From 2f4b718ddc1bdf220cd6f6d70bbf806741580c5f Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sat, 28 Mar 2026 00:15:59 +0100
Subject: [PATCH 001/145] Clean-up institution page

---
 ...titutionManufacturedComponentConnection.cs |   1 -
 frontend/components/ContactInformation.tsx    |  62 ++
 frontend/components/CopyableText.tsx          |  29 +
 frontend/components/JsonViewer.tsx            |  13 +
 frontend/components/PageHeader.tsx            |  80 +++
 frontend/components/components/Component.tsx  |   5 +-
 .../components/institutions/Institution.tsx   | 575 ++++++++++--------
 .../institutions/InstitutionTable.tsx         |  55 ++
 .../RemoveInstitutionRepresentative.tsx       |  24 +-
 frontend/components/methods/MethodTable.tsx   |   7 +-
 frontend/lib/array.ts                         |   6 +
 frontend/package.json                         |   1 -
 frontend/pages/institutions/index.tsx         |  45 +-
 frontend/queries/institutions.graphql         | 125 +---
 frontend/yarn.lock                            | 176 +-----
 15 files changed, 615 insertions(+), 589 deletions(-)
 create mode 100644 frontend/components/ContactInformation.tsx
 create mode 100644 frontend/components/CopyableText.tsx
 create mode 100644 frontend/components/JsonViewer.tsx
 create mode 100644 frontend/components/PageHeader.tsx
 create mode 100644 frontend/components/institutions/InstitutionTable.tsx

diff --git a/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentConnection.cs b/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentConnection.cs
index e1e60a1bf..0585366d8 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentConnection.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentConnection.cs
@@ -5,7 +5,6 @@
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Institutions;
 
diff --git a/frontend/components/ContactInformation.tsx b/frontend/components/ContactInformation.tsx
new file mode 100644
index 000000000..cb6d0fd32
--- /dev/null
+++ b/frontend/components/ContactInformation.tsx
@@ -0,0 +1,62 @@
+import { Space, Typography } from "antd";
+import {
+  MailOutlined,
+  PhoneOutlined,
+  GlobalOutlined,
+  EnvironmentOutlined,
+} from "@ant-design/icons";
+import { ContactInformationPartialFragment } from "../queries/institutions.generated";
+
+export default function ContactCard({
+  contact,
+}: {
+  contact: ContactInformationPartialFragment | null;
+}) {
+  const hasContact =
+    contact?.phoneNumber ||
+    contact?.emailAddress ||
+    contact?.postalAddress ||
+    contact?.websiteLocator;
+
+  if (!hasContact) {
+    return <></>;
+    // return <Empty description="No contact information available" />;
+  }
+
+  return (
+    <Space>
+      {contact?.emailAddress && (
+        <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
+          <MailOutlined style={{ fontSize: 16, color: "#1890ff" }} />
+          <Typography.Link href={`mailto:${contact.emailAddress}`}>
+            {contact.emailAddress}
+          </Typography.Link>
+        </div>
+      )}
+      {contact?.phoneNumber && (
+        <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
+          <PhoneOutlined style={{ fontSize: 16, color: "#1890ff" }} />
+          <Typography.Link href={`tel:${contact.phoneNumber}`}>
+            {contact.phoneNumber}
+          </Typography.Link>
+        </div>
+      )}
+      {contact?.websiteLocator && (
+        <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
+          <GlobalOutlined style={{ fontSize: 16, color: "#1890ff" }} />
+          <Typography.Link href={contact.websiteLocator} target="_blank">
+            {contact.websiteLocator}
+          </Typography.Link>
+        </div>
+      )}
+      {contact?.postalAddress && (
+        <div style={{ display: "flex", alignItems: "start", gap: 8 }}>
+          <EnvironmentOutlined
+            style={{ fontSize: 16, color: "#1890ff", marginTop: 2 }}
+          />
+          <span>{contact.postalAddress}</span>
+        </div>
+      )}
+    </Space>
+  );
+}
diff --git a/frontend/components/CopyableText.tsx b/frontend/components/CopyableText.tsx
new file mode 100644
index 000000000..17045ba44
--- /dev/null
+++ b/frontend/components/CopyableText.tsx
@@ -0,0 +1,29 @@
+import { Button, Space } from "antd";
+import { CopyOutlined } from "@ant-design/icons";
+import { useState } from "react";
+
+export default function CopyableText({ text }: { text: string }) {
+  const [copied, setCopied] = useState(false);
+
+  return (
+    <Space
+      style={{
+        fontFamily: "monospace",
+      }}
+    >
+      <span>{text}</span>
+      <Button
+        type="text"
+        size="small"
+        icon={<CopyOutlined />}
+        onClick={() => {
+          navigator.clipboard.writeText(text);
+          setCopied(true);
+          setTimeout(() => setCopied(false), 2000);
+        }}
+      >
+        {copied ? "Copied!" : "Copy"}
+      </Button>
+    </Space>
+  );
+}
diff --git a/frontend/components/JsonViewer.tsx b/frontend/components/JsonViewer.tsx
new file mode 100644
index 000000000..56680d637
--- /dev/null
+++ b/frontend/components/JsonViewer.tsx
@@ -0,0 +1,13 @@
+export default function JsonViewer({ jsonData }: { jsonData: any }) {
+  return (
+    <pre
+      style={{
+        overflow: "auto",
+      }}
+    >
+      <code style={{ whiteSpace: "pre-wrap", wordWrap: "break-word" }}>
+        {JSON.stringify(jsonData, null, 2)}
+      </code>
+    </pre>
+  );
+}
diff --git a/frontend/components/PageHeader.tsx b/frontend/components/PageHeader.tsx
new file mode 100644
index 000000000..9fea739bf
--- /dev/null
+++ b/frontend/components/PageHeader.tsx
@@ -0,0 +1,80 @@
+import { Breadcrumb, Button, Space, Typography } from "antd";
+import { ArrowLeftOutlined } from "@ant-design/icons";
+import { Scalars } from "../__generated__/graphql";
+import CopyableText from "./CopyableText";
+
+const { Title, Text } = Typography;
+
+interface Props {
+  id?: Scalars["Uuid"]["output"];
+  title: string;
+  subTitle?: string;
+  tags?: React.ReactNode[];
+  onBack?: () => void;
+  extra?: React.ReactNode;
+  breadcrumb?: { title: string; href?: string }[];
+  children?: React.ReactNode;
+}
+
+export default function PageHeader({
+  id,
+  title,
+  subTitle,
+  tags,
+  onBack,
+  extra,
+  breadcrumb,
+  children,
+}: Props) {
+  return (
+    <>
+      {breadcrumb && (
+        <Breadcrumb
+          items={breadcrumb.map((item) => ({
+            title: item.title,
+            href: item.href,
+          }))}
+          style={{ marginBottom: 12 }}
+        />
+      )}
+
+      <div
+        style={{
+          display: "flex",
+          justifyContent: "space-between",
+          alignItems: "flex-start",
+        }}
+      >
+        {onBack && (
+          <Button
+            type="text"
+            icon={<ArrowLeftOutlined />}
+            onClick={onBack}
+            style={{ marginLeft: -12 }}
+          />
+        )}
+        <div>
+          {id && (
+            <div>
+              <CopyableText text={id} />
+            </div>
+          )}
+          <Space>
+            <Title level={4} style={{ margin: 0 }}>
+              {title}
+            </Title>
+            {tags && <Space>{tags}</Space>}
+          </Space>
+          {subTitle && (
+            <Text type="secondary" style={{ display: "block", marginTop: 4 }}>
+              {subTitle}
+            </Text>
+          )}
+        </div>
+        <Space wrap>{extra}</Space>
+      </div>
+
+      {children && <div style={{ marginTop: 16 }}>{children}</div>}
+    </>
+  );
+}
diff --git a/frontend/components/components/Component.tsx b/frontend/components/components/Component.tsx
index 0032f256c..a4c481125 100644
--- a/frontend/components/components/Component.tsx
+++ b/frontend/components/components/Component.tsx
@@ -29,10 +29,11 @@ import { RemoveComponentAssembly } from "./RemoveComponentAssembly";
 import { RemoveComponentGeneralization } from "./RemoveComponentGeneralization";
 import { RemoveComponentVariant } from "./RemoveComponentVariant";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
+import JsonViewer from "../JsonViewer";
 
 interface ComponentProps {
   componentId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function Component({ componentId }: ComponentProps) {
   const { loading, error, data } = useQuery(ComponentDocument, {
@@ -104,7 +105,7 @@ export default function Component({ componentId }: ComponentProps) {
           )}
           {component.extras != undefined && (
             <Descriptions.Item label="Extras">
-              {JSON.stringify(component.extras, null, "\t")}
+              <JsonViewer jsonData={component.extras} />
             </Descriptions.Item>
           )}
           <Descriptions.Item label="Manager">
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index ca13fc2a4..9d351299f 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -5,10 +5,11 @@ import {
   Typography,
   Skeleton,
   Result,
-  Descriptions,
   Tag,
+  Space,
+  Tabs,
+  TabsProps,
 } from "antd";
-import { PageHeader } from "@ant-design/pro-layout";
 import { InstitutionDocument } from "../../queries/institutions.generated";
 import { Scalars } from "../../__generated__/graphql";
 import CreateComponent from "../components/CreateComponent";
@@ -19,7 +20,6 @@ import CreateDatabase from "../databases/CreateDatabase";
 import AddInstitutionRepresentative from "./AddInstitutionRepresentative";
 import Link from "next/link";
 import paths from "../../paths";
-import { ReactNode } from "react";
 import { DataFormatTable } from "../dataFormats/DataFormatTable";
 import { ComponentTable } from "../components/ComponentTable";
 import DatabaseTable from "../databases/DatabaseTable";
@@ -37,12 +37,17 @@ import RemoveInstitutionRepresentative from "./RemoveInstitutionRepresentative";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import ConfirmInstitutionMethodDeveloper from "../methods/ConfirmInstitutionMethodDeveloper";
 import { ConfirmComponentManufacturer } from "../components/ConfirmComponentManufacturer";
+import ContactInformation from "../ContactInformation";
+import JsonViewer from "../JsonViewer";
+import PageHeader from "../PageHeader";
+import { isTruthy } from "../../lib/array";
+import InstitutionTable from "./InstitutionTable";
 
-interface InstitutionProps {
+interface Props {
   institutionId: Scalars["Uuid"]["input"];
-};
+}
 
-export default function Institution({ institutionId }: InstitutionProps) {
+export default function Institution({ institutionId }: Props) {
   const { loading, error, data } = useQuery(InstitutionDocument, {
     variables: {
       uuid: institutionId,
@@ -65,9 +70,260 @@ export default function Institution({ institutionId }: InstitutionProps) {
     );
   }
 
+  const mainTabs: TabsProps["items"] = [
+    (institution.manufacturedComponents.edges.length >= 1 ||
+      institution.managedComponents.isAuthorizedToAddEdge) && {
+      key: "components",
+      label: "Manufactured Components",
+      children: (
+        <ComponentTable
+          loading={loading}
+          components={institution.manufacturedComponents.edges.map(
+            (x) => x.node,
+          )}
+        />
+      ),
+    },
+    (institution.developedMethods.edges.length >= 1 ||
+      institution.managedMethods.isAuthorizedToAddEdge) && {
+      key: "methods",
+      label: "Developed Methods",
+      children: (
+        <MethodTable
+          loading={loading}
+          methods={institution.developedMethods.edges.map((x) => x.node)}
+        />
+      ),
+    },
+    (institution.operatedDatabases.edges.length >= 1 ||
+      institution.operatedDatabases.isAuthorizedToAddEdge) && {
+      key: "databases",
+      label: "Operated Databases",
+      children: (
+        <DatabaseTable
+          loading={loading}
+          databases={institution.operatedDatabases.edges.map((x) => x.node)}
+        />
+      ),
+    },
+    (institution.gnuPgKeyFingerprints.edges.length >= 1 ||
+      institution.gnuPgKeyFingerprints.isAuthorizedToAddEdge) && {
+      key: "gnuPgKeyFingerprints",
+      label: "GnuPG Key Fingerprints",
+      children: (
+        <GnuPgKeyFingerprintTable
+          loading={false}
+          fingerprints={
+            institution.gnuPgKeyFingerprints.edges.map(
+              (e) => e.node,
+            ) as GnuPgKeyFingerprintsPartialFragment[]
+          }
+          institutionId={institution.uuid}
+        />
+      ),
+    },
+  ].filter(isTruthy);
+
+  const managedTabs: TabsProps["items"] = [
+    (institution.managedComponents.edges.length >= 1 ||
+      institution.managedComponents.isAuthorizedToAddEdge) && {
+      key: "components",
+      label: "Components",
+      children: (
+        <ComponentTable
+          loading={loading}
+          components={institution.managedComponents.edges.map((x) => x.node)}
+        />
+      ),
+    },
+    (institution.managedMethods.edges.length >= 1 ||
+      institution.managedMethods.isAuthorizedToAddEdge) && {
+      key: "methods",
+      label: "Methods",
+      children: (
+        <MethodTable
+          loading={loading}
+          methods={institution.managedMethods.edges.map((x) => x.node)}
+        />
+      ),
+    },
+    (institution.managedDataFormats.edges.length >= 1 ||
+      institution.managedDataFormats.isAuthorizedToAddEdge) && {
+      key: "dataFormats",
+      label: "Data Formats",
+      children: (
+        <DataFormatTable
+          loading={loading}
+          dataFormats={institution.managedDataFormats.edges.map((x) => x.node)}
+        />
+      ),
+    },
+    (institution.managedInstitutions.edges.length >= 1 ||
+      institution.managedInstitutions.isAuthorizedToAddEdge) && {
+      key: "institutions",
+      label: "Institutions",
+      children: (
+        <InstitutionTable
+          loading={loading}
+          institutions={institution.managedInstitutions.edges.map(
+            (x) => x.node,
+          )}
+        />
+      ),
+    },
+    institution.openIdConnectApplications.isAuthorizedToAddEdge && {
+      key: "openIdConnectApplications",
+      label: "OpenId Connect Applications",
+      children: (
+        <OpenIdConnectApplicationTable
+          loading={false}
+          applications={
+            institution.openIdConnectApplications.edges.map(
+              (e) => e.node,
+            ) as OpenIdConnectApplicationsPartialFragment[]
+          }
+        />
+      ),
+    },
+  ].filter(isTruthy);
+
+  const createTabs: TabsProps["items"] = [
+    institution.managedComponents.isAuthorizedToAddEdge && {
+      key: "components",
+      label: "Components",
+      children: (
+        <CreateComponent
+          managerId={institution.uuid}
+          initialManufacturerId={institution.uuid}
+        />
+      ),
+    },
+    institution.managedMethods.isAuthorizedToAddEdge && {
+      key: "methods",
+      label: "Methods",
+      children: <CreateMethod managerId={institution.uuid} />,
+    },
+    institution.managedDataFormats.isAuthorizedToAddEdge && {
+      key: "dataFormats",
+      label: "Data Formats",
+      children: <CreateDataFormat managerId={institution.uuid} />,
+    },
+    institution.managedInstitutions.isAuthorizedToAddEdge && {
+      key: "institutions",
+      label: "Institutions",
+      children: <CreateInstitution managerId={institution.uuid} />,
+    },
+    institution.operatedDatabases.isAuthorizedToAddEdge && {
+      key: "databases",
+      label: "Databases",
+      children: <CreateDatabase operatorId={institution.uuid} />,
+    },
+    institution.gnuPgKeyFingerprints.isAuthorizedToAddEdge && {
+      key: "gnuPgKeyFingerprints",
+      label: "GnuPG Key Fingerprints",
+      children: <AddGnuPgKeyFingerprint institutionId={institution.uuid} />,
+    },
+    institution.openIdConnectApplications.isAuthorizedToAddEdge && {
+      key: "openIdConnectApplications",
+      label: "OpenId Connect Applications",
+      children: (
+        <CreateOpenIdConnectApplication institutionId={institution.uuid} />
+      ),
+    },
+    institution.representatives.isAuthorizedToAddEdge && {
+      key: "representatives",
+      label: "Representatives",
+      children: (
+        <>
+          <AddInstitutionRepresentative institutionId={institution.uuid} />
+        </>
+      ),
+    },
+  ].filter(isTruthy);
+
+  const pendingTabs: TabsProps["items"] = [
+    institution.pendingManufacturedComponents.isAuthorizedToConfirmEdges &&
+      institution.pendingManufacturedComponents.edges.length >= 1 && {
+        key: "components",
+        label: "Components",
+        children: (
+          <>
+            <List
+              size="small"
+              dataSource={institution.pendingManufacturedComponents.edges}
+              renderItem={(item) => (
+                <List.Item key={item.node.uuid}>
+                  <Link href={paths.component(item.node.uuid)}>
+                    {item.node.name}
+                  </Link>
+                  <ConfirmComponentManufacturer
+                    componentId={item.node.uuid}
+                    institutionId={institution.uuid}
+                  />
+                </List.Item>
+              )}
+            />
+          </>
+        ),
+      },
+    institution.pendingDevelopedMethods.isAuthorizedToConfirmEdges &&
+      institution.pendingDevelopedMethods.edges.length >= 1 && {
+        key: "methods",
+        label: "Methods",
+        children: (
+          <>
+            <List
+              size="small"
+              dataSource={institution.pendingDevelopedMethods.edges}
+              renderItem={(item) => (
+                <List.Item key={item.node.uuid}>
+                  <Link href={paths.method(item.node.uuid)}>
+                    {item.node.name}
+                  </Link>
+                  <ConfirmInstitutionMethodDeveloper
+                    methodId={item.node.uuid}
+                    institutionId={institution.uuid}
+                  />
+                </List.Item>
+              )}
+            />
+          </>
+        ),
+      },
+    institution.representatives.isAuthorizedToAddEdge &&
+      institution.pendingRepresentatives != null &&
+      institution.pendingRepresentatives.edges.length >= 1 && {
+        key: "representatives",
+        label: "Representatives",
+        children: (
+          <>
+            <List
+              size="small"
+              dataSource={institution.pendingRepresentatives.edges}
+              renderItem={(item) => (
+                <List.Item key={item.node.uuid}>
+                  <Link href={paths.user(item.node.uuid)}>
+                    {`${item.node.name} (${item.node.uuid})`}
+                  </Link>
+                  <Typography.Text>{item.role}</Typography.Text>
+                  {item.isAuthorizedToRemoveEdge && (
+                    <RemoveInstitutionRepresentative
+                      institutionId={institution.uuid}
+                      userId={item.node.uuid}
+                    />
+                  )}
+                </List.Item>
+              )}
+            />
+          </>
+        ),
+      },
+  ].filter(isTruthy);
+
   return (
     <>
       <PageHeader
+        id={institution.uuid}
         title={[
           institution.name,
           institution.abbreviation == null
@@ -85,264 +341,85 @@ export default function Institution({ institutionId }: InstitutionProps) {
             {institution.operatingState}
           </Tag>,
         ]}
-        extra={([] as ReactNode[])
-          .concat(
-            institution.isAuthorizedToUpdateNode
-              ? [
-                  <UpdateInstitution
-                    key="updateInstitution"
-                    institution={institution}
-                  />,
-                ]
-              : [],
-          )
-          .concat(
-            institution.isAuthorizedToDeleteNode
-              ? [
-                  <DeleteInstitution
-                    key="deleteInstitution"
-                    institutionId={institution.uuid}
-                  />,
-                ]
-              : [],
-          )
-          .concat(
-            institution.isAuthorizedToSwitchOperatingStateOfNode
-              ? [
-                  <SwitchInstitutionOperatingState
-                    key="switchInstitutionOperatingState"
-                    institutionId={institution.uuid}
-                  />,
-                ]
-              : [],
-          )}
-        backIcon={false}
+        extra={[
+          institution.isAuthorizedToUpdateNode && (
+            <UpdateInstitution institution={institution} />
+          ),
+          institution.isAuthorizedToSwitchOperatingStateOfNode && (
+            <SwitchInstitutionOperatingState institutionId={institution.uuid} />
+          ),
+          institution.isAuthorizedToDeleteNode && (
+            <DeleteInstitution institutionId={institution.uuid} />
+          ),
+        ].filter(Boolean)}
       >
-        <Descriptions size="small" column={1}>
-          <Descriptions.Item label="UUID">{institution.uuid}</Descriptions.Item>
-          {institution.contact?.phoneNumber && (
-            <Descriptions.Item label="Phone">
-              {institution.contact.phoneNumber}
-            </Descriptions.Item>
-          )}
-          {institution.contact?.postalAddress && (
-            <Descriptions.Item label="Postal Address">
-              {institution.contact.postalAddress}
-            </Descriptions.Item>
+        <Space orientation="vertical">
+          {institution.extras != null && (
+            <JsonViewer jsonData={institution.extras} />
           )}
-          {institution.contact?.emailAddress && (
-            <Descriptions.Item label="E-Mail">
-              {institution.contact.emailAddress}
-            </Descriptions.Item>
+          <ContactInformation contact={institution.contact} />
+          {institution.representatives.edges.length >= 1 && (
+            <div>
+              <>
+                Represented by{" "}
+                {institution.representatives.edges.map((edge, index) => (
+                  <span key={edge.node.uuid}>
+                    <Link href={paths.user(edge.node.uuid)}>
+                      {`${edge.node.name} (${edge.node.uuid})`}
+                    </Link>{" "}
+                    as <Typography.Text>{edge.role}</Typography.Text>
+                    {edge.isAuthorizedToRemoveEdge && (
+                      <RemoveInstitutionRepresentative
+                        institutionId={institution.uuid}
+                        userId={edge.node.uuid}
+                      />
+                    )}
+                    {index < institution.representatives.edges.length - 2 &&
+                      ", "}
+                    {index < institution.representatives.edges.length - 1 &&
+                      " and "}
+                  </span>
+                ))}
+              </>
+            </div>
           )}
-          {institution.contact?.websiteLocator && (
-            <Descriptions.Item label="Website">
-              <Typography.Link href={institution.contact.websiteLocator}>
-                {institution.contact.websiteLocator}
-              </Typography.Link>
-            </Descriptions.Item>
-          )}
-          {institution.extras != undefined && (
-            <Descriptions.Item label="Extras">
-              {JSON.stringify(institution.extras, null, "\t")}
-            </Descriptions.Item>
+          {institution.manager?.node && (
+            <div>
+              <>
+                Managed by{" "}
+                <Link href={paths.institution(institution.manager?.node?.uuid)}>
+                  {institution.manager?.node?.name}
+                </Link>
+              </>
+            </div>
           )}
-        </Descriptions>
+        </Space>
       </PageHeader>
       <Divider />
-      <Typography.Title level={2}>Manufactured Components</Typography.Title>
-      <ComponentTable
-        loading={loading}
-        components={institution.manufacturedComponents.edges.map((x) => x.node)}
-      />
-      {institution.pendingManufacturedComponents.isAuthorizedToConfirmEdges &&
-        institution.pendingManufacturedComponents.edges.length >= 1 && (
-          <List
-            size="small"
-            header="Pending"
-            dataSource={institution.pendingManufacturedComponents.edges}
-            renderItem={(item) => (
-              <List.Item key={item.node.uuid}>
-                <Link href={paths.component(item.node.uuid)}>
-                  {item.node.name}
-                </Link>
-                <ConfirmComponentManufacturer
-                  componentId={item.node.uuid}
-                  institutionId={institution.uuid}
-                />
-              </List.Item>
-            )}
-          />
-        )}
-      <Divider />
-      <Typography.Title level={2}>Managed Components</Typography.Title>
-      <ComponentTable
-        loading={loading}
-        components={institution.managedComponents.edges.map((x) => x.node)}
-      />
-      {institution.managedComponents.isAuthorizedToAddEdge && (
-        <CreateComponent
-          managerId={institution.uuid}
-          initialManufacturerId={institution.uuid}
-        />
-      )}
-      <Divider />
-      <Typography.Title level={2}>Operated Databases</Typography.Title>
-      <DatabaseTable
-        loading={loading}
-        databases={institution.operatedDatabases.edges.map((x) => x.node)}
-      />
-      {institution.operatedDatabases.isAuthorizedToAddEdge && (
-        <CreateDatabase operatorId={institution.uuid} />
-      )}
-      <Divider />
-      <Typography.Title level={2}>Managed Data Formats</Typography.Title>
-      <DataFormatTable
-        loading={loading}
-        dataFormats={institution.managedDataFormats.edges.map((x) => x.node)}
-      />
-      {institution.managedDataFormats.isAuthorizedToAddEdge && (
-        <CreateDataFormat managerId={institution.uuid} />
-      )}
-      <Divider />
-      <Typography.Title level={2}>Managed Methods</Typography.Title>
-      <MethodTable
-        loading={loading}
-        methods={institution.managedMethods.edges.map((x) => x.node)}
-      />
-      {institution.managedMethods.isAuthorizedToAddEdge && (
-        <CreateMethod managerId={institution.uuid} />
-      )}
-      <Divider />
-      <Typography.Title level={2}>Developed Methods</Typography.Title>
-      <List
-        size="small"
-        dataSource={institution.developedMethods.edges}
-        renderItem={(item) => (
-          <List.Item key={item.node.uuid}>
-            <Link href={paths.method(item.node.uuid)}>{item.node.name}</Link>
-          </List.Item>
-        )}
-      />
-      {institution.pendingDevelopedMethods.isAuthorizedToConfirmEdges &&
-        institution.pendingDevelopedMethods.edges.length >= 1 && (
-          <List
-            size="small"
-            header="Pending"
-            dataSource={institution.pendingDevelopedMethods.edges}
-            renderItem={(item) => (
-              <List.Item key={item.node.uuid}>
-                <Link href={paths.method(item.node.uuid)}>
-                  {item.node.name}
-                </Link>
-                <ConfirmInstitutionMethodDeveloper
-                  methodId={item.node.uuid}
-                  institutionId={institution.uuid}
-                />
-              </List.Item>
-            )}
-          />
-        )}
-      <Divider />
-      <Typography.Title level={2}>GnuPG Key Fingerprints</Typography.Title>
-      <GnuPgKeyFingerprintTable
-        loading={false}
-        fingerprints={
-          institution.gnuPgKeyFingerprints.edges.map(
-            (e) => e.node,
-          ) as GnuPgKeyFingerprintsPartialFragment[]
-        }
-        institutionId={institution.uuid}
-      />
-      {institution.gnuPgKeyFingerprints.isAuthorizedToAddEdge && (
-        <AddGnuPgKeyFingerprint institutionId={institution.uuid} />
-      )}
-      {institution.openIdConnectApplications.isAuthorizedToAddEdge && (
+      {mainTabs.length >= 1 && <Tabs items={mainTabs} />}
+      {managedTabs.length >= 1 && (
         <>
           <Divider />
           <Typography.Title level={2}>
-            OpenId Connect Applications
+            Managed &amp; Owned Entities
           </Typography.Title>
-          <OpenIdConnectApplicationTable
-            loading={false}
-            applications={
-              institution.openIdConnectApplications.edges.map(
-                (e) => e.node,
-              ) as OpenIdConnectApplicationsPartialFragment[]
-            }
-          />
+          <Tabs items={managedTabs} />
         </>
       )}
-      {institution.openIdConnectApplications.isAuthorizedToAddEdge && (
-        <CreateOpenIdConnectApplication institutionId={institution.uuid} />
-      )}
-      <Divider />
-      <Typography.Title level={2}>Managed Institutions</Typography.Title>
-      <List
-        size="small"
-        dataSource={institution.managedInstitutions.edges.map((x) => x.node)}
-        renderItem={(item) => (
-          <List.Item key={item.uuid}>
-            <Link href={paths.institution(item.uuid)}>{item.name}</Link>
-          </List.Item>
-        )}
-      />
-      {institution.managedInstitutions.isAuthorizedToAddEdge && (
-        <CreateInstitution managerId={institution.uuid} />
-      )}
-      <Divider />
-      <Typography.Title level={2}>Representatives</Typography.Title>
-      <List
-        size="small"
-        dataSource={institution.representatives.edges}
-        renderItem={(item) => (
-          <List.Item key={item.node.uuid}>
-            <Link href={paths.user(item.node.uuid)}>
-              {`${item.node.name} (${item.node.uuid})`}
-            </Link>
-            <Typography.Text>{item.role}</Typography.Text>
-            {item.isAuthorizedToRemoveEdge && (
-              <RemoveInstitutionRepresentative
-                institutionId={institution.uuid}
-                userId={item.node.uuid}
-              />
-            )}
-          </List.Item>
-        )}
-      />
-      {institution.representatives.isAuthorizedToAddEdge &&
-        institution.pendingRepresentatives != null &&
-        institution.pendingRepresentatives.edges.length >= 1 && (
-          <List
-            size="small"
-            header="Pending"
-            dataSource={institution.pendingRepresentatives.edges}
-            renderItem={(item) => (
-              <List.Item key={item.node.uuid}>
-                <Link href={paths.user(item.node.uuid)}>
-                  {`${item.node.name} (${item.node.uuid})`}
-                </Link>
-                <Typography.Text>{item.role}</Typography.Text>
-                {item.isAuthorizedToRemoveEdge && (
-                  <RemoveInstitutionRepresentative
-                    institutionId={institution.uuid}
-                    userId={item.node.uuid}
-                  />
-                )}
-              </List.Item>
-            )}
-          />
-        )}
-      {institution.representatives.isAuthorizedToAddEdge && (
-        <AddInstitutionRepresentative institutionId={institution.uuid} />
+      {createTabs.length >= 1 && (
+        <>
+          <Divider />
+          <Typography.Title level={2}>
+            Create &amp; Add Entities
+          </Typography.Title>
+          <Tabs items={createTabs} />
+        </>
       )}
-      {institution.manager?.node && (
+      {pendingTabs.length >= 1 && (
         <>
           <Divider />
-          <Typography.Title level={2}>Managing Institution</Typography.Title>
-          <Link href={paths.institution(institution.manager?.node?.uuid)}>
-            {institution.manager?.node?.name}
-          </Link>
+          <Typography.Title level={2}>Pending Entities</Typography.Title>
+          <Tabs items={pendingTabs} />
         </>
       )}
     </>
diff --git a/frontend/components/institutions/InstitutionTable.tsx b/frontend/components/institutions/InstitutionTable.tsx
new file mode 100644
index 000000000..b4da664d4
--- /dev/null
+++ b/frontend/components/institutions/InstitutionTable.tsx
@@ -0,0 +1,55 @@
+import { Table } from "antd";
+import { InstitutionsPartialFragment } from "../../queries/institutions.generated";
+import {
+  getNameColumnProps,
+  getAbbreviationColumnProps,
+  getDescriptionColumnProps,
+  getUuidColumnProps,
+} from "../../lib/table";
+import paths from "../../paths";
+import { useState } from "react";
+import { setMapValue } from "../../lib/freeTextFilter";
+
+export default function InstitutionTable({
+  loading,
+  institutions,
+}: {
+  loading: boolean;
+  institutions: InstitutionsPartialFragment[];
+}) {
+  const [filterText, setFilterText] = useState(() => new Map<string, string>());
+  const onFilterTextChange = setMapValue(filterText, setFilterText);
+
+  return (
+    <Table
+      loading={loading}
+      columns={[
+        {
+          ...getUuidColumnProps<(typeof nodes)[0]>(
+            onFilterTextChange,
+            (x) => filterText.get(x),
+            paths.institution,
+          ),
+        },
+        {
+          ...getNameColumnProps<(typeof nodes)[0]>(onFilterTextChange, (x) =>
+            filterText.get(x),
+          ),
+        },
+        {
+          ...getAbbreviationColumnProps<(typeof nodes)[0]>(
+            onFilterTextChange,
+            (x) => filterText.get(x),
+          ),
+        },
+        {
+          ...getDescriptionColumnProps<(typeof nodes)[0]>(
+            onFilterTextChange,
+            (x) => filterText.get(x),
+          ),
+        },
+      ]}
+      dataSource={institutions}
+    />
+  );
+}
diff --git a/frontend/components/institutions/RemoveInstitutionRepresentative.tsx b/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
index 71acf596e..0cd345f56 100644
--- a/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
+++ b/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Button } from "antd";
+import { Button, Popconfirm, Tooltip } from "antd";
 import { InstitutionDocument } from "../../queries/institutions.generated";
 import { Scalars } from "../../__generated__/graphql";
 import { UserDocument } from "../../queries/users.generated";
@@ -8,6 +8,7 @@ import {
   RemoveInstitutionRepresentativeMutation,
 } from "../../queries/institutionRepresentatives.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import { DeleteOutlined } from "@ant-design/icons";
 
 interface Props {
   institutionId: Scalars["Uuid"]["input"];
@@ -63,8 +64,23 @@ export default function RemoveInstitutionRepresentative({
   };
 
   return (
-    <Button danger type="primary" onClick={remove} loading={mutating}>
-      Remove
-    </Button>
+    <Popconfirm
+      title="Remove Representative"
+      description="Are you sure?"
+      okText="Yes"
+      cancelText="No"
+      okButtonProps={{ danger: true }}
+      onConfirm={remove}
+    >
+      <Tooltip title="Delete">
+        <Button
+          type="text"
+          danger
+          shape="circle"
+          icon={<DeleteOutlined />}
+          loading={mutating}
+        />
+      </Tooltip>
+    </Popconfirm>
   );
 }
diff --git a/frontend/components/methods/MethodTable.tsx b/frontend/components/methods/MethodTable.tsx
index 6c6d430ee..74d525d04 100644
--- a/frontend/components/methods/MethodTable.tsx
+++ b/frontend/components/methods/MethodTable.tsx
@@ -10,14 +10,15 @@ import {
   getDescriptionColumnProps,
   getUuidColumnProps,
 } from "../../lib/table";
-import { Method, MethodCategory } from "../../__generated__/graphql";
+import { MethodCategory } from "../../__generated__/graphql";
+import { MethodsPartialFragment } from "../../queries/methods.generated";
 
 // TODO Pagination. See https://www.apollographql.com/docs/react/pagination/core-api/
 
 interface MethodTableProps {
   loading: boolean;
   methods: Pick<
-    Method,
+    MethodsPartialFragment,
     | "uuid"
     | "name"
     | "description"
@@ -25,7 +26,7 @@ interface MethodTableProps {
     | "calculationLocator"
     | "reference"
   >[];
-};
+}
 
 export function MethodTable({ loading, methods }: MethodTableProps) {
   const [filterText, setFilterText] = useState(() => new Map<string, string>());
diff --git a/frontend/lib/array.ts b/frontend/lib/array.ts
index b24b88fec..bc423f6d4 100644
--- a/frontend/lib/array.ts
+++ b/frontend/lib/array.ts
@@ -4,3 +4,9 @@ export function notEmpty<TValue>(
 ): value is TValue {
   return value !== null && value !== undefined;
 }
+
+export function isTruthy<T>(
+  value: T | false | null | undefined | "" | 0,
+): value is T {
+  return Boolean(value);
+}
diff --git a/frontend/package.json b/frontend/package.json
index dd2f77fa2..53f9d17a0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -14,7 +14,6 @@
     "refresh-baseline-browser-mapping": "yarn upgrade baseline-browser-mapping@latest"
   },
   "dependencies": {
-    "@ant-design/pro-layout": "^7.10.3",
     "@apollo/client": "^4.0.9",
     "@parcel/watcher": "^2.5.1",
     "antd": "^6.3.3",
diff --git a/frontend/pages/institutions/index.tsx b/frontend/pages/institutions/index.tsx
index 6d482eac7..31db4c9ef 100644
--- a/frontend/pages/institutions/index.tsx
+++ b/frontend/pages/institutions/index.tsx
@@ -2,21 +2,14 @@ import { useQuery } from "@apollo/client/react";
 import Layout from "../../components/Layout";
 import Link from "next/link";
 import paths from "../../paths";
-import { Table, Typography, Divider } from "antd";
+import { Typography, Divider } from "antd";
 import { InstitutionsDocument } from "../../queries/institutions.generated";
-import { useState } from "react";
 import { CurrentUserDocument } from "../../queries/currentUser.generated";
 import PendingInstitutions from "../../components/institutions/PendingInstitutions";
 import { UserRole } from "../../__generated__/graphql";
-import { setMapValue } from "../../lib/freeTextFilter";
-import {
-  getNameColumnProps,
-  getAbbreviationColumnProps,
-  getDescriptionColumnProps,
-  getUuidColumnProps,
-} from "../../lib/table";
 import { notEmpty } from "../../lib/array";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
+import InstitutionTable from "../../components/institutions/InstitutionTable";
 
 // TODO Pagination. See https://www.apollographql.com/docs/react/pagination/core-api/
 
@@ -25,9 +18,6 @@ function Page() {
   const nodes =
     data?.institutions?.edges?.map((e) => e.node).filter(notEmpty) || [];
 
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
-
   const currentUser = useQuery(CurrentUserDocument)?.data?.currentUser;
 
   useQueryHandler({ error });
@@ -41,36 +31,7 @@ function Page() {
         <Link href={paths.dataFormats}>data formats</Link> and{" "}
         <Link href={paths.methods}>methods</Link>.
       </Typography.Paragraph>
-      <Table
-        loading={loading}
-        columns={[
-          {
-            ...getUuidColumnProps<(typeof nodes)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-              paths.institution,
-            ),
-          },
-          {
-            ...getNameColumnProps<(typeof nodes)[0]>(onFilterTextChange, (x) =>
-              filterText.get(x),
-            ),
-          },
-          {
-            ...getAbbreviationColumnProps<(typeof nodes)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getDescriptionColumnProps<(typeof nodes)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-        ]}
-        dataSource={nodes}
-      />
+      <InstitutionTable loading={loading} institutions={nodes} />
       <Typography.Paragraph style={{ maxWidth: 768 }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         provides all information about institutions.
diff --git a/frontend/queries/institutions.graphql b/frontend/queries/institutions.graphql
index 8234cfbad..a9b8c128f 100644
--- a/frontend/queries/institutions.graphql
+++ b/frontend/queries/institutions.graphql
@@ -1,5 +1,9 @@
-#import "./openIdConnect.graphql"
+#import "./components.graphql"
+#import "./dataFormats.graphql"
+#import "./databases.graphql"
 #import "./gnuPgKeyFingerprints.graphql"
+#import "./methods.graphql"
+#import "./openIdConnect.graphql"
 
 fragment ContactInformationPartial on ContactInformation {
   phoneNumber
@@ -39,32 +43,14 @@ fragment InstitutionPartial on Institution {
   manufacturedComponents {
     edges {
       node {
-        id
-        uuid
-        name
-        abbreviation
-        description
-        categories
-        availability {
-          from
-          to
-        }
+        ...ComponentsPartial
       }
     }
   }
   managedComponents {
     edges {
       node {
-        id
-        uuid
-        name
-        abbreviation
-        description
-        categories
-        availability {
-          from
-          to
-        }
+        ...ComponentsPartial
       }
     }
     isAuthorizedToAddEdge
@@ -82,18 +68,7 @@ fragment InstitutionPartial on Institution {
   operatedDatabases {
     edges {
       node {
-        id
-        uuid
-        name
-        description
-        locator
-        operator {
-          node {
-            id
-            uuid
-            name
-          }
-        }
+        ...DatabasesPartial
       }
     }
     isAuthorizedToAddEdge
@@ -131,45 +106,7 @@ fragment InstitutionPartial on Institution {
   managedDataFormats {
     edges {
       node {
-        id
-        uuid
-        name
-        extension
-        description
-        mediaType
-        schemaLocator
-        reference {
-          ... on Standard {
-            abstract
-            section
-            title
-            locator
-            numeration {
-              mainNumber
-              prefix
-              suffix
-            }
-            standardizers
-            year
-          }
-          ... on Publication {
-            abstract
-            section
-            title
-            arXiv
-            authors
-            doi
-            urn
-            webAddress
-          }
-        }
-        manager {
-          node {
-            id
-            uuid
-            name
-          }
-        }
+        ...DataFormatsPartial
       }
     }
     isAuthorizedToAddEdge
@@ -177,45 +114,7 @@ fragment InstitutionPartial on Institution {
   managedMethods {
     edges {
       node {
-        id
-        uuid
-        name
-        description
-        validity {
-          from
-          to
-        }
-        availability {
-          from
-          to
-        }
-        reference {
-          ... on Standard {
-            abstract
-            section
-            title
-            locator
-            numeration {
-              mainNumber
-              prefix
-              suffix
-            }
-            standardizers
-            year
-          }
-          ... on Publication {
-            abstract
-            section
-            title
-            arXiv
-            authors
-            doi
-            urn
-            webAddress
-          }
-        }
-        calculationLocator
-        categories
+        ...MethodsPartial
       }
     }
     isAuthorizedToAddEdge
@@ -223,9 +122,7 @@ fragment InstitutionPartial on Institution {
   developedMethods {
     edges {
       node {
-        id
-        uuid
-        name
+        ...MethodsPartial
       }
     }
   }
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 6555bcfc9..5493eb546 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2,13 +2,6 @@
 # yarn lockfile v1
 
 
-"@ant-design/colors@^7.0.0":
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-7.2.1.tgz#3bbc1c6c18550020d1622a0067ff03492318df98"
-  integrity sha512-lCHDcEzieu4GA3n8ELeZ5VQ8pKQAWcGGLRTQ50aQM2iqPpq2evTxER84jfdPvsPAtEcZ7m44NI45edFMo8oOYQ==
-  dependencies:
-    "@ant-design/fast-color" "^2.0.6"
-
 "@ant-design/colors@^8.0.0", "@ant-design/colors@^8.0.1":
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-8.0.1.tgz#6b5444f2ab4061c7b1aa4bc776adb023b0253161"
@@ -25,19 +18,6 @@
     "@babel/runtime" "^7.23.2"
     "@rc-component/util" "^1.4.0"
 
-"@ant-design/cssinjs@^1.21.1":
-  version "1.24.0"
-  resolved "https://registry.yarnpkg.com/@ant-design/cssinjs/-/cssinjs-1.24.0.tgz#7db091f03f189abc77a13cbd27a2293802cd7285"
-  integrity sha512-K4cYrJBsgvL+IoozUXYjbT6LHHNt+19a9zkvpBPxLjFHas1UpPM2A5MlhROb0BT8N8WoavM5VsP9MeSeNK/3mg==
-  dependencies:
-    "@babel/runtime" "^7.11.1"
-    "@emotion/hash" "^0.8.0"
-    "@emotion/unitless" "^0.7.5"
-    classnames "^2.3.1"
-    csstype "^3.1.3"
-    rc-util "^5.35.0"
-    stylis "^4.3.4"
-
 "@ant-design/cssinjs@^2.1.2":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/@ant-design/cssinjs/-/cssinjs-2.1.2.tgz#0219e37afdd957248b10da366febae1e4001c952"
@@ -51,13 +31,6 @@
     csstype "^3.1.3"
     stylis "^4.3.4"
 
-"@ant-design/fast-color@^2.0.6":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@ant-design/fast-color/-/fast-color-2.0.6.tgz#ab4d4455c1542c9017d367c2fa8ca3e4215d0ba2"
-  integrity sha512-y2217gk4NqL35giHl72o6Zzqji9O7vHh9YmhUVkPtAOpoTCH4uWxo/pr4VE8t0+ChEPs0qo4eJRC5Q1eXWo3vA==
-  dependencies:
-    "@babel/runtime" "^7.24.7"
-
 "@ant-design/fast-color@^3.0.0", "@ant-design/fast-color@^3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@ant-design/fast-color/-/fast-color-3.0.1.tgz#fee56b95427c0b55b216c93d9a7f3473f31615b5"
@@ -68,17 +41,6 @@
   resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz#ed2be7fb4d82ac7e1d45a54a5b06d6cecf8be6f6"
   integrity sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==
 
-"@ant-design/icons@^5.0.0":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-5.6.1.tgz#7290fcdc3d96ff3fca793ed399053cd29ad5dbd3"
-  integrity sha512-0/xS39c91WjPAZOWsvi1//zjx6kAp4kxWwctR6kuU6p133w8RU0D2dSCvZC19uQyharg/sAvYxGYWl01BbZZfg==
-  dependencies:
-    "@ant-design/colors" "^7.0.0"
-    "@ant-design/icons-svg" "^4.4.0"
-    "@babel/runtime" "^7.24.8"
-    classnames "^2.2.6"
-    rc-util "^5.31.1"
-
 "@ant-design/icons@^6.1.0":
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-6.1.0.tgz#97cc14a3c0528b8e2b37f41f232b019f2ca38c2c"
@@ -89,55 +51,6 @@
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@ant-design/pro-layout@^7.10.3":
-  version "7.22.7"
-  resolved "https://registry.yarnpkg.com/@ant-design/pro-layout/-/pro-layout-7.22.7.tgz#7002b1838e1cdf879bbec813677b478c26fbbb77"
-  integrity sha512-fvmtNA1r9SaasVIQIQt611VSlNxtVxDbQ3e+1GhYQza3tVJi/3gCZuDyfMfTnbLmf3PaW/YvLkn7MqDbzAzoLA==
-  dependencies:
-    "@ant-design/cssinjs" "^1.21.1"
-    "@ant-design/icons" "^5.0.0"
-    "@ant-design/pro-provider" "2.16.2"
-    "@ant-design/pro-utils" "2.18.0"
-    "@babel/runtime" "^7.18.0"
-    "@umijs/route-utils" "^4.0.0"
-    "@umijs/use-params" "^1.0.9"
-    classnames "^2.3.2"
-    lodash "^4.17.21"
-    lodash-es "^4.17.21"
-    path-to-regexp "8.2.0"
-    rc-resize-observer "^1.1.0"
-    rc-util "^5.0.6"
-    swr "^2.0.0"
-    warning "^4.0.3"
-
-"@ant-design/pro-provider@2.16.2":
-  version "2.16.2"
-  resolved "https://registry.yarnpkg.com/@ant-design/pro-provider/-/pro-provider-2.16.2.tgz#3ccec06ea9a69a4d48adc593a268413c813dab2f"
-  integrity sha512-0KmCH1EaOND787Jz6VRMYtLNZmqfT0JPjdUfxhyOxFfnBRfrjyfZgIa6CQoAJLEUMWv57PccWS8wRHVUUk2Yiw==
-  dependencies:
-    "@ant-design/cssinjs" "^1.21.1"
-    "@babel/runtime" "^7.18.0"
-    "@ctrl/tinycolor" "^3.4.0"
-    dayjs "^1.11.10"
-    rc-util "^5.0.1"
-    swr "^2.0.0"
-
-"@ant-design/pro-utils@2.18.0":
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/@ant-design/pro-utils/-/pro-utils-2.18.0.tgz#50a6bcc95742b71a7a17252f7db6c2ccd2ec60f4"
-  integrity sha512-8+ikyrN8L8a8Ph4oeHTOJEiranTj18+9+WHCHjKNdEfukI7Rjn8xpYdLJWb2AUJkb9d4eoAqjd5+k+7w81Df0w==
-  dependencies:
-    "@ant-design/icons" "^5.0.0"
-    "@ant-design/pro-provider" "2.16.2"
-    "@babel/runtime" "^7.18.0"
-    classnames "^2.3.2"
-    dayjs "^1.11.10"
-    lodash "^4.17.21"
-    lodash-es "^4.17.21"
-    rc-util "^5.0.6"
-    safe-stable-stringify "^2.4.3"
-    swr "^2.0.0"
-
 "@ant-design/react-slick@~2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-2.0.0.tgz#2d1dac45e7fc94060355f7cc233e92ca247133dc"
@@ -410,7 +323,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.28.6"
 
-"@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.23.2", "@babel/runtime@^7.24.4", "@babel/runtime@^7.24.7", "@babel/runtime@^7.24.8", "@babel/runtime@^7.26.10", "@babel/runtime@^7.28.4":
+"@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.18.0", "@babel/runtime@^7.20.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.24.4", "@babel/runtime@^7.24.7", "@babel/runtime@^7.26.10", "@babel/runtime@^7.28.4":
   version "7.29.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.29.2.tgz#9a6e2d05f4b6692e1801cd4fb176ad823930ed5e"
   integrity sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==
@@ -457,11 +370,6 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@ctrl/tinycolor@^3.4.0":
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz#b6c75a56a1947cc916ea058772d666a2c8932f31"
-  integrity sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==
-
 "@emnapi/core@^1.4.3":
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.9.1.tgz#2143069c744ca2442074f8078462e51edd63c7bd"
@@ -2506,16 +2414,6 @@
     "@typescript-eslint/types" "8.57.1"
     eslint-visitor-keys "^5.0.0"
 
-"@umijs/route-utils@^4.0.0":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@umijs/route-utils/-/route-utils-4.0.3.tgz#70779ee069ac048509786bcf316368d3516ca5fd"
-  integrity sha512-zPEcYhl1cSfkSRDzzGgoD1mDvGjxoOTJFvkn55srfgdQ3NZe2ZMCScCU6DEnOxuKP1XDVf8pqyqCDVd2+RCQIw==
-
-"@umijs/use-params@^1.0.9":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@umijs/use-params/-/use-params-1.0.9.tgz#0ae4a87f4922d8e8e3fb4495b0f8f4de9ca38c52"
-  integrity sha512-QlN0RJSBVQBwLRNxbxjQ5qzqYIGn+K7USppMoIOVlf7fxXHsnQZ2bEsa6Pm74bt6DVQxpUE8HqvdStn6Y9FV1w==
-
 "@ungap/structured-clone@^1.3.0":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
@@ -3247,11 +3145,6 @@ cjs-module-lexer@^2.1.0:
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-2.2.0.tgz#b3ca5101843389259ade7d88c77bd06ce55849ca"
   integrity sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==
 
-classnames@^2.2.1, classnames@^2.2.6, classnames@^2.3.1, classnames@^2.3.2:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
-  integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
-
 cli-cursor@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-5.0.0.tgz#24a4831ecf5a6b01ddeb32fb71a4b2088b0dce38"
@@ -3469,7 +3362,7 @@ dataloader@^2.2.3:
   resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.2.3.tgz#42d10b4913515f5b37c6acedcb4960d6ae1b1517"
   integrity sha512-y2krtASINtPFS1rSDjacrFgn1dcUuoREVabwlOGOe4SdxenREqwjwjElAdwvbGM7kgZz9a3KVicWR7vcz8rnzA==
 
-dayjs@^1.0, dayjs@^1.11.10, dayjs@^1.11.11:
+dayjs@^1.0, dayjs@^1.11.11:
   version "1.11.20"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.20.tgz#88d919fd639dc991415da5f4cb6f1b6650811938"
   integrity sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==
@@ -3536,11 +3429,6 @@ dependency-graph@^1.0.0:
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-1.0.0.tgz#bb5e85aec1310bc13b22dbd76e3196c4ee4c10d2"
   integrity sha512-cW3gggJ28HZ/LExwxP2B++aiKxhJXMSIt9K48FOXQkm+vuG5gyatXnLsONRJdzO/7VfjDIiaOOa/bs4l464Lwg==
 
-dequal@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
-  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
-
 detect-indent@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
@@ -5436,17 +5324,12 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-lodash-es@^4.17.21:
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.23.tgz#58c4360fd1b5d33afc6c0bbd3d1149349b1138e0"
-  integrity sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
 
-lodash@^4.17.21, lodash@~4.17.0:
+lodash@~4.17.0:
   version "4.17.23"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
   integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
@@ -6008,11 +5891,6 @@ path-scurry@^1.11.1:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
-path-to-regexp@8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-8.2.0.tgz#73990cc29e57a3ff2a0d914095156df5db79e8b4"
-  integrity sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -6102,24 +5980,6 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-rc-resize-observer@^1.1.0:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.4.3.tgz#4fd41fa561ba51362b5155a07c35d7c89a1ea569"
-  integrity sha512-YZLjUbyIWox8E9i9C3Tm7ia+W7euPItNWSPX5sCcQTYbnwDb5uNpnLHQCG1f22oZWUhLw4Mv2tFmeWe68CDQRQ==
-  dependencies:
-    "@babel/runtime" "^7.20.7"
-    classnames "^2.2.1"
-    rc-util "^5.44.1"
-    resize-observer-polyfill "^1.5.1"
-
-rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.31.1, rc-util@^5.35.0, rc-util@^5.44.1:
-  version "5.44.4"
-  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.44.4.tgz#89ee9037683cca01cd60f1a6bbda761457dd6ba5"
-  integrity sha512-resueRJzmHG9Q6rI/DfK6Kdv9/Lfls05vzMs1Sk3M2P+3cJa+MakaZyWY8IPfehVuhPJFKrIY1IK4GqbiaiY5w==
-  dependencies:
-    "@babel/runtime" "^7.18.3"
-    react-is "^18.2.0"
-
 react-cookie@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/react-cookie/-/react-cookie-8.0.1.tgz#0d7f5112c9003b61c70d3d53f1f0a5b741e9f2e9"
@@ -6259,11 +6119,6 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
-resize-observer-polyfill@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
-  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
-
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -6367,11 +6222,6 @@ safe-regex-test@^1.0.3, safe-regex-test@^1.1.0:
     es-errors "^1.3.0"
     is-regex "^1.2.1"
 
-safe-stable-stringify@^2.4.3:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz#4ca2f8e385f2831c432a719b108a3bf7af42a1dd"
-  integrity sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==
-
 "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -6894,14 +6744,6 @@ swap-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-swr@^2.0.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/swr/-/swr-2.4.1.tgz#c9e48abff6bf4b04846342e2f1f6be108a078cf6"
-  integrity sha512-2CC6CiKQtEwaEeNiqWTAw9PGykW8SR5zZX8MZk6TeAvEAnVS7Visz8WzphqgtQ8v2xz/4Q5K+j+SeMaKXeeQIA==
-  dependencies:
-    dequal "^2.0.3"
-    use-sync-external-store "^1.6.0"
-
 sync-fetch@0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/sync-fetch/-/sync-fetch-0.6.0.tgz#5759e775f3d5202e1b3d14821bc152fec32aa180"
@@ -7200,11 +7042,6 @@ urlpattern-polyfill@^10.0.0:
   resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-10.1.0.tgz#1b2517e614136c73ba32948d5e7a3a063cba8e74"
   integrity sha512-IGjKp/o0NL3Bso1PymYURCJxMPNAf/ILOpendP9f5B6e1rTJgdgiOvgfoT8VxCAdY+Wisb9uhGaJJf3yZ2V9nw==
 
-use-sync-external-store@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz#b174bfa65cb2b526732d9f2ac0a408027876f32d"
-  integrity sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==
-
 util-extend@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
@@ -7239,13 +7076,6 @@ walker@^1.0.8:
   dependencies:
     makeerror "1.0.12"
 
-warning@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
-  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
-  dependencies:
-    loose-envify "^1.0.0"
-
 web-streams-polyfill@^3.0.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz#2073b91a2fdb1fbfbd401e7de0ac9f8214cecb4b"

From dab96d94429dda2904bce884f6ee4d942d7fe0b4 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sat, 28 Mar 2026 11:44:42 +0100
Subject: [PATCH 002/145] Ask for confirmation before deleting entities

---
 frontend/components/ContactInformation.tsx    |  2 +-
 frontend/components/SafeDeleteButton.tsx      | 60 ++++++++++++++++++
 frontend/components/components/Component.tsx  | 15 ++---
 .../components/components/ComponentTable.tsx  |  9 +--
 .../components/RemoveComponentAssembly.tsx    | 11 ++--
 .../RemoveComponentGeneralization.tsx         | 11 ++--
 .../RemoveComponentManufacturer.tsx           | 11 ++--
 .../components/RemoveComponentVariant.tsx     | 11 ++--
 .../components/dataFormats/DataFormat.tsx     | 22 +++----
 frontend/components/databases/Database.tsx    | 34 ++++-------
 .../components/databases/DatabaseTable.tsx    |  8 +--
 .../institutions/DeleteInstitution.tsx        | 13 ++--
 .../components/institutions/Institution.tsx   |  2 +-
 .../RemoveInstitutionRepresentative.tsx       | 25 ++------
 frontend/components/methods/Method.tsx        | 17 +++---
 frontend/components/methods/MethodTable.tsx   | 12 +---
 .../RemoveInstitutionMethodDeveloper.tsx      | 11 ++--
 .../methods/RemoveUserMethodDeveloper.tsx     | 11 ++--
 .../DeleteOpenIdConnectApplication.tsx        | 11 ++--
 .../applications/OpenIdConnectApplication.tsx | 61 ++++++++-----------
 ...etOpenIdConnectApplicationClientSecret.tsx | 17 ++++--
 .../DeleteOpenIdConnectAuthorization.tsx      | 11 ++--
 frontend/components/users/DeleteUser.tsx      | 13 ++--
 frontend/components/users/User.tsx            | 42 +++----------
 frontend/components/users/UserRoleTag.tsx     | 14 +++--
 frontend/queries/users.graphql                |  1 +
 26 files changed, 243 insertions(+), 212 deletions(-)
 create mode 100644 frontend/components/SafeDeleteButton.tsx

diff --git a/frontend/components/ContactInformation.tsx b/frontend/components/ContactInformation.tsx
index cb6d0fd32..a4b3d34a1 100644
--- a/frontend/components/ContactInformation.tsx
+++ b/frontend/components/ContactInformation.tsx
@@ -7,7 +7,7 @@ import {
 } from "@ant-design/icons";
 import { ContactInformationPartialFragment } from "../queries/institutions.generated";
 
-export default function ContactCard({
+export default function ContactInformation({
   contact,
 }: {
   contact: ContactInformationPartialFragment | null;
diff --git a/frontend/components/SafeDeleteButton.tsx b/frontend/components/SafeDeleteButton.tsx
new file mode 100644
index 000000000..64b9fe345
--- /dev/null
+++ b/frontend/components/SafeDeleteButton.tsx
@@ -0,0 +1,60 @@
+import { Button, Popconfirm, Tooltip } from "antd";
+import { DeleteOutlined, SyncOutlined } from "@ant-design/icons";
+
+const capitalize = <T extends string>(s: T) =>
+  (s[0].toUpperCase() + s.slice(1)) as Capitalize<T>;
+
+export default function SafeDeleteButton({
+  kind,
+  type = "text",
+  deleting,
+  onConfirm,
+}: {
+  kind: "delete" | "remove";
+  type: "icon" | "text";
+  deleting: boolean;
+  onConfirm: (e?: React.MouseEvent<HTMLElement>) => void;
+}) {
+  const title = capitalize(kind);
+
+  const button = (() => {
+    switch (type) {
+      case "icon":
+        return (
+          <Tooltip title={title}>
+            <Button
+              danger
+              type="text"
+              icon={deleting ? <SyncOutlined spin /> : <DeleteOutlined />}
+              loading={deleting}
+              shape="circle"
+            />
+          </Tooltip>
+        );
+      case "text":
+        return (
+          <Button
+            danger
+            type="primary"
+            icon={<DeleteOutlined />}
+            loading={deleting}
+          >
+            {title}
+          </Button>
+        );
+    }
+  })();
+
+  return (
+    <Popconfirm
+      title={title}
+      description="Are you sure?"
+      okText="Yes"
+      cancelText="No"
+      okButtonProps={{ danger: true }}
+      onConfirm={onConfirm}
+    >
+      {button}
+    </Popconfirm>
+  );
+}
diff --git a/frontend/components/components/Component.tsx b/frontend/components/components/Component.tsx
index a4c481125..90d44037e 100644
--- a/frontend/components/components/Component.tsx
+++ b/frontend/components/components/Component.tsx
@@ -1,5 +1,6 @@
 import { useQuery } from "@apollo/client/react";
 import { Scalars } from "../../__generated__/graphql";
+import PageHeader from "../PageHeader";
 import { ComponentDocument } from "../../queries/components.generated";
 import {
   Skeleton,
@@ -11,7 +12,6 @@ import {
   Col,
   Space,
 } from "antd";
-import { PageHeader } from "@ant-design/pro-layout";
 import { ReactNode } from "react";
 import paths from "../../paths";
 import Link from "next/link";
@@ -30,6 +30,7 @@ import { RemoveComponentGeneralization } from "./RemoveComponentGeneralization";
 import { RemoveComponentVariant } from "./RemoveComponentVariant";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import JsonViewer from "../JsonViewer";
+import { isTruthy } from "../../lib/array";
 
 interface ComponentProps {
   componentId: Scalars["Uuid"]["input"];
@@ -61,6 +62,7 @@ export default function Component({ componentId }: ComponentProps) {
   return (
     <>
       <PageHeader
+        id={component.uuid}
         title={[
           component.name,
           component.abbreviation == null ? null : `(${component.abbreviation})`,
@@ -73,12 +75,11 @@ export default function Component({ componentId }: ComponentProps) {
             {x}
           </Tag>
         ))}
-        extra={
-          component.isAuthorizedToUpdateNode
-            ? [<UpdateComponent key="UpdateComponent" component={component} />]
-            : []
-        }
-        backIcon={false}
+        extra={[
+          component.isAuthorizedToUpdateNode && (
+            <UpdateComponent key="UpdateComponent" component={component} />
+          ),
+        ].filter(isTruthy)}
       >
         <Descriptions size="small" column={1}>
           <Descriptions.Item label="UUID">{component.uuid}</Descriptions.Item>
diff --git a/frontend/components/components/ComponentTable.tsx b/frontend/components/components/ComponentTable.tsx
index dae86d29a..6e89d01b7 100644
--- a/frontend/components/components/ComponentTable.tsx
+++ b/frontend/components/components/ComponentTable.tsx
@@ -1,4 +1,3 @@
-import { Component } from "../../__generated__/graphql";
 import { Table } from "antd";
 import { useState } from "react";
 import { setMapValue } from "../../lib/freeTextFilter";
@@ -11,14 +10,12 @@ import {
   getNameColumnProps,
   getUuidColumnProps,
 } from "../../lib/table";
+import { ComponentsPartialFragment } from "../../queries/components.generated";
 
 interface ComponentTableProps {
   loading: boolean;
-  components: Pick<
-    Component,
-    "uuid" | "name" | "abbreviation" | "description" | "categories"
-  >[];
-};
+  components: ComponentsPartialFragment[];
+}
 
 export function ComponentTable({ loading, components }: ComponentTableProps) {
   const [filterText, setFilterText] = useState(() => new Map<string, string>());
diff --git a/frontend/components/components/RemoveComponentAssembly.tsx b/frontend/components/components/RemoveComponentAssembly.tsx
index 3f2b30d0d..afa3ea28d 100644
--- a/frontend/components/components/RemoveComponentAssembly.tsx
+++ b/frontend/components/components/RemoveComponentAssembly.tsx
@@ -9,7 +9,7 @@ import {
   ComponentsDocument,
 } from "../../queries/components.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
-import { Button } from "antd";
+import SafeDeleteButton from "../SafeDeleteButton";
 
 interface Props {
   assembledComponentId: Scalars["Uuid"]["input"];
@@ -65,8 +65,11 @@ export function RemoveComponentAssembly({
     );
 
   return (
-    <Button danger onClick={remove} loading={mutating}>
-      Remove
-    </Button>
+    <SafeDeleteButton
+      type="text"
+      kind="remove"
+      onConfirm={remove}
+      deleting={mutating}
+    />
   );
 }
diff --git a/frontend/components/components/RemoveComponentGeneralization.tsx b/frontend/components/components/RemoveComponentGeneralization.tsx
index f118e11df..5e503756c 100644
--- a/frontend/components/components/RemoveComponentGeneralization.tsx
+++ b/frontend/components/components/RemoveComponentGeneralization.tsx
@@ -9,7 +9,7 @@ import {
   ComponentsDocument,
 } from "../../queries/components.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
-import { Button } from "antd";
+import SafeDeleteButton from "../SafeDeleteButton";
 
 interface Props {
   generalComponentId: Scalars["Uuid"]["input"];
@@ -65,8 +65,11 @@ export function RemoveComponentGeneralization({
     );
 
   return (
-    <Button danger onClick={remove} loading={mutating}>
-      Remove
-    </Button>
+    <SafeDeleteButton
+      type="text"
+      kind="remove"
+      onConfirm={remove}
+      deleting={mutating}
+    />
   );
 }
diff --git a/frontend/components/components/RemoveComponentManufacturer.tsx b/frontend/components/components/RemoveComponentManufacturer.tsx
index 8f9de84e2..af3a5bd6a 100644
--- a/frontend/components/components/RemoveComponentManufacturer.tsx
+++ b/frontend/components/components/RemoveComponentManufacturer.tsx
@@ -10,7 +10,7 @@ import {
 } from "../../queries/components.generated";
 import { InstitutionDocument } from "../../queries/institutions.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
-import { Button } from "antd";
+import SafeDeleteButton from "../SafeDeleteButton";
 
 interface Props {
   componentId: Scalars["Uuid"]["input"];
@@ -66,8 +66,11 @@ export function RemoveComponentManufacturer({
     );
 
   return (
-    <Button danger onClick={remove} loading={mutating}>
-      Remove
-    </Button>
+    <SafeDeleteButton
+      type="text"
+      kind="remove"
+      onConfirm={remove}
+      deleting={mutating}
+    />
   );
 }
diff --git a/frontend/components/components/RemoveComponentVariant.tsx b/frontend/components/components/RemoveComponentVariant.tsx
index b61ffb334..1b776b917 100644
--- a/frontend/components/components/RemoveComponentVariant.tsx
+++ b/frontend/components/components/RemoveComponentVariant.tsx
@@ -9,7 +9,7 @@ import {
   ComponentsDocument,
 } from "../../queries/components.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
-import { Button } from "antd";
+import SafeDeleteButton from "../SafeDeleteButton";
 
 interface Props {
   oneComponentId: Scalars["Uuid"]["input"];
@@ -65,8 +65,11 @@ export function RemoveComponentVariant({
     );
 
   return (
-    <Button danger onClick={remove} loading={mutating}>
-      Remove
-    </Button>
+    <SafeDeleteButton
+      type="text"
+      kind="remove"
+      onConfirm={remove}
+      deleting={mutating}
+    />
   );
 }
diff --git a/frontend/components/dataFormats/DataFormat.tsx b/frontend/components/dataFormats/DataFormat.tsx
index af3b9ea7c..f12dd2e1a 100644
--- a/frontend/components/dataFormats/DataFormat.tsx
+++ b/frontend/components/dataFormats/DataFormat.tsx
@@ -1,16 +1,17 @@
 import { Scalars } from "../../__generated__/graphql";
 import { DataFormatDocument } from "../../queries/dataFormats.generated";
 import { Skeleton, Result, Descriptions, Typography } from "antd";
-import { PageHeader } from "@ant-design/pro-layout";
 import paths from "../../paths";
+import PageHeader from "../PageHeader";
 import { Reference } from "../Reference";
 import UpdateDataFormat from "./UpdateDataFormat";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
+import { isTruthy } from "../../lib/array";
 
 interface DataFormatProps {
   dataFormatId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function DataFormat({ dataFormatId }: DataFormatProps) {
   const { loading, error, data } = useQuery(DataFormatDocument, {
@@ -38,19 +39,14 @@ export default function DataFormat({ dataFormatId }: DataFormatProps) {
   return (
     <>
       <PageHeader
+        id={dataFormat.uuid}
         title={dataFormat.name}
         subTitle={dataFormat.description}
-        extra={
-          dataFormat.isAuthorizedToUpdateNode
-            ? [
-                <UpdateDataFormat
-                  key="updateDataFormat"
-                  dataFormat={dataFormat}
-                />,
-              ]
-            : []
-        }
-        backIcon={false}
+        extra={[
+          dataFormat.isAuthorizedToUpdateNode && (
+            <UpdateDataFormat key="updateDataFormat" dataFormat={dataFormat} />
+          ),
+        ].filter(isTruthy)}
       >
         <Descriptions size="small" column={1}>
           <Descriptions.Item label="UUID">{dataFormat.uuid}</Descriptions.Item>
diff --git a/frontend/components/databases/Database.tsx b/frontend/components/databases/Database.tsx
index 6b2a0b6cb..791a4f57f 100644
--- a/frontend/components/databases/Database.tsx
+++ b/frontend/components/databases/Database.tsx
@@ -4,18 +4,18 @@ import {
 } from "../../__generated__/graphql";
 import { DatabaseDocument } from "../../queries/databases.generated";
 import { Skeleton, Result, Descriptions, Typography, Tag } from "antd";
-import { PageHeader } from "@ant-design/pro-layout";
-import { ReactNode } from "react";
+import PageHeader from "../PageHeader";
 import Link from "next/link";
 import paths from "../../paths";
 import UpdateDatabase from "./UpdateDatabase";
 import VerifyDatabase from "./VerifyDatabase";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
+import { isTruthy } from "../../lib/array";
 
 interface DatabaseProps {
   databaseId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function Database({ databaseId }: DatabaseProps) {
   const { loading, error, data } = useQuery(DatabaseDocument, {
@@ -43,31 +43,23 @@ export default function Database({ databaseId }: DatabaseProps) {
   return (
     <>
       <PageHeader
+        id={database.uuid}
         title={database.name}
         subTitle={database.description}
-        extra={([] as ReactNode[])
-          .concat(
-            database.isAuthorizedToUpdateNode
-              ? [<UpdateDatabase key="updateDatabase" database={database} />]
-              : [],
-          )
-          .concat(
-            database.isAuthorizedToVerifyNode &&
-              database.verificationState == DatabaseVerificationState.Pending
-              ? [
-                  <VerifyDatabase
-                    key="verifyDatabase"
-                    databaseId={database.uuid}
-                  />,
-                ]
-              : [],
-          )}
+        extra={[
+          database.isAuthorizedToUpdateNode && (
+            <UpdateDatabase key="updateDatabase" database={database} />
+          ),
+          database.isAuthorizedToVerifyNode &&
+            database.verificationState == DatabaseVerificationState.Pending && (
+              <VerifyDatabase key="verifyDatabase" databaseId={database.uuid} />
+            ),
+        ].filter(isTruthy)}
         tags={[
           <Tag key="verificationState" color="magenta">
             {database.verificationState}
           </Tag>,
         ]}
-        backIcon={false}
       >
         <Descriptions size="small" column={1}>
           <Descriptions.Item label="UUID">{database.uuid}</Descriptions.Item>
diff --git a/frontend/components/databases/DatabaseTable.tsx b/frontend/components/databases/DatabaseTable.tsx
index 122abbae7..1da2c4c8a 100644
--- a/frontend/components/databases/DatabaseTable.tsx
+++ b/frontend/components/databases/DatabaseTable.tsx
@@ -9,15 +9,13 @@ import {
   getInternallyLinkedFilterableStringColumnProps,
   getUuidColumnProps,
 } from "../../lib/table";
-import { Database, Institution } from "../../__generated__/graphql";
+import { DatabasesPartialFragment } from "../../queries/databases.generated";
 
 // TODO Pagination. See https://www.apollographql.com/docs/react/pagination/core-api/
 interface DatabaseTableProps {
   loading: boolean;
-  databases: (Pick<Database, "uuid" | "name" | "description" | "locator"> & {
-    operator: { node: Pick<Institution, "uuid" | "name"> };
-  })[];
-};
+  databases: DatabasesPartialFragment[];
+}
 
 export function DatabaseTable({ loading, databases }: DatabaseTableProps) {
   const [filterText, setFilterText] = useState(() => new Map<string, string>());
diff --git a/frontend/components/institutions/DeleteInstitution.tsx b/frontend/components/institutions/DeleteInstitution.tsx
index c4dfe6cd2..55fe0db25 100644
--- a/frontend/components/institutions/DeleteInstitution.tsx
+++ b/frontend/components/institutions/DeleteInstitution.tsx
@@ -1,5 +1,4 @@
 import { useMutation } from "@apollo/client/react";
-import { Button } from "antd";
 import { useRouter } from "next/router";
 import paths from "../../paths";
 import {
@@ -9,10 +8,11 @@ import {
 } from "../../queries/institutions.generated";
 import { Scalars } from "../../__generated__/graphql";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import SafeDeleteButton from "../SafeDeleteButton";
 
 interface DeleteInstitutionProps {
   institutionId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function DeleteInstitution({
   institutionId,
@@ -50,8 +50,11 @@ export default function DeleteInstitution({
   };
 
   return (
-    <Button danger type="primary" onClick={mutate} loading={mutating}>
-      Delete
-    </Button>
+    <SafeDeleteButton
+      type="text"
+      kind="delete"
+      onConfirm={mutate}
+      deleting={mutating}
+    />
   );
 }
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index 9d351299f..b859b426d 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -351,7 +351,7 @@ export default function Institution({ institutionId }: Props) {
           institution.isAuthorizedToDeleteNode && (
             <DeleteInstitution institutionId={institution.uuid} />
           ),
-        ].filter(Boolean)}
+        ].filter(isTruthy)}
       >
         <Space orientation="vertical">
           {institution.extras != null && (
diff --git a/frontend/components/institutions/RemoveInstitutionRepresentative.tsx b/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
index 0cd345f56..696e0dfcd 100644
--- a/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
+++ b/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
@@ -1,5 +1,4 @@
 import { useMutation } from "@apollo/client/react";
-import { Button, Popconfirm, Tooltip } from "antd";
 import { InstitutionDocument } from "../../queries/institutions.generated";
 import { Scalars } from "../../__generated__/graphql";
 import { UserDocument } from "../../queries/users.generated";
@@ -8,7 +7,7 @@ import {
   RemoveInstitutionRepresentativeMutation,
 } from "../../queries/institutionRepresentatives.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
-import { DeleteOutlined } from "@ant-design/icons";
+import SafeDeleteButton from "../SafeDeleteButton";
 
 interface Props {
   institutionId: Scalars["Uuid"]["input"];
@@ -64,23 +63,11 @@ export default function RemoveInstitutionRepresentative({
   };
 
   return (
-    <Popconfirm
-      title="Remove Representative"
-      description="Are you sure?"
-      okText="Yes"
-      cancelText="No"
-      okButtonProps={{ danger: true }}
+    <SafeDeleteButton
+      kind="remove"
+      type="icon"
+      deleting={mutating}
       onConfirm={remove}
-    >
-      <Tooltip title="Delete">
-        <Button
-          type="text"
-          danger
-          shape="circle"
-          icon={<DeleteOutlined />}
-          loading={mutating}
-        />
-      </Tooltip>
-    </Popconfirm>
+    />
   );
 }
diff --git a/frontend/components/methods/Method.tsx b/frontend/components/methods/Method.tsx
index ec6b81f3c..cb4039e4d 100644
--- a/frontend/components/methods/Method.tsx
+++ b/frontend/components/methods/Method.tsx
@@ -11,8 +11,8 @@ import {
   Row,
   Col,
 } from "antd";
-import { PageHeader } from "@ant-design/pro-layout";
 import Link from "next/link";
+import PageHeader from "../PageHeader";
 import paths from "../../paths";
 import { Reference } from "../Reference";
 import OpenEndedDateTimeRangeX from "../OpenEndedDateTimeRangeX";
@@ -22,10 +22,11 @@ import AddUserMethodDeveloper from "./AddUserMethodDeveloper";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import RemoveInstitutionMethodDeveloper from "./RemoveInstitutionMethodDeveloper";
 import RemoveUserMethodDeveloper from "./RemoveUserMethodDeveloper";
+import { isTruthy } from "../../lib/array";
 
 interface MethodProps {
   methodId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function Method({ methodId }: MethodProps) {
   const { loading, error, data } = useQuery(MethodDocument, {
@@ -53,6 +54,7 @@ export default function Method({ methodId }: MethodProps) {
   return (
     <>
       <PageHeader
+        id={method.uuid}
         title={method.name}
         subTitle={method.description}
         tags={method.categories.map((x) => (
@@ -60,12 +62,11 @@ export default function Method({ methodId }: MethodProps) {
             {x}
           </Tag>
         ))}
-        extra={
-          method.isAuthorizedToUpdateNode
-            ? [<UpdateMethod key="updateMethod" method={method} />]
-            : []
-        }
-        backIcon={false}
+        extra={[
+          method.isAuthorizedToUpdateNode && (
+            <UpdateMethod key="updateMethod" method={method} />
+          ),
+        ].filter(isTruthy)}
       >
         <Descriptions size="small" column={1}>
           <Descriptions.Item label="UUID">{method.uuid}</Descriptions.Item>
diff --git a/frontend/components/methods/MethodTable.tsx b/frontend/components/methods/MethodTable.tsx
index 74d525d04..55cfe7a9b 100644
--- a/frontend/components/methods/MethodTable.tsx
+++ b/frontend/components/methods/MethodTable.tsx
@@ -13,19 +13,9 @@ import {
 import { MethodCategory } from "../../__generated__/graphql";
 import { MethodsPartialFragment } from "../../queries/methods.generated";
 
-// TODO Pagination. See https://www.apollographql.com/docs/react/pagination/core-api/
-
 interface MethodTableProps {
   loading: boolean;
-  methods: Pick<
-    MethodsPartialFragment,
-    | "uuid"
-    | "name"
-    | "description"
-    | "categories"
-    | "calculationLocator"
-    | "reference"
-  >[];
+  methods: MethodsPartialFragment[];
 }
 
 export function MethodTable({ loading, methods }: MethodTableProps) {
diff --git a/frontend/components/methods/RemoveInstitutionMethodDeveloper.tsx b/frontend/components/methods/RemoveInstitutionMethodDeveloper.tsx
index 726d64698..4f20d6a1b 100644
--- a/frontend/components/methods/RemoveInstitutionMethodDeveloper.tsx
+++ b/frontend/components/methods/RemoveInstitutionMethodDeveloper.tsx
@@ -1,5 +1,4 @@
 import { useMutation } from "@apollo/client/react";
-import { Button } from "antd";
 import {
   MethodDocument,
   MethodsDocument,
@@ -11,6 +10,7 @@ import {
   RemoveInstitutionMethodDeveloperMutation,
 } from "../../queries/institutionMethodDevelopers.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import SafeDeleteButton from "../SafeDeleteButton";
 
 interface Props {
   methodId: Scalars["Uuid"]["input"];
@@ -67,8 +67,11 @@ export default function RemoveInstitutionMethodDeveloper({
   };
 
   return (
-    <Button danger type="primary" onClick={mutate} loading={mutating}>
-      Remove
-    </Button>
+    <SafeDeleteButton
+      type="text"
+      kind="remove"
+      onConfirm={mutate}
+      deleting={mutating}
+    />
   );
 }
diff --git a/frontend/components/methods/RemoveUserMethodDeveloper.tsx b/frontend/components/methods/RemoveUserMethodDeveloper.tsx
index 7ac8c7fce..4096b9fb8 100644
--- a/frontend/components/methods/RemoveUserMethodDeveloper.tsx
+++ b/frontend/components/methods/RemoveUserMethodDeveloper.tsx
@@ -1,5 +1,4 @@
 import { useMutation } from "@apollo/client/react";
-import { Button } from "antd";
 import {
   MethodDocument,
   MethodsDocument,
@@ -11,6 +10,7 @@ import {
   RemoveUserMethodDeveloperMutation,
 } from "../../queries/userMethodDevelopers.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import SafeDeleteButton from "../SafeDeleteButton";
 
 interface Props {
   methodId: Scalars["Uuid"]["input"];
@@ -64,8 +64,11 @@ export default function RemoveUserMethodDeveloper({ methodId, userId }: Props) {
   };
 
   return (
-    <Button danger type="primary" onClick={mutate} loading={mutating}>
-      Remove
-    </Button>
+    <SafeDeleteButton
+      type="text"
+      kind="remove"
+      onConfirm={mutate}
+      deleting={mutating}
+    />
   );
 }
diff --git a/frontend/components/openIdConnect/applications/DeleteOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/DeleteOpenIdConnectApplication.tsx
index 1ed628e6b..a50b82205 100644
--- a/frontend/components/openIdConnect/applications/DeleteOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/DeleteOpenIdConnectApplication.tsx
@@ -1,5 +1,4 @@
 import { useMutation } from "@apollo/client/react";
-import { Button } from "antd";
 import {
   ApplicationDocument,
   ApplicationsDocument,
@@ -10,6 +9,7 @@ import { Scalars } from "../../../__generated__/graphql";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
 import { useRouter } from "next/router";
 import { Route } from "next";
+import SafeDeleteButton from "../../SafeDeleteButton";
 
 interface DeleteApplicationProps {
   applicationId: Scalars["Uuid"]["input"];
@@ -61,8 +61,11 @@ export default function DeleteOpenIdConnectApplication({
   };
 
   return (
-    <Button danger type="primary" onClick={mutate} loading={mutating}>
-      Delete
-    </Button>
+    <SafeDeleteButton
+      type="text"
+      kind="delete"
+      onConfirm={mutate}
+      deleting={mutating}
+    />
   );
 }
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
index 3653680b9..5b50c61f8 100644
--- a/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
@@ -1,16 +1,16 @@
-import { ReactNode } from "react";
 import { Scalars } from "../../../__generated__/graphql";
 import { Descriptions, Divider, Result, Skeleton, Typography } from "antd";
 import UpdateOpenIdConnectApplication from "./UpdateOpenIdConnectApplication";
 import OpenIdConnectAutorizationTable from "../authorizations/OpenIdConnectAuthorizationTable";
 import OpenIdConnectTokenTable from "../tokens/OpenIdConnectTokenTable";
-import { PageHeader } from "@ant-design/pro-layout";
 import DeleteOpenIdConnectApplication from "./DeleteOpenIdConnectApplication";
+import PageHeader from "../../PageHeader";
 import { ApplicationDocument } from "../../../queries/openIdConnect.generated";
 import ResetOpenIdConnectApplicationClientSecret from "./ResetOpenIdConnectApplicationClientSecret";
 import { useQuery } from "@apollo/client/react";
 import paths from "../../../paths";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
+import { isTruthy } from "../../../lib/array";
 
 interface Props {
   applicationId: Scalars["Uuid"]["input"];
@@ -42,41 +42,30 @@ export default function OpenIdConnectApplication({ applicationId }: Props) {
   return (
     <>
       <PageHeader
-        title={application.displayName}
+        id={application.uuid}
+        title={application.displayName ?? application.clientId}
         tags={[]}
-        extra={([] as ReactNode[])
-          .concat(
-            application.isAuthorizedToManageNode
-              ? [
-                  <UpdateOpenIdConnectApplication
-                    key="updateApplication"
-                    application={application}
-                  />,
-                ]
-              : [],
-          )
-          .concat(
-            application.isAuthorizedToManageNode
-              ? [
-                  <ResetOpenIdConnectApplicationClientSecret
-                    key="resetApplicationClientSecret"
-                    applicationId={application.uuid}
-                  />,
-                ]
-              : [],
-          )
-          .concat(
-            application.isAuthorizedToManageNode
-              ? [
-                  <DeleteOpenIdConnectApplication
-                    key="deleteApplication"
-                    applicationId={application.uuid}
-                    redirectTo={paths.institution(application.owner.node.uuid)}
-                  />,
-                ]
-              : [],
-          )}
-        backIcon={false}
+        extra={[
+          application.isAuthorizedToManageNode && (
+            <UpdateOpenIdConnectApplication
+              key="updateApplication"
+              application={application}
+            />
+          ),
+          application.isAuthorizedToManageNode && (
+            <ResetOpenIdConnectApplicationClientSecret
+              key="resetApplicationClientSecret"
+              applicationId={application.uuid}
+            />
+          ),
+          application.isAuthorizedToManageNode && (
+            <DeleteOpenIdConnectApplication
+              key="deleteApplication"
+              applicationId={application.uuid}
+              redirectTo={paths.institution(application.owner.node.uuid)}
+            />
+          ),
+        ].filter(isTruthy)}
       >
         <Descriptions size="small" column={1}>
           <Descriptions.Item label="UUID">{application.uuid}</Descriptions.Item>
diff --git a/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx b/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
index 7dc528a44..571b5b427 100644
--- a/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
+++ b/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Button, App, Typography } from "antd";
+import { Button, App, Typography, Popconfirm } from "antd";
 import {
   ResetApplicationClientSecretDocument,
   ResetApplicationClientSecretMutation,
@@ -71,8 +71,17 @@ export default function ResetOpenIdConnectApplicationClientSecret({
   };
 
   return (
-    <Button danger type="default" onClick={mutate} loading={mutating}>
-      Reset Client Secret
-    </Button>
+    <Popconfirm
+      title="Reset Client Secret"
+      description="Are you sure?"
+      okText="Yes"
+      cancelText="No"
+      okButtonProps={{ danger: true }}
+      onConfirm={mutate}
+    >
+      <Button danger type="default" loading={mutating}>
+        Reset Client Secret
+      </Button>
+    </Popconfirm>
   );
 }
diff --git a/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx b/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx
index 990a3addd..547e3fdfc 100644
--- a/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx
+++ b/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx
@@ -1,5 +1,4 @@
 import { useMutation } from "@apollo/client/react";
-import { Button } from "antd";
 import {
   DeleteAuthorizationDocument,
   DeleteAuthorizationMutation,
@@ -7,6 +6,7 @@ import {
 import { Scalars } from "../../../__generated__/graphql";
 import { DocumentNode } from "graphql";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
+import SafeDeleteButton from "../../SafeDeleteButton";
 
 interface DeleteAuthorizationProps {
   authorizationId: Scalars["Uuid"]["input"];
@@ -48,8 +48,11 @@ export default function DeleteOpenIdConnectAuthorization({
   };
 
   return (
-    <Button danger type="primary" onClick={mutate} loading={mutating}>
-      Delete
-    </Button>
+    <SafeDeleteButton
+      type="text"
+      kind="delete"
+      onConfirm={mutate}
+      deleting={mutating}
+    />
   );
 }
diff --git a/frontend/components/users/DeleteUser.tsx b/frontend/components/users/DeleteUser.tsx
index e32f4491b..118ef8ae1 100644
--- a/frontend/components/users/DeleteUser.tsx
+++ b/frontend/components/users/DeleteUser.tsx
@@ -1,5 +1,4 @@
 import { useMutation } from "@apollo/client/react";
-import { Button } from "antd";
 import { useRouter } from "next/router";
 import paths from "../../paths";
 import {
@@ -9,10 +8,11 @@ import {
 } from "../../queries/users.generated";
 import { Scalars } from "../../__generated__/graphql";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import SafeDeleteButton from "../SafeDeleteButton";
 
 interface DeleteUserProps {
   userId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function DeleteUser({ userId }: DeleteUserProps) {
   const router = useRouter();
@@ -48,8 +48,11 @@ export default function DeleteUser({ userId }: DeleteUserProps) {
   };
 
   return (
-    <Button danger type="primary" onClick={mutate} loading={mutating}>
-      Delete
-    </Button>
+    <SafeDeleteButton
+      type="text"
+      kind="delete"
+      onConfirm={mutate}
+      deleting={mutating}
+    />
   );
 }
diff --git a/frontend/components/users/User.tsx b/frontend/components/users/User.tsx
index c3747da94..d1abfd6d1 100644
--- a/frontend/components/users/User.tsx
+++ b/frontend/components/users/User.tsx
@@ -1,14 +1,7 @@
 import { useQuery } from "@apollo/client/react";
-import {
-  Divider,
-  Typography,
-  Skeleton,
-  Descriptions,
-  List,
-  Result,
-} from "antd";
-import { PageHeader } from "@ant-design/pro-layout";
+import { Divider, Typography, Skeleton, List, Result } from "antd";
 import { UserDocument } from "../../queries/users.generated";
+import PageHeader from "../PageHeader";
 import { Scalars } from "../../__generated__/graphql";
 import paths from "../../paths";
 import Link from "next/link";
@@ -18,10 +11,12 @@ import { UserRoleTag } from "./UserRoleTag";
 import ConfirmUserMethodDeveloper from "../methods/ConfirmUserMethodDeveloper";
 import ConfirmInstitutionRepresentative from "../institutions/ConfirmInstitutionRepresentative";
 import DeleteUser from "./DeleteUser";
+import { isTruthy } from "../../lib/array";
+import ContactInformation from "../ContactInformation";
 
 interface UserProps {
   userId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function User({ userId }: UserProps) {
   const { loading, error, data } = useQuery(UserDocument, {
@@ -51,6 +46,7 @@ export default function User({ userId }: UserProps) {
   return (
     <>
       <PageHeader
+        id={user.uuid}
         title={user.name}
         tags={user.roles?.map((role) => (
           <UserRoleTag
@@ -62,31 +58,9 @@ export default function User({ userId }: UserProps) {
         ))}
         extra={[
           user.isAuthorizedToDeleteUser && <DeleteUser userId={user.uuid} />,
-        ].filter((x) => x != null)}
-        backIcon={false}
+        ].filter(isTruthy)}
       >
-        <Descriptions column={1}>
-          <Descriptions.Item label="UUID">{user.uuid}</Descriptions.Item>
-          {user.contact.emailAddress && (
-            <Descriptions.Item label="Email Address">
-              <Typography.Link href={`mailto:${user.contact.emailAddress}`}>
-                {user.contact.emailAddress}
-              </Typography.Link>
-            </Descriptions.Item>
-          )}
-          {user.contact.phoneNumber && (
-            <Descriptions.Item label="Phone Number">
-              {user.contact.phoneNumber}
-            </Descriptions.Item>
-          )}
-          {user.contact.websiteLocator && (
-            <Descriptions.Item label="Website">
-              <Typography.Link href={user.contact.websiteLocator}>
-                {user.contact.websiteLocator}
-              </Typography.Link>
-            </Descriptions.Item>
-          )}
-        </Descriptions>
+        <ContactInformation contact={user.contact} />
         {rolesCurrentUserCanAndMayWantToAdd &&
           rolesCurrentUserCanAndMayWantToAdd.length >= 1 && (
             <AddUserRole
diff --git a/frontend/components/users/UserRoleTag.tsx b/frontend/components/users/UserRoleTag.tsx
index 2ebf57616..f03f9224e 100644
--- a/frontend/components/users/UserRoleTag.tsx
+++ b/frontend/components/users/UserRoleTag.tsx
@@ -8,7 +8,7 @@ import {
 } from "../../queries/users.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import { Tag } from "antd";
-import { SyncOutlined } from "@ant-design/icons";
+import SafeDeleteButton from "../SafeDeleteButton";
 
 interface Props {
   userId: Scalars["Uuid"]["input"];
@@ -54,9 +54,15 @@ export function UserRoleTag({ userId, role, canRemove }: Props) {
 
   return (
     <Tag
-      icon={mutating && <SyncOutlined spin />}
-      closable={(!mutating && canRemove) || false}
-      onClose={() => remove()}
+      closable={canRemove}
+      closeIcon={
+        <SafeDeleteButton
+          type="icon"
+          kind="remove"
+          onConfirm={remove}
+          deleting={mutating}
+        />
+      }
       color="magenta"
     >
       {role}
diff --git a/frontend/queries/users.graphql b/frontend/queries/users.graphql
index e813d72b2..5fea1b5c7 100644
--- a/frontend/queries/users.graphql
+++ b/frontend/queries/users.graphql
@@ -18,6 +18,7 @@ fragment UserPartial on User {
     phoneNumber
     isPhoneNumberConfirmed
     websiteLocator
+    postalAddress
   }
   roles
   rolesCurrentUserCanAdd

From 3ce35bfb3b27eeb6674170aee8ff7524adfcbbb6 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sat, 28 Mar 2026 11:53:56 +0100
Subject: [PATCH 003/145] Tell what to do when migrations are pending or
 missing

---
 backend/src/Program.cs                     | 2 +-
 backend/test/Integration/MigrationTests.cs | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/Program.cs b/backend/src/Program.cs
index 87aafa794..c569a0428 100644
--- a/backend/src/Program.cs
+++ b/backend/src/Program.cs
@@ -164,7 +164,7 @@ IServiceProvider services
         var pendingMigrations = dbContext.Database.GetPendingMigrations();
         if (pendingMigrations.Any())
         {
-            throw new InvalidOperationException($"The database is not up to date. The pending migrations are: {string.Join(", ", pendingMigrations)}");
+            throw new InvalidOperationException($"The database is not up to date. The pending migrations are: {string.Join(", ", pendingMigrations)}. Apply them by running `./database.mk migrate`.");
         }
     }
 
diff --git a/backend/test/Integration/MigrationTests.cs b/backend/test/Integration/MigrationTests.cs
index f576aa4e9..feb28a1c9 100644
--- a/backend/test/Integration/MigrationTests.cs
+++ b/backend/test/Integration/MigrationTests.cs
@@ -44,7 +44,10 @@ public Task EnsureMigrationsAreUpToDate()
                     source: snapshotModel?.GetRelationalModel(),
                     target: model.GetRelationalModel());
             // The differences should be empty if the migrations are up-to-date
-            modelDifferences.Should().BeEquivalentTo(Enumerable.Empty<MigrationOperation>()); // .BeEmpty();
+            modelDifferences.Should().BeEquivalentTo(
+                Enumerable.Empty<MigrationOperation>(),
+                because: "you forgot to add a migration with `make migration NAME='...' in the shell `./docker.mk shell SERVICE=backend`."
+            );
         });
     }
 }
\ No newline at end of file

From 1dc44baa36eeee99021777dce38d2577653307f6 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sat, 28 Mar 2026 22:07:36 +0100
Subject: [PATCH 004/145] Corrext exists flags (now for real)

---
 ...ectExistsFlagsOfReferencesSecondAttempt.cs | 328 ++++++++++++++++++
 .../ApplicationDbContextModelSnapshot.cs      |   2 +-
 backend/src/Migrations/migrate.sql            | 325 +++++++++++++++++
 3 files changed, 654 insertions(+), 1 deletion(-)
 create mode 100644 backend/src/Migrations/20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt.cs

diff --git a/backend/src/Migrations/20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt.cs b/backend/src/Migrations/20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt.cs
new file mode 100644
index 000000000..eba82599b
--- /dev/null
+++ b/backend/src/Migrations/20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt.cs
@@ -0,0 +1,328 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Metabase.Migrations
+{
+    /// <inheritdoc />
+    public partial class CorrectExistsFlagsOfReferencesSecondAttempt : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(@"
+                UPDATE metabase.method
+                SET 
+                    ""Reference_Standard_Exists"" = CASE WHEN
+                        ""Reference_Standard_Title"" IS NOT NULL OR
+                        ""Reference_Standard_Abstract"" IS NOT NULL OR
+                        ""Reference_Standard_Section"" IS NOT NULL OR
+                        ""Reference_Standard_Year"" IS NOT NULL OR
+                        ""Reference_Standard_Numeration_Prefix"" IS NOT NULL OR
+                        ""Reference_Standard_Numeration_MainNumber"" IS NOT NULL OR
+                        ""Reference_Standard_Numeration_Suffix"" IS NOT NULL OR
+                        ""Reference_Standard_Standardizers"" IS NOT NULL OR
+                        ""Reference_Standard_Locator"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+                    ""Reference_Publication_Exists"" = CASE WHEN
+                        ""Reference_Publication_Title"" IS NOT NULL OR
+                        ""Reference_Publication_Abstract"" IS NOT NULL OR
+                        ""Reference_Publication_Section"" IS NOT NULL OR
+                        ""Reference_Publication_Authors"" IS NOT NULL OR
+                        ""Reference_Publication_Doi"" IS NOT NULL OR
+                        ""Reference_Publication_ArXiv"" IS NOT NULL OR
+                        ""Reference_Publication_Urn"" IS NOT NULL OR
+                        ""Reference_Publication_WebAddress"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+                    ""Reference_Exists"" = CASE WHEN
+                        ""Reference_Standard_Title"" IS NOT NULL OR
+                        ""Reference_Standard_Abstract"" IS NOT NULL OR
+                        ""Reference_Standard_Section"" IS NOT NULL OR
+                        ""Reference_Standard_Year"" IS NOT NULL OR
+                        ""Reference_Standard_Numeration_Prefix"" IS NOT NULL OR
+                        ""Reference_Standard_Numeration_MainNumber"" IS NOT NULL OR
+                        ""Reference_Standard_Numeration_Suffix"" IS NOT NULL OR
+                        ""Reference_Standard_Standardizers"" IS NOT NULL OR
+                        ""Reference_Standard_Locator"" IS NOT NULL OR
+                        ""Reference_Publication_Title"" IS NOT NULL OR
+                        ""Reference_Publication_Abstract"" IS NOT NULL OR
+                        ""Reference_Publication_Section"" IS NOT NULL OR
+                        ""Reference_Publication_Authors"" IS NOT NULL OR
+                        ""Reference_Publication_Doi"" IS NOT NULL OR
+                        ""Reference_Publication_ArXiv"" IS NOT NULL OR
+                        ""Reference_Publication_Urn"" IS NOT NULL OR
+                        ""Reference_Publication_WebAddress"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END;
+
+                UPDATE metabase.data_format
+                SET
+                    ""Reference_Standard_Exists"" = CASE WHEN
+                        ""Reference_Standard_Title"" IS NOT NULL OR
+                        ""Reference_Standard_Abstract"" IS NOT NULL OR
+                        ""Reference_Standard_Section"" IS NOT NULL OR
+                        ""Reference_Standard_Year"" IS NOT NULL OR
+                        ""Reference_Standard_Numeration_Prefix"" IS NOT NULL OR
+                        ""Reference_Standard_Numeration_MainNumber"" IS NOT NULL OR
+                        ""Reference_Standard_Numeration_Suffix"" IS NOT NULL OR
+                        ""Reference_Standard_Standardizers"" IS NOT NULL OR
+                        ""Reference_Standard_Locator"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+                    ""Reference_Publication_Exists"" = CASE WHEN
+                        ""Reference_Publication_Title"" IS NOT NULL OR
+                        ""Reference_Publication_Abstract"" IS NOT NULL OR
+                        ""Reference_Publication_Section"" IS NOT NULL OR
+                        ""Reference_Publication_Authors"" IS NOT NULL OR
+                        ""Reference_Publication_Doi"" IS NOT NULL OR
+                        ""Reference_Publication_ArXiv"" IS NOT NULL OR
+                        ""Reference_Publication_Urn"" IS NOT NULL OR
+                        ""Reference_Publication_WebAddress"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+                    ""Reference_Exists"" = CASE WHEN
+                        ""Reference_Standard_Title"" IS NOT NULL OR
+                        ""Reference_Standard_Abstract"" IS NOT NULL OR
+                        ""Reference_Standard_Section"" IS NOT NULL OR
+                        ""Reference_Standard_Year"" IS NOT NULL OR
+                        ""Reference_Standard_Numeration_Prefix"" IS NOT NULL OR
+                        ""Reference_Standard_Numeration_MainNumber"" IS NOT NULL OR
+                        ""Reference_Standard_Numeration_Suffix"" IS NOT NULL OR
+                        ""Reference_Standard_Standardizers"" IS NOT NULL OR
+                        ""Reference_Standard_Locator"" IS NOT NULL OR
+                        ""Reference_Publication_Title"" IS NOT NULL OR
+                        ""Reference_Publication_Abstract"" IS NOT NULL OR
+                        ""Reference_Publication_Section"" IS NOT NULL OR
+                        ""Reference_Publication_Authors"" IS NOT NULL OR
+                        ""Reference_Publication_Doi"" IS NOT NULL OR
+                        ""Reference_Publication_ArXiv"" IS NOT NULL OR
+                        ""Reference_Publication_Urn"" IS NOT NULL OR
+                        ""Reference_Publication_WebAddress"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END;
+
+                UPDATE metabase.component
+                SET
+                    ""PrimeSurface_Reference_Standard_Exists"" = CASE WHEN
+                        ""PrimeSurface_Reference_Standard_Title"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Abstract"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Section"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Year"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Numeration_Prefix"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Numeration_MainNumber"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Numeration_Suffix"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Standardizers"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Locator"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+                    ""PrimeSurface_Reference_Publication_Exists"" = CASE WHEN
+                        ""PrimeSurface_Reference_Publication_Title"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Abstract"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Section"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Authors"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Doi"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_ArXiv"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Urn"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_WebAddress"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+                    ""PrimeSurface_Reference_Exists"" = CASE WHEN
+                        ""PrimeSurface_Reference_Standard_Title"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Abstract"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Section"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Year"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Numeration_Prefix"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Numeration_MainNumber"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Numeration_Suffix"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Standardizers"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Locator"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Title"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Abstract"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Section"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Authors"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Doi"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_ArXiv"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Urn"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_WebAddress"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+                    ""PrimeSurface_Exists"" = CASE WHEN
+                        ""PrimeSurface_Description"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Title"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Abstract"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Section"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Year"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Numeration_Prefix"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Numeration_MainNumber"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Numeration_Suffix"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Standardizers"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Standard_Locator"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Title"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Abstract"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Section"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Authors"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Doi"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_ArXiv"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_Urn"" IS NOT NULL OR
+                        ""PrimeSurface_Reference_Publication_WebAddress"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+
+                    ""PrimeDirection_Reference_Standard_Exists"" = CASE WHEN
+                        ""PrimeDirection_Reference_Standard_Title"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Abstract"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Section"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Year"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Numeration_Prefix"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Numeration_MainNumber"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Numeration_Suffix"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Standardizers"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Locator"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+                    ""PrimeDirection_Reference_Publication_Exists"" = CASE WHEN
+                        ""PrimeDirection_Reference_Publication_Title"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Abstract"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Section"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Authors"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Doi"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_ArXiv"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Urn"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_WebAddress"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+                    ""PrimeDirection_Reference_Exists"" = CASE WHEN
+                        ""PrimeDirection_Reference_Standard_Title"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Abstract"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Section"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Year"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Numeration_Prefix"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Numeration_MainNumber"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Numeration_Suffix"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Standardizers"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Locator"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Title"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Abstract"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Section"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Authors"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Doi"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_ArXiv"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Urn"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_WebAddress"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+                    ""PrimeDirection_Exists"" = CASE WHEN
+                        ""PrimeDirection_Description"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Title"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Abstract"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Section"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Year"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Numeration_Prefix"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Numeration_MainNumber"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Numeration_Suffix"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Standardizers"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Standard_Locator"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Title"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Abstract"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Section"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Authors"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Doi"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_ArXiv"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_Urn"" IS NOT NULL OR
+                        ""PrimeDirection_Reference_Publication_WebAddress"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+
+                    ""SwitchableLayers_Reference_Standard_Exists"" = CASE WHEN
+                        ""SwitchableLayers_Reference_Standard_Title"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Abstract"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Section"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Year"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Numeration_Prefix"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Numeration_MainNumber"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Numeration_Suffix"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Standardizers"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Locator"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+                    ""SwitchableLayers_Reference_Publication_Exists"" = CASE WHEN
+                        ""SwitchableLayers_Reference_Publication_Title"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Abstract"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Section"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Authors"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Doi"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_ArXiv"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Urn"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_WebAddress"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+                    ""SwitchableLayers_Reference_Exists"" = CASE WHEN
+                        ""SwitchableLayers_Reference_Standard_Title"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Abstract"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Section"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Year"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Numeration_Prefix"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Numeration_MainNumber"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Numeration_Suffix"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Standardizers"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Locator"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Title"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Abstract"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Section"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Authors"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Doi"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_ArXiv"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Urn"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_WebAddress"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END,
+                    ""SwitchableLayers_Exists"" = CASE WHEN
+                        ""SwitchableLayers_Description"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Title"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Abstract"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Section"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Year"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Numeration_Prefix"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Numeration_MainNumber"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Numeration_Suffix"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Standardizers"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Standard_Locator"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Title"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Abstract"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Section"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Authors"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Doi"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_ArXiv"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_Urn"" IS NOT NULL OR
+                        ""SwitchableLayers_Reference_Publication_WebAddress"" IS NOT NULL
+                        THEN TRUE
+                      ELSE NULL
+                    END;
+            ");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs b/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
index 1d34b3a59..421851491 100644
--- a/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Text.Json;
 using Metabase.Data;
diff --git a/backend/src/Migrations/migrate.sql b/backend/src/Migrations/migrate.sql
index 6809f8f15..a17340535 100644
--- a/backend/src/Migrations/migrate.sql
+++ b/backend/src/Migrations/migrate.sql
@@ -1968,3 +1968,328 @@ BEGIN
 END $EF$;
 COMMIT;
 
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt') THEN
+
+                    UPDATE metabase.method
+                    SET 
+                        "Reference_Standard_Exists" = CASE WHEN
+                            "Reference_Standard_Title" IS NOT NULL OR
+                            "Reference_Standard_Abstract" IS NOT NULL OR
+                            "Reference_Standard_Section" IS NOT NULL OR
+                            "Reference_Standard_Year" IS NOT NULL OR
+                            "Reference_Standard_Numeration_Prefix" IS NOT NULL OR
+                            "Reference_Standard_Numeration_MainNumber" IS NOT NULL OR
+                            "Reference_Standard_Numeration_Suffix" IS NOT NULL OR
+                            "Reference_Standard_Standardizers" IS NOT NULL OR
+                            "Reference_Standard_Locator" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+                        "Reference_Publication_Exists" = CASE WHEN
+                            "Reference_Publication_Title" IS NOT NULL OR
+                            "Reference_Publication_Abstract" IS NOT NULL OR
+                            "Reference_Publication_Section" IS NOT NULL OR
+                            "Reference_Publication_Authors" IS NOT NULL OR
+                            "Reference_Publication_Doi" IS NOT NULL OR
+                            "Reference_Publication_ArXiv" IS NOT NULL OR
+                            "Reference_Publication_Urn" IS NOT NULL OR
+                            "Reference_Publication_WebAddress" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+                        "Reference_Exists" = CASE WHEN
+                            "Reference_Standard_Title" IS NOT NULL OR
+                            "Reference_Standard_Abstract" IS NOT NULL OR
+                            "Reference_Standard_Section" IS NOT NULL OR
+                            "Reference_Standard_Year" IS NOT NULL OR
+                            "Reference_Standard_Numeration_Prefix" IS NOT NULL OR
+                            "Reference_Standard_Numeration_MainNumber" IS NOT NULL OR
+                            "Reference_Standard_Numeration_Suffix" IS NOT NULL OR
+                            "Reference_Standard_Standardizers" IS NOT NULL OR
+                            "Reference_Standard_Locator" IS NOT NULL OR
+                            "Reference_Publication_Title" IS NOT NULL OR
+                            "Reference_Publication_Abstract" IS NOT NULL OR
+                            "Reference_Publication_Section" IS NOT NULL OR
+                            "Reference_Publication_Authors" IS NOT NULL OR
+                            "Reference_Publication_Doi" IS NOT NULL OR
+                            "Reference_Publication_ArXiv" IS NOT NULL OR
+                            "Reference_Publication_Urn" IS NOT NULL OR
+                            "Reference_Publication_WebAddress" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END;
+
+                    UPDATE metabase.data_format
+                    SET
+                        "Reference_Standard_Exists" = CASE WHEN
+                            "Reference_Standard_Title" IS NOT NULL OR
+                            "Reference_Standard_Abstract" IS NOT NULL OR
+                            "Reference_Standard_Section" IS NOT NULL OR
+                            "Reference_Standard_Year" IS NOT NULL OR
+                            "Reference_Standard_Numeration_Prefix" IS NOT NULL OR
+                            "Reference_Standard_Numeration_MainNumber" IS NOT NULL OR
+                            "Reference_Standard_Numeration_Suffix" IS NOT NULL OR
+                            "Reference_Standard_Standardizers" IS NOT NULL OR
+                            "Reference_Standard_Locator" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+                        "Reference_Publication_Exists" = CASE WHEN
+                            "Reference_Publication_Title" IS NOT NULL OR
+                            "Reference_Publication_Abstract" IS NOT NULL OR
+                            "Reference_Publication_Section" IS NOT NULL OR
+                            "Reference_Publication_Authors" IS NOT NULL OR
+                            "Reference_Publication_Doi" IS NOT NULL OR
+                            "Reference_Publication_ArXiv" IS NOT NULL OR
+                            "Reference_Publication_Urn" IS NOT NULL OR
+                            "Reference_Publication_WebAddress" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+                        "Reference_Exists" = CASE WHEN
+                            "Reference_Standard_Title" IS NOT NULL OR
+                            "Reference_Standard_Abstract" IS NOT NULL OR
+                            "Reference_Standard_Section" IS NOT NULL OR
+                            "Reference_Standard_Year" IS NOT NULL OR
+                            "Reference_Standard_Numeration_Prefix" IS NOT NULL OR
+                            "Reference_Standard_Numeration_MainNumber" IS NOT NULL OR
+                            "Reference_Standard_Numeration_Suffix" IS NOT NULL OR
+                            "Reference_Standard_Standardizers" IS NOT NULL OR
+                            "Reference_Standard_Locator" IS NOT NULL OR
+                            "Reference_Publication_Title" IS NOT NULL OR
+                            "Reference_Publication_Abstract" IS NOT NULL OR
+                            "Reference_Publication_Section" IS NOT NULL OR
+                            "Reference_Publication_Authors" IS NOT NULL OR
+                            "Reference_Publication_Doi" IS NOT NULL OR
+                            "Reference_Publication_ArXiv" IS NOT NULL OR
+                            "Reference_Publication_Urn" IS NOT NULL OR
+                            "Reference_Publication_WebAddress" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END;
+
+                    UPDATE metabase.component
+                    SET
+                        "PrimeSurface_Reference_Standard_Exists" = CASE WHEN
+                            "PrimeSurface_Reference_Standard_Title" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Abstract" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Section" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Year" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Numeration_Prefix" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Numeration_MainNumber" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Numeration_Suffix" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Standardizers" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Locator" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+                        "PrimeSurface_Reference_Publication_Exists" = CASE WHEN
+                            "PrimeSurface_Reference_Publication_Title" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Abstract" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Section" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Authors" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Doi" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_ArXiv" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Urn" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_WebAddress" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+                        "PrimeSurface_Reference_Exists" = CASE WHEN
+                            "PrimeSurface_Reference_Standard_Title" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Abstract" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Section" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Year" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Numeration_Prefix" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Numeration_MainNumber" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Numeration_Suffix" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Standardizers" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Locator" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Title" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Abstract" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Section" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Authors" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Doi" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_ArXiv" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Urn" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_WebAddress" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+                        "PrimeSurface_Exists" = CASE WHEN
+                            "PrimeSurface_Description" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Title" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Abstract" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Section" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Year" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Numeration_Prefix" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Numeration_MainNumber" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Numeration_Suffix" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Standardizers" IS NOT NULL OR
+                            "PrimeSurface_Reference_Standard_Locator" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Title" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Abstract" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Section" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Authors" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Doi" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_ArXiv" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_Urn" IS NOT NULL OR
+                            "PrimeSurface_Reference_Publication_WebAddress" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+
+                        "PrimeDirection_Reference_Standard_Exists" = CASE WHEN
+                            "PrimeDirection_Reference_Standard_Title" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Abstract" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Section" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Year" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Numeration_Prefix" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Numeration_MainNumber" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Numeration_Suffix" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Standardizers" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Locator" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+                        "PrimeDirection_Reference_Publication_Exists" = CASE WHEN
+                            "PrimeDirection_Reference_Publication_Title" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Abstract" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Section" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Authors" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Doi" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_ArXiv" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Urn" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_WebAddress" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+                        "PrimeDirection_Reference_Exists" = CASE WHEN
+                            "PrimeDirection_Reference_Standard_Title" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Abstract" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Section" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Year" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Numeration_Prefix" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Numeration_MainNumber" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Numeration_Suffix" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Standardizers" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Locator" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Title" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Abstract" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Section" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Authors" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Doi" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_ArXiv" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Urn" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_WebAddress" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+                        "PrimeDirection_Exists" = CASE WHEN
+                            "PrimeDirection_Description" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Title" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Abstract" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Section" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Year" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Numeration_Prefix" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Numeration_MainNumber" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Numeration_Suffix" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Standardizers" IS NOT NULL OR
+                            "PrimeDirection_Reference_Standard_Locator" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Title" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Abstract" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Section" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Authors" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Doi" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_ArXiv" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_Urn" IS NOT NULL OR
+                            "PrimeDirection_Reference_Publication_WebAddress" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+
+                        "SwitchableLayers_Reference_Standard_Exists" = CASE WHEN
+                            "SwitchableLayers_Reference_Standard_Title" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Abstract" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Section" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Year" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Numeration_Prefix" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Numeration_MainNumber" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Numeration_Suffix" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Standardizers" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Locator" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+                        "SwitchableLayers_Reference_Publication_Exists" = CASE WHEN
+                            "SwitchableLayers_Reference_Publication_Title" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Abstract" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Section" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Authors" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Doi" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_ArXiv" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Urn" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_WebAddress" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+                        "SwitchableLayers_Reference_Exists" = CASE WHEN
+                            "SwitchableLayers_Reference_Standard_Title" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Abstract" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Section" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Year" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Numeration_Prefix" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Numeration_MainNumber" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Numeration_Suffix" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Standardizers" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Locator" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Title" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Abstract" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Section" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Authors" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Doi" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_ArXiv" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Urn" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_WebAddress" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END,
+                        "SwitchableLayers_Exists" = CASE WHEN
+                            "SwitchableLayers_Description" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Title" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Abstract" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Section" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Year" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Numeration_Prefix" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Numeration_MainNumber" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Numeration_Suffix" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Standardizers" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Standard_Locator" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Title" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Abstract" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Section" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Authors" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Doi" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_ArXiv" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_Urn" IS NOT NULL OR
+                            "SwitchableLayers_Reference_Publication_WebAddress" IS NOT NULL
+                            THEN TRUE
+                          ELSE NULL
+                        END;
+
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt') THEN
+    INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+    VALUES ('20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt', '10.0.5');
+    END IF;
+END $EF$;
+COMMIT;
+

From 97a5d12f1bb29c0383500af2c00c1dfe259da67a Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sat, 28 Mar 2026 23:43:26 +0100
Subject: [PATCH 005/145] Notify on component creation, add tooltips with UUIDs
 to links, and clear global error messages on success

---
 frontend/components/Availability.tsx          | 14 +++
 frontend/components/CopyableText.tsx          | 12 ++-
 frontend/components/Manager.tsx               | 22 +++++
 .../components/OpenEndedDateTimeRangeX.tsx    | 16 ++--
 frontend/components/TabLabel.tsx              | 23 +++++
 .../components/AddAssembledOfComponent.tsx    |  3 +-
 .../components/AddComponentManufacturer.tsx   |  3 +-
 .../AddConcretizationOfComponent.tsx          |  3 +-
 .../AddGeneralizationOfComponent.tsx          |  3 +-
 .../components/AddPartOfComponent.tsx         |  3 +-
 .../components/AddVariantOfComponent.tsx      |  3 +-
 frontend/components/components/Component.tsx  | 26 +++--
 .../components/components/CreateComponent.tsx | 80 ++++++++++++++--
 .../dataFormats/CreateDataFormat.tsx          |  3 +-
 .../components/databases/CreateDatabase.tsx   |  3 +-
 .../AddGnuPgKeyFingerprint.tsx                |  3 +-
 .../AddInstitutionRepresentative.tsx          |  3 +-
 .../components/institutions/Institution.tsx   | 94 ++++++++++++++-----
 .../methods/AddInstitutionMethodDeveloper.tsx |  3 +-
 .../methods/AddUserMethodDeveloper.tsx        |  3 +-
 frontend/components/methods/CreateMethod.tsx  |  3 +-
 frontend/components/users/AddUserRole.tsx     |  3 +-
 frontend/lib/array.ts                         | 13 +++
 frontend/package.json                         |  2 +-
 frontend/pages/me/manage/change-password.tsx  |  1 +
 frontend/pages/me/manage/set-password.tsx     |  1 +
 frontend/queries/components.graphql           |  9 ++
 frontend/queries/institutions.graphql         | 15 +++
 frontend/yarn.lock                            |  8 +-
 29 files changed, 302 insertions(+), 76 deletions(-)
 create mode 100644 frontend/components/Availability.tsx
 create mode 100644 frontend/components/Manager.tsx
 create mode 100644 frontend/components/TabLabel.tsx

diff --git a/frontend/components/Availability.tsx b/frontend/components/Availability.tsx
new file mode 100644
index 000000000..76cd13330
--- /dev/null
+++ b/frontend/components/Availability.tsx
@@ -0,0 +1,14 @@
+import { OpenEndedDateTimeRange } from "../__generated__/graphql";
+import OpenEndedDateTimeRangeX from "./OpenEndedDateTimeRangeX";
+
+export default function Availability({
+  range,
+}: {
+  range: OpenEndedDateTimeRange;
+}) {
+  return (
+    <div>
+      Available <OpenEndedDateTimeRangeX range={range} />
+    </div>
+  );
+}
diff --git a/frontend/components/CopyableText.tsx b/frontend/components/CopyableText.tsx
index 17045ba44..bfb19f11d 100644
--- a/frontend/components/CopyableText.tsx
+++ b/frontend/components/CopyableText.tsx
@@ -1,8 +1,14 @@
 import { Button, Space } from "antd";
 import { CopyOutlined } from "@ant-design/icons";
-import { useState } from "react";
+import { ReactNode, useState } from "react";
 
-export default function CopyableText({ text }: { text: string }) {
+export default function CopyableText({
+  text,
+  children,
+}: {
+  text: string;
+  children?: ReactNode;
+}) {
   const [copied, setCopied] = useState(false);
 
   return (
@@ -11,7 +17,7 @@ export default function CopyableText({ text }: { text: string }) {
         fontFamily: "monospace",
       }}
     >
-      <span>{text}</span>
+      <span>{children ? children : text}</span>
       <Button
         type="text"
         size="small"
diff --git a/frontend/components/Manager.tsx b/frontend/components/Manager.tsx
new file mode 100644
index 000000000..6e0ee7b8f
--- /dev/null
+++ b/frontend/components/Manager.tsx
@@ -0,0 +1,22 @@
+import Link from "next/link";
+import { Scalars } from "../__generated__/graphql";
+import paths from "../paths";
+import { Tooltip } from "antd";
+
+export default function Manager({
+  data,
+}: {
+  data: {
+    uuid: Scalars["Uuid"]["input"];
+    name: string;
+  };
+}) {
+  return (
+    <div>
+      Managed by{" "}
+      <Tooltip title={data.uuid}>
+        <Link href={paths.institution(data.uuid)}>{data.name}</Link>
+      </Tooltip>
+    </div>
+  );
+}
diff --git a/frontend/components/OpenEndedDateTimeRangeX.tsx b/frontend/components/OpenEndedDateTimeRangeX.tsx
index 61643aaa7..d26be9181 100644
--- a/frontend/components/OpenEndedDateTimeRangeX.tsx
+++ b/frontend/components/OpenEndedDateTimeRangeX.tsx
@@ -3,18 +3,20 @@ import dayjs from "dayjs";
 import { OpenEndedDateTimeRange } from "../__generated__/graphql";
 
 interface OpenEndedDateTimeRangeProps {
-  range: OpenEndedDateTimeRange | null | undefined;
-};
+  range: OpenEndedDateTimeRange;
+}
 
 export default function OpenEndedDateTimeRangeX({
   range,
 }: OpenEndedDateTimeRangeProps) {
-  return range == null ? (
-    <Typography.Text>Unknown</Typography.Text>
-  ) : (
+  return (
     <Typography.Text>
-      from {dayjs(range.from).format("DD/MM/YYYY") || "beginning of time"} to{" "}
-      {dayjs(range.to).format("DD/MM/YYYY") || "end of time"}
+      from{" "}
+      {range.from == null
+        ? "beginning of time"
+        : dayjs(range.from).format("DD/MM/YYYY")}{" "}
+      to{" "}
+      {range.to == null ? "end of time" : dayjs(range.to).format("DD/MM/YYYY")}
     </Typography.Text>
   );
 }
diff --git a/frontend/components/TabLabel.tsx b/frontend/components/TabLabel.tsx
new file mode 100644
index 000000000..a7f1ab07d
--- /dev/null
+++ b/frontend/components/TabLabel.tsx
@@ -0,0 +1,23 @@
+import { Space, Badge, Typography } from "antd";
+
+const { Text } = Typography;
+
+export default function TabLabel({
+  name,
+  count,
+}: {
+  name: String;
+  count?: React.ReactNode;
+}) {
+  return count == 0 ? (
+    <Space>
+      <Text type="secondary">{name}</Text>
+      <Badge showZero color="grey" count={count} />
+    </Space>
+  ) : (
+    <Space>
+      <Text>{name}</Text>
+      {count != null && <Badge color="blue" count={count} />}
+    </Space>
+  );
+}
diff --git a/frontend/components/components/AddAssembledOfComponent.tsx b/frontend/components/components/AddAssembledOfComponent.tsx
index 3060e30e5..a60042a5e 100644
--- a/frontend/components/components/AddAssembledOfComponent.tsx
+++ b/frontend/components/components/AddAssembledOfComponent.tsx
@@ -20,7 +20,7 @@ type FormValues = {
 
 interface AddAssembledOfComponentProps {
   partComponentId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function AddAssembledOfComponent({
   partComponentId,
@@ -66,6 +66,7 @@ export default function AddAssembledOfComponent({
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/components/components/AddComponentManufacturer.tsx b/frontend/components/components/AddComponentManufacturer.tsx
index 9adfc3120..dec559fc2 100644
--- a/frontend/components/components/AddComponentManufacturer.tsx
+++ b/frontend/components/components/AddComponentManufacturer.tsx
@@ -16,7 +16,7 @@ type FormValues = { institutionId: Scalars["Uuid"]["input"] };
 
 interface AddComponentManufacturerProps {
   componentId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function AddComponentManufacturer({
   componentId,
@@ -60,6 +60,7 @@ export default function AddComponentManufacturer({
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/components/components/AddConcretizationOfComponent.tsx b/frontend/components/components/AddConcretizationOfComponent.tsx
index 2e151f0ed..e02603a29 100644
--- a/frontend/components/components/AddConcretizationOfComponent.tsx
+++ b/frontend/components/components/AddConcretizationOfComponent.tsx
@@ -18,7 +18,7 @@ type FormValues = {
 
 interface AddConcretizationOfComponentProps {
   generalComponentId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function AddConcretizationOfComponent({
   generalComponentId,
@@ -62,6 +62,7 @@ export default function AddConcretizationOfComponent({
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/components/components/AddGeneralizationOfComponent.tsx b/frontend/components/components/AddGeneralizationOfComponent.tsx
index 0a0f5d651..27cc546cd 100644
--- a/frontend/components/components/AddGeneralizationOfComponent.tsx
+++ b/frontend/components/components/AddGeneralizationOfComponent.tsx
@@ -18,7 +18,7 @@ type FormValues = {
 
 interface AddAssembledOfComponentProps {
   concreteComponentId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function AddAssembledOfComponent({
   concreteComponentId,
@@ -62,6 +62,7 @@ export default function AddAssembledOfComponent({
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/components/components/AddPartOfComponent.tsx b/frontend/components/components/AddPartOfComponent.tsx
index c847d8402..24abc861a 100644
--- a/frontend/components/components/AddPartOfComponent.tsx
+++ b/frontend/components/components/AddPartOfComponent.tsx
@@ -20,7 +20,7 @@ type FormValues = {
 
 interface AddPartOfComponentProps {
   assembledComponentId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function AddPartOfComponent({
   assembledComponentId,
@@ -66,6 +66,7 @@ export default function AddPartOfComponent({
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/components/components/AddVariantOfComponent.tsx b/frontend/components/components/AddVariantOfComponent.tsx
index ff8e18b8d..f25726a7b 100644
--- a/frontend/components/components/AddVariantOfComponent.tsx
+++ b/frontend/components/components/AddVariantOfComponent.tsx
@@ -18,7 +18,7 @@ type FormValues = {
 
 interface AddVariantOfComponentProps {
   componentId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function AddVariantOfComponent({
   componentId,
@@ -62,6 +62,7 @@ export default function AddVariantOfComponent({
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/components/components/Component.tsx b/frontend/components/components/Component.tsx
index 90d44037e..6a9153d6c 100644
--- a/frontend/components/components/Component.tsx
+++ b/frontend/components/components/Component.tsx
@@ -15,7 +15,6 @@ import {
 import { ReactNode } from "react";
 import paths from "../../paths";
 import Link from "next/link";
-import OpenEndedDateTimeRangeX from "../OpenEndedDateTimeRangeX";
 import AddPartOfComponent from "./AddPartOfComponent";
 import AddAssembledOfComponent from "./AddAssembledOfComponent";
 import UpdateComponentAssembly from "./UpdateComponentAssembly";
@@ -31,6 +30,8 @@ import { RemoveComponentVariant } from "./RemoveComponentVariant";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import JsonViewer from "../JsonViewer";
 import { isTruthy } from "../../lib/array";
+import Manager from "../Manager";
+import Availability from "../Availability";
 
 interface ComponentProps {
   componentId: Scalars["Uuid"]["input"];
@@ -81,11 +82,16 @@ export default function Component({ componentId }: ComponentProps) {
           ),
         ].filter(isTruthy)}
       >
+        <Space orientation="vertical">
+          {component.availability && (
+            <Availability range={component.availability} />
+          )}
+          {component.manager?.node && <Manager data={component.manager.node} />}
+          {component.extras != null && (
+            <JsonViewer jsonData={component.extras} />
+          )}
+        </Space>
         <Descriptions size="small" column={1}>
-          <Descriptions.Item label="UUID">{component.uuid}</Descriptions.Item>
-          <Descriptions.Item label="Available">
-            <OpenEndedDateTimeRangeX range={component.availability} />
-          </Descriptions.Item>
           {component.prime?.surface && (
             <Descriptions.Item label="Prime Surface">
               {component.prime?.surface?.description}{" "}
@@ -104,16 +110,6 @@ export default function Component({ componentId }: ComponentProps) {
               {component.switchableLayers?.reference?.title}
             </Descriptions.Item>
           )}
-          {component.extras != undefined && (
-            <Descriptions.Item label="Extras">
-              <JsonViewer jsonData={component.extras} />
-            </Descriptions.Item>
-          )}
-          <Descriptions.Item label="Manager">
-            <Link href={paths.institution(component.manager.node.uuid)}>
-              {component.manager.node.name}
-            </Link>
-          </Descriptions.Item>
         </Descriptions>
       </PageHeader>
       <Space orientation="vertical" style={{ display: "flex" }}>
diff --git a/frontend/components/components/CreateComponent.tsx b/frontend/components/components/CreateComponent.tsx
index 8386db7ab..029da7dc1 100644
--- a/frontend/components/components/CreateComponent.tsx
+++ b/frontend/components/components/CreateComponent.tsx
@@ -1,5 +1,14 @@
 import { useMutation } from "@apollo/client/react";
-import { DatePicker, Select, Form, Input, Button, Divider } from "antd";
+import {
+  DatePicker,
+  Select,
+  Form,
+  Input,
+  Button,
+  Divider,
+  App,
+  Typography,
+} from "antd";
 import {
   CreateComponentDocument,
   ComponentsDocument,
@@ -18,6 +27,10 @@ import { SelectInstitutionId } from "../SelectInstitutionId";
 import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import Link from "next/link";
+import paths from "../../paths";
+import { pluralize, pluralizeIrregular } from "../../lib/array";
+import CopyableText from "../CopyableText";
 
 type FormValues = {
   name: string;
@@ -37,7 +50,7 @@ type FormValues = {
 interface CreateComponentProps {
   managerId: Scalars["Uuid"]["input"];
   initialManufacturerId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function CreateComponent({
   managerId,
@@ -46,6 +59,7 @@ export default function CreateComponent({
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
   );
+  const { notification } = App.useApp();
   const [form] = Form.useForm<FormValues>();
 
   const [createComponentMutation] = useMutation(CreateComponentDocument, {
@@ -64,10 +78,14 @@ export default function CreateComponent({
     ],
   });
 
-  const { mutating, withMutationHandler, augmentFormWithErrors } =
-    useMutationHandler<CreateComponentMutation>({
-      getErrors: (data) => data.createComponent.errors,
-    });
+  const {
+    mutating,
+    withMutationHandler,
+    augmentFormWithErrors,
+    messageMissingModel,
+  } = useMutationHandler<CreateComponentMutation>({
+    getErrors: (data) => data.createComponent.errors,
+  });
 
   const onFinish = (values: FormValues) => {
     withMutationHandler(
@@ -113,8 +131,54 @@ export default function CreateComponent({
         });
       },
       {
-        onSuccess: () => {
-          form.resetFields();
+        onSuccess: (data) => {
+          const component = data?.createComponent?.component;
+          if (component == null) {
+            messageMissingModel();
+          } else {
+            setGlobalErrorMessages([]);
+            form.resetFields();
+            notification.success({
+              title: "Created Component",
+              placement: "top",
+              showProgress: true,
+              pauseOnHover: true,
+              description: (
+                <>
+                  <Typography.Paragraph>
+                    <CopyableText text={component.uuid}>
+                      <Link href={paths.component(component.uuid)}>
+                        {component.uuid}
+                      </Link>{" "}
+                    </CopyableText>
+                  </Typography.Paragraph>
+                  {component?.pendingManufacturers != null &&
+                    component.pendingManufacturers.totalCount >= 1 && (
+                      <Typography.Paragraph>
+                        The{" "}
+                        {pluralize(
+                          component.pendingManufacturers.totalCount,
+                          "manufacturer",
+                        )}{" "}
+                        {component.pendingManufacturers.edges
+                          .map((x) => (
+                            <Link href={paths.institution(x.node.uuid)}>
+                              {x.node.name}
+                            </Link>
+                          ))
+                          .join(", ")}{" "}
+                        {pluralizeIrregular(
+                          component.pendingManufacturers.totalCount,
+                          "is",
+                          "are",
+                        )}{" "}
+                        are waiting for confirmation.
+                      </Typography.Paragraph>
+                    )}
+                </>
+              ),
+            });
+          }
         },
         onError: (graphQlErrors, userErrors) =>
           setGlobalErrorMessages(
diff --git a/frontend/components/dataFormats/CreateDataFormat.tsx b/frontend/components/dataFormats/CreateDataFormat.tsx
index 491432be8..362906bd6 100644
--- a/frontend/components/dataFormats/CreateDataFormat.tsx
+++ b/frontend/components/dataFormats/CreateDataFormat.tsx
@@ -24,7 +24,7 @@ type FormValues = {
 
 interface CreateDataFormatProps {
   managerId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function CreateDataFormat({ managerId }: CreateDataFormatProps) {
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
@@ -80,6 +80,7 @@ export default function CreateDataFormat({ managerId }: CreateDataFormatProps) {
       },
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/components/databases/CreateDatabase.tsx b/frontend/components/databases/CreateDatabase.tsx
index 38ddcf9db..680957ec1 100644
--- a/frontend/components/databases/CreateDatabase.tsx
+++ b/frontend/components/databases/CreateDatabase.tsx
@@ -20,7 +20,7 @@ type FormValues = {
 
 interface CreateDatabaseProps {
   operatorId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function CreateDatabase({ operatorId }: CreateDatabaseProps) {
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
@@ -64,6 +64,7 @@ export default function CreateDatabase({ operatorId }: CreateDatabaseProps) {
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/components/gnuPgKeyFingerprints/AddGnuPgKeyFingerprint.tsx b/frontend/components/gnuPgKeyFingerprints/AddGnuPgKeyFingerprint.tsx
index 09eedbea1..3c6194722 100644
--- a/frontend/components/gnuPgKeyFingerprints/AddGnuPgKeyFingerprint.tsx
+++ b/frontend/components/gnuPgKeyFingerprints/AddGnuPgKeyFingerprint.tsx
@@ -17,7 +17,7 @@ type FormValues = {
 
 interface AddGnuPgKeyFingerprintProps {
   institutionId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function AddGnuPgKeyFingerprint({
   institutionId,
@@ -62,6 +62,7 @@ export default function AddGnuPgKeyFingerprint({
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/components/institutions/AddInstitutionRepresentative.tsx b/frontend/components/institutions/AddInstitutionRepresentative.tsx
index 38c782fbb..21b057733 100644
--- a/frontend/components/institutions/AddInstitutionRepresentative.tsx
+++ b/frontend/components/institutions/AddInstitutionRepresentative.tsx
@@ -20,7 +20,7 @@ type FormValues = {
 
 interface AddInstitutionRepresentativeProps {
   institutionId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function AddInstitutionRepresentative({
   institutionId,
@@ -65,6 +65,7 @@ export default function AddInstitutionRepresentative({
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index b859b426d..9ae9062a2 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -9,6 +9,8 @@ import {
   Space,
   Tabs,
   TabsProps,
+  Badge,
+  Tooltip,
 } from "antd";
 import { InstitutionDocument } from "../../queries/institutions.generated";
 import { Scalars } from "../../__generated__/graphql";
@@ -42,6 +44,8 @@ import JsonViewer from "../JsonViewer";
 import PageHeader from "../PageHeader";
 import { isTruthy } from "../../lib/array";
 import InstitutionTable from "./InstitutionTable";
+import Manager from "../Manager";
+import TabLabel from "../TabLabel";
 
 interface Props {
   institutionId: Scalars["Uuid"]["input"];
@@ -74,7 +78,12 @@ export default function Institution({ institutionId }: Props) {
     (institution.manufacturedComponents.edges.length >= 1 ||
       institution.managedComponents.isAuthorizedToAddEdge) && {
       key: "components",
-      label: "Manufactured Components",
+      label: (
+        <TabLabel
+          name="Manufactured Components"
+          count={institution.manufacturedComponents.totalCount}
+        />
+      ),
       children: (
         <ComponentTable
           loading={loading}
@@ -87,7 +96,12 @@ export default function Institution({ institutionId }: Props) {
     (institution.developedMethods.edges.length >= 1 ||
       institution.managedMethods.isAuthorizedToAddEdge) && {
       key: "methods",
-      label: "Developed Methods",
+      label: (
+        <TabLabel
+          name="Developed Methods"
+          count={institution.developedMethods.totalCount}
+        />
+      ),
       children: (
         <MethodTable
           loading={loading}
@@ -98,7 +112,12 @@ export default function Institution({ institutionId }: Props) {
     (institution.operatedDatabases.edges.length >= 1 ||
       institution.operatedDatabases.isAuthorizedToAddEdge) && {
       key: "databases",
-      label: "Operated Databases",
+      label: (
+        <TabLabel
+          name="Operated Databases"
+          count={institution.operatedDatabases.totalCount}
+        />
+      ),
       children: (
         <DatabaseTable
           loading={loading}
@@ -109,7 +128,12 @@ export default function Institution({ institutionId }: Props) {
     (institution.gnuPgKeyFingerprints.edges.length >= 1 ||
       institution.gnuPgKeyFingerprints.isAuthorizedToAddEdge) && {
       key: "gnuPgKeyFingerprints",
-      label: "GnuPG Key Fingerprints",
+      label: (
+        <TabLabel
+          name="GnuPG Key Fingerprints"
+          count={institution.gnuPgKeyFingerprints.totalCount}
+        />
+      ),
       children: (
         <GnuPgKeyFingerprintTable
           loading={false}
@@ -128,7 +152,12 @@ export default function Institution({ institutionId }: Props) {
     (institution.managedComponents.edges.length >= 1 ||
       institution.managedComponents.isAuthorizedToAddEdge) && {
       key: "components",
-      label: "Components",
+      label: (
+        <TabLabel
+          name="Components"
+          count={institution.managedComponents.totalCount}
+        />
+      ),
       children: (
         <ComponentTable
           loading={loading}
@@ -139,7 +168,12 @@ export default function Institution({ institutionId }: Props) {
     (institution.managedMethods.edges.length >= 1 ||
       institution.managedMethods.isAuthorizedToAddEdge) && {
       key: "methods",
-      label: "Methods",
+      label: (
+        <TabLabel
+          name="Methods"
+          count={institution.managedMethods.totalCount}
+        />
+      ),
       children: (
         <MethodTable
           loading={loading}
@@ -150,7 +184,12 @@ export default function Institution({ institutionId }: Props) {
     (institution.managedDataFormats.edges.length >= 1 ||
       institution.managedDataFormats.isAuthorizedToAddEdge) && {
       key: "dataFormats",
-      label: "Data Formats",
+      label: (
+        <TabLabel
+          name="Data Formats"
+          count={institution.managedDataFormats.totalCount}
+        />
+      ),
       children: (
         <DataFormatTable
           loading={loading}
@@ -161,7 +200,12 @@ export default function Institution({ institutionId }: Props) {
     (institution.managedInstitutions.edges.length >= 1 ||
       institution.managedInstitutions.isAuthorizedToAddEdge) && {
       key: "institutions",
-      label: "Institutions",
+      label: (
+        <TabLabel
+          name="Institutions"
+          count={institution.managedInstitutions.totalCount}
+        />
+      ),
       children: (
         <InstitutionTable
           loading={loading}
@@ -173,7 +217,12 @@ export default function Institution({ institutionId }: Props) {
     },
     institution.openIdConnectApplications.isAuthorizedToAddEdge && {
       key: "openIdConnectApplications",
-      label: "OpenId Connect Applications",
+      label: (
+        <TabLabel
+          name="OpenId Connect Applications"
+          count={institution.openIdConnectApplications.totalCount}
+        />
+      ),
       children: (
         <OpenIdConnectApplicationTable
           loading={false}
@@ -354,9 +403,6 @@ export default function Institution({ institutionId }: Props) {
         ].filter(isTruthy)}
       >
         <Space orientation="vertical">
-          {institution.extras != null && (
-            <JsonViewer jsonData={institution.extras} />
-          )}
           <ContactInformation contact={institution.contact} />
           {institution.representatives.edges.length >= 1 && (
             <div>
@@ -364,10 +410,14 @@ export default function Institution({ institutionId }: Props) {
                 Represented by{" "}
                 {institution.representatives.edges.map((edge, index) => (
                   <span key={edge.node.uuid}>
-                    <Link href={paths.user(edge.node.uuid)}>
-                      {`${edge.node.name} (${edge.node.uuid})`}
-                    </Link>{" "}
-                    as <Typography.Text>{edge.role}</Typography.Text>
+                    <Tooltip title={edge.node.uuid}>
+                      <Link href={paths.user(edge.node.uuid)}>
+                        {`${edge.node.name}`}
+                      </Link>
+                    </Tooltip>{" "}
+                    <Tag color="grey" variant="outlined">
+                      {edge.role}
+                    </Tag>
                     {edge.isAuthorizedToRemoveEdge && (
                       <RemoveInstitutionRepresentative
                         institutionId={institution.uuid}
@@ -384,14 +434,10 @@ export default function Institution({ institutionId }: Props) {
             </div>
           )}
           {institution.manager?.node && (
-            <div>
-              <>
-                Managed by{" "}
-                <Link href={paths.institution(institution.manager?.node?.uuid)}>
-                  {institution.manager?.node?.name}
-                </Link>
-              </>
-            </div>
+            <Manager data={institution.manager.node} />
+          )}
+          {institution.extras != null && (
+            <JsonViewer jsonData={institution.extras} />
           )}
         </Space>
       </PageHeader>
diff --git a/frontend/components/methods/AddInstitutionMethodDeveloper.tsx b/frontend/components/methods/AddInstitutionMethodDeveloper.tsx
index f685cf880..262fcdad5 100644
--- a/frontend/components/methods/AddInstitutionMethodDeveloper.tsx
+++ b/frontend/components/methods/AddInstitutionMethodDeveloper.tsx
@@ -16,7 +16,7 @@ type FormValues = { institutionId: Scalars["Uuid"]["input"] };
 
 interface AddInstitutionMethodDeveloperProps {
   methodId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function AddInstitutionMethodDeveloper({
   methodId,
@@ -60,6 +60,7 @@ export default function AddInstitutionMethodDeveloper({
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/components/methods/AddUserMethodDeveloper.tsx b/frontend/components/methods/AddUserMethodDeveloper.tsx
index e6eb96b00..4e0e13732 100644
--- a/frontend/components/methods/AddUserMethodDeveloper.tsx
+++ b/frontend/components/methods/AddUserMethodDeveloper.tsx
@@ -16,7 +16,7 @@ type FormValues = { userId: Scalars["Uuid"]["input"] };
 
 interface AddUserMethodDeveloperProps {
   methodId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function AddUserMethodDeveloper({
   methodId,
@@ -60,6 +60,7 @@ export default function AddUserMethodDeveloper({
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/components/methods/CreateMethod.tsx b/frontend/components/methods/CreateMethod.tsx
index 9b2d523b6..f6709440d 100644
--- a/frontend/components/methods/CreateMethod.tsx
+++ b/frontend/components/methods/CreateMethod.tsx
@@ -40,7 +40,7 @@ type FormValues = {
 
 interface CreateMethodProps {
   managerId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function CreateMethod({ managerId }: CreateMethodProps) {
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
@@ -107,6 +107,7 @@ export default function CreateMethod({ managerId }: CreateMethodProps) {
       },
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/components/users/AddUserRole.tsx b/frontend/components/users/AddUserRole.tsx
index 1a682c69e..33f8754a9 100644
--- a/frontend/components/users/AddUserRole.tsx
+++ b/frontend/components/users/AddUserRole.tsx
@@ -17,7 +17,7 @@ type FormValues = { role: UserRole };
 interface AddUserRoleProps {
   userId: Scalars["Uuid"]["input"];
   roles: UserRole[];
-};
+}
 
 export default function AddUserRole({ userId, roles }: AddUserRoleProps) {
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
@@ -57,6 +57,7 @@ export default function AddUserRole({ userId, roles }: AddUserRoleProps) {
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/lib/array.ts b/frontend/lib/array.ts
index bc423f6d4..3cec46a7f 100644
--- a/frontend/lib/array.ts
+++ b/frontend/lib/array.ts
@@ -10,3 +10,16 @@ export function isTruthy<T>(
 ): value is T {
   return Boolean(value);
 }
+
+export function pluralize(count: number, noun: string, suffix = "s") {
+  return `${count} ${noun}${count !== 1 ? suffix : ""}`;
+}
+
+export function pluralizeIrregular(
+  count: number,
+  singular: string,
+  plural?: string,
+) {
+  const word = count === 1 ? singular : (plural ?? `${singular}s`);
+  return `${count} ${word}`;
+}
diff --git a/frontend/package.json b/frontend/package.json
index 53f9d17a0..ee8f3e1e7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -42,7 +42,7 @@
     "@types/react-highlight-words": "^0.20.0",
     "@types/react-test-renderer": "^19.1.0",
     "babel-jest": "^30.2.0",
-    "baseline-browser-mapping": "^2.10.11",
+    "baseline-browser-mapping": "^2.10.12",
     "concurrently": "^9.2.1",
     "deepmerge": "^4.0",
     "eslint": "^10.1.0",
diff --git a/frontend/pages/me/manage/change-password.tsx b/frontend/pages/me/manage/change-password.tsx
index 254cc9b5e..56ccbbda0 100644
--- a/frontend/pages/me/manage/change-password.tsx
+++ b/frontend/pages/me/manage/change-password.tsx
@@ -45,6 +45,7 @@ function Page() {
       {
         onSuccess: () => {
           message.success("Your password has been changed.");
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/pages/me/manage/set-password.tsx b/frontend/pages/me/manage/set-password.tsx
index ba5206bbc..69b806861 100644
--- a/frontend/pages/me/manage/set-password.tsx
+++ b/frontend/pages/me/manage/set-password.tsx
@@ -43,6 +43,7 @@ function Page() {
       {
         onSuccess: () => {
           message.success("Your password has been set.");
+          setGlobalErrorMessages([]);
           form.resetFields();
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/queries/components.graphql b/frontend/queries/components.graphql
index 3268852a5..d2d19ac68 100644
--- a/frontend/queries/components.graphql
+++ b/frontend/queries/components.graphql
@@ -67,6 +67,7 @@ fragment ComponentPartial on Component {
     }
   }
   manufacturers {
+    totalCount
     edges {
       node {
         id
@@ -79,6 +80,7 @@ fragment ComponentPartial on Component {
     isAuthorizedToAddEdge
   }
   pendingManufacturers {
+    totalCount
     edges {
       node {
         id
@@ -89,6 +91,7 @@ fragment ComponentPartial on Component {
     }
   }
   assembledOf {
+    totalCount
     edges {
       node {
         id
@@ -104,6 +107,7 @@ fragment ComponentPartial on Component {
     isAuthorizedToAddEdge
   }
   partOf {
+    totalCount
     edges {
       node {
         id
@@ -119,6 +123,7 @@ fragment ComponentPartial on Component {
     isAuthorizedToAddEdge
   }
   concretizationOf {
+    totalCount
     edges {
       node {
         id
@@ -131,6 +136,7 @@ fragment ComponentPartial on Component {
     isAuthorizedToAddEdge
   }
   generalizationOf {
+    totalCount
     edges {
       node {
         id
@@ -143,6 +149,7 @@ fragment ComponentPartial on Component {
     isAuthorizedToAddEdge
   }
   variantOf {
+    totalCount
     edges {
       node {
         id
@@ -159,6 +166,7 @@ fragment ComponentPartial on Component {
 
 query ComponentNames {
   components(first: 2147483646) {
+    totalCount
     edges {
       node {
         id
@@ -171,6 +179,7 @@ query ComponentNames {
 
 query Components {
   components(first: 2147483646) {
+    totalCount
     edges {
       node {
         ...ComponentsPartial
diff --git a/frontend/queries/institutions.graphql b/frontend/queries/institutions.graphql
index a9b8c128f..ea1ddf1ce 100644
--- a/frontend/queries/institutions.graphql
+++ b/frontend/queries/institutions.graphql
@@ -41,6 +41,7 @@ fragment InstitutionPartial on Institution {
   isAuthorizedToDeleteNode
   isAuthorizedToSwitchOperatingStateOfNode
   manufacturedComponents {
+    totalCount
     edges {
       node {
         ...ComponentsPartial
@@ -48,6 +49,7 @@ fragment InstitutionPartial on Institution {
     }
   }
   managedComponents {
+    totalCount
     edges {
       node {
         ...ComponentsPartial
@@ -56,6 +58,7 @@ fragment InstitutionPartial on Institution {
     isAuthorizedToAddEdge
   }
   pendingManufacturedComponents {
+    totalCount
     edges {
       node {
         id
@@ -66,6 +69,7 @@ fragment InstitutionPartial on Institution {
     isAuthorizedToConfirmEdges
   }
   operatedDatabases {
+    totalCount
     edges {
       node {
         ...DatabasesPartial
@@ -74,6 +78,7 @@ fragment InstitutionPartial on Institution {
     isAuthorizedToAddEdge
   }
   representatives {
+    totalCount
     edges {
       node {
         id
@@ -86,6 +91,7 @@ fragment InstitutionPartial on Institution {
     isAuthorizedToAddEdge
   }
   pendingRepresentatives {
+    totalCount
     edges {
       node {
         id
@@ -104,6 +110,7 @@ fragment InstitutionPartial on Institution {
     }
   }
   managedDataFormats {
+    totalCount
     edges {
       node {
         ...DataFormatsPartial
@@ -112,6 +119,7 @@ fragment InstitutionPartial on Institution {
     isAuthorizedToAddEdge
   }
   managedMethods {
+    totalCount
     edges {
       node {
         ...MethodsPartial
@@ -120,6 +128,7 @@ fragment InstitutionPartial on Institution {
     isAuthorizedToAddEdge
   }
   developedMethods {
+    totalCount
     edges {
       node {
         ...MethodsPartial
@@ -127,6 +136,7 @@ fragment InstitutionPartial on Institution {
     }
   }
   pendingDevelopedMethods {
+    totalCount
     edges {
       node {
         id
@@ -137,6 +147,7 @@ fragment InstitutionPartial on Institution {
     isAuthorizedToConfirmEdges
   }
   gnuPgKeyFingerprints {
+    totalCount
     edges {
       node {
         ...GnuPgKeyFingerprintsPartial
@@ -145,6 +156,7 @@ fragment InstitutionPartial on Institution {
     isAuthorizedToAddEdge
   }
   openIdConnectApplications {
+    totalCount
     edges {
       node {
         ...OpenIdConnectApplicationsPartial
@@ -153,6 +165,7 @@ fragment InstitutionPartial on Institution {
     isAuthorizedToAddEdge
   }
   managedInstitutions {
+    totalCount
     edges {
       node {
         id
@@ -178,6 +191,7 @@ query InstitutionNames {
 
 query Institutions {
   institutions(first: 2147483646) {
+    totalCount
     edges {
       node {
         ...InstitutionsPartial
@@ -188,6 +202,7 @@ query Institutions {
 
 query PendingInstitutions {
   pendingInstitutions {
+    totalCount
     edges {
       node {
         ...PendingInstitutionsPartial
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 5493eb546..5fcd58865 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2949,10 +2949,10 @@ balanced-match@^4.0.2:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-4.0.4.tgz#bfb10662feed8196a2c62e7c68e17720c274179a"
   integrity sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==
 
-baseline-browser-mapping@^2.10.11:
-  version "2.10.11"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.11.tgz#957bea71ccc2e9854287c2575a037d36b3a94b73"
-  integrity sha512-DAKrHphkJyiGuau/cFieRYhcTFeK/lBuD++C7cZ6KZHbMhBrisoi+EvhQ5RZrIfV5qwsW8kgQ07JIC+MDJRAhg==
+baseline-browser-mapping@^2.10.12:
+  version "2.10.12"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.12.tgz#60f9e2172e962839ac313d4e0c8e182090fb6621"
+  integrity sha512-qyq26DxfY4awP2gIRXhhLWfwzwI+N5Nxk6iQi8EFizIaWIjqicQTE4sLnZZVdeKPRcVNoJOkkpfzoIYuvCKaIQ==
 
 baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
   version "2.10.10"

From aecb79d246cce1474ec4e9d165cbae2486fc9386 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sun, 29 Mar 2026 21:35:19 +0200
Subject: [PATCH 006/145] Remove unnecessary picking of properties, make JSON
 in JSON viewer copyable, and remove error-prone type casts

---
 .../{CopyableText.tsx => Copyable.tsx}        | 14 +++------
 frontend/components/CopyableBlock.tsx         | 31 +++++++++++++++++++
 frontend/components/Id.tsx                    |  5 +++
 frontend/components/JsonViewer.tsx            | 24 ++++++++------
 frontend/components/PageHeader.tsx            |  7 +++--
 .../components/components/CreateComponent.tsx |  9 +++---
 .../components/components/UpdateComponent.tsx | 14 ++-------
 .../dataFormats/UpdateDataFormat.tsx          | 14 ++-------
 .../components/databases/UpdateDatabase.tsx   |  7 ++---
 .../components/institutions/Institution.tsx   | 18 ++++-------
 .../institutions/UpdateInstitution.tsx        |  7 ++---
 frontend/components/methods/UpdateMethod.tsx  | 14 ++-------
 12 files changed, 82 insertions(+), 82 deletions(-)
 rename frontend/components/{CopyableText.tsx => Copyable.tsx} (67%)
 create mode 100644 frontend/components/CopyableBlock.tsx
 create mode 100644 frontend/components/Id.tsx

diff --git a/frontend/components/CopyableText.tsx b/frontend/components/Copyable.tsx
similarity index 67%
rename from frontend/components/CopyableText.tsx
rename to frontend/components/Copyable.tsx
index bfb19f11d..cd904d70f 100644
--- a/frontend/components/CopyableText.tsx
+++ b/frontend/components/Copyable.tsx
@@ -1,8 +1,8 @@
 import { Button, Space } from "antd";
-import { CopyOutlined } from "@ant-design/icons";
+import { CopyOutlined, CheckOutlined } from "@ant-design/icons";
 import { ReactNode, useState } from "react";
 
-export default function CopyableText({
+export default function Copyable({
   text,
   children,
 }: {
@@ -12,16 +12,12 @@ export default function CopyableText({
   const [copied, setCopied] = useState(false);
 
   return (
-    <Space
-      style={{
-        fontFamily: "monospace",
-      }}
-    >
-      <span>{children ? children : text}</span>
+    <Space>
+      {children == null ? <span>{text}</span> : children}
       <Button
         type="text"
         size="small"
-        icon={<CopyOutlined />}
+        icon={copied ? <CheckOutlined /> : <CopyOutlined />}
         onClick={() => {
           navigator.clipboard.writeText(text);
           setCopied(true);
diff --git a/frontend/components/CopyableBlock.tsx b/frontend/components/CopyableBlock.tsx
new file mode 100644
index 000000000..6ec3872cd
--- /dev/null
+++ b/frontend/components/CopyableBlock.tsx
@@ -0,0 +1,31 @@
+import { Button } from "antd";
+import { CheckOutlined, CopyOutlined } from "@ant-design/icons";
+import { ReactNode, useState } from "react";
+
+export default function CopyableBlock({
+  text,
+  children,
+}: {
+  text: string;
+  children: ReactNode;
+}) {
+  const [copied, setCopied] = useState(false);
+
+  return (
+    <div style={{ position: "relative" }}>
+      {children}
+      <Button
+        style={{ position: "absolute", right: 10, top: 10 }}
+        type="text"
+        icon={copied ? <CheckOutlined /> : <CopyOutlined />}
+        onClick={() => {
+          navigator.clipboard.writeText(text);
+          setCopied(true);
+          setTimeout(() => setCopied(false), 2000);
+        }}
+      >
+        {copied ? "Copied!" : "Copy"}
+      </Button>
+    </div>
+  );
+}
diff --git a/frontend/components/Id.tsx b/frontend/components/Id.tsx
new file mode 100644
index 000000000..452ac3ff8
--- /dev/null
+++ b/frontend/components/Id.tsx
@@ -0,0 +1,5 @@
+import { Scalars } from "../__generated__/graphql";
+
+export default function Id({ value }: { value: Scalars["Uuid"]["output"] }) {
+  return <code style={{ whiteSpace: "nowrap" }}>{value}</code>;
+}
diff --git a/frontend/components/JsonViewer.tsx b/frontend/components/JsonViewer.tsx
index 56680d637..6f51f4469 100644
--- a/frontend/components/JsonViewer.tsx
+++ b/frontend/components/JsonViewer.tsx
@@ -1,13 +1,19 @@
+import CopyableBlock from "./CopyableBlock";
+
 export default function JsonViewer({ jsonData }: { jsonData: any }) {
+  const jsonString = JSON.stringify(jsonData, null, 2);
+
   return (
-    <pre
-      style={{
-        overflow: "auto",
-      }}
-    >
-      <code style={{ whiteSpace: "pre-wrap", wordWrap: "break-word" }}>
-        {JSON.stringify(jsonData, null, 2)}
-      </code>
-    </pre>
+    <CopyableBlock text={jsonString}>
+      <pre
+        style={{
+          overflow: "auto",
+        }}
+      >
+        <code style={{ whiteSpace: "pre-wrap", wordWrap: "break-word" }}>
+          {jsonString}
+        </code>
+      </pre>
+    </CopyableBlock>
   );
 }
diff --git a/frontend/components/PageHeader.tsx b/frontend/components/PageHeader.tsx
index 9fea739bf..935207813 100644
--- a/frontend/components/PageHeader.tsx
+++ b/frontend/components/PageHeader.tsx
@@ -1,7 +1,8 @@
 import { Breadcrumb, Button, Space, Typography } from "antd";
 import { ArrowLeftOutlined } from "@ant-design/icons";
 import { Scalars } from "../__generated__/graphql";
-import CopyableText from "./CopyableText";
+import Copyable from "./Copyable";
+import Id from "./Id";
 
 const { Title, Text } = Typography;
 
@@ -56,7 +57,9 @@ export default function PageHeader({
         <div>
           {id && (
             <div>
-              <CopyableText text={id} />
+              <Copyable text={id}>
+                <Id value={id} />
+              </Copyable>
             </div>
           )}
           <Space>
diff --git a/frontend/components/components/CreateComponent.tsx b/frontend/components/components/CreateComponent.tsx
index 029da7dc1..73fdf1400 100644
--- a/frontend/components/components/CreateComponent.tsx
+++ b/frontend/components/components/CreateComponent.tsx
@@ -30,7 +30,8 @@ import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import Link from "next/link";
 import paths from "../../paths";
 import { pluralize, pluralizeIrregular } from "../../lib/array";
-import CopyableText from "../CopyableText";
+import Copyable from "../Copyable";
+import Id from "../Id";
 
 type FormValues = {
   name: string;
@@ -146,11 +147,11 @@ export default function CreateComponent({
               description: (
                 <>
                   <Typography.Paragraph>
-                    <CopyableText text={component.uuid}>
+                    <Copyable text={component.uuid}>
                       <Link href={paths.component(component.uuid)}>
-                        {component.uuid}
+                        <Id value={component.uuid} />
                       </Link>{" "}
-                    </CopyableText>
+                    </Copyable>
                   </Typography.Paragraph>
                   {component?.pendingManufacturers != null &&
                     component.pendingManufacturers.totalCount >= 1 && (
diff --git a/frontend/components/components/UpdateComponent.tsx b/frontend/components/components/UpdateComponent.tsx
index 14d3ce4d3..09641e781 100644
--- a/frontend/components/components/UpdateComponent.tsx
+++ b/frontend/components/components/UpdateComponent.tsx
@@ -31,18 +31,8 @@ type FormValues = {
 };
 
 interface UpdateComponentProps {
-  component: Pick<
-    ComponentPartialFragment,
-    | "uuid"
-    | "name"
-    | "abbreviation"
-    | "description"
-    | "availability"
-    | "categories"
-    | "prime"
-    | "switchableLayers"
-  >;
-};
+  component: ComponentPartialFragment;
+}
 
 export default function UpdateComponent({ component }: UpdateComponentProps) {
   const [open, setOpen] = useState(false);
diff --git a/frontend/components/dataFormats/UpdateDataFormat.tsx b/frontend/components/dataFormats/UpdateDataFormat.tsx
index 8f50d18fc..dd504b980 100644
--- a/frontend/components/dataFormats/UpdateDataFormat.tsx
+++ b/frontend/components/dataFormats/UpdateDataFormat.tsx
@@ -22,18 +22,8 @@ type FormValues = {
 };
 
 interface UpdateDataFormatProps {
-  dataFormat: Pick<
-    DataFormatPartialFragment,
-    | "uuid"
-    | "name"
-    | "extension"
-    | "description"
-    | "mediaType"
-    | "schemaLocator"
-    | "reference"
-    | "manager"
-  >;
-};
+  dataFormat: DataFormatPartialFragment;
+}
 
 export default function UpdateDataFormat({
   dataFormat,
diff --git a/frontend/components/databases/UpdateDatabase.tsx b/frontend/components/databases/UpdateDatabase.tsx
index 870e760b2..d0495e83f 100644
--- a/frontend/components/databases/UpdateDatabase.tsx
+++ b/frontend/components/databases/UpdateDatabase.tsx
@@ -18,11 +18,8 @@ type FormValues = {
 };
 
 interface UpdateDatabaseProps {
-  database: Pick<
-    DatabasePartialFragment,
-    "uuid" | "name" | "description" | "locator"
-  >;
-};
+  database: DatabasePartialFragment;
+}
 
 export default function UpdateDatabase({ database }: UpdateDatabaseProps) {
   const [open, setOpen] = useState(false);
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index 9ae9062a2..174cbd9cb 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -33,8 +33,6 @@ import OpenIdConnectApplicationTable from "../openIdConnect/applications/OpenIdC
 import CreateOpenIdConnectApplication from "../openIdConnect/applications/CreateOpenIdConnectApplication";
 import GnuPgKeyFingerprintTable from "../gnuPgKeyFingerprints/GnuPgKeyFingerprintTable";
 import AddGnuPgKeyFingerprint from "../gnuPgKeyFingerprints/AddGnuPgKeyFingerprint";
-import { GnuPgKeyFingerprintsPartialFragment } from "../../queries/gnuPgKeyFingerprints.generated";
-import { OpenIdConnectApplicationsPartialFragment } from "../../queries/openIdConnect.generated";
 import RemoveInstitutionRepresentative from "./RemoveInstitutionRepresentative";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import ConfirmInstitutionMethodDeveloper from "../methods/ConfirmInstitutionMethodDeveloper";
@@ -137,11 +135,9 @@ export default function Institution({ institutionId }: Props) {
       children: (
         <GnuPgKeyFingerprintTable
           loading={false}
-          fingerprints={
-            institution.gnuPgKeyFingerprints.edges.map(
-              (e) => e.node,
-            ) as GnuPgKeyFingerprintsPartialFragment[]
-          }
+          fingerprints={institution.gnuPgKeyFingerprints.edges.map(
+            (e) => e.node,
+          )}
           institutionId={institution.uuid}
         />
       ),
@@ -226,11 +222,9 @@ export default function Institution({ institutionId }: Props) {
       children: (
         <OpenIdConnectApplicationTable
           loading={false}
-          applications={
-            institution.openIdConnectApplications.edges.map(
-              (e) => e.node,
-            ) as OpenIdConnectApplicationsPartialFragment[]
-          }
+          applications={institution.openIdConnectApplications.edges.map(
+            (e) => e.node,
+          )}
         />
       ),
     },
diff --git a/frontend/components/institutions/UpdateInstitution.tsx b/frontend/components/institutions/UpdateInstitution.tsx
index e83e91b35..4c4d37fac 100644
--- a/frontend/components/institutions/UpdateInstitution.tsx
+++ b/frontend/components/institutions/UpdateInstitution.tsx
@@ -25,11 +25,8 @@ type FormValues = {
 };
 
 interface UpdateInstitutionProps {
-  institution: Pick<
-    InstitutionPartialFragment,
-    "uuid" | "name" | "abbreviation" | "description" | "contact"
-  >;
-};
+  institution: InstitutionPartialFragment;
+}
 
 export default function UpdateInstitution({
   institution,
diff --git a/frontend/components/methods/UpdateMethod.tsx b/frontend/components/methods/UpdateMethod.tsx
index 93f4f94e1..5ab41d039 100644
--- a/frontend/components/methods/UpdateMethod.tsx
+++ b/frontend/components/methods/UpdateMethod.tsx
@@ -34,18 +34,8 @@ type FormValues = {
 };
 
 interface UpdateMethodProps {
-  method: Pick<
-    MethodPartialFragment,
-    | "uuid"
-    | "name"
-    | "description"
-    | "validity"
-    | "availability"
-    | "reference"
-    | "calculationLocator"
-    | "categories"
-  >;
-};
+  method: MethodPartialFragment;
+}
 
 export default function UpdateMethod({ method }: UpdateMethodProps) {
   const [open, setOpen] = useState(false);

From 9479e85a2e33af1dd03a86e74cbf7de71267dc1e Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sun, 29 Mar 2026 22:12:00 +0200
Subject: [PATCH 007/145] Right-align user menu items (login/logout/register)

---
 frontend/components/Copyable.tsx      |  2 +-
 frontend/components/CopyableBlock.tsx | 12 +++++++++---
 frontend/components/NavBar.tsx        | 25 +++++++++++++++++--------
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/frontend/components/Copyable.tsx b/frontend/components/Copyable.tsx
index cd904d70f..a81a1bb7b 100644
--- a/frontend/components/Copyable.tsx
+++ b/frontend/components/Copyable.tsx
@@ -24,7 +24,7 @@ export default function Copyable({
           setTimeout(() => setCopied(false), 2000);
         }}
       >
-        {copied ? "Copied!" : "Copy"}
+        {copied ? "Done" : "Copy"}
       </Button>
     </Space>
   );
diff --git a/frontend/components/CopyableBlock.tsx b/frontend/components/CopyableBlock.tsx
index 6ec3872cd..745e5ad46 100644
--- a/frontend/components/CopyableBlock.tsx
+++ b/frontend/components/CopyableBlock.tsx
@@ -12,10 +12,16 @@ export default function CopyableBlock({
   const [copied, setCopied] = useState(false);
 
   return (
-    <div style={{ position: "relative" }}>
+    <div
+      style={{
+        position: "relative",
+        paddingBottom: "1em",
+        borderBottom: "1px solid grey",
+      }}
+    >
       {children}
       <Button
-        style={{ position: "absolute", right: 10, top: 10 }}
+        style={{ position: "absolute", right: 0, bottom: 0 }}
         type="text"
         icon={copied ? <CheckOutlined /> : <CopyOutlined />}
         onClick={() => {
@@ -24,7 +30,7 @@ export default function CopyableBlock({
           setTimeout(() => setCopied(false), 2000);
         }}
       >
-        {copied ? "Copied!" : "Copy"}
+        {copied ? "Done" : "Copy"}
       </Button>
     </div>
   );
diff --git a/frontend/components/NavBar.tsx b/frontend/components/NavBar.tsx
index b3c503e93..77d23085a 100644
--- a/frontend/components/NavBar.tsx
+++ b/frontend/components/NavBar.tsx
@@ -1,11 +1,11 @@
 import { useQuery } from "@apollo/client/react";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { Menu, Button } from "antd";
+import { Menu, Button, Spin } from "antd";
 import { CurrentUserDocument } from "../queries/currentUser.generated";
 import paths from "../paths";
 import { extractAntiforgeryTokenFromCookie } from "../lib/apollo";
-import { UserOutlined } from "@ant-design/icons";
+import { UserOutlined, LoadingOutlined } from "@ant-design/icons";
 import type { Route } from "next";
 
 type NavItemProps =
@@ -18,11 +18,12 @@ type NavItemProps =
 
 interface NavBarProps {
   items: NavItemProps[];
-};
+}
 
 export default function NavBar({ items }: NavBarProps) {
   const router = useRouter();
-  const currentUser = useQuery(CurrentUserDocument)?.data?.currentUser;
+  const { loading, data } = useQuery(CurrentUserDocument);
+  const currentUser = data?.currentUser;
 
   return (
     <>
@@ -43,10 +44,14 @@ export default function NavBar({ items }: NavBarProps) {
             </Menu.SubMenu>
           ),
         )}
-        {/* I would like the following to be on the right but that is not possible at the moment, see issue https://github.com/ant-design/ant-design/issues/10749 */}
-        {currentUser ? (
+        {loading ? (
+          <Menu.Item style={{ marginLeft: "auto" }}>
+            <Spin
+              indicator={<LoadingOutlined style={{ color: "white" }} spin />}
+            />
+          </Menu.Item>
+        ) : currentUser ? (
           <>
-            {/* TODO Put information whether person is allowed to access OpenIdConnect information in query result of current user (using OpenIdConnectAuthorization) */}
             {currentUser?.isAuthorizedToManageOpenIdConnect && (
               <Menu.Item key={paths.openIdConnect}>
                 <Link href={paths.openIdConnect}>OpenId Connect</Link>
@@ -56,6 +61,7 @@ export default function NavBar({ items }: NavBarProps) {
               title={currentUser.name}
               key={paths.me.manage.home}
               icon={<UserOutlined />}
+              style={{ marginLeft: "auto" }}
             >
               <Menu.Item key={paths.user(currentUser.uuid)}>
                 <Link href={paths.user(currentUser.uuid)}>Profile</Link>
@@ -83,7 +89,10 @@ export default function NavBar({ items }: NavBarProps) {
           </>
         ) : (
           <>
-            <Menu.Item key={paths.openIdConnectClientLogin}>
+            <Menu.Item
+              key={paths.openIdConnectClientLogin}
+              style={{ marginLeft: "auto" }}
+            >
               <Link href={paths.openIdConnectClientLogin}>Login</Link>
             </Menu.Item>
             <Menu.Item key={paths.userRegister}>

From 67a9985668527dede5a7f1d3224b21cc6846f3e8 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Mon, 30 Mar 2026 20:03:44 +0200
Subject: [PATCH 008/145] Paginate, filter, and sort via GraphQL instead of in
 the UI, use source generated data loaders, use HotChocolate connections and
 pagination also for nested lists, and migrate to HotChocolate 16

---
 backend/Directory.Build.props                 |    2 +
 backend/dotnet-tools.json                     |    4 +-
 .../Authentication/AuthenticationHandler.cs   |    4 +-
 .../src/Authorization/CommonAuthorization.cs  |   32 +-
 .../OpenIdConnectAuthorization.cs             |    9 +-
 .../src/Configuration/AuthConfiguration.cs    |   14 +-
 .../src/Configuration/GraphQlConfiguration.cs |  183 +-
 .../Controllers/AuthorizationController.cs    |    5 +-
 backend/src/Data/ApplicationDbContext.cs      |  156 +-
 backend/src/Data/Association.cs               |    8 +
 backend/src/Data/AuditableAssociation.cs      |   10 +
 backend/src/Data/AuditableEntity.cs           |   21 +
 backend/src/Data/Component.cs                 |    3 +-
 backend/src/Data/ComponentAssembly.cs         |    2 +
 ...omponentConcretizationAndGeneralization.cs |    1 +
 backend/src/Data/ComponentManufacturer.cs     |    1 +
 backend/src/Data/ComponentVariant.cs          |    2 +
 backend/src/Data/DataCopnstants.cs            |   14 +
 backend/src/Data/DataFormat.cs                |    3 +-
 backend/src/Data/Database.cs                  |    3 +-
 backend/src/Data/DbSeeder.cs                  |   54 +-
 backend/src/Data/Entity.cs                    |    4 +-
 backend/src/Data/GnuPgKeyFingerprint.cs       |   13 +-
 backend/src/Data/IAssociation.cs              |    7 +
 backend/src/Data/IAuditable.cs                |   12 +
 backend/src/Data/IMethodDeveloper.cs          |    1 +
 backend/src/Data/INamed.cs                    |    6 +
 backend/src/Data/Institution.cs               |    4 +-
 .../src/Data/InstitutionMethodDeveloper.cs    |    3 +-
 backend/src/Data/InstitutionRepresentative.cs |    1 +
 backend/src/Data/Method.cs                    |    3 +-
 .../OpenIdConnect/OpenIdConnectApplication.cs |   13 +-
 .../OpenIdConnectAuthorization.cs             |   14 +-
 .../Data/OpenIdConnect/OpenIdConnectScope.cs  |   13 +-
 .../Data/OpenIdConnect/OpenIdConnectToken.cs  |   14 +-
 backend/src/Data/User.cs                      |   12 +-
 backend/src/Data/UserMethodDeveloper.cs       |    3 +-
 backend/src/Extensions/LinqExtensions.cs      |  190 ++
 backend/src/Extensions/NodaTimeExtensions.cs  |   10 +-
 backend/src/Extensions/StringExtensions.cs    |   18 +-
 .../GraphQl/Associations/AssociationType.cs   |   22 +
 .../AuditableAssociationFilterType.cs         |   19 +
 .../AuditableAssociationSortType.cs           |   19 +
 backend/src/GraphQl/AuthorizedConnection.cs   |   14 +-
 .../GraphQl/AuthorizedPaginatedConnection.cs  |   47 +
 .../CalorimetricDataX/CalorimetricData.cs     |   77 +
 .../CalorimetricDataConnection.cs             |    4 +-
 .../CalorimetricDataEdge.cs                   |    4 +-
 .../CalorimetricDataPropositionInput.cs       |    3 +-
 .../CalorimetricDataQueries.cs                |   95 +
 .../Common/OpenEndedDateTimeRangeType.cs      |    4 +
 .../ComponentAssemblyFilterType.cs            |    8 +-
 .../ComponentAssemblySortType.cs              |    9 +-
 .../RemoveComponentAssemblyPayload.cs         |    4 +-
 ...ncretizationAndGeneralizationFilterType.cs |    8 +-
 ...ConcretizationAndGeneralizationSortType.cs |   16 +
 .../RemoveComponentGeneralizationPayload.cs   |    4 +-
 .../AddComponentManufacturerPayload.cs        |    5 +-
 .../ComponentManufacturerFilterType.cs        |    8 +-
 .../ComponentManufacturerMutations.cs         |    6 +-
 .../ComponentManufacturerSortType.cs          |    9 +-
 .../ConfirmComponentManufacturerPayload.cs    |    5 +-
 .../RemoveComponentManufacturerPayload.cs     |    4 +-
 .../ComponentVariantFilterType.cs             |    8 +-
 .../ComponentVariantSortType.cs               |   16 +
 .../RemoveComponentVariantPayload.cs          |    4 +-
 .../ComponentAssembledOfConnection.cs         |   15 +-
 .../Components/ComponentAssembledOfEdge.cs    |   22 +-
 .../ComponentAssembledOfFilterType.cs         |    1 -
 .../ComponentAssembledOfSortType.cs           |   16 +
 .../Components/ComponentByIdDataLoader.cs     |   20 -
 .../ComponentConcretizationOfConnection.cs    |    5 +-
 .../ComponentConcretizationOfEdge.cs          |   11 +-
 .../ComponentConcretizationOfFilterType.cs    |    1 -
 .../ComponentConcretizationOfSortType.cs      |   16 +
 ...tConcretizationsByComponentIdDataLoader.cs |   25 -
 .../Components/ComponentDataLoaders.cs        |  165 ++
 .../GraphQl/Components/ComponentFilterType.cs |    6 +-
 .../ComponentGeneralizationOfConnection.cs    |    6 +-
 .../ComponentGeneralizationOfEdge.cs          |   13 +-
 .../ComponentGeneralizationOfFilterType.cs    |    1 -
 .../ComponentGeneralizationOfSortType.cs      |   16 +
 ...tGeneralizationsByComponentIdDataLoader.cs |   25 -
 .../Components/ComponentManagerEdge.cs        |    6 +-
 .../ComponentManufacturerConnection.cs        |   29 +-
 .../Components/ComponentManufacturerEdge.cs   |   16 +-
 .../ComponentManufacturerFilterType.cs        |    1 -
 .../ComponentManufacturerSortType.cs          |   16 +
 ...entManufacturersByComponentIdDataLoader.cs |   25 -
 .../ComponentPartOfByComponentIdDataLoader.cs |   25 -
 .../Components/ComponentPartOfConnection.cs   |    6 +-
 .../GraphQl/Components/ComponentPartOfEdge.cs |   20 +-
 .../Components/ComponentPartOfFilterType.cs   |    1 -
 .../Components/ComponentPartOfSortType.cs     |   16 +
 .../ComponentPartsByComponentIdDataLoader.cs  |   25 -
 .../GraphQl/Components/ComponentQueries.cs    |   32 +-
 .../GraphQl/Components/ComponentSortType.cs   |    4 +-
 .../src/GraphQl/Components/ComponentType.cs   |   14 +-
 ...mponentVariantOfByComponentIdDataLoader.cs |   25 -
 .../ComponentVariantOfConnection.cs           |    5 +-
 .../Components/ComponentVariantOfEdge.cs      |   11 +-
 .../ComponentVariantOfFilterType.cs           |    1 -
 .../Components/ComponentVariantOfSortType.cs  |   16 +
 ...entManufacturersByComponentIdDataLoader.cs |   25 -
 backend/src/GraphQl/Connection.cs             |   24 +-
 .../ContactInformationFilterType.cs           |    2 +
 .../ContactInformationSortType.cs             |    4 +-
 .../DataFormats/DataFormatByIdDataLoader.cs   |   20 -
 .../DataFormats/DataFormatDataLoaders.cs      |   31 +
 .../DataFormats/DataFormatFilterType.cs       |    6 +-
 .../DataFormats/DataFormatManagerEdge.cs      |    2 +-
 .../GraphQl/DataFormats/DataFormatQueries.cs  |   24 +-
 .../GraphQl/DataFormats/DataFormatSortType.cs |    5 +-
 .../src/GraphQl/DataFormats/DataFormatType.cs |    4 +-
 backend/src/GraphQl/DataLoaders.cs            |  126 +
 backend/src/GraphQl/DataX/AppliedMethod.cs    |   12 +-
 backend/src/GraphQl/DataX/CalorimetricData.cs |   48 -
 .../DataX/CrossDatabaseDataReference.cs       |   23 +-
 backend/src/GraphQl/DataX/Data.cs             |  103 +-
 backend/src/GraphQl/DataX/DataApproval.cs     |   33 +-
 .../src/GraphQl/DataX/DataConnectionBase.cs   |    7 +-
 backend/src/GraphQl/DataX/DataEdgeBase.cs     |    6 +-
 .../src/GraphQl/DataX/DataPropositionInput.cs |    6 +
 .../src/GraphQl/DataX/FileMetaInformation.cs  |   11 +-
 backend/src/GraphQl/DataX/GeometricData.cs    |   47 -
 backend/src/GraphQl/DataX/GetHttpsResource.cs |   20 +-
 backend/src/GraphQl/DataX/HygrothermalData.cs |   44 -
 backend/src/GraphQl/DataX/IApproval.cs        |    2 -
 backend/src/GraphQl/DataX/IData.cs            |   31 +
 backend/src/GraphQl/DataX/LifeCycleData.cs    |   44 -
 .../GraphQl/DataX/OpenEndedDateTimeRange.cs   |    1 -
 backend/src/GraphQl/DataX/OpticalData.cs      |   66 -
 backend/src/GraphQl/DataX/PhotovoltaicData.cs |   44 -
 .../ToTreeVertexAppliedConversionMethod.cs    |   14 +-
 .../Databases/DatabaseByIdDataLoader.cs       |   20 -
 .../GraphQl/Databases/DatabaseDataLoaders.cs  |   31 +
 .../GraphQl/Databases/DatabaseFilterType.cs   |    6 +-
 .../GraphQl/Databases/DatabaseMutations.cs    |    2 +-
 .../GraphQl/Databases/DatabaseOperatorEdge.cs |    2 +-
 .../src/GraphQl/Databases/DatabaseQueries.cs  |   46 +-
 .../GraphQl/Databases/DatabaseResolvers.cs    |  766 +-----
 .../src/GraphQl/Databases/DatabaseSortType.cs |    5 +-
 backend/src/GraphQl/Databases/DatabaseType.cs |   51 +-
 .../DescriptionOrReferenceFilterType.cs       |    2 +
 .../DescriptionOrReferenceSortType.cs         |    2 +
 .../DescriptionOrReferenceType.cs             |    1 +
 backend/src/GraphQl/Edge.cs                   |   10 +-
 .../AssociationsByAssociateIdDataLoader.cs    |   47 -
 ...erType.cs => AuditableEntityFilterType.cs} |    6 +-
 ...SortType.cs => AuditableEntitySortType.cs} |    7 +-
 .../GraphQl/Entities/EntityByIdDataLoader.cs  |   39 -
 backend/src/GraphQl/Entities/EntityType.cs    |    5 +-
 .../ErrorLoggingDiagnosticEventListener.cs    |  187 +-
 .../src/GraphQl/Extensions/PageExtensions.cs  |   66 +
 .../Extensions/ResolverContextExtensions.cs   |   15 +-
 .../Extensions/SortingContextExtensions.cs    |   24 -
 .../GraphQl/Filters/ScalarFilterInputTypes.cs |   65 +-
 .../GraphQl/GeometricDataX/GeometricData.cs   |   77 +
 .../GeometricDataConnection.cs                |    3 +-
 .../GeometricDataEdge.cs                      |    3 +-
 .../GeometricDataPropositionInput.cs          |    3 +-
 .../GeometricDataX/GeometricDataQueries.cs    |   95 +
 ...PgKeyFingerprintByFingerprintDataLoader.cs |   33 -
 .../GnuPgKeyFingerprintByIdDataLoader.cs      |   20 -
 .../GnuPgKeyFingerprintDataLoaders.cs         |   49 +
 .../GnuPgKeyFingerprintFilterType.cs          |    6 +-
 .../GnuPgKeyFingerprintInstitutionEdge.cs     |    2 +-
 .../GnuPgKeyFingerprintMutations.cs           |   10 +-
 .../GnuPgKeyFingerprintQueries.cs             |   21 +-
 .../GnuPgKeyFingerprintSortType.cs            |    6 +-
 .../GnuPgKeyFingerprintType.cs                |    4 +-
 .../GnuPgKeyFingerprintUserEdge.cs            |    2 +-
 backend/src/GraphQl/GraphQlConstants.cs       |    1 +
 backend/src/GraphQl/GraphQlThrowHelper.cs     |   52 +
 backend/src/GraphQl/GraphQlTypeResources.cs   |    8 +
 .../HygrothermalDataX/HygrothermalData.cs     |   75 +
 .../HygrothermalDataConnection.cs             |    3 +-
 .../HygrothermalDataEdge.cs                   |    4 +-
 .../HygrothermalDataPropositionInput.cs       |    3 +-
 .../HygrothermalDataQueries.cs                |   95 +
 .../AddInstitutionMethodDeveloperPayload.cs   |    5 +-
 ...onfirmInstitutionMethodDeveloperPayload.cs |    5 +-
 .../InstitutionMethodDeveloperFilterType.cs   |    8 +-
 .../InstitutionMethodDeveloperSortType.cs     |    9 +-
 ...RemoveInstitutionMethodDeveloperPayload.cs |    5 +-
 .../InstitutionRepresentativeFilterType.cs    |    8 +-
 .../InstitutionRepresentativeMutations.cs     |    6 +-
 .../InstitutionRepresentativeSortType.cs      |    9 +-
 .../RemoveInstitutionRepresentativePayload.cs |    2 +-
 ...eyFingerprintsByInstitutionIdDataLoader.cs |   25 -
 .../Institutions/InstitutionByIdDataLoader.cs |   20 -
 .../Institutions/InstitutionDataLoaders.cs    |  289 +++
 .../InstitutionDevelopedMethodConnection.cs   |   16 +-
 .../InstitutionDevelopedMethodEdge.cs         |    9 +-
 .../InstitutionDevelopedMethodSortType.cs     |   17 +
 ...velopedMethodsByInstitutionIdDataLoader.cs |   25 -
 .../Institutions/InstitutionFilterType.cs     |    6 +-
 ...nstitutionGnuPgKeyFingerprintConnection.cs |    6 +-
 ...nstitutionGnuPgKeyFingerprintFilterType.cs |    1 -
 .../InstitutionGnuPgKeyFingerprintSortType.cs |   17 +
 .../InstitutionManagedComponentConnection.cs  |   10 +-
 .../InstitutionManagedComponentEdge.cs        |   14 +-
 .../InstitutionManagedComponentSortType.cs    |   16 +
 ...agedComponentsByInstitutionIdDataLoader.cs |   25 -
 .../InstitutionManagedDataFormatConnection.cs |   10 +-
 .../InstitutionManagedDataFormatEdge.cs       |   14 +-
 .../InstitutionManagedDataFormatSortType.cs   |   16 +
 ...gedDataFormatsByInstitutionIdDataLoader.cs |   25 -
 ...InstitutionManagedInstitutionConnection.cs |   14 +-
 .../InstitutionManagedInstitutionEdge.cs      |   14 +-
 ...InstitutionManagedInstitutionFilterType.cs |    1 -
 .../InstitutionManagedInstitutionSortType.cs  |   16 +
 ...edInstitutionsByInstitutionIdDataLoader.cs |   26 -
 .../InstitutionManagedMethodConnection.cs     |   12 +-
 .../InstitutionManagedMethodEdge.cs           |   14 +-
 .../InstitutionManagedMethodFilterType.cs     |    1 -
 .../InstitutionManagedMethodSortType.cs       |   17 +
 ...ManagedMethodsByInstitutionIdDataLoader.cs |   25 -
 .../Institutions/InstitutionManagerEdge.cs    |    2 +-
 ...turedComponentByInstitutionIdDataLoader.cs |   25 -
 ...titutionManufacturedComponentConnection.cs |   38 +-
 .../InstitutionManufacturedComponentEdge.cs   |   10 +-
 ...nstitutionManufacturedComponentSortType.cs |   17 +
 .../InstitutionOperatedDatabaseConnection.cs  |    5 +-
 .../InstitutionOperatedDatabaseFilterType.cs  |    1 -
 .../InstitutionOperatedDatabaseSortType.cs    |   17 +
 ...ratedDatabasesByInstitutionIdDataLoader.cs |   25 -
 ...OwnedOpenIdConnectApplicationConnection.cs |    5 +-
 ...tutionOwnedOpenIdConnectApplicationEdge.cs |    2 +
 ...onOwnedOpenIdConnectApplicationSortType.cs |   17 +
 ...ctApplicationsByInstitutionIdDataLoader.cs |   26 -
 .../Institutions/InstitutionQueries.cs        |   48 +-
 .../InstitutionRepresentativeConnection.cs    |    7 +-
 .../InstitutionRepresentativeEdge.cs          |    4 +-
 .../InstitutionRepresentativeFilterType.cs    |    1 -
 .../InstitutionRepresentativeSortType.cs      |   16 +
 ...epresentativesByInstitutionIdDataLoader.cs |   25 -
 .../Institutions/InstitutionSortType.cs       |    5 +-
 .../GraphQl/Institutions/InstitutionType.cs   |   71 +-
 ...velopedMethodsByInstitutionIdDataLoader.cs |   25 -
 ...uredComponentsByInstitutionIdDataLoader.cs |   25 -
 ...epresentativesByInstitutionIdDataLoader.cs |   25 -
 .../GraphQl/LifeCycleDataX/LifeCycleData.cs   |   75 +
 .../LifeCycleDataConnection.cs                |    3 +-
 .../LifeCycleDataEdge.cs                      |    4 +-
 .../LifeCycleDataPropositionInput.cs          |    3 +-
 .../LifeCycleDataX/LifeCycleDataQueries.cs    |   95 +
 .../Methods/InstitutionMethodDeveloperEdge.cs |   12 +-
 ...ionMethodDevelopersByMethodIdDataLoader.cs |   25 -
 .../GraphQl/Methods/MethodByIdDataLoader.cs   |   20 -
 .../src/GraphQl/Methods/MethodDataLoaders.cs  |  108 +
 .../Methods/MethodDeveloperConnection.cs      |   29 +-
 .../GraphQl/Methods/MethodDeveloperEdge.cs    |    6 +-
 .../Methods/MethodDeveloperFilterType.cs      |    9 +-
 .../Methods/MethodDeveloperSortType.cs        |   25 +
 .../src/GraphQl/Methods/MethodFilterType.cs   |    6 +-
 .../src/GraphQl/Methods/MethodManagerEdge.cs  |    2 +-
 backend/src/GraphQl/Methods/MethodQueries.cs  |   24 +-
 backend/src/GraphQl/Methods/MethodSortType.cs |    5 +-
 backend/src/GraphQl/Methods/MethodType.cs     |    6 +-
 ...ionMethodDevelopersByMethodIdDataLoader.cs |   25 -
 ...serMethodDevelopersByMethodIdDataLoader.cs |   25 -
 .../Methods/UserMethodDeveloperEdge.cs        |   12 +-
 ...serMethodDevelopersByMethodIdDataLoader.cs |   25 -
 ...enIdConnectApplicationAuthorizationEdge.cs |    9 +-
 .../OpenIdConnectApplicationByIdDataLoader.cs |   26 -
 .../OpenIdConnectApplicationDataLoaders.cs    |   32 +
 .../OpenIdConnectApplicationFilterType.cs     |    8 +-
 ...licationGrantedAuthorizationConnection.cs} |    9 +-
 ...onnectApplicationIssuedTokenConnection.cs} |    9 +-
 .../OpenIdConnectApplicationMutations.cs      |   24 +-
 .../OpenIdConnectApplicationOwnerEdge.cs      |    2 +-
 .../OpenIdConnectApplicationQueries.cs        |   36 +-
 .../OpenIdConnectApplicationSortType.cs       |   22 +
 .../OpenIdConnectApplicationTokenEdge.cs      |    9 +-
 .../OpenIdConnectApplicationType.cs           |   46 +-
 .../OpenIdConnectEndpointExtensions.cs        |    9 +-
 .../OpenIdConnectGrantTypeExtensions.cs       |    9 +-
 .../OpenIdConnectResponseTypeExtensions.cs    |    9 +-
 ...penIdConnectAuthorizationByIdDataLoader.cs |   26 -
 .../OpenIdConnectAuthorizationDataLoaders.cs  |   32 +
 .../OpenIdConnectAuthorizationFilterType.cs   |   10 +-
 ...nectAuthorizationIssuedTokenConnection.cs} |   15 +-
 .../OpenIdConnectAuthorizationMutations.cs    |    1 -
 .../OpenIdConnectAuthorizationQueries.cs      |   42 +-
 .../OpenIdConnectAuthorizationSortType.cs     |   21 +
 .../OpenIdConnectAuthorizationTokenEdge.cs    |    9 +-
 .../OpenIdConnectAuthorizationType.cs         |   39 +-
 .../{Applications => }/OpenIdConnectScope.cs  |    2 +-
 .../OpenIdConnectScopeExtensions.cs           |   28 +-
 .../OpenIdConnectTokenByIdDataLoader.cs       |   26 -
 .../Tokens/OpenIdConnectTokenDataLoaders.cs   |   32 +
 .../Tokens/OpenIdConnectTokenFilterType.cs    |   16 +-
 .../Tokens/OpenIdConnectTokenMutations.cs     |    1 -
 .../Tokens/OpenIdConnectTokenQueries.cs       |   39 +-
 .../Tokens/OpenIdConnectTokenSortType.cs      |   23 +
 .../Tokens/OpenIdConnectTokenType.cs          |   25 +-
 .../OpticalComponentSubtype.cs                |    2 +-
 ...OpticalComponentSubtypePropositionInput.cs |    2 +-
 .../OpticalComponentType.cs                   |    2 +-
 .../OpticalComponentTypePropositionInput.cs   |    2 +-
 .../src/GraphQl/OpticalDataX/OpticalData.cs   |   85 +
 .../OpticalDataConnection.cs                  |    3 +-
 .../OpticalDataEdge.cs                        |    4 +-
 .../OpticalDataPropositionInput.cs            |    3 +-
 .../OpticalDataX/OpticalDataQueries.cs        |   95 +
 backend/src/GraphQl/PaginatedConnection.cs    |   75 +
 backend/src/GraphQl/PaginatedEdge.cs          |   31 +
 backend/src/GraphQl/PaginationHelpers.cs      |   25 +
 .../PhotovoltaicDataX/PhotovoltaicData.cs     |   75 +
 .../PhotovoltaicDataConnection.cs             |    3 +-
 .../PhotovoltaicDataEdge.cs                   |    4 +-
 .../PhotovoltaicDataPropositionInput.cs       |    3 +-
 .../PhotovoltaicDataQueries.cs                |   95 +
 backend/src/GraphQl/Requests/DataQueries.cs   | 1127 +++++++++
 .../GraphQl/Requests/GraphQlRequestHelper.cs  |  125 +
 .../Requests}/QueryingDatabases.cs            |    3 +-
 .../src/GraphQl/{ => Scalars}/LocaleType.cs   |    2 +-
 backend/src/GraphQl/Scalars/MyUriType.cs      |  109 +
 .../src/GraphQl/Scalars/NonNegativeIntType.cs |   71 +
 backend/src/GraphQl/Sorting.cs                |   18 +
 .../AddUserMethodDeveloperPayload.cs          |    6 +-
 .../ConfirmUserMethodDeveloperPayload.cs      |    5 +-
 .../RemoveUserMethodDeveloperPayload.cs       |    5 +-
 .../UserMethodDeveloperFilterType.cs          |    8 +-
 .../UserMethodDeveloperSortType.cs            |   10 +-
 .../GnuPgKeyFingerprintsByUserIdDataLoader.cs |   25 -
 ...gUserDevelopedMethodsByUserIdDataLoader.cs |   25 -
 ...presentedInstitutionsByUserIdDataLoader.cs |   25 -
 .../Users/UseSignInManagerAttribute.cs        |    2 +-
 .../GraphQl/Users/UseUserManagerAttribute.cs  |    2 +-
 .../src/GraphQl/Users/UserByIdDataLoader.cs   |   20 -
 backend/src/GraphQl/Users/UserDataLoaders.cs  |  130 +
 .../Users/UserDevelopedMethodConnection.cs    |   18 +-
 .../GraphQl/Users/UserDevelopedMethodEdge.cs  |   10 +-
 .../Users/UserDevelopedMethodSortType.cs      |   17 +
 .../UserDevelopedMethodsByUserIdDataLoader.cs |   25 -
 backend/src/GraphQl/Users/UserFilterType.cs   |    9 +-
 .../UserGnuPgKeyFingerprintConnection.cs      |    4 +-
 .../UserGnuPgKeyFingerprintFilterType.cs      |    1 -
 .../Users/UserGnuPgKeyFingerprintSortType.cs  |   17 +
 backend/src/GraphQl/Users/UserQueries.cs      |   24 +-
 .../UserRepresentedInstitutionConnection.cs   |    8 +-
 .../Users/UserRepresentedInstitutionEdge.cs   |   22 +-
 .../UserRepresentedInstitutionFilterType.cs   |    1 -
 .../UserRepresentedInstitutionSortType.cs     |   17 +
 ...presentedInstitutionsByUserIdDataLoader.cs |   26 -
 backend/src/GraphQl/Users/UserSortType.cs     |    7 +-
 backend/src/GraphQl/Users/UserType.cs         |   27 +-
 ...ningAndEncryptionCertificateRotationJob.cs |   20 +-
 backend/src/Json/JsonSerializerSettings.cs    |    7 +
 backend/src/Metabase.csproj                   |   69 +-
 ...18153447_CorrectExistsFlagsOfReferences.cs |    2 +-
 ...FlagsOfReferencesSecondAttempt.Designer.cs | 2023 +++++++++++++++
 ...dUpdatedAndCreatedAtTimestamps.Designer.cs | 2243 +++++++++++++++++
 ...204629_AddUpdatedAndCreatedAtTimestamps.cs |  693 +++++
 .../ApplicationDbContextModelSnapshot.cs      |  236 +-
 backend/src/Migrations/migrate.sql            |  298 +++
 ...04629_AddUpdatedAndCreatedAtTimestamps.sql |  298 +++
 ...ctExistsFlagsOfReferencesSecondAttempt.sql |  256 ++
 backend/src/Program.cs                        |    6 +-
 backend/src/Services/EmailSender.cs           |    2 +-
 backend/src/Startup.cs                        |   38 +-
 backend/test/AuditableTests.cs                |   75 +
 .../GraphQlSchemaTests.IsUnchanged.snap       | 1595 +++++++-----
 backend/test/Metabase.Tests.csproj            |   12 +-
 frontend/codegen.ts                           |    9 +-
 .../components/ActiveFilterAndSortBar.tsx     |  128 +
 frontend/components/Availability.tsx          |   14 -
 frontend/components/CielabColorViewer.tsx     |   10 +
 frontend/components/CodeViewer.tsx            |   32 +
 frontend/components/ContactInformation.tsx    |    2 +-
 frontend/components/CopyButton.tsx            |   73 +
 frontend/components/Copyable.tsx              |   35 +-
 frontend/components/DeleteButton.tsx          |   63 +
 frontend/components/EditButton.tsx            |   30 +
 frontend/components/EnumTag.tsx               |   16 +
 frontend/components/Float.tsx                 |   14 +
 .../components/FloatPropositionFormList.tsx   |  118 -
 frontend/components/Footer.tsx                |    9 +-
 frontend/components/Highlight.tsx             |    6 +-
 frontend/components/Iconize.tsx               |   16 +
 frontend/components/IdentifierItem.tsx        |   95 +
 frontend/components/InlineList.tsx            |   22 +
 frontend/components/JsonViewer.tsx            |   50 +-
 frontend/components/JumpToId.tsx              |   47 +
 frontend/components/Layout.tsx                |   43 +-
 frontend/components/LazyTabs.tsx              |   77 +
 frontend/components/Manager.tsx               |   12 +-
 frontend/components/NavBar.tsx                |  186 +-
 .../components/OpenEndedDateTimeRangeX.tsx    |   14 +-
 frontend/components/PageHeader.tsx            |   83 -
 frontend/components/PaginatedIdSelect.tsx     |  162 ++
 frontend/components/Pagination.tsx            |   62 +
 frontend/components/QueryToolbar.tsx          |   47 +
 frontend/components/Reference.tsx             |  163 +-
 ...ReferenceForm.tsx => ReferenceSubform.tsx} |  107 +-
 frontend/components/SafeDeleteButton.tsx      |   65 +-
 frontend/components/SearchSelect.tsx          |   25 +-
 frontend/components/SelectComponentId.tsx     |   49 -
 frontend/components/SelectInstitutionId.tsx   |   49 -
 frontend/components/SelectUserId.tsx          |   43 -
 frontend/components/SingleSignOnLayout.tsx    |    2 +-
 frontend/components/SlideDown.tsx             |   51 +
 frontend/components/TabLabel.tsx              |    8 +-
 frontend/components/UnauthenticatedResult.tsx |   14 +
 frontend/components/UrlInput.tsx              |   33 +
 frontend/components/UuidFormItem.tsx          |   38 +
 .../components/UuidPropositionFormList.tsx    |  103 -
 .../components/AddAssembledOfComponent.tsx    |   66 +-
 .../components/AddComponentManufacturer.tsx   |   40 +-
 .../AddConcretizationOfComponent.tsx          |   40 +-
 .../AddGeneralizationOfComponent.tsx          |   46 +-
 .../components/AddPartOfComponent.tsx         |   66 +-
 .../components/AddVariantOfComponent.tsx      |   40 +-
 frontend/components/components/Component.tsx  |  456 +---
 .../components/ComponentIdSelect.tsx          |   17 +
 .../components/components/ComponentList.tsx   |   24 +
 .../components/ComponentSummary.tsx           |  303 +++
 .../components/components/ComponentTable.tsx  |   59 -
 .../components/components/CreateComponent.tsx |   28 +-
 .../components/PaginatedComponents.tsx        |   86 +
 .../components/RemoveComponentAssembly.tsx    |    2 +-
 .../RemoveComponentGeneralization.tsx         |    2 +-
 .../RemoveComponentManufacturer.tsx           |    2 +-
 .../components/RemoveComponentVariant.tsx     |    2 +-
 .../components/components/UpdateComponent.tsx |   22 +-
 .../components/UpdateComponentAssembly.tsx    |   10 +-
 frontend/components/data/DataSummary.tsx      |  308 +++
 .../data/calorimetric/CalorimetricData.tsx    |   52 +
 .../calorimetric/CalorimetricDataList.tsx     |   24 +
 .../calorimetric/CalorimetricDataSummary.tsx  |   36 +
 .../PaginatedCalorimetricData.tsx             |   68 +
 .../data/geometric/GeometricData.tsx          |   46 +
 .../data/geometric/GeometricDataList.tsx      |   24 +
 .../data/geometric/GeometricDataSummary.tsx   |   27 +
 .../data/geometric/PaginatedGeometricData.tsx |   61 +
 .../data/hygrothermal/HygrothermalData.tsx    |   52 +
 .../hygrothermal/HygrothermalDataList.tsx     |   24 +
 .../hygrothermal/HygrothermalDataSummary.tsx  |   10 +
 .../PaginatedHygrothermalData.tsx             |   54 +
 .../data/lifeCycle/LifeCycleData.tsx          |   46 +
 .../data/lifeCycle/LifeCycleDataList.tsx      |   24 +
 .../data/lifeCycle/LifeCycleDataSummary.tsx   |   10 +
 .../data/lifeCycle/PaginatedLifeCycleData.tsx |   54 +
 .../components/data/optical/OpticalData.tsx   |   49 +
 .../data/optical/OpticalDataList.tsx          |   27 +
 .../data/optical/OpticalDataRibbon.tsx        |   26 +
 .../data/optical/OpticalDataSummary.tsx       |   88 +
 .../data/optical/PaginatedOpticalData.tsx     |  132 +
 .../PaginatedPhotovoltaicData.tsx             |   54 +
 .../data/photovoltaic/PhotovoltaicData.tsx    |   52 +
 .../photovoltaic/PhotovoltaicDataList.tsx     |   24 +
 .../photovoltaic/PhotovoltaicDataSummary.tsx  |   10 +
 .../dataFormats/CreateDataFormat.tsx          |    4 +-
 .../components/dataFormats/DataFormat.tsx     |   62 +-
 .../components/dataFormats/DataFormatList.tsx |   24 +
 .../dataFormats/DataFormatSummary.tsx         |   60 +
 .../dataFormats/DataFormatTable.tsx           |   89 -
 .../dataFormats/PaginatedDataFormats.tsx      |   68 +
 .../dataFormats/UpdateDataFormat.tsx          |    8 +-
 .../components/databases/CreateDatabase.tsx   |   56 +-
 frontend/components/databases/Database.tsx    |   73 +-
 .../components/databases/DatabaseList.tsx     |   24 +
 .../components/databases/DatabaseSummary.tsx  |   54 +
 .../components/databases/DatabaseTable.tsx    |   76 -
 .../databases/PaginatedDatabases.tsx          |   62 +
 .../databases/PendingDatabaseList.tsx         |   24 +
 .../components/databases/PendingDatabases.tsx |   32 -
 .../components/databases/UpdateDatabase.tsx   |    4 +-
 frontend/components/entities/EntityItem.tsx   |   10 +
 frontend/components/entities/EntityLink.tsx   |   31 +
 frontend/components/entities/EntityList.tsx   |   57 +
 .../components/entities/EntitySummary.tsx     |  110 +
 .../components/entities/PaginatedEntities.tsx |  341 +++
 .../filtering/BaseFilterSubform.tsx           |   56 +
 .../filtering/EnumFilterSubform.tsx           |   61 +
 .../components/filtering/FilterSubform.tsx    |   67 +
 .../filtering/FloatFilterSubform.tsx          |   78 +
 .../components/filtering/IntFilterSubform.tsx |   77 +
 .../filtering/ListFilterSubform.tsx           |   35 +
 .../filtering/ObjectFilterSubform.tsx         |   58 +
 .../filtering/StringFilterSubform.tsx         |   52 +
 .../components/filtering/UrlFilterSubform.tsx |   50 +
 .../filtering/UuidFilterSubform.tsx           |   40 +
 .../AddGnuPgKeyFingerprint.tsx                |    2 +-
 .../GnuPgKeyFingerprintList.tsx               |   24 +
 .../GnuPgKeyFingerprintSummary.tsx            |   68 +
 .../GnuPgKeyFingerprintTable.tsx              |   85 -
 .../PaginatedGnuPgKeyFingerprints.tsx         |   67 +
 .../AddInstitutionRepresentative.tsx          |   74 +-
 .../institutions/CreateInstitution.tsx        |    3 +-
 .../institutions/DeleteInstitution.tsx        |    7 +-
 .../components/institutions/Institution.tsx   |  422 ++--
 .../institutions/InstitutionIdSelect.tsx      |   17 +
 .../institutions/InstitutionList.tsx          |   24 +
 .../institutions/InstitutionSummary.tsx       |  113 +
 .../institutions/InstitutionTable.tsx         |   55 -
 .../institutions/PaginatedInstitutions.tsx    |  184 ++
 .../institutions/PendingInstitutionList.tsx   |   24 +
 .../institutions/PendingInstitutions.tsx      |   32 -
 .../RemoveInstitutionRepresentative.tsx       |    2 +-
 .../institutions/UpdateInstitution.tsx        |    4 +-
 frontend/components/me/ChangeUserEmail.tsx    |    1 +
 frontend/components/me/ManageLayout.tsx       |   43 +-
 frontend/components/me/SetUserPhoneNumber.tsx |    1 +
 .../methods/AddInstitutionMethodDeveloper.tsx |   39 +-
 .../methods/AddUserMethodDeveloper.tsx        |   39 +-
 .../methods/AppliedMethodViewer.tsx           |   78 +
 frontend/components/methods/CreateMethod.tsx  |   32 +-
 frontend/components/methods/Method.tsx        |  220 +-
 frontend/components/methods/MethodList.tsx    |   24 +
 .../methods/MethodParametersSubform.tsx       |  108 +
 .../methods/MethodSourcesSubform.tsx          |   75 +
 frontend/components/methods/MethodSummary.tsx |  163 ++
 frontend/components/methods/MethodTable.tsx   |   83 -
 .../components/methods/PaginatedMethods.tsx   |   96 +
 .../RemoveInstitutionMethodDeveloper.tsx      |    2 +-
 .../methods/RemoveUserMethodDeveloper.tsx     |    2 +-
 frontend/components/methods/UpdateMethod.tsx  |   54 +-
 .../CreateOpenIdConnectApplication.tsx        |    3 +-
 .../DeleteOpenIdConnectApplication.tsx        |    7 +-
 .../applications/OpenIdConnectApplication.tsx |   93 +-
 .../OpenIdConnectApplicationList.tsx          |   24 +
 .../OpenIdConnectApplicationSummary.tsx       |  115 +
 .../OpenIdConnectApplicationTable.tsx         |   60 -
 .../PaginatedOpenIdConnectApplications.tsx    |   62 +
 ...etOpenIdConnectApplicationClientSecret.tsx |   18 +-
 .../UpdateOpenIdConnectApplication.tsx        |    6 +-
 .../DeleteOpenIdConnectAuthorization.tsx      |    7 +-
 .../tokens/OpenIdConnectTokenTable.tsx        |    4 +-
 .../tokens/RevokeOpenIdConnectToken.tsx       |   10 +-
 frontend/components/sorting/SortSubform.tsx   |   35 +
 frontend/components/users/AddUserRole.tsx     |   55 +-
 frontend/components/users/DeleteUser.tsx      |    7 +-
 frontend/components/users/PaginatedUsers.tsx  |   77 +
 frontend/components/users/User.tsx            |  173 +-
 frontend/components/users/UserIdSelect.tsx    |   17 +
 frontend/components/users/UserList.tsx        |   24 +
 frontend/components/users/UserRoleTag.tsx     |    6 +-
 frontend/components/users/UserSummary.tsx     |  102 +
 frontend/{jest.config.js => jest.config.mjs}  |    2 +-
 frontend/lib/apollo.ts                        |   95 +
 frontend/lib/array.ts                         |   30 +-
 frontend/lib/assert.ts                        |    3 +
 frontend/lib/connection.ts                    |   12 +
 frontend/lib/debug.ts                         |    7 +
 frontend/lib/filter.ts                        |  480 ++++
 frontend/lib/form.ts                          |    5 +
 frontend/lib/freeTextFilter.tsx               |  107 -
 frontend/lib/hooks/useDebounce.ts             |   26 +
 frontend/lib/hooks/useInfiniteScrollQuery.ts  |   66 +
 frontend/lib/hooks/usePaginatedQuery.ts       |  145 ++
 frontend/lib/hooks/useRequireAuth.ts          |   12 +-
 frontend/lib/recoveryCodesModal.tsx           |    2 +-
 frontend/lib/sort.ts                          |   36 +
 frontend/lib/string.ts                        |   69 +
 frontend/lib/table.tsx                        |  685 -----
 frontend/package.json                         |    3 +-
 frontend/pages/_app.tsx                       |    1 +
 frontend/pages/components/index.tsx           |   24 +-
 frontend/pages/data-formats/index.tsx         |   26 +-
 frontend/pages/data/calorimetric.tsx          |  343 +--
 frontend/pages/data/geometric.tsx             |  279 +-
 frontend/pages/data/hygrothermal.tsx          |  265 +-
 frontend/pages/data/index.tsx                 |   32 +-
 frontend/pages/data/life-cycle.tsx            |  265 +-
 frontend/pages/data/optical.tsx               |  473 +---
 frontend/pages/data/photovoltaic.tsx          |  266 +-
 .../[uuid]/data/calorimetric/[dataId].tsx     |   22 +
 .../[uuid]/data/geometric/[dataId].tsx        |   22 +
 .../[uuid]/data/hygrothermal/[dataId].tsx     |   22 +
 .../[uuid]/data/life-cycle/[dataId].tsx       |   22 +
 .../[uuid]/data/optical/[dataId].tsx          |   22 +
 .../[uuid]/data/photovoltaic/[dataId].tsx     |   22 +
 frontend/pages/databases/index.tsx            |   99 +-
 frontend/pages/index.tsx                      |  615 ++---
 frontend/pages/institutions/index.tsx         |   41 +-
 frontend/pages/me/manage/email.tsx            |    2 +-
 .../pages/me/manage/enable-authenticator.tsx  |    8 +-
 frontend/pages/me/manage/personal-data.tsx    |    2 +-
 frontend/pages/me/manage/profile.tsx          |    2 +-
 frontend/pages/me/manage/set-password.tsx     |    2 +-
 .../me/manage/two-factor-authentication.tsx   |    2 +-
 frontend/pages/methods/index.tsx              |   24 +-
 frontend/pages/open-id-connect/index.tsx      |   16 +-
 ...our-inbox-after-password-reset-request.tsx |    2 +-
 .../check-your-inbox-after-registration.tsx   |    2 +-
 frontend/pages/users/confirm-email-change.tsx |    2 +-
 frontend/pages/users/confirm-email.tsx        |    2 +-
 frontend/pages/users/index.tsx                |   50 +-
 frontend/pages/users/login/index.tsx          |    1 +
 .../pages/users/login/with-recovery-code.tsx  |    2 +-
 .../users/login/with-two-factor-code.tsx      |    2 +-
 frontend/pages/users/register.tsx             |    6 +-
 frontend/paths.ts                             |  107 +-
 frontend/queries/common.graphql               |   34 +
 frontend/queries/components.graphql           |   96 +-
 frontend/queries/currentUser.graphql          |    1 +
 frontend/queries/data.graphql                 |  356 ++-
 frontend/queries/dataFormats.graphql          |   72 +-
 frontend/queries/databases.graphql            |   50 +-
 frontend/queries/gnuPgKeyFingerprints.graphql |   68 +
 frontend/queries/institutions.graphql         |  115 +-
 frontend/queries/methods.graphql              |  146 +-
 frontend/queries/openIdConnect.graphql        |   88 +-
 frontend/queries/users.graphql                |   70 +-
 frontend/styles/global.css                    |   12 +-
 frontend/type-defs.graphqls                   | 1595 +++++++-----
 frontend/yarn.lock                            |   19 +-
 nginx/templates/default.conf.template         |   23 +-
 611 files changed, 23865 insertions(+), 11183 deletions(-)
 create mode 100644 backend/src/Data/Association.cs
 create mode 100644 backend/src/Data/AuditableAssociation.cs
 create mode 100644 backend/src/Data/AuditableEntity.cs
 create mode 100644 backend/src/Data/DataCopnstants.cs
 create mode 100644 backend/src/Data/IAssociation.cs
 create mode 100644 backend/src/Data/IAuditable.cs
 create mode 100644 backend/src/Data/INamed.cs
 create mode 100644 backend/src/Extensions/LinqExtensions.cs
 create mode 100644 backend/src/GraphQl/Associations/AssociationType.cs
 create mode 100644 backend/src/GraphQl/Associations/AuditableAssociationFilterType.cs
 create mode 100644 backend/src/GraphQl/Associations/AuditableAssociationSortType.cs
 create mode 100644 backend/src/GraphQl/AuthorizedPaginatedConnection.cs
 create mode 100644 backend/src/GraphQl/CalorimetricDataX/CalorimetricData.cs
 rename backend/src/GraphQl/{DataX => CalorimetricDataX}/CalorimetricDataConnection.cs (80%)
 rename backend/src/GraphQl/{DataX => CalorimetricDataX}/CalorimetricDataEdge.cs (65%)
 rename backend/src/GraphQl/{DataX => CalorimetricDataX}/CalorimetricDataPropositionInput.cs (84%)
 create mode 100644 backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs
 create mode 100644 backend/src/GraphQl/ComponentGeneralizations/ComponentConcretizationAndGeneralizationSortType.cs
 create mode 100644 backend/src/GraphQl/ComponentVariants/ComponentVariantSortType.cs
 create mode 100644 backend/src/GraphQl/Components/ComponentAssembledOfSortType.cs
 delete mode 100644 backend/src/GraphQl/Components/ComponentByIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Components/ComponentConcretizationOfSortType.cs
 delete mode 100644 backend/src/GraphQl/Components/ComponentConcretizationsByComponentIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Components/ComponentDataLoaders.cs
 create mode 100644 backend/src/GraphQl/Components/ComponentGeneralizationOfSortType.cs
 delete mode 100644 backend/src/GraphQl/Components/ComponentGeneralizationsByComponentIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Components/ComponentManufacturerSortType.cs
 delete mode 100644 backend/src/GraphQl/Components/ComponentManufacturersByComponentIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/Components/ComponentPartOfByComponentIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Components/ComponentPartOfSortType.cs
 delete mode 100644 backend/src/GraphQl/Components/ComponentPartsByComponentIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/Components/ComponentVariantOfByComponentIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Components/ComponentVariantOfSortType.cs
 delete mode 100644 backend/src/GraphQl/Components/PendingComponentManufacturersByComponentIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/DataFormats/DataFormatByIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/DataFormats/DataFormatDataLoaders.cs
 create mode 100644 backend/src/GraphQl/DataLoaders.cs
 delete mode 100644 backend/src/GraphQl/DataX/CalorimetricData.cs
 delete mode 100644 backend/src/GraphQl/DataX/GeometricData.cs
 delete mode 100644 backend/src/GraphQl/DataX/HygrothermalData.cs
 delete mode 100644 backend/src/GraphQl/DataX/LifeCycleData.cs
 delete mode 100644 backend/src/GraphQl/DataX/OpticalData.cs
 delete mode 100644 backend/src/GraphQl/DataX/PhotovoltaicData.cs
 delete mode 100644 backend/src/GraphQl/Databases/DatabaseByIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Databases/DatabaseDataLoaders.cs
 delete mode 100644 backend/src/GraphQl/Entities/AssociationsByAssociateIdDataLoader.cs
 rename backend/src/GraphQl/Entities/{EntityFilterType.cs => AuditableEntityFilterType.cs} (63%)
 rename backend/src/GraphQl/Entities/{EntitySortType.cs => AuditableEntitySortType.cs} (58%)
 delete mode 100644 backend/src/GraphQl/Entities/EntityByIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Extensions/PageExtensions.cs
 delete mode 100644 backend/src/GraphQl/Extensions/SortingContextExtensions.cs
 create mode 100644 backend/src/GraphQl/GeometricDataX/GeometricData.cs
 rename backend/src/GraphQl/{DataX => GeometricDataX}/GeometricDataConnection.cs (80%)
 rename backend/src/GraphQl/{DataX => GeometricDataX}/GeometricDataEdge.cs (67%)
 rename backend/src/GraphQl/{DataX => GeometricDataX}/GeometricDataPropositionInput.cs (83%)
 create mode 100644 backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs
 delete mode 100644 backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintByFingerprintDataLoader.cs
 delete mode 100644 backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintByIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintDataLoaders.cs
 create mode 100644 backend/src/GraphQl/GraphQlThrowHelper.cs
 create mode 100644 backend/src/GraphQl/GraphQlTypeResources.cs
 create mode 100644 backend/src/GraphQl/HygrothermalDataX/HygrothermalData.cs
 rename backend/src/GraphQl/{DataX => HygrothermalDataX}/HygrothermalDataConnection.cs (80%)
 rename backend/src/GraphQl/{DataX => HygrothermalDataX}/HygrothermalDataEdge.cs (65%)
 rename backend/src/GraphQl/{DataX => HygrothermalDataX}/HygrothermalDataPropositionInput.cs (81%)
 create mode 100644 backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs
 delete mode 100644 backend/src/GraphQl/Institutions/GnuPgKeyFingerprintsByInstitutionIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/Institutions/InstitutionByIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Institutions/InstitutionDataLoaders.cs
 create mode 100644 backend/src/GraphQl/Institutions/InstitutionDevelopedMethodSortType.cs
 delete mode 100644 backend/src/GraphQl/Institutions/InstitutionDevelopedMethodsByInstitutionIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintSortType.cs
 create mode 100644 backend/src/GraphQl/Institutions/InstitutionManagedComponentSortType.cs
 delete mode 100644 backend/src/GraphQl/Institutions/InstitutionManagedComponentsByInstitutionIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Institutions/InstitutionManagedDataFormatSortType.cs
 delete mode 100644 backend/src/GraphQl/Institutions/InstitutionManagedDataFormatsByInstitutionIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Institutions/InstitutionManagedInstitutionSortType.cs
 delete mode 100644 backend/src/GraphQl/Institutions/InstitutionManagedInstitutionsByInstitutionIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Institutions/InstitutionManagedMethodSortType.cs
 delete mode 100644 backend/src/GraphQl/Institutions/InstitutionManagedMethodsByInstitutionIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/Institutions/InstitutionManufacturedComponentByInstitutionIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Institutions/InstitutionManufacturedComponentSortType.cs
 create mode 100644 backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseSortType.cs
 delete mode 100644 backend/src/GraphQl/Institutions/InstitutionOperatedDatabasesByInstitutionIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationSortType.cs
 delete mode 100644 backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationsByInstitutionIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Institutions/InstitutionRepresentativeSortType.cs
 delete mode 100644 backend/src/GraphQl/Institutions/InstitutionRepresentativesByInstitutionIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/Institutions/PendingInstitutionDevelopedMethodsByInstitutionIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/Institutions/PendingInstitutionManufacturedComponentsByInstitutionIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/Institutions/PendingInstitutionRepresentativesByInstitutionIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/LifeCycleDataX/LifeCycleData.cs
 rename backend/src/GraphQl/{DataX => LifeCycleDataX}/LifeCycleDataConnection.cs (80%)
 rename backend/src/GraphQl/{DataX => LifeCycleDataX}/LifeCycleDataEdge.cs (65%)
 rename backend/src/GraphQl/{DataX => LifeCycleDataX}/LifeCycleDataPropositionInput.cs (81%)
 create mode 100644 backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs
 delete mode 100644 backend/src/GraphQl/Methods/InstitutionMethodDevelopersByMethodIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/Methods/MethodByIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Methods/MethodDataLoaders.cs
 create mode 100644 backend/src/GraphQl/Methods/MethodDeveloperSortType.cs
 delete mode 100644 backend/src/GraphQl/Methods/PendingInstitutionMethodDevelopersByMethodIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/Methods/PendingUserMethodDevelopersByMethodIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/Methods/UserMethodDevelopersByMethodIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationByIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationDataLoaders.cs
 rename backend/src/GraphQl/OpenIdConnect/Applications/{OpenIdConnectApplicationAuthorizationConnection.cs => OpenIdConnectApplicationGrantedAuthorizationConnection.cs} (82%)
 rename backend/src/GraphQl/OpenIdConnect/Applications/{OpenIdConnectApplicationTokenConnection.cs => OpenIdConnectApplicationIssuedTokenConnection.cs} (83%)
 create mode 100644 backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationSortType.cs
 delete mode 100644 backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationByIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationDataLoaders.cs
 rename backend/src/GraphQl/OpenIdConnect/Authorizations/{OpenIdConnectAuthorizationTokenConnection.cs => OpenIdConnectAuthorizationIssuedTokenConnection.cs} (71%)
 create mode 100644 backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationSortType.cs
 rename backend/src/GraphQl/OpenIdConnect/{Applications => }/OpenIdConnectScope.cs (87%)
 rename backend/src/GraphQl/OpenIdConnect/{Applications => }/OpenIdConnectScopeExtensions.cs (70%)
 delete mode 100644 backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenByIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenDataLoaders.cs
 create mode 100644 backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenSortType.cs
 rename backend/src/GraphQl/{DataX => OpticalDataX}/OpticalComponentSubtype.cs (92%)
 rename backend/src/GraphQl/{DataX => OpticalDataX}/OpticalComponentSubtypePropositionInput.cs (86%)
 rename backend/src/GraphQl/{DataX => OpticalDataX}/OpticalComponentType.cs (77%)
 rename backend/src/GraphQl/{DataX => OpticalDataX}/OpticalComponentTypePropositionInput.cs (86%)
 create mode 100644 backend/src/GraphQl/OpticalDataX/OpticalData.cs
 rename backend/src/GraphQl/{DataX => OpticalDataX}/OpticalDataConnection.cs (82%)
 rename backend/src/GraphQl/{DataX => OpticalDataX}/OpticalDataEdge.cs (65%)
 rename backend/src/GraphQl/{DataX => OpticalDataX}/OpticalDataPropositionInput.cs (92%)
 create mode 100644 backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs
 create mode 100644 backend/src/GraphQl/PaginatedConnection.cs
 create mode 100644 backend/src/GraphQl/PaginatedEdge.cs
 create mode 100644 backend/src/GraphQl/PaginationHelpers.cs
 create mode 100644 backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicData.cs
 rename backend/src/GraphQl/{DataX => PhotovoltaicDataX}/PhotovoltaicDataConnection.cs (81%)
 rename backend/src/GraphQl/{DataX => PhotovoltaicDataX}/PhotovoltaicDataEdge.cs (65%)
 rename backend/src/GraphQl/{DataX => PhotovoltaicDataX}/PhotovoltaicDataPropositionInput.cs (81%)
 create mode 100644 backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs
 create mode 100644 backend/src/GraphQl/Requests/DataQueries.cs
 create mode 100644 backend/src/GraphQl/Requests/GraphQlRequestHelper.cs
 rename backend/src/{Services => GraphQl/Requests}/QueryingDatabases.cs (99%)
 rename backend/src/GraphQl/{ => Scalars}/LocaleType.cs (98%)
 create mode 100644 backend/src/GraphQl/Scalars/MyUriType.cs
 create mode 100644 backend/src/GraphQl/Scalars/NonNegativeIntType.cs
 create mode 100644 backend/src/GraphQl/Sorting.cs
 delete mode 100644 backend/src/GraphQl/Users/GnuPgKeyFingerprintsByUserIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/Users/PendingUserDevelopedMethodsByUserIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/Users/PendingUserRepresentedInstitutionsByUserIdDataLoader.cs
 delete mode 100644 backend/src/GraphQl/Users/UserByIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Users/UserDataLoaders.cs
 create mode 100644 backend/src/GraphQl/Users/UserDevelopedMethodSortType.cs
 delete mode 100644 backend/src/GraphQl/Users/UserDevelopedMethodsByUserIdDataLoader.cs
 create mode 100644 backend/src/GraphQl/Users/UserGnuPgKeyFingerprintSortType.cs
 create mode 100644 backend/src/GraphQl/Users/UserRepresentedInstitutionSortType.cs
 delete mode 100644 backend/src/GraphQl/Users/UserRepresentedInstitutionsByUserIdDataLoader.cs
 create mode 100644 backend/src/Migrations/20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt.Designer.cs
 create mode 100644 backend/src/Migrations/20260402204629_AddUpdatedAndCreatedAtTimestamps.Designer.cs
 create mode 100644 backend/src/Migrations/20260402204629_AddUpdatedAndCreatedAtTimestamps.cs
 create mode 100644 backend/src/Migrations/migrate_from_20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt_to_20260402204629_AddUpdatedAndCreatedAtTimestamps.sql
 create mode 100644 backend/src/Migrations/rollback_from_20260402204629_AddUpdatedAndCreatedAtTimestamps_to_20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt.sql
 create mode 100644 backend/test/AuditableTests.cs
 create mode 100644 frontend/components/ActiveFilterAndSortBar.tsx
 delete mode 100644 frontend/components/Availability.tsx
 create mode 100644 frontend/components/CielabColorViewer.tsx
 create mode 100644 frontend/components/CodeViewer.tsx
 create mode 100644 frontend/components/CopyButton.tsx
 create mode 100644 frontend/components/DeleteButton.tsx
 create mode 100644 frontend/components/EditButton.tsx
 create mode 100644 frontend/components/EnumTag.tsx
 create mode 100644 frontend/components/Float.tsx
 delete mode 100644 frontend/components/FloatPropositionFormList.tsx
 create mode 100644 frontend/components/Iconize.tsx
 create mode 100644 frontend/components/IdentifierItem.tsx
 create mode 100644 frontend/components/InlineList.tsx
 create mode 100644 frontend/components/JumpToId.tsx
 create mode 100644 frontend/components/LazyTabs.tsx
 delete mode 100644 frontend/components/PageHeader.tsx
 create mode 100644 frontend/components/PaginatedIdSelect.tsx
 create mode 100644 frontend/components/Pagination.tsx
 create mode 100644 frontend/components/QueryToolbar.tsx
 rename frontend/components/{ReferenceForm.tsx => ReferenceSubform.tsx} (82%)
 delete mode 100644 frontend/components/SelectComponentId.tsx
 delete mode 100644 frontend/components/SelectInstitutionId.tsx
 delete mode 100644 frontend/components/SelectUserId.tsx
 create mode 100644 frontend/components/SlideDown.tsx
 create mode 100644 frontend/components/UnauthenticatedResult.tsx
 create mode 100644 frontend/components/UrlInput.tsx
 create mode 100644 frontend/components/UuidFormItem.tsx
 delete mode 100644 frontend/components/UuidPropositionFormList.tsx
 create mode 100644 frontend/components/components/ComponentIdSelect.tsx
 create mode 100644 frontend/components/components/ComponentList.tsx
 create mode 100644 frontend/components/components/ComponentSummary.tsx
 delete mode 100644 frontend/components/components/ComponentTable.tsx
 create mode 100644 frontend/components/components/PaginatedComponents.tsx
 create mode 100644 frontend/components/data/DataSummary.tsx
 create mode 100644 frontend/components/data/calorimetric/CalorimetricData.tsx
 create mode 100644 frontend/components/data/calorimetric/CalorimetricDataList.tsx
 create mode 100644 frontend/components/data/calorimetric/CalorimetricDataSummary.tsx
 create mode 100644 frontend/components/data/calorimetric/PaginatedCalorimetricData.tsx
 create mode 100644 frontend/components/data/geometric/GeometricData.tsx
 create mode 100644 frontend/components/data/geometric/GeometricDataList.tsx
 create mode 100644 frontend/components/data/geometric/GeometricDataSummary.tsx
 create mode 100644 frontend/components/data/geometric/PaginatedGeometricData.tsx
 create mode 100644 frontend/components/data/hygrothermal/HygrothermalData.tsx
 create mode 100644 frontend/components/data/hygrothermal/HygrothermalDataList.tsx
 create mode 100644 frontend/components/data/hygrothermal/HygrothermalDataSummary.tsx
 create mode 100644 frontend/components/data/hygrothermal/PaginatedHygrothermalData.tsx
 create mode 100644 frontend/components/data/lifeCycle/LifeCycleData.tsx
 create mode 100644 frontend/components/data/lifeCycle/LifeCycleDataList.tsx
 create mode 100644 frontend/components/data/lifeCycle/LifeCycleDataSummary.tsx
 create mode 100644 frontend/components/data/lifeCycle/PaginatedLifeCycleData.tsx
 create mode 100644 frontend/components/data/optical/OpticalData.tsx
 create mode 100644 frontend/components/data/optical/OpticalDataList.tsx
 create mode 100644 frontend/components/data/optical/OpticalDataRibbon.tsx
 create mode 100644 frontend/components/data/optical/OpticalDataSummary.tsx
 create mode 100644 frontend/components/data/optical/PaginatedOpticalData.tsx
 create mode 100644 frontend/components/data/photovoltaic/PaginatedPhotovoltaicData.tsx
 create mode 100644 frontend/components/data/photovoltaic/PhotovoltaicData.tsx
 create mode 100644 frontend/components/data/photovoltaic/PhotovoltaicDataList.tsx
 create mode 100644 frontend/components/data/photovoltaic/PhotovoltaicDataSummary.tsx
 create mode 100644 frontend/components/dataFormats/DataFormatList.tsx
 create mode 100644 frontend/components/dataFormats/DataFormatSummary.tsx
 delete mode 100644 frontend/components/dataFormats/DataFormatTable.tsx
 create mode 100644 frontend/components/dataFormats/PaginatedDataFormats.tsx
 create mode 100644 frontend/components/databases/DatabaseList.tsx
 create mode 100644 frontend/components/databases/DatabaseSummary.tsx
 delete mode 100644 frontend/components/databases/DatabaseTable.tsx
 create mode 100644 frontend/components/databases/PaginatedDatabases.tsx
 create mode 100644 frontend/components/databases/PendingDatabaseList.tsx
 delete mode 100644 frontend/components/databases/PendingDatabases.tsx
 create mode 100644 frontend/components/entities/EntityItem.tsx
 create mode 100644 frontend/components/entities/EntityLink.tsx
 create mode 100644 frontend/components/entities/EntityList.tsx
 create mode 100644 frontend/components/entities/EntitySummary.tsx
 create mode 100644 frontend/components/entities/PaginatedEntities.tsx
 create mode 100644 frontend/components/filtering/BaseFilterSubform.tsx
 create mode 100644 frontend/components/filtering/EnumFilterSubform.tsx
 create mode 100644 frontend/components/filtering/FilterSubform.tsx
 create mode 100644 frontend/components/filtering/FloatFilterSubform.tsx
 create mode 100644 frontend/components/filtering/IntFilterSubform.tsx
 create mode 100644 frontend/components/filtering/ListFilterSubform.tsx
 create mode 100644 frontend/components/filtering/ObjectFilterSubform.tsx
 create mode 100644 frontend/components/filtering/StringFilterSubform.tsx
 create mode 100644 frontend/components/filtering/UrlFilterSubform.tsx
 create mode 100644 frontend/components/filtering/UuidFilterSubform.tsx
 create mode 100644 frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintList.tsx
 create mode 100644 frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintSummary.tsx
 delete mode 100644 frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintTable.tsx
 create mode 100644 frontend/components/gnuPgKeyFingerprints/PaginatedGnuPgKeyFingerprints.tsx
 create mode 100644 frontend/components/institutions/InstitutionIdSelect.tsx
 create mode 100644 frontend/components/institutions/InstitutionList.tsx
 create mode 100644 frontend/components/institutions/InstitutionSummary.tsx
 delete mode 100644 frontend/components/institutions/InstitutionTable.tsx
 create mode 100644 frontend/components/institutions/PaginatedInstitutions.tsx
 create mode 100644 frontend/components/institutions/PendingInstitutionList.tsx
 delete mode 100644 frontend/components/institutions/PendingInstitutions.tsx
 create mode 100644 frontend/components/methods/AppliedMethodViewer.tsx
 create mode 100644 frontend/components/methods/MethodList.tsx
 create mode 100644 frontend/components/methods/MethodParametersSubform.tsx
 create mode 100644 frontend/components/methods/MethodSourcesSubform.tsx
 create mode 100644 frontend/components/methods/MethodSummary.tsx
 delete mode 100644 frontend/components/methods/MethodTable.tsx
 create mode 100644 frontend/components/methods/PaginatedMethods.tsx
 create mode 100644 frontend/components/openIdConnect/applications/OpenIdConnectApplicationList.tsx
 create mode 100644 frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
 delete mode 100644 frontend/components/openIdConnect/applications/OpenIdConnectApplicationTable.tsx
 create mode 100644 frontend/components/openIdConnect/applications/PaginatedOpenIdConnectApplications.tsx
 create mode 100644 frontend/components/sorting/SortSubform.tsx
 create mode 100644 frontend/components/users/PaginatedUsers.tsx
 create mode 100644 frontend/components/users/UserIdSelect.tsx
 create mode 100644 frontend/components/users/UserList.tsx
 create mode 100644 frontend/components/users/UserSummary.tsx
 rename frontend/{jest.config.js => jest.config.mjs} (95%)
 create mode 100644 frontend/lib/assert.ts
 create mode 100644 frontend/lib/connection.ts
 create mode 100644 frontend/lib/debug.ts
 create mode 100644 frontend/lib/filter.ts
 delete mode 100644 frontend/lib/freeTextFilter.tsx
 create mode 100644 frontend/lib/hooks/useDebounce.ts
 create mode 100644 frontend/lib/hooks/useInfiniteScrollQuery.ts
 create mode 100644 frontend/lib/hooks/usePaginatedQuery.ts
 create mode 100644 frontend/lib/sort.ts
 create mode 100644 frontend/lib/string.ts
 delete mode 100644 frontend/lib/table.tsx
 create mode 100644 frontend/pages/databases/[uuid]/data/calorimetric/[dataId].tsx
 create mode 100644 frontend/pages/databases/[uuid]/data/geometric/[dataId].tsx
 create mode 100644 frontend/pages/databases/[uuid]/data/hygrothermal/[dataId].tsx
 create mode 100644 frontend/pages/databases/[uuid]/data/life-cycle/[dataId].tsx
 create mode 100644 frontend/pages/databases/[uuid]/data/optical/[dataId].tsx
 create mode 100644 frontend/pages/databases/[uuid]/data/photovoltaic/[dataId].tsx
 create mode 100644 frontend/queries/common.graphql

diff --git a/backend/Directory.Build.props b/backend/Directory.Build.props
index 7538c469d..1de6f3cae 100644
--- a/backend/Directory.Build.props
+++ b/backend/Directory.Build.props
@@ -13,6 +13,8 @@
     <RunAnalyzersDuringLiveAnalysis>true</RunAnalyzersDuringLiveAnalysis>
     <AnalysisLevel>latest-Recommended</AnalysisLevel>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <!-- files are emitted to ./backend/src/obj/Debug/netX.X/generated -->
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
 </Project>
diff --git a/backend/dotnet-tools.json b/backend/dotnet-tools.json
index 6761c3045..5695b5050 100644
--- a/backend/dotnet-tools.json
+++ b/backend/dotnet-tools.json
@@ -24,7 +24,7 @@
       "rollForward": false
     },
     "dotnet-ef": {
-      "version": "10.0.5",
+      "version": "10.0.7",
       "commands": [
         "dotnet-ef"
       ],
@@ -66,7 +66,7 @@
       "rollForward": false
     },
     "jetbrains.resharper.globaltools": {
-      "version": "2025.3.3",
+      "version": "2026.1.1",
       "commands": [
         "jb"
       ],
diff --git a/backend/src/Authentication/AuthenticationHandler.cs b/backend/src/Authentication/AuthenticationHandler.cs
index 88924d810..db9e1766e 100644
--- a/backend/src/Authentication/AuthenticationHandler.cs
+++ b/backend/src/Authentication/AuthenticationHandler.cs
@@ -13,6 +13,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
+using NodaTime;
 using OpenIddict.Abstractions;
 using OpenIddict.Client;
 using OpenIddict.Client.AspNetCore;
@@ -54,6 +55,7 @@ string userId
 }
 
 public sealed class AuthenticationHandler(
+    IClock clock,
     UserManager<User> userManager,
     OpenIddictClientService openIddictClientService,
     ILogger<AuthenticationHandler> logger
@@ -184,7 +186,7 @@ CancellationToken cancellationToken
         var expirationDate = await GetAccessTokenExpirationDateAsync(user, providerName);
         if (accessToken is not null
             && expirationDate is not null
-            && TimeProvider.System.GetUtcNow() <= expirationDate?.Subtract(OpenIdConnectConstants.AccessAndIdentityTokenLifetime.Divide(3))
+            && clock.GetUtcNow().ToDateTimeOffset() <= expirationDate?.Subtract(OpenIdConnectConstants.AccessAndIdentityTokenLifetime.Divide(3))
         )
         {
             return accessToken;
diff --git a/backend/src/Authorization/CommonAuthorization.cs b/backend/src/Authorization/CommonAuthorization.cs
index 21b36d645..e8147f87f 100644
--- a/backend/src/Authorization/CommonAuthorization.cs
+++ b/backend/src/Authorization/CommonAuthorization.cs
@@ -21,14 +21,42 @@ public abstract class CommonAuthorization(
     IDbContextFactory<ApplicationDbContext> dbContextFactory,
     UserManager<User> userManager,
     OpenIddictApplicationManager<OpenIdConnectApplication> applicationManager
-    )
+)
+: IDisposable, IAsyncDisposable
 {
-    protected ApplicationDbContext Context { get => dbContextFactory.CreateDbContext(); }
+    protected ApplicationDbContext Context { get; } = dbContextFactory.CreateDbContext();
     protected UserManager<User> UserManager { get; } = userManager;
     protected OpenIddictApplicationManager<OpenIdConnectApplication> ApplicationManager { get; } = applicationManager;
 
     internal const string ClientSubjectPrefix = "client:";
 
+    // [Implement a DisposeAsync method](https://learn.microsoft.com/en-us/dotnet/standard/garbage-collection/implementing-disposeasync)
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        await DisposeAsyncCore();
+        Dispose(false);
+        GC.SuppressFinalize(this);
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (disposing)
+        {
+            Context.Dispose();
+        }
+    }
+
+    protected virtual ValueTask DisposeAsyncCore()
+    {
+        return Context.DisposeAsync();
+    }
+
     public async Task<T> SwitchUserOrApplicationAsync<T>(
         ClaimsPrincipal claimsPrincipal,
         Func<User?, Task<T>> handleUser,
diff --git a/backend/src/Authorization/OpenIdConnectAuthorization.cs b/backend/src/Authorization/OpenIdConnectAuthorization.cs
index 859b4f67a..ed82ab89e 100644
--- a/backend/src/Authorization/OpenIdConnectAuthorization.cs
+++ b/backend/src/Authorization/OpenIdConnectAuthorization.cs
@@ -14,7 +14,9 @@ namespace Metabase.Authorization;
 public sealed class OpenIdConnectAuthorization(
     IDbContextFactory<ApplicationDbContext> dbContextFactory,
     UserManager<User> userManager,
-    OpenIddictApplicationManager<OpenIdConnectApplication> applicationManager
+    OpenIddictApplicationManager<OpenIdConnectApplication> applicationManager,
+    OpenIddictAuthorizationManager<Data.OpenIdConnect.OpenIdConnectAuthorization> authorizationManager,
+    OpenIddictTokenManager<OpenIdConnectToken> tokenManager
 ) : CommonAuthorization(dbContextFactory, userManager, applicationManager)
 {
     internal Task<bool> IsAuthorizedToManageOpenIdConnect(
@@ -74,7 +76,6 @@ CancellationToken cancellationToken
     internal async Task<bool> IsAuthorizedToManageAuthorization(
         ClaimsPrincipal claimsPrincipal,
         Guid authorizationId,
-        OpenIddictAuthorizationManager<Data.OpenIdConnect.OpenIdConnectAuthorization> authorizationManager,
         CancellationToken cancellationToken
     )
     {
@@ -97,17 +98,15 @@ CancellationToken cancellationToken
     internal Task<bool> IsAuthorizedToManageTokensOfAuthorization(
         ClaimsPrincipal claimsPrincipal,
         Guid authorizationId,
-        OpenIddictAuthorizationManager<Data.OpenIdConnect.OpenIdConnectAuthorization> authorizationManager,
         CancellationToken cancellationToken
     )
     {
-        return IsAuthorizedToManageAuthorization(claimsPrincipal, authorizationId, authorizationManager, cancellationToken);
+        return IsAuthorizedToManageAuthorization(claimsPrincipal, authorizationId, cancellationToken);
     }
 
     internal async Task<bool> IsAuthorizedToManageToken(
         ClaimsPrincipal claimsPrincipal,
         Guid tokenId,
-        OpenIddictTokenManager<OpenIdConnectToken> tokenManager,
         CancellationToken cancellationToken
     )
     {
diff --git a/backend/src/Configuration/AuthConfiguration.cs b/backend/src/Configuration/AuthConfiguration.cs
index 37ff2b1d9..c3cff0a9f 100644
--- a/backend/src/Configuration/AuthConfiguration.cs
+++ b/backend/src/Configuration/AuthConfiguration.cs
@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using NodaTime;
 using OpenIddict.Abstractions;
 using OpenIddict.Client;
 using Quartz;
@@ -35,7 +36,7 @@ public static class AuthConfiguration
         { AuthorizationPolicies.ManageUserScopePolicy, OpenIdConnectScope.ManageUserApiScope },
     };
 
-    private static void BootstrapCertificates()
+    private static void BootstrapCertificates(IClock clock)
     {
         using var store = new X509Store(OpenIdConnectConstants.CertificateStoreName, OpenIdConnectConstants.CertificateStoreLocation);
         try
@@ -55,7 +56,8 @@ private static void BootstrapCertificates()
                 {
                     store.Add(
                         JwtSigningAndEncryptionCertificateRotationJob.CreateSigningCertificate(
-                            distinguishedName
+                            distinguishedName,
+                            clock
                         )
                     );
                 }
@@ -74,7 +76,8 @@ private static void BootstrapCertificates()
                 {
                     store.Add(
                         JwtSigningAndEncryptionCertificateRotationJob.CreateEncryptionCertificate(
-                            distinguishedName
+                            distinguishedName,
+                            clock
                         )
                     );
                 }
@@ -113,10 +116,11 @@ private static IEnumerable<X509Certificate2> FindCertificates(string distinguish
     public static void ConfigureServices(
         IServiceCollection services,
         IWebHostEnvironment environment,
-        AppSettings appSettings
+        AppSettings appSettings,
+        IClock clock
     )
     {
-        BootstrapCertificates();
+        BootstrapCertificates(clock);
         services.AddScoped<AuthenticationHandler>();
         services.AddScoped<GraphQlAuthenticationAndAntiforgeryHandler>();
         ConfigureIdentityServices(services);
diff --git a/backend/src/Configuration/GraphQlConfiguration.cs b/backend/src/Configuration/GraphQlConfiguration.cs
index e9962bcc3..19685c0d7 100644
--- a/backend/src/Configuration/GraphQlConfiguration.cs
+++ b/backend/src/Configuration/GraphQlConfiguration.cs
@@ -1,4 +1,5 @@
 using System;
+using HotChocolate.AspNetCore;
 using HotChocolate.Configuration;
 using HotChocolate.Data;
 using HotChocolate.Data.Filters;
@@ -8,14 +9,16 @@
 using HotChocolate.Language;
 using HotChocolate.Types;
 using HotChocolate.Types.Descriptors;
-using HotChocolate.Types.Descriptors.Definitions;
+using HotChocolate.Types.Descriptors.Configurations;
 using HotChocolate.Types.NodaTime;
 using Metabase.Authentication;
 using Metabase.Data;
 using Metabase.GraphQl;
 using Metabase.GraphQl.DataX;
 using Metabase.GraphQl.Filters;
+using Metabase.GraphQl.Scalars;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -32,8 +35,7 @@ IWebHostEnvironment environment
     {
         // Automatic-Persisted-Queries Services
         services
-            .AddMemoryCache()
-            .AddSha256DocumentHashProvider(HashFormat.Hex); // https://chillicream.com/docs/hotchocolate/v15/security/#fips-compliance
+            .AddMemoryCache();
         // GraphQL Server
         var serverBuilder = services
             .AddGraphQLServer();
@@ -43,59 +45,83 @@ IWebHostEnvironment environment
             serverBuilder.TryAddTypeInterceptor<LoggingTypeInterceptor>();
         }
         serverBuilder
-            // TODO add warmup task once we upgrade to version 16: https://chillicream.com/docs/hotchocolate/v16/server/warmup
-            // .AddWarmupTask(async (executor, cancellationToken) =>
-            // {
-            //     await executor.ExecuteAsync("{ __typename }", cancellationToken);
-            // })
+            .AddSha256DocumentHashProvider(HashFormat.Hex) // https://chillicream.com/docs/hotchocolate/v15/security/#fips-compliance
+            .AddApplicationService<IHttpContextAccessor>() // for `AddHttpRequestInterceptor`
+            .AddApplicationService<ILogger<ErrorLoggingDiagnosticEventListener>>() // for `AddDiagnosticEventListener`
             .DisableIntrospection(false) // if the introspection result becomes too big we need to disable it in production
-            .BindRuntimeType<uint, NonNegativeIntType>()
-            // Services https://chillicream.com/docs/hotchocolate/v13/integrations/entity-framework#registerdbcontext
             .RegisterDbContextFactory<ApplicationDbContext>()
             .AddMutationConventions(new MutationConventionOptions { ApplyToAllMutations = false })
             // Extensions
-            .AddProjections()
+            .AddNodaTime()
+            // .AddProjections()
             .AddFiltering<CustomFilterConvention>()
             .AddSorting<CustomSortConvention>()
             .AddConvention<INamingConventions, CustomNamingConventions>()
             .AddQueryContext()
             .AddAuthorization()
-            .AddGlobalObjectIdentification()
             .AddQueryFieldToMutationPayloads()
-            .ModifyOptions(options =>
+            .AddGlobalObjectIdentification(_ =>
+                {
+                    // _.MaxAllowedNodeBatchSize = 100;
+                    _.EnsureAllNodesCanBeResolved = true;
+                }
+            )
+            .ModifyOptions(_ =>
                 {
                     // https://github.com/ChilliCream/hotchocolate/blob/main/src/HotChocolate/Core/src/Types/Configuration/Contracts/ISchemaOptions.cs
-                    options.StrictValidation = true;
-                    options.UseXmlDocumentation = false;
-                    options.SortFieldsByName = true;
-                    options.RemoveUnreachableTypes = false;
-                    options.RemoveUnusedTypeSystemDirectives = true;
-                    options.DefaultBindingBehavior = BindingBehavior.Implicit;
+                    _.StrictValidation = true;
+                    _.UseXmlDocumentation = false;
+                    _.SortFieldsByName = true;
+                    _.RemoveUnreachableTypes = false;
+                    _.RemoveUnusedTypeSystemDirectives = true;
+                    _.DefaultBindingBehavior = BindingBehavior.Implicit;
                     // options.DefaultFieldBindingFlags = FieldBindingFlags.InstanceAndStatic;
-                    options.EnableDirectiveIntrospection = true;
-                    options.DefaultDirectiveVisibility = DirectiveVisibility.Public;
-                    options.DefaultResolverStrategy = ExecutionStrategy.Parallel;
-                    options.ValidatePipelineOrder = true;
-                    options.StrictRuntimeTypeValidation = true;
-                    options.EnableOneOf = true;
-                    options.EnsureAllNodesCanBeResolved = true;
-                    options.EnableFlagEnums = false;
-                    options.EnableDefer = false;
-                    options.EnableStream = false;
-                    options.EnableSemanticNonNull = false;
-                    options.StripLeadingIFromInterface = false;
-                    options.EnableTag = true;
-                    options.PublishRootFieldPagesToPromiseCache = true;
+                    _.EnableDirectiveIntrospection = true;
+                    _.DefaultDirectiveVisibility = DirectiveVisibility.Public;
+                    _.DefaultResolverStrategy = ExecutionStrategy.Parallel;
+                    _.ValidatePipelineOrder = true;
+                    _.StrictRuntimeTypeValidation = true;
+                    _.EnableFlagEnums = false;
+                    _.EnableDefer = false;
+                    _.EnableStream = false;
+                    _.StripLeadingIFromInterface = false;
+                    _.EnableTag = true;
+                    _.PublishRootFieldPagesToPromiseCache = true;
+                    // options.OperationDocumentCacheSize = 200;
+                    // options.PreparedOperationCacheSize = 100;
                 }
             )
-            .ModifyRequestOptions(options =>
+            .ModifyServerOptions(_ =>
+                {
+                    _.AllowedGetOperations = AllowedGetOperations.Query;
+                    _.Batching = AllowedBatching.None;
+                    _.EnableGetRequests = false;
+                    _.EnableMultipartRequests = true;
+                    _.EnableSchemaRequests = true;
+                    // Nitro
+                    _.Tool.DisableTelemetry = true;
+                    _.Tool.Enable = true; // environment.IsDevelopment()
+                    _.Tool.GraphQLEndpoint = GraphQlConstants.EndpointPath;
+                    _.Tool.IncludeCookies = false;
+                    _.Tool.Title = "GraphQL";
+                    _.Tool.UseBrowserUrlAsGraphQLEndpoint = false;
+                    _.Tool.UseGet = false;
+                }
+            )
+            .ModifyRequestOptions(_ =>
                 {
                     // https://github.com/ChilliCream/hotchocolate/blob/main/src/HotChocolate/Core/src/Execution/Options/RequestExecutorOptions.cs
-                    options.ExecutionTimeout = TimeSpan.FromSeconds(120);
-                    options.IncludeExceptionDetails = !environment.IsProduction(); // Default is `Debugger.IsAttached`.
-                    /* options.QueryCacheSize = ...; */
-                    /* options.UseComplexityMultipliers = ...; */
-                    options.EnableSchemaFileSupport = true;
+                    _.ExecutionTimeout = TimeSpan.FromSeconds(120);
+                    _.IncludeExceptionDetails = !environment.IsProduction(); // Default is `Debugger.IsAttached`.
+                    // options.QueryCacheSize = ...;
+                    // options.UseComplexityMultipliers = ...;
+                    // options.EnableSchemaFileSupport = true;
+                }
+            )
+            .ModifyCostOptions(_ =>
+                {
+                    _.MaxFieldCost = 10000;
+                    _.MaxTypeCost = 10000;
                 }
             )
             // Configure
@@ -108,11 +134,6 @@ IWebHostEnvironment environment
             // Persisted queries
             /* .AddFileSystemOperationDocumentStorage("./persisted_operations") */
             /* .UsePersistedOperationPipeline(); */
-            // HotChocolate uses the default authentication scheme,
-            // which we set to `null` in `AuthConfiguration` to force
-            // users to be explicit about what scheme to use when
-            // making it easier to grasp the various authentication
-            // flows.
             .AddHttpRequestInterceptor(async (httpContext, requestExecutor, requestBuilder, cancellationToken) =>
             {
                 await httpContext.RequestServices
@@ -125,24 +146,12 @@ await httpContext.RequestServices
                 )
             )
             // Scalar Types
-            // TODO Use `MyUuidType` and `MyUrlType` (see code below)
+            // TODO Add `MyUuidType` based on https://github.com/ChilliCream/graphql-platform/blob/main/src/HotChocolate/Core/src/Types/Types/Scalars/UuidType.cs
             .AddType(new UuidType("Uuid", defaultFormat: 'D')) // https://chillicream.com/docs/hotchocolate/defining-a-schema/scalars#uuid-type
-            .AddType(new UrlType("Url"))
-            .AddType(new JsonType("Any", BindingBehavior.Implicit)) // https://chillicream.com/blog/2023/02/08/new-in-hot-chocolate-13#json-scalar
+            .AddType(new MyUriType())
+            .AddType(new AnyType("Any"))
             .AddType<LocaleType>()
-            .AddType<DurationType>()
-            .AddType<DateTimeZoneType>()
-            // .AddType<OffsetDateTimeType>()
-            // Register converters between NodaTime's `OffsetDateTime` and .NET's
-            // `DateTimeOffset` to reuse the existing `DateTimeType`
-            // https://chillicream.com/docs/hotchocolate/v15/defining-a-schema/scalars#custom-converters
-            .BindRuntimeType<OffsetDateTime, DateTimeType>()
-            .AddTypeConverter<OffsetDateTime, DateTimeOffset>(
-                _ => _.ToDateTimeOffset()
-            )
-            .AddTypeConverter<DateTimeOffset, OffsetDateTime>(
-                _ => OffsetDateTime.FromDateTimeOffset(_)
-            )
+            .BindRuntimeType<uint, NonNegativeIntType>()
             // Object Types
             .AddType<DataConnection>()
             // Query, Mutation, Subscription, Object, and Input Types
@@ -155,8 +164,8 @@ await httpContext.RequestServices
             .AddDbContextCursorPagingProvider()
             .ModifyPagingOptions(_ =>
                 {
-                    _.MaxPageSize = int.MaxValue - 1;
-                    _.DefaultPageSize = 100;
+                    _.MaxPageSize = (int)GraphQlConstants.MaximumPageSize;
+                    _.DefaultPageSize = (int)GraphQlConstants.MaximumPageSize;
                     _.IncludeTotalCount = true;
                     _.IncludeNodesField = false;
                     _.InferConnectionNameFromField = true;
@@ -167,6 +176,7 @@ await httpContext.RequestServices
             .AddInMemoryOperationDocumentStorage(); // Needed by the automatic persisted operation pipeline
     }
 
+    // 
     // private sealed class MyUuidType : UuidType
     // {
     //     private const string SpecifiedByString = "https://tools.ietf.org/html/rfc4122";
@@ -185,19 +195,6 @@ await httpContext.RequestServices
     //     }
     // }
 
-    // private sealed class MyUrlType : UrlType
-    // {
-    //     private const string SpecifiedByString = "https://tools.ietf.org/html/rfc3986";
-    //
-    //     public MyUrlType(
-    //         string name,
-    //         string? description = null,
-    //         BindingBehavior bind = BindingBehavior.Explicit)
-    //         : base(name, description, bind)
-    //     {
-    //         SpecifiedBy = new Uri(SpecifiedByString, UriKind.Absolute);
-    //     }
-    // }
 }
 
 // https://github.com/ChilliCream/graphql-platform/blob/main/src/HotChocolate/Core/src/Types/Configuration/TypeInterceptor.cs
@@ -209,14 +206,14 @@ public override void OnBeforeInitialize(ITypeDiscoveryContext discoveryContext)
         Console.WriteLine($"[INIT] Discovered type '{discoveryContext.Type.GetType().Name}'");
     }
 
-    public override void OnBeforeCompleteName(ITypeCompletionContext completionContext, DefinitionBase definition)
+    public override void OnBeforeCompleteName(ITypeCompletionContext completionContext, TypeSystemConfiguration configuration)
     {
-        Console.WriteLine($"[NAME] Finalizing name '{definition.Name}' for type '{completionContext.Type.GetType().Name}'");
+        Console.WriteLine($"[NAME] Finalizing name '{configuration.Name}' for type '{completionContext.Type.GetType().Name}'");
     }
 
-    public override void OnAfterCompleteType(ITypeCompletionContext completionContext, DefinitionBase definition)
+    public override void OnAfterCompleteType(ITypeCompletionContext completionContext, TypeSystemConfiguration configuration)
     {
-        Console.WriteLine($"[DONE] Completed type '{completionContext.Type.GetType().Name}' with name '{definition.Name}'");
+        Console.WriteLine($"[DONE] Completed type '{completionContext.Type.GetType().Name}' with name '{configuration.Name}'");
     }
 }
 
@@ -254,7 +251,9 @@ protected override void Configure(IFilterConventionDescriptor descriptor)
         descriptor.Provider(
             new QueryableFilterProvider(_ => _
                 .AddDefaultFieldHandlers()
-                .AddFieldHandler<QueryableComparableInClosedIntervalHandler<double>>()
+                .AddFieldHandler<QueryableComparableInClosedIntervalHandler<double>>(context =>
+                    new QueryableComparableInClosedIntervalHandler<double>(context.TypeConverter, context.InputParser)
+                )
             )
         );
     }
@@ -396,16 +395,24 @@ this IFilterConventionDescriptor descriptor
             .BindRuntimeType<Guid?, UuidFilterInputType>()
             .BindRuntimeType<DateTime, DateTimeFilterInputType>()
             .BindRuntimeType<DateTime?, DateTimeFilterInputType>()
+            .BindRuntimeType<OffsetDateTime, DateTimeFilterInputType>()
+            .BindRuntimeType<OffsetDateTime?, DateTimeFilterInputType>()
             .BindRuntimeType<DateTimeOffset, DateTimeFilterInputType>()
             .BindRuntimeType<DateTimeOffset?, DateTimeFilterInputType>()
-            // .BindRuntimeType<DateOnly, LocalDateFilterInputType>()
-            // .BindRuntimeType<DateOnly?, LocalDateFilterInputType>()
-            // .BindRuntimeType<TimeOnly, LocalTimeFilterInputType>()
-            // .BindRuntimeType<TimeOnly?, LocalTimeFilterInputType>()
-            .BindRuntimeType<TimeSpan, TimeSpanFilterInputType>()
-            .BindRuntimeType<TimeSpan?, TimeSpanFilterInputType>()
-            .BindRuntimeType<Uri, UrlFilterInputType>()
-            .BindRuntimeType<Uri?, UrlFilterInputType>();
+            .BindRuntimeType<Instant, DateTimeFilterInputType>()
+            .BindRuntimeType<Instant?, DateTimeFilterInputType>()
+            .BindRuntimeType<LocalDateTime, LocalDateTimeFilterInputType>()
+            .BindRuntimeType<LocalDateTime?, LocalDateTimeFilterInputType>()
+            .BindRuntimeType<LocalDate, LocalDateFilterInputType>()
+            .BindRuntimeType<LocalDate?, LocalDateFilterInputType>()
+            .BindRuntimeType<LocalTime, LocalTimeFilterInputType>()
+            .BindRuntimeType<LocalTime?, LocalTimeFilterInputType>()
+            .BindRuntimeType<TimeSpan, DurationFilterInputType>()
+            .BindRuntimeType<TimeSpan?, DurationFilterInputType>()
+            .BindRuntimeType<Duration, DurationFilterInputType>()
+            .BindRuntimeType<Duration?, DurationFilterInputType>()
+            .BindRuntimeType<Uri, UriFilterInputType>()
+            .BindRuntimeType<Uri?, UriFilterInputType>();
     }
 }
 
diff --git a/backend/src/Controllers/AuthorizationController.cs b/backend/src/Controllers/AuthorizationController.cs
index dded00788..a42e2bdd8 100644
--- a/backend/src/Controllers/AuthorizationController.cs
+++ b/backend/src/Controllers/AuthorizationController.cs
@@ -15,6 +15,7 @@
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.Data.OpenIdConnect;
+using Metabase.Extensions;
 using Metabase.ViewModels.Authorization;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Antiforgery;
@@ -30,6 +31,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Tokens;
+using NodaTime;
 using OpenIddict.Abstractions;
 using OpenIddict.Core;
 using OpenIddict.Server.AspNetCore;
@@ -38,6 +40,7 @@
 namespace Metabase.Controllers;
 
 public sealed class AuthorizationController(
+    IClock clock,
     OpenIddictApplicationManager<OpenIdConnectApplication> applicationManager,
     OpenIddictAuthorizationManager<Data.OpenIdConnect.OpenIdConnectAuthorization> authorizationManager,
     OpenIddictScopeManager<OpenIdConnectScope> scopeManager,
@@ -190,7 +193,7 @@ public async Task<IActionResult> Authorize()
                     || (
                         request.MaxAge is not null
                         && result.Properties?.IssuedUtc is not null
-                        && TimeProvider.System.GetUtcNow() - result.Properties.IssuedUtc > TimeSpan.FromSeconds(request.MaxAge.Value)
+                        && clock.GetUtcNow().ToDateTimeOffset() - result.Properties.IssuedUtc > TimeSpan.FromSeconds(request.MaxAge.Value)
                     )
                 )
                 && TempData[IgnoreAuthenticationChallengeKey] is null or false
diff --git a/backend/src/Data/ApplicationDbContext.cs b/backend/src/Data/ApplicationDbContext.cs
index 8a4b749ba..69ec6da83 100644
--- a/backend/src/Data/ApplicationDbContext.cs
+++ b/backend/src/Data/ApplicationDbContext.cs
@@ -3,10 +3,13 @@
 using Microsoft.AspNetCore.DataProtection.EntityFrameworkCore;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using SchemaNameOptionsExtension = Metabase.Data.Extensions.SchemaNameOptionsExtension;
 using NodaTime;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Linq;
+using SchemaNameOptionsExtension = Metabase.Data.Extensions.SchemaNameOptionsExtension;
+using Metabase.Extensions;
 
 namespace Metabase.Data;
 
@@ -14,11 +17,12 @@ namespace Metabase.Data;
 // [Authentication and authorization for SPAs](https://docs.microsoft.com/en-us/aspnet/core/security/authentication/identity-api-authorization?view=aspnetcore-3.0)
 // [Customize Identity Model](https://docs.microsoft.com/en-us/aspnet/core/security/authentication/customize-identity-model?view=aspnetcore-3.0)
 public sealed class ApplicationDbContext
-    : IdentityDbContext<User, Role, Guid, UserClaim, UserRole, UserLogin, RoleClaim, UserToken>,
-        IDataProtectionKeyContext
+: IdentityDbContext<User, Role, Guid, UserClaim, UserRole, UserLogin, RoleClaim, UserToken>,
+  IDataProtectionKeyContext
 {
     private const string DefaultSchemaName = "metabase";
     private readonly string _schemaName;
+    private readonly IClock _clock;
 
     internal const string ComponentCategoryTypeName = "component_category";
     internal const string DatabaseVerificationStateTypeName = "database_verification_state";
@@ -30,7 +34,8 @@ public sealed class ApplicationDbContext
     internal const string StandardizerTypeName = "standardizer";
 
     public ApplicationDbContext(
-        DbContextOptions<ApplicationDbContext> options
+        DbContextOptions<ApplicationDbContext> options,
+        IClock clock
     )
         : base(options)
     {
@@ -38,6 +43,7 @@ DbContextOptions<ApplicationDbContext> options
         // of `UseSchemaName` on a `DbContextOptionsBuilder` instance.
         var schemaNameOptions = options.FindExtension<SchemaNameOptionsExtension>();
         _schemaName = schemaNameOptions is null ? DefaultSchemaName : schemaNameOptions.SchemaName;
+        _clock = clock;
     }
 
     // https://docs.microsoft.com/en-us/ef/core/miscellaneous/nullable-reference-types#dbcontext-and-dbset
@@ -114,22 +120,48 @@ public OffsetDateTimeUtcValueConverter()
         }
     }
 
-    private static
-        EntityTypeBuilder<TEntity>
-        ConfigureEntity<TEntity>(
-            EntityTypeBuilder<TEntity> builder
-        )
-        where TEntity : Entity
+    public override int SaveChanges()
+    {
+        UpdateTimestamps();
+        return base.SaveChanges();
+    }
+
+    public override Task<int> SaveChangesAsync(CancellationToken cancellationToken = default)
     {
-        // https://www.npgsql.org/efcore/modeling/generated-properties.html#guiduuid-generation
-        builder
-            .Property(e => e.Id)
-            .HasDefaultValueSql("gen_random_uuid()");
-        // https://www.npgsql.org/efcore/modeling/concurrency.html#the-postgresql-xmin-system-column
-        builder
-            .Property(e => e.Version)
-            .IsRowVersion();
-        return builder;
+        UpdateTimestamps();
+        return base.SaveChangesAsync(cancellationToken);
+    }
+
+    private void UpdateTimestamps()
+    {
+        var entries = ChangeTracker
+            .Entries<IAuditable>()
+            .Where(_ =>
+                _.State == EntityState.Added
+                || _.State == EntityState.Modified
+            // || _.State == EntityState.Deleted
+            );
+        var now = _clock.GetUtcNow();
+        foreach (var entry in entries)
+        {
+            switch (entry.State)
+            {
+                case EntityState.Added:
+                    entry.Entity.CreatedAt = now;
+                    entry.Entity.UpdatedAt = now;
+                    break;
+                case EntityState.Modified:
+                    entry.Entity.UpdatedAt = now;
+                    break;
+                    // NOTE that soft deletes do not cascade
+                    // case EntityState.Deleted:
+                    //     // soft delete
+                    //     entry.State = EntityState.Modified;
+                    //     entry.Entity.DeletedAt = now;
+                    //     entry.Entity.UpdatedAt = now;
+                    //     break;
+            }
+        }
     }
 
     private static void ConfigureIdentityEntities(
@@ -137,10 +169,7 @@ ModelBuilder builder
     )
     {
         // https://stackoverflow.com/questions/19902756/asp-net-identity-dbcontext-confusion/35722688#35722688
-        builder.Entity<User>()
-            .ToTable("user")
-            .Property(e => e.Version)
-            .IsRowVersion();
+        builder.Entity<User>().ToTable("user");
         builder.Entity<Role>().ToTable("role");
         builder.Entity<UserClaim>().ToTable("user_claim");
         builder.Entity<UserRole>().ToTable("user_role");
@@ -386,43 +415,74 @@ protected override void OnModelCreating(ModelBuilder builder)
         base.OnModelCreating(builder);
         builder.HasDefaultSchema(_schemaName);
         builder.HasPostgresExtension("pgcrypto"); // https://www.npgsql.org/efcore/modeling/generated-properties.html#guiduuid-generation
+        builder.Entity<Component>().ToTable("component");
+        builder.Entity<Database>().ToTable("database");
+        builder.Entity<GnuPgKeyFingerprint>().ToTable("gnu_pg_fingerprint");
+        builder.Entity<DataFormat>().ToTable("data_format");
+        builder.Entity<Institution>().ToTable("institution");
+        builder.Entity<Method>().ToTable("method");
         ConfigureIdentityEntities(builder);
-        ConfigureEntity(
-                builder.Entity<Component>()
-            )
-            .ToTable("component");
         ConfigureComponentAssembly(builder);
         ConfigureComponentConcretizationAndGeneralization(builder);
         ConfigureComponentManufacturer(builder);
         ConfigureComponentVariant(builder);
-        ConfigureEntity(
-                builder.Entity<Database>()
-            )
-            .ToTable("database");
-        ConfigureEntity(
-                builder.Entity<GnuPgKeyFingerprint>()
-            )
-            .ToTable("gnu_pg_fingerprint");
-        ConfigureEntity(
-                builder.Entity<DataFormat>()
-            )
-            .ToTable("data_format");
-        ConfigureEntity(
-                builder.Entity<Institution>()
-            )
-            .ToTable("institution");
         ConfigureInstitutionMethodDeveloper(builder);
         ConfigureInstitutionRepresentative(builder);
         ConfigureOpenIdConnectApplicationOwner(builder);
         ConfigureDatabaseOperator(builder);
-        ConfigureEntity(
-                builder.Entity<Method>()
-            )
-            .ToTable("method");
         ConfigureUserMethodDeveloper(builder);
         ConfigureInstitutionManager(builder);
         ConfigureComponentManager(builder);
         ConfigureDataFormatManager(builder);
         ConfigureMethodManager(builder);
+        foreach (var entityType in builder.Model.GetEntityTypes())
+        {
+            if (typeof(IEntity).IsAssignableFrom(entityType.ClrType))
+            {
+                var entity = builder.Entity(entityType.ClrType);
+                // https://www.npgsql.org/efcore/modeling/generated-properties.html#guiduuid-generation
+                entity
+                    .Property(nameof(IEntity.Id))
+                    .HasDefaultValueSql("gen_random_uuid()");
+                // https://www.npgsql.org/efcore/modeling/concurrency.html#the-postgresql-xmin-system-column
+                entity
+                    .Property(nameof(IEntity.Version))
+                    .IsRowVersion();
+            }
+            if (typeof(IAssociation).IsAssignableFrom(entityType.ClrType))
+            {
+                var association = builder.Entity(entityType.ClrType);
+                // https://www.npgsql.org/efcore/modeling/concurrency.html#the-postgresql-xmin-system-column
+                association
+                    .Property(nameof(IAssociation.Version))
+                    .IsRowVersion();
+            }
+            if (typeof(IAuditable).IsAssignableFrom(entityType.ClrType))
+            {
+                var auditable = builder.Entity(entityType.ClrType);
+                auditable
+                    .Property(nameof(IAuditable.CreatedAt))
+                    .HasDefaultValueSql("now()");
+                auditable
+                    .Property(nameof(IAuditable.UpdatedAt))
+                    .HasDefaultValueSql("now()");
+                // exclude soft-deleted entities with the effect that
+                // `context.<Auditables>.ToList()` only returns rows where
+                // `DeletedAt` is null and
+                // `context.<Auditables>.IgnoreQueryFilters().ToList()` returns
+                // all rows
+                // entity
+                //     .HasQueryFilter((IAuditable _) => _.DeletedAt == null);
+            }
+            if (typeof(IEntity).IsAssignableFrom(entityType.ClrType)
+                && typeof(INamed).IsAssignableFrom(entityType.ClrType))
+            {
+                var entity = builder.Entity(entityType.ClrType);
+                // https://www.npgsql.org/efcore/modeling/generated-properties.html#guiduuid-generation
+                entity
+                    .HasIndex(nameof(INamed.Name), nameof(IEntity.Id))
+                    .IsUnique();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/backend/src/Data/Association.cs b/backend/src/Data/Association.cs
new file mode 100644
index 000000000..e45524dd7
--- /dev/null
+++ b/backend/src/Data/Association.cs
@@ -0,0 +1,8 @@
+namespace Metabase.Data;
+
+public abstract class Association
+{
+    // Configured via `IsRowVersion` in `ApplicationDbContext` instead of the annotation
+    // [Timestamp]
+    public uint Version { get; private set; } // https://www.npgsql.org/efcore/modeling/concurrency.html
+}
\ No newline at end of file
diff --git a/backend/src/Data/AuditableAssociation.cs b/backend/src/Data/AuditableAssociation.cs
new file mode 100644
index 000000000..7d19140bd
--- /dev/null
+++ b/backend/src/Data/AuditableAssociation.cs
@@ -0,0 +1,10 @@
+using NodaTime;
+
+namespace Metabase.Data;
+
+public abstract class AuditableAssociation
+: Association, IAuditable
+{
+    public OffsetDateTime CreatedAt { get; set; }
+    public OffsetDateTime UpdatedAt { get; set; }
+}
diff --git a/backend/src/Data/AuditableEntity.cs b/backend/src/Data/AuditableEntity.cs
new file mode 100644
index 000000000..0416283f4
--- /dev/null
+++ b/backend/src/Data/AuditableEntity.cs
@@ -0,0 +1,21 @@
+using System;
+using NodaTime;
+
+namespace Metabase.Data;
+
+public abstract class AuditableEntity
+: Entity, IAuditable
+{
+    public AuditableEntity()
+    : base()
+    {
+    }
+
+    public AuditableEntity(Guid id)
+    : base(id)
+    {
+    }
+
+    public OffsetDateTime CreatedAt { get; set; }
+    public OffsetDateTime UpdatedAt { get; set; }
+}
diff --git a/backend/src/Data/Component.cs b/backend/src/Data/Component.cs
index 19c7d93f1..6ce11ae40 100644
--- a/backend/src/Data/Component.cs
+++ b/backend/src/Data/Component.cs
@@ -10,7 +10,8 @@
 namespace Metabase.Data;
 
 public sealed class Component
-    : Entity
+    : AuditableEntity,
+      INamed
 {
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     public Component()
diff --git a/backend/src/Data/ComponentAssembly.cs b/backend/src/Data/ComponentAssembly.cs
index be482278e..4000dc364 100644
--- a/backend/src/Data/ComponentAssembly.cs
+++ b/backend/src/Data/ComponentAssembly.cs
@@ -4,7 +4,9 @@
 namespace Metabase.Data;
 
 public sealed class ComponentAssembly
+: AuditableAssociation, IAssociation
 {
+
     public Guid AssembledComponentId { get; set; }
     public Component AssembledComponent { get; set; } = default!;
 
diff --git a/backend/src/Data/ComponentConcretizationAndGeneralization.cs b/backend/src/Data/ComponentConcretizationAndGeneralization.cs
index 7d880f10f..41cc8b0f1 100644
--- a/backend/src/Data/ComponentConcretizationAndGeneralization.cs
+++ b/backend/src/Data/ComponentConcretizationAndGeneralization.cs
@@ -3,6 +3,7 @@
 namespace Metabase.Data;
 
 public sealed class ComponentConcretizationAndGeneralization
+: AuditableAssociation, IAssociation
 {
     public Guid GeneralComponentId { get; set; }
     public Component GeneralComponent { get; set; } = default!;
diff --git a/backend/src/Data/ComponentManufacturer.cs b/backend/src/Data/ComponentManufacturer.cs
index af51c467a..b1ab4e4ce 100644
--- a/backend/src/Data/ComponentManufacturer.cs
+++ b/backend/src/Data/ComponentManufacturer.cs
@@ -3,6 +3,7 @@
 namespace Metabase.Data;
 
 public sealed class ComponentManufacturer
+: AuditableAssociation, IAssociation
 {
     public Guid ComponentId { get; set; }
     public Component Component { get; set; } = default!;
diff --git a/backend/src/Data/ComponentVariant.cs b/backend/src/Data/ComponentVariant.cs
index e7b572614..d06047106 100644
--- a/backend/src/Data/ComponentVariant.cs
+++ b/backend/src/Data/ComponentVariant.cs
@@ -1,8 +1,10 @@
+using EntityFrameworkCore.Projectables;
 using System;
 
 namespace Metabase.Data;
 
 public sealed class ComponentVariant
+: AuditableAssociation, IAssociation
 {
     public Guid OfComponentId { get; set; }
     public Component OfComponent { get; set; } = default!;
diff --git a/backend/src/Data/DataCopnstants.cs b/backend/src/Data/DataCopnstants.cs
new file mode 100644
index 000000000..7d2870ef9
--- /dev/null
+++ b/backend/src/Data/DataCopnstants.cs
@@ -0,0 +1,14 @@
+namespace Metabase.Data;
+
+public static class DataConstants
+{
+    public const string TestlabSolarFacadesOpenIdConnectClientId = "testlab-solar-facades";
+    public const string IgsdbOpenIdConnectClientId = "igsdb";
+
+    public const string IseInstitutionUuid = "5320d6fb-b96d-4aeb-a24c-eb7036d3437a";
+    public const string TestlabInstitutionUuid = "82b9f95c-3261-463a-90fe-0e9da707af17";
+    public const string LbnlInstitutionUuid = "c17af5ef-2f1d-4c73-bcc9-fcfb722420f3";
+
+    public const string TestlabDatabaseUuid = "8a27aa0d-6026-4124-b185-4efd5cead953";
+    public const string IgsdbDatabaseUuid = "48994b60-670d-488d-aaf7-53333a64f1d6";
+}
\ No newline at end of file
diff --git a/backend/src/Data/DataFormat.cs b/backend/src/Data/DataFormat.cs
index 2108f2643..3e53af3d4 100644
--- a/backend/src/Data/DataFormat.cs
+++ b/backend/src/Data/DataFormat.cs
@@ -5,7 +5,8 @@
 namespace Metabase.Data;
 
 public sealed class DataFormat
-    : Entity
+    : AuditableEntity,
+      INamed
 {
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     public DataFormat()
diff --git a/backend/src/Data/Database.cs b/backend/src/Data/Database.cs
index dba9c25ad..50f8a2f66 100644
--- a/backend/src/Data/Database.cs
+++ b/backend/src/Data/Database.cs
@@ -7,7 +7,8 @@
 namespace Metabase.Data;
 
 public sealed class Database
-    : Entity
+    : AuditableEntity,
+      INamed
 {
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     public Database()
diff --git a/backend/src/Data/DbSeeder.cs b/backend/src/Data/DbSeeder.cs
index fe5df256a..6be341dd0 100644
--- a/backend/src/Data/DbSeeder.cs
+++ b/backend/src/Data/DbSeeder.cs
@@ -60,9 +60,6 @@ string scope
 
 public sealed class DbSeeder
 {
-    public const string TestlabSolarFacadesOpenIdConnectClientId = "testlab-solar-facades";
-    public const string IgsdbOpenIdConnectClientId = "igsdb";
-
     public static readonly ReadOnlyCollection<(string Name, string EmailAddress, Enumerations.UserRole Role)> Users =
         Role.AllEnum.Select(role => (
             Role.EnumToName(role),
@@ -78,13 +75,6 @@ public static readonly (string Name, string EmailAddress, Enumerations.UserRole
         VerifierUser =
             Users.First(x => x.Role == Enumerations.UserRole.VERIFIER);
 
-    private const string IseInstitutionUuid = "5320d6fb-b96d-4aeb-a24c-eb7036d3437a";
-    private const string TestlabInstitutionUuid = "82b9f95c-3261-463a-90fe-0e9da707af17";
-    private const string LbnlInstitutionUuid = "c17af5ef-2f1d-4c73-bcc9-fcfb722420f3";
-
-    private const string TestlabDatabaseUuid = "8a27aa0d-6026-4124-b185-4efd5cead953";
-    private const string IgsdbDatabaseUuid = "48994b60-670d-488d-aaf7-53333a64f1d6";
-
     public static async Task DoAsync(
         IServiceProvider services
     )
@@ -172,11 +162,11 @@ IWebHostEnvironment environment
     {
         var manager = services.GetRequiredService<OpenIddictApplicationManager<OpenIdConnectApplication>>();
         var context = services.GetRequiredService<ApplicationDbContext>();
-        var iseInstitution = await context.Institutions.Where(_ => _.Id == new Guid(IseInstitutionUuid)).SingleOrDefaultAsync();
+        var iseInstitution = await context.Institutions.Where(_ => _.Id == new Guid(DataConstants.IseInstitutionUuid)).SingleOrDefaultAsync();
         if (iseInstitution is null)
         {
             iseInstitution = new Institution(
-                new Guid(IseInstitutionUuid),
+                new Guid(DataConstants.IseInstitutionUuid),
                 "Fraunhofer ISE",
                 "ISE",
                 "Fraunhofer Institute for Solar Energy Systems (ISE)",
@@ -210,10 +200,10 @@ IWebHostEnvironment environment
         }
         if (environment.IsDevelopment())
         {
-            if (!await context.Institutions.Where(x => x.Id == new Guid(TestlabInstitutionUuid)).AnyAsync())
+            if (!await context.Institutions.Where(x => x.Id == new Guid(DataConstants.TestlabInstitutionUuid)).AnyAsync())
             {
                 var institution = new Institution(
-                    new Guid(TestlabInstitutionUuid),
+                    new Guid(DataConstants.TestlabInstitutionUuid),
                     "TestLab Solar Facades",
                     "TLSF",
                     "This institution represents the TestLab Solar Facades of Fraunhofer ISE",
@@ -233,7 +223,7 @@ IWebHostEnvironment environment
                     ManagerId = iseInstitution.Id
                 };
 
-                var application = await manager.FindByClientIdAsync(TestlabSolarFacadesOpenIdConnectClientId).AsTask();
+                var application = await manager.FindByClientIdAsync(DataConstants.TestlabSolarFacadesOpenIdConnectClientId).AsTask();
                 if (application is not null)
                 {
                     institution.OpenIdConnectApplications.Add(application);
@@ -241,10 +231,10 @@ IWebHostEnvironment environment
                 context.Institutions.Add(institution);
                 await context.SaveChangesAsync();
             }
-            if (!await context.Institutions.Where(x => x.Id == new Guid(LbnlInstitutionUuid)).AnyAsync())
+            if (!await context.Institutions.Where(x => x.Id == new Guid(DataConstants.LbnlInstitutionUuid)).AnyAsync())
             {
                 var institution = new Institution(
-                    new Guid(LbnlInstitutionUuid),
+                    new Guid(DataConstants.LbnlInstitutionUuid),
                     "LBNL",
                     "LBNL",
                     "Lawrence Berkeley National Laboratory",
@@ -278,39 +268,39 @@ AppSettings appSettings
         if (environment.IsDevelopment())
         {
             var context = services.GetRequiredService<ApplicationDbContext>();
-            if (!await context.Databases.Where(x => x.Id == new Guid(TestlabDatabaseUuid)).AnyAsync())
+            if (!await context.Databases.Where(x => x.Id == new Guid(DataConstants.TestlabDatabaseUuid)).AnyAsync())
             {
                 var uriBuilder = new UriBuilder(appSettings.TestlabSolarFacades.Uri)
                 {
                     Path = "/graphql/"
                 };
                 var database = new Database(
-                    new Guid(TestlabDatabaseUuid),
+                    new Guid(DataConstants.TestlabDatabaseUuid),
                     "TestLab DB",
                     "The database of the TestLab Solar Facades of Fraunhofer ISE",
                     uriBuilder.Uri
                 )
                 {
-                    OperatorId = new Guid(TestlabInstitutionUuid)
+                    OperatorId = new Guid(DataConstants.TestlabInstitutionUuid)
                 };
                 database.Verify();
                 context.Databases.Add(database);
                 await context.SaveChangesAsync();
             }
-            if (!await context.Databases.Where(x => x.Id == new Guid(IgsdbDatabaseUuid)).AnyAsync())
+            if (!await context.Databases.Where(x => x.Id == new Guid(DataConstants.IgsdbDatabaseUuid)).AnyAsync())
             {
                 var uriBuilder = new UriBuilder(new Uri("https://igsdb-v2-staging.herokuapp.com", UriKind.Absolute))
                 {
                     Path = "/graphql/"
                 };
                 var database = new Database(
-                    new Guid(IgsdbDatabaseUuid),
+                    new Guid(DataConstants.IgsdbDatabaseUuid),
                     "IGSDB",
                     "The International Glazing and Shading Database (IGSDB)",
                     uriBuilder.Uri
                 )
                 {
-                    OperatorId = new Guid(LbnlInstitutionUuid)
+                    OperatorId = new Guid(DataConstants.LbnlInstitutionUuid)
                 };
                 database.Verify();
                 context.Databases.Add(database);
@@ -528,7 +518,7 @@ AppSettings appSettings
             .AddResourcePermissions(appSettings.GraphQlEndpoint.AbsoluteUri);
             var application = new OpenIdConnectApplication
             {
-                OwnerId = new Guid(IseInstitutionUuid)
+                OwnerId = new Guid(DataConstants.IseInstitutionUuid)
             };
             await manager.PopulateAsync(application, descriptor);
             // The secret is used in tests, see `IntegrationTests#RequestAuthToken` and in
@@ -538,13 +528,13 @@ AppSettings appSettings
 
         if (environment.IsDevelopment())
         {
-            if (await manager.FindByClientIdAsync(TestlabSolarFacadesOpenIdConnectClientId) is null)
+            if (await manager.FindByClientIdAsync(DataConstants.TestlabSolarFacadesOpenIdConnectClientId) is null)
             {
-                logger.CreatingApplicationClient(TestlabSolarFacadesOpenIdConnectClientId);
+                logger.CreatingApplicationClient(DataConstants.TestlabSolarFacadesOpenIdConnectClientId);
                 var host = appSettings.TestlabSolarFacades.Uri;
                 var descriptor = new OpenIddictApplicationDescriptor
                 {
-                    ClientId = TestlabSolarFacadesOpenIdConnectClientId,
+                    ClientId = DataConstants.TestlabSolarFacadesOpenIdConnectClientId,
                     ClientSecret = null,
                     ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
                     DisplayName = "Testlab-Solar-Facades client application",
@@ -586,7 +576,7 @@ AppSettings appSettings
                 .AddAudiencePermissions(OpenIdConnectConstants.Client.MetabaseClientId);
                 var application = new OpenIdConnectApplication
                 {
-                    OwnerId = new Guid(TestlabInstitutionUuid)
+                    OwnerId = new Guid(DataConstants.TestlabInstitutionUuid)
                 };
                 await manager.PopulateAsync(application, descriptor);
                 // The secret is used in the database client, see
@@ -594,12 +584,12 @@ AppSettings appSettings
                 await manager.CreateAsync(application, appSettings.TestlabSolarFacades.OpenIdConnectClientSecret);
             }
 
-            if (await manager.FindByClientIdAsync(IgsdbOpenIdConnectClientId) is null)
+            if (await manager.FindByClientIdAsync(DataConstants.IgsdbOpenIdConnectClientId) is null)
             {
-                logger.CreatingApplicationClient(IgsdbOpenIdConnectClientId);
+                logger.CreatingApplicationClient(DataConstants.IgsdbOpenIdConnectClientId);
                 var descriptor = new OpenIddictApplicationDescriptor
                 {
-                    ClientId = IgsdbOpenIdConnectClientId,
+                    ClientId = DataConstants.IgsdbOpenIdConnectClientId,
                     ClientSecret = null,
                     ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
                     DisplayName = "IGSDB client application",
@@ -630,7 +620,7 @@ AppSettings appSettings
                 .AddAudiencePermissions(OpenIdConnectConstants.Client.MetabaseClientId);
                 var application = new OpenIdConnectApplication
                 {
-                    OwnerId = new Guid(LbnlInstitutionUuid)
+                    OwnerId = new Guid(DataConstants.LbnlInstitutionUuid)
                 };
                 await manager.PopulateAsync(application, descriptor);
                 await manager.CreateAsync(application, appSettings.Igsdb.OpenIdConnectClientSecret);
diff --git a/backend/src/Data/Entity.cs b/backend/src/Data/Entity.cs
index 7be5f6be8..d9bc8b56f 100644
--- a/backend/src/Data/Entity.cs
+++ b/backend/src/Data/Entity.cs
@@ -1,7 +1,5 @@
 using System;
 
-// using System.ComponentModel.DataAnnotations.Schema;
-
 namespace Metabase.Data;
 
 public abstract class Entity
@@ -16,7 +14,7 @@ public Entity(Guid id)
         Id = id;
     }
 
-    public Guid Id { get; private set; }
+    public Guid Id { get; init; }
 
     // [NotMapped]
     // public Guid Uuid { get => Id; }
diff --git a/backend/src/Data/GnuPgKeyFingerprint.cs b/backend/src/Data/GnuPgKeyFingerprint.cs
index 351786454..57cef02be 100644
--- a/backend/src/Data/GnuPgKeyFingerprint.cs
+++ b/backend/src/Data/GnuPgKeyFingerprint.cs
@@ -11,8 +11,8 @@ namespace Metabase.Data;
 [Index(nameof(Fingerprint), IsUnique = true)]
 public sealed partial class GnuPgKeyFingerprint(
     string fingerprint
-    )
-        : Entity
+)
+: AuditableEntity
 {
     [GeneratedRegex("[^A-F0-9]")]
     private static partial Regex HexadecimalRegex();
@@ -27,7 +27,6 @@ public static string Normalize(string dirtyFingerprint)
 
     [Required][MinLength(1)] public string Fingerprint { get; private set; } = Normalize(fingerprint);
 
-    [Required] public OffsetDateTime CreatedAt { get; private set; } = OffsetDateTime.UtcNow;
     public OffsetDateTime? AllowedAt { get; private set; }
     public OffsetDateTime? ForbiddenAt { get; private set; }
 
@@ -39,19 +38,19 @@ public static string Normalize(string dirtyFingerprint)
     [InverseProperty(nameof(Institution.GnuPgKeyFingerprints))]
     public Institution? Institution { get; set; }
 
-    public void Allow()
+    public void Allow(IClock clock)
     {
-        AllowedAt ??= OffsetDateTime.UtcNow;
+        AllowedAt ??= clock.GetUtcNow();
     }
 
-    public void Forbid()
+    public void Forbid(IClock clock)
     {
         // If this fingerprint has not been allowed for approval yet before it
         // shall be forbidden now, we set `AllowedAt` and `ForbiddenAt` to
         // the present moment making its total validity range the half closed
         // interval `[AllowedAt, ForbiddenAt)` empty. This makes sure that
         // whenever `ForbiddenAt` is set, `AllowedAt` is also set.
-        var now = OffsetDateTime.UtcNow;
+        var now = clock.GetUtcNow();
         AllowedAt ??= now;
         ForbiddenAt ??= now;
     }
diff --git a/backend/src/Data/IAssociation.cs b/backend/src/Data/IAssociation.cs
new file mode 100644
index 000000000..d57b7a2d8
--- /dev/null
+++ b/backend/src/Data/IAssociation.cs
@@ -0,0 +1,7 @@
+namespace Metabase.Data;
+
+public interface IAssociation
+{
+    // Configured via `[Timestamp]` in `Association`
+    public uint Version { get; } // https://www.npgsql.org/efcore/modeling/concurrency.html
+}
\ No newline at end of file
diff --git a/backend/src/Data/IAuditable.cs b/backend/src/Data/IAuditable.cs
new file mode 100644
index 000000000..e9205aa93
--- /dev/null
+++ b/backend/src/Data/IAuditable.cs
@@ -0,0 +1,12 @@
+using NodaTime;
+
+namespace Metabase.Data;
+
+public interface IAuditable
+{
+    public OffsetDateTime CreatedAt { get; set; }
+    public OffsetDateTime UpdatedAt { get; set; }
+
+    // soft delete
+    // public Instant? DeletedAt { get; set; }
+}
diff --git a/backend/src/Data/IMethodDeveloper.cs b/backend/src/Data/IMethodDeveloper.cs
index d5553f614..562cc24b9 100644
--- a/backend/src/Data/IMethodDeveloper.cs
+++ b/backend/src/Data/IMethodDeveloper.cs
@@ -8,6 +8,7 @@ namespace Metabase.Data;
 [JsonDerivedType(typeof(UserMethodDeveloper), typeDiscriminator: nameof(UserMethodDeveloper))]
 [JsonDerivedType(typeof(InstitutionMethodDeveloper), typeDiscriminator: nameof(InstitutionMethodDeveloper))]
 public interface IMethodDeveloper
+: IAuditable, IAssociation
 {
     public Guid MethodId { get; }
     public Method Method { get; }
diff --git a/backend/src/Data/INamed.cs b/backend/src/Data/INamed.cs
new file mode 100644
index 000000000..2427f2a47
--- /dev/null
+++ b/backend/src/Data/INamed.cs
@@ -0,0 +1,6 @@
+namespace Metabase.Data;
+
+public interface INamed
+{
+    public string Name { get; }
+}
\ No newline at end of file
diff --git a/backend/src/Data/Institution.cs b/backend/src/Data/Institution.cs
index 1d2134158..84862d026 100644
--- a/backend/src/Data/Institution.cs
+++ b/backend/src/Data/Institution.cs
@@ -9,7 +9,9 @@
 namespace Metabase.Data;
 
 public sealed class Institution
-: Entity, IStakeholder
+: AuditableEntity,
+  IStakeholder,
+  INamed
 {
     // #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     //     public Institution()
diff --git a/backend/src/Data/InstitutionMethodDeveloper.cs b/backend/src/Data/InstitutionMethodDeveloper.cs
index 3bd55ab9c..53580295c 100644
--- a/backend/src/Data/InstitutionMethodDeveloper.cs
+++ b/backend/src/Data/InstitutionMethodDeveloper.cs
@@ -3,10 +3,11 @@
 namespace Metabase.Data;
 
 public sealed class InstitutionMethodDeveloper
-    : IMethodDeveloper
+: AuditableAssociation, IMethodDeveloper, IAssociation
 {
     public Guid InstitutionId { get; set; }
     public Institution Institution { get; set; } = default!;
+
     public Guid MethodId { get; set; }
     public Method Method { get; set; } = default!;
 
diff --git a/backend/src/Data/InstitutionRepresentative.cs b/backend/src/Data/InstitutionRepresentative.cs
index 32c81d931..e6ab400eb 100644
--- a/backend/src/Data/InstitutionRepresentative.cs
+++ b/backend/src/Data/InstitutionRepresentative.cs
@@ -5,6 +5,7 @@
 namespace Metabase.Data;
 
 public sealed class InstitutionRepresentative
+: AuditableAssociation, IAssociation
 {
     public Guid InstitutionId { get; set; }
     public Institution Institution { get; set; } = default!;
diff --git a/backend/src/Data/Method.cs b/backend/src/Data/Method.cs
index fcc72eafa..539ac6535 100644
--- a/backend/src/Data/Method.cs
+++ b/backend/src/Data/Method.cs
@@ -10,7 +10,8 @@
 namespace Metabase.Data;
 
 public sealed class Method
-    : Entity
+: AuditableEntity,
+  INamed
 {
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     public Method()
diff --git a/backend/src/Data/OpenIdConnect/OpenIdConnectApplication.cs b/backend/src/Data/OpenIdConnect/OpenIdConnectApplication.cs
index 3323d8d77..51f335b2f 100644
--- a/backend/src/Data/OpenIdConnect/OpenIdConnectApplication.cs
+++ b/backend/src/Data/OpenIdConnect/OpenIdConnectApplication.cs
@@ -1,19 +1,24 @@
 using System;
-using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using NodaTime;
 using OpenIddict.EntityFrameworkCore.Models;
 
 namespace Metabase.Data.OpenIdConnect;
 
 public sealed class OpenIdConnectApplication
     : OpenIddictEntityFrameworkCoreApplication<Guid, OpenIdConnectAuthorization, OpenIdConnectToken>,
-      IEntity
+      IEntity,
+      IAuditable
 {
     public Guid OwnerId { get; set; }
 
     [InverseProperty(nameof(Institution.OpenIdConnectApplications))]
     public Institution Owner { get; set; } = null!;
 
-    [Timestamp]
+    public OffsetDateTime CreatedAt { get; set; }
+    public OffsetDateTime UpdatedAt { get; set; }
+
+    // Configured via `IsRowVersion` in `ApplicationDbContext` instead of the annotation
+    // [Timestamp]
     public uint Version { get; private set; } // https://www.npgsql.org/efcore/modeling/concurrency.html
-}
\ No newline at end of file
+}
diff --git a/backend/src/Data/OpenIdConnect/OpenIdConnectAuthorization.cs b/backend/src/Data/OpenIdConnect/OpenIdConnectAuthorization.cs
index c9c87c533..ffc22de68 100644
--- a/backend/src/Data/OpenIdConnect/OpenIdConnectAuthorization.cs
+++ b/backend/src/Data/OpenIdConnect/OpenIdConnectAuthorization.cs
@@ -1,13 +1,19 @@
 using System;
-using System.ComponentModel.DataAnnotations;
+using NodaTime;
 using OpenIddict.EntityFrameworkCore.Models;
 
 namespace Metabase.Data.OpenIdConnect;
 
 public sealed class OpenIdConnectAuthorization
     : OpenIddictEntityFrameworkCoreAuthorization<Guid, OpenIdConnectApplication, OpenIdConnectToken>,
-      IEntity
+      IEntity,
+      IAuditable
 {
-    [Timestamp]
+    // `createdAt` could be an alias of `creationDate`
+    public OffsetDateTime CreatedAt { get; set; }
+    public OffsetDateTime UpdatedAt { get; set; }
+
+    // Configured via `IsRowVersion` in `ApplicationDbContext` instead of the annotation
+    // [Timestamp]
     public uint Version { get; private set; } // https://www.npgsql.org/efcore/modeling/concurrency.html
-}
\ No newline at end of file
+}
diff --git a/backend/src/Data/OpenIdConnect/OpenIdConnectScope.cs b/backend/src/Data/OpenIdConnect/OpenIdConnectScope.cs
index 2c93717d2..90cfc7345 100644
--- a/backend/src/Data/OpenIdConnect/OpenIdConnectScope.cs
+++ b/backend/src/Data/OpenIdConnect/OpenIdConnectScope.cs
@@ -1,5 +1,5 @@
 using System;
-using System.ComponentModel.DataAnnotations;
+using NodaTime;
 using OpenIddict.Abstractions;
 using OpenIddict.EntityFrameworkCore.Models;
 
@@ -7,7 +7,8 @@ namespace Metabase.Data.OpenIdConnect;
 
 public sealed class OpenIdConnectScope
     : OpenIddictEntityFrameworkCoreScope<Guid>,
-      IEntity
+      IEntity,
+      IAuditable
 {
     private const string ScopeSeparator = ":";
 
@@ -45,6 +46,10 @@ public sealed class OpenIdConnectScope
         ManageUserApiScope,
     ];
 
-    [Timestamp]
+    public OffsetDateTime CreatedAt { get; set; }
+    public OffsetDateTime UpdatedAt { get; set; }
+
+    // Configured via `IsRowVersion` in `ApplicationDbContext` instead of the annotation
+    // [Timestamp]
     public uint Version { get; private set; } // https://www.npgsql.org/efcore/modeling/concurrency.html
-}
\ No newline at end of file
+}
diff --git a/backend/src/Data/OpenIdConnect/OpenIdConnectToken.cs b/backend/src/Data/OpenIdConnect/OpenIdConnectToken.cs
index b62ba3a28..2a12d55c2 100644
--- a/backend/src/Data/OpenIdConnect/OpenIdConnectToken.cs
+++ b/backend/src/Data/OpenIdConnect/OpenIdConnectToken.cs
@@ -1,13 +1,19 @@
 using System;
-using System.ComponentModel.DataAnnotations;
+using NodaTime;
 using OpenIddict.EntityFrameworkCore.Models;
 
 namespace Metabase.Data.OpenIdConnect;
 
 public sealed class OpenIdConnectToken
     : OpenIddictEntityFrameworkCoreToken<Guid, OpenIdConnectApplication, OpenIdConnectAuthorization>,
-      IEntity
+      IEntity,
+      IAuditable
 {
-    [Timestamp]
+    // `createdAt` could be an alias of `creationDate`
+    public OffsetDateTime CreatedAt { get; set; }
+    public OffsetDateTime UpdatedAt { get; set; }
+
+    // Configured via `IsRowVersion` in `ApplicationDbContext` instead of the annotation
+    // [Timestamp]
     public uint Version { get; private set; } // https://www.npgsql.org/efcore/modeling/concurrency.html
-}
\ No newline at end of file
+}
diff --git a/backend/src/Data/User.cs b/backend/src/Data/User.cs
index 0bf8130ec..58e1c0758 100644
--- a/backend/src/Data/User.cs
+++ b/backend/src/Data/User.cs
@@ -4,15 +4,18 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using HotChocolate;
 using Microsoft.AspNetCore.Identity;
+using NodaTime;
 using Guid = System.Guid;
 
 // TODO Make `User`, `Role`, ... subtype `Entity` and use `Version` to catch update conflicts. Add interface `IEntity`.
 namespace Metabase.Data;
 
 public sealed class User
-    : IdentityUser<Guid>,
-        IEntity,
-        IStakeholder
+: IdentityUser<Guid>,
+  IEntity,
+  IAuditable,
+  INamed,
+  IStakeholder
 {
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     public User()
@@ -65,5 +68,8 @@ public User(
     [InverseProperty(nameof(GnuPgKeyFingerprint.User))]
     public ICollection<GnuPgKeyFingerprint> GnuPgKeyFingerprints { get; } = [];
 
+    public OffsetDateTime CreatedAt { get; set; }
+    public OffsetDateTime UpdatedAt { get; set; }
+
     public uint Version { get; private set; } // https://www.npgsql.org/efcore/modeling/concurrency.html
 }
\ No newline at end of file
diff --git a/backend/src/Data/UserMethodDeveloper.cs b/backend/src/Data/UserMethodDeveloper.cs
index aeda7885d..b81ff2275 100644
--- a/backend/src/Data/UserMethodDeveloper.cs
+++ b/backend/src/Data/UserMethodDeveloper.cs
@@ -3,10 +3,11 @@
 namespace Metabase.Data;
 
 public sealed class UserMethodDeveloper
-    : IMethodDeveloper
+: AuditableAssociation, IMethodDeveloper, IAssociation
 {
     public Guid UserId { get; set; }
     public User User { get; set; } = default!;
+
     public Guid MethodId { get; set; }
     public Method Method { get; set; } = default!;
 
diff --git a/backend/src/Extensions/LinqExtensions.cs b/backend/src/Extensions/LinqExtensions.cs
new file mode 100644
index 000000000..69ca73f94
--- /dev/null
+++ b/backend/src/Extensions/LinqExtensions.cs
@@ -0,0 +1,190 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Runtime.InteropServices;
+
+namespace Metabase.Extensions;
+
+public enum OrderDirection
+{
+    ASCENDING,
+    DESCENDING
+}
+
+public static class LinqExtensions
+{
+    [Pure]
+    public static IEnumerable<T> If<T>(
+        this IEnumerable<T> source,
+        bool condition,
+        Func<IEnumerable<T>, IEnumerable<T>> transform
+    )
+    {
+        return condition ? transform(source) : source;
+    }
+
+    [Pure]
+    public static IQueryable<T> If<T>(
+        this IQueryable<T> source,
+        bool condition,
+        Func<IQueryable<T>,
+        IQueryable<T>> transform
+    )
+    {
+        return condition ? transform(source) : source;
+    }
+
+    [Pure]
+    public static List<T> IfList<T>(
+        this List<T> source,
+        bool condition,
+        Func<List<T>, List<T>> transform
+    )
+    {
+        return condition ? transform(source) : source;
+    }
+
+    [Pure]
+    public static List<T> ToReversed<T>(this List<T> source)
+    {
+        var copy = new List<T>(source);
+        copy.Reverse();
+        return copy;
+    }
+
+    [Pure]
+    public static T? GetAtOrDefault<T>(this T[] array, int index, T? defaultValue = default) where T : class
+    {
+        return (index >= 0 && index < array.Length) ? array[index] : defaultValue;
+    }
+
+    [Pure]
+    public static T? GetFirstOrDefault<T>(this T[] array) where T : class
+    {
+        return array.Length > 0 ? array[0] : default;
+    }
+
+    [Pure]
+    public static T? GetAtOrDefault<T>(this IReadOnlyList<T> list, int index) where T : class
+    {
+        return (index >= 0 && index < list.Count) ? list[index] : default;
+    }
+
+    [Pure]
+    public static T? GetFirstOrDefault<T>(this IReadOnlyList<T> list) where T : class
+    {
+        return list.Count > 0 ? list[0] : default;
+    }
+
+    [Pure]
+    public static T? GetLastOrDefault<T>(this IReadOnlyList<T> list) where T : class
+    {
+        return list.Count > 0 ? list[^1] : default;
+    }
+
+    [Pure]
+    public static IEnumerable<T> NotNull<T>(this IEnumerable<T?> enumerable) where T : class
+    {
+        return enumerable.Where(item => item is not null).Select(item => item!);
+    }
+
+    [Pure]
+    public static IEnumerable<T> NotNull<T>(this IEnumerable<T?> enumerable) where T : struct
+    {
+        return enumerable.Where(item => item.HasValue).Select(item => item!.Value);
+    }
+
+    [Pure]
+    public static IOrderedQueryable<T> OrderByDirection<T, TKey>(
+        this IQueryable<T> source,
+        Expression<Func<T, TKey>> keySelector,
+        OrderDirection direction
+    )
+    {
+        return direction is OrderDirection.ASCENDING
+            ? source.OrderBy(keySelector)
+            : source.OrderByDescending(keySelector);
+    }
+
+
+    [Pure]
+    public static IEnumerable<T> Interleave<T>(this IEnumerable<IEnumerable<T>> sequences)
+    {
+        var enumerators = new LinkedList<IEnumerator<T>>();
+        try
+        {
+            foreach (var sequence in sequences)
+            {
+                var enumerator = sequence.GetEnumerator();
+                if (enumerator.MoveNext())
+                {
+                    enumerators.AddLast(enumerator);
+                    yield return enumerator.Current;
+                }
+                else
+                {
+                    enumerator.Dispose();
+                }
+            }
+            var node = enumerators.First;
+            while (node is { Value: var enumerator, Next: var nextNode })
+            {
+                if (enumerator.MoveNext())
+                {
+                    yield return enumerator.Current;
+                }
+                else
+                {
+                    enumerators.Remove(node);
+                    enumerator.Dispose();
+                }
+                node = nextNode ?? enumerators.First;
+            }
+        }
+        finally
+        {
+            foreach (var enumerator in enumerators)
+                enumerator.Dispose();
+        }
+    }
+
+    [Pure]
+    public static IEnumerable<TResult> Scan<TSource, TResult, TAccumulate>(
+        this IEnumerable<TSource> source,
+        TAccumulate seed,
+        Func<TAccumulate, TSource, (TAccumulate, TResult)> function)
+    {
+        var accumulate = seed;
+        foreach (var item in source)
+        {
+            (accumulate, var result) = function(accumulate, item);
+            yield return result;
+        }
+    }
+
+    [Pure]
+    public static List<T> Rotate<T>(
+        this List<T> list,
+        Predicate<T> after
+    )
+        where T : class
+    {
+        if (list.Count is 0)
+        {
+            return list;
+        }
+        var afterIndex = list.FindIndex(after);
+        if (afterIndex is -1)
+        {
+            return list;
+        }
+        var index = (afterIndex + 1) % list.Count;
+        var result = new List<T>(list.Count);
+        var span = CollectionsMarshal.AsSpan(list);
+        result.AddRange(span.Slice(index));
+        result.AddRange(span.Slice(0, index));
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/backend/src/Extensions/NodaTimeExtensions.cs b/backend/src/Extensions/NodaTimeExtensions.cs
index fea856524..498b73049 100644
--- a/backend/src/Extensions/NodaTimeExtensions.cs
+++ b/backend/src/Extensions/NodaTimeExtensions.cs
@@ -4,13 +4,13 @@ namespace Metabase.Extensions;
 
 public static class NodaTimeExtensions
 {
-    extension(OffsetDateTime)
+    public static OffsetDateTime GetUtcNow(this IClock clock)
     {
-        public static OffsetDateTime UtcNow =>
-            SystemClock.Instance
-            .GetCurrentInstant()
-            .WithOffset(Offset.Zero);
+        return clock.GetCurrentInstant().WithOffset(Offset.Zero);
+    }
 
+    extension(OffsetDateTime)
+    {
         public static bool operator >(OffsetDateTime x, OffsetDateTime y)
         {
             return OffsetDateTime.Comparer.Instant.Compare(x, y) > 0;
diff --git a/backend/src/Extensions/StringExtensions.cs b/backend/src/Extensions/StringExtensions.cs
index 62aeeb098..51cd17f58 100644
--- a/backend/src/Extensions/StringExtensions.cs
+++ b/backend/src/Extensions/StringExtensions.cs
@@ -2,12 +2,18 @@ namespace Metabase.Extensions;
 
 public static class StringExtensions
 {
-    public static string FirstCharToLower(this string str)
+    public static string FirstCharToLower(this string value)
     {
-        return string.IsNullOrEmpty(str)
-               || !char.IsLetter(str, 0)
-               || char.IsLower(str, 0)
-            ? str
-            : char.ToLowerInvariant(str[0]) + str[1..];
+        return string.IsNullOrEmpty(value)
+               || !char.IsLetter(value, 0)
+               || char.IsLower(value, 0)
+            ? value
+            : char.ToLowerInvariant(value[0]) + value[1..];
     }
+
+    public static string? NullIfEmpty(this string value)
+        => string.IsNullOrEmpty(value) ? null : value;
+
+    public static string? NullIfWhitespace(this string value)
+        => string.IsNullOrWhiteSpace(value) ? null : value;
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Associations/AssociationType.cs b/backend/src/GraphQl/Associations/AssociationType.cs
new file mode 100644
index 000000000..206336393
--- /dev/null
+++ b/backend/src/GraphQl/Associations/AssociationType.cs
@@ -0,0 +1,22 @@
+using HotChocolate.Types;
+using Metabase.Data;
+
+namespace Metabase.GraphQl.Associations;
+
+public abstract class AssociationType<TAssociation>
+    : ObjectType<TAssociation>
+    where TAssociation : IAssociation
+{
+    protected override void Configure(
+        IObjectTypeDescriptor<TAssociation> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        // TODO Do we want to expose this, require it as input, and use it to discover concurrent writes?
+        descriptor
+            .Field(t => t.Version)
+            .Type<NonNullType<NonNegativeIntType>>()
+            .Name(GraphQlConstants.VersionFieldName)
+            .Ignore();
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Associations/AuditableAssociationFilterType.cs b/backend/src/GraphQl/Associations/AuditableAssociationFilterType.cs
new file mode 100644
index 000000000..60fb2f752
--- /dev/null
+++ b/backend/src/GraphQl/Associations/AuditableAssociationFilterType.cs
@@ -0,0 +1,19 @@
+using HotChocolate.Data.Filters;
+using Metabase.Data;
+
+namespace Metabase.GraphQl.Associations;
+
+public abstract class AuditableAssociationFilterType<TAssociation>
+    : FilterInputType<TAssociation>
+    where TAssociation : IAssociation, IAuditable
+{
+    protected override void Configure(
+        IFilterInputTypeDescriptor<TAssociation> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.BindFieldsExplicitly();
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Associations/AuditableAssociationSortType.cs b/backend/src/GraphQl/Associations/AuditableAssociationSortType.cs
new file mode 100644
index 000000000..3cd30dcb6
--- /dev/null
+++ b/backend/src/GraphQl/Associations/AuditableAssociationSortType.cs
@@ -0,0 +1,19 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+
+namespace Metabase.GraphQl.Associations;
+
+public abstract class AuditableAssociationSortType<TAssociation>
+    : SortInputType<TAssociation>
+    where TAssociation : IAssociation, IAuditable
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<TAssociation> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.BindFieldsExplicitly();
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/AuthorizedConnection.cs b/backend/src/GraphQl/AuthorizedConnection.cs
index 4b057e95c..bc6ba6b6b 100644
--- a/backend/src/GraphQl/AuthorizedConnection.cs
+++ b/backend/src/GraphQl/AuthorizedConnection.cs
@@ -6,29 +6,29 @@
 using System.Threading.Tasks;
 using GreenDonut;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Data;
 
 namespace Metabase.GraphQl;
 
-public abstract class AuthorizedConnection<TSubject, TAssociation, TAssociationsByAssociateIdDataLoader, TEdge, TAuthorization>(
+public abstract class AuthorizedConnection<TSubject, TAssociation, TEdge, TAssociationsByOneIdDataLoader, TAuthorization>(
     TSubject subject,
     Func<TAssociation, TEdge> createEdge,
     Func<ClaimsPrincipal, TSubject, TAuthorization, CancellationToken, Task<bool>> isAuthorized,
     QueryContext<TAssociation> queryContext
-) : Connection<TSubject, TAssociation, TAssociationsByAssociateIdDataLoader, TEdge>(subject, createEdge, queryContext)
+) : Connection<TSubject, TAssociation, TEdge, TAssociationsByOneIdDataLoader>(subject, createEdge, queryContext)
     where TSubject : IEntity
-    where TAssociationsByAssociateIdDataLoader : IDataLoader<Guid, TAssociation[]>
+    where TAssociationsByOneIdDataLoader : IDataLoader<Guid, TAssociation[]>
 {
-    private readonly Func<ClaimsPrincipal, TSubject, TAuthorization, CancellationToken, Task<bool>> _isAuthorized = isAuthorized;
-
+    [Cost(0)]
     public async IAsyncEnumerable<TEdge> GetEdgesAsync(
         ClaimsPrincipal claimsPrincipal,
         TAuthorization authorization,
-        TAssociationsByAssociateIdDataLoader dataLoader,
+        TAssociationsByOneIdDataLoader dataLoader,
         [EnumeratorCancellation] CancellationToken cancellationToken
     )
     {
-        if (!await _isAuthorized(claimsPrincipal, Subject, authorization, cancellationToken))
+        if (!await isAuthorized(claimsPrincipal, Subject, authorization, cancellationToken))
         {
             yield break;
         }
diff --git a/backend/src/GraphQl/AuthorizedPaginatedConnection.cs b/backend/src/GraphQl/AuthorizedPaginatedConnection.cs
new file mode 100644
index 000000000..e7434ef1f
--- /dev/null
+++ b/backend/src/GraphQl/AuthorizedPaginatedConnection.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut;
+using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
+using Metabase.Data;
+
+namespace Metabase.GraphQl;
+
+public abstract class AuthorizedPaginatedConnection<TSubject, TAssociation, TEdge, TAssociationsByOneIdDataLoader, TAuthorization>(
+    TSubject subject,
+    Func<TAssociation, string, TEdge> createEdge,
+    Func<ClaimsPrincipal, TAuthorization, CancellationToken, Task<bool>> isAuthorized,
+    PagingArguments pagingArguments,
+    QueryContext<TAssociation> queryContext
+) : PaginatedConnection<TSubject, TAssociation, TEdge, TAssociationsByOneIdDataLoader>(
+    subject,
+    createEdge,
+    pagingArguments,
+    queryContext
+)
+    where TSubject : IEntity
+    where TAssociation : class
+    where TAssociationsByOneIdDataLoader : IDataLoader<Guid, Page<TAssociation>>
+{
+    [Cost(0)]
+    public async IAsyncEnumerable<TEdge> GetEdgesAsync(
+        ClaimsPrincipal claimsPrincipal,
+        TAuthorization authorization,
+        TAssociationsByOneIdDataLoader dataLoader,
+        [EnumeratorCancellation] CancellationToken cancellationToken
+    )
+    {
+        if (!await isAuthorized(claimsPrincipal, authorization, cancellationToken))
+        {
+            yield break;
+        }
+        await foreach (var edge in base.GetEdgesAsync(dataLoader, cancellationToken))
+        {
+            yield return edge;
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/CalorimetricDataX/CalorimetricData.cs b/backend/src/GraphQl/CalorimetricDataX/CalorimetricData.cs
new file mode 100644
index 000000000..65baf2dee
--- /dev/null
+++ b/backend/src/GraphQl/CalorimetricDataX/CalorimetricData.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.Resolvers;
+using HotChocolate.Types.Relay;
+using Metabase.Data;
+using Metabase.GraphQl.DataX;
+using Metabase.GraphQl.Requests;
+using NodaTime;
+
+namespace Metabase.GraphQl.CalorimetricDataX;
+
+[Node(IdField = nameof(Id))]
+public sealed record CalorimetricData(
+    string Id,
+    Guid Uuid,
+    OffsetDateTime Timestamp,
+    string Locale,
+    Guid DatabaseId,
+    Guid ComponentId,
+    string? Name,
+    string? Description,
+    IReadOnlyList<string> Warnings,
+    Guid CreatorId,
+    OffsetDateTime CreatedAt,
+    AppliedMethod AppliedMethod,
+    IReadOnlyList<GetHttpsResource> Resources,
+    GetHttpsResourceTree ResourceTree,
+    IReadOnlyList<DataApproval> Approvals,
+    // ResponseApproval Approval
+    IReadOnlyList<double> GValues,
+    IReadOnlyList<double> uValues
+)
+: DataX.Data(
+    Id,
+    Uuid,
+    Timestamp,
+    Locale,
+    DatabaseId,
+    ComponentId,
+    Name,
+    Description,
+    Warnings,
+    CreatorId,
+    CreatedAt,
+    AppliedMethod,
+    Resources,
+    ResourceTree,
+    Approvals
+)
+{
+    public override DataKind Kind { get => DataKind.CALORIMETRIC_DATA; }
+
+    [NodeResolver]
+    public static Task<CalorimetricData?> GetAsync(
+        string id,
+        DataQueries dataQueries,
+        ApplicationDbContext databaseContext,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return DataX.Data.FetchNodeAsync<CalorimetricData>(
+            id,
+            (database, uuid, locale) => dataQueries.GetCalorimetricDataAsync(
+                database,
+                uuid,
+                locale,
+                resolverContext,
+                cancellationToken
+            ),
+            databaseContext,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/CalorimetricDataConnection.cs b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataConnection.cs
similarity index 80%
rename from backend/src/GraphQl/DataX/CalorimetricDataConnection.cs
rename to backend/src/GraphQl/CalorimetricDataX/CalorimetricDataConnection.cs
index def1f6f26..422ac856a 100644
--- a/backend/src/GraphQl/DataX/CalorimetricDataConnection.cs
+++ b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataConnection.cs
@@ -1,8 +1,8 @@
-using System;
 using System.Collections.Generic;
 using HotChocolate.Types.Pagination;
+using Metabase.GraphQl.DataX;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.CalorimetricDataX;
 
 public sealed record CalorimetricDataConnection(
     IReadOnlyList<CalorimetricDataEdge> Edges,
diff --git a/backend/src/GraphQl/DataX/CalorimetricDataEdge.cs b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataEdge.cs
similarity index 65%
rename from backend/src/GraphQl/DataX/CalorimetricDataEdge.cs
rename to backend/src/GraphQl/CalorimetricDataX/CalorimetricDataEdge.cs
index 53d5448b7..ceee36e33 100644
--- a/backend/src/GraphQl/DataX/CalorimetricDataEdge.cs
+++ b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataEdge.cs
@@ -1,4 +1,6 @@
-namespace Metabase.GraphQl.DataX;
+using Metabase.GraphQl.DataX;
+
+namespace Metabase.GraphQl.CalorimetricDataX;
 
 public sealed record CalorimetricDataEdge(
     string Cursor,
diff --git a/backend/src/GraphQl/DataX/CalorimetricDataPropositionInput.cs b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataPropositionInput.cs
similarity index 84%
rename from backend/src/GraphQl/DataX/CalorimetricDataPropositionInput.cs
rename to backend/src/GraphQl/CalorimetricDataX/CalorimetricDataPropositionInput.cs
index 53e04afcb..aae0a7629 100644
--- a/backend/src/GraphQl/DataX/CalorimetricDataPropositionInput.cs
+++ b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataPropositionInput.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using Metabase.GraphQl.DataX;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.CalorimetricDataX;
 
 public sealed record CalorimetricDataPropositionInput(
     UuidPropositionInput? ComponentId,
diff --git a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs
new file mode 100644
index 000000000..aa7b5be03
--- /dev/null
+++ b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.Resolvers;
+using HotChocolate.Types;
+using Metabase.Data;
+using Metabase.GraphQl.Requests;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.CalorimetricDataX;
+
+[ExtendObjectType(nameof(Query))]
+public sealed class CalorimetricDataQueries
+{
+    public async Task<CalorimetricData?> GetCalorimetricDataAsync(
+        Guid databaseId,
+        Guid id,
+        string? locale,
+        DataQueries dataQueries,
+        ApplicationDbContext databaseContext,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        var database = await databaseContext.Databases.AsNoTracking()
+            .Where(_ => _.Id == databaseId)
+            .SingleOrDefaultAsync(cancellationToken);
+        if (database is null)
+        {
+            return null;
+        }
+        return await dataQueries.GetCalorimetricDataAsync(
+            database,
+            id,
+            locale,
+            resolverContext,
+            cancellationToken
+        );
+    }
+
+    public Task<CalorimetricDataConnection> GetAllCalorimetricDataAsync(
+        CalorimetricDataPropositionInput? where,
+        string? locale,
+        uint? first,
+        string? after,
+        uint? last,
+        string? before,
+        DataQueries dataQueries,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return dataQueries.GetAllDataAsync<CalorimetricDataConnection, CalorimetricDataEdge, CalorimetricData>(
+            first,
+            after,
+            last,
+            before,
+            (edges, totalCount, pageInfo) => new CalorimetricDataConnection(edges, totalCount, pageInfo),
+            (node, cursor) => new CalorimetricDataEdge(cursor, node),
+            (database, first, after, last, before) => dataQueries.GetAllCalorimetricDataAsync(
+                database,
+                where,
+                locale,
+                first,
+                after,
+                last,
+                before,
+                resolverContext,
+                cancellationToken
+            ),
+            cancellationToken
+        );
+    }
+
+    public Task<bool> HasCalorimetricDataAsync(
+        CalorimetricDataPropositionInput? where,
+        string? locale,
+        DataQueries dataQueries,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return dataQueries.HasDataAsync(
+            (database) => dataQueries.HasCalorimetricDataAsync(
+                database,
+                where,
+                locale,
+                resolverContext,
+                cancellationToken
+            ),
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Common/OpenEndedDateTimeRangeType.cs b/backend/src/GraphQl/Common/OpenEndedDateTimeRangeType.cs
index 25f45a9d7..c2a31c0f7 100644
--- a/backend/src/GraphQl/Common/OpenEndedDateTimeRangeType.cs
+++ b/backend/src/GraphQl/Common/OpenEndedDateTimeRangeType.cs
@@ -1,6 +1,8 @@
 using HotChocolate.Types;
+using HotChocolate.Types.NodaTime;
 using NodaTime;
 using NpgsqlTypes;
+using DateTimeType = HotChocolate.Types.NodaTime.DateTimeType;
 
 namespace Metabase.GraphQl.Common;
 
@@ -19,6 +21,7 @@ IObjectTypeDescriptor<NpgsqlRange<OffsetDateTime>> descriptor
         descriptor
             .Field("from")
             .Type<DateTimeType>()
+            .Cost(0)
             .Resolve(context =>
                 {
                     var range = context.Parent<NpgsqlRange<OffsetDateTime>>();
@@ -31,6 +34,7 @@ IObjectTypeDescriptor<NpgsqlRange<OffsetDateTime>> descriptor
         descriptor
             .Field("to")
             .Type<DateTimeType>()
+            .Cost(0)
             .Resolve(context =>
                 {
                     var range = context.Parent<NpgsqlRange<OffsetDateTime>>();
diff --git a/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblyFilterType.cs b/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblyFilterType.cs
index 44ac2bbb2..ea7bee0f9 100644
--- a/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblyFilterType.cs
+++ b/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblyFilterType.cs
@@ -1,16 +1,20 @@
 using HotChocolate.Data.Filters;
 using Metabase.Data;
+using Metabase.GraphQl.Associations;
 
 namespace Metabase.GraphQl.ComponentAssemblies;
 
 public abstract class ComponentAssemblyFilterType
-    : FilterInputType<ComponentAssembly>
+    : AuditableAssociationFilterType<ComponentAssembly>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<ComponentAssembly> descriptor
     )
     {
-        descriptor.BindFieldsExplicitly();
+        base.Configure(descriptor);
+        // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         descriptor.Field(x => x.AssembledComponent);
         descriptor.Field(x => x.PartComponent);
         descriptor.Field(x => x.Index);
diff --git a/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblySortType.cs b/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblySortType.cs
index 043174587..d7e4cfc4b 100644
--- a/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblySortType.cs
+++ b/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblySortType.cs
@@ -1,18 +1,17 @@
 using HotChocolate.Data.Sorting;
 using Metabase.Data;
+using Metabase.GraphQl.Associations;
 
 namespace Metabase.GraphQl.ComponentAssemblies;
 
-public sealed class ComponentAssemblySortType
-    : SortInputType<ComponentAssembly>
+public abstract class ComponentAssemblySortType
+    : AuditableAssociationSortType<ComponentAssembly>
 {
     protected override void Configure(
         ISortInputTypeDescriptor<ComponentAssembly> descriptor
     )
     {
-        descriptor.BindFieldsExplicitly();
-        descriptor.Field(x => x.AssembledComponent);
-        descriptor.Field(x => x.PartComponent);
+        base.Configure(descriptor);
         descriptor.Field(x => x.Index);
         descriptor.Field(x => x.PrimeSurface);
     }
diff --git a/backend/src/GraphQl/ComponentAssemblies/RemoveComponentAssemblyPayload.cs b/backend/src/GraphQl/ComponentAssemblies/RemoveComponentAssemblyPayload.cs
index 1a266b63a..625de0df9 100644
--- a/backend/src/GraphQl/ComponentAssemblies/RemoveComponentAssemblyPayload.cs
+++ b/backend/src/GraphQl/ComponentAssemblies/RemoveComponentAssemblyPayload.cs
@@ -34,7 +34,7 @@ RemoveComponentAssemblyError error
     public IReadOnlyCollection<RemoveComponentAssemblyError>? Errors { get; }
 
     public async Task<Component?> GetAssembledComponentAsync(
-        ComponentByIdDataLoader byId,
+        IComponentByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
@@ -46,7 +46,7 @@ CancellationToken cancellationToken
     }
 
     public async Task<Component?> GetPartComponentAsync(
-        ComponentByIdDataLoader byId,
+        IComponentByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
diff --git a/backend/src/GraphQl/ComponentGeneralizations/ComponentConcretizationAndGeneralizationFilterType.cs b/backend/src/GraphQl/ComponentGeneralizations/ComponentConcretizationAndGeneralizationFilterType.cs
index d73906a32..fa4202087 100644
--- a/backend/src/GraphQl/ComponentGeneralizations/ComponentConcretizationAndGeneralizationFilterType.cs
+++ b/backend/src/GraphQl/ComponentGeneralizations/ComponentConcretizationAndGeneralizationFilterType.cs
@@ -1,16 +1,20 @@
 using HotChocolate.Data.Filters;
 using Metabase.Data;
+using Metabase.GraphQl.Associations;
 
 namespace Metabase.GraphQl.ComponentGeneralizations;
 
 public abstract class ComponentConcretizationAndGeneralizationFilterType
-    : FilterInputType<ComponentConcretizationAndGeneralization>
+    : AuditableAssociationFilterType<ComponentConcretizationAndGeneralization>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<ComponentConcretizationAndGeneralization> descriptor
     )
     {
-        descriptor.BindFieldsExplicitly();
+        base.Configure(descriptor);
+        // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         descriptor.Field(x => x.ConcreteComponent);
         descriptor.Field(x => x.GeneralComponent);
     }
diff --git a/backend/src/GraphQl/ComponentGeneralizations/ComponentConcretizationAndGeneralizationSortType.cs b/backend/src/GraphQl/ComponentGeneralizations/ComponentConcretizationAndGeneralizationSortType.cs
new file mode 100644
index 000000000..051170ab2
--- /dev/null
+++ b/backend/src/GraphQl/ComponentGeneralizations/ComponentConcretizationAndGeneralizationSortType.cs
@@ -0,0 +1,16 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+using Metabase.GraphQl.Associations;
+
+namespace Metabase.GraphQl.ComponentGeneralizations;
+
+public abstract class ComponentConcretizationAndGeneralizationSortType
+    : AuditableAssociationSortType<ComponentConcretizationAndGeneralization>
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<ComponentConcretizationAndGeneralization> descriptor
+    )
+    {
+        base.Configure(descriptor);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/ComponentGeneralizations/RemoveComponentGeneralizationPayload.cs b/backend/src/GraphQl/ComponentGeneralizations/RemoveComponentGeneralizationPayload.cs
index 360ef877e..89170d30f 100644
--- a/backend/src/GraphQl/ComponentGeneralizations/RemoveComponentGeneralizationPayload.cs
+++ b/backend/src/GraphQl/ComponentGeneralizations/RemoveComponentGeneralizationPayload.cs
@@ -34,7 +34,7 @@ RemoveComponentGeneralizationError error
     public IReadOnlyCollection<RemoveComponentGeneralizationError>? Errors { get; }
 
     public async Task<Component?> GetGeneralComponentAsync(
-        ComponentByIdDataLoader byId,
+        IComponentByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
@@ -46,7 +46,7 @@ CancellationToken cancellationToken
     }
 
     public async Task<Component?> GetConcreteComponentAsync(
-        ComponentByIdDataLoader byId,
+        IComponentByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
diff --git a/backend/src/GraphQl/ComponentManufacturers/AddComponentManufacturerPayload.cs b/backend/src/GraphQl/ComponentManufacturers/AddComponentManufacturerPayload.cs
index 81b5b2aa0..bd9f8f7eb 100644
--- a/backend/src/GraphQl/ComponentManufacturers/AddComponentManufacturerPayload.cs
+++ b/backend/src/GraphQl/ComponentManufacturers/AddComponentManufacturerPayload.cs
@@ -11,7 +11,10 @@ public AddComponentManufacturerPayload(
         ComponentManufacturer componentManufacturer
     )
     {
-        ManufacturedComponentEdge = new InstitutionManufacturedComponentEdge(componentManufacturer);
+        ManufacturedComponentEdge = new InstitutionManufacturedComponentEdge(
+            componentManufacturer,
+            PaginationHelpers.ConstructCursor(componentManufacturer.InstitutionId, componentManufacturer.ComponentId)
+        );
         ComponentManufacturerEdge = new ComponentManufacturerEdge(componentManufacturer);
     }
 
diff --git a/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerFilterType.cs b/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerFilterType.cs
index a8decbe87..e3332786b 100644
--- a/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerFilterType.cs
+++ b/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerFilterType.cs
@@ -1,16 +1,20 @@
 using HotChocolate.Data.Filters;
 using Metabase.Data;
+using Metabase.GraphQl.Associations;
 
 namespace Metabase.GraphQl.ComponentManufacturers;
 
 public abstract class ComponentManufacturerFilterType
-    : FilterInputType<ComponentManufacturer>
+    : AuditableAssociationFilterType<ComponentManufacturer>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<ComponentManufacturer> descriptor
     )
     {
-        descriptor.BindFieldsExplicitly();
+        base.Configure(descriptor);
+        // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         descriptor.Field(x => x.Component);
         descriptor.Field(x => x.Institution);
     }
diff --git a/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerMutations.cs b/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerMutations.cs
index 8c4eca552..3637a7093 100644
--- a/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerMutations.cs
+++ b/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerMutations.cs
@@ -59,9 +59,9 @@ CancellationToken cancellationToken
         }
 
         if (!await context.Institutions.AsQueryable()
-                .Where(c => c.Id == input.InstitutionId)
-                .AnyAsync(cancellationToken)
-           )
+            .Where(_ => _.Id == input.InstitutionId)
+            .AnyAsync(cancellationToken)
+        )
         {
             errors.Add(
                 new AddComponentManufacturerError(
diff --git a/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerSortType.cs b/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerSortType.cs
index 09cb4e334..b17d28d40 100644
--- a/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerSortType.cs
+++ b/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerSortType.cs
@@ -1,17 +1,16 @@
 using HotChocolate.Data.Sorting;
 using Metabase.Data;
+using Metabase.GraphQl.Associations;
 
 namespace Metabase.GraphQl.ComponentManufacturers;
 
-public sealed class ComponentManufacturerSortType
-    : SortInputType<ComponentManufacturer>
+public abstract class ComponentManufacturerSortType
+    : AuditableAssociationSortType<ComponentManufacturer>
 {
     protected override void Configure(
         ISortInputTypeDescriptor<ComponentManufacturer> descriptor
     )
     {
-        descriptor.BindFieldsExplicitly();
-        descriptor.Field(x => x.Component);
-        descriptor.Field(x => x.Institution);
+        base.Configure(descriptor);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/ComponentManufacturers/ConfirmComponentManufacturerPayload.cs b/backend/src/GraphQl/ComponentManufacturers/ConfirmComponentManufacturerPayload.cs
index cfffe9836..0384dd1e3 100644
--- a/backend/src/GraphQl/ComponentManufacturers/ConfirmComponentManufacturerPayload.cs
+++ b/backend/src/GraphQl/ComponentManufacturers/ConfirmComponentManufacturerPayload.cs
@@ -11,7 +11,10 @@ public ConfirmComponentManufacturerPayload(
         ComponentManufacturer componentManufacturer
     )
     {
-        ManufacturedComponentEdge = new InstitutionManufacturedComponentEdge(componentManufacturer);
+        ManufacturedComponentEdge = new InstitutionManufacturedComponentEdge(
+            componentManufacturer,
+            PaginationHelpers.ConstructCursor(componentManufacturer.InstitutionId, componentManufacturer.ComponentId)
+        );
         ComponentManufacturerEdge = new ComponentManufacturerEdge(componentManufacturer);
     }
 
diff --git a/backend/src/GraphQl/ComponentManufacturers/RemoveComponentManufacturerPayload.cs b/backend/src/GraphQl/ComponentManufacturers/RemoveComponentManufacturerPayload.cs
index c03d53fd7..4d35ca435 100644
--- a/backend/src/GraphQl/ComponentManufacturers/RemoveComponentManufacturerPayload.cs
+++ b/backend/src/GraphQl/ComponentManufacturers/RemoveComponentManufacturerPayload.cs
@@ -35,7 +35,7 @@ RemoveComponentManufacturerError error
     public IReadOnlyCollection<RemoveComponentManufacturerError>? Errors { get; }
 
     public async Task<Component?> GetComponentAsync(
-        ComponentByIdDataLoader byId,
+        IComponentByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
@@ -47,7 +47,7 @@ CancellationToken cancellationToken
     }
 
     public async Task<Institution?> GetInstitutionAsync(
-        InstitutionByIdDataLoader byId,
+        IInstitutionByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
diff --git a/backend/src/GraphQl/ComponentVariants/ComponentVariantFilterType.cs b/backend/src/GraphQl/ComponentVariants/ComponentVariantFilterType.cs
index 49f359370..544aadd15 100644
--- a/backend/src/GraphQl/ComponentVariants/ComponentVariantFilterType.cs
+++ b/backend/src/GraphQl/ComponentVariants/ComponentVariantFilterType.cs
@@ -1,16 +1,20 @@
 using HotChocolate.Data.Filters;
 using Metabase.Data;
+using Metabase.GraphQl.Associations;
 
 namespace Metabase.GraphQl.ComponentVariants;
 
 public abstract class ComponentVariantFilterType
-    : FilterInputType<ComponentVariant>
+    : AuditableAssociationFilterType<ComponentVariant>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<ComponentVariant> descriptor
     )
     {
-        descriptor.BindFieldsExplicitly();
+        base.Configure(descriptor);
+        // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         descriptor.Field(x => x.OfComponent);
         descriptor.Field(x => x.ToComponent);
     }
diff --git a/backend/src/GraphQl/ComponentVariants/ComponentVariantSortType.cs b/backend/src/GraphQl/ComponentVariants/ComponentVariantSortType.cs
new file mode 100644
index 000000000..e6414fbd9
--- /dev/null
+++ b/backend/src/GraphQl/ComponentVariants/ComponentVariantSortType.cs
@@ -0,0 +1,16 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+using Metabase.GraphQl.Associations;
+
+namespace Metabase.GraphQl.ComponentVariants;
+
+public abstract class ComponentVariantSortType
+    : AuditableAssociationSortType<ComponentVariant>
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<ComponentVariant> descriptor
+    )
+    {
+        base.Configure(descriptor);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/ComponentVariants/RemoveComponentVariantPayload.cs b/backend/src/GraphQl/ComponentVariants/RemoveComponentVariantPayload.cs
index 72a4840dd..539244a1f 100644
--- a/backend/src/GraphQl/ComponentVariants/RemoveComponentVariantPayload.cs
+++ b/backend/src/GraphQl/ComponentVariants/RemoveComponentVariantPayload.cs
@@ -38,7 +38,7 @@ RemoveComponentVariantError error
     public IReadOnlyCollection<RemoveComponentVariantError>? Errors { get; }
 
     public async Task<Component?> GetOneComponentAsync(
-        ComponentByIdDataLoader byId,
+        IComponentByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
@@ -50,7 +50,7 @@ CancellationToken cancellationToken
     }
 
     public async Task<Component?> GetOtherComponentAsync(
-        ComponentByIdDataLoader byId,
+        IComponentByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
diff --git a/backend/src/GraphQl/Components/ComponentAssembledOfConnection.cs b/backend/src/GraphQl/Components/ComponentAssembledOfConnection.cs
index 4eee58a86..300099542 100644
--- a/backend/src/GraphQl/Components/ComponentAssembledOfConnection.cs
+++ b/backend/src/GraphQl/Components/ComponentAssembledOfConnection.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
@@ -11,15 +12,15 @@ namespace Metabase.GraphQl.Components;
 public sealed class ComponentAssembledOfConnection(
     Component subject,
     QueryContext<ComponentAssembly> queryContext
-    )
-        : Connection<Component, ComponentAssembly, ComponentPartsByComponentIdDataLoader,
-        ComponentAssembledOfEdge>(
-        subject,
-        x => new ComponentAssembledOfEdge(x),
-        queryContext
-        )
+)
+: Connection<Component, ComponentAssembly, ComponentAssembledOfEdge, IComponentAssembledOfByComponentIdDataLoader>(
+    subject,
+    x => new ComponentAssembledOfEdge(x),
+    queryContext
+)
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentAssemblyAuthorization authorization,
diff --git a/backend/src/GraphQl/Components/ComponentAssembledOfEdge.cs b/backend/src/GraphQl/Components/ComponentAssembledOfEdge.cs
index e142770d1..82662655f 100644
--- a/backend/src/GraphQl/Components/ComponentAssembledOfEdge.cs
+++ b/backend/src/GraphQl/Components/ComponentAssembledOfEdge.cs
@@ -1,26 +1,25 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.Enumerations;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Components;
 
 public sealed class ComponentAssembledOfEdge(
     ComponentAssembly association
-    )
-        : Edge<Component, ComponentByIdDataLoader>(association.PartComponentId)
+)
+: Edge<Component, IComponentByIdDataLoader>(association.PartComponentId)
 {
-    private readonly ComponentAssembly _association = association;
-
-    public byte? Index => _association.Index;
+    public byte? Index => association.Index;
 
-    public PrimeSurface? PrimeSurface => _association.PrimeSurface;
+    public PrimeSurface? PrimeSurface => association.PrimeSurface;
 
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToUpdateEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentAssemblyAuthorization authorization,
@@ -29,13 +28,14 @@ CancellationToken cancellationToken
     {
         return authorization.IsAuthorizedToManage(
             claimsPrincipal,
-            _association.AssembledComponentId,
-            _association.PartComponentId,
+            association.AssembledComponentId,
+            association.PartComponentId,
             cancellationToken
         );
     }
 
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToRemoveEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentAssemblyAuthorization authorization,
@@ -44,8 +44,8 @@ CancellationToken cancellationToken
     {
         return authorization.IsAuthorizedToManage(
             claimsPrincipal,
-            _association.AssembledComponentId,
-            _association.PartComponentId,
+            association.AssembledComponentId,
+            association.PartComponentId,
             cancellationToken
         );
     }
diff --git a/backend/src/GraphQl/Components/ComponentAssembledOfFilterType.cs b/backend/src/GraphQl/Components/ComponentAssembledOfFilterType.cs
index d6c499537..eb0b9eba4 100644
--- a/backend/src/GraphQl/Components/ComponentAssembledOfFilterType.cs
+++ b/backend/src/GraphQl/Components/ComponentAssembledOfFilterType.cs
@@ -1,5 +1,4 @@
 using HotChocolate.Data.Filters;
-using Metabase.Configuration;
 using Metabase.Data;
 
 namespace Metabase.GraphQl.Components;
diff --git a/backend/src/GraphQl/Components/ComponentAssembledOfSortType.cs b/backend/src/GraphQl/Components/ComponentAssembledOfSortType.cs
new file mode 100644
index 000000000..6f03dddf1
--- /dev/null
+++ b/backend/src/GraphQl/Components/ComponentAssembledOfSortType.cs
@@ -0,0 +1,16 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+
+namespace Metabase.GraphQl.Components;
+
+public sealed class ComponentAssembledOfSortType
+    : ComponentAssemblies.ComponentAssemblySortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<ComponentAssembly> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(ComponentAssembledOfSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentByIdDataLoader.cs b/backend/src/GraphQl/Components/ComponentByIdDataLoader.cs
deleted file mode 100644
index e4425f177..000000000
--- a/backend/src/GraphQl/Components/ComponentByIdDataLoader.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Components;
-
-public sealed class ComponentByIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : EntityByIdDataLoader<Component>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        dbContext => dbContext.Components
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentConcretizationOfConnection.cs b/backend/src/GraphQl/Components/ComponentConcretizationOfConnection.cs
index 4e61c7ceb..3d40a7880 100644
--- a/backend/src/GraphQl/Components/ComponentConcretizationOfConnection.cs
+++ b/backend/src/GraphQl/Components/ComponentConcretizationOfConnection.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
@@ -12,14 +13,14 @@ public sealed class ComponentConcretizationOfConnection(
     Component subject,
     QueryContext<ComponentConcretizationAndGeneralization> queryContext
     )
-        : Connection<Component, ComponentConcretizationAndGeneralization,
-        ComponentGeneralizationsByComponentIdDataLoader, ComponentConcretizationOfEdge>(
+        : Connection<Component, ComponentConcretizationAndGeneralization, ComponentConcretizationOfEdge, IComponentGeneralizationsByComponentIdDataLoader>(
         subject,
         x => new ComponentConcretizationOfEdge(x),
         queryContext
         )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentGeneralizationAuthorization authorization,
diff --git a/backend/src/GraphQl/Components/ComponentConcretizationOfEdge.cs b/backend/src/GraphQl/Components/ComponentConcretizationOfEdge.cs
index c7e56d366..3527216f1 100644
--- a/backend/src/GraphQl/Components/ComponentConcretizationOfEdge.cs
+++ b/backend/src/GraphQl/Components/ComponentConcretizationOfEdge.cs
@@ -1,21 +1,20 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Components;
 
 public sealed class ComponentConcretizationOfEdge(
     ComponentConcretizationAndGeneralization association
     )
-        : Edge<Component, ComponentByIdDataLoader>(association.GeneralComponentId)
+        : Edge<Component, IComponentByIdDataLoader>(association.GeneralComponentId)
 {
-    private readonly ComponentConcretizationAndGeneralization _association = association;
-
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToRemoveEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentGeneralizationAuthorization authorization,
@@ -24,8 +23,8 @@ CancellationToken cancellationToken
     {
         return authorization.IsAuthorizedToManage(
             claimsPrincipal,
-            _association.GeneralComponentId,
-            _association.ConcreteComponentId,
+            association.GeneralComponentId,
+            association.ConcreteComponentId,
             cancellationToken
         );
     }
diff --git a/backend/src/GraphQl/Components/ComponentConcretizationOfFilterType.cs b/backend/src/GraphQl/Components/ComponentConcretizationOfFilterType.cs
index 9d11f3f65..449fc9c61 100644
--- a/backend/src/GraphQl/Components/ComponentConcretizationOfFilterType.cs
+++ b/backend/src/GraphQl/Components/ComponentConcretizationOfFilterType.cs
@@ -1,5 +1,4 @@
 using HotChocolate.Data.Filters;
-using Metabase.Configuration;
 using Metabase.Data;
 
 namespace Metabase.GraphQl.Components;
diff --git a/backend/src/GraphQl/Components/ComponentConcretizationOfSortType.cs b/backend/src/GraphQl/Components/ComponentConcretizationOfSortType.cs
new file mode 100644
index 000000000..8b9ce68fc
--- /dev/null
+++ b/backend/src/GraphQl/Components/ComponentConcretizationOfSortType.cs
@@ -0,0 +1,16 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+
+namespace Metabase.GraphQl.Components;
+
+public sealed class ComponentConcretizationOfSortType
+    : ComponentGeneralizations.ComponentConcretizationAndGeneralizationSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<ComponentConcretizationAndGeneralization> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(ComponentConcretizationOfSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentConcretizationsByComponentIdDataLoader.cs b/backend/src/GraphQl/Components/ComponentConcretizationsByComponentIdDataLoader.cs
deleted file mode 100644
index 27f7ab270..000000000
--- a/backend/src/GraphQl/Components/ComponentConcretizationsByComponentIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Components;
-
-public sealed class ComponentConcretizationsByComponentIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<ComponentConcretizationAndGeneralization>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.ComponentConcretizationAndGeneralizations.AsNoTracking().Where(x =>
-                    ids.Contains(x.GeneralComponentId)
-                ).With(queryContext),
-        x => x.GeneralComponentId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentDataLoaders.cs b/backend/src/GraphQl/Components/ComponentDataLoaders.cs
new file mode 100644
index 000000000..c37a169c1
--- /dev/null
+++ b/backend/src/GraphQl/Components/ComponentDataLoaders.cs
@@ -0,0 +1,165 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut;
+using GreenDonut.Data;
+using Metabase.Data;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.Components;
+
+public sealed class ComponentDataLoaders
+: DataLoaders
+{
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Component>> GetComponentByIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<Component> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetEntityByIdAsync(
+            ids,
+            databaseContext => databaseContext.Components,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, ComponentManufacturer[]>> GetComponentManufacturersByComponentIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<ComponentManufacturer> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.ComponentManufacturers.Where(_ => !_.Pending),
+            _ => _.ComponentId,
+            _ => _.InstitutionId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, ComponentManufacturer[]>> GetPendingComponentManufacturersByComponentIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<ComponentManufacturer> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.ComponentManufacturers.Where(_ => _.Pending),
+            _ => _.ComponentId,
+            _ => _.InstitutionId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, ComponentAssembly[]>> GetComponentPartOfByComponentIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<ComponentAssembly> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.ComponentAssemblies,
+            _ => _.PartComponentId,
+            _ => _.AssembledComponentId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, ComponentAssembly[]>> GetComponentAssembledOfByComponentIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<ComponentAssembly> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.ComponentAssemblies,
+            _ => _.AssembledComponentId,
+            _ => _.PartComponentId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, ComponentVariant[]>> GetComponentVariantOfByComponentIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<ComponentVariant> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.ComponentVariants,
+            _ => _.ToComponentId,
+            _ => _.OfComponentId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, ComponentConcretizationAndGeneralization[]>> GetComponentConcretizationsByComponentIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<ComponentConcretizationAndGeneralization> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.ComponentConcretizationAndGeneralizations,
+            _ => _.GeneralComponentId,
+            _ => _.ConcreteComponentId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, ComponentConcretizationAndGeneralization[]>> GetComponentGeneralizationsByComponentIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<ComponentConcretizationAndGeneralization> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.ComponentConcretizationAndGeneralizations,
+            _ => _.ConcreteComponentId,
+            _ => _.GeneralComponentId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentFilterType.cs b/backend/src/GraphQl/Components/ComponentFilterType.cs
index 793e58f58..489209d7a 100644
--- a/backend/src/GraphQl/Components/ComponentFilterType.cs
+++ b/backend/src/GraphQl/Components/ComponentFilterType.cs
@@ -5,13 +5,17 @@
 namespace Metabase.GraphQl.Components;
 
 public class ComponentFilterType
-    : EntityFilterType<Component>
+    : AuditableEntityFilterType<Component>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<Component> descriptor
     )
     {
         base.Configure(descriptor);
+        // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.Id);
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         descriptor.Field(x => x.Name);
         descriptor.Field(x => x.Abbreviation);
         descriptor.Field(x => x.Description);
diff --git a/backend/src/GraphQl/Components/ComponentGeneralizationOfConnection.cs b/backend/src/GraphQl/Components/ComponentGeneralizationOfConnection.cs
index df51c1ed5..daecb5558 100644
--- a/backend/src/GraphQl/Components/ComponentGeneralizationOfConnection.cs
+++ b/backend/src/GraphQl/Components/ComponentGeneralizationOfConnection.cs
@@ -2,10 +2,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Components;
 
@@ -13,14 +13,14 @@ public sealed class ComponentGeneralizationOfConnection(
     Component subject,
     QueryContext<ComponentConcretizationAndGeneralization> queryContext
     )
-        : Connection<Component, ComponentConcretizationAndGeneralization,
-        ComponentConcretizationsByComponentIdDataLoader, ComponentGeneralizationOfEdge>(
+        : Connection<Component, ComponentConcretizationAndGeneralization, ComponentGeneralizationOfEdge, IComponentConcretizationsByComponentIdDataLoader>(
         subject,
         x => new ComponentGeneralizationOfEdge(x),
         queryContext
         )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentGeneralizationAuthorization authorization,
diff --git a/backend/src/GraphQl/Components/ComponentGeneralizationOfEdge.cs b/backend/src/GraphQl/Components/ComponentGeneralizationOfEdge.cs
index 569951c2c..b05c756c5 100644
--- a/backend/src/GraphQl/Components/ComponentGeneralizationOfEdge.cs
+++ b/backend/src/GraphQl/Components/ComponentGeneralizationOfEdge.cs
@@ -1,21 +1,20 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Components;
 
 public sealed class ComponentGeneralizationOfEdge(
     ComponentConcretizationAndGeneralization association
-    )
-        : Edge<Component, ComponentByIdDataLoader>(association.ConcreteComponentId)
+)
+: Edge<Component, IComponentByIdDataLoader>(association.ConcreteComponentId)
 {
-    private readonly ComponentConcretizationAndGeneralization _association = association;
-
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToRemoveEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentGeneralizationAuthorization authorization,
@@ -24,8 +23,8 @@ CancellationToken cancellationToken
     {
         return authorization.IsAuthorizedToManage(
             claimsPrincipal,
-            _association.GeneralComponentId,
-            _association.ConcreteComponentId,
+            association.GeneralComponentId,
+            association.ConcreteComponentId,
             cancellationToken
         );
     }
diff --git a/backend/src/GraphQl/Components/ComponentGeneralizationOfFilterType.cs b/backend/src/GraphQl/Components/ComponentGeneralizationOfFilterType.cs
index 4a3b1d5a3..b8793c388 100644
--- a/backend/src/GraphQl/Components/ComponentGeneralizationOfFilterType.cs
+++ b/backend/src/GraphQl/Components/ComponentGeneralizationOfFilterType.cs
@@ -1,5 +1,4 @@
 using HotChocolate.Data.Filters;
-using Metabase.Configuration;
 using Metabase.Data;
 
 namespace Metabase.GraphQl.Components;
diff --git a/backend/src/GraphQl/Components/ComponentGeneralizationOfSortType.cs b/backend/src/GraphQl/Components/ComponentGeneralizationOfSortType.cs
new file mode 100644
index 000000000..c59f58ede
--- /dev/null
+++ b/backend/src/GraphQl/Components/ComponentGeneralizationOfSortType.cs
@@ -0,0 +1,16 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+
+namespace Metabase.GraphQl.Components;
+
+public sealed class ComponentGeneralizationOfSortType
+    : ComponentGeneralizations.ComponentConcretizationAndGeneralizationSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<ComponentConcretizationAndGeneralization> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(ComponentGeneralizationOfSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentGeneralizationsByComponentIdDataLoader.cs b/backend/src/GraphQl/Components/ComponentGeneralizationsByComponentIdDataLoader.cs
deleted file mode 100644
index 5352d6b63..000000000
--- a/backend/src/GraphQl/Components/ComponentGeneralizationsByComponentIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Components;
-
-public sealed class ComponentGeneralizationsByComponentIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<ComponentConcretizationAndGeneralization>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.ComponentConcretizationAndGeneralizations.AsNoTracking().Where(x =>
-                    ids.Contains(x.ConcreteComponentId)
-                ).With(queryContext),
-        x => x.ConcreteComponentId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentManagerEdge.cs b/backend/src/GraphQl/Components/ComponentManagerEdge.cs
index 4210013a5..7d7d4d059 100644
--- a/backend/src/GraphQl/Components/ComponentManagerEdge.cs
+++ b/backend/src/GraphQl/Components/ComponentManagerEdge.cs
@@ -5,7 +5,7 @@ namespace Metabase.GraphQl.Components;
 
 public sealed class ComponentManagerEdge(
     Component association
-    )
-        : Edge<Institution, InstitutionByIdDataLoader>(association.ManagerId)
+)
+: Edge<Institution, IInstitutionByIdDataLoader>(association.ManagerId)
 {
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentManufacturerConnection.cs b/backend/src/GraphQl/Components/ComponentManufacturerConnection.cs
index e3ba6710c..eb43a9649 100644
--- a/backend/src/GraphQl/Components/ComponentManufacturerConnection.cs
+++ b/backend/src/GraphQl/Components/ComponentManufacturerConnection.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
@@ -11,14 +12,15 @@ namespace Metabase.GraphQl.Components;
 public sealed class ComponentManufacturerConnection(
     Component subject,
     QueryContext<ComponentManufacturer> queryContext
-    )
-        : Connection<Component, ComponentManufacturer, ComponentManufacturersByComponentIdDataLoader, ComponentManufacturerEdge>(
-        subject,
-        x => new ComponentManufacturerEdge(x),
-        queryContext
-        )
+)
+: Connection<Component, ComponentManufacturer, ComponentManufacturerEdge, IComponentManufacturersByComponentIdDataLoader>(
+    subject,
+    association => new ComponentManufacturerEdge(association),
+    queryContext
+)
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentManufacturerAuthorization authorization,
@@ -36,16 +38,15 @@ CancellationToken cancellationToken
 public sealed class PendingComponentManufacturerConnection(
     Component subject,
     QueryContext<ComponentManufacturer> queryContext
-    )
-        : AuthorizedConnection<Component, ComponentManufacturer, PendingComponentManufacturersByComponentIdDataLoader, ComponentManufacturerEdge, ComponentManufacturerAuthorization>(
-        subject,
-        x => new ComponentManufacturerEdge(x),
-        (claimsPrincipal, component, authorization, cancellationToken) =>
-            authorization.IsAuthorizedToAdd(claimsPrincipal, component.Id, cancellationToken),
-        queryContext
-        )
+)
+: Connection<Component, ComponentManufacturer, ComponentManufacturerEdge, IPendingComponentManufacturersByComponentIdDataLoader>(
+    subject,
+    association => new ComponentManufacturerEdge(association),
+    queryContext
+)
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentManufacturerAuthorization authorization,
diff --git a/backend/src/GraphQl/Components/ComponentManufacturerEdge.cs b/backend/src/GraphQl/Components/ComponentManufacturerEdge.cs
index 136e94ffd..915feec1f 100644
--- a/backend/src/GraphQl/Components/ComponentManufacturerEdge.cs
+++ b/backend/src/GraphQl/Components/ComponentManufacturerEdge.cs
@@ -1,22 +1,23 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Institutions;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Components;
 
 public sealed class ComponentManufacturerEdge(
     ComponentManufacturer association
-    )
-        : Edge<Institution, InstitutionByIdDataLoader>(association.InstitutionId)
+)
+: Edge<Institution, IInstitutionByIdDataLoader>(
+    association.InstitutionId
+)
 {
-    private readonly ComponentManufacturer _association = association;
-
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToConfirmEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentManufacturerAuthorization authorization,
@@ -25,12 +26,13 @@ CancellationToken cancellationToken
     {
         return authorization.IsAuthorizedToConfirm(
             claimsPrincipal,
-            _association.InstitutionId,
+            association.InstitutionId,
             cancellationToken
         );
     }
 
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToRemoveEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentManufacturerAuthorization authorization,
@@ -39,7 +41,7 @@ CancellationToken cancellationToken
     {
         return authorization.IsAuthorizedToRemove(
             claimsPrincipal,
-            _association.ComponentId,
+            association.ComponentId,
             cancellationToken
         );
     }
diff --git a/backend/src/GraphQl/Components/ComponentManufacturerFilterType.cs b/backend/src/GraphQl/Components/ComponentManufacturerFilterType.cs
index 5c0ae6585..6c7404b7b 100644
--- a/backend/src/GraphQl/Components/ComponentManufacturerFilterType.cs
+++ b/backend/src/GraphQl/Components/ComponentManufacturerFilterType.cs
@@ -1,5 +1,4 @@
 using HotChocolate.Data.Filters;
-using Metabase.Configuration;
 using Metabase.Data;
 
 namespace Metabase.GraphQl.Components;
diff --git a/backend/src/GraphQl/Components/ComponentManufacturerSortType.cs b/backend/src/GraphQl/Components/ComponentManufacturerSortType.cs
new file mode 100644
index 000000000..7533d1459
--- /dev/null
+++ b/backend/src/GraphQl/Components/ComponentManufacturerSortType.cs
@@ -0,0 +1,16 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+
+namespace Metabase.GraphQl.Components;
+
+public sealed class ComponentManufacturerSortType
+    : ComponentManufacturers.ComponentManufacturerSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<ComponentManufacturer> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(ComponentManufacturerSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentManufacturersByComponentIdDataLoader.cs b/backend/src/GraphQl/Components/ComponentManufacturersByComponentIdDataLoader.cs
deleted file mode 100644
index 74d8c254c..000000000
--- a/backend/src/GraphQl/Components/ComponentManufacturersByComponentIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Components;
-
-public sealed class ComponentManufacturersByComponentIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<ComponentManufacturer>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.ComponentManufacturers.AsNoTracking().Where(x =>
-                    !x.Pending && ids.Contains(x.ComponentId)
-                ).With(queryContext),
-        x => x.ComponentId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentPartOfByComponentIdDataLoader.cs b/backend/src/GraphQl/Components/ComponentPartOfByComponentIdDataLoader.cs
deleted file mode 100644
index fd4d811c8..000000000
--- a/backend/src/GraphQl/Components/ComponentPartOfByComponentIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Components;
-
-public sealed class ComponentPartOfByComponentIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<ComponentAssembly>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.ComponentAssemblies.AsNoTracking().Where(x =>
-                    ids.Contains(x.PartComponentId)
-                ).With(queryContext),
-        x => x.PartComponentId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentPartOfConnection.cs b/backend/src/GraphQl/Components/ComponentPartOfConnection.cs
index d60f209ac..c62984788 100644
--- a/backend/src/GraphQl/Components/ComponentPartOfConnection.cs
+++ b/backend/src/GraphQl/Components/ComponentPartOfConnection.cs
@@ -2,10 +2,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Components;
 
@@ -13,14 +13,14 @@ public sealed class ComponentPartOfConnection(
     Component subject,
     QueryContext<ComponentAssembly> queryContext
     )
-        : Connection<Component, ComponentAssembly, ComponentPartOfByComponentIdDataLoader,
-        ComponentPartOfEdge>(
+        : Connection<Component, ComponentAssembly, ComponentPartOfEdge, ComponentPartOfByComponentIdDataLoader>(
         subject,
         x => new ComponentPartOfEdge(x),
         queryContext
         )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentAssemblyAuthorization authorization,
diff --git a/backend/src/GraphQl/Components/ComponentPartOfEdge.cs b/backend/src/GraphQl/Components/ComponentPartOfEdge.cs
index 587c9d5bf..e704a44ae 100644
--- a/backend/src/GraphQl/Components/ComponentPartOfEdge.cs
+++ b/backend/src/GraphQl/Components/ComponentPartOfEdge.cs
@@ -1,26 +1,25 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.Enumerations;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Components;
 
 public sealed class ComponentPartOfEdge(
     ComponentAssembly association
     )
-        : Edge<Component, ComponentByIdDataLoader>(association.AssembledComponentId)
+        : Edge<Component, IComponentByIdDataLoader>(association.AssembledComponentId)
 {
-    private readonly ComponentAssembly _association = association;
+    public byte? Index => association.Index;
 
-    public byte? Index => _association.Index;
-
-    public PrimeSurface? PrimeSurface => _association.PrimeSurface;
+    public PrimeSurface? PrimeSurface => association.PrimeSurface;
 
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToUpdateEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentAssemblyAuthorization authorization,
@@ -29,13 +28,14 @@ CancellationToken cancellationToken
     {
         return authorization.IsAuthorizedToManage(
             claimsPrincipal,
-            _association.AssembledComponentId,
-            _association.PartComponentId,
+            association.AssembledComponentId,
+            association.PartComponentId,
             cancellationToken
         );
     }
 
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToRemoveEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentAssemblyAuthorization authorization,
@@ -44,8 +44,8 @@ CancellationToken cancellationToken
     {
         return authorization.IsAuthorizedToManage(
             claimsPrincipal,
-            _association.AssembledComponentId,
-            _association.PartComponentId,
+            association.AssembledComponentId,
+            association.PartComponentId,
             cancellationToken
         );
     }
diff --git a/backend/src/GraphQl/Components/ComponentPartOfFilterType.cs b/backend/src/GraphQl/Components/ComponentPartOfFilterType.cs
index 8559308b6..663f40c5c 100644
--- a/backend/src/GraphQl/Components/ComponentPartOfFilterType.cs
+++ b/backend/src/GraphQl/Components/ComponentPartOfFilterType.cs
@@ -1,5 +1,4 @@
 using HotChocolate.Data.Filters;
-using Metabase.Configuration;
 using Metabase.Data;
 
 namespace Metabase.GraphQl.Components;
diff --git a/backend/src/GraphQl/Components/ComponentPartOfSortType.cs b/backend/src/GraphQl/Components/ComponentPartOfSortType.cs
new file mode 100644
index 000000000..331a0d9da
--- /dev/null
+++ b/backend/src/GraphQl/Components/ComponentPartOfSortType.cs
@@ -0,0 +1,16 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+
+namespace Metabase.GraphQl.Components;
+
+public sealed class ComponentPartOfSortType
+    : ComponentAssemblies.ComponentAssemblySortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<ComponentAssembly> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(ComponentPartOfSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentPartsByComponentIdDataLoader.cs b/backend/src/GraphQl/Components/ComponentPartsByComponentIdDataLoader.cs
deleted file mode 100644
index 430757729..000000000
--- a/backend/src/GraphQl/Components/ComponentPartsByComponentIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Components;
-
-public sealed class ComponentPartsByComponentIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<ComponentAssembly>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.ComponentAssemblies.AsNoTracking().Where(x =>
-                    ids.Contains(x.AssembledComponentId)
-                ).OrderBy(x => x.Index).With(queryContext),
-        x => x.AssembledComponentId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentQueries.cs b/backend/src/GraphQl/Components/ComponentQueries.cs
index 1d16784c0..fbc8d53cb 100644
--- a/backend/src/GraphQl/Components/ComponentQueries.cs
+++ b/backend/src/GraphQl/Components/ComponentQueries.cs
@@ -2,8 +2,9 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using GreenDonut.Data;
 using HotChocolate.Data;
-using HotChocolate.Data.Sorting;
+using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
 using Metabase.GraphQl.Extensions;
@@ -15,27 +16,32 @@ namespace Metabase.GraphQl.Components;
 public sealed class ComponentQueries
 {
     [UsePaging]
-    // [UseProjection] // We disabled projections because when requesting `id` all results had the same `id` and when also requesting `uuid`, the latter was always the empty UUID `000...`.
     [UseFiltering<ComponentFilterType>]
     [UseSorting<ComponentSortType>]
-    public IQueryable<Component> GetComponents(
-        ApplicationDbContext context,
-        ISortingContext sorting
+    public ValueTask<HotChocolate.Types.Pagination.Connection<Component>> GetComponentsAsync(
+        IResolverContext resolverContext,
+        ApplicationDbContext databaseContext,
+        // PagingArguments pagingArguments, // results in the parameter `pagingArguments: PagingArgumentsInput` in the GraphQL schema
+        // QueryContext<Component> queryContext, // starts up the projection engine producing many problems
+        CancellationToken cancellationToken
     )
     {
-        sorting.StabilizeOrder<Component>();
-        return context.Components.AsNoTracking();
+        return databaseContext.Components
+            .AsNoTracking()
+            .With(resolverContext.GetQueryContext<Component>(), Sorting.DefaultEntityOrder)
+            .ToPageAsync(resolverContext.GetPagingArguments(), cancellationToken)
+            .ToConnectionAsync();
     }
 
     public Task<Component?> GetComponentAsync(
         Guid id,
-        ComponentByIdDataLoader componentById,
+        IComponentByIdDataLoader byId,
+        // QueryContext<Component> queryContext, // starts up the projection engine producing many problems
         CancellationToken cancellationToken
     )
     {
-        return componentById.LoadAsync(
-            id,
-            cancellationToken
-        );
+        return byId
+            // .With(queryContext)
+            .LoadAsync(id, cancellationToken);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Components/ComponentSortType.cs b/backend/src/GraphQl/Components/ComponentSortType.cs
index 7121b4a63..15da7d0d8 100644
--- a/backend/src/GraphQl/Components/ComponentSortType.cs
+++ b/backend/src/GraphQl/Components/ComponentSortType.cs
@@ -4,8 +4,8 @@
 
 namespace Metabase.GraphQl.Components;
 
-public sealed class ComponentSortType
-    : EntitySortType<Component>
+public class ComponentSortType
+    : AuditableEntitySortType<Component>
 {
     protected override void Configure(
         ISortInputTypeDescriptor<Component> descriptor
diff --git a/backend/src/GraphQl/Components/ComponentType.cs b/backend/src/GraphQl/Components/ComponentType.cs
index e62961e66..65b61e017 100644
--- a/backend/src/GraphQl/Components/ComponentType.cs
+++ b/backend/src/GraphQl/Components/ComponentType.cs
@@ -1,6 +1,7 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using GreenDonut.Data;
 using HotChocolate;
 using HotChocolate.Types;
 using Metabase.Authorization;
@@ -13,7 +14,7 @@
 namespace Metabase.GraphQl.Components;
 
 public sealed class ComponentType
-    : EntityType<Component, ComponentByIdDataLoader>
+    : EntityType<Component, IComponentByIdDataLoader>
 {
     protected override void Configure(
         IObjectTypeDescriptor<Component> descriptor
@@ -29,6 +30,7 @@ IObjectTypeDescriptor<Component> descriptor
         descriptor
             .Field("prime")
             .Type<ObjectType<PrimeSurfaceOrDirection>>()
+            .Cost(0)
             .Resolve(context =>
             {
                 var component = context.Parent<Component>();
@@ -54,6 +56,7 @@ IObjectTypeDescriptor<Component> descriptor
             .Field(t => t.Manufacturers)
             .Type<NonNullType<ObjectType<ComponentManufacturerConnection>>>()
             .UseFiltering<ComponentManufacturerFilterType>()
+            .UseSorting<ComponentManufacturerSortType>()
             .Resolve(context =>
                 new ComponentManufacturerConnection(
                     context.Parent<Component>(),
@@ -65,6 +68,7 @@ IObjectTypeDescriptor<Component> descriptor
             .Type<ObjectType<PendingComponentManufacturerConnection>>()
             .Authorize(AuthorizationPolicies.WriteScopePolicy)
             .UseFiltering<ComponentManufacturerFilterType>()
+            .UseSorting<ComponentManufacturerSortType>()
             .Resolve(context =>
                 new PendingComponentManufacturerConnection(
                     context.Parent<Component>(),
@@ -78,6 +82,7 @@ IObjectTypeDescriptor<Component> descriptor
             .Name("assembledOf")
             .Type<NonNullType<ObjectType<ComponentAssembledOfConnection>>>()
             .UseFiltering<ComponentAssembledOfFilterType>()
+            .UseSorting<ComponentAssembledOfSortType>()
             .Resolve(context =>
                 new ComponentAssembledOfConnection(
                     context.Parent<Component>(),
@@ -90,6 +95,7 @@ IObjectTypeDescriptor<Component> descriptor
             .Field(t => t.PartOf)
             .Type<NonNullType<ObjectType<ComponentPartOfConnection>>>()
             .UseFiltering<ComponentPartOfFilterType>()
+            .UseSorting<ComponentPartOfSortType>()
             .Resolve(context =>
                 new ComponentPartOfConnection(
                     context.Parent<Component>(),
@@ -103,6 +109,7 @@ IObjectTypeDescriptor<Component> descriptor
             .Name("concretizationOf")
             .Type<NonNullType<ObjectType<ComponentConcretizationOfConnection>>>()
             .UseFiltering<ComponentConcretizationOfFilterType>()
+            .UseSorting<ComponentConcretizationOfSortType>()
             .Resolve(context =>
                 new ComponentConcretizationOfConnection(
                     context.Parent<Component>(),
@@ -117,6 +124,7 @@ IObjectTypeDescriptor<Component> descriptor
             .Name("generalizationOf")
             .Type<NonNullType<ObjectType<ComponentGeneralizationOfConnection>>>()
             .UseFiltering<ComponentGeneralizationOfFilterType>()
+            .UseSorting<ComponentGeneralizationOfSortType>()
             .Resolve(context =>
                 new ComponentGeneralizationOfConnection(
                     context.Parent<Component>(),
@@ -135,6 +143,7 @@ IObjectTypeDescriptor<Component> descriptor
             .Field(t => t.VariantOf)
             .Type<NonNullType<ObjectType<ComponentVariantOfConnection>>>()
             .UseFiltering<ComponentVariantOfFilterType>()
+            .UseSorting<ComponentVariantOfSortType>()
             .Resolve(context =>
                 new ComponentVariantOfConnection(
                     context.Parent<Component>(),
@@ -145,6 +154,7 @@ IObjectTypeDescriptor<Component> descriptor
             .Field(t => t.VariantOfEdges).Ignore();
         descriptor
             .Field("isAuthorizedToUpdateNode")
+            .Cost(1)
             .ResolveWith<ComponentResolvers>(x =>
                 ComponentResolvers.IsAuthorizedToUpdateNodeAsync(default!, default!, default!, default!))
             .UseUserManager();
@@ -152,7 +162,7 @@ IObjectTypeDescriptor<Component> descriptor
 
     private sealed class ComponentResolvers
     {
-        public static Task<bool> IsAuthorizedToUpdateNodeAsync(
+        internal static Task<bool> IsAuthorizedToUpdateNodeAsync(
             [Parent] Component component,
             ClaimsPrincipal claimsPrincipal,
             ComponentAuthorization authorization,
diff --git a/backend/src/GraphQl/Components/ComponentVariantOfByComponentIdDataLoader.cs b/backend/src/GraphQl/Components/ComponentVariantOfByComponentIdDataLoader.cs
deleted file mode 100644
index 61d455ea5..000000000
--- a/backend/src/GraphQl/Components/ComponentVariantOfByComponentIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Components;
-
-public sealed class ComponentVariantOfByComponentIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<ComponentVariant>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.ComponentVariants.AsNoTracking().Where(x =>
-                    ids.Contains(x.ToComponentId)
-                ).With(queryContext),
-        x => x.ToComponentId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentVariantOfConnection.cs b/backend/src/GraphQl/Components/ComponentVariantOfConnection.cs
index fe99344f6..0df26a946 100644
--- a/backend/src/GraphQl/Components/ComponentVariantOfConnection.cs
+++ b/backend/src/GraphQl/Components/ComponentVariantOfConnection.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
@@ -12,14 +13,14 @@ public sealed class ComponentVariantOfConnection(
     Component subject,
     QueryContext<ComponentVariant> queryContext
     )
-        : Connection<Component, ComponentVariant, ComponentVariantOfByComponentIdDataLoader,
-        ComponentVariantOfEdge>(
+        : Connection<Component, ComponentVariant, ComponentVariantOfEdge, IComponentVariantOfByComponentIdDataLoader>(
         subject,
         x => new ComponentVariantOfEdge(x),
         queryContext
         )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentVariantAuthorization authorization,
diff --git a/backend/src/GraphQl/Components/ComponentVariantOfEdge.cs b/backend/src/GraphQl/Components/ComponentVariantOfEdge.cs
index 57b55101b..b0facc961 100644
--- a/backend/src/GraphQl/Components/ComponentVariantOfEdge.cs
+++ b/backend/src/GraphQl/Components/ComponentVariantOfEdge.cs
@@ -1,21 +1,20 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Components;
 
 public sealed class ComponentVariantOfEdge(
     ComponentVariant association
     )
-        : Edge<Component, ComponentByIdDataLoader>(association.OfComponentId)
+        : Edge<Component, IComponentByIdDataLoader>(association.OfComponentId)
 {
-    private readonly ComponentVariant _association = association;
-
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToRemoveEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentAssemblyAuthorization authorization,
@@ -24,8 +23,8 @@ CancellationToken cancellationToken
     {
         return authorization.IsAuthorizedToManage(
             claimsPrincipal,
-            _association.OfComponentId,
-            _association.ToComponentId,
+            association.OfComponentId,
+            association.ToComponentId,
             cancellationToken
         );
     }
diff --git a/backend/src/GraphQl/Components/ComponentVariantOfFilterType.cs b/backend/src/GraphQl/Components/ComponentVariantOfFilterType.cs
index 09cbd214d..41a9e5ef4 100644
--- a/backend/src/GraphQl/Components/ComponentVariantOfFilterType.cs
+++ b/backend/src/GraphQl/Components/ComponentVariantOfFilterType.cs
@@ -1,5 +1,4 @@
 using HotChocolate.Data.Filters;
-using Metabase.Configuration;
 using Metabase.Data;
 
 namespace Metabase.GraphQl.Components;
diff --git a/backend/src/GraphQl/Components/ComponentVariantOfSortType.cs b/backend/src/GraphQl/Components/ComponentVariantOfSortType.cs
new file mode 100644
index 000000000..4f8201c08
--- /dev/null
+++ b/backend/src/GraphQl/Components/ComponentVariantOfSortType.cs
@@ -0,0 +1,16 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+
+namespace Metabase.GraphQl.Components;
+
+public sealed class ComponentVariantOfSortType
+    : ComponentVariants.ComponentVariantSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<ComponentVariant> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(ComponentVariantOfSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/PendingComponentManufacturersByComponentIdDataLoader.cs b/backend/src/GraphQl/Components/PendingComponentManufacturersByComponentIdDataLoader.cs
deleted file mode 100644
index 78672c3e0..000000000
--- a/backend/src/GraphQl/Components/PendingComponentManufacturersByComponentIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Components;
-
-public sealed class PendingComponentManufacturersByComponentIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<ComponentManufacturer>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.ComponentManufacturers.AsNoTracking().Where(x =>
-                    x.Pending && ids.Contains(x.ComponentId)
-                ).With(queryContext),
-        x => x.ComponentId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Connection.cs b/backend/src/GraphQl/Connection.cs
index df5578991..c2606a0fb 100644
--- a/backend/src/GraphQl/Connection.cs
+++ b/backend/src/GraphQl/Connection.cs
@@ -6,34 +6,44 @@
 using System.Threading.Tasks;
 using GreenDonut;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Data;
 
 namespace Metabase.GraphQl;
 
-public abstract class Connection<TSubject, TAssociation, TAssociationsByAssociateIdDataLoader, TEdge>(
+public abstract class Connection<TSubject, TAssociation, TEdge, TAssociationsByOneIdDataLoader>(
     TSubject subject,
     Func<TAssociation, TEdge> createEdge,
     QueryContext<TAssociation> queryContext
-    )
+)
     where TSubject : IEntity
-    where TAssociationsByAssociateIdDataLoader : IDataLoader<Guid, TAssociation[]>
+    where TAssociationsByOneIdDataLoader : IDataLoader<Guid, TAssociation[]>
 {
     protected TSubject Subject { get; } = subject;
 
+    [Cost(0)]
     public async Task<uint> GetTotalCountAsync(
-        TAssociationsByAssociateIdDataLoader dataLoader,
+        TAssociationsByOneIdDataLoader dataLoader,
         CancellationToken cancellationToken
     )
     {
-        return (uint)(await dataLoader.With(queryContext).LoadRequiredAsync(Subject.Id, cancellationToken)).Length;
+        return (uint)(
+            (
+                await dataLoader
+                .With(queryContext)
+                .LoadAsync(Subject.Id, cancellationToken)
+            )
+            ?.Length ?? 0
+        );
     }
 
+    [Cost(0)]
     public async IAsyncEnumerable<TEdge> GetEdgesAsync(
-        TAssociationsByAssociateIdDataLoader dataLoader,
+        TAssociationsByOneIdDataLoader dataLoader,
         [EnumeratorCancellation] CancellationToken cancellationToken
     )
     {
-        foreach (var association in await dataLoader.With(queryContext).LoadRequiredAsync(Subject.Id, cancellationToken))
+        foreach (var association in await dataLoader.With(queryContext).LoadAsync(Subject.Id, cancellationToken) ?? [])
         {
             yield return createEdge(association);
         }
diff --git a/backend/src/GraphQl/ContactInformations/ContactInformationFilterType.cs b/backend/src/GraphQl/ContactInformations/ContactInformationFilterType.cs
index 38e164b9f..1252e6c95 100644
--- a/backend/src/GraphQl/ContactInformations/ContactInformationFilterType.cs
+++ b/backend/src/GraphQl/ContactInformations/ContactInformationFilterType.cs
@@ -10,6 +10,8 @@ protected override void Configure(
         IFilterInputTypeDescriptor<ContactInformation> descriptor
     )
     {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(ContactInformationFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
         descriptor.BindFieldsExplicitly();
         descriptor.Field(_ => _.PhoneNumber);
         descriptor.Field(_ => _.IsPhoneNumberConfirmed);
diff --git a/backend/src/GraphQl/ContactInformations/ContactInformationSortType.cs b/backend/src/GraphQl/ContactInformations/ContactInformationSortType.cs
index 439a6150e..2897b2cc5 100644
--- a/backend/src/GraphQl/ContactInformations/ContactInformationSortType.cs
+++ b/backend/src/GraphQl/ContactInformations/ContactInformationSortType.cs
@@ -10,12 +10,12 @@ protected override void Configure(
         ISortInputTypeDescriptor<ContactInformation> descriptor
     )
     {
+        base.Configure(descriptor);
         descriptor.BindFieldsExplicitly();
+        descriptor.Name(nameof(ContactInformationSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
         descriptor.Field(_ => _.PhoneNumber);
-        descriptor.Field(_ => _.IsPhoneNumberConfirmed);
         descriptor.Field(_ => _.PostalAddress);
         descriptor.Field(_ => _.EmailAddress);
-        descriptor.Field(_ => _.IsEmailAddressConfirmed);
         descriptor.Field(_ => _.WebsiteLocator);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataFormats/DataFormatByIdDataLoader.cs b/backend/src/GraphQl/DataFormats/DataFormatByIdDataLoader.cs
deleted file mode 100644
index 0f1bb3b9c..000000000
--- a/backend/src/GraphQl/DataFormats/DataFormatByIdDataLoader.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.DataFormats;
-
-public sealed class DataFormatByIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : EntityByIdDataLoader<DataFormat>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        dbContext => dbContext.DataFormats
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataFormats/DataFormatDataLoaders.cs b/backend/src/GraphQl/DataFormats/DataFormatDataLoaders.cs
new file mode 100644
index 000000000..2501972a5
--- /dev/null
+++ b/backend/src/GraphQl/DataFormats/DataFormatDataLoaders.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut;
+using GreenDonut.Data;
+using Metabase.Data;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.DataFormats;
+
+public sealed class DataFormatDataLoaders
+: DataLoaders
+{
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, DataFormat>> GetDataFormatByIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<DataFormat> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetEntityByIdAsync(
+            ids,
+            databaseContext => databaseContext.DataFormats,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataFormats/DataFormatFilterType.cs b/backend/src/GraphQl/DataFormats/DataFormatFilterType.cs
index 043830b21..6e54baf76 100644
--- a/backend/src/GraphQl/DataFormats/DataFormatFilterType.cs
+++ b/backend/src/GraphQl/DataFormats/DataFormatFilterType.cs
@@ -5,13 +5,17 @@
 namespace Metabase.GraphQl.DataFormats;
 
 public class DataFormatFilterType
-    : EntityFilterType<DataFormat>
+    : AuditableEntityFilterType<DataFormat>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<DataFormat> descriptor
     )
     {
         base.Configure(descriptor);
+        // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.Id);
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         descriptor.Field(x => x.Name);
         descriptor.Field(x => x.Extension);
         descriptor.Field(x => x.Description);
diff --git a/backend/src/GraphQl/DataFormats/DataFormatManagerEdge.cs b/backend/src/GraphQl/DataFormats/DataFormatManagerEdge.cs
index 45f1d3b47..b7eb5fbe5 100644
--- a/backend/src/GraphQl/DataFormats/DataFormatManagerEdge.cs
+++ b/backend/src/GraphQl/DataFormats/DataFormatManagerEdge.cs
@@ -6,6 +6,6 @@ namespace Metabase.GraphQl.DataFormats;
 public sealed class DataFormatManagerEdge(
     DataFormat association
     )
-        : Edge<Institution, InstitutionByIdDataLoader>(association.ManagerId)
+        : Edge<Institution, IInstitutionByIdDataLoader>(association.ManagerId)
 {
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataFormats/DataFormatQueries.cs b/backend/src/GraphQl/DataFormats/DataFormatQueries.cs
index 1cd76764c..24553041c 100644
--- a/backend/src/GraphQl/DataFormats/DataFormatQueries.cs
+++ b/backend/src/GraphQl/DataFormats/DataFormatQueries.cs
@@ -2,8 +2,10 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using GreenDonut.Data;
 using HotChocolate.Data;
 using HotChocolate.Data.Sorting;
+using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
 using Metabase.GraphQl.Extensions;
@@ -15,27 +17,27 @@ namespace Metabase.GraphQl.DataFormats;
 public sealed class DataFormatQueries
 {
     [UsePaging]
-    // [UseProjection] // We disabled projections because when requesting `id` all results had the same `id` and when also requesting `uuid`, the latter was always the empty UUID `000...`.
     [UseFiltering<DataFormatFilterType>]
     [UseSorting<DataFormatSortType>]
-    public IQueryable<DataFormat> GetDataFormats(
-        ApplicationDbContext context,
-        ISortingContext sorting
+    public ValueTask<HotChocolate.Types.Pagination.Connection<DataFormat>> GetDataFormatsAsync(
+        IResolverContext resolverContext,
+        ApplicationDbContext databaseContext,
+        CancellationToken cancellationToken
     )
     {
-        sorting.StabilizeOrder<DataFormat>();
-        return context.DataFormats.AsNoTracking();
+        return databaseContext.DataFormats
+            .AsNoTracking()
+            .With(resolverContext.GetQueryContext<DataFormat>(), Sorting.DefaultEntityOrder)
+            .ToPageAsync(resolverContext.GetPagingArguments(), cancellationToken)
+            .ToConnectionAsync();
     }
 
     public Task<DataFormat?> GetDataFormatAsync(
         Guid id,
-        DataFormatByIdDataLoader dataFormatById,
+        IDataFormatByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
-        return dataFormatById.LoadAsync(
-            id,
-            cancellationToken
-        );
+        return byId.LoadAsync(id, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataFormats/DataFormatSortType.cs b/backend/src/GraphQl/DataFormats/DataFormatSortType.cs
index 59fc22fd4..4284db9a4 100644
--- a/backend/src/GraphQl/DataFormats/DataFormatSortType.cs
+++ b/backend/src/GraphQl/DataFormats/DataFormatSortType.cs
@@ -4,8 +4,8 @@
 
 namespace Metabase.GraphQl.DataFormats;
 
-public sealed class DataFormatSortType
-    : EntitySortType<DataFormat>
+public class DataFormatSortType
+    : AuditableEntitySortType<DataFormat>
 {
     protected override void Configure(
         ISortInputTypeDescriptor<DataFormat> descriptor
@@ -17,6 +17,5 @@ ISortInputTypeDescriptor<DataFormat> descriptor
         descriptor.Field(x => x.Description);
         descriptor.Field(x => x.MediaType);
         descriptor.Field(x => x.SchemaLocator);
-        descriptor.Field(x => x.Manager);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataFormats/DataFormatType.cs b/backend/src/GraphQl/DataFormats/DataFormatType.cs
index 51c77cf0b..6359b97eb 100644
--- a/backend/src/GraphQl/DataFormats/DataFormatType.cs
+++ b/backend/src/GraphQl/DataFormats/DataFormatType.cs
@@ -13,7 +13,7 @@
 namespace Metabase.GraphQl.DataFormats;
 
 public sealed class DataFormatType
-    : EntityType<DataFormat, DataFormatByIdDataLoader>
+    : EntityType<DataFormat, IDataFormatByIdDataLoader>
 {
     protected override void Configure(
         IObjectTypeDescriptor<DataFormat> descriptor
@@ -23,6 +23,7 @@ IObjectTypeDescriptor<DataFormat> descriptor
         descriptor
             .Field(t => t.Reference)
             .Type<ReferenceType>()
+            .Cost(0)
             .Resolve(context => context
                 .Parent<DataFormat>()
                 .Reference?
@@ -41,6 +42,7 @@ IObjectTypeDescriptor<DataFormat> descriptor
             .Ignore();
         descriptor
             .Field("isAuthorizedToUpdateNode")
+            .Cost(1)
             .ResolveWith<DataFormatResolvers>(x =>
                 DataFormatResolvers.IsAuthorizedToUpdateNodeAsync(default!, default!, default!, default!))
             .UseUserManager();
diff --git a/backend/src/GraphQl/DataLoaders.cs b/backend/src/GraphQl/DataLoaders.cs
new file mode 100644
index 000000000..4659b1614
--- /dev/null
+++ b/backend/src/GraphQl/DataLoaders.cs
@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut.Data;
+using LinqKit;
+using Metabase.Data;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl;
+
+public abstract class DataLoaders
+{
+    public static async ValueTask<IReadOnlyDictionary<Guid, TEntity>> GetEntityByIdAsync<TEntity>
+    (
+        IReadOnlyList<Guid> ids,
+        Func<ApplicationDbContext, DbSet<TEntity>> getEntities,
+        QueryContext<TEntity> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+        where TEntity : class, IEntity, IAuditable
+    {
+        await using var databaseContext =
+            databaseContextFactory.CreateDbContext();
+        return await getEntities(databaseContext)
+            .AsNoTrackingWithIdentityResolution()
+            .Where(_ => ids.Contains(_.Id))
+            .With(queryContext, Sorting.DefaultEntityOrder)
+            .ToDictionaryAsync(_ => _.Id, cancellationToken);
+    }
+
+    public static async ValueTask<IReadOnlyDictionary<Guid, TMany[]>> GetManyByOneIdAsync<TMany>(
+        IReadOnlyList<Guid> ids,
+        Func<ApplicationDbContext, IQueryable<TMany>> getMany,
+        Expression<Func<TMany, Guid>> getOneId,
+        QueryContext<TMany> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+        where TMany : class, IEntity, IAuditable
+    {
+        await using var databaseContext =
+            databaseContextFactory.CreateDbContext();
+        return
+            await getMany(databaseContext)
+            .AsExpandable()
+            .AsNoTracking()
+            .Where(_ => ids.Contains(getOneId.Invoke(_)))
+            .With(queryContext, Sorting.DefaultEntityOrder)
+            .GroupBy(getOneId)
+            .Select(_ => new { _.Key, Items = _.ToArray() })
+            .ToDictionaryAsync(_ => _.Key, _ => _.Items, cancellationToken);
+    }
+
+    public static async ValueTask<IReadOnlyDictionary<Guid, Page<TMany>>> GetManyByOneIdAsync<TMany>(
+        IReadOnlyList<Guid> ids,
+        Func<ApplicationDbContext, IQueryable<TMany>> getMany,
+        Expression<Func<TMany, Guid>> getOneId,
+        PagingArguments pagingArguments,
+        QueryContext<TMany> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+        where TMany : class, IEntity, IAuditable
+    {
+        await using var databaseContext =
+            databaseContextFactory.CreateDbContext();
+        return
+            await getMany(databaseContext)
+            .AsExpandable()
+            .AsNoTracking()
+            .Where(_ => ids.Contains(getOneId.Invoke(_)))
+            .With(queryContext, Sorting.DefaultEntityOrder)
+            .ToBatchPageAsync(getOneId, pagingArguments, cancellationToken);
+    }
+
+    public static async ValueTask<IReadOnlyDictionary<Guid, TAssociation[]>> GetAssociationsByOneIdAsync<TAssociation>(
+        IReadOnlyList<Guid> ids,
+        Func<ApplicationDbContext, IQueryable<TAssociation>> getAssociations,
+        Expression<Func<TAssociation, Guid>> getOneId,
+        Expression<Func<TAssociation, Guid>> getOtherId,
+        QueryContext<TAssociation> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+        where TAssociation : class, IAssociation, IAuditable
+    {
+        await using var databaseContext =
+            databaseContextFactory.CreateDbContext();
+        return
+            await getAssociations(databaseContext)
+            .AsExpandable()
+            .AsNoTracking()
+            .Where(_ => ids.Contains(getOneId.Invoke(_)))
+            .With(queryContext, _ => _.AddDescending(getOneId).AddDescending(getOtherId))
+            .GroupBy(getOneId)
+            .Select(_ => new { _.Key, Items = _.ToArray() })
+            .ToDictionaryAsync(_ => _.Key, _ => _.Items, cancellationToken);
+    }
+
+    public static async ValueTask<IReadOnlyDictionary<Guid, Page<TAssociation>>> GetAssociationsByOneIdAsync<TAssociation>(
+        IReadOnlyList<Guid> ids,
+        Func<ApplicationDbContext, IQueryable<TAssociation>> getAssociations,
+        Expression<Func<TAssociation, Guid>> getOneId,
+        Expression<Func<TAssociation, Guid>> getOtherId,
+        PagingArguments pagingArguments,
+        QueryContext<TAssociation> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+        where TAssociation : class, IAssociation, IAuditable
+    {
+        await using var databaseContext =
+            databaseContextFactory.CreateDbContext();
+        return
+            await getAssociations(databaseContext)
+            .AsExpandable()
+            .AsNoTracking()
+            .Where(_ => ids.Contains(getOneId.Invoke(_)))
+            .With(queryContext, _ => _.AddDescending(getOneId).AddDescending(getOtherId))
+            .ToBatchPageAsync(getOneId, pagingArguments, cancellationToken);
+    }
+}
diff --git a/backend/src/GraphQl/DataX/AppliedMethod.cs b/backend/src/GraphQl/DataX/AppliedMethod.cs
index 6c17d7881..3040de45f 100644
--- a/backend/src/GraphQl/DataX/AppliedMethod.cs
+++ b/backend/src/GraphQl/DataX/AppliedMethod.cs
@@ -7,16 +7,12 @@
 
 namespace Metabase.GraphQl.DataX;
 
-public sealed class AppliedMethod(
-    Guid methodId,
-    IReadOnlyList<NamedMethodArgument> arguments,
-    IReadOnlyList<NamedMethodSource> sources
+public sealed record AppliedMethod(
+    Guid MethodId,
+    IReadOnlyList<NamedMethodArgument> Arguments,
+    IReadOnlyList<NamedMethodSource> Sources
     )
 {
-    public Guid MethodId { get; } = methodId;
-    public IReadOnlyList<NamedMethodArgument> Arguments { get; } = arguments;
-    public IReadOnlyList<NamedMethodSource> Sources { get; } = sources;
-
     public Task<Method?> GetMethodAsync(
         MethodByIdDataLoader methodById,
         CancellationToken cancellationToken
diff --git a/backend/src/GraphQl/DataX/CalorimetricData.cs b/backend/src/GraphQl/DataX/CalorimetricData.cs
deleted file mode 100644
index 240f253e2..000000000
--- a/backend/src/GraphQl/DataX/CalorimetricData.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using NodaTime;
-
-namespace Metabase.GraphQl.DataX;
-
-public sealed class CalorimetricData(
-    string id,
-    Guid uuid,
-    OffsetDateTime timestamp,
-    string locale,
-    Guid databaseId,
-    Guid componentId,
-    string? name,
-    string? description,
-    IReadOnlyList<string> warnings,
-    Guid creatorId,
-    OffsetDateTime createdAt,
-    AppliedMethod appliedMethod,
-    IReadOnlyList<GetHttpsResource> resources,
-    GetHttpsResourceTree resourceTree,
-    IReadOnlyList<DataApproval> approvals,
-    // ResponseApproval approval
-    IReadOnlyList<double> gValues,
-    IReadOnlyList<double> uValues
-    )
-        : Data(
-    id,
-    uuid,
-    timestamp,
-    locale,
-    databaseId,
-    componentId,
-    name,
-    description,
-    warnings,
-    creatorId,
-    createdAt,
-    appliedMethod,
-    resources,
-    resourceTree,
-    approvals
-    )
-{
-    public override DataKind Kind { get => DataKind.CALORIMETRIC_DATA; }
-    public IReadOnlyList<double> GValues { get; } = gValues;
-    public IReadOnlyList<double> UValues { get; } = uValues;
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/CrossDatabaseDataReference.cs b/backend/src/GraphQl/DataX/CrossDatabaseDataReference.cs
index f0435fb64..01d3d3e0d 100644
--- a/backend/src/GraphQl/DataX/CrossDatabaseDataReference.cs
+++ b/backend/src/GraphQl/DataX/CrossDatabaseDataReference.cs
@@ -2,25 +2,20 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Metabase.Data;
-using Metabase.GraphQl.Institutions;
+using Metabase.GraphQl.Databases;
 using NodaTime;
 
 namespace Metabase.GraphQl.DataX;
 
-public sealed class CrossDatabaseDataReference(
-    Guid dataId,
-    OffsetDateTime dataTimestamp,
-    DataKind dataKind,
-    Guid databaseId
-    )
+public sealed record CrossDatabaseDataReference(
+    Guid DataId,
+    OffsetDateTime DataTimestamp,
+    DataKind DataKind,
+    Guid DatabaseId
+)
 {
-    public Guid DataId { get; } = dataId;
-    public OffsetDateTime DataTimestamp { get; } = dataTimestamp;
-    public DataKind DataKind { get; } = dataKind;
-    public Guid DatabaseId { get; } = databaseId;
-
-    public Task<Institution?> GetDatabaseAsync(
-        InstitutionByIdDataLoader databaseById,
+    public Task<Database?> GetDatabaseAsync(
+        DatabaseByIdDataLoader databaseById,
         CancellationToken cancellationToken
     )
     {
diff --git a/backend/src/GraphQl/DataX/Data.cs b/backend/src/GraphQl/DataX/Data.cs
index 13050f62b..8e8beb5f6 100644
--- a/backend/src/GraphQl/DataX/Data.cs
+++ b/backend/src/GraphQl/DataX/Data.cs
@@ -1,63 +1,84 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using HotChocolate;
 using HotChocolate.Types;
 using HotChocolate.Types.Relay;
 using Metabase.Data;
+using Metabase.Extensions;
 using Metabase.GraphQl.Components;
 using Metabase.GraphQl.Databases;
 using Metabase.GraphQl.Institutions;
+using Metabase.GraphQl.Scalars;
+using Microsoft.EntityFrameworkCore;
 using NodaTime;
 
 namespace Metabase.GraphQl.DataX;
 
-public abstract class Data(
-    string id,
-    Guid uuid,
-    OffsetDateTime timestamp,
-    string locale,
-    Guid databaseId,
-    Guid componentId,
-    string? name,
-    string? description,
-    IReadOnlyList<string> warnings,
-    Guid creatorId,
-    OffsetDateTime createdAt,
-    AppliedMethod appliedMethod,
-    IReadOnlyList<GetHttpsResource> resources,
-    GetHttpsResourceTree resourceTree,
-    IReadOnlyList<DataApproval> approvals
-    // ResponseApproval approval
-    )
-        : IData
+public abstract partial record Data(
+    [property: GraphQLIgnore] string DataId,
+    Guid Uuid,
+    OffsetDateTime Timestamp,
+    [property: GraphQLType<NonNullType<LocaleType>>] string Locale,
+    Guid DatabaseId,
+    Guid ComponentId,
+    string? Name,
+    string? Description,
+    IReadOnlyList<string> Warnings,
+    Guid CreatorId,
+    OffsetDateTime CreatedAt,
+    AppliedMethod AppliedMethod,
+    IReadOnlyList<GetHttpsResource> Resources,
+    GetHttpsResourceTree ResourceTree,
+    IReadOnlyList<DataApproval> Approvals
+// ResponseApproval approval
+)
+: IData
 {
-    [ID]
-    public string Id { get; } = id;
+    [GeneratedRegex("^(?<databaseId>[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}):(?<uuid>[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}):(?<locale>[^:]*):(?<dataId>.+)$", RegexOptions.IgnoreCase)]
+    private static partial Regex IdRegex();
 
-    public abstract DataKind Kind { get; }
+    public static async Task<TData?> FetchNodeAsync<TData>(
+        [ID] string id,
+        Func<Database, Guid, string?, Task<TData?>> getDataAsync,
+        ApplicationDbContext databaseContext,
+        CancellationToken cancellationToken
+    )
+        where TData : class, IData
+    {
+        var match = IdRegex().Match(id);
+        if (match is null || !match.Success)
+        {
+            return null;
+        }
+        var databaseId = new Guid(match.Groups["databaseId"].Value);
+        var uuid = new Guid(match.Groups["uuid"].Value);
+        var locale = match.Groups["locale"].Value.NullIfWhitespace();
+        // TODO use only the following dataId instead of uuid and locale and use the product-data database's query `node(id: ID)` instead of `*Data(id: Uuid)`: var dataId = match.Groups["dataId"].Value;
+        var database = await databaseContext.Databases.AsNoTracking()
+            .Where(_ => _.Id == databaseId)
+            .SingleOrDefaultAsync(cancellationToken);
+        if (database is null)
+        {
+            return null;
+        }
+        return await getDataAsync(database, uuid, locale);
+    }
 
-    [GraphQLType<NonNullType<LocaleType>>]
-    public string Locale { get; } = locale;
+    [ID]
+    public string Id => Convert.ToBase64String(
+        Encoding.UTF8.GetBytes($"{DatabaseId}:{Uuid}:{Locale ?? ""}:{DataId}")
+    );
 
-    public IReadOnlyList<string> Warnings { get; } = warnings;
-    public Guid CreatorId { get; } = creatorId;
-    public OffsetDateTime CreatedAt { get; } = createdAt;
-    public IReadOnlyList<GetHttpsResource> Resources { get; } = resources;
-    public Guid Uuid { get; } = uuid;
-    public OffsetDateTime Timestamp { get; } = timestamp;
-    public Guid DatabaseId { get; } = databaseId;
-    public Guid ComponentId { get; } = componentId;
-    public string? Name { get; } = name;
-    public string? Description { get; } = description;
-    public AppliedMethod AppliedMethod { get; } = appliedMethod;
-    public GetHttpsResourceTree ResourceTree { get; } = resourceTree;
-    public IReadOnlyList<DataApproval> Approvals { get; } = approvals;
+    public abstract DataKind Kind { get; }
 
     public Task<Database?> GetDatabaseAsync(
-            DatabaseByIdDataLoader databaseById,
-            CancellationToken cancellationToken
+        IDatabaseByIdDataLoader databaseById,
+        CancellationToken cancellationToken
     )
     {
         return databaseById.LoadAsync(
@@ -67,7 +88,7 @@ CancellationToken cancellationToken
     }
 
     public Task<Component?> GetComponentAsync(
-        ComponentByIdDataLoader componentById,
+        IComponentByIdDataLoader componentById,
         CancellationToken cancellationToken
     )
     {
@@ -78,7 +99,7 @@ CancellationToken cancellationToken
     }
 
     public Task<Institution?> GetCreatorAsync(
-        InstitutionByIdDataLoader institutionById,
+        IInstitutionByIdDataLoader institutionById,
         CancellationToken cancellationToken
     )
     {
diff --git a/backend/src/GraphQl/DataX/DataApproval.cs b/backend/src/GraphQl/DataX/DataApproval.cs
index 915f5d5fe..3aef4aeb5 100644
--- a/backend/src/GraphQl/DataX/DataApproval.cs
+++ b/backend/src/GraphQl/DataX/DataApproval.cs
@@ -8,29 +8,20 @@
 
 namespace Metabase.GraphQl.DataX;
 
-public sealed class DataApproval(
-    OffsetDateTime timestamp,
-    string signature,
-    string keyFingerprint,
-    string query,
-    JsonElement variables,
-    string message,
-    Guid approverId,
-    IReference statement
-    )
-        : IApproval
+public sealed record DataApproval(
+    OffsetDateTime Timestamp,
+    string Signature,
+    string KeyFingerprint,
+    string Query,
+    JsonElement Variables,
+    string Message,
+    Guid ApproverId,
+    IReference Statement
+)
+: IApproval
 {
-    public Guid ApproverId { get; } = approverId;
-    public OffsetDateTime Timestamp { get; } = timestamp;
-    public string Signature { get; } = signature;
-    public string KeyFingerprint { get; } = keyFingerprint;
-    public string Query { get; } = query;
-    public JsonElement Variables { get; } = variables;
-    public string Message { get; } = message;
-    public IReference Statement { get; private set; } = statement;
-
     public Task<Institution?> GetApproverAsync(
-        InstitutionByIdDataLoader institutionById,
+        IInstitutionByIdDataLoader institutionById,
         CancellationToken cancellationToken
     )
     {
diff --git a/backend/src/GraphQl/DataX/DataConnectionBase.cs b/backend/src/GraphQl/DataX/DataConnectionBase.cs
index 30cc4612e..ac51995af 100644
--- a/backend/src/GraphQl/DataX/DataConnectionBase.cs
+++ b/backend/src/GraphQl/DataX/DataConnectionBase.cs
@@ -1,10 +1,11 @@
 using System.Collections.Generic;
+using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Types.Pagination;
 
 namespace Metabase.GraphQl.DataX;
 
 public abstract record DataConnectionBase<TDataEdge>(
-    IReadOnlyList<TDataEdge> Edges,
-    uint TotalCount,
-    ConnectionPageInfo PageInfo
+    [property: Cost(0)] IReadOnlyList<TDataEdge> Edges,
+    [property: Cost(0)] uint TotalCount,
+    [property: Cost(0)] ConnectionPageInfo PageInfo
 );
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/DataEdgeBase.cs b/backend/src/GraphQl/DataX/DataEdgeBase.cs
index 78da81a18..0d538bbc8 100644
--- a/backend/src/GraphQl/DataX/DataEdgeBase.cs
+++ b/backend/src/GraphQl/DataX/DataEdgeBase.cs
@@ -1,6 +1,8 @@
+using HotChocolate.CostAnalysis.Types;
+
 namespace Metabase.GraphQl.DataX;
 
 public abstract record DataEdgeBase<TData>(
-    string Cursor,
-    TData Node
+    [property: Cost(0)] string Cursor,
+    [property: Cost(0)] TData Node
 );
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/DataPropositionInput.cs b/backend/src/GraphQl/DataX/DataPropositionInput.cs
index 3eb30e29a..f086d3a16 100644
--- a/backend/src/GraphQl/DataX/DataPropositionInput.cs
+++ b/backend/src/GraphQl/DataX/DataPropositionInput.cs
@@ -1,5 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
+using Metabase.GraphQl.CalorimetricDataX;
+using Metabase.GraphQl.GeometricDataX;
+using Metabase.GraphQl.HygrothermalDataX;
+using Metabase.GraphQl.LifeCycleDataX;
+using Metabase.GraphQl.OpticalDataX;
+using Metabase.GraphQl.PhotovoltaicDataX;
 
 namespace Metabase.GraphQl.DataX;
 
diff --git a/backend/src/GraphQl/DataX/FileMetaInformation.cs b/backend/src/GraphQl/DataX/FileMetaInformation.cs
index 782db6b45..1bdc7af6d 100644
--- a/backend/src/GraphQl/DataX/FileMetaInformation.cs
+++ b/backend/src/GraphQl/DataX/FileMetaInformation.cs
@@ -7,14 +7,11 @@
 
 namespace Metabase.GraphQl.DataX;
 
-public sealed class FileMetaInformation(
-    IReadOnlyList<string> path,
-    Guid dataFormatId
-    )
+public sealed record FileMetaInformation(
+    IReadOnlyList<string> Path,
+    Guid DataFormatId
+)
 {
-    public IReadOnlyList<string> Path { get; } = path;
-    public Guid DataFormatId { get; } = dataFormatId;
-
     public Task<DataFormat?> GetDataFormatAsync(
         DataFormatByIdDataLoader dataFormatById,
         CancellationToken cancellationToken
diff --git a/backend/src/GraphQl/DataX/GeometricData.cs b/backend/src/GraphQl/DataX/GeometricData.cs
deleted file mode 100644
index 95da1579c..000000000
--- a/backend/src/GraphQl/DataX/GeometricData.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using NodaTime;
-
-namespace Metabase.GraphQl.DataX;
-
-public sealed class GeometricData(
-    string id,
-    Guid uuid,
-    OffsetDateTime timestamp,
-    string locale,
-    Guid databaseId,
-    Guid componentId,
-    string? name,
-    string? description,
-    IReadOnlyList<string> warnings,
-    Guid creatorId,
-    OffsetDateTime createdAt,
-    AppliedMethod appliedMethod,
-    IReadOnlyList<GetHttpsResource> resources,
-    GetHttpsResourceTree resourceTree,
-    IReadOnlyList<DataApproval> approvals,
-    // ResponseApproval approval,
-    IReadOnlyList<double> thicknesses
-    )
-        : Data(
-    id,
-    uuid,
-    timestamp,
-    locale,
-    databaseId,
-    componentId,
-    name,
-    description,
-    warnings,
-    creatorId,
-    createdAt,
-    appliedMethod,
-    resources,
-    resourceTree,
-    approvals
-    // approval
-    )
-{
-    public override DataKind Kind { get => DataKind.GEOMETRIC_DATA; }
-    public IReadOnlyList<double> Thicknesses { get; } = thicknesses;
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/GetHttpsResource.cs b/backend/src/GraphQl/DataX/GetHttpsResource.cs
index 707987977..b5e872bc8 100644
--- a/backend/src/GraphQl/DataX/GetHttpsResource.cs
+++ b/backend/src/GraphQl/DataX/GetHttpsResource.cs
@@ -7,20 +7,14 @@
 
 namespace Metabase.GraphQl.DataX;
 
-public sealed class GetHttpsResource(
-    string? description,
-    string hashValue,
-    Uri locator,
-    Guid dataFormatId,
-    IReadOnlyList<FileMetaInformation> archivedFilesMetaInformation
-    )
+public sealed record GetHttpsResource(
+    string? Description,
+    string HashValue,
+    Uri Locator,
+    Guid DataFormatId,
+    IReadOnlyList<FileMetaInformation> ArchivedFilesMetaInformation
+)
 {
-    public string? Description { get; } = description;
-    public string HashValue { get; } = hashValue;
-    public Uri Locator { get; } = locator;
-    public Guid DataFormatId { get; } = dataFormatId;
-    public IReadOnlyList<FileMetaInformation> ArchivedFilesMetaInformation { get; } = archivedFilesMetaInformation;
-
     public Task<DataFormat?> GetDataFormatAsync(
         DataFormatByIdDataLoader dataFormatById,
         CancellationToken cancellationToken
diff --git a/backend/src/GraphQl/DataX/HygrothermalData.cs b/backend/src/GraphQl/DataX/HygrothermalData.cs
deleted file mode 100644
index 53834b0e2..000000000
--- a/backend/src/GraphQl/DataX/HygrothermalData.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using NodaTime;
-
-namespace Metabase.GraphQl.DataX;
-
-public sealed class HygrothermalData(
-    string id,
-    Guid uuid,
-    OffsetDateTime timestamp,
-    string locale,
-    Guid databaseId,
-    Guid componentId,
-    string? name,
-    string? description,
-    IReadOnlyList<string> warnings,
-    Guid creatorId,
-    OffsetDateTime createdAt,
-    AppliedMethod appliedMethod,
-    IReadOnlyList<GetHttpsResource> resources,
-    GetHttpsResourceTree resourceTree,
-    IReadOnlyList<DataApproval> approvals
-    // ResponseApproval approval
-    )
-        : Data(
-    id,
-    uuid,
-    timestamp,
-    locale,
-    databaseId,
-    componentId,
-    name,
-    description,
-    warnings,
-    creatorId,
-    createdAt,
-    appliedMethod,
-    resources,
-    resourceTree,
-    approvals
-    )
-{
-    public override DataKind Kind { get => DataKind.HYGROTHERMAL_DATA; }
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/IApproval.cs b/backend/src/GraphQl/DataX/IApproval.cs
index 4121a6f3d..ed0a292fa 100644
--- a/backend/src/GraphQl/DataX/IApproval.cs
+++ b/backend/src/GraphQl/DataX/IApproval.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using HotChocolate.Types;
-using Metabase.Configuration;
 using NodaTime;
 
 namespace Metabase.GraphQl.DataX;
diff --git a/backend/src/GraphQl/DataX/IData.cs b/backend/src/GraphQl/DataX/IData.cs
index 552da97a3..af407609a 100644
--- a/backend/src/GraphQl/DataX/IData.cs
+++ b/backend/src/GraphQl/DataX/IData.cs
@@ -1,8 +1,21 @@
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
+using System.Threading;
+using System.Threading.Tasks;
 using HotChocolate;
 using HotChocolate.Types;
+using Metabase.Data;
+using Metabase.GraphQl.CalorimetricDataX;
+using Metabase.GraphQl.Components;
+using Metabase.GraphQl.Databases;
+using Metabase.GraphQl.GeometricDataX;
+using Metabase.GraphQl.HygrothermalDataX;
+using Metabase.GraphQl.Institutions;
+using Metabase.GraphQl.LifeCycleDataX;
+using Metabase.GraphQl.OpticalDataX;
+using Metabase.GraphQl.PhotovoltaicDataX;
+using Metabase.GraphQl.Scalars;
 using NodaTime;
 
 namespace Metabase.GraphQl.DataX;
@@ -17,6 +30,9 @@ namespace Metabase.GraphQl.DataX;
 [JsonDerivedType(typeof(PhotovoltaicData), typeDiscriminator: nameof(PhotovoltaicData))]
 public interface IData
 {
+    [GraphQLType<NonNullType<IdType>>]
+    string Id { get; }
+
     Guid Uuid { get; }
     DataKind Kind { get; }
     OffsetDateTime Timestamp { get; }
@@ -35,4 +51,19 @@ public interface IData
 
     [GraphQLType<NonNullType<LocaleType>>]
     string Locale { get; }
+
+    public Task<Database?> GetDatabaseAsync(
+        IDatabaseByIdDataLoader databaseById,
+        CancellationToken cancellationToken
+    );
+
+    public Task<Component?> GetComponentAsync(
+        IComponentByIdDataLoader componentById,
+        CancellationToken cancellationToken
+    );
+
+    public Task<Institution?> GetCreatorAsync(
+        IInstitutionByIdDataLoader institutionById,
+        CancellationToken cancellationToken
+    );
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/LifeCycleData.cs b/backend/src/GraphQl/DataX/LifeCycleData.cs
deleted file mode 100644
index 02cf21d69..000000000
--- a/backend/src/GraphQl/DataX/LifeCycleData.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using NodaTime;
-
-namespace Metabase.GraphQl.DataX;
-
-public sealed class LifeCycleData(
-    string id,
-    Guid uuid,
-    OffsetDateTime timestamp,
-    string locale,
-    Guid databaseId,
-    Guid componentId,
-    string? name,
-    string? description,
-    IReadOnlyList<string> warnings,
-    Guid creatorId,
-    OffsetDateTime createdAt,
-    AppliedMethod appliedMethod,
-    IReadOnlyList<GetHttpsResource> resources,
-    GetHttpsResourceTree resourceTree,
-    IReadOnlyList<DataApproval> approvals
-    // ResponseApproval approval
-    )
-        : Data(
-    id,
-    uuid,
-    timestamp,
-    locale,
-    databaseId,
-    componentId,
-    name,
-    description,
-    warnings,
-    creatorId,
-    createdAt,
-    appliedMethod,
-    resources,
-    resourceTree,
-    approvals
-    )
-{
-    public override DataKind Kind { get => DataKind.LIFE_CYCLE_DATA; }
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/OpenEndedDateTimeRange.cs b/backend/src/GraphQl/DataX/OpenEndedDateTimeRange.cs
index fbdd28397..675ff14c1 100644
--- a/backend/src/GraphQl/DataX/OpenEndedDateTimeRange.cs
+++ b/backend/src/GraphQl/DataX/OpenEndedDateTimeRange.cs
@@ -1,4 +1,3 @@
-using System;
 using NodaTime;
 
 namespace Metabase.GraphQl.DataX;
diff --git a/backend/src/GraphQl/DataX/OpticalData.cs b/backend/src/GraphQl/DataX/OpticalData.cs
deleted file mode 100644
index fe5e1b40b..000000000
--- a/backend/src/GraphQl/DataX/OpticalData.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using NodaTime;
-
-namespace Metabase.GraphQl.DataX;
-
-public sealed class OpticalData(
-    string id,
-    Guid uuid,
-    OffsetDateTime timestamp,
-    string locale,
-    Guid databaseId,
-    Guid componentId,
-    string? name,
-    string? description,
-    IReadOnlyList<string> warnings,
-    Guid creatorId,
-    OffsetDateTime createdAt,
-    OpticalComponentType? type,
-    OpticalComponentSubtype? subtype,
-    CoatedSide? coatedSide,
-    AppliedMethod appliedMethod,
-    IReadOnlyList<GetHttpsResource> resources,
-    GetHttpsResourceTree resourceTree,
-    IReadOnlyList<DataApproval> approvals,
-    // ResponseApproval approval
-    IReadOnlyList<double> nearnormalHemisphericalVisibleTransmittances,
-    IReadOnlyList<double> nearnormalHemisphericalVisibleReflectances,
-    IReadOnlyList<double> nearnormalHemisphericalSolarTransmittances,
-    IReadOnlyList<double> nearnormalHemisphericalSolarReflectances,
-    IReadOnlyList<double> infraredEmittances,
-    IReadOnlyList<double> colorRenderingIndices,
-    IReadOnlyList<CielabColor> cielabColors
-    )
-        : Data(
-    id,
-    uuid,
-    timestamp,
-    locale,
-    databaseId,
-    componentId,
-    name,
-    description,
-    warnings,
-    creatorId,
-    createdAt,
-    appliedMethod,
-    resources,
-    resourceTree,
-    approvals
-    )
-{
-    public override DataKind Kind { get => DataKind.OPTICAL_DATA; }
-    public OpticalComponentType? Type { get; } = type;
-    public OpticalComponentSubtype? Subtype { get; } = subtype;
-    public CoatedSide? CoatedSide { get; } = coatedSide;
-    public IReadOnlyList<double> NearnormalHemisphericalVisibleTransmittances { get; } = nearnormalHemisphericalVisibleTransmittances;
-    public IReadOnlyList<double> NearnormalHemisphericalVisibleReflectances { get; } = nearnormalHemisphericalVisibleReflectances;
-    public IReadOnlyList<double> NearnormalHemisphericalSolarTransmittances { get; } = nearnormalHemisphericalSolarTransmittances;
-    public IReadOnlyList<double> NearnormalHemisphericalSolarReflectances { get; } = nearnormalHemisphericalSolarReflectances;
-
-    public IReadOnlyList<double> InfraredEmittances { get; } = infraredEmittances;
-
-    public IReadOnlyList<double> ColorRenderingIndices { get; } = colorRenderingIndices;
-    public IReadOnlyList<CielabColor> CielabColors { get; } = cielabColors;
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/PhotovoltaicData.cs b/backend/src/GraphQl/DataX/PhotovoltaicData.cs
deleted file mode 100644
index ac1e93a0b..000000000
--- a/backend/src/GraphQl/DataX/PhotovoltaicData.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using NodaTime;
-
-namespace Metabase.GraphQl.DataX;
-
-public sealed class PhotovoltaicData(
-    string id,
-    Guid uuid,
-    OffsetDateTime timestamp,
-    string locale,
-    Guid databaseId,
-    Guid componentId,
-    string? name,
-    string? description,
-    IReadOnlyList<string> warnings,
-    Guid creatorId,
-    OffsetDateTime createdAt,
-    AppliedMethod appliedMethod,
-    IReadOnlyList<GetHttpsResource> resources,
-    GetHttpsResourceTree resourceTree,
-    IReadOnlyList<DataApproval> approvals
-    // ResponseApproval approval
-    )
-        : Data(
-    id,
-    uuid,
-    timestamp,
-    locale,
-    databaseId,
-    componentId,
-    name,
-    description,
-    warnings,
-    creatorId,
-    createdAt,
-    appliedMethod,
-    resources,
-    resourceTree,
-    approvals
-    )
-{
-    public override DataKind Kind { get => DataKind.PHOTOVOLTAIC_DATA; }
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/ToTreeVertexAppliedConversionMethod.cs b/backend/src/GraphQl/DataX/ToTreeVertexAppliedConversionMethod.cs
index 4594ff7af..08ca4cc0c 100644
--- a/backend/src/GraphQl/DataX/ToTreeVertexAppliedConversionMethod.cs
+++ b/backend/src/GraphQl/DataX/ToTreeVertexAppliedConversionMethod.cs
@@ -7,16 +7,12 @@
 
 namespace Metabase.GraphQl.DataX;
 
-public sealed class ToTreeVertexAppliedConversionMethod(
-    Guid methodId,
-    IReadOnlyList<NamedMethodArgument> arguments,
-    string sourceName
-    )
+public sealed record ToTreeVertexAppliedConversionMethod(
+    Guid MethodId,
+    IReadOnlyList<NamedMethodArgument> Arguments,
+    string SourceName
+)
 {
-    public Guid MethodId { get; } = methodId;
-    public IReadOnlyList<NamedMethodArgument> Arguments { get; } = arguments;
-    public string SourceName { get; } = sourceName;
-
     public Task<Method?> GetMethodAsync(
         MethodByIdDataLoader methodById,
         CancellationToken cancellationToken
diff --git a/backend/src/GraphQl/Databases/DatabaseByIdDataLoader.cs b/backend/src/GraphQl/Databases/DatabaseByIdDataLoader.cs
deleted file mode 100644
index d473a9abe..000000000
--- a/backend/src/GraphQl/Databases/DatabaseByIdDataLoader.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Databases;
-
-public sealed class DatabaseByIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : EntityByIdDataLoader<Database>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        dbContext => dbContext.Databases
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Databases/DatabaseDataLoaders.cs b/backend/src/GraphQl/Databases/DatabaseDataLoaders.cs
new file mode 100644
index 000000000..15512bff7
--- /dev/null
+++ b/backend/src/GraphQl/Databases/DatabaseDataLoaders.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut;
+using GreenDonut.Data;
+using Metabase.Data;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.Databases;
+
+public sealed class DatabaseDataLoaders
+: DataLoaders
+{
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Database>> GetDatabaseByIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<Database> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetEntityByIdAsync(
+            ids,
+            databaseContext => databaseContext.Databases,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Databases/DatabaseFilterType.cs b/backend/src/GraphQl/Databases/DatabaseFilterType.cs
index bb0cf3e94..c11999870 100644
--- a/backend/src/GraphQl/Databases/DatabaseFilterType.cs
+++ b/backend/src/GraphQl/Databases/DatabaseFilterType.cs
@@ -5,13 +5,17 @@
 namespace Metabase.GraphQl.Databases;
 
 public class DatabaseFilterType
-    : EntityFilterType<Database>
+    : AuditableEntityFilterType<Database>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<Database> descriptor
     )
     {
         base.Configure(descriptor);
+        // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.Id);
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         descriptor.Field(x => x.Name);
         descriptor.Field(x => x.Description);
         descriptor.Field(x => x.Locator);
diff --git a/backend/src/GraphQl/Databases/DatabaseMutations.cs b/backend/src/GraphQl/Databases/DatabaseMutations.cs
index bf0b7c3e4..d8c52dd67 100644
--- a/backend/src/GraphQl/Databases/DatabaseMutations.cs
+++ b/backend/src/GraphQl/Databases/DatabaseMutations.cs
@@ -10,8 +10,8 @@
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.Extensions;
+using Metabase.GraphQl.Requests;
 using Metabase.GraphQl.Users;
-using Metabase.Services;
 using Microsoft.EntityFrameworkCore;
 
 namespace Metabase.GraphQl.Databases;
diff --git a/backend/src/GraphQl/Databases/DatabaseOperatorEdge.cs b/backend/src/GraphQl/Databases/DatabaseOperatorEdge.cs
index d7a0a70fd..35ea64ab7 100644
--- a/backend/src/GraphQl/Databases/DatabaseOperatorEdge.cs
+++ b/backend/src/GraphQl/Databases/DatabaseOperatorEdge.cs
@@ -6,6 +6,6 @@ namespace Metabase.GraphQl.Databases;
 public sealed class DatabaseOperatorEdge(
     Database association
     )
-        : Edge<Institution, InstitutionByIdDataLoader>(association.OperatorId)
+        : Edge<Institution, IInstitutionByIdDataLoader>(association.OperatorId)
 {
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Databases/DatabaseQueries.cs b/backend/src/GraphQl/Databases/DatabaseQueries.cs
index 1a999935e..06e69e008 100644
--- a/backend/src/GraphQl/Databases/DatabaseQueries.cs
+++ b/backend/src/GraphQl/Databases/DatabaseQueries.cs
@@ -2,9 +2,10 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using GreenDonut.Data;
 using HotChocolate.Authorization;
 using HotChocolate.Data;
-using HotChocolate.Data.Sorting;
+using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Authorization;
 using Metabase.Data;
@@ -18,45 +19,46 @@ namespace Metabase.GraphQl.Databases;
 public sealed class DatabaseQueries
 {
     [UsePaging]
-    // [UseProjection] // We disabled projections because when requesting `id` all results had the same `id` and when also requesting `uuid`, the latter was always the empty UUID `000...`.
     [UseFiltering<DatabaseFilterType>]
     [UseSorting<DatabaseSortType>]
-    public IQueryable<Database> GetDatabases(
-        ApplicationDbContext context,
-        ISortingContext sorting
+    public ValueTask<HotChocolate.Types.Pagination.Connection<Database>> GetDatabasesAsync(
+        IResolverContext resolverContext,
+        ApplicationDbContext databaseContext,
+        CancellationToken cancellationToken
     )
     {
-        sorting.StabilizeOrder<Database>();
-        return
-            context.Databases.AsNoTracking()
-                .Where(d => d.VerificationState == DatabaseVerificationState.VERIFIED);
+        return databaseContext.Databases
+            .AsNoTracking()
+            .Where(d => d.VerificationState == DatabaseVerificationState.VERIFIED)
+            .With(resolverContext.GetQueryContext<Database>(), Sorting.DefaultEntityOrder)
+            .ToPageAsync(resolverContext.GetPagingArguments(), cancellationToken)
+            .ToConnectionAsync();
     }
 
     [UsePaging]
-    // [UseProjection] // We disabled projections because when requesting `id` all results had the same `id` and when also requesting `uuid`, the latter was always the empty UUID `000...`.
     [UseFiltering<DatabaseFilterType>]
     [UseSorting<DatabaseSortType>]
     [Authorize(Policy = AuthorizationPolicies.ManageDatabaseScopePolicy)]
-    public IQueryable<Database> GetPendingDatabases(
-        ApplicationDbContext context,
-        ISortingContext sorting
+    public ValueTask<HotChocolate.Types.Pagination.Connection<Database>> GetPendingDatabasesAsync(
+        IResolverContext resolverContext,
+        ApplicationDbContext databaseContext,
+        CancellationToken cancellationToken
     )
     {
-        sorting.StabilizeOrder<Database>();
-        return
-            context.Databases.AsNoTracking()
-                .Where(d => d.VerificationState == DatabaseVerificationState.PENDING);
+        return databaseContext.Databases
+            .AsNoTracking()
+            .Where(d => d.VerificationState == DatabaseVerificationState.PENDING)
+            .With(resolverContext.GetQueryContext<Database>(), Sorting.DefaultEntityOrder)
+            .ToPageAsync(resolverContext.GetPagingArguments(), cancellationToken)
+            .ToConnectionAsync();
     }
 
     public Task<Database?> GetDatabaseAsync(
         Guid id,
-        DatabaseByIdDataLoader databaseById,
+        IDatabaseByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
-        return databaseById.LoadAsync(
-            id,
-            cancellationToken
-        );
+        return byId.LoadAsync(id, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Databases/DatabaseResolvers.cs b/backend/src/GraphQl/Databases/DatabaseResolvers.cs
index 10ae82cda..3e7e51e2d 100644
--- a/backend/src/GraphQl/Databases/DatabaseResolvers.cs
+++ b/backend/src/GraphQl/Databases/DatabaseResolvers.cs
@@ -1,206 +1,26 @@
 using System;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
 using System.Security.Claims;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using GraphQL;
 using HotChocolate;
 using HotChocolate.Resolvers;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.DataX;
-using Metabase.Json;
-using Metabase.Services;
-using Microsoft.Extensions.Logging;
+using Metabase.GraphQl.CalorimetricDataX;
+using Metabase.GraphQl.GeometricDataX;
+using Metabase.GraphQl.HygrothermalDataX;
+using Metabase.GraphQl.LifeCycleDataX;
+using Metabase.GraphQl.OpticalDataX;
+using Metabase.GraphQl.PhotovoltaicDataX;
+using Metabase.GraphQl.Requests;
 
 namespace Metabase.GraphQl.Databases;
 
-public static partial class Log
-{
-    [LoggerMessage(
-        Level = LogLevel.Warning,
-        Message = "Failed with errors {Errors} to query the database {Locator} for {Request}.")]
-    public static partial void FailedWithErrors(
-        this ILogger<DatabaseResolvers> logger,
-        string Errors,
-        Uri Locator,
-        string Request
-    );
-
-    [LoggerMessage(
-        Level = LogLevel.Error,
-        Message = "Failed with status code {StatusCode} to request {Locator} for {Request}.")]
-    public static partial void FailedWithStatusCode(
-        this ILogger<DatabaseResolvers> logger,
-        Exception exception,
-        HttpStatusCode? StatusCode,
-        Uri Locator,
-        string Request
-    );
-
-    [LoggerMessage(
-        Level = LogLevel.Error,
-        Message =
-            "Failed to deserialize GraphQL response of request to {Locator} for {Request}. The details given are: Zero-based number of bytes read within the current line before the exception are {BytePositionInLine}, zero-based number of lines read before the exception are {LineNumber}, message that describes the current exception is '{Message}', path within the JSON where the exception was encountered is {Path}.")]
-    public static partial void FailedToDeserialize(
-        this ILogger<DatabaseResolvers> logger,
-        Exception exception,
-        Uri Locator,
-        string Request,
-        long? BytePositionInLine,
-        long? LineNumber,
-        string Message,
-        string? Path
-    );
-
-    [LoggerMessage(
-        Level = LogLevel.Error,
-        Message = "Failed to request {Locator} for {Request} or failed to deserialize the response.")]
-    public static partial void FailedToRequestOrDeserialize(
-        this ILogger<DatabaseResolvers> logger,
-        Exception exception,
-        Uri Locator,
-        string Request
-    );
-}
-
 public sealed class DatabaseResolvers(
-    AppSettings appSettings,
-    ILogger<DatabaseResolvers> logger
+    DataQueries dataQueries
 )
 {
-    private const string IgsdbUrl = "https://igsdb-v2.herokuapp.com/graphql/";
-    private const string IgsdbStagingUrl = "https://igsdb-v2-staging.herokuapp.com/graphql/";
-
-    private static readonly string[] s_calorimetricDataFileNames =
-    [
-        "DataFields.graphql",
-        "CalorimetricDataFields.graphql",
-        "CalorimetricData.graphql"
-    ];
-
-    private static readonly string[] s_geometricDataFileNames =
-    [
-        "DataFields.graphql",
-        "GeometricDataFields.graphql",
-        "GeometricData.graphql"
-    ];
-
-    private static readonly string[] s_hygrothermalDataFileNames =
-    [
-        "DataFields.graphql",
-        "HygrothermalDataFields.graphql",
-        "HygrothermalData.graphql"
-    ];
-
-    private static readonly string[] s_lifeCycleDataFileNames =
-    [
-        "DataFields.graphql",
-        "LifeCycleDataFields.graphql",
-        "LifeCycleData.graphql"
-    ];
-
-    private static readonly string[] s_opticalDataFileNames =
-    [
-        "DataFields.graphql",
-        "OpticalDataFields.graphql",
-        "OpticalData.graphql"
-    ];
-
-    private static readonly string[] s_photovoltaicDataFileNames =
-    [
-        "DataFields.graphql",
-        "PhotovoltaicDataFields.graphql",
-        "PhotovoltaicData.graphql"
-    ];
-
-    private static readonly string[] s_allCalorimetricDataFileNames =
-    [
-        "DataFields.graphql",
-        "CalorimetricDataFields.graphql",
-        "PageInfoFields.graphql",
-        "AllCalorimetricData.graphql"
-    ];
-
-    private static readonly string[] s_allGeometricDataFileNames =
-    [
-        "DataFields.graphql",
-        "GeometricDataFields.graphql",
-        "PageInfoFields.graphql",
-        "AllGeometricData.graphql"
-    ];
-
-    private static readonly string[] s_allHygrothermalDataFileNames =
-    [
-        "DataFields.graphql",
-        "HygrothermalDataFields.graphql",
-        "PageInfoFields.graphql",
-        "AllHygrothermalData.graphql"
-    ];
-
-    private static readonly string[] s_allLifeCycleDataFileNames =
-    [
-        "DataFields.graphql",
-        "LifeCycleDataFields.graphql",
-        "PageInfoFields.graphql",
-        "AllLifeCycleData.graphql"
-    ];
-
-    private static readonly string[] s_allOpticalDataFileNames =
-    [
-        "DataFields.graphql",
-        "OpticalDataFields.graphql",
-        "PageInfoFields.graphql",
-        "AllOpticalData.graphql"
-    ];
-
-    private static readonly string[] s_allPhotovoltaicDataFileNames =
-    [
-        "DataFields.graphql",
-        "PhotovoltaicDataFields.graphql",
-        "PageInfoFields.graphql",
-        "AllPhotovoltaicData.graphql"
-    ];
-
-    private static readonly string[] s_hasCalorimetricDataFileNames =
-    [
-        "HasCalorimetricData.graphql"
-    ];
-
-    private static readonly string[] s_hasGeometricDataFileNames =
-    [
-        "HasGeometricData.graphql"
-    ];
-
-    private static readonly string[] s_hasHygrothermalDataFileNames =
-    [
-        "HasHygrothermalData.graphql"
-    ];
-
-    private static readonly string[] s_hasLifeCycleDataFileNames =
-    [
-        "HasLifeCycleData.graphql"
-    ];
-
-    private static readonly string[] s_hasOpticalDataFileNames =
-    [
-        "HasOpticalData.graphql"
-    ];
-
-    private static readonly string[] s_hasPhotovoltaicDataFileNames =
-    [
-        "HasPhotovoltaicData.graphql"
-    ];
-
-    private static bool IsIgsdbDatabase(Database database)
-    {
-        return new[] { IgsdbUrl, IgsdbStagingUrl }
-            .Contains(database.Locator.AbsoluteUri);
-    }
-
     public Task<bool> IsAuthorizedToUpdateNodeAsync(
         [Parent] Database database,
         ClaimsPrincipal claimsPrincipal,
@@ -221,226 +41,97 @@ CancellationToken cancellationToken
         return authorization.IsAuthorizedToVerify(claimsPrincipal, database.Id, cancellationToken);
     }
 
-    public async Task<IData?> GetDataAsync(
+    public Task<IData?> GetDataAsync(
         [Parent] Database database,
         Guid id,
         DataKind kind,
         string? locale,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return kind switch
-        {
-            DataKind.CALORIMETRIC_DATA => await GetCalorimetricDataAsync(database, id, locale, queryingDatabases, resolverContext, cancellationToken),
-            DataKind.GEOMETRIC_DATA => await GetGeometricDataAsync(database, id, locale, queryingDatabases, resolverContext, cancellationToken),
-            DataKind.HYGROTHERMAL_DATA => await GetHygrothermalDataAsync(database, id, locale, queryingDatabases, resolverContext, cancellationToken),
-            DataKind.LIFE_CYCLE_DATA => await GetLifeCycleDataAsync(database, id, locale, queryingDatabases, resolverContext, cancellationToken),
-            DataKind.OPTICAL_DATA => await GetOpticalDataAsync(database, id, locale, queryingDatabases, resolverContext, cancellationToken),
-            DataKind.PHOTOVOLTAIC_DATA => await GetPhotovoltaicDataAsync(database, id, locale, queryingDatabases, resolverContext, cancellationToken),
-            _ => throw new ArgumentOutOfRangeException($"The data kind {kind} is not supported.")
-        };
+        return dataQueries.GetDataAsync(database, id, kind, locale, resolverContext, cancellationToken);
     }
 
-    public async Task<bool?> HasDataAsync(
+    public Task<bool?> HasDataAsync(
         [Parent] Database database,
         DataKind kind,
-        DataPropositionInput dataPropositionInput,
+        DataPropositionInput? where,
         string? locale,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return kind switch
-        {
-            DataKind.CALORIMETRIC_DATA => await HasCalorimetricDataAsync(database, dataPropositionInput.ToCalorimetricInput(), locale, queryingDatabases, resolverContext, cancellationToken),
-            DataKind.GEOMETRIC_DATA => await HasGeometricDataAsync(database, dataPropositionInput.ToGeometricInput(), locale, queryingDatabases, resolverContext, cancellationToken),
-            DataKind.HYGROTHERMAL_DATA => await HasHygrothermalDataAsync(database, dataPropositionInput.ToHygrothermalInput(), locale, queryingDatabases, resolverContext, cancellationToken),
-            DataKind.LIFE_CYCLE_DATA => await HasLifeCycleDataAsync(database, dataPropositionInput.ToLifeCycleInput(), locale, queryingDatabases, resolverContext, cancellationToken),
-            DataKind.OPTICAL_DATA => await HasOpticalDataAsync(database, dataPropositionInput.ToOpticalInput(), locale, queryingDatabases, resolverContext, cancellationToken),
-            DataKind.PHOTOVOLTAIC_DATA => await HasPhotovoltaicDataAsync(database, dataPropositionInput.ToPhotovoltaiInput(), locale, queryingDatabases, resolverContext, cancellationToken),
-            _ => throw new ArgumentOutOfRangeException($"The data kind {kind} is not supported.")
-        };
+        return dataQueries.HasDataAsync(database, kind, where, locale, resolverContext, cancellationToken);
     }
 
-    public async Task<CalorimetricData?> GetCalorimetricDataAsync(
+    public Task<CalorimetricData?> GetCalorimetricDataAsync(
         [Parent] Database database,
         Guid id,
         string? locale,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<CalorimetricDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_calorimetricDataFileNames
-                        ),
-                        new
-                        {
-                            id,
-                            locale
-                        },
-                        nameof(CalorimetricData)
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.CalorimetricData;
+        return dataQueries.GetCalorimetricDataAsync(database, id, locale, resolverContext, cancellationToken);
     }
 
-    public async Task<GeometricData?> GetGeometricDataAsync(
+    public Task<GeometricData?> GetGeometricDataAsync(
         [Parent] Database database,
         Guid id,
         string? locale,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<GeometricDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_geometricDataFileNames
-                        ),
-                        new
-                        {
-                            id,
-                            locale
-                        },
-                        nameof(GeometricData)
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.GeometricData;
+        return dataQueries.GetGeometricDataAsync(database, id, locale, resolverContext, cancellationToken);
     }
 
-    public async Task<HygrothermalData?> GetHygrothermalDataAsync(
+    public Task<HygrothermalData?> GetHygrothermalDataAsync(
         [Parent] Database database,
         Guid id,
         string? locale,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<HygrothermalDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_hygrothermalDataFileNames
-                        ),
-                        new
-                        {
-                            id,
-                            locale
-                        },
-                        nameof(HygrothermalData)
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.HygrothermalData;
+        return dataQueries.GetHygrothermalDataAsync(database, id, locale, resolverContext, cancellationToken);
     }
 
-    public async Task<LifeCycleData?> GetLifeCycleDataAsync(
+    public Task<LifeCycleData?> GetLifeCycleDataAsync(
         [Parent] Database database,
         Guid id,
         string? locale,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<LifeCycleDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_lifeCycleDataFileNames
-                        ),
-                        new
-                        {
-                            id,
-                            locale
-                        },
-                        nameof(LifeCycleData)
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.LifeCycleData;
+        return dataQueries.GetLifeCycleDataAsync(database, id, locale, resolverContext, cancellationToken);
     }
 
-
-    public async Task<OpticalData?> GetOpticalDataAsync(
+    public Task<OpticalData?> GetOpticalDataAsync(
         [Parent] Database database,
         Guid id,
         string? locale,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<OpticalDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_opticalDataFileNames
-                        ),
-                        new
-                        {
-                            id,
-                            locale
-                        },
-                        nameof(OpticalData)
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.OpticalData;
+        return dataQueries.GetOpticalDataAsync(database, id, locale, resolverContext, cancellationToken);
     }
 
-    public async Task<PhotovoltaicData?> GetPhotovoltaicDataAsync(
+    public Task<PhotovoltaicData?> GetPhotovoltaicDataAsync(
         [Parent] Database database,
         Guid id,
         string? locale,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<PhotovoltaicDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_photovoltaicDataFileNames
-                        ),
-                        new
-                        {
-                            id,
-                            locale
-                        },
-                        nameof(PhotovoltaicData)
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.PhotovoltaicData;
+        return dataQueries.GetPhotovoltaicDataAsync(database, id, locale, resolverContext, cancellationToken);
     }
 
-    public async Task<CalorimetricDataConnection?> GetAllCalorimetricDataAsync(
+    public Task<CalorimetricDataConnection?> GetAllCalorimetricDataAsync(
         [Parent] Database database,
         CalorimetricDataPropositionInput? where,
         string? locale,
@@ -448,36 +139,14 @@ await QueryingDatabases.ConstructQuery(
         string? after,
         uint? last,
         string? before,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<AllCalorimetricDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_allCalorimetricDataFileNames
-                        ),
-                        new
-                        {
-                            where,
-                            locale,
-                            first,
-                            after,
-                            last,
-                            before
-                        },
-                        "AllCalorimetricData"
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.AllCalorimetricData;
+        return dataQueries.GetAllCalorimetricDataAsync(database, where, locale, first, after, last, before, resolverContext, cancellationToken);
     }
 
-    public async Task<GeometricDataConnection?> GetAllGeometricDataAsync(
+    public Task<GeometricDataConnection?> GetAllGeometricDataAsync(
         [Parent] Database database,
         GeometricDataPropositionInput? where,
         string? locale,
@@ -485,35 +154,14 @@ await QueryingDatabases.ConstructQuery(
         string? after,
         uint? last,
         string? before,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<AllGeometricDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_allGeometricDataFileNames),
-                        new
-                        {
-                            where,
-                            locale,
-                            first,
-                            after,
-                            last,
-                            before
-                        },
-                        "AllGeometricData"
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.AllGeometricData;
+        return dataQueries.GetAllGeometricDataAsync(database, where, locale, first, after, last, before, resolverContext, cancellationToken);
     }
 
-    public async Task<HygrothermalDataConnection?> GetAllHygrothermalDataAsync(
+    public Task<HygrothermalDataConnection?> GetAllHygrothermalDataAsync(
         [Parent] Database database,
         HygrothermalDataPropositionInput? where,
         string? locale,
@@ -521,36 +169,14 @@ await QueryingDatabases.ConstructQuery(
         string? after,
         uint? last,
         string? before,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<AllHygrothermalDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_allHygrothermalDataFileNames
-                        ),
-                        new
-                        {
-                            where,
-                            locale,
-                            first,
-                            after,
-                            last,
-                            before
-                        },
-                        "AllHygrothermalData"
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.AllHygrothermalData;
+        return dataQueries.GetAllHygrothermalDataAsync(database, where, locale, first, after, last, before, resolverContext, cancellationToken);
     }
 
-    public async Task<LifeCycleDataConnection?> GetAllLifeCycleDataAsync(
+    public Task<LifeCycleDataConnection?> GetAllLifeCycleDataAsync(
         [Parent] Database database,
         LifeCycleDataPropositionInput? where,
         string? locale,
@@ -558,36 +184,14 @@ await QueryingDatabases.ConstructQuery(
         string? after,
         uint? last,
         string? before,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<AllLifeCycleDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_allLifeCycleDataFileNames
-                        ),
-                        new
-                        {
-                            where,
-                            locale,
-                            first,
-                            after,
-                            last,
-                            before
-                        },
-                        "AllLifeCycleData"
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.AllLifeCycleData;
+        return dataQueries.GetAllLifeCycleDataAsync(database, where, locale, first, after, last, before, resolverContext, cancellationToken);
     }
 
-    public async Task<OpticalDataConnection?> GetAllOpticalDataAsync(
+    public Task<OpticalDataConnection?> GetAllOpticalDataAsync(
         [Parent] Database database,
         OpticalDataPropositionInput? where,
         string? locale,
@@ -595,35 +199,14 @@ await QueryingDatabases.ConstructQuery(
         string? after,
         uint? last,
         string? before,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<AllOpticalDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_allOpticalDataFileNames),
-                        new
-                        {
-                            where,
-                            locale,
-                            first,
-                            after,
-                            last,
-                            before
-                        },
-                        "AllOpticalData"
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.AllOpticalData;
+        return dataQueries.GetAllOpticalDataAsync(database, where, locale, first, after, last, before, resolverContext, cancellationToken);
     }
 
-    public async Task<PhotovoltaicDataConnection?> GetAllPhotovoltaicDataAsync(
+    public Task<PhotovoltaicDataConnection?> GetAllPhotovoltaicDataAsync(
         [Parent] Database database,
         PhotovoltaicDataPropositionInput? where,
         string? locale,
@@ -631,327 +214,76 @@ await QueryingDatabases.ConstructQuery(
         string? after,
         uint? last,
         string? before,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<AllPhotovoltaicDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_allPhotovoltaicDataFileNames
-                        ),
-                        new
-                        {
-                            where,
-                            locale,
-                            first,
-                            after,
-                            last,
-                            before
-                        },
-                        "AllPhotovoltaicData"
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.AllPhotovoltaicData;
+        return dataQueries.GetAllPhotovoltaicDataAsync(database, where, locale, first, after, last, before, resolverContext, cancellationToken);
     }
 
-    public async Task<bool?> HasCalorimetricDataAsync(
+    public Task<bool?> HasCalorimetricDataAsync(
         [Parent] Database database,
         CalorimetricDataPropositionInput? where,
         string? locale,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<HasCalorimetricDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_hasCalorimetricDataFileNames
-                        ),
-                        new
-                        {
-                            where,
-                            locale
-                        },
-                        "HasCalorimetricData"
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.HasCalorimetricData;
+        return dataQueries.HasCalorimetricDataAsync(database, where, locale, resolverContext, cancellationToken);
     }
 
-    public async Task<bool?> HasGeometricDataAsync(
+    public Task<bool?> HasGeometricDataAsync(
         [Parent] Database database,
         GeometricDataPropositionInput? where,
         string? locale,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<HasGeometricDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_hasGeometricDataFileNames
-                        ),
-                        new
-                        {
-                            where,
-                            locale
-                        },
-                        "HasGeometricData"
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.HasGeometricData;
+        return dataQueries.HasGeometricDataAsync(database, where, locale, resolverContext, cancellationToken);
     }
 
-    public async Task<bool?> HasHygrothermalDataAsync(
+    public Task<bool?> HasHygrothermalDataAsync(
         [Parent] Database database,
         HygrothermalDataPropositionInput? where,
         string? locale,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<HasHygrothermalDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_hasHygrothermalDataFileNames
-                        ),
-                        new
-                        {
-                            where,
-                            locale
-                        },
-                        "HasHygrothermalData"
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.HasHygrothermalData;
+        return dataQueries.HasHygrothermalDataAsync(database, where, locale, resolverContext, cancellationToken);
     }
 
-    public async Task<bool?> HasLifeCycleDataAsync(
+    public Task<bool?> HasLifeCycleDataAsync(
         [Parent] Database database,
         LifeCycleDataPropositionInput? where,
         string? locale,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<HasLifeCycleDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_hasLifeCycleDataFileNames
-                        ),
-                        new
-                        {
-                            where,
-                            locale
-                        },
-                        "HasLifeCycleData"
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.HasLifeCycleData;
+        return dataQueries.HasLifeCycleDataAsync(database, where, locale, resolverContext, cancellationToken);
     }
 
-    public async Task<bool?> HasOpticalDataAsync(
+    public Task<bool?> HasOpticalDataAsync(
         [Parent] Database database,
         OpticalDataPropositionInput? where,
         string? locale,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<HasOpticalDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_hasOpticalDataFileNames
-                        ),
-                        new
-                        {
-                            where,
-                            locale
-                        },
-                        "HasOpticalData"
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.HasOpticalData;
+        return dataQueries.HasOpticalDataAsync(database, where, locale, resolverContext, cancellationToken);
     }
 
-    public async Task<bool?> HasPhotovoltaicDataAsync(
+    public Task<bool?> HasPhotovoltaicDataAsync(
         [Parent] Database database,
         PhotovoltaicDataPropositionInput? where,
         string? locale,
-        QueryingDatabases queryingDatabases,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
-        return (await QueryDatabase<HasPhotovoltaicDataData>(
-                    database,
-                    new GraphQLRequest(
-                        await QueryingDatabases.ConstructQuery(
-                            s_hasPhotovoltaicDataFileNames
-                        ),
-                        new
-                        {
-                            where,
-                            locale
-                        },
-                        "HasPhotovoltaicData"
-                    ),
-                    queryingDatabases,
-                    resolverContext,
-                    cancellationToken
-                )
-            )?.HasPhotovoltaicData;
-    }
-
-    private async
-        Task<TGraphQlResponse?>
-        QueryDatabase<TGraphQlResponse>(
-            Database database,
-            GraphQLRequest request,
-            QueryingDatabases queryingDatabases,
-            IResolverContext resolverContext,
-            CancellationToken cancellationToken
-        )
-        where TGraphQlResponse : class
-    {
-        try
-        {
-            var deserializedGraphQlResponse =
-                await queryingDatabases.QueryDatabase<TGraphQlResponse>(
-                    database,
-                    request,
-                    cancellationToken,
-                    IsIgsdbDatabase(database) ? appSettings.Igsdb.ApiToken : null
-                );
-            if (deserializedGraphQlResponse.Errors?.Length >= 1)
-            {
-                logger.FailedWithErrors(
-                    JsonSerializer.Serialize(deserializedGraphQlResponse.Errors),
-                    database.Locator,
-                    JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)
-                );
-                foreach (var error in deserializedGraphQlResponse.Errors)
-                {
-                    var errorBuilder = ErrorBuilder.New()
-                        .SetCode("DATABASE_QUERY_ERROR")
-                        // .SetPath(error.Path) // TODO Add the error path. Just using `error.Path` does not work as it contains non-"GraphQlName"s according to HotChocolate sometimes.
-                        .SetMessage(
-                            $"The GraphQL response received from the database {database.Locator} for the request {JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)} reported the error {error.Message}.");
-                    if (error.Extensions is not null)
-                    {
-                        foreach (var (key, value) in error.Extensions)
-                        {
-                            errorBuilder.SetExtension(key, value);
-                        }
-                    }
-
-                    // TODO Add `error.Locations` to `errorBuilder`.
-                    resolverContext.ReportError(errorBuilder.Build());
-                }
-            }
-
-            return deserializedGraphQlResponse.Data;
-        }
-        catch (HttpRequestException e)
-        {
-            logger.FailedWithStatusCode(e, e.StatusCode, database.Locator,
-                JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)
-            );
-            resolverContext.ReportError(
-                ErrorBuilder.New()
-                    .SetCode("DATABASE_REQUEST_FAILED")
-                    .SetPath(resolverContext.Path)
-                    .SetMessage($"Failed with status code {e.StatusCode} to request {database.Locator} for {JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)}.")
-                    .SetException(e)
-                    .Build()
-            );
-            return null;
-        }
-        catch (JsonException e)
-        {
-            logger.FailedToDeserialize(e, database.Locator,
-                JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl),
-                e.BytePositionInLine,
-                e.LineNumber,
-                e.Message,
-                e.Path
-            );
-            resolverContext.ReportError(
-                ErrorBuilder.New()
-                    .SetCode("DESERIALIZATION_FAILED")
-                    .SetPath(resolverContext.Path) // TODO Add the error path. I would do it as follows as a workaround, however splitting the path at '.' is wrong in general: .SetPath(resolverContext.Path.ToList().Concat(e.Path?.Split('.') ?? []).ToList())
-                    .SetMessage($"Failed to deserialize GraphQL response of request to {database.Locator} for {JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)}. The details given are: Zero-based number of bytes read within the current line before the exception are {e.BytePositionInLine}, zero-based number of lines read before the exception are {e.LineNumber}, message that describes the current exception is '{e.Message}', path within the JSON where the exception was encountered is {e.Path}.")
-                    .SetException(e)
-                    .Build()
-            );
-            return null;
-        }
-        catch (Exception exception)
-        {
-            logger.FailedToRequestOrDeserialize(
-                exception,
-                database.Locator,
-                JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)
-            );
-            resolverContext.ReportError(
-                ErrorBuilder.New()
-                    .SetCode("DATABASE_REQUEST_FAILED")
-                    .SetPath(resolverContext.Path)
-                    .SetMessage($"Failed to request {database.Locator} for {JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)} or failed to deserialize the response.")
-                    .SetException(exception)
-                    .Build()
-            );
-            return null;
-        }
+        return dataQueries.HasPhotovoltaicDataAsync(database, where, locale, resolverContext, cancellationToken);
     }
-
-    private sealed record OpticalDataData(OpticalData OpticalData);
-    private sealed record HygrothermalDataData(HygrothermalData HygrothermalData);
-    private sealed record LifeCycleDataData(LifeCycleData LifeCycleData);
-    private sealed record CalorimetricDataData(CalorimetricData CalorimetricData);
-    private sealed record PhotovoltaicDataData(PhotovoltaicData PhotovoltaicData);
-    private sealed record GeometricDataData(GeometricData GeometricData);
-    private sealed record AllOpticalDataData(OpticalDataConnection AllOpticalData);
-    private sealed record AllHygrothermalDataData(HygrothermalDataConnection AllHygrothermalData);
-    private sealed record AllLifeCycleDataData(LifeCycleDataConnection AllLifeCycleData);
-    private sealed record AllCalorimetricDataData(CalorimetricDataConnection AllCalorimetricData);
-    private sealed record AllGeometricDataData(GeometricDataConnection AllGeometricData);
-    private sealed record AllPhotovoltaicDataData(PhotovoltaicDataConnection AllPhotovoltaicData);
-    private sealed record HasOpticalDataData(bool HasOpticalData);
-    private sealed record HasCalorimetricDataData(bool HasCalorimetricData);
-    private sealed record HasGeometricDataData(bool HasGeometricData);
-    private sealed record HasHygrothermalDataData(bool HasHygrothermalData);
-    private sealed record HasLifeCycleDataData(bool HasLifeCycleData);
-    private sealed record HasPhotovoltaicDataData(bool HasPhotovoltaicData);
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Databases/DatabaseSortType.cs b/backend/src/GraphQl/Databases/DatabaseSortType.cs
index 634d3d2a9..be860564f 100644
--- a/backend/src/GraphQl/Databases/DatabaseSortType.cs
+++ b/backend/src/GraphQl/Databases/DatabaseSortType.cs
@@ -4,8 +4,8 @@
 
 namespace Metabase.GraphQl.Databases;
 
-public sealed class DatabaseSortType
-    : EntitySortType<Database>
+public class DatabaseSortType
+    : AuditableEntitySortType<Database>
 {
     protected override void Configure(
         ISortInputTypeDescriptor<Database> descriptor
@@ -15,6 +15,5 @@ ISortInputTypeDescriptor<Database> descriptor
         descriptor.Field(x => x.Name);
         descriptor.Field(x => x.Description);
         descriptor.Field(x => x.Locator);
-        descriptor.Field(x => x.Operator);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Databases/DatabaseType.cs b/backend/src/GraphQl/Databases/DatabaseType.cs
index efe337d93..e9a8fe89e 100644
--- a/backend/src/GraphQl/Databases/DatabaseType.cs
+++ b/backend/src/GraphQl/Databases/DatabaseType.cs
@@ -3,13 +3,20 @@
 using HotChocolate.Types;
 using Metabase.Data;
 using Metabase.GraphQl.DataX;
+using Metabase.GraphQl.CalorimetricDataX;
+using Metabase.GraphQl.GeometricDataX;
+using Metabase.GraphQl.HygrothermalDataX;
+using Metabase.GraphQl.LifeCycleDataX;
+using Metabase.GraphQl.OpticalDataX;
+using Metabase.GraphQl.PhotovoltaicDataX;
 using Metabase.GraphQl.Entities;
+using Metabase.GraphQl.Scalars;
 using Metabase.GraphQl.Users;
 
 namespace Metabase.GraphQl.Databases;
 
 public sealed class DatabaseType
-    : EntityType<Database, DatabaseByIdDataLoader>
+    : EntityType<Database, IDatabaseByIdDataLoader>
 {
     protected override void Configure(
         IObjectTypeDescriptor<Database> descriptor
@@ -30,113 +37,115 @@ IObjectTypeDescriptor<Database> descriptor
         ConfigureDataField(
             descriptor,
             "data",
-            _ => _.GetDataAsync(default!, default!, default, default, default!, default!, default)
+            _ => _.GetDataAsync(default!, default!, default, default!, default!, default)
         )
             .Argument("kind", _ => _.Type<NonNullType<EnumType<DataKind>>>());
         ConfigureHasDataField<DataPropositionInput>(
             descriptor,
             "hasData",
-            _ => _.HasDataAsync(default!, default!, default!, default, default!, default!, default)
+            _ => _.HasDataAsync(default!, default!, default!, default!, default!, default)
         )
             .Argument("kind", _ => _.Type<NonNullType<EnumType<DataKind>>>());
         ConfigureDataField(
             descriptor,
             "calorimetricData",
-            _ => _.GetCalorimetricDataAsync(default!, default, default, default!, default!, default)
+            _ => _.GetCalorimetricDataAsync(default!, default, default!, default!, default)
         );
         ConfigureAllDataField<CalorimetricDataPropositionInput>(
             descriptor,
             "allCalorimetricData",
-            _ => _.GetAllCalorimetricDataAsync(default!, default, default, default, default, default, default, default!, default!, default)
+            _ => _.GetAllCalorimetricDataAsync(default!, default, default, default, default, default, default!, default!, default)
         );
         ConfigureHasDataField<CalorimetricDataPropositionInput>(
             descriptor,
             "hasCalorimetricData",
-            _ => _.HasCalorimetricDataAsync(default!, default, default, default!, default!, default)
+            _ => _.HasCalorimetricDataAsync(default!, default, default!, default!, default)
         );
         ConfigureDataField(
             descriptor,
             "geometricData",
-            _ => _.GetGeometricDataAsync(default!, default, default, default!, default!, default)
+            _ => _.GetGeometricDataAsync(default!, default, default!, default!, default)
         );
         ConfigureAllDataField<GeometricDataPropositionInput>(
             descriptor,
             "allGeometricData",
-            _ => _.GetAllGeometricDataAsync(default!, default, default, default, default, default, default, default!, default!, default)
+            _ => _.GetAllGeometricDataAsync(default!, default, default, default, default, default, default!, default!, default)
         );
         ConfigureHasDataField<GeometricDataPropositionInput>(
             descriptor,
             "hasGeometricData",
-            _ => _.HasGeometricDataAsync(default!, default, default, default!, default!, default)
+            _ => _.HasGeometricDataAsync(default!, default, default!, default!, default)
         );
         ConfigureDataField(
             descriptor,
             "hygrothermalData",
-            _ => _.GetHygrothermalDataAsync(default!, default, default, default!, default!, default)
+            _ => _.GetHygrothermalDataAsync(default!, default, default!, default!, default)
         );
         ConfigureAllDataField<HygrothermalDataPropositionInput>(
             descriptor,
             "allHygrothermalData",
-            _ => _.GetAllHygrothermalDataAsync(default!, default, default, default, default, default, default, default!, default!, default)
+            _ => _.GetAllHygrothermalDataAsync(default!, default, default, default, default, default, default!, default!, default)
         );
         ConfigureHasDataField<HygrothermalDataPropositionInput>(
             descriptor,
             "hasHygrothermalData",
-            _ => _.HasHygrothermalDataAsync(default!, default, default, default!, default!, default)
+            _ => _.HasHygrothermalDataAsync(default!, default, default!, default!, default)
         );
         ConfigureDataField(
             descriptor,
             "lifeCycleData",
-            _ => _.GetLifeCycleDataAsync(default!, default, default, default!, default!, default)
+            _ => _.GetLifeCycleDataAsync(default!, default, default!, default!, default)
         );
         ConfigureAllDataField<LifeCycleDataPropositionInput>(
             descriptor,
             "allLifeCycleData",
-            _ => _.GetAllLifeCycleDataAsync(default!, default, default, default, default, default, default, default!, default!, default)
+            _ => _.GetAllLifeCycleDataAsync(default!, default, default, default, default, default, default!, default!, default)
         );
         ConfigureHasDataField<LifeCycleDataPropositionInput>(
             descriptor,
             "hasLifeCycleData",
-            _ => _.HasLifeCycleDataAsync(default!, default, default, default!, default!, default)
+            _ => _.HasLifeCycleDataAsync(default!, default, default!, default!, default)
         );
         ConfigureDataField(
             descriptor,
             "opticalData",
-            _ => _.GetOpticalDataAsync(default!, default, default, default!, default!, default)
+            _ => _.GetOpticalDataAsync(default!, default, default!, default!, default)
         );
         ConfigureAllDataField<OpticalDataPropositionInput>(
             descriptor,
             "allOpticalData",
-            _ => _.GetAllOpticalDataAsync(default!, default, default, default, default, default, default,
+            _ => _.GetAllOpticalDataAsync(default!, default, default, default, default, default,
                 default!, default!, default)
         );
         ConfigureHasDataField<OpticalDataPropositionInput>(
             descriptor,
             "hasOpticalData",
-            _ => _.HasOpticalDataAsync(default!, default, default, default!, default!, default)
+            _ => _.HasOpticalDataAsync(default!, default, default!, default!, default)
         );
         ConfigureDataField(
             descriptor,
             "photovoltaicData",
-            _ => _.GetPhotovoltaicDataAsync(default!, default, default, default!, default!, default)
+            _ => _.GetPhotovoltaicDataAsync(default!, default, default!, default!, default)
         );
         ConfigureAllDataField<PhotovoltaicDataPropositionInput>(
             descriptor,
             "allPhotovoltaicData",
-            _ => _.GetAllPhotovoltaicDataAsync(default!, default, default, default, default, default, default, default!, default!, default)
+            _ => _.GetAllPhotovoltaicDataAsync(default!, default, default, default, default, default, default!, default!, default)
         );
         ConfigureHasDataField<PhotovoltaicDataPropositionInput>(
             descriptor,
             "hasPhotovoltaicData",
-            _ => _.HasPhotovoltaicDataAsync(default!, default, default, default!, default!, default)
+            _ => _.HasPhotovoltaicDataAsync(default!, default, default!, default!, default)
         );
         descriptor
             .Field("isAuthorizedToUpdateNode")
+            .Cost(1)
             .ResolveWith<DatabaseResolvers>(x =>
                 x.IsAuthorizedToUpdateNodeAsync(default!, default!, default!, default!))
             .UseUserManager();
         descriptor
             .Field("isAuthorizedToVerifyNode")
+            .Cost(1)
             .ResolveWith<DatabaseResolvers>(x =>
                 x.IsAuthorizedToVerifyNodeAsync(default!, default!, default!, default!))
             .UseUserManager();
diff --git a/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceFilterType.cs b/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceFilterType.cs
index 9400616e2..7e70be1da 100644
--- a/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceFilterType.cs
+++ b/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceFilterType.cs
@@ -10,6 +10,8 @@ protected override void Configure(
         IFilterInputTypeDescriptor<DescriptionOrReference> descriptor
     )
     {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(DescriptionOrReferenceFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
         descriptor.BindFieldsExplicitly();
         descriptor.Field(x => x.Description);
     }
diff --git a/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceSortType.cs b/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceSortType.cs
index 7f848c06f..396a1678e 100644
--- a/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceSortType.cs
+++ b/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceSortType.cs
@@ -10,6 +10,8 @@ protected override void Configure(
         ISortInputTypeDescriptor<DescriptionOrReference> descriptor
     )
     {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(DescriptionOrReferenceSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
         descriptor.BindFieldsExplicitly();
         descriptor.Field(x => x.Description);
     }
diff --git a/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceType.cs b/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceType.cs
index 69f5dfea8..e409642d3 100644
--- a/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceType.cs
+++ b/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceType.cs
@@ -18,6 +18,7 @@ IObjectTypeDescriptor<DescriptionOrReference> descriptor
         descriptor
             .Field(t => t.Reference)
             .Type<ReferenceType>()
+            .Cost(0)
             .Resolve(context => context
                 .Parent<DescriptionOrReference>()
                 .Reference?
diff --git a/backend/src/GraphQl/Edge.cs b/backend/src/GraphQl/Edge.cs
index 7e09a0209..d5bf9be3d 100644
--- a/backend/src/GraphQl/Edge.cs
+++ b/backend/src/GraphQl/Edge.cs
@@ -2,21 +2,21 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut;
+using HotChocolate.CostAnalysis.Types;
 
 namespace Metabase.GraphQl;
 
 public abstract class Edge<TNode, TNodeByIdDataLoader>(
     Guid nodeId
-    )
-    where TNodeByIdDataLoader : IDataLoader<Guid, TNode?>
+)
+    where TNodeByIdDataLoader : IDataLoader<Guid, TNode>
 {
-    private readonly Guid _nodeId = nodeId;
-
+    [Cost(0)]
     public async Task<TNode> GetNodeAsync(
         TNodeByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
-        return (await byId.LoadAsync(_nodeId, cancellationToken))!;
+        return (await byId.LoadAsync(nodeId, cancellationToken))!;
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Entities/AssociationsByAssociateIdDataLoader.cs b/backend/src/GraphQl/Entities/AssociationsByAssociateIdDataLoader.cs
deleted file mode 100644
index 20f7bd761..000000000
--- a/backend/src/GraphQl/Entities/AssociationsByAssociateIdDataLoader.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using GreenDonut;
-using GreenDonut.Data;
-using Metabase.Data;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Entities;
-
-public abstract class AssociationsByAssociateIdDataLoader<TAssociation>(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory,
-    Func<ApplicationDbContext, IReadOnlyList<Guid>, QueryContext<TAssociation>, IQueryable<TAssociation>> getAssociations,
-    Func<TAssociation, Guid> getAssociateId
-    )
-    : StatefulGroupedDataLoader<Guid, TAssociation>(batchScheduler, options)
-{
-    private readonly IDbContextFactory<ApplicationDbContext> _dbContextFactory = dbContextFactory;
-
-    private readonly Func<TAssociation, Guid> _getAssociateId = getAssociateId;
-
-    private readonly Func<ApplicationDbContext, IReadOnlyList<Guid>, QueryContext<TAssociation>, IQueryable<TAssociation>>
-        _getAssociations = getAssociations;
-
-    protected override async Task<ILookup<Guid, TAssociation>> LoadGroupedBatchAsync(
-        IReadOnlyList<Guid> keys,
-        DataLoaderFetchContext<TAssociation[]> context,
-        CancellationToken cancellationToken
-    )
-    {
-        await using var dbContext =
-            _dbContextFactory.CreateDbContext();
-        return (
-            await _getAssociations(
-                dbContext,
-                keys,
-                context.GetQueryContext<TAssociation[], TAssociation>()
-            )
-            .ToListAsync(cancellationToken)
-        )
-        .ToLookup(_getAssociateId);
-    }
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Entities/EntityFilterType.cs b/backend/src/GraphQl/Entities/AuditableEntityFilterType.cs
similarity index 63%
rename from backend/src/GraphQl/Entities/EntityFilterType.cs
rename to backend/src/GraphQl/Entities/AuditableEntityFilterType.cs
index 1c00bb230..093748032 100644
--- a/backend/src/GraphQl/Entities/EntityFilterType.cs
+++ b/backend/src/GraphQl/Entities/AuditableEntityFilterType.cs
@@ -3,9 +3,9 @@
 
 namespace Metabase.GraphQl.Entities;
 
-public abstract class EntityFilterType<TEntity>
+public abstract class AuditableEntityFilterType<TEntity>
     : FilterInputType<TEntity>
-    where TEntity : IEntity
+    where TEntity : IEntity, IAuditable
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<TEntity> descriptor
@@ -13,5 +13,7 @@ IFilterInputTypeDescriptor<TEntity> descriptor
     {
         descriptor.BindFieldsExplicitly();
         descriptor.Field(x => x.Id);
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Entities/EntitySortType.cs b/backend/src/GraphQl/Entities/AuditableEntitySortType.cs
similarity index 58%
rename from backend/src/GraphQl/Entities/EntitySortType.cs
rename to backend/src/GraphQl/Entities/AuditableEntitySortType.cs
index 8cb694f00..643e90695 100644
--- a/backend/src/GraphQl/Entities/EntitySortType.cs
+++ b/backend/src/GraphQl/Entities/AuditableEntitySortType.cs
@@ -3,15 +3,18 @@
 
 namespace Metabase.GraphQl.Entities;
 
-public abstract class EntitySortType<TEntity>
+public abstract class AuditableEntitySortType<TEntity>
     : SortInputType<TEntity>
-    where TEntity : IEntity
+    where TEntity : IEntity, IAuditable
 {
     protected override void Configure(
         ISortInputTypeDescriptor<TEntity> descriptor
     )
     {
+        base.Configure(descriptor);
         descriptor.BindFieldsExplicitly();
         descriptor.Field(x => x.Id);
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Entities/EntityByIdDataLoader.cs b/backend/src/GraphQl/Entities/EntityByIdDataLoader.cs
deleted file mode 100644
index b6c5fad7f..000000000
--- a/backend/src/GraphQl/Entities/EntityByIdDataLoader.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using GreenDonut;
-using Metabase.Data;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Entities;
-
-public abstract class EntityByIdDataLoader<TEntity>(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory,
-    Func<ApplicationDbContext, DbSet<TEntity>> getQueryable
-    )
-    : BatchDataLoader<Guid, TEntity?>(batchScheduler, options)
-    where TEntity : class, IEntity
-{
-    private readonly IDbContextFactory<ApplicationDbContext> _dbContextFactory = dbContextFactory;
-    private readonly Func<ApplicationDbContext, DbSet<TEntity>> _getQueryable = getQueryable;
-
-    protected override async Task<IReadOnlyDictionary<Guid, TEntity?>> LoadBatchAsync(
-        IReadOnlyList<Guid> keys,
-        CancellationToken cancellationToken
-    )
-    {
-        await using var dbContext =
-            _dbContextFactory.CreateDbContext();
-        return await _getQueryable(dbContext).AsNoTrackingWithIdentityResolution()
-            .Where(entity => keys.Contains(entity.Id))
-            .ToDictionaryAsync(
-                entity => entity.Id,
-                entity => (TEntity?)entity,
-                cancellationToken
-            );
-    }
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Entities/EntityType.cs b/backend/src/GraphQl/Entities/EntityType.cs
index 73b056cc1..d87af8132 100644
--- a/backend/src/GraphQl/Entities/EntityType.cs
+++ b/backend/src/GraphQl/Entities/EntityType.cs
@@ -8,12 +8,13 @@ namespace Metabase.GraphQl.Entities;
 public abstract class EntityType<TEntity, TEntityByIdDataLoader>
     : ObjectType<TEntity>
     where TEntity : IEntity
-    where TEntityByIdDataLoader : IDataLoader<Guid, TEntity?>
+    where TEntityByIdDataLoader : IDataLoader<Guid, TEntity>
 {
     protected override void Configure(
         IObjectTypeDescriptor<TEntity> descriptor
     )
     {
+        base.Configure(descriptor);
         descriptor
             .ImplementsNode()
             .IdField(t => t.Id)
@@ -21,11 +22,11 @@ IObjectTypeDescriptor<TEntity> descriptor
                     context
                         .DataLoader<TEntityByIdDataLoader>()
                         .LoadAsync(id, context.RequestAborted)
-                    ! // Notice the null-forgiving operator `!`. It's bad that we need to use it here.
             );
         descriptor
             .Field(GraphQlConstants.UuidFieldName)
             .Type<NonNullType<UuidType>>()
+            .Cost(0)
             .Resolve(context =>
                 context.Parent<TEntity>().Id
             );
diff --git a/backend/src/GraphQl/ErrorLoggingDiagnosticEventListener.cs b/backend/src/GraphQl/ErrorLoggingDiagnosticEventListener.cs
index a6f04e174..1256eb48b 100644
--- a/backend/src/GraphQl/ErrorLoggingDiagnosticEventListener.cs
+++ b/backend/src/GraphQl/ErrorLoggingDiagnosticEventListener.cs
@@ -1,15 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Text.RegularExpressions;
 using Metabase.Logging;
 using HotChocolate;
 using HotChocolate.Execution;
 using HotChocolate.Execution.Instrumentation;
-using HotChocolate.Execution.Processing;
 using HotChocolate.Resolvers;
 using Microsoft.Extensions.Logging;
+using HotChocolate.Language;
 
 namespace Metabase.GraphQl;
 
@@ -27,45 +25,47 @@ public static partial void RequestError(
 
     [LoggerMessage(
         Level = LogLevel.Error,
-        Message = "Resolver error. Field: '{FieldName}'. Operation: '{Operation}'."
+        Message = "Request error. Document: {Document}"
     )]
-    public static partial void ResolverError(
+    public static partial void RequestError(
         this ILogger<ErrorLoggingDiagnosticEventListener> logger,
-        Exception? exception,
-        string fieldName,
-        IOperation operation,
+        IOperationDocument? document,
         [TagProvider(typeof(HotChocolateIErrorTagProvider), nameof(HotChocolateIErrorTagProvider.RecordTags))] IError error
     );
 
     [LoggerMessage(
         Level = LogLevel.Error,
-        Message = "Subscription event error. Operation: {Operation}"
+        Message = "Resolver error. Field: '{FieldName}'. Document: {Document}"
     )]
-    public static partial void SubscriptionEventError(
+    public static partial void ResolverError(
         this ILogger<ErrorLoggingDiagnosticEventListener> logger,
-        Exception exception,
-        IOperation operation
+        string fieldName,
+        DocumentNode document,
+        [TagProvider(typeof(HotChocolateIErrorTagProvider), nameof(HotChocolateIErrorTagProvider.RecordTags))] IError error,
+        Exception? exception
     );
 
     [LoggerMessage(
         Level = LogLevel.Error,
-        Message = "Subscription event error. Operation: {Operation}"
+        Message = "Resolver error. Field: '{FieldName}'. Document: {Document}"
     )]
-    public static partial void SubscriptionTransportError(
+    public static partial void ResolverError(
         this ILogger<ErrorLoggingDiagnosticEventListener> logger,
-        Exception exception,
-        IOperation operation
+        Exception? exception,
+        string fieldName,
+        IOperationDocument? document,
+        [TagProvider(typeof(HotChocolateIErrorTagProvider), nameof(HotChocolateIErrorTagProvider.RecordTags))] IError error
     );
 
     [LoggerMessage(
         Level = LogLevel.Error,
-        Message = "Syntax error. Document: {Document}"
+        Message = "Subscription event error. Id: '{SubscriptionId}'. Operation: {Document}"
     )]
-    public static partial void SyntaxError(
+    public static partial void SubscriptionEventError(
         this ILogger<ErrorLoggingDiagnosticEventListener> logger,
-        Exception? exception,
-        IOperationDocument? document,
-        [TagProvider(typeof(HotChocolateIErrorTagProvider), nameof(HotChocolateIErrorTagProvider.RecordTags))] IError error
+        Exception exception,
+        ulong subscriptionId,
+        IOperationDocument? document
     );
 
     [LoggerMessage(
@@ -128,55 +128,57 @@ ILogger<ErrorLoggingDiagnosticEventListener> logger
 : ExecutionDiagnosticEventListener
 {
     // this diagnostic event is raised when a request is executed ...
-    public override IDisposable ExecuteRequest(IRequestContext context)
+    public override IDisposable ExecuteRequest(RequestContext context)
     {
         // ... we will return an activity scope that is used to signal when the request is finished.
         return new RequestScope(logger, context);
     }
 
     public override void RequestError(
-        IRequestContext context,
-        Exception exception
+        RequestContext context,
+        Exception error
     )
     {
-        logger.RequestError(exception, context.Request.Document);
-        base.RequestError(context, exception);
+        logger.RequestError(error, context.Request.Document);
+        base.RequestError(context, error);
     }
 
-    public override void ResolverError(
-        IMiddlewareContext context,
+    public override void RequestError(
+        RequestContext context,
         IError error
     )
     {
-        logger.ResolverError(error.Exception, context.Selection.Field.Name, context.Operation, error);
-        base.ResolverError(context, error);
+        logger.RequestError(context.Request.Document, error);
+        base.RequestError(context, error);
     }
 
-    public override void SubscriptionEventError(
-        SubscriptionEventContext context,
-        Exception exception
+    public override void ResolverError(
+        IMiddlewareContext context,
+        IError error
     )
     {
-        logger.SubscriptionEventError(exception, context.Subscription.Operation);
-        base.SubscriptionEventError(context, exception);
+        logger.ResolverError(context.Selection.Field.Name, context.Operation.Document, error, error.Exception);
+        base.ResolverError(context, error);
     }
 
-    public override void SubscriptionTransportError(
-        ISubscription subscription,
-        Exception exception
+    public override void ResolverError(
+        RequestContext context,
+        ISelection selection,
+        IError error
     )
     {
-        logger.SubscriptionTransportError(exception, subscription.Operation);
-        base.SubscriptionTransportError(subscription, exception);
+        logger.ResolverError(error.Exception, selection.Field.Name, context.Request?.Document, error);
+        base.ResolverError(context, selection, error);
     }
 
-    public override void SyntaxError(
-        IRequestContext context,
-        IError error
+    public override void SubscriptionEventError(
+        RequestContext context,
+        ulong subscriptionId,
+        Exception exception
     )
     {
-        logger.SyntaxError(error.Exception, context.Request.Document, error);
-        base.SyntaxError(context, error);
+        logger.SubscriptionEventError(exception, subscriptionId, context.Request.Document);
+        base.SubscriptionEventError(context, subscriptionId, exception);
     }
 
     public override void TaskError(
@@ -189,7 +191,7 @@ IError error
     }
 
     public override void ValidationErrors(
-        IRequestContext context,
+        RequestContext context,
         IReadOnlyList<IError> errors
     )
     {
@@ -200,7 +202,7 @@ IReadOnlyList<IError> errors
         base.ValidationErrors(context, errors);
     }
 
-    private sealed partial class RequestScope(ILogger<ErrorLoggingDiagnosticEventListener> logger, IRequestContext context) : IDisposable
+    private sealed partial class RequestScope(ILogger<ErrorLoggingDiagnosticEventListener> logger, RequestContext context) : IDisposable
     {
         [GeneratedRegex(@"apiKey|authKey|privateKey|password|passphrase|secret|secure|security|token", RegexOptions.IgnoreCase, "")]
         private static partial Regex SecretRegex();
@@ -209,43 +211,45 @@ private sealed partial class RequestScope(ILogger<ErrorLoggingDiagnosticEventLis
 
         private string? StringifyVariables()
         {
-            if (_variables is not null)
-            {
-                return _variables;
-            }
-            if (context.Variables is null)
-            {
-                return null;
-            }
-            StringBuilder stringBuilder = new();
-            foreach (var variableValueCollection in context.Variables)
-            {
-                foreach (var variableValue in variableValueCollection)
-                {
-                    try
-                    {
-                        stringBuilder.AppendFormat(
-                            CultureInfo.InvariantCulture,
-                            $"{variableValue.Name} : {variableValue.Type} = "
-                        );
-                        stringBuilder.Append('\'');
-                        stringBuilder.Append(
-                            SecretRegex().IsMatch(variableValue.Name)
-                            ? "<redacted>"
-                            : variableValue.Value.ToString()
-                        );
-                        stringBuilder.Append('\'');
-                        stringBuilder.AppendFormat(CultureInfo.InvariantCulture, $"{Environment.NewLine}");
-                    }
-                    catch (Exception exception)
-                    {
-                        // all input type records will land here.
-                        stringBuilder.AppendFormat(CultureInfo.InvariantCulture, $"Failed stringifying the value: {exception.Message}");
-                        stringBuilder.AppendFormat(CultureInfo.InvariantCulture, $"{Environment.NewLine}");
-                    }
-                }
-            }
-            _variables = stringBuilder.ToString();
+            // TODO Where are the variables now if not anymore in context.Variables?
+            // if (_variables is not null)
+            // {
+            //     return _variables;
+            // }
+            // if (context.Variables is null)
+            // {
+            //     return null;
+            // }
+            // StringBuilder stringBuilder = new();
+            // foreach (var variableValueCollection in context.Variables)
+            // {
+            //     foreach (var variableValue in variableValueCollection)
+            //     {
+            //         try
+            //         {
+            //             stringBuilder.AppendFormat(
+            //                 CultureInfo.InvariantCulture,
+            //                 $"{variableValue.Name} : {variableValue.Type} = "
+            //             );
+            //             stringBuilder.Append('\'');
+            //             stringBuilder.Append(
+            //                 SecretRegex().IsMatch(variableValue.Name)
+            //                 ? "<redacted>"
+            //                 : variableValue.Value.ToString()
+            //             );
+            //             stringBuilder.Append('\'');
+            //             stringBuilder.AppendFormat(CultureInfo.InvariantCulture, $"{Environment.NewLine}");
+            //         }
+            //         catch (Exception exception)
+            //         {
+            //             // all input type records will land here.
+            //             stringBuilder.AppendFormat(CultureInfo.InvariantCulture, $"Failed stringifying the value: {exception.Message}");
+            //             stringBuilder.AppendFormat(CultureInfo.InvariantCulture, $"{Environment.NewLine}");
+            //         }
+            //     }
+            // }
+            // _variables = stringBuilder.ToString();
+            _variables = null;
             return _variables;
         }
 
@@ -253,28 +257,29 @@ public void Dispose()
         {
             if (logger.IsEnabled(LogLevel.Debug))
             {
-                if (context.Document is not null)
+                if (context.OperationDocumentInfo.Document is not null)
                 {
 #pragma warning disable CA1873 // Evaluation of this argument may be expensive and unnecessary if logging is disabled (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1873)
                     logger.Executed(
-                        context.Document.ToString(true),
+                        context.OperationDocumentInfo.Document.ToString(true),
                         StringifyVariables()
                     );
 #pragma warning restore CA1873
                 }
             }
             // when the request is finished it will dispose the activity scope
-            if (context.Result is IOperationResult { Errors.Count: > 0 } operationResult)
+            if (context.Result is OperationResult { Errors.Count: > 0 } operationResult)
             {
                 foreach (var error in operationResult.Errors)
                 {
                     logger.OperationError(context.Request.Document, StringifyVariables(), error);
                 }
             }
-            if (context.Exception is { })
-            {
-                logger.UnexpectedExecutionException(context.Request.Document, StringifyVariables(), context.Exception);
-            }
+            // TODO Where is the exception now?
+            // if (context.Exception is { })
+            // {
+            //     logger.UnexpectedExecutionException(context.Request.Document, StringifyVariables(), context.Exception);
+            // }
         }
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Extensions/PageExtensions.cs b/backend/src/GraphQl/Extensions/PageExtensions.cs
new file mode 100644
index 000000000..dd1840af0
--- /dev/null
+++ b/backend/src/GraphQl/Extensions/PageExtensions.cs
@@ -0,0 +1,66 @@
+using System.Threading.Tasks;
+using GreenDonut.Data;
+using HotChocolate.Types.Pagination;
+
+namespace Metabase.GraphQl.Extensions;
+
+// Inspired by https://github.com/ChilliCream/graphql-platform/blob/main/src/HotChocolate/Data/src/Data/Extensions/HotChocolatePaginationResultExtensions.cs
+public static class PageExtensions
+{
+    public static async ValueTask<int> GetTotalCountAsync<TSource>(
+        this Task<Page<TSource>?> pagePromise
+    )
+    {
+        return (await pagePromise)?.TotalCount ?? 0;
+    }
+
+    public static async ValueTask<ConnectionPageInfo> GetPageInfoAsync<TSource>(
+        this Task<Page<TSource>?> pagePromise
+    )
+    {
+        var page = await pagePromise;
+        return new ConnectionPageInfo(
+            page?.HasNextPage ?? false,
+            page?.HasPreviousPage ?? false,
+            page?.CreateStartCursor(),
+            page?.CreateEndCursor()
+        );
+    }
+
+    // public static async Task<Connection<TTarget>> ToConnectionAsync<TSource, TTarget>(
+    //     this Task<Page<TSource>> pagePromise,
+    //     Func<Page<TSource>, PageEntry<TSource>, Task<IEdge<TTarget>>> createEdgeAsync,
+    //     Func<IReadOnlyList<IEdge<TTarget>>, ConnectionPageInfo, int, Connection<TTarget>> createConnection
+    // )
+    //     where TTarget : class
+    //     where TSource : class
+    // {
+    //     return await CreateConnectionAsync(await pagePromise, createEdgeAsync, createConnection);
+    // }
+
+    // private static async Task<Connection<TTarget>> CreateConnectionAsync<TSource, TTarget>(
+    //     Page<TSource>? page,
+    //     Func<Page<TSource>, PageEntry<TSource>, Task<IEdge<TTarget>>> createEdgeAsync,
+    //     Func<IReadOnlyList<IEdge<TTarget>>, ConnectionPageInfo, int, Connection<TTarget>> createConnection
+    // )
+    //     where TTarget : class
+    // {
+    //     page ??= Page<TSource>.Empty;
+    //     var entries = page.Entries;
+    //     IEdge<TTarget>[] edges = entries.IsEmpty
+    //         ? []
+    //         : await Task.WhenAll(
+    //               entries
+    //                   .Select(entry => createEdgeAsync(page, entry))
+    //                   .ToList()
+    //           );
+    //     return createConnection(
+    //         edges,
+    //         new ConnectionPageInfo(
+    //             page.HasNextPage,
+    //             page.HasPreviousPage,
+    //             page.CreateStartCursor(),
+    //             page.CreateEndCursor()),
+    //         page.TotalCount ?? 0);
+    // }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Extensions/ResolverContextExtensions.cs b/backend/src/GraphQl/Extensions/ResolverContextExtensions.cs
index 2c068ddbc..49b2a5ba6 100644
--- a/backend/src/GraphQl/Extensions/ResolverContextExtensions.cs
+++ b/backend/src/GraphQl/Extensions/ResolverContextExtensions.cs
@@ -1,4 +1,5 @@
 using GreenDonut.Data;
+using HotChocolate;
 using HotChocolate.Data.Filters;
 using HotChocolate.Data.Sorting;
 using HotChocolate.Resolvers;
@@ -8,16 +9,28 @@ namespace Metabase.GraphQl.Extensions;
 public static class ResolverContextExtensions
 {
     // Inspired by https://github.com/ChilliCream/graphql-platform/blob/9ae7220205412203d0a941a6b0cc779e70b02b09/src/HotChocolate/Data/src/Data/QueryContextParameterExpressionBuilder.cs#L76-L86
+    // Using `QueryContext<Component> queryContext,` in resolvers starts up the projection engine producing many problems
     public static QueryContext<T> GetQueryContext<T>(this IResolverContext context)
     {
         var selection = context.Selection;
         var filterContext = context.GetFilterContext();
         var sortContext = context.GetSortingContext();
-
         // TODO Make selection work
         return new QueryContext<T>(
             null, // selection.AsSelector<T>(),
             filterContext?.AsPredicate<T>(),
             sortContext?.AsSortDefinition<T>());
     }
+
+    // Using `PagingArguments pagingArguments,` in resolvers results in the parameter `pagingArguments: PagingArgumentsInput` in the GraphQL schema
+    public static PagingArguments GetPagingArguments(this IResolverContext context)
+    {
+        return new(
+            context.ArgumentValue<int?>("first"),
+            context.ArgumentValue<string?>("after"),
+            context.ArgumentValue<int?>("last"),
+            context.ArgumentValue<string?>("before"),
+            includeTotalCount: true
+        );
+    }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Extensions/SortingContextExtensions.cs b/backend/src/GraphQl/Extensions/SortingContextExtensions.cs
deleted file mode 100644
index 11bc96a7d..000000000
--- a/backend/src/GraphQl/Extensions/SortingContextExtensions.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Linq;
-using HotChocolate.Data.Sorting;
-using Metabase.Data;
-
-namespace Metabase.GraphQl.Extensions;
-
-public static class SortingContextExtensions
-{
-    public static void StabilizeOrder<T>(this ISortingContext sorting) where T : IEntity
-    {
-        // this signals that the expression was not handled within the resolver
-        // and the sorting middleware should take over.
-        sorting.Handled(false);
-        sorting.OnAfterSortingApplied<IQueryable<T>>(
-            static (sortingApplied, query) =>
-            {
-                if (sortingApplied && query is IOrderedQueryable<T> ordered)
-                {
-                    return ordered.ThenBy(_ => _.Id);
-                }
-                return query.OrderBy(_ => _.Id);
-            });
-    }
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Filters/ScalarFilterInputTypes.cs b/backend/src/GraphQl/Filters/ScalarFilterInputTypes.cs
index 770600719..587d362fc 100644
--- a/backend/src/GraphQl/Filters/ScalarFilterInputTypes.cs
+++ b/backend/src/GraphQl/Filters/ScalarFilterInputTypes.cs
@@ -1,8 +1,15 @@
 using HotChocolate.Data.Filters;
 using HotChocolate.Types;
+using DateTimeType = HotChocolate.Types.NodaTime.DateTimeType;
+using DurationType = HotChocolate.Types.NodaTime.DurationType;
+using LocalDateTimeType = HotChocolate.Types.NodaTime.LocalDateTimeType;
+using LocalDateType = HotChocolate.Types.NodaTime.LocalDateType;
+using LocalTimeType = HotChocolate.Types.NodaTime.LocalTimeType;
 
 namespace Metabase.GraphQl.Filters;
 
+// https://github.com/ChilliCream/graphql-platform/blob/main/src/HotChocolate/Data/src/Data/Filters/Types/ComparableOperationFilterInputType.cs
+
 public abstract class ExtendedComparableOperationFilterInputType<T>
     : ComparableOperationFilterInputType<T>
 where T : notnull
@@ -76,15 +83,25 @@ protected override void Configure(IFilterInputTypeDescriptor descriptor)
     }
 }
 
-// public sealed class LocalDateFilterInputType
-//     : ExtendedComparableOperationFilterInputType<HotChocolate.Types.NodaTime.LocalDateType>
-// {
-//     protected override void Configure(IFilterInputTypeDescriptor descriptor)
-//     {
-//         descriptor.Name($"LocalDate{GraphQlConstants.FilterInputSuffix}");
-//         base.Configure(descriptor);
-//     }
-// }
+public sealed class LocalDateFilterInputType
+    : ExtendedComparableOperationFilterInputType<LocalDateType>
+{
+    protected override void Configure(IFilterInputTypeDescriptor descriptor)
+    {
+        descriptor.Name($"LocalDate{GraphQlConstants.FilterInputSuffix}");
+        base.Configure(descriptor);
+    }
+}
+
+public sealed class LocalDateTimeFilterInputType
+    : ExtendedComparableOperationFilterInputType<LocalDateTimeType>
+{
+    protected override void Configure(IFilterInputTypeDescriptor descriptor)
+    {
+        descriptor.Name($"LocalDateTime{GraphQlConstants.FilterInputSuffix}");
+        base.Configure(descriptor);
+    }
+}
 
 public sealed class LongFilterInputType
     : ExtendedComparableOperationFilterInputType<LongType>
@@ -96,15 +113,15 @@ protected override void Configure(IFilterInputTypeDescriptor descriptor)
     }
 }
 
-// public sealed class LocalTimeFilterInputType
-//     : ExtendedComparableOperationFilterInputType<HotChocolate.Types.NodaTime.LocalTimeType>
-// {
-//     protected override void Configure(IFilterInputTypeDescriptor descriptor)
-//     {
-//         descriptor.Name($"LocalTime{GraphQlConstants.FilterInputSuffix}");
-//         base.Configure(descriptor);
-//     }
-// }
+public sealed class LocalTimeFilterInputType
+    : ExtendedComparableOperationFilterInputType<LocalTimeType>
+{
+    protected override void Configure(IFilterInputTypeDescriptor descriptor)
+    {
+        descriptor.Name($"LocalTime{GraphQlConstants.FilterInputSuffix}");
+        base.Configure(descriptor);
+    }
+}
 
 public sealed class FloatFilterInputType
     : ExtendedComparableOperationFilterInputType<FloatType>
@@ -116,12 +133,12 @@ protected override void Configure(IFilterInputTypeDescriptor descriptor)
     }
 }
 
-public sealed class TimeSpanFilterInputType
-    : ExtendedComparableOperationFilterInputType<TimeSpanType>
+public sealed class DurationFilterInputType
+    : ExtendedComparableOperationFilterInputType<DurationType>
 {
     protected override void Configure(IFilterInputTypeDescriptor descriptor)
     {
-        descriptor.Name($"TimeSpan{GraphQlConstants.FilterInputSuffix}");
+        descriptor.Name($"Duration{GraphQlConstants.FilterInputSuffix}");
         base.Configure(descriptor);
     }
 }
@@ -146,12 +163,12 @@ protected override void Configure(IFilterInputTypeDescriptor descriptor)
     }
 }
 
-public sealed class UrlFilterInputType
-    : ExtendedComparableOperationFilterInputType<UrlType>
+public sealed class UriFilterInputType
+    : ExtendedComparableOperationFilterInputType<MyUriType>
 {
     protected override void Configure(IFilterInputTypeDescriptor descriptor)
     {
         descriptor.Name($"Url{GraphQlConstants.FilterInputSuffix}");
         base.Configure(descriptor);
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/GeometricDataX/GeometricData.cs b/backend/src/GraphQl/GeometricDataX/GeometricData.cs
new file mode 100644
index 000000000..a44a998ce
--- /dev/null
+++ b/backend/src/GraphQl/GeometricDataX/GeometricData.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.Resolvers;
+using HotChocolate.Types.Relay;
+using Metabase.Data;
+using Metabase.GraphQl.DataX;
+using Metabase.GraphQl.Requests;
+using NodaTime;
+
+namespace Metabase.GraphQl.GeometricDataX;
+
+[Node(IdField = nameof(Id))]
+public sealed record GeometricData(
+    string Id,
+    Guid Uuid,
+    OffsetDateTime Timestamp,
+    string Locale,
+    Guid DatabaseId,
+    Guid ComponentId,
+    string? Name,
+    string? Description,
+    IReadOnlyList<string> Warnings,
+    Guid CreatorId,
+    OffsetDateTime CreatedAt,
+    AppliedMethod AppliedMethod,
+    IReadOnlyList<GetHttpsResource> Resources,
+    GetHttpsResourceTree ResourceTree,
+    IReadOnlyList<DataApproval> Approvals,
+    // ResponseApproval Approval,
+    IReadOnlyList<double> Thicknesses
+)
+: DataX.Data(
+    Id,
+    Uuid,
+    Timestamp,
+    Locale,
+    DatabaseId,
+    ComponentId,
+    Name,
+    Description,
+    Warnings,
+    CreatorId,
+    CreatedAt,
+    AppliedMethod,
+    Resources,
+    ResourceTree,
+    Approvals
+// Approval
+)
+{
+    public override DataKind Kind { get => DataKind.GEOMETRIC_DATA; }
+
+    [NodeResolver]
+    public static Task<GeometricData?> GetAsync(
+        string id,
+        DataQueries dataQueries,
+        ApplicationDbContext databaseContext,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return DataX.Data.FetchNodeAsync<GeometricData>(
+            id,
+            (database, uuid, locale) => dataQueries.GetGeometricDataAsync(
+                database,
+                uuid,
+                locale,
+                resolverContext,
+                cancellationToken
+            ),
+            databaseContext,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/GeometricDataConnection.cs b/backend/src/GraphQl/GeometricDataX/GeometricDataConnection.cs
similarity index 80%
rename from backend/src/GraphQl/DataX/GeometricDataConnection.cs
rename to backend/src/GraphQl/GeometricDataX/GeometricDataConnection.cs
index 430e4d7c7..5b8bb265f 100644
--- a/backend/src/GraphQl/DataX/GeometricDataConnection.cs
+++ b/backend/src/GraphQl/GeometricDataX/GeometricDataConnection.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using HotChocolate.Types.Pagination;
+using Metabase.GraphQl.DataX;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.GeometricDataX;
 
 public sealed record GeometricDataConnection(
     IReadOnlyList<GeometricDataEdge> Edges,
diff --git a/backend/src/GraphQl/DataX/GeometricDataEdge.cs b/backend/src/GraphQl/GeometricDataX/GeometricDataEdge.cs
similarity index 67%
rename from backend/src/GraphQl/DataX/GeometricDataEdge.cs
rename to backend/src/GraphQl/GeometricDataX/GeometricDataEdge.cs
index 40c3383f4..18c93f19e 100644
--- a/backend/src/GraphQl/DataX/GeometricDataEdge.cs
+++ b/backend/src/GraphQl/GeometricDataX/GeometricDataEdge.cs
@@ -1,6 +1,7 @@
 using System;
+using Metabase.GraphQl.DataX;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.GeometricDataX;
 
 public sealed record GeometricDataEdge(
     string Cursor,
diff --git a/backend/src/GraphQl/DataX/GeometricDataPropositionInput.cs b/backend/src/GraphQl/GeometricDataX/GeometricDataPropositionInput.cs
similarity index 83%
rename from backend/src/GraphQl/DataX/GeometricDataPropositionInput.cs
rename to backend/src/GraphQl/GeometricDataX/GeometricDataPropositionInput.cs
index 404ef5ad7..f14091bf3 100644
--- a/backend/src/GraphQl/DataX/GeometricDataPropositionInput.cs
+++ b/backend/src/GraphQl/GeometricDataX/GeometricDataPropositionInput.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using Metabase.GraphQl.DataX;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.GeometricDataX;
 
 public sealed record GeometricDataPropositionInput(
     UuidPropositionInput? ComponentId,
diff --git a/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs b/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs
new file mode 100644
index 000000000..5a2a091e4
--- /dev/null
+++ b/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.Resolvers;
+using HotChocolate.Types;
+using Metabase.Data;
+using Metabase.GraphQl.Requests;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.GeometricDataX;
+
+[ExtendObjectType(nameof(Query))]
+public sealed class GeometricDataQueries
+{
+    public async Task<GeometricData?> GetGeometricDataAsync(
+        Guid databaseId,
+        Guid id,
+        string? locale,
+        DataQueries dataQueries,
+        ApplicationDbContext databaseContext,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        var database = await databaseContext.Databases.AsNoTracking()
+            .Where(_ => _.Id == databaseId)
+            .SingleOrDefaultAsync(cancellationToken);
+        if (database is null)
+        {
+            return null;
+        }
+        return await dataQueries.GetGeometricDataAsync(
+            database,
+            id,
+            locale,
+            resolverContext,
+            cancellationToken
+        );
+    }
+
+    public Task<GeometricDataConnection> GetAllGeometricDataAsync(
+        GeometricDataPropositionInput? where,
+        string? locale,
+        uint? first,
+        string? after,
+        uint? last,
+        string? before,
+        DataQueries dataQueries,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return dataQueries.GetAllDataAsync<GeometricDataConnection, GeometricDataEdge, GeometricData>(
+            first,
+            after,
+            last,
+            before,
+            (edges, totalCount, pageInfo) => new GeometricDataConnection(edges, totalCount, pageInfo),
+            (node, cursor) => new GeometricDataEdge(cursor, node),
+            (database, first, after, last, before) => dataQueries.GetAllGeometricDataAsync(
+                database,
+                where,
+                locale,
+                first,
+                after,
+                last,
+                before,
+                resolverContext,
+                cancellationToken
+            ),
+            cancellationToken
+        );
+    }
+
+    public Task<bool> HasGeometricDataAsync(
+        GeometricDataPropositionInput? where,
+        string? locale,
+        DataQueries dataQueries,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return dataQueries.HasDataAsync(
+            (database) => dataQueries.HasGeometricDataAsync(
+                database,
+                where,
+                locale,
+                resolverContext,
+                cancellationToken
+            ),
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintByFingerprintDataLoader.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintByFingerprintDataLoader.cs
deleted file mode 100644
index 91d70afae..000000000
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintByFingerprintDataLoader.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using GreenDonut;
-using Metabase.Data;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.GnuPgKeyFingerprints;
-
-public sealed class GnuPgKeyFingerprintByFingerprintDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-    : BatchDataLoader<string, GnuPgKeyFingerprint?>(batchScheduler, options)
-{
-    protected override async Task<IReadOnlyDictionary<string, GnuPgKeyFingerprint?>> LoadBatchAsync(
-        IReadOnlyList<string> keys,
-        CancellationToken cancellationToken
-    )
-    {
-        await using var dbContext =
-            dbContextFactory.CreateDbContext();
-        return await dbContext.GnuPgKeyFingerprints.AsNoTrackingWithIdentityResolution()
-            .Where(f => keys.Contains(f.Fingerprint))
-            .ToDictionaryAsync(
-                f => f.Fingerprint,
-                f => (GnuPgKeyFingerprint?)f,
-                cancellationToken
-            );
-    }
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintByIdDataLoader.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintByIdDataLoader.cs
deleted file mode 100644
index 09894d8ad..000000000
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintByIdDataLoader.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.GnuPgKeyFingerprints;
-
-public sealed class GnuPgKeyFingerprintByIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : EntityByIdDataLoader<GnuPgKeyFingerprint>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        dbContext => dbContext.GnuPgKeyFingerprints
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintDataLoaders.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintDataLoaders.cs
new file mode 100644
index 000000000..69ca3178a
--- /dev/null
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintDataLoaders.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut;
+using GreenDonut.Data;
+using Metabase.Data;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.GnuPgKeyFingerprints;
+
+public sealed class GnuPgKeyFingerprintDataLoaders
+: DataLoaders
+{
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, GnuPgKeyFingerprint>> GetGnuPgKeyFingerprintByIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<GnuPgKeyFingerprint> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetEntityByIdAsync(
+            ids,
+            databaseContext => databaseContext.GnuPgKeyFingerprints,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static async ValueTask<IReadOnlyDictionary<string, GnuPgKeyFingerprint>> GetGnuPgKeyFingerprintByFingerprintAsync(
+        IReadOnlyList<string> fingerprints,
+        QueryContext<GnuPgKeyFingerprint> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        await using var databaseContext =
+            databaseContextFactory.CreateDbContext();
+        return await databaseContext.GnuPgKeyFingerprints
+            .AsNoTrackingWithIdentityResolution()
+            .Where(_ => fingerprints.Contains(_.Fingerprint))
+            .With(queryContext, Sorting.DefaultEntityOrder)
+            .ToDictionaryAsync(_ => _.Fingerprint, cancellationToken);
+    }
+}
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintFilterType.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintFilterType.cs
index 753e9cb62..112cc252b 100644
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintFilterType.cs
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintFilterType.cs
@@ -5,13 +5,17 @@
 namespace Metabase.GraphQl.GnuPgKeyFingerprints;
 
 public class GnuPgKeyFingerprintFilterType
-    : EntityFilterType<GnuPgKeyFingerprint>
+    : AuditableEntityFilterType<GnuPgKeyFingerprint>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<GnuPgKeyFingerprint> descriptor
     )
     {
         base.Configure(descriptor);
+        // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.Id);
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         descriptor.Field(x => x.Fingerprint);
         descriptor.Field(x => x.CreatedAt);
         descriptor.Field(x => x.AllowedAt);
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintInstitutionEdge.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintInstitutionEdge.cs
index 07627d59b..193e49edf 100644
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintInstitutionEdge.cs
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintInstitutionEdge.cs
@@ -6,6 +6,6 @@ namespace Metabase.GraphQl.GnuPgKeyFingerprints;
 public sealed class GnuPgKeyFingerprintInstitutionEdge(
     GnuPgKeyFingerprint association
     )
-        : Edge<Institution, InstitutionByIdDataLoader>(association.InstitutionId)
+        : Edge<Institution, IInstitutionByIdDataLoader>(association.InstitutionId)
 {
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintMutations.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintMutations.cs
index bb86cd774..959bb31e2 100644
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintMutations.cs
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintMutations.cs
@@ -12,6 +12,7 @@
 using Metabase.GraphQl.Users;
 using Metabase.Services;
 using Microsoft.EntityFrameworkCore;
+using NodaTime;
 
 namespace Metabase.GraphQl.GnuPgKeyFingerprints;
 
@@ -26,6 +27,7 @@ public async Task<AddGnuPgKeyFingerprintPayload> AddGnuPgKeyFingerprintAsync(
         GnuPgKeyFingerprintAuthorization authorization,
         GnuPgService gnuPgService,
         ApplicationDbContext context,
+        IClock clock,
         CancellationToken cancellationToken
     )
     {
@@ -123,7 +125,7 @@ CancellationToken cancellationToken
             )
         )
         {
-            fingerprint.Allow();
+            fingerprint.Allow(clock);
         }
         context.GnuPgKeyFingerprints.Add(fingerprint);
         await context.SaveChangesAsync(cancellationToken);
@@ -137,6 +139,7 @@ public async Task<AllowGnuPgKeyFingerprintPayload> AllowGnuPgKeyFingerprintAsync
         ClaimsPrincipal claimsPrincipal,
         GnuPgKeyFingerprintAuthorization authorization,
         ApplicationDbContext context,
+        IClock clock,
         CancellationToken cancellationToken
     )
     {
@@ -170,7 +173,7 @@ CancellationToken cancellationToken
                 )
             );
         }
-        fingerprint.Allow();
+        fingerprint.Allow(clock);
         await context.SaveChangesAsync(cancellationToken);
         return new AllowGnuPgKeyFingerprintPayload(fingerprint);
     }
@@ -182,6 +185,7 @@ public async Task<ForbidGnuPgKeyFingerprintPayload> ForbidGnuPgKeyFingerprintAsy
         ClaimsPrincipal claimsPrincipal,
         GnuPgKeyFingerprintAuthorization authorization,
         ApplicationDbContext context,
+        IClock clock,
         CancellationToken cancellationToken
     )
     {
@@ -215,7 +219,7 @@ CancellationToken cancellationToken
                 )
             );
         }
-        fingerprint.Forbid();
+        fingerprint.Forbid(clock);
         await context.SaveChangesAsync(cancellationToken);
         return new ForbidGnuPgKeyFingerprintPayload(fingerprint);
     }
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintQueries.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintQueries.cs
index 813e0d205..cec7c6fad 100644
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintQueries.cs
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintQueries.cs
@@ -1,9 +1,11 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using GreenDonut.Data;
 using HotChocolate.Authorization;
 using HotChocolate.Data;
 using HotChocolate.Data.Sorting;
+using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Authorization;
 using Metabase.Data;
@@ -16,23 +18,28 @@ namespace Metabase.GraphQl.GnuPgKeyFingerprints;
 public sealed class GnuPgKeyFingerprintQueries
 {
     [UsePaging]
-    // [UseProjection] // We disabled projections because when requesting `id` all results had the same `id` and when also requesting `uuid`, the latter was always the empty UUID `000...`.
     [UseFiltering<GnuPgKeyFingerprintFilterType>]
     [UseSorting<GnuPgKeyFingerprintSortType>]
     [Authorize(Policy = AuthorizationPolicies.ManageGnuPgScopePolicy)]
-    public IQueryable<GnuPgKeyFingerprint> GetGnuPgKeyFingerprints(
-        ApplicationDbContext context,
-        ISortingContext sorting
+    public ValueTask<HotChocolate.Types.Pagination.Connection<GnuPgKeyFingerprint>> GetGnuPgKeyFingerprintsAsync(
+        IResolverContext resolverContext,
+        ApplicationDbContext databaseContext,
+        QueryContext<GnuPgKeyFingerprint> queryContext,
+        CancellationToken cancellationToken
     )
     {
-        sorting.StabilizeOrder<GnuPgKeyFingerprint>();
-        return context.GnuPgKeyFingerprints.AsNoTracking();
+        return databaseContext.GnuPgKeyFingerprints
+            .AsNoTracking()
+            .With(resolverContext.GetQueryContext<GnuPgKeyFingerprint>(), Sorting.DefaultEntityOrder)
+            .ToPageAsync(resolverContext.GetPagingArguments(), cancellationToken)
+            .ToConnectionAsync();
     }
 
     [Authorize(Policy = AuthorizationPolicies.ManageGnuPgScopePolicy)]
     public Task<GnuPgKeyFingerprint?> GetGnuPgKeyFingerprintAsync(
         string fingerprint,
-        GnuPgKeyFingerprintByFingerprintDataLoader byFingerprint,
+        IGnuPgKeyFingerprintByFingerprintDataLoader byFingerprint,
+        QueryContext<GnuPgKeyFingerprint> queryContext,
         CancellationToken cancellationToken
     )
     {
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintSortType.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintSortType.cs
index aca5a3d33..9dbbd76bd 100644
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintSortType.cs
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintSortType.cs
@@ -5,18 +5,16 @@
 namespace Metabase.GraphQl.GnuPgKeyFingerprints;
 
 public class GnuPgKeyFingerprintSortType
-    : EntitySortType<GnuPgKeyFingerprint>
+    : AuditableEntitySortType<GnuPgKeyFingerprint>
 {
     protected override void Configure(
         ISortInputTypeDescriptor<GnuPgKeyFingerprint> descriptor
     )
     {
         base.Configure(descriptor);
+        descriptor.Name(nameof(GnuPgKeyFingerprintSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
         descriptor.Field(x => x.Fingerprint);
-        descriptor.Field(x => x.CreatedAt);
         descriptor.Field(x => x.AllowedAt);
         descriptor.Field(x => x.ForbiddenAt);
-        descriptor.Field(x => x.User);
-        descriptor.Field(x => x.Institution);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintType.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintType.cs
index c1c5d5196..9e01660eb 100644
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintType.cs
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintType.cs
@@ -11,7 +11,7 @@
 namespace Metabase.GraphQl.GnuPgKeyFingerprints;
 
 public sealed class GnuPgKeyFingerprintType
-    : EntityType<GnuPgKeyFingerprint, GnuPgKeyFingerprintByIdDataLoader>
+    : EntityType<GnuPgKeyFingerprint, IGnuPgKeyFingerprintByIdDataLoader>
 {
     protected override void Configure(
         IObjectTypeDescriptor<GnuPgKeyFingerprint> descriptor
@@ -38,12 +38,14 @@ IObjectTypeDescriptor<GnuPgKeyFingerprint> descriptor
             );
         descriptor
             .Field("isAuthorizedToAllowNode")
+            .Cost(1)
             .ResolveWith<GnuPgKeyFingerprintResolvers>(x =>
                 GnuPgKeyFingerprintResolvers.IsAuthorizedToAllowNodeAsync(default!, default!, default!, default!)
             )
             .UseUserManager();
         descriptor
             .Field("isAuthorizedToForbidNode")
+            .Cost(1)
             .ResolveWith<GnuPgKeyFingerprintResolvers>(x =>
                 GnuPgKeyFingerprintResolvers.IsAuthorizedToForbidNodeAsync(default!, default!, default!, default!)
             )
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintUserEdge.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintUserEdge.cs
index 93a422165..df2641ab0 100644
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintUserEdge.cs
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintUserEdge.cs
@@ -6,6 +6,6 @@ namespace Metabase.GraphQl.GnuPgKeyFingerprints;
 public sealed class GnuPgKeyFingerprintUserEdge(
     GnuPgKeyFingerprint association
     )
-        : Edge<User, UserByIdDataLoader>(association.UserId)
+        : Edge<User, IUserByIdDataLoader>(association.UserId)
 {
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/GraphQlConstants.cs b/backend/src/GraphQl/GraphQlConstants.cs
index c6a4d5b80..77b41e2cf 100644
--- a/backend/src/GraphQl/GraphQlConstants.cs
+++ b/backend/src/GraphQl/GraphQlConstants.cs
@@ -2,6 +2,7 @@ namespace Metabase.GraphQl;
 
 internal static class GraphQlConstants
 {
+    internal const uint MaximumPageSize = 100;
     internal const string EndpointPath = "/graphql";
     internal const string CorsPolicy = "GraphQlCorsPolicy";
     internal const string TypeDiscriminatorPropertyName = "__typename";
diff --git a/backend/src/GraphQl/GraphQlThrowHelper.cs b/backend/src/GraphQl/GraphQlThrowHelper.cs
new file mode 100644
index 000000000..d41c52992
--- /dev/null
+++ b/backend/src/GraphQl/GraphQlThrowHelper.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Text.Json;
+using HotChocolate;
+using HotChocolate.Language;
+using HotChocolate.Types;
+
+namespace Metabase.GraphQl;
+
+// https://github.com/ChilliCream/graphql-platform/blob/main/src/HotChocolate/Core/src/Types/Utilities/ThrowHelper.cs
+public static class GraphQlThrowHelper
+{
+    public static LeafCoercionException ScalarCannotCoerceInputLiteral(
+        ITypeDefinition scalarType,
+        IValueNode? valueLiteral,
+        Exception? error = null)
+    {
+        valueLiteral ??= NullValueNode.Default;
+        var errorBuilder =
+            ErrorBuilder.New()
+                .SetMessage(
+                    GraphQlTypeResources.ScalarCannotCoerceInputLiteral,
+                    scalarType.Name,
+                    valueLiteral.Kind);
+        if (error is not null)
+        {
+            errorBuilder.SetException(error);
+        }
+        return new LeafCoercionException(
+            errorBuilder.Build(),
+            scalarType);
+    }
+
+    public static LeafCoercionException ScalarCannotCoerceInputValue(
+        ITypeDefinition scalarType,
+        JsonElement inputValue,
+        Exception? error = null)
+    {
+        var errorBuilder =
+            ErrorBuilder.New()
+                .SetMessage(
+                    GraphQlTypeResources.ScalarCannotCoerceInputValue,
+                    scalarType.Name,
+                    inputValue.ValueKind);
+        if (error is not null)
+        {
+            errorBuilder.SetException(error);
+        }
+        return new LeafCoercionException(
+            errorBuilder.Build(),
+            scalarType);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/GraphQlTypeResources.cs b/backend/src/GraphQl/GraphQlTypeResources.cs
new file mode 100644
index 000000000..49548f397
--- /dev/null
+++ b/backend/src/GraphQl/GraphQlTypeResources.cs
@@ -0,0 +1,8 @@
+namespace Metabase.GraphQl;
+
+// Inspired by https://github.com/ChilliCream/graphql-platform/blob/main/src/HotChocolate/Core/src/Types/Properties/TypeResources.resx
+public static class GraphQlTypeResources
+{
+    public const string ScalarCannotCoerceInputLiteral = "{0} cannot coerce the given literal of type `{1}` to a runtime value.";
+    public const string ScalarCannotCoerceInputValue = "{0} cannot coerce the given value JSON element of type `{1}` to a runtime value.";
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/HygrothermalDataX/HygrothermalData.cs b/backend/src/GraphQl/HygrothermalDataX/HygrothermalData.cs
new file mode 100644
index 000000000..e839d58c7
--- /dev/null
+++ b/backend/src/GraphQl/HygrothermalDataX/HygrothermalData.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.Resolvers;
+using HotChocolate.Types.Relay;
+using Metabase.Data;
+using Metabase.GraphQl.DataX;
+using Metabase.GraphQl.Requests;
+using NodaTime;
+
+namespace Metabase.GraphQl.HygrothermalDataX;
+
+[Node(IdField = nameof(Id))]
+public sealed record HygrothermalData(
+    string Id,
+    Guid Uuid,
+    OffsetDateTime Timestamp,
+    string Locale,
+    Guid DatabaseId,
+    Guid ComponentId,
+    string? Name,
+    string? Description,
+    IReadOnlyList<string> Warnings,
+    Guid CreatorId,
+    OffsetDateTime CreatedAt,
+    AppliedMethod AppliedMethod,
+    IReadOnlyList<GetHttpsResource> Resources,
+    GetHttpsResourceTree ResourceTree,
+    IReadOnlyList<DataApproval> Approvals
+// ResponseApproval Approval
+)
+: DataX.Data(
+    Id,
+    Uuid,
+    Timestamp,
+    Locale,
+    DatabaseId,
+    ComponentId,
+    Name,
+    Description,
+    Warnings,
+    CreatorId,
+    CreatedAt,
+    AppliedMethod,
+    Resources,
+    ResourceTree,
+    Approvals
+)
+{
+    public override DataKind Kind { get => DataKind.HYGROTHERMAL_DATA; }
+
+    [NodeResolver]
+    public static Task<HygrothermalData?> GetAsync(
+        string id,
+        DataQueries dataQueries,
+        ApplicationDbContext databaseContext,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return DataX.Data.FetchNodeAsync<HygrothermalData>(
+            id,
+            (database, uuid, locale) => dataQueries.GetHygrothermalDataAsync(
+                database,
+                uuid,
+                locale,
+                resolverContext,
+                cancellationToken
+            ),
+            databaseContext,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/HygrothermalDataConnection.cs b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataConnection.cs
similarity index 80%
rename from backend/src/GraphQl/DataX/HygrothermalDataConnection.cs
rename to backend/src/GraphQl/HygrothermalDataX/HygrothermalDataConnection.cs
index 8ebb2a439..9515fef03 100644
--- a/backend/src/GraphQl/DataX/HygrothermalDataConnection.cs
+++ b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataConnection.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using HotChocolate.Types.Pagination;
+using Metabase.GraphQl.DataX;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.HygrothermalDataX;
 
 public sealed record HygrothermalDataConnection(
     IReadOnlyList<HygrothermalDataEdge> Edges,
diff --git a/backend/src/GraphQl/DataX/HygrothermalDataEdge.cs b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataEdge.cs
similarity index 65%
rename from backend/src/GraphQl/DataX/HygrothermalDataEdge.cs
rename to backend/src/GraphQl/HygrothermalDataX/HygrothermalDataEdge.cs
index e84d43ae7..8133577a2 100644
--- a/backend/src/GraphQl/DataX/HygrothermalDataEdge.cs
+++ b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataEdge.cs
@@ -1,4 +1,6 @@
-namespace Metabase.GraphQl.DataX;
+using Metabase.GraphQl.DataX;
+
+namespace Metabase.GraphQl.HygrothermalDataX;
 
 public sealed record HygrothermalDataEdge(
     string Cursor,
diff --git a/backend/src/GraphQl/DataX/HygrothermalDataPropositionInput.cs b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataPropositionInput.cs
similarity index 81%
rename from backend/src/GraphQl/DataX/HygrothermalDataPropositionInput.cs
rename to backend/src/GraphQl/HygrothermalDataX/HygrothermalDataPropositionInput.cs
index 9acad7f8b..b52f9f332 100644
--- a/backend/src/GraphQl/DataX/HygrothermalDataPropositionInput.cs
+++ b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataPropositionInput.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using Metabase.GraphQl.DataX;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.HygrothermalDataX;
 
 public sealed record HygrothermalDataPropositionInput(
     UuidPropositionInput? ComponentId,
diff --git a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs
new file mode 100644
index 000000000..0363cb3dc
--- /dev/null
+++ b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.Resolvers;
+using HotChocolate.Types;
+using Metabase.Data;
+using Metabase.GraphQl.Requests;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.HygrothermalDataX;
+
+[ExtendObjectType(nameof(Query))]
+public sealed class HygrothermalDataQueries
+{
+    public async Task<HygrothermalData?> GetHygrothermalDataAsync(
+        Guid databaseId,
+        Guid id,
+        string? locale,
+        DataQueries dataQueries,
+        ApplicationDbContext databaseContext,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        var database = await databaseContext.Databases.AsNoTracking()
+            .Where(_ => _.Id == databaseId)
+            .SingleOrDefaultAsync(cancellationToken);
+        if (database is null)
+        {
+            return null;
+        }
+        return await dataQueries.GetHygrothermalDataAsync(
+            database,
+            id,
+            locale,
+            resolverContext,
+            cancellationToken
+        );
+    }
+
+    public Task<HygrothermalDataConnection> GetAllHygrothermalDataAsync(
+        HygrothermalDataPropositionInput? where,
+        string? locale,
+        uint? first,
+        string? after,
+        uint? last,
+        string? before,
+        DataQueries dataQueries,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return dataQueries.GetAllDataAsync<HygrothermalDataConnection, HygrothermalDataEdge, HygrothermalData>(
+            first,
+            after,
+            last,
+            before,
+            (edges, totalCount, pageInfo) => new HygrothermalDataConnection(edges, totalCount, pageInfo),
+            (node, cursor) => new HygrothermalDataEdge(cursor, node),
+            (database, first, after, last, before) => dataQueries.GetAllHygrothermalDataAsync(
+                database,
+                where,
+                locale,
+                first,
+                after,
+                last,
+                before,
+                resolverContext,
+                cancellationToken
+            ),
+            cancellationToken
+        );
+    }
+
+    public Task<bool> HasHygrothermalDataAsync(
+        HygrothermalDataPropositionInput? where,
+        string? locale,
+        DataQueries dataQueries,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return dataQueries.HasDataAsync(
+            (database) => dataQueries.HasHygrothermalDataAsync(
+                database,
+                where,
+                locale,
+                resolverContext,
+                cancellationToken
+            ),
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/InstitutionMethodDevelopers/AddInstitutionMethodDeveloperPayload.cs b/backend/src/GraphQl/InstitutionMethodDevelopers/AddInstitutionMethodDeveloperPayload.cs
index 06c47b0ca..907118b55 100644
--- a/backend/src/GraphQl/InstitutionMethodDevelopers/AddInstitutionMethodDeveloperPayload.cs
+++ b/backend/src/GraphQl/InstitutionMethodDevelopers/AddInstitutionMethodDeveloperPayload.cs
@@ -11,7 +11,10 @@ public AddInstitutionMethodDeveloperPayload(
         InstitutionMethodDeveloper institutionMethodDeveloper
     )
     {
-        DevelopedMethodEdge = new InstitutionDevelopedMethodEdge(institutionMethodDeveloper);
+        DevelopedMethodEdge = new InstitutionDevelopedMethodEdge(
+            institutionMethodDeveloper,
+            PaginationHelpers.ConstructCursor(institutionMethodDeveloper.MethodId, institutionMethodDeveloper.InstitutionId)
+        );
         MethodDeveloperEdge = new InstitutionMethodDeveloperEdge(institutionMethodDeveloper);
     }
 
diff --git a/backend/src/GraphQl/InstitutionMethodDevelopers/ConfirmInstitutionMethodDeveloperPayload.cs b/backend/src/GraphQl/InstitutionMethodDevelopers/ConfirmInstitutionMethodDeveloperPayload.cs
index 6709931d1..96a558212 100644
--- a/backend/src/GraphQl/InstitutionMethodDevelopers/ConfirmInstitutionMethodDeveloperPayload.cs
+++ b/backend/src/GraphQl/InstitutionMethodDevelopers/ConfirmInstitutionMethodDeveloperPayload.cs
@@ -11,7 +11,10 @@ public ConfirmInstitutionMethodDeveloperPayload(
         InstitutionMethodDeveloper institutionMethodDeveloper
     )
     {
-        DevelopedMethodEdge = new InstitutionDevelopedMethodEdge(institutionMethodDeveloper);
+        DevelopedMethodEdge = new InstitutionDevelopedMethodEdge(
+            institutionMethodDeveloper,
+            PaginationHelpers.ConstructCursor(institutionMethodDeveloper.MethodId, institutionMethodDeveloper.InstitutionId)
+        );
         MethodDeveloperEdge = new InstitutionMethodDeveloperEdge(institutionMethodDeveloper);
     }
 
diff --git a/backend/src/GraphQl/InstitutionMethodDevelopers/InstitutionMethodDeveloperFilterType.cs b/backend/src/GraphQl/InstitutionMethodDevelopers/InstitutionMethodDeveloperFilterType.cs
index 106b009be..e66bb230c 100644
--- a/backend/src/GraphQl/InstitutionMethodDevelopers/InstitutionMethodDeveloperFilterType.cs
+++ b/backend/src/GraphQl/InstitutionMethodDevelopers/InstitutionMethodDeveloperFilterType.cs
@@ -1,16 +1,20 @@
 using HotChocolate.Data.Filters;
 using Metabase.Data;
+using Metabase.GraphQl.Associations;
 
 namespace Metabase.GraphQl.InstitutionMethodDevelopers;
 
 public abstract class InstitutionMethodDeveloperFilterType
-    : FilterInputType<InstitutionMethodDeveloper>
+    : AuditableAssociationFilterType<InstitutionMethodDeveloper>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<InstitutionMethodDeveloper> descriptor
     )
     {
-        descriptor.BindFieldsExplicitly();
+        base.Configure(descriptor);
+        // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         descriptor.Field(x => x.Method);
         descriptor.Field(x => x.Institution);
     }
diff --git a/backend/src/GraphQl/InstitutionMethodDevelopers/InstitutionMethodDeveloperSortType.cs b/backend/src/GraphQl/InstitutionMethodDevelopers/InstitutionMethodDeveloperSortType.cs
index eb6e948ec..a54d4c4be 100644
--- a/backend/src/GraphQl/InstitutionMethodDevelopers/InstitutionMethodDeveloperSortType.cs
+++ b/backend/src/GraphQl/InstitutionMethodDevelopers/InstitutionMethodDeveloperSortType.cs
@@ -1,17 +1,16 @@
 using HotChocolate.Data.Sorting;
 using Metabase.Data;
+using Metabase.GraphQl.Associations;
 
 namespace Metabase.GraphQl.InstitutionMethodDevelopers;
 
-public sealed class InstitutionMethodDeveloperSortType
-    : SortInputType<InstitutionMethodDeveloper>
+public abstract class InstitutionMethodDeveloperSortType
+    : AuditableAssociationSortType<InstitutionMethodDeveloper>
 {
     protected override void Configure(
         ISortInputTypeDescriptor<InstitutionMethodDeveloper> descriptor
     )
     {
-        descriptor.BindFieldsExplicitly();
-        descriptor.Field(x => x.Method);
-        descriptor.Field(x => x.Institution);
+        base.Configure(descriptor);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/InstitutionMethodDevelopers/RemoveInstitutionMethodDeveloperPayload.cs b/backend/src/GraphQl/InstitutionMethodDevelopers/RemoveInstitutionMethodDeveloperPayload.cs
index 7c90dbf2e..ba7a60634 100644
--- a/backend/src/GraphQl/InstitutionMethodDevelopers/RemoveInstitutionMethodDeveloperPayload.cs
+++ b/backend/src/GraphQl/InstitutionMethodDevelopers/RemoveInstitutionMethodDeveloperPayload.cs
@@ -11,7 +11,10 @@ public RemoveInstitutionMethodDeveloperPayload(
         InstitutionMethodDeveloper institutionMethodDeveloper
     )
     {
-        DevelopedMethodEdge = new InstitutionDevelopedMethodEdge(institutionMethodDeveloper);
+        DevelopedMethodEdge = new InstitutionDevelopedMethodEdge(
+            institutionMethodDeveloper,
+            PaginationHelpers.ConstructCursor(institutionMethodDeveloper.MethodId, institutionMethodDeveloper.InstitutionId)
+        );
         MethodDeveloperEdge = new InstitutionMethodDeveloperEdge(institutionMethodDeveloper);
     }
 
diff --git a/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeFilterType.cs b/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeFilterType.cs
index 7d46ecb5f..14c1139a1 100644
--- a/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeFilterType.cs
+++ b/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeFilterType.cs
@@ -1,16 +1,20 @@
 using HotChocolate.Data.Filters;
 using Metabase.Data;
+using Metabase.GraphQl.Associations;
 
 namespace Metabase.GraphQl.InstitutionRepresentatives;
 
 public abstract class InstitutionRepresentativeFilterType
-    : FilterInputType<InstitutionRepresentative>
+    : AuditableAssociationFilterType<InstitutionRepresentative>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<InstitutionRepresentative> descriptor
     )
     {
-        descriptor.BindFieldsExplicitly();
+        base.Configure(descriptor);
+        // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         descriptor.Field(x => x.Institution);
         descriptor.Field(x => x.User);
         descriptor.Field(x => x.Role);
diff --git a/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeMutations.cs b/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeMutations.cs
index b3d0bab5c..ef0058c66 100644
--- a/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeMutations.cs
+++ b/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeMutations.cs
@@ -11,10 +11,9 @@
 using Metabase.Enumerations;
 using Metabase.Extensions;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Antiforgery;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
+using NodaTime;
 
 namespace Metabase.GraphQl.InstitutionRepresentatives;
 
@@ -117,6 +116,7 @@ public async Task<RemoveInstitutionRepresentativePayload> RemoveInstitutionRepre
         ClaimsPrincipal claimsPrincipal,
         InstitutionRepresentativeAuthorization authorization,
         ApplicationDbContext context,
+        IClock clock,
         CancellationToken cancellationToken
     )
     {
@@ -213,7 +213,7 @@ await context.InstitutionRepresentatives.AsQueryable()
                 && f.UserId == input.UserId
             ))
         {
-            fingerprint.Forbid();
+            fingerprint.Forbid(clock);
         }
         context.InstitutionRepresentatives.Remove(institutionRepresentative);
         await context.SaveChangesAsync(cancellationToken);
diff --git a/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeSortType.cs b/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeSortType.cs
index 5bd005b74..c325aba29 100644
--- a/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeSortType.cs
+++ b/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeSortType.cs
@@ -1,18 +1,17 @@
 using HotChocolate.Data.Sorting;
 using Metabase.Data;
+using Metabase.GraphQl.Associations;
 
 namespace Metabase.GraphQl.InstitutionRepresentatives;
 
-public sealed class InstitutionRepresentativeSortType
-    : SortInputType<InstitutionRepresentative>
+public abstract class InstitutionRepresentativeSortType
+    : AuditableAssociationSortType<InstitutionRepresentative>
 {
     protected override void Configure(
         ISortInputTypeDescriptor<InstitutionRepresentative> descriptor
     )
     {
-        descriptor.BindFieldsExplicitly();
-        descriptor.Field(x => x.Institution);
-        descriptor.Field(x => x.User);
+        base.Configure(descriptor);
         descriptor.Field(x => x.Role);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/InstitutionRepresentatives/RemoveInstitutionRepresentativePayload.cs b/backend/src/GraphQl/InstitutionRepresentatives/RemoveInstitutionRepresentativePayload.cs
index 1c20b1473..c1b71a6f3 100644
--- a/backend/src/GraphQl/InstitutionRepresentatives/RemoveInstitutionRepresentativePayload.cs
+++ b/backend/src/GraphQl/InstitutionRepresentatives/RemoveInstitutionRepresentativePayload.cs
@@ -35,7 +35,7 @@ RemoveInstitutionRepresentativeError error
     public IReadOnlyCollection<RemoveInstitutionRepresentativeError>? Errors { get; }
 
     public async Task<Institution?> GetInstitution(
-        InstitutionByIdDataLoader byId,
+        IInstitutionByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
diff --git a/backend/src/GraphQl/Institutions/GnuPgKeyFingerprintsByInstitutionIdDataLoader.cs b/backend/src/GraphQl/Institutions/GnuPgKeyFingerprintsByInstitutionIdDataLoader.cs
deleted file mode 100644
index 027b8cdf3..000000000
--- a/backend/src/GraphQl/Institutions/GnuPgKeyFingerprintsByInstitutionIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Institutions;
-
-public sealed class GnuPgKeyFingerprintsByInstitutionIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<GnuPgKeyFingerprint>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.GnuPgKeyFingerprints.AsNoTracking().Where(x =>
-                    ids.Contains(x.InstitutionId)
-                ).With(queryContext),
-        x => x.InstitutionId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionByIdDataLoader.cs b/backend/src/GraphQl/Institutions/InstitutionByIdDataLoader.cs
deleted file mode 100644
index 365c75d6f..000000000
--- a/backend/src/GraphQl/Institutions/InstitutionByIdDataLoader.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Institutions;
-
-public sealed class InstitutionByIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : EntityByIdDataLoader<Institution>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        dbContext => dbContext.Institutions
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionDataLoaders.cs b/backend/src/GraphQl/Institutions/InstitutionDataLoaders.cs
new file mode 100644
index 000000000..63f258add
--- /dev/null
+++ b/backend/src/GraphQl/Institutions/InstitutionDataLoaders.cs
@@ -0,0 +1,289 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut;
+using GreenDonut.Data;
+using Metabase.Data;
+using Metabase.Data.OpenIdConnect;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.Institutions;
+
+public sealed class InstitutionDataLoaders
+: DataLoaders
+{
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Institution>> GetInstitutionByIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<Institution> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetEntityByIdAsync(
+            ids,
+            databaseContext => databaseContext.Institutions,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Page<ComponentManufacturer>>> GetInstitutionManufacturedComponentsByInstitutionIdAsync(
+        IReadOnlyList<Guid> ids,
+        PagingArguments pagingArguments,
+        QueryContext<ComponentManufacturer> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.ComponentManufacturers.Where(_ => !_.Pending),
+            _ => _.InstitutionId,
+            _ => _.ComponentId,
+            pagingArguments,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Page<ComponentManufacturer>>> GetPendingInstitutionManufacturedComponentsByInstitutionIdAsync(
+        IReadOnlyList<Guid> ids,
+        PagingArguments pagingArguments,
+        QueryContext<ComponentManufacturer> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.ComponentManufacturers.Where(_ => _.Pending),
+            _ => _.InstitutionId,
+            _ => _.ComponentId,
+            pagingArguments,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Page<InstitutionMethodDeveloper>>> GetInstitutionDevelopedMethodsByInstitutionIdAsync(
+        IReadOnlyList<Guid> ids,
+        PagingArguments pagingArguments,
+        QueryContext<InstitutionMethodDeveloper> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.InstitutionMethodDevelopers.Where(_ => !_.Pending),
+            _ => _.InstitutionId,
+            _ => _.MethodId,
+            pagingArguments,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Page<InstitutionMethodDeveloper>>> GetPendingInstitutionDevelopedMethodsByInstitutionIdAsync(
+        IReadOnlyList<Guid> ids,
+        PagingArguments pagingArguments,
+        QueryContext<InstitutionMethodDeveloper> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.InstitutionMethodDevelopers.Where(_ => _.Pending),
+            _ => _.InstitutionId,
+            _ => _.MethodId,
+            pagingArguments,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Database[]>> GetInstitutionOperatedDatabasesByInstitutionIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<Database> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetManyByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.Databases,
+            _ => _.OperatorId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, OpenIdConnectApplication[]>> GetInstitutionOwnedOpenIdConnectApplicationsByInstitutionIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<OpenIdConnectApplication> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetManyByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.OpenIdConnectApplications,
+            _ => _.OwnerId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, InstitutionRepresentative[]>> GetInstitutionRepresentativesByInstitutionIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<InstitutionRepresentative> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.InstitutionRepresentatives.Where(_ => !_.Pending),
+            _ => _.InstitutionId,
+            _ => _.UserId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, InstitutionRepresentative[]>> GetPendingInstitutionRepresentativesByInstitutionIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<InstitutionRepresentative> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.InstitutionRepresentatives.Where(_ => _.Pending),
+            _ => _.InstitutionId,
+            _ => _.UserId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, GnuPgKeyFingerprint[]>> GetGnuPgKeyFingerprintsByInstitutionIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<GnuPgKeyFingerprint> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetManyByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.GnuPgKeyFingerprints,
+            _ => _.InstitutionId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Page<Component>>> GetInstitutionManagedComponentsByInstitutionIdAsync(
+        IReadOnlyList<Guid> ids,
+        PagingArguments pagingArguments,
+        QueryContext<Component> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetManyByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.Components,
+            _ => _.ManagerId,
+            pagingArguments,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Page<DataFormat>>> GetInstitutionManagedDataFormatsByInstitutionIdAsync(
+        IReadOnlyList<Guid> ids,
+        PagingArguments pagingArguments,
+        QueryContext<DataFormat> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetManyByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.DataFormats,
+            _ => _.ManagerId,
+            pagingArguments,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Page<Institution>>> GetInstitutionManagedInstitutionsByInstitutionIdAsync(
+        IReadOnlyList<Guid> ids,
+        PagingArguments pagingArguments,
+        QueryContext<Institution> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetManyByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.Institutions,
+            _ => _.ManagerId ?? Guid.Empty,
+            pagingArguments,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Page<Method>>> GetInstitutionManagedMethodsByInstitutionIdAsync(
+        IReadOnlyList<Guid> ids,
+        PagingArguments pagingArguments,
+        QueryContext<Method> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetManyByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.Methods,
+            _ => _.ManagerId,
+            pagingArguments,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodConnection.cs b/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodConnection.cs
index b0e971916..66b46111a 100644
--- a/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodConnection.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodConnection.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
@@ -10,11 +11,13 @@ namespace Metabase.GraphQl.Institutions;
 
 public sealed class InstitutionDevelopedMethodConnection(
     Institution institution,
+    PagingArguments pagingArguments,
     QueryContext<InstitutionMethodDeveloper> queryContext
     )
-        : Connection<Institution, InstitutionMethodDeveloper, InstitutionDevelopedMethodsByInstitutionIdDataLoader, InstitutionDevelopedMethodEdge>(
+        : PaginatedConnection<Institution, InstitutionMethodDeveloper, InstitutionDevelopedMethodEdge, IInstitutionDevelopedMethodsByInstitutionIdDataLoader>(
         institution,
-        x => new InstitutionDevelopedMethodEdge(x),
+        (association, cursor) => new InstitutionDevelopedMethodEdge(association, cursor),
+        pagingArguments,
         queryContext
         )
 {
@@ -22,17 +25,20 @@ QueryContext<InstitutionMethodDeveloper> queryContext
 
 public sealed class PendingInstitutionDevelopedMethodConnection(
     Institution institution,
+    PagingArguments pagingArguments,
     QueryContext<InstitutionMethodDeveloper> queryContext
     )
-        : AuthorizedConnection<Institution, InstitutionMethodDeveloper, PendingInstitutionDevelopedMethodsByInstitutionIdDataLoader, InstitutionDevelopedMethodEdge, InstitutionMethodDeveloperAuthorization>(
+        : AuthorizedPaginatedConnection<Institution, InstitutionMethodDeveloper, InstitutionDevelopedMethodEdge, IPendingInstitutionDevelopedMethodsByInstitutionIdDataLoader, InstitutionMethodDeveloperAuthorization>(
         institution,
-        x => new InstitutionDevelopedMethodEdge(x),
-        (claimsPrincipal, institution, authorization, cancellationToken) =>
+        (association, cursor) => new InstitutionDevelopedMethodEdge(association, cursor),
+        (claimsPrincipal, authorization, cancellationToken) =>
             authorization.IsAuthorizedToConfirm(claimsPrincipal, institution.Id, cancellationToken),
+        pagingArguments,
         queryContext
         )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToConfirmEdgesAsync(
         ClaimsPrincipal claimsPrincipal,
         InstitutionMethodDeveloperAuthorization authorization,
diff --git a/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodEdge.cs b/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodEdge.cs
index 8f91851c3..14c4f7329 100644
--- a/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodEdge.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodEdge.cs
@@ -4,8 +4,11 @@
 namespace Metabase.GraphQl.Institutions;
 
 public sealed class InstitutionDevelopedMethodEdge(
-    InstitutionMethodDeveloper association
-    )
-        : Edge<Method, MethodByIdDataLoader>(association.MethodId)
+    InstitutionMethodDeveloper association,
+    string cursor
+)
+: PaginatedEdge<Method, IMethodByIdDataLoader>(
+    association.MethodId, cursor
+)
 {
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodSortType.cs b/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodSortType.cs
new file mode 100644
index 000000000..84ab85b09
--- /dev/null
+++ b/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodSortType.cs
@@ -0,0 +1,17 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+using Metabase.GraphQl.InstitutionMethodDevelopers;
+
+namespace Metabase.GraphQl.Institutions;
+
+public sealed class InstitutionDevelopedMethodSortType
+    : InstitutionMethodDeveloperSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<InstitutionMethodDeveloper> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(InstitutionDevelopedMethodSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodsByInstitutionIdDataLoader.cs b/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodsByInstitutionIdDataLoader.cs
deleted file mode 100644
index a7e356500..000000000
--- a/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodsByInstitutionIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Institutions;
-
-public sealed class InstitutionDevelopedMethodsByInstitutionIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<InstitutionMethodDeveloper>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.InstitutionMethodDevelopers.AsNoTracking().Where(x =>
-                    !x.Pending && ids.Contains(x.InstitutionId)
-                ).With(queryContext),
-        x => x.InstitutionId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionFilterType.cs
index 47a44b3ef..5be294271 100644
--- a/backend/src/GraphQl/Institutions/InstitutionFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionFilterType.cs
@@ -5,13 +5,17 @@
 namespace Metabase.GraphQl.Institutions;
 
 public class InstitutionFilterType
-    : EntityFilterType<Institution>
+    : AuditableEntityFilterType<Institution>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<Institution> descriptor
     )
     {
         base.Configure(descriptor);
+        // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.Id);
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         descriptor.Field(_ => _.Name);
         descriptor.Field(_ => _.Abbreviation);
         descriptor.Field(_ => _.Description);
diff --git a/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintConnection.cs b/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintConnection.cs
index 45a3d940d..9cadecff1 100644
--- a/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintConnection.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintConnection.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
@@ -14,8 +15,8 @@ QueryContext<GnuPgKeyFingerprint> queryContext
 ) : Connection<
         Institution,
         GnuPgKeyFingerprint,
-        GnuPgKeyFingerprintsByInstitutionIdDataLoader,
-        InstitutionGnuPgKeyFingerprintEdge
+        InstitutionGnuPgKeyFingerprintEdge,
+        GnuPgKeyFingerprintsByInstitutionIdDataLoader
     >
 (
     institution,
@@ -24,6 +25,7 @@ QueryContext<GnuPgKeyFingerprint> queryContext
 )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         GnuPgKeyFingerprintAuthorization authorization,
diff --git a/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintFilterType.cs
index e189930aa..ea50eae6e 100644
--- a/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintFilterType.cs
@@ -1,5 +1,4 @@
 using HotChocolate.Data.Filters;
-using Metabase.Configuration;
 using Metabase.Data;
 using Metabase.GraphQl.GnuPgKeyFingerprints;
 
diff --git a/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintSortType.cs b/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintSortType.cs
new file mode 100644
index 000000000..5f1f63073
--- /dev/null
+++ b/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintSortType.cs
@@ -0,0 +1,17 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+using Metabase.GraphQl.GnuPgKeyFingerprints;
+
+namespace Metabase.GraphQl.Institutions;
+
+public sealed class InstitutionGnuPgKeyFingerprintSortType
+    : GnuPgKeyFingerprintSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<GnuPgKeyFingerprint> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(InstitutionGnuPgKeyFingerprintSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedComponentConnection.cs b/backend/src/GraphQl/Institutions/InstitutionManagedComponentConnection.cs
index 2849d80c7..f28631cc4 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagedComponentConnection.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedComponentConnection.cs
@@ -2,25 +2,27 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Institutions;
 
 public sealed class InstitutionManagedComponentConnection(
     Institution institution,
+    PagingArguments pagingArguments,
     QueryContext<Component> queryContext
     )
-        : Connection<Institution, Component, InstitutionManagedComponentsByInstitutionIdDataLoader,
-        InstitutionManagedComponentEdge>(
+        : PaginatedConnection<Institution, Component, InstitutionManagedComponentEdge, IInstitutionManagedComponentsByInstitutionIdDataLoader>(
         institution,
-        x => new InstitutionManagedComponentEdge(x),
+        (node, cursor) => new InstitutionManagedComponentEdge(node, cursor),
+        pagingArguments,
         queryContext
         )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentAuthorization authorization,
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedComponentEdge.cs b/backend/src/GraphQl/Institutions/InstitutionManagedComponentEdge.cs
index 875da81e1..bcc9a9fe5 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagedComponentEdge.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedComponentEdge.cs
@@ -2,9 +2,11 @@
 
 namespace Metabase.GraphQl.Institutions;
 
-public sealed class InstitutionManagedComponentEdge(
-    Component node
-    )
-{
-    public Component Node { get; } = node;
-}
\ No newline at end of file
+public sealed record InstitutionManagedComponentEdge(
+    Component Node,
+    string Cursor
+)
+: PaginatedEdge<Component>(
+    Node,
+    Cursor
+);
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedComponentSortType.cs b/backend/src/GraphQl/Institutions/InstitutionManagedComponentSortType.cs
new file mode 100644
index 000000000..f2e458d57
--- /dev/null
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedComponentSortType.cs
@@ -0,0 +1,16 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+
+namespace Metabase.GraphQl.Components;
+
+public sealed class InstitutionManagedComponentSortType
+    : ComponentSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<Component> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(InstitutionManagedComponentSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedComponentsByInstitutionIdDataLoader.cs b/backend/src/GraphQl/Institutions/InstitutionManagedComponentsByInstitutionIdDataLoader.cs
deleted file mode 100644
index 7fd4fa6de..000000000
--- a/backend/src/GraphQl/Institutions/InstitutionManagedComponentsByInstitutionIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Institutions;
-
-public sealed class InstitutionManagedComponentsByInstitutionIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<Component>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.Components.AsNoTracking().Where(x =>
-                    ids.Contains(x.ManagerId)
-                ).With(queryContext),
-        x => x.ManagerId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatConnection.cs b/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatConnection.cs
index 1a9fe223f..fe484aef4 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatConnection.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatConnection.cs
@@ -2,25 +2,27 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Institutions;
 
 public sealed class InstitutionManagedDataFormatConnection(
     Institution institution,
+    PagingArguments pagingArguments,
     QueryContext<DataFormat> queryContext
     )
-        : Connection<Institution, DataFormat, InstitutionManagedDataFormatsByInstitutionIdDataLoader,
-        InstitutionManagedDataFormatEdge>(
+        : PaginatedConnection<Institution, DataFormat, InstitutionManagedDataFormatEdge, IInstitutionManagedDataFormatsByInstitutionIdDataLoader>(
         institution,
-        x => new InstitutionManagedDataFormatEdge(x),
+        (node, cursor) => new InstitutionManagedDataFormatEdge(node, cursor),
+        pagingArguments,
         queryContext
         )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         DataFormatAuthorization authorization,
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatEdge.cs b/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatEdge.cs
index af05b948e..a707c07ee 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatEdge.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatEdge.cs
@@ -2,9 +2,11 @@
 
 namespace Metabase.GraphQl.Institutions;
 
-public sealed class InstitutionManagedDataFormatEdge(
-    DataFormat node
-    )
-{
-    public DataFormat Node { get; } = node;
-}
\ No newline at end of file
+public sealed record InstitutionManagedDataFormatEdge(
+    DataFormat Node,
+    string Cursor
+)
+: PaginatedEdge<DataFormat>(
+    Node,
+    Cursor
+);
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatSortType.cs b/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatSortType.cs
new file mode 100644
index 000000000..86fbbdf23
--- /dev/null
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatSortType.cs
@@ -0,0 +1,16 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+
+namespace Metabase.GraphQl.DataFormats;
+
+public sealed class InstitutionManagedDataFormatSortType
+    : DataFormatSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<DataFormat> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(InstitutionManagedDataFormatSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatsByInstitutionIdDataLoader.cs b/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatsByInstitutionIdDataLoader.cs
deleted file mode 100644
index 0d0061f4d..000000000
--- a/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatsByInstitutionIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Institutions;
-
-public sealed class InstitutionManagedDataFormatsByInstitutionIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<DataFormat>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.DataFormats.AsNoTracking().Where(x =>
-                    ids.Contains(x.ManagerId)
-                ).With(queryContext),
-        x => x.ManagerId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionConnection.cs b/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionConnection.cs
index ff42f6d06..f46eba87c 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionConnection.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionConnection.cs
@@ -2,25 +2,27 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Institutions;
 
 public sealed class InstitutionManagedInstitutionConnection(
     Institution institution,
+    PagingArguments pagingArguments,
     QueryContext<Institution> queryContext
-    )
-        : Connection<Institution, Institution, InstitutionManagedInstitutionsByInstitutionIdDataLoader,
-        InstitutionManagedInstitutionEdge>(
+)
+: PaginatedConnection<Institution, Institution, InstitutionManagedInstitutionEdge, IInstitutionManagedInstitutionsByInstitutionIdDataLoader>(
         institution,
-        x => new InstitutionManagedInstitutionEdge(x),
+        (node, cursor) => new InstitutionManagedInstitutionEdge(node, cursor),
+        pagingArguments,
         queryContext
-        )
+)
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         InstitutionAuthorization authorization,
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionEdge.cs b/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionEdge.cs
index 2ff6c4ba1..52a437fc2 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionEdge.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionEdge.cs
@@ -2,9 +2,11 @@
 
 namespace Metabase.GraphQl.Institutions;
 
-public sealed class InstitutionManagedInstitutionEdge(
-    Institution node
-    )
-{
-    public Institution Node { get; } = node;
-}
\ No newline at end of file
+public sealed record InstitutionManagedInstitutionEdge(
+    Institution Node,
+    string Cursor
+)
+: PaginatedEdge<Institution>(
+    Node,
+    Cursor
+);
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionFilterType.cs
index 0b0a9e492..ec5bc9af4 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionFilterType.cs
@@ -1,5 +1,4 @@
 using HotChocolate.Data.Filters;
-using Metabase.Configuration;
 using Metabase.Data;
 
 namespace Metabase.GraphQl.Institutions;
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionSortType.cs b/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionSortType.cs
new file mode 100644
index 000000000..bd0cb6f78
--- /dev/null
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionSortType.cs
@@ -0,0 +1,16 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+
+namespace Metabase.GraphQl.Institutions;
+
+public sealed class InstitutionManagedInstitutionSortType
+    : InstitutionSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<Institution> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(InstitutionManagedInstitutionSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionsByInstitutionIdDataLoader.cs b/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionsByInstitutionIdDataLoader.cs
deleted file mode 100644
index cf41e4cd7..000000000
--- a/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionsByInstitutionIdDataLoader.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Institutions;
-
-public sealed class InstitutionManagedInstitutionsByInstitutionIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<Institution>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.Institutions.AsNoTracking().Where(x =>
-                    ids.Contains(x.ManagerId ?? Guid.Empty)
-                ).With(queryContext),
-        x => x.ManagerId ?? Guid.Empty
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedMethodConnection.cs b/backend/src/GraphQl/Institutions/InstitutionManagedMethodConnection.cs
index e5d8da00f..6fd0262b1 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagedMethodConnection.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedMethodConnection.cs
@@ -2,25 +2,27 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Institutions;
 
 public sealed class InstitutionManagedMethodConnection(
     Institution institution,
+    PagingArguments pagingArguments,
     QueryContext<Method> queryContext
-    )
-        : Connection<Institution, Method, InstitutionManagedMethodsByInstitutionIdDataLoader,
-        InstitutionManagedMethodEdge>(
+)
+: PaginatedConnection<Institution, Method, InstitutionManagedMethodEdge, IInstitutionManagedMethodsByInstitutionIdDataLoader>(
         institution,
-        x => new InstitutionManagedMethodEdge(x),
+        (node, cursor) => new InstitutionManagedMethodEdge(node, cursor),
+        pagingArguments,
         queryContext
         )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         MethodAuthorization authorization,
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedMethodEdge.cs b/backend/src/GraphQl/Institutions/InstitutionManagedMethodEdge.cs
index 3ddbf87c4..c7d715921 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagedMethodEdge.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedMethodEdge.cs
@@ -2,9 +2,11 @@
 
 namespace Metabase.GraphQl.Institutions;
 
-public sealed class InstitutionManagedMethodEdge(
-    Method node
-    )
-{
-    public Method Node { get; } = node;
-}
\ No newline at end of file
+public sealed record InstitutionManagedMethodEdge(
+    Method Node,
+    string Cursor
+)
+: PaginatedEdge<Method>(
+    Node,
+    Cursor
+);
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedMethodFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionManagedMethodFilterType.cs
index 38a0feb14..fd215c188 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagedMethodFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedMethodFilterType.cs
@@ -1,5 +1,4 @@
 using HotChocolate.Data.Filters;
-using Metabase.Configuration;
 using Metabase.Data;
 using Metabase.GraphQl.Methods;
 
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedMethodSortType.cs b/backend/src/GraphQl/Institutions/InstitutionManagedMethodSortType.cs
new file mode 100644
index 000000000..95f9e2d86
--- /dev/null
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedMethodSortType.cs
@@ -0,0 +1,17 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+using Metabase.GraphQl.Methods;
+
+namespace Metabase.GraphQl.Institutions;
+
+public sealed class InstitutionManagedMethodSortType
+    : MethodSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<Method> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(InstitutionManagedMethodSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedMethodsByInstitutionIdDataLoader.cs b/backend/src/GraphQl/Institutions/InstitutionManagedMethodsByInstitutionIdDataLoader.cs
deleted file mode 100644
index 79c712bd3..000000000
--- a/backend/src/GraphQl/Institutions/InstitutionManagedMethodsByInstitutionIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Institutions;
-
-public sealed class InstitutionManagedMethodsByInstitutionIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<Method>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.Methods.AsNoTracking().Where(x =>
-                    ids.Contains(x.ManagerId)
-                ).With(queryContext),
-        x => x.ManagerId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagerEdge.cs b/backend/src/GraphQl/Institutions/InstitutionManagerEdge.cs
index 9fc6bd0f5..5916096be 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagerEdge.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagerEdge.cs
@@ -6,6 +6,6 @@ namespace Metabase.GraphQl.Institutions;
 public sealed class InstitutionManagerEdge(
     Institution association
     )
-        : Edge<Institution, InstitutionByIdDataLoader>(association.ManagerId ?? Guid.Empty)
+        : Edge<Institution, IInstitutionByIdDataLoader>(association.ManagerId ?? Guid.Empty)
 {
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentByInstitutionIdDataLoader.cs b/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentByInstitutionIdDataLoader.cs
deleted file mode 100644
index d01be9182..000000000
--- a/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentByInstitutionIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Institutions;
-
-public sealed class InstitutionManufacturedComponentsByInstitutionIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<ComponentManufacturer>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.ComponentManufacturers.AsNoTracking().Where(x =>
-                    !x.Pending && ids.Contains(x.InstitutionId)
-                ).With(queryContext),
-        x => x.InstitutionId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentConnection.cs b/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentConnection.cs
index 0585366d8..631267972 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentConnection.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentConnection.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
@@ -9,30 +10,35 @@
 namespace Metabase.GraphQl.Institutions;
 
 public sealed class InstitutionManufacturedComponentConnection(
-    Institution institution,
+    Institution subject,
+    PagingArguments pagingArguments,
     QueryContext<ComponentManufacturer> queryContext
-    )
-        : Connection<Institution, ComponentManufacturer, InstitutionManufacturedComponentsByInstitutionIdDataLoader, InstitutionManufacturedComponentEdge>(
-        institution,
-        x => new InstitutionManufacturedComponentEdge(x),
-        queryContext
-        )
+)
+: PaginatedConnection<Institution, ComponentManufacturer, InstitutionManufacturedComponentEdge, IInstitutionManufacturedComponentsByInstitutionIdDataLoader>(
+    subject,
+    (association, cursor) => new InstitutionManufacturedComponentEdge(association, cursor),
+    pagingArguments,
+    queryContext
+)
 {
 }
 
 public sealed class PendingInstitutionManufacturedComponentConnection(
-    Institution institution,
+    Institution subject,
+    PagingArguments pagingArguments,
     QueryContext<ComponentManufacturer> queryContext
-    )
-        : AuthorizedConnection<Institution, ComponentManufacturer, PendingInstitutionManufacturedComponentsByInstitutionIdDataLoader, InstitutionManufacturedComponentEdge, ComponentManufacturerAuthorization>(
-        institution,
-        x => new InstitutionManufacturedComponentEdge(x),
-        (claimsPrincipal, institution, authorization, cancellationToken) =>
-            authorization.IsAuthorizedToConfirm(claimsPrincipal, institution.Id, cancellationToken),
-        queryContext
-        )
+)
+: AuthorizedPaginatedConnection<Institution, ComponentManufacturer, InstitutionManufacturedComponentEdge, IPendingInstitutionManufacturedComponentsByInstitutionIdDataLoader, ComponentManufacturerAuthorization>(
+    subject,
+    (association, cursor) => new InstitutionManufacturedComponentEdge(association, cursor),
+    (claimsPrincipal, authorization, cancellationToken) =>
+        authorization.IsAuthorizedToConfirm(claimsPrincipal, subject.Id, cancellationToken),
+    pagingArguments,
+    queryContext
+)
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToConfirmEdgesAsync(
         ClaimsPrincipal claimsPrincipal,
         ComponentManufacturerAuthorization authorization,
diff --git a/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentEdge.cs b/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentEdge.cs
index adc23aba2..76aae2737 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentEdge.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentEdge.cs
@@ -4,8 +4,12 @@
 namespace Metabase.GraphQl.Institutions;
 
 public sealed class InstitutionManufacturedComponentEdge(
-    ComponentManufacturer association
-    )
-        : Edge<Component, ComponentByIdDataLoader>(association.ComponentId)
+    ComponentManufacturer association,
+    string cursor
+)
+: PaginatedEdge<Component, IComponentByIdDataLoader>(
+    association.ComponentId,
+    cursor
+)
 {
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentSortType.cs b/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentSortType.cs
new file mode 100644
index 000000000..4c3f1bc9d
--- /dev/null
+++ b/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentSortType.cs
@@ -0,0 +1,17 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+using Metabase.GraphQl.ComponentManufacturers;
+
+namespace Metabase.GraphQl.Institutions;
+
+public sealed class InstitutionManufacturedComponentSortType
+    : ComponentManufacturerSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<ComponentManufacturer> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(InstitutionManufacturedComponentSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseConnection.cs b/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseConnection.cs
index 88bbccbf5..84469a4ce 100644
--- a/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseConnection.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseConnection.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
@@ -12,14 +13,14 @@ public sealed class InstitutionOperatedDatabaseConnection(
     Institution institution,
     QueryContext<Database> queryContext
     )
-        : Connection<Institution, Database, InstitutionOperatedDatabasesByInstitutionIdDataLoader,
-        InstitutionOperatedDatabaseEdge>(
+        : Connection<Institution, Database, InstitutionOperatedDatabaseEdge, IInstitutionOperatedDatabasesByInstitutionIdDataLoader>(
         institution,
         x => new InstitutionOperatedDatabaseEdge(x),
         queryContext
         )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         DatabaseAuthorization authorization,
diff --git a/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseFilterType.cs
index aefc8bf6c..037a31c85 100644
--- a/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseFilterType.cs
@@ -1,5 +1,4 @@
 using HotChocolate.Data.Filters;
-using Metabase.Configuration;
 using Metabase.Data;
 using Metabase.GraphQl.Databases;
 
diff --git a/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseSortType.cs b/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseSortType.cs
new file mode 100644
index 000000000..1975f45dc
--- /dev/null
+++ b/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseSortType.cs
@@ -0,0 +1,17 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+using Metabase.GraphQl.Databases;
+
+namespace Metabase.GraphQl.Institutions;
+
+public sealed class InstitutionOperatedDatabaseSortType
+    : DatabaseSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<Database> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(InstitutionOperatedDatabaseSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionOperatedDatabasesByInstitutionIdDataLoader.cs b/backend/src/GraphQl/Institutions/InstitutionOperatedDatabasesByInstitutionIdDataLoader.cs
deleted file mode 100644
index 62aef385c..000000000
--- a/backend/src/GraphQl/Institutions/InstitutionOperatedDatabasesByInstitutionIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Institutions;
-
-public sealed class InstitutionOperatedDatabasesByInstitutionIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<Database>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.Databases.AsNoTracking().Where(x =>
-                    ids.Contains(x.OperatorId)
-                ).With(queryContext),
-        x => x.OperatorId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationConnection.cs b/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationConnection.cs
index 19dd95ae0..25c9ee5d6 100644
--- a/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationConnection.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationConnection.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Data;
 using Metabase.Data.OpenIdConnect;
 using Metabase.GraphQl.Users;
@@ -14,8 +15,8 @@ QueryContext<OpenIdConnectApplication> queryContext
 ) : AuthorizedConnection<
         Institution,
         OpenIdConnectApplication,
-        InstitutionOwnedOpenIdConnectApplicationsByInstitutionIdDataLoader,
         InstitutionOwnedOpenIdConnectApplicationEdge,
+        InstitutionOwnedOpenIdConnectApplicationsByInstitutionIdDataLoader,
         Authorization.OpenIdConnectAuthorization
     >
 (
@@ -27,6 +28,7 @@ QueryContext<OpenIdConnectApplication> queryContext
 )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
@@ -41,6 +43,7 @@ CancellationToken cancellationToken
     }
 
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToRemoveEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
diff --git a/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationEdge.cs b/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationEdge.cs
index bc946c7bd..9613c9dac 100644
--- a/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationEdge.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationEdge.cs
@@ -1,6 +1,7 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Data.OpenIdConnect;
 using Metabase.GraphQl.Users;
 
@@ -13,6 +14,7 @@ OpenIdConnectApplication node
     public OpenIdConnectApplication Node { get; } = node;
 
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToRemoveEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
diff --git a/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationSortType.cs b/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationSortType.cs
new file mode 100644
index 000000000..0ec7e7ddb
--- /dev/null
+++ b/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationSortType.cs
@@ -0,0 +1,17 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data.OpenIdConnect;
+using Metabase.GraphQl.OpenIdConnect.Applications;
+
+namespace Metabase.GraphQl.Institutions;
+
+public sealed class InstitutionOwnedOpenIdConnectApplicationSortType
+    : OpenIdConnectApplicationSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<OpenIdConnectApplication> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(InstitutionOwnedOpenIdConnectApplicationSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationsByInstitutionIdDataLoader.cs b/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationsByInstitutionIdDataLoader.cs
deleted file mode 100644
index 0f97ebfe6..000000000
--- a/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationsByInstitutionIdDataLoader.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.Data.OpenIdConnect;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Institutions;
-
-public sealed class InstitutionOwnedOpenIdConnectApplicationsByInstitutionIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    ) :
-    AssociationsByAssociateIdDataLoader<OpenIdConnectApplication>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.OpenIdConnectApplications.AsNoTracking().Where(x =>
-                    ids.Contains(x.OwnerId)
-                ).With(queryContext),
-        x => x.OwnerId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionQueries.cs b/backend/src/GraphQl/Institutions/InstitutionQueries.cs
index 7ab174157..0fc6bd964 100644
--- a/backend/src/GraphQl/Institutions/InstitutionQueries.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionQueries.cs
@@ -3,9 +3,11 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using GreenDonut.Data;
 using HotChocolate.Authorization;
 using HotChocolate.Data;
 using HotChocolate.Data.Sorting;
+using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Authorization;
 using Metabase.Data;
@@ -46,49 +48,47 @@ application is null
     }
 
     [UsePaging]
-    // [UseProjection] // We disabled projections because when requesting `id` all results had the
-    // same `id` and when also requesting `uuid`, the latter was always the empty UUID `000...`.
     [UseFiltering<InstitutionFilterType>]
     [UseSorting<InstitutionSortType>]
-    public IQueryable<Institution> GetInstitutions(
-        ApplicationDbContext context,
-        ISortingContext sorting
+    public ValueTask<HotChocolate.Types.Pagination.Connection<Institution>> GetInstitutionsAsync(
+        IResolverContext resolverContext,
+        ApplicationDbContext databaseContext,
+        CancellationToken cancellationToken
     )
     {
-        sorting.StabilizeOrder<Institution>();
-        var institutions = context.Institutions.AsNoTracking()
-                .Where(d => d.State == InstitutionState.VERIFIED);
-
-        return institutions;
+        return databaseContext.Institutions
+            .AsNoTracking()
+            .Where(d => d.State == InstitutionState.VERIFIED)
+            .With(resolverContext.GetQueryContext<Institution>(), Sorting.DefaultEntityOrder)
+            .ToPageAsync(resolverContext.GetPagingArguments(), cancellationToken)
+            .ToConnectionAsync();
     }
 
     [UsePaging]
-    // [UseProjection] // We disabled projections because when requesting `id` all results had the
-    // same `id` and when also requesting `uuid`, the latter was always the empty UUID `000...`.
     [UseFiltering<InstitutionFilterType>]
     [UseSorting<InstitutionSortType>]
     [Authorize(Policy = AuthorizationPolicies.WriteScopePolicy)]
     [Authorize(Policy = AuthorizationPolicies.VerifyScopePolicy)]
-    public IQueryable<Institution> GetPendingInstitutions(
-        ApplicationDbContext context,
-        ISortingContext sorting
+    public ValueTask<HotChocolate.Types.Pagination.Connection<Institution>> GetPendingInstitutionsAsync(
+        IResolverContext resolverContext,
+        ApplicationDbContext databaseContext,
+        CancellationToken cancellationToken
     )
     {
-        sorting.StabilizeOrder<Institution>();
-        return
-            context.Institutions.AsNoTracking()
-                .Where(d => d.State == InstitutionState.PENDING);
+        return databaseContext.Institutions
+            .AsNoTracking()
+            .Where(d => d.State == InstitutionState.PENDING)
+            .With(resolverContext.GetQueryContext<Institution>(), Sorting.DefaultEntityOrder)
+            .ToPageAsync(resolverContext.GetPagingArguments(), cancellationToken)
+            .ToConnectionAsync();
     }
 
     public Task<Institution?> GetInstitutionAsync(
         Guid id,
-        InstitutionByIdDataLoader institutionById,
+        IInstitutionByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
-        return institutionById.LoadAsync(
-            id,
-            cancellationToken
-        );
+        return byId.LoadAsync(id, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionRepresentativeConnection.cs b/backend/src/GraphQl/Institutions/InstitutionRepresentativeConnection.cs
index 91b94f686..91c707899 100644
--- a/backend/src/GraphQl/Institutions/InstitutionRepresentativeConnection.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionRepresentativeConnection.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
@@ -12,13 +13,14 @@ public sealed class InstitutionRepresentativeConnection(
     Institution institution,
     QueryContext<InstitutionRepresentative> queryContext
     )
-        : Connection<Institution, InstitutionRepresentative, InstitutionRepresentativesByInstitutionIdDataLoader, InstitutionRepresentativeEdge>(
+        : Connection<Institution, InstitutionRepresentative, InstitutionRepresentativeEdge, IInstitutionRepresentativesByInstitutionIdDataLoader>(
         institution,
         x => new InstitutionRepresentativeEdge(x),
         queryContext
         )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         InstitutionRepresentativeAuthorization authorization,
@@ -37,7 +39,7 @@ public sealed class PendingInstitutionRepresentativeConnection(
     Institution institution,
     QueryContext<InstitutionRepresentative> queryContext
     )
-        : AuthorizedConnection<Institution, InstitutionRepresentative, PendingInstitutionRepresentativesByInstitutionIdDataLoader, InstitutionRepresentativeEdge, InstitutionRepresentativeAuthorization>(
+        : AuthorizedConnection<Institution, InstitutionRepresentative, InstitutionRepresentativeEdge, IPendingInstitutionRepresentativesByInstitutionIdDataLoader, InstitutionRepresentativeAuthorization>(
         institution,
         x => new InstitutionRepresentativeEdge(x),
         (claimsPrincipal, institution, authorization, cancellationToken) =>
@@ -46,6 +48,7 @@ QueryContext<InstitutionRepresentative> queryContext
         )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         InstitutionRepresentativeAuthorization authorization,
diff --git a/backend/src/GraphQl/Institutions/InstitutionRepresentativeEdge.cs b/backend/src/GraphQl/Institutions/InstitutionRepresentativeEdge.cs
index a94e38787..0aa21320a 100644
--- a/backend/src/GraphQl/Institutions/InstitutionRepresentativeEdge.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionRepresentativeEdge.cs
@@ -1,6 +1,7 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.Enumerations;
@@ -11,11 +12,12 @@ namespace Metabase.GraphQl.Institutions;
 public sealed class InstitutionRepresentativeEdge(
     InstitutionRepresentative association
 )
-: Edge<User, UserByIdDataLoader>(association.UserId)
+: Edge<User, IUserByIdDataLoader>(association.UserId)
 {
     public InstitutionRepresentativeRole Role { get; } = association.Role;
 
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToRemoveEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         InstitutionRepresentativeAuthorization authorization,
diff --git a/backend/src/GraphQl/Institutions/InstitutionRepresentativeFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionRepresentativeFilterType.cs
index 7531c4adc..39a2a57f2 100644
--- a/backend/src/GraphQl/Institutions/InstitutionRepresentativeFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionRepresentativeFilterType.cs
@@ -1,5 +1,4 @@
 using HotChocolate.Data.Filters;
-using Metabase.Configuration;
 using Metabase.Data;
 
 namespace Metabase.GraphQl.Institutions;
diff --git a/backend/src/GraphQl/Institutions/InstitutionRepresentativeSortType.cs b/backend/src/GraphQl/Institutions/InstitutionRepresentativeSortType.cs
new file mode 100644
index 000000000..49557c82c
--- /dev/null
+++ b/backend/src/GraphQl/Institutions/InstitutionRepresentativeSortType.cs
@@ -0,0 +1,16 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+
+namespace Metabase.GraphQl.Institutions;
+
+public sealed class InstitutionRepresentativeSortType
+    : InstitutionRepresentatives.InstitutionRepresentativeSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<InstitutionRepresentative> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(InstitutionRepresentativeSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionRepresentativesByInstitutionIdDataLoader.cs b/backend/src/GraphQl/Institutions/InstitutionRepresentativesByInstitutionIdDataLoader.cs
deleted file mode 100644
index 91c1cc941..000000000
--- a/backend/src/GraphQl/Institutions/InstitutionRepresentativesByInstitutionIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Institutions;
-
-public sealed class InstitutionRepresentativesByInstitutionIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<InstitutionRepresentative>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.InstitutionRepresentatives.AsNoTracking().Where(x =>
-                    !x.Pending && ids.Contains(x.InstitutionId)
-                ).With(queryContext),
-        x => x.InstitutionId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionSortType.cs b/backend/src/GraphQl/Institutions/InstitutionSortType.cs
index bfc883e53..1d8dce3d3 100644
--- a/backend/src/GraphQl/Institutions/InstitutionSortType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionSortType.cs
@@ -4,8 +4,8 @@
 
 namespace Metabase.GraphQl.Institutions;
 
-public sealed class InstitutionSortType
-    : EntitySortType<Institution>
+public class InstitutionSortType
+    : AuditableEntitySortType<Institution>
 {
     protected override void Configure(
         ISortInputTypeDescriptor<Institution> descriptor
@@ -17,6 +17,5 @@ ISortInputTypeDescriptor<Institution> descriptor
         descriptor.Field(_ => _.Description);
         descriptor.Field(_ => _.Contact);
         descriptor.Field(_ => _.State);
-        descriptor.Field(_ => _.Manager);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionType.cs b/backend/src/GraphQl/Institutions/InstitutionType.cs
index 814bf4f00..f47282947 100644
--- a/backend/src/GraphQl/Institutions/InstitutionType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionType.cs
@@ -10,7 +10,6 @@
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.Data.OpenIdConnect;
-using Metabase.Extensions;
 using Metabase.GraphQl.Components;
 using Metabase.GraphQl.DataFormats;
 using Metabase.GraphQl.Entities;
@@ -21,7 +20,7 @@
 namespace Metabase.GraphQl.Institutions;
 
 public sealed class InstitutionType
-    : EntityType<Institution, InstitutionByIdDataLoader>
+    : EntityType<Institution, IInstitutionByIdDataLoader>
 {
     protected override void Configure(
         IObjectTypeDescriptor<Institution> descriptor
@@ -31,20 +30,26 @@ IObjectTypeDescriptor<Institution> descriptor
         descriptor
             .Field(t => t.DevelopedMethods)
             .Type<NonNullType<ObjectType<InstitutionDevelopedMethodConnection>>>()
+            .AddPagingArguments()
             .UseFiltering<InstitutionDevelopedMethodFilterType>()
+            .UseSorting<InstitutionDevelopedMethodSortType>()
             .Resolve(context =>
                 new InstitutionDevelopedMethodConnection(
                     context.Parent<Institution>(),
+                    context.GetPagingArguments(),
                     context.GetQueryContext<InstitutionMethodDeveloper>()
                 )
             );
         descriptor
             .Field($"{GraphQlConstants.PendingPrefix}{nameof(Institution.DevelopedMethods)}")
             .Type<NonNullType<ObjectType<PendingInstitutionDevelopedMethodConnection>>>()
+            .AddPagingArguments()
             .UseFiltering<InstitutionDevelopedMethodFilterType>()
+            .UseSorting<InstitutionDevelopedMethodSortType>()
             .Resolve(context =>
                 new PendingInstitutionDevelopedMethodConnection(
                     context.Parent<Institution>(),
+                    context.GetPagingArguments(),
                     context.GetQueryContext<InstitutionMethodDeveloper>()
                 )
             );
@@ -54,20 +59,26 @@ IObjectTypeDescriptor<Institution> descriptor
         descriptor
             .Field(t => t.ManufacturedComponents)
             .Type<NonNullType<ObjectType<InstitutionManufacturedComponentConnection>>>()
+            .AddPagingArguments()
             .UseFiltering<InstitutionManufacturedComponentFilterType>()
+            .UseSorting<InstitutionManufacturedComponentSortType>()
             .Resolve(context =>
                 new InstitutionManufacturedComponentConnection(
                     context.Parent<Institution>(),
+                    context.GetPagingArguments(),
                     context.GetQueryContext<ComponentManufacturer>()
                 )
             );
         descriptor
             .Field($"{GraphQlConstants.PendingPrefix}{nameof(Institution.ManufacturedComponents)}")
             .Type<NonNullType<ObjectType<PendingInstitutionManufacturedComponentConnection>>>()
+            .AddPagingArguments()
             .UseFiltering<InstitutionManufacturedComponentFilterType>()
+            .UseSorting<InstitutionManufacturedComponentSortType>()
             .Resolve(context =>
                 new PendingInstitutionManufacturedComponentConnection(
                     context.Parent<Institution>(),
+                    context.GetPagingArguments(),
                     context.GetQueryContext<ComponentManufacturer>()
                 )
             );
@@ -77,40 +88,52 @@ IObjectTypeDescriptor<Institution> descriptor
         descriptor
             .Field(t => t.ManagedComponents)
             .Type<NonNullType<ObjectType<InstitutionManagedComponentConnection>>>()
+            .AddPagingArguments()
             .UseFiltering<InstitutionManagedComponentFilterType>()
+            .UseSorting<InstitutionManagedComponentSortType>()
             .Resolve(context =>
                 new InstitutionManagedComponentConnection(
                     context.Parent<Institution>(),
+                    context.GetPagingArguments(),
                     context.GetQueryContext<Component>()
                 )
             );
         descriptor
             .Field(t => t.ManagedDataFormats)
             .Type<NonNullType<ObjectType<InstitutionManagedDataFormatConnection>>>()
+            .AddPagingArguments()
             .UseFiltering<InstitutionManagedDataFormatFilterType>()
+            .UseSorting<InstitutionManagedDataFormatSortType>()
             .Resolve(context =>
                 new InstitutionManagedDataFormatConnection(
                     context.Parent<Institution>(),
+                    context.GetPagingArguments(),
                     context.GetQueryContext<DataFormat>()
                 )
             );
         descriptor
             .Field(t => t.ManagedInstitutions)
             .Type<NonNullType<ObjectType<InstitutionManagedInstitutionConnection>>>()
+            .AddPagingArguments()
             .UseFiltering<InstitutionManagedInstitutionFilterType>()
+            .UseSorting<InstitutionManagedInstitutionSortType>()
             .Resolve(context =>
                 new InstitutionManagedInstitutionConnection(
                     context.Parent<Institution>(),
+                    context.GetPagingArguments(),
                     context.GetQueryContext<Institution>()
                 )
             );
         descriptor
             .Field(t => t.ManagedMethods)
             .Type<NonNullType<ObjectType<InstitutionManagedMethodConnection>>>()
+            .AddPagingArguments()
             .UseFiltering<InstitutionManagedMethodFilterType>()
+            .UseSorting<InstitutionManagedMethodSortType>()
             .Resolve(context =>
                 new InstitutionManagedMethodConnection(
                     context.Parent<Institution>(),
+                    context.GetPagingArguments(),
                     context.GetQueryContext<Method>()
                 )
             );
@@ -132,6 +155,7 @@ IObjectTypeDescriptor<Institution> descriptor
             .Field(t => t.OperatedDatabases)
             .Type<NonNullType<ObjectType<InstitutionOperatedDatabaseConnection>>>()
             .UseFiltering<InstitutionOperatedDatabaseFilterType>()
+            .UseSorting<InstitutionOperatedDatabaseSortType>()
             .Resolve(context =>
                 new InstitutionOperatedDatabaseConnection(
                     context.Parent<Institution>(),
@@ -141,9 +165,8 @@ IObjectTypeDescriptor<Institution> descriptor
         descriptor
             .Field(t => t.Representatives)
             .Type<NonNullType<ObjectType<InstitutionRepresentativeConnection>>>()
-            // .UseProjection<InstitutionRepresentative>()
             .UseFiltering<InstitutionRepresentativeFilterType>()
-            // .UseSorting<InstitutionRepresentativeSortType>()
+            .UseSorting<InstitutionRepresentativeSortType>()
             .Resolve(context =>
                 new InstitutionRepresentativeConnection(
                     context.Parent<Institution>(),
@@ -154,9 +177,8 @@ IObjectTypeDescriptor<Institution> descriptor
             .Field($"{GraphQlConstants.PendingPrefix}{nameof(Institution.Representatives)}")
             .Type<ObjectType<PendingInstitutionRepresentativeConnection>>()
             .Authorize(AuthorizationPolicies.ManageInstitutionRepresentativeScopePolicy)
-            // .UseProjection<InstitutionRepresentative>()
             .UseFiltering<InstitutionRepresentativeFilterType>()
-            // .UseSorting<InstitutionRepresentativeSortType>()
+            .UseSorting<InstitutionRepresentativeSortType>()
             .Resolve(context =>
                 new PendingInstitutionRepresentativeConnection(
                     context.Parent<Institution>(),
@@ -170,6 +192,7 @@ IObjectTypeDescriptor<Institution> descriptor
             .Field(t => t.OpenIdConnectApplications)
             .Type<NonNullType<ObjectType<InstitutionOwnedOpenIdConnectApplicationConnection>>>()
             .UseFiltering<InstitutionOwnedOpenIdConnectApplicationFilterType>()
+            .UseSorting<InstitutionOwnedOpenIdConnectApplicationSortType>()
             .Resolve(context =>
                 new InstitutionOwnedOpenIdConnectApplicationConnection(
                     context.Parent<Institution>(),
@@ -180,6 +203,7 @@ IObjectTypeDescriptor<Institution> descriptor
             .Field(t => t.GnuPgKeyFingerprints)
             .Type<NonNullType<ObjectType<InstitutionGnuPgKeyFingerprintConnection>>>()
             .UseFiltering<InstitutionGnuPgKeyFingerprintFilterType>()
+            .UseSorting<InstitutionGnuPgKeyFingerprintSortType>()
             .Resolve(context =>
                 new InstitutionGnuPgKeyFingerprintConnection(
                     context.Parent<Institution>(),
@@ -189,25 +213,30 @@ IObjectTypeDescriptor<Institution> descriptor
         descriptor
             .Field("has" + nameof(GnuPgKeyFingerprint))
             .UseFiltering<InstitutionGnuPgKeyFingerprintFilterType>()
+            .UseSorting<InstitutionGnuPgKeyFingerprintSortType>()
             .ResolveWith<InstitutionResolvers>(x =>
                 InstitutionResolvers.HasGnuPgKeyFingerprintsAsync(default!, default!, default!, default!));
         descriptor
             .Field("isAuthorizedToUpdateNode")
+            .Cost(1)
             .ResolveWith<InstitutionResolvers>(x =>
                 InstitutionResolvers.IsAuthorizedToUpdateNodeAsync(default!, default!, default!, default!))
             .UseUserManager();
         descriptor
             .Field("isAuthorizedToVerifyNode")
+            .Cost(1)
             .ResolveWith<InstitutionResolvers>(x =>
                 InstitutionResolvers.IsAuthorizedToVerifyNodeAsync(default!, default!, default!, default!))
             .UseUserManager();
         descriptor
             .Field("isAuthorizedToDeleteNode")
+            .Cost(1)
             .ResolveWith<InstitutionResolvers>(x =>
                 InstitutionResolvers.IsAuthorizedToDeleteNodeAsync(default!, default!, default!, default!))
             .UseUserManager();
         descriptor
             .Field("isAuthorizedToSwitchOperatingStateOfNode")
+            .Cost(1)
             .ResolveWith<InstitutionResolvers>(x =>
                 InstitutionResolvers.IsAuthorizedToSwitchOperatingStateOfNodeAsync(default!, default!, default!, default!))
             .UseUserManager();
@@ -267,5 +296,35 @@ CancellationToken cancellationToken
         {
             return authorization.IsAuthorizedToSwitchInstitutionOperatingState(claimsPrincipal, institution.Id, cancellationToken);
         }
+
+        // internal static Task<Connection<Component>> GetManufacturedComponentsAsync(
+        //     [Parent] Component component,
+        //     IInstitutionManufactureredComponentsByInstitutionIdDataLoader dataLoader,
+        //     IComponentByIdDataLoader nodeById,
+        //     ApplicationDbContext databaseContext,
+        //     PagingArguments pagingArguments,
+        //     QueryContext<ComponentManufacturer> queryContext,
+        //     QueryContext<Component> nodeQueryContext,
+        //     CancellationToken cancellationToken
+        // )
+        // {
+        //     return dataLoader
+        //         .With(pagingArguments, queryContext)
+        //         .LoadAsync(institution.Id, cancellationToken)
+        //         .ToConnectionAsync<ComponentManufacturer, Component>(
+        //             async (page, entry) =>
+        //             {
+        //                 return new InstitutionManufactureredComponentEdge(
+        //                     entry.Item,
+        //                     await nodeById
+        //                         .With(nodeQueryContext)
+        //                         .LoadAsync(entry.Item.ComponentId, cancellationToken),
+        //                     page.CreateCursor(entry)
+        //                 );
+        //             },
+        //             (edges, pageInfo, totalCount) =>
+        //                 new InstitutionManufacturedComponentConnection(institution, edges, pageInfo, totalCount)
+        //         );
+        // }
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/PendingInstitutionDevelopedMethodsByInstitutionIdDataLoader.cs b/backend/src/GraphQl/Institutions/PendingInstitutionDevelopedMethodsByInstitutionIdDataLoader.cs
deleted file mode 100644
index f8950a6f4..000000000
--- a/backend/src/GraphQl/Institutions/PendingInstitutionDevelopedMethodsByInstitutionIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Institutions;
-
-public sealed class PendingInstitutionDevelopedMethodsByInstitutionIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<InstitutionMethodDeveloper>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.InstitutionMethodDevelopers.AsNoTracking().Where(x =>
-                    x.Pending && ids.Contains(x.InstitutionId)
-                ).With(queryContext),
-        x => x.InstitutionId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/PendingInstitutionManufacturedComponentsByInstitutionIdDataLoader.cs b/backend/src/GraphQl/Institutions/PendingInstitutionManufacturedComponentsByInstitutionIdDataLoader.cs
deleted file mode 100644
index 5e4308822..000000000
--- a/backend/src/GraphQl/Institutions/PendingInstitutionManufacturedComponentsByInstitutionIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Institutions;
-
-public sealed class PendingInstitutionManufacturedComponentsByInstitutionIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<ComponentManufacturer>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.ComponentManufacturers.AsNoTracking().Where(x =>
-                    x.Pending && ids.Contains(x.InstitutionId)
-                ).With(queryContext),
-        x => x.InstitutionId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/PendingInstitutionRepresentativesByInstitutionIdDataLoader.cs b/backend/src/GraphQl/Institutions/PendingInstitutionRepresentativesByInstitutionIdDataLoader.cs
deleted file mode 100644
index 0a25ebc59..000000000
--- a/backend/src/GraphQl/Institutions/PendingInstitutionRepresentativesByInstitutionIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Institutions;
-
-public sealed class PendingInstitutionRepresentativesByInstitutionIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<InstitutionRepresentative>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.InstitutionRepresentatives.AsNoTracking().Where(x =>
-                    x.Pending && ids.Contains(x.InstitutionId)
-                ).With(queryContext),
-        x => x.InstitutionId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/LifeCycleDataX/LifeCycleData.cs b/backend/src/GraphQl/LifeCycleDataX/LifeCycleData.cs
new file mode 100644
index 000000000..da1e39134
--- /dev/null
+++ b/backend/src/GraphQl/LifeCycleDataX/LifeCycleData.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.Resolvers;
+using HotChocolate.Types.Relay;
+using Metabase.Data;
+using Metabase.GraphQl.DataX;
+using Metabase.GraphQl.Requests;
+using NodaTime;
+
+namespace Metabase.GraphQl.LifeCycleDataX;
+
+[Node(IdField = nameof(Id))]
+public sealed record LifeCycleData(
+    string Id,
+    Guid Uuid,
+    OffsetDateTime Timestamp,
+    string Locale,
+    Guid DatabaseId,
+    Guid ComponentId,
+    string? Name,
+    string? Description,
+    IReadOnlyList<string> Warnings,
+    Guid CreatorId,
+    OffsetDateTime CreatedAt,
+    AppliedMethod AppliedMethod,
+    IReadOnlyList<GetHttpsResource> Resources,
+    GetHttpsResourceTree ResourceTree,
+    IReadOnlyList<DataApproval> Approvals
+// ResponseApproval Approval
+)
+: DataX.Data(
+    Id,
+    Uuid,
+    Timestamp,
+    Locale,
+    DatabaseId,
+    ComponentId,
+    Name,
+    Description,
+    Warnings,
+    CreatorId,
+    CreatedAt,
+    AppliedMethod,
+    Resources,
+    ResourceTree,
+    Approvals
+)
+{
+    public override DataKind Kind { get => DataKind.LIFE_CYCLE_DATA; }
+
+    [NodeResolver]
+    public static Task<LifeCycleData?> GetAsync(
+        string id,
+        DataQueries dataQueries,
+        ApplicationDbContext databaseContext,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return DataX.Data.FetchNodeAsync<LifeCycleData>(
+            id,
+            (database, uuid, locale) => dataQueries.GetLifeCycleDataAsync(
+                database,
+                uuid,
+                locale,
+                resolverContext,
+                cancellationToken
+            ),
+            databaseContext,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/LifeCycleDataConnection.cs b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataConnection.cs
similarity index 80%
rename from backend/src/GraphQl/DataX/LifeCycleDataConnection.cs
rename to backend/src/GraphQl/LifeCycleDataX/LifeCycleDataConnection.cs
index 77f77a724..91828fb9e 100644
--- a/backend/src/GraphQl/DataX/LifeCycleDataConnection.cs
+++ b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataConnection.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using HotChocolate.Types.Pagination;
+using Metabase.GraphQl.DataX;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.LifeCycleDataX;
 
 public sealed record LifeCycleDataConnection(
     IReadOnlyList<LifeCycleDataEdge> Edges,
diff --git a/backend/src/GraphQl/DataX/LifeCycleDataEdge.cs b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataEdge.cs
similarity index 65%
rename from backend/src/GraphQl/DataX/LifeCycleDataEdge.cs
rename to backend/src/GraphQl/LifeCycleDataX/LifeCycleDataEdge.cs
index 6118ae4cf..40da02411 100644
--- a/backend/src/GraphQl/DataX/LifeCycleDataEdge.cs
+++ b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataEdge.cs
@@ -1,4 +1,6 @@
-namespace Metabase.GraphQl.DataX;
+using Metabase.GraphQl.DataX;
+
+namespace Metabase.GraphQl.LifeCycleDataX;
 
 public sealed record LifeCycleDataEdge(
     string Cursor,
diff --git a/backend/src/GraphQl/DataX/LifeCycleDataPropositionInput.cs b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataPropositionInput.cs
similarity index 81%
rename from backend/src/GraphQl/DataX/LifeCycleDataPropositionInput.cs
rename to backend/src/GraphQl/LifeCycleDataX/LifeCycleDataPropositionInput.cs
index fa000e806..66c6d0292 100644
--- a/backend/src/GraphQl/DataX/LifeCycleDataPropositionInput.cs
+++ b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataPropositionInput.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using Metabase.GraphQl.DataX;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.LifeCycleDataX;
 
 public sealed record LifeCycleDataPropositionInput(
     UuidPropositionInput? ComponentId,
diff --git a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs
new file mode 100644
index 000000000..411e60af1
--- /dev/null
+++ b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.Resolvers;
+using HotChocolate.Types;
+using Metabase.Data;
+using Metabase.GraphQl.Requests;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.LifeCycleDataX;
+
+[ExtendObjectType(nameof(Query))]
+public sealed class LifeCycleDataQueries
+{
+    public async Task<LifeCycleData?> GetLifeCycleDataAsync(
+        Guid databaseId,
+        Guid id,
+        string? locale,
+        DataQueries dataQueries,
+        ApplicationDbContext databaseContext,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        var database = await databaseContext.Databases.AsNoTracking()
+            .Where(_ => _.Id == databaseId)
+            .SingleOrDefaultAsync(cancellationToken);
+        if (database is null)
+        {
+            return null;
+        }
+        return await dataQueries.GetLifeCycleDataAsync(
+            database,
+            id,
+            locale,
+            resolverContext,
+            cancellationToken
+        );
+    }
+
+    public Task<LifeCycleDataConnection> GetAllLifeCycleDataAsync(
+        LifeCycleDataPropositionInput? where,
+        string? locale,
+        uint? first,
+        string? after,
+        uint? last,
+        string? before,
+        DataQueries dataQueries,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return dataQueries.GetAllDataAsync<LifeCycleDataConnection, LifeCycleDataEdge, LifeCycleData>(
+            first,
+            after,
+            last,
+            before,
+            (edges, totalCount, pageInfo) => new LifeCycleDataConnection(edges, totalCount, pageInfo),
+            (node, cursor) => new LifeCycleDataEdge(cursor, node),
+            (database, first, after, last, before) => dataQueries.GetAllLifeCycleDataAsync(
+                database,
+                where,
+                locale,
+                first,
+                after,
+                last,
+                before,
+                resolverContext,
+                cancellationToken
+            ),
+            cancellationToken
+        );
+    }
+
+    public Task<bool> HasLifeCycleDataAsync(
+        LifeCycleDataPropositionInput? where,
+        string? locale,
+        DataQueries dataQueries,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return dataQueries.HasDataAsync(
+            (database) => dataQueries.HasLifeCycleDataAsync(
+                database,
+                where,
+                locale,
+                resolverContext,
+                cancellationToken
+            ),
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Methods/InstitutionMethodDeveloperEdge.cs b/backend/src/GraphQl/Methods/InstitutionMethodDeveloperEdge.cs
index 31a1b3f86..981655308 100644
--- a/backend/src/GraphQl/Methods/InstitutionMethodDeveloperEdge.cs
+++ b/backend/src/GraphQl/Methods/InstitutionMethodDeveloperEdge.cs
@@ -1,22 +1,21 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Institutions;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Methods;
 
 public sealed class InstitutionMethodDeveloperEdge(
     InstitutionMethodDeveloper association
     )
-        : Edge<Institution, InstitutionByIdDataLoader>(association.InstitutionId)
+        : Edge<Institution, IInstitutionByIdDataLoader>(association.InstitutionId)
 {
-    private readonly InstitutionMethodDeveloper _association = association;
-
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToConfirmEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         InstitutionMethodDeveloperAuthorization authorization,
@@ -25,12 +24,13 @@ CancellationToken cancellationToken
     {
         return authorization.IsAuthorizedToConfirm(
             claimsPrincipal,
-            _association.InstitutionId,
+            association.InstitutionId,
             cancellationToken
         );
     }
 
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToRemoveEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         InstitutionMethodDeveloperAuthorization authorization,
@@ -39,7 +39,7 @@ CancellationToken cancellationToken
     {
         return authorization.IsAuthorizedToRemove(
             claimsPrincipal,
-            _association.MethodId,
+            association.MethodId,
             cancellationToken
         );
     }
diff --git a/backend/src/GraphQl/Methods/InstitutionMethodDevelopersByMethodIdDataLoader.cs b/backend/src/GraphQl/Methods/InstitutionMethodDevelopersByMethodIdDataLoader.cs
deleted file mode 100644
index 44ead8520..000000000
--- a/backend/src/GraphQl/Methods/InstitutionMethodDevelopersByMethodIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Methods;
-
-public sealed class InstitutionMethodDevelopersByMethodIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<InstitutionMethodDeveloper>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.InstitutionMethodDevelopers.AsNoTracking().Where(x =>
-                    !x.Pending && ids.Contains(x.MethodId)
-                ).With(queryContext),
-        x => x.MethodId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Methods/MethodByIdDataLoader.cs b/backend/src/GraphQl/Methods/MethodByIdDataLoader.cs
deleted file mode 100644
index fadf0f93d..000000000
--- a/backend/src/GraphQl/Methods/MethodByIdDataLoader.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Methods;
-
-public sealed class MethodByIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : EntityByIdDataLoader<Method>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        dbContext => dbContext.Methods
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Methods/MethodDataLoaders.cs b/backend/src/GraphQl/Methods/MethodDataLoaders.cs
new file mode 100644
index 000000000..183eb4026
--- /dev/null
+++ b/backend/src/GraphQl/Methods/MethodDataLoaders.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut;
+using GreenDonut.Data;
+using Metabase.Data;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.Methods;
+
+public sealed class MethodDataLoaders
+: DataLoaders
+{
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Method>> GetMethodByIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<Method> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetEntityByIdAsync(
+            ids,
+            databaseContext => databaseContext.Methods,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, InstitutionMethodDeveloper[]>> GetInstitutionMethodDevelopersByMethodIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<InstitutionMethodDeveloper> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.InstitutionMethodDevelopers.Where(_ => !_.Pending),
+            _ => _.MethodId,
+            _ => _.InstitutionId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, InstitutionMethodDeveloper[]>> GetPendingInstitutionMethodDevelopersByMethodIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<InstitutionMethodDeveloper> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.InstitutionMethodDevelopers.Where(_ => _.Pending),
+            _ => _.MethodId,
+            _ => _.InstitutionId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, UserMethodDeveloper[]>> GetUserMethodDevelopersByMethodIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<UserMethodDeveloper> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.UserMethodDevelopers.Where(_ => !_.Pending),
+            _ => _.MethodId,
+            _ => _.UserId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, UserMethodDeveloper[]>> GetPendingUserMethodDevelopersByMethodIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<UserMethodDeveloper> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.UserMethodDevelopers.Where(_ => _.Pending),
+            _ => _.MethodId,
+            _ => _.UserId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Methods/MethodDeveloperConnection.cs b/backend/src/GraphQl/Methods/MethodDeveloperConnection.cs
index e19d50d30..495e3c4ea 100644
--- a/backend/src/GraphQl/Methods/MethodDeveloperConnection.cs
+++ b/backend/src/GraphQl/Methods/MethodDeveloperConnection.cs
@@ -8,6 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
@@ -20,8 +21,8 @@ QueryContext<IMethodDeveloper> queryContext
     )
 {
     public async Task<uint> GetTotalCountAsync(
-        InstitutionMethodDevelopersByMethodIdDataLoader institutionMethodDevelopersDataLoader,
-        UserMethodDevelopersByMethodIdDataLoader userMethodDevelopersDataLoader,
+        IInstitutionMethodDevelopersByMethodIdDataLoader institutionMethodDevelopersDataLoader,
+        IUserMethodDevelopersByMethodIdDataLoader userMethodDevelopersDataLoader,
         CancellationToken cancellationToken
     )
     {
@@ -45,8 +46,8 @@ CancellationToken cancellationToken
     }
 
     public async IAsyncEnumerable<MethodDeveloperEdge> GetEdgesAsync(
-        InstitutionMethodDevelopersByMethodIdDataLoader institutionMethodDevelopersDataLoader,
-        UserMethodDevelopersByMethodIdDataLoader userMethodDevelopersDataLoader,
+        IInstitutionMethodDevelopersByMethodIdDataLoader institutionMethodDevelopersDataLoader,
+        IUserMethodDevelopersByMethodIdDataLoader userMethodDevelopersDataLoader,
         [EnumeratorCancellation] CancellationToken cancellationToken
     )
     {
@@ -77,6 +78,7 @@ [EnumeratorCancellation] CancellationToken cancellationToken
     }
 
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddInstitutionEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         InstitutionMethodDeveloperAuthorization authorization,
@@ -91,6 +93,7 @@ CancellationToken cancellationToken
     }
 
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddUserEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         InstitutionMethodDeveloperAuthorization authorization,
@@ -109,7 +112,7 @@ internal sealed class InstitutionMethodDeveloperConnection(
     Method subject,
     QueryContext<InstitutionMethodDeveloper> queryContext
     )
-        : Connection<Method, InstitutionMethodDeveloper, InstitutionMethodDevelopersByMethodIdDataLoader, InstitutionMethodDeveloperEdge>(
+        : Connection<Method, InstitutionMethodDeveloper, InstitutionMethodDeveloperEdge, IInstitutionMethodDevelopersByMethodIdDataLoader>(
         subject,
         x => new InstitutionMethodDeveloperEdge(x),
         queryContext
@@ -121,7 +124,7 @@ internal sealed class UserMethodDeveloperConnection(
     Method subject,
     QueryContext<UserMethodDeveloper> queryContext
     )
-        : Connection<Method, UserMethodDeveloper, UserMethodDevelopersByMethodIdDataLoader, UserMethodDeveloperEdge>(
+        : Connection<Method, UserMethodDeveloper, UserMethodDeveloperEdge, IUserMethodDevelopersByMethodIdDataLoader>(
         subject,
         x => new UserMethodDeveloperEdge(x),
         queryContext
@@ -135,8 +138,8 @@ QueryContext<IMethodDeveloper> queryContext
     )
 {
     public async Task<uint> GetTotalCountAsync(
-        PendingInstitutionMethodDevelopersByMethodIdDataLoader pendingInstitutionMethodDevelopersDataLoader,
-        PendingUserMethodDevelopersByMethodIdDataLoader pendingUserMethodDevelopersDataLoader,
+        IPendingInstitutionMethodDevelopersByMethodIdDataLoader pendingInstitutionMethodDevelopersDataLoader,
+        IPendingUserMethodDevelopersByMethodIdDataLoader pendingUserMethodDevelopersDataLoader,
         CancellationToken cancellationToken
     )
     {
@@ -160,8 +163,8 @@ CancellationToken cancellationToken
     }
 
     public async IAsyncEnumerable<MethodDeveloperEdge> GetEdgesAsync(
-        PendingInstitutionMethodDevelopersByMethodIdDataLoader pendingInstitutionMethodDevelopersDataLoader,
-        PendingUserMethodDevelopersByMethodIdDataLoader pendingUserMethodDevelopersDataLoader,
+        IPendingInstitutionMethodDevelopersByMethodIdDataLoader pendingInstitutionMethodDevelopersDataLoader,
+        IPendingUserMethodDevelopersByMethodIdDataLoader pendingUserMethodDevelopersDataLoader,
         [EnumeratorCancellation] CancellationToken cancellationToken
     )
     {
@@ -192,6 +195,7 @@ [EnumeratorCancellation] CancellationToken cancellationToken
     }
 
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddInstitutionEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         InstitutionMethodDeveloperAuthorization authorization,
@@ -206,6 +210,7 @@ CancellationToken cancellationToken
     }
 
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToAddUserEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         InstitutionMethodDeveloperAuthorization authorization,
@@ -224,7 +229,7 @@ internal sealed class PendingInstitutionMethodDeveloperConnection(
     Method subject,
     QueryContext<InstitutionMethodDeveloper> queryContext
     )
-        : AuthorizedConnection<Method, InstitutionMethodDeveloper, PendingInstitutionMethodDevelopersByMethodIdDataLoader, InstitutionMethodDeveloperEdge, InstitutionMethodDeveloperAuthorization>(
+        : AuthorizedConnection<Method, InstitutionMethodDeveloper, InstitutionMethodDeveloperEdge, IPendingInstitutionMethodDevelopersByMethodIdDataLoader, InstitutionMethodDeveloperAuthorization>(
         subject,
         x => new InstitutionMethodDeveloperEdge(x),
         (claimsPrincipal, method, authorization, cancellationToken) =>
@@ -238,7 +243,7 @@ internal sealed class PendingUserMethodDeveloperConnection(
     Method subject,
     QueryContext<UserMethodDeveloper> queryContext
     )
-        : AuthorizedConnection<Method, UserMethodDeveloper, PendingUserMethodDevelopersByMethodIdDataLoader, UserMethodDeveloperEdge, UserMethodDeveloperAuthorization>(
+        : AuthorizedConnection<Method, UserMethodDeveloper, UserMethodDeveloperEdge, IPendingUserMethodDevelopersByMethodIdDataLoader, UserMethodDeveloperAuthorization>(
         subject,
         x => new UserMethodDeveloperEdge(x),
         (claimsPrincipal, method, authorization, cancellationToken) =>
diff --git a/backend/src/GraphQl/Methods/MethodDeveloperEdge.cs b/backend/src/GraphQl/Methods/MethodDeveloperEdge.cs
index 42f7e3aaa..72ea646f5 100644
--- a/backend/src/GraphQl/Methods/MethodDeveloperEdge.cs
+++ b/backend/src/GraphQl/Methods/MethodDeveloperEdge.cs
@@ -2,6 +2,7 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Institutions;
@@ -28,8 +29,9 @@ UserMethodDeveloperEdge edge
         _userMethodDeveloperEdge = edge;
     }
 
+    [Cost(0)]
     public async Task<IStakeholder> GetNodeAsync(
-        InstitutionByIdDataLoader institutionById,
+        IInstitutionByIdDataLoader institutionById,
         UserByIdDataLoader userById,
         CancellationToken cancellationToken
     )
@@ -46,6 +48,7 @@ CancellationToken cancellationToken
     }
 
     [UseUserManager]
+    [Cost(1)]
     public async Task<bool> IsAuthorizedToConfirmEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         InstitutionMethodDeveloperAuthorization institutionMethodDeveloperAuthorization,
@@ -65,6 +68,7 @@ CancellationToken cancellationToken
     }
 
     [UseUserManager]
+    [Cost(1)]
     public async Task<bool> IsAuthorizedToRemoveEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         InstitutionMethodDeveloperAuthorization institutionMethodDeveloperAuthorization,
diff --git a/backend/src/GraphQl/Methods/MethodDeveloperFilterType.cs b/backend/src/GraphQl/Methods/MethodDeveloperFilterType.cs
index ccc24a309..0c1d39490 100644
--- a/backend/src/GraphQl/Methods/MethodDeveloperFilterType.cs
+++ b/backend/src/GraphQl/Methods/MethodDeveloperFilterType.cs
@@ -1,16 +1,21 @@
 using HotChocolate.Data.Filters;
 using Metabase.Data;
+using Metabase.GraphQl.Associations;
 
 namespace Metabase.GraphQl.Methods;
 
 public sealed class MethodDeveloperFilterType
-    : FilterInputType<IMethodDeveloper>
+    : AuditableAssociationFilterType<IMethodDeveloper>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<IMethodDeveloper> descriptor
     )
     {
-        descriptor.BindFieldsExplicitly();
+        base.Configure(descriptor);
+        descriptor.Name(nameof(MethodDeveloperFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
+        // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         // Disjunctively compose the filters following filters taking into
         // account the "lifting" done in `MethodDeveloperConnection`.
         // descriptor
diff --git a/backend/src/GraphQl/Methods/MethodDeveloperSortType.cs b/backend/src/GraphQl/Methods/MethodDeveloperSortType.cs
new file mode 100644
index 000000000..e600f2d88
--- /dev/null
+++ b/backend/src/GraphQl/Methods/MethodDeveloperSortType.cs
@@ -0,0 +1,25 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+using Metabase.GraphQl.Associations;
+
+namespace Metabase.GraphQl.Methods;
+
+public sealed class MethodDeveloperSortType
+    : AuditableAssociationSortType<IMethodDeveloper>
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<IMethodDeveloper> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(MethodDeveloperSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+        // Disjunctively compose the sort following sort taking into
+        // account the "lifting" done in `MethodDeveloperConnection`.
+        // descriptor
+        //     .Field(nameof(InstitutionMethodDeveloper.Institution))
+        //     .Type<InstitutionSortType>();
+        // descriptor
+        //     .Field(nameof(UserMethodDeveloper.User))
+        //     .Type<UserSortType>();
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Methods/MethodFilterType.cs b/backend/src/GraphQl/Methods/MethodFilterType.cs
index efe31dcba..c24e584da 100644
--- a/backend/src/GraphQl/Methods/MethodFilterType.cs
+++ b/backend/src/GraphQl/Methods/MethodFilterType.cs
@@ -5,13 +5,17 @@
 namespace Metabase.GraphQl.Methods;
 
 public class MethodFilterType
-    : EntityFilterType<Method>
+    : AuditableEntityFilterType<Method>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<Method> descriptor
     )
     {
         base.Configure(descriptor);
+        // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.Id);
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         descriptor.Field(x => x.Name);
         descriptor.Field(x => x.Description);
         descriptor.Field(x => x.CalculationLocator);
diff --git a/backend/src/GraphQl/Methods/MethodManagerEdge.cs b/backend/src/GraphQl/Methods/MethodManagerEdge.cs
index e66a458bd..7e9febb58 100644
--- a/backend/src/GraphQl/Methods/MethodManagerEdge.cs
+++ b/backend/src/GraphQl/Methods/MethodManagerEdge.cs
@@ -6,6 +6,6 @@ namespace Metabase.GraphQl.Methods;
 public sealed class MethodManagerEdge(
     Method association
     )
-        : Edge<Institution, InstitutionByIdDataLoader>(association.ManagerId)
+        : Edge<Institution, IInstitutionByIdDataLoader>(association.ManagerId)
 {
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Methods/MethodQueries.cs b/backend/src/GraphQl/Methods/MethodQueries.cs
index db41e543d..0f22c3e4e 100644
--- a/backend/src/GraphQl/Methods/MethodQueries.cs
+++ b/backend/src/GraphQl/Methods/MethodQueries.cs
@@ -2,8 +2,10 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using GreenDonut.Data;
 using HotChocolate.Data;
 using HotChocolate.Data.Sorting;
+using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
 using Metabase.GraphQl.Extensions;
@@ -15,27 +17,27 @@ namespace Metabase.GraphQl.Methods;
 public sealed class MethodQueries
 {
     [UsePaging]
-    // [UseProjection] // We disabled projections because when requesting `id` all results had the same `id` and when also requesting `uuid`, the latter was always the empty UUID `000...`.
     [UseFiltering<MethodFilterType>]
     [UseSorting<MethodSortType>]
-    public IQueryable<Method> GetMethods(
-        ApplicationDbContext context,
-        ISortingContext sorting
+    public ValueTask<HotChocolate.Types.Pagination.Connection<Method>> GetMethodsAsync(
+        IResolverContext resolverContext,
+        ApplicationDbContext databaseContext,
+        CancellationToken cancellationToken
     )
     {
-        sorting.StabilizeOrder<Method>();
-        return context.Methods.AsNoTracking();
+        return databaseContext.Methods
+            .AsNoTracking()
+            .With(resolverContext.GetQueryContext<Method>(), Sorting.DefaultEntityOrder)
+            .ToPageAsync(resolverContext.GetPagingArguments(), cancellationToken)
+            .ToConnectionAsync();
     }
 
     public Task<Method?> GetMethodAsync(
         Guid id,
-        MethodByIdDataLoader methodById,
+        IMethodByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
-        return methodById.LoadAsync(
-            id,
-            cancellationToken
-        );
+        return byId.LoadAsync(id, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Methods/MethodSortType.cs b/backend/src/GraphQl/Methods/MethodSortType.cs
index 1c725d4d6..ba43b3c84 100644
--- a/backend/src/GraphQl/Methods/MethodSortType.cs
+++ b/backend/src/GraphQl/Methods/MethodSortType.cs
@@ -4,8 +4,8 @@
 
 namespace Metabase.GraphQl.Methods;
 
-public sealed class MethodSortType
-    : EntitySortType<Method>
+public class MethodSortType
+    : AuditableEntitySortType<Method>
 {
     protected override void Configure(
         ISortInputTypeDescriptor<Method> descriptor
@@ -15,6 +15,5 @@ ISortInputTypeDescriptor<Method> descriptor
         descriptor.Field(x => x.Name);
         descriptor.Field(x => x.Description);
         descriptor.Field(x => x.CalculationLocator);
-        descriptor.Field(x => x.Manager);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Methods/MethodType.cs b/backend/src/GraphQl/Methods/MethodType.cs
index 8f3793e29..cafb8952d 100644
--- a/backend/src/GraphQl/Methods/MethodType.cs
+++ b/backend/src/GraphQl/Methods/MethodType.cs
@@ -14,7 +14,7 @@
 namespace Metabase.GraphQl.Methods;
 
 public sealed class MethodType
-    : EntityType<Method, MethodByIdDataLoader>
+    : EntityType<Method, IMethodByIdDataLoader>
 {
     protected override void Configure(
         IObjectTypeDescriptor<Method> descriptor
@@ -24,6 +24,7 @@ IObjectTypeDescriptor<Method> descriptor
         descriptor
             .Field(t => t.Reference)
             .Type<ReferenceType>()
+            .Cost(0)
             .Resolve(context => context
                 .Parent<Method>()
                 .Reference?
@@ -44,6 +45,7 @@ IObjectTypeDescriptor<Method> descriptor
             .Field(t => t.Developers)
             .Type<NonNullType<ObjectType<MethodDeveloperConnection>>>()
             .UseFiltering<MethodDeveloperFilterType>()
+            .UseSorting<MethodDeveloperSortType>()
             .Resolve(context =>
                 new MethodDeveloperConnection(
                     context.Parent<Method>(),
@@ -55,6 +57,7 @@ IObjectTypeDescriptor<Method> descriptor
             .Type<ObjectType<PendingMethodDeveloperConnection>>()
             .Authorize(AuthorizationPolicies.WriteScopePolicy)
             .UseFiltering<MethodDeveloperFilterType>()
+            .UseSorting<MethodDeveloperSortType>()
             .Resolve(context =>
                 new PendingMethodDeveloperConnection(
                     context.Parent<Method>(),
@@ -75,6 +78,7 @@ IObjectTypeDescriptor<Method> descriptor
             .Ignore();
         descriptor
             .Field("isAuthorizedToUpdateNode")
+            .Cost(1)
             .ResolveWith<MethodResolvers>(x =>
                 MethodResolvers.IsAuthorizedToUpdateNodeAsync(default!, default!, default!, default!))
             .UseUserManager();
diff --git a/backend/src/GraphQl/Methods/PendingInstitutionMethodDevelopersByMethodIdDataLoader.cs b/backend/src/GraphQl/Methods/PendingInstitutionMethodDevelopersByMethodIdDataLoader.cs
deleted file mode 100644
index b7e54160f..000000000
--- a/backend/src/GraphQl/Methods/PendingInstitutionMethodDevelopersByMethodIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Methods;
-
-public sealed class PendingInstitutionMethodDevelopersByMethodIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<InstitutionMethodDeveloper>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.InstitutionMethodDevelopers.AsNoTracking().Where(x =>
-                    x.Pending && ids.Contains(x.MethodId)
-                ).With(queryContext),
-        x => x.MethodId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Methods/PendingUserMethodDevelopersByMethodIdDataLoader.cs b/backend/src/GraphQl/Methods/PendingUserMethodDevelopersByMethodIdDataLoader.cs
deleted file mode 100644
index 5f9e590fa..000000000
--- a/backend/src/GraphQl/Methods/PendingUserMethodDevelopersByMethodIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Methods;
-
-public sealed class PendingUserMethodDevelopersByMethodIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<UserMethodDeveloper>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.UserMethodDevelopers.AsNoTracking().Where(x =>
-                    x.Pending && ids.Contains(x.MethodId)
-                ).With(queryContext),
-        x => x.MethodId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Methods/UserMethodDeveloperEdge.cs b/backend/src/GraphQl/Methods/UserMethodDeveloperEdge.cs
index 9731ff76b..544e2e5f2 100644
--- a/backend/src/GraphQl/Methods/UserMethodDeveloperEdge.cs
+++ b/backend/src/GraphQl/Methods/UserMethodDeveloperEdge.cs
@@ -1,21 +1,20 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.Methods;
 
 public sealed class UserMethodDeveloperEdge(
     UserMethodDeveloper association
     )
-        : Edge<User, UserByIdDataLoader>(association.UserId)
+        : Edge<User, IUserByIdDataLoader>(association.UserId)
 {
-    private readonly UserMethodDeveloper _association = association;
-
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToConfirmEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         UserMethodDeveloperAuthorization authorization,
@@ -24,12 +23,13 @@ CancellationToken cancellationToken
     {
         return authorization.IsAuthorizedToConfirm(
             claimsPrincipal,
-            _association.UserId,
+            association.UserId,
             cancellationToken
         );
     }
 
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToRemoveEdgeAsync(
         ClaimsPrincipal claimsPrincipal,
         UserMethodDeveloperAuthorization authorization,
@@ -38,7 +38,7 @@ CancellationToken cancellationToken
     {
         return authorization.IsAuthorizedToRemove(
             claimsPrincipal,
-            _association.MethodId,
+            association.MethodId,
             cancellationToken
         );
     }
diff --git a/backend/src/GraphQl/Methods/UserMethodDevelopersByMethodIdDataLoader.cs b/backend/src/GraphQl/Methods/UserMethodDevelopersByMethodIdDataLoader.cs
deleted file mode 100644
index 31a617f9c..000000000
--- a/backend/src/GraphQl/Methods/UserMethodDevelopersByMethodIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Methods;
-
-public sealed class UserMethodDevelopersByMethodIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<UserMethodDeveloper>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.UserMethodDevelopers.AsNoTracking().Where(x =>
-                    !x.Pending && ids.Contains(x.MethodId)
-                ).With(queryContext),
-        x => x.MethodId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationAuthorizationEdge.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationAuthorizationEdge.cs
index 65c9a6b01..4a4e93ec6 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationAuthorizationEdge.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationAuthorizationEdge.cs
@@ -2,9 +2,6 @@
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
-public sealed class OpenIdConnectApplicationAuthorizationEdge(
-    OpenIdConnectAuthorization node
-)
-{
-    public OpenIdConnectAuthorization Node { get; } = node;
-}
\ No newline at end of file
+public sealed record OpenIdConnectApplicationGrantedAuthorizationEdge(
+    OpenIdConnectAuthorization Node
+);
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationByIdDataLoader.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationByIdDataLoader.cs
deleted file mode 100644
index 6b3167721..000000000
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationByIdDataLoader.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using GreenDonut;
-using Metabase.Data.OpenIdConnect;
-using OpenIddict.Core;
-
-namespace Metabase.GraphQl.OpenIdConnect.Applications;
-
-public sealed class OpenIdConnectApplicationByIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    OpenIddictApplicationManager<OpenIdConnectApplication> applicationManager)
-: BatchDataLoader<Guid, OpenIdConnectApplication?>(batchScheduler, options)
-{
-    protected override async Task<IReadOnlyDictionary<Guid, OpenIdConnectApplication?>> LoadBatchAsync(IReadOnlyList<Guid> keys, CancellationToken cancellationToken)
-    {
-        var ret = new Dictionary<Guid, OpenIdConnectApplication?>();
-        foreach (var key in keys)
-        {
-            ret.Add(key, await applicationManager.FindByIdAsync(key.ToString(), cancellationToken: cancellationToken));
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationDataLoaders.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationDataLoaders.cs
new file mode 100644
index 000000000..6d0b3ed8f
--- /dev/null
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationDataLoaders.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut;
+using GreenDonut.Data;
+using Metabase.Data;
+using Metabase.Data.OpenIdConnect;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.OpenIdConnect.Applications;
+
+public sealed class OpenIdConnectApplicationDataLoaders
+: DataLoaders
+{
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, OpenIdConnectApplication>> GetOpenIdConnectApplicationByIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<OpenIdConnectApplication> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetEntityByIdAsync(
+            ids,
+            databaseContext => databaseContext.OpenIdConnectApplications,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationFilterType.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationFilterType.cs
index bb9817b1d..9e8b26d53 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationFilterType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationFilterType.cs
@@ -5,14 +5,17 @@
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
 public class OpenIdConnectApplicationFilterType
-    : EntityFilterType<OpenIdConnectApplication>
+    : AuditableEntityFilterType<OpenIdConnectApplication>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<OpenIdConnectApplication> descriptor
     )
     {
         base.Configure(descriptor);
-        descriptor.Name(nameof(OpenIdConnectApplicationFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
+        // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.Id);
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         descriptor.Field(x => x.ApplicationType);
         descriptor.Field(x => x.ClientId);
         descriptor.Field(x => x.ConsentType);
@@ -20,5 +23,6 @@ IFilterInputTypeDescriptor<OpenIdConnectApplication> descriptor
         // descriptor.Field(x => x.PostLogoutRedirectUris);
         // descriptor.Field(x => x.RedirectUris);
         // descriptor.Field(x => x.Requirements);
+        descriptor.Field(x => x.Owner);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationAuthorizationConnection.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationGrantedAuthorizationConnection.cs
similarity index 82%
rename from backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationAuthorizationConnection.cs
rename to backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationGrantedAuthorizationConnection.cs
index 7e1c2e5e4..5ae3f4f2b 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationAuthorizationConnection.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationGrantedAuthorizationConnection.cs
@@ -4,15 +4,17 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Data.OpenIdConnect;
 using OpenIddict.Core;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
-public sealed class OpenIdConnectApplicationAuthorizationConnection(
+public sealed class OpenIdConnectApplicationGrantedAuthorizationConnection(
     OpenIdConnectApplication application
 )
 {
+    [Cost(0)]
     public async Task<uint> GetTotalCountAsync(
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
@@ -27,7 +29,8 @@ CancellationToken cancellationToken
         return (uint)await authorizationManager.FindByApplicationIdAsync(application.Id.ToString(), cancellationToken).CountAsync(cancellationToken);
     }
 
-    public async IAsyncEnumerable<OpenIdConnectApplicationAuthorizationEdge> GetEdgesAsync(
+    [Cost(0)]
+    public async IAsyncEnumerable<OpenIdConnectApplicationGrantedAuthorizationEdge> GetEdgesAsync(
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
         OpenIddictAuthorizationManager<OpenIdConnectAuthorization> authorizationManager,
@@ -40,7 +43,7 @@ [EnumeratorCancellation] CancellationToken cancellationToken
         }
         await foreach (var auth in authorizationManager.FindByApplicationIdAsync(application.Id.ToString(), cancellationToken))
         {
-            yield return new OpenIdConnectApplicationAuthorizationEdge(auth);
+            yield return new OpenIdConnectApplicationGrantedAuthorizationEdge(auth);
         }
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationTokenConnection.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationIssuedTokenConnection.cs
similarity index 83%
rename from backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationTokenConnection.cs
rename to backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationIssuedTokenConnection.cs
index b9b906386..433594589 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationTokenConnection.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationIssuedTokenConnection.cs
@@ -4,15 +4,17 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Data.OpenIdConnect;
 using OpenIddict.Core;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
-public sealed class OpenIdConnectApplicationTokenConnection(
+public sealed class OpenIdConnectApplicationIssuedTokenConnection(
     OpenIdConnectApplication application
 )
 {
+    [Cost(0)]
     public async Task<uint> GetTotalCountAsync(
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
@@ -27,7 +29,8 @@ CancellationToken cancellationToken
         return (uint)await tokenManager.FindByApplicationIdAsync(application.Id.ToString(), cancellationToken).CountAsync(cancellationToken);
     }
 
-    public async IAsyncEnumerable<OpenIdConnectApplicationTokenEdge> GetEdgesAsync(
+    [Cost(0)]
+    public async IAsyncEnumerable<OpenIdConnectApplicationIssuedTokenEdge> GetEdgesAsync(
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
         OpenIddictTokenManager<OpenIdConnectToken> tokenManager,
@@ -40,7 +43,7 @@ [EnumeratorCancellation] CancellationToken cancellationToken
         }
         await foreach (var token in tokenManager.FindByApplicationIdAsync(application.Id.ToString(), cancellationToken))
         {
-            yield return new OpenIdConnectApplicationTokenEdge(token);
+            yield return new OpenIdConnectApplicationIssuedTokenEdge(token);
         }
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
index 14f1bce85..f3e7bc7a7 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
@@ -89,10 +89,10 @@ CancellationToken cancellationToken
             }
         };
         descriptor.Permissions.UnionWith(
-            input.Endpoints.Select(x => x.ToStringEndpoint())
-            .Concat(input.GrantTypes.Select(x => x.ToStringGrantType()))
-            .Concat(input.ResponseTypes.Select(x => x.ToStringResponseType()))
-            .Concat(input.Scopes.Select(x => x.ToStringScope()))
+            input.Endpoints.Select(x => x.ToPermissionString())
+            .Concat(input.GrantTypes.Select(x => x.ToPermissionString()))
+            .Concat(input.ResponseTypes.Select(x => x.ToPermissionString()))
+            .Concat(input.Scopes.Select(x => x.ToPermissionString()))
         );
         if (input.RedirectUri is not null)
         {
@@ -254,7 +254,7 @@ OpenIddictApplicationDescriptor descriptor
         {
             try
             {
-                permission.ToOpenIdConnectEndpoint();
+                permission.PermissionToOpenIdConnectEndpoint();
                 return true;
             }
             catch (ArgumentOutOfRangeException)
@@ -266,7 +266,7 @@ OpenIddictApplicationDescriptor descriptor
         {
             try
             {
-                permission.ToOpenIdConnectGrantType();
+                permission.PermissionToOpenIdConnectGrantType();
                 return true;
             }
             catch (ArgumentOutOfRangeException)
@@ -278,7 +278,7 @@ OpenIddictApplicationDescriptor descriptor
         {
             try
             {
-                permission.ToOpenIdConnectResponseType();
+                permission.PermissionToOpenIdConnectResponseType();
                 return true;
             }
             catch (ArgumentOutOfRangeException)
@@ -290,7 +290,7 @@ OpenIddictApplicationDescriptor descriptor
         {
             try
             {
-                permission.ToOpenIdConnectScope();
+                permission.PermissionToOpenIdConnectScope();
                 return true;
             }
             catch (ArgumentOutOfRangeException)
@@ -299,10 +299,10 @@ OpenIddictApplicationDescriptor descriptor
             }
         });
         descriptor.Permissions.UnionWith(
-            input.Endpoints.Select(x => x.ToStringEndpoint())
-            .Concat(input.GrantTypes.Select(x => x.ToStringGrantType()))
-            .Concat(input.ResponseTypes.Select(x => x.ToStringResponseType()))
-            .Concat(input.Scopes.Select(x => x.ToStringScope()))
+            input.Endpoints.Select(x => x.ToPermissionString())
+            .Concat(input.GrantTypes.Select(x => x.ToPermissionString()))
+            .Concat(input.ResponseTypes.Select(x => x.ToPermissionString()))
+            .Concat(input.Scopes.Select(x => x.ToPermissionString()))
         );
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationOwnerEdge.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationOwnerEdge.cs
index 5bc0e715b..0908328b0 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationOwnerEdge.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationOwnerEdge.cs
@@ -7,6 +7,6 @@ namespace Metabase.GraphQl.OpenIdConnect.Applications;
 public sealed class OpenIdConnectApplicationOwnerEdge(
     OpenIdConnectApplication association
     )
-        : Edge<Institution, InstitutionByIdDataLoader>(association.OwnerId)
+        : Edge<Institution, IInstitutionByIdDataLoader>(association.OwnerId)
 {
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
index 926161c1e..07f31a124 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
@@ -1,15 +1,19 @@
 using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
+using System.Linq;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using GreenDonut.Data;
 using HotChocolate.Authorization;
+using HotChocolate.Data;
+using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Authorization;
+using Metabase.Data;
 using Metabase.Data.OpenIdConnect;
+using Metabase.GraphQl.Extensions;
 using Metabase.GraphQl.Users;
-using OpenIddict.Core;
+using Microsoft.EntityFrameworkCore;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
@@ -42,33 +46,37 @@ CancellationToken cancellationToken
     }
 
     // TODO In all queries, instead of returning nothing, report as authentication error to client.
-    // TODO Make the application manager use the scoped database context.
+    [UsePaging]
+    [UseFiltering<OpenIdConnectApplicationFilterType>]
+    [UseSorting<OpenIdConnectApplicationSortType>]
     [UseUserManager]
     [Authorize(Policy = AuthorizationPolicies.ManageOpenIdConnectScopePolicy)]
-    public async IAsyncEnumerable<OpenIdConnectApplication> GetOpenIdConnectApplicationsAsync(
-        OpenIddictApplicationManager<OpenIdConnectApplication> applicationManager,
+    public async ValueTask<HotChocolate.Types.Pagination.Connection<OpenIdConnectApplication>> GetOpenIdConnectApplicationsAsync(
+        IResolverContext resolverContext,
+        ApplicationDbContext databaseContext,
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
-        [EnumeratorCancellation] CancellationToken cancellationToken
+        CancellationToken cancellationToken
     )
     {
         if (!await authorization.IsAuthorizedToManageOpenIdConnect(claimsPrincipal, cancellationToken))
         {
-            yield break;
-        }
-        await foreach (var application in applicationManager.ListAsync(cancellationToken: cancellationToken))
-        {
-            yield return application;
+            return HotChocolate.Types.Pagination.Connection.Empty<OpenIdConnectApplication>();
         }
+        return await databaseContext.OpenIdConnectApplications
+            .AsNoTracking()
+            .With(resolverContext.GetQueryContext<OpenIdConnectApplication>(), Sorting.DefaultEntityOrder)
+            .ToPageAsync(resolverContext.GetPagingArguments(), cancellationToken)
+            .ToConnectionAsync();
     }
 
     [UseUserManager]
     [Authorize(Policy = AuthorizationPolicies.ManageOpenIdConnectScopePolicy)]
     public async Task<OpenIdConnectApplication?> GetOpenIdConnectApplicationAsync(
         Guid id,
+        IOpenIdConnectApplicationByIdDataLoader byId,
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
-        OpenIddictApplicationManager<OpenIdConnectApplication> applicationManager,
         CancellationToken cancellationToken
     )
     {
@@ -76,6 +84,6 @@ CancellationToken cancellationToken
         {
             return null;
         }
-        return await applicationManager.FindByIdAsync(id.ToString(), cancellationToken: cancellationToken);
+        return await byId.LoadAsync(id, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationSortType.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationSortType.cs
new file mode 100644
index 000000000..a95ca6155
--- /dev/null
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationSortType.cs
@@ -0,0 +1,22 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data.OpenIdConnect;
+using Metabase.GraphQl.Entities;
+
+namespace Metabase.GraphQl.OpenIdConnect.Applications;
+
+public class OpenIdConnectApplicationSortType
+    : AuditableEntitySortType<OpenIdConnectApplication>
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<OpenIdConnectApplication> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Field(x => x.ApplicationType);
+        descriptor.Field(x => x.ClientId);
+        descriptor.Field(x => x.ConsentType);
+        descriptor.Field(x => x.DisplayName);
+        // descriptor.Field(x => x.PostLogoutRedirectUris);
+        // descriptor.Field(x => x.RedirectUris);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationTokenEdge.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationTokenEdge.cs
index 5fb7b9631..1538b902d 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationTokenEdge.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationTokenEdge.cs
@@ -2,9 +2,6 @@
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
-public sealed class OpenIdConnectApplicationTokenEdge(
-    OpenIdConnectToken node
-)
-{
-    public OpenIdConnectToken Node { get; } = node;
-}
\ No newline at end of file
+public sealed record OpenIdConnectApplicationIssuedTokenEdge(
+    OpenIdConnectToken Node
+);
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
index 054286f96..d082427d3 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
@@ -7,18 +7,14 @@
 using System.Threading.Tasks;
 using HotChocolate;
 using HotChocolate.Types;
-using Metabase.Data;
 using Metabase.Data.OpenIdConnect;
-using Metabase.GraphQl.Extensions;
-using Metabase.GraphQl.Institutions;
 using Metabase.GraphQl.Users;
 using Metabase.GraphQl.Entities;
-using OpenIddict.Core;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
 public sealed class OpenIdConnectApplicationType
-    : EntityType<OpenIdConnectApplication, OpenIdConnectApplicationByIdDataLoader>
+    : EntityType<OpenIdConnectApplication, IOpenIdConnectApplicationByIdDataLoader>
 {
     protected override void Configure(
         IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
@@ -35,6 +31,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
         descriptor
             .Field(application => application.ClientId)
             .Type<NonNullType<StringType>>()
+            .Cost(0)
             .Resolve(context =>
                 context.Parent<OpenIdConnectApplication>().ClientId
                 ?? throw new GraphQLException("Client ID is missing.")
@@ -42,6 +39,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
         descriptor
             .Field(application => application.ConsentType)
             .Type<NonNullType<EnumType<OpenIdConnectConsentType>>>()
+            .Cost(0)
             .Resolve(context =>
                 context.Parent<OpenIdConnectApplication>().ConsentType?.ToOpenIdConnectConsentType()
                 ?? throw new GraphQLException("Consent type is missing.")
@@ -52,6 +50,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
         descriptor
             .Field("endpoints")
             .Type<NonNullType<ListType<NonNullType<EnumType<OpenIdConnectEndpoint>>>>>()
+            .Cost(0)
             .Resolve(context =>
         {
             var application = context.Parent<OpenIdConnectApplication>();
@@ -64,7 +63,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
                 {
                     try
                     {
-                        permission.ToOpenIdConnectEndpoint();
+                        permission.PermissionToOpenIdConnectEndpoint();
                         return true;
                     }
                     catch (ArgumentOutOfRangeException)
@@ -72,12 +71,13 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
                         return false;
                     }
                 })
-                ?.Select(endpoint => endpoint.ToOpenIdConnectEndpoint())
+                ?.Select(endpointPermission => endpointPermission.PermissionToOpenIdConnectEndpoint())
                 .ToList() ?? [];
         });
         descriptor
             .Field("grantTypes")
             .Type<NonNullType<ListType<NonNullType<EnumType<OpenIdConnectGrantType>>>>>()
+            .Cost(0)
             .Resolve(context =>
         {
             var application = context.Parent<OpenIdConnectApplication>();
@@ -90,7 +90,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
                 {
                     try
                     {
-                        permission.ToOpenIdConnectGrantType();
+                        permission.PermissionToOpenIdConnectGrantType();
                         return true;
                     }
                     catch (ArgumentOutOfRangeException)
@@ -98,12 +98,13 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
                         return false;
                     }
                 })
-                ?.Select(grantType => grantType.ToOpenIdConnectGrantType())
+                ?.Select(grantTypePermission => grantTypePermission.PermissionToOpenIdConnectGrantType())
                 .ToList() ?? [];
         });
         descriptor
             .Field("responseTypes")
             .Type<NonNullType<ListType<NonNullType<EnumType<OpenIdConnectResponseType>>>>>()
+            .Cost(0)
             .Resolve(context =>
         {
             var application = context.Parent<OpenIdConnectApplication>();
@@ -116,7 +117,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
                 {
                     try
                     {
-                        permission.ToOpenIdConnectResponseType();
+                        permission.PermissionToOpenIdConnectResponseType();
                         return true;
                     }
                     catch (ArgumentOutOfRangeException)
@@ -124,12 +125,13 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
                         return false;
                     }
                 })
-                ?.Select(responseType => responseType.ToOpenIdConnectResponseType())
+                ?.Select(responseTypePermission => responseTypePermission.PermissionToOpenIdConnectResponseType())
                 .ToList() ?? [];
         });
         descriptor
             .Field("scopes")
             .Type<NonNullType<ListType<NonNullType<EnumType<OpenIdConnectScope>>>>>()
+            .Cost(0)
             .Resolve(context =>
         {
             var application = context.Parent<OpenIdConnectApplication>();
@@ -142,7 +144,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
                 {
                     try
                     {
-                        permission.ToOpenIdConnectScope();
+                        permission.PermissionToOpenIdConnectScope();
                         return true;
                     }
                     catch (ArgumentOutOfRangeException)
@@ -150,12 +152,13 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
                         return false;
                     }
                 })
-                ?.Select(scope => scope.ToOpenIdConnectScope())
+                ?.Select(scopePermission => scopePermission.PermissionToOpenIdConnectScope())
                 .ToList() ?? [];
         });
         descriptor
             .Field(application => application.Requirements)
             .Type<NonNullType<ListType<NonNullType<EnumType<OpenIdConnectRequirement>>>>>()
+            .Cost(0)
             .Resolve(context =>
         {
             var application = context.Parent<OpenIdConnectApplication>();
@@ -170,16 +173,19 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
         descriptor
             .Field(application => application.RedirectUris)
             .Name("redirectUri")
-            .Type<UrlType>()
+            .Type<MyUriType>()
+            .Cost(0)
             .Resolve(context => ExtractUri(context.Parent<OpenIdConnectApplication>().RedirectUris));
         descriptor
             .Field(application => application.PostLogoutRedirectUris)
             .Name("postLogoutRedirectUri")
-            .Type<UrlType>()
+            .Type<MyUriType>()
+            .Cost(0)
             .Resolve(context => ExtractUri(context.Parent<OpenIdConnectApplication>().PostLogoutRedirectUris));
         descriptor
             .Field(application => application.Owner)
             .Type<NonNullType<ObjectType<OpenIdConnectApplicationOwnerEdge>>>()
+            .Cost(0)
             .Resolve(context =>
                 new OpenIdConnectApplicationOwnerEdge(
                     context.Parent<OpenIdConnectApplication>()
@@ -190,23 +196,25 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
             .Ignore();
         descriptor
             .Field(application => application.Authorizations)
-            .Type<NonNullType<ObjectType<OpenIdConnectApplicationAuthorizationConnection>>>()
+            .Type<NonNullType<ObjectType<OpenIdConnectApplicationGrantedAuthorizationConnection>>>()
+            .Cost(0)
             .Resolve(context =>
-                new OpenIdConnectApplicationAuthorizationConnection(
+                new OpenIdConnectApplicationGrantedAuthorizationConnection(
                     context.Parent<OpenIdConnectApplication>()
                 )
             );
         descriptor
             .Field(application => application.Tokens)
-            .Type<NonNullType<ObjectType<OpenIdConnectApplicationTokenConnection>>>()
+            .Type<NonNullType<ObjectType<OpenIdConnectApplicationIssuedTokenConnection>>>()
             .Resolve(context =>
-                new OpenIdConnectApplicationTokenConnection(
+                new OpenIdConnectApplicationIssuedTokenConnection(
                     context.Parent<OpenIdConnectApplication>()
                 )
             );
 
         descriptor
             .Field("isAuthorizedToManageNode")
+            .Cost(1)
             .ResolveWith<ApplicationResolvers>(_ =>
                 ApplicationResolvers.IsAuthorizedToManageNodeAsync(default!, default!, default!, default!))
             .UseUserManager();
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectEndpointExtensions.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectEndpointExtensions.cs
index 98f83179a..e44a91112 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectEndpointExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectEndpointExtensions.cs
@@ -1,14 +1,13 @@
 using System;
-using Metabase.Configuration;
 using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
 public static class OpenIdConnectEndpointExtensions
 {
-    public static OpenIdConnectEndpoint ToOpenIdConnectEndpoint(this string endpoint)
+    public static OpenIdConnectEndpoint PermissionToOpenIdConnectEndpoint(this string endpointPermission)
     {
-        return endpoint switch
+        return endpointPermission switch
         {
             OpenIddictConstants.Permissions.Endpoints.Authorization => OpenIdConnectEndpoint.AUTHORIZATION,
             OpenIddictConstants.Permissions.Endpoints.EndSession => OpenIdConnectEndpoint.END_SESSION,
@@ -16,11 +15,11 @@ public static OpenIdConnectEndpoint ToOpenIdConnectEndpoint(this string endpoint
             OpenIddictConstants.Permissions.Endpoints.PushedAuthorization => OpenIdConnectEndpoint.PUSHED_AUTHORIZATION,
             OpenIddictConstants.Permissions.Endpoints.Revocation => OpenIdConnectEndpoint.REVOCATION,
             OpenIddictConstants.Permissions.Endpoints.Token => OpenIdConnectEndpoint.TOKEN,
-            _ => throw new ArgumentOutOfRangeException(nameof(endpoint), $"Unsupported endpoint `{endpoint}`")
+            _ => throw new ArgumentOutOfRangeException(nameof(endpointPermission), $"Unsupported endpoint `{endpointPermission}`")
         };
     }
 
-    public static string ToStringEndpoint(this OpenIdConnectEndpoint endpoint)
+    public static string ToPermissionString(this OpenIdConnectEndpoint endpoint)
     {
         return endpoint switch
         {
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectGrantTypeExtensions.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectGrantTypeExtensions.cs
index bf60919a4..b7708007c 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectGrantTypeExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectGrantTypeExtensions.cs
@@ -1,24 +1,23 @@
 using System;
-using Metabase.Configuration;
 using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
 public static class OpenIdConnectGrantTypeExtensions
 {
-    public static OpenIdConnectGrantType ToOpenIdConnectGrantType(this string grantType)
+    public static OpenIdConnectGrantType PermissionToOpenIdConnectGrantType(this string grantTypePermission)
     {
-        return grantType switch
+        return grantTypePermission switch
         {
             OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode => OpenIdConnectGrantType.AUTHORIZATION_CODE,
             OpenIddictConstants.Permissions.GrantTypes.ClientCredentials => OpenIdConnectGrantType.CLIENT_CREDENTIALS,
             OpenIddictConstants.Permissions.GrantTypes.RefreshToken => OpenIdConnectGrantType.REFRESH_TOKEN,
             OpenIddictConstants.Permissions.GrantTypes.TokenExchange => OpenIdConnectGrantType.TOKEN_EXCHANGE,
-            _ => throw new ArgumentOutOfRangeException(nameof(grantType), $"Unsupported grant type `{grantType}`")
+            _ => throw new ArgumentOutOfRangeException(nameof(grantTypePermission), $"Unsupported grant type `{grantTypePermission}`")
         };
     }
 
-    public static string ToStringGrantType(this OpenIdConnectGrantType grantType)
+    public static string ToPermissionString(this OpenIdConnectGrantType grantType)
     {
         return grantType switch
         {
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectResponseTypeExtensions.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectResponseTypeExtensions.cs
index 097b28c25..fd1fcfbc8 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectResponseTypeExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectResponseTypeExtensions.cs
@@ -1,23 +1,22 @@
 using System;
-using Metabase.Configuration;
 using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
 public static class OpenIdConnectResponseTypeExtensions
 {
-    public static OpenIdConnectResponseType ToOpenIdConnectResponseType(this string responseType)
+    public static OpenIdConnectResponseType PermissionToOpenIdConnectResponseType(this string responseTypePermission)
     {
-        return responseType switch
+        return responseTypePermission switch
         {
             OpenIddictConstants.Permissions.ResponseTypes.Code => OpenIdConnectResponseType.CODE,
             OpenIddictConstants.Permissions.ResponseTypes.IdToken => OpenIdConnectResponseType.ID_TOKEN,
             OpenIddictConstants.Permissions.ResponseTypes.Token => OpenIdConnectResponseType.TOKEN,
-            _ => throw new ArgumentOutOfRangeException(nameof(responseType), $"Unsupported response type `{responseType}`")
+            _ => throw new ArgumentOutOfRangeException(nameof(responseTypePermission), $"Unsupported response type `{responseTypePermission}`")
         };
     }
 
-    public static string ToStringResponseType(this OpenIdConnectResponseType responseType)
+    public static string ToPermissionString(this OpenIdConnectResponseType responseType)
     {
         return responseType switch
         {
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationByIdDataLoader.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationByIdDataLoader.cs
deleted file mode 100644
index 4dc32f489..000000000
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationByIdDataLoader.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using GreenDonut;
-using Metabase.Data.OpenIdConnect;
-using OpenIddict.Core;
-
-namespace Metabase.GraphQl.OpenIdConnect.Authorizations;
-
-public sealed class OpenIdConnectAuthorizationByIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    OpenIddictAuthorizationManager<OpenIdConnectAuthorization> authorizationManager)
-: BatchDataLoader<Guid, OpenIdConnectAuthorization?>(batchScheduler, options)
-{
-    protected override async Task<IReadOnlyDictionary<Guid, OpenIdConnectAuthorization?>> LoadBatchAsync(IReadOnlyList<Guid> keys, CancellationToken cancellationToken)
-    {
-        var ret = new Dictionary<Guid, OpenIdConnectAuthorization?>();
-        foreach (var key in keys)
-        {
-            ret.Add(key, await authorizationManager.FindByIdAsync(key.ToString(), cancellationToken: cancellationToken));
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationDataLoaders.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationDataLoaders.cs
new file mode 100644
index 000000000..f0fc4628d
--- /dev/null
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationDataLoaders.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut;
+using GreenDonut.Data;
+using Metabase.Data;
+using Metabase.Data.OpenIdConnect;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.OpenIdConnect.Authorizations;
+
+public sealed class OpenIdConnectAuthorizationDataLoaders
+: DataLoaders
+{
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, OpenIdConnectAuthorization>> GetOpenIdConnectAuthorizationByIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<OpenIdConnectAuthorization> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetEntityByIdAsync(
+            ids,
+            databaseContext => databaseContext.OpenIdConnectAuthorizations,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationFilterType.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationFilterType.cs
index 174f46db1..e6d92b81c 100644
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationFilterType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationFilterType.cs
@@ -5,7 +5,7 @@
 namespace Metabase.GraphQl.OpenIdConnect.Authorizations;
 
 public sealed class OpenIdConnectAuthorizationFilterType
-    : EntityFilterType<OpenIdConnectAuthorization>
+    : AuditableEntityFilterType<OpenIdConnectAuthorization>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<OpenIdConnectAuthorization> descriptor
@@ -13,11 +13,15 @@ IFilterInputTypeDescriptor<OpenIdConnectAuthorization> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(OpenIdConnectAuthorizationFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.CreationDate);
+        // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.Id);
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
+        descriptor.Field(x => x.CreationDate).Ignore();
         descriptor.Field(x => x.Status);
         descriptor.Field(x => x.Subject);
         descriptor.Field(x => x.Tokens);
         descriptor.Field(x => x.Type);
-        // descriptor.Field(x => x.Application);
+        descriptor.Field(x => x.Application);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationTokenConnection.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationIssuedTokenConnection.cs
similarity index 71%
rename from backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationTokenConnection.cs
rename to backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationIssuedTokenConnection.cs
index 7375b6a7a..8eb94e58b 100644
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationTokenConnection.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationIssuedTokenConnection.cs
@@ -4,45 +4,46 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Data.OpenIdConnect;
 using OpenIddict.Core;
 
 namespace Metabase.GraphQl.OpenIdConnect.Authorizations;
 
-public sealed class OpenIdConnectAuthorizationTokenConnection(
+public sealed class OpenIdConnectAuthorizationIssuedTokenConnection(
     OpenIdConnectAuthorization authorization
 )
 {
+    [Cost(0)]
     public async Task<uint> GetTotalCountAsync(
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization auth,
-        OpenIddictAuthorizationManager<OpenIdConnectAuthorization> authorizationManager,
         OpenIddictTokenManager<OpenIdConnectToken> tokenManager,
         CancellationToken cancellationToken
     )
     {
-        if (!await auth.IsAuthorizedToManageTokensOfAuthorization(claimsPrincipal, authorization.Id, authorizationManager, cancellationToken))
+        if (!await auth.IsAuthorizedToManageTokensOfAuthorization(claimsPrincipal, authorization.Id, cancellationToken))
         {
             return 0;
         }
         return (uint)await tokenManager.FindByAuthorizationIdAsync(authorization.Id.ToString(), cancellationToken).CountAsync(cancellationToken);
     }
 
-    public async IAsyncEnumerable<OpenIdConnectAuthorizationTokenEdge> GetEdgesAsync(
+    [Cost(0)]
+    public async IAsyncEnumerable<OpenIdConnectAuthorizationIssuedTokenEdge> GetEdgesAsync(
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization auth,
-        OpenIddictAuthorizationManager<OpenIdConnectAuthorization> authorizationManager,
         OpenIddictTokenManager<OpenIdConnectToken> tokenManager,
         [EnumeratorCancellation] CancellationToken cancellationToken
     )
     {
-        if (!await auth.IsAuthorizedToManageTokensOfAuthorization(claimsPrincipal, authorization.Id, authorizationManager, cancellationToken))
+        if (!await auth.IsAuthorizedToManageTokensOfAuthorization(claimsPrincipal, authorization.Id, cancellationToken))
         {
             yield break;
         }
         await foreach (var token in tokenManager.FindByAuthorizationIdAsync(authorization.Id.ToString(), cancellationToken))
         {
-            yield return new OpenIdConnectAuthorizationTokenEdge(token);
+            yield return new OpenIdConnectAuthorizationIssuedTokenEdge(token);
         }
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationMutations.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationMutations.cs
index 6d991c2a7..b1d42536b 100644
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationMutations.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationMutations.cs
@@ -26,7 +26,6 @@ CancellationToken cancellationToken
         if (!await openIdConnectAuthorization.IsAuthorizedToManageAuthorization(
                 claimsPrincipal,
                 input.AuthorizationId,
-                authorizationManager,
                 cancellationToken
             )
         )
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationQueries.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationQueries.cs
index 8467835b4..7b2f40408 100644
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationQueries.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationQueries.cs
@@ -1,53 +1,63 @@
 using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
+using System.Linq;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using GreenDonut.Data;
 using HotChocolate.Authorization;
+using HotChocolate.Data;
+using HotChocolate.Resolvers;
 using HotChocolate.Types;
+using Metabase.Data;
 using Metabase.Data.OpenIdConnect;
+using Metabase.GraphQl.Extensions;
 using Metabase.GraphQl.Users;
-using OpenIddict.Core;
+using Microsoft.EntityFrameworkCore;
 
 namespace Metabase.GraphQl.OpenIdConnect.Authorizations;
 
 [ExtendObjectType(nameof(Query))]
 public sealed class OpenIdConnectAuthorizationQueries
 {
+    // TODO In all queries, instead of returning nothing, report as authentication error to client.
+    [UsePaging]
+    [UseFiltering<OpenIdConnectAuthorizationFilterType>]
+    [UseSorting<OpenIdConnectAuthorizationSortType>]
     [UseUserManager]
     [Authorize(Policy = Authorization.AuthorizationPolicies.ManageOpenIdConnectScopePolicy)]
-    public async IAsyncEnumerable<OpenIdConnectAuthorization> GetOpenIdConnectAuthorizationsAsync(
+    public async ValueTask<HotChocolate.Types.Pagination.Connection<OpenIdConnectAuthorization>> GetOpenIdConnectAuthorizationsAsync(
+        IResolverContext resolverContext,
+        ApplicationDbContext databaseContext,
         ClaimsPrincipal claimsPrincipal,
-        Authorization.OpenIdConnectAuthorization authorization, // TODO Make the authorization manager use the scoped database context.
-        OpenIddictAuthorizationManager<OpenIdConnectAuthorization> authorizationManager,
-        [EnumeratorCancellation] CancellationToken cancellationToken
+        Authorization.OpenIdConnectAuthorization authorization,
+        CancellationToken cancellationToken
     )
     {
         if (!await authorization.IsAuthorizedToManageOpenIdConnect(claimsPrincipal, cancellationToken))
         {
-            yield break;
-        }
-        await foreach (var auth in authorizationManager.ListAsync(cancellationToken: cancellationToken))
-        {
-            yield return auth;
+            return HotChocolate.Types.Pagination.Connection.Empty<OpenIdConnectAuthorization>();
         }
+        return await databaseContext.OpenIdConnectAuthorizations
+            .AsNoTracking()
+            .With(resolverContext.GetQueryContext<OpenIdConnectAuthorization>(), Sorting.DefaultEntityOrder)
+            .ToPageAsync(resolverContext.GetPagingArguments(), cancellationToken)
+            .ToConnectionAsync();
     }
 
     [UseUserManager]
     [Authorize(Policy = Authorization.AuthorizationPolicies.ManageOpenIdConnectScopePolicy)]
-    public async Task<OpenIdConnectAuthorization?> GetOpenIdConnectAuthorization(
+    public async Task<OpenIdConnectAuthorization?> GetOpenIdConnectAuthorizationAsync(
         Guid id,
+        IOpenIdConnectAuthorizationByIdDataLoader byId,
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
-        OpenIddictAuthorizationManager<OpenIdConnectAuthorization> authorizationManager,
         CancellationToken cancellationToken
     )
     {
-        if (!await authorization.IsAuthorizedToManageAuthorization(claimsPrincipal, id, authorizationManager, cancellationToken))
+        if (!await authorization.IsAuthorizedToManageAuthorization(claimsPrincipal, id, cancellationToken))
         {
             return null;
         }
-        return await authorizationManager.FindByIdAsync(id.ToString(), cancellationToken: cancellationToken);
+        return await byId.LoadAsync(id, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationSortType.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationSortType.cs
new file mode 100644
index 000000000..8fb567d9c
--- /dev/null
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationSortType.cs
@@ -0,0 +1,21 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data.OpenIdConnect;
+using Metabase.GraphQl.Entities;
+
+namespace Metabase.GraphQl.OpenIdConnect.Authorizations;
+
+public sealed class OpenIdConnectAuthorizationSortType
+    : AuditableEntitySortType<OpenIdConnectAuthorization>
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<OpenIdConnectAuthorization> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(OpenIdConnectAuthorizationSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+        descriptor.Field(x => x.CreationDate).Ignore();
+        descriptor.Field(x => x.Status);
+        descriptor.Field(x => x.Subject);
+        descriptor.Field(x => x.Type);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationTokenEdge.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationTokenEdge.cs
index e291e9e16..b30cf88f3 100644
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationTokenEdge.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationTokenEdge.cs
@@ -2,9 +2,6 @@
 
 namespace Metabase.GraphQl.OpenIdConnect.Authorizations;
 
-public sealed class OpenIdConnectAuthorizationTokenEdge(
-    OpenIdConnectToken node
-)
-{
-    public OpenIdConnectToken Node { get; } = node;
-}
\ No newline at end of file
+public sealed record OpenIdConnectAuthorizationIssuedTokenEdge(
+    OpenIdConnectToken Node
+);
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationType.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationType.cs
index a4d686e30..6dcf9c908 100644
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationType.cs
@@ -6,12 +6,14 @@
 using Metabase.Data.OpenIdConnect;
 using Metabase.GraphQl.Users;
 using Metabase.GraphQl.Entities;
-using OpenIddict.Core;
+using System.Text.Json;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Metabase.GraphQl.OpenIdConnect.Authorizations;
 
 public sealed class OpenIdConnectAuthorizationType
-    : EntityType<OpenIdConnectAuthorization, OpenIdConnectAuthorizationByIdDataLoader>
+    : EntityType<OpenIdConnectAuthorization, IOpenIdConnectAuthorizationByIdDataLoader>
 {
     protected override void Configure(
         IObjectTypeDescriptor<OpenIdConnectAuthorization> descriptor
@@ -20,8 +22,23 @@ IObjectTypeDescriptor<OpenIdConnectAuthorization> descriptor
         base.Configure(descriptor);
         descriptor.Field(authorization => authorization.ConcurrencyToken).Ignore();
         descriptor.Field(authorization => authorization.Properties).Ignore();
-        descriptor.Field(authorization => authorization.Scopes).Ignore();
+        descriptor.Field(authorization => authorization.CreationDate).Ignore(); // use `CreatedAt` instead
 
+        descriptor
+            .Field(authorization => authorization.Scopes)
+            .Type<NonNullType<ListType<NonNullType<EnumType<OpenIdConnectScope>>>>>()
+            .Cost(0)
+            .Resolve(context =>
+        {
+            var authorization = context.Parent<OpenIdConnectAuthorization>();
+            if (authorization.Scopes is null)
+            {
+                return [];
+            }
+            return JsonSerializer.Deserialize<List<string>>(authorization.Scopes)
+                ?.Select(scope => scope.ToOpenIdConnectScope())
+                .ToList() ?? [];
+        });
         descriptor
             .Field(t => t.Application)
             .Type<NonNullType<ObjectType<OpenIdConnectAuthorizationApplicationEdge>>>()
@@ -32,17 +49,18 @@ IObjectTypeDescriptor<OpenIdConnectAuthorization> descriptor
             );
         descriptor
             .Field(authorization => authorization.Tokens)
-            .Type<NonNullType<ObjectType<OpenIdConnectAuthorizationTokenConnection>>>()
+            .Type<NonNullType<ObjectType<OpenIdConnectAuthorizationIssuedTokenConnection>>>()
             .Resolve(context =>
-                new OpenIdConnectAuthorizationTokenConnection(
+                new OpenIdConnectAuthorizationIssuedTokenConnection(
                     context.Parent<OpenIdConnectAuthorization>()
                 )
             );
         descriptor
-                .Field("isAuthorizedToDeleteNode")
-                .ResolveWith<AuthorizationResolvers>(x =>
-                    AuthorizationResolvers.IsAuthorizedToDeleteNodeAsync(default!, default!, default!, default!, default!))
-                .UseUserManager();
+            .Field("isAuthorizedToDeleteNode")
+            .Cost(1)
+            .ResolveWith<AuthorizationResolvers>(x =>
+                AuthorizationResolvers.IsAuthorizedToDeleteNodeAsync(default!, default!, default!, default!))
+            .UseUserManager();
     }
 
     private sealed class AuthorizationResolvers
@@ -51,11 +69,10 @@ public static Task<bool> IsAuthorizedToDeleteNodeAsync(
             [Parent] OpenIdConnectAuthorization authorization,
             ClaimsPrincipal claimsPrincipal,
             Authorization.OpenIdConnectAuthorization openIdConnectAuthorization,
-            OpenIddictAuthorizationManager<OpenIdConnectAuthorization> authorizationManager,
             CancellationToken cancellationToken
         )
         {
-            return openIdConnectAuthorization.IsAuthorizedToManageAuthorization(claimsPrincipal, authorization.Id, authorizationManager, cancellationToken);
+            return openIdConnectAuthorization.IsAuthorizedToManageAuthorization(claimsPrincipal, authorization.Id, cancellationToken);
         }
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectScope.cs b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs
similarity index 87%
rename from backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectScope.cs
rename to backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs
index a2eec4c6e..f9ccbf8a9 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectScope.cs
+++ b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace Metabase.GraphQl.OpenIdConnect.Applications;
+namespace Metabase.GraphQl.OpenIdConnect;
 
 [SuppressMessage("Naming", "CA1707")]
 public enum OpenIdConnectScope
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectScopeExtensions.cs b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
similarity index 70%
rename from backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectScopeExtensions.cs
rename to backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
index 6d016a412..3a1449dcb 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectScopeExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
@@ -1,13 +1,35 @@
 using System;
 using OpenIddict.Abstractions;
 
-namespace Metabase.GraphQl.OpenIdConnect.Applications;
+namespace Metabase.GraphQl.OpenIdConnect;
 
 public static class OpenIdConnectScopeExtensions
 {
     public static OpenIdConnectScope ToOpenIdConnectScope(this string scope)
     {
         return scope switch
+        {
+            OpenIddictConstants.Scopes.Address => OpenIdConnectScope.ADDRESS,
+            OpenIddictConstants.Scopes.Email => OpenIdConnectScope.EMAIL,
+            OpenIddictConstants.Scopes.Phone => OpenIdConnectScope.PHONE,
+            OpenIddictConstants.Scopes.Profile => OpenIdConnectScope.PROFILE,
+            OpenIddictConstants.Scopes.Roles => OpenIdConnectScope.ROLES,
+            Data.OpenIdConnect.OpenIdConnectScope.ReadApiScope => OpenIdConnectScope.READ_API,
+            Data.OpenIdConnect.OpenIdConnectScope.WriteApiScope => OpenIdConnectScope.WRITE_API,
+            Data.OpenIdConnect.OpenIdConnectScope.AdministrateApiScope => OpenIdConnectScope.ADMINISTRATE_API,
+            Data.OpenIdConnect.OpenIdConnectScope.VerifyApiScope => OpenIdConnectScope.VERIFY_API,
+            Data.OpenIdConnect.OpenIdConnectScope.ManageDatabaseApiScope => OpenIdConnectScope.MANAGE_DATABASE_API,
+            Data.OpenIdConnect.OpenIdConnectScope.ManageGnuPgApiScope => OpenIdConnectScope.MANAGE_GNU_PG_API,
+            Data.OpenIdConnect.OpenIdConnectScope.ManageInstitutionRepresentativeApiScope => OpenIdConnectScope.MANAGE_INSTITUTION_REPRESENTATIVE_API,
+            Data.OpenIdConnect.OpenIdConnectScope.ManageOpenIdConnectApiScope => OpenIdConnectScope.MANAGE_OPEN_ID_CONNECT_API,
+            Data.OpenIdConnect.OpenIdConnectScope.ManageUserApiScope => OpenIdConnectScope.MANAGE_USER_API,
+            _ => throw new ArgumentOutOfRangeException(nameof(scope), $"Unsupported scope `{scope}`")
+        };
+    }
+
+    public static OpenIdConnectScope PermissionToOpenIdConnectScope(this string scopePermission)
+    {
+        return scopePermission switch
         {
             OpenIddictConstants.Permissions.Scopes.Address => OpenIdConnectScope.ADDRESS,
             OpenIddictConstants.Permissions.Scopes.Email => OpenIdConnectScope.EMAIL,
@@ -23,11 +45,11 @@ public static OpenIdConnectScope ToOpenIdConnectScope(this string scope)
             OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.ManageInstitutionRepresentativeApiScope => OpenIdConnectScope.MANAGE_INSTITUTION_REPRESENTATIVE_API,
             OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.ManageOpenIdConnectApiScope => OpenIdConnectScope.MANAGE_OPEN_ID_CONNECT_API,
             OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.ManageUserApiScope => OpenIdConnectScope.MANAGE_USER_API,
-            _ => throw new ArgumentOutOfRangeException(nameof(scope), $"Unsupported scope `{scope}`")
+            _ => throw new ArgumentOutOfRangeException(nameof(scopePermission), $"Unsupported scope `{scopePermission}`")
         };
     }
 
-    public static string ToStringScope(this OpenIdConnectScope scope)
+    public static string ToPermissionString(this OpenIdConnectScope scope)
     {
         return scope switch
         {
diff --git a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenByIdDataLoader.cs b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenByIdDataLoader.cs
deleted file mode 100644
index 7f6d93a48..000000000
--- a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenByIdDataLoader.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using GreenDonut;
-using Metabase.Data.OpenIdConnect;
-using OpenIddict.Core;
-
-namespace Metabase.GraphQl.OpenIdConnect.Tokens;
-
-public sealed class OpenIdConnectTokenByIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    OpenIddictTokenManager<OpenIdConnectToken> tokenManager)
-: BatchDataLoader<Guid, OpenIdConnectToken?>(batchScheduler, options)
-{
-    protected override async Task<IReadOnlyDictionary<Guid, OpenIdConnectToken?>> LoadBatchAsync(IReadOnlyList<Guid> keys, CancellationToken cancellationToken)
-    {
-        var ret = new Dictionary<Guid, OpenIdConnectToken?>();
-        foreach (var key in keys)
-        {
-            ret.Add(key, await tokenManager.FindByIdAsync(key.ToString(), cancellationToken: cancellationToken));
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenDataLoaders.cs b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenDataLoaders.cs
new file mode 100644
index 000000000..a32a4e044
--- /dev/null
+++ b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenDataLoaders.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut;
+using GreenDonut.Data;
+using Metabase.Data;
+using Metabase.Data.OpenIdConnect;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.OpenIdConnect.Tokens;
+
+public sealed class OpenIdConnectTokenDataLoaders
+: DataLoaders
+{
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, OpenIdConnectToken>> GetOpenIdConnectTokenByIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<OpenIdConnectToken> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetEntityByIdAsync(
+            ids,
+            databaseContext => databaseContext.OpenIdConnectTokens,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenFilterType.cs b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenFilterType.cs
index d9dc1d45b..21bd2fdff 100644
--- a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenFilterType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenFilterType.cs
@@ -5,7 +5,7 @@
 namespace Metabase.GraphQl.OpenIdConnect.Tokens;
 
 public sealed class OpenIdConnectTokenFilterType
-    : EntityFilterType<OpenIdConnectToken>
+    : AuditableEntityFilterType<OpenIdConnectToken>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<OpenIdConnectToken> descriptor
@@ -13,13 +13,17 @@ IFilterInputTypeDescriptor<OpenIdConnectToken> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(OpenIdConnectTokenFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.CreationDate);
-        descriptor.Field(x => x.ExpirationDate);
-        descriptor.Field(x => x.RedemptionDate);
+        // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.Id);
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
+        descriptor.Field(x => x.CreationDate).Ignore();
+        descriptor.Field(x => x.ExpirationDate).Name(OpenIdConnectTokenType.ExpiredAtName);
+        descriptor.Field(x => x.RedemptionDate).Name(OpenIdConnectTokenType.RedeemedAtName);
         descriptor.Field(x => x.Status);
         descriptor.Field(x => x.Subject);
         descriptor.Field(x => x.Type);
-        // descriptor.Field(x => x.Authorization);
-        // descriptor.Field(x => x.Application);
+        descriptor.Field(x => x.Authorization);
+        descriptor.Field(x => x.Application);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenMutations.cs b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenMutations.cs
index da03bb159..75fffe4e2 100644
--- a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenMutations.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenMutations.cs
@@ -27,7 +27,6 @@ CancellationToken cancellationToken
         if (!await authorization.IsAuthorizedToManageToken(
                 claimsPrincipal,
                 input.TokenId,
-                tokenManager,
                 cancellationToken
             ))
         {
diff --git a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenQueries.cs b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenQueries.cs
index 02cd4804f..59bdfd2bf 100644
--- a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenQueries.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenQueries.cs
@@ -1,55 +1,64 @@
 using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
+using System.Linq;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using GreenDonut.Data;
 using HotChocolate.Authorization;
+using HotChocolate.Data;
+using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Authorization;
+using Metabase.Data;
 using Metabase.Data.OpenIdConnect;
+using Metabase.GraphQl.Extensions;
 using Metabase.GraphQl.Users;
-using OpenIddict.Core;
+using Microsoft.EntityFrameworkCore;
 
 namespace Metabase.GraphQl.OpenIdConnect.Tokens;
 
 [ExtendObjectType(nameof(Query))]
 public sealed class OpenIdConnectTokenQueries
 {
+    // TODO In all queries, instead of returning nothing, report as authentication error to client.
+    [UsePaging]
+    [UseFiltering<OpenIdConnectTokenFilterType>]
+    [UseSorting<OpenIdConnectTokenSortType>]
     [UseUserManager]
     [Authorize(Policy = AuthorizationPolicies.ManageOpenIdConnectScopePolicy)]
-    public async IAsyncEnumerable<OpenIdConnectToken> GetOpenIdConnectTokensAsync(
+    public async ValueTask<HotChocolate.Types.Pagination.Connection<OpenIdConnectToken>> GetOpenIdConnectTokensAsync(
+        IResolverContext resolverContext,
+        ApplicationDbContext databaseContext,
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
-        OpenIddictTokenManager<OpenIdConnectToken> tokenManager, // TODO Make the token manager use the scoped database context.
-        [EnumeratorCancellation] CancellationToken cancellationToken
+        CancellationToken cancellationToken
     )
     {
         if (!await authorization.IsAuthorizedToManageOpenIdConnect(claimsPrincipal, cancellationToken))
         {
-            yield break;
-        }
-        await foreach (var token in tokenManager.ListAsync(cancellationToken: cancellationToken))
-        {
-            yield return token;
+            return HotChocolate.Types.Pagination.Connection.Empty<OpenIdConnectToken>();
         }
+        return await databaseContext.OpenIdConnectTokens
+            .AsNoTracking()
+            .With(resolverContext.GetQueryContext<OpenIdConnectToken>(), Sorting.DefaultEntityOrder)
+            .ToPageAsync(resolverContext.GetPagingArguments(), cancellationToken)
+            .ToConnectionAsync();
     }
 
     [UseUserManager]
     [Authorize(Policy = AuthorizationPolicies.ManageOpenIdConnectScopePolicy)]
     public async Task<OpenIdConnectToken?> GetOpenIdConnectTokenAsync(
         Guid id,
+        IOpenIdConnectTokenByIdDataLoader byId,
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
-        OpenIddictTokenManager<OpenIdConnectToken> tokenManager,
         CancellationToken cancellationToken
     )
     {
-        if (!await authorization.IsAuthorizedToManageToken(claimsPrincipal, id, tokenManager, cancellationToken))
+        if (!await authorization.IsAuthorizedToManageToken(claimsPrincipal, id, cancellationToken))
         {
             return null;
         }
-
-        return await tokenManager.FindByIdAsync(id.ToString(), cancellationToken: cancellationToken);
+        return await byId.LoadAsync(id, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenSortType.cs b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenSortType.cs
new file mode 100644
index 000000000..bc5abfcda
--- /dev/null
+++ b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenSortType.cs
@@ -0,0 +1,23 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data.OpenIdConnect;
+using Metabase.GraphQl.Entities;
+
+namespace Metabase.GraphQl.OpenIdConnect.Tokens;
+
+public sealed class OpenIdConnectTokenSortType
+    : AuditableEntitySortType<OpenIdConnectToken>
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<OpenIdConnectToken> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(OpenIdConnectTokenSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+        descriptor.Field(x => x.CreationDate).Ignore();
+        descriptor.Field(x => x.ExpirationDate).Name(OpenIdConnectTokenType.ExpiredAtName);
+        descriptor.Field(x => x.RedemptionDate).Name(OpenIdConnectTokenType.RedeemedAtName);
+        descriptor.Field(x => x.Status);
+        descriptor.Field(x => x.Subject);
+        descriptor.Field(x => x.Type);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenType.cs b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenType.cs
index 4e426cb9b..fa390c47a 100644
--- a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenType.cs
@@ -6,13 +6,15 @@
 using Metabase.Data.OpenIdConnect;
 using Metabase.GraphQl.Users;
 using Metabase.GraphQl.Entities;
-using OpenIddict.Core;
 
 namespace Metabase.GraphQl.OpenIdConnect.Tokens;
 
 public sealed class OpenIdConnectTokenType
-    : EntityType<OpenIdConnectToken, OpenIdConnectTokenByIdDataLoader>
+    : EntityType<OpenIdConnectToken, IOpenIdConnectTokenByIdDataLoader>
 {
+    internal const string ExpiredAtName = "expiredAt";
+    internal const string RedeemedAtName = "redeemedAt";
+
     protected override void Configure(
         IObjectTypeDescriptor<OpenIdConnectToken> descriptor
     )
@@ -22,7 +24,14 @@ IObjectTypeDescriptor<OpenIdConnectToken> descriptor
         descriptor.Field(token => token.ReferenceId).Ignore();
         descriptor.Field(token => token.Payload).Ignore();
         descriptor.Field(token => token.ConcurrencyToken).Ignore();
+        descriptor.Field(token => token.CreationDate).Ignore(); // use `CreatedAt` instead
 
+        descriptor
+            .Field(_ => _.ExpirationDate)
+            .Name(ExpiredAtName);
+        descriptor
+            .Field(_ => _.RedemptionDate)
+            .Name(RedeemedAtName);
         descriptor
             .Field(t => t.Application)
             .Type<NonNullType<ObjectType<OpenIdConnectTokenApplicationEdge>>>()
@@ -40,10 +49,11 @@ IObjectTypeDescriptor<OpenIdConnectToken> descriptor
                 )
             );
         descriptor
-                .Field("isAuthorizedToRevokeNode")
-                .ResolveWith<TokenResolvers>(x =>
-                    TokenResolvers.IsAuthorizedToRevokeNodeAsync(default!, default!, default!, default!, default!))
-                .UseUserManager();
+            .Field("isAuthorizedToRevokeNode")
+            .Cost(1)
+            .ResolveWith<TokenResolvers>(x =>
+                TokenResolvers.IsAuthorizedToRevokeNodeAsync(default!, default!, default!, default!))
+            .UseUserManager();
     }
 
     private sealed class TokenResolvers
@@ -52,11 +62,10 @@ public static Task<bool> IsAuthorizedToRevokeNodeAsync(
             [Parent] OpenIdConnectToken token,
             ClaimsPrincipal claimsPrincipal,
             Authorization.OpenIdConnectAuthorization authorization,
-            OpenIddictTokenManager<OpenIdConnectToken> tokenManager,
             CancellationToken cancellationToken
         )
         {
-            return authorization.IsAuthorizedToManageToken(claimsPrincipal, token.Id, tokenManager, cancellationToken);
+            return authorization.IsAuthorizedToManageToken(claimsPrincipal, token.Id, cancellationToken);
         }
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/OpticalComponentSubtype.cs b/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtype.cs
similarity index 92%
rename from backend/src/GraphQl/DataX/OpticalComponentSubtype.cs
rename to backend/src/GraphQl/OpticalDataX/OpticalComponentSubtype.cs
index 161f72f28..05bc892ea 100644
--- a/backend/src/GraphQl/DataX/OpticalComponentSubtype.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtype.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.OpticalDataX;
 
 [SuppressMessage("Naming", "CA1707")]
 public enum OpticalComponentSubtype
diff --git a/backend/src/GraphQl/DataX/OpticalComponentSubtypePropositionInput.cs b/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtypePropositionInput.cs
similarity index 86%
rename from backend/src/GraphQl/DataX/OpticalComponentSubtypePropositionInput.cs
rename to backend/src/GraphQl/OpticalDataX/OpticalComponentSubtypePropositionInput.cs
index 4181e3163..db15d9aea 100644
--- a/backend/src/GraphQl/DataX/OpticalComponentSubtypePropositionInput.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtypePropositionInput.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.OpticalDataX;
 
 public sealed record OpticalComponentSubtypePropositionInput(
   OpticalComponentSubtype? EqualTo,
diff --git a/backend/src/GraphQl/DataX/OpticalComponentType.cs b/backend/src/GraphQl/OpticalDataX/OpticalComponentType.cs
similarity index 77%
rename from backend/src/GraphQl/DataX/OpticalComponentType.cs
rename to backend/src/GraphQl/OpticalDataX/OpticalComponentType.cs
index 2130cae74..6d0392f59 100644
--- a/backend/src/GraphQl/DataX/OpticalComponentType.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalComponentType.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.OpticalDataX;
 
 [SuppressMessage("Naming", "CA1707")]
 public enum OpticalComponentType
diff --git a/backend/src/GraphQl/DataX/OpticalComponentTypePropositionInput.cs b/backend/src/GraphQl/OpticalDataX/OpticalComponentTypePropositionInput.cs
similarity index 86%
rename from backend/src/GraphQl/DataX/OpticalComponentTypePropositionInput.cs
rename to backend/src/GraphQl/OpticalDataX/OpticalComponentTypePropositionInput.cs
index 6c95d03da..9000a26f6 100644
--- a/backend/src/GraphQl/DataX/OpticalComponentTypePropositionInput.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalComponentTypePropositionInput.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.OpticalDataX;
 
 public sealed record OpticalComponentTypePropositionInput(
   OpticalComponentType? EqualTo,
diff --git a/backend/src/GraphQl/OpticalDataX/OpticalData.cs b/backend/src/GraphQl/OpticalDataX/OpticalData.cs
new file mode 100644
index 000000000..d1e0625c1
--- /dev/null
+++ b/backend/src/GraphQl/OpticalDataX/OpticalData.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.Resolvers;
+using HotChocolate.Types.Relay;
+using Metabase.Data;
+using Metabase.GraphQl.DataX;
+using Metabase.GraphQl.Requests;
+using NodaTime;
+
+namespace Metabase.GraphQl.OpticalDataX;
+
+[Node(IdField = nameof(Id))]
+public sealed record OpticalData(
+    string Id,
+    Guid Uuid,
+    OffsetDateTime Timestamp,
+    string Locale,
+    Guid DatabaseId,
+    Guid ComponentId,
+    string? Name,
+    string? Description,
+    IReadOnlyList<string> Warnings,
+    Guid CreatorId,
+    OffsetDateTime CreatedAt,
+    OpticalComponentType? Type,
+    OpticalComponentSubtype? Subtype,
+    CoatedSide? CoatedSide,
+    AppliedMethod AppliedMethod,
+    IReadOnlyList<GetHttpsResource> Resources,
+    GetHttpsResourceTree ResourceTree,
+    IReadOnlyList<DataApproval> Approvals,
+    // ResponseApproval Approval,
+    IReadOnlyList<double> NearnormalHemisphericalVisibleTransmittances,
+    IReadOnlyList<double> NearnormalHemisphericalVisibleReflectances,
+    IReadOnlyList<double> NearnormalHemisphericalSolarTransmittances,
+    IReadOnlyList<double> NearnormalHemisphericalSolarReflectances,
+    IReadOnlyList<double> InfraredEmittances,
+    IReadOnlyList<double> ColorRenderingIndices,
+    IReadOnlyList<CielabColor> CielabColors
+)
+: DataX.Data(
+    Id,
+    Uuid,
+    Timestamp,
+    Locale,
+    DatabaseId,
+    ComponentId,
+    Name,
+    Description,
+    Warnings,
+    CreatorId,
+    CreatedAt,
+    AppliedMethod,
+    Resources,
+    ResourceTree,
+    Approvals
+    )
+{
+    public override DataKind Kind => DataKind.OPTICAL_DATA;
+
+    [NodeResolver]
+    public static Task<OpticalData?> GetAsync(
+        string id,
+        DataQueries dataQueries,
+        ApplicationDbContext databaseContext,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return DataX.Data.FetchNodeAsync<OpticalData>(
+            id,
+            (database, uuid, locale) => dataQueries.GetOpticalDataAsync(
+                database,
+                uuid,
+                locale,
+                resolverContext,
+                cancellationToken
+            ),
+            databaseContext,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/OpticalDataConnection.cs b/backend/src/GraphQl/OpticalDataX/OpticalDataConnection.cs
similarity index 82%
rename from backend/src/GraphQl/DataX/OpticalDataConnection.cs
rename to backend/src/GraphQl/OpticalDataX/OpticalDataConnection.cs
index 61f82e621..374158af6 100644
--- a/backend/src/GraphQl/DataX/OpticalDataConnection.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalDataConnection.cs
@@ -2,8 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using HotChocolate.Types.Pagination;
+using Metabase.GraphQl.DataX;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.OpticalDataX;
 
 public sealed record OpticalDataConnection(
     IReadOnlyList<OpticalDataEdge> Edges,
diff --git a/backend/src/GraphQl/DataX/OpticalDataEdge.cs b/backend/src/GraphQl/OpticalDataX/OpticalDataEdge.cs
similarity index 65%
rename from backend/src/GraphQl/DataX/OpticalDataEdge.cs
rename to backend/src/GraphQl/OpticalDataX/OpticalDataEdge.cs
index d864d96f2..cab889744 100644
--- a/backend/src/GraphQl/DataX/OpticalDataEdge.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalDataEdge.cs
@@ -1,6 +1,6 @@
-using System;
+using Metabase.GraphQl.DataX;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.OpticalDataX;
 
 public sealed record OpticalDataEdge(
     string Cursor,
diff --git a/backend/src/GraphQl/DataX/OpticalDataPropositionInput.cs b/backend/src/GraphQl/OpticalDataX/OpticalDataPropositionInput.cs
similarity index 92%
rename from backend/src/GraphQl/DataX/OpticalDataPropositionInput.cs
rename to backend/src/GraphQl/OpticalDataX/OpticalDataPropositionInput.cs
index 47c818191..3a642faac 100644
--- a/backend/src/GraphQl/DataX/OpticalDataPropositionInput.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalDataPropositionInput.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using Metabase.GraphQl.DataX;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.OpticalDataX;
 
 public sealed record OpticalDataPropositionInput(
     UuidPropositionInput? ComponentId,
diff --git a/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs b/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs
new file mode 100644
index 000000000..78bb125b6
--- /dev/null
+++ b/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.Resolvers;
+using HotChocolate.Types;
+using Metabase.Data;
+using Metabase.GraphQl.Requests;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.OpticalDataX;
+
+[ExtendObjectType(nameof(Query))]
+public sealed class OpticalDataQueries
+{
+    public async Task<OpticalData?> GetOpticalDataAsync(
+        Guid databaseId,
+        Guid id,
+        string? locale,
+        DataQueries dataQueries,
+        ApplicationDbContext databaseContext,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        var database = await databaseContext.Databases.AsNoTracking()
+            .Where(_ => _.Id == databaseId)
+            .SingleOrDefaultAsync(cancellationToken);
+        if (database is null)
+        {
+            return null;
+        }
+        return await dataQueries.GetOpticalDataAsync(
+            database,
+            id,
+            locale,
+            resolverContext,
+            cancellationToken
+        );
+    }
+
+    public Task<OpticalDataConnection> GetAllOpticalDataAsync(
+        OpticalDataPropositionInput? where,
+        string? locale,
+        uint? first,
+        string? after,
+        uint? last,
+        string? before,
+        DataQueries dataQueries,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return dataQueries.GetAllDataAsync<OpticalDataConnection, OpticalDataEdge, OpticalData>(
+            first,
+            after,
+            last,
+            before,
+            (edges, totalCount, pageInfo) => new OpticalDataConnection(edges, totalCount, pageInfo),
+            (node, cursor) => new OpticalDataEdge(cursor, node),
+            (database, first, after, last, before) => dataQueries.GetAllOpticalDataAsync(
+                database,
+                where,
+                locale,
+                first,
+                after,
+                last,
+                before,
+                resolverContext,
+                cancellationToken
+            ),
+            cancellationToken
+        );
+    }
+
+    public Task<bool> HasOpticalDataAsync(
+        OpticalDataPropositionInput? where,
+        string? locale,
+        DataQueries dataQueries,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return dataQueries.HasDataAsync(
+            (database) => dataQueries.HasOpticalDataAsync(
+                database,
+                where,
+                locale,
+                resolverContext,
+                cancellationToken
+            ),
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/PaginatedConnection.cs b/backend/src/GraphQl/PaginatedConnection.cs
new file mode 100644
index 000000000..f8351514b
--- /dev/null
+++ b/backend/src/GraphQl/PaginatedConnection.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut;
+using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
+using HotChocolate.Types.Pagination;
+using Metabase.Data;
+using Metabase.GraphQl.Extensions;
+
+namespace Metabase.GraphQl;
+
+public abstract class PaginatedConnection<
+    TSubject,
+    TAssociation,
+    TEdge,
+    TAssociationsByOneIdDataLoader
+>(
+    TSubject subject,
+    Func<TAssociation, string, TEdge> createEdge,
+    PagingArguments pagingArguments,
+    QueryContext<TAssociation> queryContext
+)
+    where TSubject : IEntity
+    where TAssociation : class
+    where TAssociationsByOneIdDataLoader : IDataLoader<Guid, Page<TAssociation>>
+{
+    protected TSubject Subject { get; } = subject;
+
+    [Cost(0)]
+    public ValueTask<int> GetTotalCountAsync(
+        TAssociationsByOneIdDataLoader dataLoader,
+        CancellationToken cancellationToken
+    )
+    {
+        return dataLoader
+            .With(pagingArguments, queryContext)
+            .LoadAsync(Subject.Id, cancellationToken)
+            .GetTotalCountAsync();
+    }
+
+    [Cost(0)]
+    public ValueTask<ConnectionPageInfo> GetPageInfoAsync(
+        TAssociationsByOneIdDataLoader dataLoader,
+        CancellationToken cancellationToken
+    )
+    {
+        return dataLoader
+            .With(pagingArguments, queryContext)
+            .LoadAsync(Subject.Id, cancellationToken)
+            .GetPageInfoAsync();
+    }
+
+    [Cost(0)]
+    public async IAsyncEnumerable<TEdge> GetEdgesAsync(
+        TAssociationsByOneIdDataLoader dataLoader,
+        [EnumeratorCancellation] CancellationToken cancellationToken
+    )
+    {
+        var page =
+            await dataLoader
+            .With(pagingArguments, queryContext)
+            .LoadAsync(Subject.Id, cancellationToken);
+        if (page is null)
+        {
+            yield break;
+        }
+        foreach (var entry in page.Entries)
+        {
+            yield return createEdge(entry.Item, page.CreateCursor(entry));
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/PaginatedEdge.cs b/backend/src/GraphQl/PaginatedEdge.cs
new file mode 100644
index 000000000..36766fee0
--- /dev/null
+++ b/backend/src/GraphQl/PaginatedEdge.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut;
+using HotChocolate.CostAnalysis.Types;
+
+namespace Metabase.GraphQl;
+
+public abstract record PaginatedEdge<TNode>(
+    TNode Node,
+    string Cursor
+);
+
+public abstract class PaginatedEdge<TNode, TNodeByIdDataLoader>(
+    Guid nodeId,
+    string cursor
+)
+    where TNodeByIdDataLoader : IDataLoader<Guid, TNode>
+    where TNode : notnull
+{
+    [Cost(0)]
+    public Task<TNode> GetNodeAsync(
+        TNodeByIdDataLoader byId,
+        CancellationToken cancellationToken
+    )
+    {
+        return byId.LoadRequiredAsync(nodeId, cancellationToken);
+    }
+
+    public string Cursor => cursor;
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/PaginationHelpers.cs b/backend/src/GraphQl/PaginationHelpers.cs
new file mode 100644
index 000000000..0d02b7dc5
--- /dev/null
+++ b/backend/src/GraphQl/PaginationHelpers.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Text;
+
+namespace Metabase.GraphQl;
+
+public static class PaginationHelpers
+{
+    public static string ConstructCursor(Guid id)
+    {
+        return Convert.ToBase64String(
+            Encoding.UTF8.GetBytes(
+                id.ToString("D")
+            )
+        );
+    }
+
+    public static string ConstructCursor(Guid id1, Guid id2)
+    {
+        return Convert.ToBase64String(
+            Encoding.UTF8.GetBytes(
+                $"{id1:D}:{id2:D}"
+            )
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicData.cs b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicData.cs
new file mode 100644
index 000000000..03e2aaa82
--- /dev/null
+++ b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicData.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.Resolvers;
+using HotChocolate.Types.Relay;
+using Metabase.Data;
+using Metabase.GraphQl.DataX;
+using Metabase.GraphQl.Requests;
+using NodaTime;
+
+namespace Metabase.GraphQl.PhotovoltaicDataX;
+
+[Node(IdField = nameof(Id))]
+public sealed record PhotovoltaicData(
+    string Id,
+    Guid Uuid,
+    OffsetDateTime Timestamp,
+    string Locale,
+    Guid DatabaseId,
+    Guid ComponentId,
+    string? Name,
+    string? Description,
+    IReadOnlyList<string> Warnings,
+    Guid CreatorId,
+    OffsetDateTime CreatedAt,
+    AppliedMethod AppliedMethod,
+    IReadOnlyList<GetHttpsResource> Resources,
+    GetHttpsResourceTree ResourceTree,
+    IReadOnlyList<DataApproval> Approvals
+// ResponseApproval Approval
+)
+: DataX.Data(
+    Id,
+    Uuid,
+    Timestamp,
+    Locale,
+    DatabaseId,
+    ComponentId,
+    Name,
+    Description,
+    Warnings,
+    CreatorId,
+    CreatedAt,
+    AppliedMethod,
+    Resources,
+    ResourceTree,
+    Approvals
+)
+{
+    public override DataKind Kind { get => DataKind.PHOTOVOLTAIC_DATA; }
+
+    [NodeResolver]
+    public static Task<PhotovoltaicData?> GetAsync(
+        string id,
+        DataQueries dataQueries,
+        ApplicationDbContext databaseContext,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return DataX.Data.FetchNodeAsync<PhotovoltaicData>(
+            id,
+            (database, uuid, locale) => dataQueries.GetPhotovoltaicDataAsync(
+                database,
+                uuid,
+                locale,
+                resolverContext,
+                cancellationToken
+            ),
+            databaseContext,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/PhotovoltaicDataConnection.cs b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataConnection.cs
similarity index 81%
rename from backend/src/GraphQl/DataX/PhotovoltaicDataConnection.cs
rename to backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataConnection.cs
index 70db869cc..fcaaf3cce 100644
--- a/backend/src/GraphQl/DataX/PhotovoltaicDataConnection.cs
+++ b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataConnection.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
 using HotChocolate.Types.Pagination;
+using Metabase.GraphQl.DataX;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.PhotovoltaicDataX;
 
 public sealed record PhotovoltaicDataConnection(
     IReadOnlyList<PhotovoltaicDataEdge> Edges,
diff --git a/backend/src/GraphQl/DataX/PhotovoltaicDataEdge.cs b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataEdge.cs
similarity index 65%
rename from backend/src/GraphQl/DataX/PhotovoltaicDataEdge.cs
rename to backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataEdge.cs
index d23d5e4e0..25316e7e8 100644
--- a/backend/src/GraphQl/DataX/PhotovoltaicDataEdge.cs
+++ b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataEdge.cs
@@ -1,4 +1,6 @@
-namespace Metabase.GraphQl.DataX;
+using Metabase.GraphQl.DataX;
+
+namespace Metabase.GraphQl.PhotovoltaicDataX;
 
 public sealed record PhotovoltaicDataEdge(
     string Cursor,
diff --git a/backend/src/GraphQl/DataX/PhotovoltaicDataPropositionInput.cs b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataPropositionInput.cs
similarity index 81%
rename from backend/src/GraphQl/DataX/PhotovoltaicDataPropositionInput.cs
rename to backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataPropositionInput.cs
index f0d573649..891ce3e0f 100644
--- a/backend/src/GraphQl/DataX/PhotovoltaicDataPropositionInput.cs
+++ b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataPropositionInput.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using Metabase.GraphQl.DataX;
 
-namespace Metabase.GraphQl.DataX;
+namespace Metabase.GraphQl.PhotovoltaicDataX;
 
 public sealed record PhotovoltaicDataPropositionInput(
     UuidPropositionInput? ComponentId,
diff --git a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs
new file mode 100644
index 000000000..9dd93fb23
--- /dev/null
+++ b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.Resolvers;
+using HotChocolate.Types;
+using Metabase.Data;
+using Metabase.GraphQl.Requests;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.PhotovoltaicDataX;
+
+[ExtendObjectType(nameof(Query))]
+public sealed class PhotovoltaicDataQueries
+{
+    public async Task<PhotovoltaicData?> GetPhotovoltaicDataAsync(
+        Guid databaseId,
+        Guid id,
+        string? locale,
+        DataQueries dataQueries,
+        ApplicationDbContext databaseContext,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        var database = await databaseContext.Databases.AsNoTracking()
+            .Where(_ => _.Id == databaseId)
+            .SingleOrDefaultAsync(cancellationToken);
+        if (database is null)
+        {
+            return null;
+        }
+        return await dataQueries.GetPhotovoltaicDataAsync(
+            database,
+            id,
+            locale,
+            resolverContext,
+            cancellationToken
+        );
+    }
+
+    public Task<PhotovoltaicDataConnection> GetAllPhotovoltaicDataAsync(
+        PhotovoltaicDataPropositionInput? where,
+        string? locale,
+        uint? first,
+        string? after,
+        uint? last,
+        string? before,
+        DataQueries dataQueries,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return dataQueries.GetAllDataAsync<PhotovoltaicDataConnection, PhotovoltaicDataEdge, PhotovoltaicData>(
+            first,
+            after,
+            last,
+            before,
+            (edges, totalCount, pageInfo) => new PhotovoltaicDataConnection(edges, totalCount, pageInfo),
+            (node, cursor) => new PhotovoltaicDataEdge(cursor, node),
+            (database, first, after, last, before) => dataQueries.GetAllPhotovoltaicDataAsync(
+                database,
+                where,
+                locale,
+                first,
+                after,
+                last,
+                before,
+                resolverContext,
+                cancellationToken
+            ),
+            cancellationToken
+        );
+    }
+
+    public Task<bool> HasPhotovoltaicDataAsync(
+        PhotovoltaicDataPropositionInput? where,
+        string? locale,
+        DataQueries dataQueries,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return dataQueries.HasDataAsync(
+            (database) => dataQueries.HasPhotovoltaicDataAsync(
+                database,
+                where,
+                locale,
+                resolverContext,
+                cancellationToken
+            ),
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Requests/DataQueries.cs b/backend/src/GraphQl/Requests/DataQueries.cs
new file mode 100644
index 000000000..bdc0990c6
--- /dev/null
+++ b/backend/src/GraphQl/Requests/DataQueries.cs
@@ -0,0 +1,1127 @@
+using System;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using GraphQL;
+using HotChocolate;
+using HotChocolate.Resolvers;
+using Metabase.Data;
+using Metabase.GraphQl.DataX;
+using Metabase.GraphQl.CalorimetricDataX;
+using Metabase.GraphQl.GeometricDataX;
+using Metabase.GraphQl.HygrothermalDataX;
+using Metabase.GraphQl.LifeCycleDataX;
+using Metabase.GraphQl.OpticalDataX;
+using Metabase.GraphQl.PhotovoltaicDataX;
+using Metabase.Json;
+using Microsoft.Extensions.Logging;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections.Immutable;
+using System.Linq;
+using HotChocolate.Types.Pagination;
+using Metabase.Extensions;
+using System.Text.Json.Serialization;
+
+namespace Metabase.GraphQl.Requests;
+
+public static partial class Log
+{
+    [LoggerMessage(
+        Level = LogLevel.Warning,
+        Message = "Failed with errors {Errors} to query the database {Locator} for {Request}.")]
+    public static partial void FailedWithErrors(
+        this ILogger<DataQueries> logger,
+        string Errors,
+        Uri Locator,
+        string Request
+    );
+}
+
+public sealed class DataQueries(
+    ApplicationDbContext databaseContext,
+    QueryingDatabases queryingDatabases,
+    GraphQlRequestHelper graphQlRequestHelper,
+    AppSettings appSettings,
+    ILogger<DataQueries> logger
+)
+{
+    private static readonly string[] s_calorimetricDataFileNames =
+    [
+        "DataFields.graphql",
+        "CalorimetricDataFields.graphql",
+        "CalorimetricData.graphql"
+    ];
+
+    private static readonly string[] s_geometricDataFileNames =
+    [
+        "DataFields.graphql",
+        "GeometricDataFields.graphql",
+        "GeometricData.graphql"
+    ];
+
+    private static readonly string[] s_hygrothermalDataFileNames =
+    [
+        "DataFields.graphql",
+        "HygrothermalDataFields.graphql",
+        "HygrothermalData.graphql"
+    ];
+
+    private static readonly string[] s_lifeCycleDataFileNames =
+    [
+        "DataFields.graphql",
+        "LifeCycleDataFields.graphql",
+        "LifeCycleData.graphql"
+    ];
+
+    private static readonly string[] s_opticalDataFileNames =
+    [
+        "DataFields.graphql",
+        "OpticalDataFields.graphql",
+        "OpticalData.graphql"
+    ];
+
+    private static readonly string[] s_photovoltaicDataFileNames =
+    [
+        "DataFields.graphql",
+        "PhotovoltaicDataFields.graphql",
+        "PhotovoltaicData.graphql"
+    ];
+
+    private static readonly string[] s_allCalorimetricDataFileNames =
+    [
+        "DataFields.graphql",
+        "CalorimetricDataFields.graphql",
+        "PageInfoFields.graphql",
+        "AllCalorimetricData.graphql"
+    ];
+
+    private static readonly string[] s_allGeometricDataFileNames =
+    [
+        "DataFields.graphql",
+        "GeometricDataFields.graphql",
+        "PageInfoFields.graphql",
+        "AllGeometricData.graphql"
+    ];
+
+    private static readonly string[] s_allHygrothermalDataFileNames =
+    [
+        "DataFields.graphql",
+        "HygrothermalDataFields.graphql",
+        "PageInfoFields.graphql",
+        "AllHygrothermalData.graphql"
+    ];
+
+    private static readonly string[] s_allLifeCycleDataFileNames =
+    [
+        "DataFields.graphql",
+        "LifeCycleDataFields.graphql",
+        "PageInfoFields.graphql",
+        "AllLifeCycleData.graphql"
+    ];
+
+    private static readonly string[] s_allOpticalDataFileNames =
+    [
+        "DataFields.graphql",
+        "OpticalDataFields.graphql",
+        "PageInfoFields.graphql",
+        "AllOpticalData.graphql"
+    ];
+
+    private static readonly string[] s_allPhotovoltaicDataFileNames =
+    [
+        "DataFields.graphql",
+        "PhotovoltaicDataFields.graphql",
+        "PageInfoFields.graphql",
+        "AllPhotovoltaicData.graphql"
+    ];
+
+    private static readonly string[] s_hasCalorimetricDataFileNames =
+    [
+        "HasCalorimetricData.graphql"
+    ];
+
+    private static readonly string[] s_hasGeometricDataFileNames =
+    [
+        "HasGeometricData.graphql"
+    ];
+
+    private static readonly string[] s_hasHygrothermalDataFileNames =
+    [
+        "HasHygrothermalData.graphql"
+    ];
+
+    private static readonly string[] s_hasLifeCycleDataFileNames =
+    [
+        "HasLifeCycleData.graphql"
+    ];
+
+    private static readonly string[] s_hasOpticalDataFileNames =
+    [
+        "HasOpticalData.graphql"
+    ];
+
+    private static readonly string[] s_hasPhotovoltaicDataFileNames =
+    [
+        "HasPhotovoltaicData.graphql"
+    ];
+
+    private static bool IsIgsdbDatabase(Database database)
+    {
+        return database.Id == new Guid(DataConstants.IgsdbDatabaseUuid);
+    }
+
+    private sealed record NeighboringCursors(
+        [property: JsonPropertyName("l")] string? Before,
+        [property: JsonPropertyName("r")] string? After
+    );
+
+    /// The cursor of an edge of an edge list resulting from interleaving edge
+    /// lists of various databases. The database the edge belongs to is
+    /// identified by the database ID (`DatabaseId`). The cursor of the edge
+    /// within its database (hereafter referred to be "local cursor") is
+    /// `Cursors[DatabaseId].Before` and `Cursors[DatabaseId].After` (both
+    /// values are identical in this case). For each other database with ID
+    /// `OtherId`, if for that database there is an edge in the edge list
+    /// before the current edge, then its cursor is `Cursors[OtherId].Before`,
+    /// otherwise the value is `null`, and if there is an edge after the
+    /// current edge, then its cursor is `Cursors[OtherId].After`, otherwise
+    /// `null`.
+    ///
+    /// Database X:  [1, 2, 3, 4, 5]                        (local cursors)
+    /// Database Y:  [a, b, c]                              (local cursors)
+    /// Interleaved: [1, a, 2, b, 3, c, 4, 5]               (short hand)
+    ///              [                                      (long form)
+    ///                 [(X, { X: (1, 1), Y: (null, a) })]  (0)
+    ///                 [(Y, { X: (1, 2), Y: (a, a) })]     (1)
+    ///                 [(X, { X: (2, 2), Y: (a, b) })]     (2)
+    ///                 [(X, { X: (2, 3), Y: (b, b) })]     (3)
+    ///                 [(X, { X: (3, 3), Y: (b, c) })]     (4)
+    ///                 [(X, { X: (3, 4), Y: (c, c) })]     (5)
+    ///                 [(X, { X: (4, 4), Y: (c, null) })]  (6)
+    ///                 [(X, { X: (5, 5), Y: (c, null) })]  (7)
+    ///              ]
+    ///
+    /// The values of `Before` and `After` are used for queries with `after` or
+    /// `before` pagination argument. For example, to query for edges after
+    /// `[(X, { X: (3, 4), Y: (c, c) })]` (5), database `X` is asked for edges
+    /// after `3` (the `Before` cursor) and `Y` for edges after `c` (the
+    /// `Before` cursor), and to query for edges before it, database `X` is
+    /// asked for edges before `4` (the `After` cursor) and `Y` for edges
+    /// before `c` (the `After` cursor).
+    private sealed record CompoundCursor
+    {
+        [JsonPropertyName("d")]
+        public required Guid DatabaseId { get; set; }
+
+        [JsonPropertyName("c")]
+        public required Dictionary<Guid, NeighboringCursors> Cursors { get; set; }
+    };
+
+    private static string SerializeCompoundCursor(CompoundCursor cursor)
+    {
+        return Convert.ToBase64String(
+            Encoding.UTF8.GetBytes(
+                JsonSerializer.Serialize(cursor, JsonSerializerSettings.Compact)
+            )
+        );
+    }
+
+    private static CompoundCursor? DeserializeCompoundCursor(string? cursors)
+    {
+        if (cursors is null)
+        {
+            return null;
+        }
+        return JsonSerializer.Deserialize<CompoundCursor>(
+            Encoding.UTF8.GetString(
+                Convert.FromBase64String(cursors)
+            ),
+            JsonSerializerSettings.Compact
+        );
+    }
+
+    private enum PaginationDirection
+    {
+        FORWARD,
+        BACKWARD
+    }
+
+    public async Task<TDataConnection> GetAllDataAsync<TDataConnection, TDataEdge, TDataNode>(
+        uint? first,
+        string? after,
+        uint? last,
+        string? before,
+        Func<IReadOnlyList<TDataEdge>, uint, ConnectionPageInfo, TDataConnection> createDataConnection,
+        Func<TDataNode, string, TDataEdge> createDataEdge,
+        Func<Database, uint?, string?, uint?, string?, Task<TDataConnection?>> getAllDataAsync,
+        CancellationToken cancellationToken
+    )
+        where TDataConnection : DataConnectionBase<TDataEdge>
+        where TDataEdge : DataEdgeBase<TDataNode>
+    {
+        var paginationDirection = (first, last) switch
+        {
+            (_, null) => PaginationDirection.FORWARD,
+            (null, _) => PaginationDirection.BACKWARD,
+            _ => PaginationDirection.FORWARD,
+        };
+        var compoundAfter = DeserializeCompoundCursor(after);
+        var compoundBefore = DeserializeCompoundCursor(before);
+        var databases = await databaseContext.Databases.AsNoTracking()
+            .Where(_ => _.VerificationState == Enumerations.DatabaseVerificationState.VERIFIED)
+            // on follow-up requests include only the previously included databases
+            .If(
+                compoundAfter is not null || compoundBefore is not null,
+                queryable => queryable.Where(_ =>
+                    (compoundAfter ?? compoundBefore ?? default!).Cursors.Keys.Contains(_.Id)
+                )
+            )
+            // order databases to stabilize compound cursors and the order of interleaved edges
+            .OrderBy(_ => _.CreatedAt)
+            .ToListAsync(cancellationToken);
+        if (databases.Count is 0)
+        {
+            return createDataConnection([], 0, new ConnectionPageInfo(false, false, null, null));
+        }
+        // reorder and rotate the databases get the first edge after or last edge before and so forth of the interleaved edges in the correct order
+        var beginAfterDatabaseId =
+            paginationDirection is PaginationDirection.FORWARD
+            ? compoundAfter?.DatabaseId
+            : compoundBefore?.DatabaseId;
+        var rotatedDatabases = databases
+            .IfList(paginationDirection is PaginationDirection.BACKWARD, _ => _.ToReversed())
+            .IfList(beginAfterDatabaseId is not null, _ => _.Rotate(_ => _.Id == beginAfterDatabaseId!));
+        // fetch data from the databases concurrently leaving the order intact
+        var connections = await Task.WhenAll(
+            rotatedDatabases.Select((database) =>
+                getAllDataAsync(
+                    database,
+                    first is null ? null : first + 1,
+                    compoundAfter?.Cursors.GetValueOrDefault(database.Id)?.Before,
+                    last is null ? null : last + 1,
+                    compoundBefore?.Cursors.GetValueOrDefault(database.Id)?.After
+                )
+            )
+        );
+        var databaseToConnection = rotatedDatabases
+            .Zip(connections, (database, connection) => connection is null ? null : new { databaseId = database.Id, connection })
+            .NotNull()
+            .ToDictionary(_ => _.databaseId, _ => _.connection);
+        // adapt the after and before cursors such that they can serve as seed for the next or previous edge
+        compoundAfter?.Cursors[compoundAfter.DatabaseId] = new(
+            compoundAfter.Cursors.GetValueOrDefault(compoundAfter.DatabaseId)?.Before,
+            databaseToConnection.GetValueOrDefault(compoundAfter.DatabaseId)?.Edges.GetFirstOrDefault()?.Cursor
+        );
+        compoundBefore?.Cursors[compoundBefore.DatabaseId] = new(
+            databaseToConnection.GetValueOrDefault(compoundBefore.DatabaseId)?.Edges.GetLastOrDefault()?.Cursor,
+            compoundBefore.Cursors.GetValueOrDefault(compoundBefore.DatabaseId)?.After
+        );
+        // interleave edges and replace their cursors with compound cursors (see `CompoundCursor`)
+        var edges = paginationDirection is PaginationDirection.FORWARD
+            ? databaseToConnection
+                .Select(_ =>
+                    // pair each edge with its right neighbor padding at the
+                    // end, where the first entry in each tuple is the edge and
+                    // the second its right neighbor `(edge, neighbor)`. For
+                    // example [1, 2, 3] becomes [(1, 2), (2, 3), (3, null)]
+                    _.Value.Edges.Zip(
+                        _.Value.Edges.Skip(1).Append(null),
+                        (current, after) => new { current, after }
+                    )
+                    .Select((neighboringEdges) => (neighboringEdges, databaseId: _.Key))
+                )
+                // interleave edges of various databases (from the left or
+                // left-aligned or padded right with `null`s)
+                // Database X:  [1, 2, 3, 4, 5]                        (local cursors)
+                // Database Y:  [a, b, c]                              (local cursors)
+                // Interleaved: [1, a, 2, b, 3, c, 4, 5]               (short hand)
+                //  (long form) [(1, 2), (a, b), (2, 3), (b, c), (3, 4), (c, null), (4, 5), (5, null)]
+                .Interleave()
+                // give each edge a compound cursor with enough information for
+                // using it as `after` and `before` in paginated queries:
+                //              [                                      (long form)
+                //                 [(X, { X: (1, 1), Y: (null, a) })]  (0)
+                //                 [(Y, { X: (1, 2), Y: (a, a) })]     (1)
+                //                 [(X, { X: (2, 2), Y: (a, b) })]     (2)
+                //                 [(Y, { X: (2, 3), Y: (b, b) })]     (3)
+                //                 [(X, { X: (3, 3), Y: (b, c) })]     (4)
+                //                 [(Y, { X: (3, 4), Y: (c, c) })]     (5)
+                //                 [(X, { X: (4, 4), Y: (c, null) })]  (6)
+                //                 [(X, { X: (5, 5), Y: (c, null) })]  (7)
+                //              ]
+                // if `after` were [(Y, { X: (0, 1), Y: (#, #) })], then `null`
+                // in the cursor of (0) would become `#`:
+                //                 [(X, { X: (1, 1), Y: (#, a) })]     (0)
+                .Scan(
+                    compoundAfter ?? new()
+                    {
+                        Cursors = databases.ToDictionary(
+                            _ => _.Id,
+                            _ => new NeighboringCursors(
+                                null,
+                                databaseToConnection.GetValueOrDefault(_.Id)?.Edges.GetFirstOrDefault()?.Cursor
+                            )
+                        ),
+                        DatabaseId = rotatedDatabases[^1].Id
+                    },
+                    (compoundCursor, _) =>
+                    {
+                        // adapt the cursor for the current edge
+                        compoundCursor.Cursors[_.databaseId] = new(_.neighboringEdges.current.Cursor, _.neighboringEdges.current.Cursor);
+                        compoundCursor.DatabaseId = _.databaseId;
+                        var currentEdgeCursor = SerializeCompoundCursor(compoundCursor);
+                        // adapt the cursor for the edge coming after
+                        compoundCursor.Cursors[_.databaseId] = new(_.neighboringEdges.current.Cursor, _.neighboringEdges.after?.Cursor);
+                        return (compoundCursor, createDataEdge(_.neighboringEdges.current.Node, currentEdgeCursor));
+                    }
+                )
+                .ToList()
+            : databaseToConnection
+                .Select(_ =>
+                    // pair each edge with its left neighbor padding at the
+                    // beginning, where the second entry in each tuple is the
+                    // edge and the first its left neighbor `(neighbor, edge)`.
+                    // For example [1, 2, 3] becomes [(null, 1), (1, 2), (2, 3)].
+                    // By reversing it before interleaving and scanning it with
+                    // the edges of other databases, the edges are iterated in
+                    // reverse, that is, from the end to the beginning.
+                    _.Value.Edges.Prepend(null).SkipLast(1).Zip(
+                        _.Value.Edges,
+                        (before, current) => new { before, current }
+                    )
+                    .Reverse()
+                    .Select((neighboringEdges) => (neighboringEdges, databaseId: _.Key)))
+                // interleave edges of various databases (from the right or
+                // right-aligned or padded left with `null`s)
+                // Database X:           [1, 2, 3, 4, 5]               (local cursors)
+                // Database Y:                 [a, b, c]               (local cursors)
+                // Interleaved: [1, 2, a, 3, b, 4, c, 5]               (short hand)
+                //  (long form) [(null, 1), (1, 2), (null, a), (2, 3), (a, b), (3, 4), (b, c), (4, 5)]
+                .Interleave()
+                // give each edge a compound cursor with enough information for
+                // using it as `after` and `before` in paginated queries
+                //              [                                      (long form)
+                //                 [(X, { X: (1, 1), Y: (null, a) })]  (0)
+                //                 [(X, { X: (2, 2), Y: (null, a) })]  (1)
+                //                 [(Y, { X: (2, 3), Y: (a, a) })]     (2)
+                //                 [(X, { X: (3, 3), Y: (a, b) })]     (3)
+                //                 [(Y, { X: (3, 4), Y: (b, b) })]     (4)
+                //                 [(X, { X: (4, 4), Y: (b, c) })]     (5)
+                //                 [(Y, { X: (4, 5), Y: (c, c) })]     (6)
+                //                 [(X, { X: (5, 5), Y: (c, null) })]  (7)
+                //              ]
+                // if `before` were [(Y, { X: (5, 6), Y: (d, d) })], then `null`
+                // in the cursor of (7) would become `d`:
+                //                 [(X, { X: (5, 5), Y: (c, d) })]     (7)
+                .Scan(
+                    compoundBefore ?? new()
+                    {
+                        Cursors = databases.ToDictionary(
+                            _ => _.Id,
+                            _ => new NeighboringCursors(
+                                databaseToConnection.GetValueOrDefault(_.Id)?.Edges.GetFirstOrDefault()?.Cursor,
+                                null
+                            )
+                        ),
+                        DatabaseId = rotatedDatabases[^1].Id
+                    },
+                    (compoundCursor, _) =>
+                    {
+                        // adapt the cursor for the current edge
+                        compoundCursor.Cursors[_.databaseId] = new(_.neighboringEdges.current.Cursor, _.neighboringEdges.current.Cursor);
+                        compoundCursor.DatabaseId = _.databaseId;
+                        var currentEdgeCursor = SerializeCompoundCursor(compoundCursor);
+                        // adapt the cursor for the edge coming before
+                        compoundCursor.Cursors[_.databaseId] = new(_.neighboringEdges.before?.Cursor, _.neighboringEdges.current.Cursor);
+                        return (compoundCursor, createDataEdge(_.neighboringEdges.current.Node, currentEdgeCursor));
+                    }
+                )
+                // undo the reversal of the edges above
+                .Reverse()
+                .ToList();
+        // clamp the edges taking only the first `first` and the last `last` (or the maximum page size)
+        var cappedFirst = (int)Math.Min(first ?? GraphQlConstants.MaximumPageSize, GraphQlConstants.MaximumPageSize);
+        var cappedLast = (int)Math.Min(last ?? GraphQlConstants.MaximumPageSize, GraphQlConstants.MaximumPageSize);
+        var clampedEdges =
+            ((first, last) switch
+            {
+                (_, null) => edges.Take(cappedFirst),
+                (null, _) => edges.TakeLast(cappedLast),
+                _ => edges.Take(cappedFirst).TakeLast(cappedLast)
+            })
+            .ToList()
+            .AsReadOnly();
+        // compute total cound and page info
+        var totalCount = connections.Sum(_ => _?.TotalCount ?? 0);
+        var pageInfo = new ConnectionPageInfo(
+            // there is a next page if edges were removed from the end
+            hasNextPage: (clampedEdges.Count > 0 && clampedEdges[^1] != edges[^1]) || connections.Any(_ => _?.PageInfo.HasNextPage ?? false),
+            // there is a previous page if edges were removed from the beginning
+            hasPreviousPage: (clampedEdges.Count > 0 && clampedEdges[0] != edges[0]) || connections.Any(_ => _?.PageInfo.HasPreviousPage ?? false),
+            startCursor: clampedEdges.Count is 0 ? null : clampedEdges[0].Cursor,
+            endCursor: clampedEdges.Count is 0 ? null : clampedEdges[^1].Cursor
+        );
+        return createDataConnection(clampedEdges, (uint)totalCount, pageInfo);
+    }
+
+    public async Task<bool> HasDataAsync(
+        Func<Database, Task<bool?>> hasDataAsync,
+        CancellationToken cancellationToken
+    )
+    {
+        var databases = await databaseContext.Databases.AsNoTracking().ToListAsync(cancellationToken);
+        var hasData = await Task.WhenAll(
+            databases.Select((database) =>
+                hasDataAsync(database)
+            )
+        );
+        return hasData.Any(_ => _ ?? false);
+    }
+
+    public async Task<IData?> GetDataAsync(
+        Database database,
+        Guid id,
+        DataKind kind,
+        string? locale,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return kind switch
+        {
+            DataKind.CALORIMETRIC_DATA => await GetCalorimetricDataAsync(database, id, locale, resolverContext, cancellationToken),
+            DataKind.GEOMETRIC_DATA => await GetGeometricDataAsync(database, id, locale, resolverContext, cancellationToken),
+            DataKind.HYGROTHERMAL_DATA => await GetHygrothermalDataAsync(database, id, locale, resolverContext, cancellationToken),
+            DataKind.LIFE_CYCLE_DATA => await GetLifeCycleDataAsync(database, id, locale, resolverContext, cancellationToken),
+            DataKind.OPTICAL_DATA => await GetOpticalDataAsync(database, id, locale, resolverContext, cancellationToken),
+            DataKind.PHOTOVOLTAIC_DATA => await GetPhotovoltaicDataAsync(database, id, locale, resolverContext, cancellationToken),
+            _ => throw new ArgumentOutOfRangeException($"The data kind {kind} is not supported.")
+        };
+    }
+
+    public async Task<bool?> HasDataAsync(
+        Database database,
+        DataKind kind,
+        DataPropositionInput? where,
+        string? locale,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return kind switch
+        {
+            DataKind.CALORIMETRIC_DATA => await HasCalorimetricDataAsync(database, where?.ToCalorimetricInput(), locale, resolverContext, cancellationToken),
+            DataKind.GEOMETRIC_DATA => await HasGeometricDataAsync(database, where?.ToGeometricInput(), locale, resolverContext, cancellationToken),
+            DataKind.HYGROTHERMAL_DATA => await HasHygrothermalDataAsync(database, where?.ToHygrothermalInput(), locale, resolverContext, cancellationToken),
+            DataKind.LIFE_CYCLE_DATA => await HasLifeCycleDataAsync(database, where?.ToLifeCycleInput(), locale, resolverContext, cancellationToken),
+            DataKind.OPTICAL_DATA => await HasOpticalDataAsync(database, where?.ToOpticalInput(), locale, resolverContext, cancellationToken),
+            DataKind.PHOTOVOLTAIC_DATA => await HasPhotovoltaicDataAsync(database, where?.ToPhotovoltaiInput(), locale, resolverContext, cancellationToken),
+            _ => throw new ArgumentOutOfRangeException($"The data kind {kind} is not supported.")
+        };
+    }
+
+    public async Task<CalorimetricData?> GetCalorimetricDataAsync(
+        Database database,
+        Guid id,
+        string? locale,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<CalorimetricDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_calorimetricDataFileNames
+                        ),
+                        new
+                        {
+                            id,
+                            locale
+                        },
+                        nameof(CalorimetricData)
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.CalorimetricData;
+    }
+
+    public async Task<GeometricData?> GetGeometricDataAsync(
+        Database database,
+        Guid id,
+        string? locale,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<GeometricDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_geometricDataFileNames
+                        ),
+                        new
+                        {
+                            id,
+                            locale
+                        },
+                        nameof(GeometricData)
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.GeometricData;
+    }
+
+    public async Task<HygrothermalData?> GetHygrothermalDataAsync(
+        Database database,
+        Guid id,
+        string? locale,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<HygrothermalDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_hygrothermalDataFileNames
+                        ),
+                        new
+                        {
+                            id,
+                            locale
+                        },
+                        nameof(HygrothermalData)
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.HygrothermalData;
+    }
+
+    public async Task<LifeCycleData?> GetLifeCycleDataAsync(
+        Database database,
+        Guid id,
+        string? locale,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<LifeCycleDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_lifeCycleDataFileNames
+                        ),
+                        new
+                        {
+                            id,
+                            locale
+                        },
+                        nameof(LifeCycleData)
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.LifeCycleData;
+    }
+
+
+    public async Task<OpticalData?> GetOpticalDataAsync(
+        Database database,
+        Guid id,
+        string? locale,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<OpticalDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_opticalDataFileNames
+                        ),
+                        new
+                        {
+                            id,
+                            locale
+                        },
+                        nameof(OpticalData)
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.OpticalData;
+    }
+
+    public async Task<PhotovoltaicData?> GetPhotovoltaicDataAsync(
+        Database database,
+        Guid id,
+        string? locale,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<PhotovoltaicDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_photovoltaicDataFileNames
+                        ),
+                        new
+                        {
+                            id,
+                            locale
+                        },
+                        nameof(PhotovoltaicData)
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.PhotovoltaicData;
+    }
+
+    public async Task<CalorimetricDataConnection?> GetAllCalorimetricDataAsync(
+        Database database,
+        CalorimetricDataPropositionInput? where,
+        string? locale,
+        uint? first,
+        string? after,
+        uint? last,
+        string? before,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<AllCalorimetricDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_allCalorimetricDataFileNames
+                        ),
+                        new
+                        {
+                            where,
+                            locale,
+                            first,
+                            after,
+                            last,
+                            before
+                        },
+                        "AllCalorimetricData"
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.AllCalorimetricData;
+    }
+
+    public async Task<GeometricDataConnection?> GetAllGeometricDataAsync(
+        Database database,
+        GeometricDataPropositionInput? where,
+        string? locale,
+        uint? first,
+        string? after,
+        uint? last,
+        string? before,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<AllGeometricDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_allGeometricDataFileNames),
+                        new
+                        {
+                            where,
+                            locale,
+                            first,
+                            after,
+                            last,
+                            before
+                        },
+                        "AllGeometricData"
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.AllGeometricData;
+    }
+
+    public async Task<HygrothermalDataConnection?> GetAllHygrothermalDataAsync(
+        Database database,
+        HygrothermalDataPropositionInput? where,
+        string? locale,
+        uint? first,
+        string? after,
+        uint? last,
+        string? before,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<AllHygrothermalDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_allHygrothermalDataFileNames
+                        ),
+                        new
+                        {
+                            where,
+                            locale,
+                            first,
+                            after,
+                            last,
+                            before
+                        },
+                        "AllHygrothermalData"
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.AllHygrothermalData;
+    }
+
+    public async Task<LifeCycleDataConnection?> GetAllLifeCycleDataAsync(
+        Database database,
+        LifeCycleDataPropositionInput? where,
+        string? locale,
+        uint? first,
+        string? after,
+        uint? last,
+        string? before,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<AllLifeCycleDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_allLifeCycleDataFileNames
+                        ),
+                        new
+                        {
+                            where,
+                            locale,
+                            first,
+                            after,
+                            last,
+                            before
+                        },
+                        "AllLifeCycleData"
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.AllLifeCycleData;
+    }
+
+    public async Task<OpticalDataConnection?> GetAllOpticalDataAsync(
+        Database database,
+        OpticalDataPropositionInput? where,
+        string? locale,
+        uint? first,
+        string? after,
+        uint? last,
+        string? before,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<AllOpticalDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_allOpticalDataFileNames),
+                        new
+                        {
+                            where,
+                            locale,
+                            first,
+                            after,
+                            last,
+                            before
+                        },
+                        "AllOpticalData"
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.AllOpticalData;
+    }
+
+    public async Task<PhotovoltaicDataConnection?> GetAllPhotovoltaicDataAsync(
+        Database database,
+        PhotovoltaicDataPropositionInput? where,
+        string? locale,
+        uint? first,
+        string? after,
+        uint? last,
+        string? before,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<AllPhotovoltaicDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_allPhotovoltaicDataFileNames
+                        ),
+                        new
+                        {
+                            where,
+                            locale,
+                            first,
+                            after,
+                            last,
+                            before
+                        },
+                        "AllPhotovoltaicData"
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.AllPhotovoltaicData;
+    }
+
+    public async Task<bool?> HasCalorimetricDataAsync(
+        Database database,
+        CalorimetricDataPropositionInput? where,
+        string? locale,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<HasCalorimetricDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_hasCalorimetricDataFileNames
+                        ),
+                        new
+                        {
+                            where,
+                            locale
+                        },
+                        "HasCalorimetricData"
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.HasCalorimetricData;
+    }
+
+    public async Task<bool?> HasGeometricDataAsync(
+        Database database,
+        GeometricDataPropositionInput? where,
+        string? locale,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<HasGeometricDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_hasGeometricDataFileNames
+                        ),
+                        new
+                        {
+                            where,
+                            locale
+                        },
+                        "HasGeometricData"
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.HasGeometricData;
+    }
+
+    public async Task<bool?> HasHygrothermalDataAsync(
+        Database database,
+        HygrothermalDataPropositionInput? where,
+        string? locale,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<HasHygrothermalDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_hasHygrothermalDataFileNames
+                        ),
+                        new
+                        {
+                            where,
+                            locale
+                        },
+                        "HasHygrothermalData"
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.HasHygrothermalData;
+    }
+
+    public async Task<bool?> HasLifeCycleDataAsync(
+        Database database,
+        LifeCycleDataPropositionInput? where,
+        string? locale,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<HasLifeCycleDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_hasLifeCycleDataFileNames
+                        ),
+                        new
+                        {
+                            where,
+                            locale
+                        },
+                        "HasLifeCycleData"
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.HasLifeCycleData;
+    }
+
+    public async Task<bool?> HasOpticalDataAsync(
+        Database database,
+        OpticalDataPropositionInput? where,
+        string? locale,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<HasOpticalDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_hasOpticalDataFileNames
+                        ),
+                        new
+                        {
+                            where,
+                            locale
+                        },
+                        "HasOpticalData"
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.HasOpticalData;
+    }
+
+    public async Task<bool?> HasPhotovoltaicDataAsync(
+        Database database,
+        PhotovoltaicDataPropositionInput? where,
+        string? locale,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return (await QueryDatabase<HasPhotovoltaicDataData>(
+                    database,
+                    new GraphQLRequest(
+                        await QueryingDatabases.ConstructQuery(
+                            s_hasPhotovoltaicDataFileNames
+                        ),
+                        new
+                        {
+                            where,
+                            locale
+                        },
+                        "HasPhotovoltaicData"
+                    ),
+                    resolverContext,
+                    cancellationToken
+                )
+            )?.HasPhotovoltaicData;
+    }
+
+    private Task<TGraphQlResponse?> QueryDatabase<TGraphQlResponse>(
+        Database database,
+        GraphQLRequest request,
+        IResolverContext resolverContext,
+        CancellationToken cancellationToken
+    )
+    where TGraphQlResponse : class
+    {
+        return graphQlRequestHelper.TransformExceptionsAsync(
+            async () =>
+            {
+                var deserializedGraphQlResponse =
+                    await queryingDatabases.QueryDatabase<TGraphQlResponse>(
+                        database,
+                        request,
+                        cancellationToken,
+                        IsIgsdbDatabase(database) ? appSettings.Igsdb.ApiToken : null
+                    );
+                if (deserializedGraphQlResponse.Errors?.Length >= 1)
+                {
+                    logger.FailedWithErrors(
+                        JsonSerializer.Serialize(deserializedGraphQlResponse.Errors),
+                        database.Locator,
+                        JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)
+                    );
+                    foreach (var error in deserializedGraphQlResponse.Errors)
+                    {
+                        var errorBuilder = ErrorBuilder.New()
+                            .SetCode("DATABASE_QUERY_ERROR")
+                            // .SetPath(error.Path) // TODO Add the error path. Just using `error.Path` does not work as it contains non-"GraphQlName"s according to HotChocolate sometimes.
+                            .SetMessage(
+                                $"The GraphQL response received from the database {database.Locator} for the request {JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)} reported the error {error.Message}.");
+                        if (error.Extensions is not null)
+                        {
+                            foreach (var (key, value) in error.Extensions)
+                            {
+                                errorBuilder.SetExtension(key, value);
+                            }
+                        }
+                        // TODO Add `error.Locations` to `errorBuilder`.
+                        resolverContext.ReportError(errorBuilder.Build());
+                    }
+                }
+                return deserializedGraphQlResponse.Data;
+            },
+            database.Locator,
+            request,
+            resolverContext
+        );
+    }
+
+    private sealed record OpticalDataData(OpticalData OpticalData);
+    private sealed record HygrothermalDataData(HygrothermalData HygrothermalData);
+    private sealed record LifeCycleDataData(LifeCycleData LifeCycleData);
+    private sealed record CalorimetricDataData(CalorimetricData CalorimetricData);
+    private sealed record PhotovoltaicDataData(PhotovoltaicData PhotovoltaicData);
+    private sealed record GeometricDataData(GeometricData GeometricData);
+    private sealed record AllOpticalDataData(OpticalDataConnection AllOpticalData);
+    private sealed record AllHygrothermalDataData(HygrothermalDataConnection AllHygrothermalData);
+    private sealed record AllLifeCycleDataData(LifeCycleDataConnection AllLifeCycleData);
+    private sealed record AllCalorimetricDataData(CalorimetricDataConnection AllCalorimetricData);
+    private sealed record AllGeometricDataData(GeometricDataConnection AllGeometricData);
+    private sealed record AllPhotovoltaicDataData(PhotovoltaicDataConnection AllPhotovoltaicData);
+    private sealed record HasOpticalDataData(bool HasOpticalData);
+    private sealed record HasCalorimetricDataData(bool HasCalorimetricData);
+    private sealed record HasGeometricDataData(bool HasGeometricData);
+    private sealed record HasHygrothermalDataData(bool HasHygrothermalData);
+    private sealed record HasLifeCycleDataData(bool HasLifeCycleData);
+    private sealed record HasPhotovoltaicDataData(bool HasPhotovoltaicData);
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Requests/GraphQlRequestHelper.cs b/backend/src/GraphQl/Requests/GraphQlRequestHelper.cs
new file mode 100644
index 000000000..5eeeb3e4c
--- /dev/null
+++ b/backend/src/GraphQl/Requests/GraphQlRequestHelper.cs
@@ -0,0 +1,125 @@
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Text.Json;
+using System.Threading.Tasks;
+using GraphQL;
+using HotChocolate;
+using HotChocolate.Resolvers;
+using Metabase.Json;
+using Microsoft.Extensions.Logging;
+
+namespace Metabase.GraphQl.Requests;
+
+public static partial class Log
+{
+    [LoggerMessage(
+        Level = LogLevel.Error,
+        Message = "Failed with status code {StatusCode} to request {Locator} for {Request}.")]
+    public static partial void FailedWithStatusCode(
+        this ILogger<GraphQlRequestHelper> logger,
+        Exception exception,
+        HttpStatusCode? StatusCode,
+        Uri Locator,
+        string Request
+    );
+
+    [LoggerMessage(
+        Level = LogLevel.Error,
+        Message = "Failed to deserialize GraphQL response of request to {Locator} for {Request}. The details given are: Zero-based number of bytes read within the current line before the exception are {BytePositionInLine}, zero-based number of lines read before the exception are {LineNumber}, message that describes the current exception is '{Message}', path within the JSON where the exception was encountered is {Path}.")]
+    public static partial void FailedToDeserialize(
+        this ILogger<GraphQlRequestHelper> logger,
+        Exception exception,
+        Uri Locator,
+        string Request,
+        long? BytePositionInLine,
+        long? LineNumber,
+        string Message,
+        string? Path
+    );
+
+    [LoggerMessage(
+        Level = LogLevel.Error,
+        Message = "Failed to request {Locator} for {Request} or failed to deserialize the response.")]
+    public static partial void FailedToRequestOrDeserialize(
+        this ILogger<GraphQlRequestHelper> logger,
+        Exception exception,
+        Uri Locator,
+        string Request
+    );
+}
+
+public sealed class GraphQlRequestHelper(
+    ILogger<GraphQlRequestHelper> logger
+)
+{
+    public async Task<T?> TransformExceptionsAsync<T>(
+        Func<Task<T>> action,
+        Uri databaseLocator,
+        GraphQLRequest request,
+        IResolverContext resolverContext
+    )
+    where T : class
+    {
+        try
+        {
+            return await action();
+        }
+        catch (HttpRequestException exception)
+        {
+            logger.FailedWithStatusCode(
+                exception,
+                exception.StatusCode,
+                databaseLocator,
+                JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)
+            );
+            resolverContext.ReportError(
+                ErrorBuilder.New()
+                    .SetCode("EXTERNAL_GRAPHQL_REQUEST_FAILED")
+                    .SetPath(resolverContext.Path)
+                    .SetMessage($"Failed with status code '{exception.StatusCode}' to request the endpoint '{databaseLocator}' for {JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)}.")
+                    .SetException(exception)
+                    .Build()
+            );
+            return null;
+        }
+        catch (JsonException exception)
+        {
+            logger.FailedToDeserialize(
+                exception,
+                databaseLocator,
+                JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl),
+                exception.BytePositionInLine,
+                exception.LineNumber,
+                exception.Message,
+                exception.Path
+            );
+            resolverContext.ReportError(
+                ErrorBuilder.New()
+                    .SetCode("JSON_DESERIALIZATION_FAILED")
+                    .SetPath(resolverContext.Path) // TODO Add the error path. I would do it as follows as a workaround, however splitting the path at '.' is wrong in general: .SetPath(resolverContext.Path.ToList().Concat(e.Path?.Split('.') ?? []).ToList())
+                    .SetMessage($"Failed to deserialize the GraphQL response of the request to the endpoint '{databaseLocator}' for {JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)}. The details given are: Zero-based number of bytes read within the current line before the exception are '{exception.BytePositionInLine}', zero-based number of lines read before the exception are '{exception.LineNumber}', message that describes the current exception is \"{exception.Message}\", path within the JSON where the exception was encountered is '{exception.Path}'.")
+                    .SetException(exception)
+                    .Build()
+            );
+            return null;
+        }
+        catch (Exception exception)
+        {
+            logger.FailedToRequestOrDeserialize(
+                exception,
+                databaseLocator,
+                JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)
+            );
+            resolverContext.ReportError(
+                ErrorBuilder.New()
+                    .SetCode("DATABASE_REQUEST_FAILED")
+                    .SetPath(resolverContext.Path)
+                    .SetMessage($"Failed to request {databaseLocator} for {JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)} or failed to deserialize the response.")
+                    .SetException(exception)
+                    .Build()
+            );
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/Services/QueryingDatabases.cs b/backend/src/GraphQl/Requests/QueryingDatabases.cs
similarity index 99%
rename from backend/src/Services/QueryingDatabases.cs
rename to backend/src/GraphQl/Requests/QueryingDatabases.cs
index 822ff8ffe..e6294c9e9 100644
--- a/backend/src/Services/QueryingDatabases.cs
+++ b/backend/src/GraphQl/Requests/QueryingDatabases.cs
@@ -21,7 +21,7 @@
 using static OpenIddict.Abstractions.OpenIddictConstants;
 using static OpenIddict.Abstractions.OpenIddictExceptions;
 
-namespace Metabase.Services;
+namespace Metabase.GraphQl.Requests;
 
 public static partial class Log
 {
@@ -190,7 +190,6 @@ await httpClient.PostAsync(
                 $"The status code is not {HttpStatusCode.OK} but {httpResponseMessage.StatusCode}.", null,
                 httpResponseMessage.StatusCode);
         }
-
         // We could use `httpResponseMessage.Content.ReadFromJsonAsync<GraphQL.GraphQLResponse<TGraphQlResponse>>` which would make debugging more difficult though, https://docs.microsoft.com/en-us/dotnet/api/system.net.http.json.httpcontentjsonextensions.readfromjsonasync?view=net-5.0#System_Net_Http_Json_HttpContentJsonExtensions_ReadFromJsonAsync__1_System_Net_Http_HttpContent_System_Text_Json_JsonSerializerOptions_System_Threading_CancellationToken_
         using var graphQlResponseStream =
             await httpResponseMessage.Content
diff --git a/backend/src/GraphQl/LocaleType.cs b/backend/src/GraphQl/Scalars/LocaleType.cs
similarity index 98%
rename from backend/src/GraphQl/LocaleType.cs
rename to backend/src/GraphQl/Scalars/LocaleType.cs
index 770cb0fc2..02297c5cc 100644
--- a/backend/src/GraphQl/LocaleType.cs
+++ b/backend/src/GraphQl/Scalars/LocaleType.cs
@@ -2,7 +2,7 @@
 using HotChocolate.Types;
 
 // TODO Maybe use an enumeration as runtime type instead of string (and fallback to english when the given one does not exist).namespace Database.GraphQl
-namespace Metabase.GraphQl;
+namespace Metabase.GraphQl.Scalars;
 
 /// <summary>
 ///     [BCP 47](https://tools.ietf.org/html/bcp47)
diff --git a/backend/src/GraphQl/Scalars/MyUriType.cs b/backend/src/GraphQl/Scalars/MyUriType.cs
new file mode 100644
index 000000000..c2ae572d0
--- /dev/null
+++ b/backend/src/GraphQl/Scalars/MyUriType.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Text.Json;
+using HotChocolate.Features;
+using HotChocolate.Language;
+using HotChocolate.Text.Json;
+using Metabase.GraphQl;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace HotChocolate.Types;
+
+// Inspired by https://github.com/ChilliCream/graphql-platform/blob/main/src/HotChocolate/Core/src/Types/Types/Scalars/UriType.cs
+/// <summary>
+/// [RFC 3986](https://tools.ietf.org/html/rfc3986)
+/// and
+/// [RFC 3987](https://tools.ietf.org/html/rfc3987)
+/// compliant
+/// [absolute Uniform Resource Locator (URL)](https://tools.ietf.org/html/rfc3986#section-4.3)
+/// string with optional
+/// [fragment identifier](https://tools.ietf.org/html/rfc3986#section-3.5).
+/// [Valid values are for example](https://datatracker.ietf.org/doc/html/rfc3986#section-1.1.2)
+/// `ftp://ftp.is.co.za/rfc/rfc1808.txt`, `http://www.ietf.org/rfc/rfc2396.txt`,
+/// `ldap://[2001:db8::7]/c=GB?objectClass?one`, `mailto:John.Doe@example.com`,
+/// `news:comp.infosystems.www.servers.unix`, `tel:+1-816-555-1212`,
+/// `telnet://192.0.2.16:80/`,
+/// `urn:oasis:names:specification:docbook:dtd:xml:4.1.2`
+/// 
+/// See also
+/// [URL Living Standard](https://url.spec.whatwg.org/#absolute-url-with-fragment-string)
+/// and
+/// [Identifying resources on the Web](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web).
+/// </summary>
+/// <seealso href="https://tools.ietf.org/html/rfc3986">Specification</seealso>
+public sealed class MyUriType : ScalarType<Uri, StringValueNode>
+{
+    private const string ScalarName = "Url";
+
+    private const string SpecifiedByUri = "https://tools.ietf.org/html/rfc3986";
+
+    public MyUriType(
+        string name,
+        string? description = null,
+        BindingBehavior bind = BindingBehavior.Explicit)
+        : base(name, bind)
+    {
+        Description = description;
+        SpecifiedBy = new Uri(SpecifiedByUri);
+    }
+
+    /// </summary>
+    [ActivatorUtilitiesConstructor]
+    public MyUriType()
+        : this(
+            ScalarName,
+            $"The `{ScalarName}` scalar type represents a Uniform Resource Identifier (URI) as defined by RFC 3986.",
+            BindingBehavior.Implicit)
+    {
+    }
+
+    /// <inheritdoc />
+    protected override Uri OnCoerceInputLiteral(StringValueNode valueLiteral)
+    {
+        if (TryParseUri(valueLiteral.Value, out var value))
+        {
+            return value;
+        }
+
+        throw GraphQlThrowHelper.ScalarCannotCoerceInputLiteral(this, valueLiteral);
+    }
+
+    /// <inheritdoc />
+    protected override Uri OnCoerceInputValue(JsonElement inputValue, IFeatureProvider context)
+    {
+        if (TryParseUri(inputValue.GetString()!, out var value))
+        {
+            return value;
+        }
+
+        throw GraphQlThrowHelper.ScalarCannotCoerceInputValue(this, inputValue);
+    }
+
+    /// <inheritdoc />
+    protected override void OnCoerceOutputValue(Uri runtimeValue, ResultElement resultValue)
+    {
+        var serialized = runtimeValue.IsAbsoluteUri
+            ? runtimeValue.AbsoluteUri
+            : runtimeValue.ToString();
+        resultValue.SetStringValue(serialized);
+    }
+
+    /// <inheritdoc />
+    protected override StringValueNode OnValueToLiteral(Uri runtimeValue)
+    {
+        var value = runtimeValue.IsAbsoluteUri
+            ? runtimeValue.AbsoluteUri
+            : runtimeValue.ToString();
+        return new StringValueNode(value);
+    }
+
+    private static bool TryParseUri(string value, out Uri uri)
+    {
+        if (!Uri.TryCreate(value, UriKind.RelativeOrAbsolute, out var parsedUri))
+        {
+            uri = null!;
+            return false;
+        }
+        uri = parsedUri;
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Scalars/NonNegativeIntType.cs b/backend/src/GraphQl/Scalars/NonNegativeIntType.cs
new file mode 100644
index 000000000..972a8d191
--- /dev/null
+++ b/backend/src/GraphQl/Scalars/NonNegativeIntType.cs
@@ -0,0 +1,71 @@
+using System.Text.Json;
+using HotChocolate.Language;
+using HotChocolate.Text.Json;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace HotChocolate.Types;
+
+/// <summary>
+/// <para>
+/// The NonNegativeInt scalar type represents an unsigned 32‐bit numeric
+/// non‐fractional value. Response formats that support an unsigned 32‐bit
+/// integer or a number type should use that type to represent this scalar.
+/// </para>
+/// </summary>
+public sealed class NonNegativeIntType
+: IntegerTypeBase<uint>
+{
+    public const string ScalarName = "NonNegativeInt";
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="NonNegativeIntType"/> class.
+    /// </summary>
+    public NonNegativeIntType(uint min, uint max)
+        : this(
+            ScalarName,
+            $"The `{ScalarName}` scalar type represents an unsigned 32-bit numeric non-fractional value.",
+            min,
+            max,
+            BindingBehavior.Implicit)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="NonNegativeIntType"/> class.
+    /// </summary>
+    public NonNegativeIntType(
+        string name,
+        string? description = null,
+        uint min = uint.MinValue,
+        uint max = uint.MaxValue,
+        BindingBehavior bind = BindingBehavior.Explicit)
+        : base(name, min, max, bind)
+    {
+        Description = description;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="NonNegativeIntType"/> class.
+    /// </summary>
+    [ActivatorUtilitiesConstructor]
+    public NonNegativeIntType()
+        : this(uint.MinValue, uint.MaxValue)
+    {
+    }
+
+    /// <inheritdoc />
+    protected override uint OnCoerceInputLiteral(IntValueNode valueLiteral)
+        => valueLiteral.ToUInt32();
+
+    /// <inheritdoc />
+    protected override uint OnCoerceInputValue(JsonElement inputValue)
+        => inputValue.GetUInt32();
+
+    /// <inheritdoc />
+    protected override void OnCoerceOutputValue(uint runtimeValue, ResultElement resultValue)
+        => resultValue.SetNumberValue(runtimeValue);
+
+    /// <inheritdoc />
+    protected override IValueNode OnValueToLiteral(uint runtimeValue)
+        => new IntValueNode(runtimeValue);
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Sorting.cs b/backend/src/GraphQl/Sorting.cs
new file mode 100644
index 000000000..75c68bb46
--- /dev/null
+++ b/backend/src/GraphQl/Sorting.cs
@@ -0,0 +1,18 @@
+using GreenDonut.Data;
+using Metabase.Data;
+
+namespace Metabase.GraphQl;
+
+public static class Sorting
+{
+    public static SortDefinition<TEntity> DefaultEntityOrder<TEntity>(
+        SortDefinition<TEntity> sort
+    )
+    where TEntity : class, IEntity//, IAuditable
+    {
+        // always sort by primary key to make pagination cursors unique
+        return sort
+            // .IfEmpty(_ => _.AddDescending(_ => _.CreatedAt))
+            .AddDescending(_ => _.Id);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/UserMethodDevelopers/AddUserMethodDeveloperPayload.cs b/backend/src/GraphQl/UserMethodDevelopers/AddUserMethodDeveloperPayload.cs
index 8a3dcc892..fbc888cbe 100644
--- a/backend/src/GraphQl/UserMethodDevelopers/AddUserMethodDeveloperPayload.cs
+++ b/backend/src/GraphQl/UserMethodDevelopers/AddUserMethodDeveloperPayload.cs
@@ -11,7 +11,11 @@ public AddUserMethodDeveloperPayload(
         UserMethodDeveloper userMethodDeveloper
     )
     {
-        DevelopedMethodEdge = new UserDevelopedMethodEdge(userMethodDeveloper);
+        DevelopedMethodEdge = new UserDevelopedMethodEdge(
+            userMethodDeveloper,
+            PaginationHelpers.ConstructCursor(userMethodDeveloper.MethodId, userMethodDeveloper.UserId)
+
+        );
         MethodDeveloperEdge = new UserMethodDeveloperEdge(userMethodDeveloper);
     }
 
diff --git a/backend/src/GraphQl/UserMethodDevelopers/ConfirmUserMethodDeveloperPayload.cs b/backend/src/GraphQl/UserMethodDevelopers/ConfirmUserMethodDeveloperPayload.cs
index b544691fc..83f860be7 100644
--- a/backend/src/GraphQl/UserMethodDevelopers/ConfirmUserMethodDeveloperPayload.cs
+++ b/backend/src/GraphQl/UserMethodDevelopers/ConfirmUserMethodDeveloperPayload.cs
@@ -11,7 +11,10 @@ public ConfirmUserMethodDeveloperPayload(
         UserMethodDeveloper userMethodDeveloper
     )
     {
-        DevelopedMethodEdge = new UserDevelopedMethodEdge(userMethodDeveloper);
+        DevelopedMethodEdge = new UserDevelopedMethodEdge(
+            userMethodDeveloper,
+            PaginationHelpers.ConstructCursor(userMethodDeveloper.MethodId, userMethodDeveloper.UserId)
+        );
         MethodDeveloperEdge = new UserMethodDeveloperEdge(userMethodDeveloper);
     }
 
diff --git a/backend/src/GraphQl/UserMethodDevelopers/RemoveUserMethodDeveloperPayload.cs b/backend/src/GraphQl/UserMethodDevelopers/RemoveUserMethodDeveloperPayload.cs
index 1898be427..3454d6b46 100644
--- a/backend/src/GraphQl/UserMethodDevelopers/RemoveUserMethodDeveloperPayload.cs
+++ b/backend/src/GraphQl/UserMethodDevelopers/RemoveUserMethodDeveloperPayload.cs
@@ -11,7 +11,10 @@ public RemoveUserMethodDeveloperPayload(
         UserMethodDeveloper userMethodDeveloper
     )
     {
-        DevelopedMethodEdge = new UserDevelopedMethodEdge(userMethodDeveloper);
+        DevelopedMethodEdge = new UserDevelopedMethodEdge(
+            userMethodDeveloper,
+            PaginationHelpers.ConstructCursor(userMethodDeveloper.MethodId, userMethodDeveloper.UserId)
+        );
         MethodDeveloperEdge = new UserMethodDeveloperEdge(userMethodDeveloper);
     }
 
diff --git a/backend/src/GraphQl/UserMethodDevelopers/UserMethodDeveloperFilterType.cs b/backend/src/GraphQl/UserMethodDevelopers/UserMethodDeveloperFilterType.cs
index fb499f743..99aa9556c 100644
--- a/backend/src/GraphQl/UserMethodDevelopers/UserMethodDeveloperFilterType.cs
+++ b/backend/src/GraphQl/UserMethodDevelopers/UserMethodDeveloperFilterType.cs
@@ -1,16 +1,20 @@
 using HotChocolate.Data.Filters;
 using Metabase.Data;
+using Metabase.GraphQl.Associations;
 
 namespace Metabase.GraphQl.UserMethodDevelopers;
 
 public abstract class UserMethodDeveloperFilterType
-    : FilterInputType<UserMethodDeveloper>
+    : AuditableAssociationFilterType<UserMethodDeveloper>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<UserMethodDeveloper> descriptor
     )
     {
-        descriptor.BindFieldsExplicitly();
+        base.Configure(descriptor);
+        // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         descriptor.Field(x => x.Method);
         descriptor.Field(x => x.User);
     }
diff --git a/backend/src/GraphQl/UserMethodDevelopers/UserMethodDeveloperSortType.cs b/backend/src/GraphQl/UserMethodDevelopers/UserMethodDeveloperSortType.cs
index 7c8b7ce69..f57269358 100644
--- a/backend/src/GraphQl/UserMethodDevelopers/UserMethodDeveloperSortType.cs
+++ b/backend/src/GraphQl/UserMethodDevelopers/UserMethodDeveloperSortType.cs
@@ -1,17 +1,17 @@
 using HotChocolate.Data.Sorting;
 using Metabase.Data;
+using Metabase.GraphQl.Associations;
 
 namespace Metabase.GraphQl.UserMethodDevelopers;
 
-public sealed class UserMethodDeveloperSortType
-    : SortInputType<UserMethodDeveloper>
+public abstract class UserMethodDeveloperSortType
+    : AuditableAssociationSortType<UserMethodDeveloper>
 {
     protected override void Configure(
         ISortInputTypeDescriptor<UserMethodDeveloper> descriptor
     )
     {
-        descriptor.BindFieldsExplicitly();
-        descriptor.Field(x => x.Method);
-        descriptor.Field(x => x.User);
+        base.Configure(descriptor);
+        descriptor.Name(nameof(UserMethodDeveloperSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/GnuPgKeyFingerprintsByUserIdDataLoader.cs b/backend/src/GraphQl/Users/GnuPgKeyFingerprintsByUserIdDataLoader.cs
deleted file mode 100644
index df06f7d92..000000000
--- a/backend/src/GraphQl/Users/GnuPgKeyFingerprintsByUserIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Users;
-
-public sealed class GnuPgKeyFingerprintsByUserIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<GnuPgKeyFingerprint>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.GnuPgKeyFingerprints.AsNoTracking().Where(x =>
-                    ids.Contains(x.UserId)
-                ).With(queryContext),
-        x => x.UserId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/PendingUserDevelopedMethodsByUserIdDataLoader.cs b/backend/src/GraphQl/Users/PendingUserDevelopedMethodsByUserIdDataLoader.cs
deleted file mode 100644
index f3ea2f2e6..000000000
--- a/backend/src/GraphQl/Users/PendingUserDevelopedMethodsByUserIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Users;
-
-public sealed class PendingUserDevelopedMethodsByUserIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<UserMethodDeveloper>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.UserMethodDevelopers.AsNoTracking().Where(x =>
-                    x.Pending && ids.Contains(x.UserId)
-                ).With(queryContext),
-        x => x.UserId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/PendingUserRepresentedInstitutionsByUserIdDataLoader.cs b/backend/src/GraphQl/Users/PendingUserRepresentedInstitutionsByUserIdDataLoader.cs
deleted file mode 100644
index 5ff187cb1..000000000
--- a/backend/src/GraphQl/Users/PendingUserRepresentedInstitutionsByUserIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Users;
-
-public sealed class PendingUserRepresentedInstitutionsByUserIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<InstitutionRepresentative>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.InstitutionRepresentatives.AsNoTracking().Where(x =>
-                    x.Pending && ids.Contains(x.UserId)
-                ).With(queryContext),
-        x => x.UserId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/UseSignInManagerAttribute.cs b/backend/src/GraphQl/Users/UseSignInManagerAttribute.cs
index 307d21305..9af8aefa2 100644
--- a/backend/src/GraphQl/Users/UseSignInManagerAttribute.cs
+++ b/backend/src/GraphQl/Users/UseSignInManagerAttribute.cs
@@ -9,7 +9,7 @@ public sealed class UseSignInManagerAttribute : ObjectFieldDescriptorAttribute
     protected override void OnConfigure(
         IDescriptorContext context,
         IObjectFieldDescriptor descriptor,
-        MemberInfo member
+        MemberInfo? member
     )
     {
         descriptor.UseSignInManager();
diff --git a/backend/src/GraphQl/Users/UseUserManagerAttribute.cs b/backend/src/GraphQl/Users/UseUserManagerAttribute.cs
index e3a28d06b..df89bdd14 100644
--- a/backend/src/GraphQl/Users/UseUserManagerAttribute.cs
+++ b/backend/src/GraphQl/Users/UseUserManagerAttribute.cs
@@ -9,7 +9,7 @@ public sealed class UseUserManagerAttribute : ObjectFieldDescriptorAttribute
     protected override void OnConfigure(
         IDescriptorContext context,
         IObjectFieldDescriptor descriptor,
-        MemberInfo member
+        MemberInfo? member
     )
     {
         descriptor.UseUserManager();
diff --git a/backend/src/GraphQl/Users/UserByIdDataLoader.cs b/backend/src/GraphQl/Users/UserByIdDataLoader.cs
deleted file mode 100644
index fa1781de0..000000000
--- a/backend/src/GraphQl/Users/UserByIdDataLoader.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Users;
-
-public sealed class UserByIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : EntityByIdDataLoader<User>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        dbContext => dbContext.Users
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/UserDataLoaders.cs b/backend/src/GraphQl/Users/UserDataLoaders.cs
new file mode 100644
index 000000000..0ea945395
--- /dev/null
+++ b/backend/src/GraphQl/Users/UserDataLoaders.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut;
+using GreenDonut.Data;
+using Metabase.Data;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.GraphQl.Users;
+
+public sealed class UserDataLoaders
+: DataLoaders
+{
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, User>> GetUserByIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<User> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetEntityByIdAsync(
+            ids,
+            databaseContext => databaseContext.Users,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, GnuPgKeyFingerprint[]>> GetGnuPgKeyFingerprintsByUserIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<GnuPgKeyFingerprint> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetManyByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.GnuPgKeyFingerprints,
+            _ => _.UserId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, InstitutionRepresentative[]>> GetUserRepresentedInstitutionsByUserIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<InstitutionRepresentative> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.InstitutionRepresentatives.Where(_ => !_.Pending),
+            _ => _.UserId,
+            _ => _.InstitutionId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, InstitutionRepresentative[]>> GetPendingUserRepresentedInstitutionsByUserIdAsync(
+        IReadOnlyList<Guid> ids,
+        QueryContext<InstitutionRepresentative> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.InstitutionRepresentatives.Where(_ => _.Pending),
+            _ => _.UserId,
+            _ => _.InstitutionId,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Page<UserMethodDeveloper>>> GetUserDevelopedMethodsByUserIdAsync(
+        IReadOnlyList<Guid> ids,
+        PagingArguments pagingArguments,
+        QueryContext<UserMethodDeveloper> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.UserMethodDevelopers.Where(_ => !_.Pending),
+            _ => _.UserId,
+            _ => _.MethodId,
+            pagingArguments,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+
+    [DataLoader]
+    public static ValueTask<IReadOnlyDictionary<Guid, Page<UserMethodDeveloper>>> GetPendingUserDevelopedMethodsByUserIdAsync(
+        IReadOnlyList<Guid> ids,
+        PagingArguments pagingArguments,
+        QueryContext<UserMethodDeveloper> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        return GetAssociationsByOneIdAsync(
+            ids,
+            (databaseContext) => databaseContext.UserMethodDevelopers.Where(_ => _.Pending),
+            _ => _.UserId,
+            _ => _.MethodId,
+            pagingArguments,
+            queryContext,
+            databaseContextFactory,
+            cancellationToken
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/UserDevelopedMethodConnection.cs b/backend/src/GraphQl/Users/UserDevelopedMethodConnection.cs
index e54a1bcd7..271d009f0 100644
--- a/backend/src/GraphQl/Users/UserDevelopedMethodConnection.cs
+++ b/backend/src/GraphQl/Users/UserDevelopedMethodConnection.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 
@@ -9,11 +10,13 @@ namespace Metabase.GraphQl.Users;
 
 public sealed class UserDevelopedMethodConnection(
     User subject,
+    PagingArguments pagingArguments,
     QueryContext<UserMethodDeveloper> queryContext
     )
-        : Connection<User, UserMethodDeveloper, UserDevelopedMethodsByUserIdDataLoader, UserDevelopedMethodEdge>(
+        : PaginatedConnection<User, UserMethodDeveloper, UserDevelopedMethodEdge, IUserDevelopedMethodsByUserIdDataLoader>(
         subject,
-        x => new UserDevelopedMethodEdge(x),
+        (association, cursor) => new UserDevelopedMethodEdge(association, cursor),
+        pagingArguments,
         queryContext
         )
 {
@@ -21,17 +24,20 @@ QueryContext<UserMethodDeveloper> queryContext
 
 public sealed class PendingUserDevelopedMethodConnection(
     User subject,
+    PagingArguments pagingArguments,
     QueryContext<UserMethodDeveloper> queryContext
     )
-        : AuthorizedConnection<User, UserMethodDeveloper, PendingUserDevelopedMethodsByUserIdDataLoader, UserDevelopedMethodEdge, UserMethodDeveloperAuthorization>(
+        : AuthorizedPaginatedConnection<User, UserMethodDeveloper, UserDevelopedMethodEdge, IPendingUserDevelopedMethodsByUserIdDataLoader, UserMethodDeveloperAuthorization>(
         subject,
-        x => new UserDevelopedMethodEdge(x),
-        (claimsPrincipal, institution, authorization, cancellationToken) =>
-            authorization.IsAuthorizedToConfirm(claimsPrincipal, institution.Id, cancellationToken),
+        (association, cursor) => new UserDevelopedMethodEdge(association, cursor),
+        (claimsPrincipal, authorization, cancellationToken) =>
+            authorization.IsAuthorizedToConfirm(claimsPrincipal, subject.Id, cancellationToken),
+        pagingArguments,
         queryContext
         )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToConfirmEdgesAsync(
         ClaimsPrincipal claimsPrincipal,
         UserMethodDeveloperAuthorization authorization,
diff --git a/backend/src/GraphQl/Users/UserDevelopedMethodEdge.cs b/backend/src/GraphQl/Users/UserDevelopedMethodEdge.cs
index 8e6539d47..9009daa92 100644
--- a/backend/src/GraphQl/Users/UserDevelopedMethodEdge.cs
+++ b/backend/src/GraphQl/Users/UserDevelopedMethodEdge.cs
@@ -4,8 +4,12 @@
 namespace Metabase.GraphQl.Users;
 
 public sealed class UserDevelopedMethodEdge(
-    UserMethodDeveloper association
-    )
-        : Edge<Method, MethodByIdDataLoader>(association.MethodId)
+    UserMethodDeveloper association,
+    string cursor
+)
+: PaginatedEdge<Method, IMethodByIdDataLoader>(
+    association.MethodId,
+    cursor
+)
 {
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/UserDevelopedMethodSortType.cs b/backend/src/GraphQl/Users/UserDevelopedMethodSortType.cs
new file mode 100644
index 000000000..25151a358
--- /dev/null
+++ b/backend/src/GraphQl/Users/UserDevelopedMethodSortType.cs
@@ -0,0 +1,17 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+using Metabase.GraphQl.UserMethodDevelopers;
+
+namespace Metabase.GraphQl.Users;
+
+public sealed class UserDevelopedMethodSortType
+    : UserMethodDeveloperSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<UserMethodDeveloper> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(UserDevelopedMethodSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/UserDevelopedMethodsByUserIdDataLoader.cs b/backend/src/GraphQl/Users/UserDevelopedMethodsByUserIdDataLoader.cs
deleted file mode 100644
index 8c5f4c839..000000000
--- a/backend/src/GraphQl/Users/UserDevelopedMethodsByUserIdDataLoader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Users;
-
-public sealed class UserDevelopedMethodsByUserIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<UserMethodDeveloper>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.UserMethodDevelopers.AsNoTracking().Where(x =>
-                    !x.Pending && ids.Contains(x.UserId)
-                ).With(queryContext),
-        x => x.UserId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/UserFilterType.cs b/backend/src/GraphQl/Users/UserFilterType.cs
index 57a5c5cb3..21093af32 100644
--- a/backend/src/GraphQl/Users/UserFilterType.cs
+++ b/backend/src/GraphQl/Users/UserFilterType.cs
@@ -5,15 +5,20 @@
 namespace Metabase.GraphQl.Users;
 
 public sealed class UserFilterType
-    : EntityFilterType<User>
+    : AuditableEntityFilterType<User>
 {
     protected override void Configure(
         IFilterInputTypeDescriptor<User> descriptor
     )
     {
         base.Configure(descriptor);
+        descriptor.Name(nameof(UserFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
+        // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
+        descriptor.Field(x => x.Id);
+        descriptor.Field(x => x.CreatedAt);
+        descriptor.Field(x => x.UpdatedAt);
         // TODO The commented fields below should be filterable by OpenId Connect Clients and application users with the proper scopes and rights. If they are filterable in general, it is a way to figure out that information even if it is not returned by GraphQL.
-        // descriptor.Field(x => x.Name);
+        descriptor.Field(x => x.Name);
         // descriptor.Field(x => x.Email);
         // descriptor.Field(x => x.PostalAddress);
         // descriptor.Field(x => x.WebsiteLocator);
diff --git a/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintConnection.cs b/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintConnection.cs
index ef646dab0..02f28bd42 100644
--- a/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintConnection.cs
+++ b/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintConnection.cs
@@ -9,8 +9,8 @@ QueryContext<GnuPgKeyFingerprint> queryContext
 ) : Connection<
         User,
         GnuPgKeyFingerprint,
-        GnuPgKeyFingerprintsByUserIdDataLoader,
-        UserGnuPgKeyFingerprintEdge
+        UserGnuPgKeyFingerprintEdge,
+        IGnuPgKeyFingerprintsByUserIdDataLoader
     >
 (
     user,
diff --git a/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintFilterType.cs b/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintFilterType.cs
index 8cbfd3832..2eb025658 100644
--- a/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintFilterType.cs
+++ b/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintFilterType.cs
@@ -1,5 +1,4 @@
 using HotChocolate.Data.Filters;
-using Metabase.Configuration;
 using Metabase.Data;
 using Metabase.GraphQl.GnuPgKeyFingerprints;
 
diff --git a/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintSortType.cs b/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintSortType.cs
new file mode 100644
index 000000000..31d4fd346
--- /dev/null
+++ b/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintSortType.cs
@@ -0,0 +1,17 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+using Metabase.GraphQl.GnuPgKeyFingerprints;
+
+namespace Metabase.GraphQl.Users;
+
+public sealed class UserGnuPgKeyFingerprintSortType
+    : GnuPgKeyFingerprintSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<GnuPgKeyFingerprint> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(UserGnuPgKeyFingerprintSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/UserQueries.cs b/backend/src/GraphQl/Users/UserQueries.cs
index 7aaa5f2aa..4638db867 100644
--- a/backend/src/GraphQl/Users/UserQueries.cs
+++ b/backend/src/GraphQl/Users/UserQueries.cs
@@ -3,9 +3,11 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using GreenDonut.Data;
 using HotChocolate.Authorization;
 using HotChocolate.Data;
 using HotChocolate.Data.Sorting;
+using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Authorization;
 using Metabase.Data;
@@ -34,27 +36,27 @@ CancellationToken cancellationToken
     }
 
     [UsePaging]
-    /* [UseProjection] // fails without an explicit error message in the logs */
     [UseFiltering<UserFilterType>]
     [UseSorting<UserSortType>]
-    public IQueryable<User> GetUsers(
-        ApplicationDbContext context,
-        ISortingContext sorting
+    public ValueTask<HotChocolate.Types.Pagination.Connection<User>> GetUsersAsync(
+        IResolverContext resolverContext,
+        ApplicationDbContext databaseContext,
+        CancellationToken cancellationToken
     )
     {
-        sorting.StabilizeOrder<User>();
-        return context.Users.AsNoTracking();
+        return databaseContext.Users
+            .AsNoTracking()
+            .With(resolverContext.GetQueryContext<User>(), Sorting.DefaultEntityOrder)
+            .ToPageAsync(resolverContext.GetPagingArguments(), cancellationToken)
+            .ToConnectionAsync();
     }
 
     public Task<User?> GetUserAsync(
         Guid id,
-        UserByIdDataLoader userById,
+        IUserByIdDataLoader byId,
         CancellationToken cancellationToken
     )
     {
-        return userById.LoadAsync(
-            id,
-            cancellationToken
-        );
+        return byId.LoadAsync(id, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/UserRepresentedInstitutionConnection.cs b/backend/src/GraphQl/Users/UserRepresentedInstitutionConnection.cs
index 523704b8f..b9e18282a 100644
--- a/backend/src/GraphQl/Users/UserRepresentedInstitutionConnection.cs
+++ b/backend/src/GraphQl/Users/UserRepresentedInstitutionConnection.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
+using HotChocolate.CostAnalysis.Types;
 using Metabase.Authorization;
 using Metabase.Data;
 
@@ -14,8 +15,8 @@ QueryContext<InstitutionRepresentative> queryContext
 : Connection<
     User,
     InstitutionRepresentative,
-    UserRepresentedInstitutionsByUserIdDataLoader,
-    UserRepresentedInstitutionEdge
+    UserRepresentedInstitutionEdge,
+    UserRepresentedInstitutionsByUserIdDataLoader
 >(
     subject,
     x => new UserRepresentedInstitutionEdge(x),
@@ -31,8 +32,8 @@ QueryContext<InstitutionRepresentative> queryContext
 : AuthorizedConnection<
     User,
     InstitutionRepresentative,
-    PendingUserRepresentedInstitutionsByUserIdDataLoader,
     UserRepresentedInstitutionEdge,
+    PendingUserRepresentedInstitutionsByUserIdDataLoader,
     InstitutionRepresentativeAuthorization
 >(
     subject,
@@ -43,6 +44,7 @@ QueryContext<InstitutionRepresentative> queryContext
     )
 {
     [UseUserManager]
+    [Cost(1)]
     public Task<bool> IsAuthorizedToConfirmEdgesAsync(
         ClaimsPrincipal claimsPrincipal,
         InstitutionRepresentativeAuthorization authorization,
diff --git a/backend/src/GraphQl/Users/UserRepresentedInstitutionEdge.cs b/backend/src/GraphQl/Users/UserRepresentedInstitutionEdge.cs
index 0e128fb1e..9dd7c36aa 100644
--- a/backend/src/GraphQl/Users/UserRepresentedInstitutionEdge.cs
+++ b/backend/src/GraphQl/Users/UserRepresentedInstitutionEdge.cs
@@ -1,3 +1,8 @@
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
+using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.Enumerations;
 using Metabase.GraphQl.Institutions;
@@ -7,7 +12,22 @@ namespace Metabase.GraphQl.Users;
 public sealed class UserRepresentedInstitutionEdge(
     InstitutionRepresentative association
     )
-        : Edge<Institution, InstitutionByIdDataLoader>(association.InstitutionId)
+        : Edge<Institution, IInstitutionByIdDataLoader>(association.InstitutionId)
 {
     public InstitutionRepresentativeRole Role { get; } = association.Role;
+
+    [UseUserManager]
+    [Cost(1)]
+    public Task<bool> IsAuthorizedToRemoveEdgeAsync(
+        ClaimsPrincipal claimsPrincipal,
+        InstitutionRepresentativeAuthorization authorization,
+        CancellationToken cancellationToken
+    )
+    {
+        return authorization.IsAuthorizedToManage(
+            claimsPrincipal,
+            association.InstitutionId,
+            cancellationToken
+        );
+    }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/UserRepresentedInstitutionFilterType.cs b/backend/src/GraphQl/Users/UserRepresentedInstitutionFilterType.cs
index b41ca5e05..d4c84e9d3 100644
--- a/backend/src/GraphQl/Users/UserRepresentedInstitutionFilterType.cs
+++ b/backend/src/GraphQl/Users/UserRepresentedInstitutionFilterType.cs
@@ -1,5 +1,4 @@
 using HotChocolate.Data.Filters;
-using Metabase.Configuration;
 using Metabase.Data;
 using Metabase.GraphQl.InstitutionRepresentatives;
 
diff --git a/backend/src/GraphQl/Users/UserRepresentedInstitutionSortType.cs b/backend/src/GraphQl/Users/UserRepresentedInstitutionSortType.cs
new file mode 100644
index 000000000..d6aa69140
--- /dev/null
+++ b/backend/src/GraphQl/Users/UserRepresentedInstitutionSortType.cs
@@ -0,0 +1,17 @@
+using HotChocolate.Data.Sorting;
+using Metabase.Data;
+using Metabase.GraphQl.InstitutionRepresentatives;
+
+namespace Metabase.GraphQl.Users;
+
+public sealed class UserRepresentedInstitutionSortType
+    : InstitutionRepresentativeSortType
+{
+    protected override void Configure(
+        ISortInputTypeDescriptor<InstitutionRepresentative> descriptor
+    )
+    {
+        base.Configure(descriptor);
+        descriptor.Name(nameof(UserRepresentedInstitutionSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/UserRepresentedInstitutionsByUserIdDataLoader.cs b/backend/src/GraphQl/Users/UserRepresentedInstitutionsByUserIdDataLoader.cs
deleted file mode 100644
index 7e8e00888..000000000
--- a/backend/src/GraphQl/Users/UserRepresentedInstitutionsByUserIdDataLoader.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Linq;
-using GreenDonut;
-using GreenDonut.Data;
-using Metabase.Data;
-using Metabase.GraphQl.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Metabase.GraphQl.Users;
-
-public sealed class UserRepresentedInstitutionsByUserIdDataLoader(
-    IBatchScheduler batchScheduler,
-    DataLoaderOptions options,
-    IDbContextFactory<ApplicationDbContext> dbContextFactory
-    )
-        : AssociationsByAssociateIdDataLoader<InstitutionRepresentative>(
-        batchScheduler,
-        options,
-        dbContextFactory,
-        (dbContext, ids, queryContext) =>
-                dbContext.InstitutionRepresentatives.AsNoTracking().Where(x =>
-                    !x.Pending && ids.Contains(x.UserId)
-                ).With(queryContext),
-        x => x.UserId
-        )
-{
-}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/UserSortType.cs b/backend/src/GraphQl/Users/UserSortType.cs
index e05ccb294..0aae5beee 100644
--- a/backend/src/GraphQl/Users/UserSortType.cs
+++ b/backend/src/GraphQl/Users/UserSortType.cs
@@ -5,15 +5,16 @@
 namespace Metabase.GraphQl.Users;
 
 public sealed class UserSortType
-    : EntitySortType<User>
+    : AuditableEntitySortType<User>
 {
     protected override void Configure(
         ISortInputTypeDescriptor<User> descriptor
     )
     {
         base.Configure(descriptor);
-        // TODO The commented fiels below should be sortable by OpenId Connect Clients and application users with the proper scopes and rights. If they are filterable in general, it is a way to figure out that information even if it is not returned by GraphQL.
-        // descriptor.Field(x => x.Name);
+        descriptor.Name(nameof(UserSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
+        // TODO The commented fiels below should be sortable by OpenId Connect Clients and application users with the proper scopes and rights. If they are sortable in general, it is a way to figure out that information even if it is not returned by GraphQL.
+        descriptor.Field(x => x.Name);
         // descriptor.Field(x => x.Email);
         // descriptor.Field(x => x.PostalAddress);
         // descriptor.Field(x => x.WebsiteLocator);
diff --git a/backend/src/GraphQl/Users/UserType.cs b/backend/src/GraphQl/Users/UserType.cs
index 0389e481c..693803303 100644
--- a/backend/src/GraphQl/Users/UserType.cs
+++ b/backend/src/GraphQl/Users/UserType.cs
@@ -24,7 +24,7 @@
 namespace Metabase.GraphQl.Users;
 
 public sealed class UserType
-    : EntityType<User, UserByIdDataLoader>
+    : EntityType<User, IUserByIdDataLoader>
 {
     private static async Task<T?> Authorize<T>(
         IResolverContext context,
@@ -136,17 +136,20 @@ IObjectTypeDescriptor<User> descriptor
         descriptor
             .Field(t => t.Name)
             // .Type<NonNullType<StringType>>()
+            .Cost(0)
             .Resolve(async context =>
                 // Instead of returning `null`, we return a string because otherwise the
                 // corresponding GraphQL field would need to be nullable and because the type `User`
                 // implements `IStakeholder`, the stakeholder name would also need to be nullable.
-                await Authorize(context, user => user.Name, Scopes.Profile) ??
-                "<redacted>"
+                await Authorize(context, user => user.Name, Scopes.Profile)
+                ?? context.Parent<User>().Name.Split(null as char[], StringSplitOptions.RemoveEmptyEntries).GetFirstOrDefault()
+                ?? "<redacted>"
             )
             .UseUserManager();
         descriptor
             .Field("contact")
             .Type<NonNullType<ObjectType<ContactInformation>>>()
+            .Cost(0)
             .Resolve(async context =>
                 new ContactInformation(
                     await Authorize(context, user => user.PhoneNumber, Scopes.Phone),
@@ -160,6 +163,7 @@ await Authorize(context, user => user.WebsiteLocator, Scopes.Profile)
             .UseUserManager();
         descriptor
             .Field("twoFactorAuthentication")
+            .Cost(0)
             .ResolveWith<UserResolvers>(t =>
                 UserResolvers.GetTwoFactorAuthenticationAsync(default!, default!, default!, default!, default!, default!))
             .UseUserManager()
@@ -167,6 +171,7 @@ await Authorize(context, user => user.WebsiteLocator, Scopes.Profile)
         descriptor
             .Field("hasPassword")
             .Type<BooleanType>()
+            .Cost(0)
             .Resolve(context =>
                 AuthorizeAsync<bool>(
                     context,
@@ -177,6 +182,7 @@ await Authorize(context, user => user.WebsiteLocator, Scopes.Profile)
             .UseUserManager();
         descriptor
             .Field("roles")
+            .Cost(0)
             .Resolve(context =>
                 AuthorizeAsync(
                     context,
@@ -187,33 +193,41 @@ await Authorize(context, user => user.WebsiteLocator, Scopes.Profile)
             .UseUserManager();
         descriptor
             .Field("rolesCurrentUserCanAdd")
+            .Cost(1)
             .ResolveWith<UserResolvers>(x =>
                 UserResolvers.GetRolesCurrentUserCanAddOrRemoveAsync(default!, default!, default!))
             .UseUserManager();
         descriptor
             .Field("rolesCurrentUserCanRemove")
+            .Cost(1)
             .ResolveWith<UserResolvers>(x =>
                 UserResolvers.GetRolesCurrentUserCanAddOrRemoveAsync(default!, default!, default!))
             .UseUserManager();
         descriptor
             .Field("isAuthorizedToDeleteUser")
+            .Cost(1)
             .ResolveWith<UserResolvers>(x => UserResolvers.IsAuthorizedToDeleteUserAsync(default!, default!, default!))
             .UseUserManager();
         descriptor
             .Field("isAuthorizedToManageOpenIdConnect")
+            .Cost(1)
             .ResolveWith<UserResolvers>(x => UserResolvers.IsAuthorizedToManageOpenIdConnect(default!, default!, default!))
             .UseUserManager();
         descriptor
             .Field("isAuthorizedToAddApprovals")
+            .Cost(1)
             .ResolveWith<UserResolvers>(x => UserResolvers.IsAuthorizedToAddApprovals(default!, default!, default!))
             .UseUserManager();
         descriptor
             .Field(t => t.DevelopedMethods)
             .Type<NonNullType<ObjectType<UserDevelopedMethodConnection>>>()
+            .AddPagingArguments()
             .UseFiltering<UserDevelopedMethodFilterType>()
+            .UseSorting<UserDevelopedMethodSortType>()
             .Resolve(context =>
                 new UserDevelopedMethodConnection(
                     context.Parent<User>(),
+                    context.GetPagingArguments(),
                     context.GetQueryContext<UserMethodDeveloper>()
                 )
             );
@@ -221,10 +235,13 @@ await Authorize(context, user => user.WebsiteLocator, Scopes.Profile)
             .Field($"{GraphQlConstants.PendingPrefix}{nameof(User.DevelopedMethods)}")
             .Type<ObjectType<PendingUserDevelopedMethodConnection>>()
             .Authorize(AuthorizationPolicies.WriteScopePolicy)
+            .AddPagingArguments()
             .UseFiltering<UserDevelopedMethodFilterType>()
+            .UseSorting<UserDevelopedMethodSortType>()
             .Resolve(context =>
                 new PendingUserDevelopedMethodConnection(
                     context.Parent<User>(),
+                    context.GetPagingArguments(),
                     context.GetQueryContext<UserMethodDeveloper>()
                 )
             );
@@ -232,6 +249,7 @@ await Authorize(context, user => user.WebsiteLocator, Scopes.Profile)
             .Field(t => t.RepresentedInstitutions)
             .Type<NonNullType<ObjectType<UserRepresentedInstitutionConnection>>>()
             .UseFiltering<UserRepresentedInstitutionFilterType>()
+            .UseSorting<UserRepresentedInstitutionSortType>()
             .Resolve(context =>
                 new UserRepresentedInstitutionConnection(
                     context.Parent<User>(),
@@ -243,6 +261,7 @@ await Authorize(context, user => user.WebsiteLocator, Scopes.Profile)
             .Type<ObjectType<PendingUserRepresentedInstitutionConnection>>()
             .Authorize(AuthorizationPolicies.WriteScopePolicy)
             .UseFiltering<UserRepresentedInstitutionFilterType>()
+            .UseSorting<UserRepresentedInstitutionSortType>()
             .Resolve(context =>
                 new PendingUserRepresentedInstitutionConnection(
                     context.Parent<User>(),
@@ -253,6 +272,7 @@ await Authorize(context, user => user.WebsiteLocator, Scopes.Profile)
             .Field(t => t.GnuPgKeyFingerprints)
             .Type<NonNullType<ObjectType<UserGnuPgKeyFingerprintConnection>>>()
             .UseFiltering<UserGnuPgKeyFingerprintFilterType>()
+            .UseSorting<UserGnuPgKeyFingerprintSortType>()
             .Resolve(context =>
                 new UserGnuPgKeyFingerprintConnection(
                     context.Parent<User>(),
@@ -262,6 +282,7 @@ await Authorize(context, user => user.WebsiteLocator, Scopes.Profile)
         descriptor
             .Field("has" + nameof(GnuPgKeyFingerprint))
             .UseFiltering<UserGnuPgKeyFingerprintFilterType>()
+            .UseSorting<UserGnuPgKeyFingerprintSortType>()
             .ResolveWith<UserResolvers>(x =>
                 UserResolvers.HasGnuPgKeyFingerprintsAsync(default!, default!, default!, default!));
     }
diff --git a/backend/src/Jobs/JwtSigningAndEncryptionCertificateRotationJob.cs b/backend/src/Jobs/JwtSigningAndEncryptionCertificateRotationJob.cs
index ceceedf69..d2aa3c195 100644
--- a/backend/src/Jobs/JwtSigningAndEncryptionCertificateRotationJob.cs
+++ b/backend/src/Jobs/JwtSigningAndEncryptionCertificateRotationJob.cs
@@ -1,10 +1,11 @@
 using System;
-using System.Runtime.ConstrainedExecution;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using Metabase.Authentication;
+using Metabase.Extensions;
 using Microsoft.Extensions.Logging;
+using NodaTime;
 using Quartz;
 
 namespace Metabase.Jobs;
@@ -48,6 +49,7 @@ Exception exception
 }
 
 public sealed class JwtSigningAndEncryptionCertificateRotationJob(
+    IClock clock,
     ILogger<JwtSigningAndEncryptionCertificateRotationJob> logger
 )
 : IJob
@@ -75,7 +77,7 @@ public async Task Execute(IJobExecutionContext context)
         // TODO: Trigger OpenIddict reload. Currently done dialy with a cron job that restart all services.
     }
 
-    public static X509Certificate2 CreateSigningCertificate(string distinguishedName)
+    public static X509Certificate2 CreateSigningCertificate(string distinguishedName, IClock clock)
     {
         // In the future use ECDSA.
         // using var algorithm = ECDsa.Create(ECCurve.NamedCurves.nistP256);
@@ -97,7 +99,7 @@ public static X509Certificate2 CreateSigningCertificate(string distinguishedName
                 critical: true
             )
         );
-        var now = TimeProvider.System.GetUtcNow();
+        var now = clock.GetUtcNow().ToDateTimeOffset();
         var ephemeralCertificate = request.CreateSelfSigned(
             notBefore: now.Add(s_notBeforeOffset),
             notAfter: now.Add(s_notAfterOffset)
@@ -114,7 +116,7 @@ public static X509Certificate2 CreateSigningCertificate(string distinguishedName
     {
         try
         {
-            return CreateSigningCertificate(distinguishedName);
+            return CreateSigningCertificate(distinguishedName, clock);
         }
         catch (Exception exception)
         {
@@ -123,7 +125,7 @@ public static X509Certificate2 CreateSigningCertificate(string distinguishedName
         }
     }
 
-    public static X509Certificate2 CreateEncryptionCertificate(string distinguishedName)
+    public static X509Certificate2 CreateEncryptionCertificate(string distinguishedName, IClock clock)
     {
         // In the furture use `ML-KEM`.
         using var algorithm = RSA.Create(keySizeInBits: 3072);
@@ -139,7 +141,7 @@ public static X509Certificate2 CreateEncryptionCertificate(string distinguishedN
                 critical: true
             )
         );
-        var now = TimeProvider.System.GetUtcNow();
+        var now = clock.GetUtcNow().ToDateTimeOffset();
         var ephemeralCertificate = request.CreateSelfSigned(
             notBefore: now.Add(s_notBeforeOffset),
             notAfter: now.Add(s_notAfterOffset)
@@ -156,7 +158,7 @@ public static X509Certificate2 CreateEncryptionCertificate(string distinguishedN
     {
         try
         {
-            return CreateEncryptionCertificate(distinguishedName);
+            return CreateEncryptionCertificate(distinguishedName, clock);
         }
         catch (Exception exception)
         {
@@ -202,10 +204,10 @@ public void CleanupLongExpiredCertificatesWithErrorHandling(params string[] dist
                     distinguishedName,
                     validOnly: false
                 );
-                var now = TimeProvider.System.GetUtcNow();
+                var now = clock.GetUtcNow().ToDateTimeOffset();
                 foreach (var certificate in certificates)
                 {
-                    // Use `NotAfterDaysOffset` as overlap period.
+                    // Use `RefreshTokenLifetime` as overlap period.
                     if (certificate.NotAfter.Add(OpenIdConnectConstants.RefreshTokenLifetime) < now)
                     {
                         try
diff --git a/backend/src/Json/JsonSerializerSettings.cs b/backend/src/Json/JsonSerializerSettings.cs
index 6972e4d27..acbd884c2 100644
--- a/backend/src/Json/JsonSerializerSettings.cs
+++ b/backend/src/Json/JsonSerializerSettings.cs
@@ -63,4 +63,11 @@ public static class JsonSerializerSettings
             PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
             UnmappedMemberHandling = JsonUnmappedMemberHandling.Skip,
         };
+
+    public static readonly JsonSerializerOptions Compact =
+        new(s_common)
+        {
+            WriteIndented = false,
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+        };
 }
\ No newline at end of file
diff --git a/backend/src/Metabase.csproj b/backend/src/Metabase.csproj
index 4fba0111b..73681a48c 100644
--- a/backend/src/Metabase.csproj
+++ b/backend/src/Metabase.csproj
@@ -13,34 +13,35 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- <PackageReference Include="AutoMapper" Version="10.1.1" /> -->
-    <!-- <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" /> -->
+    <PackageReference Include="EntityFrameworkCore.Projectables" Version="6.0.4" />
     <PackageReference Include="AspNetCore.HealthChecks.OpenIdConnectServer" Version="9.0.0" />
     <PackageReference Include="GraphQL.Client" Version="6.1.0" />
     <PackageReference Include="GraphQL.Client.Serializer.SystemTextJson" Version="6.1.0" />
-    <PackageReference Include="HotChocolate" Version="15.1.12" />
-    <PackageReference Include="HotChocolate.AspNetCore" Version="15.1.12" />
-    <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="15.1.12" />
-    <PackageReference Include="HotChocolate.Data" Version="15.1.12" />
-    <PackageReference Include="HotChocolate.Data.EntityFramework" Version="15.1.12" />
-    <PackageReference Include="HotChocolate.PersistedOperations.InMemory" Version="15.1.12" />
-    <PackageReference Include="HotChocolate.Types.Analyzers" Version="15.1.12" />
-    <PackageReference Include="HotChocolate.Types.NodaTime" Version="15.1.12" />
-    <PackageReference Include="HotChocolate.Types.Scalars" Version="15.1.12" />
+    <PackageReference Include="HotChocolate" Version="16.1.0-p.1.10" />
+    <PackageReference Include="HotChocolate.AspNetCore" Version="16.1.0-p.1.10" />
+    <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="16.1.0-p.1.10" />
+    <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="16.0.0" />
+    <PackageReference Include="HotChocolate.Data" Version="16.1.0-p.1.10" />
+    <PackageReference Include="HotChocolate.Data.EntityFramework" Version="16.1.0-p.1.10" />
+    <PackageReference Include="HotChocolate.PersistedOperations.InMemory" Version="16.1.0-p.1.10" />
+    <PackageReference Include="HotChocolate.Types.Analyzers" Version="16.1.0-p.1.10" />
+    <PackageReference Include="HotChocolate.Types.NodaTime" Version="16.1.0-p.1.10" />
+    <PackageReference Include="HotChocolate.Types.Scalars" Version="16.1.0-p.1.10" />
     <PackageReference Include="IdentityModel" Version="7.0.0" />
-    <PackageReference Include="MailKit" Version="4.15.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.5">
+    <PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="10.0.11" />
+    <PackageReference Include="MailKit" Version="4.16.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Common" Version="10.4.0" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Telemetry.Abstractions" Version="10.4.0" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Common" Version="10.5.0" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Telemetry.Abstractions" Version="10.5.0" />
     <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.3.1" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="10.0.1" />
@@ -48,25 +49,25 @@
     <!--   <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> -->
     <!--   <PrivateAssets>all</PrivateAssets> -->
     <!-- </PackageReference> -->
-    <PackageReference Include="OpenIddict.AspNetCore" Version="7.4.0" />
-    <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="7.4.0" />
-    <PackageReference Include="OpenIddict.Quartz" Version="7.4.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.0" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
-    <PackageReference Include="Quartz" Version="3.16.1" />
-    <PackageReference Include="Quartz.AspNetCore" Version="3.16.1" />
-    <PackageReference Include="Scalar.AspNetCore" Version="2.13.15" />
-    <PackageReference Include="Scalar.AspNetCore.Microsoft" Version="2.13.15" />
+    <PackageReference Include="OpenIddict.AspNetCore" Version="7.5.0" />
+    <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="7.5.0" />
+    <PackageReference Include="OpenIddict.Quartz" Version="7.5.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
+    <PackageReference Include="Quartz" Version="3.18.1" />
+    <PackageReference Include="Quartz.AspNetCore" Version="3.18.1" />
+    <PackageReference Include="Scalar.AspNetCore" Version="2.14.11" />
+    <PackageReference Include="Scalar.AspNetCore.Microsoft" Version="2.14.11" />
     <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
     <PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.OpenTelemetry" Version="4.2.0" />
-    <PackageReference Include="System.Linq.Async" Version="7.0.0" />
+    <PackageReference Include="System.Linq.Async" Version="7.0.1" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/backend/src/Migrations/20260318153447_CorrectExistsFlagsOfReferences.cs b/backend/src/Migrations/20260318153447_CorrectExistsFlagsOfReferences.cs
index 477ea7b73..6283595fe 100644
--- a/backend/src/Migrations/20260318153447_CorrectExistsFlagsOfReferences.cs
+++ b/backend/src/Migrations/20260318153447_CorrectExistsFlagsOfReferences.cs
@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/backend/src/Migrations/20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt.Designer.cs b/backend/src/Migrations/20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt.Designer.cs
new file mode 100644
index 000000000..37714973f
--- /dev/null
+++ b/backend/src/Migrations/20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt.Designer.cs
@@ -0,0 +1,2023 @@
+// <auto-generated />
+using System;
+using System.Text.Json;
+using Metabase.Data;
+using Metabase.Enumerations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Metabase.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt")]
+    partial class CorrectExistsFlagsOfReferencesSecondAttempt
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("metabase")
+                .HasAnnotation("ProductVersion", "10.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "component_category", new[] { "layer", "material", "unit" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "database_verification_state", new[] { "pending", "verified" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_operating_state", new[] { "not_operating", "operating" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_representative_role", new[] { "assistant", "owner" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_state", new[] { "pending", "verified" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "method_category", new[] { "calculation", "measurement" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "prime_surface", new[] { "inside", "outside" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "standardizer", new[] { "aerc", "agi", "ashrae", "breeam", "bs", "bsi", "cen", "cie", "dgnb", "din", "dvwg", "iec", "ies", "ift", "iso", "jis", "leed", "nfrc", "riba", "ul", "unece", "vdi", "vff", "well" });
+            NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "pgcrypto");
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("Abbreviation")
+                        .HasColumnType("text");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
+                        .HasColumnType("tstzrange");
+
+                    b.PrimitiveCollection<ComponentCategory[]>("Categories")
+                        .IsRequired()
+                        .HasColumnType("metabase.component_category[]");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<JsonElement?>("Extras")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.ToTable("component", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentAssembly", b =>
+                {
+                    b.Property<Guid>("AssembledComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("PartComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<byte?>("Index")
+                        .HasColumnType("smallint");
+
+                    b.Property<PrimeSurface?>("PrimeSurface")
+                        .HasColumnType("metabase.prime_surface");
+
+                    b.HasKey("AssembledComponentId", "PartComponentId");
+
+                    b.HasIndex("PartComponentId");
+
+                    b.ToTable("component_assembly", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentConcretizationAndGeneralization", b =>
+                {
+                    b.Property<Guid>("GeneralComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ConcreteComponentId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("GeneralComponentId", "ConcreteComponentId");
+
+                    b.HasIndex("ConcreteComponentId");
+
+                    b.ToTable("component_concretization_and_generalization", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentManufacturer", b =>
+                {
+                    b.Property<Guid>("ComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("ComponentId", "InstitutionId");
+
+                    b.HasIndex("InstitutionId");
+
+                    b.ToTable("component_manufacturer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentVariant", b =>
+                {
+                    b.Property<Guid>("OfComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ToComponentId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("OfComponentId", "ToComponentId");
+
+                    b.HasIndex("ToComponentId");
+
+                    b.ToTable("component_variant", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.DataFormat", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Extension")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("MediaType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SchemaLocator")
+                        .HasColumnType("text");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.ToTable("data_format", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Database", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Locator")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OperatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("VerificationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DatabaseVerificationState>("VerificationState")
+                        .HasColumnType("metabase.database_verification_state");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OperatorId");
+
+                    b.ToTable("database", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.GnuPgKeyFingerprint", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<OffsetDateTime?>("AllowedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<OffsetDateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Fingerprint")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<OffsetDateTime?>("ForbiddenAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Fingerprint")
+                        .IsUnique();
+
+                    b.HasIndex("InstitutionId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("gnu_pg_fingerprint", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("Abbreviation")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<JsonElement?>("Extras")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<InstitutionOperatingState>("OperatingState")
+                        .HasColumnType("metabase.institution_operating_state");
+
+                    b.Property<InstitutionState>("State")
+                        .HasColumnType("metabase.institution_state");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.ToTable("institution", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionMethodDeveloper", b =>
+                {
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MethodId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("InstitutionId", "MethodId");
+
+                    b.HasIndex("MethodId");
+
+                    b.ToTable("institution_method_developer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionRepresentative", b =>
+                {
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<InstitutionRepresentativeRole>("Role")
+                        .HasColumnType("metabase.institution_representative_role");
+
+                    b.HasKey("InstitutionId", "UserId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("institution_representative", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
+                        .HasColumnType("tstzrange");
+
+                    b.Property<string>("CalculationLocator")
+                        .HasColumnType("text");
+
+                    b.PrimitiveCollection<MethodCategory[]>("Categories")
+                        .IsRequired()
+                        .HasColumnType("metabase.method_category[]");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Validity")
+                        .HasColumnType("tstzrange");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.ToTable("method", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicationType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("ClientSecret")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClientType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ConsentType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayNames")
+                        .HasColumnType("text");
+
+                    b.Property<string>("JsonWebKeySet")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Permissions")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostLogoutRedirectUris")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RedirectUris")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Requirements")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Settings")
+                        .HasColumnType("text");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId")
+                        .IsUnique();
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("OpenIddictApplications", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("CreationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Scopes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Subject")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                    b.ToTable("OpenIddictAuthorizations", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectScope", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Descriptions")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayNames")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Resources")
+                        .HasColumnType("text");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("OpenIddictScopes", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AuthorizationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("CreationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("ExpirationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("RedemptionDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ReferenceId")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Status")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Subject")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuthorizationId");
+
+                    b.HasIndex("ReferenceId")
+                        .IsUnique();
+
+                    b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                    b.ToTable("OpenIddictTokens", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Role", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("role", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.RoleClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("role_claim", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PostalAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.Property<string>("WebsiteLocator")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("user", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("user_claim", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserLogin", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("user_login", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserMethodDeveloper", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MethodId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("UserId", "MethodId");
+
+                    b.HasIndex("MethodId");
+
+                    b.ToTable("user_method_developer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserRole", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("user_role", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserToken", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("user_token", "metabase");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedComponents")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "PrimeDirection", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "PrimeSurface", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "SwitchableLayers", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("PrimeDirection");
+
+                    b.Navigation("PrimeSurface");
+
+                    b.Navigation("SwitchableLayers");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentAssembly", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "AssembledComponent")
+                        .WithMany("PartEdges")
+                        .HasForeignKey("AssembledComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "PartComponent")
+                        .WithMany("PartOfEdges")
+                        .HasForeignKey("PartComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("AssembledComponent");
+
+                    b.Navigation("PartComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentConcretizationAndGeneralization", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "ConcreteComponent")
+                        .WithMany("GeneralizationEdges")
+                        .HasForeignKey("ConcreteComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "GeneralComponent")
+                        .WithMany("ConcretizationEdges")
+                        .HasForeignKey("GeneralComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ConcreteComponent");
+
+                    b.Navigation("GeneralComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentManufacturer", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "Component")
+                        .WithMany("ManufacturerEdges")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("ManufacturedComponentEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Institution");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentVariant", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "OfComponent")
+                        .WithMany("VariantEdges")
+                        .HasForeignKey("OfComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "ToComponent")
+                        .WithMany("VariantOfEdges")
+                        .HasForeignKey("ToComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("OfComponent");
+
+                    b.Navigation("ToComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.DataFormat", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedDataFormats")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.Reference", "Reference", b1 =>
+                        {
+                            b1.Property<Guid>("DataFormatId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("DataFormatId");
+
+                            b1.ToTable("data_format", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("DataFormatId");
+
+                            b1.OwnsOne("Metabase.Data.Publication", "Publication", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceDataFormatId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("ArXiv")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<string[]>("Authors")
+                                        .HasColumnType("text[]");
+
+                                    b2.Property<string>("Doi")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Urn")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("WebAddress")
+                                        .HasColumnType("text");
+
+                                    b2.HasKey("ReferenceDataFormatId");
+
+                                    b2.ToTable("data_format", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceDataFormatId");
+                                });
+
+                            b1.OwnsOne("Metabase.Data.Standard", "Standard", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceDataFormatId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Locator")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                        .IsRequired()
+                                        .HasColumnType("metabase.standardizer[]");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<int?>("Year")
+                                        .HasColumnType("integer");
+
+                                    b2.HasKey("ReferenceDataFormatId");
+
+                                    b2.ToTable("data_format", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceDataFormatId");
+
+                                    b2.OwnsOne("Metabase.Data.Numeration", "Numeration", b3 =>
+                                        {
+                                            b3.Property<Guid>("StandardReferenceDataFormatId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("MainNumber")
+                                                .IsRequired()
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Prefix")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Suffix")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("StandardReferenceDataFormatId");
+
+                                            b3.ToTable("data_format", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("StandardReferenceDataFormatId");
+                                        });
+
+                                    b2.Navigation("Numeration")
+                                        .IsRequired();
+                                });
+
+                            b1.Navigation("Publication");
+
+                            b1.Navigation("Standard");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("Reference");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Database", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Operator")
+                        .WithMany("OperatedDatabases")
+                        .HasForeignKey("OperatorId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Operator");
+                });
+
+            modelBuilder.Entity("Metabase.Data.GnuPgKeyFingerprint", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("GnuPgKeyFingerprints")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("GnuPgKeyFingerprints")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedInstitutions")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.OwnsOne("Metabase.Data.ContactInformation", "Contact", b1 =>
+                        {
+                            b1.Property<Guid>("InstitutionId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("EmailAddress")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("IsEmailAddressConfirmed")
+                                .HasColumnType("boolean");
+
+                            b1.Property<bool>("IsPhoneNumberConfirmed")
+                                .HasColumnType("boolean");
+
+                            b1.Property<string>("PhoneNumber")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("PostalAddress")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("WebsiteLocator")
+                                .HasColumnType("text");
+
+                            b1.HasKey("InstitutionId");
+
+                            b1.ToTable("institution", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("InstitutionId");
+                        });
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Manager");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionMethodDeveloper", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("DevelopedMethodEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Method", "Method")
+                        .WithMany("InstitutionDeveloperEdges")
+                        .HasForeignKey("MethodId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("Method");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionRepresentative", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("RepresentativeEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("RepresentedInstitutionEdges")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedMethods")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.Reference", "Reference", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("MethodId");
+
+                            b1.ToTable("method", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+
+                            b1.OwnsOne("Metabase.Data.Publication", "Publication", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceMethodId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("ArXiv")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<string[]>("Authors")
+                                        .HasColumnType("text[]");
+
+                                    b2.Property<string>("Doi")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Urn")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("WebAddress")
+                                        .HasColumnType("text");
+
+                                    b2.HasKey("ReferenceMethodId");
+
+                                    b2.ToTable("method", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceMethodId");
+                                });
+
+                            b1.OwnsOne("Metabase.Data.Standard", "Standard", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceMethodId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Locator")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                        .IsRequired()
+                                        .HasColumnType("metabase.standardizer[]");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<int?>("Year")
+                                        .HasColumnType("integer");
+
+                                    b2.HasKey("ReferenceMethodId");
+
+                                    b2.ToTable("method", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceMethodId");
+
+                                    b2.OwnsOne("Metabase.Data.Numeration", "Numeration", b3 =>
+                                        {
+                                            b3.Property<Guid>("StandardReferenceMethodId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("MainNumber")
+                                                .IsRequired()
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Prefix")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Suffix")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("StandardReferenceMethodId");
+
+                                            b3.ToTable("method", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("StandardReferenceMethodId");
+                                        });
+
+                                    b2.Navigation("Numeration")
+                                        .IsRequired();
+                                });
+
+                            b1.Navigation("Publication");
+
+                            b1.Navigation("Standard");
+                        });
+
+                    b.OwnsMany("Metabase.Data.MethodParameter", "Parameters", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<JsonElement>("Type")
+                                .HasColumnType("jsonb");
+
+                            b1.HasKey("MethodId", "Id");
+
+                            b1.ToTable("MethodParameter", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+                        });
+
+                    b.OwnsMany("Metabase.Data.MethodSource", "Sources", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Description")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.HasKey("MethodId", "Id");
+
+                            b1.ToTable("MethodSource", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("Parameters");
+
+                    b.Navigation("Reference");
+
+                    b.Navigation("Sources");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Owner")
+                        .WithMany("OpenIdConnectApplications")
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", "Application")
+                        .WithMany("Authorizations")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectToken", b =>
+                {
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", "Application")
+                        .WithMany("Tokens")
+                        .HasForeignKey("ApplicationId");
+
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", "Authorization")
+                        .WithMany("Tokens")
+                        .HasForeignKey("AuthorizationId");
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Authorization");
+                });
+
+            modelBuilder.Entity("Metabase.Data.RoleClaim", b =>
+                {
+                    b.HasOne("Metabase.Data.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserClaim", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserLogin", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserMethodDeveloper", b =>
+                {
+                    b.HasOne("Metabase.Data.Method", "Method")
+                        .WithMany("UserDeveloperEdges")
+                        .HasForeignKey("MethodId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("DevelopedMethodEdges")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Method");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserRole", b =>
+                {
+                    b.HasOne("Metabase.Data.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserToken", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.Navigation("ConcretizationEdges");
+
+                    b.Navigation("GeneralizationEdges");
+
+                    b.Navigation("ManufacturerEdges");
+
+                    b.Navigation("PartEdges");
+
+                    b.Navigation("PartOfEdges");
+
+                    b.Navigation("VariantEdges");
+
+                    b.Navigation("VariantOfEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.Navigation("DevelopedMethodEdges");
+
+                    b.Navigation("GnuPgKeyFingerprints");
+
+                    b.Navigation("ManagedComponents");
+
+                    b.Navigation("ManagedDataFormats");
+
+                    b.Navigation("ManagedInstitutions");
+
+                    b.Navigation("ManagedMethods");
+
+                    b.Navigation("ManufacturedComponentEdges");
+
+                    b.Navigation("OpenIdConnectApplications");
+
+                    b.Navigation("OperatedDatabases");
+
+                    b.Navigation("RepresentativeEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.Navigation("InstitutionDeveloperEdges");
+
+                    b.Navigation("UserDeveloperEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.Navigation("Authorizations");
+
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Metabase.Data.User", b =>
+                {
+                    b.Navigation("DevelopedMethodEdges");
+
+                    b.Navigation("GnuPgKeyFingerprints");
+
+                    b.Navigation("RepresentedInstitutionEdges");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/Migrations/20260402204629_AddUpdatedAndCreatedAtTimestamps.Designer.cs b/backend/src/Migrations/20260402204629_AddUpdatedAndCreatedAtTimestamps.Designer.cs
new file mode 100644
index 000000000..1216893cf
--- /dev/null
+++ b/backend/src/Migrations/20260402204629_AddUpdatedAndCreatedAtTimestamps.Designer.cs
@@ -0,0 +1,2243 @@
+// <auto-generated />
+using System;
+using System.Text.Json;
+using Metabase.Data;
+using Metabase.Enumerations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Metabase.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20260402204629_AddUpdatedAndCreatedAtTimestamps")]
+    partial class AddUpdatedAndCreatedAtTimestamps
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("metabase")
+                .HasAnnotation("ProductVersion", "10.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "component_category", new[] { "layer", "material", "unit" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "database_verification_state", new[] { "pending", "verified" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_operating_state", new[] { "not_operating", "operating" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_representative_role", new[] { "assistant", "owner" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_state", new[] { "pending", "verified" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "method_category", new[] { "calculation", "measurement" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "prime_surface", new[] { "inside", "outside" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "standardizer", new[] { "aerc", "agi", "ashrae", "breeam", "bs", "bsi", "cen", "cie", "dgnb", "din", "dvwg", "iec", "ies", "ift", "iso", "jis", "leed", "nfrc", "riba", "ul", "unece", "vdi", "vff", "well" });
+            NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "pgcrypto");
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("Abbreviation")
+                        .HasColumnType("text");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
+                        .HasColumnType("tstzrange");
+
+                    b.PrimitiveCollection<ComponentCategory[]>("Categories")
+                        .IsRequired()
+                        .HasColumnType("metabase.component_category[]");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<JsonElement?>("Extras")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.ToTable("component", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentAssembly", b =>
+                {
+                    b.Property<Guid>("AssembledComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("PartComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<byte?>("Index")
+                        .HasColumnType("smallint");
+
+                    b.Property<PrimeSurface?>("PrimeSurface")
+                        .HasColumnType("metabase.prime_surface");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("AssembledComponentId", "PartComponentId");
+
+                    b.HasIndex("PartComponentId");
+
+                    b.ToTable("component_assembly", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentConcretizationAndGeneralization", b =>
+                {
+                    b.Property<Guid>("GeneralComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ConcreteComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("GeneralComponentId", "ConcreteComponentId");
+
+                    b.HasIndex("ConcreteComponentId");
+
+                    b.ToTable("component_concretization_and_generalization", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentManufacturer", b =>
+                {
+                    b.Property<Guid>("ComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("ComponentId", "InstitutionId");
+
+                    b.HasIndex("InstitutionId");
+
+                    b.ToTable("component_manufacturer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentVariant", b =>
+                {
+                    b.Property<Guid>("OfComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ToComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("OfComponentId", "ToComponentId");
+
+                    b.HasIndex("ToComponentId");
+
+                    b.ToTable("component_variant", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.DataFormat", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Extension")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("MediaType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SchemaLocator")
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.ToTable("data_format", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Database", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Locator")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OperatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("VerificationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DatabaseVerificationState>("VerificationState")
+                        .HasColumnType("metabase.database_verification_state");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OperatorId");
+
+                    b.ToTable("database", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.GnuPgKeyFingerprint", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<OffsetDateTime?>("AllowedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Fingerprint")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<OffsetDateTime?>("ForbiddenAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Fingerprint")
+                        .IsUnique();
+
+                    b.HasIndex("InstitutionId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("gnu_pg_fingerprint", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("Abbreviation")
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<JsonElement?>("Extras")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<InstitutionOperatingState>("OperatingState")
+                        .HasColumnType("metabase.institution_operating_state");
+
+                    b.Property<InstitutionState>("State")
+                        .HasColumnType("metabase.institution_state");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.ToTable("institution", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionMethodDeveloper", b =>
+                {
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MethodId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("InstitutionId", "MethodId");
+
+                    b.HasIndex("MethodId");
+
+                    b.ToTable("institution_method_developer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionRepresentative", b =>
+                {
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<InstitutionRepresentativeRole>("Role")
+                        .HasColumnType("metabase.institution_representative_role");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("InstitutionId", "UserId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("institution_representative", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
+                        .HasColumnType("tstzrange");
+
+                    b.Property<string>("CalculationLocator")
+                        .HasColumnType("text");
+
+                    b.PrimitiveCollection<MethodCategory[]>("Categories")
+                        .IsRequired()
+                        .HasColumnType("metabase.method_category[]");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Validity")
+                        .HasColumnType("tstzrange");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.ToTable("method", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("ApplicationType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("ClientSecret")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClientType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ConsentType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayNames")
+                        .HasColumnType("text");
+
+                    b.Property<string>("JsonWebKeySet")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Permissions")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostLogoutRedirectUris")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RedirectUris")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Requirements")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Settings")
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId")
+                        .IsUnique();
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("OpenIddictApplications", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTime?>("CreationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Scopes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Subject")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                    b.ToTable("OpenIddictAuthorizations", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectScope", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Instant>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Descriptions")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayNames")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Resources")
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("OpenIddictScopes", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AuthorizationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTime?>("CreationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("ExpirationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("RedemptionDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ReferenceId")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Status")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Subject")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuthorizationId");
+
+                    b.HasIndex("ReferenceId")
+                        .IsUnique();
+
+                    b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                    b.ToTable("OpenIddictTokens", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Role", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("role", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.RoleClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("role_claim", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PostalAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.Property<string>("WebsiteLocator")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("user", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("user_claim", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserLogin", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("user_login", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserMethodDeveloper", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MethodId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("UserId", "MethodId");
+
+                    b.HasIndex("MethodId");
+
+                    b.ToTable("user_method_developer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserRole", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("user_role", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserToken", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("user_token", "metabase");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedComponents")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "PrimeDirection", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "PrimeSurface", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "SwitchableLayers", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("PrimeDirection");
+
+                    b.Navigation("PrimeSurface");
+
+                    b.Navigation("SwitchableLayers");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentAssembly", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "AssembledComponent")
+                        .WithMany("PartEdges")
+                        .HasForeignKey("AssembledComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "PartComponent")
+                        .WithMany("PartOfEdges")
+                        .HasForeignKey("PartComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("AssembledComponent");
+
+                    b.Navigation("PartComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentConcretizationAndGeneralization", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "ConcreteComponent")
+                        .WithMany("GeneralizationEdges")
+                        .HasForeignKey("ConcreteComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "GeneralComponent")
+                        .WithMany("ConcretizationEdges")
+                        .HasForeignKey("GeneralComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ConcreteComponent");
+
+                    b.Navigation("GeneralComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentManufacturer", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "Component")
+                        .WithMany("ManufacturerEdges")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("ManufacturedComponentEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Institution");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentVariant", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "OfComponent")
+                        .WithMany("VariantEdges")
+                        .HasForeignKey("OfComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "ToComponent")
+                        .WithMany("VariantOfEdges")
+                        .HasForeignKey("ToComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("OfComponent");
+
+                    b.Navigation("ToComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.DataFormat", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedDataFormats")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.Reference", "Reference", b1 =>
+                        {
+                            b1.Property<Guid>("DataFormatId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("DataFormatId");
+
+                            b1.ToTable("data_format", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("DataFormatId");
+
+                            b1.OwnsOne("Metabase.Data.Publication", "Publication", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceDataFormatId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("ArXiv")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<string[]>("Authors")
+                                        .HasColumnType("text[]");
+
+                                    b2.Property<string>("Doi")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Urn")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("WebAddress")
+                                        .HasColumnType("text");
+
+                                    b2.HasKey("ReferenceDataFormatId");
+
+                                    b2.ToTable("data_format", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceDataFormatId");
+                                });
+
+                            b1.OwnsOne("Metabase.Data.Standard", "Standard", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceDataFormatId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Locator")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                        .IsRequired()
+                                        .HasColumnType("metabase.standardizer[]");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<int?>("Year")
+                                        .HasColumnType("integer");
+
+                                    b2.HasKey("ReferenceDataFormatId");
+
+                                    b2.ToTable("data_format", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceDataFormatId");
+
+                                    b2.OwnsOne("Metabase.Data.Numeration", "Numeration", b3 =>
+                                        {
+                                            b3.Property<Guid>("StandardReferenceDataFormatId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("MainNumber")
+                                                .IsRequired()
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Prefix")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Suffix")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("StandardReferenceDataFormatId");
+
+                                            b3.ToTable("data_format", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("StandardReferenceDataFormatId");
+                                        });
+
+                                    b2.Navigation("Numeration")
+                                        .IsRequired();
+                                });
+
+                            b1.Navigation("Publication");
+
+                            b1.Navigation("Standard");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("Reference");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Database", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Operator")
+                        .WithMany("OperatedDatabases")
+                        .HasForeignKey("OperatorId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Operator");
+                });
+
+            modelBuilder.Entity("Metabase.Data.GnuPgKeyFingerprint", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("GnuPgKeyFingerprints")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("GnuPgKeyFingerprints")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedInstitutions")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.OwnsOne("Metabase.Data.ContactInformation", "Contact", b1 =>
+                        {
+                            b1.Property<Guid>("InstitutionId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("EmailAddress")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("IsEmailAddressConfirmed")
+                                .HasColumnType("boolean");
+
+                            b1.Property<bool>("IsPhoneNumberConfirmed")
+                                .HasColumnType("boolean");
+
+                            b1.Property<string>("PhoneNumber")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("PostalAddress")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("WebsiteLocator")
+                                .HasColumnType("text");
+
+                            b1.HasKey("InstitutionId");
+
+                            b1.ToTable("institution", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("InstitutionId");
+                        });
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Manager");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionMethodDeveloper", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("DevelopedMethodEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Method", "Method")
+                        .WithMany("InstitutionDeveloperEdges")
+                        .HasForeignKey("MethodId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("Method");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionRepresentative", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("RepresentativeEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("RepresentedInstitutionEdges")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedMethods")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.Reference", "Reference", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("MethodId");
+
+                            b1.ToTable("method", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+
+                            b1.OwnsOne("Metabase.Data.Publication", "Publication", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceMethodId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("ArXiv")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<string[]>("Authors")
+                                        .HasColumnType("text[]");
+
+                                    b2.Property<string>("Doi")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Urn")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("WebAddress")
+                                        .HasColumnType("text");
+
+                                    b2.HasKey("ReferenceMethodId");
+
+                                    b2.ToTable("method", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceMethodId");
+                                });
+
+                            b1.OwnsOne("Metabase.Data.Standard", "Standard", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceMethodId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Locator")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                        .IsRequired()
+                                        .HasColumnType("metabase.standardizer[]");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<int?>("Year")
+                                        .HasColumnType("integer");
+
+                                    b2.HasKey("ReferenceMethodId");
+
+                                    b2.ToTable("method", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceMethodId");
+
+                                    b2.OwnsOne("Metabase.Data.Numeration", "Numeration", b3 =>
+                                        {
+                                            b3.Property<Guid>("StandardReferenceMethodId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("MainNumber")
+                                                .IsRequired()
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Prefix")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Suffix")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("StandardReferenceMethodId");
+
+                                            b3.ToTable("method", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("StandardReferenceMethodId");
+                                        });
+
+                                    b2.Navigation("Numeration")
+                                        .IsRequired();
+                                });
+
+                            b1.Navigation("Publication");
+
+                            b1.Navigation("Standard");
+                        });
+
+                    b.OwnsMany("Metabase.Data.MethodParameter", "Parameters", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<JsonElement>("Type")
+                                .HasColumnType("jsonb");
+
+                            b1.HasKey("MethodId", "Id");
+
+                            b1.ToTable("MethodParameter", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+                        });
+
+                    b.OwnsMany("Metabase.Data.MethodSource", "Sources", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Description")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.HasKey("MethodId", "Id");
+
+                            b1.ToTable("MethodSource", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("Parameters");
+
+                    b.Navigation("Reference");
+
+                    b.Navigation("Sources");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Owner")
+                        .WithMany("OpenIdConnectApplications")
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", "Application")
+                        .WithMany("Authorizations")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectToken", b =>
+                {
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", "Application")
+                        .WithMany("Tokens")
+                        .HasForeignKey("ApplicationId");
+
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", "Authorization")
+                        .WithMany("Tokens")
+                        .HasForeignKey("AuthorizationId");
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Authorization");
+                });
+
+            modelBuilder.Entity("Metabase.Data.RoleClaim", b =>
+                {
+                    b.HasOne("Metabase.Data.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserClaim", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserLogin", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserMethodDeveloper", b =>
+                {
+                    b.HasOne("Metabase.Data.Method", "Method")
+                        .WithMany("UserDeveloperEdges")
+                        .HasForeignKey("MethodId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("DevelopedMethodEdges")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Method");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserRole", b =>
+                {
+                    b.HasOne("Metabase.Data.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserToken", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.Navigation("ConcretizationEdges");
+
+                    b.Navigation("GeneralizationEdges");
+
+                    b.Navigation("ManufacturerEdges");
+
+                    b.Navigation("PartEdges");
+
+                    b.Navigation("PartOfEdges");
+
+                    b.Navigation("VariantEdges");
+
+                    b.Navigation("VariantOfEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.Navigation("DevelopedMethodEdges");
+
+                    b.Navigation("GnuPgKeyFingerprints");
+
+                    b.Navigation("ManagedComponents");
+
+                    b.Navigation("ManagedDataFormats");
+
+                    b.Navigation("ManagedInstitutions");
+
+                    b.Navigation("ManagedMethods");
+
+                    b.Navigation("ManufacturedComponentEdges");
+
+                    b.Navigation("OpenIdConnectApplications");
+
+                    b.Navigation("OperatedDatabases");
+
+                    b.Navigation("RepresentativeEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.Navigation("InstitutionDeveloperEdges");
+
+                    b.Navigation("UserDeveloperEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.Navigation("Authorizations");
+
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Metabase.Data.User", b =>
+                {
+                    b.Navigation("DevelopedMethodEdges");
+
+                    b.Navigation("GnuPgKeyFingerprints");
+
+                    b.Navigation("RepresentedInstitutionEdges");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/backend/src/Migrations/20260402204629_AddUpdatedAndCreatedAtTimestamps.cs b/backend/src/Migrations/20260402204629_AddUpdatedAndCreatedAtTimestamps.cs
new file mode 100644
index 000000000..7870f69de
--- /dev/null
+++ b/backend/src/Migrations/20260402204629_AddUpdatedAndCreatedAtTimestamps.cs
@@ -0,0 +1,693 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using NodaTime;
+
+#nullable disable
+
+namespace Metabase.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddUpdatedAndCreatedAtTimestamps : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "user_method_developer",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "user_method_developer",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<uint>(
+                name: "xmin",
+                schema: "metabase",
+                table: "user_method_developer",
+                type: "xid",
+                rowVersion: true,
+                nullable: false,
+                defaultValue: 0u);
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "user",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "user",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "user",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictTokens",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "OpenIddictTokens",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "OpenIddictTokens",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictScopes",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "OpenIddictScopes",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValue: NodaTime.Instant.FromUnixTimeTicks(0L));
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "OpenIddictScopes",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValue: NodaTime.Instant.FromUnixTimeTicks(0L));
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictAuthorizations",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "OpenIddictAuthorizations",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "OpenIddictAuthorizations",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictApplications",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "OpenIddictApplications",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "OpenIddictApplications",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "method",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "method",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "institution_representative",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "institution_representative",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<uint>(
+                name: "xmin",
+                schema: "metabase",
+                table: "institution_representative",
+                type: "xid",
+                rowVersion: true,
+                nullable: false,
+                defaultValue: 0u);
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "institution_method_developer",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "institution_method_developer",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<uint>(
+                name: "xmin",
+                schema: "metabase",
+                table: "institution_method_developer",
+                type: "xid",
+                rowVersion: true,
+                nullable: false,
+                defaultValue: 0u);
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "institution",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "institution",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AlterColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "gnu_pg_fingerprint",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()",
+                oldClrType: typeof(OffsetDateTime),
+                oldType: "timestamp with time zone");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "gnu_pg_fingerprint",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "database",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "database",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "data_format",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "data_format",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "component_variant",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "component_variant",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<uint>(
+                name: "xmin",
+                schema: "metabase",
+                table: "component_variant",
+                type: "xid",
+                rowVersion: true,
+                nullable: false,
+                defaultValue: 0u);
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "component_manufacturer",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "component_manufacturer",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<uint>(
+                name: "xmin",
+                schema: "metabase",
+                table: "component_manufacturer",
+                type: "xid",
+                rowVersion: true,
+                nullable: false,
+                defaultValue: 0u);
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "component_concretization_and_generalization",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "component_concretization_and_generalization",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<uint>(
+                name: "xmin",
+                schema: "metabase",
+                table: "component_concretization_and_generalization",
+                type: "xid",
+                rowVersion: true,
+                nullable: false,
+                defaultValue: 0u);
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "component_assembly",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "component_assembly",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<uint>(
+                name: "xmin",
+                schema: "metabase",
+                table: "component_assembly",
+                type: "xid",
+                rowVersion: true,
+                nullable: false,
+                defaultValue: 0u);
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "component",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+
+            migrationBuilder.AddColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "component",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "user_method_developer");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "user_method_developer");
+
+            migrationBuilder.DropColumn(
+                name: "xmin",
+                schema: "metabase",
+                table: "user_method_developer");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "user");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "user");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "OpenIddictTokens");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "OpenIddictTokens");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "OpenIddictScopes");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "OpenIddictScopes");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "OpenIddictAuthorizations");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "OpenIddictAuthorizations");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "OpenIddictApplications");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "OpenIddictApplications");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "method");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "method");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "institution_representative");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "institution_representative");
+
+            migrationBuilder.DropColumn(
+                name: "xmin",
+                schema: "metabase",
+                table: "institution_representative");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "institution_method_developer");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "institution_method_developer");
+
+            migrationBuilder.DropColumn(
+                name: "xmin",
+                schema: "metabase",
+                table: "institution_method_developer");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "institution");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "institution");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "gnu_pg_fingerprint");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "database");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "database");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "data_format");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "data_format");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "component_variant");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "component_variant");
+
+            migrationBuilder.DropColumn(
+                name: "xmin",
+                schema: "metabase",
+                table: "component_variant");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "component_manufacturer");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "component_manufacturer");
+
+            migrationBuilder.DropColumn(
+                name: "xmin",
+                schema: "metabase",
+                table: "component_manufacturer");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "component_concretization_and_generalization");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "component_concretization_and_generalization");
+
+            migrationBuilder.DropColumn(
+                name: "xmin",
+                schema: "metabase",
+                table: "component_concretization_and_generalization");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "component_assembly");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "component_assembly");
+
+            migrationBuilder.DropColumn(
+                name: "xmin",
+                schema: "metabase",
+                table: "component_assembly");
+
+            migrationBuilder.DropColumn(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "component");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "component");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "user",
+                type: "uuid",
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictTokens",
+                type: "uuid",
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictScopes",
+                type: "uuid",
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictAuthorizations",
+                type: "uuid",
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictApplications",
+                type: "uuid",
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<OffsetDateTime>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "gnu_pg_fingerprint",
+                type: "timestamp with time zone",
+                nullable: false,
+                oldClrType: typeof(Instant),
+                oldType: "timestamp with time zone",
+                oldDefaultValueSql: "now()");
+        }
+    }
+}
diff --git a/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs b/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
index 421851491..92a16a3f5 100644
--- a/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Text.Json;
 using Metabase.Data;
@@ -53,6 +53,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("metabase.component_category[]");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<string>("Description")
                         .IsRequired()
                         .HasColumnType("text");
@@ -67,6 +72,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("text");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<uint>("Version")
                         .IsConcurrencyToken()
                         .ValueGeneratedOnAddOrUpdate()
@@ -88,12 +98,28 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("PartComponentId")
                         .HasColumnType("uuid");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<byte?>("Index")
                         .HasColumnType("smallint");
 
                     b.Property<PrimeSurface?>("PrimeSurface")
                         .HasColumnType("metabase.prime_surface");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
                     b.HasKey("AssembledComponentId", "PartComponentId");
 
                     b.HasIndex("PartComponentId");
@@ -109,6 +135,22 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("ConcreteComponentId")
                         .HasColumnType("uuid");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
                     b.HasKey("GeneralComponentId", "ConcreteComponentId");
 
                     b.HasIndex("ConcreteComponentId");
@@ -124,9 +166,25 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("InstitutionId")
                         .HasColumnType("uuid");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<bool>("Pending")
                         .HasColumnType("boolean");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
                     b.HasKey("ComponentId", "InstitutionId");
 
                     b.HasIndex("InstitutionId");
@@ -142,6 +200,22 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("ToComponentId")
                         .HasColumnType("uuid");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
                     b.HasKey("OfComponentId", "ToComponentId");
 
                     b.HasIndex("ToComponentId");
@@ -156,6 +230,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasDefaultValueSql("gen_random_uuid()");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<string>("Description")
                         .IsRequired()
                         .HasColumnType("text");
@@ -177,6 +256,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("SchemaLocator")
                         .HasColumnType("text");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<uint>("Version")
                         .IsConcurrencyToken()
                         .ValueGeneratedOnAddOrUpdate()
@@ -197,6 +281,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasDefaultValueSql("gen_random_uuid()");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<string>("Description")
                         .IsRequired()
                         .HasColumnType("text");
@@ -212,6 +301,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("OperatorId")
                         .HasColumnType("uuid");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<string>("VerificationCode")
                         .IsRequired()
                         .HasColumnType("text");
@@ -242,8 +336,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<OffsetDateTime?>("AllowedAt")
                         .HasColumnType("timestamp with time zone");
 
-                    b.Property<OffsetDateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
 
                     b.Property<string>("Fingerprint")
                         .IsRequired()
@@ -255,6 +351,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("InstitutionId")
                         .HasColumnType("uuid");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<Guid>("UserId")
                         .HasColumnType("uuid");
 
@@ -286,6 +387,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("Abbreviation")
                         .HasColumnType("text");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<string>("Description")
                         .IsRequired()
                         .HasColumnType("text");
@@ -306,6 +412,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<InstitutionState>("State")
                         .HasColumnType("metabase.institution_state");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<uint>("Version")
                         .IsConcurrencyToken()
                         .ValueGeneratedOnAddOrUpdate()
@@ -327,9 +438,25 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("MethodId")
                         .HasColumnType("uuid");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<bool>("Pending")
                         .HasColumnType("boolean");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
                     b.HasKey("InstitutionId", "MethodId");
 
                     b.HasIndex("MethodId");
@@ -345,12 +472,28 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("UserId")
                         .HasColumnType("uuid");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<bool>("Pending")
                         .HasColumnType("boolean");
 
                     b.Property<InstitutionRepresentativeRole>("Role")
                         .HasColumnType("metabase.institution_representative_role");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
                     b.HasKey("InstitutionId", "UserId");
 
                     b.HasIndex("UserId");
@@ -375,6 +518,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("metabase.method_category[]");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<string>("Description")
                         .IsRequired()
                         .HasColumnType("text");
@@ -386,6 +534,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("text");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<NpgsqlRange<OffsetDateTime>?>("Validity")
                         .HasColumnType("tstzrange");
 
@@ -406,7 +559,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
 
                     b.Property<string>("ApplicationType")
                         .HasMaxLength(50)
@@ -432,6 +586,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("character varying(50)");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<string>("DisplayName")
                         .HasColumnType("text");
 
@@ -462,6 +621,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("Settings")
                         .HasColumnType("text");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<uint>("Version")
                         .IsConcurrencyToken()
                         .ValueGeneratedOnAddOrUpdate()
@@ -482,7 +646,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
 
                     b.Property<Guid?>("ApplicationId")
                         .HasColumnType("uuid");
@@ -492,6 +657,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("character varying(50)");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<DateTime?>("CreationDate")
                         .HasColumnType("timestamp with time zone");
 
@@ -513,6 +683,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("character varying(50)");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<uint>("Version")
                         .IsConcurrencyToken()
                         .ValueGeneratedOnAddOrUpdate()
@@ -530,13 +705,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
 
                     b.Property<string>("ConcurrencyToken")
                         .IsConcurrencyToken()
                         .HasMaxLength(50)
                         .HasColumnType("character varying(50)");
 
+                    b.Property<Instant>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
                     b.Property<string>("Description")
                         .HasColumnType("text");
 
@@ -559,6 +738,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("Resources")
                         .HasColumnType("text");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
                     b.Property<uint>("Version")
                         .IsConcurrencyToken()
                         .ValueGeneratedOnAddOrUpdate()
@@ -577,7 +759,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
 
                     b.Property<Guid?>("ApplicationId")
                         .HasColumnType("uuid");
@@ -590,6 +773,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("character varying(50)");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<DateTime?>("CreationDate")
                         .HasColumnType("timestamp with time zone");
 
@@ -621,6 +809,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(150)
                         .HasColumnType("character varying(150)");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<uint>("Version")
                         .IsConcurrencyToken()
                         .ValueGeneratedOnAddOrUpdate()
@@ -694,7 +887,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("uuid");
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
 
                     b.Property<int>("AccessFailedCount")
                         .HasColumnType("integer");
@@ -703,6 +897,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsConcurrencyToken()
                         .HasColumnType("text");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<string>("Email")
                         .HasMaxLength(256)
                         .HasColumnType("character varying(256)");
@@ -746,6 +945,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<bool>("TwoFactorEnabled")
                         .HasColumnType("boolean");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<string>("UserName")
                         .HasMaxLength(256)
                         .HasColumnType("character varying(256)");
@@ -824,9 +1028,25 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("MethodId")
                         .HasColumnType("uuid");
 
+                    b.Property<Instant>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
                     b.Property<bool>("Pending")
                         .HasColumnType("boolean");
 
+                    b.Property<Instant>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
                     b.HasKey("UserId", "MethodId");
 
                     b.HasIndex("MethodId");
diff --git a/backend/src/Migrations/migrate.sql b/backend/src/Migrations/migrate.sql
index a17340535..f55e2c020 100644
--- a/backend/src/Migrations/migrate.sql
+++ b/backend/src/Migrations/migrate.sql
@@ -2293,3 +2293,301 @@ BEGIN
 END $EF$;
 COMMIT;
 
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.user_method_developer ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.user_method_developer ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."user" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."user" ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."user" ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictTokens" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictTokens" ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictTokens" ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT TIMESTAMPTZ '1970-01-01T00:00:00Z';
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT TIMESTAMPTZ '1970-01-01T00:00:00Z';
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictAuthorizations" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictAuthorizations" ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictAuthorizations" ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictApplications" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictApplications" ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictApplications" ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.method ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.method ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution_representative ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution_representative ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution_method_developer ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution_method_developer ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.gnu_pg_fingerprint ALTER COLUMN "CreatedAt" SET DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.gnu_pg_fingerprint ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.database ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.database ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.data_format ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.data_format ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_variant ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_variant ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_manufacturer ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_manufacturer ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_concretization_and_generalization ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_concretization_and_generalization ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_assembly ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_assembly ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+    VALUES ('20260402204629_AddUpdatedAndCreatedAtTimestamps', '10.0.5');
+    END IF;
+END $EF$;
+COMMIT;
+
diff --git a/backend/src/Migrations/migrate_from_20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt_to_20260402204629_AddUpdatedAndCreatedAtTimestamps.sql b/backend/src/Migrations/migrate_from_20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt_to_20260402204629_AddUpdatedAndCreatedAtTimestamps.sql
new file mode 100644
index 000000000..196721d63
--- /dev/null
+++ b/backend/src/Migrations/migrate_from_20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt_to_20260402204629_AddUpdatedAndCreatedAtTimestamps.sql
@@ -0,0 +1,298 @@
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.user_method_developer ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.user_method_developer ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."user" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."user" ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."user" ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictTokens" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictTokens" ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictTokens" ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT TIMESTAMPTZ '1970-01-01T00:00:00Z';
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT TIMESTAMPTZ '1970-01-01T00:00:00Z';
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictAuthorizations" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictAuthorizations" ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictAuthorizations" ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictApplications" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictApplications" ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictApplications" ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.method ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.method ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution_representative ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution_representative ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution_method_developer ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution_method_developer ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.gnu_pg_fingerprint ALTER COLUMN "CreatedAt" SET DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.gnu_pg_fingerprint ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.database ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.database ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.data_format ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.data_format ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_variant ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_variant ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_manufacturer ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_manufacturer ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_concretization_and_generalization ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_concretization_and_generalization ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_assembly ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_assembly ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component ADD "CreatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component ADD "UpdatedAt" timestamp with time zone NOT NULL DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+    VALUES ('20260402204629_AddUpdatedAndCreatedAtTimestamps', '10.0.5');
+    END IF;
+END $EF$;
+COMMIT;
+
diff --git a/backend/src/Migrations/rollback_from_20260402204629_AddUpdatedAndCreatedAtTimestamps_to_20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt.sql b/backend/src/Migrations/rollback_from_20260402204629_AddUpdatedAndCreatedAtTimestamps_to_20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt.sql
new file mode 100644
index 000000000..b4f10ea43
--- /dev/null
+++ b/backend/src/Migrations/rollback_from_20260402204629_AddUpdatedAndCreatedAtTimestamps_to_20260328153447_CorrectExistsFlagsOfReferencesSecondAttempt.sql
@@ -0,0 +1,256 @@
+START TRANSACTION;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.user_method_developer DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.user_method_developer DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."user" DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."user" DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictTokens" DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictTokens" DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictScopes" DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictScopes" DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictAuthorizations" DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictAuthorizations" DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictApplications" DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictApplications" DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.method DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.method DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution_representative DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution_representative DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution_method_developer DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution_method_developer DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.institution DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.gnu_pg_fingerprint DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.database DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.database DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.data_format DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.data_format DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_variant DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_variant DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_manufacturer DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_manufacturer DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_concretization_and_generalization DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_concretization_and_generalization DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_assembly DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component_assembly DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component DROP COLUMN "CreatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.component DROP COLUMN "UpdatedAt";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."user" ALTER COLUMN "Id" DROP DEFAULT;
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictTokens" ALTER COLUMN "Id" DROP DEFAULT;
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ALTER COLUMN "Id" DROP DEFAULT;
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictAuthorizations" ALTER COLUMN "Id" DROP DEFAULT;
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase."OpenIddictApplications" ALTER COLUMN "Id" DROP DEFAULT;
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    ALTER TABLE metabase.gnu_pg_fingerprint ALTER COLUMN "CreatedAt" DROP DEFAULT;
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps') THEN
+    DELETE FROM "__EFMigrationsHistory"
+    WHERE "MigrationId" = '20260402204629_AddUpdatedAndCreatedAtTimestamps';
+    END IF;
+END $EF$;
+COMMIT;
+
diff --git a/backend/src/Program.cs b/backend/src/Program.cs
index c569a0428..e515aeffd 100644
--- a/backend/src/Program.cs
+++ b/backend/src/Program.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using HotChocolate;
 using Metabase.Data;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.EntityFrameworkCore;
@@ -90,9 +91,8 @@ string[] commandLineArguments
                 }
                 await SeedDatabase(scope.ServiceProvider);
             }
-
-            await application.RunAsync();
-            return 0;
+            // dotnet run -- schema export --output ./schema.graphql
+            return await application.RunWithGraphQLCommandsAsync(commandLineArguments);
         }
         catch (Exception exception) when (exception is not HostAbortedException && exception.Source != "Microsoft.EntityFrameworkCore.Design") // see https://github.com/dotnet/efcore/issues/29923
         {
diff --git a/backend/src/Services/EmailSender.cs b/backend/src/Services/EmailSender.cs
index b0e2c00b5..f0c1cc692 100644
--- a/backend/src/Services/EmailSender.cs
+++ b/backend/src/Services/EmailSender.cs
@@ -36,7 +36,7 @@ string body
         message.From.Add(
             new MailboxAddress(
                 "Metabase",
-                $"metabase@{appSettings.Uri.Host}"
+                $"metabase@{appSettings.Host}"
             )
         );
         message.To.Add(
diff --git a/backend/src/Startup.cs b/backend/src/Startup.cs
index c057cd723..e18bcd9db 100644
--- a/backend/src/Startup.cs
+++ b/backend/src/Startup.cs
@@ -6,13 +6,13 @@
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
-using HotChocolate.AspNetCore;
 using Metabase.Configuration;
 using Metabase.Data;
 using Metabase.Data.Extensions;
 using Metabase.Data.OpenIdConnect;
 using Metabase.Enumerations;
 using Metabase.GraphQl;
+using Metabase.GraphQl.Requests;
 using Metabase.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
@@ -28,6 +28,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi;
+using NodaTime;
 using Npgsql;
 using OpenTelemetry.Exporter;
 using OpenTelemetry.Logs;
@@ -51,10 +52,10 @@ IConfiguration configuration
         })
         ?? throw new InvalidOperationException("Failed to get application settings from configuration.");
 
+    private readonly IClock _clock = SystemClock.Instance;
+
     public void ConfigureServices(IServiceCollection services)
     {
-        AuthConfiguration.ConfigureServices(services, environment, _appSettings);
-        GraphQlConfiguration.ConfigureServices(services, environment);
         ConfigureDatabaseServices(services);
         services.AddScoped<IEmailSender, EmailSender>();
         ConfigureRequestResponseServices(services);
@@ -76,8 +77,11 @@ public void ConfigureServices(IServiceCollection services)
         // .AddOpenIdConnectServer(_appSettings.Uri, isDynamicOpenIdProvider: false)
         services.AddSingleton(_appSettings);
         services.AddSingleton(environment);
+        services.AddSingleton<IClock>(_clock);
         // services.AddDatabaseDeveloperPageExceptionFilter();
         ConfigureCustomServices(services);
+        AuthConfiguration.ConfigureServices(services, environment, _appSettings, _clock);
+        GraphQlConfiguration.ConfigureServices(services, environment);
     }
 
     private static void ConfigureRequestResponseServices(IServiceCollection services)
@@ -85,7 +89,6 @@ private static void ConfigureRequestResponseServices(IServiceCollection services
         // https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/proxy-load-balancer#forwarded-headers-middleware-order
         services.Configure<ForwardedHeadersOptions>(_ =>
             {
-                // TODO _.AllowedHosts = ...
                 _.ForwardedHeaders =
                     ForwardedHeaders.XForwardedFor |
                     ForwardedHeaders.XForwardedProto |
@@ -283,7 +286,9 @@ private void ConfigureHttpClientServices(IServiceCollection services)
     public static void ConfigureCustomServices(IServiceCollection services)
     {
         services.AddScoped<GnuPgService>();
+        services.AddScoped<GraphQlRequestHelper>();
         services.AddScoped<QueryingDatabases>();
+        services.AddScoped<DataQueries>();
     }
 
     public void Configure(WebApplication app)
@@ -315,11 +320,11 @@ public void Configure(WebApplication app)
         app.UseStaticFiles();
         app.UseCookiePolicy(); // [SameSite cookies](https://learn.microsoft.com/en-us/aspnet/core/security/samesite)
         app.UseRouting();
-        // TODO Do we really want this? See https://docs.microsoft.com/en-us/aspnet/core/fundamentals/localization?view=aspnetcore-5.0
+        // [Localization](https://docs.microsoft.com/en-us/aspnet/core/fundamentals/localization)
         app.UseRequestLocalization(_ =>
         {
-            _.AddSupportedCultures("en-US", "de-DE");
-            _.AddSupportedUICultures("en-US", "de-DE");
+            _.AddSupportedCultures("en-US");
+            _.AddSupportedUICultures("en-US");
             _.SetDefaultCulture("en-US");
         });
         app.UseCors();
@@ -342,25 +347,6 @@ public void Configure(WebApplication app)
             _.WithOpenApiRoutePattern(OpenApiConstants.RoutePattern);
         });
         app.MapGraphQL()
-            .WithOptions(
-                // https://chillicream.com/docs/hotchocolate/server/middleware
-                new GraphQLServerOptions
-                {
-                    EnableSchemaRequests = true,
-                    EnableGetRequests = false,
-                    // AllowedGetOperations = AllowedGetOperations.Query
-                    EnableMultipartRequests = false,
-                    Tool =
-                    {
-                        DisableTelemetry = true,
-                        Enable = true, // environment.IsDevelopment()
-                        IncludeCookies = false,
-                        GraphQLEndpoint = GraphQlConstants.EndpointPath,
-                        HttpMethod = DefaultHttpMethod.Post,
-                        Title = "GraphQL"
-                    }
-                }
-            )
             .RequireCors(GraphQlConstants.CorsPolicy);
         app.MapControllers();
         app.MapHealthChecks("/health",
diff --git a/backend/test/AuditableTests.cs b/backend/test/AuditableTests.cs
new file mode 100644
index 000000000..3e3ae745e
--- /dev/null
+++ b/backend/test/AuditableTests.cs
@@ -0,0 +1,75 @@
+using NodaTime;
+using NodaTime.Testing;
+using Microsoft.EntityFrameworkCore;
+using NUnit.Framework;
+using Metabase.Data;
+using System;
+using System.Threading.Tasks;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Metabase.Tests;
+
+[TestFixture]
+public sealed class AuditableTests
+{
+    private DbContextOptions<ApplicationDbContext> _options = default!;
+
+    [SetUp]
+    public void Setup()
+    {
+        _options = new DbContextOptionsBuilder<ApplicationDbContext>()
+            .UseInMemoryDatabase(databaseName: Guid.NewGuid().ToString())
+            .Options;
+    }
+
+    [Test]
+    [SuppressMessage("Naming", "CA1707")]
+    public async Task SaveChanges_SetsAndUpdatesTimestamps_UsingFakeClock()
+    {
+        // Arrange
+        var startInstant = Instant.FromUtc(2024, 1, 1, 10, 0);
+        var fakeClock = new FakeClock(startInstant);
+        using var context = new ApplicationDbContext(_options, fakeClock);
+        var entity = new Method("Name", "Description", null, null, null, [], [], []);
+        // Act
+        context.Add(entity);
+        await context.SaveChangesAsync();
+        // Assert
+        Assert.Multiple(() =>
+        {
+            Assert.That(entity.CreatedAt, Is.EqualTo(startInstant.WithOffset(Offset.Zero)));
+            Assert.That(entity.UpdatedAt, Is.EqualTo(startInstant.WithOffset(Offset.Zero)));
+        });
+        // Act
+        var duration = Duration.FromHours(1);
+        fakeClock.Advance(duration);
+        var updatedInstant = startInstant.Plus(duration);
+        entity.Update("Name", "Description", null, null, null, [], [], []);
+        await context.SaveChangesAsync();
+        // Assert
+        Assert.Multiple(() =>
+        {
+            Assert.That(entity.CreatedAt, Is.EqualTo(startInstant.WithOffset(Offset.Zero)), "CreatedAt should not change on update.");
+            Assert.That(entity.UpdatedAt, Is.EqualTo(updatedInstant.WithOffset(Offset.Zero)), "UpdatedAt should reflect the new fake time.");
+        });
+    }
+
+    // [Test]
+    // public async Task Remove_PerformsSoftDelete_AndSetsDeletedAt()
+    // {
+    //     var deleteTime = Instant.FromUtc(2024, 1, 1, 15, 0);
+    //     var fakeClock = new FakeClock(deleteTime);
+    //     using var context = new ApplicationDbContext(_options, fakeClock);
+    //     var entity = new YourModel { Name = "To Be Deleted" };
+    //     context.Add(entity);
+    //     await context.SaveChangesAsync();
+    //     // Act
+    //     context.Remove(entity);
+    //     await context.SaveChangesAsync();
+    //     // Assert
+    //     Assert.That(entity.DeletedAt, Is.EqualTo(deleteTime));
+    //     // Ensure it's hidden from normal queries
+    //     var count = await context.YourModels.CountAsync();
+    //     Assert.That(count, Is.Zero);
+    // }
+}
\ No newline at end of file
diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index dd06ce132..77b33725d 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -16,11 +16,15 @@ interface Approval {
 interface Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
+  component: Component
   componentId: Uuid!
   createdAt: DateTime!
+  creator: Institution
   creatorId: Uuid!
+  database: Database
   databaseId: Uuid!
   description: String
+  id: ID!
   kind: DataKind!
   locale: Locale!
   name: String
@@ -179,7 +183,7 @@ type AppliedMethod {
   sources: [NamedMethodSource!]!
 }
 
-type CalorimetricData implements Data {
+type CalorimetricData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
   component: Component @cost(weight: "10")
@@ -204,14 +208,14 @@ type CalorimetricData implements Data {
 }
 
 type CalorimetricDataConnection {
-  edges: [CalorimetricDataEdge!]!
-  pageInfo: PageInfo!
+  edges: [CalorimetricDataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
   totalCount: NonNegativeInt!
 }
 
 type CalorimetricDataEdge {
   cursor: String!
-  node: CalorimetricData!
+  node: CalorimetricData! @cost(weight: "0")
 }
 
 type ChangeInstitutionRepresentativeRoleError implements UserError {
@@ -259,101 +263,103 @@ type CielabColor {
 
 type Component implements Node {
   abbreviation: String
-  assembledOf(where: ComponentAssembledOfFilterInput @cost(weight: "10")): ComponentAssembledOfConnection! @cost(weight: "10")
+  assembledOf(order: [ComponentAssembledOfSortInput!] @cost(weight: "10") where: ComponentAssembledOfFilterInput @cost(weight: "10")): ComponentAssembledOfConnection! @cost(weight: "10")
   availability: OpenEndedDateTimeRange
   categories: [ComponentCategory!]!
-  concretizationOf(where: ComponentConcretizationOfFilterInput @cost(weight: "10")): ComponentConcretizationOfConnection! @cost(weight: "10")
+  concretizationOf(order: [ComponentConcretizationOfSortInput!] @cost(weight: "10") where: ComponentConcretizationOfFilterInput @cost(weight: "10")): ComponentConcretizationOfConnection! @cost(weight: "10")
+  createdAt: DateTime!
   description: String!
   extras: Any
-  generalizationOf(where: ComponentGeneralizationOfFilterInput @cost(weight: "10")): ComponentGeneralizationOfConnection! @cost(weight: "10")
+  generalizationOf(order: [ComponentGeneralizationOfSortInput!] @cost(weight: "10") where: ComponentGeneralizationOfFilterInput @cost(weight: "10")): ComponentGeneralizationOfConnection! @cost(weight: "10")
   id: ID!
-  isAuthorizedToUpdateNode: Boolean! @cost(weight: "10")
+  isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
   manager: ComponentManagerEdge! @cost(weight: "10")
-  manufacturers(where: ComponentManufacturerFilterInput @cost(weight: "10")): ComponentManufacturerConnection! @cost(weight: "10")
+  manufacturers(order: [ComponentManufacturerSortInput!] @cost(weight: "10") where: ComponentManufacturerFilterInput @cost(weight: "10")): ComponentManufacturerConnection! @cost(weight: "10")
   name: String!
-  partOf(where: ComponentPartOfFilterInput @cost(weight: "10")): ComponentPartOfConnection! @cost(weight: "10")
-  pendingManufacturers(where: ComponentManufacturerFilterInput @cost(weight: "10")): PendingComponentManufacturerConnection @authorize(policy: "WriteScope") @cost(weight: "10")
-  prime: PrimeSurfaceOrDirection @cost(weight: "10")
+  partOf(order: [ComponentPartOfSortInput!] @cost(weight: "10") where: ComponentPartOfFilterInput @cost(weight: "10")): ComponentPartOfConnection! @cost(weight: "10")
+  pendingManufacturers(order: [ComponentManufacturerSortInput!] @cost(weight: "10") where: ComponentManufacturerFilterInput @cost(weight: "10")): PendingComponentManufacturerConnection @authorize(policy: "WriteScope") @cost(weight: "10")
+  prime: PrimeSurfaceOrDirection @cost(weight: "0")
   switchableLayers: DescriptionOrReference
-  uuid: Uuid! @cost(weight: "10")
-  variantOf(where: ComponentVariantOfFilterInput @cost(weight: "10")): ComponentVariantOfConnection! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
+  variantOf(order: [ComponentVariantOfSortInput!] @cost(weight: "10") where: ComponentVariantOfFilterInput @cost(weight: "10")): ComponentVariantOfConnection! @cost(weight: "10")
 }
 
 type ComponentAssembledOfConnection {
-  edges: [ComponentAssembledOfEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [ComponentAssembledOfEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type ComponentAssembledOfEdge {
-  index: Byte
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToUpdateEdge: Boolean! @cost(weight: "10")
-  node: Component! @cost(weight: "10")
+  index: UnsignedByte
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToUpdateEdge: Boolean! @cost(weight: "1")
+  node: Component! @cost(weight: "0")
   primeSurface: PrimeSurface
 }
 
 type ComponentConcretizationOfConnection {
-  edges: [ComponentConcretizationOfEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [ComponentConcretizationOfEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type ComponentConcretizationOfEdge {
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: Component! @cost(weight: "10")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Component! @cost(weight: "0")
 }
 
 type ComponentGeneralizationOfConnection {
-  edges: [ComponentGeneralizationOfEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [ComponentGeneralizationOfEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type ComponentGeneralizationOfEdge {
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: Component! @cost(weight: "10")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Component! @cost(weight: "0")
 }
 
 type ComponentManagerEdge {
-  node: Institution! @cost(weight: "10")
+  node: Institution! @cost(weight: "0")
 }
 
 type ComponentManufacturerConnection {
-  edges: [ComponentManufacturerEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [ComponentManufacturerEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type ComponentManufacturerEdge {
-  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: Institution! @cost(weight: "10")
+  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Institution! @cost(weight: "0")
 }
 
 type ComponentPartOfConnection {
-  edges: [ComponentPartOfEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [ComponentPartOfEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type ComponentPartOfEdge {
-  index: Byte
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToUpdateEdge: Boolean! @cost(weight: "10")
-  node: Component! @cost(weight: "10")
+  index: UnsignedByte
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToUpdateEdge: Boolean! @cost(weight: "1")
+  node: Component! @cost(weight: "0")
   primeSurface: PrimeSurface
 }
 
 type ComponentVariantOfConnection {
-  edges: [ComponentVariantOfEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [ComponentVariantOfEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type ComponentVariantOfEdge {
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: Component! @cost(weight: "10")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Component! @cost(weight: "0")
 }
 
 "A connection to a list of items."
@@ -533,7 +539,7 @@ type CreateOpenIdConnectApplicationPayload {
 }
 
 type CrossDatabaseDataReference {
-  database: Institution @cost(weight: "10")
+  database: Database @cost(weight: "10")
   databaseId: Uuid!
   dataId: Uuid!
   dataKind: DataKind!
@@ -553,31 +559,33 @@ type DataApproval implements Approval {
 }
 
 type DataConnection {
-  edges: [DataEdge!]!
-  pageInfo: PageInfo!
+  edges: [DataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
   totalCount: NonNegativeInt!
 }
 
 type DataEdge {
   cursor: String!
-  node: Data!
+  node: Data! @cost(weight: "0")
 }
 
 type DataFormat implements Node {
+  createdAt: DateTime!
   description: String!
   extension: String
   id: ID!
-  isAuthorizedToUpdateNode: Boolean! @cost(weight: "10")
+  isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
   manager: DataFormatManagerEdge! @cost(weight: "10")
   mediaType: String!
   name: String!
-  reference: Reference @cost(weight: "10")
+  reference: Reference @cost(weight: "0")
   schemaLocator: Url
-  uuid: Uuid! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
 }
 
 type DataFormatManagerEdge {
-  node: Institution! @cost(weight: "10")
+  node: Institution! @cost(weight: "0")
 }
 
 "A connection to a list of items."
@@ -606,6 +614,7 @@ type Database implements Node {
   allOpticalData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: OpticalDataPropositionInput): OpticalDataConnection @cost(weight: "10")
   allPhotovoltaicData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: PhotovoltaicDataPropositionInput): PhotovoltaicDataConnection @cost(weight: "10")
   calorimetricData(id: Uuid! locale: Locale): CalorimetricData @cost(weight: "10")
+  createdAt: DateTime!
   data(id: Uuid! kind: DataKind! locale: Locale): Data @cost(weight: "10")
   description: String!
   geometricData(id: Uuid! locale: Locale): GeometricData @cost(weight: "10")
@@ -618,21 +627,22 @@ type Database implements Node {
   hasPhotovoltaicData(locale: Locale where: PhotovoltaicDataPropositionInput): Boolean @cost(weight: "10")
   hygrothermalData(id: Uuid! locale: Locale): HygrothermalData @cost(weight: "10")
   id: ID!
-  isAuthorizedToUpdateNode: Boolean! @cost(weight: "10")
-  isAuthorizedToVerifyNode: Boolean! @cost(weight: "10")
+  isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
+  isAuthorizedToVerifyNode: Boolean! @cost(weight: "1")
   lifeCycleData(id: Uuid! locale: Locale): LifeCycleData @cost(weight: "10")
   locator: Url!
   name: String!
   operator: DatabaseOperatorEdge! @cost(weight: "10")
   opticalData(id: Uuid! locale: Locale): OpticalData @cost(weight: "10")
   photovoltaicData(id: Uuid! locale: Locale): PhotovoltaicData @cost(weight: "10")
-  uuid: Uuid! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
   verificationCode: String!
   verificationState: DatabaseVerificationState!
 }
 
 type DatabaseOperatorEdge {
-  node: Institution! @cost(weight: "10")
+  node: Institution! @cost(weight: "0")
 }
 
 "A connection to a list of items."
@@ -712,7 +722,7 @@ type DeleteUserPayload {
 
 type DescriptionOrReference {
   description: String
-  reference: Reference @cost(weight: "10")
+  reference: Reference @cost(weight: "0")
 }
 
 type DisableUserTwoFactorAuthenticationError implements UserError {
@@ -799,7 +809,7 @@ type GenerateUserTwoFactorRecoveryCodesPayload {
   user: User
 }
 
-type GeometricData implements Data {
+type GeometricData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
   component: Component @cost(weight: "10")
@@ -823,14 +833,14 @@ type GeometricData implements Data {
 }
 
 type GeometricDataConnection {
-  edges: [GeometricDataEdge!]!
-  pageInfo: PageInfo!
+  edges: [GeometricDataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
   totalCount: NonNegativeInt!
 }
 
 type GeometricDataEdge {
   cursor: String!
-  node: GeometricData!
+  node: GeometricData! @cost(weight: "0")
 }
 
 type GetHttpsResource {
@@ -866,18 +876,19 @@ type GnuPgKeyFingerprint implements Node {
   forbiddenAt: DateTime
   id: ID!
   institution: GnuPgKeyFingerprintInstitutionEdge! @cost(weight: "10")
-  isAuthorizedToAllowNode: Boolean! @cost(weight: "10")
-  isAuthorizedToForbidNode: Boolean! @cost(weight: "10")
+  isAuthorizedToAllowNode: Boolean! @cost(weight: "1")
+  isAuthorizedToForbidNode: Boolean! @cost(weight: "1")
+  updatedAt: DateTime!
   user: GnuPgKeyFingerprintUserEdge! @cost(weight: "10")
-  uuid: Uuid! @cost(weight: "10")
+  uuid: Uuid!
 }
 
 type GnuPgKeyFingerprintInstitutionEdge {
-  node: Institution! @cost(weight: "10")
+  node: Institution! @cost(weight: "0")
 }
 
 type GnuPgKeyFingerprintUserEdge {
-  node: User! @cost(weight: "10")
+  node: User! @cost(weight: "0")
 }
 
 "A connection to a list of items."
@@ -898,7 +909,7 @@ type GnuPgKeyFingerprintsEdge {
   node: GnuPgKeyFingerprint!
 }
 
-type HygrothermalData implements Data {
+type HygrothermalData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
   component: Component @cost(weight: "10")
@@ -921,60 +932,64 @@ type HygrothermalData implements Data {
 }
 
 type HygrothermalDataConnection {
-  edges: [HygrothermalDataEdge!]!
-  pageInfo: PageInfo!
+  edges: [HygrothermalDataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
   totalCount: NonNegativeInt!
 }
 
 type HygrothermalDataEdge {
   cursor: String!
-  node: HygrothermalData!
+  node: HygrothermalData! @cost(weight: "0")
 }
 
 type Institution implements Node {
   abbreviation: String
   contact: ContactInformation
+  createdAt: DateTime!
   description: String!
-  developedMethods(where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")): InstitutionDevelopedMethodConnection! @cost(weight: "10")
+  developedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionDevelopedMethodSortInput!] @cost(weight: "10") where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")): InstitutionDevelopedMethodConnection! @cost(weight: "10")
   extras: Any
-  gnuPgKeyFingerprints(where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")): InstitutionGnuPgKeyFingerprintConnection! @cost(weight: "10")
-  hasGnuPgKeyFingerprint(where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")): Boolean! @cost(weight: "10")
+  gnuPgKeyFingerprints(order: [InstitutionGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")): InstitutionGnuPgKeyFingerprintConnection! @cost(weight: "10")
+  hasGnuPgKeyFingerprint(order: [InstitutionGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")): Boolean! @cost(weight: "10")
   id: ID!
-  isAuthorizedToDeleteNode: Boolean! @cost(weight: "10")
-  isAuthorizedToSwitchOperatingStateOfNode: Boolean! @cost(weight: "10")
-  isAuthorizedToUpdateNode: Boolean! @cost(weight: "10")
-  isAuthorizedToVerifyNode: Boolean! @cost(weight: "10")
-  managedComponents(where: InstitutionManagedComponentFilterInput @cost(weight: "10")): InstitutionManagedComponentConnection! @cost(weight: "10")
-  managedDataFormats(where: InstitutionManagedDataFormatFilterInput @cost(weight: "10")): InstitutionManagedDataFormatConnection! @cost(weight: "10")
-  managedInstitutions(where: InstitutionManagedInstitutionFilterInput @cost(weight: "10")): InstitutionManagedInstitutionConnection! @cost(weight: "10")
-  managedMethods(where: InstitutionManagedMethodFilterInput @cost(weight: "10")): InstitutionManagedMethodConnection! @cost(weight: "10")
+  isAuthorizedToDeleteNode: Boolean! @cost(weight: "1")
+  isAuthorizedToSwitchOperatingStateOfNode: Boolean! @cost(weight: "1")
+  isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
+  isAuthorizedToVerifyNode: Boolean! @cost(weight: "1")
+  managedComponents("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedComponentSortInput!] @cost(weight: "10") where: InstitutionManagedComponentFilterInput @cost(weight: "10")): InstitutionManagedComponentConnection! @cost(weight: "10")
+  managedDataFormats("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedDataFormatSortInput!] @cost(weight: "10") where: InstitutionManagedDataFormatFilterInput @cost(weight: "10")): InstitutionManagedDataFormatConnection! @cost(weight: "10")
+  managedInstitutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedInstitutionSortInput!] @cost(weight: "10") where: InstitutionManagedInstitutionFilterInput @cost(weight: "10")): InstitutionManagedInstitutionConnection! @cost(weight: "10")
+  managedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedMethodSortInput!] @cost(weight: "10") where: InstitutionManagedMethodFilterInput @cost(weight: "10")): InstitutionManagedMethodConnection! @cost(weight: "10")
   manager: InstitutionManagerEdge @cost(weight: "10")
-  manufacturedComponents(where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")): InstitutionManufacturedComponentConnection! @cost(weight: "10")
+  manufacturedComponents("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManufacturedComponentSortInput!] @cost(weight: "10") where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")): InstitutionManufacturedComponentConnection! @cost(weight: "10")
   name: String!
-  openIdConnectApplications(where: InstitutionOwnedOpenIdConnectApplicationFilterInput @cost(weight: "10")): InstitutionOwnedOpenIdConnectApplicationConnection! @cost(weight: "10")
-  operatedDatabases(where: InstitutionOperatedDatabaseFilterInput @cost(weight: "10")): InstitutionOperatedDatabaseConnection! @cost(weight: "10")
+  openIdConnectApplications(order: [InstitutionOwnedOpenIdConnectApplicationSortInput!] @cost(weight: "10") where: InstitutionOwnedOpenIdConnectApplicationFilterInput @cost(weight: "10")): InstitutionOwnedOpenIdConnectApplicationConnection! @cost(weight: "10")
+  operatedDatabases(order: [InstitutionOperatedDatabaseSortInput!] @cost(weight: "10") where: InstitutionOperatedDatabaseFilterInput @cost(weight: "10")): InstitutionOperatedDatabaseConnection! @cost(weight: "10")
   operatingState: InstitutionOperatingState!
-  pendingDevelopedMethods(where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")): PendingInstitutionDevelopedMethodConnection! @cost(weight: "10")
-  pendingManufacturedComponents(where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")): PendingInstitutionManufacturedComponentConnection! @cost(weight: "10")
-  pendingRepresentatives(where: InstitutionRepresentativeFilterInput @cost(weight: "10")): PendingInstitutionRepresentativeConnection @authorize(policy: "ManageInstitutionRepresentativeScope") @cost(weight: "10")
-  representatives(where: InstitutionRepresentativeFilterInput @cost(weight: "10")): InstitutionRepresentativeConnection! @cost(weight: "10")
+  pendingDevelopedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionDevelopedMethodSortInput!] @cost(weight: "10") where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")): PendingInstitutionDevelopedMethodConnection! @cost(weight: "10")
+  pendingManufacturedComponents("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManufacturedComponentSortInput!] @cost(weight: "10") where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")): PendingInstitutionManufacturedComponentConnection! @cost(weight: "10")
+  pendingRepresentatives(order: [InstitutionRepresentativeSortInput!] @cost(weight: "10") where: InstitutionRepresentativeFilterInput @cost(weight: "10")): PendingInstitutionRepresentativeConnection @authorize(policy: "ManageInstitutionRepresentativeScope") @cost(weight: "10")
+  representatives(order: [InstitutionRepresentativeSortInput!] @cost(weight: "10") where: InstitutionRepresentativeFilterInput @cost(weight: "10")): InstitutionRepresentativeConnection! @cost(weight: "10")
   state: InstitutionState!
-  uuid: Uuid! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
 }
 
 type InstitutionDevelopedMethodConnection {
-  edges: [InstitutionDevelopedMethodEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionDevelopedMethodEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type InstitutionDevelopedMethodEdge {
-  node: Method! @cost(weight: "10")
+  cursor: String!
+  node: Method! @cost(weight: "0")
 }
 
 type InstitutionGnuPgKeyFingerprintConnection {
-  edges: [InstitutionGnuPgKeyFingerprintEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionGnuPgKeyFingerprintEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type InstitutionGnuPgKeyFingerprintEdge {
@@ -982,68 +997,78 @@ type InstitutionGnuPgKeyFingerprintEdge {
 }
 
 type InstitutionManagedComponentConnection {
-  edges: [InstitutionManagedComponentEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionManagedComponentEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type InstitutionManagedComponentEdge {
+  cursor: String!
   node: Component!
 }
 
 type InstitutionManagedDataFormatConnection {
-  edges: [InstitutionManagedDataFormatEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionManagedDataFormatEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type InstitutionManagedDataFormatEdge {
+  cursor: String!
   node: DataFormat!
 }
 
 type InstitutionManagedInstitutionConnection {
-  edges: [InstitutionManagedInstitutionEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionManagedInstitutionEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type InstitutionManagedInstitutionEdge {
+  cursor: String!
   node: Institution!
 }
 
 type InstitutionManagedMethodConnection {
-  edges: [InstitutionManagedMethodEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionManagedMethodEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type InstitutionManagedMethodEdge {
+  cursor: String!
   node: Method!
 }
 
 type InstitutionManagerEdge {
-  node: Institution! @cost(weight: "10")
+  node: Institution! @cost(weight: "0")
 }
 
 type InstitutionManufacturedComponentConnection {
-  edges: [InstitutionManufacturedComponentEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionManufacturedComponentEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type InstitutionManufacturedComponentEdge {
-  node: Component! @cost(weight: "10")
+  cursor: String!
+  node: Component! @cost(weight: "0")
 }
 
 type InstitutionMethodDeveloperEdge {
-  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: Institution! @cost(weight: "10")
+  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Institution! @cost(weight: "0")
 }
 
 type InstitutionOperatedDatabaseConnection {
-  edges: [InstitutionOperatedDatabaseEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionOperatedDatabaseEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type InstitutionOperatedDatabaseEdge {
@@ -1051,26 +1076,26 @@ type InstitutionOperatedDatabaseEdge {
 }
 
 type InstitutionOwnedOpenIdConnectApplicationConnection {
-  edges: [InstitutionOwnedOpenIdConnectApplicationEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionOwnedOpenIdConnectApplicationEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type InstitutionOwnedOpenIdConnectApplicationEdge {
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
   node: OpenIdConnectApplication!
 }
 
 type InstitutionRepresentativeConnection {
-  edges: [InstitutionRepresentativeEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionRepresentativeEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type InstitutionRepresentativeEdge {
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: User! @cost(weight: "10")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: User! @cost(weight: "0")
   role: InstitutionRepresentativeRole!
 }
 
@@ -1092,7 +1117,7 @@ type InstitutionsEdge {
   node: Institution!
 }
 
-type LifeCycleData implements Data {
+type LifeCycleData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
   component: Component @cost(weight: "10")
@@ -1115,14 +1140,14 @@ type LifeCycleData implements Data {
 }
 
 type LifeCycleDataConnection {
-  edges: [LifeCycleDataEdge!]!
-  pageInfo: PageInfo!
+  edges: [LifeCycleDataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
   totalCount: NonNegativeInt!
 }
 
 type LifeCycleDataEdge {
   cursor: String!
-  node: LifeCycleData!
+  node: LifeCycleData! @cost(weight: "0")
 }
 
 type LoginUserError implements UserError {
@@ -1178,35 +1203,37 @@ type Method implements Node {
   availability: OpenEndedDateTimeRange
   calculationLocator: Url
   categories: [MethodCategory!]!
+  createdAt: DateTime!
   description: String!
-  developers(where: IMethodDeveloperFilterInput @cost(weight: "10")): MethodDeveloperConnection! @cost(weight: "10")
+  developers(order: [MethodDeveloperSortInput!] @cost(weight: "10") where: MethodDeveloperFilterInput @cost(weight: "10")): MethodDeveloperConnection! @cost(weight: "10")
   id: ID!
-  isAuthorizedToUpdateNode: Boolean! @cost(weight: "10")
+  isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
   manager: MethodManagerEdge! @cost(weight: "10")
   name: String!
   parameters: [MethodParameter!]!
-  pendingDevelopers(where: IMethodDeveloperFilterInput @cost(weight: "10")): PendingMethodDeveloperConnection @authorize(policy: "WriteScope") @cost(weight: "10")
-  reference: Reference @cost(weight: "10")
+  pendingDevelopers(order: [MethodDeveloperSortInput!] @cost(weight: "10") where: MethodDeveloperFilterInput @cost(weight: "10")): PendingMethodDeveloperConnection @authorize(policy: "WriteScope") @cost(weight: "10")
+  reference: Reference @cost(weight: "0")
   sources: [MethodSource!]!
-  uuid: Uuid! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
   validity: OpenEndedDateTimeRange
 }
 
 type MethodDeveloperConnection {
   edges: [MethodDeveloperEdge!]! @cost(weight: "10")
-  isAuthorizedToAddInstitutionEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToAddUserEdge: Boolean! @cost(weight: "10")
+  isAuthorizedToAddInstitutionEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToAddUserEdge: Boolean! @cost(weight: "1")
   totalCount: NonNegativeInt! @cost(weight: "10")
 }
 
 type MethodDeveloperEdge {
-  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: Stakeholder! @cost(weight: "10")
+  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Stakeholder! @cost(weight: "0")
 }
 
 type MethodManagerEdge {
-  node: Institution! @cost(weight: "10")
+  node: Institution! @cost(weight: "0")
 }
 
 "A parameter given as a primitive or complex JSON value when this method is applied."
@@ -1333,90 +1360,131 @@ type Numeration {
 }
 
 type OpenEndedDateTimeRange {
-  from: DateTime @cost(weight: "10")
-  to: DateTime @cost(weight: "10")
+  from: DateTime
+  to: DateTime
 }
 
 type OpenIdConnectApplication implements Node {
   applicationType: String
-  authorizations: OpenIdConnectApplicationAuthorizationConnection! @cost(weight: "10")
-  clientId: String! @cost(weight: "10")
+  authorizations: OpenIdConnectApplicationGrantedAuthorizationConnection! @cost(weight: "0")
+  clientId: String!
   clientType: String
-  consentType: OpenIdConnectConsentType! @cost(weight: "10")
+  consentType: OpenIdConnectConsentType!
+  createdAt: DateTime!
   displayName: String
-  endpoints: [OpenIdConnectEndpoint!]! @cost(weight: "10")
-  grantTypes: [OpenIdConnectGrantType!]! @cost(weight: "10")
+  endpoints: [OpenIdConnectEndpoint!]! @cost(weight: "0")
+  grantTypes: [OpenIdConnectGrantType!]! @cost(weight: "0")
   id: ID!
-  isAuthorizedToManageNode: Boolean! @cost(weight: "10")
-  owner: OpenIdConnectApplicationOwnerEdge! @cost(weight: "10")
-  postLogoutRedirectUri: Url @cost(weight: "10")
-  redirectUri: Url @cost(weight: "10")
-  requirements: [OpenIdConnectRequirement!]! @cost(weight: "10")
-  responseTypes: [OpenIdConnectResponseType!]! @cost(weight: "10")
-  scopes: [OpenIdConnectScope!]! @cost(weight: "10")
-  tokens: OpenIdConnectApplicationTokenConnection! @cost(weight: "10")
-  uuid: Uuid! @cost(weight: "10")
-}
-
-type OpenIdConnectApplicationAuthorizationConnection {
-  edges: [OpenIdConnectApplicationAuthorizationEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  isAuthorizedToManageNode: Boolean! @cost(weight: "1")
+  owner: OpenIdConnectApplicationOwnerEdge! @cost(weight: "0")
+  postLogoutRedirectUri: Url
+  redirectUri: Url
+  requirements: [OpenIdConnectRequirement!]! @cost(weight: "0")
+  responseTypes: [OpenIdConnectResponseType!]! @cost(weight: "0")
+  scopes: [OpenIdConnectScope!]! @cost(weight: "0")
+  tokens: OpenIdConnectApplicationIssuedTokenConnection! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
+}
+
+type OpenIdConnectApplicationGrantedAuthorizationConnection {
+  edges: [OpenIdConnectApplicationGrantedAuthorizationEdge!]! @cost(weight: "0")
+  totalCount: NonNegativeInt!
 }
 
-type OpenIdConnectApplicationAuthorizationEdge {
+type OpenIdConnectApplicationGrantedAuthorizationEdge {
   node: OpenIdConnectAuthorization!
 }
 
+type OpenIdConnectApplicationIssuedTokenConnection {
+  edges: [OpenIdConnectApplicationIssuedTokenEdge!]! @cost(weight: "0")
+  totalCount: NonNegativeInt!
+}
+
+type OpenIdConnectApplicationIssuedTokenEdge {
+  node: OpenIdConnectToken!
+}
+
 type OpenIdConnectApplicationOwnerEdge {
-  node: Institution! @cost(weight: "10")
+  node: Institution! @cost(weight: "0")
 }
 
-type OpenIdConnectApplicationTokenConnection {
-  edges: [OpenIdConnectApplicationTokenEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+"A connection to a list of items."
+type OpenIdConnectApplicationsConnection {
+  "A list of edges."
+  edges: [OpenIdConnectApplicationsEdge!]
+  "Information to aid in pagination."
+  pageInfo: PageInfo!
+  "Identifies the total count of items in the connection."
+  totalCount: Int! @cost(weight: "10")
 }
 
-type OpenIdConnectApplicationTokenEdge {
-  node: OpenIdConnectToken!
+"An edge in a connection."
+type OpenIdConnectApplicationsEdge {
+  "A cursor for use in pagination."
+  cursor: String!
+  "The item at the end of the edge."
+  node: OpenIdConnectApplication!
 }
 
 type OpenIdConnectAuthorization implements Node {
   application: OpenIdConnectAuthorizationApplicationEdge! @cost(weight: "10")
-  creationDate: DateTime
+  createdAt: DateTime!
   id: ID!
-  isAuthorizedToDeleteNode: Boolean! @cost(weight: "10")
+  isAuthorizedToDeleteNode: Boolean! @cost(weight: "1")
+  scopes: [OpenIdConnectScope!]! @cost(weight: "0")
   status: String
   subject: String
-  tokens: OpenIdConnectAuthorizationTokenConnection! @cost(weight: "10")
+  tokens: OpenIdConnectAuthorizationIssuedTokenConnection! @cost(weight: "10")
   type: String
-  uuid: Uuid! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
 }
 
 type OpenIdConnectAuthorizationApplicationEdge {
   node: OpenIdConnectApplication!
 }
 
-type OpenIdConnectAuthorizationTokenConnection {
-  edges: [OpenIdConnectAuthorizationTokenEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+type OpenIdConnectAuthorizationIssuedTokenConnection {
+  edges: [OpenIdConnectAuthorizationIssuedTokenEdge!]! @cost(weight: "0")
+  totalCount: NonNegativeInt!
 }
 
-type OpenIdConnectAuthorizationTokenEdge {
+type OpenIdConnectAuthorizationIssuedTokenEdge {
   node: OpenIdConnectToken!
 }
 
+"A connection to a list of items."
+type OpenIdConnectAuthorizationsConnection {
+  "A list of edges."
+  edges: [OpenIdConnectAuthorizationsEdge!]
+  "Information to aid in pagination."
+  pageInfo: PageInfo!
+  "Identifies the total count of items in the connection."
+  totalCount: Int! @cost(weight: "10")
+}
+
+"An edge in a connection."
+type OpenIdConnectAuthorizationsEdge {
+  "A cursor for use in pagination."
+  cursor: String!
+  "The item at the end of the edge."
+  node: OpenIdConnectAuthorization!
+}
+
 type OpenIdConnectToken implements Node {
   application: OpenIdConnectTokenApplicationEdge! @cost(weight: "10")
   authorization: OpenIdConnectTokenAuthorizationEdge! @cost(weight: "10")
-  creationDate: DateTime
-  expirationDate: DateTime
+  createdAt: DateTime!
+  expiredAt: LocalDateTime
   id: ID!
-  isAuthorizedToRevokeNode: Boolean! @cost(weight: "10")
-  redemptionDate: DateTime
+  isAuthorizedToRevokeNode: Boolean! @cost(weight: "1")
+  redeemedAt: LocalDateTime
   status: String
   subject: String
   type: String
-  uuid: Uuid! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
 }
 
 type OpenIdConnectTokenApplicationEdge {
@@ -1427,7 +1495,25 @@ type OpenIdConnectTokenAuthorizationEdge {
   node: OpenIdConnectAuthorization!
 }
 
-type OpticalData implements Data {
+"A connection to a list of items."
+type OpenIdConnectTokensConnection {
+  "A list of edges."
+  edges: [OpenIdConnectTokensEdge!]
+  "Information to aid in pagination."
+  pageInfo: PageInfo!
+  "Identifies the total count of items in the connection."
+  totalCount: Int! @cost(weight: "10")
+}
+
+"An edge in a connection."
+type OpenIdConnectTokensEdge {
+  "A cursor for use in pagination."
+  cursor: String!
+  "The item at the end of the edge."
+  node: OpenIdConnectToken!
+}
+
+type OpticalData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
   cielabColors: [CielabColor!]!
@@ -1460,14 +1546,14 @@ type OpticalData implements Data {
 }
 
 type OpticalDataConnection {
-  edges: [OpticalDataEdge!]!
-  pageInfo: PageInfo!
+  edges: [OpticalDataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
   totalCount: NonNegativeInt!
 }
 
 type OpticalDataEdge {
   cursor: String!
-  node: OpticalData!
+  node: OpticalData! @cost(weight: "0")
 }
 
 "Information about pagination in a connection."
@@ -1483,9 +1569,9 @@ type PageInfo {
 }
 
 type PendingComponentManufacturerConnection {
-  edges: [ComponentManufacturerEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [ComponentManufacturerEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 "A connection to a list of items."
@@ -1507,21 +1593,23 @@ type PendingDatabasesEdge {
 }
 
 type PendingInstitutionDevelopedMethodConnection {
-  edges: [InstitutionDevelopedMethodEdge!]! @cost(weight: "10")
-  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionDevelopedMethodEdge!]! @cost(weight: "0")
+  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "1")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type PendingInstitutionManufacturedComponentConnection {
-  edges: [InstitutionManufacturedComponentEdge!]! @cost(weight: "10")
-  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionManufacturedComponentEdge!]! @cost(weight: "0")
+  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "1")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type PendingInstitutionRepresentativeConnection {
-  edges: [InstitutionRepresentativeEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionRepresentativeEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 "A connection to a list of items."
@@ -1544,24 +1632,25 @@ type PendingInstitutionsEdge {
 
 type PendingMethodDeveloperConnection {
   edges: [MethodDeveloperEdge!]! @cost(weight: "10")
-  isAuthorizedToAddInstitutionEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToAddUserEdge: Boolean! @cost(weight: "10")
+  isAuthorizedToAddInstitutionEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToAddUserEdge: Boolean! @cost(weight: "1")
   totalCount: NonNegativeInt! @cost(weight: "10")
 }
 
 type PendingUserDevelopedMethodConnection {
-  edges: [UserDevelopedMethodEdge!]! @cost(weight: "10")
-  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [UserDevelopedMethodEdge!]! @cost(weight: "0")
+  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "1")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type PendingUserRepresentedInstitutionConnection {
-  edges: [UserRepresentedInstitutionEdge!]! @cost(weight: "10")
-  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [UserRepresentedInstitutionEdge!]! @cost(weight: "0")
+  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
-type PhotovoltaicData implements Data {
+type PhotovoltaicData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
   component: Component @cost(weight: "10")
@@ -1584,14 +1673,14 @@ type PhotovoltaicData implements Data {
 }
 
 type PhotovoltaicDataConnection {
-  edges: [PhotovoltaicDataEdge!]!
-  pageInfo: PageInfo!
+  edges: [PhotovoltaicDataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
   totalCount: NonNegativeInt!
 }
 
 type PhotovoltaicDataEdge {
   cursor: String!
-  node: PhotovoltaicData!
+  node: PhotovoltaicData! @cost(weight: "0")
 }
 
 type PrimeSurfaceOrDirection {
@@ -1616,35 +1705,53 @@ type Publication {
 }
 
 type Query {
+  allCalorimetricData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: CalorimetricDataPropositionInput): CalorimetricDataConnection! @cost(weight: "10")
+  allGeometricData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: GeometricDataPropositionInput): GeometricDataConnection! @cost(weight: "10")
+  allHygrothermalData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: HygrothermalDataPropositionInput): HygrothermalDataConnection! @cost(weight: "10")
+  allLifeCycleData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: LifeCycleDataPropositionInput): LifeCycleDataConnection! @cost(weight: "10")
+  allOpticalData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: OpticalDataPropositionInput): OpticalDataConnection! @cost(weight: "10")
+  allPhotovoltaicData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: PhotovoltaicDataPropositionInput): PhotovoltaicDataConnection! @cost(weight: "10")
+  calorimetricData(databaseId: Uuid! id: Uuid! locale: String): CalorimetricData @cost(weight: "10")
   component(id: Uuid!): Component @cost(weight: "10")
-  components("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [ComponentSortInput!] @cost(weight: "10") where: ComponentFilterInput @cost(weight: "10")): ComponentsConnection @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  components("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [ComponentSortInput!] @cost(weight: "10") where: ComponentFilterInput @cost(weight: "10")): ComponentsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
   currentInstitution: Institution @authorize(policy: "Authenticated") @cost(weight: "10")
   currentOpenIdConnectApplication: OpenIdConnectApplication @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
   currentUser: User @authorize(policy: "Authenticated") @cost(weight: "10")
   database(id: Uuid!): Database @cost(weight: "10")
-  databases("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DatabaseSortInput!] @cost(weight: "10") where: DatabaseFilterInput @cost(weight: "10")): DatabasesConnection @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  databases("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DatabaseSortInput!] @cost(weight: "10") where: DatabaseFilterInput @cost(weight: "10")): DatabasesConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
   dataFormat(id: Uuid!): DataFormat @cost(weight: "10")
-  dataFormats("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DataFormatSortInput!] @cost(weight: "10") where: DataFormatFilterInput @cost(weight: "10")): DataFormatsConnection @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  dataFormats("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DataFormatSortInput!] @cost(weight: "10") where: DataFormatFilterInput @cost(weight: "10")): DataFormatsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
+  geometricData(databaseId: Uuid! id: Uuid! locale: String): GeometricData @cost(weight: "10")
   gnuPgKeyFingerprint(fingerprint: String!): GnuPgKeyFingerprint @authorize(policy: "ManageGnuPgScope") @cost(weight: "10")
-  gnuPgKeyFingerprints("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [GnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: GnuPgKeyFingerprintFilterInput @cost(weight: "10")): GnuPgKeyFingerprintsConnection @authorize(policy: "ManageGnuPgScope") @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  gnuPgKeyFingerprints("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [GnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: GnuPgKeyFingerprintFilterInput @cost(weight: "10")): GnuPgKeyFingerprintsConnection @authorize(policy: "ManageGnuPgScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
+  hasCalorimetricData(locale: String where: CalorimetricDataPropositionInput): Boolean! @cost(weight: "10")
+  hasGeometricData(locale: String where: GeometricDataPropositionInput): Boolean! @cost(weight: "10")
+  hasHygrothermalData(locale: String where: HygrothermalDataPropositionInput): Boolean! @cost(weight: "10")
+  hasLifeCycleData(locale: String where: LifeCycleDataPropositionInput): Boolean! @cost(weight: "10")
+  hasOpticalData(locale: String where: OpticalDataPropositionInput): Boolean! @cost(weight: "10")
+  hasPhotovoltaicData(locale: String where: PhotovoltaicDataPropositionInput): Boolean! @cost(weight: "10")
+  hygrothermalData(databaseId: Uuid! id: Uuid! locale: String): HygrothermalData @cost(weight: "10")
   institution(id: Uuid!): Institution @cost(weight: "10")
-  institutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionSortInput!] @cost(weight: "10") where: InstitutionFilterInput @cost(weight: "10")): InstitutionsConnection @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  institutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionSortInput!] @cost(weight: "10") where: InstitutionFilterInput @cost(weight: "10")): InstitutionsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
+  lifeCycleData(databaseId: Uuid! id: Uuid! locale: String): LifeCycleData @cost(weight: "10")
   method(id: Uuid!): Method @cost(weight: "10")
-  methods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [MethodSortInput!] @cost(weight: "10") where: MethodFilterInput @cost(weight: "10")): MethodsConnection @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  methods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [MethodSortInput!] @cost(weight: "10") where: MethodFilterInput @cost(weight: "10")): MethodsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
   "Fetches an object given its ID."
   node("ID of the object." id: ID!): Node @cost(weight: "10")
   "Lookup nodes by a list of IDs."
   nodes("The list of node IDs." ids: [ID!]!): [Node]! @cost(weight: "10")
   openIdConnectApplication(id: Uuid!): OpenIdConnectApplication @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  openIdConnectApplications: [OpenIdConnectApplication!]! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
+  openIdConnectApplications("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [OpenIdConnectApplicationSortInput!] @cost(weight: "10") where: OpenIdConnectApplicationFilterInput @cost(weight: "10")): OpenIdConnectApplicationsConnection @authorize(policy: "ManageOpenIdConnectScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
   openIdConnectAuthorization(id: Uuid!): OpenIdConnectAuthorization @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  openIdConnectAuthorizations: [OpenIdConnectAuthorization!]! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
+  openIdConnectAuthorizations("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [OpenIdConnectAuthorizationSortInput!] @cost(weight: "10") where: OpenIdConnectAuthorizationFilterInput @cost(weight: "10")): OpenIdConnectAuthorizationsConnection @authorize(policy: "ManageOpenIdConnectScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
   openIdConnectToken(id: Uuid!): OpenIdConnectToken @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  openIdConnectTokens: [OpenIdConnectToken!]! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  pendingDatabases("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DatabaseSortInput!] @cost(weight: "10") where: DatabaseFilterInput @cost(weight: "10")): PendingDatabasesConnection @authorize(policy: "ManageDatabaseScope") @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
-  pendingInstitutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionSortInput!] @cost(weight: "10") where: InstitutionFilterInput @cost(weight: "10")): PendingInstitutionsConnection @authorize(policy: "WriteScope") @authorize(policy: "VerifyScope") @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  openIdConnectTokens("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [OpenIdConnectTokenSortInput!] @cost(weight: "10") where: OpenIdConnectTokenFilterInput @cost(weight: "10")): OpenIdConnectTokensConnection @authorize(policy: "ManageOpenIdConnectScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
+  opticalData(databaseId: Uuid! id: Uuid! locale: String): OpticalData @cost(weight: "10")
+  pendingDatabases("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DatabaseSortInput!] @cost(weight: "10") where: DatabaseFilterInput @cost(weight: "10")): PendingDatabasesConnection @authorize(policy: "ManageDatabaseScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
+  pendingInstitutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionSortInput!] @cost(weight: "10") where: InstitutionFilterInput @cost(weight: "10")): PendingInstitutionsConnection @authorize(policy: "WriteScope") @authorize(policy: "VerifyScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
+  photovoltaicData(databaseId: Uuid! id: Uuid! locale: String): PhotovoltaicData @cost(weight: "10")
   user(id: Uuid!): User @cost(weight: "10")
-  users("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [UserSortInput!] @cost(weight: "10") where: UserFilterInput @cost(weight: "10")): UsersConnection @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  users("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [UserSortInput!] @cost(weight: "10") where: UserFilterInput @cost(weight: "10")): UsersConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
 }
 
 type RegisterUserError implements UserError {
@@ -2017,39 +2124,41 @@ type UpdateOpenIdConnectApplicationPayload {
 }
 
 type User implements Node {
-  contact: ContactInformation! @cost(weight: "10")
-  developedMethods(where: UserDevelopedMethodFilterInput @cost(weight: "10")): UserDevelopedMethodConnection! @cost(weight: "10")
-  gnuPgKeyFingerprints(where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")): UserGnuPgKeyFingerprintConnection! @cost(weight: "10")
-  hasGnuPgKeyFingerprint(where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")): Boolean! @cost(weight: "10")
-  hasPassword: Boolean @cost(weight: "10")
+  contact: ContactInformation! @cost(weight: "0")
+  developedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [UserDevelopedMethodSortInput!] @cost(weight: "10") where: UserDevelopedMethodFilterInput @cost(weight: "10")): UserDevelopedMethodConnection! @cost(weight: "10")
+  gnuPgKeyFingerprints(order: [UserGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")): UserGnuPgKeyFingerprintConnection! @cost(weight: "10")
+  hasGnuPgKeyFingerprint(order: [UserGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")): Boolean! @cost(weight: "10")
+  hasPassword: Boolean
   id: ID!
-  isAuthorizedToAddApprovals: Boolean! @cost(weight: "10")
-  isAuthorizedToDeleteUser: Boolean! @cost(weight: "10")
-  isAuthorizedToManageOpenIdConnect: Boolean! @cost(weight: "10")
+  isAuthorizedToAddApprovals: Boolean! @cost(weight: "1")
+  isAuthorizedToDeleteUser: Boolean! @cost(weight: "1")
+  isAuthorizedToManageOpenIdConnect: Boolean! @cost(weight: "1")
   "Full name"
-  name: String! @cost(weight: "10")
-  pendingDevelopedMethods(where: UserDevelopedMethodFilterInput @cost(weight: "10")): PendingUserDevelopedMethodConnection @authorize(policy: "WriteScope") @cost(weight: "10")
-  pendingRepresentedInstitutions(where: UserRepresentedInstitutionFilterInput @cost(weight: "10")): PendingUserRepresentedInstitutionConnection @authorize(policy: "WriteScope") @cost(weight: "10")
-  representedInstitutions(where: UserRepresentedInstitutionFilterInput @cost(weight: "10")): UserRepresentedInstitutionConnection! @cost(weight: "10")
-  roles: [UserRole!] @cost(weight: "10")
-  rolesCurrentUserCanAdd: [UserRole!]! @cost(weight: "10")
-  rolesCurrentUserCanRemove: [UserRole!]! @cost(weight: "10")
-  twoFactorAuthentication: TwoFactorAuthentication @cost(weight: "10")
-  uuid: Uuid! @cost(weight: "10")
+  name: String!
+  pendingDevelopedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [UserDevelopedMethodSortInput!] @cost(weight: "10") where: UserDevelopedMethodFilterInput @cost(weight: "10")): PendingUserDevelopedMethodConnection @authorize(policy: "WriteScope") @cost(weight: "10")
+  pendingRepresentedInstitutions(order: [UserRepresentedInstitutionSortInput!] @cost(weight: "10") where: UserRepresentedInstitutionFilterInput @cost(weight: "10")): PendingUserRepresentedInstitutionConnection @authorize(policy: "WriteScope") @cost(weight: "10")
+  representedInstitutions(order: [UserRepresentedInstitutionSortInput!] @cost(weight: "10") where: UserRepresentedInstitutionFilterInput @cost(weight: "10")): UserRepresentedInstitutionConnection! @cost(weight: "10")
+  roles: [UserRole!] @cost(weight: "0")
+  rolesCurrentUserCanAdd: [UserRole!]!
+  rolesCurrentUserCanRemove: [UserRole!]!
+  twoFactorAuthentication: TwoFactorAuthentication @cost(weight: "0")
+  uuid: Uuid!
 }
 
 type UserDevelopedMethodConnection {
-  edges: [UserDevelopedMethodEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [UserDevelopedMethodEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type UserDevelopedMethodEdge {
-  node: Method! @cost(weight: "10")
+  cursor: String!
+  node: Method! @cost(weight: "0")
 }
 
 type UserGnuPgKeyFingerprintConnection {
-  edges: [UserGnuPgKeyFingerprintEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [UserGnuPgKeyFingerprintEdge!]! @cost(weight: "0")
+  totalCount: NonNegativeInt!
 }
 
 type UserGnuPgKeyFingerprintEdge {
@@ -2057,18 +2166,19 @@ type UserGnuPgKeyFingerprintEdge {
 }
 
 type UserMethodDeveloperEdge {
-  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: User! @cost(weight: "10")
+  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: User! @cost(weight: "0")
 }
 
 type UserRepresentedInstitutionConnection {
-  edges: [UserRepresentedInstitutionEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [UserRepresentedInstitutionEdge!]! @cost(weight: "0")
+  totalCount: NonNegativeInt!
 }
 
 type UserRepresentedInstitutionEdge {
-  node: Institution! @cost(weight: "10")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Institution! @cost(weight: "0")
   role: InstitutionRepresentativeRole!
 }
 
@@ -2120,7 +2230,7 @@ union Stakeholder = Institution | User
 
 input AddComponentAssemblyInput {
   assembledComponentId: Uuid!
-  index: Byte
+  index: UnsignedByte
   partComponentId: Uuid!
   primeSurface: PrimeSurface
 }
@@ -2177,29 +2287,19 @@ input BooleanFilterInput {
 
 input ByteFilterInput {
   equalTo: Byte @cost(weight: "10")
-  notEqualTo: Byte @cost(weight: "10")
-  in: [Byte] @cost(weight: "10")
-  notIn: [Byte] @cost(weight: "10")
   greaterThan: Byte @cost(weight: "10")
-  notGreaterThan: Byte @cost(weight: "10")
   greaterThanOrEqualTo: Byte @cost(weight: "10")
-  notGreaterThanOrEqualTo: Byte @cost(weight: "10")
+  in: [Byte] @cost(weight: "10")
   lessThan: Byte @cost(weight: "10")
-  notLessThan: Byte @cost(weight: "10")
   lessThanOrEqualTo: Byte @cost(weight: "10")
+  notEqualTo: Byte @cost(weight: "10")
+  notGreaterThan: Byte @cost(weight: "10")
+  notGreaterThanOrEqualTo: Byte @cost(weight: "10")
+  notIn: [Byte] @cost(weight: "10")
+  notLessThan: Byte @cost(weight: "10")
   notLessThanOrEqualTo: Byte @cost(weight: "10")
 }
 
-input CalendarSystemFilterInput {
-  and: [CalendarSystemFilterInput!]
-  or: [CalendarSystemFilterInput!]
-  id: StringFilterInput
-  name: StringFilterInput
-  minYear: IntFilterInput
-  maxYear: IntFilterInput
-  eras: FilterInputTypeOfErasFilterInput
-}
-
 input CalorimetricDataPropositionInput {
   and: [CalorimetricDataPropositionInput!]
   componentId: UuidPropositionInput
@@ -2257,96 +2357,134 @@ input CoatedSidePropositionInput {
 
 input ComponentAssembledOfFilterInput {
   and: [ComponentAssembledOfFilterInput!]
+  createdAt: DateTimeFilterInput
+  index: ByteFilterInput
   or: [ComponentAssembledOfFilterInput!]
   partComponent: ComponentFilterInput
-  index: ByteFilterInput
   primeSurface: NullableOfPrimeSurfaceFilterInput
+  updatedAt: DateTimeFilterInput
 }
 
-input ComponentAssemblySortInput {
-  assembledComponent: ComponentSortInput @cost(weight: "10")
-  partComponent: ComponentSortInput @cost(weight: "10")
+input ComponentAssembledOfSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
   index: SortEnumType @cost(weight: "10")
   primeSurface: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input ComponentCategoryFilterInput {
   equalTo: ComponentCategory @cost(weight: "10")
-  notEqualTo: ComponentCategory @cost(weight: "10")
   in: [ComponentCategory!] @cost(weight: "10")
+  notEqualTo: ComponentCategory @cost(weight: "10")
   notIn: [ComponentCategory!] @cost(weight: "10")
 }
 
 input ComponentCategorysFilterInput {
   all: ComponentCategoryFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: ComponentCategoryFilterInput @cost(weight: "10")
   some: ComponentCategoryFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input ComponentConcretizationOfFilterInput {
   and: [ComponentConcretizationOfFilterInput!]
-  or: [ComponentConcretizationOfFilterInput!]
+  createdAt: DateTimeFilterInput
   generalComponent: ComponentFilterInput
+  or: [ComponentConcretizationOfFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input ComponentConcretizationOfSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input ComponentFilterInput {
-  and: [ComponentFilterInput!]
-  or: [ComponentFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
   abbreviation: StringFilterInput
-  description: StringFilterInput
+  and: [ComponentFilterInput!]
   categories: ComponentCategorysFilterInput
-  extras: JsonElementFilterInput
-  partOf: FilterInputTypeOfComponentsFilterInput
-  parts: FilterInputTypeOfComponentsFilterInput
-  partOfEdges: FilterInputTypeOfComponentAssemblysFilterInput
-  partEdges: FilterInputTypeOfComponentAssemblysFilterInput
   concretizations: FilterInputTypeOfComponentsFilterInput
+  createdAt: DateTimeFilterInput
+  description: StringFilterInput
+  extras: JsonElementFilterInput
   generalizations: FilterInputTypeOfComponentsFilterInput
-  variants: FilterInputTypeOfComponentsFilterInput
+  id: UuidFilterInput
   manager: InstitutionFilterInput
-  manufacturers: FilterInputTypeOfInstitutionsFilterInput
   manufacturerEdges: FilterInputTypeOfComponentManufacturersFilterInput
+  manufacturers: FilterInputTypeOfInstitutionsFilterInput
+  name: StringFilterInput
+  or: [ComponentFilterInput!]
+  partEdges: FilterInputTypeOfComponentAssemblysFilterInput
+  partOf: FilterInputTypeOfComponentsFilterInput
+  partOfEdges: FilterInputTypeOfComponentAssemblysFilterInput
+  parts: FilterInputTypeOfComponentsFilterInput
+  updatedAt: DateTimeFilterInput
+  variants: FilterInputTypeOfComponentsFilterInput
 }
 
 input ComponentGeneralizationOfFilterInput {
   and: [ComponentGeneralizationOfFilterInput!]
-  or: [ComponentGeneralizationOfFilterInput!]
   concreteComponent: ComponentFilterInput
+  createdAt: DateTimeFilterInput
+  or: [ComponentGeneralizationOfFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input ComponentGeneralizationOfSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input ComponentManufacturerFilterInput {
   and: [ComponentManufacturerFilterInput!]
-  or: [ComponentManufacturerFilterInput!]
+  createdAt: DateTimeFilterInput
   institution: InstitutionFilterInput
+  or: [ComponentManufacturerFilterInput!]
+  updatedAt: DateTimeFilterInput
 }
 
 input ComponentManufacturerSortInput {
-  component: ComponentSortInput @cost(weight: "10")
-  institution: InstitutionSortInput @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input ComponentPartOfFilterInput {
   and: [ComponentPartOfFilterInput!]
-  or: [ComponentPartOfFilterInput!]
   assembledComponent: ComponentFilterInput
+  createdAt: DateTimeFilterInput
   index: ByteFilterInput
+  or: [ComponentPartOfFilterInput!]
   primeSurface: NullableOfPrimeSurfaceFilterInput
+  updatedAt: DateTimeFilterInput
+}
+
+input ComponentPartOfSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  index: SortEnumType @cost(weight: "10")
+  primeSurface: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input ComponentSortInput {
-  id: SortEnumType @cost(weight: "10")
-  name: SortEnumType @cost(weight: "10")
   abbreviation: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
   description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input ComponentVariantOfFilterInput {
   and: [ComponentVariantOfFilterInput!]
-  or: [ComponentVariantOfFilterInput!]
+  createdAt: DateTimeFilterInput
   ofComponent: ComponentFilterInput
+  or: [ComponentVariantOfFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input ComponentVariantOfSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input ConfirmComponentManufacturerInput {
@@ -2382,12 +2520,12 @@ input ConfirmUserMethodDeveloperInput {
 
 input ContactInformationFilterInput {
   and: [ContactInformationFilterInput!]
+  emailAddress: StringFilterInput
+  isEmailAddressConfirmed: BooleanFilterInput
+  isPhoneNumberConfirmed: BooleanFilterInput
   or: [ContactInformationFilterInput!]
   phoneNumber: StringFilterInput
-  isPhoneNumberConfirmed: BooleanFilterInput
   postalAddress: StringFilterInput
-  emailAddress: StringFilterInput
-  isEmailAddressConfirmed: BooleanFilterInput
   websiteLocator: UrlFilterInput
 }
 
@@ -2399,11 +2537,9 @@ input ContactInformationInput {
 }
 
 input ContactInformationSortInput {
+  emailAddress: SortEnumType @cost(weight: "10")
   phoneNumber: SortEnumType @cost(weight: "10")
-  isPhoneNumberConfirmed: SortEnumType @cost(weight: "10")
   postalAddress: SortEnumType @cost(weight: "10")
-  emailAddress: SortEnumType @cost(weight: "10")
-  isEmailAddressConfirmed: SortEnumType @cost(weight: "10")
   websiteLocator: UriSortInput @cost(weight: "10")
 }
 
@@ -2480,24 +2616,27 @@ input CreateOpenIdConnectApplicationInput {
 
 input DataFormatFilterInput {
   and: [DataFormatFilterInput!]
-  or: [DataFormatFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
-  extension: StringFilterInput
+  createdAt: DateTimeFilterInput
   description: StringFilterInput
+  extension: StringFilterInput
+  id: UuidFilterInput
+  manager: InstitutionFilterInput
   mediaType: StringFilterInput
+  name: StringFilterInput
+  or: [DataFormatFilterInput!]
   schemaLocator: UrlFilterInput
-  manager: InstitutionFilterInput
+  updatedAt: DateTimeFilterInput
 }
 
 input DataFormatSortInput {
-  id: SortEnumType @cost(weight: "10")
-  name: SortEnumType @cost(weight: "10")
-  extension: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
   description: SortEnumType @cost(weight: "10")
+  extension: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
   mediaType: SortEnumType @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
   schemaLocator: UriSortInput @cost(weight: "10")
-  manager: InstitutionSortInput @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input DataPropositionInput {
@@ -2510,49 +2649,52 @@ input DataPropositionInput {
 
 input DatabaseFilterInput {
   and: [DatabaseFilterInput!]
-  or: [DatabaseFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
+  createdAt: DateTimeFilterInput
   description: StringFilterInput
+  id: UuidFilterInput
   locator: UrlFilterInput
+  name: StringFilterInput
   operator: InstitutionFilterInput
+  or: [DatabaseFilterInput!]
+  updatedAt: DateTimeFilterInput
 }
 
 input DatabaseSortInput {
-  id: SortEnumType @cost(weight: "10")
-  name: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
   description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
   locator: UriSortInput @cost(weight: "10")
-  operator: InstitutionSortInput @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input DateTimeFilterInput {
   equalTo: DateTime @cost(weight: "10")
-  notEqualTo: DateTime @cost(weight: "10")
-  in: [DateTime] @cost(weight: "10")
-  notIn: [DateTime] @cost(weight: "10")
   greaterThan: DateTime @cost(weight: "10")
-  notGreaterThan: DateTime @cost(weight: "10")
   greaterThanOrEqualTo: DateTime @cost(weight: "10")
-  notGreaterThanOrEqualTo: DateTime @cost(weight: "10")
+  in: [DateTime] @cost(weight: "10")
   lessThan: DateTime @cost(weight: "10")
-  notLessThan: DateTime @cost(weight: "10")
   lessThanOrEqualTo: DateTime @cost(weight: "10")
+  notEqualTo: DateTime @cost(weight: "10")
+  notGreaterThan: DateTime @cost(weight: "10")
+  notGreaterThanOrEqualTo: DateTime @cost(weight: "10")
+  notIn: [DateTime] @cost(weight: "10")
+  notLessThan: DateTime @cost(weight: "10")
   notLessThanOrEqualTo: DateTime @cost(weight: "10")
 }
 
 input DecimalFilterInput {
   equalTo: Decimal @cost(weight: "10")
-  notEqualTo: Decimal @cost(weight: "10")
-  in: [Decimal] @cost(weight: "10")
-  notIn: [Decimal] @cost(weight: "10")
   greaterThan: Decimal @cost(weight: "10")
-  notGreaterThan: Decimal @cost(weight: "10")
   greaterThanOrEqualTo: Decimal @cost(weight: "10")
-  notGreaterThanOrEqualTo: Decimal @cost(weight: "10")
+  in: [Decimal] @cost(weight: "10")
   lessThan: Decimal @cost(weight: "10")
-  notLessThan: Decimal @cost(weight: "10")
   lessThanOrEqualTo: Decimal @cost(weight: "10")
+  notEqualTo: Decimal @cost(weight: "10")
+  notGreaterThan: Decimal @cost(weight: "10")
+  notGreaterThanOrEqualTo: Decimal @cost(weight: "10")
+  notIn: [Decimal] @cost(weight: "10")
+  notLessThan: Decimal @cost(weight: "10")
   notLessThanOrEqualTo: Decimal @cost(weight: "10")
 }
 
@@ -2578,8 +2720,8 @@ input DeleteUserInput {
 
 input DescriptionOrReferenceFilterInput {
   and: [DescriptionOrReferenceFilterInput!]
-  or: [DescriptionOrReferenceFilterInput!]
   description: StringFilterInput
+  or: [DescriptionOrReferenceFilterInput!]
 }
 
 input DescriptionOrReferenceInput {
@@ -2591,14 +2733,23 @@ input DescriptionOrReferenceSortInput {
   description: SortEnumType @cost(weight: "10")
 }
 
-input EnableUserTwoFactorAuthenticatorInput {
-  verificationCode: String!
+input DurationFilterInput {
+  equalTo: Duration @cost(weight: "10")
+  greaterThan: Duration @cost(weight: "10")
+  greaterThanOrEqualTo: Duration @cost(weight: "10")
+  in: [Duration] @cost(weight: "10")
+  lessThan: Duration @cost(weight: "10")
+  lessThanOrEqualTo: Duration @cost(weight: "10")
+  notEqualTo: Duration @cost(weight: "10")
+  notGreaterThan: Duration @cost(weight: "10")
+  notGreaterThanOrEqualTo: Duration @cost(weight: "10")
+  notIn: [Duration] @cost(weight: "10")
+  notLessThan: Duration @cost(weight: "10")
+  notLessThanOrEqualTo: Duration @cost(weight: "10")
 }
 
-input EraFilterInput {
-  and: [EraFilterInput!]
-  or: [EraFilterInput!]
-  name: StringFilterInput
+input EnableUserTwoFactorAuthenticatorInput {
+  verificationCode: String!
 }
 
 input FileMetaInformationPropositionInput {
@@ -2613,116 +2764,109 @@ input FilesMetaInformationPropositionInput {
 
 input FilterInputTypeOfComponentAssemblysFilterInput {
   all: ComponentAssembledOfFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: ComponentAssembledOfFilterInput @cost(weight: "10")
   some: ComponentAssembledOfFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfComponentManufacturersFilterInput {
   all: ComponentManufacturerFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: ComponentManufacturerFilterInput @cost(weight: "10")
   some: ComponentManufacturerFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfComponentsFilterInput {
   all: ComponentFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: ComponentFilterInput @cost(weight: "10")
   some: ComponentFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfDataFormatsFilterInput {
   all: DataFormatFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: DataFormatFilterInput @cost(weight: "10")
   some: DataFormatFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfDatabasesFilterInput {
   all: DatabaseFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: DatabaseFilterInput @cost(weight: "10")
   some: DatabaseFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-}
-
-input FilterInputTypeOfErasFilterInput {
-  all: EraFilterInput @cost(weight: "10")
-  none: EraFilterInput @cost(weight: "10")
-  some: EraFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfGnuPgKeyFingerprintsFilterInput {
   all: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
   some: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfInstitutionMethodDevelopersFilterInput {
   all: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
   some: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfInstitutionRepresentativesFilterInput {
   all: InstitutionRepresentativeFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: InstitutionRepresentativeFilterInput @cost(weight: "10")
   some: InstitutionRepresentativeFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfInstitutionsFilterInput {
   all: InstitutionFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: InstitutionFilterInput @cost(weight: "10")
   some: InstitutionFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfMethodsFilterInput {
   all: InstitutionManagedMethodFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: InstitutionManagedMethodFilterInput @cost(weight: "10")
   some: InstitutionManagedMethodFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfOpenIdConnectTokensFilterInput {
   all: OpenIdConnectTokenFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: OpenIdConnectTokenFilterInput @cost(weight: "10")
   some: OpenIdConnectTokenFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfUserMethodDevelopersFilterInput {
   all: UserDevelopedMethodFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: UserDevelopedMethodFilterInput @cost(weight: "10")
   some: UserDevelopedMethodFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfUsersFilterInput {
   all: UserFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: UserFilterInput @cost(weight: "10")
   some: UserFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FloatFilterInput {
   equalTo: Float @cost(weight: "10")
-  notEqualTo: Float @cost(weight: "10")
-  in: [Float] @cost(weight: "10")
-  notIn: [Float] @cost(weight: "10")
   greaterThan: Float @cost(weight: "10")
-  notGreaterThan: Float @cost(weight: "10")
   greaterThanOrEqualTo: Float @cost(weight: "10")
-  notGreaterThanOrEqualTo: Float @cost(weight: "10")
+  in: [Float] @cost(weight: "10")
+  inClosedInterval: ClosedIntervalInputOfDoubleInput @cost(weight: "10")
   lessThan: Float @cost(weight: "10")
-  notLessThan: Float @cost(weight: "10")
   lessThanOrEqualTo: Float @cost(weight: "10")
+  notEqualTo: Float @cost(weight: "10")
+  notGreaterThan: Float @cost(weight: "10")
+  notGreaterThanOrEqualTo: Float @cost(weight: "10")
+  notIn: [Float] @cost(weight: "10")
+  notLessThan: Float @cost(weight: "10")
   notLessThanOrEqualTo: Float @cost(weight: "10")
-  inClosedInterval: ClosedIntervalInputOfDoubleInput @cost(weight: "10")
 }
 
 input FloatPropositionInput {
@@ -2763,25 +2907,25 @@ input GetHttpsResourcesPropositionInput {
 }
 
 input GnuPgKeyFingerprintFilterInput {
+  allowedAt: DateTimeFilterInput
   and: [GnuPgKeyFingerprintFilterInput!]
-  or: [GnuPgKeyFingerprintFilterInput!]
-  id: UuidFilterInput
+  createdAt: DateTimeFilterInput
   fingerprint: StringFilterInput
-  createdAt: OffsetDateTimeFilterInput
-  allowedAt: OffsetDateTimeFilterInput
-  forbiddenAt: OffsetDateTimeFilterInput
-  user: UserFilterInput
+  forbiddenAt: DateTimeFilterInput
+  id: UuidFilterInput
   institution: InstitutionFilterInput
+  or: [GnuPgKeyFingerprintFilterInput!]
+  updatedAt: DateTimeFilterInput
+  user: UserFilterInput
 }
 
 input GnuPgKeyFingerprintSortInput {
-  id: SortEnumType @cost(weight: "10")
-  fingerprint: SortEnumType @cost(weight: "10")
-  createdAt: SortEnumType @cost(weight: "10")
   allowedAt: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  fingerprint: SortEnumType @cost(weight: "10")
   forbiddenAt: SortEnumType @cost(weight: "10")
-  user: UserSortInput @cost(weight: "10")
-  institution: InstitutionSortInput @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input HygrothermalDataPropositionInput {
@@ -2792,209 +2936,292 @@ input HygrothermalDataPropositionInput {
   resources: GetHttpsResourcesPropositionInput
 }
 
-input IMethodDeveloperFilterInput {
-  and: [IMethodDeveloperFilterInput!]
-  or: [IMethodDeveloperFilterInput!]
-}
-
 input InstitutionDevelopedMethodFilterInput {
   and: [InstitutionDevelopedMethodFilterInput!]
-  or: [InstitutionDevelopedMethodFilterInput!]
+  createdAt: DateTimeFilterInput
   method: InstitutionManagedMethodFilterInput
+  or: [InstitutionDevelopedMethodFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input InstitutionDevelopedMethodSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionFilterInput {
-  and: [InstitutionFilterInput!]
-  or: [InstitutionFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
   abbreviation: StringFilterInput
-  description: StringFilterInput
+  and: [InstitutionFilterInput!]
   contact: ContactInformationFilterInput
-  state: InstitutionStateFilterInput
-  extras: JsonElementFilterInput
-  developedMethods: FilterInputTypeOfMethodsFilterInput
+  createdAt: DateTimeFilterInput
+  description: StringFilterInput
   developedMethodEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  managedMethods: FilterInputTypeOfMethodsFilterInput
+  developedMethods: FilterInputTypeOfMethodsFilterInput
+  extras: JsonElementFilterInput
+  gnuPgKeyFingerprints: FilterInputTypeOfGnuPgKeyFingerprintsFilterInput
+  id: UuidFilterInput
   managedDataFormats: FilterInputTypeOfDataFormatsFilterInput
-  manufacturedComponents: FilterInputTypeOfComponentsFilterInput
+  managedInstitutions: FilterInputTypeOfInstitutionsFilterInput
+  managedMethods: FilterInputTypeOfMethodsFilterInput
+  manager: InstitutionFilterInput
   manufacturedComponentEdges: FilterInputTypeOfComponentManufacturersFilterInput
+  manufacturedComponents: FilterInputTypeOfComponentsFilterInput
+  name: StringFilterInput
   operatedDatabases: FilterInputTypeOfDatabasesFilterInput
-  manager: InstitutionFilterInput
-  managedInstitutions: FilterInputTypeOfInstitutionsFilterInput
-  representatives: FilterInputTypeOfUsersFilterInput
+  or: [InstitutionFilterInput!]
   representativeEdges: FilterInputTypeOfInstitutionRepresentativesFilterInput
-  gnuPgKeyFingerprints: FilterInputTypeOfGnuPgKeyFingerprintsFilterInput
+  representatives: FilterInputTypeOfUsersFilterInput
+  state: InstitutionStateFilterInput
+  updatedAt: DateTimeFilterInput
 }
 
 input InstitutionGnuPgKeyFingerprintFilterInput {
+  allowedAt: DateTimeFilterInput
   and: [InstitutionGnuPgKeyFingerprintFilterInput!]
-  or: [InstitutionGnuPgKeyFingerprintFilterInput!]
-  id: UuidFilterInput
+  createdAt: DateTimeFilterInput
   fingerprint: StringFilterInput
-  createdAt: OffsetDateTimeFilterInput
-  allowedAt: OffsetDateTimeFilterInput
-  forbiddenAt: OffsetDateTimeFilterInput
+  forbiddenAt: DateTimeFilterInput
+  id: UuidFilterInput
+  or: [InstitutionGnuPgKeyFingerprintFilterInput!]
+  updatedAt: DateTimeFilterInput
   user: UserFilterInput
 }
 
+input InstitutionGnuPgKeyFingerprintSortInput {
+  allowedAt: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  fingerprint: SortEnumType @cost(weight: "10")
+  forbiddenAt: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
+}
+
 input InstitutionManagedComponentFilterInput {
-  and: [InstitutionManagedComponentFilterInput!]
-  or: [InstitutionManagedComponentFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
   abbreviation: StringFilterInput
-  description: StringFilterInput
+  and: [InstitutionManagedComponentFilterInput!]
   categories: ComponentCategorysFilterInput
+  concretizations: FilterInputTypeOfComponentsFilterInput
+  createdAt: DateTimeFilterInput
+  description: StringFilterInput
   extras: JsonElementFilterInput
+  generalizations: FilterInputTypeOfComponentsFilterInput
+  id: UuidFilterInput
+  manufacturerEdges: FilterInputTypeOfComponentManufacturersFilterInput
+  manufacturers: FilterInputTypeOfInstitutionsFilterInput
+  name: StringFilterInput
+  or: [InstitutionManagedComponentFilterInput!]
+  partEdges: FilterInputTypeOfComponentAssemblysFilterInput
   partOf: FilterInputTypeOfComponentsFilterInput
-  parts: FilterInputTypeOfComponentsFilterInput
   partOfEdges: FilterInputTypeOfComponentAssemblysFilterInput
-  partEdges: FilterInputTypeOfComponentAssemblysFilterInput
-  concretizations: FilterInputTypeOfComponentsFilterInput
-  generalizations: FilterInputTypeOfComponentsFilterInput
+  parts: FilterInputTypeOfComponentsFilterInput
+  updatedAt: DateTimeFilterInput
   variants: FilterInputTypeOfComponentsFilterInput
-  manufacturers: FilterInputTypeOfInstitutionsFilterInput
-  manufacturerEdges: FilterInputTypeOfComponentManufacturersFilterInput
+}
+
+input InstitutionManagedComponentSortInput {
+  abbreviation: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionManagedDataFormatFilterInput {
   and: [InstitutionManagedDataFormatFilterInput!]
-  or: [InstitutionManagedDataFormatFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
-  extension: StringFilterInput
+  createdAt: DateTimeFilterInput
   description: StringFilterInput
+  extension: StringFilterInput
+  id: UuidFilterInput
   mediaType: StringFilterInput
+  name: StringFilterInput
+  or: [InstitutionManagedDataFormatFilterInput!]
   schemaLocator: UrlFilterInput
+  updatedAt: DateTimeFilterInput
+}
+
+input InstitutionManagedDataFormatSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
+  extension: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  mediaType: SortEnumType @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  schemaLocator: UriSortInput @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionManagedInstitutionFilterInput {
-  and: [InstitutionManagedInstitutionFilterInput!]
-  or: [InstitutionManagedInstitutionFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
   abbreviation: StringFilterInput
-  description: StringFilterInput
+  and: [InstitutionManagedInstitutionFilterInput!]
   contact: ContactInformationFilterInput
-  state: InstitutionStateFilterInput
-  extras: JsonElementFilterInput
-  developedMethods: FilterInputTypeOfMethodsFilterInput
+  createdAt: DateTimeFilterInput
+  description: StringFilterInput
   developedMethodEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  managedMethods: FilterInputTypeOfMethodsFilterInput
+  developedMethods: FilterInputTypeOfMethodsFilterInput
+  extras: JsonElementFilterInput
+  gnuPgKeyFingerprints: FilterInputTypeOfGnuPgKeyFingerprintsFilterInput
+  id: UuidFilterInput
   managedDataFormats: FilterInputTypeOfDataFormatsFilterInput
-  manufacturedComponents: FilterInputTypeOfComponentsFilterInput
+  managedInstitutions: FilterInputTypeOfInstitutionsFilterInput
+  managedMethods: FilterInputTypeOfMethodsFilterInput
   manufacturedComponentEdges: FilterInputTypeOfComponentManufacturersFilterInput
+  manufacturedComponents: FilterInputTypeOfComponentsFilterInput
+  name: StringFilterInput
   operatedDatabases: FilterInputTypeOfDatabasesFilterInput
-  managedInstitutions: FilterInputTypeOfInstitutionsFilterInput
-  representatives: FilterInputTypeOfUsersFilterInput
+  or: [InstitutionManagedInstitutionFilterInput!]
   representativeEdges: FilterInputTypeOfInstitutionRepresentativesFilterInput
-  gnuPgKeyFingerprints: FilterInputTypeOfGnuPgKeyFingerprintsFilterInput
+  representatives: FilterInputTypeOfUsersFilterInput
+  state: InstitutionStateFilterInput
+  updatedAt: DateTimeFilterInput
+}
+
+input InstitutionManagedInstitutionSortInput {
+  abbreviation: SortEnumType @cost(weight: "10")
+  contact: ContactInformationSortInput @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  state: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionManagedMethodFilterInput {
   and: [InstitutionManagedMethodFilterInput!]
-  or: [InstitutionManagedMethodFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
-  description: StringFilterInput
   calculationLocator: UrlFilterInput
   categories: MethodCategorysFilterInput
-  institutionDevelopers: FilterInputTypeOfInstitutionsFilterInput
+  createdAt: DateTimeFilterInput
+  description: StringFilterInput
+  id: UuidFilterInput
   institutionDeveloperEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  userDevelopers: FilterInputTypeOfUsersFilterInput
+  institutionDevelopers: FilterInputTypeOfInstitutionsFilterInput
+  name: StringFilterInput
+  or: [InstitutionManagedMethodFilterInput!]
+  updatedAt: DateTimeFilterInput
   userDeveloperEdges: FilterInputTypeOfUserMethodDevelopersFilterInput
+  userDevelopers: FilterInputTypeOfUsersFilterInput
+}
+
+input InstitutionManagedMethodSortInput {
+  calculationLocator: UriSortInput @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionManufacturedComponentFilterInput {
   and: [InstitutionManufacturedComponentFilterInput!]
-  or: [InstitutionManufacturedComponentFilterInput!]
   component: ComponentFilterInput
+  createdAt: DateTimeFilterInput
+  or: [InstitutionManufacturedComponentFilterInput!]
+  updatedAt: DateTimeFilterInput
 }
 
-input InstitutionMethodDeveloperSortInput {
-  method: MethodSortInput @cost(weight: "10")
-  institution: InstitutionSortInput @cost(weight: "10")
+input InstitutionManufacturedComponentSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionOperatedDatabaseFilterInput {
   and: [InstitutionOperatedDatabaseFilterInput!]
-  or: [InstitutionOperatedDatabaseFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
+  createdAt: DateTimeFilterInput
   description: StringFilterInput
+  id: UuidFilterInput
   locator: UrlFilterInput
+  name: StringFilterInput
+  or: [InstitutionOperatedDatabaseFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input InstitutionOperatedDatabaseSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  locator: UriSortInput @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionOwnedOpenIdConnectApplicationFilterInput {
   and: [InstitutionOwnedOpenIdConnectApplicationFilterInput!]
-  or: [InstitutionOwnedOpenIdConnectApplicationFilterInput!]
-  id: UuidFilterInput
   applicationType: StringFilterInput
   clientId: StringFilterInput
   consentType: StringFilterInput
+  createdAt: DateTimeFilterInput
   displayName: StringFilterInput
+  id: UuidFilterInput
+  or: [InstitutionOwnedOpenIdConnectApplicationFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input InstitutionOwnedOpenIdConnectApplicationSortInput {
+  applicationType: SortEnumType @cost(weight: "10")
+  clientId: SortEnumType @cost(weight: "10")
+  consentType: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  displayName: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionRepresentativeFilterInput {
   and: [InstitutionRepresentativeFilterInput!]
+  createdAt: DateTimeFilterInput
   or: [InstitutionRepresentativeFilterInput!]
-  user: UserFilterInput
   role: InstitutionRepresentativeRoleFilterInput
+  updatedAt: DateTimeFilterInput
+  user: UserFilterInput
 }
 
 input InstitutionRepresentativeRoleFilterInput {
   equalTo: InstitutionRepresentativeRole @cost(weight: "10")
-  notEqualTo: InstitutionRepresentativeRole @cost(weight: "10")
   in: [InstitutionRepresentativeRole!] @cost(weight: "10")
+  notEqualTo: InstitutionRepresentativeRole @cost(weight: "10")
   notIn: [InstitutionRepresentativeRole!] @cost(weight: "10")
 }
 
 input InstitutionRepresentativeSortInput {
-  institution: InstitutionSortInput @cost(weight: "10")
-  user: UserSortInput @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
   role: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionSortInput {
-  id: SortEnumType @cost(weight: "10")
-  name: SortEnumType @cost(weight: "10")
   abbreviation: SortEnumType @cost(weight: "10")
-  description: SortEnumType @cost(weight: "10")
   contact: ContactInformationSortInput @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
   state: SortEnumType @cost(weight: "10")
-  manager: InstitutionSortInput @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionStateFilterInput {
   equalTo: InstitutionState @cost(weight: "10")
-  notEqualTo: InstitutionState @cost(weight: "10")
   in: [InstitutionState!] @cost(weight: "10")
+  notEqualTo: InstitutionState @cost(weight: "10")
   notIn: [InstitutionState!] @cost(weight: "10")
 }
 
 input IntFilterInput {
   equalTo: Int @cost(weight: "10")
-  notEqualTo: Int @cost(weight: "10")
-  in: [Int] @cost(weight: "10")
-  notIn: [Int] @cost(weight: "10")
   greaterThan: Int @cost(weight: "10")
-  notGreaterThan: Int @cost(weight: "10")
   greaterThanOrEqualTo: Int @cost(weight: "10")
-  notGreaterThanOrEqualTo: Int @cost(weight: "10")
+  in: [Int] @cost(weight: "10")
   lessThan: Int @cost(weight: "10")
-  notLessThan: Int @cost(weight: "10")
   lessThanOrEqualTo: Int @cost(weight: "10")
+  notEqualTo: Int @cost(weight: "10")
+  notGreaterThan: Int @cost(weight: "10")
+  notGreaterThanOrEqualTo: Int @cost(weight: "10")
+  notIn: [Int] @cost(weight: "10")
+  notLessThan: Int @cost(weight: "10")
   notLessThanOrEqualTo: Int @cost(weight: "10")
 }
 
-input IsoDayOfWeekFilterInput {
-  equalTo: IsoDayOfWeek @cost(weight: "10")
-  notEqualTo: IsoDayOfWeek @cost(weight: "10")
-  in: [IsoDayOfWeek!] @cost(weight: "10")
-  notIn: [IsoDayOfWeek!] @cost(weight: "10")
-}
-
 input JsonElementFilterInput {
   and: [JsonElementFilterInput!]
   or: [JsonElementFilterInput!]
@@ -3003,8 +3230,8 @@ input JsonElementFilterInput {
 
 input JsonValueKindFilterInput {
   equalTo: JsonValueKind @cost(weight: "10")
-  notEqualTo: JsonValueKind @cost(weight: "10")
   in: [JsonValueKind!] @cost(weight: "10")
+  notEqualTo: JsonValueKind @cost(weight: "10")
   notIn: [JsonValueKind!] @cost(weight: "10")
 }
 
@@ -3017,54 +3244,48 @@ input LifeCycleDataPropositionInput {
 }
 
 input LocalDateFilterInput {
-  and: [LocalDateFilterInput!]
-  or: [LocalDateFilterInput!]
-  calendar: CalendarSystemFilterInput
-  year: IntFilterInput
-  month: IntFilterInput
-  day: IntFilterInput
-  dayOfWeek: IsoDayOfWeekFilterInput
-  yearOfEra: IntFilterInput
-  era: EraFilterInput
-  dayOfYear: IntFilterInput
+  equalTo: LocalDate @cost(weight: "10")
+  greaterThan: LocalDate @cost(weight: "10")
+  greaterThanOrEqualTo: LocalDate @cost(weight: "10")
+  in: [LocalDate] @cost(weight: "10")
+  lessThan: LocalDate @cost(weight: "10")
+  lessThanOrEqualTo: LocalDate @cost(weight: "10")
+  notEqualTo: LocalDate @cost(weight: "10")
+  notGreaterThan: LocalDate @cost(weight: "10")
+  notGreaterThanOrEqualTo: LocalDate @cost(weight: "10")
+  notIn: [LocalDate] @cost(weight: "10")
+  notLessThan: LocalDate @cost(weight: "10")
+  notLessThanOrEqualTo: LocalDate @cost(weight: "10")
 }
 
 input LocalDateTimeFilterInput {
-  and: [LocalDateTimeFilterInput!]
-  or: [LocalDateTimeFilterInput!]
-  calendar: CalendarSystemFilterInput
-  year: IntFilterInput
-  yearOfEra: IntFilterInput
-  era: EraFilterInput
-  month: IntFilterInput
-  dayOfYear: IntFilterInput
-  day: IntFilterInput
-  dayOfWeek: IsoDayOfWeekFilterInput
-  hour: IntFilterInput
-  clockHourOfHalfDay: IntFilterInput
-  minute: IntFilterInput
-  second: IntFilterInput
-  millisecond: IntFilterInput
-  tickOfSecond: IntFilterInput
-  tickOfDay: LongFilterInput
-  nanosecondOfSecond: IntFilterInput
-  nanosecondOfDay: LongFilterInput
-  timeOfDay: LocalTimeFilterInput
-  date: LocalDateFilterInput
+  equalTo: LocalDateTime @cost(weight: "10")
+  greaterThan: LocalDateTime @cost(weight: "10")
+  greaterThanOrEqualTo: LocalDateTime @cost(weight: "10")
+  in: [LocalDateTime] @cost(weight: "10")
+  lessThan: LocalDateTime @cost(weight: "10")
+  lessThanOrEqualTo: LocalDateTime @cost(weight: "10")
+  notEqualTo: LocalDateTime @cost(weight: "10")
+  notGreaterThan: LocalDateTime @cost(weight: "10")
+  notGreaterThanOrEqualTo: LocalDateTime @cost(weight: "10")
+  notIn: [LocalDateTime] @cost(weight: "10")
+  notLessThan: LocalDateTime @cost(weight: "10")
+  notLessThanOrEqualTo: LocalDateTime @cost(weight: "10")
 }
 
 input LocalTimeFilterInput {
-  and: [LocalTimeFilterInput!]
-  or: [LocalTimeFilterInput!]
-  hour: IntFilterInput
-  clockHourOfHalfDay: IntFilterInput
-  minute: IntFilterInput
-  second: IntFilterInput
-  millisecond: IntFilterInput
-  tickOfSecond: IntFilterInput
-  tickOfDay: LongFilterInput
-  nanosecondOfSecond: IntFilterInput
-  nanosecondOfDay: LongFilterInput
+  equalTo: LocalTime @cost(weight: "10")
+  greaterThan: LocalTime @cost(weight: "10")
+  greaterThanOrEqualTo: LocalTime @cost(weight: "10")
+  in: [LocalTime] @cost(weight: "10")
+  lessThan: LocalTime @cost(weight: "10")
+  lessThanOrEqualTo: LocalTime @cost(weight: "10")
+  notEqualTo: LocalTime @cost(weight: "10")
+  notGreaterThan: LocalTime @cost(weight: "10")
+  notGreaterThanOrEqualTo: LocalTime @cost(weight: "10")
+  notIn: [LocalTime] @cost(weight: "10")
+  notLessThan: LocalTime @cost(weight: "10")
+  notLessThanOrEqualTo: LocalTime @cost(weight: "10")
 }
 
 input LoginUserInput {
@@ -3083,46 +3304,60 @@ input LoginUserWithTwoFactorCodeInput {
 
 input LongFilterInput {
   equalTo: Long @cost(weight: "10")
-  notEqualTo: Long @cost(weight: "10")
-  in: [Long] @cost(weight: "10")
-  notIn: [Long] @cost(weight: "10")
   greaterThan: Long @cost(weight: "10")
-  notGreaterThan: Long @cost(weight: "10")
   greaterThanOrEqualTo: Long @cost(weight: "10")
-  notGreaterThanOrEqualTo: Long @cost(weight: "10")
+  in: [Long] @cost(weight: "10")
   lessThan: Long @cost(weight: "10")
-  notLessThan: Long @cost(weight: "10")
   lessThanOrEqualTo: Long @cost(weight: "10")
+  notEqualTo: Long @cost(weight: "10")
+  notGreaterThan: Long @cost(weight: "10")
+  notGreaterThanOrEqualTo: Long @cost(weight: "10")
+  notIn: [Long] @cost(weight: "10")
+  notLessThan: Long @cost(weight: "10")
   notLessThanOrEqualTo: Long @cost(weight: "10")
 }
 
 input MethodCategoryFilterInput {
   equalTo: MethodCategory @cost(weight: "10")
-  notEqualTo: MethodCategory @cost(weight: "10")
   in: [MethodCategory!] @cost(weight: "10")
+  notEqualTo: MethodCategory @cost(weight: "10")
   notIn: [MethodCategory!] @cost(weight: "10")
 }
 
 input MethodCategorysFilterInput {
   all: MethodCategoryFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: MethodCategoryFilterInput @cost(weight: "10")
   some: MethodCategoryFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
+}
+
+input MethodDeveloperFilterInput {
+  and: [MethodDeveloperFilterInput!]
+  createdAt: DateTimeFilterInput
+  or: [MethodDeveloperFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input MethodDeveloperSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input MethodFilterInput {
   and: [MethodFilterInput!]
-  or: [MethodFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
-  description: StringFilterInput
   calculationLocator: UrlFilterInput
   categories: MethodCategorysFilterInput
-  institutionDevelopers: FilterInputTypeOfInstitutionsFilterInput
+  createdAt: DateTimeFilterInput
+  description: StringFilterInput
+  id: UuidFilterInput
   institutionDeveloperEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  userDevelopers: FilterInputTypeOfUsersFilterInput
-  userDeveloperEdges: FilterInputTypeOfUserMethodDevelopersFilterInput
+  institutionDevelopers: FilterInputTypeOfInstitutionsFilterInput
   manager: InstitutionFilterInput
+  name: StringFilterInput
+  or: [MethodFilterInput!]
+  updatedAt: DateTimeFilterInput
+  userDeveloperEdges: FilterInputTypeOfUserMethodDevelopersFilterInput
+  userDevelopers: FilterInputTypeOfUsersFilterInput
 }
 
 input MethodParameterInput {
@@ -3131,11 +3366,12 @@ input MethodParameterInput {
 }
 
 input MethodSortInput {
+  calculationLocator: UriSortInput @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
   id: SortEnumType @cost(weight: "10")
   name: SortEnumType @cost(weight: "10")
-  description: SortEnumType @cost(weight: "10")
-  calculationLocator: UriSortInput @cost(weight: "10")
-  manager: InstitutionSortInput @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 "A data source given as a cross-database data reference when this method is applied."
@@ -3146,8 +3382,8 @@ input MethodSourceInput {
 
 input NullableOfPrimeSurfaceFilterInput {
   equalTo: PrimeSurface @cost(weight: "10")
-  notEqualTo: PrimeSurface @cost(weight: "10")
   in: [PrimeSurface] @cost(weight: "10")
+  notEqualTo: PrimeSurface @cost(weight: "10")
   notIn: [PrimeSurface] @cost(weight: "10")
 }
 
@@ -3157,41 +3393,6 @@ input NumerationInput {
   suffix: String
 }
 
-input OffsetDateTimeFilterInput {
-  and: [OffsetDateTimeFilterInput!]
-  or: [OffsetDateTimeFilterInput!]
-  calendar: CalendarSystemFilterInput
-  year: IntFilterInput
-  month: IntFilterInput
-  day: IntFilterInput
-  dayOfWeek: IsoDayOfWeekFilterInput
-  yearOfEra: IntFilterInput
-  era: EraFilterInput
-  dayOfYear: IntFilterInput
-  hour: IntFilterInput
-  clockHourOfHalfDay: IntFilterInput
-  minute: IntFilterInput
-  second: IntFilterInput
-  millisecond: IntFilterInput
-  tickOfSecond: IntFilterInput
-  tickOfDay: LongFilterInput
-  nanosecondOfSecond: IntFilterInput
-  nanosecondOfDay: LongFilterInput
-  localDateTime: LocalDateTimeFilterInput
-  date: LocalDateFilterInput
-  timeOfDay: LocalTimeFilterInput
-  offset: OffsetFilterInput
-}
-
-input OffsetFilterInput {
-  and: [OffsetFilterInput!]
-  or: [OffsetFilterInput!]
-  seconds: IntFilterInput
-  milliseconds: IntFilterInput
-  ticks: LongFilterInput
-  nanoseconds: LongFilterInput
-}
-
 input OpenEndedDateTimeRangeInput {
   from: DateTime
   to: DateTime
@@ -3199,35 +3400,73 @@ input OpenEndedDateTimeRangeInput {
 
 input OpenIdConnectApplicationFilterInput {
   and: [OpenIdConnectApplicationFilterInput!]
-  or: [OpenIdConnectApplicationFilterInput!]
-  id: UuidFilterInput
   applicationType: StringFilterInput
   clientId: StringFilterInput
   consentType: StringFilterInput
+  createdAt: DateTimeFilterInput
   displayName: StringFilterInput
+  id: UuidFilterInput
+  or: [OpenIdConnectApplicationFilterInput!]
+  owner: InstitutionFilterInput
+  updatedAt: DateTimeFilterInput
+}
+
+input OpenIdConnectApplicationSortInput {
+  applicationType: SortEnumType @cost(weight: "10")
+  clientId: SortEnumType @cost(weight: "10")
+  consentType: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  displayName: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input OpenIdConnectAuthorizationFilterInput {
   and: [OpenIdConnectAuthorizationFilterInput!]
-  or: [OpenIdConnectAuthorizationFilterInput!]
+  application: InstitutionOwnedOpenIdConnectApplicationFilterInput
+  createdAt: DateTimeFilterInput
   id: UuidFilterInput
-  creationDate: DateTimeFilterInput
+  or: [OpenIdConnectAuthorizationFilterInput!]
   status: StringFilterInput
   subject: StringFilterInput
   tokens: FilterInputTypeOfOpenIdConnectTokensFilterInput
   type: StringFilterInput
+  updatedAt: DateTimeFilterInput
+}
+
+input OpenIdConnectAuthorizationSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  status: SortEnumType @cost(weight: "10")
+  subject: SortEnumType @cost(weight: "10")
+  type: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input OpenIdConnectTokenFilterInput {
   and: [OpenIdConnectTokenFilterInput!]
-  or: [OpenIdConnectTokenFilterInput!]
+  application: InstitutionOwnedOpenIdConnectApplicationFilterInput
+  authorization: OpenIdConnectAuthorizationFilterInput
+  createdAt: DateTimeFilterInput
+  expiredAt: DateTimeFilterInput
   id: UuidFilterInput
-  creationDate: DateTimeFilterInput
-  expirationDate: DateTimeFilterInput
-  redemptionDate: DateTimeFilterInput
+  or: [OpenIdConnectTokenFilterInput!]
+  redeemedAt: DateTimeFilterInput
   status: StringFilterInput
   subject: StringFilterInput
   type: StringFilterInput
+  updatedAt: DateTimeFilterInput
+}
+
+input OpenIdConnectTokenSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  expiredAt: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  redeemedAt: SortEnumType @cost(weight: "10")
+  status: SortEnumType @cost(weight: "10")
+  subject: SortEnumType @cost(weight: "10")
+  type: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input OpticalComponentSubtypePropositionInput {
@@ -3379,16 +3618,16 @@ input SetUserPhoneNumberInput {
 
 input ShortFilterInput {
   equalTo: Short @cost(weight: "10")
-  notEqualTo: Short @cost(weight: "10")
-  in: [Short] @cost(weight: "10")
-  notIn: [Short] @cost(weight: "10")
   greaterThan: Short @cost(weight: "10")
-  notGreaterThan: Short @cost(weight: "10")
   greaterThanOrEqualTo: Short @cost(weight: "10")
-  notGreaterThanOrEqualTo: Short @cost(weight: "10")
+  in: [Short] @cost(weight: "10")
   lessThan: Short @cost(weight: "10")
-  notLessThan: Short @cost(weight: "10")
   lessThanOrEqualTo: Short @cost(weight: "10")
+  notEqualTo: Short @cost(weight: "10")
+  notGreaterThan: Short @cost(weight: "10")
+  notGreaterThanOrEqualTo: Short @cost(weight: "10")
+  notIn: [Short] @cost(weight: "10")
+  notLessThan: Short @cost(weight: "10")
   notLessThanOrEqualTo: Short @cost(weight: "10")
 }
 
@@ -3404,41 +3643,26 @@ input StandardInput {
 
 input StringFilterInput {
   and: [StringFilterInput!]
-  or: [StringFilterInput!]
-  equalTo: String @cost(weight: "10")
-  notEqualTo: String @cost(weight: "10")
   contains: String @cost(weight: "20")
   doesNotContain: String @cost(weight: "20")
+  doesNotEndWith: String @cost(weight: "20")
+  doesNotStartWith: String @cost(weight: "20")
+  endsWith: String @cost(weight: "20")
+  equalTo: String @cost(weight: "10")
   in: [String] @cost(weight: "10")
+  notEqualTo: String @cost(weight: "10")
   notIn: [String] @cost(weight: "10")
+  or: [StringFilterInput!]
   startsWith: String @cost(weight: "20")
-  doesNotStartWith: String @cost(weight: "20")
-  endsWith: String @cost(weight: "20")
-  doesNotEndWith: String @cost(weight: "20")
 }
 
 input SwitchInstitutionOperatingStateInput {
   institutionId: Uuid!
 }
 
-input TimeSpanFilterInput {
-  equalTo: TimeSpan @cost(weight: "10")
-  notEqualTo: TimeSpan @cost(weight: "10")
-  in: [TimeSpan] @cost(weight: "10")
-  notIn: [TimeSpan] @cost(weight: "10")
-  greaterThan: TimeSpan @cost(weight: "10")
-  notGreaterThan: TimeSpan @cost(weight: "10")
-  greaterThanOrEqualTo: TimeSpan @cost(weight: "10")
-  notGreaterThanOrEqualTo: TimeSpan @cost(weight: "10")
-  lessThan: TimeSpan @cost(weight: "10")
-  notLessThan: TimeSpan @cost(weight: "10")
-  lessThanOrEqualTo: TimeSpan @cost(weight: "10")
-  notLessThanOrEqualTo: TimeSpan @cost(weight: "10")
-}
-
 input UpdateComponentAssemblyInput {
   assembledComponentId: Uuid!
-  index: Byte
+  index: UnsignedByte
   partComponentId: Uuid!
   primeSurface: PrimeSurface
 }
@@ -3512,97 +3736,125 @@ input UpdateOpenIdConnectApplicationInput {
 input UriSortInput {
   absolutePath: SortEnumType @cost(weight: "10")
   absoluteUri: SortEnumType @cost(weight: "10")
-  localPath: SortEnumType @cost(weight: "10")
   authority: SortEnumType @cost(weight: "10")
+  dnsSafeHost: SortEnumType @cost(weight: "10")
+  fragment: SortEnumType @cost(weight: "10")
+  host: SortEnumType @cost(weight: "10")
   hostNameType: SortEnumType @cost(weight: "10")
+  idnHost: SortEnumType @cost(weight: "10")
+  isAbsoluteUri: SortEnumType @cost(weight: "10")
   isDefaultPort: SortEnumType @cost(weight: "10")
   isFile: SortEnumType @cost(weight: "10")
   isLoopback: SortEnumType @cost(weight: "10")
-  pathAndQuery: SortEnumType @cost(weight: "10")
   isUnc: SortEnumType @cost(weight: "10")
-  host: SortEnumType @cost(weight: "10")
+  localPath: SortEnumType @cost(weight: "10")
+  originalString: SortEnumType @cost(weight: "10")
+  pathAndQuery: SortEnumType @cost(weight: "10")
   port: SortEnumType @cost(weight: "10")
   query: SortEnumType @cost(weight: "10")
-  fragment: SortEnumType @cost(weight: "10")
   scheme: SortEnumType @cost(weight: "10")
-  originalString: SortEnumType @cost(weight: "10")
-  dnsSafeHost: SortEnumType @cost(weight: "10")
-  idnHost: SortEnumType @cost(weight: "10")
-  isAbsoluteUri: SortEnumType @cost(weight: "10")
   userEscaped: SortEnumType @cost(weight: "10")
   userInfo: SortEnumType @cost(weight: "10")
 }
 
 input UrlFilterInput {
   equalTo: Url @cost(weight: "10")
-  notEqualTo: Url @cost(weight: "10")
-  in: [Url] @cost(weight: "10")
-  notIn: [Url] @cost(weight: "10")
   greaterThan: Url @cost(weight: "10")
-  notGreaterThan: Url @cost(weight: "10")
   greaterThanOrEqualTo: Url @cost(weight: "10")
-  notGreaterThanOrEqualTo: Url @cost(weight: "10")
+  in: [Url] @cost(weight: "10")
   lessThan: Url @cost(weight: "10")
-  notLessThan: Url @cost(weight: "10")
   lessThanOrEqualTo: Url @cost(weight: "10")
+  notEqualTo: Url @cost(weight: "10")
+  notGreaterThan: Url @cost(weight: "10")
+  notGreaterThanOrEqualTo: Url @cost(weight: "10")
+  notIn: [Url] @cost(weight: "10")
+  notLessThan: Url @cost(weight: "10")
   notLessThanOrEqualTo: Url @cost(weight: "10")
 }
 
 input UserDevelopedMethodFilterInput {
   and: [UserDevelopedMethodFilterInput!]
-  or: [UserDevelopedMethodFilterInput!]
+  createdAt: DateTimeFilterInput
   method: InstitutionManagedMethodFilterInput
+  or: [UserDevelopedMethodFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input UserDevelopedMethodSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input UserFilterInput {
   and: [UserFilterInput!]
-  or: [UserFilterInput!]
-  id: UuidFilterInput
-  developedMethods: FilterInputTypeOfMethodsFilterInput
+  createdAt: DateTimeFilterInput
   developedMethodEdges: FilterInputTypeOfUserMethodDevelopersFilterInput
-  representedInstitutions: FilterInputTypeOfInstitutionsFilterInput
+  developedMethods: FilterInputTypeOfMethodsFilterInput
+  id: UuidFilterInput
+  "Full name"
+  name: StringFilterInput
+  or: [UserFilterInput!]
   representedInstitutionEdges: FilterInputTypeOfInstitutionRepresentativesFilterInput
+  representedInstitutions: FilterInputTypeOfInstitutionsFilterInput
+  updatedAt: DateTimeFilterInput
 }
 
 input UserGnuPgKeyFingerprintFilterInput {
+  allowedAt: DateTimeFilterInput
   and: [UserGnuPgKeyFingerprintFilterInput!]
-  or: [UserGnuPgKeyFingerprintFilterInput!]
-  id: UuidFilterInput
+  createdAt: DateTimeFilterInput
   fingerprint: StringFilterInput
-  createdAt: OffsetDateTimeFilterInput
-  allowedAt: OffsetDateTimeFilterInput
-  forbiddenAt: OffsetDateTimeFilterInput
+  forbiddenAt: DateTimeFilterInput
+  id: UuidFilterInput
   institution: InstitutionFilterInput
+  or: [UserGnuPgKeyFingerprintFilterInput!]
+  updatedAt: DateTimeFilterInput
 }
 
-input UserMethodDeveloperSortInput {
-  method: MethodSortInput @cost(weight: "10")
-  user: UserSortInput @cost(weight: "10")
+input UserGnuPgKeyFingerprintSortInput {
+  allowedAt: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  fingerprint: SortEnumType @cost(weight: "10")
+  forbiddenAt: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input UserRepresentedInstitutionFilterInput {
   and: [UserRepresentedInstitutionFilterInput!]
-  or: [UserRepresentedInstitutionFilterInput!]
+  createdAt: DateTimeFilterInput
   institution: InstitutionFilterInput
+  or: [UserRepresentedInstitutionFilterInput!]
   role: InstitutionRepresentativeRoleFilterInput
+  updatedAt: DateTimeFilterInput
+}
+
+input UserRepresentedInstitutionSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  role: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input UserSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
   id: SortEnumType @cost(weight: "10")
+  "Full name"
+  name: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input UuidFilterInput {
   equalTo: Uuid @cost(weight: "10")
-  notEqualTo: Uuid @cost(weight: "10")
-  in: [Uuid] @cost(weight: "10")
-  notIn: [Uuid] @cost(weight: "10")
   greaterThan: Uuid @cost(weight: "10")
-  notGreaterThan: Uuid @cost(weight: "10")
   greaterThanOrEqualTo: Uuid @cost(weight: "10")
-  notGreaterThanOrEqualTo: Uuid @cost(weight: "10")
+  in: [Uuid] @cost(weight: "10")
   lessThan: Uuid @cost(weight: "10")
-  notLessThan: Uuid @cost(weight: "10")
   lessThanOrEqualTo: Uuid @cost(weight: "10")
+  notEqualTo: Uuid @cost(weight: "10")
+  notGreaterThan: Uuid @cost(weight: "10")
+  notGreaterThanOrEqualTo: Uuid @cost(weight: "10")
+  notIn: [Uuid] @cost(weight: "10")
+  notLessThan: Uuid @cost(weight: "10")
   notLessThanOrEqualTo: Uuid @cost(weight: "10")
 }
 
@@ -3938,17 +4190,6 @@ enum InstitutionState {
   VERIFIED
 }
 
-enum IsoDayOfWeek {
-  NONE
-  MONDAY
-  TUESDAY
-  WEDNESDAY
-  THURSDAY
-  FRIDAY
-  SATURDAY
-  SUNDAY
-}
-
 enum JsonValueKind {
   UNDEFINED
   OBJECT
@@ -4334,62 +4575,56 @@ enum VerifyInstitutionErrorCode {
 }
 
 "The authorize directive."
-directive @authorize("Defines when when the authorize directive shall be applied.By default the authorize directives are applied during the validation phase." apply: ApplyPolicy! = BEFORE_RESOLVER "The name of the authorization policy that determines access to the annotated resource." policy: String "Roles that are allowed to access the annotated resource." roles: [String!]) repeatable on OBJECT | FIELD_DEFINITION
+directive @authorize("Defines when the authorize directive shall be applied. By default the authorize directive is applied before the resolver is executed." apply: ApplyPolicy! = BEFORE_RESOLVER "The name of the authorization policy that determines access to the annotated resource." policy: String "Roles that are allowed to access the annotated resource." roles: [String!]) repeatable on OBJECT | FIELD_DEFINITION
 
 "The purpose of the `cost` directive is to define a `weight` for GraphQL types, fields, and arguments. Static analysis can use these weights when calculating the overall cost of a query or response."
 directive @cost("The `weight` argument defines what value to add to the overall cost for every appearance, or possible appearance, of a type, field, argument, etc." weight: String!) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM | INPUT_FIELD_DEFINITION
 
 "The purpose of the `@listSize` directive is to either inform the static analysis about the size of returned lists (if that information is statically available), or to point the analysis to where to find that information."
-directive @listSize("The `assumedSize` argument can be used to statically define the maximum length of a list returned by a field." assumedSize: Int "The `requireOneSlicingArgument` argument can be used to inform the static analysis that it should expect that exactly one of the defined slicing arguments is present in a query. If that is not the case (i.e., if none or multiple slicing arguments are present), the static analysis may throw an error." requireOneSlicingArgument: Boolean! = true "The `sizedFields` argument can be used to define that the value of the `assumedSize` argument or of a slicing argument does not affect the size of a list returned by a field itself, but that of a list returned by one of its sub-fields." sizedFields: [String!] "The `slicingArgumentDefaultValue` argument can be used to define a default value for a slicing argument, which is used if the argument is not present in a query." slicingArgumentDefaultValue: Int "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments." slicingArguments: [String!]) on FIELD_DEFINITION
+directive @listSize("The `assumedSize` argument can be used to statically define the maximum length of a list returned by a field." assumedSize: Int "The `requireOneSlicingArgument` argument can be used to inform the static analysis that it should expect that exactly one of the defined slicing arguments is present in a query. If that is not the case (i.e., if none or multiple slicing arguments are present), the static analysis may throw an error." requireOneSlicingArgument: Boolean = true "The `sizedFields` argument can be used to define that the value of the `assumedSize` argument or of a slicing argument does not affect the size of a list returned by a field itself, but that of a list returned by one of its sub-fields." sizedFields: [String!] "The `slicingArgumentDefaultValue` argument can be used to define a default value for a slicing argument, which is used if the argument is not present in a query." slicingArgumentDefaultValue: Int "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments." slicingArguments: [String!]) on FIELD_DEFINITION
 
 "The `@specifiedBy` directive is used within the type system definition language to provide a URL for specifying the behavior of custom scalar definitions."
 directive @specifiedBy("The specifiedBy URL points to a human-readable specification. This field will only read a result for scalar types." url: String!) on SCALAR
 
-scalar Any
-
-"The `Byte` scalar type represents non-fractional whole numeric values. Byte can represent values between 0 and 255."
-scalar Byte
+scalar Any @specifiedBy(url: "https://scalars.graphql.org/chillicream/any.html")
 
-"The `DateTime` scalar represents an ISO-8601 compliant date time type."
-scalar DateTime @specifiedBy(url: "https:\/\/www.graphql-scalars.com\/date-time")
+"The `Byte` scalar type represents a signed 8-bit integer."
+scalar Byte @specifiedBy(url: "https://scalars.graphql.org/chillicream/byte.html")
 
-"""
-Represents a time zone - a mapping between UTC and local time.
-A time zone maps UTC instants to local times - or, equivalently, to the offset from UTC at any particular instant.
+"The `DateTime` scalar type represents a date and time with time zone offset information."
+scalar DateTime @specifiedBy(url: "https://scalars.graphql.org/chillicream/date-time.html")
 
-Example: `Europe/Zurich`
-"""
-scalar DateTimeZone
+"The `Decimal` scalar type represents a decimal floating-point number with high precision."
+scalar Decimal @specifiedBy(url: "https://scalars.graphql.org/chillicream/decimal.html")
 
-"The `Decimal` scalar type represents a decimal floating-point number."
-scalar Decimal
+"The `Duration` scalar type represents a duration of time."
+scalar Duration @specifiedBy(url: "https://scalars.graphql.org/chillicream/duration.html")
 
-"""
-Represents a fixed (and calendar-independent) length of time.
+"The `LocalDate` scalar type represents a date without time or time zone information."
+scalar LocalDate @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-date.html")
 
-Allowed patterns:
-- `-D:hh:mm:ss.sssssssss`
+"The `LocalDateTime` scalar type represents a date and time without time zone information."
+scalar LocalDateTime @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-date-time.html")
 
-Examples:
-- `-1:20:00:00.999999999`
-"""
-scalar Duration
+"The `LocalTime` scalar type represents a time of day without date or time zone information."
+scalar LocalTime @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-time.html")
 
 "BCP 47 compliant Language Tag string"
 scalar Locale
 
-"The `Long` scalar type represents non-fractional signed whole 64-bit numeric values. Long can represent values between -(2^63) and 2^63 - 1."
-scalar Long
+"The `Long` scalar type represents a signed 64-bit integer."
+scalar Long @specifiedBy(url: "https://scalars.graphql.org/chillicream/long.html")
 
-"The NonNegativeInt scalar type represents a unsigned 32-bit numeric non-fractional value equal to or greater than 0."
+"The `NonNegativeInt` scalar type represents an unsigned 32-bit numeric non-fractional value."
 scalar NonNegativeInt
 
-"The `Short` scalar type represents non-fractional signed whole 16-bit numeric values. Short can represent values between -(2^15) and 2^15 - 1."
-scalar Short
+"The `Short` scalar type represents a signed 16-bit integer."
+scalar Short @specifiedBy(url: "https://scalars.graphql.org/chillicream/short.html")
 
-"The `TimeSpan` scalar represents an ISO-8601 compliant duration type."
-scalar TimeSpan
+"The `UnsignedByte` scalar type represents an unsigned 8-bit integer."
+scalar UnsignedByte @specifiedBy(url: "https://scalars.graphql.org/chillicream/unsigned-byte.html")
 
-scalar Url
+"The `Url` scalar type represents a Uniform Resource Identifier (URI) as defined by RFC 3986."
+scalar Url @specifiedBy(url: "https://tools.ietf.org/html/rfc3986")
 
-scalar Uuid
\ No newline at end of file
+scalar Uuid @specifiedBy(url: "https://scalars.graphql.org/chillicream/uuid.html")
\ No newline at end of file
diff --git a/backend/test/Metabase.Tests.csproj b/backend/test/Metabase.Tests.csproj
index 6f8bdd3dd..8a49335e2 100644
--- a/backend/test/Metabase.Tests.csproj
+++ b/backend/test/Metabase.Tests.csproj
@@ -12,18 +12,20 @@
     <PackageReference Include="FluentAssertions" Version="8.9.0" />
     <PackageReference Include="IdentityModel" Version="7.0.0" />
     <PackageReference Include="JsonPath.Net" Version="3.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
-    <PackageReference Include="NUnit" Version="4.5.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
+    <PackageReference Include="NodaTime.Testing" Version="3.3.2" />
+    <PackageReference Include="NUnit" Version="4.6.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.12.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.13.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
     <PackageReference Include="Serilog.Sinks.NUnit" Version="1.0.3" />
     <PackageReference Include="Snapshooter.NUnit" Version="1.3.1" />
-    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.5.2" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.6.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/frontend/codegen.ts b/frontend/codegen.ts
index 9e23c42de..bd13804f5 100644
--- a/frontend/codegen.ts
+++ b/frontend/codegen.ts
@@ -40,17 +40,21 @@ const config: CodegenConfig = {
             input: "string",
             output: "string",
           },
-          Any: "unknown",
+          Any: "object",
           Byte: "number",
           DateTime: "string",
           DateTimeZone: "string",
           Decimal: "string",
           Duration: "string",
+          LocalDate: "string",
+          LocalDateTime: "string",
+          LocalTime: "string",
           Locale: "string",
           Long: "number",
           NonNegativeInt: "number",
           Short: "number",
           TimeSpan: "string",
+          UnsignedByte: "string",
           Upload: "unknown",
           Url: "string",
           Uuid: "string",
@@ -69,6 +73,9 @@ const config: CodegenConfig = {
         deterministic: true,
       },
     },
+    "./__generated__/apolloHelpers.ts": {
+      plugins: ["typescript-apollo-client-helpers"],
+    },
     // './queries/': {
     //   preset: 'near-operation-file',
     //   presetConfig: {
diff --git a/frontend/components/ActiveFilterAndSortBar.tsx b/frontend/components/ActiveFilterAndSortBar.tsx
new file mode 100644
index 000000000..1f393d0e2
--- /dev/null
+++ b/frontend/components/ActiveFilterAndSortBar.tsx
@@ -0,0 +1,128 @@
+import { Tag, Space, Typography, Flex } from "antd";
+import {
+  ObjectFilterState,
+  getFilterOperatorLabel,
+  createFilterStateReducer,
+  FilterDefinition,
+  FilterStateReducerContext,
+} from "../lib/filter";
+import { formatSortDirection, SortState, SortDefinition } from "../lib/sort";
+import DeleteButton from "./DeleteButton";
+import { Key } from "react";
+import { getLabel } from "../lib/string";
+
+const stringifySort = <TSortInput,>(
+  sort: SortState,
+  definitions: readonly SortDefinition<TSortInput>[],
+) => `${String(definitions[sort.index].field)}|${sort.direction}`;
+
+const renderSort = <TSortInput,>(
+  sort: SortState,
+  definitions: readonly SortDefinition<TSortInput>[],
+) => (
+  <>
+    {getLabel(definitions[sort.index], "none-upper")} (
+    {formatSortDirection(sort.direction)})
+  </>
+);
+
+const stringifyFilter = <TFilterInput,>(
+  filter: ObjectFilterState,
+  definitions: readonly FilterDefinition<TFilterInput>[],
+): Key =>
+  createFilterStateReducer<string>(
+    (scalar) =>
+      `${getFilterOperatorLabel(scalar.operator)}|${JSON.stringify(scalar.value)}`,
+    (list, stringify) =>
+      `${getFilterOperatorLabel(list.operator)}|${stringify(list.value)}`,
+    (object, context, stringify) =>
+      `${String(context[object.index].field)}|${stringify(object.value)}`,
+  )(filter, definitions as FilterStateReducerContext);
+
+const renderFilter = <TFilterInput,>(
+  value: ObjectFilterState,
+  definitions: readonly FilterDefinition<TFilterInput>[],
+) =>
+  createFilterStateReducer<React.ReactNode>(
+    (scalar) => (
+      <>
+        {getFilterOperatorLabel(scalar.operator)}{" "}
+        {Array.isArray(scalar.value)
+          ? `{${scalar.value.join(", ")}}`
+          : scalar.value}
+      </>
+    ),
+    (list, render) => (
+      <>
+        {getFilterOperatorLabel(list.operator)} {render(list.value)}
+      </>
+    ),
+    (object, context, render) => (
+      <>
+        {getLabel(context[object.index], "none-upper")} {render(object.value)}
+      </>
+    ),
+  )(value, definitions as FilterStateReducerContext);
+
+export default function ActiveFilterAndSortBar<TFilterInput, TSortInput>({
+  values,
+  filterDefinitions,
+  sortDefinitions,
+  onRemoveFilter,
+  onRemoveSort,
+  onRemoveAll,
+}: {
+  values: {
+    filters: readonly ObjectFilterState[];
+    sorts: readonly SortState[];
+  };
+  filterDefinitions: readonly FilterDefinition<TFilterInput>[];
+  sortDefinitions: readonly SortDefinition<TSortInput>[];
+  onRemoveFilter: (index: number) => void;
+  onRemoveSort: (index: number) => void;
+  onRemoveAll: () => void;
+}) {
+  return (
+    <Flex justify="space-between" align="baseline">
+      <Space>
+        {values.filters.length > 0 && (
+          <>
+            <Typography.Text type="secondary">Filtered by</Typography.Text>
+            {values.filters.map((filter, index: number) => (
+              <Tag
+                color="green"
+                closable
+                closeIcon={
+                  <DeleteButton type="icon" kind="remove" title="Remove" />
+                }
+                key={stringifyFilter(filter, filterDefinitions)}
+                onClose={() => onRemoveFilter(index)}
+              >
+                {renderFilter(filter, filterDefinitions)}
+              </Tag>
+            ))}
+          </>
+        )}
+        {values.sorts.length > 0 && (
+          <>
+            <Typography.Text type="secondary">Sorted by</Typography.Text>
+            {values.sorts.map((sort, index: number) => (
+              <Tag
+                color="blue"
+                closable
+                closeIcon={<DeleteButton type="icon" kind="remove" />}
+                key={stringifySort(sort, sortDefinitions)}
+                onClose={() => onRemoveSort(index)}
+              >
+                {renderSort(sort, sortDefinitions)}
+              </Tag>
+            ))}
+          </>
+        )}
+      </Space>
+      {(values.filters.length > 0 || values.sorts.length > 0) && (
+        <DeleteButton title="Remove All" type="text" onClick={onRemoveAll} />
+      )}
+    </Flex>
+  );
+}
diff --git a/frontend/components/Availability.tsx b/frontend/components/Availability.tsx
deleted file mode 100644
index 76cd13330..000000000
--- a/frontend/components/Availability.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { OpenEndedDateTimeRange } from "../__generated__/graphql";
-import OpenEndedDateTimeRangeX from "./OpenEndedDateTimeRangeX";
-
-export default function Availability({
-  range,
-}: {
-  range: OpenEndedDateTimeRange;
-}) {
-  return (
-    <div>
-      Available <OpenEndedDateTimeRangeX range={range} />
-    </div>
-  );
-}
diff --git a/frontend/components/CielabColorViewer.tsx b/frontend/components/CielabColorViewer.tsx
new file mode 100644
index 000000000..272d5f4ff
--- /dev/null
+++ b/frontend/components/CielabColorViewer.tsx
@@ -0,0 +1,10 @@
+import Copyable from "./Copyable";
+import { CielabColor } from "../__generated__/graphql";
+
+export default function CielabColorViewer({ value }: { value: CielabColor }) {
+  return (
+    <Copyable onlyIcon text={JSON.stringify(value)}>
+      L*={value.lStar}, a*={value.aStar}, b*={value.bStar}
+    </Copyable>
+  );
+}
diff --git a/frontend/components/CodeViewer.tsx b/frontend/components/CodeViewer.tsx
new file mode 100644
index 000000000..88d94bb4e
--- /dev/null
+++ b/frontend/components/CodeViewer.tsx
@@ -0,0 +1,32 @@
+import Copyable from "./Copyable";
+import CopyableBlock from "./CopyableBlock";
+
+export default function CodeViewer({
+  code,
+  inline = false,
+}: {
+  code: string;
+  inline?: boolean;
+}) {
+  if (inline) {
+    return (
+      <Copyable onlyIcon text={code}>
+        <code>{code}</code>
+      </Copyable>
+    );
+  } else {
+    return (
+      <CopyableBlock text={code}>
+        <pre
+          style={{
+            overflow: "auto",
+          }}
+        >
+          <code style={{ whiteSpace: "pre-wrap", wordWrap: "break-word" }}>
+            {code}
+          </code>
+        </pre>
+      </CopyableBlock>
+    );
+  }
+}
diff --git a/frontend/components/ContactInformation.tsx b/frontend/components/ContactInformation.tsx
index a4b3d34a1..7ceeaa3c4 100644
--- a/frontend/components/ContactInformation.tsx
+++ b/frontend/components/ContactInformation.tsx
@@ -5,7 +5,7 @@ import {
   GlobalOutlined,
   EnvironmentOutlined,
 } from "@ant-design/icons";
-import { ContactInformationPartialFragment } from "../queries/institutions.generated";
+import { ContactInformationPartialFragment } from "../queries/common.generated";
 
 export default function ContactInformation({
   contact,
diff --git a/frontend/components/CopyButton.tsx b/frontend/components/CopyButton.tsx
new file mode 100644
index 000000000..3cbc231cf
--- /dev/null
+++ b/frontend/components/CopyButton.tsx
@@ -0,0 +1,73 @@
+import { Button, Tooltip } from "antd";
+import { CopyOutlined, CheckOutlined } from "@ant-design/icons";
+import { ReactNode, useState } from "react";
+
+export default function CopyButton({
+  getText,
+  type = "text",
+  size = "small",
+  copyIcon = <CopyOutlined />,
+  onlyIcon = false,
+  color = undefined,
+  children,
+}: {
+  getText: () => string;
+  type?: "text" | "default";
+  size?: "small" | "medium" | "large";
+  copyIcon?: ReactNode;
+  onlyIcon?: boolean;
+  color?: "white";
+  children?: ReactNode;
+}) {
+  const [copied, setCopied] = useState(false);
+
+  return onlyIcon ? (
+    <Tooltip title="Copy">
+      <Button
+        type={type}
+        size={size}
+        icon={copied ? <CheckOutlined /> : copyIcon}
+        onClick={() => {
+          navigator.clipboard.writeText(getText());
+          setCopied(true);
+          setTimeout(() => setCopied(false), 2000);
+        }}
+      />
+    </Tooltip>
+  ) : (
+    <Button
+      type={type}
+      size={size}
+      icon={copied ? <CheckOutlined /> : copyIcon}
+      color="danger"
+      onClick={() => {
+        navigator.clipboard.writeText(getText());
+        setCopied(true);
+        setTimeout(() => setCopied(false), 2000);
+      }}
+    >
+      <div style={{ display: "inline-grid", gridTemplateAreas: '"stack"' }}>
+        <span
+          style={{
+            gridArea: "stack",
+            visibility: copied ? "hidden" : "visible",
+            whiteSpace: "nowrap",
+            color: color,
+          }}
+        >
+          {children}
+        </span>
+        <span
+          style={{
+            gridArea: "stack",
+            visibility: copied ? "visible" : "hidden",
+            whiteSpace: "nowrap",
+            color: color,
+          }}
+        >
+          Done
+        </span>
+      </div>
+    </Button>
+  );
+}
diff --git a/frontend/components/Copyable.tsx b/frontend/components/Copyable.tsx
index a81a1bb7b..f72dc9778 100644
--- a/frontend/components/Copyable.tsx
+++ b/frontend/components/Copyable.tsx
@@ -1,31 +1,26 @@
-import { Button, Space } from "antd";
-import { CopyOutlined, CheckOutlined } from "@ant-design/icons";
-import { ReactNode, useState } from "react";
+import { Space } from "antd";
+import { ReactNode } from "react";
+import CopyButton from "./CopyButton";
 
 export default function Copyable({
   text,
+  onlyIcon,
+  color,
   children,
 }: {
   text: string;
+  onlyIcon?: boolean;
+  color?: "white";
   children?: ReactNode;
 }) {
-  const [copied, setCopied] = useState(false);
-
   return (
-    <Space>
-      {children == null ? <span>{text}</span> : children}
-      <Button
-        type="text"
-        size="small"
-        icon={copied ? <CheckOutlined /> : <CopyOutlined />}
-        onClick={() => {
-          navigator.clipboard.writeText(text);
-          setCopied(true);
-          setTimeout(() => setCopied(false), 2000);
-        }}
-      >
-        {copied ? "Done" : "Copy"}
-      </Button>
-    </Space>
+    <span>
+      <Space>
+        <span>{children == null ? text : children}</span>
+        <CopyButton getText={() => text} onlyIcon={onlyIcon} color={color}>
+          Copy
+        </CopyButton>
+      </Space>
+    </span>
   );
 }
diff --git a/frontend/components/DeleteButton.tsx b/frontend/components/DeleteButton.tsx
new file mode 100644
index 000000000..0a923d81c
--- /dev/null
+++ b/frontend/components/DeleteButton.tsx
@@ -0,0 +1,63 @@
+import { Button, Tooltip } from "antd";
+import { DeleteOutlined, SyncOutlined } from "@ant-design/icons";
+import { capitalize } from "../lib/string";
+import { CSSProperties, forwardRef } from "react";
+
+interface DeleteButtonProps {
+  title?: React.ReactNode;
+  kind?: "delete" | "remove";
+  type?: "primary" | "text" | "default" | "icon";
+  deleting?: boolean;
+  style?: CSSProperties;
+  onClick?: (e?: React.MouseEvent<HTMLElement>) => void;
+  // This allows Popconfirm to inject its internal event handlers
+  [key: string]: any;
+}
+
+const DeleteButton = forwardRef<HTMLButtonElement, DeleteButtonProps>(
+  (
+    {
+      title,
+      kind = "delete",
+      type = "primary",
+      deleting = false,
+      style,
+      onClick,
+      ...rest
+    },
+    ref,
+  ) => {
+    const theTitle = title ?? capitalize(kind);
+
+    const commonProps = {
+      ...rest, // contains Popconfirm's events
+      ref, // allows Popconfirm to measure position
+      danger: true,
+      loading: deleting,
+      style,
+      onClick,
+    };
+
+    switch (type) {
+      case "icon":
+        return (
+          <Tooltip title={theTitle}>
+            <Button
+              {...commonProps}
+              type="text"
+              icon={deleting ? <SyncOutlined spin /> : <DeleteOutlined />}
+              shape="circle"
+            />
+          </Tooltip>
+        );
+      default:
+        return (
+          <Button {...commonProps} type={type} icon={<DeleteOutlined />}>
+            {theTitle}
+          </Button>
+        );
+    }
+  },
+);
+
+export default DeleteButton;
diff --git a/frontend/components/EditButton.tsx b/frontend/components/EditButton.tsx
new file mode 100644
index 000000000..37a6111ef
--- /dev/null
+++ b/frontend/components/EditButton.tsx
@@ -0,0 +1,30 @@
+import { EditOutlined } from "@ant-design/icons";
+import { Button, Tooltip } from "antd";
+
+export default function EditButton({
+  type = "default",
+  onClick,
+}: {
+  type?: "text" | "default" | "icon";
+  onClick?: (e?: React.MouseEvent<HTMLElement>) => void;
+}) {
+  switch (type) {
+    case "icon":
+      return (
+        <Tooltip title="Edit">
+          <Button
+            type="text"
+            icon={<EditOutlined />}
+            shape="circle"
+            onClick={onClick}
+          />
+        </Tooltip>
+      );
+    default:
+      return (
+        <Button type="default" onClick={onClick}>
+          Edit
+        </Button>
+      );
+  }
+}
diff --git a/frontend/components/EnumTag.tsx b/frontend/components/EnumTag.tsx
new file mode 100644
index 000000000..ea6b35e4a
--- /dev/null
+++ b/frontend/components/EnumTag.tsx
@@ -0,0 +1,16 @@
+import { Tag, TagProps } from "antd";
+
+export default function EnumTag(props: TagProps) {
+  return (
+    <Tag
+      {...props}
+      style={{
+        textTransform: "lowercase",
+        fontWeight: "normal",
+        ...props.style,
+      }}
+    >
+      {props.children}
+    </Tag>
+  );
+}
diff --git a/frontend/components/Float.tsx b/frontend/components/Float.tsx
new file mode 100644
index 000000000..ab72ce580
--- /dev/null
+++ b/frontend/components/Float.tsx
@@ -0,0 +1,14 @@
+import Copyable from "./Copyable";
+import { Scalars } from "../__generated__/graphql";
+
+export default function Float({
+  value,
+}: {
+  value: Scalars["Float"]["output"];
+}) {
+  return (
+    <Copyable onlyIcon text={value.toString()}>
+      {value}
+    </Copyable>
+  );
+}
diff --git a/frontend/components/FloatPropositionFormList.tsx b/frontend/components/FloatPropositionFormList.tsx
deleted file mode 100644
index 480da3e38..000000000
--- a/frontend/components/FloatPropositionFormList.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import { Form, Select, InputNumber, Button, Space } from "antd";
-import { PlusOutlined } from "@ant-design/icons";
-
-const tailLayout = {
-  wrapperCol: { offset: 8, span: 16 },
-};
-
-enum Negator {
-  Is = "is",
-  IsNot = "isNot",
-}
-
-export enum FloatPropositionComparator {
-  EqualTo = "equalTo",
-  LessThanOrEqualTo = "lessThanOrEqualTo",
-  GreaterThanOrEqualTo = "greaterThanOrEqualTo",
-  // InClosedInterval = "inClosedInterval"
-}
-
-interface FloatPropositionFormListProps {
-  name: string;
-  label: string;
-  minimum: number;
-  maximum: number;
-};
-
-export function FloatPropositionFormList({
-  name,
-  label,
-  minimum,
-  maximum,
-}: FloatPropositionFormListProps) {
-  return (
-    <Form.List name={name}>
-      {(fields, { add, remove }, { errors }) => (
-        <>
-          {fields.map(({ key, name, ...restField }, index) => (
-            <Form.Item key={key} label={index === 0 ? label : " "}>
-              <Space.Compact block>
-                <Form.Item
-                  {...restField}
-                  key={`negator${key}`}
-                  name={[name, "negator"]}
-                  noStyle
-                  initialValue={Negator.Is}
-                >
-                  <Select
-                    style={{ width: "10%" }}
-                    options={[
-                      { label: "Is", value: Negator.Is },
-                      { label: "Is not", value: Negator.IsNot },
-                    ]}
-                  />
-                </Form.Item>
-                <Form.Item
-                  {...restField}
-                  key={`comparator${key}`}
-                  name={[name, "comparator"]}
-                  noStyle
-                  initialValue={FloatPropositionComparator.EqualTo}
-                >
-                  <Select
-                    style={{ width: "20%" }}
-                    options={[
-                      {
-                        label: "equal to",
-                        value: FloatPropositionComparator.EqualTo,
-                      },
-                      {
-                        label: "greater than or equal to",
-                        value: FloatPropositionComparator.GreaterThanOrEqualTo,
-                      },
-                      {
-                        label: "less than or equal to",
-                        value: FloatPropositionComparator.LessThanOrEqualTo,
-                      },
-                      // {
-                      //     label: "in closed interval",
-                      //     value: FloatPropositionComparator.InClosedInterval
-                      // }
-                    ]}
-                  />
-                </Form.Item>
-                <Form.Item
-                  {...restField}
-                  key={`value${key}`}
-                  name={[name, "value"]}
-                  noStyle
-                >
-                  <InputNumber
-                    min={minimum}
-                    max={maximum}
-                    step="0.01"
-                    style={{ width: "60%" }}
-                  />
-                </Form.Item>
-                <Button danger onClick={() => remove(name)}>
-                  Remove
-                </Button>
-              </Space.Compact>
-            </Form.Item>
-          ))}
-          <Form.Item {...tailLayout}>
-            <Button
-              type="dashed"
-              onClick={add}
-              style={{ width: "100%" }}
-              icon={<PlusOutlined />}
-            >
-              {`Add ${label.toLocaleLowerCase("en")} proposition`}
-            </Button>
-            <Form.ErrorList errors={errors} />
-          </Form.Item>
-        </>
-      )}
-    </Form.List>
-  );
-}
diff --git a/frontend/components/Footer.tsx b/frontend/components/Footer.tsx
index ab4ce83a4..8505147a3 100644
--- a/frontend/components/Footer.tsx
+++ b/frontend/components/Footer.tsx
@@ -1,14 +1,13 @@
-import { Typography } from "antd";
+import { Space, Typography } from "antd";
 import paths from "../paths";
 
 export default function Footer() {
   return (
-    <>
-      <Typography.Link href={paths.legalNotice}>Legal Notice</Typography.Link>{" "}
-      &middot;{" "}
+    <Space size="large">
+      <Typography.Link href={paths.legalNotice}>Legal Notice</Typography.Link>
       <Typography.Link href={paths.dataProtectionInformation}>
         Data Protection Information
       </Typography.Link>
-    </>
+    </Space>
   );
 }
diff --git a/frontend/components/Highlight.tsx b/frontend/components/Highlight.tsx
index b80fe130e..62a1b23e2 100644
--- a/frontend/components/Highlight.tsx
+++ b/frontend/components/Highlight.tsx
@@ -4,9 +4,9 @@ import Highlighter from "react-highlight-words";
 interface HighlightProps {
   text: string | null | undefined;
   snippet: string | null | undefined;
-};
+}
 
-export const Highlight = forwardRef<Highlighter, HighlightProps>(
+const Highlight = forwardRef<Highlighter, HighlightProps>(
   ({ text, snippet }, ref) => (
     <Highlighter
       ref={ref}
@@ -17,3 +17,5 @@ export const Highlight = forwardRef<Highlighter, HighlightProps>(
     />
   ),
 );
+
+export default Highlight;
diff --git a/frontend/components/Iconize.tsx b/frontend/components/Iconize.tsx
new file mode 100644
index 000000000..11e394fc6
--- /dev/null
+++ b/frontend/components/Iconize.tsx
@@ -0,0 +1,16 @@
+import { Space } from "antd";
+
+export const Iconize = ({
+  icon,
+  children,
+}: {
+  icon: React.ReactNode;
+  children: React.ReactNode;
+}) => {
+  return (
+    <Space size={4}>
+      {icon}
+      {children}
+    </Space>
+  );
+};
diff --git a/frontend/components/IdentifierItem.tsx b/frontend/components/IdentifierItem.tsx
new file mode 100644
index 000000000..45ca2e9f8
--- /dev/null
+++ b/frontend/components/IdentifierItem.tsx
@@ -0,0 +1,95 @@
+import { Typography } from "antd";
+import Icon, { BarcodeOutlined, GlobalOutlined } from "@ant-design/icons";
+import { CustomIconComponentProps } from "@ant-design/icons/lib/components/Icon";
+import { Iconize } from "./Iconize";
+import { addPrefix, removePrefix } from "../lib/string";
+import CopyButton from "./CopyButton";
+
+const ArXivSvg = () => (
+  <svg width="1em" height="1em" fill="currentColor" viewBox="0 0 24 24">
+    <path d="M12.4 12.8L18.4 2H22L14.2 13.8L22 22H18.4L12.4 14.8L6.4 22H2.8L10.6 11.2L2.8 2H6.4L12.4 12.8Z" />
+  </svg>
+);
+
+const DoiSvg = () => (
+  <svg width="1em" height="1em" fill="currentColor" viewBox="0 0 24 24">
+    <path d="M12 0C5.373 0 0 5.373 0 12s5.373 12 12 12 12-5.373 12-12S18.627 0 12 0zm0 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2zm-1.8 14.2h1.6V7.8h-1.6v8.4zm4.8-4.2c0 2.319-1.881 4.2-4.2 4.2h-.4v-1.6h.4c1.436 0 2.6-1.164 2.6-2.6s-1.164-2.6-2.6-2.6h-.4V7.8h.4c2.319 0 4.2 1.881 4.2 4.2z" />
+  </svg>
+);
+
+export const ArXivIcon = (props: Partial<CustomIconComponentProps>) => (
+  <Icon component={ArXivSvg} {...props} />
+);
+export const DoiIcon = (props: Partial<CustomIconComponentProps>) => (
+  <Icon component={DoiSvg} {...props} />
+);
+
+const IDENTIFIER_CONFIG = {
+  arXiv: {
+    label: null,
+    prefix: "arXiv:",
+    icon: <ArXivIcon style={{ color: "#b31b1b" }} />,
+    url: ({ valueWithoutPrefix }: { valueWithoutPrefix: string }) =>
+      `https://arxiv.org/abs/${valueWithoutPrefix}`,
+  },
+  doi: {
+    label: null,
+    prefix: "doi:",
+    icon: <DoiIcon style={{ color: "#ff6600" }} />,
+    url: ({ valueWithoutPrefix }: { valueWithoutPrefix: string }) =>
+      `https://doi.org/${valueWithoutPrefix}`,
+  },
+  urn: {
+    label: null,
+    prefix: "urn:",
+    icon: <BarcodeOutlined style={{ color: "#1890ff" }} />,
+    url: ({
+      valueWithPrefix,
+      valueWithoutPrefix,
+    }: {
+      valueWithPrefix: string;
+      valueWithoutPrefix: string;
+    }) => {
+      if (valueWithPrefix.startsWith("urn:isbn:")) {
+        return `https://isbnsearch.org/isbn/${removePrefix(valueWithoutPrefix, "isbn:")}`;
+      }
+      if (valueWithPrefix.startsWith("urn:issn:")) {
+        return `https://urn.issn.org/${valueWithPrefix}`;
+      }
+      if (valueWithPrefix.startsWith("urn:nbn:")) {
+        return `https://nbn-resolving.org/${valueWithPrefix}`;
+      }
+      return `https://www.ecosia.org/search?q=${valueWithPrefix}`;
+    },
+  },
+  webAddress: {
+    label: "Web",
+    prefix: "https://",
+    icon: <GlobalOutlined />,
+    url: ({ value }: { value: string }) => value,
+  },
+};
+
+export default function IdentifierItem({
+  type,
+  value,
+}: {
+  type: keyof typeof IDENTIFIER_CONFIG;
+  value: string;
+}) {
+  const config = IDENTIFIER_CONFIG[type];
+  const valueWithoutPrefix = removePrefix(value, config.prefix);
+  const valueWithPrefix = addPrefix(value, config.prefix);
+  const href = config.url({ value, valueWithPrefix, valueWithoutPrefix });
+
+  return (
+    <span>
+      <Typography.Link href={href} target="_blank">
+        <Iconize icon={config.icon}>
+          {config.label ? config.label : valueWithPrefix}
+        </Iconize>
+      </Typography.Link>
+      <CopyButton onlyIcon getText={() => value} />
+    </span>
+  );
+}
diff --git a/frontend/components/InlineList.tsx b/frontend/components/InlineList.tsx
new file mode 100644
index 000000000..0063081c6
--- /dev/null
+++ b/frontend/components/InlineList.tsx
@@ -0,0 +1,22 @@
+export default function InlineList<TItem>({
+  items,
+  renderItem,
+}: {
+  items: readonly TItem[];
+  renderItem: (item: TItem, index: number) => React.ReactNode;
+}) {
+  return (
+    <>
+      <style>{`
+        .inline-list {
+          & > *:not(:last-child)::after { content: ", "; }
+          & > *:first-child:nth-last-child(2)::after { content: " and "; }
+          & > *:nth-last-child(2):not(:first-child)::after { content: ", and "; }
+        }
+      `}</style>
+      <span className="inline-list">
+        {items.map((item, index) => renderItem(item, index))}
+      </span>
+    </>
+  );
+}
diff --git a/frontend/components/JsonViewer.tsx b/frontend/components/JsonViewer.tsx
index 6f51f4469..ce8559e94 100644
--- a/frontend/components/JsonViewer.tsx
+++ b/frontend/components/JsonViewer.tsx
@@ -1,19 +1,37 @@
+import { Tooltip } from "antd";
+import Copyable from "./Copyable";
 import CopyableBlock from "./CopyableBlock";
 
-export default function JsonViewer({ jsonData }: { jsonData: any }) {
-  const jsonString = JSON.stringify(jsonData, null, 2);
-
-  return (
-    <CopyableBlock text={jsonString}>
-      <pre
-        style={{
-          overflow: "auto",
-        }}
-      >
-        <code style={{ whiteSpace: "pre-wrap", wordWrap: "break-word" }}>
-          {jsonString}
-        </code>
-      </pre>
-    </CopyableBlock>
-  );
+export default function JsonViewer({
+  data,
+  inline = false,
+}: {
+  data: object;
+  inline?: boolean;
+}) {
+  if (inline) {
+    const jsonString = JSON.stringify(data);
+    return (
+      <Copyable onlyIcon text={jsonString}>
+        <Tooltip title={<JsonViewer data={data} />}>
+          <code>{jsonString}</code>
+        </Tooltip>
+      </Copyable>
+    );
+  } else {
+    const jsonString = JSON.stringify(data, null, 2);
+    return (
+      <CopyableBlock text={jsonString}>
+        <pre
+          style={{
+            overflow: "auto",
+          }}
+        >
+          <code style={{ whiteSpace: "pre-wrap", wordWrap: "break-word" }}>
+            {jsonString}
+          </code>
+        </pre>
+      </CopyableBlock>
+    );
+  }
 }
diff --git a/frontend/components/JumpToId.tsx b/frontend/components/JumpToId.tsx
new file mode 100644
index 000000000..71041df52
--- /dev/null
+++ b/frontend/components/JumpToId.tsx
@@ -0,0 +1,47 @@
+import { useState } from "react";
+import { Button, Input, Space } from "antd";
+import { useRouter } from "next/router";
+import { Scalars } from "../__generated__/graphql";
+import { Route } from "next";
+import PaginatedIdSelect, { PaginatedSelectProps } from "./PaginatedIdSelect";
+
+export type JumpToIdProps = {
+  query?: PaginatedSelectProps["query"];
+  route: (id: Scalars["Uuid"]["output"]) => Route;
+};
+
+export default function JumpToId({ query, route }: JumpToIdProps) {
+  const router = useRouter();
+  const [id, setId] = useState("");
+
+  const handleJump = () => {
+    if (id) {
+      router.push(route(id));
+    }
+  };
+
+  return (
+    <Space.Compact>
+      {/* 36 characters is what a UUID of the form "ffffffff-ffff-ffff-ffff-ffffffffffff" has */}
+      {query ? (
+        <PaginatedIdSelect
+          value={id}
+          query={query}
+          style={{ minWidth: "66ch" }}
+          onChange={setId}
+        />
+      ) : (
+        <Input
+          placeholder="ID"
+          style={{ fontFamily: "monospace", width: "66ch" }}
+          maxLength={36}
+          value={id}
+          onChange={(e) => setId(e.target.value)}
+        />
+      )}
+      <Button type="primary" onClick={handleJump}>
+        Jump to Page
+      </Button>
+    </Space.Compact>
+  );
+}
diff --git a/frontend/components/Layout.tsx b/frontend/components/Layout.tsx
index aedbfe195..8b20d326c 100644
--- a/frontend/components/Layout.tsx
+++ b/frontend/components/Layout.tsx
@@ -2,7 +2,7 @@ import Head from "next/head";
 import { ReactNode, useEffect } from "react";
 import Footer from "./Footer";
 import NavBar from "./NavBar";
-import { Layout as AntLayout, App, Typography } from "antd";
+import { Layout as AntLayout, App, Flex, Typography } from "antd";
 import paths from "../paths";
 import { useCookies } from "react-cookie";
 
@@ -16,27 +16,27 @@ const navItems = [
     label: "Data",
     subitems: [
       {
-        path: paths.calorimetricData,
+        path: paths.allCalorimetricData,
         label: "Calorimetric Data",
       },
       {
-        path: paths.geometricData,
+        path: paths.allGeometricData,
         label: "Geometric Data",
       },
       {
-        path: paths.hygrothermalData,
+        path: paths.allHygrothermalData,
         label: "Hygrothermal Data",
       },
       {
-        path: paths.lifeCycleData,
+        path: paths.allLifeCycleData,
         label: "Life-Cycle Data",
       },
       {
-        path: paths.opticalData,
+        path: paths.allOpticalData,
         label: "Optical Data",
       },
       {
-        path: paths.photovoltaicData,
+        path: paths.allPhotovoltaicData,
         label: "Photovoltaic Data",
       },
     ],
@@ -75,7 +75,7 @@ const navItems = [
 
 interface LayoutProps {
   children?: ReactNode;
-};
+}
 
 const cookieConsentName = "consent";
 const cookieConsentValue = "yes";
@@ -93,7 +93,7 @@ export default function Layout({ children }: LayoutProps) {
       modal.info({
         title: "Cookie Consent",
         content: (
-          <Typography.Paragraph>
+          <Typography.Paragraph style={{ maxWidth: "75ch" }}>
             This website employs cookies to make it work securely. As these
             cookies are essential you need to agree to their usage to use this
             website.
@@ -115,13 +115,30 @@ export default function Layout({ children }: LayoutProps) {
         <meta charSet="utf-8" />
       </Head>
       <AntLayout.Header>
-        <NavBar items={navItems} />
+        <Flex justify="center">
+          <NavBar
+            items={navItems}
+            style={{
+              width: "100%",
+              maxWidth: 1024,
+            }}
+          />
+        </Flex>
       </AntLayout.Header>
-      <AntLayout.Content style={{ padding: "50px" }}>
-        {children}
+      <AntLayout.Content
+        style={{
+          paddingTop: "24px",
+          paddingBottom: "24px",
+        }}
+      >
+        <Flex justify="center">
+          <div style={{ width: "100%", maxWidth: 1024 }}>{children}</div>
+        </Flex>
       </AntLayout.Content>
       <AntLayout.Footer>
-        <Footer />
+        <Flex justify="center">
+          <Footer />
+        </Flex>
       </AntLayout.Footer>
     </AntLayout>
   );
diff --git a/frontend/components/LazyTabs.tsx b/frontend/components/LazyTabs.tsx
new file mode 100644
index 000000000..e9b4eac29
--- /dev/null
+++ b/frontend/components/LazyTabs.tsx
@@ -0,0 +1,77 @@
+import React, { useState, useMemo } from "react";
+import { GetProp, Tabs, TabsProps } from "antd";
+import TabLabel from "./TabLabel";
+
+type TabItem = GetProp<TabsProps, "items">[number];
+
+type TabItemWithCount = TabItem & {
+  count?: number;
+};
+
+export type LazyTabsProps = Omit<TabsProps, "items"> & {
+  items?: TabItemWithCount[];
+};
+
+/**
+ * Internal wrapper that tracks if a tab has ever been "active".
+ * Once initialized, it stays mounted.
+ */
+const LazyWrapper: React.FC<{ active: boolean; children: React.ReactNode }> = ({
+  active,
+  children,
+}) => {
+  const [initialized, setInitialized] = useState(false);
+
+  if (active && !initialized) {
+    setInitialized(true);
+  }
+  if (!initialized) return null;
+  return <>{children}</>;
+};
+
+/**
+ * Reusable LazyTabs Component
+ * Extends standard Ant Design TabsProps
+ */
+export default function LazyTabs({ items, onChange, ...props }: LazyTabsProps) {
+  const [activeKey, setActiveKey] = useState<string>(() => {
+    return (
+      props.activeKey ||
+      props.defaultActiveKey ||
+      (items?.filter((item) => item.count && item.count > 0)?.[0]
+        ?.key as string) ||
+      (items?.[0].key as string)
+    );
+  });
+
+  const handleTabChange = (key: string) => {
+    setActiveKey(key);
+    onChange?.(key);
+  };
+
+  const lazyItems = useMemo(() => {
+    return items?.map((item) => ({
+      ...item,
+      label:
+        item.count === undefined ? (
+          item.label
+        ) : (
+          <TabLabel name={item.label} count={item.count} />
+        ),
+      children: (
+        <LazyWrapper active={activeKey === item.key}>
+          {item.children}
+        </LazyWrapper>
+      ),
+    }));
+  }, [items, activeKey]);
+
+  return (
+    <Tabs
+      {...props}
+      activeKey={activeKey}
+      items={lazyItems}
+      onChange={handleTabChange}
+    />
+  );
+}
diff --git a/frontend/components/Manager.tsx b/frontend/components/Manager.tsx
index 6e0ee7b8f..5408cfa8a 100644
--- a/frontend/components/Manager.tsx
+++ b/frontend/components/Manager.tsx
@@ -1,7 +1,6 @@
-import Link from "next/link";
 import { Scalars } from "../__generated__/graphql";
 import paths from "../paths";
-import { Tooltip } from "antd";
+import EntityLink from "./entities/EntityLink";
 
 export default function Manager({
   data,
@@ -12,11 +11,8 @@ export default function Manager({
   };
 }) {
   return (
-    <div>
-      Managed by{" "}
-      <Tooltip title={data.uuid}>
-        <Link href={paths.institution(data.uuid)}>{data.name}</Link>
-      </Tooltip>
-    </div>
+    <>
+      Managed by <EntityLink entity={data} route={paths.institution} />
+    </>
   );
 }
diff --git a/frontend/components/NavBar.tsx b/frontend/components/NavBar.tsx
index 77d23085a..160a3af9c 100644
--- a/frontend/components/NavBar.tsx
+++ b/frontend/components/NavBar.tsx
@@ -2,11 +2,79 @@ import { useQuery } from "@apollo/client/react";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import { Menu, Button, Spin } from "antd";
-import { CurrentUserDocument } from "../queries/currentUser.generated";
+import {
+  CurrentUserDocument,
+  CurrentUserPartialFragment,
+} from "../queries/currentUser.generated";
 import paths from "../paths";
 import { extractAntiforgeryTokenFromCookie } from "../lib/apollo";
 import { UserOutlined, LoadingOutlined } from "@ant-design/icons";
 import type { Route } from "next";
+import { isTruthy } from "../lib/array";
+import { CSSProperties, useMemo } from "react";
+
+const userLoadingItem = {
+  key: paths.openIdConnect,
+  style: { marginLeft: "auto" },
+  label: (
+    <Spin indicator={<LoadingOutlined style={{ color: "white" }} spin />} />
+  ),
+};
+
+const loginOrRegisterItems = [
+  {
+    key: paths.openIdConnectClientLogin,
+    style: { marginLeft: "auto" },
+    label: <Link href={paths.openIdConnectClientLogin}>Login</Link>,
+  },
+  {
+    key: paths.userRegister,
+    label: <Link href={paths.userRegister}>Register</Link>,
+  },
+];
+
+const userItems = (currentUser: CurrentUserPartialFragment) =>
+  [
+    currentUser?.isAuthorizedToManageOpenIdConnect && {
+      key: paths.openIdConnect,
+      label: <Link href={paths.openIdConnect}>OpenId Connect</Link>,
+    },
+    {
+      key: paths.me.manage.home,
+      label: currentUser.name,
+      icon: <UserOutlined />,
+      style: { marginLeft: "auto" },
+      children: [
+        {
+          key: paths.user(currentUser.uuid),
+          label: <Link href={paths.user(currentUser.uuid)}>Profile</Link>,
+        },
+        {
+          key: paths.me.manage.profile,
+          label: <Link href={paths.me.manage.profile}>Account</Link>,
+        },
+        {
+          key: paths.openIdConnectClientLogout,
+          label: (
+            <form action={paths.openIdConnectClientLogout} method="post">
+              <input
+                name="__RequestVerificationToken"
+                type="hidden"
+                value={
+                  typeof window !== "undefined"
+                    ? (extractAntiforgeryTokenFromCookie() ?? "")
+                    : ""
+                }
+              />
+              <Button type="primary" htmlType="submit">
+                Logout
+              </Button>
+            </form>
+          ),
+        },
+      ],
+    },
+  ].filter(isTruthy);
 
 type NavItemProps =
   | {
@@ -18,89 +86,51 @@ type NavItemProps =
 
 interface NavBarProps {
   items: NavItemProps[];
+  style?: CSSProperties;
 }
 
-export default function NavBar({ items }: NavBarProps) {
+export default function NavBar({ items, style }: NavBarProps) {
   const router = useRouter();
   const { loading, data } = useQuery(CurrentUserDocument);
   const currentUser = data?.currentUser;
 
+  const mainItems = useMemo(
+    () =>
+      items.map((item) =>
+        item.subitems === null
+          ? {
+              key: item.path,
+              label: <Link href={item.path}>{item.label}</Link>,
+            }
+          : {
+              key: item.label,
+              label: item.label,
+              children: item.subitems.map((subitem) => ({
+                key: subitem.path,
+                label: <Link href={subitem.path}>{subitem.label}</Link>,
+              })),
+            },
+      ),
+    [items],
+  );
+
+  const userOrLoginItems = useMemo(
+    () =>
+      loading
+        ? [userLoadingItem]
+        : currentUser
+          ? userItems(currentUser)
+          : loginOrRegisterItems,
+    [loading, userLoadingItem, currentUser, loginOrRegisterItems],
+  );
+
   return (
-    <>
-      <Menu mode="horizontal" selectedKeys={[router.pathname]} theme="dark">
-        {items.map((item) =>
-          item.subitems === null ? (
-            <Menu.Item key={item.path}>
-              <Link href={item.path}>{item.label}</Link>
-            </Menu.Item>
-          ) : (
-            // TODO find a better key
-            <Menu.SubMenu title={item.label} key={item.label}>
-              {item.subitems.map((subitem) => (
-                <Menu.Item key={subitem.path}>
-                  <Link href={subitem.path}>{subitem.label}</Link>
-                </Menu.Item>
-              ))}
-            </Menu.SubMenu>
-          ),
-        )}
-        {loading ? (
-          <Menu.Item style={{ marginLeft: "auto" }}>
-            <Spin
-              indicator={<LoadingOutlined style={{ color: "white" }} spin />}
-            />
-          </Menu.Item>
-        ) : currentUser ? (
-          <>
-            {currentUser?.isAuthorizedToManageOpenIdConnect && (
-              <Menu.Item key={paths.openIdConnect}>
-                <Link href={paths.openIdConnect}>OpenId Connect</Link>
-              </Menu.Item>
-            )}
-            <Menu.SubMenu
-              title={currentUser.name}
-              key={paths.me.manage.home}
-              icon={<UserOutlined />}
-              style={{ marginLeft: "auto" }}
-            >
-              <Menu.Item key={paths.user(currentUser.uuid)}>
-                <Link href={paths.user(currentUser.uuid)}>Profile</Link>
-              </Menu.Item>
-              <Menu.Item key={paths.me.manage.profile}>
-                <Link href={paths.me.manage.profile}>Account</Link>
-              </Menu.Item>
-              <Menu.Item key={paths.openIdConnectClientLogout}>
-                <form action={paths.openIdConnectClientLogout} method="post">
-                  <input
-                    name="__RequestVerificationToken"
-                    type="hidden"
-                    value={
-                      typeof window !== "undefined"
-                        ? (extractAntiforgeryTokenFromCookie() ?? "")
-                        : ""
-                    }
-                  />
-                  <Button type="primary" htmlType="submit">
-                    Logout
-                  </Button>
-                </form>
-              </Menu.Item>
-            </Menu.SubMenu>
-          </>
-        ) : (
-          <>
-            <Menu.Item
-              key={paths.openIdConnectClientLogin}
-              style={{ marginLeft: "auto" }}
-            >
-              <Link href={paths.openIdConnectClientLogin}>Login</Link>
-            </Menu.Item>
-            <Menu.Item key={paths.userRegister}>
-              <Link href={paths.userRegister}>Register</Link>
-            </Menu.Item>
-          </>
-        )}
-      </Menu>
-    </>
+    <Menu
+      mode="horizontal"
+      theme="dark"
+      selectedKeys={[router.pathname]}
+      style={style}
+      items={[...mainItems, ...userOrLoginItems]}
+    />
   );
 }
diff --git a/frontend/components/OpenEndedDateTimeRangeX.tsx b/frontend/components/OpenEndedDateTimeRangeX.tsx
index d26be9181..f2239975d 100644
--- a/frontend/components/OpenEndedDateTimeRangeX.tsx
+++ b/frontend/components/OpenEndedDateTimeRangeX.tsx
@@ -1,6 +1,7 @@
 import { Typography } from "antd";
 import dayjs from "dayjs";
 import { OpenEndedDateTimeRange } from "../__generated__/graphql";
+import { isTruthy } from "../lib/array";
 
 interface OpenEndedDateTimeRangeProps {
   range: OpenEndedDateTimeRange;
@@ -11,12 +12,13 @@ export default function OpenEndedDateTimeRangeX({
 }: OpenEndedDateTimeRangeProps) {
   return (
     <Typography.Text>
-      from{" "}
-      {range.from == null
-        ? "beginning of time"
-        : dayjs(range.from).format("DD/MM/YYYY")}{" "}
-      to{" "}
-      {range.to == null ? "end of time" : dayjs(range.to).format("DD/MM/YYYY")}
+      {[
+        range.from == null && range.to == null && "unrestricted",
+        range.from != null && `from ${dayjs(range.from).format("DD/MM/YYYY")}`,
+        range.to != null && `to ${dayjs(range.to).format("DD/MM/YYYY")}`,
+      ]
+        .filter(isTruthy)
+        .join(" ")}
     </Typography.Text>
   );
 }
diff --git a/frontend/components/PageHeader.tsx b/frontend/components/PageHeader.tsx
deleted file mode 100644
index 935207813..000000000
--- a/frontend/components/PageHeader.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Breadcrumb, Button, Space, Typography } from "antd";
-import { ArrowLeftOutlined } from "@ant-design/icons";
-import { Scalars } from "../__generated__/graphql";
-import Copyable from "./Copyable";
-import Id from "./Id";
-
-const { Title, Text } = Typography;
-
-interface Props {
-  id?: Scalars["Uuid"]["output"];
-  title: string;
-  subTitle?: string;
-  tags?: React.ReactNode[];
-  onBack?: () => void;
-  extra?: React.ReactNode;
-  breadcrumb?: { title: string; href?: string }[];
-  children?: React.ReactNode;
-}
-
-export default function PageHeader({
-  id,
-  title,
-  subTitle,
-  tags,
-  onBack,
-  extra,
-  breadcrumb,
-  children,
-}: Props) {
-  return (
-    <>
-      {breadcrumb && (
-        <Breadcrumb
-          items={breadcrumb.map((item) => ({
-            title: item.title,
-            href: item.href,
-          }))}
-          style={{ marginBottom: 12 }}
-        />
-      )}
-
-      <div
-        style={{
-          display: "flex",
-          justifyContent: "space-between",
-          alignItems: "flex-start",
-        }}
-      >
-        {onBack && (
-          <Button
-            type="text"
-            icon={<ArrowLeftOutlined />}
-            onClick={onBack}
-            style={{ marginLeft: -12 }}
-          />
-        )}
-        <div>
-          {id && (
-            <div>
-              <Copyable text={id}>
-                <Id value={id} />
-              </Copyable>
-            </div>
-          )}
-          <Space>
-            <Title level={4} style={{ margin: 0 }}>
-              {title}
-            </Title>
-            {tags && <Space>{tags}</Space>}
-          </Space>
-          {subTitle && (
-            <Text type="secondary" style={{ display: "block", marginTop: 4 }}>
-              {subTitle}
-            </Text>
-          )}
-        </div>
-        <Space wrap>{extra}</Space>
-      </div>
-
-      {children && <div style={{ marginTop: 16 }}>{children}</div>}
-    </>
-  );
-}
diff --git a/frontend/components/PaginatedIdSelect.tsx b/frontend/components/PaginatedIdSelect.tsx
new file mode 100644
index 000000000..4b4c34621
--- /dev/null
+++ b/frontend/components/PaginatedIdSelect.tsx
@@ -0,0 +1,162 @@
+import React, { useState } from "react";
+import { Select, Space, Spin } from "antd";
+import { useQuery } from "@apollo/client/react";
+import { useDebounce } from "../lib/hooks/useDebounce";
+import { Scalars, SortEnumType } from "../__generated__/graphql";
+import { TypedDocumentNode } from "@apollo/client";
+import { isUuid, notEmpty } from "../lib/string";
+import { isTruthy } from "../lib/array";
+import Id from "./Id";
+
+// Inspired by https://ant.design/components/select/#components-select-demo-select-users
+
+interface PageInfo {
+  endCursor: string | null;
+  hasNextPage: boolean;
+}
+
+interface Item {
+  uuid: Scalars["Uuid"]["output"];
+  name: string;
+}
+
+interface ItemsData {
+  connection: {
+    edges: { node: Item }[];
+    pageInfo: PageInfo;
+  };
+}
+
+interface ItemsVariables {
+  first: number;
+  after?: string | null;
+  where?: { or?: { id?: { equalTo: any }; name?: { contains: any } }[] };
+  order?: { name?: SortEnumType };
+}
+
+interface BaseProps {
+  query: TypedDocumentNode<any, ItemsVariables>;
+  value?: string;
+  style?: React.CSSProperties;
+  onChange?: (value: string) => void;
+}
+
+interface SingleProps extends BaseProps {
+  mode?: undefined;
+}
+
+interface MultiProps extends BaseProps {
+  mode: "multiple" | "tags";
+}
+
+export type PaginatedSelectProps = SingleProps | MultiProps;
+
+const order = {
+  name: SortEnumType.Asc,
+};
+
+export default function PaginatedIdSelect({
+  query,
+  mode,
+  value,
+  style = { width: "100%" },
+  onChange,
+}: PaginatedSelectProps) {
+  const [search, setSearch] = useState<string>("");
+  const pageSize = 10;
+
+  const filters = [
+    isUuid(search) && { id: { equalTo: search } },
+    notEmpty(search) && { name: { contains: search } },
+  ].filter(isTruthy);
+  const where = filters.length > 0 ? { or: filters } : undefined;
+
+  const { data, loading, fetchMore, refetch } = useQuery<
+    ItemsData,
+    ItemsVariables
+  >(query, {
+    variables: {
+      first: pageSize,
+      after: null,
+      where: where,
+      order: order,
+    },
+  });
+
+  const { edges, pageInfo } = data?.connection || {
+    edges: [],
+    pageInfo: { hasNextPage: false, endCursor: null },
+  };
+
+  const handleSearch = useDebounce((value: string) => {
+    setSearch(value);
+    refetch({
+      first: pageSize,
+      after: null,
+      where: where,
+      order: order,
+    });
+  }, 500);
+
+  const handleScroll = (e: React.UIEvent<HTMLDivElement>) => {
+    const { scrollTop, scrollHeight, clientHeight } = e.currentTarget;
+    const isBottom = scrollHeight - scrollTop <= clientHeight + 10;
+
+    if (isBottom && !loading && pageInfo?.hasNextPage) {
+      fetchMore({
+        variables: {
+          first: pageSize,
+          after: pageInfo.endCursor,
+          where: where,
+          order: order,
+        },
+      });
+    }
+  };
+
+  return (
+    <Select
+      popupMatchSelectWidth={false}
+      mode={mode}
+      value={value}
+      onChange={onChange}
+      showSearch={{
+        filterOption: false,
+        onSearch: handleSearch,
+      }}
+      allowClear
+      placeholder="Search by name or paste ID..."
+      onPopupScroll={handleScroll}
+      onClear={() => {
+        setSearch("");
+        refetch({
+          after: null,
+          first: pageSize,
+        });
+      }}
+      loading={loading}
+      options={edges?.map(({ node }) => ({
+        label: (
+          <Space>
+            {node.name} (<Id value={node.uuid} />)
+          </Space>
+        ),
+        value: node.uuid,
+      }))}
+      maxTagCount="responsive"
+      // 36 characters is what a UUID of the form "ffffffff-ffff-ffff-ffff-ffffffffffff" has
+      style={style}
+      notFoundContent={loading ? <Spin size="small" /> : "No data found"}
+      popupRender={(menu) => (
+        <>
+          {menu}
+          {loading && pageInfo?.hasNextPage && (
+            <div style={{ padding: "8px", textAlign: "center" }}>
+              <Spin size="small" description="Loading more..." />
+            </div>
+          )}
+        </>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/Pagination.tsx b/frontend/components/Pagination.tsx
new file mode 100644
index 000000000..f2edb7d0c
--- /dev/null
+++ b/frontend/components/Pagination.tsx
@@ -0,0 +1,62 @@
+import { Space, Button, Select, Tooltip } from "antd";
+import { LeftOutlined, RightOutlined } from "@ant-design/icons";
+
+export const initialPageSize = 10;
+
+const pageSizeOptions = [3, initialPageSize, 20, 50, 100].map((size) => ({
+  label: `${size} per page`,
+  value: size,
+}));
+
+export interface PaginationProps {
+  current: number;
+  total: number;
+  pageSize: number;
+  hasPrevious: boolean;
+  hasNext: boolean;
+  onPrevious: () => void;
+  onNext: () => void;
+  onPageSizeChange: (size: number) => void;
+}
+
+export default function Pagination({
+  current,
+  total,
+  pageSize,
+  onPrevious,
+  hasPrevious,
+  onNext,
+  hasNext,
+  onPageSizeChange,
+}: PaginationProps) {
+  return (
+    <Space style={{ display: "flex", justifyContent: "flex-end" }}>
+      <Tooltip title="Previous">
+        <Button
+          onClick={onPrevious}
+          disabled={!hasPrevious}
+          type="text"
+          icon={<LeftOutlined />}
+        />
+      </Tooltip>
+      <span>
+        Page {current} of {total}
+      </span>
+      <Tooltip title="Next">
+        <Button
+          onClick={onNext}
+          disabled={!hasNext}
+          type="text"
+          icon={<RightOutlined />}
+        />
+      </Tooltip>
+      <Select
+        options={pageSizeOptions}
+        defaultValue={pageSize}
+        onChange={onPageSizeChange}
+        showSearch
+        style={{ width: "max-content" }}
+      />
+    </Space>
+  );
+}
diff --git a/frontend/components/QueryToolbar.tsx b/frontend/components/QueryToolbar.tsx
new file mode 100644
index 000000000..0ca5f6f24
--- /dev/null
+++ b/frontend/components/QueryToolbar.tsx
@@ -0,0 +1,47 @@
+import { Button, Space } from "antd";
+import { RocketOutlined } from "@ant-design/icons";
+import { print } from "graphql";
+import { TypedDocumentNode } from "@apollo/client";
+import CopyButton from "./CopyButton";
+
+export default function QueryToolbar<TVariables>({
+  query,
+  variables,
+}: {
+  query: TypedDocumentNode<any, TVariables>;
+  variables?: TVariables | null;
+}) {
+  const openInNitro = () => {
+    const nitroUrl = new URL("/graphql/", window.location.origin);
+    // const minifiedQuery = print(query)
+    //   .replace(/#.*$/gm, "")
+    //   .replace(/\s+/g, " ")
+    //   .trim();
+    // nitroUrl.searchParams.set("query", minifiedQuery);
+    // if (variables != null) {
+    //   nitroUrl.searchParams.set("variables", JSON.stringify(variables));
+    // }
+    window.open(nitroUrl.toString(), "_blank");
+  };
+
+  return (
+    <Space>
+      GraphQL
+      <CopyButton type="default" size="medium" getText={() => print(query)}>
+        Copy Query
+      </CopyButton>
+      {variables && (
+        <CopyButton
+          type="default"
+          size="medium"
+          getText={() => JSON.stringify(variables)}
+        >
+          Copy Variables
+        </CopyButton>
+      )}
+      <Button type="link" icon={<RocketOutlined />} onClick={openInNitro}>
+        Open Explorer
+      </Button>
+    </Space>
+  );
+}
diff --git a/frontend/components/Reference.tsx b/frontend/components/Reference.tsx
index 87d460ddd..1cf20ffff 100644
--- a/frontend/components/Reference.tsx
+++ b/frontend/components/Reference.tsx
@@ -1,51 +1,124 @@
-import { Descriptions, Typography } from "antd";
-import { Publication, Standard } from "../__generated__/graphql";
+import { Space, Typography } from "antd";
+import {
+  GlobalOutlined,
+  BookOutlined,
+  SafetyCertificateOutlined,
+} from "@ant-design/icons";
+import { Iconize } from "./Iconize";
+import { isTruthy } from "../lib/array";
+import { ReactNode } from "react";
+import { Fragment } from "react/jsx-runtime";
+import IdentifierItem from "./IdentifierItem";
+import { ReferencePartialFragment } from "../queries/common.generated";
 
-interface ReferenceProps {
-  reference?: Publication | Standard | null;
+const joinWithCopyableSpace = (
+  nodes: ReactNode[],
+  separator: string = " ",
+): ReactNode => {
+  return nodes.reduce((acc, curr, index) => {
+    if (index === 0) return [curr];
+    return [
+      ...(acc as ReactNode[]),
+      <Fragment key={index}>{separator}</Fragment>,
+      curr,
+    ];
+  }, [] as ReactNode[]);
 };
 
-export function Reference({ reference }: ReferenceProps) {
-  return reference == null ? (
-    <Typography.Text>None</Typography.Text>
-  ) : (
-    <Descriptions column={1}>
-      <>
-        <Descriptions.Item label="Title">{reference?.title}</Descriptions.Item>
-        <Descriptions.Item label="Abstract">
-          {reference?.abstract}
-        </Descriptions.Item>
-        <Descriptions.Item label="Section">
-          {reference?.section}
-        </Descriptions.Item>
-      </>
-      {reference.__typename === "Standard" && (
-        <>
-          <Descriptions.Item label="Numeration">{`${reference.numeration.prefix} ${reference.numeration.mainNumber} ${reference.numeration.suffix}`}</Descriptions.Item>
-          <Descriptions.Item label="Year">{reference.year}</Descriptions.Item>
-          <Descriptions.Item label="Locator">
-            <Typography.Link href={reference.locator}>
-              {reference.locator}
-            </Typography.Link>
-          </Descriptions.Item>
-          <Descriptions.Item label="Standardizers">
-            {reference.standardizers.join(", ")}
-          </Descriptions.Item>
-        </>
-      )}
-      {reference.__typename === "Publication" && (
-        <>
-          <Descriptions.Item label="arXiv">{reference.arXiv}</Descriptions.Item>
-          <Descriptions.Item label="DOI">{reference.doi}</Descriptions.Item>
-          <Descriptions.Item label="URN">{reference.urn}</Descriptions.Item>
-          <Descriptions.Item label="Web Address">
-            {reference.webAddress}
-          </Descriptions.Item>
-          <Descriptions.Item label="Authors">
-            {reference.authors?.join(", ")}
-          </Descriptions.Item>
-        </>
+interface ReferenceProps {
+  data: ReferencePartialFragment;
+}
+
+export function Reference({ data }: ReferenceProps) {
+  const Icon =
+    data.__typename === "Standard" ? SafetyCertificateOutlined : BookOutlined;
+
+  return (
+    <div>
+      <Iconize icon={<Icon />}>{data.__typename}</Iconize>{" "}
+      <span>
+        {data.__typename === "Publication" &&
+          joinWithCopyableSpace(
+            [
+              data.authors && data.authors.length > 0 && (
+                <Typography.Text strong key="authors">
+                  {data.authors.join(", ")}
+                </Typography.Text>
+              ),
+              data.title && (
+                <Typography.Text key="title" italic style={{ marginLeft: 4 }}>
+                  {data.title},
+                </Typography.Text>
+              ),
+              data.section && (
+                <span key="section">
+                  Section{" "}
+                  <Typography.Text italic>{data.section}</Typography.Text>.
+                </span>
+              ),
+              (data.arXiv || data.doi || data.urn || data.webAddress) && (
+                <Space wrap size="small" key="identifier">
+                  {(["arXiv", "doi", "urn", "webAddress"] as const)
+                    .map(
+                      (key) =>
+                        data[key] && (
+                          <IdentifierItem
+                            key={key}
+                            type={key}
+                            value={data[key]}
+                          />
+                        ),
+                    )
+                    .filter(isTruthy)}
+                </Space>
+              ),
+            ].filter(isTruthy),
+          )}
+        {data.__typename === "Standard" &&
+          joinWithCopyableSpace(
+            [
+              data.standardizers && data.standardizers.length > 0 && (
+                <Typography.Text strong key="standardizers">
+                  {data.standardizers?.join(", ")}
+                </Typography.Text>
+              ),
+              <span key="numeration">
+                {data.numeration.prefix ?? ""}
+                {data.numeration.mainNumber}
+                {data.numeration.suffix ? `-${data.numeration.suffix}` : ""}
+              </span>,
+              data.year && <span key="year">({data.year}).</span>,
+              data.title && (
+                <Typography.Text italic key="title">
+                  {data.title}.
+                </Typography.Text>
+              ),
+              data.section && (
+                <span key="section">
+                  Section{" "}
+                  <Typography.Text italic>{data.section}</Typography.Text>.
+                </span>
+              ),
+              data.locator && (
+                <Typography.Link
+                  href={data.locator}
+                  target="_blank"
+                  key="locator"
+                >
+                  <Iconize icon={<GlobalOutlined />}>Web</Iconize>
+                </Typography.Link>
+              ),
+            ].filter(isTruthy),
+          )}
+      </span>
+      {data.abstract && (
+        <Typography.Paragraph
+          type="secondary"
+          ellipsis={{ rows: 3, expandable: true, symbol: "more" }}
+        >
+          {data.abstract}
+        </Typography.Paragraph>
       )}
-    </Descriptions>
+    </div>
   );
 }
diff --git a/frontend/components/ReferenceForm.tsx b/frontend/components/ReferenceSubform.tsx
similarity index 82%
rename from frontend/components/ReferenceForm.tsx
rename to frontend/components/ReferenceSubform.tsx
index af489bcb8..4f3bbc551 100644
--- a/frontend/components/ReferenceForm.tsx
+++ b/frontend/components/ReferenceSubform.tsx
@@ -7,13 +7,12 @@ import {
   Space,
   Button,
   FormInstance,
+  Flex,
 } from "antd";
 import { useState } from "react";
 import { Standardizer, Standard, Publication } from "../__generated__/graphql";
-
-const tailLayout = {
-  wrapperCol: { offset: 8, span: 16 },
-};
+import DeleteButton from "./DeleteButton";
+import TextArea from "antd/es/input/TextArea";
 
 enum ReferenceKind {
   None = "None",
@@ -27,15 +26,14 @@ function referenceToKind(
   switch (reference?.__typename) {
     case null:
       return ReferenceKind.None;
+    case undefined:
+      return ReferenceKind.None;
     case "Standard":
       return ReferenceKind.Standard;
     case "Publication":
       return ReferenceKind.Publication;
     default:
-      // TODO Why does this not work? For a working example see https://www.typescriptlang.org/docs/handbook/2/narrowing.html#exhaustiveness-checking
-      // const _exhaustiveCheck: never = reference;
-      // return _exhaustiveCheck;
-      return ReferenceKind.None;
+      return assertNever(reference);
   }
 }
 
@@ -54,23 +52,18 @@ function removeTypenames(
   return referenceWithoutTypename;
 }
 
-// interface HasStandardAndPublication {
-//   standard: CreateStandardInput | null | undefined;
-//   publication: CreatePublicationInput | null | undefined;
-// }
-
-export type ReferenceFormProps<Values> = {
+export type ReferenceSubformProps<Values> = {
   form: FormInstance<Values>;
   initialValue?: Standard | Publication | null;
   namespace: string[];
 };
 
-// TODO Why does the following not work? export function ReferenceForm<Values extends HasStandardAndPublication>({form}: ReferenceFormProps<Values>) {
-export function ReferenceForm({
+// TODO Harden types: export function ReferenceForm<Values extends ReferenceInput>({form}: ReferenceFormProps<Values>) {
+export function ReferenceSubform({
   form,
   initialValue,
   namespace,
-}: ReferenceFormProps<any>) {
+}: ReferenceSubformProps<any>) {
   const initialKind = referenceToKind(initialValue);
   const initialReference = removeTypenames(initialValue);
   const [selectedReferenceOption, setSelectedReferenceOption] =
@@ -143,7 +136,7 @@ export function ReferenceForm({
                 : null
             }
           >
-            <Input />
+            <TextArea autoSize={{ minRows: 2 }} />
           </Form.Item>
           <Form.Item
             label="Section"
@@ -190,7 +183,7 @@ export function ReferenceForm({
             <Input />
           </Form.Item>
           <Form.Item
-            label="WebAddress"
+            label="Web Address"
             name={namespace.concat("publication", "webAddress")}
             initialValue={
               initialValue?.__typename == "Publication"
@@ -205,44 +198,54 @@ export function ReferenceForm({
           >
             <Input />
           </Form.Item>
-          <Form.List
-            name={namespace.concat("publication", "authors")}
-            initialValue={
-              initialValue?.__typename == "Publication"
-                ? initialValue.authors == null
-                  ? undefined
-                  : initialValue.authors
-                : undefined
-            }
-          >
-            {(fields, { add, remove }, { errors }) => (
-              <>
-                {fields.map((field) => (
-                  <Form.Item key={field.key} label="Author">
-                    <Space.Compact block>
-                      <Form.Item {...field} noStyle>
-                        <Input style={{ width: "80%" }} />
+          <Form.Item label="Author(s)">
+            <Form.List
+              name={namespace.concat("publication", "authors")}
+              initialValue={
+                initialValue?.__typename == "Publication"
+                  ? initialValue.authors == null
+                    ? undefined
+                    : initialValue.authors
+                  : undefined
+              }
+            >
+              {(fields, { add, remove }, { errors }) => (
+                <Flex vertical gap="small">
+                  <Form.ErrorList errors={errors} />
+                  {fields.map(({ key, name, ...restField }) => (
+                    <Flex key={key} gap="small" align="baseline">
+                      <Form.Item
+                        {...restField}
+                        name={name}
+                        noStyle
+                        style={{ flex: 1 }}
+                        rules={[
+                          {
+                            required: true,
+                          },
+                        ]}
+                      >
+                        <Input style={{ width: "100%" }} />
                       </Form.Item>
-                      <Button danger onClick={() => remove(field.name)}>
-                        Remove
-                      </Button>
-                    </Space.Compact>
-                  </Form.Item>
-                ))}
-                <Form.Item {...tailLayout}>
+                      <DeleteButton
+                        type="icon"
+                        kind="remove"
+                        onClick={() => remove(name)}
+                      />
+                    </Flex>
+                  ))}
                   <Button
-                    type="dashed"
-                    onClick={add}
-                    style={{ width: "100%" }}
+                    block
+                    type="default"
+                    onClick={() => add(null)}
                     icon={<PlusOutlined />}
                   >
-                    Add author
+                    Add Author
                   </Button>
-                  <Form.ErrorList errors={errors} />
-                </Form.Item>
-              </>
-            )}
-          </Form.List>
+                </Flex>
+              )}
+            </Form.List>
+          </Form.Item>
         </>
       )}
       {selectedReferenceOption === ReferenceKind.Standard && (
diff --git a/frontend/components/SafeDeleteButton.tsx b/frontend/components/SafeDeleteButton.tsx
index 64b9fe345..ca2b370ea 100644
--- a/frontend/components/SafeDeleteButton.tsx
+++ b/frontend/components/SafeDeleteButton.tsx
@@ -1,60 +1,41 @@
-import { Button, Popconfirm, Tooltip } from "antd";
-import { DeleteOutlined, SyncOutlined } from "@ant-design/icons";
-
-const capitalize = <T extends string>(s: T) =>
-  (s[0].toUpperCase() + s.slice(1)) as Capitalize<T>;
+import { Popconfirm } from "antd";
+import DeleteButton from "./DeleteButton";
+import { capitalize } from "../lib/string";
+import { CSSProperties } from "react";
 
 export default function SafeDeleteButton({
-  kind,
-  type = "text",
-  deleting,
+  title,
+  kind = "delete",
+  type = "primary",
+  deleting = false,
+  style,
   onConfirm,
 }: {
-  kind: "delete" | "remove";
-  type: "icon" | "text";
-  deleting: boolean;
+  title?: React.ReactNode;
+  kind?: "delete" | "remove";
+  type?: "primary" | "icon";
+  deleting?: boolean;
+  style?: CSSProperties;
   onConfirm: (e?: React.MouseEvent<HTMLElement>) => void;
 }) {
-  const title = capitalize(kind);
-
-  const button = (() => {
-    switch (type) {
-      case "icon":
-        return (
-          <Tooltip title={title}>
-            <Button
-              danger
-              type="text"
-              icon={deleting ? <SyncOutlined spin /> : <DeleteOutlined />}
-              loading={deleting}
-              shape="circle"
-            />
-          </Tooltip>
-        );
-      case "text":
-        return (
-          <Button
-            danger
-            type="primary"
-            icon={<DeleteOutlined />}
-            loading={deleting}
-          >
-            {title}
-          </Button>
-        );
-    }
-  })();
+  const theTitle = title ?? capitalize(kind);
 
   return (
     <Popconfirm
-      title={title}
+      title={theTitle}
       description="Are you sure?"
       okText="Yes"
       cancelText="No"
       okButtonProps={{ danger: true }}
       onConfirm={onConfirm}
     >
-      {button}
+      <DeleteButton
+        title={theTitle}
+        kind={kind}
+        type={type}
+        deleting={deleting}
+        style={style}
+      />
     </Popconfirm>
   );
 }
diff --git a/frontend/components/SearchSelect.tsx b/frontend/components/SearchSelect.tsx
index ace73f51e..b46e35ced 100644
--- a/frontend/components/SearchSelect.tsx
+++ b/frontend/components/SearchSelect.tsx
@@ -15,21 +15,20 @@ export function SearchSelect<ValueType>({
 }: SearchSelectProps<ValueType>) {
   return (
     <Select
-      showSearch
       mode={mode}
-      placeholder="Please select"
+      placeholder="Search and select..."
       options={options}
-      optionFilterProp="label"
-      filterOption={(input, option) =>
-        option?.label?.toLocaleString().includes(input) || false
-      }
-      filterSort={(optionA, optionB) =>
-        optionA.label != null && optionB.label != null
-          ? optionA.label
-              .toLocaleString()
-              .localeCompare(optionB.label.toLocaleString(), "en")
-          : 0
-      }
+      showSearch={{
+        optionFilterProp: "label",
+        filterOption: (input, option) =>
+          option?.label?.toLocaleString().includes(input) || false,
+        filterSort: (optionA, optionB) =>
+          optionA.label != null && optionB.label != null
+            ? optionA.label
+                .toLocaleString()
+                .localeCompare(optionB.label.toLocaleString(), "en")
+            : 0,
+      }}
       value={value}
       onChange={onChange}
     />
diff --git a/frontend/components/SelectComponentId.tsx b/frontend/components/SelectComponentId.tsx
deleted file mode 100644
index fd586728c..000000000
--- a/frontend/components/SelectComponentId.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { useQuery } from "@apollo/client/react";
-import { Skeleton, Result } from "antd";
-import { SearchSelect } from "./SearchSelect";
-import { notEmpty } from "../lib/array";
-import { ComponentNamesDocument } from "../queries/components.generated";
-
-interface SelectComponentIdProps {
-  mode?: "multiple" | "tags";
-  value?: string;
-  onChange?: (value: string) => void;
-};
-
-export function SelectComponentId({
-  mode,
-  value,
-  onChange,
-}: SelectComponentIdProps) {
-  // TODO Use search instead of drop-down with all users/components preloaded. Be inspired by https://ant.design/components/select/#components-select-demo-select-users
-  const { loading, data, error } = useQuery(ComponentNamesDocument);
-  const components = data?.components?.edges
-    ?.map((e) => e.node)
-    .filter(notEmpty);
-
-  if (loading) {
-    return <Skeleton />;
-  }
-
-  if (error) {
-    console.error(error);
-  }
-
-  if (!components) {
-    return <Result status="error" title="Failed to load components." />;
-  }
-
-  return (
-    <SearchSelect
-      value={value}
-      mode={mode}
-      onChange={onChange}
-      options={
-        components?.map((component) => ({
-          label: component.name,
-          value: component.uuid,
-        })) || []
-      }
-    />
-  );
-}
diff --git a/frontend/components/SelectInstitutionId.tsx b/frontend/components/SelectInstitutionId.tsx
deleted file mode 100644
index 666a75e6b..000000000
--- a/frontend/components/SelectInstitutionId.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { useQuery } from "@apollo/client/react";
-import { Skeleton, Result } from "antd";
-import { SearchSelect } from "./SearchSelect";
-import { notEmpty } from "../lib/array";
-import { InstitutionNamesDocument } from "../queries/institutions.generated";
-
-interface SelectInstitutionIdProps {
-  mode?: "multiple" | "tags";
-  value?: string;
-  onChange?: (value: string) => void;
-};
-
-export function SelectInstitutionId({
-  mode,
-  value,
-  onChange,
-}: SelectInstitutionIdProps) {
-  // TODO Use search instead of drop-down with all users/institutions preloaded. Be inspired by https://ant.design/components/select/#components-select-demo-select-users
-  const { loading, data, error } = useQuery(InstitutionNamesDocument);
-  const institutions = data?.institutions?.edges
-    ?.map((e) => e.node)
-    .filter(notEmpty);
-
-  if (loading) {
-    return <Skeleton />;
-  }
-
-  if (error) {
-    console.error(error);
-  }
-
-  if (!institutions) {
-    return <Result status="error" title="Failed to load institutions." />;
-  }
-
-  return (
-    <SearchSelect
-      value={value}
-      mode={mode}
-      onChange={onChange}
-      options={
-        institutions?.map((institution) => ({
-          label: institution.name,
-          value: institution.uuid,
-        })) || []
-      }
-    />
-  );
-}
diff --git a/frontend/components/SelectUserId.tsx b/frontend/components/SelectUserId.tsx
deleted file mode 100644
index c5e3069fc..000000000
--- a/frontend/components/SelectUserId.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { useQuery } from "@apollo/client/react";
-import { Skeleton, Result } from "antd";
-import { SearchSelect } from "./SearchSelect";
-import { notEmpty } from "../lib/array";
-import { UserNamesDocument } from "../queries/users.generated";
-
-interface SelectUserIdProps {
-  mode?: "multiple" | "tags";
-  value?: string;
-  onChange?: (value: string) => void;
-};
-
-export function SelectUserId({ mode, value, onChange }: SelectUserIdProps) {
-  // TODO Use search instead of drop-down with all users/users preloaded. Be inspired by https://ant.design/components/select/#components-select-demo-select-users
-  const { loading, data, error } = useQuery(UserNamesDocument);
-  const users = data?.users?.edges?.map((e) => e.node).filter(notEmpty);
-
-  if (loading) {
-    return <Skeleton />;
-  }
-
-  if (error) {
-    console.error(error);
-  }
-
-  if (!users) {
-    return <Result status="error" title="Failed to load users." />;
-  }
-
-  return (
-    <SearchSelect
-      value={value}
-      mode={mode}
-      onChange={onChange}
-      options={
-        users?.map((user) => ({
-          label: `${user.name} (${user.uuid})`,
-          value: user.uuid,
-        })) || []
-      }
-    />
-  );
-}
diff --git a/frontend/components/SingleSignOnLayout.tsx b/frontend/components/SingleSignOnLayout.tsx
index edd431e6b..2599cfa8d 100644
--- a/frontend/components/SingleSignOnLayout.tsx
+++ b/frontend/components/SingleSignOnLayout.tsx
@@ -26,7 +26,7 @@ export default function SingleSignOnLayout({
       modal.info({
         title: "Cookie Consent",
         content: (
-          <Typography.Paragraph>
+          <Typography.Paragraph style={{ maxWidth: "75ch" }}>
             This website employs cookies to make it work securely. As these
             cookies are essential you need to agree to their usage to use this
             website.
diff --git a/frontend/components/SlideDown.tsx b/frontend/components/SlideDown.tsx
new file mode 100644
index 000000000..a9f05133f
--- /dev/null
+++ b/frontend/components/SlideDown.tsx
@@ -0,0 +1,51 @@
+import { useLayoutEffect, useRef, useState } from "react";
+
+export default function SlideDown({
+  open,
+  children,
+}: {
+  open: boolean;
+  children: React.ReactNode;
+}) {
+  const contentRef = useRef<HTMLDivElement>(null);
+  const [height, setHeight] = useState<number | string>(0);
+  const [transitioning, setTransitioning] = useState(false);
+
+  useLayoutEffect(() => {
+    const element = contentRef.current;
+    if (!element) return;
+    setTransitioning(true);
+    const startHeight = open ? 0 : element.scrollHeight;
+    const endHeight = open ? element.scrollHeight : 0;
+    setHeight(startHeight);
+    void element.offsetHeight; // force reflow
+    requestAnimationFrame(() => {
+      requestAnimationFrame(() => {
+        setHeight(endHeight);
+      });
+    });
+  }, [open]);
+
+  const handleTransitionEnd = () => {
+    setTransitioning(false);
+    setHeight(open ? "auto" : 0);
+  };
+
+  if (!open && !transitioning) {
+    return null;
+  }
+
+  return (
+    <div
+      onTransitionEnd={handleTransitionEnd}
+      style={{
+        height: height,
+        pointerEvents: open ? "auto" : "none",
+        overflow: "hidden",
+        transition: "all 0.3s ease-in-out",
+      }}
+    >
+      <div ref={contentRef}>{children}</div>
+    </div>
+  );
+}
diff --git a/frontend/components/TabLabel.tsx b/frontend/components/TabLabel.tsx
index a7f1ab07d..b8b366ed3 100644
--- a/frontend/components/TabLabel.tsx
+++ b/frontend/components/TabLabel.tsx
@@ -1,22 +1,20 @@
 import { Space, Badge, Typography } from "antd";
 
-const { Text } = Typography;
-
 export default function TabLabel({
   name,
   count,
 }: {
-  name: String;
+  name: React.ReactNode;
   count?: React.ReactNode;
 }) {
   return count == 0 ? (
     <Space>
-      <Text type="secondary">{name}</Text>
+      <Typography.Text type="secondary">{name}</Typography.Text>
       <Badge showZero color="grey" count={count} />
     </Space>
   ) : (
     <Space>
-      <Text>{name}</Text>
+      <Typography.Text>{name}</Typography.Text>
       {count != null && <Badge color="blue" count={count} />}
     </Space>
   );
diff --git a/frontend/components/UnauthenticatedResult.tsx b/frontend/components/UnauthenticatedResult.tsx
new file mode 100644
index 000000000..e3d596a7f
--- /dev/null
+++ b/frontend/components/UnauthenticatedResult.tsx
@@ -0,0 +1,14 @@
+import { Result } from "antd";
+import paths from "../paths";
+import Link from "next/link";
+
+export default function UnauthenticatedResult() {
+  return (
+    <Result
+      status="403"
+      title="401"
+      subTitle="Sorry, you need to be logged in to access this page."
+      extra={<Link href={paths.openIdConnectClientLogin}>Login</Link>}
+    />
+  );
+}
diff --git a/frontend/components/UrlInput.tsx b/frontend/components/UrlInput.tsx
new file mode 100644
index 000000000..b5121125b
--- /dev/null
+++ b/frontend/components/UrlInput.tsx
@@ -0,0 +1,33 @@
+import { Input, Space } from "antd";
+
+// or `UrlFormItem`? With `<FormItem normalize={normalize}`
+
+const normalize = (value: string) => {
+  if (!value) return value;
+  // If it doesn't start with http or https, prepend https://
+  if (!/^https?:\/\//i.test(value) && value.length > 3) {
+    return `https://${value}`;
+  }
+  return value.toLowerCase().trim();
+};
+
+export default function UrlInput({
+  value,
+  onChange,
+}: {
+  value?: string;
+  onChange?: (v: string) => void;
+}) {
+  return (
+    <Space.Compact>
+      <Input
+        value={value}
+        onChange={(e) => onChange?.(normalize(e.target.value))}
+        placeholder="https://..."
+      />
+      <a href={value} target="_blank" rel="noreferrer">
+        Test Link
+      </a>
+    </Space.Compact>
+  );
+}
diff --git a/frontend/components/UuidFormItem.tsx b/frontend/components/UuidFormItem.tsx
new file mode 100644
index 000000000..91e9aae84
--- /dev/null
+++ b/frontend/components/UuidFormItem.tsx
@@ -0,0 +1,38 @@
+import { Input, Form } from "antd";
+import { uuidRegex } from "../lib/string";
+import { CSSProperties } from "react";
+
+export default function UuidFormItem({
+  name,
+  style,
+}: {
+  name: (string | number)[];
+  style?: CSSProperties;
+}) {
+  return (
+    <Form.Item
+      name={name}
+      noStyle
+      // normalize makes the cursor jump to the end: normalize={(value) => value?.toLowerCase()}
+      rules={[
+        {
+          required: true,
+        },
+        {
+          whitespace: true,
+        },
+        {
+          pattern: uuidRegex,
+          message:
+            "Invalid UUID format (e.g. 123e4567-e89b-12d3-a456-426614174000)",
+        },
+      ]}
+    >
+      <Input
+        style={{ fontFamily: "monospace", ...style }}
+        maxLength={36}
+        placeholder="xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx"
+      />
+    </Form.Item>
+  );
+}
diff --git a/frontend/components/UuidPropositionFormList.tsx b/frontend/components/UuidPropositionFormList.tsx
deleted file mode 100644
index 27512c174..000000000
--- a/frontend/components/UuidPropositionFormList.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { Form, Input, Space, Select, Button } from "antd";
-import { PlusOutlined } from "@ant-design/icons";
-
-const tailLayout = {
-  wrapperCol: { offset: 8, span: 16 },
-};
-
-enum Negator {
-  Is = "is",
-  IsNot = "isNot",
-}
-
-const negatorOptions = [
-  { value: Negator.Is, label: "Is" },
-  { value: Negator.IsNot, label: "Is" },
-];
-
-export enum UuidPropositionComparator {
-  EqualTo = "equalTo",
-}
-
-interface UuidPropositionFormListProps {
-  name: string;
-  label: string;
-};
-
-export function UuidPropositionFormList({
-  name,
-  label,
-}: UuidPropositionFormListProps) {
-  return (
-    <Form.List name={name}>
-      {(fields, { add, remove }, { errors }) => (
-        <>
-          {fields.map(({ key, name, ...restField }, index) => (
-            <Form.Item key={key} label={index === 0 ? label : " "}>
-              <Space.Compact block>
-                <Form.Item
-                  {...restField}
-                  key={`negator${key}`}
-                  name={[name, "negator"]}
-                  noStyle
-                  initialValue={Negator.Is}
-                >
-                  <Select
-                    style={{ width: "10%" }}
-                    defaultValue={Negator.Is}
-                    options={negatorOptions}
-                  />
-                </Form.Item>
-                <Form.Item
-                  {...restField}
-                  key={`comparator${key}`}
-                  name={[name, "comparator"]}
-                  noStyle
-                  initialValue={UuidPropositionComparator.EqualTo}
-                >
-                  <Select
-                    style={{ width: "20%" }}
-                    options={[
-                      {
-                        label: "equal to",
-                        value: UuidPropositionComparator.EqualTo,
-                      },
-                    ]}
-                  />
-                </Form.Item>
-                <Form.Item
-                  {...restField}
-                  key={`value${key}`}
-                  name={[name, "value"]}
-                  noStyle
-                >
-                  <Input
-                    style={{
-                      float: "none",
-                      display: "inline-block",
-                      width: "60%",
-                    }}
-                  />
-                </Form.Item>
-                <Button danger onClick={() => remove(name)}>
-                  Remove
-                </Button>
-              </Space.Compact>
-            </Form.Item>
-          ))}
-          <Form.Item {...tailLayout}>
-            <Button
-              type="dashed"
-              onClick={add}
-              style={{ width: "100%" }}
-              icon={<PlusOutlined />}
-            >
-              {`Add ${label.toLocaleLowerCase("en")} proposition`}
-            </Button>
-            <Form.ErrorList errors={errors} />
-          </Form.Item>
-        </>
-      )}
-    </Form.List>
-  );
-}
diff --git a/frontend/components/components/AddAssembledOfComponent.tsx b/frontend/components/components/AddAssembledOfComponent.tsx
index a60042a5e..6cd313891 100644
--- a/frontend/components/components/AddAssembledOfComponent.tsx
+++ b/frontend/components/components/AddAssembledOfComponent.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Form, Button, InputNumber, Select } from "antd";
+import { Form, Button, InputNumber, Select, Space } from "antd";
 import {
   AddComponentAssemblyDocument,
   AddComponentAssemblyMutation,
@@ -8,9 +8,8 @@ import { PrimeSurface, Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import { ComponentDocument } from "../../queries/components.generated";
-import { SelectComponentId } from "../SelectComponentId";
+import { ComponentIdSelect } from "./ComponentIdSelect";
 import ErrorAlert from "../ErrorAlert";
-import { layout, tailLayout } from "../../lib/form";
 
 type FormValues = {
   assembledComponentId: Scalars["Uuid"]["input"];
@@ -77,49 +76,46 @@ export default function AddAssembledOfComponent({
     );
   };
 
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
-
   return (
     <>
       <ErrorAlert messages={globalErrorMessages} />
       <Form
-        {...layout}
         form={form}
         name="addAssembledComponent"
         onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+        style={{ display: "flex" }}
       >
-        <Form.Item
-          label="Assembly"
-          name="assembledComponentId"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <SelectComponentId />
-        </Form.Item>
-        <Form.Item label="Index" name="index">
-          <InputNumber min={1} max={255} />
-        </Form.Item>
-        <Form.Item label="Prime Surface" name="primeSurface">
-          <Select
-            allowClear={true}
-            placeholder="Please select"
-            options={Object.entries(PrimeSurface).map(([_key, value]) => ({
-              label: value,
-              value: value,
-            }))}
-          />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
+        <Space.Compact style={{ flex: 1 }}>
+          <Form.Item
+            noStyle
+            label="Assembly"
+            name="assembledComponentId"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+            style={{ width: "100%" }}
+          >
+            <ComponentIdSelect />
+          </Form.Item>
+          <Form.Item noStyle label="Index" name="index">
+            <InputNumber placeholder="Index" min={1} max={255} />
+          </Form.Item>
+          <Form.Item noStyle label="Prime Surface" name="primeSurface">
+            <Select
+              allowClear={true}
+              placeholder="Prime Surface"
+              options={Object.entries(PrimeSurface).map(([_key, value]) => ({
+                label: value,
+                value: value,
+              }))}
+            />
+          </Form.Item>
           <Button type="primary" htmlType="submit" loading={mutating}>
             Add
           </Button>
-        </Form.Item>
+        </Space.Compact>
       </Form>
     </>
   );
diff --git a/frontend/components/components/AddComponentManufacturer.tsx b/frontend/components/components/AddComponentManufacturer.tsx
index dec559fc2..e607690ff 100644
--- a/frontend/components/components/AddComponentManufacturer.tsx
+++ b/frontend/components/components/AddComponentManufacturer.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Form, Button } from "antd";
+import { Form, Button, Space } from "antd";
 import {
   AddComponentManufacturerDocument,
   AddComponentManufacturerMutation,
@@ -7,10 +7,9 @@ import {
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
 import { ComponentDocument } from "../../queries/components.generated";
-import { SelectInstitutionId } from "../SelectInstitutionId";
+import { InstitutionIdSelect } from "../institutions/InstitutionIdSelect";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
-import { layout, tailLayout } from "../../lib/form";
 
 type FormValues = { institutionId: Scalars["Uuid"]["input"] };
 
@@ -71,36 +70,33 @@ export default function AddComponentManufacturer({
     );
   };
 
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
-
   return (
     <>
       <ErrorAlert messages={globalErrorMessages} />
       <Form
-        {...layout}
         form={form}
         name="addComponentManufacturer"
         onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+        style={{ display: "flex" }}
       >
-        <Form.Item
-          label="Institution"
-          name="institutionId"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <SelectInstitutionId />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
+        <Space.Compact style={{ flex: 1 }}>
+          <Form.Item
+            noStyle
+            label="Institution"
+            name="institutionId"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+            style={{ width: "100%" }}
+          >
+            <InstitutionIdSelect />
+          </Form.Item>
           <Button type="primary" htmlType="submit" loading={mutating}>
             Add
           </Button>
-        </Form.Item>
+        </Space.Compact>
       </Form>
     </>
   );
diff --git a/frontend/components/components/AddConcretizationOfComponent.tsx b/frontend/components/components/AddConcretizationOfComponent.tsx
index e02603a29..1fadbaf60 100644
--- a/frontend/components/components/AddConcretizationOfComponent.tsx
+++ b/frontend/components/components/AddConcretizationOfComponent.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Form, Button } from "antd";
+import { Form, Button, Space } from "antd";
 import {
   AddComponentGeneralizationDocument,
   AddComponentGeneralizationMutation,
@@ -7,9 +7,8 @@ import {
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
 import { ComponentDocument } from "../../queries/components.generated";
-import { SelectComponentId } from "../SelectComponentId";
+import { ComponentIdSelect } from "./ComponentIdSelect";
 import ErrorAlert from "../ErrorAlert";
-import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 
 type FormValues = {
@@ -73,36 +72,33 @@ export default function AddConcretizationOfComponent({
     );
   };
 
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
-
   return (
     <>
       <ErrorAlert messages={globalErrorMessages} />
       <Form
-        {...layout}
         form={form}
         name="addConcreteComponent"
         onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+        style={{ display: "flex" }}
       >
-        <Form.Item
-          label="Concretization"
-          name="concreteComponentId"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <SelectComponentId />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
+        <Space.Compact style={{ flex: 1 }}>
+          <Form.Item
+            noStyle
+            label="Concretization"
+            name="concreteComponentId"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+            style={{ width: "100%" }}
+          >
+            <ComponentIdSelect />
+          </Form.Item>
           <Button type="primary" htmlType="submit" loading={mutating}>
             Add
           </Button>
-        </Form.Item>
+        </Space.Compact>
       </Form>
     </>
   );
diff --git a/frontend/components/components/AddGeneralizationOfComponent.tsx b/frontend/components/components/AddGeneralizationOfComponent.tsx
index 27cc546cd..2f6f8f82b 100644
--- a/frontend/components/components/AddGeneralizationOfComponent.tsx
+++ b/frontend/components/components/AddGeneralizationOfComponent.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Form, Button } from "antd";
+import { Form, Button, Space } from "antd";
 import {
   AddComponentGeneralizationDocument,
   AddComponentGeneralizationMutation,
@@ -7,22 +7,21 @@ import {
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
 import { ComponentDocument } from "../../queries/components.generated";
-import { SelectComponentId } from "../SelectComponentId";
+import { ComponentIdSelect } from "./ComponentIdSelect";
 import ErrorAlert from "../ErrorAlert";
-import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 
 type FormValues = {
   generalComponentId: Scalars["Uuid"]["input"];
 };
 
-interface AddAssembledOfComponentProps {
+interface AddGeneralizationOfComponentProps {
   concreteComponentId: Scalars["Uuid"]["input"];
 }
 
-export default function AddAssembledOfComponent({
+export default function AddGeneralizationOfComponent({
   concreteComponentId,
-}: AddAssembledOfComponentProps) {
+}: AddGeneralizationOfComponentProps) {
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
   );
@@ -73,36 +72,33 @@ export default function AddAssembledOfComponent({
     );
   };
 
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
-
   return (
     <>
       <ErrorAlert messages={globalErrorMessages} />
       <Form
-        {...layout}
         form={form}
         name="addGeneralComponent"
         onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+        style={{ display: "flex" }}
       >
-        <Form.Item
-          label="Generalization"
-          name="generalComponentId"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <SelectComponentId />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
+        <Space.Compact style={{ flex: 1 }}>
+          <Form.Item
+            noStyle
+            label="Generalization"
+            name="generalComponentId"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+            style={{ width: "100%" }}
+          >
+            <ComponentIdSelect />
+          </Form.Item>
           <Button type="primary" htmlType="submit" loading={mutating}>
             Add
           </Button>
-        </Form.Item>
+        </Space.Compact>
       </Form>
     </>
   );
diff --git a/frontend/components/components/AddPartOfComponent.tsx b/frontend/components/components/AddPartOfComponent.tsx
index 24abc861a..845251972 100644
--- a/frontend/components/components/AddPartOfComponent.tsx
+++ b/frontend/components/components/AddPartOfComponent.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Form, Button, InputNumber, Select } from "antd";
+import { Form, Button, InputNumber, Select, Space } from "antd";
 import {
   AddComponentAssemblyDocument,
   AddComponentAssemblyMutation,
@@ -7,9 +7,8 @@ import {
 import { PrimeSurface, Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
 import { ComponentDocument } from "../../queries/components.generated";
-import { SelectComponentId } from "../SelectComponentId";
+import { ComponentIdSelect } from "./ComponentIdSelect";
 import ErrorAlert from "../ErrorAlert";
-import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 
 type FormValues = {
@@ -77,49 +76,46 @@ export default function AddPartOfComponent({
     );
   };
 
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
-
   return (
     <>
       <ErrorAlert messages={globalErrorMessages} />
       <Form
-        {...layout}
         form={form}
         name="addPartComponent"
         onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+        style={{ display: "flex" }}
       >
-        <Form.Item
-          label="Part"
-          name="partComponentId"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <SelectComponentId />
-        </Form.Item>
-        <Form.Item label="Index" name="index">
-          <InputNumber min={1} max={255} />
-        </Form.Item>
-        <Form.Item label="Prime Surface" name="primeSurface">
-          <Select
-            allowClear={true}
-            placeholder="Please select"
-            options={Object.entries(PrimeSurface).map(([_key, value]) => ({
-              label: value,
-              value: value,
-            }))}
-          />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
+        <Space.Compact style={{ flex: 1 }}>
+          <Form.Item
+            noStyle
+            label="Part"
+            name="partComponentId"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+            style={{ width: "100%" }}
+          >
+            <ComponentIdSelect />
+          </Form.Item>
+          <Form.Item noStyle label="Index" name="index">
+            <InputNumber placeholder="Index" min={1} max={255} />
+          </Form.Item>
+          <Form.Item noStyle label="Prime Surface" name="primeSurface">
+            <Select
+              allowClear={true}
+              placeholder="Prime Surface"
+              options={Object.entries(PrimeSurface).map(([_key, value]) => ({
+                label: value,
+                value: value,
+              }))}
+            />
+          </Form.Item>
           <Button type="primary" htmlType="submit" loading={mutating}>
             Add
           </Button>
-        </Form.Item>
+        </Space.Compact>
       </Form>
     </>
   );
diff --git a/frontend/components/components/AddVariantOfComponent.tsx b/frontend/components/components/AddVariantOfComponent.tsx
index f25726a7b..5e4101ebf 100644
--- a/frontend/components/components/AddVariantOfComponent.tsx
+++ b/frontend/components/components/AddVariantOfComponent.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Form, Button } from "antd";
+import { Form, Button, Space } from "antd";
 import {
   AddComponentVariantDocument,
   AddComponentVariantMutation,
@@ -7,9 +7,8 @@ import {
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
 import { ComponentDocument } from "../../queries/components.generated";
-import { SelectComponentId } from "../SelectComponentId";
+import { ComponentIdSelect } from "./ComponentIdSelect";
 import ErrorAlert from "../ErrorAlert";
-import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 
 type FormValues = {
@@ -73,36 +72,33 @@ export default function AddVariantOfComponent({
     );
   };
 
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
-
   return (
     <>
       <ErrorAlert messages={globalErrorMessages} />
       <Form
-        {...layout}
         form={form}
         name="addComponentVariant"
         onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+        style={{ display: "flex" }}
       >
-        <Form.Item
-          label="Variant"
-          name="variantComponentId"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <SelectComponentId />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
+        <Space.Compact style={{ flex: 1 }}>
+          <Form.Item
+            noStyle
+            label="Variant"
+            name="variantComponentId"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+            style={{ width: "100%" }}
+          >
+            <ComponentIdSelect />
+          </Form.Item>
           <Button type="primary" htmlType="submit" loading={mutating}>
             Add
           </Button>
-        </Form.Item>
+        </Space.Compact>
       </Form>
     </>
   );
diff --git a/frontend/components/components/Component.tsx b/frontend/components/components/Component.tsx
index 6a9153d6c..5867ac604 100644
--- a/frontend/components/components/Component.tsx
+++ b/frontend/components/components/Component.tsx
@@ -1,47 +1,21 @@
 import { useQuery } from "@apollo/client/react";
 import { Scalars } from "../../__generated__/graphql";
-import PageHeader from "../PageHeader";
 import { ComponentDocument } from "../../queries/components.generated";
-import {
-  Skeleton,
-  Result,
-  Descriptions,
-  Tag,
-  List,
-  Row,
-  Col,
-  Space,
-} from "antd";
-import { ReactNode } from "react";
-import paths from "../../paths";
-import Link from "next/link";
-import AddPartOfComponent from "./AddPartOfComponent";
-import AddAssembledOfComponent from "./AddAssembledOfComponent";
-import UpdateComponentAssembly from "./UpdateComponentAssembly";
-import AddVariantOfComponent from "./AddVariantOfComponent";
-import AddConcretizationOfComponent from "./AddConcretizationOfComponent";
-import AddGeneralizationOfComponent from "./AddGeneralizationOfComponent";
-import UpdateComponent from "./UpdateComponent";
-import AddComponentManufacturer from "./AddComponentManufacturer";
-import { RemoveComponentManufacturer } from "./RemoveComponentManufacturer";
-import { RemoveComponentAssembly } from "./RemoveComponentAssembly";
-import { RemoveComponentGeneralization } from "./RemoveComponentGeneralization";
-import { RemoveComponentVariant } from "./RemoveComponentVariant";
+import { Skeleton, Result, Card, Divider } from "antd";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
-import JsonViewer from "../JsonViewer";
-import { isTruthy } from "../../lib/array";
-import Manager from "../Manager";
-import Availability from "../Availability";
+import ComponentSummary from "./ComponentSummary";
+import QueryToolbar from "../QueryToolbar";
 
 interface ComponentProps {
   componentId: Scalars["Uuid"]["input"];
 }
 
 export default function Component({ componentId }: ComponentProps) {
+  const queryVariables = {
+    uuid: componentId,
+  };
   const { loading, error, data } = useQuery(ComponentDocument, {
-    variables: {
-      uuid: componentId,
-    },
+    variables: queryVariables,
   });
   useQueryHandler({ error });
   const component = data?.component;
@@ -61,416 +35,10 @@ export default function Component({ componentId }: ComponentProps) {
   }
 
   return (
-    <>
-      <PageHeader
-        id={component.uuid}
-        title={[
-          component.name,
-          component.abbreviation == null ? null : `(${component.abbreviation})`,
-        ]
-          .filter((x) => x != null)
-          .join(" ")}
-        subTitle={component.description}
-        tags={component.categories.map((x) => (
-          <Tag key={x} color="magenta">
-            {x}
-          </Tag>
-        ))}
-        extra={[
-          component.isAuthorizedToUpdateNode && (
-            <UpdateComponent key="UpdateComponent" component={component} />
-          ),
-        ].filter(isTruthy)}
-      >
-        <Space orientation="vertical">
-          {component.availability && (
-            <Availability range={component.availability} />
-          )}
-          {component.manager?.node && <Manager data={component.manager.node} />}
-          {component.extras != null && (
-            <JsonViewer jsonData={component.extras} />
-          )}
-        </Space>
-        <Descriptions size="small" column={1}>
-          {component.prime?.surface && (
-            <Descriptions.Item label="Prime Surface">
-              {component.prime?.surface?.description}{" "}
-              {component.prime?.surface?.reference?.title}
-            </Descriptions.Item>
-          )}
-          {component.prime?.direction && (
-            <Descriptions.Item label="Prime Direction">
-              {component.prime?.direction?.description}{" "}
-              {component.prime?.direction?.reference?.title}
-            </Descriptions.Item>
-          )}
-          {component.switchableLayers && (
-            <Descriptions.Item label="Switchable Layers">
-              {component.switchableLayers?.description}{" "}
-              {component.switchableLayers?.reference?.title}
-            </Descriptions.Item>
-          )}
-        </Descriptions>
-      </PageHeader>
-      <Space orientation="vertical" style={{ display: "flex" }}>
-        <Row gutter={[16, 16]}>
-          <Col flex={1}>
-            <List
-              header="Manufacturers"
-              bordered={true}
-              size="small"
-              footer={
-                component.manufacturers.isAuthorizedToAddEdge && (
-                  <AddComponentManufacturer componentId={component.uuid} />
-                )
-              }
-            >
-              {component.manufacturers.edges.map((x) => (
-                <List.Item
-                  key={x.node.uuid}
-                  actions={([] as ReactNode[]).concat(
-                    x.isAuthorizedToRemoveEdge
-                      ? [
-                          <RemoveComponentManufacturer
-                            key={`RemoveComponentManufacturer-${x.node.uuid}`}
-                            componentId={component.uuid}
-                            institutionId={x.node.uuid}
-                          />,
-                        ]
-                      : [],
-                  )}
-                >
-                  <List.Item.Meta
-                    title={
-                      <Link href={paths.institution(x.node.uuid)}>
-                        {x.node.name}
-                      </Link>
-                    }
-                    description={x.node.description}
-                  />
-                </List.Item>
-              ))}
-              {component.pendingManufacturers?.edges.map((x) => (
-                <List.Item
-                  key={x.node.uuid}
-                  actions={([] as ReactNode[]).concat(
-                    x.isAuthorizedToRemoveEdge
-                      ? [
-                          <RemoveComponentManufacturer
-                            key={`RemoveComponentManufacturer-${x.node.uuid}`}
-                            componentId={component.uuid}
-                            institutionId={x.node.uuid}
-                          />,
-                        ]
-                      : [],
-                  )}
-                >
-                  <List.Item.Meta
-                    title={
-                      <Link href={paths.institution(x.node.uuid)}>
-                        {x.node.name} (Pending)
-                      </Link>
-                    }
-                  />
-                </List.Item>
-              ))}
-            </List>
-          </Col>
-        </Row>
-        {(component.assembledOf.edges.length >= 1 ||
-          component.assembledOf.isAuthorizedToAddEdge ||
-          component.partOf.edges.length >= 1 ||
-          component.partOf.isAuthorizedToAddEdge) && (
-          <Row gutter={[16, 16]}>
-            <Col flex={1}>
-              {(component.assembledOf.edges.length >= 1 ||
-                component.assembledOf.isAuthorizedToAddEdge) && (
-                <List
-                  header="Assembled Of"
-                  bordered={true}
-                  size="small"
-                  footer={
-                    component.assembledOf.isAuthorizedToAddEdge && (
-                      <AddPartOfComponent
-                        assembledComponentId={component.uuid}
-                      />
-                    )
-                  }
-                >
-                  {component.assembledOf.edges.map((x) => (
-                    <List.Item
-                      key={x.node.uuid}
-                      actions={([] as ReactNode[])
-                        .concat(
-                          x.isAuthorizedToUpdateEdge
-                            ? [
-                                <UpdateComponentAssembly
-                                  key={`UpdateComponentAssembly-${component.uuid}-${x.node.uuid}`}
-                                  assembledComponent={{
-                                    uuid: component.uuid,
-                                    name: component.name,
-                                  }}
-                                  partComponent={{
-                                    uuid: x.node.uuid,
-                                    name: x.node.name,
-                                  }}
-                                  index={x.index}
-                                  primeSurface={x.primeSurface}
-                                />,
-                              ]
-                            : [],
-                        )
-                        .concat(
-                          x.isAuthorizedToRemoveEdge
-                            ? [
-                                <RemoveComponentAssembly
-                                  key={`RemoveComponentAssembly-${component.uuid}-${x.node.uuid}`}
-                                  assembledComponentId={component.uuid}
-                                  partComponentId={x.node.uuid}
-                                />,
-                              ]
-                            : [],
-                        )}
-                    >
-                      <List.Item.Meta
-                        title={
-                          <Space>
-                            <Link href={paths.component(x.node.uuid)}>
-                              {x.node.name}
-                            </Link>
-                            <div>
-                              {x.index && (
-                                <Tag color="purple">Layer {x.index}</Tag>
-                              )}
-                              {x.primeSurface && (
-                                <Tag color="volcano">
-                                  Prime Surface {x.primeSurface}
-                                </Tag>
-                              )}
-                            </div>
-                          </Space>
-                        }
-                        description={x.node.description}
-                      />
-                    </List.Item>
-                  ))}
-                </List>
-              )}
-            </Col>
-            <Col flex={1}>
-              {(component.partOf.edges.length >= 1 ||
-                component.partOf.isAuthorizedToAddEdge) && (
-                <List
-                  header="Part Of"
-                  bordered={true}
-                  size="small"
-                  footer={
-                    component.partOf.isAuthorizedToAddEdge && (
-                      <AddAssembledOfComponent
-                        partComponentId={component.uuid}
-                      />
-                    )
-                  }
-                >
-                  {component.partOf.edges.map((x) => (
-                    <List.Item
-                      key={x.node.uuid}
-                      actions={([] as ReactNode[])
-                        .concat(
-                          x.isAuthorizedToUpdateEdge
-                            ? [
-                                <UpdateComponentAssembly
-                                  key={`UpdateComponentAssembly-${x.node.uuid}-${component.uuid}`}
-                                  assembledComponent={{
-                                    uuid: x.node.uuid,
-                                    name: x.node.name,
-                                  }}
-                                  partComponent={{
-                                    uuid: component.uuid,
-                                    name: component.name,
-                                  }}
-                                  index={x.index}
-                                  primeSurface={x.primeSurface}
-                                />,
-                              ]
-                            : [],
-                        )
-                        .concat(
-                          x.isAuthorizedToRemoveEdge
-                            ? [
-                                <RemoveComponentAssembly
-                                  key={`removeComponentAssembly-${x.node.uuid}-${component.uuid}`}
-                                  assembledComponentId={x.node.uuid}
-                                  partComponentId={component.uuid}
-                                />,
-                              ]
-                            : [],
-                        )}
-                    >
-                      <List.Item.Meta
-                        title={
-                          <Space>
-                            <Link href={paths.component(x.node.uuid)}>
-                              {x.node.name}
-                            </Link>
-                            <div>
-                              {x.index && (
-                                <Tag color="purple">Layer {x.index}</Tag>
-                              )}
-                              {x.primeSurface && (
-                                <Tag color="volcano">
-                                  Prime Surface {x.primeSurface}
-                                </Tag>
-                              )}
-                            </div>
-                          </Space>
-                        }
-                        description={x.node.description}
-                      />
-                    </List.Item>
-                  ))}
-                </List>
-              )}
-            </Col>
-          </Row>
-        )}
-        {(component.concretizationOf.edges.length >= 1 ||
-          component.concretizationOf.isAuthorizedToAddEdge ||
-          component.generalizationOf.edges.length >= 1 ||
-          component.generalizationOf.isAuthorizedToAddEdge) && (
-          <Row gutter={[16, 16]}>
-            <Col flex={1}>
-              {(component.concretizationOf.edges.length >= 1 ||
-                component.concretizationOf.isAuthorizedToAddEdge) && (
-                <List
-                  header="Concretization Of"
-                  bordered={true}
-                  size="small"
-                  footer={
-                    component.concretizationOf.isAuthorizedToAddEdge && (
-                      <AddGeneralizationOfComponent
-                        concreteComponentId={component.uuid}
-                      />
-                    )
-                  }
-                >
-                  {component.concretizationOf.edges.map((x) => (
-                    <List.Item
-                      key={x.node.uuid}
-                      actions={([] as ReactNode[]).concat(
-                        x.isAuthorizedToRemoveEdge
-                          ? [
-                              <RemoveComponentGeneralization
-                                key={`removeComponentGeneralization-${x.node.uuid}`}
-                                generalComponentId={x.node.uuid}
-                                concreteComponentId={component.uuid}
-                              />,
-                            ]
-                          : [],
-                      )}
-                    >
-                      <List.Item.Meta
-                        title={
-                          <Link href={paths.component(x.node.uuid)}>
-                            {x.node.name}
-                          </Link>
-                        }
-                        description={x.node.description}
-                      />
-                    </List.Item>
-                  ))}
-                </List>
-              )}
-            </Col>
-            <Col flex={1}>
-              {(component.generalizationOf.edges.length >= 1 ||
-                component.generalizationOf.isAuthorizedToAddEdge) && (
-                <List
-                  header="Generalization Of"
-                  bordered={true}
-                  size="small"
-                  footer={
-                    component.generalizationOf.isAuthorizedToAddEdge && (
-                      <AddConcretizationOfComponent
-                        generalComponentId={component.uuid}
-                      />
-                    )
-                  }
-                >
-                  {component.generalizationOf.edges.map((x) => (
-                    <List.Item
-                      key={x.node.uuid}
-                      actions={([] as ReactNode[]).concat(
-                        x.isAuthorizedToRemoveEdge
-                          ? [
-                              <RemoveComponentGeneralization
-                                key={`removeComponentGeneralization-${x.node.uuid}`}
-                                generalComponentId={component.uuid}
-                                concreteComponentId={x.node.uuid}
-                              />,
-                            ]
-                          : [],
-                      )}
-                    >
-                      <List.Item.Meta
-                        title={
-                          <Link href={paths.component(x.node.uuid)}>
-                            {x.node.name}
-                          </Link>
-                        }
-                        description={x.node.description}
-                      />
-                    </List.Item>
-                  ))}
-                </List>
-              )}
-            </Col>
-          </Row>
-        )}
-        {(component.variantOf.edges.length >= 1 ||
-          component.variantOf.isAuthorizedToAddEdge) && (
-          <Row gutter={[16, 16]}>
-            <Col flex={1}>
-              <List
-                header="Variant Of"
-                bordered={true}
-                size="small"
-                footer={
-                  component.variantOf.isAuthorizedToAddEdge && (
-                    <AddVariantOfComponent componentId={component.uuid} />
-                  )
-                }
-              >
-                {component.variantOf.edges.map((x) => (
-                  <List.Item
-                    key={x.node.uuid}
-                    actions={([] as ReactNode[]).concat(
-                      x.isAuthorizedToRemoveEdge
-                        ? [
-                            <RemoveComponentVariant
-                              key={`RemoveComponentVariant-${x.node.uuid}`}
-                              oneComponentId={component.uuid}
-                              otherComponentId={x.node.uuid}
-                            />,
-                          ]
-                        : [],
-                    )}
-                  >
-                    <List.Item.Meta
-                      title={
-                        <Link href={paths.component(x.node.uuid)}>
-                          {x.node.name}
-                        </Link>
-                      }
-                      description={x.node.description}
-                    />
-                  </List.Item>
-                ))}
-              </List>
-            </Col>
-          </Row>
-        )}
-      </Space>
-    </>
+    <Card>
+      <ComponentSummary entity={component} />
+      <Divider />
+      <QueryToolbar query={ComponentDocument} variables={queryVariables} />
+    </Card>
   );
 }
diff --git a/frontend/components/components/ComponentIdSelect.tsx b/frontend/components/components/ComponentIdSelect.tsx
new file mode 100644
index 000000000..1dd2b5124
--- /dev/null
+++ b/frontend/components/components/ComponentIdSelect.tsx
@@ -0,0 +1,17 @@
+import { ComponentNamesDocument } from "../../queries/components.generated";
+import PaginatedIdSelect, { PaginatedSelectProps } from "../PaginatedIdSelect";
+
+export function ComponentIdSelect({
+  mode,
+  value,
+  onChange,
+}: Omit<PaginatedSelectProps, "query">) {
+  return (
+    <PaginatedIdSelect
+      query={ComponentNamesDocument}
+      value={value}
+      mode={mode}
+      onChange={onChange}
+    />
+  );
+}
diff --git a/frontend/components/components/ComponentList.tsx b/frontend/components/components/ComponentList.tsx
new file mode 100644
index 000000000..42ea9727c
--- /dev/null
+++ b/frontend/components/components/ComponentList.tsx
@@ -0,0 +1,24 @@
+import { ComponentsPartialFragment } from "../../queries/components.generated";
+import EntityItem from "../entities/EntityItem";
+import EntityList from "../entities/EntityList";
+import ComponentSummary from "./ComponentSummary";
+
+export default function ComponentList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: ComponentsPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <ComponentSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/components/ComponentSummary.tsx b/frontend/components/components/ComponentSummary.tsx
new file mode 100644
index 000000000..d817017da
--- /dev/null
+++ b/frontend/components/components/ComponentSummary.tsx
@@ -0,0 +1,303 @@
+import { Descriptions, Space, Tag } from "antd";
+import { isTruthy } from "../../lib/array";
+import {
+  ComponentsPartialFragment,
+  ComponentPartialFragment,
+} from "../../queries/components.generated";
+import EntitySummary from "../entities/EntitySummary";
+import JsonViewer from "../JsonViewer";
+import Manager from "../Manager";
+import UpdateComponent from "./UpdateComponent";
+import paths from "../../paths";
+import EntityLink from "../entities/EntityLink";
+import OpenEndedDateTimeRangeX from "../OpenEndedDateTimeRangeX";
+import { RemoveComponentManufacturer } from "./RemoveComponentManufacturer";
+import InlineList from "../InlineList";
+import { Scalars } from "../../__generated__/graphql";
+import AddComponentManufacturer from "./AddComponentManufacturer";
+import AddVariantOfComponent from "./AddVariantOfComponent";
+import { RemoveComponentVariant } from "./RemoveComponentVariant";
+import AddConcretizationOfComponent from "./AddConcretizationOfComponent";
+import AddGeneralizationOfComponent from "./AddGeneralizationOfComponent";
+import { RemoveComponentGeneralization } from "./RemoveComponentGeneralization";
+import AddPartOfComponent from "./AddPartOfComponent";
+import { RemoveComponentAssembly } from "./RemoveComponentAssembly";
+import UpdateComponentAssembly from "./UpdateComponentAssembly";
+import AddAssembledOfComponent from "./AddAssembledOfComponent";
+import EnumTag from "../EnumTag";
+
+const renderManufacturerList = (
+  manufacturers:
+    | NonNullable<ComponentPartialFragment["manufacturers"]>
+    | NonNullable<ComponentPartialFragment["pendingManufacturers"]>,
+  componentId: Scalars["Uuid"]["output"],
+) => (
+  <InlineList
+    items={manufacturers.edges}
+    renderItem={(edge) => (
+      <span key={edge.node.id}>
+        <EntityLink entity={edge.node} route={paths.institution} />{" "}
+        {edge.isAuthorizedToRemoveEdge && (
+          <RemoveComponentManufacturer
+            componentId={componentId}
+            institutionId={edge.node.uuid}
+          />
+        )}
+      </span>
+    )}
+  />
+);
+
+export default function ComponentSummary({
+  entity,
+}: {
+  entity: ComponentsPartialFragment | ComponentPartialFragment;
+}) {
+  return (
+    <EntitySummary
+      entity={entity}
+      route={paths.component}
+      tags={entity.categories.map((x) => (
+        <EnumTag>{x}</EnumTag>
+      ))}
+      extra={[
+        "isAuthorizedToUpdateNode" in entity &&
+          entity.isAuthorizedToUpdateNode && (
+            <UpdateComponent key="UpdateComponent" component={entity} />
+          ),
+      ].filter(isTruthy)}
+    >
+      {(entity.availability?.from || entity.availability?.to) && (
+        <div>
+          Available <OpenEndedDateTimeRangeX range={entity.availability} />
+        </div>
+      )}
+      <div>
+        Manufactured by{" "}
+        {"pendingManufacturers" in entity ? (
+          <>
+            {renderManufacturerList(entity.manufacturers, entity.uuid)}
+            {entity.pendingManufacturers &&
+              entity.pendingManufacturers.edges.length > 0 && (
+                <>
+                  Awaiting verification of
+                  {renderManufacturerList(
+                    entity.pendingManufacturers,
+                    entity.uuid,
+                  )}
+                </>
+              )}
+            {entity.manufacturers.isAuthorizedToAddEdge && (
+              <AddComponentManufacturer componentId={entity.uuid} />
+            )}
+          </>
+        ) : (
+          <InlineList
+            items={entity.manufacturers.edges}
+            renderItem={(edge) => (
+              <span key={edge.node.id}>
+                <EntityLink entity={edge.node} route={paths.institution} />
+              </span>
+            )}
+          />
+        )}
+      </div>
+      {"assembledOf" in entity &&
+        (entity.assembledOf.edges.length > 0 ||
+          entity.assembledOf.isAuthorizedToAddEdge) && (
+          <div>
+            Assembled of{" "}
+            <InlineList
+              items={entity.assembledOf.edges}
+              renderItem={(edge) => (
+                <span key={edge.node.id}>
+                  <EntityLink entity={edge.node} route={paths.component} />{" "}
+                  {edge.index && <Tag color="purple">Layer {edge.index}</Tag>}
+                  {edge.primeSurface && (
+                    <Tag color="volcano">
+                      Prime Surface "{edge.primeSurface}"
+                    </Tag>
+                  )}
+                  {edge.isAuthorizedToUpdateEdge && (
+                    <UpdateComponentAssembly
+                      assembledComponent={{
+                        uuid: entity.uuid,
+                        name: entity.name,
+                      }}
+                      partComponent={{
+                        uuid: edge.node.uuid,
+                        name: edge.node.name,
+                      }}
+                      index={edge.index}
+                      primeSurface={edge.primeSurface}
+                    />
+                  )}
+                  {edge.isAuthorizedToRemoveEdge && (
+                    <RemoveComponentAssembly
+                      assembledComponentId={entity.uuid}
+                      partComponentId={edge.node.uuid}
+                    />
+                  )}
+                </span>
+              )}
+            />
+            {entity.assembledOf.isAuthorizedToAddEdge && (
+              <AddPartOfComponent assembledComponentId={entity.uuid} />
+            )}
+          </div>
+        )}
+      {"partOf" in entity &&
+        (entity.partOf.edges.length > 0 ||
+          entity.partOf.isAuthorizedToAddEdge) && (
+          <div>
+            Part of{" "}
+            <InlineList
+              items={entity.partOf.edges}
+              renderItem={(edge) => (
+                <span key={edge.node.id}>
+                  <Space>
+                    <EntityLink entity={edge.node} route={paths.component} />
+                    <span>
+                      {edge.index && (
+                        <Tag color="purple">Layer {edge.index}</Tag>
+                      )}
+                      {edge.primeSurface && (
+                        <Tag color="volcano">
+                          Prime Surface "{edge.primeSurface}"
+                        </Tag>
+                      )}
+                    </span>
+                  </Space>
+                  {edge.isAuthorizedToUpdateEdge && (
+                    <UpdateComponentAssembly
+                      assembledComponent={{
+                        uuid: edge.node.uuid,
+                        name: edge.node.name,
+                      }}
+                      partComponent={{
+                        uuid: entity.uuid,
+                        name: entity.name,
+                      }}
+                      index={edge.index}
+                      primeSurface={edge.primeSurface}
+                    />
+                  )}
+                  {edge.isAuthorizedToRemoveEdge && (
+                    <RemoveComponentAssembly
+                      assembledComponentId={edge.node.uuid}
+                      partComponentId={entity.uuid}
+                    />
+                  )}
+                </span>
+              )}
+            />
+            {entity.partOf.isAuthorizedToAddEdge && (
+              <AddAssembledOfComponent partComponentId={entity.uuid} />
+            )}
+          </div>
+        )}
+      {"variantOf" in entity &&
+        (entity.variantOf.edges.length > 0 ||
+          entity.variantOf.isAuthorizedToAddEdge) && (
+          <div>
+            Variant of{" "}
+            <InlineList
+              items={entity.variantOf.edges}
+              renderItem={(edge) => (
+                <span key={edge.node.id}>
+                  <EntityLink entity={edge.node} route={paths.component} />{" "}
+                  {edge.isAuthorizedToRemoveEdge && (
+                    <RemoveComponentVariant
+                      oneComponentId={entity.uuid}
+                      otherComponentId={edge.node.uuid}
+                    />
+                  )}
+                </span>
+              )}
+            />
+            {entity.variantOf.isAuthorizedToAddEdge && (
+              <AddVariantOfComponent componentId={entity.uuid} />
+            )}
+          </div>
+        )}
+      {"generalizationOf" in entity &&
+        (entity.generalizationOf.edges.length > 0 ||
+          entity.generalizationOf.isAuthorizedToAddEdge) && (
+          <div>
+            Generalization of{" "}
+            <InlineList
+              items={entity.generalizationOf.edges}
+              renderItem={(edge) => (
+                <span key={edge.node.id}>
+                  <EntityLink entity={edge.node} route={paths.component} />{" "}
+                  {edge.isAuthorizedToRemoveEdge && (
+                    <RemoveComponentGeneralization
+                      generalComponentId={entity.uuid}
+                      concreteComponentId={edge.node.uuid}
+                    />
+                  )}
+                </span>
+              )}
+            />
+            {entity.generalizationOf.isAuthorizedToAddEdge && (
+              <AddConcretizationOfComponent generalComponentId={entity.uuid} />
+            )}
+          </div>
+        )}
+      {"concretizationOf" in entity &&
+        (entity.concretizationOf.edges.length > 0 ||
+          entity.concretizationOf.isAuthorizedToAddEdge) && (
+          <div>
+            Concretization of{" "}
+            <InlineList
+              items={entity.concretizationOf.edges}
+              renderItem={(edge) => (
+                <span key={edge.node.id}>
+                  <EntityLink entity={edge.node} route={paths.component} />{" "}
+                  {edge.isAuthorizedToRemoveEdge && (
+                    <RemoveComponentGeneralization
+                      generalComponentId={edge.node.uuid}
+                      concreteComponentId={entity.uuid}
+                    />
+                  )}
+                </span>
+              )}
+            />
+            {entity.concretizationOf.isAuthorizedToAddEdge && (
+              <AddGeneralizationOfComponent concreteComponentId={entity.uuid} />
+            )}
+          </div>
+        )}
+      {"manager" in entity && entity.manager?.node && (
+        <div>
+          <Manager data={entity.manager.node} />
+        </div>
+      )}
+      {"extras" in entity && entity.extras != null && (
+        <div>
+          <JsonViewer data={entity.extras} />
+        </div>
+      )}
+      <Descriptions size="small" column={1}>
+        {"prime" in entity && entity.prime?.surface && (
+          <Descriptions.Item label="Prime Surface">
+            {entity.prime?.surface?.description}{" "}
+            {entity.prime?.surface?.reference?.title}
+          </Descriptions.Item>
+        )}
+        {"prime" in entity && entity.prime?.direction && (
+          <Descriptions.Item label="Prime Direction">
+            {entity.prime?.direction?.description}{" "}
+            {entity.prime?.direction?.reference?.title}
+          </Descriptions.Item>
+        )}
+        {"switchableLayers" in entity && entity.switchableLayers && (
+          <Descriptions.Item label="Switchable Layers">
+            {entity.switchableLayers?.description}{" "}
+            {entity.switchableLayers?.reference?.title}
+          </Descriptions.Item>
+        )}
+      </Descriptions>
+    </EntitySummary>
+  );
+}
diff --git a/frontend/components/components/ComponentTable.tsx b/frontend/components/components/ComponentTable.tsx
deleted file mode 100644
index 6e89d01b7..000000000
--- a/frontend/components/components/ComponentTable.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Table } from "antd";
-import { useState } from "react";
-import { setMapValue } from "../../lib/freeTextFilter";
-import { ComponentCategory } from "../../__generated__/graphql";
-import paths from "../../paths";
-import {
-  getAbbreviationColumnProps,
-  getDescriptionColumnProps,
-  getFilterableEnumListColumnProps,
-  getNameColumnProps,
-  getUuidColumnProps,
-} from "../../lib/table";
-import { ComponentsPartialFragment } from "../../queries/components.generated";
-
-interface ComponentTableProps {
-  loading: boolean;
-  components: ComponentsPartialFragment[];
-}
-
-export function ComponentTable({ loading, components }: ComponentTableProps) {
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
-
-  return (
-    <Table
-      loading={loading}
-      columns={[
-        getUuidColumnProps<(typeof components)[0]>(
-          onFilterTextChange,
-          (x) => filterText.get(x),
-          paths.component,
-        ),
-        getNameColumnProps<(typeof components)[0]>(onFilterTextChange, (x) =>
-          filterText.get(x),
-        ),
-        getAbbreviationColumnProps<(typeof components)[0]>(
-          onFilterTextChange,
-          (x) => filterText.get(x),
-        ),
-        getDescriptionColumnProps<(typeof components)[0]>(
-          onFilterTextChange,
-          (x) => filterText.get(x),
-        ),
-        getFilterableEnumListColumnProps<
-          (typeof components)[0],
-          ComponentCategory
-        >(
-          "Categories",
-          "categories",
-          Object.entries(ComponentCategory),
-          (record) => record.categories,
-          onFilterTextChange,
-          (x) => filterText.get(x),
-        ),
-      ]}
-      dataSource={components}
-    />
-  );
-}
diff --git a/frontend/components/components/CreateComponent.tsx b/frontend/components/components/CreateComponent.tsx
index 73fdf1400..0dd83113b 100644
--- a/frontend/components/components/CreateComponent.tsx
+++ b/frontend/components/components/CreateComponent.tsx
@@ -22,8 +22,8 @@ import {
 import { useState } from "react";
 import dayjs from "dayjs";
 import { InstitutionDocument } from "../../queries/institutions.generated";
-import { ReferenceForm } from "../ReferenceForm";
-import { SelectInstitutionId } from "../SelectInstitutionId";
+import { ReferenceSubform } from "../ReferenceSubform";
+import { InstitutionIdSelect } from "../institutions/InstitutionIdSelect";
 import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
@@ -145,8 +145,8 @@ export default function CreateComponent({
               showProgress: true,
               pauseOnHover: true,
               description: (
-                <>
-                  <Typography.Paragraph>
+                <div>
+                  <Typography.Paragraph style={{ maxWidth: "75ch" }}>
                     <Copyable text={component.uuid}>
                       <Link href={paths.component(component.uuid)}>
                         <Id value={component.uuid} />
@@ -154,8 +154,8 @@ export default function CreateComponent({
                     </Copyable>
                   </Typography.Paragraph>
                   {component?.pendingManufacturers != null &&
-                    component.pendingManufacturers.totalCount >= 1 && (
-                      <Typography.Paragraph>
+                    component.pendingManufacturers.totalCount > 0 && (
+                      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
                         The{" "}
                         {pluralize(
                           component.pendingManufacturers.totalCount,
@@ -176,7 +176,7 @@ export default function CreateComponent({
                         are waiting for confirmation.
                       </Typography.Paragraph>
                     )}
-                </>
+                </div>
               ),
             });
           }
@@ -234,7 +234,7 @@ export default function CreateComponent({
           rules={[{ required: true }]}
           initialValue={initialManufacturerId}
         >
-          <SelectInstitutionId />
+          <InstitutionIdSelect />
         </Form.Item>
         <Form.Item label="Availability" name="availability">
           <DatePicker.RangePicker allowEmpty={[true, true]} showTime />
@@ -250,35 +250,35 @@ export default function CreateComponent({
           />
         </Form.Item>
         <Divider />
-        <Form.Item label="Prime Surface" name="primeSurface">
+        <Form.Item label="Prime Surface">
           <Form.Item label="Description" name={["primeSurface", "description"]}>
             <Input />
           </Form.Item>
-          <ReferenceForm
+          <ReferenceSubform
             form={form}
             namespace={["primeSurface", "reference"]}
           />
         </Form.Item>
-        <Form.Item label="Prime Direction" name="primeDirection">
+        <Form.Item label="Prime Direction">
           <Form.Item
             label="Description"
             name={["primeDirection", "description"]}
           >
             <Input />
           </Form.Item>
-          <ReferenceForm
+          <ReferenceSubform
             form={form}
             namespace={["primeDirection", "reference"]}
           />
         </Form.Item>
-        <Form.Item label="Switchable Layers" name="switchableLayers">
+        <Form.Item label="Switchable Layers">
           <Form.Item
             label="Description"
             name={["switchableLayers", "description"]}
           >
             <Input />
           </Form.Item>
-          <ReferenceForm
+          <ReferenceSubform
             form={form}
             namespace={["switchableLayers", "reference"]}
           />
diff --git a/frontend/components/components/PaginatedComponents.tsx b/frontend/components/components/PaginatedComponents.tsx
new file mode 100644
index 000000000..0b7172bcc
--- /dev/null
+++ b/frontend/components/components/PaginatedComponents.tsx
@@ -0,0 +1,86 @@
+import {
+  ComponentsDocument,
+  ComponentNamesDocument,
+  ComponentsQueryVariables,
+} from "../../queries/components.generated";
+import paths from "../../paths";
+import ComponentList from "./ComponentList";
+import PaginatedEntities from "../entities/PaginatedEntities";
+import { ComponentCategory } from "../../__generated__/graphql";
+
+export default function PaginatedComponents({
+  where,
+  showJump = false,
+}: {
+  where?: ComponentsQueryVariables["where"];
+  showJump?: boolean;
+}) {
+  return (
+    <PaginatedEntities
+      entitiesQuery={ComponentsDocument}
+      namesQuery={ComponentNamesDocument}
+      where={where}
+      showJump={showJump}
+      route={paths.component}
+      list={(props) => <ComponentList {...props} />}
+      filterDefinitions={[
+        {
+          field: "name",
+          type: "string",
+        },
+        {
+          field: "abbreviation",
+          type: "string",
+        },
+        {
+          field: "description",
+          type: "string",
+        },
+        {
+          field: "categories",
+          type: "list",
+          item: {
+            type: "enum",
+            enumObject: ComponentCategory,
+          },
+        },
+        {
+          field: "manufacturers",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "name",
+                type: "string",
+              },
+              { field: "id", type: "uuid" },
+            ],
+          },
+        },
+        {
+          field: "manager",
+          type: "object",
+          items: [
+            {
+              field: "name",
+              type: "string",
+            },
+            { field: "id", type: "uuid" },
+          ],
+        },
+        {
+          field: "id",
+          type: "uuid",
+        },
+      ]}
+      sortDefinitions={[
+        { field: "name" },
+        { field: "abbreviation" },
+        { field: "createdAt" },
+        { field: "updatedAt" },
+        { field: "id" },
+      ]}
+    />
+  );
+}
diff --git a/frontend/components/components/RemoveComponentAssembly.tsx b/frontend/components/components/RemoveComponentAssembly.tsx
index afa3ea28d..c3ef1c181 100644
--- a/frontend/components/components/RemoveComponentAssembly.tsx
+++ b/frontend/components/components/RemoveComponentAssembly.tsx
@@ -66,7 +66,7 @@ export function RemoveComponentAssembly({
 
   return (
     <SafeDeleteButton
-      type="text"
+      type="icon"
       kind="remove"
       onConfirm={remove}
       deleting={mutating}
diff --git a/frontend/components/components/RemoveComponentGeneralization.tsx b/frontend/components/components/RemoveComponentGeneralization.tsx
index 5e503756c..b2ed0f6ae 100644
--- a/frontend/components/components/RemoveComponentGeneralization.tsx
+++ b/frontend/components/components/RemoveComponentGeneralization.tsx
@@ -66,7 +66,7 @@ export function RemoveComponentGeneralization({
 
   return (
     <SafeDeleteButton
-      type="text"
+      type="icon"
       kind="remove"
       onConfirm={remove}
       deleting={mutating}
diff --git a/frontend/components/components/RemoveComponentManufacturer.tsx b/frontend/components/components/RemoveComponentManufacturer.tsx
index af3a5bd6a..f647f9b4d 100644
--- a/frontend/components/components/RemoveComponentManufacturer.tsx
+++ b/frontend/components/components/RemoveComponentManufacturer.tsx
@@ -67,7 +67,7 @@ export function RemoveComponentManufacturer({
 
   return (
     <SafeDeleteButton
-      type="text"
+      type="icon"
       kind="remove"
       onConfirm={remove}
       deleting={mutating}
diff --git a/frontend/components/components/RemoveComponentVariant.tsx b/frontend/components/components/RemoveComponentVariant.tsx
index 1b776b917..6eeaf9887 100644
--- a/frontend/components/components/RemoveComponentVariant.tsx
+++ b/frontend/components/components/RemoveComponentVariant.tsx
@@ -66,7 +66,7 @@ export function RemoveComponentVariant({
 
   return (
     <SafeDeleteButton
-      type="text"
+      type="icon"
       kind="remove"
       onConfirm={remove}
       deleting={mutating}
diff --git a/frontend/components/components/UpdateComponent.tsx b/frontend/components/components/UpdateComponent.tsx
index 09641e781..349f3e9ea 100644
--- a/frontend/components/components/UpdateComponent.tsx
+++ b/frontend/components/components/UpdateComponent.tsx
@@ -11,10 +11,11 @@ import {
   ComponentCategory,
   DescriptionOrReferenceInput,
 } from "../../__generated__/graphql";
-import { ReferenceForm } from "../ReferenceForm";
+import { ReferenceSubform } from "../ReferenceSubform";
 import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import EditButton from "../EditButton";
 
 type FormValues = {
   name: string;
@@ -91,7 +92,10 @@ export default function UpdateComponent({ component }: UpdateComponentProps) {
         });
       },
       {
-        onSuccess: () => setOpen(false),
+        onSuccess: () => {
+          setGlobalErrorMessages([]);
+          setOpen(false);
+        },
         onError: (graphQlErrors, userErrors) =>
           setGlobalErrorMessages(
             augmentFormWithErrors(graphQlErrors, userErrors, form),
@@ -106,7 +110,7 @@ export default function UpdateComponent({ component }: UpdateComponentProps) {
 
   return (
     <>
-      <Button onClick={() => setOpen(true)}>Edit</Button>
+      <EditButton onClick={() => setOpen(true)} />
       <Modal
         open={open}
         title="Edit Component"
@@ -184,7 +188,7 @@ export default function UpdateComponent({ component }: UpdateComponentProps) {
             />
           </Form.Item>
           <Divider />
-          <Form.Item label="Prime Surface" name="primeSurface">
+          <Form.Item label="Prime Surface">
             <Form.Item
               label="Description"
               name={["primeSurface", "description"]}
@@ -192,13 +196,13 @@ export default function UpdateComponent({ component }: UpdateComponentProps) {
             >
               <Input />
             </Form.Item>
-            <ReferenceForm
+            <ReferenceSubform
               form={form}
               namespace={["primeSurface", "reference"]}
               initialValue={component.prime?.surface?.reference}
             />
           </Form.Item>
-          <Form.Item label="Prime Direction" name="primeDirection">
+          <Form.Item label="Prime Direction">
             <Form.Item
               label="Description"
               name={["primeDirection", "description"]}
@@ -206,13 +210,13 @@ export default function UpdateComponent({ component }: UpdateComponentProps) {
             >
               <Input />
             </Form.Item>
-            <ReferenceForm
+            <ReferenceSubform
               form={form}
               namespace={["primeDirection", "reference"]}
               initialValue={component.prime?.direction?.reference}
             />
           </Form.Item>
-          <Form.Item label="Switchable Layers" name="switchableLayers">
+          <Form.Item label="Switchable Layers">
             <Form.Item
               label="Description"
               name={["switchableLayers", "description"]}
@@ -220,7 +224,7 @@ export default function UpdateComponent({ component }: UpdateComponentProps) {
             >
               <Input />
             </Form.Item>
-            <ReferenceForm
+            <ReferenceSubform
               form={form}
               namespace={["switchableLayers", "reference"]}
               initialValue={component.switchableLayers?.reference}
diff --git a/frontend/components/components/UpdateComponentAssembly.tsx b/frontend/components/components/UpdateComponentAssembly.tsx
index c3123c094..aec25e8d9 100644
--- a/frontend/components/components/UpdateComponentAssembly.tsx
+++ b/frontend/components/components/UpdateComponentAssembly.tsx
@@ -10,6 +10,7 @@ import { ComponentDocument } from "../../queries/components.generated";
 import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import EditButton from "../EditButton";
 
 type FormValues = {
   index: Scalars["Byte"]["input"] | null | undefined;
@@ -21,7 +22,7 @@ interface UpdateComponentAssemblyProps {
   partComponent: { uuid: Scalars["Uuid"]["input"]; name: string };
   index: Scalars["Byte"]["input"] | null | undefined;
   primeSurface: PrimeSurface | null | undefined;
-};
+}
 
 export default function UpdateComponentAssembly(
   componentAssembly: UpdateComponentAssemblyProps,
@@ -71,7 +72,10 @@ export default function UpdateComponentAssembly(
           },
         }),
       {
-        onSuccess: () => setOpen(false),
+        onSuccess: () => {
+          setGlobalErrorMessages([]);
+          setOpen(false);
+        },
         onError: (graphQlErrors, userErrors) =>
           setGlobalErrorMessages(
             augmentFormWithErrors(graphQlErrors, userErrors, form),
@@ -86,7 +90,7 @@ export default function UpdateComponentAssembly(
 
   return (
     <>
-      <Button onClick={() => setOpen(true)}>Edit</Button>
+      <EditButton type="icon" onClick={() => setOpen(true)} />
       <Modal
         open={open}
         title="Edit Assembly"
diff --git a/frontend/components/data/DataSummary.tsx b/frontend/components/data/DataSummary.tsx
new file mode 100644
index 000000000..02cd58709
--- /dev/null
+++ b/frontend/components/data/DataSummary.tsx
@@ -0,0 +1,308 @@
+import * as graphql from "graphql";
+import { Breadcrumb, Flex, Tag, Tooltip, Tree, Typography } from "antd";
+import paths from "../../paths";
+import EntitySummary from "../entities/EntitySummary";
+import {
+  GetHttpsResourcePartialFragment,
+  DataPartialFragment,
+  ToTreeVertexAppliedConversionMethodPartialFragment,
+} from "../../queries/data.generated";
+import dayjs from "dayjs";
+import InlineList from "../InlineList";
+import EntityLink from "../entities/EntityLink";
+import { Scalars } from "../../__generated__/graphql";
+import JsonViewer from "../JsonViewer";
+import { useMemo, useState } from "react";
+import Copyable from "../Copyable";
+import { Reference } from "../Reference";
+import Link from "next/link";
+import CopyableBlock from "../CopyableBlock";
+import CodeViewer from "../CodeViewer";
+import AppliedMethodViewer from "../methods/AppliedMethodViewer";
+
+interface ResourceTreeNode {
+  key: string;
+  title: string;
+  vertexId: string;
+  parentId?: string;
+  value: GetHttpsResourcePartialFragment;
+  appliedConversionMethod?: ToTreeVertexAppliedConversionMethodPartialFragment;
+  children?: ResourceTreeNode[];
+}
+
+const transformToTree = (resourceTree: DataPartialFragment["resourceTree"]) => {
+  const { root, nonRootVertices } = resourceTree;
+  const childrenMap = new Map<
+    string,
+    DataPartialFragment["resourceTree"]["nonRootVertices"][0][]
+  >();
+  nonRootVertices.forEach((vertex) => {
+    const parentId = vertex.parentId;
+    if (!childrenMap.has(parentId)) {
+      childrenMap.set(parentId, []);
+    }
+    childrenMap.get(parentId)?.push(vertex);
+  });
+  const buildBranch = (
+    node:
+      | DataPartialFragment["resourceTree"]["nonRootVertices"][0]
+      | DataPartialFragment["resourceTree"]["root"],
+  ): ResourceTreeNode => {
+    const children = childrenMap.get(node.vertexId) || [];
+    return {
+      ...node,
+      key: node.vertexId,
+      title: node.vertexId,
+      // node.value.locator || node.value.description || `ID: ${node.vertexId}`,
+      children: children.map((child) => buildBranch(child)),
+    };
+  };
+  return buildBranch(root);
+};
+
+const getBreadcrumbItems = (
+  selectedId: string,
+  flatNodes: (
+    | DataPartialFragment["resourceTree"]["nonRootVertices"][0]
+    | DataPartialFragment["resourceTree"]["root"]
+  )[],
+) => {
+  const path = [];
+  let currentId = selectedId;
+  while (currentId) {
+    const node = flatNodes.find((node) => node.vertexId === currentId);
+    if (!node) break;
+    path.unshift({
+      title: `${node.value.dataFormat?.name ?? node.value.dataFormatId} (${node.vertexId})`,
+    });
+    if (node.__typename === "GetHttpsResourceTreeNonRootVertex") {
+      currentId = node.parentId;
+    } else {
+      break;
+    }
+  }
+  return path;
+};
+
+const nameFallback = (id: Scalars["Uuid"]["output"]) => ({
+  uuid: id,
+  name: id,
+});
+
+export default function DataSummary({
+  entity,
+  children,
+}: {
+  entity: DataPartialFragment;
+  children?: React.ReactNode;
+}) {
+  const rootResource = useMemo(
+    () => transformToTree(entity.resourceTree),
+    [entity],
+  );
+  const [selectedResource, setSelectedResource] = useState(rootResource);
+  const resourceNodes = [
+    entity.resourceTree.root,
+    ...entity.resourceTree.nonRootVertices,
+  ];
+
+  return (
+    <EntitySummary
+      entity={entity}
+      route={(id) => paths.opticalData(entity.database?.uuid, id)}
+      tags={[
+        <Tag key="updatedAt" style={{ fontWeight: "normal" }}>
+          <Tooltip title={`Updated At ${entity.timestamp}`}>
+            Updated At &ldquo;{dayjs(entity.timestamp).format("DD/MM/YYYY")}
+            &rdquo;
+          </Tooltip>
+        </Tag>,
+        <Tag key="createdAt" style={{ fontWeight: "normal" }}>
+          <Tooltip title={`Created At ${entity.createdAt}`}>
+            Created At &ldquo;{dayjs(entity.createdAt).format("DD/MM/YYYY")}
+            &rdquo;
+          </Tooltip>
+        </Tag>,
+        <Tag key="locale" style={{ fontWeight: "normal" }}>
+          Locale &ldquo;<Tooltip title="Locale">{entity.locale}</Tooltip>&rdquo;
+        </Tag>,
+      ]}
+    >
+      <div>
+        Data for component{" "}
+        {entity.component && (
+          <EntityLink
+            entity={entity.component ?? nameFallback(entity.componentId)}
+            route={paths.component}
+          />
+        )}{" "}
+        created by{" "}
+        <EntityLink
+          entity={entity.creator ?? nameFallback(entity.creatorId)}
+          route={paths.institution}
+        />{" "}
+        and stored in the{" "}
+        <EntityLink
+          entity={entity.database ?? nameFallback(entity.databaseId)}
+          route={paths.database}
+        />
+      </div>
+      <div>
+        Generated by applying the method{" "}
+        <AppliedMethodViewer value={entity.appliedMethod} />
+      </div>
+      {children && <div>{children}</div>}
+      {rootResource.children && rootResource.children.length > 0 && (
+        <Tree
+          showLine
+          treeData={[rootResource]}
+          onSelect={(_, info) => setSelectedResource(info.node)}
+        />
+      )}
+      {selectedResource && (
+        <div>
+          {resourceNodes.length > 1 && (
+            <Breadcrumb
+              items={getBreadcrumbItems(
+                selectedResource.vertexId,
+                resourceNodes,
+              )}
+            />
+          )}
+          {selectedResource.value.description && (
+            <div>{selectedResource.value.description}</div>
+          )}
+          <div>
+            Located at{" "}
+            <Copyable onlyIcon text={selectedResource.value.locator}>
+              <Typography.Link
+                href={selectedResource.value.locator}
+                target="_blank"
+              >
+                {selectedResource.value.locator}
+              </Typography.Link>
+            </Copyable>
+          </div>
+          <div>
+            Having the{" "}
+            <Typography.Link
+              href="https://csrc.nist.gov/pubs/fips/180-4/upd1/final"
+              target="_blank"
+            >
+              SHA-256
+            </Typography.Link>{" "}
+            hash value{" "}
+            <CodeViewer inline code={selectedResource.value.hashValue} /> as
+            unique digital fingerprint. Use it after downloading the data to
+            ensure that it has not been tampered with or gotten corrupted.
+          </div>
+          <div>
+            Being of the data format{" "}
+            <EntityLink
+              entity={
+                selectedResource.value.dataFormat ??
+                nameFallback(selectedResource.value.dataFormatId)
+              }
+              route={paths.dataFormat}
+            />
+            {selectedResource.value.archivedFilesMetaInformation?.length >
+              0 && (
+              <>
+                It is an archive format and the archive file contains the files{" "}
+                <InlineList
+                  items={selectedResource.value.archivedFilesMetaInformation}
+                  renderItem={(item) => (
+                    <span>
+                      ./{item.path.join("/")}=
+                      <EntityLink
+                        entity={
+                          item.dataFormat ?? nameFallback(item.dataFormatId)
+                        }
+                        route={paths.dataFormat}
+                      />
+                    </span>
+                  )}
+                />
+              </>
+            )}
+          </div>
+          {selectedResource.appliedConversionMethod && (
+            <div>
+              Generated by applying the conversion method{" "}
+              <AppliedMethodViewer
+                value={selectedResource.appliedConversionMethod}
+              />
+            </div>
+          )}
+        </div>
+      )}
+      {entity.approvals.length > 0 && (
+        <Flex gap="small">
+          {entity.approvals.map((approval) => (
+            <div>
+              The institution{" "}
+              <EntityLink
+                entity={approval.approver ?? nameFallback(approval.approverId)}
+                route={paths.institution}
+              />{" "}
+              approved on {dayjs(approval.timestamp).format("DD/MM/YYYY")} that
+              the data satisfies the statement given by the reference
+              <Reference data={approval.statement} />
+              This is proven by the GnuPG signature{" "}
+              <Copyable text={approval.signature}>
+                &ldquo;{approval.signature}
+                &rdquo;
+              </Copyable>{" "}
+              generated with the institution's GnuPG key{" "}
+              <Copyable text={approval.keyFingerprint}>
+                <Link href={paths.gnuPgKeyFingerprint(approval.keyFingerprint)}>
+                  {approval.keyFingerprint}
+                </Link>
+              </Copyable>{" "}
+              of the message
+              <CopyableBlock text={approval.message}>
+                <pre
+                  style={{
+                    overflow: "visible",
+                  }}
+                >
+                  <code style={{ whiteSpace: "nowrap" }}>
+                    {approval.message}
+                  </code>
+                </pre>
+              </CopyableBlock>
+              The message contains the statement and the response of the query
+              <CodeViewer code={graphql.print(graphql.parse(approval.query))} />
+              with the variables
+              <JsonViewer data={approval.variables} />
+              against the GraphQL endpoint of the database{" "}
+              <EntityLink
+                entity={entity.database ?? nameFallback(entity.databaseId)}
+                route={paths.database}
+              />
+              {entity.database?.locator && (
+                <>
+                  {" "}
+                  located at{" "}
+                  <Typography.Link href={entity.database.locator}>
+                    {entity.database.locator}
+                  </Typography.Link>
+                </>
+              )}
+              .
+            </div>
+          ))}
+        </Flex>
+      )}
+      {entity.warnings.length > 0 && (
+        <div>
+          Beware of{" "}
+          <InlineList
+            items={entity.warnings}
+            renderItem={(item) => <span>&ldquo;{item}&rdquo;</span>}
+          />
+        </div>
+      )}
+    </EntitySummary>
+  );
+}
diff --git a/frontend/components/data/calorimetric/CalorimetricData.tsx b/frontend/components/data/calorimetric/CalorimetricData.tsx
new file mode 100644
index 000000000..f0231e315
--- /dev/null
+++ b/frontend/components/data/calorimetric/CalorimetricData.tsx
@@ -0,0 +1,52 @@
+import { Scalars } from "../../../__generated__/graphql";
+import { CalorimetricDataDocument } from "../../../queries/data.generated";
+import { Skeleton, Result, Card, Divider } from "antd";
+import { useQuery } from "@apollo/client/react";
+import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
+import CalorimetricDataSummary from "./CalorimetricDataSummary";
+import QueryToolbar from "../../QueryToolbar";
+
+interface CalorimetricDataProps {
+  databaseId: Scalars["Uuid"]["input"];
+  id: Scalars["Uuid"]["input"];
+}
+
+export default function CalorimetricData({
+  databaseId,
+  id,
+}: CalorimetricDataProps) {
+  const queryVariables = {
+    databaseId: databaseId,
+    id: id,
+  };
+  const { loading, error, data } = useQuery(CalorimetricDataDocument, {
+    variables: queryVariables,
+  });
+  useQueryHandler({ error });
+  const theData = data?.data;
+
+  if (loading) {
+    return <Skeleton active avatar title />;
+  }
+
+  if (!theData) {
+    return (
+      <Result
+        status="500"
+        title="500"
+        subTitle="Sorry, something went wrong."
+      />
+    );
+  }
+
+  return (
+    <Card>
+      <CalorimetricDataSummary entity={theData} />
+      <Divider />
+      <QueryToolbar
+        query={CalorimetricDataDocument}
+        variables={queryVariables}
+      />
+    </Card>
+  );
+}
diff --git a/frontend/components/data/calorimetric/CalorimetricDataList.tsx b/frontend/components/data/calorimetric/CalorimetricDataList.tsx
new file mode 100644
index 000000000..9a39f4ce3
--- /dev/null
+++ b/frontend/components/data/calorimetric/CalorimetricDataList.tsx
@@ -0,0 +1,24 @@
+import { CalorimetricDataPartialFragment } from "../../../queries/data.generated";
+import EntityList from "../../entities/EntityList";
+import CalorimetricDataSummary from "./CalorimetricDataSummary";
+import EntityItem from "../../entities/EntityItem";
+
+export default function CalorimetricDataList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: CalorimetricDataPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <CalorimetricDataSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/data/calorimetric/CalorimetricDataSummary.tsx b/frontend/components/data/calorimetric/CalorimetricDataSummary.tsx
new file mode 100644
index 000000000..653ce9036
--- /dev/null
+++ b/frontend/components/data/calorimetric/CalorimetricDataSummary.tsx
@@ -0,0 +1,36 @@
+import { isTruthy } from "../../../lib/array";
+import { CalorimetricDataPartialFragment } from "../../../queries/data.generated";
+import Float from "../../Float";
+import InlineList from "../../InlineList";
+import DataSummary from "../DataSummary";
+
+export default function CalorimetricDataSummary({
+  entity,
+}: {
+  entity: CalorimetricDataPartialFragment;
+}) {
+  const values = [
+    entity.gValues.length > 0 && (
+      <div key="gValues">
+        G-Values{" "}
+        <InlineList
+          items={entity.gValues}
+          renderItem={(item, index) => <Float key={index} value={item} />}
+        />
+      </div>
+    ),
+    entity.uValues.length > 0 && (
+      <div key="uValues">
+        U-Values{" "}
+        <InlineList
+          items={entity.uValues}
+          renderItem={(item, index) => <Float key={index} value={item} />}
+        />
+      </div>
+    ),
+  ].filter(isTruthy);
+
+  return (
+    <DataSummary entity={entity}>{values.length > 0 && values}</DataSummary>
+  );
+}
diff --git a/frontend/components/data/calorimetric/PaginatedCalorimetricData.tsx b/frontend/components/data/calorimetric/PaginatedCalorimetricData.tsx
new file mode 100644
index 000000000..23448c017
--- /dev/null
+++ b/frontend/components/data/calorimetric/PaginatedCalorimetricData.tsx
@@ -0,0 +1,68 @@
+import {
+  AllCalorimetricDataDocument,
+  AllCalorimetricDataQueryVariables,
+} from "../../../queries/data.generated";
+import CalorimetricDataList from "./CalorimetricDataList";
+import PaginatedEntities from "../../entities/PaginatedEntities";
+
+export default function PaginatedCalorimetricData({
+  where,
+}: {
+  where?: AllCalorimetricDataQueryVariables["where"];
+}) {
+  return (
+    <PaginatedEntities
+      showJump={false}
+      entitiesQuery={AllCalorimetricDataDocument}
+      where={where}
+      list={(props) => <CalorimetricDataList {...props} />}
+      filterDefinitions={[
+        {
+          field: "componentId",
+          type: "uuid",
+        },
+        {
+          field: "resources",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "dataFormatId",
+                type: "uuid",
+              },
+              {
+                field: "archivedFilesMetaInformation",
+                type: "list",
+                item: {
+                  type: "object",
+                  items: [
+                    {
+                      field: "dataFormatId",
+                      type: "uuid",
+                    },
+                  ],
+                },
+              },
+            ],
+          },
+        },
+        {
+          field: "gValues",
+          type: "list",
+          item: {
+            type: "float",
+          },
+        },
+        {
+          field: "uValues",
+          type: "list",
+          item: {
+            type: "float",
+          },
+        },
+      ]}
+      sortDefinitions={[]}
+    />
+  );
+}
diff --git a/frontend/components/data/geometric/GeometricData.tsx b/frontend/components/data/geometric/GeometricData.tsx
new file mode 100644
index 000000000..a8d82cd81
--- /dev/null
+++ b/frontend/components/data/geometric/GeometricData.tsx
@@ -0,0 +1,46 @@
+import { Scalars } from "../../../__generated__/graphql";
+import { GeometricDataDocument } from "../../../queries/data.generated";
+import { Skeleton, Result, Card, Divider } from "antd";
+import { useQuery } from "@apollo/client/react";
+import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
+import GeometricDataSummary from "./GeometricDataSummary";
+import QueryToolbar from "../../QueryToolbar";
+
+interface GeometricDataProps {
+  databaseId: Scalars["Uuid"]["input"];
+  id: Scalars["Uuid"]["input"];
+}
+
+export default function GeometricData({ databaseId, id }: GeometricDataProps) {
+  const queryVariables = {
+    databaseId: databaseId,
+    id: id,
+  };
+  const { loading, error, data } = useQuery(GeometricDataDocument, {
+    variables: queryVariables,
+  });
+  useQueryHandler({ error });
+  const theData = data?.data;
+
+  if (loading) {
+    return <Skeleton active avatar title />;
+  }
+
+  if (!theData) {
+    return (
+      <Result
+        status="500"
+        title="500"
+        subTitle="Sorry, something went wrong."
+      />
+    );
+  }
+
+  return (
+    <Card>
+      <GeometricDataSummary entity={theData} />
+      <Divider />
+      <QueryToolbar query={GeometricDataDocument} variables={queryVariables} />
+    </Card>
+  );
+}
diff --git a/frontend/components/data/geometric/GeometricDataList.tsx b/frontend/components/data/geometric/GeometricDataList.tsx
new file mode 100644
index 000000000..355f10f79
--- /dev/null
+++ b/frontend/components/data/geometric/GeometricDataList.tsx
@@ -0,0 +1,24 @@
+import { GeometricDataPartialFragment } from "../../../queries/data.generated";
+import EntityList from "../../entities/EntityList";
+import GeometricDataSummary from "./GeometricDataSummary";
+import EntityItem from "../../entities/EntityItem";
+
+export default function GeometricDataList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: GeometricDataPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <GeometricDataSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/data/geometric/GeometricDataSummary.tsx b/frontend/components/data/geometric/GeometricDataSummary.tsx
new file mode 100644
index 000000000..595004546
--- /dev/null
+++ b/frontend/components/data/geometric/GeometricDataSummary.tsx
@@ -0,0 +1,27 @@
+import { isTruthy } from "../../../lib/array";
+import { GeometricDataPartialFragment } from "../../../queries/data.generated";
+import Float from "../../Float";
+import InlineList from "../../InlineList";
+import DataSummary from "../DataSummary";
+
+export default function GeometricDataSummary({
+  entity,
+}: {
+  entity: GeometricDataPartialFragment;
+}) {
+  const values = [
+    entity.thicknesses.length > 0 && (
+      <div key="thicknesses">
+        Thicknesses{" "}
+        <InlineList
+          items={entity.thicknesses}
+          renderItem={(item, index) => <Float key={index} value={item} />}
+        />
+      </div>
+    ),
+  ].filter(isTruthy);
+
+  return (
+    <DataSummary entity={entity}>{values.length > 0 && values}</DataSummary>
+  );
+}
diff --git a/frontend/components/data/geometric/PaginatedGeometricData.tsx b/frontend/components/data/geometric/PaginatedGeometricData.tsx
new file mode 100644
index 000000000..362c3d3f1
--- /dev/null
+++ b/frontend/components/data/geometric/PaginatedGeometricData.tsx
@@ -0,0 +1,61 @@
+import {
+  AllGeometricDataDocument,
+  AllGeometricDataQueryVariables,
+} from "../../../queries/data.generated";
+import GeometricDataList from "./GeometricDataList";
+import PaginatedEntities from "../../entities/PaginatedEntities";
+
+export default function PaginatedGeometricData({
+  where,
+}: {
+  where?: AllGeometricDataQueryVariables["where"];
+}) {
+  return (
+    <PaginatedEntities
+      showJump={false}
+      entitiesQuery={AllGeometricDataDocument}
+      where={where}
+      list={(props) => <GeometricDataList {...props} />}
+      filterDefinitions={[
+        {
+          field: "componentId",
+          type: "uuid",
+        },
+        {
+          field: "resources",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "dataFormatId",
+                type: "uuid",
+              },
+              {
+                field: "archivedFilesMetaInformation",
+                type: "list",
+                item: {
+                  type: "object",
+                  items: [
+                    {
+                      field: "dataFormatId",
+                      type: "uuid",
+                    },
+                  ],
+                },
+              },
+            ],
+          },
+        },
+        {
+          field: "thicknesses",
+          type: "list",
+          item: {
+            type: "float",
+          },
+        },
+      ]}
+      sortDefinitions={[]}
+    />
+  );
+}
diff --git a/frontend/components/data/hygrothermal/HygrothermalData.tsx b/frontend/components/data/hygrothermal/HygrothermalData.tsx
new file mode 100644
index 000000000..38cf700fc
--- /dev/null
+++ b/frontend/components/data/hygrothermal/HygrothermalData.tsx
@@ -0,0 +1,52 @@
+import { Scalars } from "../../../__generated__/graphql";
+import { HygrothermalDataDocument } from "../../../queries/data.generated";
+import { Skeleton, Result, Card, Divider } from "antd";
+import { useQuery } from "@apollo/client/react";
+import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
+import HygrothermalDataSummary from "./HygrothermalDataSummary";
+import QueryToolbar from "../../QueryToolbar";
+
+interface HygrothermalDataProps {
+  databaseId: Scalars["Uuid"]["input"];
+  id: Scalars["Uuid"]["input"];
+}
+
+export default function HygrothermalData({
+  databaseId,
+  id,
+}: HygrothermalDataProps) {
+  const queryVariables = {
+    databaseId: databaseId,
+    id: id,
+  };
+  const { loading, error, data } = useQuery(HygrothermalDataDocument, {
+    variables: queryVariables,
+  });
+  useQueryHandler({ error });
+  const theData = data?.data;
+
+  if (loading) {
+    return <Skeleton active avatar title />;
+  }
+
+  if (!theData) {
+    return (
+      <Result
+        status="500"
+        title="500"
+        subTitle="Sorry, something went wrong."
+      />
+    );
+  }
+
+  return (
+    <Card>
+      <HygrothermalDataSummary entity={theData} />
+      <Divider />
+      <QueryToolbar
+        query={HygrothermalDataDocument}
+        variables={queryVariables}
+      />
+    </Card>
+  );
+}
diff --git a/frontend/components/data/hygrothermal/HygrothermalDataList.tsx b/frontend/components/data/hygrothermal/HygrothermalDataList.tsx
new file mode 100644
index 000000000..75dea2140
--- /dev/null
+++ b/frontend/components/data/hygrothermal/HygrothermalDataList.tsx
@@ -0,0 +1,24 @@
+import { HygrothermalDataPartialFragment } from "../../../queries/data.generated";
+import EntityList from "../../entities/EntityList";
+import HygrothermalDataSummary from "./HygrothermalDataSummary";
+import EntityItem from "../../entities/EntityItem";
+
+export default function HygrothermalDataList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: HygrothermalDataPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <HygrothermalDataSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/data/hygrothermal/HygrothermalDataSummary.tsx b/frontend/components/data/hygrothermal/HygrothermalDataSummary.tsx
new file mode 100644
index 000000000..ceb47444f
--- /dev/null
+++ b/frontend/components/data/hygrothermal/HygrothermalDataSummary.tsx
@@ -0,0 +1,10 @@
+import { HygrothermalDataPartialFragment } from "../../../queries/data.generated";
+import DataSummary from "../DataSummary";
+
+export default function HygrothermalDataSummary({
+  entity,
+}: {
+  entity: HygrothermalDataPartialFragment;
+}) {
+  return <DataSummary entity={entity}></DataSummary>;
+}
diff --git a/frontend/components/data/hygrothermal/PaginatedHygrothermalData.tsx b/frontend/components/data/hygrothermal/PaginatedHygrothermalData.tsx
new file mode 100644
index 000000000..6fd55c2fe
--- /dev/null
+++ b/frontend/components/data/hygrothermal/PaginatedHygrothermalData.tsx
@@ -0,0 +1,54 @@
+import {
+  AllHygrothermalDataDocument,
+  AllHygrothermalDataQueryVariables,
+} from "../../../queries/data.generated";
+import HygrothermalDataList from "./HygrothermalDataList";
+import PaginatedEntities from "../../entities/PaginatedEntities";
+
+export default function PaginatedHygrothermalData({
+  where,
+}: {
+  where?: AllHygrothermalDataQueryVariables["where"];
+}) {
+  return (
+    <PaginatedEntities
+      showJump={false}
+      entitiesQuery={AllHygrothermalDataDocument}
+      where={where}
+      list={(props) => <HygrothermalDataList {...props} />}
+      filterDefinitions={[
+        {
+          field: "componentId",
+          type: "uuid",
+        },
+        {
+          field: "resources",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "dataFormatId",
+                type: "uuid",
+              },
+              {
+                field: "archivedFilesMetaInformation",
+                type: "list",
+                item: {
+                  type: "object",
+                  items: [
+                    {
+                      field: "dataFormatId",
+                      type: "uuid",
+                    },
+                  ],
+                },
+              },
+            ],
+          },
+        },
+      ]}
+      sortDefinitions={[]}
+    />
+  );
+}
diff --git a/frontend/components/data/lifeCycle/LifeCycleData.tsx b/frontend/components/data/lifeCycle/LifeCycleData.tsx
new file mode 100644
index 000000000..6e5acab55
--- /dev/null
+++ b/frontend/components/data/lifeCycle/LifeCycleData.tsx
@@ -0,0 +1,46 @@
+import { Scalars } from "../../../__generated__/graphql";
+import { LifeCycleDataDocument } from "../../../queries/data.generated";
+import { Skeleton, Result, Card, Divider } from "antd";
+import { useQuery } from "@apollo/client/react";
+import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
+import LifeCycleDataSummary from "./LifeCycleDataSummary";
+import QueryToolbar from "../../QueryToolbar";
+
+interface LifeCycleDataProps {
+  databaseId: Scalars["Uuid"]["input"];
+  id: Scalars["Uuid"]["input"];
+}
+
+export default function LifeCycleData({ databaseId, id }: LifeCycleDataProps) {
+  const queryVariables = {
+    databaseId: databaseId,
+    id: id,
+  };
+  const { loading, error, data } = useQuery(LifeCycleDataDocument, {
+    variables: queryVariables,
+  });
+  useQueryHandler({ error });
+  const theData = data?.data;
+
+  if (loading) {
+    return <Skeleton active avatar title />;
+  }
+
+  if (!theData) {
+    return (
+      <Result
+        status="500"
+        title="500"
+        subTitle="Sorry, something went wrong."
+      />
+    );
+  }
+
+  return (
+    <Card>
+      <LifeCycleDataSummary entity={theData} />
+      <Divider />
+      <QueryToolbar query={LifeCycleDataDocument} variables={queryVariables} />
+    </Card>
+  );
+}
diff --git a/frontend/components/data/lifeCycle/LifeCycleDataList.tsx b/frontend/components/data/lifeCycle/LifeCycleDataList.tsx
new file mode 100644
index 000000000..7b0000480
--- /dev/null
+++ b/frontend/components/data/lifeCycle/LifeCycleDataList.tsx
@@ -0,0 +1,24 @@
+import { LifeCycleDataPartialFragment } from "../../../queries/data.generated";
+import EntityList from "../../entities/EntityList";
+import LifeCycleDataSummary from "./LifeCycleDataSummary";
+import EntityItem from "../../entities/EntityItem";
+
+export default function LifeCycleDataList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: LifeCycleDataPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <LifeCycleDataSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/data/lifeCycle/LifeCycleDataSummary.tsx b/frontend/components/data/lifeCycle/LifeCycleDataSummary.tsx
new file mode 100644
index 000000000..745e15236
--- /dev/null
+++ b/frontend/components/data/lifeCycle/LifeCycleDataSummary.tsx
@@ -0,0 +1,10 @@
+import { LifeCycleDataPartialFragment } from "../../../queries/data.generated";
+import DataSummary from "../DataSummary";
+
+export default function LifeCycleDataSummary({
+  entity,
+}: {
+  entity: LifeCycleDataPartialFragment;
+}) {
+  return <DataSummary entity={entity}></DataSummary>;
+}
diff --git a/frontend/components/data/lifeCycle/PaginatedLifeCycleData.tsx b/frontend/components/data/lifeCycle/PaginatedLifeCycleData.tsx
new file mode 100644
index 000000000..2cd3c2ab7
--- /dev/null
+++ b/frontend/components/data/lifeCycle/PaginatedLifeCycleData.tsx
@@ -0,0 +1,54 @@
+import {
+  AllLifeCycleDataDocument,
+  AllLifeCycleDataQueryVariables,
+} from "../../../queries/data.generated";
+import LifeCycleDataList from "./LifeCycleDataList";
+import PaginatedEntities from "../../entities/PaginatedEntities";
+
+export default function PaginatedLifeCycleData({
+  where,
+}: {
+  where?: AllLifeCycleDataQueryVariables["where"];
+}) {
+  return (
+    <PaginatedEntities
+      showJump={false}
+      entitiesQuery={AllLifeCycleDataDocument}
+      where={where}
+      list={(props) => <LifeCycleDataList {...props} />}
+      filterDefinitions={[
+        {
+          field: "componentId",
+          type: "uuid",
+        },
+        {
+          field: "resources",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "dataFormatId",
+                type: "uuid",
+              },
+              {
+                field: "archivedFilesMetaInformation",
+                type: "list",
+                item: {
+                  type: "object",
+                  items: [
+                    {
+                      field: "dataFormatId",
+                      type: "uuid",
+                    },
+                  ],
+                },
+              },
+            ],
+          },
+        },
+      ]}
+      sortDefinitions={[]}
+    />
+  );
+}
diff --git a/frontend/components/data/optical/OpticalData.tsx b/frontend/components/data/optical/OpticalData.tsx
new file mode 100644
index 000000000..941997550
--- /dev/null
+++ b/frontend/components/data/optical/OpticalData.tsx
@@ -0,0 +1,49 @@
+import { Scalars } from "../../../__generated__/graphql";
+import { OpticalDataDocument } from "../../../queries/data.generated";
+import { Skeleton, Result, Card, Divider } from "antd";
+import { useQuery } from "@apollo/client/react";
+import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
+import OpticalDataSummary from "./OpticalDataSummary";
+import OpticalDataRibbon from "./OpticalDataRibbon";
+import QueryToolbar from "../../QueryToolbar";
+
+interface OpticalDataProps {
+  databaseId: Scalars["Uuid"]["input"];
+  id: Scalars["Uuid"]["input"];
+}
+
+export default function OpticalData({ databaseId, id }: OpticalDataProps) {
+  const queryVariables = {
+    databaseId: databaseId,
+    id: id,
+  };
+  const { loading, error, data } = useQuery(OpticalDataDocument, {
+    variables: queryVariables,
+  });
+  useQueryHandler({ error });
+  const theData = data?.data;
+
+  if (loading) {
+    return <Skeleton active avatar title />;
+  }
+
+  if (!theData) {
+    return (
+      <Result
+        status="500"
+        title="500"
+        subTitle="Sorry, something went wrong."
+      />
+    );
+  }
+
+  return (
+    <OpticalDataRibbon {...theData}>
+      <Card>
+        <OpticalDataSummary entity={theData} />
+        <Divider />
+        <QueryToolbar query={OpticalDataDocument} variables={queryVariables} />
+      </Card>
+    </OpticalDataRibbon>
+  );
+}
diff --git a/frontend/components/data/optical/OpticalDataList.tsx b/frontend/components/data/optical/OpticalDataList.tsx
new file mode 100644
index 000000000..25ed8009a
--- /dev/null
+++ b/frontend/components/data/optical/OpticalDataList.tsx
@@ -0,0 +1,27 @@
+import { OpticalDataPartialFragment } from "../../../queries/data.generated";
+import EntityList from "../../entities/EntityList";
+import OpticalDataSummary from "./OpticalDataSummary";
+import EntityItem from "../../entities/EntityItem";
+import OpticalDataRibbon from "./OpticalDataRibbon";
+
+export default function OpticalDataList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: OpticalDataPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <OpticalDataRibbon {...node}>
+          <EntityItem>
+            <OpticalDataSummary entity={node} />
+          </EntityItem>
+        </OpticalDataRibbon>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/data/optical/OpticalDataRibbon.tsx b/frontend/components/data/optical/OpticalDataRibbon.tsx
new file mode 100644
index 000000000..9da55bc58
--- /dev/null
+++ b/frontend/components/data/optical/OpticalDataRibbon.tsx
@@ -0,0 +1,26 @@
+import { Badge } from "antd";
+import {
+  OpticalComponentSubtype,
+  OpticalComponentType,
+} from "../../../__generated__/graphql";
+
+export default function OpticalDataRibbon({
+  type,
+  subtype,
+  children,
+}: {
+  type?: OpticalComponentType | null;
+  subtype?: OpticalComponentSubtype | null;
+  children: React.ReactNode;
+}) {
+  return type == null && subtype == null ? (
+    children
+  ) : (
+    <Badge.Ribbon
+      text={`${type ?? "unknown"}${subtype && ` (${subtype})`}`}
+      style={{ textTransform: "lowercase", fontWeight: "normal" }}
+    >
+      {children}
+    </Badge.Ribbon>
+  );
+}
diff --git a/frontend/components/data/optical/OpticalDataSummary.tsx b/frontend/components/data/optical/OpticalDataSummary.tsx
new file mode 100644
index 000000000..68cfc9511
--- /dev/null
+++ b/frontend/components/data/optical/OpticalDataSummary.tsx
@@ -0,0 +1,88 @@
+import { OpticalDataPartialFragment } from "../../../queries/data.generated";
+import Float from "../../Float";
+import InlineList from "../../InlineList";
+import DataSummary from "../DataSummary";
+import CielabColorViewer from "../../CielabColorViewer";
+import { CoatedSide } from "../../../__generated__/graphql";
+import { isTruthy } from "../../../lib/array";
+
+export default function OpticalDataSummary({
+  entity,
+}: {
+  entity: OpticalDataPartialFragment;
+}) {
+  const values = [
+    entity.coatedSide && entity.coatedSide != CoatedSide.NotApplicable && (
+      <div key="coatedSide">Coated Side {entity.coatedSide}</div>
+    ),
+    entity.infraredEmittances.length > 0 && (
+      <div key="infraredEmittances">
+        Infrared Emittances{" "}
+        <InlineList
+          items={entity.infraredEmittances}
+          renderItem={(item, index) => <Float key={index} value={item} />}
+        />
+      </div>
+    ),
+    entity.nearnormalHemisphericalSolarReflectances.length > 0 && (
+      <div key="nearnormalHemisphericalSolarReflectances">
+        Near-Normal Hemispherical Solar Reflectances{" "}
+        <InlineList
+          items={entity.nearnormalHemisphericalSolarReflectances}
+          renderItem={(item, index) => <Float key={index} value={item} />}
+        />
+      </div>
+    ),
+    entity.nearnormalHemisphericalSolarTransmittances.length > 0 && (
+      <div key="nearnormalHemisphericalSolarTransmittances">
+        Near-Normal Hemispherical Solar Transmittances{" "}
+        <InlineList
+          items={entity.nearnormalHemisphericalSolarTransmittances}
+          renderItem={(item, index) => <Float key={index} value={item} />}
+        />
+      </div>
+    ),
+    entity.nearnormalHemisphericalVisibleReflectances.length > 0 && (
+      <div key="nearnormalHemisphericalVisibleReflectances">
+        Near-Normal Hemispherical Visible Reflectances{" "}
+        <InlineList
+          items={entity.nearnormalHemisphericalVisibleReflectances}
+          renderItem={(item, index) => <Float key={index} value={item} />}
+        />
+      </div>
+    ),
+    entity.nearnormalHemisphericalVisibleTransmittances.length > 0 && (
+      <div key="nearnormalHemisphericalVisibleTransmittances">
+        Near-Normal Hemispherical Visible Transmittances{" "}
+        <InlineList
+          items={entity.nearnormalHemisphericalVisibleTransmittances}
+          renderItem={(item, index) => <Float key={index} value={item} />}
+        />
+      </div>
+    ),
+    entity.cielabColors.length > 0 && (
+      <div key="cielabColors">
+        CIELAB Color Space{" "}
+        <InlineList
+          items={entity.cielabColors}
+          renderItem={(item, index) => (
+            <CielabColorViewer key={index} value={item} />
+          )}
+        />
+      </div>
+    ),
+    entity.colorRenderingIndices.length > 0 && (
+      <div key="colorRenderingIndices">
+        Color Rendering Indices{" "}
+        <InlineList
+          items={entity.colorRenderingIndices}
+          renderItem={(item, index) => <Float key={index} value={item} />}
+        />
+      </div>
+    ),
+  ].filter(isTruthy);
+
+  return (
+    <DataSummary entity={entity}>{values.length > 0 && values}</DataSummary>
+  );
+}
diff --git a/frontend/components/data/optical/PaginatedOpticalData.tsx b/frontend/components/data/optical/PaginatedOpticalData.tsx
new file mode 100644
index 000000000..cf8876545
--- /dev/null
+++ b/frontend/components/data/optical/PaginatedOpticalData.tsx
@@ -0,0 +1,132 @@
+import {
+  AllOpticalDataDocument,
+  AllOpticalDataQueryVariables,
+} from "../../../queries/data.generated";
+import OpticalDataList from "./OpticalDataList";
+import PaginatedEntities from "../../entities/PaginatedEntities";
+
+export default function PaginatedOpticalData({
+  where,
+}: {
+  where?: AllOpticalDataQueryVariables["where"];
+}) {
+  return (
+    <PaginatedEntities
+      showJump={false}
+      entitiesQuery={AllOpticalDataDocument}
+      where={where}
+      list={(props) => <OpticalDataList {...props} />}
+      filterDefinitions={[
+        {
+          field: "componentId",
+          type: "uuid",
+        },
+        {
+          field: "resources",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "dataFormatId",
+                type: "uuid",
+              },
+              {
+                field: "archivedFilesMetaInformation",
+                type: "list",
+                item: {
+                  type: "object",
+                  items: [
+                    {
+                      field: "dataFormatId",
+                      type: "uuid",
+                    },
+                  ],
+                },
+              },
+            ],
+          },
+        },
+        // {
+        //   field: "type",
+        //   type: "enum",
+        //   enumObject: OpticalComponentType,
+        // },
+        // {
+        //   field: "subtype",
+        //   type: "enum",
+        //   enumObject: OpticalComponentSubtype,
+        // },
+        // {
+        //   field: "coatedSide",
+        //   type: "enum",
+        //   enumObject: CoatedSide,
+        // },
+        {
+          field: "nearnormalHemisphericalSolarReflectances",
+          type: "list",
+          item: {
+            type: "float",
+          },
+        },
+        {
+          field: "nearnormalHemisphericalSolarTransmittances",
+          type: "list",
+          item: {
+            type: "float",
+          },
+        },
+        {
+          field: "nearnormalHemisphericalVisibleReflectances",
+          type: "list",
+          item: {
+            type: "float",
+          },
+        },
+        {
+          field: "nearnormalHemisphericalVisibleTransmittances",
+          type: "list",
+          item: {
+            type: "float",
+          },
+        },
+        {
+          field: "infraredEmittances",
+          type: "list",
+          item: {
+            type: "float",
+          },
+        },
+        {
+          field: "cielabColors",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "lStar",
+                type: "float",
+              },
+              {
+                field: "aStar",
+                type: "float",
+              },
+              {
+                field: "bStar",
+                type: "float",
+              },
+            ],
+          },
+        },
+        {
+          field: "colorRenderingIndices",
+          type: "list",
+          item: {
+            type: "float",
+          },
+        },
+      ]}
+      sortDefinitions={[]}
+    />
+  );
+}
diff --git a/frontend/components/data/photovoltaic/PaginatedPhotovoltaicData.tsx b/frontend/components/data/photovoltaic/PaginatedPhotovoltaicData.tsx
new file mode 100644
index 000000000..6dd105c20
--- /dev/null
+++ b/frontend/components/data/photovoltaic/PaginatedPhotovoltaicData.tsx
@@ -0,0 +1,54 @@
+import {
+  AllPhotovoltaicDataDocument,
+  AllPhotovoltaicDataQueryVariables,
+} from "../../../queries/data.generated";
+import PhotovoltaicDataList from "./PhotovoltaicDataList";
+import PaginatedEntities from "../../entities/PaginatedEntities";
+
+export default function PaginatedPhotovoltaicData({
+  where,
+}: {
+  where?: AllPhotovoltaicDataQueryVariables["where"];
+}) {
+  return (
+    <PaginatedEntities
+      showJump={false}
+      entitiesQuery={AllPhotovoltaicDataDocument}
+      where={where}
+      list={(props) => <PhotovoltaicDataList {...props} />}
+      filterDefinitions={[
+        {
+          field: "componentId",
+          type: "uuid",
+        },
+        {
+          field: "resources",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "dataFormatId",
+                type: "uuid",
+              },
+              {
+                field: "archivedFilesMetaInformation",
+                type: "list",
+                item: {
+                  type: "object",
+                  items: [
+                    {
+                      field: "dataFormatId",
+                      type: "uuid",
+                    },
+                  ],
+                },
+              },
+            ],
+          },
+        },
+      ]}
+      sortDefinitions={[]}
+    />
+  );
+}
diff --git a/frontend/components/data/photovoltaic/PhotovoltaicData.tsx b/frontend/components/data/photovoltaic/PhotovoltaicData.tsx
new file mode 100644
index 000000000..149ed0d10
--- /dev/null
+++ b/frontend/components/data/photovoltaic/PhotovoltaicData.tsx
@@ -0,0 +1,52 @@
+import { Scalars } from "../../../__generated__/graphql";
+import { PhotovoltaicDataDocument } from "../../../queries/data.generated";
+import { Skeleton, Result, Card, Divider } from "antd";
+import { useQuery } from "@apollo/client/react";
+import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
+import PhotovoltaicDataSummary from "./PhotovoltaicDataSummary";
+import QueryToolbar from "../../QueryToolbar";
+
+interface PhotovoltaicDataProps {
+  databaseId: Scalars["Uuid"]["input"];
+  id: Scalars["Uuid"]["input"];
+}
+
+export default function PhotovoltaicData({
+  databaseId,
+  id,
+}: PhotovoltaicDataProps) {
+  const queryVariables = {
+    databaseId: databaseId,
+    id: id,
+  };
+  const { loading, error, data } = useQuery(PhotovoltaicDataDocument, {
+    variables: queryVariables,
+  });
+  useQueryHandler({ error });
+  const theData = data?.data;
+
+  if (loading) {
+    return <Skeleton active avatar title />;
+  }
+
+  if (!theData) {
+    return (
+      <Result
+        status="500"
+        title="500"
+        subTitle="Sorry, something went wrong."
+      />
+    );
+  }
+
+  return (
+    <Card>
+      <PhotovoltaicDataSummary entity={theData} />
+      <Divider />
+      <QueryToolbar
+        query={PhotovoltaicDataDocument}
+        variables={queryVariables}
+      />
+    </Card>
+  );
+}
diff --git a/frontend/components/data/photovoltaic/PhotovoltaicDataList.tsx b/frontend/components/data/photovoltaic/PhotovoltaicDataList.tsx
new file mode 100644
index 000000000..c451adb73
--- /dev/null
+++ b/frontend/components/data/photovoltaic/PhotovoltaicDataList.tsx
@@ -0,0 +1,24 @@
+import { PhotovoltaicDataPartialFragment } from "../../../queries/data.generated";
+import EntityList from "../../entities/EntityList";
+import PhotovoltaicDataSummary from "./PhotovoltaicDataSummary";
+import EntityItem from "../../entities/EntityItem";
+
+export default function PhotovoltaicDataList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: PhotovoltaicDataPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <PhotovoltaicDataSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/data/photovoltaic/PhotovoltaicDataSummary.tsx b/frontend/components/data/photovoltaic/PhotovoltaicDataSummary.tsx
new file mode 100644
index 000000000..a4d624ab7
--- /dev/null
+++ b/frontend/components/data/photovoltaic/PhotovoltaicDataSummary.tsx
@@ -0,0 +1,10 @@
+import { PhotovoltaicDataPartialFragment } from "../../../queries/data.generated";
+import DataSummary from "../DataSummary";
+
+export default function PhotovoltaicDataSummary({
+  entity,
+}: {
+  entity: PhotovoltaicDataPartialFragment;
+}) {
+  return <DataSummary entity={entity}></DataSummary>;
+}
diff --git a/frontend/components/dataFormats/CreateDataFormat.tsx b/frontend/components/dataFormats/CreateDataFormat.tsx
index 362906bd6..42acde436 100644
--- a/frontend/components/dataFormats/CreateDataFormat.tsx
+++ b/frontend/components/dataFormats/CreateDataFormat.tsx
@@ -8,7 +8,7 @@ import {
 import { ReferenceInput, Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
 import { InstitutionDocument } from "../../queries/institutions.generated";
-import { ReferenceForm } from "../ReferenceForm";
+import { ReferenceSubform } from "../ReferenceSubform";
 import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
@@ -164,7 +164,7 @@ export default function CreateDataFormat({ managerId }: CreateDataFormatProps) {
           <Input />
         </Form.Item>
         <Divider />
-        <ReferenceForm form={form} namespace={["reference"]} />
+        <ReferenceSubform form={form} namespace={["reference"]} />
         <Form.Item {...tailLayout}>
           <Button type="primary" htmlType="submit" loading={mutating}>
             Create
diff --git a/frontend/components/dataFormats/DataFormat.tsx b/frontend/components/dataFormats/DataFormat.tsx
index f12dd2e1a..b7951d537 100644
--- a/frontend/components/dataFormats/DataFormat.tsx
+++ b/frontend/components/dataFormats/DataFormat.tsx
@@ -1,23 +1,21 @@
 import { Scalars } from "../../__generated__/graphql";
 import { DataFormatDocument } from "../../queries/dataFormats.generated";
-import { Skeleton, Result, Descriptions, Typography } from "antd";
-import paths from "../../paths";
-import PageHeader from "../PageHeader";
-import { Reference } from "../Reference";
-import UpdateDataFormat from "./UpdateDataFormat";
+import { Skeleton, Result, Card, Divider } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
-import { isTruthy } from "../../lib/array";
+import DataFormatSummary from "./DataFormatSummary";
+import QueryToolbar from "../QueryToolbar";
 
 interface DataFormatProps {
   dataFormatId: Scalars["Uuid"]["input"];
 }
 
 export default function DataFormat({ dataFormatId }: DataFormatProps) {
+  const queryVariables = {
+    uuid: dataFormatId,
+  };
   const { loading, error, data } = useQuery(DataFormatDocument, {
-    variables: {
-      uuid: dataFormatId,
-    },
+    variables: queryVariables,
   });
   useQueryHandler({ error });
   const dataFormat = data?.dataFormat;
@@ -37,46 +35,10 @@ export default function DataFormat({ dataFormatId }: DataFormatProps) {
   }
 
   return (
-    <>
-      <PageHeader
-        id={dataFormat.uuid}
-        title={dataFormat.name}
-        subTitle={dataFormat.description}
-        extra={[
-          dataFormat.isAuthorizedToUpdateNode && (
-            <UpdateDataFormat key="updateDataFormat" dataFormat={dataFormat} />
-          ),
-        ].filter(isTruthy)}
-      >
-        <Descriptions size="small" column={1}>
-          <Descriptions.Item label="UUID">{dataFormat.uuid}</Descriptions.Item>
-          <Descriptions.Item label="Extension">
-            {dataFormat.extension}
-          </Descriptions.Item>
-          <Descriptions.Item label="Media Type">
-            <Typography.Link href="http://www.iana.org/assignments/media-types/media-types.xhtml">
-              {dataFormat.mediaType}
-            </Typography.Link>
-          </Descriptions.Item>
-          {dataFormat.schemaLocator && (
-            <Descriptions.Item label="Schema">
-              <Typography.Link href={dataFormat.schemaLocator}>
-                {dataFormat.schemaLocator}
-              </Typography.Link>
-            </Descriptions.Item>
-          )}
-          <Descriptions.Item label="Reference">
-            <Reference reference={dataFormat.reference} />
-          </Descriptions.Item>
-          <Descriptions.Item label="Managed by">
-            <Typography.Link
-              href={paths.institution(dataFormat.manager.node.uuid)}
-            >
-              {dataFormat.manager.node.name}
-            </Typography.Link>
-          </Descriptions.Item>
-        </Descriptions>
-      </PageHeader>
-    </>
+    <Card>
+      <DataFormatSummary entity={dataFormat} />
+      <Divider />
+      <QueryToolbar query={DataFormatDocument} variables={queryVariables} />
+    </Card>
   );
 }
diff --git a/frontend/components/dataFormats/DataFormatList.tsx b/frontend/components/dataFormats/DataFormatList.tsx
new file mode 100644
index 000000000..d1e33c3f5
--- /dev/null
+++ b/frontend/components/dataFormats/DataFormatList.tsx
@@ -0,0 +1,24 @@
+import { DataFormatsPartialFragment } from "../../queries/dataFormats.generated";
+import EntityList from "../entities/EntityList";
+import DataFormatSummary from "./DataFormatSummary";
+import EntityItem from "../entities/EntityItem";
+
+export default function DataFormatList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: DataFormatsPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <DataFormatSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/dataFormats/DataFormatSummary.tsx b/frontend/components/dataFormats/DataFormatSummary.tsx
new file mode 100644
index 000000000..f7c747e18
--- /dev/null
+++ b/frontend/components/dataFormats/DataFormatSummary.tsx
@@ -0,0 +1,60 @@
+import { Tag, Tooltip, Typography } from "antd";
+import { isTruthy } from "../../lib/array";
+import paths from "../../paths";
+import EntitySummary from "../entities/EntitySummary";
+import { Reference } from "../Reference";
+import UpdateDataFormat from "./UpdateDataFormat";
+import {
+  DataFormatsPartialFragment,
+  DataFormatPartialFragment,
+} from "../../queries/dataFormats.generated";
+import Manager from "../Manager";
+
+export default function DataFormatSummary({
+  entity,
+}: {
+  entity: DataFormatsPartialFragment | DataFormatPartialFragment;
+}) {
+  return (
+    <EntitySummary
+      entity={entity}
+      route={paths.dataFormat}
+      tags={[
+        <Tag key="extension" style={{ fontWeight: "normal" }}>
+          <Tooltip title="File Extension">*.{entity.extension}</Tooltip>
+        </Tag>,
+        <Tag key="mediaType" style={{ fontWeight: "normal" }}>
+          <Tooltip title="Open Media-Type Specification">
+            <Typography.Link
+              target="_blank"
+              rel="noopener noreferrer"
+              href={`https://www.iana.org/assignments/media-types/${entity.mediaType}`}
+            >
+              {entity.mediaType}
+            </Typography.Link>
+          </Tooltip>
+        </Tag>,
+      ]}
+      extra={[
+        "isAuthorizedToUpdateNode" in entity &&
+          entity.isAuthorizedToUpdateNode && (
+            <UpdateDataFormat key="updateDataFormat" dataFormat={entity} />
+          ),
+      ].filter(isTruthy)}
+    >
+      {entity.schemaLocator && (
+        <div>
+          <Typography.Link href={entity.schemaLocator}>
+            {entity.schemaLocator}
+          </Typography.Link>
+        </div>
+      )}
+      {entity.reference && <Reference data={entity.reference} />}
+      {"manager" in entity && (
+        <div>
+          <Manager data={entity.manager.node} />
+        </div>
+      )}
+    </EntitySummary>
+  );
+}
diff --git a/frontend/components/dataFormats/DataFormatTable.tsx b/frontend/components/dataFormats/DataFormatTable.tsx
deleted file mode 100644
index 073524541..000000000
--- a/frontend/components/dataFormats/DataFormatTable.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import { Table } from "antd";
-import {
-  getExternallyLinkedFilterableLocatorColumnProps,
-  getFilterableStringColumnProps,
-  getNameColumnProps,
-  getDescriptionColumnProps,
-  getUuidColumnProps,
-  getReferenceColumnProps,
-} from "../../lib/table";
-import paths from "../../paths";
-import { useState } from "react";
-import { setMapValue } from "../../lib/freeTextFilter";
-import { DataFormatsPartialFragment } from "../../queries/dataFormats.generated";
-
-interface DataFormatTableProps {
-  loading: boolean;
-  dataFormats: DataFormatsPartialFragment[];
-};
-
-export function DataFormatTable({
-  loading,
-  dataFormats,
-}: DataFormatTableProps) {
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
-
-  return (
-    <Table
-      loading={loading}
-      columns={[
-        {
-          ...getUuidColumnProps<(typeof dataFormats)[0]>(
-            onFilterTextChange,
-            (x) => filterText.get(x),
-            paths.dataFormat,
-          ),
-        },
-        {
-          ...getNameColumnProps<(typeof dataFormats)[0]>(
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-        {
-          ...getDescriptionColumnProps<(typeof dataFormats)[0]>(
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-        {
-          ...getFilterableStringColumnProps<(typeof dataFormats)[0]>(
-            "Media Type",
-            "mediaType",
-            (record) => record.mediaType,
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-        {
-          ...getFilterableStringColumnProps<(typeof dataFormats)[0]>(
-            "Extension",
-            "extension",
-            (record) => record.extension,
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-        {
-          ...getExternallyLinkedFilterableLocatorColumnProps<
-            (typeof dataFormats)[0]
-          >(
-            "Schema",
-            "schemaLocator",
-            (record) => record.schemaLocator,
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-        {
-          ...getReferenceColumnProps<(typeof dataFormats)[0]>(
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-      ]}
-      dataSource={dataFormats}
-    />
-  );
-}
diff --git a/frontend/components/dataFormats/PaginatedDataFormats.tsx b/frontend/components/dataFormats/PaginatedDataFormats.tsx
new file mode 100644
index 000000000..578116afd
--- /dev/null
+++ b/frontend/components/dataFormats/PaginatedDataFormats.tsx
@@ -0,0 +1,68 @@
+import {
+  DataFormatsDocument,
+  DataFormatNamesDocument,
+  DataFormatsQueryVariables,
+} from "../../queries/dataFormats.generated";
+import paths from "../../paths";
+import DataFormatList from "./DataFormatList";
+import PaginatedEntities from "../entities/PaginatedEntities";
+
+export default function PaginatedDataFormats({
+  where,
+  showJump = false,
+}: {
+  where?: DataFormatsQueryVariables["where"];
+  showJump?: boolean;
+}) {
+  return (
+    <PaginatedEntities
+      entitiesQuery={DataFormatsDocument}
+      namesQuery={DataFormatNamesDocument}
+      where={where}
+      showJump={showJump}
+      route={paths.dataFormat}
+      list={(props) => <DataFormatList {...props} />}
+      filterDefinitions={[
+        {
+          field: "name",
+          type: "string",
+        },
+        {
+          field: "description",
+          type: "string",
+        },
+        {
+          field: "extension",
+          type: "string",
+        },
+        {
+          field: "mediaType",
+          type: "string",
+        },
+        {
+          field: "manager",
+          type: "object",
+          items: [
+            {
+              field: "name",
+              type: "string",
+            },
+            { field: "id", type: "uuid" },
+          ],
+        },
+        {
+          field: "id",
+          type: "uuid",
+        },
+      ]}
+      sortDefinitions={[
+        { field: "name" },
+        { field: "extension" },
+        { field: "mediaType" },
+        { field: "createdAt" },
+        { field: "updatedAt" },
+        { field: "id" },
+      ]}
+    />
+  );
+}
diff --git a/frontend/components/dataFormats/UpdateDataFormat.tsx b/frontend/components/dataFormats/UpdateDataFormat.tsx
index dd504b980..1b7bf9387 100644
--- a/frontend/components/dataFormats/UpdateDataFormat.tsx
+++ b/frontend/components/dataFormats/UpdateDataFormat.tsx
@@ -7,10 +7,11 @@ import {
 } from "../../queries/dataFormats.generated";
 import { ReferenceInput, Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
-import { ReferenceForm } from "../ReferenceForm";
+import { ReferenceSubform } from "../ReferenceSubform";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
+import EditButton from "../EditButton";
 
 type FormValues = {
   name: string;
@@ -68,6 +69,7 @@ export default function UpdateDataFormat({
       },
       {
         onSuccess: async () => {
+          setGlobalErrorMessages([]);
           setOpen(false);
         },
         onError: (graphQlErrors, userErrors) =>
@@ -84,7 +86,7 @@ export default function UpdateDataFormat({
 
   return (
     <>
-      <Button onClick={() => setOpen(true)}>Edit</Button>
+      <EditButton onClick={() => setOpen(true)} />
       <Modal
         open={open}
         title="Edit Data Format"
@@ -164,7 +166,7 @@ export default function UpdateDataFormat({
             <Input />
           </Form.Item>
           <Divider />
-          <ReferenceForm
+          <ReferenceSubform
             form={form}
             namespace={["reference"]}
             initialValue={dataFormat.reference}
diff --git a/frontend/components/databases/CreateDatabase.tsx b/frontend/components/databases/CreateDatabase.tsx
index 680957ec1..8be04c05f 100644
--- a/frontend/components/databases/CreateDatabase.tsx
+++ b/frontend/components/databases/CreateDatabase.tsx
@@ -1,16 +1,22 @@
 import { useMutation } from "@apollo/client/react";
-import { Form, Input, Button } from "antd";
+import { Form, Input, Button, App, Typography } from "antd";
 import {
   CreateDatabaseDocument,
   CreateDatabaseMutation,
   DatabasesDocument,
 } from "../../queries/databases.generated";
-import { Scalars } from "../../__generated__/graphql";
+import {
+  DatabaseVerificationState,
+  Scalars,
+} from "../../__generated__/graphql";
 import { useState } from "react";
 import { InstitutionDocument } from "../../queries/institutions.generated";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
+import { ExclamationCircleTwoTone } from "@ant-design/icons";
+import Link from "next/link";
+import paths from "../../paths";
 
 type FormValues = {
   name: string;
@@ -27,6 +33,7 @@ export default function CreateDatabase({ operatorId }: CreateDatabaseProps) {
     new Array<string>(),
   );
   const [form] = Form.useForm<FormValues>();
+  const { modal } = App.useApp();
 
   const [createDatabaseMutation] = useMutation(CreateDatabaseDocument, {
     // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
@@ -44,10 +51,14 @@ export default function CreateDatabase({ operatorId }: CreateDatabaseProps) {
     ],
   });
 
-  const { mutating, withMutationHandler, augmentFormWithErrors } =
-    useMutationHandler<CreateDatabaseMutation>({
-      getErrors: (data) => data.createDatabase.errors,
-    });
+  const {
+    mutating,
+    withMutationHandler,
+    augmentFormWithErrors,
+    messageMissingModel,
+  } = useMutationHandler<CreateDatabaseMutation>({
+    getErrors: (data) => data.createDatabase.errors,
+  });
 
   const onFinish = (values: FormValues) => {
     withMutationHandler(
@@ -63,9 +74,40 @@ export default function CreateDatabase({ operatorId }: CreateDatabaseProps) {
           },
         }),
       {
-        onSuccess: () => {
+        onSuccess: (data) => {
           setGlobalErrorMessages([]);
           form.resetFields();
+          const model = data?.createDatabase.database;
+          if (!model) {
+            messageMissingModel();
+          } else {
+            if (model.verificationState == DatabaseVerificationState.Pending) {
+              modal.info({
+                title: "Database Verification Code",
+                centered: true,
+                width: 500,
+                content: (
+                  <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+                    <span>
+                      <ExclamationCircleTwoTone twoToneColor="#f9b02e" />{" "}
+                    </span>
+                    Have your database&apos;s GraphQL endpoint return the
+                    verification code &ldquo;{model.verificationCode}&rdquo;
+                    (without the quotation marks), when queried for the GraphQL
+                    query &ldquo;verificationCode&rdquo;. Then, press the
+                    &ldquo;Verify&rdquo; button on
+                    <Link href={paths.database(model.uuid)}>{model.name}</Link>
+                    to make the metabase assert that the verification codes
+                    match which proves that you control the GraphQL endpoint
+                    {model.locator}. Verified databases are publicly listed and
+                    included in data searches. When you are logged-in and the
+                    database is unverified, the verification code is shown on
+                    <Link href={paths.database(model.uuid)}>{model.name}</Link>.
+                  </Typography.Paragraph>
+                ),
+              });
+            }
+          }
         },
         onError: (graphQlErrors, userErrors) =>
           setGlobalErrorMessages(
diff --git a/frontend/components/databases/Database.tsx b/frontend/components/databases/Database.tsx
index 791a4f57f..a9df81799 100644
--- a/frontend/components/databases/Database.tsx
+++ b/frontend/components/databases/Database.tsx
@@ -3,25 +3,22 @@ import {
   Scalars,
 } from "../../__generated__/graphql";
 import { DatabaseDocument } from "../../queries/databases.generated";
-import { Skeleton, Result, Descriptions, Typography, Tag } from "antd";
-import PageHeader from "../PageHeader";
-import Link from "next/link";
-import paths from "../../paths";
-import UpdateDatabase from "./UpdateDatabase";
-import VerifyDatabase from "./VerifyDatabase";
+import { Skeleton, Result, Typography, Card, Divider } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
-import { isTruthy } from "../../lib/array";
+import DatabaseSummary from "./DatabaseSummary";
+import QueryToolbar from "../QueryToolbar";
 
 interface DatabaseProps {
   databaseId: Scalars["Uuid"]["input"];
 }
 
 export default function Database({ databaseId }: DatabaseProps) {
+  const queryVariables = {
+    uuid: databaseId,
+  };
   const { loading, error, data } = useQuery(DatabaseDocument, {
-    variables: {
-      uuid: databaseId,
-    },
+    variables: queryVariables,
   });
   useQueryHandler({ error });
   const database = data?.database;
@@ -41,53 +38,23 @@ export default function Database({ databaseId }: DatabaseProps) {
   }
 
   return (
-    <>
-      <PageHeader
-        id={database.uuid}
-        title={database.name}
-        subTitle={database.description}
-        extra={[
-          database.isAuthorizedToUpdateNode && (
-            <UpdateDatabase key="updateDatabase" database={database} />
-          ),
-          database.isAuthorizedToVerifyNode &&
-            database.verificationState == DatabaseVerificationState.Pending && (
-              <VerifyDatabase key="verifyDatabase" databaseId={database.uuid} />
-            ),
-        ].filter(isTruthy)}
-        tags={[
-          <Tag key="verificationState" color="magenta">
-            {database.verificationState}
-          </Tag>,
-        ]}
-      >
-        <Descriptions size="small" column={1}>
-          <Descriptions.Item label="UUID">{database.uuid}</Descriptions.Item>
-          <Descriptions.Item label="Located at">
-            <Typography.Link href={database.locator}>
-              {database.locator}
-            </Typography.Link>
-          </Descriptions.Item>
-          <Descriptions.Item label="Operated by">
-            <Link href={paths.institution(database.operator.node.uuid)}>
-              {database.operator.node.name}
-            </Link>
-          </Descriptions.Item>
-        </Descriptions>
-      </PageHeader>
+    <Card>
+      <DatabaseSummary entity={database} />
       {database.isAuthorizedToVerifyNode &&
         database.verificationState == DatabaseVerificationState.Pending && (
-          <Typography.Paragraph>
+          <Typography.Paragraph style={{ maxWidth: "75ch" }}>
             Have your database&apos;s GraphQL endpoint return the verification
-            code &ldquo;
-            {database.verificationCode}&rdquo; (without the quotation marks),
-            when queried for the GraphQL query &ldquo;verificationCode&rdquo;.
-            Then, press the &ldquo;Verify&rdquo; button above to make the
-            metabase assert that the verification codes match which proves that
-            you control the GraphQL endpoint {database.locator}. Verified
-            databases are publicly listed and included in data searches.
+            code &ldquo;{database.verificationCode}&rdquo; (without the
+            quotation marks), when queried for the GraphQL query
+            &ldquo;verificationCode&rdquo;. Then, press the &ldquo;Verify&rdquo;
+            button above to make the metabase assert that the verification codes
+            match which proves that you control the GraphQL endpoint{" "}
+            {database.locator}. Verified databases are publicly listed and
+            included in data searches.
           </Typography.Paragraph>
         )}
-    </>
+      <Divider />
+      <QueryToolbar query={DatabaseDocument} variables={queryVariables} />
+    </Card>
   );
 }
diff --git a/frontend/components/databases/DatabaseList.tsx b/frontend/components/databases/DatabaseList.tsx
new file mode 100644
index 000000000..c439bdb2d
--- /dev/null
+++ b/frontend/components/databases/DatabaseList.tsx
@@ -0,0 +1,24 @@
+import { DatabasesPartialFragment } from "../../queries/databases.generated";
+import EntityList from "../entities/EntityList";
+import DatabaseSummary from "./DatabaseSummary";
+import EntityItem from "../entities/EntityItem";
+
+export default function DatabaseList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: DatabasesPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <DatabaseSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/databases/DatabaseSummary.tsx b/frontend/components/databases/DatabaseSummary.tsx
new file mode 100644
index 000000000..4568256c0
--- /dev/null
+++ b/frontend/components/databases/DatabaseSummary.tsx
@@ -0,0 +1,54 @@
+import { Tag, Typography } from "antd";
+import paths from "../../paths";
+import {
+  DatabasesPartialFragment,
+  DatabasePartialFragment,
+  PendingDatabasesPartialFragment,
+} from "../../queries/databases.generated";
+import EntityLink from "../entities/EntityLink";
+import EntitySummary from "../entities/EntitySummary";
+import { DatabaseVerificationState } from "../../__generated__/graphql";
+import { isTruthy } from "../../lib/array";
+import UpdateDatabase from "./UpdateDatabase";
+import VerifyDatabase from "./VerifyDatabase";
+
+export default function DatabaseSummary({
+  entity,
+}: {
+  entity:
+    | DatabasesPartialFragment
+    | PendingDatabasesPartialFragment
+    | DatabasePartialFragment;
+}) {
+  return (
+    <EntitySummary
+      entity={entity}
+      route={paths.database}
+      tags={[
+        <Tag key="verificationState" color="magenta">
+          {entity.verificationState}
+        </Tag>,
+      ]}
+      extra={[
+        "isAuthorizedToVerifyNode" in entity &&
+          entity.isAuthorizedToVerifyNode &&
+          entity.verificationState == DatabaseVerificationState.Pending && (
+            <VerifyDatabase key="verifyDatabase" databaseId={entity.uuid} />
+          ),
+        "isAuthorizedToUpdateNode" in entity &&
+          entity.isAuthorizedToUpdateNode && (
+            <UpdateDatabase key="updateDatabase" database={entity} />
+          ),
+      ].filter(isTruthy)}
+    >
+      <div>
+        Operated by <EntityLink entity={entity} route={paths.database} />
+      </div>
+      <div>
+        <Typography.Link href={entity.locator}>
+          {entity.locator}
+        </Typography.Link>
+      </div>
+    </EntitySummary>
+  );
+}
diff --git a/frontend/components/databases/DatabaseTable.tsx b/frontend/components/databases/DatabaseTable.tsx
deleted file mode 100644
index 1da2c4c8a..000000000
--- a/frontend/components/databases/DatabaseTable.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import paths from "../../paths";
-import { Table } from "antd";
-import { useState } from "react";
-import { setMapValue } from "../../lib/freeTextFilter";
-import {
-  getExternallyLinkedFilterableLocatorColumnProps,
-  getNameColumnProps,
-  getDescriptionColumnProps,
-  getInternallyLinkedFilterableStringColumnProps,
-  getUuidColumnProps,
-} from "../../lib/table";
-import { DatabasesPartialFragment } from "../../queries/databases.generated";
-
-// TODO Pagination. See https://www.apollographql.com/docs/react/pagination/core-api/
-interface DatabaseTableProps {
-  loading: boolean;
-  databases: DatabasesPartialFragment[];
-}
-
-export function DatabaseTable({ loading, databases }: DatabaseTableProps) {
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
-
-  return (
-    <Table
-      loading={loading}
-      columns={[
-        {
-          ...getUuidColumnProps<(typeof databases)[0]>(
-            onFilterTextChange,
-            (x) => filterText.get(x),
-            paths.database,
-          ),
-        },
-        {
-          ...getNameColumnProps<(typeof databases)[0]>(
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-        {
-          ...getDescriptionColumnProps<(typeof databases)[0]>(
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-        {
-          ...getExternallyLinkedFilterableLocatorColumnProps<
-            (typeof databases)[0]
-          >(
-            "Locator",
-            "locator",
-            (record) => record.locator,
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-        {
-          ...getInternallyLinkedFilterableStringColumnProps<
-            (typeof databases)[0]
-          >(
-            "Operator",
-            "operator",
-            (record) => record.operator.node.name,
-            onFilterTextChange,
-            (x) => filterText.get(x),
-            (x) => paths.institution(x.operator.node.uuid),
-          ),
-        },
-      ]}
-      dataSource={databases}
-    />
-  );
-}
-
-export default DatabaseTable;
diff --git a/frontend/components/databases/PaginatedDatabases.tsx b/frontend/components/databases/PaginatedDatabases.tsx
new file mode 100644
index 000000000..de97cbaea
--- /dev/null
+++ b/frontend/components/databases/PaginatedDatabases.tsx
@@ -0,0 +1,62 @@
+import {
+  DatabasesDocument,
+  DatabaseNamesDocument,
+  DatabasesQueryVariables,
+} from "../../queries/databases.generated";
+import paths from "../../paths";
+import DatabaseList from "./DatabaseList";
+import PaginatedEntities from "../entities/PaginatedEntities";
+
+export default function PaginatedDatabases({
+  where,
+  showJump = false,
+}: {
+  where?: DatabasesQueryVariables["where"];
+  showJump?: boolean;
+}) {
+  return (
+    <PaginatedEntities
+      entitiesQuery={DatabasesDocument}
+      namesQuery={DatabaseNamesDocument}
+      where={where}
+      showJump={showJump}
+      route={paths.database}
+      list={(props) => <DatabaseList {...props} />}
+      filterDefinitions={[
+        {
+          field: "name",
+          type: "string",
+        },
+        {
+          field: "description",
+          type: "string",
+        },
+        {
+          field: "locator",
+          type: "url",
+        },
+        {
+          field: "operator",
+          type: "object",
+          items: [
+            {
+              field: "name",
+              type: "string",
+            },
+            { field: "id", type: "uuid" },
+          ],
+        },
+        {
+          field: "id",
+          type: "uuid",
+        },
+      ]}
+      sortDefinitions={[
+        { field: "name" },
+        { field: "createdAt" },
+        { field: "updatedAt" },
+        { field: "id" },
+      ]}
+    />
+  );
+}
diff --git a/frontend/components/databases/PendingDatabaseList.tsx b/frontend/components/databases/PendingDatabaseList.tsx
new file mode 100644
index 000000000..8475bfbfe
--- /dev/null
+++ b/frontend/components/databases/PendingDatabaseList.tsx
@@ -0,0 +1,24 @@
+import { useQuery } from "@apollo/client/react";
+import { PendingDatabasesDocument } from "../../queries/databases.generated";
+import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
+import EntityList from "../entities/EntityList";
+import EntityItem from "../entities/EntityItem";
+import DatabaseSummary from "./DatabaseSummary";
+
+export default function PendingDatabaseList() {
+  const { data, loading, error } = useQuery(PendingDatabasesDocument);
+  useQueryHandler({ error });
+  const nodes = data?.pendingDatabases?.edges?.map((e) => e.node) || [];
+
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <DatabaseSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/databases/PendingDatabases.tsx b/frontend/components/databases/PendingDatabases.tsx
deleted file mode 100644
index ad605e82d..000000000
--- a/frontend/components/databases/PendingDatabases.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useQuery } from "@apollo/client/react";
-import { List } from "antd";
-import { PendingDatabasesDocument } from "../../queries/databases.generated";
-import Link from "next/link";
-import paths from "../../paths";
-import VerifyDatabase from "./VerifyDatabase";
-import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
-
-interface PendingDatabasesProps {};
-
-export default function PendingDatabases({}: PendingDatabasesProps) {
-  const { data, loading, error } = useQuery(PendingDatabasesDocument);
-  useQueryHandler({ error });
-
-  return (
-    <>
-      <List
-        size="small"
-        loading={loading}
-        dataSource={data?.pendingDatabases?.edges?.map((e) => e.node) || []}
-        renderItem={(item) => (
-          <List.Item>
-            <Link href={paths.database(item.uuid)}>{item.name}</Link>
-            {item.isAuthorizedToVerifyNode && (
-              <VerifyDatabase databaseId={item.uuid} />
-            )}
-          </List.Item>
-        )}
-      />
-    </>
-  );
-}
diff --git a/frontend/components/databases/UpdateDatabase.tsx b/frontend/components/databases/UpdateDatabase.tsx
index d0495e83f..4c766412a 100644
--- a/frontend/components/databases/UpdateDatabase.tsx
+++ b/frontend/components/databases/UpdateDatabase.tsx
@@ -10,6 +10,7 @@ import { useState } from "react";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
+import EditButton from "../EditButton";
 
 type FormValues = {
   name: string;
@@ -50,6 +51,7 @@ export default function UpdateDatabase({ database }: UpdateDatabaseProps) {
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           setOpen(false);
         },
         onError: (graphQlErrors, userErrors) =>
@@ -66,7 +68,7 @@ export default function UpdateDatabase({ database }: UpdateDatabaseProps) {
 
   return (
     <>
-      <Button onClick={() => setOpen(true)}>Edit</Button>
+      <EditButton onClick={() => setOpen(true)} />
       <Modal
         open={open}
         title="Edit Database"
diff --git a/frontend/components/entities/EntityItem.tsx b/frontend/components/entities/EntityItem.tsx
new file mode 100644
index 000000000..93584dc27
--- /dev/null
+++ b/frontend/components/entities/EntityItem.tsx
@@ -0,0 +1,10 @@
+import { Card } from "antd";
+import React from "react";
+
+export default function EntityItem({
+  children,
+}: {
+  children?: React.ReactNode;
+}) {
+  return <Card variant="borderless">{children}</Card>;
+}
diff --git a/frontend/components/entities/EntityLink.tsx b/frontend/components/entities/EntityLink.tsx
new file mode 100644
index 000000000..44f385e77
--- /dev/null
+++ b/frontend/components/entities/EntityLink.tsx
@@ -0,0 +1,31 @@
+import { Tooltip } from "antd";
+import { Scalars } from "../../__generated__/graphql";
+import { Route } from "next";
+import Link from "next/link";
+import Copyable from "../Copyable";
+
+export default function EntityLink({
+  entity,
+  route,
+}: {
+  entity: {
+    uuid: Scalars["Uuid"]["output"];
+    name: string;
+  };
+  route: (id: Scalars["Uuid"]["output"]) => Route;
+}) {
+  return (
+    <Tooltip
+      title={<Copyable text={entity.uuid} color="white" />}
+      styles={{
+        container: {
+          whiteSpace: "nowrap",
+          minWidth: "max-content",
+          maxWidth: "none",
+        },
+      }}
+    >
+      <Link href={route(entity.uuid)}>{entity.name}</Link>
+    </Tooltip>
+  );
+}
diff --git a/frontend/components/entities/EntityList.tsx b/frontend/components/entities/EntityList.tsx
new file mode 100644
index 000000000..4601e8e18
--- /dev/null
+++ b/frontend/components/entities/EntityList.tsx
@@ -0,0 +1,57 @@
+import { Card, Empty, Flex, Skeleton } from "antd";
+import { Scalars } from "../../__generated__/graphql";
+import { useState, useEffect } from "react";
+import { initialPageSize } from "../Pagination";
+import { range } from "../../lib/array";
+
+export default function EntityList<
+  TEntity extends { uuid: Scalars["Uuid"]["output"] },
+>({
+  loading,
+  dataSource,
+  renderItem,
+}: {
+  loading: boolean;
+  dataSource: TEntity[];
+  renderItem: (entity: TEntity) => React.ReactNode;
+}) {
+  const [hasLoadedOnce, setHasLoadedOnce] = useState(false);
+
+  useEffect(() => {
+    if (!loading && dataSource?.length > 0) {
+      setHasLoadedOnce(true);
+    }
+  }, [loading, dataSource]);
+
+  if (loading && !hasLoadedOnce) {
+    return (
+      <Flex vertical gap="middle">
+        {range(1, initialPageSize).map((key) => (
+          <Card key={key}>
+            <Skeleton active avatar paragraph={{ rows: 2 }} />
+          </Card>
+        ))}
+      </Flex>
+    );
+  }
+
+  if (!loading && (!dataSource || dataSource.length === 0)) {
+    return <Empty description="No data found" />;
+  }
+
+  return (
+    <Flex
+      vertical
+      gap="middle"
+      style={{
+        opacity: loading ? 0.6 : 1,
+        transition: "opacity 0.3s ease-in-out",
+        pointerEvents: loading ? "none" : "auto", // Prevent clicks while loading
+      }}
+    >
+      {dataSource.map((entity) => (
+        <div key={entity.uuid}>{renderItem(entity)}</div>
+      ))}
+    </Flex>
+  );
+}
diff --git a/frontend/components/entities/EntitySummary.tsx b/frontend/components/entities/EntitySummary.tsx
new file mode 100644
index 000000000..96cd1e7ff
--- /dev/null
+++ b/frontend/components/entities/EntitySummary.tsx
@@ -0,0 +1,110 @@
+import { Breadcrumb, Button, Flex, Space, Typography } from "antd";
+import { ArrowLeftOutlined, PushpinOutlined } from "@ant-design/icons";
+import { Scalars } from "../../__generated__/graphql";
+import Copyable from "../Copyable";
+import Id from "../Id";
+import CopyButton from "../CopyButton";
+import { Route } from "next";
+import Link from "next/link";
+
+interface Props {
+  entity: {
+    uuid: Scalars["Uuid"]["output"];
+    name?: string | null;
+    abbreviation?: string | null;
+    description?: string | null;
+  };
+  route: (id: Scalars["Uuid"]["output"]) => Route;
+  tags?: React.ReactNode[];
+  onBack?: () => void;
+  extra?: React.ReactNode;
+  breadcrumb?: { title: string; href?: string }[];
+  children?: React.ReactNode;
+}
+
+export default function EntitySummary({
+  entity,
+  route,
+  tags,
+  onBack,
+  extra,
+  breadcrumb,
+  children,
+}: Props) {
+  return (
+    <div>
+      {breadcrumb && (
+        <Breadcrumb
+          items={breadcrumb.map((item) => ({
+            title: item.title,
+            href: item.href,
+          }))}
+          style={{ marginBottom: 12 }}
+        />
+      )}
+      <Flex justify="space-between" align="flex-start">
+        {onBack && (
+          <Button
+            type="text"
+            icon={<ArrowLeftOutlined />}
+            onClick={onBack}
+            style={{ marginLeft: -12 }}
+          />
+        )}
+        <div>
+          {entity.uuid && (
+            <div>
+              <Copyable text={entity.uuid}>
+                <Id value={entity.uuid} />
+              </Copyable>
+            </div>
+          )}
+          <Flex vertical gap={2}>
+            <div style={{ position: "relative" }}>
+              <div
+                style={{
+                  position: "absolute",
+                  right: "100%",
+                  marginRight: "3em",
+                  top: "50%",
+                  transform: "translateY(-50%)",
+                }}
+              >
+                <CopyButton
+                  getText={() => window.location.href}
+                  copyIcon={<PushpinOutlined />}
+                >
+                  Copy Permalink
+                </CopyButton>
+              </div>
+              <Space align="center">
+                <Typography.Title level={4} style={{ margin: 0 }}>
+                  <Link href={route(entity.uuid)}>
+                    {entity.name ?? "Unnamed"}
+                  </Link>
+                  {entity.abbreviation && <span> ({entity.abbreviation})</span>}
+                </Typography.Title>
+                {tags && (
+                  <div>
+                    <Space>{tags}</Space>
+                  </div>
+                )}
+              </Space>
+            </div>
+            {entity.description && (
+              <Typography.Text type="secondary">
+                {entity.description}
+              </Typography.Text>
+            )}
+          </Flex>
+        </div>
+        <Space wrap>{extra}</Space>
+      </Flex>
+      {children && (
+        <Flex vertical gap="small" style={{ marginTop: 16 }}>
+          {children}
+        </Flex>
+      )}
+    </div>
+  );
+}
diff --git a/frontend/components/entities/PaginatedEntities.tsx b/frontend/components/entities/PaginatedEntities.tsx
new file mode 100644
index 000000000..4c4346eb3
--- /dev/null
+++ b/frontend/components/entities/PaginatedEntities.tsx
@@ -0,0 +1,341 @@
+import { FilterOutlined, PlusOutlined } from "@ant-design/icons";
+import { Button, Card, Flex, Form, Space } from "antd";
+import {
+  QueryDocument,
+  QueryVariables,
+  usePaginatedQuery,
+} from "../../lib/hooks/usePaginatedQuery";
+import Pagination from "../Pagination";
+import { useMemo, useRef, useState } from "react";
+import ActiveFilterAndSortBar from "../ActiveFilterAndSortBar";
+import {
+  ObjectFilterState,
+  FilterDefinition,
+  toWhereClause,
+  getInitialFilterSubformValues,
+  ObjectFilterDefinition,
+} from "../../lib/filter";
+import {
+  SortState,
+  SortDefinition,
+  toOrderClause,
+  initialSortSubformValues,
+} from "../../lib/sort";
+import JumpToId, { JumpToIdProps } from "../JumpToId";
+import { Scalars, SortEnumType } from "../../__generated__/graphql";
+import { Route } from "next";
+import DeleteButton from "../DeleteButton";
+import ObjectFilterSubform from "../filtering/ObjectFilterSubform";
+import SortSubform from "../sorting/SortSubform";
+import QueryToolbar from "../QueryToolbar";
+import SlideDown from "../SlideDown";
+import { notEmpty } from "../../lib/array";
+
+const reduceClauses = <TFilterInput, TSortInput>(clauses: {
+  where: { and: TFilterInput[] };
+  order: TSortInput[];
+}) => {
+  if (clauses.where.and.length == 0 && clauses.order.length == 0) {
+    return {};
+  }
+  if (clauses.where.and.length == 0) {
+    return { order: clauses.order };
+  }
+  if (clauses.order.length == 0) {
+    return { where: clauses.where };
+  }
+  return clauses;
+};
+
+type FilterAndSortFormValues = {
+  filters: ObjectFilterState[] | null | undefined;
+  sorts: SortState[] | null | undefined;
+};
+
+type BaseProps<TNode, TFilterInput, TSortInput> = {
+  entitiesQuery: QueryDocument<TNode, TFilterInput, TSortInput>;
+  list: (props: { loading: boolean; nodes: TNode[] }) => React.ReactNode;
+  filterDefinitions: readonly FilterDefinition<TFilterInput>[];
+  sortDefinitions: readonly SortDefinition<TSortInput>[];
+  where?: TFilterInput | null;
+  order?: TSortInput | null;
+  loading?: boolean;
+};
+
+type Props<TNode, TFilterInput, TSortInput> =
+  | (BaseProps<TNode, TFilterInput, TSortInput> & {
+      showJump: false;
+    })
+  | (BaseProps<TNode, TFilterInput, TSortInput> & {
+      showJump: true;
+      route: (id: Scalars["Uuid"]["output"]) => Route;
+      namesQuery?: JumpToIdProps["query"];
+    });
+
+export default function PaginatedEntities<
+  TNode,
+  TFilterInput extends {
+    [x: string]: { [x: string]: any | null } | null;
+  },
+  TSortInput extends { [x: string]: SortEnumType | null },
+>(props: Props<TNode, TFilterInput, TSortInput>) {
+  // const router = useRouter();
+  const [form] = Form.useForm<FilterAndSortFormValues>();
+  const [filters, setFilters] = useState<readonly ObjectFilterState[]>([]);
+  const [sorts, setSorts] = useState<readonly SortState[]>([]);
+  const [isFilterAndSortOpen, setIsFilterAndSortOpen] = useState(false);
+  const [paginatedQueryVariables, setPaginatedQueryVariables] =
+    useState<QueryVariables<TFilterInput, TSortInput> | null>(null);
+  const filterFormListRemoveRef =
+    useRef<(index: number | number[]) => void | null>(null);
+  const sortFormListRemoveRef =
+    useRef<(index: number | number[]) => void | null>(null);
+
+  const applyFiltersAndSortsFormValues = (values: FilterAndSortFormValues) => {
+    setFilters(values.filters ?? []);
+    setSorts(values.sorts ?? []);
+    // setIsFilterAndSortOpen(false);
+  };
+  const clearFiltersAndSortsForm = () => {
+    // form.resetFields();
+    form.setFieldsValue({ filters: [], sorts: [] });
+    // setIsFilterAndSortOpen(false);
+  };
+
+  const removeFilter = (index: number) => {
+    filterFormListRemoveRef.current?.(index);
+    const newFilters = filters.filter((_, i) => i !== index);
+    setFilters(newFilters);
+    setIsFilterAndSortOpen(
+      (current) => current && (newFilters.length > 0 || sorts.length > 0),
+    );
+  };
+  const removeSort = (index: number) => {
+    sortFormListRemoveRef.current?.(index);
+    const newSorts = sorts.filter((_, i) => i !== index);
+    setSorts(newSorts);
+    setIsFilterAndSortOpen(
+      (current) => current && (filters.length > 0 || newSorts.length > 0),
+    );
+  };
+  const removeAllFiltersAndSorts = () => {
+    // form.resetFields();
+    form.setFieldsValue({ filters: [], sorts: [] });
+    setFilters([]);
+    setSorts([]);
+    setIsFilterAndSortOpen(false);
+  };
+
+  // useEffect(() => {
+  //   if (!router.isReady) return;
+  //   const { filters, sorts } = router.query;
+  //   form.setFieldsValue({
+  //     filters: filters ? JSON.parse(filters as string) : [],
+  //     sorts: sorts ? JSON.parse(sorts as string) : [],
+  //   });
+  // }, [router.isReady, router.query, form]);
+
+  // const handleValuesChange = (_: any, values: FilterAndSortFormValues) => {
+  //   const { filters, sorts } = values;
+  //   router.push(
+  //     {
+  //       pathname: router.pathname,
+  //       query: {
+  //         ...router.query,
+  //         filters: JSON.stringify(filters),
+  //         sorts: JSON.stringify(sorts),
+  //       },
+  //     },
+  //     undefined,
+  //     { shallow: true }, // Prevents calling getServerSideProps again
+  //   );
+  // };
+
+  const queryVariables = useMemo(
+    () =>
+      reduceClauses({
+        where: {
+          and: [
+            props.where,
+            ...filters.map<TFilterInput>((filter) =>
+              toWhereClause(filter, props.filterDefinitions),
+            ),
+          ].filter(notEmpty),
+        },
+        order: [
+          props.order,
+          ...sorts.map((sort) => toOrderClause(sort, props.sortDefinitions)),
+        ].filter(notEmpty),
+      }),
+    [filters, sorts],
+  );
+  const { loading, nodes, paginationProps } = usePaginatedQuery(
+    props.entitiesQuery,
+    queryVariables,
+    setPaginatedQueryVariables,
+  );
+
+  const objectFilterDefinition: ObjectFilterDefinition<any, any> = {
+    type: "object",
+    field: null,
+    items: props.filterDefinitions as readonly FilterDefinition<any>[],
+  };
+
+  return (
+    <div>
+      <Flex vertical gap="medium">
+        <Flex justify="space-between" align="baseline">
+          {props.showJump ? (
+            <JumpToId query={props.namesQuery} route={props.route} />
+          ) : (
+            <div />
+          )}
+          <Button
+            type={isFilterAndSortOpen ? "text" : "default"}
+            icon={<FilterOutlined />}
+            onClick={() => setIsFilterAndSortOpen((x) => !x)}
+          >
+            Filter & Sort
+          </Button>
+        </Flex>
+        <SlideDown open={isFilterAndSortOpen}>
+          <Card variant="borderless">
+            <Form
+              form={form}
+              layout="vertical"
+              onFinish={applyFiltersAndSortsFormValues}
+              initialValues={{ filters, sorts }}
+            >
+              <Flex vertical gap="medium">
+                {props.filterDefinitions.length > 0 && (
+                  <div>
+                    <h3>Filter by</h3>
+                    <Form.List name="filters">
+                      {(fields, { add, remove }, { errors }) => {
+                        filterFormListRemoveRef.current = remove;
+                        return (
+                          <Flex vertical gap="small">
+                            <Form.ErrorList errors={errors} />
+                            {fields.map(({ key, name }) => {
+                              return (
+                                <Flex key={key} gap="small" align="baseline">
+                                  <ObjectFilterSubform
+                                    name={[name]}
+                                    ancestors={["filters"]}
+                                    definition={objectFilterDefinition}
+                                  />
+                                  <DeleteButton
+                                    kind="remove"
+                                    type="icon"
+                                    onClick={() => remove(name)}
+                                  />
+                                </Flex>
+                              );
+                            })}
+                            <Button
+                              block
+                              type="dashed"
+                              onClick={() =>
+                                add(
+                                  getInitialFilterSubformValues(
+                                    objectFilterDefinition,
+                                  ),
+                                )
+                              }
+                              icon={<PlusOutlined />}
+                            >
+                              Add Filter
+                            </Button>
+                          </Flex>
+                        );
+                      }}
+                    </Form.List>
+                  </div>
+                )}
+                {props.sortDefinitions.length > 0 && (
+                  <div>
+                    <h3>Sort by</h3>
+                    <Form.List name="sorts">
+                      {(fields, { add, remove }, { errors }) => {
+                        sortFormListRemoveRef.current = remove;
+                        return (
+                          <Flex vertical gap="small">
+                            <Form.ErrorList errors={errors} />
+                            {fields.map(({ key, name }) => {
+                              return (
+                                <Flex key={key} gap="small" align="baseline">
+                                  <SortSubform
+                                    name={[name]}
+                                    definitions={props.sortDefinitions}
+                                  />
+                                  <DeleteButton
+                                    kind="remove"
+                                    type="icon"
+                                    onClick={() => remove(name)}
+                                  />
+                                </Flex>
+                              );
+                            })}
+                            <Button
+                              block
+                              type="dashed"
+                              onClick={() => add(initialSortSubformValues)}
+                              icon={<PlusOutlined />}
+                            >
+                              Add Sort
+                            </Button>
+                          </Flex>
+                        );
+                      }}
+                    </Form.List>
+                  </div>
+                )}
+                <div
+                  style={{
+                    display: "flex",
+                    justifyContent: "flex-end",
+                  }}
+                >
+                  <Space>
+                    <DeleteButton
+                      title="Clear"
+                      type="default"
+                      onClick={clearFiltersAndSortsForm}
+                    />
+                    <Button
+                      type="default"
+                      onClick={() => setIsFilterAndSortOpen(false)}
+                    >
+                      Close
+                    </Button>
+                    <Button type="primary" onClick={form.submit}>
+                      Apply
+                    </Button>
+                  </Space>
+                </div>
+              </Flex>
+            </Form>
+          </Card>
+        </SlideDown>
+        {(filters.length > 0 || sorts.length > 0) && (
+          <ActiveFilterAndSortBar
+            values={{ filters, sorts }}
+            filterDefinitions={props.filterDefinitions}
+            sortDefinitions={props.sortDefinitions}
+            onRemoveFilter={removeFilter}
+            onRemoveSort={removeSort}
+            onRemoveAll={removeAllFiltersAndSorts}
+          />
+        )}
+        {props.list({ loading: props.loading || loading, nodes })}
+        <Flex justify="space-between" align="baseline">
+          <QueryToolbar
+            query={props.entitiesQuery}
+            variables={paginatedQueryVariables}
+          />
+          <Pagination {...paginationProps} />
+        </Flex>
+      </Flex>
+    </div>
+  );
+}
diff --git a/frontend/components/filtering/BaseFilterSubform.tsx b/frontend/components/filtering/BaseFilterSubform.tsx
new file mode 100644
index 000000000..ead463434
--- /dev/null
+++ b/frontend/components/filtering/BaseFilterSubform.tsx
@@ -0,0 +1,56 @@
+import { Form, Select, Space } from "antd";
+import React from "react";
+import {
+  getFilterOperatorLabel,
+  isFilterOperatorSingle,
+  FilterOperator,
+} from "../../lib/filter";
+
+type NarrowedOperator<TFilterInput> = FilterOperator & keyof TFilterInput;
+
+export default function BaseFilterSubform<TFilterInput>({
+  name,
+  ancestors,
+  operators,
+  renderSingleFormItem,
+  renderMultipleFormItem,
+  initialOperator,
+}: {
+  _type?: TFilterInput;
+  name: readonly (string | number)[];
+  ancestors: readonly (string | number)[];
+  operators: readonly NarrowedOperator<TFilterInput>[];
+  renderSingleFormItem: (props: {
+    name: (string | number)[];
+  }) => React.ReactNode;
+  renderMultipleFormItem: (props: {
+    name: (string | number)[];
+  }) => React.ReactNode;
+  initialOperator: number;
+}) {
+  const form = Form.useFormInstance();
+  const currentOperator =
+    (Form.useWatch(
+      [...ancestors, ...name, "operator"],
+      form,
+    ) as NarrowedOperator<TFilterInput>) ?? operators[initialOperator];
+
+  return (
+    <Space.Compact style={{ flex: 1 }}>
+      <Form.Item name={[...name, "operator"]} noStyle>
+        <Select
+          popupMatchSelectWidth={false}
+          options={operators.map((key) => ({
+            value: key,
+            label: getFilterOperatorLabel(key),
+          }))}
+        />
+      </Form.Item>
+      <Form.Item noStyle style={{ flex: 1 }}>
+        {isFilterOperatorSingle(currentOperator)
+          ? renderSingleFormItem({ name: [...name, "value"] })
+          : renderMultipleFormItem({ name: [...name, "value"] })}
+      </Form.Item>
+    </Space.Compact>
+  );
+}
diff --git a/frontend/components/filtering/EnumFilterSubform.tsx b/frontend/components/filtering/EnumFilterSubform.tsx
new file mode 100644
index 000000000..a49888e52
--- /dev/null
+++ b/frontend/components/filtering/EnumFilterSubform.tsx
@@ -0,0 +1,61 @@
+import { Select, Form } from "antd";
+import BaseFilterSubform from "./BaseFilterSubform";
+import { EnumFilterInput } from "../../lib/filter";
+import { FilterTypeMap } from "../../lib/filter";
+
+export default function EnumFilterSubform<
+  TFilterInput extends EnumFilterInput<TEnum>,
+  TEnum extends object,
+>({
+  name,
+  ancestors,
+  enumObject,
+}: {
+  name: readonly (string | number)[];
+  ancestors: readonly (string | number)[];
+  enumObject: TEnum;
+}) {
+  const selectOptions = Object.entries(enumObject).map(([_key, value]) => ({
+    label: value,
+    value: value,
+  }));
+
+  return (
+    <BaseFilterSubform<TFilterInput>
+      name={name}
+      ancestors={ancestors}
+      operators={FilterTypeMap["enum"].operators}
+      initialOperator={FilterTypeMap["enum"].initialOperator}
+      renderSingleFormItem={(props) => (
+        <Form.Item
+          name={props.name}
+          noStyle
+          rules={[
+            {
+              required: true,
+            },
+          ]}
+        >
+          <Select options={selectOptions} style={{ width: "100%" }} />
+        </Form.Item>
+      )}
+      renderMultipleFormItem={(props) => (
+        <Form.Item
+          name={props.name}
+          noStyle
+          rules={[
+            {
+              required: true,
+            },
+          ]}
+        >
+          <Select
+            mode="multiple"
+            options={selectOptions}
+            style={{ width: "100%" }}
+          />
+        </Form.Item>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/filtering/FilterSubform.tsx b/frontend/components/filtering/FilterSubform.tsx
new file mode 100644
index 000000000..7e273f53b
--- /dev/null
+++ b/frontend/components/filtering/FilterSubform.tsx
@@ -0,0 +1,67 @@
+import {
+  FilterDefinition,
+  ListFilterDefinition,
+  ListFilterInput,
+} from "../../lib/filter";
+import EnumFilterSubform from "./EnumFilterSubform";
+import FloatFilterSubform from "./FloatFilterSubform";
+import IntFilterSubform from "./IntFilterSubform";
+import StringFilterSubform from "./StringFilterSubform";
+import UrlFilterSubform from "./UrlFilterSubform";
+import UuidFilterSubform from "./UuidFilterSubform";
+import ListFilterSubform from "./ListFilterSubform";
+import ObjectFilterSubform from "./ObjectFilterSubform";
+
+export default function FilterSubform<TFilterInput>({
+  name,
+  ancestors,
+  definition: definition,
+}: {
+  name: readonly (string | number)[];
+  ancestors: readonly (string | number)[];
+  definition: FilterDefinition<TFilterInput>;
+}) {
+  switch (definition.type) {
+    case "enum":
+      return (
+        <EnumFilterSubform
+          name={name}
+          ancestors={ancestors}
+          enumObject={definition.enumObject as any}
+        />
+      );
+    case "float":
+      return <FloatFilterSubform name={name} ancestors={ancestors} />;
+    case "int":
+      return <IntFilterSubform name={name} ancestors={ancestors} />;
+    case "string":
+      return <StringFilterSubform name={name} ancestors={ancestors} />;
+    case "url":
+      return <UrlFilterSubform name={name} ancestors={ancestors} />;
+    case "uuid":
+      return <UuidFilterSubform name={name} ancestors={ancestors} />;
+    case "list":
+      return (
+        <ListFilterSubform
+          name={name}
+          ancestors={ancestors}
+          definition={
+            definition as ListFilterDefinition<
+              ListFilterInput<unknown>,
+              keyof ListFilterInput<unknown>
+            >
+          }
+        />
+      );
+    case "object":
+      return (
+        <ObjectFilterSubform
+          name={name}
+          ancestors={ancestors}
+          definition={definition}
+        />
+      );
+    default:
+      return assertNever(definition);
+  }
+}
diff --git a/frontend/components/filtering/FloatFilterSubform.tsx b/frontend/components/filtering/FloatFilterSubform.tsx
new file mode 100644
index 000000000..b4b2892a6
--- /dev/null
+++ b/frontend/components/filtering/FloatFilterSubform.tsx
@@ -0,0 +1,78 @@
+import { Form, InputNumber, Select } from "antd";
+import BaseFilterSubform from "./BaseFilterSubform";
+import { FloatFilterInput } from "../../__generated__/graphql";
+import { FilterTypeMap } from "../../lib/filter";
+
+export default function FloatFilterSubform<
+  TFilterInput extends FloatFilterInput,
+>({
+  name,
+  ancestors,
+}: {
+  name: readonly (string | number)[];
+  ancestors: readonly (string | number)[];
+}) {
+  return (
+    <BaseFilterSubform<TFilterInput>
+      name={name}
+      ancestors={ancestors}
+      operators={FilterTypeMap["float"].operators}
+      initialOperator={FilterTypeMap["float"].initialOperator}
+      renderSingleFormItem={(props) => (
+        <Form.Item
+          name={props.name}
+          noStyle
+          rules={[
+            {
+              required: true,
+            },
+          ]}
+        >
+          <InputNumber style={{ width: "100%" }} />
+        </Form.Item>
+      )}
+      renderMultipleFormItem={(props) => (
+        <Form.Item
+          name={props.name}
+          noStyle
+          normalize={(value: any[] | null) =>
+            value
+              ? value.map((v) => parseFloat(v)).filter((v) => !isNaN(v))
+              : []
+          }
+          rules={[
+            {
+              required: true,
+            },
+            {
+              validator: (_, value) => {
+                if (value?.some((v: any) => isNaN(parseFloat(v)))) {
+                  return Promise.reject(
+                    new Error("All entries must be valid decimal numbers"),
+                  );
+                }
+                return Promise.resolve();
+              },
+            },
+          ]}
+        >
+          <Select
+            mode="tags"
+            tokenSeparators={[",", " "]}
+            onInputKeyDown={(e) => {
+              if (
+                !/[0-9.-]/.test(e.key) &&
+                e.key !== "Enter" &&
+                e.key !== "Tab" &&
+                e.key !== "Backspace"
+              ) {
+                e.preventDefault();
+              }
+            }}
+            style={{ width: "100%" }}
+          />
+        </Form.Item>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/filtering/IntFilterSubform.tsx b/frontend/components/filtering/IntFilterSubform.tsx
new file mode 100644
index 000000000..2ea0c9e1a
--- /dev/null
+++ b/frontend/components/filtering/IntFilterSubform.tsx
@@ -0,0 +1,77 @@
+import { Form, InputNumber, Select } from "antd";
+import BaseFilterSubform from "./BaseFilterSubform";
+import { IntFilterInput } from "../../__generated__/graphql";
+import { FilterTypeMap } from "../../lib/filter";
+
+export default function IntFilterSubform<TFilterInput extends IntFilterInput>({
+  name,
+  ancestors,
+}: {
+  name: readonly (string | number)[];
+  ancestors: readonly (string | number)[];
+}) {
+  return (
+    <BaseFilterSubform<TFilterInput>
+      name={name}
+      ancestors={ancestors}
+      operators={FilterTypeMap["int"].operators}
+      initialOperator={FilterTypeMap["int"].initialOperator}
+      renderSingleFormItem={(props) => (
+        <Form.Item
+          name={props.name}
+          noStyle
+          rules={[
+            {
+              required: true,
+            },
+            {
+              whitespace: true,
+            },
+          ]}
+        >
+          <InputNumber style={{ width: "100%" }} />
+        </Form.Item>
+      )}
+      renderMultipleFormItem={(props) => (
+        <Form.Item
+          name={props.name}
+          noStyle
+          normalize={(value: any[] | null) =>
+            value ? value.map((v) => parseInt(v)).filter((v) => !isNaN(v)) : []
+          }
+          rules={[
+            {
+              required: true,
+            },
+            {
+              validator: (_, value) => {
+                if (value?.some((v: any) => isNaN(parseInt(v)))) {
+                  return Promise.reject(
+                    new Error("All entries must be valid integers"),
+                  );
+                }
+                return Promise.resolve();
+              },
+            },
+          ]}
+        >
+          <Select
+            mode="tags"
+            tokenSeparators={[",", " "]}
+            onInputKeyDown={(e) => {
+              if (
+                !/[0-9-]/.test(e.key) &&
+                e.key !== "Enter" &&
+                e.key !== "Tab" &&
+                e.key !== "Backspace"
+              ) {
+                e.preventDefault();
+              }
+            }}
+            style={{ width: "100%" }}
+          />
+        </Form.Item>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/filtering/ListFilterSubform.tsx b/frontend/components/filtering/ListFilterSubform.tsx
new file mode 100644
index 000000000..258cbcd22
--- /dev/null
+++ b/frontend/components/filtering/ListFilterSubform.tsx
@@ -0,0 +1,35 @@
+import BaseFilterSubform from "./BaseFilterSubform";
+import { ListFilterDefinition, ListFilterInput } from "../../lib/filter";
+import FilterSubform from "./FilterSubform";
+import { FilterTypeMap } from "../../lib/filter";
+
+export default function ListFilterSubform<
+  TItemFilterInput,
+  TListFilterInput extends ListFilterInput<TItemFilterInput>,
+>({
+  name,
+  ancestors,
+  definition,
+}: {
+  name: readonly (string | number)[];
+  ancestors: readonly (string | number)[];
+  definition: ListFilterDefinition<TListFilterInput, keyof TListFilterInput>;
+}) {
+  const renderItem = (props: { name: (string | number)[] }) => (
+    <FilterSubform
+      name={props.name}
+      ancestors={ancestors}
+      definition={definition.item}
+    />
+  );
+  return (
+    <BaseFilterSubform<TListFilterInput>
+      name={name}
+      ancestors={ancestors}
+      operators={FilterTypeMap["list"].operators}
+      initialOperator={FilterTypeMap["list"].initialOperator}
+      renderSingleFormItem={renderItem}
+      renderMultipleFormItem={renderItem}
+    />
+  );
+}
diff --git a/frontend/components/filtering/ObjectFilterSubform.tsx b/frontend/components/filtering/ObjectFilterSubform.tsx
new file mode 100644
index 000000000..f3a9c4b07
--- /dev/null
+++ b/frontend/components/filtering/ObjectFilterSubform.tsx
@@ -0,0 +1,58 @@
+import { Form, Select, Space } from "antd";
+import {
+  FilterDefinition,
+  getInitialFilterSubformValues,
+  ObjectFilterDefinition,
+} from "../../lib/filter";
+import { getLabel } from "../../lib/string";
+import FilterSubform from "./FilterSubform";
+
+export default function ObjectFilterSubform<TObjectFilterInput>({
+  name,
+  ancestors,
+  definition,
+}: {
+  _type?: TObjectFilterInput;
+  name: readonly (string | number)[];
+  ancestors: readonly (string | number)[];
+  definition: ObjectFilterDefinition<
+    TObjectFilterInput,
+    keyof TObjectFilterInput
+  >;
+}) {
+  const form = Form.useFormInstance();
+  const fullPath = [...ancestors, ...name];
+  const currentIndex =
+    (Form.useWatch([...fullPath, "index"], form) as number) ?? 0;
+
+  const handleChange = (newIndex: number) => {
+    form.setFieldValue(
+      [...fullPath, "value"],
+      getInitialFilterSubformValues(
+        definition.items[newIndex] as FilterDefinition<any>,
+      ),
+    );
+  };
+
+  return (
+    <Space.Compact style={{ flex: 1 }}>
+      <Form.Item noStyle name={[...name, "index"]} rules={[{ required: true }]}>
+        <Select
+          popupMatchSelectWidth={false}
+          onChange={handleChange}
+          options={definition.items.map((value, index) => ({
+            value: index,
+            label: getLabel(value, "all-upper"),
+          }))}
+        />
+      </Form.Item>
+      <Form.Item noStyle style={{ flex: 1 }}>
+        <FilterSubform
+          name={[...name, "value"]}
+          ancestors={ancestors}
+          definition={definition.items[currentIndex]}
+        />
+      </Form.Item>
+    </Space.Compact>
+  );
+}
diff --git a/frontend/components/filtering/StringFilterSubform.tsx b/frontend/components/filtering/StringFilterSubform.tsx
new file mode 100644
index 000000000..a3bbcf33e
--- /dev/null
+++ b/frontend/components/filtering/StringFilterSubform.tsx
@@ -0,0 +1,52 @@
+import { Input, Select, Form } from "antd";
+import BaseFilterSubform from "./BaseFilterSubform";
+import { StringFilterInput } from "../../__generated__/graphql";
+import { FilterTypeMap } from "../../lib/filter";
+
+export default function StringFilterSubform<
+  TFilterInput extends StringFilterInput,
+>({
+  name,
+  ancestors,
+}: {
+  name: readonly (string | number)[];
+  ancestors: readonly (string | number)[];
+}) {
+  return (
+    <BaseFilterSubform<TFilterInput>
+      name={name}
+      ancestors={ancestors}
+      operators={FilterTypeMap["string"].operators}
+      initialOperator={FilterTypeMap["string"].initialOperator}
+      renderSingleFormItem={(props) => (
+        <Form.Item
+          name={props.name}
+          noStyle
+          rules={[
+            {
+              required: true,
+            },
+            {
+              whitespace: true,
+            },
+          ]}
+        >
+          <Input allowClear style={{ width: "100%" }} />
+        </Form.Item>
+      )}
+      renderMultipleFormItem={(props) => (
+        <Form.Item
+          name={props.name}
+          noStyle
+          rules={[
+            {
+              required: true,
+            },
+          ]}
+        >
+          <Select mode="tags" style={{ width: "100%" }} />
+        </Form.Item>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/filtering/UrlFilterSubform.tsx b/frontend/components/filtering/UrlFilterSubform.tsx
new file mode 100644
index 000000000..6ba33d332
--- /dev/null
+++ b/frontend/components/filtering/UrlFilterSubform.tsx
@@ -0,0 +1,50 @@
+import { Input, Select, Form } from "antd";
+import BaseFilterSubform from "./BaseFilterSubform";
+import { UrlFilterInput } from "../../__generated__/graphql";
+import { FilterTypeMap } from "../../lib/filter";
+
+export default function UrlFilterSubform<TFilterInput extends UrlFilterInput>({
+  name,
+  ancestors,
+}: {
+  name: readonly (string | number)[];
+  ancestors: readonly (string | number)[];
+}) {
+  return (
+    <BaseFilterSubform<TFilterInput>
+      name={name}
+      ancestors={ancestors}
+      operators={FilterTypeMap["url"].operators}
+      initialOperator={FilterTypeMap["url"].initialOperator}
+      renderSingleFormItem={(props) => (
+        <Form.Item
+          name={props.name}
+          noStyle
+          rules={[
+            {
+              required: true,
+            },
+            {
+              whitespace: true,
+            },
+          ]}
+        >
+          <Input allowClear style={{ width: "100%" }} />
+        </Form.Item>
+      )}
+      renderMultipleFormItem={(props) => (
+        <Form.Item
+          name={props.name}
+          noStyle
+          rules={[
+            {
+              required: true,
+            },
+          ]}
+        >
+          <Select mode="tags" style={{ width: "100%" }} />
+        </Form.Item>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/filtering/UuidFilterSubform.tsx b/frontend/components/filtering/UuidFilterSubform.tsx
new file mode 100644
index 000000000..3d0f3f4f1
--- /dev/null
+++ b/frontend/components/filtering/UuidFilterSubform.tsx
@@ -0,0 +1,40 @@
+import { Form, Select } from "antd";
+import BaseFilterSubform from "./BaseFilterSubform";
+import UuidFormItem from "../UuidFormItem";
+import { UuidFilterInput } from "../../__generated__/graphql";
+import { FilterTypeMap } from "../../lib/filter";
+
+export default function UuidFilterSubform<
+  TFilterInput extends UuidFilterInput,
+>({
+  name,
+  ancestors,
+}: {
+  name: readonly (string | number)[];
+  ancestors: readonly (string | number)[];
+}) {
+  return (
+    <BaseFilterSubform<TFilterInput>
+      name={name}
+      ancestors={ancestors}
+      operators={FilterTypeMap["uuid"].operators}
+      initialOperator={FilterTypeMap["uuid"].initialOperator}
+      renderSingleFormItem={(props) => (
+        <UuidFormItem name={props.name} style={{ width: "100%" }} />
+      )}
+      renderMultipleFormItem={(props) => (
+        <Form.Item
+          name={props.name}
+          noStyle
+          rules={[
+            {
+              required: true,
+            },
+          ]}
+        >
+          <Select mode="tags" style={{ width: "100%" }} />
+        </Form.Item>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/gnuPgKeyFingerprints/AddGnuPgKeyFingerprint.tsx b/frontend/components/gnuPgKeyFingerprints/AddGnuPgKeyFingerprint.tsx
index 3c6194722..de51a87d3 100644
--- a/frontend/components/gnuPgKeyFingerprints/AddGnuPgKeyFingerprint.tsx
+++ b/frontend/components/gnuPgKeyFingerprints/AddGnuPgKeyFingerprint.tsx
@@ -80,7 +80,7 @@ export default function AddGnuPgKeyFingerprint({
   return (
     <>
       <ErrorAlert messages={globalErrorMessages} />
-      <Typography.Paragraph>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
         Before adding the GnuPG fingerprint of your GnuPG key here, you need to
         upload the GnuPG public key to the{" "}
         <Typography.Link href="https://keys.openpgp.org/">
diff --git a/frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintList.tsx b/frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintList.tsx
new file mode 100644
index 000000000..997b949cb
--- /dev/null
+++ b/frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintList.tsx
@@ -0,0 +1,24 @@
+import { GnuPgKeyFingerprintsPartialFragment } from "../../queries/gnuPgKeyFingerprints.generated";
+import EntityList from "../entities/EntityList";
+import GnuPgKeyFingerprintSummary from "./GnuPgKeyFingerprintSummary";
+import EntityItem from "../entities/EntityItem";
+
+export default function GnuPgKeyFingerprintList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: GnuPgKeyFingerprintsPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <GnuPgKeyFingerprintSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintSummary.tsx b/frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintSummary.tsx
new file mode 100644
index 000000000..e66b6a26e
--- /dev/null
+++ b/frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintSummary.tsx
@@ -0,0 +1,68 @@
+import { GnuPgKeyFingerprintsPartialFragment } from "../../queries/gnuPgKeyFingerprints.generated";
+import paths from "../../paths";
+import { Tag } from "antd";
+import AllowGnuPgKeyFingerprint from "./AllowGnuPgKeyFingerprint";
+import ForbidGnuPgKeyFingerprint from "./ForbidGnuPgKeyFingerprint";
+import EntityLink from "../entities/EntityLink";
+import EntitySummary from "../entities/EntitySummary";
+
+type Status = "pending" | "allowed" | "forbidden";
+
+const color = (status: Status) => {
+  switch (status) {
+    case "pending":
+      return "processing"; // "warning"
+    case "allowed":
+      return "success";
+    case "forbidden":
+      return "error";
+  }
+};
+
+export default function GnuPgKeyFingerprintSummary({
+  entity,
+}: {
+  entity: GnuPgKeyFingerprintsPartialFragment;
+}) {
+  const status: Status = entity.allowedAt
+    ? entity.forbiddenAt
+      ? "forbidden"
+      : "allowed"
+    : "pending";
+
+  return (
+    <EntitySummary
+      entity={entity}
+      route={(_) => paths.gnuPgKeyFingerprint(entity.fingerprint)}
+      tags={[
+        <Tag
+          key="status"
+          color={color(status)}
+          style={{ fontWeight: "normal" }}
+        >
+          {status}
+        </Tag>,
+      ]}
+      extra={[
+        entity.isAuthorizedToAllowNode && entity.allowedAt == undefined && (
+          <AllowGnuPgKeyFingerprint
+            fingerprint={entity.fingerprint}
+            institutionId={entity.institution.node.uuid}
+          />
+        ),
+        entity.isAuthorizedToForbidNode && entity.forbiddenAt == undefined && (
+          <ForbidGnuPgKeyFingerprint
+            fingerprint={entity.fingerprint}
+            institutionId={entity.institution.node.uuid}
+          />
+        ),
+      ]}
+    >
+      {entity.allowedAt && <div>Allowed at {entity.allowedAt}</div>}
+      {entity.forbiddenAt && <div>Forbidden at {entity.forbiddenAt}</div>}
+      <div>
+        Owned by <EntityLink entity={entity.user.node} route={paths.user} />
+      </div>
+    </EntitySummary>
+  );
+}
diff --git a/frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintTable.tsx b/frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintTable.tsx
deleted file mode 100644
index 888d46579..000000000
--- a/frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintTable.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { Skeleton, Space, Table, TableProps } from "antd";
-import Link from "next/link";
-import paths from "../../paths";
-import AllowGnuPgKeyFingerprint from "./AllowGnuPgKeyFingerprint";
-import ForbidGnuPgKeyFingerprint from "./ForbidGnuPgKeyFingerprint";
-import { Scalars } from "../../__generated__/graphql";
-import { GnuPgKeyFingerprintsPartialFragment } from "../../queries/gnuPgKeyFingerprints.generated";
-
-interface GnuPgKeyFingerprintsProps {
-  loading: boolean;
-  fingerprints: GnuPgKeyFingerprintsPartialFragment[];
-  institutionId: Scalars["Uuid"]["input"];
-};
-
-export default function GnuPgKeyFingerprintTable({
-  loading,
-  fingerprints,
-  institutionId,
-}: GnuPgKeyFingerprintsProps) {
-  if (loading) {
-    return <Skeleton active avatar title />;
-  }
-
-  const fingerprintColumns: TableProps<GnuPgKeyFingerprintsPartialFragment>["columns"] =
-    [
-      {
-        title: "Fingerprint",
-        dataIndex: "fingerprint",
-        key: "fingerprint",
-      },
-      {
-        title: "AllowedAt",
-        dataIndex: "allowedAt",
-        key: "allowedAt",
-      },
-      {
-        title: "ForbiddenAt",
-        dataIndex: "forbiddenAt",
-        key: "forbiddenAt",
-      },
-      {
-        title: "User",
-        dataIndex: "user",
-        key: "user",
-        render: (_value, record, _index) => (
-          <Link href={paths.user(record.user.node.uuid)}>
-            {record.user.node.name}
-          </Link>
-        ),
-      },
-      {
-        title: "Action",
-        key: "action",
-        render: (_value, record, _index) => (
-          <Space size="middle">
-            {record.isAuthorizedToAllowNode && record.allowedAt == undefined ? (
-              <AllowGnuPgKeyFingerprint
-                fingerprint={record.fingerprint}
-                institutionId={institutionId}
-              />
-            ) : (
-              <></>
-            )}
-            {record.isAuthorizedToForbidNode &&
-            record.forbiddenAt == undefined ? (
-              <ForbidGnuPgKeyFingerprint
-                fingerprint={record.fingerprint}
-                institutionId={institutionId}
-              />
-            ) : (
-              <></>
-            )}
-          </Space>
-        ),
-      },
-    ];
-
-  return (
-    <Table<GnuPgKeyFingerprintsPartialFragment>
-      loading={loading}
-      columns={fingerprintColumns}
-      dataSource={fingerprints}
-    />
-  );
-}
diff --git a/frontend/components/gnuPgKeyFingerprints/PaginatedGnuPgKeyFingerprints.tsx b/frontend/components/gnuPgKeyFingerprints/PaginatedGnuPgKeyFingerprints.tsx
new file mode 100644
index 000000000..5bc08c87f
--- /dev/null
+++ b/frontend/components/gnuPgKeyFingerprints/PaginatedGnuPgKeyFingerprints.tsx
@@ -0,0 +1,67 @@
+import {
+  GnuPgKeyFingerprintsDocument,
+  GnuPgKeyFingerprintsQueryVariables,
+} from "../../queries/gnuPgKeyFingerprints.generated";
+import paths from "../../paths";
+import GnuPgKeyFingerprintList from "./GnuPgKeyFingerprintList";
+import PaginatedEntities from "../entities/PaginatedEntities";
+
+export default function PaginatedGnuPgKeyFingerprints({
+  where,
+  showJump = false,
+}: {
+  where?: GnuPgKeyFingerprintsQueryVariables["where"];
+  showJump?: boolean;
+}) {
+  return (
+    <PaginatedEntities
+      entitiesQuery={GnuPgKeyFingerprintsDocument}
+      // namesQuery={GnuPgKeyFingerprintNamesDocument}
+      where={where}
+      showJump={showJump}
+      route={paths.gnuPgKeyFingerprint}
+      list={(props) => <GnuPgKeyFingerprintList {...props} />}
+      filterDefinitions={[
+        {
+          field: "fingerprint",
+          type: "string",
+        },
+        {
+          field: "institution",
+          type: "object",
+          items: [
+            {
+              field: "name",
+              type: "string",
+            },
+            { field: "id", type: "uuid" },
+          ],
+        },
+        {
+          field: "user",
+          type: "object",
+          items: [
+            {
+              field: "name",
+              type: "string",
+            },
+            { field: "id", type: "uuid" },
+          ],
+        },
+        {
+          field: "id",
+
+          type: "uuid",
+        },
+      ]}
+      sortDefinitions={[
+        { field: "fingerprint" },
+        { field: "createdAt" },
+        { field: "allowedAt" },
+        { field: "forbiddenAt" },
+        { field: "updatedAt" },
+        { field: "id" },
+      ]}
+    />
+  );
+}
diff --git a/frontend/components/institutions/AddInstitutionRepresentative.tsx b/frontend/components/institutions/AddInstitutionRepresentative.tsx
index 21b057733..f9fa5d6d5 100644
--- a/frontend/components/institutions/AddInstitutionRepresentative.tsx
+++ b/frontend/components/institutions/AddInstitutionRepresentative.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Select, Form, Button } from "antd";
+import { Select, Form, Button, Space } from "antd";
 import {
   AddInstitutionRepresentativeDocument,
   AddInstitutionRepresentativeMutation,
@@ -8,8 +8,7 @@ import { InstitutionRepresentativeRole } from "../../__generated__/graphql";
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
 import { InstitutionDocument } from "../../queries/institutions.generated";
-import { SelectUserId } from "../SelectUserId";
-import { layout, tailLayout } from "../../lib/form";
+import { UserIdSelect } from "../users/UserIdSelect";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 
@@ -76,52 +75,51 @@ export default function AddInstitutionRepresentative({
     );
   };
 
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
-
   return (
     <>
       <ErrorAlert messages={globalErrorMessages} />
       <Form
-        {...layout}
         form={form}
         name="addInstitutionRepresentative"
         onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+        style={{ display: "flex" }}
       >
-        <Form.Item
-          label="User"
-          name="userId"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <SelectUserId />
-        </Form.Item>
-        <Form.Item
-          label="Role"
-          name="role"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <Select
-            placeholder="Please select"
-            options={Object.entries(InstitutionRepresentativeRole).map(
-              ([_key, value]) => ({ label: value, value: value }),
-            )}
-          />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
+        <Space.Compact style={{ flex: 1 }}>
+          <Form.Item
+            noStyle
+            label="User"
+            name="userId"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+            style={{ width: "100%" }}
+          >
+            <UserIdSelect />
+          </Form.Item>
+          <Form.Item
+            noStyle
+            label="Role"
+            name="role"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+            initialValue={InstitutionRepresentativeRole.Assistant}
+          >
+            <Select
+              placeholder="Role"
+              options={Object.entries(InstitutionRepresentativeRole).map(
+                ([_key, value]) => ({ label: value, value: value }),
+              )}
+            />
+          </Form.Item>
           <Button type="primary" htmlType="submit" loading={mutating}>
             Add
           </Button>
-        </Form.Item>
+        </Space.Compact>
       </Form>
     </>
   );
diff --git a/frontend/components/institutions/CreateInstitution.tsx b/frontend/components/institutions/CreateInstitution.tsx
index 9a2b50eab..ea81ab266 100644
--- a/frontend/components/institutions/CreateInstitution.tsx
+++ b/frontend/components/institutions/CreateInstitution.tsx
@@ -31,7 +31,7 @@ type FormValues = {
 interface CreateInstitutionProps {
   ownerIds?: Scalars["Uuid"]["input"][];
   managerId?: Scalars["Uuid"]["input"];
-};
+}
 
 export default function CreateInstitution({
   ownerIds,
@@ -94,6 +94,7 @@ export default function CreateInstitution({
           if (!managerId) {
             const model = data?.createInstitution?.institution;
             if (!model) {
+              setGlobalErrorMessages([]);
               messageMissingModel();
             } else {
               return router.push(paths.institution(model.uuid));
diff --git a/frontend/components/institutions/DeleteInstitution.tsx b/frontend/components/institutions/DeleteInstitution.tsx
index 55fe0db25..83544fe9c 100644
--- a/frontend/components/institutions/DeleteInstitution.tsx
+++ b/frontend/components/institutions/DeleteInstitution.tsx
@@ -50,11 +50,6 @@ export default function DeleteInstitution({
   };
 
   return (
-    <SafeDeleteButton
-      type="text"
-      kind="delete"
-      onConfirm={mutate}
-      deleting={mutating}
-    />
+    <SafeDeleteButton kind="delete" onConfirm={mutate} deleting={mutating} />
   );
 }
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index 174cbd9cb..59478af20 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -1,236 +1,179 @@
 import { useQuery } from "@apollo/client/react";
+import { Divider, List, Typography, Skeleton, Result, Card } from "antd";
 import {
-  Divider,
-  List,
-  Typography,
-  Skeleton,
-  Result,
-  Tag,
-  Space,
-  Tabs,
-  TabsProps,
-  Badge,
-  Tooltip,
-} from "antd";
-import { InstitutionDocument } from "../../queries/institutions.generated";
+  InstitutionDocument,
+  InstitutionPartialFragment,
+} from "../../queries/institutions.generated";
 import { Scalars } from "../../__generated__/graphql";
 import CreateComponent from "../components/CreateComponent";
 import CreateMethod from "../methods/CreateMethod";
 import CreateDataFormat from "../dataFormats/CreateDataFormat";
 import CreateInstitution from "../institutions/CreateInstitution";
 import CreateDatabase from "../databases/CreateDatabase";
-import AddInstitutionRepresentative from "./AddInstitutionRepresentative";
 import Link from "next/link";
 import paths from "../../paths";
-import { DataFormatTable } from "../dataFormats/DataFormatTable";
-import { ComponentTable } from "../components/ComponentTable";
-import DatabaseTable from "../databases/DatabaseTable";
-import MethodTable from "../methods/MethodTable";
-import UpdateInstitution from "./UpdateInstitution";
-import DeleteInstitution from "./DeleteInstitution";
-import SwitchInstitutionOperatingState from "./SwitchInstitutionOperatingState";
-import OpenIdConnectApplicationTable from "../openIdConnect/applications/OpenIdConnectApplicationTable";
 import CreateOpenIdConnectApplication from "../openIdConnect/applications/CreateOpenIdConnectApplication";
-import GnuPgKeyFingerprintTable from "../gnuPgKeyFingerprints/GnuPgKeyFingerprintTable";
 import AddGnuPgKeyFingerprint from "../gnuPgKeyFingerprints/AddGnuPgKeyFingerprint";
 import RemoveInstitutionRepresentative from "./RemoveInstitutionRepresentative";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import ConfirmInstitutionMethodDeveloper from "../methods/ConfirmInstitutionMethodDeveloper";
 import { ConfirmComponentManufacturer } from "../components/ConfirmComponentManufacturer";
-import ContactInformation from "../ContactInformation";
-import JsonViewer from "../JsonViewer";
-import PageHeader from "../PageHeader";
 import { isTruthy } from "../../lib/array";
-import InstitutionTable from "./InstitutionTable";
-import Manager from "../Manager";
-import TabLabel from "../TabLabel";
+import PaginatedMethods from "../methods/PaginatedMethods";
+import PaginatedDatabases from "../databases/PaginatedDatabases";
+import PaginatedDataFormats from "../dataFormats/PaginatedDataFormats";
+import PaginatedInstitutions from "./PaginatedInstitutions";
+import PaginatedOpenIdConnectApplications from "../openIdConnect/applications/PaginatedOpenIdConnectApplications";
+import PaginatedComponents from "../components/PaginatedComponents";
+import LazyTabs, { LazyTabsProps } from "../LazyTabs";
+import QueryToolbar from "../QueryToolbar";
+import PaginatedGnuPgKeyFingerprints from "../gnuPgKeyFingerprints/PaginatedGnuPgKeyFingerprints";
+import { useMemo } from "react";
+import InstitutionSummary from "./InstitutionSummary";
 
-interface Props {
-  institutionId: Scalars["Uuid"]["input"];
-}
-
-export default function Institution({ institutionId }: Props) {
-  const { loading, error, data } = useQuery(InstitutionDocument, {
-    variables: {
-      uuid: institutionId,
-    },
-  });
-  useQueryHandler({ error });
-  const institution = data?.institution;
-
-  if (loading) {
-    return <Skeleton active avatar title />;
-  }
-
-  if (!institution) {
-    return (
-      <Result
-        status="500"
-        title="500"
-        subTitle="Sorry, something went wrong."
-      />
-    );
-  }
-
-  const mainTabs: TabsProps["items"] = [
-    (institution.manufacturedComponents.edges.length >= 1 ||
-      institution.managedComponents.isAuthorizedToAddEdge) && {
+const getMainTabs = (
+  institution: InstitutionPartialFragment,
+): LazyTabsProps["items"] =>
+  [
+    {
       key: "components",
-      label: (
-        <TabLabel
-          name="Manufactured Components"
-          count={institution.manufacturedComponents.totalCount}
-        />
-      ),
+      count: institution.manufacturedComponents.totalCount,
+      label: "Manufactured Components",
       children: (
-        <ComponentTable
-          loading={loading}
-          components={institution.manufacturedComponents.edges.map(
-            (x) => x.node,
-          )}
+        <PaginatedComponents
+          where={{
+            manufacturers: {
+              some: { id: { equalTo: institution.uuid } },
+            },
+          }}
         />
       ),
     },
-    (institution.developedMethods.edges.length >= 1 ||
-      institution.managedMethods.isAuthorizedToAddEdge) && {
+    {
       key: "methods",
-      label: (
-        <TabLabel
-          name="Developed Methods"
-          count={institution.developedMethods.totalCount}
-        />
-      ),
+      count: institution.developedMethods.totalCount,
+      label: "Developed Methods",
       children: (
-        <MethodTable
-          loading={loading}
-          methods={institution.developedMethods.edges.map((x) => x.node)}
+        <PaginatedMethods
+          where={{
+            institutionDevelopers: {
+              some: { id: { equalTo: institution.uuid } },
+            },
+          }}
         />
       ),
     },
-    (institution.operatedDatabases.edges.length >= 1 ||
-      institution.operatedDatabases.isAuthorizedToAddEdge) && {
+    {
       key: "databases",
-      label: (
-        <TabLabel
-          name="Operated Databases"
-          count={institution.operatedDatabases.totalCount}
-        />
-      ),
+      count: institution.operatedDatabases.totalCount,
+      label: "Operated Databases",
       children: (
-        <DatabaseTable
-          loading={loading}
-          databases={institution.operatedDatabases.edges.map((x) => x.node)}
+        <PaginatedDatabases
+          where={{
+            operator: {
+              id: { equalTo: institution.uuid },
+            },
+          }}
         />
       ),
     },
-    (institution.gnuPgKeyFingerprints.edges.length >= 1 ||
+    (institution.gnuPgKeyFingerprints.edges.length > 0 ||
       institution.gnuPgKeyFingerprints.isAuthorizedToAddEdge) && {
       key: "gnuPgKeyFingerprints",
-      label: (
-        <TabLabel
-          name="GnuPG Key Fingerprints"
-          count={institution.gnuPgKeyFingerprints.totalCount}
-        />
-      ),
+      count: institution.gnuPgKeyFingerprints.totalCount,
+      label: "GnuPG Key Fingerprints",
       children: (
-        <GnuPgKeyFingerprintTable
-          loading={false}
-          fingerprints={institution.gnuPgKeyFingerprints.edges.map(
-            (e) => e.node,
-          )}
-          institutionId={institution.uuid}
+        <PaginatedGnuPgKeyFingerprints
+          where={{
+            institution: {
+              id: { equalTo: institution.uuid },
+            },
+          }}
         />
       ),
     },
   ].filter(isTruthy);
 
-  const managedTabs: TabsProps["items"] = [
-    (institution.managedComponents.edges.length >= 1 ||
-      institution.managedComponents.isAuthorizedToAddEdge) && {
+const getManagedTabs = (
+  institution: InstitutionPartialFragment,
+): LazyTabsProps["items"] =>
+  [
+    {
       key: "components",
-      label: (
-        <TabLabel
-          name="Components"
-          count={institution.managedComponents.totalCount}
-        />
-      ),
+      count: institution.managedComponents.totalCount,
+      label: "Components",
       children: (
-        <ComponentTable
-          loading={loading}
-          components={institution.managedComponents.edges.map((x) => x.node)}
+        <PaginatedComponents
+          where={{
+            manager: {
+              id: { equalTo: institution.uuid },
+            },
+          }}
         />
       ),
     },
-    (institution.managedMethods.edges.length >= 1 ||
-      institution.managedMethods.isAuthorizedToAddEdge) && {
+    {
       key: "methods",
-      label: (
-        <TabLabel
-          name="Methods"
-          count={institution.managedMethods.totalCount}
-        />
-      ),
+      count: institution.managedMethods.totalCount,
+      label: "Methods",
       children: (
-        <MethodTable
-          loading={loading}
-          methods={institution.managedMethods.edges.map((x) => x.node)}
+        <PaginatedMethods
+          where={{
+            manager: {
+              id: { equalTo: institution.uuid },
+            },
+          }}
         />
       ),
     },
-    (institution.managedDataFormats.edges.length >= 1 ||
-      institution.managedDataFormats.isAuthorizedToAddEdge) && {
+    {
       key: "dataFormats",
-      label: (
-        <TabLabel
-          name="Data Formats"
-          count={institution.managedDataFormats.totalCount}
-        />
-      ),
+      count: institution.managedDataFormats.totalCount,
+      label: "Data Formats",
       children: (
-        <DataFormatTable
-          loading={loading}
-          dataFormats={institution.managedDataFormats.edges.map((x) => x.node)}
+        <PaginatedDataFormats
+          where={{
+            manager: {
+              id: { equalTo: institution.uuid },
+            },
+          }}
         />
       ),
     },
-    (institution.managedInstitutions.edges.length >= 1 ||
-      institution.managedInstitutions.isAuthorizedToAddEdge) && {
+    {
       key: "institutions",
-      label: (
-        <TabLabel
-          name="Institutions"
-          count={institution.managedInstitutions.totalCount}
-        />
-      ),
+      count: institution.managedInstitutions.totalCount,
+      label: "Institutions",
       children: (
-        <InstitutionTable
-          loading={loading}
-          institutions={institution.managedInstitutions.edges.map(
-            (x) => x.node,
-          )}
+        <PaginatedInstitutions
+          where={{
+            manager: {
+              id: { equalTo: institution.uuid },
+            },
+          }}
         />
       ),
     },
     institution.openIdConnectApplications.isAuthorizedToAddEdge && {
       key: "openIdConnectApplications",
-      label: (
-        <TabLabel
-          name="OpenId Connect Applications"
-          count={institution.openIdConnectApplications.totalCount}
-        />
-      ),
+      count: institution.openIdConnectApplications.totalCount,
+      label: "OpenId Connect Applications",
       children: (
-        <OpenIdConnectApplicationTable
-          loading={false}
-          applications={institution.openIdConnectApplications.edges.map(
-            (e) => e.node,
-          )}
+        <PaginatedOpenIdConnectApplications
+          where={{
+            owner: {
+              id: { equalTo: institution.uuid },
+            },
+          }}
         />
       ),
     },
   ].filter(isTruthy);
 
-  const createTabs: TabsProps["items"] = [
+const getCreateTabs = (
+  institution: InstitutionPartialFragment,
+): LazyTabsProps["items"] =>
+  [
     institution.managedComponents.isAuthorizedToAddEdge && {
       key: "components",
       label: "Components",
@@ -273,20 +216,14 @@ export default function Institution({ institutionId }: Props) {
         <CreateOpenIdConnectApplication institutionId={institution.uuid} />
       ),
     },
-    institution.representatives.isAuthorizedToAddEdge && {
-      key: "representatives",
-      label: "Representatives",
-      children: (
-        <>
-          <AddInstitutionRepresentative institutionId={institution.uuid} />
-        </>
-      ),
-    },
   ].filter(isTruthy);
 
-  const pendingTabs: TabsProps["items"] = [
+const getPendingTabs = (
+  institution: InstitutionPartialFragment,
+): LazyTabsProps["items"] =>
+  [
     institution.pendingManufacturedComponents.isAuthorizedToConfirmEdges &&
-      institution.pendingManufacturedComponents.edges.length >= 1 && {
+      institution.pendingManufacturedComponents.edges.length > 0 && {
         key: "components",
         label: "Components",
         children: (
@@ -310,7 +247,7 @@ export default function Institution({ institutionId }: Props) {
         ),
       },
     institution.pendingDevelopedMethods.isAuthorizedToConfirmEdges &&
-      institution.pendingDevelopedMethods.edges.length >= 1 && {
+      institution.pendingDevelopedMethods.edges.length > 0 && {
         key: "methods",
         label: "Methods",
         children: (
@@ -335,7 +272,7 @@ export default function Institution({ institutionId }: Props) {
       },
     institution.representatives.isAuthorizedToAddEdge &&
       institution.pendingRepresentatives != null &&
-      institution.pendingRepresentatives.edges.length >= 1 && {
+      institution.pendingRepresentatives.edges.length > 0 && {
         key: "representatives",
         label: "Representatives",
         children: (
@@ -363,105 +300,76 @@ export default function Institution({ institutionId }: Props) {
       },
   ].filter(isTruthy);
 
+interface Props {
+  institutionId: Scalars["Uuid"]["input"];
+}
+
+export default function Institution({ institutionId }: Props) {
+  const queryVariables = {
+    uuid: institutionId,
+  };
+  const { loading, error, data } = useQuery(InstitutionDocument, {
+    variables: queryVariables,
+  });
+  useQueryHandler({ error });
+  const institution = data?.institution;
+
+  const tabs = useMemo(() => {
+    if (!institution) return null;
+    return {
+      main: getMainTabs(institution),
+      managed: getManagedTabs(institution),
+      create: getCreateTabs(institution),
+      pending: getPendingTabs(institution),
+    };
+  }, [institution]);
+
+  if (loading) {
+    return <Skeleton active avatar title />;
+  }
+  Card;
+  if (!institution) {
+    return (
+      <Result
+        status="500"
+        title="500"
+        subTitle="Sorry, something went wrong."
+      />
+    );
+  }
+
   return (
     <>
-      <PageHeader
-        id={institution.uuid}
-        title={[
-          institution.name,
-          institution.abbreviation == null
-            ? null
-            : `(${institution.abbreviation})`,
-        ]
-          .filter((x) => x != null)
-          .join(" ")}
-        subTitle={institution.description}
-        tags={[
-          <Tag key={institution.state} color="magenta">
-            {institution.state}
-          </Tag>,
-          <Tag key={institution.operatingState} color="blue">
-            {institution.operatingState}
-          </Tag>,
-        ]}
-        extra={[
-          institution.isAuthorizedToUpdateNode && (
-            <UpdateInstitution institution={institution} />
-          ),
-          institution.isAuthorizedToSwitchOperatingStateOfNode && (
-            <SwitchInstitutionOperatingState institutionId={institution.uuid} />
-          ),
-          institution.isAuthorizedToDeleteNode && (
-            <DeleteInstitution institutionId={institution.uuid} />
-          ),
-        ].filter(isTruthy)}
-      >
-        <Space orientation="vertical">
-          <ContactInformation contact={institution.contact} />
-          {institution.representatives.edges.length >= 1 && (
-            <div>
-              <>
-                Represented by{" "}
-                {institution.representatives.edges.map((edge, index) => (
-                  <span key={edge.node.uuid}>
-                    <Tooltip title={edge.node.uuid}>
-                      <Link href={paths.user(edge.node.uuid)}>
-                        {`${edge.node.name}`}
-                      </Link>
-                    </Tooltip>{" "}
-                    <Tag color="grey" variant="outlined">
-                      {edge.role}
-                    </Tag>
-                    {edge.isAuthorizedToRemoveEdge && (
-                      <RemoveInstitutionRepresentative
-                        institutionId={institution.uuid}
-                        userId={edge.node.uuid}
-                      />
-                    )}
-                    {index < institution.representatives.edges.length - 2 &&
-                      ", "}
-                    {index < institution.representatives.edges.length - 1 &&
-                      " and "}
-                  </span>
-                ))}
-              </>
-            </div>
-          )}
-          {institution.manager?.node && (
-            <Manager data={institution.manager.node} />
-          )}
-          {institution.extras != null && (
-            <JsonViewer jsonData={institution.extras} />
-          )}
-        </Space>
-      </PageHeader>
+      <InstitutionSummary entity={institution} />
       <Divider />
-      {mainTabs.length >= 1 && <Tabs items={mainTabs} />}
-      {managedTabs.length >= 1 && (
+      {tabs?.main && <LazyTabs items={tabs?.main} />}
+      {tabs?.managed && tabs.managed.length > 0 && (
         <>
           <Divider />
-          <Typography.Title level={2}>
+          <Typography.Title level={4}>
             Managed &amp; Owned Entities
           </Typography.Title>
-          <Tabs items={managedTabs} />
+          <LazyTabs items={tabs.managed} />
         </>
       )}
-      {createTabs.length >= 1 && (
+      {tabs?.create && tabs.create.length > 0 && (
         <>
           <Divider />
-          <Typography.Title level={2}>
+          <Typography.Title level={4}>
             Create &amp; Add Entities
           </Typography.Title>
-          <Tabs items={createTabs} />
+          <LazyTabs items={tabs.create} />
         </>
       )}
-      {pendingTabs.length >= 1 && (
+      {tabs?.pending && tabs.pending.length > 0 && (
         <>
           <Divider />
-          <Typography.Title level={2}>Pending Entities</Typography.Title>
-          <Tabs items={pendingTabs} />
+          <Typography.Title level={4}>Pending Entities</Typography.Title>
+          <LazyTabs items={tabs.pending} />
         </>
       )}
+      <Divider />
+      <QueryToolbar query={InstitutionDocument} variables={queryVariables} />
     </>
   );
 }
diff --git a/frontend/components/institutions/InstitutionIdSelect.tsx b/frontend/components/institutions/InstitutionIdSelect.tsx
new file mode 100644
index 000000000..3d321dba3
--- /dev/null
+++ b/frontend/components/institutions/InstitutionIdSelect.tsx
@@ -0,0 +1,17 @@
+import { InstitutionNamesDocument } from "../../queries/institutions.generated";
+import PaginatedIdSelect, { PaginatedSelectProps } from "../PaginatedIdSelect";
+
+export function InstitutionIdSelect({
+  mode,
+  value,
+  onChange,
+}: Omit<PaginatedSelectProps, "query">) {
+  return (
+    <PaginatedIdSelect
+      query={InstitutionNamesDocument}
+      value={value}
+      mode={mode}
+      onChange={onChange}
+    />
+  );
+}
diff --git a/frontend/components/institutions/InstitutionList.tsx b/frontend/components/institutions/InstitutionList.tsx
new file mode 100644
index 000000000..570c8fad5
--- /dev/null
+++ b/frontend/components/institutions/InstitutionList.tsx
@@ -0,0 +1,24 @@
+import { InstitutionsPartialFragment } from "../../queries/institutions.generated";
+import EntityList from "../entities/EntityList";
+import InstitutionSummary from "./InstitutionSummary";
+import EntityItem from "../entities/EntityItem";
+
+export default function InstitutionList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: InstitutionsPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <InstitutionSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/institutions/InstitutionSummary.tsx b/frontend/components/institutions/InstitutionSummary.tsx
new file mode 100644
index 000000000..fb648217f
--- /dev/null
+++ b/frontend/components/institutions/InstitutionSummary.tsx
@@ -0,0 +1,113 @@
+import { Typography } from "antd";
+import { asReadonlyMixed, isTruthy } from "../../lib/array";
+import paths from "../../paths";
+import {
+  InstitutionsPartialFragment,
+  InstitutionPartialFragment,
+  PendingInstitutionsPartialFragment,
+} from "../../queries/institutions.generated";
+import ContactInformation from "../ContactInformation";
+import EntityLink from "../entities/EntityLink";
+import EntitySummary from "../entities/EntitySummary";
+import InlineList from "../InlineList";
+import JsonViewer from "../JsonViewer";
+import Manager from "../Manager";
+import DeleteInstitution from "./DeleteInstitution";
+import RemoveInstitutionRepresentative from "./RemoveInstitutionRepresentative";
+import SwitchInstitutionOperatingState from "./SwitchInstitutionOperatingState";
+import UpdateInstitution from "./UpdateInstitution";
+import VerifyInstitution from "./VerifyInstitution";
+import { InstitutionState } from "../../__generated__/graphql";
+import Link from "next/link";
+import AddInstitutionRepresentative from "./AddInstitutionRepresentative";
+import EnumTag from "../EnumTag";
+
+export default function InstitutionSummary({
+  entity,
+}: {
+  entity:
+    | InstitutionsPartialFragment
+    | PendingInstitutionsPartialFragment
+    | InstitutionPartialFragment;
+}) {
+  return (
+    <EntitySummary
+      entity={entity}
+      route={paths.institution}
+      tags={[
+        <EnumTag key={entity.state} color="magenta">
+          {entity.state}
+        </EnumTag>,
+        <EnumTag key={entity.operatingState} color="blue">
+          {entity.operatingState}
+        </EnumTag>,
+      ]}
+      extra={[
+        "isAuthorizedToVerifyNode" in entity &&
+          entity.isAuthorizedToVerifyNode &&
+          entity.state == InstitutionState.Pending && (
+            <VerifyInstitution institutionId={entity.uuid} />
+          ),
+        "isAuthorizedToUpdateNode" in entity &&
+          entity.isAuthorizedToUpdateNode && (
+            <UpdateInstitution institution={entity} />
+          ),
+        "isAuthorizedToSwitchOperatingStateOfNode" in entity &&
+          entity.isAuthorizedToSwitchOperatingStateOfNode && (
+            <SwitchInstitutionOperatingState institutionId={entity.uuid} />
+          ),
+        "isAuthorizedToDeleteNode" in entity &&
+          entity.isAuthorizedToDeleteNode && (
+            <DeleteInstitution institutionId={entity.uuid} />
+          ),
+      ].filter(isTruthy)}
+    >
+      {entity.state == InstitutionState.Pending && (
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          The institution is awaiting verification by one of the verifiers. Once
+          it is verified, it will be listed on{" "}
+          <Link href={paths.institutions}>Institutions</Link> and its
+          representatives will be able to manage its components, databases, data
+          formats, methods, OpenId Connect applications, and other
+          representatives.
+        </Typography.Paragraph>
+      )}
+      <ContactInformation contact={entity.contact} />
+      {entity.representatives.edges.length > 0 && (
+        <div>
+          Represented by{" "}
+          <InlineList
+            items={asReadonlyMixed(entity.representatives.edges)}
+            renderItem={(edge) => (
+              <span key={edge.node.id}>
+                <EntityLink entity={edge.node} route={paths.user} />{" "}
+                <EnumTag color="grey" variant="outlined">
+                  {edge.role}
+                </EnumTag>
+                {"isAuthorizedToRemoveEdge" in edge &&
+                  edge.isAuthorizedToRemoveEdge && (
+                    <RemoveInstitutionRepresentative
+                      institutionId={entity.uuid}
+                      userId={edge.node.uuid}
+                    />
+                  )}
+              </span>
+            )}
+          />
+          {"isAuthorizedToAddEdge" in entity.representatives &&
+            entity.representatives.isAuthorizedToAddEdge && (
+              <AddInstitutionRepresentative institutionId={entity.uuid} />
+            )}
+        </div>
+      )}
+      {"manager" in entity && entity.manager?.node && (
+        <div>
+          <Manager data={entity.manager.node} />
+        </div>
+      )}
+      {"extras" in entity && entity.extras != null && (
+        <JsonViewer data={entity.extras} />
+      )}
+    </EntitySummary>
+  );
+}
diff --git a/frontend/components/institutions/InstitutionTable.tsx b/frontend/components/institutions/InstitutionTable.tsx
deleted file mode 100644
index b4da664d4..000000000
--- a/frontend/components/institutions/InstitutionTable.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Table } from "antd";
-import { InstitutionsPartialFragment } from "../../queries/institutions.generated";
-import {
-  getNameColumnProps,
-  getAbbreviationColumnProps,
-  getDescriptionColumnProps,
-  getUuidColumnProps,
-} from "../../lib/table";
-import paths from "../../paths";
-import { useState } from "react";
-import { setMapValue } from "../../lib/freeTextFilter";
-
-export default function InstitutionTable({
-  loading,
-  institutions,
-}: {
-  loading: boolean;
-  institutions: InstitutionsPartialFragment[];
-}) {
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
-
-  return (
-    <Table
-      loading={loading}
-      columns={[
-        {
-          ...getUuidColumnProps<(typeof nodes)[0]>(
-            onFilterTextChange,
-            (x) => filterText.get(x),
-            paths.institution,
-          ),
-        },
-        {
-          ...getNameColumnProps<(typeof nodes)[0]>(onFilterTextChange, (x) =>
-            filterText.get(x),
-          ),
-        },
-        {
-          ...getAbbreviationColumnProps<(typeof nodes)[0]>(
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-        {
-          ...getDescriptionColumnProps<(typeof nodes)[0]>(
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-      ]}
-      dataSource={institutions}
-    />
-  );
-}
diff --git a/frontend/components/institutions/PaginatedInstitutions.tsx b/frontend/components/institutions/PaginatedInstitutions.tsx
new file mode 100644
index 000000000..d76efee61
--- /dev/null
+++ b/frontend/components/institutions/PaginatedInstitutions.tsx
@@ -0,0 +1,184 @@
+import {
+  InstitutionsDocument,
+  InstitutionNamesDocument,
+  InstitutionsQueryVariables,
+} from "../../queries/institutions.generated";
+import paths from "../../paths";
+import InstitutionList from "./InstitutionList";
+import PaginatedEntities from "../entities/PaginatedEntities";
+
+export default function PaginatedInstitutions({
+  where,
+  showJump = false,
+}: {
+  where?: InstitutionsQueryVariables["where"];
+  showJump?: boolean;
+}) {
+  return (
+    <PaginatedEntities
+      entitiesQuery={InstitutionsDocument}
+      namesQuery={InstitutionNamesDocument}
+      where={where}
+      showJump={showJump}
+      route={paths.institution}
+      list={(props) => <InstitutionList {...props} />}
+      filterDefinitions={[
+        {
+          field: "name",
+          type: "string",
+        },
+        {
+          field: "description",
+          type: "string",
+        },
+        {
+          field: "developedMethods",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "name",
+                type: "string",
+              },
+              { field: "id", type: "uuid" },
+            ],
+          },
+        },
+        {
+          field: "gnuPgKeyFingerprints",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "name",
+                type: "string",
+              },
+              { field: "id", type: "uuid" },
+            ],
+          },
+        },
+        {
+          field: "managedDataFormats",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "name",
+                type: "string",
+              },
+              { field: "id", type: "uuid" },
+            ],
+          },
+        },
+        {
+          field: "managedInstitutions",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "name",
+                type: "string",
+              },
+              { field: "id", type: "uuid" },
+            ],
+          },
+        },
+        {
+          field: "managedMethods",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "name",
+                type: "string",
+              },
+              { field: "id", type: "uuid" },
+            ],
+          },
+        },
+        {
+          field: "manufacturedComponents",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "name",
+                type: "string",
+              },
+              { field: "id", type: "uuid" },
+            ],
+          },
+        },
+        {
+          field: "operatedDatabases",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "name",
+                type: "string",
+              },
+              { field: "id", type: "uuid" },
+            ],
+          },
+        },
+        {
+          field: "representatives",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "name",
+                type: "string",
+              },
+              { field: "id", type: "uuid" },
+            ],
+          },
+        },
+        {
+          field: "representatives",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "name",
+                type: "string",
+              },
+              { field: "id", type: "uuid" },
+            ],
+          },
+        },
+        {
+          field: "manager",
+          type: "object",
+          items: [
+            {
+              field: "name",
+              type: "string",
+            },
+            { field: "id", type: "uuid" },
+          ],
+        },
+        {
+          field: "id",
+          type: "uuid",
+        },
+      ]}
+      sortDefinitions={[
+        { field: "name" },
+        { field: "createdAt" },
+        { field: "updatedAt" },
+        { field: "id" },
+      ]}
+    />
+  );
+}
diff --git a/frontend/components/institutions/PendingInstitutionList.tsx b/frontend/components/institutions/PendingInstitutionList.tsx
new file mode 100644
index 000000000..3d2422c47
--- /dev/null
+++ b/frontend/components/institutions/PendingInstitutionList.tsx
@@ -0,0 +1,24 @@
+import { useQuery } from "@apollo/client/react";
+import { PendingInstitutionsDocument } from "../../queries/institutions.generated";
+import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
+import EntityList from "../entities/EntityList";
+import EntityItem from "../entities/EntityItem";
+import InstitutionSummary from "./InstitutionSummary";
+
+export default function PendingInstitutionList() {
+  const { data, loading, error } = useQuery(PendingInstitutionsDocument);
+  useQueryHandler({ error });
+  const nodes = data?.pendingInstitutions?.edges?.map((e) => e.node) || [];
+
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <InstitutionSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/institutions/PendingInstitutions.tsx b/frontend/components/institutions/PendingInstitutions.tsx
deleted file mode 100644
index c4d9ab832..000000000
--- a/frontend/components/institutions/PendingInstitutions.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useQuery } from "@apollo/client/react";
-import { List } from "antd";
-import { PendingInstitutionsDocument } from "../../queries/institutions.generated";
-import Link from "next/link";
-import paths from "../../paths";
-import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
-import VerifyInstitution from "./VerifyInstitution";
-
-interface PendingInstitutionsProps {};
-
-export default function PendingInstitutions({}: PendingInstitutionsProps) {
-  const { data, loading, error } = useQuery(PendingInstitutionsDocument);
-  useQueryHandler({ error });
-
-  return (
-    <>
-      <List
-        size="small"
-        loading={loading}
-        dataSource={data?.pendingInstitutions?.edges?.map((e) => e.node) || []}
-        renderItem={(item) => (
-          <List.Item>
-            <Link href={paths.institution(item.uuid)}>{item.name}</Link>
-            {item.isAuthorizedToVerifyNode && (
-              <VerifyInstitution institutionId={item.uuid} />
-            )}
-          </List.Item>
-        )}
-      />
-    </>
-  );
-}
diff --git a/frontend/components/institutions/RemoveInstitutionRepresentative.tsx b/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
index 696e0dfcd..ded835e82 100644
--- a/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
+++ b/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
@@ -64,8 +64,8 @@ export default function RemoveInstitutionRepresentative({
 
   return (
     <SafeDeleteButton
-      kind="remove"
       type="icon"
+      kind="remove"
       deleting={mutating}
       onConfirm={remove}
     />
diff --git a/frontend/components/institutions/UpdateInstitution.tsx b/frontend/components/institutions/UpdateInstitution.tsx
index 4c4d37fac..0eba8e3f2 100644
--- a/frontend/components/institutions/UpdateInstitution.tsx
+++ b/frontend/components/institutions/UpdateInstitution.tsx
@@ -9,6 +9,7 @@ import { useState } from "react";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
+import EditButton from "../EditButton";
 
 type ContactFormValues = {
   phoneNumber: string | null | undefined;
@@ -66,6 +67,7 @@ export default function UpdateInstitution({
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           setOpen(false);
         },
         onError: (graphQlErrors, userErrors) =>
@@ -82,7 +84,7 @@ export default function UpdateInstitution({
 
   return (
     <>
-      <Button onClick={() => setOpen(true)}>Edit</Button>
+      <EditButton onClick={() => setOpen(true)} />
       <Modal
         open={open}
         title="Edit Institution"
diff --git a/frontend/components/me/ChangeUserEmail.tsx b/frontend/components/me/ChangeUserEmail.tsx
index 43c7f9e6b..64eff998f 100644
--- a/frontend/components/me/ChangeUserEmail.tsx
+++ b/frontend/components/me/ChangeUserEmail.tsx
@@ -39,6 +39,7 @@ export function ChangeUserEmail() {
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           message.success(
             "Verification link to change email sent. Please check your email.",
           );
diff --git a/frontend/components/me/ManageLayout.tsx b/frontend/components/me/ManageLayout.tsx
index 9a2ebea72..fa9482f78 100644
--- a/frontend/components/me/ManageLayout.tsx
+++ b/frontend/components/me/ManageLayout.tsx
@@ -1,4 +1,4 @@
-import { ReactNode } from "react";
+import { ReactNode, useMemo } from "react";
 import { useRouter } from "next/router";
 import Link from "next/link";
 import { Skeleton, Layout as AntLayout, Menu } from "antd";
@@ -25,6 +25,15 @@ const navItems = [
   },
 ];
 
+const changePasswordItem = {
+  path: paths.me.manage.changePassword,
+  label: "Change Password",
+};
+const setPasswordItem = {
+  path: paths.me.manage.setPassword,
+  label: "Set Password",
+};
+
 type ManageLayoutProps = {
   children?: ReactNode;
 };
@@ -35,6 +44,18 @@ export default function ManageLayout({ children }: ManageLayoutProps) {
     returnTo: paths.me.manage.profile,
   });
 
+  const items = useMemo(
+    () =>
+      [
+        ...navItems,
+        currentUser?.hasPassword ? changePasswordItem : setPasswordItem,
+      ].map((item) => ({
+        key: item.path,
+        label: <Link href={item.path}>{item.label}</Link>,
+      })),
+    [navItems, currentUser?.hasPassword, changePasswordItem, setPasswordItem],
+  );
+
   if (!authenticated) {
     return (
       <Layout>
@@ -51,24 +72,8 @@ export default function ManageLayout({ children }: ManageLayoutProps) {
             mode="inline"
             selectedKeys={[router.pathname]}
             style={{ height: "100%", borderRight: 0 }}
-          >
-            {navItems.map(({ path, label }) => (
-              <Menu.Item key={path}>
-                <Link href={path}>{label}</Link>
-              </Menu.Item>
-            ))}
-            {currentUser.hasPassword ? (
-              <Menu.Item key={paths.me.manage.changePassword}>
-                <Link href={paths.me.manage.changePassword}>
-                  Change Password
-                </Link>
-              </Menu.Item>
-            ) : (
-              <Menu.Item key={paths.me.manage.setPassword}>
-                <Link href={paths.me.manage.setPassword}>Set Password</Link>
-              </Menu.Item>
-            )}
-          </Menu>
+            items={items}
+          />
         </AntLayout.Sider>
         <AntLayout.Content style={{ padding: "0 24px", minHeight: 280 }}>
           {children}
diff --git a/frontend/components/me/SetUserPhoneNumber.tsx b/frontend/components/me/SetUserPhoneNumber.tsx
index 3eab1e7f1..17474ec84 100644
--- a/frontend/components/me/SetUserPhoneNumber.tsx
+++ b/frontend/components/me/SetUserPhoneNumber.tsx
@@ -43,6 +43,7 @@ export function SetUserPhoneNumber({ phoneNumber }: SetUserPhoneNumberProps) {
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           message.success("Your new phone number was set.");
         },
         onError: (graphQlErrors, userErrors) =>
diff --git a/frontend/components/methods/AddInstitutionMethodDeveloper.tsx b/frontend/components/methods/AddInstitutionMethodDeveloper.tsx
index 262fcdad5..9b5859cd9 100644
--- a/frontend/components/methods/AddInstitutionMethodDeveloper.tsx
+++ b/frontend/components/methods/AddInstitutionMethodDeveloper.tsx
@@ -1,14 +1,13 @@
 import { useMutation } from "@apollo/client/react";
-import { Form, Button } from "antd";
+import { Form, Button, Space } from "antd";
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
 import { MethodDocument } from "../../queries/methods.generated";
-import { SelectInstitutionId } from "../SelectInstitutionId";
+import { InstitutionIdSelect } from "../institutions/InstitutionIdSelect";
 import {
   AddInstitutionMethodDeveloperDocument,
   AddInstitutionMethodDeveloperMutation,
 } from "../../queries/institutionMethodDevelopers.generated";
-import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 
@@ -71,36 +70,32 @@ export default function AddInstitutionMethodDeveloper({
     );
   };
 
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
-
   return (
     <>
       <ErrorAlert messages={globalErrorMessages} />
       <Form
-        {...layout}
         form={form}
         name="addInstitutionMethodDeveloper"
         onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+        style={{ display: "flex" }}
       >
-        <Form.Item
-          label="Institution"
-          name="institutionId"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <SelectInstitutionId />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
+        <Space.Compact style={{ flex: 1 }}>
+          <Form.Item
+            label="Institution"
+            name="institutionId"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+            style={{ width: "100%" }}
+          >
+            <InstitutionIdSelect />
+          </Form.Item>
           <Button type="primary" htmlType="submit" loading={mutating}>
             Add
           </Button>
-        </Form.Item>
+        </Space.Compact>
       </Form>
     </>
   );
diff --git a/frontend/components/methods/AddUserMethodDeveloper.tsx b/frontend/components/methods/AddUserMethodDeveloper.tsx
index 4e0e13732..e5344714c 100644
--- a/frontend/components/methods/AddUserMethodDeveloper.tsx
+++ b/frontend/components/methods/AddUserMethodDeveloper.tsx
@@ -1,14 +1,13 @@
 import { useMutation } from "@apollo/client/react";
-import { Form, Button } from "antd";
+import { Form, Button, Space } from "antd";
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
 import { MethodDocument } from "../../queries/methods.generated";
-import { SelectUserId } from "../SelectUserId";
+import { UserIdSelect } from "../users/UserIdSelect";
 import {
   AddUserMethodDeveloperDocument,
   AddUserMethodDeveloperMutation,
 } from "../../queries/userMethodDevelopers.generated";
-import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 
@@ -71,36 +70,32 @@ export default function AddUserMethodDeveloper({
     );
   };
 
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
-
   return (
     <>
       <ErrorAlert messages={globalErrorMessages} />
       <Form
-        {...layout}
         form={form}
         name="addUserMethodDeveloper"
         onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+        style={{ display: "flex" }}
       >
-        <Form.Item
-          label="User"
-          name="userId"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <SelectUserId />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
+        <Space.Compact style={{ flex: 1 }}>
+          <Form.Item
+            label="User"
+            name="userId"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+            style={{ width: "100%" }}
+          >
+            <UserIdSelect />
+          </Form.Item>
           <Button type="primary" htmlType="submit" loading={mutating}>
             Add
           </Button>
-        </Form.Item>
+        </Space.Compact>
       </Form>
     </>
   );
diff --git a/frontend/components/methods/AppliedMethodViewer.tsx b/frontend/components/methods/AppliedMethodViewer.tsx
new file mode 100644
index 000000000..b2480db12
--- /dev/null
+++ b/frontend/components/methods/AppliedMethodViewer.tsx
@@ -0,0 +1,78 @@
+import { Scalars } from "../../__generated__/graphql";
+import dayjs from "dayjs";
+import paths from "../../paths";
+import EntityLink from "../entities/EntityLink";
+import InlineList from "../InlineList";
+import JsonViewer from "../JsonViewer";
+import {
+  AppliedMethodPartialFragment,
+  ToTreeVertexAppliedConversionMethodPartialFragment,
+} from "../../queries/data.generated";
+
+const nameFallback = (id: Scalars["Uuid"]["output"]) => ({
+  uuid: id,
+  name: id,
+});
+
+export default function AppliedMethodViewer({
+  value,
+}: {
+  value:
+    | AppliedMethodPartialFragment
+    | ToTreeVertexAppliedConversionMethodPartialFragment;
+}) {
+  return (
+    <span>
+      <EntityLink
+        entity={value.method ?? nameFallback(value.methodId)}
+        route={paths.method}
+      />
+      {value.arguments.length > 0 && (
+        <>
+          {" "}
+          with the arguments{" "}
+          <InlineList
+            items={value.arguments}
+            renderItem={(item) => (
+              <span>
+                <code>{item.name}</code>=&ldquo;
+                <JsonViewer inline data={item.value} />
+                &rdquo;
+              </span>
+            )}
+          />
+        </>
+      )}
+      {value.__typename === "AppliedMethod" && value.sources.length > 0 && (
+        <>
+          {" "}
+          on the sources{" "}
+          <InlineList
+            items={value.sources}
+            renderItem={(item) => (
+              <span>
+                <code>{item.name}</code>=&ldquo;
+                <EntityLink
+                  entity={{
+                    uuid: item.value.dataId,
+                    name: `data ${item.value.dataId} in database ${item.value.database?.name ?? item.value.databaseId} at timestamp ${dayjs(item.value.dataTimestamp)}`,
+                  }}
+                  route={(id) =>
+                    paths.data(item.value.databaseId, item.value.dataKind, id)
+                  }
+                />
+                &rdquo;
+              </span>
+            )}
+          />
+        </>
+      )}
+      {value.__typename === "ToTreeVertexAppliedConversionMethod" && (
+        <>
+          {" "}
+          with its parent as the source <code>{value.sourceName}</code>.
+        </>
+      )}
+    </span>
+  );
+}
diff --git a/frontend/components/methods/CreateMethod.tsx b/frontend/components/methods/CreateMethod.tsx
index f6709440d..8d6a8a094 100644
--- a/frontend/components/methods/CreateMethod.tsx
+++ b/frontend/components/methods/CreateMethod.tsx
@@ -9,16 +9,19 @@ import {
   MethodCategory,
   Scalars,
   ReferenceInput,
+  MethodParameterInput,
+  MethodSourceInput,
 } from "../../__generated__/graphql";
 import { useState } from "react";
 import { InstitutionDocument } from "../../queries/institutions.generated";
-import { SelectInstitutionId } from "../SelectInstitutionId";
-import { SelectUserId } from "../SelectUserId";
-import { ReferenceForm } from "../ReferenceForm";
+import { InstitutionIdSelect } from "../institutions/InstitutionIdSelect";
+import { UserIdSelect } from "../users/UserIdSelect";
+import { ReferenceSubform } from "../ReferenceSubform";
 import dayjs from "dayjs";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
+import { MethodParametersSubform } from "./MethodParametersSubform";
 
 type FormValues = {
   name: string;
@@ -33,6 +36,8 @@ type FormValues = {
     | undefined;
   reference: ReferenceInput | null | undefined;
   calculationLocator: Scalars["Url"]["input"] | null | undefined;
+  parameters: MethodParameterInput[] | null | undefined;
+  sources: MethodSourceInput[] | null | undefined;
   categories: MethodCategory[] | null | undefined;
   institutionDeveloperIds: Scalars["Uuid"]["input"][] | null | undefined;
   userDeveloperIds: Scalars["Uuid"]["input"][] | null | undefined;
@@ -72,13 +77,19 @@ export default function CreateMethod({ managerId }: CreateMethodProps) {
   const onFinish = (values: FormValues) => {
     withMutationHandler(
       () => {
-        // TODO Why does `initialValue` not set standardizers to `[]`?
+        // TODO Why does `initialValue` not set sources, parameters, and standardizers to `[]`?
         if (
           values.reference?.standard != null &&
           values.reference.standard.standardizers == undefined
         ) {
           values.reference.standard.standardizers = [];
         }
+        if (values.parameters == undefined) {
+          values.parameters = [];
+        }
+        if (values.sources == undefined) {
+          values.sources = [];
+        }
         // https://www.apollographql.com/docs/react/networking/authentication/#reset-store-on-logout
         return createMethodMutation({
           variables: {
@@ -95,8 +106,8 @@ export default function CreateMethod({ managerId }: CreateMethodProps) {
               },
               reference: values.reference,
               calculationLocator: values.calculationLocator,
-              parameters: [],
-              sources: [],
+              parameters: values.parameters,
+              sources: values.sources,
               categories: values.categories || [],
               managerId: managerId,
               institutionDeveloperIds: values.institutionDeveloperIds || [],
@@ -184,22 +195,25 @@ export default function CreateMethod({ managerId }: CreateMethodProps) {
             }))}
           />
         </Form.Item>
+        <Form.Item label="Parameter(s)">
+          <MethodParametersSubform namespace={["parameters"]} />
+        </Form.Item>
         <Form.Item
           label="Institution Developers"
           name="institutionDeveloperIds"
           initialValue={[]}
         >
-          <SelectInstitutionId mode="multiple" />
+          <InstitutionIdSelect mode="multiple" />
         </Form.Item>
         <Form.Item
           label="User Developers"
           name="userDeveloperIds"
           initialValue={[]}
         >
-          <SelectUserId mode="multiple" />
+          <UserIdSelect mode="multiple" />
         </Form.Item>
         <Divider />
-        <ReferenceForm form={form} namespace={["reference"]} />
+        <ReferenceSubform form={form} namespace={["reference"]} />
         <Form.Item {...tailLayout}>
           <Button type="primary" htmlType="submit" loading={mutating}>
             Create
diff --git a/frontend/components/methods/Method.tsx b/frontend/components/methods/Method.tsx
index cb4039e4d..a67207397 100644
--- a/frontend/components/methods/Method.tsx
+++ b/frontend/components/methods/Method.tsx
@@ -1,38 +1,21 @@
 import { useQuery } from "@apollo/client/react";
 import { Scalars } from "../../__generated__/graphql";
 import { MethodDocument } from "../../queries/methods.generated";
-import {
-  Tag,
-  Skeleton,
-  Result,
-  Descriptions,
-  Typography,
-  List,
-  Row,
-  Col,
-} from "antd";
-import Link from "next/link";
-import PageHeader from "../PageHeader";
-import paths from "../../paths";
-import { Reference } from "../Reference";
-import OpenEndedDateTimeRangeX from "../OpenEndedDateTimeRangeX";
-import UpdateMethod from "./UpdateMethod";
-import AddInstitutionMethodDeveloper from "./AddInstitutionMethodDeveloper";
-import AddUserMethodDeveloper from "./AddUserMethodDeveloper";
+import { Skeleton, Result, Card, Divider } from "antd";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
-import RemoveInstitutionMethodDeveloper from "./RemoveInstitutionMethodDeveloper";
-import RemoveUserMethodDeveloper from "./RemoveUserMethodDeveloper";
-import { isTruthy } from "../../lib/array";
+import MethodSummary from "./MethodSummary";
+import QueryToolbar from "../QueryToolbar";
 
 interface MethodProps {
   methodId: Scalars["Uuid"]["input"];
 }
 
 export default function Method({ methodId }: MethodProps) {
+  const queryVariables = {
+    uuid: methodId,
+  };
   const { loading, error, data } = useQuery(MethodDocument, {
-    variables: {
-      uuid: methodId,
-    },
+    variables: queryVariables,
   });
   useQueryHandler({ error });
   const method = data?.method;
@@ -52,189 +35,10 @@ export default function Method({ methodId }: MethodProps) {
   }
 
   return (
-    <>
-      <PageHeader
-        id={method.uuid}
-        title={method.name}
-        subTitle={method.description}
-        tags={method.categories.map((x) => (
-          <Tag key={x} color="magenta">
-            {x}
-          </Tag>
-        ))}
-        extra={[
-          method.isAuthorizedToUpdateNode && (
-            <UpdateMethod key="updateMethod" method={method} />
-          ),
-        ].filter(isTruthy)}
-      >
-        <Descriptions size="small" column={1}>
-          <Descriptions.Item label="UUID">{method.uuid}</Descriptions.Item>
-          <Descriptions.Item label="Valid">
-            <OpenEndedDateTimeRangeX range={method.validity} />
-          </Descriptions.Item>
-          <Descriptions.Item label="Available">
-            <OpenEndedDateTimeRangeX range={method.availability} />
-          </Descriptions.Item>
-          {method.calculationLocator && (
-            <Descriptions.Item label="Calculation">
-              <Typography.Link href={method.calculationLocator}>
-                {method.calculationLocator}
-              </Typography.Link>
-            </Descriptions.Item>
-          )}
-          <Descriptions.Item label="Reference">
-            <Reference reference={method.reference} />
-          </Descriptions.Item>
-          <Descriptions.Item label="Managed by">
-            <Typography.Link href={paths.institution(method.manager.node.uuid)}>
-              {method.manager.node.name}
-            </Typography.Link>
-          </Descriptions.Item>
-        </Descriptions>
-      </PageHeader>
-      {(method.developers.edges.length >= 1 ||
-        method.developers.isAuthorizedToAddInstitutionEdge ||
-        method.developers.isAuthorizedToAddUserEdge) && (
-        <Row gutter={[16, 16]}>
-          <Col flex={1}>
-            {(method.developers.edges.length >= 1 ||
-              method.developers.isAuthorizedToAddInstitutionEdge) && (
-              <List
-                header="Institution Developers"
-                bordered={true}
-                size="small"
-                footer={
-                  method.developers.isAuthorizedToAddInstitutionEdge && (
-                    <AddInstitutionMethodDeveloper methodId={method.uuid} />
-                  )
-                }
-              >
-                {method.developers.edges
-                  .filter((x) => x.node.__typename == "Institution")
-                  .map((x) => (
-                    <List.Item
-                      key={x.node.uuid}
-                      actions={
-                        x.isAuthorizedToRemoveEdge
-                          ? [
-                              <RemoveInstitutionMethodDeveloper
-                                key={`removeInstitutionMethodDeveloper-${x.node.uuid}`}
-                                methodId={method.uuid}
-                                institutionId={x.node.uuid}
-                              />,
-                            ]
-                          : []
-                      }
-                    >
-                      <List.Item.Meta
-                        title={
-                          <Link href={paths.institution(x.node.uuid)}>
-                            {x.node.name}
-                          </Link>
-                        }
-                      />
-                    </List.Item>
-                  ))}
-                {method.pendingDevelopers?.edges
-                  .filter((x) => x.node.__typename == "Institution")
-                  .map((x) => (
-                    <List.Item
-                      key={x.node.uuid}
-                      actions={
-                        x.isAuthorizedToRemoveEdge
-                          ? [
-                              <RemoveInstitutionMethodDeveloper
-                                key={`removeInstitutionMethodDeveloper-${x.node.uuid}`}
-                                methodId={method.uuid}
-                                institutionId={x.node.uuid}
-                              />,
-                            ]
-                          : []
-                      }
-                    >
-                      <List.Item.Meta
-                        title={
-                          <Link href={paths.institution(x.node.uuid)}>
-                            {x.node.name} (Pending)
-                          </Link>
-                        }
-                      />
-                    </List.Item>
-                  ))}
-              </List>
-            )}
-          </Col>
-          <Col flex={1}>
-            {(method.developers.edges.length >= 1 ||
-              method.developers.isAuthorizedToAddUserEdge) && (
-              <List
-                header="User Developers"
-                bordered={true}
-                size="small"
-                footer={
-                  method.developers.isAuthorizedToAddUserEdge && (
-                    <AddUserMethodDeveloper methodId={method.uuid} />
-                  )
-                }
-              >
-                {method.developers.edges
-                  .filter((x) => x.node.__typename == "User")
-                  .map((x) => (
-                    <List.Item
-                      key={x.node.uuid}
-                      actions={
-                        x.isAuthorizedToRemoveEdge
-                          ? [
-                              <RemoveUserMethodDeveloper
-                                key={`removeUserMethodDeveloper-${x.node.uuid}`}
-                                methodId={method.uuid}
-                                userId={x.node.uuid}
-                              />,
-                            ]
-                          : []
-                      }
-                    >
-                      <List.Item.Meta
-                        title={
-                          <Link href={paths.user(x.node.uuid)}>
-                            {x.node.name}
-                          </Link>
-                        }
-                      />
-                    </List.Item>
-                  ))}
-                {method.pendingDevelopers?.edges
-                  .filter((x) => x.node.__typename == "User")
-                  .map((x) => (
-                    <List.Item
-                      key={x.node.uuid}
-                      actions={
-                        x.isAuthorizedToRemoveEdge
-                          ? [
-                              <RemoveUserMethodDeveloper
-                                key={`removeUserMethodDeveloper-${x.node.uuid}`}
-                                methodId={method.uuid}
-                                userId={x.node.uuid}
-                              />,
-                            ]
-                          : []
-                      }
-                    >
-                      <List.Item.Meta
-                        title={
-                          <Link href={paths.user(x.node.uuid)}>
-                            {x.node.name} (Pending)
-                          </Link>
-                        }
-                      />
-                    </List.Item>
-                  ))}
-              </List>
-            )}
-          </Col>
-        </Row>
-      )}
-    </>
+    <Card>
+      <MethodSummary entity={method} />
+      <Divider />
+      <QueryToolbar query={MethodDocument} variables={queryVariables} />
+    </Card>
   );
 }
diff --git a/frontend/components/methods/MethodList.tsx b/frontend/components/methods/MethodList.tsx
new file mode 100644
index 000000000..238603db5
--- /dev/null
+++ b/frontend/components/methods/MethodList.tsx
@@ -0,0 +1,24 @@
+import { MethodsPartialFragment } from "../../queries/methods.generated";
+import EntityItem from "../entities/EntityItem";
+import EntityList from "../entities/EntityList";
+import MethodSummary from "./MethodSummary";
+
+export default function MethodList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: MethodsPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <MethodSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/methods/MethodParametersSubform.tsx b/frontend/components/methods/MethodParametersSubform.tsx
new file mode 100644
index 000000000..8e8713eec
--- /dev/null
+++ b/frontend/components/methods/MethodParametersSubform.tsx
@@ -0,0 +1,108 @@
+import { PlusOutlined } from "@ant-design/icons";
+import { Form, Input, Button, Flex } from "antd";
+import DeleteButton from "../DeleteButton";
+import { MethodParameter } from "../../__generated__/graphql";
+import TextArea from "antd/es/input/TextArea";
+
+export type MethodParametersSubformProps = {
+  initialValue?: MethodParameter[] | null;
+  namespace: string[];
+};
+
+export function MethodParametersSubform({
+  initialValue,
+  namespace,
+}: MethodParametersSubformProps) {
+  return (
+    <>
+      <Form.List name={namespace} initialValue={initialValue ?? undefined}>
+        {(fields, { add, remove }, { errors }) => (
+          <Flex vertical gap="small">
+            <Form.ErrorList errors={errors} />
+            {fields.map(({ key, name, ...restField }) => (
+              <Flex vertical key={key} gap="small" align="baseline">
+                <Form.Item
+                  {...restField}
+                  name={[name, "name"]}
+                  noStyle
+                  style={{ flex: 1 }}
+                  rules={[
+                    {
+                      required: true,
+                    },
+                  ]}
+                >
+                  <Input placeholder="Name" style={{ width: "100%" }} />
+                </Form.Item>
+                <Form.Item
+                  {...restField}
+                  name={[name, "type"]}
+                  noStyle
+                  style={{ flex: 1 }}
+                  // Convert JSON Object (State) -> String (UI)
+                  getValueProps={(value: object | null | undefined) => {
+                    return {
+                      value:
+                        typeof value === "object"
+                          ? JSON.stringify(value, null, 2)
+                          : value,
+                    };
+                  }}
+                  // Convert String (UI) -> JSON Object (State)
+                  getValueFromEvent={(e) => {
+                    const rawValue = e.target.value.trim();
+                    if (rawValue === "true") return true;
+                    if (rawValue === "false") return false;
+                    try {
+                      return JSON.parse(rawValue);
+                    } catch (err) {
+                      return rawValue;
+                    }
+                  }}
+                  rules={[
+                    {
+                      required: true,
+                    },
+                    {
+                      validator: (_, value) => {
+                        // Let the "required" rule handle it
+                        if (value === undefined || value === null)
+                          return Promise.resolve();
+                        if (typeof value === "string") {
+                          return Promise.reject(
+                            new Error("Invalid JSON Schema"),
+                          );
+                        }
+                        return Promise.resolve();
+                      },
+                    },
+                  ]}
+                >
+                  <TextArea
+                    autoSize={{ minRows: 2 }}
+                    placeholder="Type (JSON Schema)"
+                    style={{ width: "100%" }}
+                  />
+                </Form.Item>
+                <DeleteButton
+                  type="default"
+                  kind="remove"
+                  style={{ width: "100%" }}
+                  onClick={() => remove(name)}
+                />
+              </Flex>
+            ))}
+            <Button
+              block
+              type="default"
+              onClick={() => add(null)}
+              icon={<PlusOutlined />}
+            >
+              Add Parameter
+            </Button>
+          </Flex>
+        )}
+      </Form.List>
+    </>
+  );
+}
diff --git a/frontend/components/methods/MethodSourcesSubform.tsx b/frontend/components/methods/MethodSourcesSubform.tsx
new file mode 100644
index 000000000..97a141a69
--- /dev/null
+++ b/frontend/components/methods/MethodSourcesSubform.tsx
@@ -0,0 +1,75 @@
+import { PlusOutlined } from "@ant-design/icons";
+import { Form, Input, Button, Flex } from "antd";
+import DeleteButton from "../DeleteButton";
+import { MethodSource } from "../../__generated__/graphql";
+import TextArea from "antd/es/input/TextArea";
+
+export type MethodSourcesSubformProps = {
+  initialValue?: MethodSource[] | null;
+  namespace: string[];
+};
+
+export function MethodSourcesSubform({
+  initialValue,
+  namespace,
+}: MethodSourcesSubformProps) {
+  return (
+    <>
+      <Form.List name={namespace} initialValue={initialValue ?? undefined}>
+        {(fields, { add, remove }, { errors }) => (
+          <Flex vertical gap="small">
+            <Form.ErrorList errors={errors} />
+            {fields.map(({ key, name, ...restField }) => (
+              <Flex vertical key={key} gap="small" align="baseline">
+                <Form.Item
+                  {...restField}
+                  name={[name, "name"]}
+                  noStyle
+                  style={{ flex: 1 }}
+                  rules={[
+                    {
+                      required: true,
+                    },
+                  ]}
+                >
+                  <Input placeholder="Name" style={{ width: "100%" }} />
+                </Form.Item>
+                <Form.Item
+                  {...restField}
+                  name={[name, "description"]}
+                  noStyle
+                  style={{ flex: 1 }}
+                  rules={[
+                    {
+                      required: true,
+                    },
+                  ]}
+                >
+                  <TextArea
+                    autoSize={{ minRows: 2 }}
+                    placeholder="Description"
+                    style={{ width: "100%" }}
+                  />
+                </Form.Item>
+                <DeleteButton
+                  type="default"
+                  kind="remove"
+                  style={{ width: "100%" }}
+                  onClick={() => remove(name)}
+                />
+              </Flex>
+            ))}
+            <Button
+              block
+              type="default"
+              onClick={() => add(null)}
+              icon={<PlusOutlined />}
+            >
+              Add Source
+            </Button>
+          </Flex>
+        )}
+      </Form.List>
+    </>
+  );
+}
diff --git a/frontend/components/methods/MethodSummary.tsx b/frontend/components/methods/MethodSummary.tsx
new file mode 100644
index 000000000..96d1db352
--- /dev/null
+++ b/frontend/components/methods/MethodSummary.tsx
@@ -0,0 +1,163 @@
+import { Typography } from "antd";
+import { asReadonlyMixed, isTruthy } from "../../lib/array";
+import paths from "../../paths";
+import Manager from "../Manager";
+import OpenEndedDateTimeRangeX from "../OpenEndedDateTimeRangeX";
+import EntitySummary from "../entities/EntitySummary";
+import { Reference } from "../Reference";
+import UpdateMethod from "./UpdateMethod";
+import {
+  MethodPartialFragment,
+  MethodsPartialFragment,
+} from "../../queries/methods.generated";
+import EntityLink from "../entities/EntityLink";
+import InlineList from "../InlineList";
+import RemoveInstitutionMethodDeveloper from "./RemoveInstitutionMethodDeveloper";
+import RemoveUserMethodDeveloper from "./RemoveUserMethodDeveloper";
+import AddInstitutionMethodDeveloper from "./AddInstitutionMethodDeveloper";
+import AddUserMethodDeveloper from "./AddUserMethodDeveloper";
+import { Scalars } from "../../__generated__/graphql";
+import JsonViewer from "../JsonViewer";
+import EnumTag from "../EnumTag";
+
+const renderDeveloperList = (
+  developers:
+    | NonNullable<MethodsPartialFragment["developers"]>
+    | NonNullable<MethodPartialFragment["developers"]>
+    | NonNullable<MethodPartialFragment["pendingDevelopers"]>,
+  methodId: Scalars["Uuid"]["output"],
+) => (
+  <InlineList
+    items={asReadonlyMixed(developers.edges)}
+    renderItem={(edge) => (
+      <span key={edge.node.id}>
+        <EntityLink
+          entity={edge.node}
+          route={
+            edge.node.__typename == "Institution"
+              ? paths.institution
+              : paths.user
+          }
+        />{" "}
+        {"isAuthorizedToRemoveEdge" in edge &&
+          edge.isAuthorizedToRemoveEdge &&
+          (edge.node.__typename == "Institution" ? (
+            <RemoveInstitutionMethodDeveloper
+              methodId={methodId}
+              institutionId={edge.node.uuid}
+            />
+          ) : (
+            <RemoveUserMethodDeveloper
+              methodId={methodId}
+              userId={edge.node.uuid}
+            />
+          ))}
+      </span>
+    )}
+  />
+);
+
+export default function MethodSummary({
+  entity,
+}: {
+  entity: MethodsPartialFragment | MethodPartialFragment;
+}) {
+  const dateTimeRanges = [
+    (entity.validity?.from || entity.validity?.to) && (
+      <div key="validity">
+        Valid <OpenEndedDateTimeRangeX range={entity.validity} />
+      </div>
+    ),
+    (entity.availability?.from || entity.availability?.to) && (
+      <div key="availability">
+        Available <OpenEndedDateTimeRangeX range={entity.availability} />
+      </div>
+    ),
+  ].filter(isTruthy);
+
+  return (
+    <EntitySummary
+      entity={entity}
+      route={paths.method}
+      tags={entity.categories.map((x) => (
+        <EnumTag key={x} color="magenta">
+          {x}
+        </EnumTag>
+      ))}
+      extra={[
+        "isAuthorizedToUpdateNode" in entity &&
+          entity.isAuthorizedToUpdateNode && (
+            <UpdateMethod key="updateMethod" method={entity} />
+          ),
+      ].filter(isTruthy)}
+    >
+      {dateTimeRanges.length > 0 && <div>{dateTimeRanges}</div>}
+      {(entity.parameters.length > 0 || entity.sources.length > 0) && (
+        <div>
+          {entity.parameters.length > 0 && (
+            <div>
+              Parameterized by{" "}
+              <InlineList
+                items={entity.parameters}
+                renderItem={(item) => (
+                  <span key={item.name}>
+                    &ldquo;{item.name}&rdquo; of type{" "}
+                    <JsonViewer inline data={item.type} />
+                  </span>
+                )}
+              />
+            </div>
+          )}
+          {entity.sources.length > 0 && (
+            <div>
+              Operates on the sources{" "}
+              <InlineList
+                items={entity.sources}
+                renderItem={(item) => (
+                  <span key={item.name}>
+                    &ldquo;{item.name}&rdquo; ({item.description})
+                  </span>
+                )}
+              />
+            </div>
+          )}
+        </div>
+      )}
+      {entity.calculationLocator && (
+        <div>
+          Calculate on{" "}
+          <Typography.Link href={entity.calculationLocator} target="_blank">
+            {entity.calculationLocator}
+          </Typography.Link>
+        </div>
+      )}
+      {entity.developers.edges.length > 0 && (
+        <div>
+          Developed by {renderDeveloperList(entity.developers, entity.uuid)}
+          {"pendingDevelopers" in entity &&
+            entity.pendingDevelopers &&
+            entity.pendingDevelopers.edges.length > 0 && (
+              <>
+                Awaiting verification of
+                {renderDeveloperList(entity.pendingDevelopers, entity.uuid)}
+              </>
+            )}
+          {"isAuthorizedToAddInstitutionEdge" in entity.developers &&
+            entity.developers.isAuthorizedToAddInstitutionEdge && (
+              <AddInstitutionMethodDeveloper methodId={entity.uuid} />
+            )}
+          {"isAuthorizedToAddUserEdge" in entity.developers &&
+            entity.developers.isAuthorizedToAddUserEdge && (
+              <AddUserMethodDeveloper methodId={entity.uuid} />
+            )}
+        </div>
+      )}
+      {entity.reference && <Reference data={entity.reference} />}
+      {"manager" in entity && (
+        <div>
+          <Manager data={entity.manager.node} />
+        </div>
+      )}
+    </EntitySummary>
+  );
+}
diff --git a/frontend/components/methods/MethodTable.tsx b/frontend/components/methods/MethodTable.tsx
deleted file mode 100644
index 55cfe7a9b..000000000
--- a/frontend/components/methods/MethodTable.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Table } from "antd";
-import { useState } from "react";
-import paths from "../../paths";
-import { setMapValue } from "../../lib/freeTextFilter";
-import {
-  getReferenceColumnProps,
-  getExternallyLinkedFilterableLocatorColumnProps,
-  getFilterableEnumListColumnProps,
-  getNameColumnProps,
-  getDescriptionColumnProps,
-  getUuidColumnProps,
-} from "../../lib/table";
-import { MethodCategory } from "../../__generated__/graphql";
-import { MethodsPartialFragment } from "../../queries/methods.generated";
-
-interface MethodTableProps {
-  loading: boolean;
-  methods: MethodsPartialFragment[];
-}
-
-export function MethodTable({ loading, methods }: MethodTableProps) {
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
-
-  return (
-    <Table
-      loading={loading}
-      columns={[
-        {
-          ...getUuidColumnProps<(typeof methods)[0]>(
-            onFilterTextChange,
-            (x) => filterText.get(x),
-            paths.method,
-          ),
-        },
-        {
-          ...getNameColumnProps<(typeof methods)[0]>(onFilterTextChange, (x) =>
-            filterText.get(x),
-          ),
-        },
-        {
-          ...getDescriptionColumnProps<(typeof methods)[0]>(
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-        {
-          ...getFilterableEnumListColumnProps<
-            (typeof methods)[0],
-            MethodCategory
-          >(
-            "Categories",
-            "categories",
-            Object.entries(MethodCategory),
-            (record) => record.categories,
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-        {
-          ...getExternallyLinkedFilterableLocatorColumnProps<
-            (typeof methods)[0]
-          >(
-            "Calculation",
-            "calculationLocator",
-            (record) => record.calculationLocator,
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-        {
-          ...getReferenceColumnProps<(typeof methods)[0]>(
-            onFilterTextChange,
-            (x) => filterText.get(x),
-          ),
-        },
-      ]}
-      dataSource={methods}
-    />
-  );
-}
-
-export default MethodTable;
diff --git a/frontend/components/methods/PaginatedMethods.tsx b/frontend/components/methods/PaginatedMethods.tsx
new file mode 100644
index 000000000..61b43591a
--- /dev/null
+++ b/frontend/components/methods/PaginatedMethods.tsx
@@ -0,0 +1,96 @@
+import {
+  MethodsDocument,
+  MethodNamesDocument,
+  MethodsQueryVariables,
+} from "../../queries/methods.generated";
+import paths from "../../paths";
+import MethodList from "./MethodList";
+import PaginatedEntities from "../entities/PaginatedEntities";
+import { MethodCategory } from "../../__generated__/graphql";
+
+export default function PaginatedMethods({
+  where,
+  showJump = false,
+}: {
+  where?: MethodsQueryVariables["where"];
+  showJump?: boolean;
+}) {
+  return (
+    <PaginatedEntities
+      entitiesQuery={MethodsDocument}
+      namesQuery={MethodNamesDocument}
+      where={where}
+      showJump={showJump}
+      route={paths.method}
+      list={(props) => <MethodList {...props} />}
+      filterDefinitions={[
+        {
+          field: "name",
+          type: "string",
+        },
+        {
+          field: "description",
+          type: "string",
+        },
+        {
+          field: "categories",
+          type: "list",
+          item: { type: "enum", enumObject: MethodCategory },
+        },
+        {
+          field: "calculationLocator",
+          type: "url",
+        },
+        {
+          field: "institutionDevelopers",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "name",
+                type: "string",
+              },
+              { field: "id", type: "uuid" },
+            ],
+          },
+        },
+        {
+          field: "userDevelopers",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "name",
+                type: "string",
+              },
+              { field: "id", type: "uuid" },
+            ],
+          },
+        },
+        {
+          field: "manager",
+          type: "object",
+          items: [
+            {
+              field: "name",
+              type: "string",
+            },
+            { field: "id", type: "uuid" },
+          ],
+        },
+        {
+          field: "id",
+          type: "uuid",
+        },
+      ]}
+      sortDefinitions={[
+        { field: "name" },
+        { field: "createdAt" },
+        { field: "updatedAt" },
+        { field: "id" },
+      ]}
+    />
+  );
+}
diff --git a/frontend/components/methods/RemoveInstitutionMethodDeveloper.tsx b/frontend/components/methods/RemoveInstitutionMethodDeveloper.tsx
index 4f20d6a1b..977ba8c35 100644
--- a/frontend/components/methods/RemoveInstitutionMethodDeveloper.tsx
+++ b/frontend/components/methods/RemoveInstitutionMethodDeveloper.tsx
@@ -68,7 +68,7 @@ export default function RemoveInstitutionMethodDeveloper({
 
   return (
     <SafeDeleteButton
-      type="text"
+      type="icon"
       kind="remove"
       onConfirm={mutate}
       deleting={mutating}
diff --git a/frontend/components/methods/RemoveUserMethodDeveloper.tsx b/frontend/components/methods/RemoveUserMethodDeveloper.tsx
index 4096b9fb8..3a77378f7 100644
--- a/frontend/components/methods/RemoveUserMethodDeveloper.tsx
+++ b/frontend/components/methods/RemoveUserMethodDeveloper.tsx
@@ -65,7 +65,7 @@ export default function RemoveUserMethodDeveloper({ methodId, userId }: Props) {
 
   return (
     <SafeDeleteButton
-      type="text"
+      type="icon"
       kind="remove"
       onConfirm={mutate}
       deleting={mutating}
diff --git a/frontend/components/methods/UpdateMethod.tsx b/frontend/components/methods/UpdateMethod.tsx
index 5ab41d039..533614ee7 100644
--- a/frontend/components/methods/UpdateMethod.tsx
+++ b/frontend/components/methods/UpdateMethod.tsx
@@ -9,13 +9,18 @@ import {
   MethodCategory,
   Scalars,
   ReferenceInput,
+  MethodParameterInput,
+  MethodSourceInput,
 } from "../../__generated__/graphql";
 import { useState } from "react";
-import { ReferenceForm } from "../ReferenceForm";
+import { ReferenceSubform } from "../ReferenceSubform";
 import dayjs from "dayjs";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
+import { MethodParametersSubform } from "./MethodParametersSubform";
+import { MethodSourcesSubform } from "./MethodSourcesSubform";
+import EditButton from "../EditButton";
 
 type FormValues = {
   name: string;
@@ -31,6 +36,8 @@ type FormValues = {
   reference: ReferenceInput | null | undefined;
   calculationLocator: Scalars["Url"]["input"] | null | undefined;
   categories: MethodCategory[] | null | undefined;
+  parameters: MethodParameterInput[] | null | undefined;
+  sources: MethodSourceInput[] | null | undefined;
 };
 
 interface UpdateMethodProps {
@@ -54,13 +61,19 @@ export default function UpdateMethod({ method }: UpdateMethodProps) {
   const onFinish = (values: FormValues) => {
     withMutationHandler(
       () => {
-        // TODO Why does `initialValue` not set standardizers to `[]`?
+        // TODO Why does `initialValue` not set sources, parameters, and standardizers to `[]`?
         if (
           values.reference?.standard != null &&
           values.reference?.standard.standardizers == undefined
         ) {
           values.reference.standard.standardizers = [];
         }
+        if (values.parameters == undefined) {
+          values.parameters = [];
+        }
+        if (values.sources == undefined) {
+          values.sources = [];
+        }
         // https://www.apollographql.com/docs/react/networking/authentication/#reset-store-on-logout
         return updateMethodMutation({
           variables: {
@@ -79,14 +92,15 @@ export default function UpdateMethod({ method }: UpdateMethodProps) {
               reference: values.reference,
               calculationLocator: values.calculationLocator,
               categories: values.categories || [],
-              parameters: [],
-              sources: [],
+              parameters: values.parameters,
+              sources: values.sources,
             },
           },
         });
       },
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           setOpen(false);
         },
         onError: (graphQlErrors, userErrors) =>
@@ -103,7 +117,7 @@ export default function UpdateMethod({ method }: UpdateMethodProps) {
 
   return (
     <>
-      <Button onClick={() => setOpen(true)}>Edit</Button>
+      <EditButton onClick={() => setOpen(true)} />
       <Modal
         open={open}
         title="Edit Method"
@@ -146,14 +160,26 @@ export default function UpdateMethod({ method }: UpdateMethodProps) {
           <Form.Item
             label="Validity"
             name="validity"
-            initialValue={method.validity}
+            initialValue={[
+              method.validity?.from == null
+                ? null
+                : dayjs(method.validity.from),
+              method.validity?.to == null ? null : dayjs(method.validity.to),
+            ]}
           >
             <DatePicker.RangePicker allowEmpty={[true, true]} showTime />
           </Form.Item>
           <Form.Item
             label="Availability"
             name="availability"
-            initialValue={method.availability}
+            initialValue={[
+              method.availability?.from == null
+                ? null
+                : dayjs(method.availability.from),
+              method.availability?.to == null
+                ? null
+                : dayjs(method.availability.to),
+            ]}
           >
             <DatePicker.RangePicker allowEmpty={[true, true]} showTime />
           </Form.Item>
@@ -186,8 +212,20 @@ export default function UpdateMethod({ method }: UpdateMethodProps) {
               }))}
             />
           </Form.Item>
+          <Form.Item label="Parameter(s)">
+            <MethodParametersSubform
+              namespace={["parameters"]}
+              initialValue={method.parameters}
+            />
+          </Form.Item>
+          <Form.Item label="Source(s)">
+            <MethodSourcesSubform
+              namespace={["sources"]}
+              initialValue={method.sources}
+            />
+          </Form.Item>
           <Divider />
-          <ReferenceForm
+          <ReferenceSubform
             form={form}
             namespace={["reference"]}
             initialValue={method.reference}
diff --git a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
index 1d080a81d..7d1dd3824 100644
--- a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
@@ -92,6 +92,7 @@ export default function CreateOpenIdConnectApplication({
         }),
       {
         onSuccess: (data) => {
+          setGlobalErrorMessages([]);
           const model = data?.createOpenIdConnectApplication?.clientSecret;
           if (!model) {
             messageMissingModel();
@@ -101,7 +102,7 @@ export default function CreateOpenIdConnectApplication({
               centered: true,
               width: 500,
               content: (
-                <Typography.Paragraph>
+                <Typography.Paragraph style={{ maxWidth: "75ch" }}>
                   <span>
                     <ExclamationCircleTwoTone twoToneColor="#f9b02e" />{" "}
                   </span>
diff --git a/frontend/components/openIdConnect/applications/DeleteOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/DeleteOpenIdConnectApplication.tsx
index a50b82205..6c2399985 100644
--- a/frontend/components/openIdConnect/applications/DeleteOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/DeleteOpenIdConnectApplication.tsx
@@ -61,11 +61,6 @@ export default function DeleteOpenIdConnectApplication({
   };
 
   return (
-    <SafeDeleteButton
-      type="text"
-      kind="delete"
-      onConfirm={mutate}
-      deleting={mutating}
-    />
+    <SafeDeleteButton kind="delete" onConfirm={mutate} deleting={mutating} />
   );
 }
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
index 5b50c61f8..ae902bcb3 100644
--- a/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
@@ -1,26 +1,23 @@
 import { Scalars } from "../../../__generated__/graphql";
-import { Descriptions, Divider, Result, Skeleton, Typography } from "antd";
-import UpdateOpenIdConnectApplication from "./UpdateOpenIdConnectApplication";
+import { Card, Divider, Result, Skeleton, Typography } from "antd";
 import OpenIdConnectAutorizationTable from "../authorizations/OpenIdConnectAuthorizationTable";
 import OpenIdConnectTokenTable from "../tokens/OpenIdConnectTokenTable";
-import DeleteOpenIdConnectApplication from "./DeleteOpenIdConnectApplication";
-import PageHeader from "../../PageHeader";
 import { ApplicationDocument } from "../../../queries/openIdConnect.generated";
-import ResetOpenIdConnectApplicationClientSecret from "./ResetOpenIdConnectApplicationClientSecret";
 import { useQuery } from "@apollo/client/react";
-import paths from "../../../paths";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
-import { isTruthy } from "../../../lib/array";
+import OpenIdConnectApplicationSummary from "./OpenIdConnectApplicationSummary";
+import QueryToolbar from "../../QueryToolbar";
 
 interface Props {
   applicationId: Scalars["Uuid"]["input"];
 }
 
 export default function OpenIdConnectApplication({ applicationId }: Props) {
+  const queryVariables = {
+    uuid: applicationId,
+  };
   const { loading, error, data } = useQuery(ApplicationDocument, {
-    variables: {
-      uuid: applicationId,
-    },
+    variables: queryVariables,
   });
   useQueryHandler({ error });
   const application = data?.openIdConnectApplication;
@@ -40,83 +37,21 @@ export default function OpenIdConnectApplication({ applicationId }: Props) {
   }
 
   return (
-    <>
-      <PageHeader
-        id={application.uuid}
-        title={application.displayName ?? application.clientId}
-        tags={[]}
-        extra={[
-          application.isAuthorizedToManageNode && (
-            <UpdateOpenIdConnectApplication
-              key="updateApplication"
-              application={application}
-            />
-          ),
-          application.isAuthorizedToManageNode && (
-            <ResetOpenIdConnectApplicationClientSecret
-              key="resetApplicationClientSecret"
-              applicationId={application.uuid}
-            />
-          ),
-          application.isAuthorizedToManageNode && (
-            <DeleteOpenIdConnectApplication
-              key="deleteApplication"
-              applicationId={application.uuid}
-              redirectTo={paths.institution(application.owner.node.uuid)}
-            />
-          ),
-        ].filter(isTruthy)}
-      >
-        <Descriptions size="small" column={1}>
-          <Descriptions.Item label="UUID">{application.uuid}</Descriptions.Item>
-          <Descriptions.Item label="Client ID">
-            {application.clientId}
-          </Descriptions.Item>
-          <Descriptions.Item label="Consent Type">
-            {application.consentType}
-          </Descriptions.Item>
-          <Descriptions.Item label="Endpoints">
-            {application.endpoints.join(", ")}
-          </Descriptions.Item>
-          <Descriptions.Item label="Grant Types">
-            {application.grantTypes.join(", ")}
-          </Descriptions.Item>
-          <Descriptions.Item label="Response Types">
-            {application.responseTypes.join(", ")}
-          </Descriptions.Item>
-          <Descriptions.Item label="Scopes">
-            {application.scopes.join(", ")}
-          </Descriptions.Item>
-          <Descriptions.Item label="Requirements">
-            {application.requirements.join(", ")}
-          </Descriptions.Item>
-          {application.postLogoutRedirectUri && (
-            <Descriptions.Item label="Post Logout Redirect URI">
-              <Typography.Link href={application.postLogoutRedirectUri}>
-                {application.postLogoutRedirectUri}
-              </Typography.Link>
-            </Descriptions.Item>
-          )}
-          {application.redirectUri && (
-            <Descriptions.Item label="Redirect URI">
-              <Typography.Link href={application.redirectUri}>
-                {application.redirectUri}
-              </Typography.Link>
-            </Descriptions.Item>
-          )}
-        </Descriptions>
-      </PageHeader>
+    <Card>
+      <OpenIdConnectApplicationSummary entity={application} />
       <Divider />
-      <Typography.Title level={2}>Authorizations</Typography.Title>
+      <Typography.Title level={4}>Authorizations</Typography.Title>
       <OpenIdConnectAutorizationTable
         applicationId={application.uuid}
         authorizations={application.authorizations.edges.map((x) => x.node)}
       />
       <Divider />
-      <Typography.Title level={2}>Tokens</Typography.Title>
+      <Typography.Title level={4}>Tokens</Typography.Title>
       <OpenIdConnectTokenTable
         tokens={application.tokens.edges.map((x) => x.node)}
       />
-    </>
+      <Divider />
+      <QueryToolbar query={ApplicationDocument} variables={queryVariables} />
+    </Card>
   );
 }
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationList.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationList.tsx
new file mode 100644
index 000000000..7154f261e
--- /dev/null
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationList.tsx
@@ -0,0 +1,24 @@
+import { OpenIdConnectApplicationsPartialFragment } from "../../../queries/openIdConnect.generated";
+import EntityList from "../../entities/EntityList";
+import OpenIdConnectApplicationSummary from "./OpenIdConnectApplicationSummary";
+import EntityItem from "../../entities/EntityItem";
+
+export default function OpenIdConnectApplicationList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: OpenIdConnectApplicationsPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <OpenIdConnectApplicationSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
new file mode 100644
index 000000000..dc2cd2fce
--- /dev/null
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
@@ -0,0 +1,115 @@
+import {
+  OpenIdConnectApplicationPartialFragment,
+  OpenIdConnectApplicationsPartialFragment,
+} from "../../../queries/openIdConnect.generated";
+import paths from "../../../paths";
+import { Tag, Typography } from "antd";
+import { isTruthy } from "../../../lib/array";
+import EntitySummary from "../../entities/EntitySummary";
+import DeleteOpenIdConnectApplication from "./DeleteOpenIdConnectApplication";
+import ResetOpenIdConnectApplicationClientSecret from "./ResetOpenIdConnectApplicationClientSecret";
+import UpdateOpenIdConnectApplication from "./UpdateOpenIdConnectApplication";
+import InlineList from "../../InlineList";
+import EntityLink from "../../entities/EntityLink";
+
+export default function OpenIdConnectApplicationSummary({
+  entity,
+}: {
+  entity:
+    | OpenIdConnectApplicationsPartialFragment
+    | OpenIdConnectApplicationPartialFragment;
+}) {
+  return (
+    <EntitySummary
+      entity={entity}
+      route={paths.openIdConnectApplication}
+      tags={[<Tag key="consentType">Consent Type "{entity.consentType}"</Tag>]}
+      extra={[
+        "isAuthorizedToManageNode" in entity &&
+          entity.isAuthorizedToManageNode && (
+            <UpdateOpenIdConnectApplication
+              key="updateApplication"
+              application={entity}
+            />
+          ),
+        "isAuthorizedToManageNode" in entity &&
+          entity.isAuthorizedToManageNode && (
+            <ResetOpenIdConnectApplicationClientSecret
+              key="resetApplicationClientSecret"
+              applicationId={entity.uuid}
+            />
+          ),
+        "isAuthorizedToManageNode" in entity &&
+          entity.isAuthorizedToManageNode && (
+            <DeleteOpenIdConnectApplication
+              key="deleteApplication"
+              applicationId={entity.uuid}
+              redirectTo={paths.institution(entity.owner.node.uuid)}
+            />
+          ),
+      ].filter(isTruthy)}
+    >
+      {(entity.redirectUri || entity.postLogoutRedirectUri) && (
+        <div>
+          {entity.redirectUri && (
+            <div>
+              For login, redirect to{" "}
+              <Typography.Link href={entity.redirectUri}>
+                {entity.redirectUri}
+              </Typography.Link>
+            </div>
+          )}
+          {entity.postLogoutRedirectUri && (
+            <div>
+              After logout, redirect to{" "}
+              <Typography.Link href={entity.postLogoutRedirectUri}>
+                {entity.postLogoutRedirectUri}
+              </Typography.Link>
+            </div>
+          )}
+        </div>
+      )}
+      <div>
+        <div>
+          Endpoints{" "}
+          <InlineList
+            items={entity.endpoints}
+            renderItem={(item) => <code key={item}>{item}</code>}
+          />
+        </div>
+        <div>
+          Grant Types{" "}
+          <InlineList
+            items={entity.grantTypes}
+            renderItem={(item) => <code key={item}>{item}</code>}
+          />
+        </div>
+        <div>
+          Response Types{" "}
+          <InlineList
+            items={entity.responseTypes}
+            renderItem={(item) => <code key={item}>{item}</code>}
+          />
+        </div>
+        <div>
+          Scopes{" "}
+          <InlineList
+            items={entity.scopes}
+            renderItem={(item) => <code key={item}>{item}</code>}
+          />
+        </div>
+        <div>
+          Requirements{" "}
+          <InlineList
+            items={entity.requirements}
+            renderItem={(item) => <code key={item}>{item}</code>}
+          />
+        </div>
+      </div>
+      <div>
+        Owned by{" "}
+        <EntityLink entity={entity.owner.node} route={paths.institution} />
+      </div>
+    </EntitySummary>
+  );
+}
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationTable.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationTable.tsx
deleted file mode 100644
index 412485a2f..000000000
--- a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationTable.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Skeleton, Table, TableProps } from "antd";
-import paths from "../../../paths";
-import { OpenIdConnectApplicationsPartialFragment } from "../../../queries/openIdConnect.generated";
-import { getUuidColumnProps } from "../../../lib/table";
-import { useState } from "react";
-import { setMapValue } from "../../../lib/freeTextFilter";
-
-interface ApplicationsProps {
-  loading: boolean;
-  applications: OpenIdConnectApplicationsPartialFragment[];
-}
-
-export default function OpenIdConnectApplicationTable({
-  loading,
-  applications,
-}: ApplicationsProps) {
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
-
-  if (loading) {
-    return <Skeleton active avatar title />;
-  }
-
-  const applicationColumns: TableProps<OpenIdConnectApplicationsPartialFragment>["columns"] =
-    [
-      getUuidColumnProps<(typeof applications)[0]>(
-        onFilterTextChange,
-        (x) => filterText.get(x),
-        paths.openIdConnectApplication,
-      ),
-      {
-        title: "Client ID",
-        dataIndex: "clientId",
-        key: "clientId",
-      },
-      {
-        title: "Name",
-        dataIndex: "displayName",
-        key: "displayName",
-      },
-      {
-        title: "Redirect URL",
-        dataIndex: "redirectUri",
-        key: "redirectUri",
-      },
-      {
-        title: "Logout Redirect",
-        dataIndex: "postLogoutRedirectUri",
-        key: "postLogoutRedirectUri",
-      },
-    ];
-
-  return (
-    <Table<OpenIdConnectApplicationsPartialFragment>
-      loading={loading}
-      columns={applicationColumns}
-      dataSource={applications}
-    />
-  );
-}
diff --git a/frontend/components/openIdConnect/applications/PaginatedOpenIdConnectApplications.tsx b/frontend/components/openIdConnect/applications/PaginatedOpenIdConnectApplications.tsx
new file mode 100644
index 000000000..14dc60c61
--- /dev/null
+++ b/frontend/components/openIdConnect/applications/PaginatedOpenIdConnectApplications.tsx
@@ -0,0 +1,62 @@
+import {
+  ApplicationsDocument,
+  ApplicationsQueryVariables,
+} from "../../../queries/openIdConnect.generated";
+import paths from "../../../paths";
+import OpenIdConnectApplicationList from "./OpenIdConnectApplicationList";
+import PaginatedEntities from "../../entities/PaginatedEntities";
+
+export default function PaginatedOpenIdConnectApplications({
+  where,
+  showJump = false,
+  loading,
+}: {
+  where?: ApplicationsQueryVariables["where"];
+  showJump?: boolean;
+  loading?: boolean;
+}) {
+  return (
+    <PaginatedEntities
+      loading={loading}
+      where={where}
+      showJump={showJump}
+      entitiesQuery={ApplicationsDocument}
+      // namesQuery={ApplicationNamesDocument}
+      route={paths.openIdConnectApplication}
+      list={(props) => <OpenIdConnectApplicationList {...props} />}
+      filterDefinitions={[
+        {
+          field: "displayName",
+          type: "string",
+        },
+        {
+          field: "clientId",
+          type: "string",
+        },
+        {
+          field: "owner",
+          type: "object",
+          items: [
+            {
+              field: "name",
+              type: "string",
+            },
+            { field: "id", type: "uuid" },
+          ],
+        },
+        {
+          field: "id",
+
+          type: "uuid",
+        },
+      ]}
+      sortDefinitions={[
+        { field: "displayName" },
+        { field: "clientId" },
+        { field: "createdAt" },
+        { field: "updatedAt" },
+        { field: "id" },
+      ]}
+    />
+  );
+}
diff --git a/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx b/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
index 571b5b427..a4848f58d 100644
--- a/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
+++ b/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Button, App, Typography, Popconfirm } from "antd";
+import { App, Typography } from "antd";
 import {
   ResetApplicationClientSecretDocument,
   ResetApplicationClientSecretMutation,
@@ -7,6 +7,7 @@ import {
 import { ExclamationCircleTwoTone } from "@ant-design/icons";
 import { Scalars } from "../../../__generated__/graphql";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
+import SafeDeleteButton from "../../SafeDeleteButton";
 
 interface ResetApplicationClientSecretProps {
   applicationId: Scalars["Uuid"]["input"];
@@ -47,7 +48,7 @@ export default function ResetOpenIdConnectApplicationClientSecret({
               centered: true,
               width: 500,
               content: (
-                <Typography.Paragraph>
+                <Typography.Paragraph style={{ maxWidth: "75ch" }}>
                   <span>
                     <ExclamationCircleTwoTone twoToneColor="#f9b02e" />{" "}
                   </span>
@@ -71,17 +72,10 @@ export default function ResetOpenIdConnectApplicationClientSecret({
   };
 
   return (
-    <Popconfirm
+    <SafeDeleteButton
       title="Reset Client Secret"
-      description="Are you sure?"
-      okText="Yes"
-      cancelText="No"
-      okButtonProps={{ danger: true }}
+      deleting={mutating}
       onConfirm={mutate}
-    >
-      <Button danger type="default" loading={mutating}>
-        Reset Client Secret
-      </Button>
-    </Popconfirm>
+    />
   );
 }
diff --git a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
index e81735934..2fccc70fe 100644
--- a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
@@ -17,6 +17,7 @@ import {
 import { layout, tailLayout } from "../../../lib/form";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../../ErrorAlert";
+import EditButton from "../../EditButton";
 
 interface UpdateApplicationProps {
   application: OpenIdConnectApplicationPartialFragment;
@@ -71,6 +72,7 @@ export default function UpdateOpenIdConnectApplication({
         }),
       {
         onSuccess: () => {
+          setGlobalErrorMessages([]);
           setOpen(false);
         },
         onError: (graphQlErrors, userErrors) =>
@@ -87,7 +89,7 @@ export default function UpdateOpenIdConnectApplication({
 
   return (
     <>
-      <Button onClick={() => setOpen(true)}>Edit</Button>
+      <EditButton onClick={() => setOpen(true)} />
       <Modal
         open={open}
         title="Edit Application"
@@ -107,7 +109,7 @@ export default function UpdateOpenIdConnectApplication({
             label="ClientId"
             name="clientId"
             rules={[{ required: true }]}
-            initialValue={application.clientId}
+            initialValue={application.name}
           >
             <Input />
           </Form.Item>
diff --git a/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx b/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx
index 547e3fdfc..30d046c74 100644
--- a/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx
+++ b/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx
@@ -48,11 +48,6 @@ export default function DeleteOpenIdConnectAuthorization({
   };
 
   return (
-    <SafeDeleteButton
-      type="text"
-      kind="delete"
-      onConfirm={mutate}
-      deleting={mutating}
-    />
+    <SafeDeleteButton kind="delete" onConfirm={mutate} deleting={mutating} />
   );
 }
diff --git a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenTable.tsx b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenTable.tsx
index 00f12546f..822efdfe0 100644
--- a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenTable.tsx
+++ b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenTable.tsx
@@ -26,8 +26,8 @@ export default function OpenIdConnectTokenTable({ tokens }: TokenTableProps) {
       },
       {
         title: "Expiration Date",
-        dataIndex: "expirationDate",
-        key: "expirationDate",
+        dataIndex: "expiredAt",
+        key: "expiredAt",
       },
       {
         title: "Action",
diff --git a/frontend/components/openIdConnect/tokens/RevokeOpenIdConnectToken.tsx b/frontend/components/openIdConnect/tokens/RevokeOpenIdConnectToken.tsx
index 2f4033267..439c9503b 100644
--- a/frontend/components/openIdConnect/tokens/RevokeOpenIdConnectToken.tsx
+++ b/frontend/components/openIdConnect/tokens/RevokeOpenIdConnectToken.tsx
@@ -1,11 +1,11 @@
 import { useMutation } from "@apollo/client/react";
-import { Button } from "antd";
 import {
   RevokeTokenDocument,
   RevokeTokenMutation,
 } from "../../../queries/openIdConnect.generated";
 import { Scalars } from "../../../__generated__/graphql";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
+import DeleteButton from "../../DeleteButton";
 
 interface RevokeTokenProps {
   tokenId: Scalars["Uuid"]["input"];
@@ -21,7 +21,7 @@ export default function RevokeOpenIdConnectToken({
       getErrors: (data) => data.revokeOpenIdConnectToken.errors,
     });
 
-  const revoke = async () => {
+  const mutate = async () => {
     withMutationHandler(
       () =>
         revokeTokenMutation({
@@ -37,9 +37,5 @@ export default function RevokeOpenIdConnectToken({
     );
   };
 
-  return (
-    <Button danger type="primary" onClick={revoke} loading={mutating}>
-      Revoke
-    </Button>
-  );
+  return <DeleteButton title="Revoke" deleting={mutating} onClick={mutate} />;
 }
diff --git a/frontend/components/sorting/SortSubform.tsx b/frontend/components/sorting/SortSubform.tsx
new file mode 100644
index 000000000..47df47259
--- /dev/null
+++ b/frontend/components/sorting/SortSubform.tsx
@@ -0,0 +1,35 @@
+import { Space, Form, Select } from "antd";
+import { SortEnumType } from "../../__generated__/graphql";
+import { formatSortDirection, SortDefinition } from "../../lib/sort";
+import { getLabel } from "../../lib/string";
+
+const sortDirectionOptions = Object.entries(SortEnumType).map(
+  ([_key, value]) => ({
+    value: value,
+    label: formatSortDirection(value),
+  }),
+);
+
+export default function SortSubform<TSortInput>({
+  name,
+  definitions,
+}: {
+  name: (string | number)[];
+  definitions: readonly SortDefinition<TSortInput>[];
+}) {
+  return (
+    <Space.Compact style={{ flex: 1 }}>
+      <Form.Item noStyle name={[...name, "index"]} rules={[{ required: true }]}>
+        <Select
+          options={definitions.map((value, index) => ({
+            value: index,
+            label: getLabel(value, "all-upper"),
+          }))}
+        />
+      </Form.Item>
+      <Form.Item noStyle name={[...name, "direction"]}>
+        <Select options={sortDirectionOptions} style={{ width: "100%" }} />
+      </Form.Item>
+    </Space.Compact>
+  );
+}
diff --git a/frontend/components/users/AddUserRole.tsx b/frontend/components/users/AddUserRole.tsx
index 33f8754a9..aaab2262a 100644
--- a/frontend/components/users/AddUserRole.tsx
+++ b/frontend/components/users/AddUserRole.tsx
@@ -6,9 +6,8 @@ import {
   AddUserRoleMutation,
 } from "../../queries/users.generated";
 import { Scalars, UserRole } from "../../__generated__/graphql";
-import { Form, Button, Select } from "antd";
+import { Form, Button, Select, Space } from "antd";
 import { useState } from "react";
-import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 
@@ -68,41 +67,37 @@ export default function AddUserRole({ userId, roles }: AddUserRoleProps) {
     );
   };
 
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
+  if (roles.length == 0) {
+    return null;
+  }
 
   return (
     <>
       <ErrorAlert messages={globalErrorMessages} />
-      <Form
-        {...layout}
-        form={form}
-        name="basic"
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
-      >
-        <Form.Item
-          label="Role"
-          name="role"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <Select
-            options={roles.map((role) => ({
-              label: role,
-              value: role,
-            }))}
-          />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
+      <Form form={form} name="basic" onFinish={onFinish}>
+        <Space.Compact>
+          <Form.Item
+            noStyle
+            label="Role"
+            name="role"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+            initialValue={roles[0]}
+          >
+            <Select
+              options={roles.map((role) => ({
+                label: role,
+                value: role,
+              }))}
+            />
+          </Form.Item>
           <Button type="primary" htmlType="submit" loading={mutating}>
             Add
           </Button>
-        </Form.Item>
+        </Space.Compact>
       </Form>
     </>
   );
diff --git a/frontend/components/users/DeleteUser.tsx b/frontend/components/users/DeleteUser.tsx
index 118ef8ae1..8e290bfe7 100644
--- a/frontend/components/users/DeleteUser.tsx
+++ b/frontend/components/users/DeleteUser.tsx
@@ -48,11 +48,6 @@ export default function DeleteUser({ userId }: DeleteUserProps) {
   };
 
   return (
-    <SafeDeleteButton
-      type="text"
-      kind="delete"
-      onConfirm={mutate}
-      deleting={mutating}
-    />
+    <SafeDeleteButton kind="delete" onConfirm={mutate} deleting={mutating} />
   );
 }
diff --git a/frontend/components/users/PaginatedUsers.tsx b/frontend/components/users/PaginatedUsers.tsx
new file mode 100644
index 000000000..6d2561252
--- /dev/null
+++ b/frontend/components/users/PaginatedUsers.tsx
@@ -0,0 +1,77 @@
+import {
+  UsersDocument,
+  UserNamesDocument,
+  UsersQueryVariables,
+} from "../../queries/users.generated";
+import paths from "../../paths";
+import UserList from "./UserList";
+import PaginatedEntities from "../entities/PaginatedEntities";
+
+export default function PaginatedUsers({
+  where,
+  showJump = false,
+}: {
+  where?: UsersQueryVariables["where"];
+  showJump?: boolean;
+}) {
+  return (
+    <PaginatedEntities
+      entitiesQuery={UsersDocument}
+      namesQuery={UserNamesDocument}
+      where={where}
+      showJump={showJump}
+      route={paths.user}
+      list={(props) => <UserList {...props} />}
+      filterDefinitions={[
+        {
+          field: "name",
+          type: "string",
+        },
+        {
+          field: "representedInstitutions",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "name",
+                type: "string",
+              },
+              {
+                field: "id",
+                type: "uuid",
+              },
+            ],
+          },
+        },
+        {
+          field: "developedMethods",
+          type: "list",
+          item: {
+            type: "object",
+            items: [
+              {
+                field: "name",
+                type: "string",
+              },
+              {
+                field: "id",
+                type: "uuid",
+              },
+            ],
+          },
+        },
+        {
+          field: "id",
+          type: "uuid",
+        },
+      ]}
+      sortDefinitions={[
+        { field: "name" },
+        { field: "createdAt" },
+        { field: "updatedAt" },
+        { field: "id" },
+      ]}
+    />
+  );
+}
diff --git a/frontend/components/users/User.tsx b/frontend/components/users/User.tsx
index d1abfd6d1..c6b840c76 100644
--- a/frontend/components/users/User.tsx
+++ b/frontend/components/users/User.tsx
@@ -1,33 +1,31 @@
 import { useQuery } from "@apollo/client/react";
-import { Divider, Typography, Skeleton, List, Result } from "antd";
+import { Skeleton, Result, Card, Flex, Divider } from "antd";
 import { UserDocument } from "../../queries/users.generated";
-import PageHeader from "../PageHeader";
 import { Scalars } from "../../__generated__/graphql";
 import paths from "../../paths";
-import Link from "next/link";
-import AddUserRole from "./AddUserRole";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
-import { UserRoleTag } from "./UserRoleTag";
 import ConfirmUserMethodDeveloper from "../methods/ConfirmUserMethodDeveloper";
 import ConfirmInstitutionRepresentative from "../institutions/ConfirmInstitutionRepresentative";
-import DeleteUser from "./DeleteUser";
-import { isTruthy } from "../../lib/array";
-import ContactInformation from "../ContactInformation";
+import UserSummary from "./UserSummary";
+import { asReadonlyMixed, isTruthy } from "../../lib/array";
+import EntityLink from "../entities/EntityLink";
+import InlineList from "../InlineList";
+import EnumTag from "../EnumTag";
+import QueryToolbar from "../QueryToolbar";
 
 interface UserProps {
   userId: Scalars["Uuid"]["input"];
 }
 
 export default function User({ userId }: UserProps) {
+  const queryVariables = {
+    uuid: userId,
+  };
   const { loading, error, data } = useQuery(UserDocument, {
-    variables: {
-      uuid: userId,
-    },
+    variables: queryVariables,
   });
   useQueryHandler({ error });
   const user = data?.user;
-  const rolesCurrentUserCanAndMayWantToAdd =
-    user?.rolesCurrentUserCanAdd?.filter((role) => !user.roles?.includes(role));
 
   if (loading) {
     return <Skeleton active avatar title />;
@@ -43,98 +41,65 @@ export default function User({ userId }: UserProps) {
     );
   }
 
-  return (
-    <>
-      <PageHeader
-        id={user.uuid}
-        title={user.name}
-        tags={user.roles?.map((role) => (
-          <UserRoleTag
-            key={`${role}-tag`}
-            userId={user.uuid}
-            role={role}
-            canRemove={user.rolesCurrentUserCanRemove?.includes(role)}
+  const pending = [
+    user.pendingRepresentedInstitutions &&
+      user.pendingRepresentedInstitutions.isAuthorizedToConfirmEdges &&
+      user.pendingRepresentedInstitutions.edges.length > 0 && (
+        <div>
+          The following institutions asked to add you as representative. Confirm
+          or deny their request:{" "}
+          <InlineList
+            items={asReadonlyMixed(user.representedInstitutions.edges)}
+            renderItem={(edge) => (
+              <span key={edge.node.id}>
+                <EntityLink entity={edge.node} route={paths.institution} />{" "}
+                <EnumTag color="grey" variant="outlined">
+                  {edge.role}
+                </EnumTag>
+                <ConfirmInstitutionRepresentative
+                  userId={user.uuid}
+                  institutionId={edge.node.uuid}
+                />
+              </span>
+            )}
           />
-        ))}
-        extra={[
-          user.isAuthorizedToDeleteUser && <DeleteUser userId={user.uuid} />,
-        ].filter(isTruthy)}
-      >
-        <ContactInformation contact={user.contact} />
-        {rolesCurrentUserCanAndMayWantToAdd &&
-          rolesCurrentUserCanAndMayWantToAdd.length >= 1 && (
-            <AddUserRole
-              userId={user.uuid}
-              roles={rolesCurrentUserCanAndMayWantToAdd}
-            />
-          )}
-
-        <Divider />
-        <Typography.Title level={2}>Represented Institutions</Typography.Title>
-        <List
-          size="small"
-          dataSource={user.representedInstitutions.edges}
-          renderItem={(item) => (
-            <List.Item key={item.node.uuid}>
-              <Link href={paths.institution(item.node.uuid)}>
-                {item.node.name}
-              </Link>
-            </List.Item>
-          )}
-        />
-        {user.pendingRepresentedInstitutions != null &&
-          user.pendingRepresentedInstitutions.isAuthorizedToConfirmEdges &&
-          user.pendingRepresentedInstitutions.edges.length >= 1 && (
-            <List
-              size="small"
-              header="Pending"
-              dataSource={user.pendingRepresentedInstitutions?.edges}
-              renderItem={(item) => (
-                <List.Item key={item.node.uuid}>
-                  <Link href={paths.institution(item.node.uuid)}>
-                    {item.node.name}
-                  </Link>
-                  <ConfirmInstitutionRepresentative
-                    userId={user.uuid}
-                    institutionId={item.node.uuid}
-                  />
-                </List.Item>
-              )}
-            />
-          )}
+        </div>
+      ),
+    user.pendingDevelopedMethods != null &&
+      user.pendingDevelopedMethods.isAuthorizedToConfirmEdges &&
+      user.pendingDevelopedMethods.edges.length > 0 && (
+        <div>
+          The developers of the following methods asked to add you as a
+          developer. Confirm or deny their request:{" "}
+          <InlineList
+            items={user.pendingDevelopedMethods.edges}
+            renderItem={(edge) => (
+              <span key={edge.node.uuid}>
+                <EntityLink entity={edge.node} route={paths.method} />{" "}
+                <ConfirmUserMethodDeveloper
+                  userId={user.uuid}
+                  methodId={edge.node.uuid}
+                />
+              </span>
+            )}
+          />
+        </div>
+      ),
+  ].filter(isTruthy);
 
-        <Divider />
-        <Typography.Title level={2}>Developed Methods</Typography.Title>
-        <List
-          size="small"
-          dataSource={user.developedMethods.edges}
-          renderItem={(item) => (
-            <List.Item key={item.node.uuid}>
-              <Link href={paths.method(item.node.uuid)}>{item.node.name}</Link>
-            </List.Item>
-          )}
-        />
-        {user.pendingDevelopedMethods != null &&
-          user.pendingDevelopedMethods.isAuthorizedToConfirmEdges &&
-          user.pendingDevelopedMethods.edges.length >= 1 && (
-            <List
-              size="small"
-              header="Pending"
-              dataSource={user.pendingDevelopedMethods.edges}
-              renderItem={(item) => (
-                <List.Item key={item.node.uuid}>
-                  <Link href={paths.method(item.node.uuid)}>
-                    {item.node.name}
-                  </Link>
-                  <ConfirmUserMethodDeveloper
-                    userId={user.uuid}
-                    methodId={item.node.uuid}
-                  />
-                </List.Item>
-              )}
-            />
-          )}
-      </PageHeader>
-    </>
+  return (
+    <Card>
+      <UserSummary entity={user} />
+      {pending.length > 0 && (
+        <>
+          <Divider />
+          <Flex vertical gap="medium">
+            {pending}
+          </Flex>
+        </>
+      )}
+      <Divider />
+      <QueryToolbar query={UserDocument} variables={queryVariables} />
+    </Card>
   );
 }
diff --git a/frontend/components/users/UserIdSelect.tsx b/frontend/components/users/UserIdSelect.tsx
new file mode 100644
index 000000000..ab8ee4bc8
--- /dev/null
+++ b/frontend/components/users/UserIdSelect.tsx
@@ -0,0 +1,17 @@
+import { UserNamesDocument } from "../../queries/users.generated";
+import PaginatedIdSelect, { PaginatedSelectProps } from "../PaginatedIdSelect";
+
+export function UserIdSelect({
+  mode,
+  value,
+  onChange,
+}: Omit<PaginatedSelectProps, "query">) {
+  return (
+    <PaginatedIdSelect
+      query={UserNamesDocument}
+      value={value}
+      mode={mode}
+      onChange={onChange}
+    />
+  );
+}
diff --git a/frontend/components/users/UserList.tsx b/frontend/components/users/UserList.tsx
new file mode 100644
index 000000000..01bcdb9d0
--- /dev/null
+++ b/frontend/components/users/UserList.tsx
@@ -0,0 +1,24 @@
+import { UsersPartialFragment } from "../../queries/users.generated";
+import EntityList from "../entities/EntityList";
+import UserSummary from "./UserSummary";
+import EntityItem from "../entities/EntityItem";
+
+export default function UserList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: UsersPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <UserSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/users/UserRoleTag.tsx b/frontend/components/users/UserRoleTag.tsx
index f03f9224e..0b3f35c91 100644
--- a/frontend/components/users/UserRoleTag.tsx
+++ b/frontend/components/users/UserRoleTag.tsx
@@ -7,8 +7,8 @@ import {
   UsersDocument,
 } from "../../queries/users.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
-import { Tag } from "antd";
 import SafeDeleteButton from "../SafeDeleteButton";
+import EnumTag from "../EnumTag";
 
 interface Props {
   userId: Scalars["Uuid"]["input"];
@@ -53,7 +53,7 @@ export function UserRoleTag({ userId, role, canRemove }: Props) {
     );
 
   return (
-    <Tag
+    <EnumTag
       closable={canRemove}
       closeIcon={
         <SafeDeleteButton
@@ -66,6 +66,6 @@ export function UserRoleTag({ userId, role, canRemove }: Props) {
       color="magenta"
     >
       {role}
-    </Tag>
+    </EnumTag>
   );
 }
diff --git a/frontend/components/users/UserSummary.tsx b/frontend/components/users/UserSummary.tsx
new file mode 100644
index 000000000..194a3af99
--- /dev/null
+++ b/frontend/components/users/UserSummary.tsx
@@ -0,0 +1,102 @@
+import {
+  UserPartialFragment,
+  UsersPartialFragment,
+} from "../../queries/users.generated";
+import paths from "../../paths";
+import { UserRoleTag } from "./UserRoleTag";
+import InlineList from "../InlineList";
+import EntityLink from "../entities/EntityLink";
+import ContactInformation from "../ContactInformation";
+import EntitySummary from "../entities/EntitySummary";
+import { asReadonlyMixed, isTruthy, pluralize } from "../../lib/array";
+import DeleteUser from "./DeleteUser";
+import RemoveInstitutionRepresentative from "../institutions/RemoveInstitutionRepresentative";
+import AddUserRole from "./AddUserRole";
+import EnumTag from "../EnumTag";
+
+export default function UserSummary({
+  entity,
+}: {
+  entity: UsersPartialFragment | UserPartialFragment;
+}) {
+  const rolesCurrentUserCanAndMayWantToAdd =
+    "rolesCurrentUserCanAdd" in entity &&
+    entity?.rolesCurrentUserCanAdd?.filter(
+      (role) => !entity.roles?.includes(role),
+    );
+
+  return (
+    <EntitySummary
+      entity={entity}
+      route={paths.user}
+      tags={[
+        ...(entity.roles?.map((role) => (
+          <UserRoleTag
+            key={role}
+            userId={entity.uuid}
+            role={role}
+            canRemove={
+              "rolesCurrentUserCanRemove" in entity &&
+              entity.rolesCurrentUserCanRemove?.includes(role)
+            }
+          />
+        )) ?? []),
+        rolesCurrentUserCanAndMayWantToAdd &&
+          rolesCurrentUserCanAndMayWantToAdd.length > 0 && (
+            <AddUserRole
+              userId={entity.uuid}
+              roles={rolesCurrentUserCanAndMayWantToAdd}
+            />
+          ),
+      ].filter(isTruthy)}
+      extra={[
+        "isAuthorizedToDeleteUser" in entity &&
+          entity.isAuthorizedToDeleteUser && (
+            <DeleteUser userId={entity.uuid} />
+          ),
+      ].filter(isTruthy)}
+    >
+      <ContactInformation contact={entity.contact} />
+      {entity.representedInstitutions.edges.length > 0 && (
+        <div>
+          Represents{" "}
+          <InlineList
+            items={asReadonlyMixed(entity.representedInstitutions.edges)}
+            renderItem={(edge) => (
+              <span key={edge.node.id}>
+                <EntityLink entity={edge.node} route={paths.institution} />{" "}
+                <EnumTag color="grey" variant="outlined">
+                  {edge.role}
+                </EnumTag>
+                {"isAuthorizedToRemoveEdge" in edge &&
+                  edge.isAuthorizedToRemoveEdge && (
+                    <RemoveInstitutionRepresentative
+                      institutionId={edge.node.uuid}
+                      userId={entity.uuid}
+                    />
+                  )}
+              </span>
+            )}
+          />
+        </div>
+      )}
+      {"developedMethods" in entity &&
+        entity.developedMethods.edges.length > 0 && (
+          <div>
+            Developed the{" "}
+            {pluralize(entity.developedMethods.edges.length, "method")}{" "}
+            <InlineList
+              items={entity.developedMethods.edges}
+              renderItem={(item) => (
+                <EntityLink
+                  key={item.node.id}
+                  entity={item.node}
+                  route={paths.method}
+                />
+              )}
+            />
+          </div>
+        )}
+    </EntitySummary>
+  );
+}
diff --git a/frontend/jest.config.js b/frontend/jest.config.mjs
similarity index 95%
rename from frontend/jest.config.js
rename to frontend/jest.config.mjs
index 6d1a774c4..3dee8c35a 100644
--- a/frontend/jest.config.js
+++ b/frontend/jest.config.mjs
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   roots: ["<rootDir>"],
   moduleFileExtensions: ["ts", "tsx", "js", "json", "jsx"],
   testPathIgnorePatterns: ["<rootDir>[/\\\\](node_modules|.next)[/\\\\]"],
diff --git a/frontend/lib/apollo.ts b/frontend/lib/apollo.ts
index bf951d54c..d6842e644 100644
--- a/frontend/lib/apollo.ts
+++ b/frontend/lib/apollo.ts
@@ -16,6 +16,8 @@ import { sha256 } from "crypto-hash";
 import fragmentMatcherTypes from "../__generated__/fragmentMatcherTypes"; // generated by `fragment-matcher` plugin
 import { GraphQLFormattedError } from "graphql";
 import { map } from "rxjs";
+import { StrictTypedTypePolicies } from "../__generated__/apolloHelpers";
+import { relayStylePagination } from "@apollo/client/utilities";
 
 const AntiforgeryCookieKey = "XSRF-TOKEN";
 const AntiforgeryHeaderName = "X-XSRF-TOKEN";
@@ -119,10 +121,103 @@ const apolloLink = filterAuthErrorsLink
   .concat(persistedQueryLink)
   .concat(httpLink);
 
+// [Cursor-Based Pagination](https://www.apollographql.com/docs/react/pagination/cursor-based)
+// [Key Arguments](https://www.apollographql.com/docs/react/pagination/key-args)
+// https://the-guild.dev/graphql/codegen/plugins/typescript/typescript-apollo-client-helpers
+const typePolicies: StrictTypedTypePolicies = {
+  Query: {
+    fields: {
+      allCalorimetricData: relayStylePagination(["locale", "where"]),
+      allGeometricData: relayStylePagination(["locale", "where"]),
+      allHygrothermalData: relayStylePagination(["locale", "where"]),
+      allLifeCycleData: relayStylePagination(["locale", "where"]),
+      allOpticalData: relayStylePagination(["locale", "where"]),
+      allPhotovoltaicData: relayStylePagination(["locale", "where"]),
+      components: relayStylePagination(["where", "order"]),
+      databases: relayStylePagination(["where", "order"]),
+      dataFormats: relayStylePagination(["where", "order"]),
+      gnuPgKeyFingerprints: relayStylePagination(["where", "order"]),
+      institutions: relayStylePagination(["where", "order"]),
+      methods: relayStylePagination(["where", "order"]),
+      openIdConnectApplications: relayStylePagination(["where", "order"]),
+      openIdConnectAuthorizations: relayStylePagination(["where", "order"]),
+      openIdConnectTokens: relayStylePagination(["where", "order"]),
+      pendingDatabases: relayStylePagination(["where", "order"]),
+      pendingInstitutions: relayStylePagination(["where", "order"]),
+      users: relayStylePagination(["where", "order"]),
+    },
+  },
+  // Component: {
+  //   fields: {
+  //     assembledOf: relayStylePagination(["where"]),
+  //     concretizationOf: relayStylePagination(["where"]),
+  //     generalizationOf: relayStylePagination(["where"]),
+  //     manufacturers: relayStylePagination(["where"]),
+  //     partOf: relayStylePagination(["where"]),
+  //     pendingManufacturers: relayStylePagination(["where"]),
+  //     variantOf: relayStylePagination(["where"]),
+  //   },
+  // },
+  Database: {
+    fields: {
+      allCalorimetricData: relayStylePagination(["locale", "where"]),
+      allGeometricData: relayStylePagination(["locale", "where"]),
+      allHygrothermalData: relayStylePagination(["locale", "where"]),
+      allLifeCycleData: relayStylePagination(["locale", "where"]),
+      allOpticalData: relayStylePagination(["locale", "where"]),
+      allPhotovoltaicData: relayStylePagination(["locale", "where"]),
+    },
+  },
+  // Institution: {
+  //   fields: {
+  //     developedMethods: relayStylePagination(["where"]),
+  //     gnuPgKeyFingerprints: relayStylePagination(["where"]),
+  //     managedComponents: relayStylePagination(["where"]),
+  //     managedDataFormats: relayStylePagination(["where"]),
+  //     managedInstitutions: relayStylePagination(["where"]),
+  //     managedMethods: relayStylePagination(["where"]),
+  //     manufacturedComponents: relayStylePagination(["where"]),
+  //     openIdConnectApplications: relayStylePagination(["where"]),
+  //     operatedDatabases: relayStylePagination(["where"]),
+  //     pendingDevelopedMethods: relayStylePagination(["where"]),
+  //     pendingManufacturedComponents: relayStylePagination(["where"]),
+  //     pendingRepresentatives: relayStylePagination(["where"]),
+  //     representatives: relayStylePagination(["where"]),
+  //   },
+  // },
+  // Method: {
+  //   fields: {
+  //     developers: relayStylePagination(["where"]),
+  //     pendingDevelopers: relayStylePagination(["where"]),
+  //   },
+  // },
+  // OpenIdConnectApplication: {
+  //   fields: {
+  //     authorizations: relayStylePagination(),
+  //     tokens: relayStylePagination(),
+  //   },
+  // },
+  // OpenIdConnectAuthorization: {
+  //   fields: {
+  //     tokens: relayStylePagination(),
+  //   },
+  // },
+  // User: {
+  //   fields: {
+  //     developedMethods: relayStylePagination(["where"]),
+  //     gnuPgKeyFingerprints: relayStylePagination(["where"]),
+  //     pendingDevelopedMethods: relayStylePagination(["where"]),
+  //     pendingRepresentedInstitutions: relayStylePagination(["where"]),
+  //     representedInstitutions: relayStylePagination(["where"]),
+  //   },
+  // },
+};
+
 export const apolloClient = new ApolloClient({
   ssrMode: false,
   link: apolloLink,
   cache: new InMemoryCache({
+    typePolicies: typePolicies,
     possibleTypes: fragmentMatcherTypes.possibleTypes,
   }),
   localState: new LocalState({}),
diff --git a/frontend/lib/array.ts b/frontend/lib/array.ts
index 3cec46a7f..a4baa96a4 100644
--- a/frontend/lib/array.ts
+++ b/frontend/lib/array.ts
@@ -11,8 +11,33 @@ export function isTruthy<T>(
   return Boolean(value);
 }
 
+export function isMember<T extends string>(
+  value: string,
+  array: readonly T[],
+): value is T {
+  return array.includes(value as T);
+}
+
+/**
+ * Unwraps T if T is an array, otherwise becomes `never`.
+ * When applied to a union like `A[] | B[]`, it results in `A | B`.
+ */
+type UnboxArray<T> = T extends (infer U)[] ? U : never;
+
+/**
+ * Turns `A[] | B[] | C[]` into `readonly (A | B | C)[]` without runtime costs.
+ */
+export function asReadonlyMixed<T extends any[]>(
+  array: T,
+): readonly UnboxArray<T>[] {
+  return array as any;
+}
+
+export const range = (start: number, end: number): number[] =>
+  Array.from({ length: end - start + 1 }, (_, i) => start + i);
+
 export function pluralize(count: number, noun: string, suffix = "s") {
-  return `${count} ${noun}${count !== 1 ? suffix : ""}`;
+  return `${noun}${count !== 1 ? suffix : ""}`;
 }
 
 export function pluralizeIrregular(
@@ -20,6 +45,5 @@ export function pluralizeIrregular(
   singular: string,
   plural?: string,
 ) {
-  const word = count === 1 ? singular : (plural ?? `${singular}s`);
-  return `${count} ${word}`;
+  return count === 1 ? singular : (plural ?? `${singular}s`);
 }
diff --git a/frontend/lib/assert.ts b/frontend/lib/assert.ts
new file mode 100644
index 000000000..d2a847cfa
--- /dev/null
+++ b/frontend/lib/assert.ts
@@ -0,0 +1,3 @@
+function assertNever(x: never): never {
+  throw new Error("Unexpected object: " + x);
+}
diff --git a/frontend/lib/connection.ts b/frontend/lib/connection.ts
new file mode 100644
index 000000000..64e9dd1b5
--- /dev/null
+++ b/frontend/lib/connection.ts
@@ -0,0 +1,12 @@
+export interface PageInfo {
+  hasNextPage: boolean;
+  hasPreviousPage?: boolean;
+  startCursor?: string | null;
+  endCursor: string | null;
+}
+
+export interface Connection<TNode> {
+  edges?: Array<{ cursor?: string; node: TNode }> | null;
+  pageInfo: PageInfo;
+  totalCount: number;
+}
diff --git a/frontend/lib/debug.ts b/frontend/lib/debug.ts
new file mode 100644
index 000000000..28485ceb4
--- /dev/null
+++ b/frontend/lib/debug.ts
@@ -0,0 +1,7 @@
+export type Prettify<T> = {
+  [K in keyof T]: T[K];
+} & {};
+
+export type PrettifyDeep<T> = {
+  [K in keyof T]: T[K] extends object ? PrettifyDeep<T[K]> : T[K];
+} & {};
diff --git a/frontend/lib/filter.ts b/frontend/lib/filter.ts
new file mode 100644
index 000000000..18488394b
--- /dev/null
+++ b/frontend/lib/filter.ts
@@ -0,0 +1,480 @@
+import {
+  FloatFilterInput,
+  IntFilterInput,
+  StringFilterInput,
+  UrlFilterInput,
+  UuidFilterInput,
+} from "../__generated__/graphql";
+
+type DistributiveOmit<T, K extends keyof any> = T extends any
+  ? Omit<T, K>
+  : never;
+
+type Scalar = string | number | boolean;
+
+export type EnumFilterInput<TEnum> = {
+  equalTo?: TEnum | null;
+  in?: TEnum[] | null;
+  notEqualTo?: TEnum | null;
+  notIn?: TEnum[] | null;
+};
+
+export type ListFilterInput<TItemFilterInput = any> = {
+  all?: TItemFilterInput | null;
+  none?: TItemFilterInput | null;
+  some?: TItemFilterInput | null;
+};
+
+type FilterOperatorKind = "single" | "multiple";
+
+const ScalarFilterOperatorMap = {
+  contains: { label: "contains", kind: "single" },
+  startsWith: { label: "starts with", kind: "single" },
+  endsWith: { label: "ends with", kind: "single" },
+  equalTo: { label: "=", kind: "single" },
+  notEqualTo: { label: "≠", kind: "single" },
+  greaterThan: { label: ">", kind: "single" },
+  greaterThanOrEqualTo: { label: "≥", kind: "single" },
+  lessThan: { label: "<", kind: "single" },
+  lessThanOrEqualTo: { label: "≤", kind: "single" },
+  in: { label: "∈", kind: "multiple" },
+  notIn: { label: "∉", kind: "multiple" },
+} as const satisfies Record<
+  string,
+  { label: string; kind: FilterOperatorKind }
+>;
+
+const ListFilterOperatorMap = {
+  all: { label: "all", kind: "single" },
+  none: { label: "none", kind: "single" },
+  some: { label: "some", kind: "single" },
+} as const satisfies Record<
+  string,
+  { label: string; kind: FilterOperatorKind }
+>;
+
+const FilterOperatorMap = {
+  ...ScalarFilterOperatorMap,
+  ...ListFilterOperatorMap,
+} as const;
+
+type ScalarFilterOperator = keyof typeof ScalarFilterOperatorMap;
+type ListFilterOperator = keyof typeof ListFilterOperatorMap;
+export type FilterOperator = ScalarFilterOperator | ListFilterOperator;
+
+export const getFilterOperatorLabel = (key: FilterOperator) =>
+  FilterOperatorMap[key].label;
+export const isFilterOperatorSingle = (key: FilterOperator) =>
+  FilterOperatorMap[key].kind === "single";
+
+const scalarFilterOperators = new Set(
+  Object.keys(ScalarFilterOperatorMap),
+) as ReadonlySet<ScalarFilterOperator>;
+const listFilterOperators = new Set(
+  Object.keys(ListFilterOperatorMap),
+) as ReadonlySet<ListFilterOperator>;
+
+const isScalarFilterOperator = (
+  value: FilterOperator | undefined,
+): value is ScalarFilterOperator => {
+  return scalarFilterOperators.has(value as ScalarFilterOperator);
+};
+const isListFilterOperator = (
+  value: FilterOperator | undefined,
+): value is ListFilterOperator => {
+  return listFilterOperators.has(value as ListFilterOperator);
+};
+
+const defineFilterOperators = <K extends FilterOperator>(
+  keys: readonly K[],
+): readonly K[] => keys;
+
+type ScalarFilterState = {
+  readonly operator: ScalarFilterOperator;
+  readonly value: Scalar | Scalar[] | null;
+};
+type ListFilterState = {
+  readonly operator: ListFilterOperator;
+  readonly value: FilterState;
+};
+export type ObjectFilterState = {
+  readonly operator?: undefined;
+  readonly index: number;
+  readonly value: FilterState;
+};
+
+type FilterState = ScalarFilterState | ListFilterState | ObjectFilterState;
+
+const ScalarFilterTypeMap = {
+  enum: {
+    operators: defineFilterOperators(["equalTo", "notEqualTo", "in", "notIn"]),
+    initialOperator: 0,
+  },
+  float: {
+    operators: defineFilterOperators([
+      "equalTo",
+      "notEqualTo",
+      "greaterThan",
+      "greaterThanOrEqualTo",
+      "lessThan",
+      "lessThanOrEqualTo",
+      "in",
+      "notIn",
+    ]),
+    initialOperator: 0,
+  },
+  int: {
+    operators: defineFilterOperators([
+      "equalTo",
+      "notEqualTo",
+      "greaterThan",
+      "greaterThanOrEqualTo",
+      "lessThan",
+      "lessThanOrEqualTo",
+      "in",
+      "notIn",
+    ]),
+    initialOperator: 0,
+  },
+  string: {
+    operators: defineFilterOperators([
+      "contains",
+      "startsWith",
+      "endsWith",
+      "equalTo",
+      "notEqualTo",
+      "in",
+      "notIn",
+    ]),
+    initialOperator: 0,
+  },
+  url: {
+    operators: defineFilterOperators(["equalTo", "notEqualTo", "in", "notIn"]),
+    initialOperator: 0,
+  },
+  uuid: {
+    operators: defineFilterOperators(["equalTo", "notEqualTo", "in", "notIn"]),
+    initialOperator: 0,
+  },
+} as const satisfies Record<
+  string,
+  { operators: readonly ScalarFilterOperator[]; initialOperator: number }
+>;
+
+const ListFilterTypeMap = {
+  list: {
+    operators: defineFilterOperators(["some", "all", "none"]),
+    initialOperator: 0,
+  },
+} as const satisfies Record<
+  string,
+  { operators: readonly ListFilterOperator[]; initialOperator: number }
+>;
+
+export const FilterTypeMap = {
+  ...ScalarFilterTypeMap,
+  ...ListFilterTypeMap,
+} as const;
+
+type ScalarFilterType = keyof typeof ScalarFilterTypeMap;
+type ListFilterType = keyof typeof ListFilterTypeMap;
+type ObjectFilterType = typeof objectFilterType;
+type FilterType = ScalarFilterType | ListFilterType | ObjectFilterType;
+
+const scalarFilterTypes = new Set(
+  Object.keys(ScalarFilterTypeMap),
+) as ReadonlySet<ScalarFilterType>;
+const listFilterTypes = new Set(
+  Object.keys(ListFilterTypeMap),
+) as ReadonlySet<ListFilterType>;
+const objectFilterType = "object" as const;
+
+const isScalarFilterType = (value: FilterType): value is ScalarFilterType => {
+  return scalarFilterTypes.has(value as ScalarFilterType);
+};
+const isListFilterType = (value: FilterType): value is ListFilterType => {
+  return listFilterTypes.has(value as ListFilterType);
+};
+
+type BaseFilterDefinition<TKey> = {
+  readonly field: TKey;
+  readonly label?: string;
+};
+
+type EnumFilterDefinition<
+  TFilterInput,
+  TKey extends keyof TFilterInput,
+  TEnum,
+> = BaseFilterDefinition<TKey> & {
+  readonly type: "enum" & ScalarFilterType;
+  readonly field: TKey;
+  readonly enumObject: TEnum;
+  readonly _validation?: TFilterInput[TKey] extends EnumFilterInput<TEnum>
+    ? TKey
+    : never;
+};
+
+type FloatFilterDefinition<
+  TFilterInput,
+  TKey extends keyof TFilterInput,
+> = BaseFilterDefinition<TKey> & {
+  readonly type: "float" & ScalarFilterType;
+  readonly _validation?: TFilterInput[TKey] extends FloatFilterInput
+    ? TKey
+    : never;
+};
+
+type IntFilterDefinition<
+  TFilterInput,
+  TKey extends keyof TFilterInput,
+> = BaseFilterDefinition<TKey> & {
+  readonly type: "int" & ScalarFilterType;
+  readonly _validation?: TFilterInput[TKey] extends IntFilterInput
+    ? TKey
+    : never;
+};
+
+type StringFilterDefinition<
+  TFilterInput,
+  TKey extends keyof TFilterInput,
+> = BaseFilterDefinition<TKey> & {
+  readonly type: "string" & ScalarFilterType;
+  readonly _validation?: TFilterInput[TKey] extends StringFilterInput
+    ? TKey
+    : never;
+};
+
+type UrlFilterDefinition<
+  TFilterInput,
+  TKey extends keyof TFilterInput,
+> = BaseFilterDefinition<TKey> & {
+  readonly type: "url" & ScalarFilterType;
+  readonly _validation?: TFilterInput[TKey] extends UrlFilterInput
+    ? TKey
+    : never;
+};
+
+type UuidFilterDefinition<
+  TFilterInput,
+  TKey extends keyof TFilterInput,
+> = BaseFilterDefinition<TKey> & {
+  readonly type: "uuid" & ScalarFilterType;
+  readonly _validation?: TFilterInput[TKey] extends UuidFilterInput
+    ? TKey
+    : never;
+};
+
+type ScalarFilterDefinitionMap<
+  TFilterInput,
+  TKey extends keyof TFilterInput,
+> = {
+  enum: TFilterInput[TKey] extends EnumFilterInput<infer TEnum>
+    ? EnumFilterDefinition<TFilterInput, TKey, TEnum>
+    : never;
+  float: FloatFilterDefinition<TFilterInput, TKey>;
+  int: IntFilterDefinition<TFilterInput, TKey>;
+  string: StringFilterDefinition<TFilterInput, TKey>;
+  url: UrlFilterDefinition<TFilterInput, TKey>;
+  uuid: UuidFilterDefinition<TFilterInput, TKey>;
+};
+
+type ScalarFilterDefinition<
+  TFilterInput,
+  TKey extends keyof TFilterInput,
+> = ScalarFilterDefinitionMap<TFilterInput, TKey>[ScalarFilterType];
+
+type ListItemFilterDefinition<TFilterInput, TKey extends keyof TFilterInput> =
+  NonNullable<TFilterInput[TKey]> extends { all?: infer TItemFilterInput }
+    ? DistributiveOmit<FilterDefinition<NonNullable<TItemFilterInput>>, "field">
+    : never;
+
+export type ListFilterDefinition<
+  TFilterInput,
+  TKey extends keyof TFilterInput,
+> = BaseFilterDefinition<TKey> & {
+  readonly type: "list" & ListFilterType;
+  readonly item: ListItemFilterDefinition<TFilterInput, TKey>;
+  readonly _validation?: TFilterInput extends ListFilterInput ? TKey : never;
+};
+
+export type ObjectFilterDefinition<
+  TFilterInput,
+  TKey extends keyof TFilterInput,
+> = BaseFilterDefinition<TKey> & {
+  readonly type: "object" & ObjectFilterType;
+  readonly items: readonly FilterDefinition<NonNullable<TFilterInput[TKey]>>[];
+};
+
+type FieldFilterDefinition<TFilterInput, TKey extends keyof TFilterInput> =
+  | ScalarFilterDefinition<TFilterInput, TKey>
+  | ListFilterDefinition<TFilterInput, TKey>
+  | ObjectFilterDefinition<TFilterInput, TKey>;
+
+type AnyFilterDefinition = FieldFilterDefinition<any, any>;
+
+export type FilterDefinition<TFilterInput> = {
+  [TKey in keyof TFilterInput]: FieldFilterDefinition<TFilterInput, TKey>;
+}[keyof TFilterInput];
+
+const isScalarFilterDefinition = <TFilterInput>(
+  value: FilterDefinition<TFilterInput>,
+): value is ScalarFilterDefinition<TFilterInput, keyof TFilterInput> => {
+  return isScalarFilterType(value.type);
+};
+const isListFilterDefinition = <TFilterInput>(
+  value: FilterDefinition<TFilterInput>,
+): value is ListFilterDefinition<TFilterInput, keyof TFilterInput> => {
+  return isListFilterType(value.type);
+};
+const isObjectFilterDefinition = <TFilterInput>(
+  value: FilterDefinition<TFilterInput>,
+): value is ObjectFilterDefinition<TFilterInput, keyof TFilterInput> => {
+  return value.type === objectFilterType;
+};
+
+const isScalarFilterState = (
+  value: FilterState,
+): value is ScalarFilterState => {
+  return isScalarFilterOperator(value.operator);
+};
+const isListFilterState = (value: FilterState): value is ListFilterState => {
+  return isListFilterOperator(value.operator);
+};
+const isObjectFilterState = (
+  value: FilterState,
+): value is ObjectFilterState => {
+  return value.operator === undefined;
+};
+
+export type FilterStateReducerContext = readonly AnyFilterDefinition[];
+
+export const createFilterStateReducer = <TOutput>(
+  reduceScalar: (
+    scalar: ScalarFilterState,
+    context: FilterStateReducerContext,
+  ) => TOutput,
+  reduceList: (
+    list: ListFilterState,
+    reduce: (filter: FilterState) => TOutput,
+  ) => TOutput,
+  reduceObject: (
+    object: ObjectFilterState,
+    context: FilterStateReducerContext,
+    reduce: (filter: FilterState) => TOutput,
+  ) => TOutput,
+) => {
+  return (
+    root: ObjectFilterState,
+    initialContext: FilterStateReducerContext,
+  ): TOutput => {
+    const reduce = (
+      filter: FilterState,
+      context: FilterStateReducerContext,
+    ): TOutput => {
+      if (isScalarFilterState(filter)) {
+        return reduceScalar(filter, context);
+      }
+      if (isListFilterState(filter)) {
+        return reduceList(filter, (x) => reduce(x, context));
+      }
+      if (isObjectFilterState(filter)) {
+        const subContext = (
+          context[filter.index] as ObjectFilterDefinition<any, keyof any>
+        ).items;
+        return reduceObject(filter, context, (x) => reduce(x, subContext));
+      }
+      return assertNever(filter);
+    };
+    return reduceObject(root, initialContext, (object) =>
+      reduce(object, initialContext),
+    );
+  };
+};
+
+export const createFilterDefinitionReducer = <
+  TScalarOutput,
+  TListOutput,
+  TObjectOutput,
+>(
+  reduceScalar: (scalar: ScalarFilterDefinition<any, any>) => TScalarOutput,
+  reduceList: (
+    list: ListFilterDefinition<any, any>,
+    reduce: (
+      filter: AnyFilterDefinition,
+    ) => TScalarOutput | TListOutput | TObjectOutput,
+  ) => TListOutput,
+  reduceObject: (
+    object: ObjectFilterDefinition<any, any>,
+    reduce: (
+      filter: AnyFilterDefinition,
+    ) => TScalarOutput | TListOutput | TObjectOutput,
+  ) => TObjectOutput,
+) => {
+  return (
+    root: AnyFilterDefinition,
+  ): TScalarOutput | TListOutput | TObjectOutput => {
+    const reduce = (
+      filter: AnyFilterDefinition,
+    ): TScalarOutput | TListOutput | TObjectOutput => {
+      if (isScalarFilterDefinition(filter)) {
+        return reduceScalar(filter);
+      }
+      if (isListFilterDefinition(filter)) {
+        return reduceList(filter, (x) => reduce(x));
+      }
+      if (isObjectFilterDefinition(filter)) {
+        return reduceObject(filter, (x) => reduce(x));
+      }
+      return null as TScalarOutput | TListOutput | TObjectOutput;
+      // TODO make the following succeed: return assertNever(filter);
+    };
+    return reduce(root);
+  };
+};
+
+// to GraphQL filter input, for example, to `{ name: { contains: "Simon" } }`
+export const toWhereClause = <TFilterInput>(
+  filter: ObjectFilterState,
+  configs: readonly FilterDefinition<TFilterInput>[],
+): TFilterInput =>
+  // the initial context type is `readonly FilterDefinition<TFilterInput>[]` and subsequent
+  // types are of the form `readonly FilterDefinition<TFilterInput[keyof TFilterInput]>[]`
+  createFilterStateReducer<any>(
+    (scalar, _) => ({
+      [scalar.operator]: scalar.value,
+    }),
+    (list, reduce) => ({
+      [list.operator]: reduce(list.value),
+    }),
+    (object, context, reduce) => ({
+      [context[object.index].field]: reduce(object.value),
+    }),
+  )(filter, configs as FilterStateReducerContext) as TFilterInput;
+
+export const getInitialFilterSubformValues = (
+  filterDefinition: AnyFilterDefinition,
+): FilterState =>
+  createFilterDefinitionReducer<
+    ScalarFilterState,
+    ListFilterState,
+    ObjectFilterState
+  >(
+    (scalar) => ({
+      operator:
+        ScalarFilterTypeMap[scalar.type].operators[
+          ScalarFilterTypeMap[scalar.type].initialOperator
+        ],
+      value: null,
+    }),
+    (list, reduce) => ({
+      operator:
+        ListFilterTypeMap[list.type].operators[
+          ListFilterTypeMap[list.type].initialOperator
+        ],
+      value: reduce(list.item),
+    }),
+    (object, reduce) => ({
+      index: 0,
+      value: reduce(object.items[0]),
+    }),
+  )(filterDefinition);
diff --git a/frontend/lib/form.ts b/frontend/lib/form.ts
index 33efe8685..ffc036697 100644
--- a/frontend/lib/form.ts
+++ b/frontend/lib/form.ts
@@ -2,6 +2,11 @@ export const layout = {
   labelCol: { span: 8 },
   wrapperCol: { span: 16 },
 };
+
 export const tailLayout = {
   wrapperCol: { offset: 8, span: 16 },
 };
+
+export const getFieldValue = (values: any, path: (string | number)[]) => {
+  return path.reduce((obj, key) => obj?.[key], values);
+};
diff --git a/frontend/lib/freeTextFilter.tsx b/frontend/lib/freeTextFilter.tsx
deleted file mode 100644
index 64331bb87..000000000
--- a/frontend/lib/freeTextFilter.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import { Input, Space, Button, InputRef } from "antd";
-import { FilterFilled } from "@ant-design/icons";
-import {
-  FilterConfirmProps,
-  FilterDropdownProps,
-} from "antd/lib/table/interface";
-import React, { Dispatch, Key, SetStateAction } from "react";
-
-export function setMapValue(
-  map: Map<string, string>,
-  setMap: Dispatch<SetStateAction<Map<string, string>>>,
-) {
-  return (key: string) => {
-    return (newValue: string) => {
-      if (map.get(key) !== newValue) {
-        const copy = new Map(map);
-        copy.set(key, newValue);
-        setMap(copy);
-      }
-    };
-  };
-}
-
-export function doesFieldIncludeFilterValue(
-  field: string,
-  value: React.Key | boolean,
-) {
-  return field.toLowerCase().includes(value.toString().toLowerCase());
-}
-
-export function getFreeTextFilterProps<RecordType>(
-  getField: (record: RecordType) => string | null | undefined,
-  onFilterTextChange: (newFilterText: string) => void,
-) {
-  const filter = (
-    selectedKeys: Key[],
-    confirm: (param?: FilterConfirmProps | undefined) => void,
-  ) => {
-    confirm();
-    onFilterTextChange(
-      selectedKeys.length === 0 ? "" : selectedKeys[0].toString(),
-    );
-  };
-
-  const reset = (clearFilters: (() => void) | undefined) => {
-    if (clearFilters !== undefined) {
-      clearFilters();
-      onFilterTextChange("");
-    }
-  };
-
-  let searchInput: InputRef | null = null;
-
-  return {
-    filterDropdown: ({
-      setSelectedKeys,
-      selectedKeys,
-      confirm,
-      clearFilters,
-    }: FilterDropdownProps) => (
-      <div style={{ padding: 8 }}>
-        <Input
-          ref={(node) => {
-            searchInput = node;
-          }}
-          placeholder={"Filter"}
-          value={selectedKeys?.[0]?.toString()}
-          onChange={(e) =>
-            setSelectedKeys(e.target.value ? [e.target.value] : [])
-          }
-          onPressEnter={() => filter(selectedKeys, confirm)}
-          style={{ marginBottom: 8, display: "block" }}
-        />
-        <Space>
-          <Button
-            type="primary"
-            onClick={() => filter(selectedKeys, confirm)}
-            icon={<FilterFilled />}
-            size="small"
-            style={{ width: 90 }}
-          >
-            Filter
-          </Button>
-          <Button
-            onClick={() => reset(clearFilters)}
-            size="small"
-            style={{ width: 90 }}
-          >
-            Reset
-          </Button>
-        </Space>
-      </div>
-    ),
-    filterIcon: (filtered: boolean) => (
-      <FilterFilled style={{ color: filtered ? "#1890ff" : undefined }} />
-    ),
-    onFilter: (value: React.Key | boolean, record: RecordType) => {
-      const field = getField(record);
-      return field ? doesFieldIncludeFilterValue(field, value) : false;
-    },
-    onFilterDropdownOpenChange: (visible: boolean) => {
-      if (visible) {
-        setTimeout(() => searchInput?.select(), 100);
-      }
-    },
-  };
-}
diff --git a/frontend/lib/hooks/useDebounce.ts b/frontend/lib/hooks/useDebounce.ts
new file mode 100644
index 000000000..9ddeb77df
--- /dev/null
+++ b/frontend/lib/hooks/useDebounce.ts
@@ -0,0 +1,26 @@
+import { useRef, useCallback, useEffect } from "react";
+
+export function useDebounce<T extends (...args: any[]) => any>(
+  callback: T,
+  delay: number,
+) {
+  const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  const debouncedFn = useCallback(
+    (...args: Parameters<T>) => {
+      if (timeoutRef.current) clearTimeout(timeoutRef.current);
+      timeoutRef.current = setTimeout(() => callback(...args), delay);
+    },
+    [callback, delay],
+  );
+
+  // Cleanup on unmount
+  useEffect(
+    () => () => {
+      if (timeoutRef.current) clearTimeout(timeoutRef.current);
+    },
+    [],
+  );
+
+  return debouncedFn;
+}
diff --git a/frontend/lib/hooks/useInfiniteScrollQuery.ts b/frontend/lib/hooks/useInfiniteScrollQuery.ts
new file mode 100644
index 000000000..2f3ecda48
--- /dev/null
+++ b/frontend/lib/hooks/useInfiniteScrollQuery.ts
@@ -0,0 +1,66 @@
+import { TypedDocumentNode } from "@apollo/client";
+import { useQuery } from "@apollo/client/react";
+import { Connection } from "../connection";
+
+// ensure `relayStylePagination(["first", "after", ...])` is set in `InMemoryCache` for the field `fieldName`
+export function useRelayInfiniteScroll<
+  TNode,
+  TData extends Record<TFieldName, Connection<TNode>>,
+  TVariables extends {
+    first?: number | null;
+    after?: string | null;
+    where?: any;
+    order?: any;
+  },
+  TFieldName extends keyof TData,
+>(
+  queryDocument: TypedDocumentNode<TData, TVariables>,
+  {
+    pageSize,
+    fieldName,
+    where,
+    order,
+  }: {
+    pageSize: number;
+    fieldName: TFieldName;
+    where: TVariables["where"];
+    order: TVariables["order"];
+  },
+) {
+  const { data, loading, fetchMore } = useQuery<TData, TVariables>(
+    queryDocument,
+    {
+      variables: {
+        first: pageSize,
+        after: null,
+        where: where,
+        order: order, // HotChocolate naming convention
+      } as TVariables,
+      notifyOnNetworkStatusChange: true,
+    },
+  );
+
+  const connection = data?.[fieldName];
+  const hasMore = !!connection?.pageInfo.hasNextPage;
+
+  const loadMore = () => {
+    if (hasMore && !loading) {
+      fetchMore({
+        variables: { after: connection.pageInfo.endCursor } as TVariables,
+      });
+    }
+  };
+
+  return {
+    edges: connection?.edges || [],
+    nodes: connection?.edges?.map((e: any) => e.node) || [],
+    loading,
+    hasMore,
+    loadMore,
+    loadMoreButtonProps: {
+      loading,
+      onClick: loadMore,
+      disabled: !hasMore,
+    },
+  };
+}
diff --git a/frontend/lib/hooks/usePaginatedQuery.ts b/frontend/lib/hooks/usePaginatedQuery.ts
new file mode 100644
index 000000000..e9fb5bdee
--- /dev/null
+++ b/frontend/lib/hooks/usePaginatedQuery.ts
@@ -0,0 +1,145 @@
+import { useState, useMemo, useEffect } from "react";
+import { TypedDocumentNode } from "@apollo/client";
+import { useQuery } from "@apollo/client/react";
+import { Connection } from "../connection";
+import { useQueryHandler } from "./useQueryHandler";
+import { initialPageSize, PaginationProps } from "../../components/Pagination";
+
+export type QueryData<TNode> = {
+  connection: Connection<TNode> | null;
+};
+
+type FilterInput<TFilterInput> = TFilterInput | { and?: TFilterInput[] };
+
+type SortInput<TSortInput> = TSortInput | TSortInput[];
+
+export type QueryVariables<TFilterInput, TSortInput> = {
+  first: number;
+  after?: string | null;
+  where?: FilterInput<TFilterInput>;
+  order?: SortInput<TSortInput>;
+};
+
+export type QueryDocument<TNode, TFilterInput, TSortInput> = TypedDocumentNode<
+  QueryData<TNode>,
+  QueryVariables<TFilterInput, TSortInput>
+>;
+
+// ensure `relayStylePagination(["first", "after", ...])` is set in `InMemoryCache` for the field `fieldName`
+export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
+  queryDocument: QueryDocument<TNode, TFilterInput, TSortInput>,
+  {
+    where,
+    order,
+  }: {
+    where?: FilterInput<TFilterInput>;
+    order?: SortInput<TSortInput>;
+  },
+  onQueryVariablesChange: (
+    variables: QueryVariables<TFilterInput, TSortInput>,
+  ) => void,
+): {
+  loading: boolean;
+  nodes: TNode[];
+  paginationProps: PaginationProps;
+} {
+  const [currentPage, setCurrentPage] = useState(1);
+  const [pageSize, setPageSize] = useState(initialPageSize);
+  const [afterCursors, setAfterCursors] = useState<(string | null)[]>([null]);
+
+  const variables = {
+    first: pageSize,
+    after: null,
+    where: where,
+    order: order,
+  };
+  const { loading, error, data, fetchMore, refetch } = useQuery(queryDocument, {
+    variables,
+    notifyOnNetworkStatusChange: true,
+  });
+  useQueryHandler({ error });
+
+  // Reset: If where OR order change, jump back to page 1
+  useEffect(() => {
+    setCurrentPage(1);
+    setAfterCursors([null]);
+    onQueryVariablesChange(variables);
+  }, [JSON.stringify(where), JSON.stringify(order)]);
+
+  const connection = data?.connection;
+  const edges = connection?.edges || [];
+
+  // Window the current page from the cache
+  const currentPageNodes = useMemo(() => {
+    const start = (currentPage - 1) * pageSize;
+    return edges.slice(start, start + pageSize).map((e) => e.node);
+  }, [edges, currentPage, pageSize]);
+
+  const handlePrevious = () => {
+    if (loading) return;
+    if (currentPage <= 1) return;
+    const previousPage = currentPage - 1;
+    setCurrentPage(previousPage);
+    onQueryVariablesChange({
+      ...variables,
+      after: afterCursors[previousPage - 1],
+    });
+  };
+
+  const handleNext = () => {
+    if (loading) return;
+    const isLastPageInMemory = currentPage * pageSize >= edges.length;
+    if (isLastPageInMemory && connection?.pageInfo.hasNextPage) {
+      const endCursor = connection?.pageInfo.endCursor ?? null;
+      const variables = {
+        first: pageSize,
+        after: endCursor,
+        where: where,
+        order: order,
+      };
+      fetchMore({ variables }).then(() => {
+        setCurrentPage((previous) => previous + 1);
+        setAfterCursors((previous) => [...previous, endCursor]);
+        onQueryVariablesChange(variables);
+      });
+    } else if (!isLastPageInMemory) {
+      setCurrentPage(currentPage + 1);
+      onQueryVariablesChange({
+        ...variables,
+        after: afterCursors[currentPage],
+      });
+    }
+  };
+
+  const handlePageSizeChange = (pageSize: number) => {
+    setPageSize(pageSize);
+    const variables = {
+      first: pageSize,
+      after: null,
+      where: where,
+      order: order,
+    };
+    refetch(variables).then(() => {
+      setCurrentPage(1);
+      setAfterCursors([null]);
+      onQueryVariablesChange(variables);
+    });
+  };
+
+  return {
+    loading,
+    nodes: currentPageNodes,
+    paginationProps: {
+      current: currentPage,
+      total: Math.ceil((connection?.totalCount ?? 0) / pageSize),
+      pageSize: pageSize,
+      hasNext:
+        !!connection?.pageInfo.hasNextPage ||
+        currentPage * pageSize < edges.length,
+      hasPrevious: currentPage > 1,
+      onNext: handleNext,
+      onPrevious: handlePrevious,
+      onPageSizeChange: handlePageSizeChange,
+    },
+  };
+}
diff --git a/frontend/lib/hooks/useRequireAuth.ts b/frontend/lib/hooks/useRequireAuth.ts
index b8cecb5dc..7f03af58f 100644
--- a/frontend/lib/hooks/useRequireAuth.ts
+++ b/frontend/lib/hooks/useRequireAuth.ts
@@ -14,8 +14,12 @@ interface UseRequireAuthProps {
 }
 
 type UseRequireAuthResponse =
-  | { authenticated: true; currentUser: CurrentUserPartialFragment }
-  | { authenticated: false; currentUser: null | undefined };
+  | {
+      loading: false;
+      authenticated: true;
+      currentUser: CurrentUserPartialFragment;
+    }
+  | { loading: boolean; authenticated: false; currentUser: null | undefined };
 
 export function useRequireAuth({
   returnTo,
@@ -35,7 +39,7 @@ export function useRequireAuth({
   }, [router, shouldRedirect, returnTo]);
 
   if (!authenticated) {
-    return { authenticated: false, currentUser: null };
+    return { loading, authenticated: false, currentUser: null };
   }
-  return { authenticated: true, currentUser };
+  return { loading, authenticated: true, currentUser };
 }
diff --git a/frontend/lib/recoveryCodesModal.tsx b/frontend/lib/recoveryCodesModal.tsx
index e8fbc12a4..57876824a 100644
--- a/frontend/lib/recoveryCodesModal.tsx
+++ b/frontend/lib/recoveryCodesModal.tsx
@@ -9,7 +9,7 @@ export function recoveryCodesModal(modal: HookAPI, recoveryCodes: string[]) {
         <Typography.Paragraph strong>
           Put these codes in a safe place.
         </Typography.Paragraph>
-        <Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
           If you lose your device and don& apos;t have the recovery codes you
           will lose access to your account.
         </Typography.Paragraph>
diff --git a/frontend/lib/sort.ts b/frontend/lib/sort.ts
new file mode 100644
index 000000000..5fa105dbb
--- /dev/null
+++ b/frontend/lib/sort.ts
@@ -0,0 +1,36 @@
+import { SortEnumType } from "../__generated__/graphql";
+
+export type SortState = {
+  index: number;
+  direction: SortEnumType;
+};
+
+export type SortDefinition<TSortInput> = {
+  field: keyof TSortInput;
+  label?: string;
+};
+
+export const initialSortSubformValues = {
+  index: 0,
+  direction: SortEnumType.Asc,
+};
+
+// to GraphQL sort input, for example, to `[{ name: "ASC" }, { date: "DESC" }]`
+export const toOrderClause = <TSortInput>(
+  sort: SortState,
+  configs: readonly SortDefinition<TSortInput>[],
+): TSortInput =>
+  ({
+    [configs[sort.index].field]: sort.direction,
+  }) as TSortInput;
+
+export const formatSortDirection = (direction: SortEnumType) => {
+  switch (direction) {
+    case SortEnumType.Asc:
+      return "ascending";
+    case SortEnumType.Desc:
+      return "descending";
+    default:
+      return assertNever(direction);
+  }
+};
diff --git a/frontend/lib/string.ts b/frontend/lib/string.ts
new file mode 100644
index 000000000..ad25e6ca0
--- /dev/null
+++ b/frontend/lib/string.ts
@@ -0,0 +1,69 @@
+export const uuidRegex =
+  /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+
+export const isUuid = <T extends string>(value: T) => uuidRegex.test(value);
+
+export const notEmpty = <T extends string>(value: T) => value.trim().length > 0;
+
+export const capitalize = <T extends string>(value: T) =>
+  (value[0].toUpperCase() + value.slice(1)) as Capitalize<T>;
+
+export const replacePrefix = (
+  value: string,
+  oldPrefix: string,
+  newPrefix: string = "",
+): string =>
+  value.startsWith(oldPrefix)
+    ? newPrefix + value.slice(oldPrefix.length)
+    : value;
+
+export const removePrefix = (value: string, prefix: string): string =>
+  value.startsWith(prefix) ? value.slice(prefix.length) : value;
+
+export const addPrefix = (value: string, prefix: string): string =>
+  value.startsWith(prefix) ? value : prefix + value;
+
+const ACRONYMS = ["ID", "URL", "UUID"];
+type CaseStyle = "all-upper" | "first-upper" | "none-upper";
+
+export const humanize = (
+  key: PropertyKey,
+  style: CaseStyle = "none-upper",
+): string => {
+  if (!key) return "";
+  const words = String(key)
+    .replace(/([a-z])([A-Z])/g, "$1 $2")
+    .replace(/[_-]/g, " ")
+    .trim()
+    .split(/\s+/); // Get individual words
+  const formattedWords = words.map((word, index) => {
+    const upper = word.toUpperCase();
+    if (ACRONYMS.includes(upper)) {
+      return upper;
+    }
+    switch (style) {
+      case "all-upper": // title Case
+        return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
+      case "first-upper": // sentence Case
+        return index === 0
+          ? word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()
+          : word.toLowerCase();
+      case "none-upper": // lowercase
+        return word.toLowerCase();
+      default:
+        return word;
+    }
+  });
+  return formattedWords.join(" ");
+};
+
+export const getLabel = (
+  {
+    field,
+    label,
+  }: {
+    field: PropertyKey;
+    label?: string;
+  },
+  style: CaseStyle = "none-upper",
+) => label ?? humanize(field, style);
diff --git a/frontend/lib/table.tsx b/frontend/lib/table.tsx
deleted file mode 100644
index 0181f1215..000000000
--- a/frontend/lib/table.tsx
+++ /dev/null
@@ -1,685 +0,0 @@
-import { List, Typography, Descriptions } from "antd";
-import { SortOrder } from "antd/lib/table/interface";
-import {
-  doesFieldIncludeFilterValue,
-  getFreeTextFilterProps,
-} from "./freeTextFilter";
-import Link from "next/link";
-import { Scalars, Publication, Standard } from "../__generated__/graphql";
-import { Highlight } from "../components/Highlight";
-import paths from "../paths";
-import { JSX } from "react";
-import { Route } from "next";
-
-const sortDirections: SortOrder[] = ["ascend", "descend"];
-
-function compare<ValueType>(
-  x: ValueType | null | undefined,
-  y: ValueType | null | undefined,
-  nonNullCompare: (a: ValueType, b: ValueType) => number,
-) {
-  if (x != null && y != null) {
-    return nonNullCompare(x, y);
-  }
-  if (x == null && y != null) {
-    return -1;
-  }
-  if (x != null && y == null) {
-    return 1;
-  }
-  return 0;
-}
-
-function compareLexicographically<ValueType>(
-  xs: (ValueType | null | undefined)[],
-  ys: (ValueType | null | undefined)[],
-  elementCompare: (x: ValueType, y: ValueType) => number,
-) {
-  let i = 0;
-  while (i < xs.length && i < ys.length) {
-    const comparison = compare(xs[i], ys[i], elementCompare);
-    if (comparison !== 0) {
-      return comparison;
-    }
-    i++;
-  }
-  return xs.length - ys.length;
-}
-
-export function getColumnProps<RecordType>(
-  title: string,
-  key: keyof RecordType,
-) {
-  return {
-    title: title,
-    key: key,
-    // dataIndex: key,
-  };
-}
-
-export function getDateTimeColumnProps<RecordType>(
-  title: string,
-  key: keyof RecordType,
-  getValue: (
-    record: RecordType,
-  ) => Scalars["DateTime"]["output"] | null | undefined,
-) {
-  return {
-    ...getColumnProps(title, key),
-    sorter: (a: RecordType, b: RecordType) =>
-      compare(
-        getValue(a),
-        getValue(b),
-        (x, y) => Date.parse(y) - Date.parse(x),
-      ),
-    sortDirections: sortDirections,
-  };
-}
-
-export function getTimestampColumnProps<
-  RecordType extends { timestamp: Scalars["DateTime"]["output"] },
->() {
-  return {
-    ...getDateTimeColumnProps<RecordType>(
-      "Timestamp",
-      "timestamp",
-      (record) => record.timestamp,
-    ),
-  };
-}
-
-export function getStringColumnProps<RecordType>(
-  title: string,
-  key: keyof RecordType,
-  getValue: (record: RecordType) => string | null | undefined,
-) {
-  return {
-    ...getColumnProps(title, key),
-    sorter: (a: RecordType, b: RecordType) =>
-      compare(getValue(a), getValue(b), (x, y) => x.localeCompare(y, "en")),
-    sortDirections: sortDirections,
-  };
-}
-
-export function getFilterableStringColumnProps<RecordType>(
-  title: string,
-  key: keyof RecordType,
-  getValue: (record: RecordType) => string | null | undefined,
-  onFilterTextChange: (
-    key: keyof RecordType,
-  ) => (newFilterText: string) => void,
-  getFilterText: (key: keyof RecordType) => string | undefined,
-  doRender: (
-    record: RecordType,
-    highlightedValue: JSX.Element,
-    value: string | null | undefined,
-  ) => JSX.Element = (_record, highlightedValue, _value) => highlightedValue,
-) {
-  return {
-    ...getStringColumnProps(title, key, getValue),
-    ...getFreeTextFilterProps<RecordType>(getValue, onFilterTextChange(key)),
-    render: (_text: string, record: RecordType, _index: number) =>
-      doRender(
-        record,
-        <Highlight text={getValue(record)} snippet={getFilterText(key)} />,
-        getValue(record),
-      ),
-  };
-}
-
-export function getInternallyLinkedFilterableStringColumnProps<RecordType>(
-  title: string,
-  key: keyof RecordType,
-  getValue: (record: RecordType) => string | null | undefined,
-  onFilterTextChange: (
-    key: keyof RecordType,
-  ) => (newFilterText: string) => void,
-  getFilterText: (key: keyof RecordType) => string | undefined,
-  getPath: (record: RecordType) => Route,
-) {
-  return getFilterableStringColumnProps(
-    title,
-    key,
-    getValue,
-    onFilterTextChange,
-    getFilterText,
-    (record, _highlightedValue, value) =>
-      value ? (
-        // TODO Why does this not work with `_highlightedValue`? An error is raised saying "Function components cannot be given refs. Attempts to access this ref will fail. Did you mean to use React.forwardRef()?": https://nextjs.org/docs/api-reference/next/link#if-the-child-is-a-function-component or https://reactjs.org/docs/forwarding-refs.html or https://deepscan.io/docs/rules/react-func-component-invalid-ref-prop or https://www.carlrippon.com/react-forwardref-typescript/
-        <Link href={getPath(record)}>{value}</Link>
-      ) : (
-        <></>
-      ),
-  );
-}
-
-export function getExternallyLinkedFilterableStringColumnProps<RecordType>(
-  title: string,
-  key: keyof RecordType,
-  getValue: (record: RecordType) => string | null | undefined,
-  onFilterTextChange: (
-    key: keyof RecordType,
-  ) => (newFilterText: string) => void,
-  getFilterText: (key: keyof RecordType) => string | undefined,
-  getPath: (record: RecordType) => string,
-) {
-  return getFilterableStringColumnProps(
-    title,
-    key,
-    getValue,
-    onFilterTextChange,
-    getFilterText,
-    (record, highlightedValue, _value) => {
-      const href = getPath(record);
-      return href ? (
-        <Typography.Link href={href}>{highlightedValue}</Typography.Link>
-      ) : (
-        <></>
-      );
-    },
-  );
-}
-
-export function getExternallyLinkedFilterableLocatorColumnProps<RecordType>(
-  title: string,
-  key: keyof RecordType,
-  getValue: (record: RecordType) => string | null | undefined,
-  onFilterTextChange: (
-    key: keyof RecordType,
-  ) => (newFilterText: string) => void,
-  getFilterText: (key: keyof RecordType) => string | undefined,
-) {
-  return getFilterableStringColumnProps(
-    title,
-    key,
-    getValue,
-    onFilterTextChange,
-    getFilterText,
-    (record, highlightedValue, _value) => {
-      const href = getValue(record);
-      return href ? (
-        <Typography.Link href={href}>{highlightedValue}</Typography.Link>
-      ) : (
-        <></>
-      );
-    },
-  );
-}
-
-export function getUuidColumnProps<
-  RecordType extends { uuid: Scalars["Uuid"]["output"] },
->(
-  onFilterTextChange: (
-    key: keyof RecordType,
-  ) => (newFilterText: string) => void,
-  getFilterText: (key: keyof RecordType) => string | undefined,
-  getPath: (uuid: Scalars["Uuid"]["output"]) => Route,
-) {
-  return getInternallyLinkedFilterableStringColumnProps(
-    "UUID",
-    "uuid",
-    (record) => record.uuid,
-    onFilterTextChange,
-    getFilterText,
-    (record) => getPath(record.uuid),
-  );
-}
-
-export function getNameColumnProps<RecordType extends { name?: string | null }>(
-  onFilterTextChange: (
-    key: keyof RecordType,
-  ) => (newFilterText: string) => void,
-  getFilterText: (key: keyof RecordType) => string | undefined,
-) {
-  return getFilterableStringColumnProps(
-    "Name",
-    "name",
-    (record) => record.name,
-    onFilterTextChange,
-    getFilterText,
-  );
-}
-
-export function getDescriptionColumnProps<
-  RecordType extends { description?: string | null },
->(
-  onFilterTextChange: (
-    key: keyof RecordType,
-  ) => (newFilterText: string) => void,
-  getFilterText: (key: keyof RecordType) => string | undefined,
-) {
-  return getFilterableStringColumnProps(
-    "Description",
-    "description",
-    (record) => record.description,
-    onFilterTextChange,
-    getFilterText,
-  );
-}
-
-export function getAbbreviationColumnProps<
-  RecordType extends { abbreviation?: string | null },
->(
-  onFilterTextChange: (
-    key: keyof RecordType,
-  ) => (newFilterText: string) => void,
-  getFilterText: (key: keyof RecordType) => string | undefined,
-) {
-  return getFilterableStringColumnProps(
-    "Abbreviation",
-    "abbreviation",
-    (record) => record.abbreviation,
-    onFilterTextChange,
-    getFilterText,
-  );
-}
-
-// TODO Use `EnumType extends enum` once there is an `enum` constraint as asked for in https://github.com/microsoft/TypeScript/issues/30611
-export function getEnumListColumnProps<RecordType, EnumType extends string>(
-  title: string,
-  key: keyof RecordType,
-  getValues: (record: RecordType) => EnumType[] | null | undefined,
-) {
-  return {
-    ...getColumnProps(title, key),
-    sorter: (a: RecordType, b: RecordType) =>
-      compare(getValues(a), getValues(b), (xs, ys) =>
-        compareLexicographically(xs, ys, (x, y) => x.localeCompare(y, "en")),
-      ),
-    sortDirections: sortDirections,
-  };
-}
-
-export function getFilterableEnumListColumnProps<
-  RecordType,
-  EnumType extends string,
->(
-  title: string,
-  key: keyof RecordType,
-  entries: [string, EnumType][],
-  getValues: (record: RecordType) => EnumType[] | null | undefined,
-  // TODO Call `onFilterTextChange` when the filter text changes (that is not done right now and that is the reason why matches are not highlighted). Note though that it cannot be called inside `onFilter` because that function is being called on render and we may not change state on render!
-  _onFilterTextChange: (
-    key: keyof RecordType,
-  ) => (newFilterText: string) => void,
-  getFilterText: (key: keyof RecordType) => string | undefined,
-  doRender: (
-    record: RecordType,
-    highlightedValue: JSX.Element,
-    value: EnumType,
-  ) => JSX.Element = (_record, highlightedValue, _value) => highlightedValue,
-) {
-  return {
-    ...getEnumListColumnProps(title, key, getValues),
-    filters: entries.map(([key, value]) => ({
-      text: key,
-      value: value,
-    })),
-    onFilter: (value: React.Key | boolean, record: RecordType) => {
-      const values = getValues(record);
-      if (
-        typeof value === "string" &&
-        entries
-          .map(([_enumKey, enumValue]) => enumValue.toString())
-          .includes(value)
-      ) {
-        return values?.includes(value as EnumType) || false;
-      }
-      return true;
-    },
-    render: (_value: string, record: RecordType, _index: number) => {
-      const values = getValues(record);
-      if (values == null) {
-        return null;
-      } else {
-        return (
-          <List>
-            {values.map((value) => (
-              <List.Item key={value}>
-                {doRender(
-                  record,
-                  <Highlight text={value} snippet={getFilterText(key)} />,
-                  value,
-                )}
-              </List.Item>
-            ))}
-          </List>
-        );
-      }
-    },
-  };
-}
-
-export function getDescriptionListColumnProps<RecordType>(
-  title: string,
-  key: keyof RecordType,
-  getEntries: (record: RecordType) =>
-    | {
-        key: string;
-        title: string;
-        value: string | null | undefined;
-      }[]
-    | null
-    | undefined,
-) {
-  return {
-    ...getColumnProps(title, key),
-    sorter: (a: RecordType, b: RecordType) => {
-      const aValues = getEntries(a)?.map((x) => x.value);
-      const bValues = getEntries(b)?.map((x) => x.value);
-      return compare(aValues, bValues, (xs, ys) =>
-        compareLexicographically(xs, ys, (x, y) => x.localeCompare(y, "en")),
-      );
-    },
-    sortDirections: sortDirections,
-  };
-}
-
-const titleValueDescriptionListSeparator = ": ";
-
-function splitDescriptionListFilterText(filterText: string | null | undefined) {
-  if (filterText == null) {
-    return [null, null];
-  }
-  const filterTexts = filterText.split(titleValueDescriptionListSeparator);
-  switch (filterTexts.length) {
-    case 1:
-      return [null, filterTexts[0]];
-    case 2:
-      return [filterTexts[0], filterTexts[1]];
-    default:
-      return [
-        filterTexts[0],
-        // TODO There are more efficient ways to do this than creating a new array without the first entry just to join them later on.
-        filterTexts.slice(1, -1).join(titleValueDescriptionListSeparator),
-      ];
-  }
-}
-
-export function getFilterableDescriptionListColumnProps<RecordType>(
-  title: string,
-  key: keyof RecordType,
-  getEntries: (record: RecordType) =>
-    | {
-        key: string;
-        title: string;
-        value: string | null | undefined;
-        render?: (
-          record: RecordType,
-          highlightedValue: JSX.Element,
-          value: string | null | undefined,
-        ) => JSX.Element;
-      }[]
-    | null
-    | undefined,
-  onFilterTextChange: (
-    key: keyof RecordType,
-  ) => (newFilterText: string) => void,
-  getFilterText: (key: keyof RecordType) => string | undefined,
-) {
-  return {
-    ...getDescriptionListColumnProps(title, key, getEntries),
-    ...getFreeTextFilterProps<RecordType>(
-      (record) =>
-        getEntries(record)
-          ?.map(
-            ({ title, value }) =>
-              `${title}${titleValueDescriptionListSeparator}${value}`,
-          )
-          ?.join("\n"),
-      onFilterTextChange(key),
-    ),
-    render: (_value: string, record: RecordType, _index: number) => {
-      const titlesAndValues = getEntries(record);
-      if (titlesAndValues == null) {
-        return null;
-      } else {
-        return (
-          <Descriptions column={1}>
-            {titlesAndValues.map(
-              ({
-                key: entryKey,
-                title,
-                value,
-                render = (_record, highlightedValue, _value) =>
-                  highlightedValue,
-              }) => {
-                const [titleFilterText, valueFilterText] =
-                  splitDescriptionListFilterText(getFilterText(key));
-                return (
-                  <Descriptions.Item
-                    key={entryKey}
-                    label={<Highlight text={title} snippet={titleFilterText} />}
-                  >
-                    {render(
-                      record,
-                      titleFilterText === null ||
-                        doesFieldIncludeFilterValue(title, titleFilterText) ? (
-                        <Highlight text={value} snippet={valueFilterText} />
-                      ) : (
-                        <Highlight text={value} snippet={null} />
-                      ),
-                      value,
-                    )}
-                  </Descriptions.Item>
-                );
-              },
-            )}
-          </Descriptions>
-        );
-      }
-    },
-  };
-}
-
-export function getReferenceColumnProps<
-  RecordType extends { reference?: Publication | Standard | null },
->(
-  onFilterTextChange: (
-    key: keyof RecordType,
-  ) => (newFilterText: string) => void,
-  getFilterText: (key: keyof RecordType) => string | undefined,
-) {
-  return getFilterableDescriptionListColumnProps(
-    "Reference",
-    "reference",
-    (record) =>
-      record.reference && [
-        {
-          key: "title",
-          title: "Title",
-          value: record.reference.title,
-        },
-        {
-          key: "abstract",
-          title: "Abstract",
-          value: record.reference.abstract,
-        },
-        {
-          key: "section",
-          title: "Section",
-          value: record.reference.section,
-        },
-        ...(record.reference.__typename !== "Standard"
-          ? []
-          : [
-              {
-                key: "numeration",
-                title: "Numeration",
-                value: `${record.reference.numeration.prefix} ${record.reference.numeration.mainNumber} ${record.reference.numeration.suffix}`,
-              },
-              {
-                key: "year",
-                title: "Year",
-                value: record.reference.year,
-              },
-              {
-                key: "locator",
-                title: "Locator",
-                value: record.reference.locator,
-                render: (
-                  _record: RecordType,
-                  hightlightedValue: JSX.Element,
-                  value: string | null | undefined,
-                ) => (
-                  // TODO Actually, `value` is neither `null` nor `undefined` but the type system does not know about it. How can we make it know about it so we don't need `|| ""` here?
-                  <Typography.Link href={value || ""}>
-                    {hightlightedValue}
-                  </Typography.Link>
-                ),
-              },
-              {
-                key: "Standardizers",
-                title: "Standardizers",
-                value: record.reference.standardizers.join(", "),
-              },
-            ]),
-        ...(record.reference.__typename !== "Publication"
-          ? []
-          : [
-              {
-                key: "arXiv",
-                title: "arXiv",
-                value: record.reference.arXiv,
-              },
-              {
-                key: "doi",
-                title: "DOI",
-                value: record.reference.doi,
-              },
-              {
-                key: "urn",
-                title: "URN",
-                value: record.reference.urn,
-              },
-              {
-                key: "webAddress",
-                title: "Website",
-                value: record.reference.webAddress,
-              },
-              {
-                key: "authors",
-                title: "Authors",
-                value: record.reference.authors?.join(", "),
-              },
-            ]),
-      ],
-    onFilterTextChange,
-    getFilterText,
-  );
-}
-
-export function getComponentUuidColumnProps<
-  RecordType extends { componentId: Scalars["Uuid"]["output"] },
->(
-  onFilterTextChange: (
-    key: keyof RecordType,
-  ) => (newFilterText: string) => void,
-  getFilterText: (key: keyof RecordType) => string | undefined,
-) {
-  return getInternallyLinkedFilterableStringColumnProps(
-    "Component UUID",
-    "componentId",
-    (x) => x.componentId,
-    onFilterTextChange,
-    getFilterText,
-    (x) => paths.component(x.componentId),
-  );
-}
-
-export function getAppliedMethodColumnProps<
-  RecordType extends { appliedMethod: { methodId: Scalars["Uuid"]["output"] } },
->(
-  onFilterTextChange: (
-    key: keyof RecordType,
-  ) => (newFilterText: string) => void,
-  getFilterText: (key: keyof RecordType) => string | undefined,
-) {
-  return getFilterableDescriptionListColumnProps(
-    "Applied Method",
-    "appliedMethod",
-    (x) => [
-      {
-        key: "appliedMethodId",
-        title: "UUID",
-        value: x.appliedMethod.methodId,
-        render: (_record, _highlightedValue, value) => (
-          // TODO Why does this not work with `_highlightedValue`? An error is raised saying "Function components cannot be given refs. Attempts to access this ref will fail. Did you mean to use React.forwardRef()?": https://nextjs.org/docs/api-reference/next/link#if-the-child-is-a-function-component or https://reactjs.org/docs/forwarding-refs.html or https://deepscan.io/docs/rules/react-func-component-invalid-ref-prop or https://www.carlrippon.com/react-forwardref-typescript/
-          <Link href={paths.method(x.appliedMethod.methodId)}>{value}</Link>
-        ),
-      },
-      // {
-      //   key: "appliedMethodName",
-      //   title: "Name",
-      //   value: x.appliedMethod.method?.name,
-      // },
-      // {
-      //   key: "appliedMethodDescription",
-      //   title: "Description",
-      //   value: x.appliedMethod.method?.description,
-      // },
-    ],
-    onFilterTextChange,
-    getFilterText,
-  );
-}
-
-export function getResourceTreeColumnProps<
-  RecordType extends {
-    resourceTree: {
-      root: {
-        value: {
-          description?: string | null | undefined;
-          hashValue: string;
-          locator: Scalars["Url"]["output"];
-          dataFormatId: Scalars["Uuid"]["output"];
-        };
-      };
-    };
-  },
->(
-  onFilterTextChange: (
-    key: keyof RecordType,
-  ) => (newFilterText: string) => void,
-  getFilterText: (key: keyof RecordType) => string | undefined,
-) {
-  return getFilterableDescriptionListColumnProps(
-    "Resource Tree Root",
-    "resourceTree",
-    (x) => [
-      {
-        key: "description",
-        title: "Description",
-        value: x.resourceTree.root.value.description,
-      },
-      {
-        key: "hashValue",
-        title: "Hash Value",
-        value: x.resourceTree.root.value.hashValue,
-      },
-      {
-        key: "locator",
-        title: "Locator",
-        value: x.resourceTree.root.value.locator,
-        render: (_record, hightlightedValue, _value) => (
-          <Typography.Link href={x.resourceTree.root.value.locator}>
-            {hightlightedValue}
-          </Typography.Link>
-        ),
-      },
-      {
-        key: "dataFormatId",
-        title: "Data Format UUID",
-        value: x.resourceTree.root.value.dataFormatId,
-        render: (_record, _hightlightedValue, value) => (
-          // TODO Why does this not work with `_highlightedValue`? An error is raised saying "Function components cannot be given refs. Attempts to access this ref will fail. Did you mean to use React.forwardRef()?": https://nextjs.org/docs/api-reference/next/link#if-the-child-is-a-function-component or https://reactjs.org/docs/forwarding-refs.html or https://deepscan.io/docs/rules/react-func-component-invalid-ref-prop or https://www.carlrippon.com/react-forwardref-typescript/
-          <Link href={paths.dataFormat(x.resourceTree.root.value.dataFormatId)}>
-            {value}
-          </Link>
-        ),
-      },
-    ],
-    onFilterTextChange,
-    getFilterText,
-  );
-}
diff --git a/frontend/package.json b/frontend/package.json
index ee8f3e1e7..c52305c5e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -35,6 +35,7 @@
     "@graphql-codegen/fragment-matcher": "^6.0.0",
     "@graphql-codegen/near-operation-file-preset": "^5.0.0",
     "@graphql-codegen/typescript": "^5.0.4",
+    "@graphql-codegen/typescript-apollo-client-helpers": "^4.0.0",
     "@graphql-codegen/typescript-operations": "^5.0.4",
     "@types/node": "^24.10.1",
     "@types/react": "^19.2.5",
@@ -42,7 +43,7 @@
     "@types/react-highlight-words": "^0.20.0",
     "@types/react-test-renderer": "^19.1.0",
     "babel-jest": "^30.2.0",
-    "baseline-browser-mapping": "^2.10.12",
+    "baseline-browser-mapping": "^2.10.27",
     "concurrently": "^9.2.1",
     "deepmerge": "^4.0",
     "eslint": "^10.1.0",
diff --git a/frontend/pages/_app.tsx b/frontend/pages/_app.tsx
index a14175c85..02d6d388f 100644
--- a/frontend/pages/_app.tsx
+++ b/frontend/pages/_app.tsx
@@ -5,6 +5,7 @@ import { CookiesProvider } from "react-cookie";
 import { App, ConfigProvider } from "antd";
 import { ReactNode, useEffect, useState } from "react";
 import paths from "../paths";
+import "antd/dist/reset.css";
 import "../styles/global.css";
 
 function AntiforgeryProvider({ children }: { children: ReactNode }) {
diff --git a/frontend/pages/components/index.tsx b/frontend/pages/components/index.tsx
index b62662154..490b5554c 100644
--- a/frontend/pages/components/index.tsx
+++ b/frontend/pages/components/index.tsx
@@ -1,33 +1,21 @@
-import { useQuery } from "@apollo/client/react";
 import Layout from "../../components/Layout";
 import { Typography } from "antd";
-import { ComponentsDocument } from "../../queries/components.generated";
 import paths from "../../paths";
 import Link from "next/link";
-import { ComponentTable } from "../../components/components/ComponentTable";
-import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
-
-// TODO Pagination. See https://www.apollographql.com/docs/react/pagination/core-api/
-
-function Page() {
-  const { loading, error, data } = useQuery(ComponentsDocument);
-  const nodes = data?.components?.edges?.map((e) => e.node) || [];
-
-  useQueryHandler({ error });
+import PaginatedComponents from "../../components/components/PaginatedComponents";
 
+export default function Page() {
   return (
     <Layout>
-      <Typography.Paragraph style={{ maxWidth: 768 }}>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
         The building envelope components for which{" "}
-        <Link href={paths.data}>data</Link> is available are presented here.
+        <Link href={paths.allData}>data</Link> is available are presented here.
       </Typography.Paragraph>
-      <ComponentTable loading={loading} components={nodes} />
-      <Typography.Paragraph style={{ maxWidth: 768 }}>
+      <PaginatedComponents showJump />
+      <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         provides all information about components.
       </Typography.Paragraph>
     </Layout>
   );
 }
-
-export default Page;
diff --git a/frontend/pages/data-formats/index.tsx b/frontend/pages/data-formats/index.tsx
index 4613cd41c..a075edf69 100644
--- a/frontend/pages/data-formats/index.tsx
+++ b/frontend/pages/data-formats/index.tsx
@@ -1,33 +1,21 @@
-import { useQuery } from "@apollo/client/react";
 import Layout from "../../components/Layout";
 import { Typography } from "antd";
-import { DataFormatsDocument } from "../../queries/dataFormats.generated";
-import Link from "next/link";
 import paths from "../../paths";
-import { DataFormatTable } from "../../components/dataFormats/DataFormatTable";
-import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
-
-// TODO Pagination. See https://www.apollographql.com/docs/react/pagination/core-api/
-
-function Page() {
-  const { loading, error, data } = useQuery(DataFormatsDocument);
-  const nodes = data?.dataFormats?.edges?.map((e) => e.node) || [];
-
-  useQueryHandler({ error });
+import Link from "next/link";
+import PaginatedDataFormats from "../../components/dataFormats/PaginatedDataFormats";
 
+export default function Page() {
   return (
     <Layout>
-      <Typography.Paragraph style={{ maxWidth: 768 }}>
-        <Link href={paths.data}>Data</Link> is shared as resources. Each
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        <Link href={paths.allData}>Data</Link> is shared as resources. Each
         resource has one of the following data formats:
       </Typography.Paragraph>
-      <DataFormatTable loading={loading} dataFormats={nodes} />
-      <Typography.Paragraph style={{ maxWidth: 768 }}>
+      <PaginatedDataFormats showJump />
+      <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         provides all information about data formats.
       </Typography.Paragraph>
     </Layout>
   );
 }
-
-export default Page;
diff --git a/frontend/pages/data/calorimetric.tsx b/frontend/pages/data/calorimetric.tsx
index e5fa8828d..4270b62f3 100644
--- a/frontend/pages/data/calorimetric.tsx
+++ b/frontend/pages/data/calorimetric.tsx
@@ -1,335 +1,22 @@
 import Layout from "../../components/Layout";
-import { Table, Form, Button, Typography, Descriptions } from "antd";
-import {
-  AllCalorimetricDataDocument,
-  CalorimetricDataPartialFragment,
-} from "../../queries/data.generated";
-import {
-  Scalars,
-  CalorimetricDataPropositionInput,
-} from "../../__generated__/graphql";
-import { useState } from "react";
-import { setMapValue } from "../../lib/freeTextFilter";
-import {
-  getAppliedMethodColumnProps,
-  getComponentUuidColumnProps,
-  getDescriptionColumnProps,
-  getNameColumnProps,
-  getResourceTreeColumnProps,
-  getTimestampColumnProps,
-  getUuidColumnProps,
-} from "../../lib/table";
-import {
-  FloatPropositionComparator,
-  FloatPropositionFormList,
-} from "../../components/FloatPropositionFormList";
-import {
-  UuidPropositionComparator,
-  UuidPropositionFormList,
-} from "../../components/UuidPropositionFormList";
-import { useQuery } from "@apollo/client/react";
-import ErrorAlert from "../../components/ErrorAlert";
-
-const layout = {
-  labelCol: { span: 8 },
-  wrapperCol: { span: 16 },
-};
-const tailLayout = {
-  wrapperCol: { offset: 8, span: 16 },
-};
-
-enum Negator {
-  Is = "is",
-  IsNot = "isNot",
-}
-
-const negateIfNecessary = (
-  negator: Negator,
-  proposition: CalorimetricDataPropositionInput,
-): CalorimetricDataPropositionInput => {
-  switch (negator) {
-    case Negator.Is:
-      return proposition;
-    case Negator.IsNot:
-      // return { not: proposition };
-      return proposition; // TODO Support `not` in filter!
-  }
-};
-
-const conjunct = (
-  propositions: CalorimetricDataPropositionInput[],
-): CalorimetricDataPropositionInput => {
-  if (propositions.length == 0) {
-    return {};
-  }
-  if (propositions.length == 1) {
-    return propositions[0];
-  }
-  return { and: propositions };
-};
-
-// const disjunct = (
-//   propositions: CalorimetricDataPropositionInput[]
-// ): CalorimetricDataPropositionInput => {
-//   if (propositions.length == 0) {
-//     return {};
-//   }
-//   if (propositions.length == 1) {
-//     return propositions[0];
-//   }
-//   return { or: propositions };
-// };
-
-function Page() {
-  const [form] = Form.useForm();
-  const [filtering, setFiltering] = useState(false);
-  const [globalErrorMessages, setGlobalErrorMessages] = useState(
-    new Array<string>(),
-  );
-  const [data, setData] = useState<CalorimetricDataPartialFragment[]>([]);
-  // Using `skip` is inspired by https://github.com/apollographql/apollo-client/issues/5268#issuecomment-749501801
-  // An alternative would be `useLazy...` as told in https://github.com/apollographql/apollo-client/issues/5268#issuecomment-527727653
-  // `useLazy...` does not return a `Promise` though as `use...Query.refetch` does which is used below.
-  // For error policies see https://www.apollographql.com/docs/react/v2/data/error-handling/#error-policies
-  const allCalorimetricDataQuery = useQuery(AllCalorimetricDataDocument, {
-    skip: true,
-    errorPolicy: "all",
-  });
-
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
-
-  const onFinish = ({
-    componentIds,
-    gValues,
-    uValues,
-    dataFormatIds,
-  }: {
-    componentIds:
-      | {
-          negator: Negator;
-          comparator: UuidPropositionComparator;
-          value: Scalars["Uuid"] | undefined;
-        }[]
-      | undefined;
-    dataFormatIds:
-      | {
-          negator: Negator;
-          comparator: UuidPropositionComparator;
-          value: Scalars["Uuid"] | undefined;
-        }[]
-      | undefined;
-    gValues:
-      | {
-          negator: Negator;
-          comparator: FloatPropositionComparator;
-          value: number | undefined;
-        }[]
-      | undefined;
-    uValues:
-      | {
-          negator: Negator;
-          comparator: FloatPropositionComparator;
-          value: number | undefined;
-        }[]
-      | undefined;
-  }) => {
-    const filter = async () => {
-      try {
-        setFiltering(true);
-        // https://www.apollographql.com/docs/react/networking/authentication/#reset-store-on-logout
-        const propositions: CalorimetricDataPropositionInput[] = [];
-        if (componentIds) {
-          for (let { negator, comparator, value } of componentIds) {
-            propositions.push(
-              negateIfNecessary(negator, {
-                componentId: { [comparator]: value },
-              }),
-            );
-          }
-        }
-        if (dataFormatIds) {
-          for (let { negator, comparator, value } of dataFormatIds) {
-            propositions.push(
-              negateIfNecessary(negator, {
-                resources: {
-                  some: {
-                    dataFormatId: { [comparator]: value },
-                  },
-                },
-              }),
-            );
-          }
-        }
-        // Note that `0` evaluates to `false`, so below we cannot use
-        // `if (value)`.
-        if (gValues) {
-          for (let { negator, comparator, value } of gValues) {
-            if (value !== undefined && value !== null) {
-              propositions.push(
-                negateIfNecessary(negator, {
-                  gValues: {
-                    some: {
-                      [comparator]: value,
-                    },
-                  },
-                }),
-              );
-            }
-          }
-        }
-        if (uValues) {
-          for (let { negator, comparator, value } of uValues) {
-            if (value !== undefined && value !== null) {
-              propositions.push(
-                negateIfNecessary(negator, {
-                  uValues: {
-                    some: {
-                      [comparator]: value,
-                    },
-                  },
-                }),
-              );
-            }
-          }
-        }
-        const { error, data } = await allCalorimetricDataQuery.refetch(
-          propositions.length == 0
-            ? {}
-            : {
-                where: conjunct(propositions),
-              },
-        );
-        if (error) {
-          // TODO Handle properly.
-          console.log(error);
-        }
-        const nestedData =
-          data?.databases?.edges?.map(
-            (edge) =>
-              edge?.node?.allCalorimetricData?.edges?.map((e) => e.node) || [],
-          ) || [];
-        const flatData = ([] as CalorimetricDataPartialFragment[]).concat(
-          ...nestedData,
-        );
-        setData(flatData);
-      } catch (error) {
-        // TODO Handle properly.
-        console.log("Failed:", error);
-      } finally {
-        setFiltering(false);
-      }
-    };
-    filter();
-  };
-
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
+import { Typography } from "antd";
+import Link from "next/link";
+import paths from "../../paths";
+import PaginatedCalorimetricData from "../../components/data/calorimetric/PaginatedCalorimetricData";
 
+export default function Page() {
   return (
     <Layout>
-      <Typography.Title>Calorimetric Data</Typography.Title>
-      <ErrorAlert messages={globalErrorMessages} />
-      <Form
-        {...layout}
-        form={form}
-        name="filterData"
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
-      >
-        <UuidPropositionFormList name="componentIds" label="Component Id" />
-        <UuidPropositionFormList name="dataFormatIds" label="Data Format Id" />
-        <FloatPropositionFormList
-          name="gValues"
-          label="g Value"
-          minimum={0}
-          maximum={1}
-        />
-        <FloatPropositionFormList
-          name="uValues"
-          label="u Value"
-          minimum={0}
-          maximum={1}
-        />
-
-        <Form.Item {...tailLayout}>
-          <Button type="primary" htmlType="submit" loading={filtering}>
-            Filter
-          </Button>
-        </Form.Item>
-      </Form>
-      <Table
-        loading={filtering}
-        columns={[
-          {
-            ...getUuidColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-              (_uuid) => "/", // TODO Link somewhere useful!
-            ),
-          },
-          {
-            ...getNameColumnProps<(typeof data)[0]>(onFilterTextChange, (x) =>
-              filterText.get(x),
-            ),
-          },
-          {
-            ...getDescriptionColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getTimestampColumnProps<(typeof data)[0]>(),
-          },
-          {
-            ...getComponentUuidColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          // {
-          //   ...getInternallyLinkedFilterableStringColumnProps<typeof data[0]>(
-          //     "Database UUID",
-          //     "databaseId",
-          //     (x) => x.databaseId,
-          //     onFilterTextChange,
-          //     (x) => filterText.get(x),
-          //     (x) => paths.database(x.databaseId)
-          //   ),
-          // },
-          {
-            ...getAppliedMethodColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getResourceTreeColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            title: "g and u Values",
-            key: "g-and-u-values",
-            render: (_text, record, _index) => (
-              <Descriptions column={1}>
-                <Descriptions.Item key="gValues" label="g Values">
-                  {record.gValues.map((x) => x.toLocaleString("en")).join(", ")}
-                </Descriptions.Item>
-                <Descriptions.Item key="uValues" label="u Values">
-                  {record.uValues.map((x) => x.toLocaleString("en")).join(", ")}
-                </Descriptions.Item>
-              </Descriptions>
-            ),
-          },
-        ]}
-        dataSource={data}
-      />
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        The network of <Link href={paths.databases}>databases</Link> can be
+        queried here for data on building envelope{" "}
+        <Link href={paths.components}>components</Link>.
+      </Typography.Paragraph>
+      <PaginatedCalorimetricData />
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
+        is the most powerful way of querying the databases.
+      </Typography.Paragraph>
     </Layout>
   );
 }
-
-export default Page;
diff --git a/frontend/pages/data/geometric.tsx b/frontend/pages/data/geometric.tsx
index 0d366ac96..96a250319 100644
--- a/frontend/pages/data/geometric.tsx
+++ b/frontend/pages/data/geometric.tsx
@@ -1,271 +1,22 @@
 import Layout from "../../components/Layout";
-import { Table, Form, Button, Typography, Descriptions } from "antd";
-import {
-  AllGeometricDataDocument,
-  GeometricDataPartialFragment,
-} from "../../queries/data.generated";
-import {
-  Scalars,
-  GeometricDataPropositionInput,
-} from "../../__generated__/graphql";
-import { useState } from "react";
-import { setMapValue } from "../../lib/freeTextFilter";
-import {
-  getAppliedMethodColumnProps,
-  getComponentUuidColumnProps,
-  getDescriptionColumnProps,
-  getNameColumnProps,
-  getResourceTreeColumnProps,
-  getTimestampColumnProps,
-  getUuidColumnProps,
-} from "../../lib/table";
-import {
-  FloatPropositionComparator,
-  FloatPropositionFormList,
-} from "../../components/FloatPropositionFormList";
-import {
-  UuidPropositionComparator,
-  UuidPropositionFormList,
-} from "../../components/UuidPropositionFormList";
-import { useQuery } from "@apollo/client/react";
-import ErrorAlert from "../../components/ErrorAlert";
+import { Typography } from "antd";
+import Link from "next/link";
+import paths from "../../paths";
+import PaginatedGeometricData from "../../components/data/geometric/PaginatedGeometricData";
 
-const layout = {
-  labelCol: { span: 8 },
-  wrapperCol: { span: 16 },
-};
-const tailLayout = {
-  wrapperCol: { offset: 8, span: 16 },
-};
-
-enum Negator {
-  Is = "is",
-  IsNot = "isNot",
-}
-
-const negateIfNecessary = (
-  negator: Negator,
-  proposition: GeometricDataPropositionInput,
-): GeometricDataPropositionInput => {
-  switch (negator) {
-    case Negator.Is:
-      return proposition;
-    case Negator.IsNot:
-      return proposition;
-  }
-};
-
-const conjunct = (
-  propositions: GeometricDataPropositionInput[],
-): GeometricDataPropositionInput => {
-  if (propositions.length == 0) {
-    return {};
-  }
-  if (propositions.length == 1) {
-    return propositions[0];
-  }
-  return { and: propositions };
-};
-
-function Page() {
-  const [form] = Form.useForm();
-  const [filtering, setFiltering] = useState(false);
-  const [globalErrorMessages, setGlobalErrorMessages] = useState(
-    new Array<string>(),
-  );
-  const [data, setData] = useState<GeometricDataPartialFragment[]>([]);
-
-  const allGeometricDataQuery = useQuery(AllGeometricDataDocument, {
-    skip: true,
-    errorPolicy: "all",
-  });
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
-
-  const onFinish = ({
-    componentIds,
-    thicknesses,
-    dataFormatIds,
-  }: {
-    componentIds:
-      | {
-          negator: Negator;
-          comparator: UuidPropositionComparator;
-          value: Scalars["Uuid"] | undefined;
-        }[]
-      | undefined;
-    dataFormatIds:
-      | {
-          negator: Negator;
-          comparator: UuidPropositionComparator;
-          value: Scalars["Uuid"] | undefined;
-        }[]
-      | undefined;
-    thicknesses:
-      | {
-          negator: Negator;
-          comparator: FloatPropositionComparator;
-          value: number | undefined;
-        }[]
-      | undefined;
-  }) => {
-    const filter = async () => {
-      try {
-        setFiltering(true);
-        const propositions: GeometricDataPropositionInput[] = [];
-        if (componentIds) {
-          for (let { negator, comparator, value } of componentIds) {
-            propositions.push(
-              negateIfNecessary(negator, {
-                componentId: { [comparator]: value },
-              }),
-            );
-          }
-        }
-        if (dataFormatIds) {
-          for (let { negator, comparator, value } of dataFormatIds) {
-            propositions.push(
-              negateIfNecessary(negator, {
-                resources: {
-                  some: {
-                    dataFormatId: { [comparator]: value },
-                  },
-                },
-              }),
-            );
-          }
-        }
-        if (thicknesses) {
-          for (let { negator, comparator, value } of thicknesses) {
-            if (value !== undefined && value !== null) {
-              propositions.push(
-                negateIfNecessary(negator, {
-                  thicknesses: {
-                    some: {
-                      [comparator]: value,
-                    },
-                  },
-                }),
-              );
-            }
-          }
-        }
-        const { error, data } = await allGeometricDataQuery.refetch(
-          propositions.length == 0
-            ? {}
-            : {
-                where: conjunct(propositions),
-              },
-        );
-        if (error) {
-          console.log(error);
-        }
-        const nestedData =
-          data?.databases?.edges?.map(
-            (edge) =>
-              edge?.node?.allGeometricData?.edges?.map((e) => e.node) || [],
-          ) || [];
-        const flatData = ([] as GeometricDataPartialFragment[]).concat(
-          ...nestedData,
-        );
-        setData(flatData);
-      } catch (error) {
-        console.log("Failed:", error);
-      } finally {
-        setFiltering(false);
-      }
-    };
-    filter();
-  };
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
+export default function Page() {
   return (
     <Layout>
-      <Typography.Title>Geometric Data</Typography.Title>
-      <ErrorAlert messages={globalErrorMessages} />
-      <Form
-        {...layout}
-        form={form}
-        name="filterData"
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
-      >
-        <UuidPropositionFormList name="componentIds" label="Component Id" />
-        <UuidPropositionFormList name="dataFormatIds" label="Data Format Id" />
-        <FloatPropositionFormList
-          name="thicknesses"
-          label="Thickness"
-          minimum={0}
-          maximum={Infinity}
-        />
-
-        <Form.Item {...tailLayout}>
-          <Button type="primary" htmlType="submit" loading={filtering}>
-            Filter
-          </Button>
-        </Form.Item>
-      </Form>
-      <Table
-        loading={filtering}
-        columns={[
-          {
-            ...getUuidColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-              (_uuid) => "/",
-            ),
-          },
-          {
-            ...getNameColumnProps<(typeof data)[0]>(onFilterTextChange, (x) =>
-              filterText.get(x),
-            ),
-          },
-          {
-            ...getDescriptionColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getTimestampColumnProps<(typeof data)[0]>(),
-          },
-          {
-            ...getComponentUuidColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getAppliedMethodColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getResourceTreeColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            title: "Thicknesses",
-            key: "thicknesses",
-            render: (_text, record, _index) => (
-              <Descriptions column={1}>
-                <Descriptions.Item key="thicknesses" label="Thicknesses">
-                  {record.thicknesses
-                    .map((x) => x.toLocaleString("en"))
-                    .join(", ")}
-                </Descriptions.Item>
-              </Descriptions>
-            ),
-          },
-        ]}
-        dataSource={data}
-      />
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        The network of <Link href={paths.databases}>databases</Link> can be
+        queried here for data on building envelope{" "}
+        <Link href={paths.components}>components</Link>.
+      </Typography.Paragraph>
+      <PaginatedGeometricData />
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
+        is the most powerful way of querying the databases.
+      </Typography.Paragraph>
     </Layout>
   );
 }
-
-export default Page;
diff --git a/frontend/pages/data/hygrothermal.tsx b/frontend/pages/data/hygrothermal.tsx
index a8c625e36..1312c0c62 100644
--- a/frontend/pages/data/hygrothermal.tsx
+++ b/frontend/pages/data/hygrothermal.tsx
@@ -1,257 +1,22 @@
 import Layout from "../../components/Layout";
-import { Table, Form, Button, Typography } from "antd";
-import {
-  AllHygrothermalDataDocument,
-  HygrothermalDataPartialFragment,
-} from "../../queries/data.generated";
-import {
-  Scalars,
-  HygrothermalDataPropositionInput,
-} from "../../__generated__/graphql";
-import { useState } from "react";
-import { setMapValue } from "../../lib/freeTextFilter";
-import {
-  getAppliedMethodColumnProps,
-  getComponentUuidColumnProps,
-  getDescriptionColumnProps,
-  getNameColumnProps,
-  getResourceTreeColumnProps,
-  getTimestampColumnProps,
-  getUuidColumnProps,
-} from "../../lib/table";
-import {
-  UuidPropositionComparator,
-  UuidPropositionFormList,
-} from "../../components/UuidPropositionFormList";
-import { useQuery } from "@apollo/client/react";
-import ErrorAlert from "../../components/ErrorAlert";
-
-const layout = {
-  labelCol: { span: 8 },
-  wrapperCol: { span: 16 },
-};
-const tailLayout = {
-  wrapperCol: { offset: 8, span: 16 },
-};
-
-enum Negator {
-  Is = "is",
-  IsNot = "isNot",
-}
-
-const negateIfNecessary = (
-  negator: Negator,
-  proposition: HygrothermalDataPropositionInput,
-): HygrothermalDataPropositionInput => {
-  switch (negator) {
-    case Negator.Is:
-      return proposition;
-    case Negator.IsNot:
-      // return { not: proposition };
-      return proposition; // TODO Support `not` in filter!
-  }
-};
-
-const conjunct = (
-  propositions: HygrothermalDataPropositionInput[],
-): HygrothermalDataPropositionInput => {
-  if (propositions.length == 0) {
-    return {};
-  }
-  if (propositions.length == 1) {
-    return propositions[0];
-  }
-  return { and: propositions };
-};
-
-// const disjunct = (
-//   propositions: HygrothermalDataPropositionInput[]
-// ): HygrothermalDataPropositionInput => {
-//   if (propositions.length == 0) {
-//     return {};
-//   }
-//   if (propositions.length == 1) {
-//     return propositions[0];
-//   }
-//   return { or: propositions };
-// };
-
-function Page() {
-  const [form] = Form.useForm();
-  const [filtering, setFiltering] = useState(false);
-  const [globalErrorMessages, setGlobalErrorMessages] = useState(
-    new Array<string>(),
-  );
-  const [data, setData] = useState<HygrothermalDataPartialFragment[]>([]);
-  // Using `skip` is inspired by https://github.com/apollographql/apollo-client/issues/5268#issuecomment-749501801
-  // An alternative would be `useLazy...` as told in https://github.com/apollographql/apollo-client/issues/5268#issuecomment-527727653
-  // `useLazy...` does not return a `Promise` though as `use...Query.refetch` does which is used below.
-  // For error policies see https://www.apollographql.com/docs/react/v2/data/error-handling/#error-policies
-  const allHygrothermalDataQuery = useQuery(AllHygrothermalDataDocument, {
-    skip: true,
-    errorPolicy: "all",
-  });
-
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
-
-  const onFinish = ({
-    componentIds,
-    dataFormatIds,
-  }: {
-    componentIds:
-      | {
-          negator: Negator;
-          comparator: UuidPropositionComparator;
-          value: Scalars["Uuid"] | undefined;
-        }[]
-      | undefined;
-    dataFormatIds:
-      | {
-          negator: Negator;
-          comparator: UuidPropositionComparator;
-          value: Scalars["Uuid"] | undefined;
-        }[]
-      | undefined;
-  }) => {
-    const filter = async () => {
-      try {
-        setFiltering(true);
-        // https://www.apollographql.com/docs/react/networking/authentication/#reset-store-on-logout
-        const propositions: HygrothermalDataPropositionInput[] = [];
-        if (componentIds) {
-          for (let { negator, comparator, value } of componentIds) {
-            propositions.push(
-              negateIfNecessary(negator, {
-                componentId: { [comparator]: value },
-              }),
-            );
-          }
-        }
-        if (dataFormatIds) {
-          for (let { negator, comparator, value } of dataFormatIds) {
-            propositions.push(
-              negateIfNecessary(negator, {
-                resources: {
-                  some: {
-                    dataFormatId: { [comparator]: value },
-                  },
-                },
-              }),
-            );
-          }
-        }
-        const { error, data } = await allHygrothermalDataQuery.refetch(
-          propositions.length == 0
-            ? {}
-            : {
-                where: conjunct(propositions),
-              },
-        );
-        if (error) {
-          // TODO Handle properly.
-          console.log(error);
-        }
-        const nestedData =
-          data?.databases?.edges?.map(
-            (edge) =>
-              edge?.node?.allHygrothermalData?.edges?.map((e) => e.node) || [],
-          ) || [];
-        const flatData = ([] as HygrothermalDataPartialFragment[]).concat(
-          ...nestedData,
-        );
-        setData(flatData);
-      } catch (error) {
-        // TODO Handle properly.
-        console.log("Failed:", error);
-      } finally {
-        setFiltering(false);
-      }
-    };
-    filter();
-  };
-
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
+import { Typography } from "antd";
+import Link from "next/link";
+import paths from "../../paths";
+import PaginatedHygrothermalData from "../../components/data/hygrothermal/PaginatedHygrothermalData";
 
+export default function Page() {
   return (
     <Layout>
-      <Typography.Title>Hygrothermal Data</Typography.Title>
-      <ErrorAlert messages={globalErrorMessages} />
-      <Form
-        {...layout}
-        form={form}
-        name="filterData"
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
-      >
-        <UuidPropositionFormList name="componentIds" label="Component Id" />
-        <UuidPropositionFormList name="dataFormatIds" label="Data Format Id" />
-
-        <Form.Item {...tailLayout}>
-          <Button type="primary" htmlType="submit" loading={filtering}>
-            Filter
-          </Button>
-        </Form.Item>
-      </Form>
-      <Table
-        loading={filtering}
-        columns={[
-          {
-            ...getUuidColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-              (_uuid) => "/", // TODO Link somewhere useful!
-            ),
-          },
-          {
-            ...getNameColumnProps<(typeof data)[0]>(onFilterTextChange, (x) =>
-              filterText.get(x),
-            ),
-          },
-          {
-            ...getDescriptionColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getTimestampColumnProps<(typeof data)[0]>(),
-          },
-          {
-            ...getComponentUuidColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          // {
-          //   ...getInternallyLinkedFilterableStringColumnProps<typeof data[0]>(
-          //     "Database UUID",
-          //     "databaseId",
-          //     (x) => x.databaseId,
-          //     onFilterTextChange,
-          //     (x) => filterText.get(x),
-          //     (x) => paths.database(x.databaseId)
-          //   ),
-          // },
-          {
-            ...getAppliedMethodColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getResourceTreeColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-        ]}
-        dataSource={data}
-      />
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        The network of <Link href={paths.databases}>databases</Link> can be
+        queried here for data on building envelope{" "}
+        <Link href={paths.components}>components</Link>.
+      </Typography.Paragraph>
+      <PaginatedHygrothermalData />
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
+        is the most powerful way of querying the databases.
+      </Typography.Paragraph>
     </Layout>
   );
 }
-
-export default Page;
diff --git a/frontend/pages/data/index.tsx b/frontend/pages/data/index.tsx
index 3c79de37a..addf8b7a4 100644
--- a/frontend/pages/data/index.tsx
+++ b/frontend/pages/data/index.tsx
@@ -1,31 +1,31 @@
 import Layout from "../../components/Layout";
-import { Flex, List } from "antd";
+import { Flex } from "antd";
 import paths from "../../paths";
 import Link from "next/link";
 
 const navItems = [
   {
-    path: paths.calorimetricData,
+    path: paths.allCalorimetricData,
     label: "Calorimetric Data",
   },
   {
-    path: paths.geometricData,
+    path: paths.allGeometricData,
     label: "Geometric Data",
   },
   {
-    path: paths.hygrothermalData,
+    path: paths.allHygrothermalData,
     label: "Hygrothermal Data",
   },
   {
-    path: paths.lifeCycleData,
+    path: paths.allLifeCycleData,
     label: "Life-Cycle Data",
   },
   {
-    path: paths.opticalData,
+    path: paths.allOpticalData,
     label: "Optical Data",
   },
   {
-    path: paths.photovoltaicData,
+    path: paths.allPhotovoltaicData,
     label: "Photovoltaic Data",
   },
 ];
@@ -33,18 +33,12 @@ const navItems = [
 function Page() {
   return (
     <Layout>
-      <Flex justify="center">
-        <div style={{ maxWidth: 768 }}>
-          <List
-            bordered
-            dataSource={navItems}
-            renderItem={(item) => (
-              <List.Item>
-                <Link href={item.path}>{item.label}</Link>
-              </List.Item>
-            )}
-          />
-        </div>
+      <Flex justify="center" gap="medium">
+        {navItems.map((item) => (
+          <Link key={item.path} href={item.path}>
+            {item.label}
+          </Link>
+        ))}
       </Flex>
     </Layout>
   );
diff --git a/frontend/pages/data/life-cycle.tsx b/frontend/pages/data/life-cycle.tsx
index f811049b4..3205d471e 100644
--- a/frontend/pages/data/life-cycle.tsx
+++ b/frontend/pages/data/life-cycle.tsx
@@ -1,257 +1,22 @@
 import Layout from "../../components/Layout";
-import { Table, Form, Button, Typography } from "antd";
-import {
-  AllLifeCycleDataDocument,
-  LifeCycleDataPartialFragment,
-} from "../../queries/data.generated";
-import {
-  Scalars,
-  LifeCycleDataPropositionInput,
-} from "../../__generated__/graphql";
-import { useState } from "react";
-import { setMapValue } from "../../lib/freeTextFilter";
-import {
-  getAppliedMethodColumnProps,
-  getComponentUuidColumnProps,
-  getDescriptionColumnProps,
-  getNameColumnProps,
-  getResourceTreeColumnProps,
-  getTimestampColumnProps,
-  getUuidColumnProps,
-} from "../../lib/table";
-import {
-  UuidPropositionComparator,
-  UuidPropositionFormList,
-} from "../../components/UuidPropositionFormList";
-import { useQuery } from "@apollo/client/react";
-import ErrorAlert from "../../components/ErrorAlert";
-
-const layout = {
-  labelCol: { span: 8 },
-  wrapperCol: { span: 16 },
-};
-const tailLayout = {
-  wrapperCol: { offset: 8, span: 16 },
-};
-
-enum Negator {
-  Is = "is",
-  IsNot = "isNot",
-}
-
-const negateIfNecessary = (
-  negator: Negator,
-  proposition: LifeCycleDataPropositionInput,
-): LifeCycleDataPropositionInput => {
-  switch (negator) {
-    case Negator.Is:
-      return proposition;
-    case Negator.IsNot:
-      // return { not: proposition };
-      return proposition; // TODO Support `not` in filter!
-  }
-};
-
-const conjunct = (
-  propositions: LifeCycleDataPropositionInput[],
-): LifeCycleDataPropositionInput => {
-  if (propositions.length == 0) {
-    return {};
-  }
-  if (propositions.length == 1) {
-    return propositions[0];
-  }
-  return { and: propositions };
-};
-
-// const disjunct = (
-//   propositions: LifeCycleDataPropositionInput[]
-// ): LifeCycleDataPropositionInput => {
-//   if (propositions.length == 0) {
-//     return {};
-//   }
-//   if (propositions.length == 1) {
-//     return propositions[0];
-//   }
-//   return { or: propositions };
-// };
-
-function Page() {
-  const [form] = Form.useForm();
-  const [filtering, setFiltering] = useState(false);
-  const [globalErrorMessages, setGlobalErrorMessages] = useState(
-    new Array<string>(),
-  );
-  const [data, setData] = useState<LifeCycleDataPartialFragment[]>([]);
-  // Using `skip` is inspired by https://github.com/apollographql/apollo-client/issues/5268#issuecomment-749501801
-  // An alternative would be `useLazy...` as told in https://github.com/apollographql/apollo-client/issues/5268#issuecomment-527727653
-  // `useLazy...` does not return a `Promise` though as `use...Query.refetch` does which is used below.
-  // For error policies see https://www.apollographql.com/docs/react/v2/data/error-handling/#error-policies
-  const allLifeCycleDataQuery = useQuery(AllLifeCycleDataDocument, {
-    skip: true,
-    errorPolicy: "all",
-  });
-
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
-
-  const onFinish = ({
-    componentIds,
-    dataFormatIds,
-  }: {
-    componentIds:
-      | {
-          negator: Negator;
-          comparator: UuidPropositionComparator;
-          value: Scalars["Uuid"] | undefined;
-        }[]
-      | undefined;
-    dataFormatIds:
-      | {
-          negator: Negator;
-          comparator: UuidPropositionComparator;
-          value: Scalars["Uuid"] | undefined;
-        }[]
-      | undefined;
-  }) => {
-    const filter = async () => {
-      try {
-        setFiltering(true);
-        // https://www.apollographql.com/docs/react/networking/authentication/#reset-store-on-logout
-        const propositions: LifeCycleDataPropositionInput[] = [];
-        if (componentIds) {
-          for (let { negator, comparator, value } of componentIds) {
-            propositions.push(
-              negateIfNecessary(negator, {
-                componentId: { [comparator]: value },
-              }),
-            );
-          }
-        }
-        if (dataFormatIds) {
-          for (let { negator, comparator, value } of dataFormatIds) {
-            propositions.push(
-              negateIfNecessary(negator, {
-                resources: {
-                  some: {
-                    dataFormatId: { [comparator]: value },
-                  },
-                },
-              }),
-            );
-          }
-        }
-        const { error, data } = await allLifeCycleDataQuery.refetch(
-          propositions.length == 0
-            ? {}
-            : {
-                where: conjunct(propositions),
-              },
-        );
-        if (error) {
-          // TODO Handle properly.
-          console.log(error);
-        }
-        const nestedData =
-          data?.databases?.edges?.map(
-            (edge) =>
-              edge?.node?.allLifeCycleData?.edges?.map((e) => e.node) || [],
-          ) || [];
-        const flatData = ([] as LifeCycleDataPartialFragment[]).concat(
-          ...nestedData,
-        );
-        setData(flatData);
-      } catch (error) {
-        // TODO Handle properly.
-        console.log("Failed:", error);
-      } finally {
-        setFiltering(false);
-      }
-    };
-    filter();
-  };
-
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
+import { Typography } from "antd";
+import Link from "next/link";
+import paths from "../../paths";
+import PaginatedLifeCycleData from "../../components/data/lifeCycle/PaginatedLifeCycleData";
 
+export default function Page() {
   return (
     <Layout>
-      <Typography.Title>Life-Cycle Data</Typography.Title>
-      <ErrorAlert messages={globalErrorMessages} />
-      <Form
-        {...layout}
-        form={form}
-        name="filterData"
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
-      >
-        <UuidPropositionFormList name="componentIds" label="Component Id" />
-        <UuidPropositionFormList name="dataFormatIds" label="Data Format Id" />
-
-        <Form.Item {...tailLayout}>
-          <Button type="primary" htmlType="submit" loading={filtering}>
-            Filter
-          </Button>
-        </Form.Item>
-      </Form>
-      <Table
-        loading={filtering}
-        columns={[
-          {
-            ...getUuidColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-              (_uuid) => "/", // TODO Link somewhere useful!
-            ),
-          },
-          {
-            ...getNameColumnProps<(typeof data)[0]>(onFilterTextChange, (x) =>
-              filterText.get(x),
-            ),
-          },
-          {
-            ...getDescriptionColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getTimestampColumnProps<(typeof data)[0]>(),
-          },
-          {
-            ...getComponentUuidColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          // {
-          //   ...getInternallyLinkedFilterableStringColumnProps<typeof data[0]>(
-          //     "Database UUID",
-          //     "databaseId",
-          //     (x) => x.databaseId,
-          //     onFilterTextChange,
-          //     (x) => filterText.get(x),
-          //     (x) => paths.database(x.databaseId)
-          //   ),
-          // },
-          {
-            ...getAppliedMethodColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getResourceTreeColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-        ]}
-        dataSource={data}
-      />
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        The network of <Link href={paths.databases}>databases</Link> can be
+        queried here for data on building envelope{" "}
+        <Link href={paths.components}>components</Link>.
+      </Typography.Paragraph>
+      <PaginatedLifeCycleData />
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
+        is the most powerful way of querying the databases.
+      </Typography.Paragraph>
     </Layout>
   );
 }
-
-export default Page;
diff --git a/frontend/pages/data/optical.tsx b/frontend/pages/data/optical.tsx
index 18803ff73..4ba482d08 100644
--- a/frontend/pages/data/optical.tsx
+++ b/frontend/pages/data/optical.tsx
@@ -1,483 +1,22 @@
 import Layout from "../../components/Layout";
-import { Table, Form, Button, Typography, Descriptions } from "antd";
-import {
-  AllOpticalDataDocument,
-  OpticalDataPartialFragment,
-} from "../../queries/data.generated";
-import {
-  Scalars,
-  OpticalDataPropositionInput,
-} from "../../__generated__/graphql";
-import { useState } from "react";
+import { Typography } from "antd";
 import Link from "next/link";
 import paths from "../../paths";
-import { setMapValue } from "../../lib/freeTextFilter";
-import {
-  getAppliedMethodColumnProps,
-  getComponentUuidColumnProps,
-  getDescriptionColumnProps,
-  getNameColumnProps,
-  getResourceTreeColumnProps,
-  getTimestampColumnProps,
-  getUuidColumnProps,
-} from "../../lib/table";
-import {
-  FloatPropositionComparator,
-  FloatPropositionFormList,
-} from "../../components/FloatPropositionFormList";
-import {
-  UuidPropositionComparator,
-  UuidPropositionFormList,
-} from "../../components/UuidPropositionFormList";
-import { useQuery } from "@apollo/client/react";
-import ErrorAlert from "../../components/ErrorAlert";
-
-const layout = {
-  labelCol: { span: 8 },
-  wrapperCol: { span: 16 },
-};
-const tailLayout = {
-  wrapperCol: { offset: 8, span: 16 },
-};
-
-enum Negator {
-  Is = "is",
-  IsNot = "isNot",
-}
-
-const negateIfNecessary = (
-  negator: Negator,
-  proposition: OpticalDataPropositionInput,
-): OpticalDataPropositionInput => {
-  switch (negator) {
-    case Negator.Is:
-      return proposition;
-    case Negator.IsNot:
-      return { not: proposition };
-  }
-};
-
-const conjunct = (
-  propositions: OpticalDataPropositionInput[],
-): OpticalDataPropositionInput => {
-  if (propositions.length == 0) {
-    return {};
-  }
-  if (propositions.length == 1) {
-    return propositions[0];
-  }
-  return { and: propositions };
-};
-
-// const disjunct = (
-//   propositions: OpticalDataPropositionInput[]
-// ): OpticalDataPropositionInput => {
-//   if (propositions.length == 0) {
-//     return {};
-//   }
-//   if (propositions.length == 1) {
-//     return propositions[0];
-//   }
-//   return { or: propositions };
-// };
-
-function Page() {
-  const [form] = Form.useForm();
-  const [filtering, setFiltering] = useState(false);
-  const [globalErrorMessages, setGlobalErrorMessages] = useState(
-    new Array<string>(),
-  );
-  const [data, setData] = useState<OpticalDataPartialFragment[]>([]);
-  // Using `skip` is inspired by https://github.com/apollographql/apollo-client/issues/5268#issuecomment-749501801
-  // An alternative would be `useLazy...` as told in https://github.com/apollographql/apollo-client/issues/5268#issuecomment-527727653
-  // `useLazy...` does not return a `Promise` though as `use...Query.refetch` does which is used below.
-  // For error policies see https://www.apollographql.com/docs/react/v2/data/error-handling/#error-policies
-  const allOpticalDataQuery = useQuery(AllOpticalDataDocument, {
-    skip: true,
-    errorPolicy: "all",
-  });
-
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
-
-  const onFinish = ({
-    componentIds,
-    dataFormatIds,
-    infraredEmittances,
-    nearnormalHemisphericalSolarReflectances,
-    nearnormalHemisphericalSolarTransmittances,
-    nearnormalHemisphericalVisibleReflectances,
-    nearnormalHemisphericalVisibleTransmittances,
-  }: {
-    componentIds:
-      | {
-          negator: Negator;
-          comparator: UuidPropositionComparator;
-          value: Scalars["Uuid"] | undefined;
-        }[]
-      | undefined;
-    dataFormatIds:
-      | {
-          negator: Negator;
-          comparator: UuidPropositionComparator;
-          value: Scalars["Uuid"] | undefined;
-        }[]
-      | undefined;
-    infraredEmittances:
-      | {
-          negator: Negator;
-          comparator: FloatPropositionComparator;
-          value: number | undefined;
-        }[]
-      | undefined;
-    nearnormalHemisphericalSolarReflectances:
-      | {
-          negator: Negator;
-          comparator: FloatPropositionComparator;
-          value: number | undefined;
-        }[]
-      | undefined;
-    nearnormalHemisphericalSolarTransmittances:
-      | {
-          negator: Negator;
-          comparator: FloatPropositionComparator;
-          value: number | undefined;
-        }[]
-      | undefined;
-    nearnormalHemisphericalVisibleReflectances:
-      | {
-          negator: Negator;
-          comparator: FloatPropositionComparator;
-          value: number | undefined;
-        }[]
-      | undefined;
-    nearnormalHemisphericalVisibleTransmittances:
-      | {
-          negator: Negator;
-          comparator: FloatPropositionComparator;
-          value: number | undefined;
-        }[]
-      | undefined;
-  }) => {
-    const filter = async () => {
-      try {
-        setFiltering(true);
-        // https://www.apollographql.com/docs/react/networking/authentication/#reset-store-on-logout
-        const propositions: OpticalDataPropositionInput[] = [];
-        if (componentIds) {
-          for (let { negator, comparator, value } of componentIds) {
-            propositions.push(
-              negateIfNecessary(negator, {
-                componentId: { [comparator]: value },
-              }),
-            );
-          }
-        }
-        if (dataFormatIds) {
-          for (let { negator, comparator, value } of dataFormatIds) {
-            propositions.push(
-              negateIfNecessary(negator, {
-                resources: {
-                  some: {
-                    dataFormatId: { [comparator]: value },
-                  },
-                },
-              }),
-            );
-          }
-        }
-        // Note that `0` evaluates to `false`, so below we cannot use
-        // `if (nearnormalHemisphericalVisibleTransmittance)`.
-        if (infraredEmittances) {
-          for (let { negator, comparator, value } of infraredEmittances) {
-            if (value !== undefined && value !== null) {
-              propositions.push(
-                negateIfNecessary(negator, {
-                  infraredEmittances: {
-                    some: {
-                      [comparator]: value,
-                    },
-                  },
-                }),
-              );
-            }
-          }
-        }
-        if (nearnormalHemisphericalSolarReflectances) {
-          for (let {
-            negator,
-            comparator,
-            value,
-          } of nearnormalHemisphericalSolarReflectances) {
-            if (value !== undefined && value !== null) {
-              propositions.push(
-                negateIfNecessary(negator, {
-                  nearnormalHemisphericalSolarReflectances: {
-                    some: {
-                      [comparator]: value,
-                    },
-                  },
-                }),
-              );
-            }
-          }
-        }
-        if (nearnormalHemisphericalSolarTransmittances) {
-          for (let {
-            negator,
-            comparator,
-            value,
-          } of nearnormalHemisphericalSolarTransmittances) {
-            if (value !== undefined && value !== null) {
-              propositions.push(
-                negateIfNecessary(negator, {
-                  nearnormalHemisphericalSolarTransmittances: {
-                    some: {
-                      [comparator]: value,
-                    },
-                  },
-                }),
-              );
-            }
-          }
-        }
-        if (nearnormalHemisphericalVisibleReflectances) {
-          for (let {
-            negator,
-            comparator,
-            value,
-          } of nearnormalHemisphericalVisibleReflectances) {
-            if (value !== undefined && value !== null) {
-              propositions.push(
-                negateIfNecessary(negator, {
-                  nearnormalHemisphericalVisibleReflectances: {
-                    some: {
-                      [comparator]: value,
-                    },
-                  },
-                }),
-              );
-            }
-          }
-        }
-        if (nearnormalHemisphericalVisibleTransmittances) {
-          for (let {
-            negator,
-            comparator,
-            value,
-          } of nearnormalHemisphericalVisibleTransmittances) {
-            if (value !== undefined && value !== null) {
-              propositions.push(
-                negateIfNecessary(negator, {
-                  nearnormalHemisphericalVisibleTransmittances: {
-                    some: {
-                      [comparator]: value,
-                    },
-                  },
-                }),
-              );
-            }
-          }
-        }
-        const { error, data } = await allOpticalDataQuery.refetch(
-          propositions.length == 0
-            ? {}
-            : {
-                where: conjunct(propositions),
-              },
-        );
-        if (error) {
-          // TODO Handle properly.
-          console.log(error);
-        }
-        // TODO Add `edge.node.databaseId to nodes?
-        const nestedData =
-          data?.databases?.edges?.map(
-            (edge) =>
-              edge?.node?.allOpticalData?.edges?.map((e) => e.node) || [],
-          ) || [];
-        const flatData = ([] as OpticalDataPartialFragment[]).concat(
-          ...nestedData,
-        );
-        setData(flatData);
-      } catch (error) {
-        // TODO Handle properly.
-        console.log("Failed:", error);
-      } finally {
-        setFiltering(false);
-      }
-    };
-    filter();
-  };
-
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
+import PaginatedOpticalData from "../../components/data/optical/PaginatedOpticalData";
 
+export default function Page() {
   return (
     <Layout>
-      <Typography.Paragraph style={{ maxWidth: 768 }}>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
         The network of <Link href={paths.databases}>databases</Link> can be
         queried here for data on building envelope{" "}
         <Link href={paths.components}>components</Link>.
       </Typography.Paragraph>
-      <Typography.Title>Optical Data</Typography.Title>
-      <ErrorAlert messages={globalErrorMessages} />
-      <Form
-        {...layout}
-        form={form}
-        name="filterData"
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
-      >
-        <UuidPropositionFormList name="componentIds" label="Component Id" />
-        <UuidPropositionFormList name="dataFormatIds" label="Data Format Id" />
-        <FloatPropositionFormList
-          name="infraredEmittances"
-          label="Infrared emittance"
-          minimum={0}
-          maximum={1}
-        />
-        <FloatPropositionFormList
-          name="nearnormalHemisphericalSolarReflectances"
-          label="Nearnormal hemispherical solar reflectance"
-          minimum={0}
-          maximum={1}
-        />
-        <FloatPropositionFormList
-          name="nearnormalHemisphericalSolarTransmittances"
-          label="Nearnormal hemispherical solar transmittance"
-          minimum={0}
-          maximum={1}
-        />
-        <FloatPropositionFormList
-          name="nearnormalHemisphericalVisibleReflectances"
-          label="Nearnormal hemispherical visible reflectance"
-          minimum={0}
-          maximum={1}
-        />
-        <FloatPropositionFormList
-          name="nearnormalHemisphericalVisibleTransmittances"
-          label="Nearnormal hemispherical visible transmittance"
-          minimum={0}
-          maximum={1}
-        />
-
-        <Form.Item {...tailLayout}>
-          <Button type="primary" htmlType="submit" loading={filtering}>
-            Filter
-          </Button>
-        </Form.Item>
-      </Form>
-      <Table
-        loading={filtering}
-        columns={[
-          {
-            ...getUuidColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-              (_uuid) => "/", // TODO Link somewhere useful!
-            ),
-          },
-          {
-            ...getNameColumnProps<(typeof data)[0]>(onFilterTextChange, (x) =>
-              filterText.get(x),
-            ),
-          },
-          {
-            ...getDescriptionColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getTimestampColumnProps<(typeof data)[0]>(),
-          },
-          {
-            ...getComponentUuidColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          // {
-          //   ...getInternallyLinkedFilterableStringColumnProps<typeof data[0]>(
-          //     "Database UUID",
-          //     "databaseId",
-          //     (x) => x.databaseId,
-          //     onFilterTextChange,
-          //     (x) => filterText.get(x),
-          //     (x) => paths.database(x.databaseId)
-          //   ),
-          // },
-          {
-            ...getAppliedMethodColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getResourceTreeColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            title: "Emittances, Reflectances, and Transmittances",
-            key: "nearnormalHemisphericalX",
-            render: (_text, record, _index) => (
-              <Descriptions column={1}>
-                <Descriptions.Item
-                  key="infraredEmittances"
-                  label="Infrared Emittances"
-                >
-                  {record.infraredEmittances
-                    .map((x) => x.toLocaleString("en"))
-                    .join(", ")}
-                </Descriptions.Item>
-                <Descriptions.Item
-                  key="nearnormalHemisphericalSolarReflectances"
-                  label="Nearnormal Hemispherical Solar Reflectances"
-                >
-                  {record.nearnormalHemisphericalSolarReflectances
-                    .map((x) => x.toLocaleString("en"))
-                    .join(", ")}
-                </Descriptions.Item>
-                <Descriptions.Item
-                  key="nearnormalHemisphericalSolarTransmittances"
-                  label="Nearnormal Hemispherical Solar Transmittances"
-                >
-                  {record.nearnormalHemisphericalSolarTransmittances
-                    .map((x) => x.toLocaleString("en"))
-                    .join(", ")}
-                </Descriptions.Item>
-                <Descriptions.Item
-                  key="nearnormalHemisphericalVisibleReflectances"
-                  label="Nearnormal Hemispherical Visible Reflectances"
-                >
-                  {record.nearnormalHemisphericalVisibleReflectances
-                    .map((x) => x.toLocaleString("en"))
-                    .join(", ")}
-                </Descriptions.Item>
-                <Descriptions.Item
-                  key="nearnormalHemisphericalVisibleTransmittances"
-                  label="Nearnormal Hemispherical Visible Transmittances"
-                >
-                  {record.nearnormalHemisphericalVisibleTransmittances
-                    .map((x) => x.toLocaleString("en"))
-                    .join(", ")}
-                </Descriptions.Item>
-              </Descriptions>
-            ),
-          },
-        ]}
-        dataSource={data}
-      />
-      <Typography.Paragraph style={{ maxWidth: 768 }}>
+      <PaginatedOpticalData />
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         is the most powerful way of querying the databases.
       </Typography.Paragraph>
     </Layout>
   );
 }
-
-export default Page;
diff --git a/frontend/pages/data/photovoltaic.tsx b/frontend/pages/data/photovoltaic.tsx
index ee435706c..5f807bad1 100644
--- a/frontend/pages/data/photovoltaic.tsx
+++ b/frontend/pages/data/photovoltaic.tsx
@@ -1,258 +1,22 @@
 import Layout from "../../components/Layout";
-import { Table, Form, Button, Typography } from "antd";
-import {
-  AllPhotovoltaicDataDocument,
-  PhotovoltaicDataPartialFragment,
-} from "../../queries/data.generated";
-import {
-  Scalars,
-  PhotovoltaicDataPropositionInput,
-} from "../../__generated__/graphql";
-import { useState } from "react";
-import { setMapValue } from "../../lib/freeTextFilter";
-import {
-  getAppliedMethodColumnProps,
-  getComponentUuidColumnProps,
-  getDescriptionColumnProps,
-  getNameColumnProps,
-  getResourceTreeColumnProps,
-  getTimestampColumnProps,
-  getUuidColumnProps,
-} from "../../lib/table";
-import {
-  UuidPropositionComparator,
-  UuidPropositionFormList,
-} from "../../components/UuidPropositionFormList";
-import { useQuery } from "@apollo/client/react";
-import ErrorAlert from "../../components/ErrorAlert";
-
-const layout = {
-  labelCol: { span: 8 },
-  wrapperCol: { span: 16 },
-};
-const tailLayout = {
-  wrapperCol: { offset: 8, span: 16 },
-};
-
-enum Negator {
-  Is = "is",
-  IsNot = "isNot",
-}
-
-const negateIfNecessary = (
-  negator: Negator,
-  proposition: PhotovoltaicDataPropositionInput,
-): PhotovoltaicDataPropositionInput => {
-  switch (negator) {
-    case Negator.Is:
-      return proposition;
-    case Negator.IsNot:
-      // return { not: proposition };
-      return proposition; // TODO Support `not` in filter!
-  }
-};
-
-const conjunct = (
-  propositions: PhotovoltaicDataPropositionInput[],
-): PhotovoltaicDataPropositionInput => {
-  if (propositions.length == 0) {
-    return {};
-  }
-  if (propositions.length == 1) {
-    return propositions[0];
-  }
-  return { and: propositions };
-};
-
-// const disjunct = (
-//   propositions: PhotovoltaicDataPropositionInput[]
-// ): PhotovoltaicDataPropositionInput => {
-//   if (propositions.length == 0) {
-//     return {};
-//   }
-//   if (propositions.length == 1) {
-//     return propositions[0];
-//   }
-//   return { or: propositions };
-// };
-
-function Page() {
-  const [form] = Form.useForm();
-  const [filtering, setFiltering] = useState(false);
-  const [globalErrorMessages, setGlobalErrorMessages] = useState(
-    new Array<string>(),
-  );
-  const [data, setData] = useState<PhotovoltaicDataPartialFragment[]>([]);
-  // Using `skip` is inspired by https://github.com/apollographql/apollo-client/issues/5268#issuecomment-749501801
-  // An alternative would be `useLazy...` as told in https://github.com/apollographql/apollo-client/issues/5268#issuecomment-527727653
-  // `useLazy...` does not return a `Promise` though as `use...Query.refetch` does which is used below.
-  // For error policies see https://www.apollographql.com/docs/react/v2/data/error-handling/#error-policies
-  const allPhotovoltaicDataQuery = useQuery(AllPhotovoltaicDataDocument, {
-    skip: true,
-    errorPolicy: "all",
-  });
-
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
-
-  const onFinish = ({
-    componentIds,
-    dataFormatIds,
-  }: {
-    componentIds:
-      | {
-          negator: Negator;
-          comparator: UuidPropositionComparator;
-          value: Scalars["Uuid"] | undefined;
-        }[]
-      | undefined;
-    dataFormatIds:
-      | {
-          negator: Negator;
-          comparator: UuidPropositionComparator;
-          value: Scalars["Uuid"] | undefined;
-        }[]
-      | undefined;
-  }) => {
-    const filter = async () => {
-      try {
-        setFiltering(true);
-        // https://www.apollographql.com/docs/react/networking/authentication/#reset-store-on-logout
-        const propositions: PhotovoltaicDataPropositionInput[] = [];
-        if (componentIds) {
-          for (let { negator, comparator, value } of componentIds) {
-            propositions.push(
-              negateIfNecessary(negator, {
-                componentId: { [comparator]: value },
-              }),
-            );
-          }
-        }
-        if (dataFormatIds) {
-          for (let { negator, comparator, value } of dataFormatIds) {
-            propositions.push(
-              negateIfNecessary(negator, {
-                resources: {
-                  some: {
-                    dataFormatId: { [comparator]: value },
-                  },
-                },
-              }),
-            );
-          }
-        }
-        const { error, data } = await allPhotovoltaicDataQuery.refetch(
-          propositions.length == 0
-            ? {}
-            : {
-                where: conjunct(propositions),
-              },
-        );
-        if (error) {
-          // TODO Handle properly.
-          console.log(error);
-        }
-        // TODO Casting to `PhotovoltaicData` is wrong and error prone!
-        const nestedData =
-          data?.databases?.edges?.map(
-            (edge) =>
-              edge?.node?.allPhotovoltaicData?.edges?.map((e) => e.node) || [],
-          ) || [];
-        const flatData = ([] as PhotovoltaicDataPartialFragment[]).concat(
-          ...nestedData,
-        );
-        setData(flatData);
-      } catch (error) {
-        // TODO Handle properly.
-        console.log("Failed:", error);
-      } finally {
-        setFiltering(false);
-      }
-    };
-    filter();
-  };
-
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
+import { Typography } from "antd";
+import Link from "next/link";
+import paths from "../../paths";
+import PaginatedPhotovoltaicData from "../../components/data/photovoltaic/PaginatedPhotovoltaicData";
 
+export default function Page() {
   return (
     <Layout>
-      <Typography.Title>Photovoltaic Data</Typography.Title>
-      <ErrorAlert messages={globalErrorMessages} />
-      <Form
-        {...layout}
-        form={form}
-        name="filterData"
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
-      >
-        <UuidPropositionFormList name="componentIds" label="Component Id" />
-        <UuidPropositionFormList name="dataFormatIds" label="Data Format Id" />
-
-        <Form.Item {...tailLayout}>
-          <Button type="primary" htmlType="submit" loading={filtering}>
-            Filter
-          </Button>
-        </Form.Item>
-      </Form>
-      <Table
-        loading={filtering}
-        columns={[
-          {
-            ...getUuidColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-              (_uuid) => "/", // TODO Link somewhere useful!
-            ),
-          },
-          {
-            ...getNameColumnProps<(typeof data)[0]>(onFilterTextChange, (x) =>
-              filterText.get(x),
-            ),
-          },
-          {
-            ...getDescriptionColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getTimestampColumnProps<(typeof data)[0]>(),
-          },
-          {
-            ...getComponentUuidColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          // {
-          //   ...getInternallyLinkedFilterableStringColumnProps<typeof data[0]>(
-          //     "Database UUID",
-          //     "databaseId",
-          //     (x) => x.databaseId,
-          //     onFilterTextChange,
-          //     (x) => filterText.get(x),
-          //     (x) => paths.database(x.databaseId)
-          //   ),
-          // },
-          {
-            ...getAppliedMethodColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getResourceTreeColumnProps<(typeof data)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-        ]}
-        dataSource={data}
-      />
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        The network of <Link href={paths.databases}>databases</Link> can be
+        queried here for data on building envelope{" "}
+        <Link href={paths.components}>components</Link>.
+      </Typography.Paragraph>
+      <PaginatedPhotovoltaicData />
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
+        is the most powerful way of querying the databases.
+      </Typography.Paragraph>
     </Layout>
   );
 }
-
-export default Page;
diff --git a/frontend/pages/databases/[uuid]/data/calorimetric/[dataId].tsx b/frontend/pages/databases/[uuid]/data/calorimetric/[dataId].tsx
new file mode 100644
index 000000000..ff631c735
--- /dev/null
+++ b/frontend/pages/databases/[uuid]/data/calorimetric/[dataId].tsx
@@ -0,0 +1,22 @@
+import { useRouter } from "next/router";
+import Layout from "../../../../../components/Layout";
+import CalorimetricData from "../../../../../components/data/calorimetric/CalorimetricData";
+
+function Page() {
+  const router = useRouter();
+
+  if (!router.isReady) {
+    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
+    return null;
+  }
+
+  const { uuid, dataId } = router.query;
+
+  return (
+    <Layout>
+      <CalorimetricData databaseId={uuid} id={dataId} />
+    </Layout>
+  );
+}
+
+export default Page;
diff --git a/frontend/pages/databases/[uuid]/data/geometric/[dataId].tsx b/frontend/pages/databases/[uuid]/data/geometric/[dataId].tsx
new file mode 100644
index 000000000..412aae464
--- /dev/null
+++ b/frontend/pages/databases/[uuid]/data/geometric/[dataId].tsx
@@ -0,0 +1,22 @@
+import { useRouter } from "next/router";
+import Layout from "../../../../../components/Layout";
+import GeometricData from "../../../../../components/data/geometric/GeometricData";
+
+function Page() {
+  const router = useRouter();
+
+  if (!router.isReady) {
+    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
+    return null;
+  }
+
+  const { uuid, dataId } = router.query;
+
+  return (
+    <Layout>
+      <GeometricData databaseId={uuid} id={dataId} />
+    </Layout>
+  );
+}
+
+export default Page;
diff --git a/frontend/pages/databases/[uuid]/data/hygrothermal/[dataId].tsx b/frontend/pages/databases/[uuid]/data/hygrothermal/[dataId].tsx
new file mode 100644
index 000000000..a421fbc7c
--- /dev/null
+++ b/frontend/pages/databases/[uuid]/data/hygrothermal/[dataId].tsx
@@ -0,0 +1,22 @@
+import { useRouter } from "next/router";
+import Layout from "../../../../../components/Layout";
+import HygrothermalData from "../../../../../components/data/hygrothermal/HygrothermalData";
+
+function Page() {
+  const router = useRouter();
+
+  if (!router.isReady) {
+    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
+    return null;
+  }
+
+  const { uuid, dataId } = router.query;
+
+  return (
+    <Layout>
+      <HygrothermalData databaseId={uuid} id={dataId} />
+    </Layout>
+  );
+}
+
+export default Page;
diff --git a/frontend/pages/databases/[uuid]/data/life-cycle/[dataId].tsx b/frontend/pages/databases/[uuid]/data/life-cycle/[dataId].tsx
new file mode 100644
index 000000000..0d10894fc
--- /dev/null
+++ b/frontend/pages/databases/[uuid]/data/life-cycle/[dataId].tsx
@@ -0,0 +1,22 @@
+import { useRouter } from "next/router";
+import Layout from "../../../../../components/Layout";
+import LifeCycleData from "../../../../../components/data/lifeCycle/LifeCycleData";
+
+function Page() {
+  const router = useRouter();
+
+  if (!router.isReady) {
+    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
+    return null;
+  }
+
+  const { uuid, dataId } = router.query;
+
+  return (
+    <Layout>
+      <LifeCycleData databaseId={uuid} id={dataId} />
+    </Layout>
+  );
+}
+
+export default Page;
diff --git a/frontend/pages/databases/[uuid]/data/optical/[dataId].tsx b/frontend/pages/databases/[uuid]/data/optical/[dataId].tsx
new file mode 100644
index 000000000..7d23fa198
--- /dev/null
+++ b/frontend/pages/databases/[uuid]/data/optical/[dataId].tsx
@@ -0,0 +1,22 @@
+import { useRouter } from "next/router";
+import Layout from "../../../../../components/Layout";
+import OpticalData from "../../../../../components/data/optical/OpticalData";
+
+function Page() {
+  const router = useRouter();
+
+  if (!router.isReady) {
+    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
+    return null;
+  }
+
+  const { uuid, dataId } = router.query;
+
+  return (
+    <Layout>
+      <OpticalData databaseId={uuid} id={dataId} />
+    </Layout>
+  );
+}
+
+export default Page;
diff --git a/frontend/pages/databases/[uuid]/data/photovoltaic/[dataId].tsx b/frontend/pages/databases/[uuid]/data/photovoltaic/[dataId].tsx
new file mode 100644
index 000000000..a6b2925cf
--- /dev/null
+++ b/frontend/pages/databases/[uuid]/data/photovoltaic/[dataId].tsx
@@ -0,0 +1,22 @@
+import { useRouter } from "next/router";
+import Layout from "../../../../../components/Layout";
+import PhotovoltaicData from "../../../../../components/data/photovoltaic/PhotovoltaicData";
+
+function Page() {
+  const router = useRouter();
+
+  if (!router.isReady) {
+    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
+    return null;
+  }
+
+  const { uuid, dataId } = router.query;
+
+  return (
+    <Layout>
+      <PhotovoltaicData databaseId={uuid} id={dataId} />
+    </Layout>
+  );
+}
+
+export default Page;
diff --git a/frontend/pages/databases/index.tsx b/frontend/pages/databases/index.tsx
index ec97b1b32..f15270f74 100644
--- a/frontend/pages/databases/index.tsx
+++ b/frontend/pages/databases/index.tsx
@@ -1,105 +1,36 @@
 import { useQuery } from "@apollo/client/react";
 import Layout from "../../components/Layout";
 import paths from "../../paths";
-import { Divider, Table, Typography } from "antd";
-import { DatabasesDocument } from "../../queries/databases.generated";
-import { useState } from "react";
+import { Divider, Typography } from "antd";
 import { CurrentUserDocument } from "../../queries/currentUser.generated";
-import { setMapValue } from "../../lib/freeTextFilter";
-import PendingDatabases from "../../components/databases/PendingDatabases";
-import {
-  getExternallyLinkedFilterableLocatorColumnProps,
-  getNameColumnProps,
-  getDescriptionColumnProps,
-  getInternallyLinkedFilterableStringColumnProps,
-  getUuidColumnProps,
-} from "../../lib/table";
+import PendingDatabaseList from "../../components/databases/PendingDatabaseList";
 import Link from "next/link";
 import { UserRole } from "../../__generated__/graphql";
-import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
-
-// TODO Pagination. See https://www.apollographql.com/docs/react/pagination/core-api/
-
-function Page() {
-  const { loading, error, data } = useQuery(DatabasesDocument);
-  const nodes = data?.databases?.edges?.map((e) => e.node) || [];
-
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
+import PaginatedDatabases from "../../components/databases/PaginatedDatabases";
 
+export default function Page() {
   const currentUser = useQuery(CurrentUserDocument)?.data?.currentUser;
 
-  useQueryHandler({ error });
-
   return (
     <Layout>
-      <Typography.Paragraph style={{ maxWidth: 768 }}>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
         The following databases are connected to{" "}
         <Link href={paths.home}>buildingenvelopedata.org</Link> and contain{" "}
-        <Link href={paths.data}>data</Link> on{" "}
+        <Link href={paths.allData}>data</Link> on{" "}
         <Link href={paths.components}>components</Link>.
       </Typography.Paragraph>
-      <Table
-        loading={loading}
-        columns={[
-          {
-            ...getUuidColumnProps<(typeof nodes)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-              paths.database,
-            ),
-          },
-          {
-            ...getNameColumnProps<(typeof nodes)[0]>(onFilterTextChange, (x) =>
-              filterText.get(x),
-            ),
-          },
-          {
-            ...getDescriptionColumnProps<(typeof nodes)[0]>(
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getExternallyLinkedFilterableLocatorColumnProps<
-              (typeof nodes)[0]
-            >(
-              "Locator",
-              "locator",
-              (record) => record.locator,
-              onFilterTextChange,
-              (x) => filterText.get(x),
-            ),
-          },
-          {
-            ...getInternallyLinkedFilterableStringColumnProps<
-              (typeof nodes)[0]
-            >(
-              "Operator",
-              "operator",
-              (record) => record.operator.node.name,
-              onFilterTextChange,
-              (x) => filterText.get(x),
-              (x) => paths.institution(x.operator.node.uuid),
-            ),
-          },
-        ]}
-        dataSource={nodes}
-      />
-      {currentUser && currentUser?.roles?.includes(UserRole.Administrator) && (
-        <>
-          <Divider />
-          <Typography.Title level={2}>Pending Databases</Typography.Title>
-          <PendingDatabases />
-          <Divider />
-        </>
-      )}
-      <Typography.Paragraph style={{ maxWidth: 768 }}>
+      <PaginatedDatabases showJump />
+      <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         provides all information about databases.
       </Typography.Paragraph>
+      {currentUser?.roles?.includes(UserRole.Administrator) && (
+        <div>
+          <Divider />
+          <Typography.Title level={4}>Pending Databases</Typography.Title>
+          <PendingDatabaseList />
+        </div>
+      )}
     </Layout>
   );
 }
-
-export default Page;
diff --git a/frontend/pages/index.tsx b/frontend/pages/index.tsx
index 248eb7f10..228013685 100644
--- a/frontend/pages/index.tsx
+++ b/frontend/pages/index.tsx
@@ -1,5 +1,5 @@
 import Layout from "../components/Layout";
-import { Flex, Typography } from "antd";
+import { Anchor, Card, Typography } from "antd";
 import Link from "next/link";
 import paths from "../paths";
 import Image from "next/image";
@@ -9,310 +9,323 @@ import germanFederalMinistry from "../public/german-federal-ministry-for-economi
 function Page() {
   return (
     <Layout>
-      <Flex justify="center">
-        <div style={{ maxWidth: 768 }}>
-          <Typography.Paragraph>
-            <a href="#manufacturers">For Manufacturers</a> |{" "}
-            <a href="#software-companies">For Software Companies</a> |{" "}
-            <a href="#architects-planners-engineers">
-              For Architects, Planners, and Engineers
-            </a>
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            <Link href={paths.home}>buildingenvelopedata.org</Link> offers you
-            access to a network of <Link href={paths.databases}>databases</Link>
-            . It contains detailed <Link href={paths.data}>optical data</Link>{" "}
-            for thousands of building envelope{" "}
-            <Link href={paths.components}>components</Link> and can be used for
-            example to calculate the energy performance of buildings. The{" "}
-            <Link href={paths.data}>data</Link> is ready to be used by software
-            companies and advanced engineering offices.
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            This website offers an overview of the{" "}
-            <Link href={paths.components}>components</Link> for which{" "}
-            <Link href={paths.data}>data</Link> is available and the{" "}
-            <Link href={paths.databases}>databases</Link> of the network. It can
-            also be used to search for <Link href={paths.data}>data</Link> in
-            all <Link href={paths.databases}>databases</Link>. In order to
-            identify <Link href={paths.institutions}>institutions</Link>,{" "}
-            <Link href={paths.dataFormats}>data formats</Link> and{" "}
-            <Link href={paths.methods}>methods</Link> across the{" "}
-            <Link href={paths.databases}>databases</Link>, they are managed by a
-            metabase together with the{" "}
-            <Link href={paths.components}>components</Link> and{" "}
-            <Link href={paths.databases}>databases</Link>. This website is the
-            front end of the metabase.
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            The metabase can be queried through its{" "}
-            <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>
-            . This is the most powerful way to query all{" "}
-            <Link href={paths.databases}>databases</Link>. It is well suited to
-            be used by software. The tabs of this website can offer only a part
-            of the functions of the{" "}
-            <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>
-            .
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            With{" "}
-            <Typography.Link
-              href={paths.dataFormat("9ca9e8f5-94bf-4fdd-81e3-31a58d7ca708")}
-            >
-              BED-JSON
-            </Typography.Link>
-            , <Link href={paths.home}>buildingenvelopedata.org</Link> offers a
-            general format for optical, calorimetric and photovoltaic data sets.
-            It is defined by the JSON Schemas of the{" "}
-            <Typography.Link href="https://github.com/building-envelope-data/api">
-              buildingenvelopedata.org API specification
-            </Typography.Link>
-            . Other data formats are also available. The{" "}
-            <Typography.Link href="https://github.com/building-envelope-data/metabase">
-              source code
-            </Typography.Link>{" "}
-            of the metabase is available at{" "}
-            <Typography.Link href="https://github.com">GitHub</Typography.Link>.
-          </Typography.Paragraph>
-          <Image
-            src={overviewImage}
-            alt="Schematic depiction of how users like architects, planners, or engineers can use the metabase to find products and data in and across databases."
+      <Card>
+        <div style={{ paddingBottom: "1em" }}>
+          <Anchor
+            affix
+            direction="horizontal"
             style={{
-              maxWidth: "100%",
-              height: "auto",
-            }}
-          />
-          <Typography.Paragraph>
-            Video{" "}
-            <Typography.Link href="https://www.youtube.com/watch?v=QsulJnpvuh0">
-              Introduction into the details
-            </Typography.Link>
-            . Video{" "}
-            <Typography.Link href="https://www.youtube.com/watch?v=IRqjbj1zSPA">
-              Applications using the product data network
-            </Typography.Link>
-            .
-          </Typography.Paragraph>
-          <Typography.Title level={2} id="manufacturers">
-            For Manufacturers
-          </Typography.Title>
-          <Typography.Paragraph>
-            <strong>
-              Manufacturers of building envelope components often face the
-              following challenges:
-            </strong>
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            They receive product data from various sources, for example
-            laboratories or suppliers. There are several types of product data,
-            but also several formats for one type of product data. The
-            manufacturer selects a part of the product data and submits it to
-            databases of associations e.g., the International Glazing and
-            Shading Database (IGSDB) and the European Solar-Shading Database
-            (ES-SDA), in the format which they require.
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            There is a large variety of software applications used by architects
-            and engineers (“planners”) to design building envelopes. Several
-            planning applications have a limited amount of product data stored
-            within the application. The manufacturer must decide which data is
-            provided to which application and which overall costs are acceptable
-            as part of the marketing of the products. Most manufacturers have a
-            website where planners can download datasheet values of many
-            components. Planners need to type them manually into their planning
-            application which is time-consuming and error-prone. When planners
-            have chosen interesting components of a manufacturer, they want that
-            their planning software can directly simulate with these components.
-            They don’t want to research which calculation method requires which
-            type of data in which format. Manufacturers must keep their product
-            data in sync across all databases of associations, planning
-            applications and their own website.
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            <strong>Solutions with the product data network</strong>
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            The product data network buildingenvelopedata.org provides the
-            format BED-JSON which covers all optical and calorimetric data which
-            is currently relevant. Instead of exchanging product data manually,
-            manufacturers add an additional application programming interface to
-            their existing website server, or their association adds the
-            additional API to their existing website server. The product data
-            network provides a specification for this API. Planning applications
-            can access the product data in an automated way which reduces the
-            cost for managing the product data significantly.
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            Planners prefer to work with building envelope components which they
-            can easily simulate in their favorite application.
-            <strong>
-              The product data network connects your product data with many
-              software applications and with the architects, planners and
-              engineers who use the planning software.{" "}
-            </strong>
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            <strong>Next steps</strong>
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            There is a{" "}
-            <Typography.Link href="https://github.com/building-envelope-data#how-can-i-add-my-product-data-to-the-product-data-network">
-              description for software developers how to connect your product
-              data to the planning software applications.
-            </Typography.Link>{" "}
-            Please{" "}
-            <Typography.Link href="https://github.com/building-envelope-data/api/issues/new">
-              raise an issue
-            </Typography.Link>{" "}
-            if we can help you in any way.
-          </Typography.Paragraph>
-          <Typography.Title level={2} id="software-companies">
-            For software companies
-          </Typography.Title>
-          <Typography.Paragraph>
-            <strong>
-              Software companies which develop planning applications for
-              buildings and building envelopes face several challenges:
-            </strong>
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            Optical and calorimetric data is typically available either as a PDF
-            datasheet or in a special text format for experts in these domains.
-            Software companies therefore need software developers which become
-            experts for such data. If the information is provided as a PDF
-            datasheet, it cannot be extracted reliably. If the information is
-            provided in a special text format, it is difficult to parse. Some
-            data sets may not be valid e.g. because the decimal separator has
-            been entered wrong.
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            Planners must comply with the local building code, which means that
-            their planning software must comply with the local regulations, too.
-            For example, the definition of solar transmittance according to EN
-            410 differs from that in ISO 9050. The required quality of the
-            product data depends on the required calculation. Optical and
-            calorimetric data is typically provided without specifying the
-            method according to which they were created. Therefore, software
-            companies and planners sometimes do not know whether they can use
-            the data which they have found for the intended purpose.
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            Planners want to be able to use all available components in their
-            planning software. It is time-consuming to collect product data
-            manually from manufacturers.
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            <strong>Solutions with the product data network</strong>
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            The product data network buildingenvelopedata.org allows software
-            companies to download product data from several manufacturers and
-            associations via the same application programming interface (API).
-            The format BED-JSON was developed explicitly for software developers
-            without background in optical or calorimetric data. The JSON schemas
-            explain each key and can be used to validate data sets. It is simple
-            to parse the JSON data set and to use it in any programming
-            language.
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            <strong>
-              The product data network provides an easy access to a large amount
-              of product data which is always up to date.
-            </strong>
-            Your planning software can use it to make the planning of building
-            envelopes easier, faster, and better. Architects, planners, and
-            engineers don&apos;t need to understand all details of the
-            calculation and the required data. They appreciate applications
-            which make it easy to evaluate many variants in a short time to find
-            the best solution for their customers.
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            <strong>Next steps</strong>
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            There is a{" "}
-            <Typography.Link href="https://github.com/building-envelope-data#how-can-i-use-the-product-data-network-with-my-software-application">
-              description for software developers how to use the product data
-              network with your application.
-            </Typography.Link>{" "}
-            Please{" "}
-            <Typography.Link href="https://github.com/building-envelope-data/api/issues/new">
-              raise an issue
-            </Typography.Link>{" "}
-            if we can help you in any way.
-          </Typography.Paragraph>
-          <Typography.Title level={2} id="architects-planners-engineers">
-            For architects, planners and engineers
-          </Typography.Title>
-          <Typography.Paragraph>
-            <strong>
-              There are at least eight challenges for planners affecting the
-              speed of their work, the required effort, and the quality of the
-              results:
-            </strong>
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            Planning software typically contains a limited amount of product
-            data. When planners need to evaluate other products, they need to
-            understand which data and format is required. The manual search for
-            product data is time-consuming. Therefore, only some products can be
-            evaluated. It is difficult to find the components which are suited
-            best to a specific application. Product data often needs to be
-            entered manually into planning software, which is time-consuming and
-            prone to error. When many variants of the building envelope are
-            compared, effort is needed to document the inputs of each simulation
-            properly. Time and effort are needed to get product data from
-            manufacturers, especially when detailed data is needed. Planners
-            sometimes receive the required data content in a format which cannot
-            be processed by their planning software. To get the required product
-            data in the required format, several software applications can be
-            necessary. Processes with several applications can be error-prone
-            and cumbersome to maintain.
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            <strong>Solutions with the product data network</strong>
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            The product data network buildingenvelopedata.org adds a large
-            amount of product data to your favorite planning software. You don’t
-            need to understand all details of the calculations. You don’t need
-            to understand which format is required by the planning software,
-            where you find the product data and which data sets are suitable for
-            the calculation.
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            Your planning software makes it easy for you by using the product
-            data network. You can quickly evaluate all interesting variants and
-            find great solutions for your customers.
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            <strong>Next steps</strong>
-          </Typography.Paragraph>
-          <Typography.Paragraph>
-            If your favorite planning software does not yet provide a large
-            amount of glass panes and shading to choose from, ask them to
-            connect to the product data network. Software companies can use the
-            product data for free.
-          </Typography.Paragraph>
-          <Typography.Title level={2}>Acknowledgements</Typography.Title>
-          <Typography.Paragraph>
-            This work was funded by the German Federal Ministry for Economic
-            Affairs and Climate Action under Grants 03ET1560A and 03EN1070A,
-            based on a decision by the German Bundestag, by a Fraunhofer ICON
-            Grant and by the Assistant Secretary for Energy Efficiency and
-            Renewable Energy, Building Technologies Program, of the U.S.
-            Department of Energy, under Contract No. DE-AC02-05CH11231.
-          </Typography.Paragraph>
-          <Image
-            src={germanFederalMinistry}
-            alt="Coat of arms of Germany with the text: Supported by the German Federal Ministry for Economic Affairs and Climate Action on the basis of a decision by the German Bundestag."
-            style={{
-              maxWidth: "50%",
-              height: "auto",
+              backgroundColor: "rgba(255, 255, 255, 1)",
             }}
+            items={[
+              {
+                key: "manufacturers",
+                href: "#manufacturers", // Muss mit der ID des Ziels übereinstimmen
+                title: "For Manufacturers",
+              },
+              {
+                key: "software-companies",
+                href: "#software-companies", // Muss mit der ID des Ziels übereinstimmen
+                title: "For Software Companies",
+              },
+              {
+                key: "architects-planners-engineers",
+                href: "#architects-planners-engineers", // Muss mit der ID des Ziels übereinstimmen
+                title: "For Architects, Planners, and Engineers",
+              },
+            ]}
           />
         </div>
-      </Flex>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          <Link href={paths.home}>buildingenvelopedata.org</Link> offers you
+          access to a network of <Link href={paths.databases}>databases</Link>.
+          It contains detailed <Link href={paths.allData}>optical data</Link>{" "}
+          for thousands of building envelope{" "}
+          <Link href={paths.components}>components</Link> and can be used for
+          example to calculate the energy performance of buildings. The{" "}
+          <Link href={paths.allData}>data</Link> is ready to be used by software
+          companies and advanced engineering offices.
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          This website offers an overview of the{" "}
+          <Link href={paths.components}>components</Link> for which{" "}
+          <Link href={paths.allData}>data</Link> is available and the{" "}
+          <Link href={paths.databases}>databases</Link> of the network. It can
+          also be used to search for <Link href={paths.allData}>data</Link> in
+          all <Link href={paths.databases}>databases</Link>. In order to
+          identify <Link href={paths.institutions}>institutions</Link>,{" "}
+          <Link href={paths.dataFormats}>data formats</Link> and{" "}
+          <Link href={paths.methods}>methods</Link> across the{" "}
+          <Link href={paths.databases}>databases</Link>, they are managed by a
+          metabase together with the{" "}
+          <Link href={paths.components}>components</Link> and{" "}
+          <Link href={paths.databases}>databases</Link>. This website is the
+          front end of the metabase.
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          The metabase can be queried through its{" "}
+          <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>.
+          This is the most powerful way to query all{" "}
+          <Link href={paths.databases}>databases</Link>. It is well suited to be
+          used by software. The tabs of this website can offer only a part of
+          the functions of the{" "}
+          <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>.
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          With{" "}
+          <Typography.Link
+            href={paths.dataFormat("9ca9e8f5-94bf-4fdd-81e3-31a58d7ca708")}
+          >
+            BED-JSON
+          </Typography.Link>
+          , <Link href={paths.home}>buildingenvelopedata.org</Link> offers a
+          general format for optical, calorimetric and photovoltaic data sets.
+          It is defined by the JSON Schemas of the{" "}
+          <Typography.Link href="https://github.com/building-envelope-data/api">
+            buildingenvelopedata.org API specification
+          </Typography.Link>
+          . Other data formats are also available. The{" "}
+          <Typography.Link href="https://github.com/building-envelope-data/metabase">
+            source code
+          </Typography.Link>{" "}
+          of the metabase is available at{" "}
+          <Typography.Link href="https://github.com">GitHub</Typography.Link>.
+        </Typography.Paragraph>
+        <Image
+          src={overviewImage}
+          alt="Schematic depiction of how users like architects, planners, or engineers can use the metabase to find products and data in and across databases."
+          style={{
+            maxWidth: "100%",
+            height: "auto",
+          }}
+        />
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          Video{" "}
+          <Typography.Link href="https://www.youtube.com/watch?v=QsulJnpvuh0">
+            Introduction into the details
+          </Typography.Link>
+          . Video{" "}
+          <Typography.Link href="https://www.youtube.com/watch?v=IRqjbj1zSPA">
+            Applications using the product data network
+          </Typography.Link>
+          .
+        </Typography.Paragraph>
+        <Typography.Title level={4} id="manufacturers">
+          For Manufacturers
+        </Typography.Title>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          <strong>
+            Manufacturers of building envelope components often face the
+            following challenges:
+          </strong>
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          They receive product data from various sources, for example
+          laboratories or suppliers. There are several types of product data,
+          but also several formats for one type of product data. The
+          manufacturer selects a part of the product data and submits it to
+          databases of associations e.g., the International Glazing and Shading
+          Database (IGSDB) and the European Solar-Shading Database (ES-SDA), in
+          the format which they require.
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          There is a large variety of software applications used by architects
+          and engineers (“planners”) to design building envelopes. Several
+          planning applications have a limited amount of product data stored
+          within the application. The manufacturer must decide which data is
+          provided to which application and which overall costs are acceptable
+          as part of the marketing of the products. Most manufacturers have a
+          website where planners can download datasheet values of many
+          components. Planners need to type them manually into their planning
+          application which is time-consuming and error-prone. When planners
+          have chosen interesting components of a manufacturer, they want that
+          their planning software can directly simulate with these components.
+          They don’t want to research which calculation method requires which
+          type of data in which format. Manufacturers must keep their product
+          data in sync across all databases of associations, planning
+          applications and their own website.
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          <strong>Solutions with the product data network</strong>
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          The product data network buildingenvelopedata.org provides the format
+          BED-JSON which covers all optical and calorimetric data which is
+          currently relevant. Instead of exchanging product data manually,
+          manufacturers add an additional application programming interface to
+          their existing website server, or their association adds the
+          additional API to their existing website server. The product data
+          network provides a specification for this API. Planning applications
+          can access the product data in an automated way which reduces the cost
+          for managing the product data significantly.
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          Planners prefer to work with building envelope components which they
+          can easily simulate in their favorite application.
+          <strong>
+            The product data network connects your product data with many
+            software applications and with the architects, planners and
+            engineers who use the planning software.{" "}
+          </strong>
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          <strong>Next steps</strong>
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          There is a{" "}
+          <Typography.Link href="https://github.com/building-envelope-data#how-can-i-add-my-product-data-to-the-product-data-network">
+            description for software developers how to connect your product data
+            to the planning software applications.
+          </Typography.Link>{" "}
+          Please{" "}
+          <Typography.Link href="https://github.com/building-envelope-data/api/issues/new">
+            raise an issue
+          </Typography.Link>{" "}
+          if we can help you in any way.
+        </Typography.Paragraph>
+        <Typography.Title level={4} id="software-companies">
+          For software companies
+        </Typography.Title>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          <strong>
+            Software companies which develop planning applications for buildings
+            and building envelopes face several challenges:
+          </strong>
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          Optical and calorimetric data is typically available either as a PDF
+          datasheet or in a special text format for experts in these domains.
+          Software companies therefore need software developers which become
+          experts for such data. If the information is provided as a PDF
+          datasheet, it cannot be extracted reliably. If the information is
+          provided in a special text format, it is difficult to parse. Some data
+          sets may not be valid e.g. because the decimal separator has been
+          entered wrong.
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          Planners must comply with the local building code, which means that
+          their planning software must comply with the local regulations, too.
+          For example, the definition of solar transmittance according to EN 410
+          differs from that in ISO 9050. The required quality of the product
+          data depends on the required calculation. Optical and calorimetric
+          data is typically provided without specifying the method according to
+          which they were created. Therefore, software companies and planners
+          sometimes do not know whether they can use the data which they have
+          found for the intended purpose.
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          Planners want to be able to use all available components in their
+          planning software. It is time-consuming to collect product data
+          manually from manufacturers.
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          <strong>Solutions with the product data network</strong>
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          The product data network buildingenvelopedata.org allows software
+          companies to download product data from several manufacturers and
+          associations via the same application programming interface (API). The
+          format BED-JSON was developed explicitly for software developers
+          without background in optical or calorimetric data. The JSON schemas
+          explain each key and can be used to validate data sets. It is simple
+          to parse the JSON data set and to use it in any programming language.
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          <strong>
+            The product data network provides an easy access to a large amount
+            of product data which is always up to date.
+          </strong>
+          Your planning software can use it to make the planning of building
+          envelopes easier, faster, and better. Architects, planners, and
+          engineers don&apos;t need to understand all details of the calculation
+          and the required data. They appreciate applications which make it easy
+          to evaluate many variants in a short time to find the best solution
+          for their customers.
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          <strong>Next steps</strong>
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          There is a{" "}
+          <Typography.Link href="https://github.com/building-envelope-data#how-can-i-use-the-product-data-network-with-my-software-application">
+            description for software developers how to use the product data
+            network with your application.
+          </Typography.Link>{" "}
+          Please{" "}
+          <Typography.Link href="https://github.com/building-envelope-data/api/issues/new">
+            raise an issue
+          </Typography.Link>{" "}
+          if we can help you in any way.
+        </Typography.Paragraph>
+        <Typography.Title level={4} id="architects-planners-engineers">
+          For architects, planners and engineers
+        </Typography.Title>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          <strong>
+            There are at least eight challenges for planners affecting the speed
+            of their work, the required effort, and the quality of the results:
+          </strong>
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          Planning software typically contains a limited amount of product data.
+          When planners need to evaluate other products, they need to understand
+          which data and format is required. The manual search for product data
+          is time-consuming. Therefore, only some products can be evaluated. It
+          is difficult to find the components which are suited best to a
+          specific application. Product data often needs to be entered manually
+          into planning software, which is time-consuming and prone to error.
+          When many variants of the building envelope are compared, effort is
+          needed to document the inputs of each simulation properly. Time and
+          effort are needed to get product data from manufacturers, especially
+          when detailed data is needed. Planners sometimes receive the required
+          data content in a format which cannot be processed by their planning
+          software. To get the required product data in the required format,
+          several software applications can be necessary. Processes with several
+          applications can be error-prone and cumbersome to maintain.
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          <strong>Solutions with the product data network</strong>
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          The product data network buildingenvelopedata.org adds a large amount
+          of product data to your favorite planning software. You don’t need to
+          understand all details of the calculations. You don’t need to
+          understand which format is required by the planning software, where
+          you find the product data and which data sets are suitable for the
+          calculation.
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          Your planning software makes it easy for you by using the product data
+          network. You can quickly evaluate all interesting variants and find
+          great solutions for your customers.
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          <strong>Next steps</strong>
+        </Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          If your favorite planning software does not yet provide a large amount
+          of glass panes and shading to choose from, ask them to connect to the
+          product data network. Software companies can use the product data for
+          free.
+        </Typography.Paragraph>
+        <Typography.Title level={4}>Acknowledgements</Typography.Title>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          This work was funded by the German Federal Ministry for Economic
+          Affairs and Climate Action under Grants 03ET1560A and 03EN1070A, based
+          on a decision by the German Bundestag, by a Fraunhofer ICON Grant and
+          by the Assistant Secretary for Energy Efficiency and Renewable Energy,
+          Building Technologies Program, of the U.S. Department of Energy, under
+          Contract No. DE-AC02-05CH11231.
+        </Typography.Paragraph>
+        <Image
+          src={germanFederalMinistry}
+          alt="Coat of arms of Germany with the text: Supported by the German Federal Ministry for Economic Affairs and Climate Action on the basis of a decision by the German Bundestag."
+          style={{
+            maxWidth: "50%",
+            height: "auto",
+          }}
+        />
+      </Card>
     </Layout>
   );
 }
diff --git a/frontend/pages/institutions/index.tsx b/frontend/pages/institutions/index.tsx
index 31db4c9ef..553cf78fe 100644
--- a/frontend/pages/institutions/index.tsx
+++ b/frontend/pages/institutions/index.tsx
@@ -3,51 +3,38 @@ import Layout from "../../components/Layout";
 import Link from "next/link";
 import paths from "../../paths";
 import { Typography, Divider } from "antd";
-import { InstitutionsDocument } from "../../queries/institutions.generated";
 import { CurrentUserDocument } from "../../queries/currentUser.generated";
-import PendingInstitutions from "../../components/institutions/PendingInstitutions";
+import PendingInstitutionList from "../../components/institutions/PendingInstitutionList";
 import { UserRole } from "../../__generated__/graphql";
-import { notEmpty } from "../../lib/array";
-import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
-import InstitutionTable from "../../components/institutions/InstitutionTable";
-
-// TODO Pagination. See https://www.apollographql.com/docs/react/pagination/core-api/
-
-function Page() {
-  const { loading, error, data } = useQuery(InstitutionsDocument);
-  const nodes =
-    data?.institutions?.edges?.map((e) => e.node).filter(notEmpty) || [];
+import PaginatedInstitutions from "../../components/institutions/PaginatedInstitutions";
 
+export default function Page() {
   const currentUser = useQuery(CurrentUserDocument)?.data?.currentUser;
 
-  useQueryHandler({ error });
-
   return (
     <Layout>
-      <Typography.Paragraph style={{ maxWidth: 768 }}>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
         Institutions can manufacture{" "}
         <Link href={paths.components}>components</Link>, operate{" "}
         <Link href={paths.databases}>databases</Link> and create{" "}
         <Link href={paths.dataFormats}>data formats</Link> and{" "}
         <Link href={paths.methods}>methods</Link>.
       </Typography.Paragraph>
-      <InstitutionTable loading={loading} institutions={nodes} />
-      <Typography.Paragraph style={{ maxWidth: 768 }}>
+      {currentUser && (
+        <Link href={paths.institutionCreate}>Create Institution</Link>
+      )}
+      <PaginatedInstitutions showJump />
+      <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         provides all information about institutions.
       </Typography.Paragraph>
-      {currentUser && currentUser?.roles?.includes(UserRole.Verifier) && (
-        <>
+      {currentUser?.roles?.includes(UserRole.Verifier) && (
+        <div>
           <Divider />
-          <Typography.Title level={2}>Pending Institutions</Typography.Title>
-          <PendingInstitutions />
-        </>
-      )}
-      {currentUser && (
-        <Link href={paths.institutionCreate}>Create Institution</Link>
+          <Typography.Title level={4}>Pending Institutions</Typography.Title>
+          <PendingInstitutionList />
+        </div>
       )}
     </Layout>
   );
 }
-
-export default Page;
diff --git a/frontend/pages/me/manage/email.tsx b/frontend/pages/me/manage/email.tsx
index 8591c210a..2fc5b25ff 100644
--- a/frontend/pages/me/manage/email.tsx
+++ b/frontend/pages/me/manage/email.tsx
@@ -18,7 +18,7 @@ function Page() {
 
   return (
     <ManageLayout>
-      <Typography.Paragraph>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
         Your current email address is {currentUser.contact.emailAddress}.
         {!currentUser.contact.isEmailAddressConfirmed && (
           <>
diff --git a/frontend/pages/me/manage/enable-authenticator.tsx b/frontend/pages/me/manage/enable-authenticator.tsx
index 0b2d70719..9695fa489 100644
--- a/frontend/pages/me/manage/enable-authenticator.tsx
+++ b/frontend/pages/me/manage/enable-authenticator.tsx
@@ -25,12 +25,12 @@ function Page() {
     <>
       <ManageLayout>
         <Typography.Title level={3}>Configure</Typography.Title>
-        <Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
           To use an authenticator app go through the following steps:
         </Typography.Paragraph>
         <List>
           <List>
-            <Typography.Paragraph>
+            <Typography.Paragraph style={{ maxWidth: "75ch" }}>
               Download a two-factor authenticator app like{" "}
               <a href="https://freeotp.github.io/">FreeOTP</a> or{" "}
               <a href="https://www.microsoft.com/en-us/account/authenticator">
@@ -44,7 +44,7 @@ function Page() {
             </Typography.Paragraph>
           </List>
           <List>
-            <Typography.Paragraph>
+            <Typography.Paragraph style={{ maxWidth: "75ch" }}>
               Scan the QR Code or enter this key <kbd>{sharedKey}</kbd> into
               your two factor authenticator app. Spaces and casing do not
               matter.
@@ -52,7 +52,7 @@ function Page() {
             <QRCode value={authenticatorUri} />
           </List>
           <List>
-            <Typography.Paragraph>
+            <Typography.Paragraph style={{ maxWidth: "75ch" }}>
               Once you have scanned the QR code or input the key above, your two
               factor authentication app will provide you with a unique code.
               Enter the code in the confirmation box below.
diff --git a/frontend/pages/me/manage/personal-data.tsx b/frontend/pages/me/manage/personal-data.tsx
index c5b53cac7..3e52d91f7 100644
--- a/frontend/pages/me/manage/personal-data.tsx
+++ b/frontend/pages/me/manage/personal-data.tsx
@@ -19,7 +19,7 @@ function Page() {
 
   return (
     <ManageLayout>
-      <Typography.Paragraph>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
         Your account contains personal data that you have given us. This page
         allows you to download or delete that data in accordance with the{" "}
         <Typography.Link href="https://gdpr.eu">
diff --git a/frontend/pages/me/manage/profile.tsx b/frontend/pages/me/manage/profile.tsx
index cd07480f5..78af2e468 100644
--- a/frontend/pages/me/manage/profile.tsx
+++ b/frontend/pages/me/manage/profile.tsx
@@ -17,7 +17,7 @@ function Page() {
 
   return (
     <ManageLayout>
-      <Typography.Paragraph>Hello {currentUser.name}!</Typography.Paragraph>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>Hello {currentUser.name}!</Typography.Paragraph>
       {/* TODO Change name, postal address, and website locator */}
       <SetUserPhoneNumber phoneNumber={currentUser.contact.phoneNumber} />
     </ManageLayout>
diff --git a/frontend/pages/me/manage/set-password.tsx b/frontend/pages/me/manage/set-password.tsx
index 69b806861..fd99144fa 100644
--- a/frontend/pages/me/manage/set-password.tsx
+++ b/frontend/pages/me/manage/set-password.tsx
@@ -60,7 +60,7 @@ function Page() {
 
   return (
     <ManageLayout>
-      <Typography.Paragraph>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
         You do not have a local username/password for this site. Add a local
         account so you can log in without an external login.
       </Typography.Paragraph>
diff --git a/frontend/pages/me/manage/two-factor-authentication.tsx b/frontend/pages/me/manage/two-factor-authentication.tsx
index 8dfb754de..706662b3e 100644
--- a/frontend/pages/me/manage/two-factor-authentication.tsx
+++ b/frontend/pages/me/manage/two-factor-authentication.tsx
@@ -98,7 +98,7 @@ function Page() {
           </GenerateUserTwoFactorRecoveryCodes>
         </>
       ) : (
-        <Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
           Two-factor authentication is disabled. You can enable it when you
           setup an authenticator app.
         </Typography.Paragraph>
diff --git a/frontend/pages/methods/index.tsx b/frontend/pages/methods/index.tsx
index c51c1def9..be321755f 100644
--- a/frontend/pages/methods/index.tsx
+++ b/frontend/pages/methods/index.tsx
@@ -1,33 +1,21 @@
-import { useQuery } from "@apollo/client/react";
 import Layout from "../../components/Layout";
 import { Typography } from "antd";
-import { MethodsDocument } from "../../queries/methods.generated";
 import paths from "../../paths";
 import Link from "next/link";
-import MethodTable from "../../components/methods/MethodTable";
-import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
-
-// TODO Pagination. See https://www.apollographql.com/docs/react/pagination/core-api/
-
-function Page() {
-  const { loading, error, data } = useQuery(MethodsDocument);
-  const nodes = data?.methods?.edges?.map((e) => e.node) || [];
-
-  useQueryHandler({ error });
+import PaginatedMethods from "../../components/methods/PaginatedMethods";
 
+export default function Page() {
   return (
     <Layout>
-      <Typography.Paragraph style={{ maxWidth: 768 }}>
-        <Link href={paths.data}>Data</Link> is created by applying a method.
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        <Link href={paths.allData}>Data</Link> is created by applying a method.
         Methods can be defined for example by a standard.
       </Typography.Paragraph>
-      <MethodTable loading={loading} methods={nodes} />
-      <Typography.Paragraph style={{ maxWidth: 768 }}>
+      <PaginatedMethods showJump />
+      <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         provides all information about methods.
       </Typography.Paragraph>
     </Layout>
   );
 }
-
-export default Page;
diff --git a/frontend/pages/open-id-connect/index.tsx b/frontend/pages/open-id-connect/index.tsx
index 2a79c9601..6b460975d 100644
--- a/frontend/pages/open-id-connect/index.tsx
+++ b/frontend/pages/open-id-connect/index.tsx
@@ -1,22 +1,16 @@
-import { useQuery } from "@apollo/client/react";
 import Layout from "../../components/Layout";
-import OpenIdConnectApplicationTable from "../../components/openIdConnect/applications/OpenIdConnectApplicationTable";
 import paths from "../../paths";
-import { ApplicationsDocument } from "../../queries/openIdConnect.generated";
 import { useRequireAuth } from "../../lib/hooks/useRequireAuth";
-import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
+import PaginatedOpenIdConnectApplications from "../../components/openIdConnect/applications/PaginatedOpenIdConnectApplications";
 
 function Page() {
-  const { authenticated } = useRequireAuth({ returnTo: paths.openIdConnect });
-  const { loading, error, data } = useQuery(ApplicationsDocument);
-  useQueryHandler({ error });
+  const { authenticated } = useRequireAuth({
+    returnTo: paths.openIdConnect,
+  });
 
   return (
     <Layout>
-      <OpenIdConnectApplicationTable
-        loading={!authenticated || loading}
-        applications={data?.openIdConnectApplications || []}
-      />
+      <PaginatedOpenIdConnectApplications showJump loading={!authenticated} />
     </Layout>
   );
 }
diff --git a/frontend/pages/users/check-your-inbox-after-password-reset-request.tsx b/frontend/pages/users/check-your-inbox-after-password-reset-request.tsx
index 2327fc61b..6c3c3f0f6 100644
--- a/frontend/pages/users/check-your-inbox-after-password-reset-request.tsx
+++ b/frontend/pages/users/check-your-inbox-after-password-reset-request.tsx
@@ -11,7 +11,7 @@ function CheckYourInboxAfterPasswordResetRequest() {
   return (
     <SingleSignOnLayout>
       <Card title="Check your inbox!">
-        <Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
           Confirm your password-reset request by following the confirmation link
           in your inbox and then{" "}
           <Link
diff --git a/frontend/pages/users/check-your-inbox-after-registration.tsx b/frontend/pages/users/check-your-inbox-after-registration.tsx
index 929d9c372..f9a49d73d 100644
--- a/frontend/pages/users/check-your-inbox-after-registration.tsx
+++ b/frontend/pages/users/check-your-inbox-after-registration.tsx
@@ -11,7 +11,7 @@ function CheckYourInboxAfterRegistration() {
   return (
     <Layout>
       <Card title="Check your inbox!">
-        <Typography.Paragraph>
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
           Confirm your email address by following the confirmation link in your
           inbox and then{" "}
           <Link
diff --git a/frontend/pages/users/confirm-email-change.tsx b/frontend/pages/users/confirm-email-change.tsx
index 6ce4ca9ce..e3534cfa5 100644
--- a/frontend/pages/users/confirm-email-change.tsx
+++ b/frontend/pages/users/confirm-email-change.tsx
@@ -73,7 +73,7 @@ function Page() {
 
   return (
     <Layout>
-      <Typography.Paragraph>Confirming email change ...</Typography.Paragraph>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>Confirming email change ...</Typography.Paragraph>
     </Layout>
   );
 }
diff --git a/frontend/pages/users/confirm-email.tsx b/frontend/pages/users/confirm-email.tsx
index 246726dc1..c60f6751b 100644
--- a/frontend/pages/users/confirm-email.tsx
+++ b/frontend/pages/users/confirm-email.tsx
@@ -68,7 +68,7 @@ function ConfirmUserEmail() {
 
   return (
     <Layout>
-      <Typography.Paragraph>Confirming email ...</Typography.Paragraph>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>Confirming email ...</Typography.Paragraph>
     </Layout>
   );
 }
diff --git a/frontend/pages/users/index.tsx b/frontend/pages/users/index.tsx
index 47d4c560f..7940e2a1d 100644
--- a/frontend/pages/users/index.tsx
+++ b/frontend/pages/users/index.tsx
@@ -1,61 +1,21 @@
-import { useQuery } from "@apollo/client/react";
 import Layout from "../../components/Layout";
-import { Table, Typography } from "antd";
-import { UsersDocument } from "../../queries/users.generated";
+import { Typography } from "antd";
 import paths from "../../paths";
-import { useState } from "react";
-import { setMapValue } from "../../lib/freeTextFilter";
-import {
-  getExternallyLinkedFilterableStringColumnProps,
-  getNameColumnProps,
-  getUuidColumnProps,
-} from "../../lib/table";
 import Link from "next/link";
-import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
-
-// TODO Pagination. See https://www.apollographql.com/docs/react/pagination/core-api/
+import PaginatedUsers from "../../components/users/PaginatedUsers";
 
 function Page() {
-  const { loading, error, data } = useQuery(UsersDocument);
-  const nodes = data?.users?.edges?.map((e) => e.node) || [];
-
-  const [filterText, setFilterText] = useState(() => new Map<string, string>());
-  const onFilterTextChange = setMapValue(filterText, setFilterText);
-
-  useQueryHandler({ error });
-
   return (
     <Layout>
-      <Typography.Paragraph style={{ maxWidth: 768 }}>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
         A user is usually affiliated to an{" "}
         <Link href={paths.institutions}>institution</Link>. In further steps,
         users can receive the permission for example to add{" "}
         <Link href={paths.components}>components</Link> manufactured by this{" "}
         <Link href={paths.institutions}>institution</Link>.
       </Typography.Paragraph>
-      <Table
-        loading={loading}
-        columns={[
-          getUuidColumnProps<(typeof nodes)[0]>(
-            onFilterTextChange,
-            (x) => filterText.get(x),
-            paths.user,
-          ),
-          getNameColumnProps<(typeof nodes)[0]>(onFilterTextChange, (x) =>
-            filterText.get(x),
-          ),
-          getExternallyLinkedFilterableStringColumnProps<(typeof nodes)[0]>(
-            "Email",
-            "contact",
-            (record) => record.contact.emailAddress,
-            onFilterTextChange,
-            (x) => filterText.get(x),
-            (record) => `mailto:${record.contact.emailAddress}`,
-          ),
-        ]}
-        dataSource={nodes}
-      />
-      <Typography.Paragraph style={{ maxWidth: 768 }}>
+      <PaginatedUsers showJump />
+      <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         can as well be used to find, for example, the users of your{" "}
         <Link href={paths.institutions}>institution</Link>.
diff --git a/frontend/pages/users/login/index.tsx b/frontend/pages/users/login/index.tsx
index 227fd5430..869ece00e 100644
--- a/frontend/pages/users/login/index.tsx
+++ b/frontend/pages/users/login/index.tsx
@@ -54,6 +54,7 @@ function Login() {
         onSuccess: async (data) => {
           const payload = data?.loginUser;
           if (!payload?.requiresTwoFactor && !payload?.user) {
+            setGlobalErrorMessages([]);
             messageMissingModel();
           } else {
             if (payload.requiresTwoFactor) {
diff --git a/frontend/pages/users/login/with-recovery-code.tsx b/frontend/pages/users/login/with-recovery-code.tsx
index 3fb7aeebc..f452e2aa8 100644
--- a/frontend/pages/users/login/with-recovery-code.tsx
+++ b/frontend/pages/users/login/with-recovery-code.tsx
@@ -73,7 +73,7 @@ function LoginWithRecoveryCode() {
         <Col>
           <Card title="Login">
             <ErrorAlert messages={globalErrorMessages} />
-            <Typography.Paragraph>
+            <Typography.Paragraph style={{ maxWidth: "75ch" }}>
               You have requested to log in with a recovery code. This login will
               not be remembered until you provide an authenticator app code at
               log in or disable two-factor authentication and log in again.
diff --git a/frontend/pages/users/login/with-two-factor-code.tsx b/frontend/pages/users/login/with-two-factor-code.tsx
index afc7bc13d..54910609c 100644
--- a/frontend/pages/users/login/with-two-factor-code.tsx
+++ b/frontend/pages/users/login/with-two-factor-code.tsx
@@ -84,7 +84,7 @@ function LoginWithTwoFactorCode() {
         <Col>
           <Card title="Login">
             <ErrorAlert messages={globalErrorMessages} />
-            <Typography.Paragraph>
+            <Typography.Paragraph style={{ maxWidth: "75ch" }}>
               Your login is protected with an authenticator app. Enter your
               authenticator code below.
             </Typography.Paragraph>
diff --git a/frontend/pages/users/register.tsx b/frontend/pages/users/register.tsx
index a3744736a..21f38e7ab 100644
--- a/frontend/pages/users/register.tsx
+++ b/frontend/pages/users/register.tsx
@@ -76,10 +76,10 @@ function Register() {
       <Row justify="center">
         <Col>
           <Card title="Register">
-            <Typography.Paragraph style={{ maxWidth: 768 }}>
+            <Typography.Paragraph style={{ maxWidth: "75ch" }}>
               No account is needed to query the{" "}
-              <Link href={paths.data}>data</Link> for free! However, if you want
-              to change information about{" "}
+              <Link href={paths.allData}>data</Link> for free! However, if you
+              want to change information about{" "}
               <Link href={paths.institutions}>institutions</Link>,{" "}
               <Link href={paths.dataFormats}>data formats</Link>,{" "}
               <Link href={paths.methods}>methods</Link>,{" "}
diff --git a/frontend/paths.ts b/frontend/paths.ts
index b234394a0..13836d908 100644
--- a/frontend/paths.ts
+++ b/frontend/paths.ts
@@ -1,4 +1,5 @@
 import type { Route } from "next";
+import { DataKind, Scalars } from "./__generated__/graphql";
 
 export default {
   home: "/" as Route,
@@ -6,17 +7,17 @@ export default {
   legalNotice: "/legal-notice" as Route,
   dataProtectionInformation: "/data-protection-information" as Route,
   databases: "/databases" as Route,
-  database(uuid: string) {
-    return `/databases/${encodeURIComponent(uuid)}` as Route;
+  database(id: Scalars["Uuid"]["output"]) {
+    return `/databases/${encodeURIComponent(id)}` as Route;
   },
   institutions: "/institutions" as Route,
-  institution(uuid: string) {
-    return `/institutions/${encodeURIComponent(uuid)}` as Route;
+  institution(id: Scalars["Uuid"]["output"]) {
+    return `/institutions/${encodeURIComponent(id)}` as Route;
   },
   institutionCreate: "/institutions/create" as Route,
   users: "/users" as Route,
-  user(uuid: string) {
-    return `/users/${encodeURIComponent(uuid)}` as Route;
+  user(id: Scalars["Uuid"]["output"]) {
+    return `/users/${encodeURIComponent(id)}` as Route;
   },
   userCurrent: "me" as Route,
   me: {
@@ -43,26 +44,88 @@ export default {
   userCheckYourInboxAfterPasswordResetRequest:
     "/users/check-your-inbox-after-password-reset-request" as Route,
   dataFormats: "/data-formats" as Route,
-  dataFormat(uuid: string) {
-    return `/data-formats/${encodeURIComponent(uuid)}` as Route;
+  dataFormat(id: Scalars["Uuid"]["output"]) {
+    return `/data-formats/${encodeURIComponent(id)}` as Route;
   },
   methods: "/methods" as Route,
-  method(uuid: string) {
-    return `/methods/${encodeURIComponent(uuid)}` as Route;
+  method(id: Scalars["Uuid"]["output"]) {
+    return `/methods/${encodeURIComponent(id)}` as Route;
   },
   components: "/components" as Route,
-  component(uuid: string) {
-    return `/components/${encodeURIComponent(uuid)}` as Route;
-  },
-  data: "/data" as Route,
-  calorimetricData: "/data/calorimetric" as Route,
-  hygrothermalData: "/data/hygrothermal" as Route,
-  lifeCycleData: "/data/life-cycle" as Route,
-  opticalData: "/data/optical" as Route,
-  photovoltaicData: "/data/photovoltaic" as Route,
-  geometricData: "/data/geometric" as Route,
-  openIdConnectApplication(uuid: string) {
-    return `/open-id-connect/application/${encodeURIComponent(uuid)}` as Route;
+  component(id: Scalars["Uuid"]["output"]) {
+    return `/components/${encodeURIComponent(id)}` as Route;
+  },
+  gnuPgKeyFingerprints: "/gnuPgKeys" as Route,
+  gnuPgKeyFingerprint(fingerprint: string) {
+    return `/gnuPgKeys/${encodeURIComponent(fingerprint)}` as Route;
+  },
+  allData: "/data" as Route,
+  data(
+    databaseId: Scalars["Uuid"]["output"],
+    dataKind: DataKind,
+    id: Scalars["Uuid"]["output"],
+  ) {
+    switch (dataKind) {
+      case DataKind.CalorimetricData:
+        return this.calorimetricData(databaseId, id);
+      case DataKind.GeometricData:
+        return this.geometricData(databaseId, id);
+      case DataKind.HygrothermalData:
+        return this.hygrothermalData(databaseId, id);
+      case DataKind.LifeCycleData:
+        return this.lifeCycleData(databaseId, id);
+      case DataKind.OpticalData:
+        return this.opticalData(databaseId, id);
+      case DataKind.PhotovoltaicData:
+        return this.photovoltaicData(databaseId, id);
+      default:
+        return assertNever(dataKind);
+    }
+  },
+  allCalorimetricData: "/data/calorimetric" as Route,
+  calorimetricData(
+    databaseId: Scalars["Uuid"]["output"],
+    id: Scalars["Uuid"]["output"],
+  ) {
+    return `/databases/${encodeURIComponent(databaseId)}/data/calorimetric/${encodeURIComponent(id)}` as Route;
+  },
+  allHygrothermalData: "/data/hygrothermal" as Route,
+  hygrothermalData(
+    databaseId: Scalars["Uuid"]["output"],
+    id: Scalars["Uuid"]["output"],
+  ) {
+    return `/databases/${encodeURIComponent(databaseId)}/data/hygrothermal/${encodeURIComponent(id)}` as Route;
+  },
+  allLifeCycleData: "/data/life-cycle" as Route,
+  lifeCycleData(
+    databaseId: Scalars["Uuid"]["output"],
+    id: Scalars["Uuid"]["output"],
+  ) {
+    return `/databases/${encodeURIComponent(databaseId)}/data/life-cycle/${encodeURIComponent(id)}` as Route;
+  },
+  allOpticalData: "/data/optical" as Route,
+  opticalData(
+    databaseId: Scalars["Uuid"]["output"],
+    id: Scalars["Uuid"]["output"],
+  ) {
+    return `/databases/${encodeURIComponent(databaseId)}/data/optical/${encodeURIComponent(id)}` as Route;
+  },
+  allPhotovoltaicData: "/data/photovoltaic" as Route,
+  photovoltaicData(
+    databaseId: Scalars["Uuid"]["output"],
+    id: Scalars["Uuid"]["output"],
+  ) {
+    return `/databases/${encodeURIComponent(databaseId)}/data/photovoltaic/${encodeURIComponent(id)}` as Route;
+  },
+  allGeometricData: "/data/geometric" as Route,
+  geometricData(
+    databaseId: Scalars["Uuid"]["output"],
+    id: Scalars["Uuid"]["output"],
+  ) {
+    return `/databases/${encodeURIComponent(databaseId)}/data/geometric/${encodeURIComponent(id)}` as Route;
+  },
+  openIdConnectApplication(id: Scalars["Uuid"]["output"]) {
+    return `/open-id-connect/application/${encodeURIComponent(id)}` as Route;
   },
   openIdConnectApplicationCreate:
     "/open-id-connect/application/create" as Route,
diff --git a/frontend/queries/common.graphql b/frontend/queries/common.graphql
new file mode 100644
index 000000000..fb9e7ed76
--- /dev/null
+++ b/frontend/queries/common.graphql
@@ -0,0 +1,34 @@
+fragment ContactInformationPartial on ContactInformation {
+  phoneNumber
+  isPhoneNumberConfirmed
+  postalAddress
+  emailAddress
+  isEmailAddressConfirmed
+  websiteLocator
+}
+
+fragment ReferencePartial on Reference {
+  ... on Standard {
+    abstract
+    section
+    title
+    locator
+    numeration {
+      mainNumber
+      prefix
+      suffix
+    }
+    standardizers
+    year
+  }
+  ... on Publication {
+    abstract
+    section
+    title
+    arXiv
+    authors
+    doi
+    urn
+    webAddress
+  }
+}
diff --git a/frontend/queries/components.graphql b/frontend/queries/components.graphql
index d2d19ac68..ad2e789c8 100644
--- a/frontend/queries/components.graphql
+++ b/frontend/queries/components.graphql
@@ -1,3 +1,5 @@
+#import "./common.graphql"
+
 fragment ComponentsPartial on Component {
   id
   uuid
@@ -9,43 +11,6 @@ fragment ComponentsPartial on Component {
     from
     to
   }
-}
-
-fragment ReferencePartial on Reference {
-  ... on Standard {
-    abstract
-    section
-    title
-    locator
-    numeration {
-      mainNumber
-      prefix
-      suffix
-    }
-    standardizers
-    year
-  }
-  ... on Publication {
-    abstract
-    section
-    title
-    arXiv
-    authors
-    doi
-    urn
-    webAddress
-  }
-}
-
-fragment ComponentPartial on Component {
-  ...ComponentsPartial
-  extras
-  manager {
-    node {
-      uuid
-      name
-    }
-  }
   prime {
     surface {
       description
@@ -66,6 +31,27 @@ fragment ComponentPartial on Component {
       ...ReferencePartial
     }
   }
+  manufacturers {
+    totalCount
+    edges {
+      node {
+        id
+        uuid
+        name
+      }
+    }
+  }
+}
+
+fragment ComponentPartial on Component {
+  ...ComponentsPartial
+  extras
+  manager {
+    node {
+      uuid
+      name
+    }
+  }
   manufacturers {
     totalCount
     edges {
@@ -164,9 +150,23 @@ fragment ComponentPartial on Component {
   isAuthorizedToUpdateNode
 }
 
-query ComponentNames {
-  components(first: 2147483646) {
+query ComponentNames(
+  $first: Int!
+  $after: String
+  $where: ComponentFilterInput
+  $order: [ComponentSortInput!]
+) {
+  connection: components(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
     totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
     edges {
       node {
         id
@@ -177,9 +177,23 @@ query ComponentNames {
   }
 }
 
-query Components {
-  components(first: 2147483646) {
+query Components(
+  $first: Int!
+  $after: String
+  $where: ComponentFilterInput
+  $order: [ComponentSortInput!]
+) {
+  connection: components(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
     totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
     edges {
       node {
         ...ComponentsPartial
diff --git a/frontend/queries/currentUser.graphql b/frontend/queries/currentUser.graphql
index 9e0350911..663b118d4 100644
--- a/frontend/queries/currentUser.graphql
+++ b/frontend/queries/currentUser.graphql
@@ -96,6 +96,7 @@ mutation ChangeUserEmail($input: ChangeUserEmailInput!) {
 
 query TwoFactorAuthentication {
   currentUser {
+    id
     twoFactorAuthentication {
       hasAuthenticator
       isEnabled
diff --git a/frontend/queries/data.graphql b/frontend/queries/data.graphql
index fbbcc7dac..a91322d43 100644
--- a/frontend/queries/data.graphql
+++ b/frontend/queries/data.graphql
@@ -1,41 +1,120 @@
+#import "./common.graphql"
+
+fragment GetHttpsResourcePartial on GetHttpsResource {
+  description
+  hashValue
+  locator
+  dataFormatId
+  dataFormat {
+    uuid
+    name
+  }
+  archivedFilesMetaInformation {
+    path
+    dataFormatId
+    dataFormat {
+      uuid
+      name
+    }
+  }
+}
+
+fragment AppliedMethodPartial on AppliedMethod {
+  methodId
+  method {
+    uuid
+    name
+  }
+  arguments {
+    name
+    value
+  }
+  sources {
+    name
+    value {
+      databaseId
+      database {
+        name
+      }
+      dataId
+      dataKind
+      dataTimestamp
+    }
+  }
+}
+
+fragment ToTreeVertexAppliedConversionMethodPartial on ToTreeVertexAppliedConversionMethod {
+  methodId
+  method {
+    uuid
+    name
+  }
+  arguments {
+    name
+    value
+  }
+  sourceName
+}
+
 fragment DataPartial on Data {
+  id
   uuid
   locale
   timestamp
-  componentId
-  databaseId
   name
   description
   warnings
   createdAt
+  componentId
+  component {
+    uuid
+    name
+  }
   creatorId
-  appliedMethod {
-    methodId
-    arguments {
+  creator {
+    uuid
+    name
+  }
+  databaseId
+  database {
+    uuid
+    name
+    locator
+  }
+  approvals {
+    approverId
+    approver {
+      uuid
       name
-      value
     }
-    sources {
-      name
-      value {
-        databaseId
-        dataId
-        dataKind
-        dataTimestamp
-      }
+    keyFingerprint
+    message
+    query
+    signature
+    statement {
+      ...ReferencePartial
     }
+    timestamp
+    variables
+  }
+  appliedMethod {
+    ...AppliedMethodPartial
   }
   resourceTree {
     root {
+      vertexId
       value {
-        description
-        hashValue
-        locator
-        dataFormatId
-        archivedFilesMetaInformation {
-          dataFormatId
-          path
-        }
+        ...GetHttpsResourcePartial
+      }
+    }
+    nonRootVertices {
+      vertexId
+      parentId
+      appliedConversionMethod {
+        ...ToTreeVertexAppliedConversionMethodPartial
+      }
+      value {
+        ...GetHttpsResourcePartial
       }
     }
   }
@@ -47,184 +126,211 @@ fragment CalorimetricDataPartial on CalorimetricData {
   uValues
 }
 
-query AllCalorimetricData($where: CalorimetricDataPropositionInput) {
-  databases {
+query CalorimetricData($databaseId: Uuid!, $id: Uuid!) {
+  data: calorimetricData(databaseId: $databaseId, id: $id) {
+    ...CalorimetricDataPartial
+  }
+}
+
+query AllCalorimetricData(
+  $first: NonNegativeInt!
+  $after: String
+  $where: CalorimetricDataPropositionInput
+) {
+  connection: allCalorimetricData(first: $first, after: $after, where: $where) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
     edges {
       node {
-        allCalorimetricData(where: $where) {
-          edges {
-            node {
-              ...CalorimetricDataPartial
-            }
-          }
-        }
+        ...CalorimetricDataPartial
       }
     }
   }
 }
 
 query HasCalorimetricData($where: CalorimetricDataPropositionInput) {
-  databases {
+  hasData: hasCalorimetricData(where: $where)
+}
+
+fragment GeometricDataPartial on GeometricData {
+  ...DataPartial
+  thicknesses
+}
+
+query GeometricData($databaseId: Uuid!, $id: Uuid!) {
+  data: geometricData(databaseId: $databaseId, id: $id) {
+    ...GeometricDataPartial
+  }
+}
+
+query AllGeometricData(
+  $first: NonNegativeInt!
+  $after: String
+  $where: GeometricDataPropositionInput
+) {
+  connection: allGeometricData(first: $first, after: $after, where: $where) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
     edges {
       node {
-        hasCalorimetricData(where: $where)
+        ...GeometricDataPartial
       }
     }
   }
 }
 
+query HasGeometricData($where: GeometricDataPropositionInput) {
+  hasData: hasGeometricData(where: $where)
+}
+
 fragment HygrothermalDataPartial on HygrothermalData {
   ...DataPartial
 }
 
-query AllHygrothermalData($where: HygrothermalDataPropositionInput) {
-  databases {
-    edges {
-      node {
-        allHygrothermalData(where: $where) {
-          edges {
-            node {
-              ...HygrothermalDataPartial
-            }
-          }
-        }
-      }
-    }
+query HygrothermalData($databaseId: Uuid!, $id: Uuid!) {
+  data: hygrothermalData(databaseId: $databaseId, id: $id) {
+    ...HygrothermalDataPartial
   }
 }
 
-query HasHygrothermalData($where: HygrothermalDataPropositionInput) {
-  databases {
+query AllHygrothermalData(
+  $first: NonNegativeInt!
+  $after: String
+  $where: HygrothermalDataPropositionInput
+) {
+  connection: allHygrothermalData(first: $first, after: $after, where: $where) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
     edges {
       node {
-        hasHygrothermalData(where: $where)
+        ...HygrothermalDataPartial
       }
     }
   }
 }
 
+query HasHygrothermalData($where: HygrothermalDataPropositionInput) {
+  hasData: hasHygrothermalData(where: $where)
+}
+
 fragment LifeCycleDataPartial on LifeCycleData {
   ...DataPartial
 }
 
-query AllLifeCycleData($where: LifeCycleDataPropositionInput) {
-  databases {
-    edges {
-      node {
-        allLifeCycleData(where: $where) {
-          edges {
-            node {
-              ...LifeCycleDataPartial
-            }
-          }
-        }
-      }
-    }
+query LifeCycleData($databaseId: Uuid!, $id: Uuid!) {
+  data: lifeCycleData(databaseId: $databaseId, id: $id) {
+    ...LifeCycleDataPartial
   }
 }
 
-query HasLifeCycleData($where: LifeCycleDataPropositionInput) {
-  databases {
+query AllLifeCycleData(
+  $first: NonNegativeInt!
+  $after: String
+  $where: LifeCycleDataPropositionInput
+) {
+  connection: allLifeCycleData(first: $first, after: $after, where: $where) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
     edges {
       node {
-        hasLifeCycleData(where: $where)
+        ...LifeCycleDataPartial
       }
     }
   }
 }
 
+query HasLifeCycleData($where: LifeCycleDataPropositionInput) {
+  hasData: hasLifeCycleData(where: $where)
+}
+
 fragment OpticalDataPartial on OpticalData {
   ...DataPartial
+  type
+  subtype
+  coatedSide
   infraredEmittances
   nearnormalHemisphericalSolarReflectances
   nearnormalHemisphericalSolarTransmittances
   nearnormalHemisphericalVisibleReflectances
   nearnormalHemisphericalVisibleTransmittances
+  cielabColors {
+    lStar
+    aStar
+    bStar
+  }
+  colorRenderingIndices
 }
 
-query AllOpticalData($where: OpticalDataPropositionInput) {
-  databases {
-    edges {
-      node {
-        allOpticalData(where: $where) {
-          edges {
-            node {
-              ...OpticalDataPartial
-            }
-          }
-        }
-      }
-    }
+query OpticalData($databaseId: Uuid!, $id: Uuid!) {
+  data: opticalData(databaseId: $databaseId, id: $id) {
+    ...OpticalDataPartial
   }
 }
 
-query HasOpticalData($where: OpticalDataPropositionInput) {
-  databases {
+query AllOpticalData(
+  $first: NonNegativeInt!
+  $after: String
+  $where: OpticalDataPropositionInput
+) {
+  connection: allOpticalData(first: $first, after: $after, where: $where) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
     edges {
       node {
-        hasOpticalData(where: $where)
+        ...OpticalDataPartial
       }
     }
   }
 }
 
+query HasOpticalData($where: OpticalDataPropositionInput) {
+  hasData: hasOpticalData(where: $where)
+}
+
 fragment PhotovoltaicDataPartial on PhotovoltaicData {
   ...DataPartial
 }
 
-query AllPhotovoltaicData($where: PhotovoltaicDataPropositionInput) {
-  databases {
-    edges {
-      node {
-        allPhotovoltaicData(where: $where) {
-          edges {
-            node {
-              ...PhotovoltaicDataPartial
-            }
-          }
-        }
-      }
-    }
+query PhotovoltaicData($databaseId: Uuid!, $id: Uuid!) {
+  data: photovoltaicData(databaseId: $databaseId, id: $id) {
+    ...PhotovoltaicDataPartial
   }
 }
 
-query HasPhotovoltaicData($where: PhotovoltaicDataPropositionInput) {
-  databases {
-    edges {
-      node {
-        hasPhotovoltaicData(where: $where)
-      }
+query AllPhotovoltaicData(
+  $first: NonNegativeInt!
+  $after: String
+  $where: PhotovoltaicDataPropositionInput
+) {
+  connection: allPhotovoltaicData(first: $first, after: $after, where: $where) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
     }
-  }
-}
-
-fragment GeometricDataPartial on GeometricData {
-  ...DataPartial
-  thicknesses
-}
-
-query AllGeometricData($where: GeometricDataPropositionInput) {
-  databases {
     edges {
       node {
-        allGeometricData(where: $where) {
-          edges {
-            node {
-              ...GeometricDataPartial
-            }
-          }
-        }
+        ...PhotovoltaicDataPartial
       }
     }
   }
 }
 
-query HasGeometricData($where: GeometricDataPropositionInput) {
-  databases {
-    edges {
-      node {
-        hasGeometricData(where: $where)
-      }
-    }
-  }
+query HasPhotovoltaicData($where: PhotovoltaicDataPropositionInput) {
+  hasData: hasPhotovoltaicData(where: $where)
 }
diff --git a/frontend/queries/dataFormats.graphql b/frontend/queries/dataFormats.graphql
index 3ba092594..a750c287b 100644
--- a/frontend/queries/dataFormats.graphql
+++ b/frontend/queries/dataFormats.graphql
@@ -1,3 +1,5 @@
+#import "./common.graphql"
+
 fragment DataFormatsPartial on DataFormat {
   id
   uuid
@@ -7,29 +9,7 @@ fragment DataFormatsPartial on DataFormat {
   mediaType
   schemaLocator
   reference {
-    ... on Standard {
-      abstract
-      section
-      title
-      locator
-      numeration {
-        mainNumber
-        prefix
-        suffix
-      }
-      standardizers
-      year
-    }
-    ... on Publication {
-      abstract
-      section
-      title
-      arXiv
-      authors
-      doi
-      urn
-      webAddress
-    }
+    ...ReferencePartial
   }
 }
 
@@ -45,8 +25,50 @@ fragment DataFormatPartial on DataFormat {
   }
 }
 
-query DataFormats {
-  dataFormats {
+query DataFormatNames(
+  $first: Int!
+  $after: String
+  $where: DataFormatFilterInput
+  $order: [DataFormatSortInput!]
+) {
+  connection: dataFormats(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+    edges {
+      node {
+        id
+        uuid
+        name
+      }
+    }
+  }
+}
+
+query DataFormats(
+  $first: Int!
+  $after: String
+  $where: DataFormatFilterInput
+  $order: [DataFormatSortInput!]
+) {
+  connection: dataFormats(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
     edges {
       node {
         ...DataFormatsPartial
diff --git a/frontend/queries/databases.graphql b/frontend/queries/databases.graphql
index 866918fa0..42c6de2a0 100644
--- a/frontend/queries/databases.graphql
+++ b/frontend/queries/databases.graphql
@@ -15,9 +15,7 @@ fragment DatabasesPartial on Database {
 }
 
 fragment PendingDatabasesPartial on Database {
-  id
-  uuid
-  name
+  ...DatabasesPartial
   isAuthorizedToVerifyNode
 }
 
@@ -27,8 +25,50 @@ fragment DatabasePartial on Database {
   isAuthorizedToVerifyNode
 }
 
-query Databases {
-  databases {
+query DatabaseNames(
+  $first: Int!
+  $after: String
+  $where: DatabaseFilterInput
+  $order: [DatabaseSortInput!]
+) {
+  connection: databases(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+    edges {
+      node {
+        id
+        uuid
+        name
+      }
+    }
+  }
+}
+
+query Databases(
+  $first: Int!
+  $after: String
+  $where: DatabaseFilterInput
+  $order: [DatabaseSortInput!]
+) {
+  connection: databases(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
     edges {
       node {
         ...DatabasesPartial
diff --git a/frontend/queries/gnuPgKeyFingerprints.graphql b/frontend/queries/gnuPgKeyFingerprints.graphql
index 39d7af37a..ed2cd9bd7 100644
--- a/frontend/queries/gnuPgKeyFingerprints.graphql
+++ b/frontend/queries/gnuPgKeyFingerprints.graphql
@@ -1,6 +1,7 @@
 fragment GnuPgKeyFingerprintsPartial on GnuPgKeyFingerprint {
   id
   uuid
+  name: fingerprint
   fingerprint
   allowedAt
   forbiddenAt
@@ -10,10 +11,71 @@ fragment GnuPgKeyFingerprintsPartial on GnuPgKeyFingerprint {
       name
     }
   }
+  institution {
+    node {
+      uuid
+    }
+  }
   isAuthorizedToAllowNode
   isAuthorizedToForbidNode
 }
 
+fragment GnuPgKeyFingerprintPartial on GnuPgKeyFingerprint {
+  ...GnuPgKeyFingerprintsPartial
+}
+
+query GnuPgKeyFingerprintNames(
+  $first: Int!
+  $after: String
+  $where: GnuPgKeyFingerprintFilterInput
+  $order: [GnuPgKeyFingerprintSortInput!]
+) {
+  connection: gnuPgKeyFingerprints(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+    edges {
+      node {
+        id
+        uuid
+        name: fingerprint
+      }
+    }
+  }
+}
+
+query GnuPgKeyFingerprints(
+  $first: Int!
+  $after: String
+  $where: GnuPgKeyFingerprintFilterInput
+  $order: [GnuPgKeyFingerprintSortInput!]
+) {
+  connection: gnuPgKeyFingerprints(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+    edges {
+      node {
+        ...GnuPgKeyFingerprintsPartial
+      }
+    }
+  }
+}
+
 mutation AddGnuPgKeyFingerprint($input: AddGnuPgKeyFingerprintInput!) {
   addGnuPgKeyFingerprint(input: $input) {
     gnuPgKeyFingerprint {
@@ -54,3 +116,9 @@ mutation ForbidGnuPgKeyFingerprint($fingerprint: String!) {
     }
   }
 }
+
+query GnuPgKeyFingerprint($fingerprint: String!) {
+  gnuPgKeyFingerprint(fingerprint: $fingerprint) {
+    ...GnuPgKeyFingerprintPartial
+  }
+}
diff --git a/frontend/queries/institutions.graphql b/frontend/queries/institutions.graphql
index ea1ddf1ce..bc37c170a 100644
--- a/frontend/queries/institutions.graphql
+++ b/frontend/queries/institutions.graphql
@@ -1,3 +1,4 @@
+#import "./common.graphql"
 #import "./components.graphql"
 #import "./dataFormats.graphql"
 #import "./databases.graphql"
@@ -5,56 +6,47 @@
 #import "./methods.graphql"
 #import "./openIdConnect.graphql"
 
-fragment ContactInformationPartial on ContactInformation {
-  phoneNumber
-  isPhoneNumberConfirmed
-  postalAddress
-  emailAddress
-  isEmailAddressConfirmed
-  websiteLocator
-}
-
 fragment InstitutionsPartial on Institution {
   id
   uuid
   name
   abbreviation
   description
+  state
+  operatingState
+  contact {
+    ...ContactInformationPartial
+  }
+  representatives {
+    totalCount
+    edges {
+      node {
+        id
+        uuid
+        name
+      }
+      role
+    }
+  }
 }
 
 fragment PendingInstitutionsPartial on Institution {
-  id
-  uuid
-  name
+  ...InstitutionsPartial
   isAuthorizedToVerifyNode
 }
 
 fragment InstitutionPartial on Institution {
   ...InstitutionsPartial
-  contact {
-    ...ContactInformationPartial
-  }
-  state
-  operatingState
   extras
+  isAuthorizedToVerifyNode
   isAuthorizedToUpdateNode
   isAuthorizedToDeleteNode
   isAuthorizedToSwitchOperatingStateOfNode
   manufacturedComponents {
     totalCount
-    edges {
-      node {
-        ...ComponentsPartial
-      }
-    }
   }
   managedComponents {
     totalCount
-    edges {
-      node {
-        ...ComponentsPartial
-      }
-    }
     isAuthorizedToAddEdge
   }
   pendingManufacturedComponents {
@@ -70,11 +62,6 @@ fragment InstitutionPartial on Institution {
   }
   operatedDatabases {
     totalCount
-    edges {
-      node {
-        ...DatabasesPartial
-      }
-    }
     isAuthorizedToAddEdge
   }
   representatives {
@@ -111,29 +98,14 @@ fragment InstitutionPartial on Institution {
   }
   managedDataFormats {
     totalCount
-    edges {
-      node {
-        ...DataFormatsPartial
-      }
-    }
     isAuthorizedToAddEdge
   }
   managedMethods {
     totalCount
-    edges {
-      node {
-        ...MethodsPartial
-      }
-    }
     isAuthorizedToAddEdge
   }
   developedMethods {
     totalCount
-    edges {
-      node {
-        ...MethodsPartial
-      }
-    }
   }
   pendingDevelopedMethods {
     totalCount
@@ -157,28 +129,31 @@ fragment InstitutionPartial on Institution {
   }
   openIdConnectApplications {
     totalCount
-    edges {
-      node {
-        ...OpenIdConnectApplicationsPartial
-      }
-    }
     isAuthorizedToAddEdge
   }
   managedInstitutions {
     totalCount
-    edges {
-      node {
-        id
-        uuid
-        name
-      }
-    }
     isAuthorizedToAddEdge
   }
 }
 
-query InstitutionNames {
-  institutions(first: 2147483646) {
+query InstitutionNames(
+  $first: Int!
+  $after: String
+  $where: InstitutionFilterInput
+  $order: [InstitutionSortInput!]
+) {
+  connection: institutions(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
     edges {
       node {
         id
@@ -189,9 +164,23 @@ query InstitutionNames {
   }
 }
 
-query Institutions {
-  institutions(first: 2147483646) {
+query Institutions(
+  $first: Int!
+  $after: String
+  $where: InstitutionFilterInput
+  $order: [InstitutionSortInput!]
+) {
+  connection: institutions(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
     totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
     edges {
       node {
         ...InstitutionsPartial
diff --git a/frontend/queries/methods.graphql b/frontend/queries/methods.graphql
index bcd4035c9..9c0e5b3c4 100644
--- a/frontend/queries/methods.graphql
+++ b/frontend/queries/methods.graphql
@@ -1,3 +1,5 @@
+#import "./common.graphql"
+
 fragment MethodsPartial on Method {
   id
   uuid
@@ -13,60 +15,16 @@ fragment MethodsPartial on Method {
     from
     to
   }
-  reference {
-    ... on Standard {
-      abstract
-      section
-      title
-      locator
-      numeration {
-        mainNumber
-        prefix
-        suffix
-      }
-      standardizers
-      year
-    }
-    ... on Publication {
-      abstract
-      section
-      title
-      arXiv
-      authors
-      doi
-      urn
-      webAddress
-    }
+  parameters {
+    name
+    type
+  }
+  sources {
+    name
+    description
   }
-}
-
-fragment MethodPartial on Method {
-  ...MethodsPartial
-  isAuthorizedToUpdateNode
   reference {
-    ... on Standard {
-      abstract
-      section
-      title
-      locator
-      numeration {
-        mainNumber
-        prefix
-        suffix
-      }
-      standardizers
-      year
-    }
-    ... on Publication {
-      abstract
-      section
-      title
-      arXiv
-      authors
-      doi
-      urn
-      webAddress
-    }
+    ...ReferencePartial
   }
   developers {
     edges {
@@ -83,6 +41,32 @@ fragment MethodPartial on Method {
           name
         }
       }
+    }
+  }
+}
+
+fragment MethodDeveloperStakeholderPartial on Stakeholder {
+  ... on Institution {
+    id
+    uuid
+    name
+    description
+  }
+  ... on User {
+    id
+    uuid
+    name
+  }
+}
+
+fragment MethodPartial on Method {
+  ...MethodsPartial
+  isAuthorizedToUpdateNode
+  developers {
+    edges {
+      node {
+        ...MethodDeveloperStakeholderPartial
+      }
       isAuthorizedToConfirmEdge
       isAuthorizedToRemoveEdge
     }
@@ -92,17 +76,7 @@ fragment MethodPartial on Method {
   pendingDevelopers {
     edges {
       node {
-        ... on Institution {
-          id
-          uuid
-          name
-          description
-        }
-        ... on User {
-          id
-          uuid
-          name
-        }
+        ...MethodDeveloperStakeholderPartial
       }
       isAuthorizedToConfirmEdge
       isAuthorizedToRemoveEdge
@@ -117,8 +91,50 @@ fragment MethodPartial on Method {
   }
 }
 
-query Methods {
-  methods {
+query MethodNames(
+  $first: Int!
+  $after: String
+  $where: MethodFilterInput
+  $order: [MethodSortInput!]
+) {
+  connection: methods(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+    edges {
+      node {
+        id
+        uuid
+        name
+      }
+    }
+  }
+}
+
+query Methods(
+  $first: Int!
+  $after: String
+  $where: MethodFilterInput
+  $order: [MethodSortInput!]
+) {
+  connection: methods(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
     edges {
       node {
         ...MethodsPartial
diff --git a/frontend/queries/openIdConnect.graphql b/frontend/queries/openIdConnect.graphql
index 4788eebbc..83ed2704a 100644
--- a/frontend/queries/openIdConnect.graphql
+++ b/frontend/queries/openIdConnect.graphql
@@ -1,16 +1,30 @@
 fragment OpenIdConnectApplicationsPartial on OpenIdConnectApplication {
   id
   uuid
+  name: clientId
   clientId
+  description: displayName
   displayName
   postLogoutRedirectUri
   redirectUri
+  consentType
+  endpoints
+  grantTypes
+  responseTypes
+  scopes
+  requirements
+  owner {
+    node {
+      uuid
+      name
+    }
+  }
 }
 
 fragment OpenIdConnectAuthorizationPartial on OpenIdConnectAuthorization {
   id
   uuid
-  creationDate
+  createdAt
   status
   subject
   type
@@ -20,9 +34,9 @@ fragment OpenIdConnectAuthorizationPartial on OpenIdConnectAuthorization {
 fragment OpenIdConnectTokenPartial on OpenIdConnectToken {
   id
   uuid
-  creationDate
-  expirationDate
-  redemptionDate
+  createdAt
+  expiredAt
+  redeemedAt
   status
   subject
   type
@@ -31,20 +45,9 @@ fragment OpenIdConnectTokenPartial on OpenIdConnectToken {
 
 fragment OpenIdConnectApplicationPartial on OpenIdConnectApplication {
   ...OpenIdConnectApplicationsPartial
-  consentType
-  endpoints
-  grantTypes
-  responseTypes
-  scopes
-  requirements
   isAuthorizedToManageNode
-  owner {
-    node {
-      uuid
-      name
-    }
-  }
   authorizations {
+    totalCount
     edges {
       node {
         ...OpenIdConnectAuthorizationPartial
@@ -52,6 +55,7 @@ fragment OpenIdConnectApplicationPartial on OpenIdConnectApplication {
     }
   }
   tokens {
+    totalCount
     edges {
       node {
         ...OpenIdConnectTokenPartial
@@ -60,9 +64,55 @@ fragment OpenIdConnectApplicationPartial on OpenIdConnectApplication {
   }
 }
 
-query Applications {
-  openIdConnectApplications {
-    ...OpenIdConnectApplicationsPartial
+query ApplicationNames(
+  $first: Int!
+  $after: String
+  $where: OpenIdConnectApplicationFilterInput
+  $order: [OpenIdConnectApplicationSortInput!]
+) {
+  connection: openIdConnectApplications(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+    edges {
+      node {
+        id
+        uuid
+        name: clientId
+      }
+    }
+  }
+}
+
+query Applications(
+  $first: Int!
+  $after: String
+  $where: OpenIdConnectApplicationFilterInput
+  $order: [OpenIdConnectApplicationSortInput!]
+) {
+  connection: openIdConnectApplications(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+    edges {
+      node {
+        ...OpenIdConnectApplicationsPartial
+      }
+    }
   }
 }
 
diff --git a/frontend/queries/users.graphql b/frontend/queries/users.graphql
index 5fea1b5c7..c6ca0f3df 100644
--- a/frontend/queries/users.graphql
+++ b/frontend/queries/users.graphql
@@ -1,10 +1,23 @@
+#import "./common.graphql"
+
 fragment UsersPartial on User {
   id
   uuid
   name
   contact {
-    emailAddress
-    isEmailAddressConfirmed
+    ...ContactInformationPartial
+  }
+  roles
+  representedInstitutions {
+    totalCount
+    edges {
+      node {
+        id
+        uuid
+        name
+      }
+      role
+    }
   }
 }
 
@@ -13,12 +26,7 @@ fragment UserPartial on User {
   uuid
   name
   contact {
-    emailAddress
-    isEmailAddressConfirmed
-    phoneNumber
-    isPhoneNumberConfirmed
-    websiteLocator
-    postalAddress
+    ...ContactInformationPartial
   }
   roles
   rolesCurrentUserCanAdd
@@ -26,6 +34,7 @@ fragment UserPartial on User {
   isAuthorizedToDeleteUser
   isAuthorizedToManageOpenIdConnect
   developedMethods {
+    totalCount
     edges {
       node {
         id
@@ -35,6 +44,7 @@ fragment UserPartial on User {
     }
   }
   pendingDevelopedMethods {
+    totalCount
     edges {
       node {
         id
@@ -45,30 +55,51 @@ fragment UserPartial on User {
     isAuthorizedToConfirmEdges
   }
   representedInstitutions {
+    totalCount
     edges {
       node {
         id
         uuid
         name
       }
+      role
+      isAuthorizedToRemoveEdge
     }
   }
   pendingRepresentedInstitutions {
+    totalCount
     edges {
       node {
         id
         uuid
         name
       }
+      role
     }
     isAuthorizedToConfirmEdges
   }
 }
 
-query UserNames {
-  users {
+query UserNames(
+  $first: Int!
+  $after: String
+  $where: UserFilterInput
+  $order: [UserSortInput!]
+) {
+  connection: users(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
     edges {
       node {
+        id
         uuid
         name
       }
@@ -76,8 +107,23 @@ query UserNames {
   }
 }
 
-query Users {
-  users {
+query Users(
+  $first: Int!
+  $after: String
+  $where: UserFilterInput
+  $order: [UserSortInput!]
+) {
+  connection: users(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
     edges {
       node {
         ...UsersPartial
diff --git a/frontend/styles/global.css b/frontend/styles/global.css
index f61b4468f..13143a34e 100644
--- a/frontend/styles/global.css
+++ b/frontend/styles/global.css
@@ -1,8 +1,4 @@
-.message {
-  margin-top: 10hv;
-}
-
-.error-message {
-  margin-top: 5px;
-  margin-bottom: 5px;
-}
+/* .ant-modal-container { */
+/*   width: 100%; */
+/*   max-width: 1024px; */
+/* } */
diff --git a/frontend/type-defs.graphqls b/frontend/type-defs.graphqls
index dd06ce132..77b33725d 100644
--- a/frontend/type-defs.graphqls
+++ b/frontend/type-defs.graphqls
@@ -16,11 +16,15 @@ interface Approval {
 interface Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
+  component: Component
   componentId: Uuid!
   createdAt: DateTime!
+  creator: Institution
   creatorId: Uuid!
+  database: Database
   databaseId: Uuid!
   description: String
+  id: ID!
   kind: DataKind!
   locale: Locale!
   name: String
@@ -179,7 +183,7 @@ type AppliedMethod {
   sources: [NamedMethodSource!]!
 }
 
-type CalorimetricData implements Data {
+type CalorimetricData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
   component: Component @cost(weight: "10")
@@ -204,14 +208,14 @@ type CalorimetricData implements Data {
 }
 
 type CalorimetricDataConnection {
-  edges: [CalorimetricDataEdge!]!
-  pageInfo: PageInfo!
+  edges: [CalorimetricDataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
   totalCount: NonNegativeInt!
 }
 
 type CalorimetricDataEdge {
   cursor: String!
-  node: CalorimetricData!
+  node: CalorimetricData! @cost(weight: "0")
 }
 
 type ChangeInstitutionRepresentativeRoleError implements UserError {
@@ -259,101 +263,103 @@ type CielabColor {
 
 type Component implements Node {
   abbreviation: String
-  assembledOf(where: ComponentAssembledOfFilterInput @cost(weight: "10")): ComponentAssembledOfConnection! @cost(weight: "10")
+  assembledOf(order: [ComponentAssembledOfSortInput!] @cost(weight: "10") where: ComponentAssembledOfFilterInput @cost(weight: "10")): ComponentAssembledOfConnection! @cost(weight: "10")
   availability: OpenEndedDateTimeRange
   categories: [ComponentCategory!]!
-  concretizationOf(where: ComponentConcretizationOfFilterInput @cost(weight: "10")): ComponentConcretizationOfConnection! @cost(weight: "10")
+  concretizationOf(order: [ComponentConcretizationOfSortInput!] @cost(weight: "10") where: ComponentConcretizationOfFilterInput @cost(weight: "10")): ComponentConcretizationOfConnection! @cost(weight: "10")
+  createdAt: DateTime!
   description: String!
   extras: Any
-  generalizationOf(where: ComponentGeneralizationOfFilterInput @cost(weight: "10")): ComponentGeneralizationOfConnection! @cost(weight: "10")
+  generalizationOf(order: [ComponentGeneralizationOfSortInput!] @cost(weight: "10") where: ComponentGeneralizationOfFilterInput @cost(weight: "10")): ComponentGeneralizationOfConnection! @cost(weight: "10")
   id: ID!
-  isAuthorizedToUpdateNode: Boolean! @cost(weight: "10")
+  isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
   manager: ComponentManagerEdge! @cost(weight: "10")
-  manufacturers(where: ComponentManufacturerFilterInput @cost(weight: "10")): ComponentManufacturerConnection! @cost(weight: "10")
+  manufacturers(order: [ComponentManufacturerSortInput!] @cost(weight: "10") where: ComponentManufacturerFilterInput @cost(weight: "10")): ComponentManufacturerConnection! @cost(weight: "10")
   name: String!
-  partOf(where: ComponentPartOfFilterInput @cost(weight: "10")): ComponentPartOfConnection! @cost(weight: "10")
-  pendingManufacturers(where: ComponentManufacturerFilterInput @cost(weight: "10")): PendingComponentManufacturerConnection @authorize(policy: "WriteScope") @cost(weight: "10")
-  prime: PrimeSurfaceOrDirection @cost(weight: "10")
+  partOf(order: [ComponentPartOfSortInput!] @cost(weight: "10") where: ComponentPartOfFilterInput @cost(weight: "10")): ComponentPartOfConnection! @cost(weight: "10")
+  pendingManufacturers(order: [ComponentManufacturerSortInput!] @cost(weight: "10") where: ComponentManufacturerFilterInput @cost(weight: "10")): PendingComponentManufacturerConnection @authorize(policy: "WriteScope") @cost(weight: "10")
+  prime: PrimeSurfaceOrDirection @cost(weight: "0")
   switchableLayers: DescriptionOrReference
-  uuid: Uuid! @cost(weight: "10")
-  variantOf(where: ComponentVariantOfFilterInput @cost(weight: "10")): ComponentVariantOfConnection! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
+  variantOf(order: [ComponentVariantOfSortInput!] @cost(weight: "10") where: ComponentVariantOfFilterInput @cost(weight: "10")): ComponentVariantOfConnection! @cost(weight: "10")
 }
 
 type ComponentAssembledOfConnection {
-  edges: [ComponentAssembledOfEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [ComponentAssembledOfEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type ComponentAssembledOfEdge {
-  index: Byte
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToUpdateEdge: Boolean! @cost(weight: "10")
-  node: Component! @cost(weight: "10")
+  index: UnsignedByte
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToUpdateEdge: Boolean! @cost(weight: "1")
+  node: Component! @cost(weight: "0")
   primeSurface: PrimeSurface
 }
 
 type ComponentConcretizationOfConnection {
-  edges: [ComponentConcretizationOfEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [ComponentConcretizationOfEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type ComponentConcretizationOfEdge {
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: Component! @cost(weight: "10")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Component! @cost(weight: "0")
 }
 
 type ComponentGeneralizationOfConnection {
-  edges: [ComponentGeneralizationOfEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [ComponentGeneralizationOfEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type ComponentGeneralizationOfEdge {
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: Component! @cost(weight: "10")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Component! @cost(weight: "0")
 }
 
 type ComponentManagerEdge {
-  node: Institution! @cost(weight: "10")
+  node: Institution! @cost(weight: "0")
 }
 
 type ComponentManufacturerConnection {
-  edges: [ComponentManufacturerEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [ComponentManufacturerEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type ComponentManufacturerEdge {
-  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: Institution! @cost(weight: "10")
+  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Institution! @cost(weight: "0")
 }
 
 type ComponentPartOfConnection {
-  edges: [ComponentPartOfEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [ComponentPartOfEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type ComponentPartOfEdge {
-  index: Byte
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToUpdateEdge: Boolean! @cost(weight: "10")
-  node: Component! @cost(weight: "10")
+  index: UnsignedByte
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToUpdateEdge: Boolean! @cost(weight: "1")
+  node: Component! @cost(weight: "0")
   primeSurface: PrimeSurface
 }
 
 type ComponentVariantOfConnection {
-  edges: [ComponentVariantOfEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [ComponentVariantOfEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type ComponentVariantOfEdge {
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: Component! @cost(weight: "10")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Component! @cost(weight: "0")
 }
 
 "A connection to a list of items."
@@ -533,7 +539,7 @@ type CreateOpenIdConnectApplicationPayload {
 }
 
 type CrossDatabaseDataReference {
-  database: Institution @cost(weight: "10")
+  database: Database @cost(weight: "10")
   databaseId: Uuid!
   dataId: Uuid!
   dataKind: DataKind!
@@ -553,31 +559,33 @@ type DataApproval implements Approval {
 }
 
 type DataConnection {
-  edges: [DataEdge!]!
-  pageInfo: PageInfo!
+  edges: [DataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
   totalCount: NonNegativeInt!
 }
 
 type DataEdge {
   cursor: String!
-  node: Data!
+  node: Data! @cost(weight: "0")
 }
 
 type DataFormat implements Node {
+  createdAt: DateTime!
   description: String!
   extension: String
   id: ID!
-  isAuthorizedToUpdateNode: Boolean! @cost(weight: "10")
+  isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
   manager: DataFormatManagerEdge! @cost(weight: "10")
   mediaType: String!
   name: String!
-  reference: Reference @cost(weight: "10")
+  reference: Reference @cost(weight: "0")
   schemaLocator: Url
-  uuid: Uuid! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
 }
 
 type DataFormatManagerEdge {
-  node: Institution! @cost(weight: "10")
+  node: Institution! @cost(weight: "0")
 }
 
 "A connection to a list of items."
@@ -606,6 +614,7 @@ type Database implements Node {
   allOpticalData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: OpticalDataPropositionInput): OpticalDataConnection @cost(weight: "10")
   allPhotovoltaicData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: PhotovoltaicDataPropositionInput): PhotovoltaicDataConnection @cost(weight: "10")
   calorimetricData(id: Uuid! locale: Locale): CalorimetricData @cost(weight: "10")
+  createdAt: DateTime!
   data(id: Uuid! kind: DataKind! locale: Locale): Data @cost(weight: "10")
   description: String!
   geometricData(id: Uuid! locale: Locale): GeometricData @cost(weight: "10")
@@ -618,21 +627,22 @@ type Database implements Node {
   hasPhotovoltaicData(locale: Locale where: PhotovoltaicDataPropositionInput): Boolean @cost(weight: "10")
   hygrothermalData(id: Uuid! locale: Locale): HygrothermalData @cost(weight: "10")
   id: ID!
-  isAuthorizedToUpdateNode: Boolean! @cost(weight: "10")
-  isAuthorizedToVerifyNode: Boolean! @cost(weight: "10")
+  isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
+  isAuthorizedToVerifyNode: Boolean! @cost(weight: "1")
   lifeCycleData(id: Uuid! locale: Locale): LifeCycleData @cost(weight: "10")
   locator: Url!
   name: String!
   operator: DatabaseOperatorEdge! @cost(weight: "10")
   opticalData(id: Uuid! locale: Locale): OpticalData @cost(weight: "10")
   photovoltaicData(id: Uuid! locale: Locale): PhotovoltaicData @cost(weight: "10")
-  uuid: Uuid! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
   verificationCode: String!
   verificationState: DatabaseVerificationState!
 }
 
 type DatabaseOperatorEdge {
-  node: Institution! @cost(weight: "10")
+  node: Institution! @cost(weight: "0")
 }
 
 "A connection to a list of items."
@@ -712,7 +722,7 @@ type DeleteUserPayload {
 
 type DescriptionOrReference {
   description: String
-  reference: Reference @cost(weight: "10")
+  reference: Reference @cost(weight: "0")
 }
 
 type DisableUserTwoFactorAuthenticationError implements UserError {
@@ -799,7 +809,7 @@ type GenerateUserTwoFactorRecoveryCodesPayload {
   user: User
 }
 
-type GeometricData implements Data {
+type GeometricData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
   component: Component @cost(weight: "10")
@@ -823,14 +833,14 @@ type GeometricData implements Data {
 }
 
 type GeometricDataConnection {
-  edges: [GeometricDataEdge!]!
-  pageInfo: PageInfo!
+  edges: [GeometricDataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
   totalCount: NonNegativeInt!
 }
 
 type GeometricDataEdge {
   cursor: String!
-  node: GeometricData!
+  node: GeometricData! @cost(weight: "0")
 }
 
 type GetHttpsResource {
@@ -866,18 +876,19 @@ type GnuPgKeyFingerprint implements Node {
   forbiddenAt: DateTime
   id: ID!
   institution: GnuPgKeyFingerprintInstitutionEdge! @cost(weight: "10")
-  isAuthorizedToAllowNode: Boolean! @cost(weight: "10")
-  isAuthorizedToForbidNode: Boolean! @cost(weight: "10")
+  isAuthorizedToAllowNode: Boolean! @cost(weight: "1")
+  isAuthorizedToForbidNode: Boolean! @cost(weight: "1")
+  updatedAt: DateTime!
   user: GnuPgKeyFingerprintUserEdge! @cost(weight: "10")
-  uuid: Uuid! @cost(weight: "10")
+  uuid: Uuid!
 }
 
 type GnuPgKeyFingerprintInstitutionEdge {
-  node: Institution! @cost(weight: "10")
+  node: Institution! @cost(weight: "0")
 }
 
 type GnuPgKeyFingerprintUserEdge {
-  node: User! @cost(weight: "10")
+  node: User! @cost(weight: "0")
 }
 
 "A connection to a list of items."
@@ -898,7 +909,7 @@ type GnuPgKeyFingerprintsEdge {
   node: GnuPgKeyFingerprint!
 }
 
-type HygrothermalData implements Data {
+type HygrothermalData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
   component: Component @cost(weight: "10")
@@ -921,60 +932,64 @@ type HygrothermalData implements Data {
 }
 
 type HygrothermalDataConnection {
-  edges: [HygrothermalDataEdge!]!
-  pageInfo: PageInfo!
+  edges: [HygrothermalDataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
   totalCount: NonNegativeInt!
 }
 
 type HygrothermalDataEdge {
   cursor: String!
-  node: HygrothermalData!
+  node: HygrothermalData! @cost(weight: "0")
 }
 
 type Institution implements Node {
   abbreviation: String
   contact: ContactInformation
+  createdAt: DateTime!
   description: String!
-  developedMethods(where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")): InstitutionDevelopedMethodConnection! @cost(weight: "10")
+  developedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionDevelopedMethodSortInput!] @cost(weight: "10") where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")): InstitutionDevelopedMethodConnection! @cost(weight: "10")
   extras: Any
-  gnuPgKeyFingerprints(where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")): InstitutionGnuPgKeyFingerprintConnection! @cost(weight: "10")
-  hasGnuPgKeyFingerprint(where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")): Boolean! @cost(weight: "10")
+  gnuPgKeyFingerprints(order: [InstitutionGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")): InstitutionGnuPgKeyFingerprintConnection! @cost(weight: "10")
+  hasGnuPgKeyFingerprint(order: [InstitutionGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")): Boolean! @cost(weight: "10")
   id: ID!
-  isAuthorizedToDeleteNode: Boolean! @cost(weight: "10")
-  isAuthorizedToSwitchOperatingStateOfNode: Boolean! @cost(weight: "10")
-  isAuthorizedToUpdateNode: Boolean! @cost(weight: "10")
-  isAuthorizedToVerifyNode: Boolean! @cost(weight: "10")
-  managedComponents(where: InstitutionManagedComponentFilterInput @cost(weight: "10")): InstitutionManagedComponentConnection! @cost(weight: "10")
-  managedDataFormats(where: InstitutionManagedDataFormatFilterInput @cost(weight: "10")): InstitutionManagedDataFormatConnection! @cost(weight: "10")
-  managedInstitutions(where: InstitutionManagedInstitutionFilterInput @cost(weight: "10")): InstitutionManagedInstitutionConnection! @cost(weight: "10")
-  managedMethods(where: InstitutionManagedMethodFilterInput @cost(weight: "10")): InstitutionManagedMethodConnection! @cost(weight: "10")
+  isAuthorizedToDeleteNode: Boolean! @cost(weight: "1")
+  isAuthorizedToSwitchOperatingStateOfNode: Boolean! @cost(weight: "1")
+  isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
+  isAuthorizedToVerifyNode: Boolean! @cost(weight: "1")
+  managedComponents("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedComponentSortInput!] @cost(weight: "10") where: InstitutionManagedComponentFilterInput @cost(weight: "10")): InstitutionManagedComponentConnection! @cost(weight: "10")
+  managedDataFormats("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedDataFormatSortInput!] @cost(weight: "10") where: InstitutionManagedDataFormatFilterInput @cost(weight: "10")): InstitutionManagedDataFormatConnection! @cost(weight: "10")
+  managedInstitutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedInstitutionSortInput!] @cost(weight: "10") where: InstitutionManagedInstitutionFilterInput @cost(weight: "10")): InstitutionManagedInstitutionConnection! @cost(weight: "10")
+  managedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedMethodSortInput!] @cost(weight: "10") where: InstitutionManagedMethodFilterInput @cost(weight: "10")): InstitutionManagedMethodConnection! @cost(weight: "10")
   manager: InstitutionManagerEdge @cost(weight: "10")
-  manufacturedComponents(where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")): InstitutionManufacturedComponentConnection! @cost(weight: "10")
+  manufacturedComponents("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManufacturedComponentSortInput!] @cost(weight: "10") where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")): InstitutionManufacturedComponentConnection! @cost(weight: "10")
   name: String!
-  openIdConnectApplications(where: InstitutionOwnedOpenIdConnectApplicationFilterInput @cost(weight: "10")): InstitutionOwnedOpenIdConnectApplicationConnection! @cost(weight: "10")
-  operatedDatabases(where: InstitutionOperatedDatabaseFilterInput @cost(weight: "10")): InstitutionOperatedDatabaseConnection! @cost(weight: "10")
+  openIdConnectApplications(order: [InstitutionOwnedOpenIdConnectApplicationSortInput!] @cost(weight: "10") where: InstitutionOwnedOpenIdConnectApplicationFilterInput @cost(weight: "10")): InstitutionOwnedOpenIdConnectApplicationConnection! @cost(weight: "10")
+  operatedDatabases(order: [InstitutionOperatedDatabaseSortInput!] @cost(weight: "10") where: InstitutionOperatedDatabaseFilterInput @cost(weight: "10")): InstitutionOperatedDatabaseConnection! @cost(weight: "10")
   operatingState: InstitutionOperatingState!
-  pendingDevelopedMethods(where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")): PendingInstitutionDevelopedMethodConnection! @cost(weight: "10")
-  pendingManufacturedComponents(where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")): PendingInstitutionManufacturedComponentConnection! @cost(weight: "10")
-  pendingRepresentatives(where: InstitutionRepresentativeFilterInput @cost(weight: "10")): PendingInstitutionRepresentativeConnection @authorize(policy: "ManageInstitutionRepresentativeScope") @cost(weight: "10")
-  representatives(where: InstitutionRepresentativeFilterInput @cost(weight: "10")): InstitutionRepresentativeConnection! @cost(weight: "10")
+  pendingDevelopedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionDevelopedMethodSortInput!] @cost(weight: "10") where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")): PendingInstitutionDevelopedMethodConnection! @cost(weight: "10")
+  pendingManufacturedComponents("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManufacturedComponentSortInput!] @cost(weight: "10") where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")): PendingInstitutionManufacturedComponentConnection! @cost(weight: "10")
+  pendingRepresentatives(order: [InstitutionRepresentativeSortInput!] @cost(weight: "10") where: InstitutionRepresentativeFilterInput @cost(weight: "10")): PendingInstitutionRepresentativeConnection @authorize(policy: "ManageInstitutionRepresentativeScope") @cost(weight: "10")
+  representatives(order: [InstitutionRepresentativeSortInput!] @cost(weight: "10") where: InstitutionRepresentativeFilterInput @cost(weight: "10")): InstitutionRepresentativeConnection! @cost(weight: "10")
   state: InstitutionState!
-  uuid: Uuid! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
 }
 
 type InstitutionDevelopedMethodConnection {
-  edges: [InstitutionDevelopedMethodEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionDevelopedMethodEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type InstitutionDevelopedMethodEdge {
-  node: Method! @cost(weight: "10")
+  cursor: String!
+  node: Method! @cost(weight: "0")
 }
 
 type InstitutionGnuPgKeyFingerprintConnection {
-  edges: [InstitutionGnuPgKeyFingerprintEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionGnuPgKeyFingerprintEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type InstitutionGnuPgKeyFingerprintEdge {
@@ -982,68 +997,78 @@ type InstitutionGnuPgKeyFingerprintEdge {
 }
 
 type InstitutionManagedComponentConnection {
-  edges: [InstitutionManagedComponentEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionManagedComponentEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type InstitutionManagedComponentEdge {
+  cursor: String!
   node: Component!
 }
 
 type InstitutionManagedDataFormatConnection {
-  edges: [InstitutionManagedDataFormatEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionManagedDataFormatEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type InstitutionManagedDataFormatEdge {
+  cursor: String!
   node: DataFormat!
 }
 
 type InstitutionManagedInstitutionConnection {
-  edges: [InstitutionManagedInstitutionEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionManagedInstitutionEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type InstitutionManagedInstitutionEdge {
+  cursor: String!
   node: Institution!
 }
 
 type InstitutionManagedMethodConnection {
-  edges: [InstitutionManagedMethodEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionManagedMethodEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type InstitutionManagedMethodEdge {
+  cursor: String!
   node: Method!
 }
 
 type InstitutionManagerEdge {
-  node: Institution! @cost(weight: "10")
+  node: Institution! @cost(weight: "0")
 }
 
 type InstitutionManufacturedComponentConnection {
-  edges: [InstitutionManufacturedComponentEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionManufacturedComponentEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type InstitutionManufacturedComponentEdge {
-  node: Component! @cost(weight: "10")
+  cursor: String!
+  node: Component! @cost(weight: "0")
 }
 
 type InstitutionMethodDeveloperEdge {
-  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: Institution! @cost(weight: "10")
+  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Institution! @cost(weight: "0")
 }
 
 type InstitutionOperatedDatabaseConnection {
-  edges: [InstitutionOperatedDatabaseEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionOperatedDatabaseEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type InstitutionOperatedDatabaseEdge {
@@ -1051,26 +1076,26 @@ type InstitutionOperatedDatabaseEdge {
 }
 
 type InstitutionOwnedOpenIdConnectApplicationConnection {
-  edges: [InstitutionOwnedOpenIdConnectApplicationEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionOwnedOpenIdConnectApplicationEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type InstitutionOwnedOpenIdConnectApplicationEdge {
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
   node: OpenIdConnectApplication!
 }
 
 type InstitutionRepresentativeConnection {
-  edges: [InstitutionRepresentativeEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionRepresentativeEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 type InstitutionRepresentativeEdge {
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: User! @cost(weight: "10")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: User! @cost(weight: "0")
   role: InstitutionRepresentativeRole!
 }
 
@@ -1092,7 +1117,7 @@ type InstitutionsEdge {
   node: Institution!
 }
 
-type LifeCycleData implements Data {
+type LifeCycleData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
   component: Component @cost(weight: "10")
@@ -1115,14 +1140,14 @@ type LifeCycleData implements Data {
 }
 
 type LifeCycleDataConnection {
-  edges: [LifeCycleDataEdge!]!
-  pageInfo: PageInfo!
+  edges: [LifeCycleDataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
   totalCount: NonNegativeInt!
 }
 
 type LifeCycleDataEdge {
   cursor: String!
-  node: LifeCycleData!
+  node: LifeCycleData! @cost(weight: "0")
 }
 
 type LoginUserError implements UserError {
@@ -1178,35 +1203,37 @@ type Method implements Node {
   availability: OpenEndedDateTimeRange
   calculationLocator: Url
   categories: [MethodCategory!]!
+  createdAt: DateTime!
   description: String!
-  developers(where: IMethodDeveloperFilterInput @cost(weight: "10")): MethodDeveloperConnection! @cost(weight: "10")
+  developers(order: [MethodDeveloperSortInput!] @cost(weight: "10") where: MethodDeveloperFilterInput @cost(weight: "10")): MethodDeveloperConnection! @cost(weight: "10")
   id: ID!
-  isAuthorizedToUpdateNode: Boolean! @cost(weight: "10")
+  isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
   manager: MethodManagerEdge! @cost(weight: "10")
   name: String!
   parameters: [MethodParameter!]!
-  pendingDevelopers(where: IMethodDeveloperFilterInput @cost(weight: "10")): PendingMethodDeveloperConnection @authorize(policy: "WriteScope") @cost(weight: "10")
-  reference: Reference @cost(weight: "10")
+  pendingDevelopers(order: [MethodDeveloperSortInput!] @cost(weight: "10") where: MethodDeveloperFilterInput @cost(weight: "10")): PendingMethodDeveloperConnection @authorize(policy: "WriteScope") @cost(weight: "10")
+  reference: Reference @cost(weight: "0")
   sources: [MethodSource!]!
-  uuid: Uuid! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
   validity: OpenEndedDateTimeRange
 }
 
 type MethodDeveloperConnection {
   edges: [MethodDeveloperEdge!]! @cost(weight: "10")
-  isAuthorizedToAddInstitutionEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToAddUserEdge: Boolean! @cost(weight: "10")
+  isAuthorizedToAddInstitutionEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToAddUserEdge: Boolean! @cost(weight: "1")
   totalCount: NonNegativeInt! @cost(weight: "10")
 }
 
 type MethodDeveloperEdge {
-  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: Stakeholder! @cost(weight: "10")
+  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Stakeholder! @cost(weight: "0")
 }
 
 type MethodManagerEdge {
-  node: Institution! @cost(weight: "10")
+  node: Institution! @cost(weight: "0")
 }
 
 "A parameter given as a primitive or complex JSON value when this method is applied."
@@ -1333,90 +1360,131 @@ type Numeration {
 }
 
 type OpenEndedDateTimeRange {
-  from: DateTime @cost(weight: "10")
-  to: DateTime @cost(weight: "10")
+  from: DateTime
+  to: DateTime
 }
 
 type OpenIdConnectApplication implements Node {
   applicationType: String
-  authorizations: OpenIdConnectApplicationAuthorizationConnection! @cost(weight: "10")
-  clientId: String! @cost(weight: "10")
+  authorizations: OpenIdConnectApplicationGrantedAuthorizationConnection! @cost(weight: "0")
+  clientId: String!
   clientType: String
-  consentType: OpenIdConnectConsentType! @cost(weight: "10")
+  consentType: OpenIdConnectConsentType!
+  createdAt: DateTime!
   displayName: String
-  endpoints: [OpenIdConnectEndpoint!]! @cost(weight: "10")
-  grantTypes: [OpenIdConnectGrantType!]! @cost(weight: "10")
+  endpoints: [OpenIdConnectEndpoint!]! @cost(weight: "0")
+  grantTypes: [OpenIdConnectGrantType!]! @cost(weight: "0")
   id: ID!
-  isAuthorizedToManageNode: Boolean! @cost(weight: "10")
-  owner: OpenIdConnectApplicationOwnerEdge! @cost(weight: "10")
-  postLogoutRedirectUri: Url @cost(weight: "10")
-  redirectUri: Url @cost(weight: "10")
-  requirements: [OpenIdConnectRequirement!]! @cost(weight: "10")
-  responseTypes: [OpenIdConnectResponseType!]! @cost(weight: "10")
-  scopes: [OpenIdConnectScope!]! @cost(weight: "10")
-  tokens: OpenIdConnectApplicationTokenConnection! @cost(weight: "10")
-  uuid: Uuid! @cost(weight: "10")
-}
-
-type OpenIdConnectApplicationAuthorizationConnection {
-  edges: [OpenIdConnectApplicationAuthorizationEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  isAuthorizedToManageNode: Boolean! @cost(weight: "1")
+  owner: OpenIdConnectApplicationOwnerEdge! @cost(weight: "0")
+  postLogoutRedirectUri: Url
+  redirectUri: Url
+  requirements: [OpenIdConnectRequirement!]! @cost(weight: "0")
+  responseTypes: [OpenIdConnectResponseType!]! @cost(weight: "0")
+  scopes: [OpenIdConnectScope!]! @cost(weight: "0")
+  tokens: OpenIdConnectApplicationIssuedTokenConnection! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
+}
+
+type OpenIdConnectApplicationGrantedAuthorizationConnection {
+  edges: [OpenIdConnectApplicationGrantedAuthorizationEdge!]! @cost(weight: "0")
+  totalCount: NonNegativeInt!
 }
 
-type OpenIdConnectApplicationAuthorizationEdge {
+type OpenIdConnectApplicationGrantedAuthorizationEdge {
   node: OpenIdConnectAuthorization!
 }
 
+type OpenIdConnectApplicationIssuedTokenConnection {
+  edges: [OpenIdConnectApplicationIssuedTokenEdge!]! @cost(weight: "0")
+  totalCount: NonNegativeInt!
+}
+
+type OpenIdConnectApplicationIssuedTokenEdge {
+  node: OpenIdConnectToken!
+}
+
 type OpenIdConnectApplicationOwnerEdge {
-  node: Institution! @cost(weight: "10")
+  node: Institution! @cost(weight: "0")
 }
 
-type OpenIdConnectApplicationTokenConnection {
-  edges: [OpenIdConnectApplicationTokenEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+"A connection to a list of items."
+type OpenIdConnectApplicationsConnection {
+  "A list of edges."
+  edges: [OpenIdConnectApplicationsEdge!]
+  "Information to aid in pagination."
+  pageInfo: PageInfo!
+  "Identifies the total count of items in the connection."
+  totalCount: Int! @cost(weight: "10")
 }
 
-type OpenIdConnectApplicationTokenEdge {
-  node: OpenIdConnectToken!
+"An edge in a connection."
+type OpenIdConnectApplicationsEdge {
+  "A cursor for use in pagination."
+  cursor: String!
+  "The item at the end of the edge."
+  node: OpenIdConnectApplication!
 }
 
 type OpenIdConnectAuthorization implements Node {
   application: OpenIdConnectAuthorizationApplicationEdge! @cost(weight: "10")
-  creationDate: DateTime
+  createdAt: DateTime!
   id: ID!
-  isAuthorizedToDeleteNode: Boolean! @cost(weight: "10")
+  isAuthorizedToDeleteNode: Boolean! @cost(weight: "1")
+  scopes: [OpenIdConnectScope!]! @cost(weight: "0")
   status: String
   subject: String
-  tokens: OpenIdConnectAuthorizationTokenConnection! @cost(weight: "10")
+  tokens: OpenIdConnectAuthorizationIssuedTokenConnection! @cost(weight: "10")
   type: String
-  uuid: Uuid! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
 }
 
 type OpenIdConnectAuthorizationApplicationEdge {
   node: OpenIdConnectApplication!
 }
 
-type OpenIdConnectAuthorizationTokenConnection {
-  edges: [OpenIdConnectAuthorizationTokenEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+type OpenIdConnectAuthorizationIssuedTokenConnection {
+  edges: [OpenIdConnectAuthorizationIssuedTokenEdge!]! @cost(weight: "0")
+  totalCount: NonNegativeInt!
 }
 
-type OpenIdConnectAuthorizationTokenEdge {
+type OpenIdConnectAuthorizationIssuedTokenEdge {
   node: OpenIdConnectToken!
 }
 
+"A connection to a list of items."
+type OpenIdConnectAuthorizationsConnection {
+  "A list of edges."
+  edges: [OpenIdConnectAuthorizationsEdge!]
+  "Information to aid in pagination."
+  pageInfo: PageInfo!
+  "Identifies the total count of items in the connection."
+  totalCount: Int! @cost(weight: "10")
+}
+
+"An edge in a connection."
+type OpenIdConnectAuthorizationsEdge {
+  "A cursor for use in pagination."
+  cursor: String!
+  "The item at the end of the edge."
+  node: OpenIdConnectAuthorization!
+}
+
 type OpenIdConnectToken implements Node {
   application: OpenIdConnectTokenApplicationEdge! @cost(weight: "10")
   authorization: OpenIdConnectTokenAuthorizationEdge! @cost(weight: "10")
-  creationDate: DateTime
-  expirationDate: DateTime
+  createdAt: DateTime!
+  expiredAt: LocalDateTime
   id: ID!
-  isAuthorizedToRevokeNode: Boolean! @cost(weight: "10")
-  redemptionDate: DateTime
+  isAuthorizedToRevokeNode: Boolean! @cost(weight: "1")
+  redeemedAt: LocalDateTime
   status: String
   subject: String
   type: String
-  uuid: Uuid! @cost(weight: "10")
+  updatedAt: DateTime!
+  uuid: Uuid!
 }
 
 type OpenIdConnectTokenApplicationEdge {
@@ -1427,7 +1495,25 @@ type OpenIdConnectTokenAuthorizationEdge {
   node: OpenIdConnectAuthorization!
 }
 
-type OpticalData implements Data {
+"A connection to a list of items."
+type OpenIdConnectTokensConnection {
+  "A list of edges."
+  edges: [OpenIdConnectTokensEdge!]
+  "Information to aid in pagination."
+  pageInfo: PageInfo!
+  "Identifies the total count of items in the connection."
+  totalCount: Int! @cost(weight: "10")
+}
+
+"An edge in a connection."
+type OpenIdConnectTokensEdge {
+  "A cursor for use in pagination."
+  cursor: String!
+  "The item at the end of the edge."
+  node: OpenIdConnectToken!
+}
+
+type OpticalData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
   cielabColors: [CielabColor!]!
@@ -1460,14 +1546,14 @@ type OpticalData implements Data {
 }
 
 type OpticalDataConnection {
-  edges: [OpticalDataEdge!]!
-  pageInfo: PageInfo!
+  edges: [OpticalDataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
   totalCount: NonNegativeInt!
 }
 
 type OpticalDataEdge {
   cursor: String!
-  node: OpticalData!
+  node: OpticalData! @cost(weight: "0")
 }
 
 "Information about pagination in a connection."
@@ -1483,9 +1569,9 @@ type PageInfo {
 }
 
 type PendingComponentManufacturerConnection {
-  edges: [ComponentManufacturerEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [ComponentManufacturerEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 "A connection to a list of items."
@@ -1507,21 +1593,23 @@ type PendingDatabasesEdge {
 }
 
 type PendingInstitutionDevelopedMethodConnection {
-  edges: [InstitutionDevelopedMethodEdge!]! @cost(weight: "10")
-  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionDevelopedMethodEdge!]! @cost(weight: "0")
+  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "1")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type PendingInstitutionManufacturedComponentConnection {
-  edges: [InstitutionManufacturedComponentEdge!]! @cost(weight: "10")
-  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionManufacturedComponentEdge!]! @cost(weight: "0")
+  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "1")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type PendingInstitutionRepresentativeConnection {
-  edges: [InstitutionRepresentativeEdge!]! @cost(weight: "10")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [InstitutionRepresentativeEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
 "A connection to a list of items."
@@ -1544,24 +1632,25 @@ type PendingInstitutionsEdge {
 
 type PendingMethodDeveloperConnection {
   edges: [MethodDeveloperEdge!]! @cost(weight: "10")
-  isAuthorizedToAddInstitutionEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToAddUserEdge: Boolean! @cost(weight: "10")
+  isAuthorizedToAddInstitutionEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToAddUserEdge: Boolean! @cost(weight: "1")
   totalCount: NonNegativeInt! @cost(weight: "10")
 }
 
 type PendingUserDevelopedMethodConnection {
-  edges: [UserDevelopedMethodEdge!]! @cost(weight: "10")
-  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [UserDevelopedMethodEdge!]! @cost(weight: "0")
+  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "1")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type PendingUserRepresentedInstitutionConnection {
-  edges: [UserRepresentedInstitutionEdge!]! @cost(weight: "10")
-  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [UserRepresentedInstitutionEdge!]! @cost(weight: "0")
+  isAuthorizedToConfirmEdges: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
 }
 
-type PhotovoltaicData implements Data {
+type PhotovoltaicData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
   component: Component @cost(weight: "10")
@@ -1584,14 +1673,14 @@ type PhotovoltaicData implements Data {
 }
 
 type PhotovoltaicDataConnection {
-  edges: [PhotovoltaicDataEdge!]!
-  pageInfo: PageInfo!
+  edges: [PhotovoltaicDataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
   totalCount: NonNegativeInt!
 }
 
 type PhotovoltaicDataEdge {
   cursor: String!
-  node: PhotovoltaicData!
+  node: PhotovoltaicData! @cost(weight: "0")
 }
 
 type PrimeSurfaceOrDirection {
@@ -1616,35 +1705,53 @@ type Publication {
 }
 
 type Query {
+  allCalorimetricData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: CalorimetricDataPropositionInput): CalorimetricDataConnection! @cost(weight: "10")
+  allGeometricData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: GeometricDataPropositionInput): GeometricDataConnection! @cost(weight: "10")
+  allHygrothermalData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: HygrothermalDataPropositionInput): HygrothermalDataConnection! @cost(weight: "10")
+  allLifeCycleData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: LifeCycleDataPropositionInput): LifeCycleDataConnection! @cost(weight: "10")
+  allOpticalData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: OpticalDataPropositionInput): OpticalDataConnection! @cost(weight: "10")
+  allPhotovoltaicData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: PhotovoltaicDataPropositionInput): PhotovoltaicDataConnection! @cost(weight: "10")
+  calorimetricData(databaseId: Uuid! id: Uuid! locale: String): CalorimetricData @cost(weight: "10")
   component(id: Uuid!): Component @cost(weight: "10")
-  components("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [ComponentSortInput!] @cost(weight: "10") where: ComponentFilterInput @cost(weight: "10")): ComponentsConnection @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  components("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [ComponentSortInput!] @cost(weight: "10") where: ComponentFilterInput @cost(weight: "10")): ComponentsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
   currentInstitution: Institution @authorize(policy: "Authenticated") @cost(weight: "10")
   currentOpenIdConnectApplication: OpenIdConnectApplication @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
   currentUser: User @authorize(policy: "Authenticated") @cost(weight: "10")
   database(id: Uuid!): Database @cost(weight: "10")
-  databases("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DatabaseSortInput!] @cost(weight: "10") where: DatabaseFilterInput @cost(weight: "10")): DatabasesConnection @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  databases("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DatabaseSortInput!] @cost(weight: "10") where: DatabaseFilterInput @cost(weight: "10")): DatabasesConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
   dataFormat(id: Uuid!): DataFormat @cost(weight: "10")
-  dataFormats("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DataFormatSortInput!] @cost(weight: "10") where: DataFormatFilterInput @cost(weight: "10")): DataFormatsConnection @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  dataFormats("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DataFormatSortInput!] @cost(weight: "10") where: DataFormatFilterInput @cost(weight: "10")): DataFormatsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
+  geometricData(databaseId: Uuid! id: Uuid! locale: String): GeometricData @cost(weight: "10")
   gnuPgKeyFingerprint(fingerprint: String!): GnuPgKeyFingerprint @authorize(policy: "ManageGnuPgScope") @cost(weight: "10")
-  gnuPgKeyFingerprints("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [GnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: GnuPgKeyFingerprintFilterInput @cost(weight: "10")): GnuPgKeyFingerprintsConnection @authorize(policy: "ManageGnuPgScope") @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  gnuPgKeyFingerprints("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [GnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: GnuPgKeyFingerprintFilterInput @cost(weight: "10")): GnuPgKeyFingerprintsConnection @authorize(policy: "ManageGnuPgScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
+  hasCalorimetricData(locale: String where: CalorimetricDataPropositionInput): Boolean! @cost(weight: "10")
+  hasGeometricData(locale: String where: GeometricDataPropositionInput): Boolean! @cost(weight: "10")
+  hasHygrothermalData(locale: String where: HygrothermalDataPropositionInput): Boolean! @cost(weight: "10")
+  hasLifeCycleData(locale: String where: LifeCycleDataPropositionInput): Boolean! @cost(weight: "10")
+  hasOpticalData(locale: String where: OpticalDataPropositionInput): Boolean! @cost(weight: "10")
+  hasPhotovoltaicData(locale: String where: PhotovoltaicDataPropositionInput): Boolean! @cost(weight: "10")
+  hygrothermalData(databaseId: Uuid! id: Uuid! locale: String): HygrothermalData @cost(weight: "10")
   institution(id: Uuid!): Institution @cost(weight: "10")
-  institutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionSortInput!] @cost(weight: "10") where: InstitutionFilterInput @cost(weight: "10")): InstitutionsConnection @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  institutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionSortInput!] @cost(weight: "10") where: InstitutionFilterInput @cost(weight: "10")): InstitutionsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
+  lifeCycleData(databaseId: Uuid! id: Uuid! locale: String): LifeCycleData @cost(weight: "10")
   method(id: Uuid!): Method @cost(weight: "10")
-  methods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [MethodSortInput!] @cost(weight: "10") where: MethodFilterInput @cost(weight: "10")): MethodsConnection @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  methods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [MethodSortInput!] @cost(weight: "10") where: MethodFilterInput @cost(weight: "10")): MethodsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
   "Fetches an object given its ID."
   node("ID of the object." id: ID!): Node @cost(weight: "10")
   "Lookup nodes by a list of IDs."
   nodes("The list of node IDs." ids: [ID!]!): [Node]! @cost(weight: "10")
   openIdConnectApplication(id: Uuid!): OpenIdConnectApplication @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  openIdConnectApplications: [OpenIdConnectApplication!]! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
+  openIdConnectApplications("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [OpenIdConnectApplicationSortInput!] @cost(weight: "10") where: OpenIdConnectApplicationFilterInput @cost(weight: "10")): OpenIdConnectApplicationsConnection @authorize(policy: "ManageOpenIdConnectScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
   openIdConnectAuthorization(id: Uuid!): OpenIdConnectAuthorization @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  openIdConnectAuthorizations: [OpenIdConnectAuthorization!]! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
+  openIdConnectAuthorizations("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [OpenIdConnectAuthorizationSortInput!] @cost(weight: "10") where: OpenIdConnectAuthorizationFilterInput @cost(weight: "10")): OpenIdConnectAuthorizationsConnection @authorize(policy: "ManageOpenIdConnectScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
   openIdConnectToken(id: Uuid!): OpenIdConnectToken @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  openIdConnectTokens: [OpenIdConnectToken!]! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  pendingDatabases("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DatabaseSortInput!] @cost(weight: "10") where: DatabaseFilterInput @cost(weight: "10")): PendingDatabasesConnection @authorize(policy: "ManageDatabaseScope") @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
-  pendingInstitutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionSortInput!] @cost(weight: "10") where: InstitutionFilterInput @cost(weight: "10")): PendingInstitutionsConnection @authorize(policy: "WriteScope") @authorize(policy: "VerifyScope") @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  openIdConnectTokens("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [OpenIdConnectTokenSortInput!] @cost(weight: "10") where: OpenIdConnectTokenFilterInput @cost(weight: "10")): OpenIdConnectTokensConnection @authorize(policy: "ManageOpenIdConnectScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
+  opticalData(databaseId: Uuid! id: Uuid! locale: String): OpticalData @cost(weight: "10")
+  pendingDatabases("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DatabaseSortInput!] @cost(weight: "10") where: DatabaseFilterInput @cost(weight: "10")): PendingDatabasesConnection @authorize(policy: "ManageDatabaseScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
+  pendingInstitutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionSortInput!] @cost(weight: "10") where: InstitutionFilterInput @cost(weight: "10")): PendingInstitutionsConnection @authorize(policy: "WriteScope") @authorize(policy: "VerifyScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
+  photovoltaicData(databaseId: Uuid! id: Uuid! locale: String): PhotovoltaicData @cost(weight: "10")
   user(id: Uuid!): User @cost(weight: "10")
-  users("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [UserSortInput!] @cost(weight: "10") where: UserFilterInput @cost(weight: "10")): UsersConnection @listSize(assumedSize: 2147483646, slicingArguments: [ "first", "last" ], slicingArgumentDefaultValue: 100, sizedFields: [ "edges", "nodes" ], requireOneSlicingArgument: false) @cost(weight: "10")
+  users("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [UserSortInput!] @cost(weight: "10") where: UserFilterInput @cost(weight: "10")): UsersConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
 }
 
 type RegisterUserError implements UserError {
@@ -2017,39 +2124,41 @@ type UpdateOpenIdConnectApplicationPayload {
 }
 
 type User implements Node {
-  contact: ContactInformation! @cost(weight: "10")
-  developedMethods(where: UserDevelopedMethodFilterInput @cost(weight: "10")): UserDevelopedMethodConnection! @cost(weight: "10")
-  gnuPgKeyFingerprints(where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")): UserGnuPgKeyFingerprintConnection! @cost(weight: "10")
-  hasGnuPgKeyFingerprint(where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")): Boolean! @cost(weight: "10")
-  hasPassword: Boolean @cost(weight: "10")
+  contact: ContactInformation! @cost(weight: "0")
+  developedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [UserDevelopedMethodSortInput!] @cost(weight: "10") where: UserDevelopedMethodFilterInput @cost(weight: "10")): UserDevelopedMethodConnection! @cost(weight: "10")
+  gnuPgKeyFingerprints(order: [UserGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")): UserGnuPgKeyFingerprintConnection! @cost(weight: "10")
+  hasGnuPgKeyFingerprint(order: [UserGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")): Boolean! @cost(weight: "10")
+  hasPassword: Boolean
   id: ID!
-  isAuthorizedToAddApprovals: Boolean! @cost(weight: "10")
-  isAuthorizedToDeleteUser: Boolean! @cost(weight: "10")
-  isAuthorizedToManageOpenIdConnect: Boolean! @cost(weight: "10")
+  isAuthorizedToAddApprovals: Boolean! @cost(weight: "1")
+  isAuthorizedToDeleteUser: Boolean! @cost(weight: "1")
+  isAuthorizedToManageOpenIdConnect: Boolean! @cost(weight: "1")
   "Full name"
-  name: String! @cost(weight: "10")
-  pendingDevelopedMethods(where: UserDevelopedMethodFilterInput @cost(weight: "10")): PendingUserDevelopedMethodConnection @authorize(policy: "WriteScope") @cost(weight: "10")
-  pendingRepresentedInstitutions(where: UserRepresentedInstitutionFilterInput @cost(weight: "10")): PendingUserRepresentedInstitutionConnection @authorize(policy: "WriteScope") @cost(weight: "10")
-  representedInstitutions(where: UserRepresentedInstitutionFilterInput @cost(weight: "10")): UserRepresentedInstitutionConnection! @cost(weight: "10")
-  roles: [UserRole!] @cost(weight: "10")
-  rolesCurrentUserCanAdd: [UserRole!]! @cost(weight: "10")
-  rolesCurrentUserCanRemove: [UserRole!]! @cost(weight: "10")
-  twoFactorAuthentication: TwoFactorAuthentication @cost(weight: "10")
-  uuid: Uuid! @cost(weight: "10")
+  name: String!
+  pendingDevelopedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [UserDevelopedMethodSortInput!] @cost(weight: "10") where: UserDevelopedMethodFilterInput @cost(weight: "10")): PendingUserDevelopedMethodConnection @authorize(policy: "WriteScope") @cost(weight: "10")
+  pendingRepresentedInstitutions(order: [UserRepresentedInstitutionSortInput!] @cost(weight: "10") where: UserRepresentedInstitutionFilterInput @cost(weight: "10")): PendingUserRepresentedInstitutionConnection @authorize(policy: "WriteScope") @cost(weight: "10")
+  representedInstitutions(order: [UserRepresentedInstitutionSortInput!] @cost(weight: "10") where: UserRepresentedInstitutionFilterInput @cost(weight: "10")): UserRepresentedInstitutionConnection! @cost(weight: "10")
+  roles: [UserRole!] @cost(weight: "0")
+  rolesCurrentUserCanAdd: [UserRole!]!
+  rolesCurrentUserCanRemove: [UserRole!]!
+  twoFactorAuthentication: TwoFactorAuthentication @cost(weight: "0")
+  uuid: Uuid!
 }
 
 type UserDevelopedMethodConnection {
-  edges: [UserDevelopedMethodEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [UserDevelopedMethodEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: Int!
 }
 
 type UserDevelopedMethodEdge {
-  node: Method! @cost(weight: "10")
+  cursor: String!
+  node: Method! @cost(weight: "0")
 }
 
 type UserGnuPgKeyFingerprintConnection {
-  edges: [UserGnuPgKeyFingerprintEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [UserGnuPgKeyFingerprintEdge!]! @cost(weight: "0")
+  totalCount: NonNegativeInt!
 }
 
 type UserGnuPgKeyFingerprintEdge {
@@ -2057,18 +2166,19 @@ type UserGnuPgKeyFingerprintEdge {
 }
 
 type UserMethodDeveloperEdge {
-  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "10")
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "10")
-  node: User! @cost(weight: "10")
+  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: User! @cost(weight: "0")
 }
 
 type UserRepresentedInstitutionConnection {
-  edges: [UserRepresentedInstitutionEdge!]! @cost(weight: "10")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  edges: [UserRepresentedInstitutionEdge!]! @cost(weight: "0")
+  totalCount: NonNegativeInt!
 }
 
 type UserRepresentedInstitutionEdge {
-  node: Institution! @cost(weight: "10")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Institution! @cost(weight: "0")
   role: InstitutionRepresentativeRole!
 }
 
@@ -2120,7 +2230,7 @@ union Stakeholder = Institution | User
 
 input AddComponentAssemblyInput {
   assembledComponentId: Uuid!
-  index: Byte
+  index: UnsignedByte
   partComponentId: Uuid!
   primeSurface: PrimeSurface
 }
@@ -2177,29 +2287,19 @@ input BooleanFilterInput {
 
 input ByteFilterInput {
   equalTo: Byte @cost(weight: "10")
-  notEqualTo: Byte @cost(weight: "10")
-  in: [Byte] @cost(weight: "10")
-  notIn: [Byte] @cost(weight: "10")
   greaterThan: Byte @cost(weight: "10")
-  notGreaterThan: Byte @cost(weight: "10")
   greaterThanOrEqualTo: Byte @cost(weight: "10")
-  notGreaterThanOrEqualTo: Byte @cost(weight: "10")
+  in: [Byte] @cost(weight: "10")
   lessThan: Byte @cost(weight: "10")
-  notLessThan: Byte @cost(weight: "10")
   lessThanOrEqualTo: Byte @cost(weight: "10")
+  notEqualTo: Byte @cost(weight: "10")
+  notGreaterThan: Byte @cost(weight: "10")
+  notGreaterThanOrEqualTo: Byte @cost(weight: "10")
+  notIn: [Byte] @cost(weight: "10")
+  notLessThan: Byte @cost(weight: "10")
   notLessThanOrEqualTo: Byte @cost(weight: "10")
 }
 
-input CalendarSystemFilterInput {
-  and: [CalendarSystemFilterInput!]
-  or: [CalendarSystemFilterInput!]
-  id: StringFilterInput
-  name: StringFilterInput
-  minYear: IntFilterInput
-  maxYear: IntFilterInput
-  eras: FilterInputTypeOfErasFilterInput
-}
-
 input CalorimetricDataPropositionInput {
   and: [CalorimetricDataPropositionInput!]
   componentId: UuidPropositionInput
@@ -2257,96 +2357,134 @@ input CoatedSidePropositionInput {
 
 input ComponentAssembledOfFilterInput {
   and: [ComponentAssembledOfFilterInput!]
+  createdAt: DateTimeFilterInput
+  index: ByteFilterInput
   or: [ComponentAssembledOfFilterInput!]
   partComponent: ComponentFilterInput
-  index: ByteFilterInput
   primeSurface: NullableOfPrimeSurfaceFilterInput
+  updatedAt: DateTimeFilterInput
 }
 
-input ComponentAssemblySortInput {
-  assembledComponent: ComponentSortInput @cost(weight: "10")
-  partComponent: ComponentSortInput @cost(weight: "10")
+input ComponentAssembledOfSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
   index: SortEnumType @cost(weight: "10")
   primeSurface: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input ComponentCategoryFilterInput {
   equalTo: ComponentCategory @cost(weight: "10")
-  notEqualTo: ComponentCategory @cost(weight: "10")
   in: [ComponentCategory!] @cost(weight: "10")
+  notEqualTo: ComponentCategory @cost(weight: "10")
   notIn: [ComponentCategory!] @cost(weight: "10")
 }
 
 input ComponentCategorysFilterInput {
   all: ComponentCategoryFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: ComponentCategoryFilterInput @cost(weight: "10")
   some: ComponentCategoryFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input ComponentConcretizationOfFilterInput {
   and: [ComponentConcretizationOfFilterInput!]
-  or: [ComponentConcretizationOfFilterInput!]
+  createdAt: DateTimeFilterInput
   generalComponent: ComponentFilterInput
+  or: [ComponentConcretizationOfFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input ComponentConcretizationOfSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input ComponentFilterInput {
-  and: [ComponentFilterInput!]
-  or: [ComponentFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
   abbreviation: StringFilterInput
-  description: StringFilterInput
+  and: [ComponentFilterInput!]
   categories: ComponentCategorysFilterInput
-  extras: JsonElementFilterInput
-  partOf: FilterInputTypeOfComponentsFilterInput
-  parts: FilterInputTypeOfComponentsFilterInput
-  partOfEdges: FilterInputTypeOfComponentAssemblysFilterInput
-  partEdges: FilterInputTypeOfComponentAssemblysFilterInput
   concretizations: FilterInputTypeOfComponentsFilterInput
+  createdAt: DateTimeFilterInput
+  description: StringFilterInput
+  extras: JsonElementFilterInput
   generalizations: FilterInputTypeOfComponentsFilterInput
-  variants: FilterInputTypeOfComponentsFilterInput
+  id: UuidFilterInput
   manager: InstitutionFilterInput
-  manufacturers: FilterInputTypeOfInstitutionsFilterInput
   manufacturerEdges: FilterInputTypeOfComponentManufacturersFilterInput
+  manufacturers: FilterInputTypeOfInstitutionsFilterInput
+  name: StringFilterInput
+  or: [ComponentFilterInput!]
+  partEdges: FilterInputTypeOfComponentAssemblysFilterInput
+  partOf: FilterInputTypeOfComponentsFilterInput
+  partOfEdges: FilterInputTypeOfComponentAssemblysFilterInput
+  parts: FilterInputTypeOfComponentsFilterInput
+  updatedAt: DateTimeFilterInput
+  variants: FilterInputTypeOfComponentsFilterInput
 }
 
 input ComponentGeneralizationOfFilterInput {
   and: [ComponentGeneralizationOfFilterInput!]
-  or: [ComponentGeneralizationOfFilterInput!]
   concreteComponent: ComponentFilterInput
+  createdAt: DateTimeFilterInput
+  or: [ComponentGeneralizationOfFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input ComponentGeneralizationOfSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input ComponentManufacturerFilterInput {
   and: [ComponentManufacturerFilterInput!]
-  or: [ComponentManufacturerFilterInput!]
+  createdAt: DateTimeFilterInput
   institution: InstitutionFilterInput
+  or: [ComponentManufacturerFilterInput!]
+  updatedAt: DateTimeFilterInput
 }
 
 input ComponentManufacturerSortInput {
-  component: ComponentSortInput @cost(weight: "10")
-  institution: InstitutionSortInput @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input ComponentPartOfFilterInput {
   and: [ComponentPartOfFilterInput!]
-  or: [ComponentPartOfFilterInput!]
   assembledComponent: ComponentFilterInput
+  createdAt: DateTimeFilterInput
   index: ByteFilterInput
+  or: [ComponentPartOfFilterInput!]
   primeSurface: NullableOfPrimeSurfaceFilterInput
+  updatedAt: DateTimeFilterInput
+}
+
+input ComponentPartOfSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  index: SortEnumType @cost(weight: "10")
+  primeSurface: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input ComponentSortInput {
-  id: SortEnumType @cost(weight: "10")
-  name: SortEnumType @cost(weight: "10")
   abbreviation: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
   description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input ComponentVariantOfFilterInput {
   and: [ComponentVariantOfFilterInput!]
-  or: [ComponentVariantOfFilterInput!]
+  createdAt: DateTimeFilterInput
   ofComponent: ComponentFilterInput
+  or: [ComponentVariantOfFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input ComponentVariantOfSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input ConfirmComponentManufacturerInput {
@@ -2382,12 +2520,12 @@ input ConfirmUserMethodDeveloperInput {
 
 input ContactInformationFilterInput {
   and: [ContactInformationFilterInput!]
+  emailAddress: StringFilterInput
+  isEmailAddressConfirmed: BooleanFilterInput
+  isPhoneNumberConfirmed: BooleanFilterInput
   or: [ContactInformationFilterInput!]
   phoneNumber: StringFilterInput
-  isPhoneNumberConfirmed: BooleanFilterInput
   postalAddress: StringFilterInput
-  emailAddress: StringFilterInput
-  isEmailAddressConfirmed: BooleanFilterInput
   websiteLocator: UrlFilterInput
 }
 
@@ -2399,11 +2537,9 @@ input ContactInformationInput {
 }
 
 input ContactInformationSortInput {
+  emailAddress: SortEnumType @cost(weight: "10")
   phoneNumber: SortEnumType @cost(weight: "10")
-  isPhoneNumberConfirmed: SortEnumType @cost(weight: "10")
   postalAddress: SortEnumType @cost(weight: "10")
-  emailAddress: SortEnumType @cost(weight: "10")
-  isEmailAddressConfirmed: SortEnumType @cost(weight: "10")
   websiteLocator: UriSortInput @cost(weight: "10")
 }
 
@@ -2480,24 +2616,27 @@ input CreateOpenIdConnectApplicationInput {
 
 input DataFormatFilterInput {
   and: [DataFormatFilterInput!]
-  or: [DataFormatFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
-  extension: StringFilterInput
+  createdAt: DateTimeFilterInput
   description: StringFilterInput
+  extension: StringFilterInput
+  id: UuidFilterInput
+  manager: InstitutionFilterInput
   mediaType: StringFilterInput
+  name: StringFilterInput
+  or: [DataFormatFilterInput!]
   schemaLocator: UrlFilterInput
-  manager: InstitutionFilterInput
+  updatedAt: DateTimeFilterInput
 }
 
 input DataFormatSortInput {
-  id: SortEnumType @cost(weight: "10")
-  name: SortEnumType @cost(weight: "10")
-  extension: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
   description: SortEnumType @cost(weight: "10")
+  extension: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
   mediaType: SortEnumType @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
   schemaLocator: UriSortInput @cost(weight: "10")
-  manager: InstitutionSortInput @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input DataPropositionInput {
@@ -2510,49 +2649,52 @@ input DataPropositionInput {
 
 input DatabaseFilterInput {
   and: [DatabaseFilterInput!]
-  or: [DatabaseFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
+  createdAt: DateTimeFilterInput
   description: StringFilterInput
+  id: UuidFilterInput
   locator: UrlFilterInput
+  name: StringFilterInput
   operator: InstitutionFilterInput
+  or: [DatabaseFilterInput!]
+  updatedAt: DateTimeFilterInput
 }
 
 input DatabaseSortInput {
-  id: SortEnumType @cost(weight: "10")
-  name: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
   description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
   locator: UriSortInput @cost(weight: "10")
-  operator: InstitutionSortInput @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input DateTimeFilterInput {
   equalTo: DateTime @cost(weight: "10")
-  notEqualTo: DateTime @cost(weight: "10")
-  in: [DateTime] @cost(weight: "10")
-  notIn: [DateTime] @cost(weight: "10")
   greaterThan: DateTime @cost(weight: "10")
-  notGreaterThan: DateTime @cost(weight: "10")
   greaterThanOrEqualTo: DateTime @cost(weight: "10")
-  notGreaterThanOrEqualTo: DateTime @cost(weight: "10")
+  in: [DateTime] @cost(weight: "10")
   lessThan: DateTime @cost(weight: "10")
-  notLessThan: DateTime @cost(weight: "10")
   lessThanOrEqualTo: DateTime @cost(weight: "10")
+  notEqualTo: DateTime @cost(weight: "10")
+  notGreaterThan: DateTime @cost(weight: "10")
+  notGreaterThanOrEqualTo: DateTime @cost(weight: "10")
+  notIn: [DateTime] @cost(weight: "10")
+  notLessThan: DateTime @cost(weight: "10")
   notLessThanOrEqualTo: DateTime @cost(weight: "10")
 }
 
 input DecimalFilterInput {
   equalTo: Decimal @cost(weight: "10")
-  notEqualTo: Decimal @cost(weight: "10")
-  in: [Decimal] @cost(weight: "10")
-  notIn: [Decimal] @cost(weight: "10")
   greaterThan: Decimal @cost(weight: "10")
-  notGreaterThan: Decimal @cost(weight: "10")
   greaterThanOrEqualTo: Decimal @cost(weight: "10")
-  notGreaterThanOrEqualTo: Decimal @cost(weight: "10")
+  in: [Decimal] @cost(weight: "10")
   lessThan: Decimal @cost(weight: "10")
-  notLessThan: Decimal @cost(weight: "10")
   lessThanOrEqualTo: Decimal @cost(weight: "10")
+  notEqualTo: Decimal @cost(weight: "10")
+  notGreaterThan: Decimal @cost(weight: "10")
+  notGreaterThanOrEqualTo: Decimal @cost(weight: "10")
+  notIn: [Decimal] @cost(weight: "10")
+  notLessThan: Decimal @cost(weight: "10")
   notLessThanOrEqualTo: Decimal @cost(weight: "10")
 }
 
@@ -2578,8 +2720,8 @@ input DeleteUserInput {
 
 input DescriptionOrReferenceFilterInput {
   and: [DescriptionOrReferenceFilterInput!]
-  or: [DescriptionOrReferenceFilterInput!]
   description: StringFilterInput
+  or: [DescriptionOrReferenceFilterInput!]
 }
 
 input DescriptionOrReferenceInput {
@@ -2591,14 +2733,23 @@ input DescriptionOrReferenceSortInput {
   description: SortEnumType @cost(weight: "10")
 }
 
-input EnableUserTwoFactorAuthenticatorInput {
-  verificationCode: String!
+input DurationFilterInput {
+  equalTo: Duration @cost(weight: "10")
+  greaterThan: Duration @cost(weight: "10")
+  greaterThanOrEqualTo: Duration @cost(weight: "10")
+  in: [Duration] @cost(weight: "10")
+  lessThan: Duration @cost(weight: "10")
+  lessThanOrEqualTo: Duration @cost(weight: "10")
+  notEqualTo: Duration @cost(weight: "10")
+  notGreaterThan: Duration @cost(weight: "10")
+  notGreaterThanOrEqualTo: Duration @cost(weight: "10")
+  notIn: [Duration] @cost(weight: "10")
+  notLessThan: Duration @cost(weight: "10")
+  notLessThanOrEqualTo: Duration @cost(weight: "10")
 }
 
-input EraFilterInput {
-  and: [EraFilterInput!]
-  or: [EraFilterInput!]
-  name: StringFilterInput
+input EnableUserTwoFactorAuthenticatorInput {
+  verificationCode: String!
 }
 
 input FileMetaInformationPropositionInput {
@@ -2613,116 +2764,109 @@ input FilesMetaInformationPropositionInput {
 
 input FilterInputTypeOfComponentAssemblysFilterInput {
   all: ComponentAssembledOfFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: ComponentAssembledOfFilterInput @cost(weight: "10")
   some: ComponentAssembledOfFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfComponentManufacturersFilterInput {
   all: ComponentManufacturerFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: ComponentManufacturerFilterInput @cost(weight: "10")
   some: ComponentManufacturerFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfComponentsFilterInput {
   all: ComponentFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: ComponentFilterInput @cost(weight: "10")
   some: ComponentFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfDataFormatsFilterInput {
   all: DataFormatFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: DataFormatFilterInput @cost(weight: "10")
   some: DataFormatFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfDatabasesFilterInput {
   all: DatabaseFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: DatabaseFilterInput @cost(weight: "10")
   some: DatabaseFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-}
-
-input FilterInputTypeOfErasFilterInput {
-  all: EraFilterInput @cost(weight: "10")
-  none: EraFilterInput @cost(weight: "10")
-  some: EraFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfGnuPgKeyFingerprintsFilterInput {
   all: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
   some: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfInstitutionMethodDevelopersFilterInput {
   all: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
   some: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfInstitutionRepresentativesFilterInput {
   all: InstitutionRepresentativeFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: InstitutionRepresentativeFilterInput @cost(weight: "10")
   some: InstitutionRepresentativeFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfInstitutionsFilterInput {
   all: InstitutionFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: InstitutionFilterInput @cost(weight: "10")
   some: InstitutionFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfMethodsFilterInput {
   all: InstitutionManagedMethodFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: InstitutionManagedMethodFilterInput @cost(weight: "10")
   some: InstitutionManagedMethodFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfOpenIdConnectTokensFilterInput {
   all: OpenIdConnectTokenFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: OpenIdConnectTokenFilterInput @cost(weight: "10")
   some: OpenIdConnectTokenFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfUserMethodDevelopersFilterInput {
   all: UserDevelopedMethodFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: UserDevelopedMethodFilterInput @cost(weight: "10")
   some: UserDevelopedMethodFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FilterInputTypeOfUsersFilterInput {
   all: UserFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: UserFilterInput @cost(weight: "10")
   some: UserFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
 }
 
 input FloatFilterInput {
   equalTo: Float @cost(weight: "10")
-  notEqualTo: Float @cost(weight: "10")
-  in: [Float] @cost(weight: "10")
-  notIn: [Float] @cost(weight: "10")
   greaterThan: Float @cost(weight: "10")
-  notGreaterThan: Float @cost(weight: "10")
   greaterThanOrEqualTo: Float @cost(weight: "10")
-  notGreaterThanOrEqualTo: Float @cost(weight: "10")
+  in: [Float] @cost(weight: "10")
+  inClosedInterval: ClosedIntervalInputOfDoubleInput @cost(weight: "10")
   lessThan: Float @cost(weight: "10")
-  notLessThan: Float @cost(weight: "10")
   lessThanOrEqualTo: Float @cost(weight: "10")
+  notEqualTo: Float @cost(weight: "10")
+  notGreaterThan: Float @cost(weight: "10")
+  notGreaterThanOrEqualTo: Float @cost(weight: "10")
+  notIn: [Float] @cost(weight: "10")
+  notLessThan: Float @cost(weight: "10")
   notLessThanOrEqualTo: Float @cost(weight: "10")
-  inClosedInterval: ClosedIntervalInputOfDoubleInput @cost(weight: "10")
 }
 
 input FloatPropositionInput {
@@ -2763,25 +2907,25 @@ input GetHttpsResourcesPropositionInput {
 }
 
 input GnuPgKeyFingerprintFilterInput {
+  allowedAt: DateTimeFilterInput
   and: [GnuPgKeyFingerprintFilterInput!]
-  or: [GnuPgKeyFingerprintFilterInput!]
-  id: UuidFilterInput
+  createdAt: DateTimeFilterInput
   fingerprint: StringFilterInput
-  createdAt: OffsetDateTimeFilterInput
-  allowedAt: OffsetDateTimeFilterInput
-  forbiddenAt: OffsetDateTimeFilterInput
-  user: UserFilterInput
+  forbiddenAt: DateTimeFilterInput
+  id: UuidFilterInput
   institution: InstitutionFilterInput
+  or: [GnuPgKeyFingerprintFilterInput!]
+  updatedAt: DateTimeFilterInput
+  user: UserFilterInput
 }
 
 input GnuPgKeyFingerprintSortInput {
-  id: SortEnumType @cost(weight: "10")
-  fingerprint: SortEnumType @cost(weight: "10")
-  createdAt: SortEnumType @cost(weight: "10")
   allowedAt: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  fingerprint: SortEnumType @cost(weight: "10")
   forbiddenAt: SortEnumType @cost(weight: "10")
-  user: UserSortInput @cost(weight: "10")
-  institution: InstitutionSortInput @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input HygrothermalDataPropositionInput {
@@ -2792,209 +2936,292 @@ input HygrothermalDataPropositionInput {
   resources: GetHttpsResourcesPropositionInput
 }
 
-input IMethodDeveloperFilterInput {
-  and: [IMethodDeveloperFilterInput!]
-  or: [IMethodDeveloperFilterInput!]
-}
-
 input InstitutionDevelopedMethodFilterInput {
   and: [InstitutionDevelopedMethodFilterInput!]
-  or: [InstitutionDevelopedMethodFilterInput!]
+  createdAt: DateTimeFilterInput
   method: InstitutionManagedMethodFilterInput
+  or: [InstitutionDevelopedMethodFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input InstitutionDevelopedMethodSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionFilterInput {
-  and: [InstitutionFilterInput!]
-  or: [InstitutionFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
   abbreviation: StringFilterInput
-  description: StringFilterInput
+  and: [InstitutionFilterInput!]
   contact: ContactInformationFilterInput
-  state: InstitutionStateFilterInput
-  extras: JsonElementFilterInput
-  developedMethods: FilterInputTypeOfMethodsFilterInput
+  createdAt: DateTimeFilterInput
+  description: StringFilterInput
   developedMethodEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  managedMethods: FilterInputTypeOfMethodsFilterInput
+  developedMethods: FilterInputTypeOfMethodsFilterInput
+  extras: JsonElementFilterInput
+  gnuPgKeyFingerprints: FilterInputTypeOfGnuPgKeyFingerprintsFilterInput
+  id: UuidFilterInput
   managedDataFormats: FilterInputTypeOfDataFormatsFilterInput
-  manufacturedComponents: FilterInputTypeOfComponentsFilterInput
+  managedInstitutions: FilterInputTypeOfInstitutionsFilterInput
+  managedMethods: FilterInputTypeOfMethodsFilterInput
+  manager: InstitutionFilterInput
   manufacturedComponentEdges: FilterInputTypeOfComponentManufacturersFilterInput
+  manufacturedComponents: FilterInputTypeOfComponentsFilterInput
+  name: StringFilterInput
   operatedDatabases: FilterInputTypeOfDatabasesFilterInput
-  manager: InstitutionFilterInput
-  managedInstitutions: FilterInputTypeOfInstitutionsFilterInput
-  representatives: FilterInputTypeOfUsersFilterInput
+  or: [InstitutionFilterInput!]
   representativeEdges: FilterInputTypeOfInstitutionRepresentativesFilterInput
-  gnuPgKeyFingerprints: FilterInputTypeOfGnuPgKeyFingerprintsFilterInput
+  representatives: FilterInputTypeOfUsersFilterInput
+  state: InstitutionStateFilterInput
+  updatedAt: DateTimeFilterInput
 }
 
 input InstitutionGnuPgKeyFingerprintFilterInput {
+  allowedAt: DateTimeFilterInput
   and: [InstitutionGnuPgKeyFingerprintFilterInput!]
-  or: [InstitutionGnuPgKeyFingerprintFilterInput!]
-  id: UuidFilterInput
+  createdAt: DateTimeFilterInput
   fingerprint: StringFilterInput
-  createdAt: OffsetDateTimeFilterInput
-  allowedAt: OffsetDateTimeFilterInput
-  forbiddenAt: OffsetDateTimeFilterInput
+  forbiddenAt: DateTimeFilterInput
+  id: UuidFilterInput
+  or: [InstitutionGnuPgKeyFingerprintFilterInput!]
+  updatedAt: DateTimeFilterInput
   user: UserFilterInput
 }
 
+input InstitutionGnuPgKeyFingerprintSortInput {
+  allowedAt: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  fingerprint: SortEnumType @cost(weight: "10")
+  forbiddenAt: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
+}
+
 input InstitutionManagedComponentFilterInput {
-  and: [InstitutionManagedComponentFilterInput!]
-  or: [InstitutionManagedComponentFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
   abbreviation: StringFilterInput
-  description: StringFilterInput
+  and: [InstitutionManagedComponentFilterInput!]
   categories: ComponentCategorysFilterInput
+  concretizations: FilterInputTypeOfComponentsFilterInput
+  createdAt: DateTimeFilterInput
+  description: StringFilterInput
   extras: JsonElementFilterInput
+  generalizations: FilterInputTypeOfComponentsFilterInput
+  id: UuidFilterInput
+  manufacturerEdges: FilterInputTypeOfComponentManufacturersFilterInput
+  manufacturers: FilterInputTypeOfInstitutionsFilterInput
+  name: StringFilterInput
+  or: [InstitutionManagedComponentFilterInput!]
+  partEdges: FilterInputTypeOfComponentAssemblysFilterInput
   partOf: FilterInputTypeOfComponentsFilterInput
-  parts: FilterInputTypeOfComponentsFilterInput
   partOfEdges: FilterInputTypeOfComponentAssemblysFilterInput
-  partEdges: FilterInputTypeOfComponentAssemblysFilterInput
-  concretizations: FilterInputTypeOfComponentsFilterInput
-  generalizations: FilterInputTypeOfComponentsFilterInput
+  parts: FilterInputTypeOfComponentsFilterInput
+  updatedAt: DateTimeFilterInput
   variants: FilterInputTypeOfComponentsFilterInput
-  manufacturers: FilterInputTypeOfInstitutionsFilterInput
-  manufacturerEdges: FilterInputTypeOfComponentManufacturersFilterInput
+}
+
+input InstitutionManagedComponentSortInput {
+  abbreviation: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionManagedDataFormatFilterInput {
   and: [InstitutionManagedDataFormatFilterInput!]
-  or: [InstitutionManagedDataFormatFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
-  extension: StringFilterInput
+  createdAt: DateTimeFilterInput
   description: StringFilterInput
+  extension: StringFilterInput
+  id: UuidFilterInput
   mediaType: StringFilterInput
+  name: StringFilterInput
+  or: [InstitutionManagedDataFormatFilterInput!]
   schemaLocator: UrlFilterInput
+  updatedAt: DateTimeFilterInput
+}
+
+input InstitutionManagedDataFormatSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
+  extension: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  mediaType: SortEnumType @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  schemaLocator: UriSortInput @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionManagedInstitutionFilterInput {
-  and: [InstitutionManagedInstitutionFilterInput!]
-  or: [InstitutionManagedInstitutionFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
   abbreviation: StringFilterInput
-  description: StringFilterInput
+  and: [InstitutionManagedInstitutionFilterInput!]
   contact: ContactInformationFilterInput
-  state: InstitutionStateFilterInput
-  extras: JsonElementFilterInput
-  developedMethods: FilterInputTypeOfMethodsFilterInput
+  createdAt: DateTimeFilterInput
+  description: StringFilterInput
   developedMethodEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  managedMethods: FilterInputTypeOfMethodsFilterInput
+  developedMethods: FilterInputTypeOfMethodsFilterInput
+  extras: JsonElementFilterInput
+  gnuPgKeyFingerprints: FilterInputTypeOfGnuPgKeyFingerprintsFilterInput
+  id: UuidFilterInput
   managedDataFormats: FilterInputTypeOfDataFormatsFilterInput
-  manufacturedComponents: FilterInputTypeOfComponentsFilterInput
+  managedInstitutions: FilterInputTypeOfInstitutionsFilterInput
+  managedMethods: FilterInputTypeOfMethodsFilterInput
   manufacturedComponentEdges: FilterInputTypeOfComponentManufacturersFilterInput
+  manufacturedComponents: FilterInputTypeOfComponentsFilterInput
+  name: StringFilterInput
   operatedDatabases: FilterInputTypeOfDatabasesFilterInput
-  managedInstitutions: FilterInputTypeOfInstitutionsFilterInput
-  representatives: FilterInputTypeOfUsersFilterInput
+  or: [InstitutionManagedInstitutionFilterInput!]
   representativeEdges: FilterInputTypeOfInstitutionRepresentativesFilterInput
-  gnuPgKeyFingerprints: FilterInputTypeOfGnuPgKeyFingerprintsFilterInput
+  representatives: FilterInputTypeOfUsersFilterInput
+  state: InstitutionStateFilterInput
+  updatedAt: DateTimeFilterInput
+}
+
+input InstitutionManagedInstitutionSortInput {
+  abbreviation: SortEnumType @cost(weight: "10")
+  contact: ContactInformationSortInput @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  state: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionManagedMethodFilterInput {
   and: [InstitutionManagedMethodFilterInput!]
-  or: [InstitutionManagedMethodFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
-  description: StringFilterInput
   calculationLocator: UrlFilterInput
   categories: MethodCategorysFilterInput
-  institutionDevelopers: FilterInputTypeOfInstitutionsFilterInput
+  createdAt: DateTimeFilterInput
+  description: StringFilterInput
+  id: UuidFilterInput
   institutionDeveloperEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  userDevelopers: FilterInputTypeOfUsersFilterInput
+  institutionDevelopers: FilterInputTypeOfInstitutionsFilterInput
+  name: StringFilterInput
+  or: [InstitutionManagedMethodFilterInput!]
+  updatedAt: DateTimeFilterInput
   userDeveloperEdges: FilterInputTypeOfUserMethodDevelopersFilterInput
+  userDevelopers: FilterInputTypeOfUsersFilterInput
+}
+
+input InstitutionManagedMethodSortInput {
+  calculationLocator: UriSortInput @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionManufacturedComponentFilterInput {
   and: [InstitutionManufacturedComponentFilterInput!]
-  or: [InstitutionManufacturedComponentFilterInput!]
   component: ComponentFilterInput
+  createdAt: DateTimeFilterInput
+  or: [InstitutionManufacturedComponentFilterInput!]
+  updatedAt: DateTimeFilterInput
 }
 
-input InstitutionMethodDeveloperSortInput {
-  method: MethodSortInput @cost(weight: "10")
-  institution: InstitutionSortInput @cost(weight: "10")
+input InstitutionManufacturedComponentSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionOperatedDatabaseFilterInput {
   and: [InstitutionOperatedDatabaseFilterInput!]
-  or: [InstitutionOperatedDatabaseFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
+  createdAt: DateTimeFilterInput
   description: StringFilterInput
+  id: UuidFilterInput
   locator: UrlFilterInput
+  name: StringFilterInput
+  or: [InstitutionOperatedDatabaseFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input InstitutionOperatedDatabaseSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  locator: UriSortInput @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionOwnedOpenIdConnectApplicationFilterInput {
   and: [InstitutionOwnedOpenIdConnectApplicationFilterInput!]
-  or: [InstitutionOwnedOpenIdConnectApplicationFilterInput!]
-  id: UuidFilterInput
   applicationType: StringFilterInput
   clientId: StringFilterInput
   consentType: StringFilterInput
+  createdAt: DateTimeFilterInput
   displayName: StringFilterInput
+  id: UuidFilterInput
+  or: [InstitutionOwnedOpenIdConnectApplicationFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input InstitutionOwnedOpenIdConnectApplicationSortInput {
+  applicationType: SortEnumType @cost(weight: "10")
+  clientId: SortEnumType @cost(weight: "10")
+  consentType: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  displayName: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionRepresentativeFilterInput {
   and: [InstitutionRepresentativeFilterInput!]
+  createdAt: DateTimeFilterInput
   or: [InstitutionRepresentativeFilterInput!]
-  user: UserFilterInput
   role: InstitutionRepresentativeRoleFilterInput
+  updatedAt: DateTimeFilterInput
+  user: UserFilterInput
 }
 
 input InstitutionRepresentativeRoleFilterInput {
   equalTo: InstitutionRepresentativeRole @cost(weight: "10")
-  notEqualTo: InstitutionRepresentativeRole @cost(weight: "10")
   in: [InstitutionRepresentativeRole!] @cost(weight: "10")
+  notEqualTo: InstitutionRepresentativeRole @cost(weight: "10")
   notIn: [InstitutionRepresentativeRole!] @cost(weight: "10")
 }
 
 input InstitutionRepresentativeSortInput {
-  institution: InstitutionSortInput @cost(weight: "10")
-  user: UserSortInput @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
   role: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionSortInput {
-  id: SortEnumType @cost(weight: "10")
-  name: SortEnumType @cost(weight: "10")
   abbreviation: SortEnumType @cost(weight: "10")
-  description: SortEnumType @cost(weight: "10")
   contact: ContactInformationSortInput @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
   state: SortEnumType @cost(weight: "10")
-  manager: InstitutionSortInput @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input InstitutionStateFilterInput {
   equalTo: InstitutionState @cost(weight: "10")
-  notEqualTo: InstitutionState @cost(weight: "10")
   in: [InstitutionState!] @cost(weight: "10")
+  notEqualTo: InstitutionState @cost(weight: "10")
   notIn: [InstitutionState!] @cost(weight: "10")
 }
 
 input IntFilterInput {
   equalTo: Int @cost(weight: "10")
-  notEqualTo: Int @cost(weight: "10")
-  in: [Int] @cost(weight: "10")
-  notIn: [Int] @cost(weight: "10")
   greaterThan: Int @cost(weight: "10")
-  notGreaterThan: Int @cost(weight: "10")
   greaterThanOrEqualTo: Int @cost(weight: "10")
-  notGreaterThanOrEqualTo: Int @cost(weight: "10")
+  in: [Int] @cost(weight: "10")
   lessThan: Int @cost(weight: "10")
-  notLessThan: Int @cost(weight: "10")
   lessThanOrEqualTo: Int @cost(weight: "10")
+  notEqualTo: Int @cost(weight: "10")
+  notGreaterThan: Int @cost(weight: "10")
+  notGreaterThanOrEqualTo: Int @cost(weight: "10")
+  notIn: [Int] @cost(weight: "10")
+  notLessThan: Int @cost(weight: "10")
   notLessThanOrEqualTo: Int @cost(weight: "10")
 }
 
-input IsoDayOfWeekFilterInput {
-  equalTo: IsoDayOfWeek @cost(weight: "10")
-  notEqualTo: IsoDayOfWeek @cost(weight: "10")
-  in: [IsoDayOfWeek!] @cost(weight: "10")
-  notIn: [IsoDayOfWeek!] @cost(weight: "10")
-}
-
 input JsonElementFilterInput {
   and: [JsonElementFilterInput!]
   or: [JsonElementFilterInput!]
@@ -3003,8 +3230,8 @@ input JsonElementFilterInput {
 
 input JsonValueKindFilterInput {
   equalTo: JsonValueKind @cost(weight: "10")
-  notEqualTo: JsonValueKind @cost(weight: "10")
   in: [JsonValueKind!] @cost(weight: "10")
+  notEqualTo: JsonValueKind @cost(weight: "10")
   notIn: [JsonValueKind!] @cost(weight: "10")
 }
 
@@ -3017,54 +3244,48 @@ input LifeCycleDataPropositionInput {
 }
 
 input LocalDateFilterInput {
-  and: [LocalDateFilterInput!]
-  or: [LocalDateFilterInput!]
-  calendar: CalendarSystemFilterInput
-  year: IntFilterInput
-  month: IntFilterInput
-  day: IntFilterInput
-  dayOfWeek: IsoDayOfWeekFilterInput
-  yearOfEra: IntFilterInput
-  era: EraFilterInput
-  dayOfYear: IntFilterInput
+  equalTo: LocalDate @cost(weight: "10")
+  greaterThan: LocalDate @cost(weight: "10")
+  greaterThanOrEqualTo: LocalDate @cost(weight: "10")
+  in: [LocalDate] @cost(weight: "10")
+  lessThan: LocalDate @cost(weight: "10")
+  lessThanOrEqualTo: LocalDate @cost(weight: "10")
+  notEqualTo: LocalDate @cost(weight: "10")
+  notGreaterThan: LocalDate @cost(weight: "10")
+  notGreaterThanOrEqualTo: LocalDate @cost(weight: "10")
+  notIn: [LocalDate] @cost(weight: "10")
+  notLessThan: LocalDate @cost(weight: "10")
+  notLessThanOrEqualTo: LocalDate @cost(weight: "10")
 }
 
 input LocalDateTimeFilterInput {
-  and: [LocalDateTimeFilterInput!]
-  or: [LocalDateTimeFilterInput!]
-  calendar: CalendarSystemFilterInput
-  year: IntFilterInput
-  yearOfEra: IntFilterInput
-  era: EraFilterInput
-  month: IntFilterInput
-  dayOfYear: IntFilterInput
-  day: IntFilterInput
-  dayOfWeek: IsoDayOfWeekFilterInput
-  hour: IntFilterInput
-  clockHourOfHalfDay: IntFilterInput
-  minute: IntFilterInput
-  second: IntFilterInput
-  millisecond: IntFilterInput
-  tickOfSecond: IntFilterInput
-  tickOfDay: LongFilterInput
-  nanosecondOfSecond: IntFilterInput
-  nanosecondOfDay: LongFilterInput
-  timeOfDay: LocalTimeFilterInput
-  date: LocalDateFilterInput
+  equalTo: LocalDateTime @cost(weight: "10")
+  greaterThan: LocalDateTime @cost(weight: "10")
+  greaterThanOrEqualTo: LocalDateTime @cost(weight: "10")
+  in: [LocalDateTime] @cost(weight: "10")
+  lessThan: LocalDateTime @cost(weight: "10")
+  lessThanOrEqualTo: LocalDateTime @cost(weight: "10")
+  notEqualTo: LocalDateTime @cost(weight: "10")
+  notGreaterThan: LocalDateTime @cost(weight: "10")
+  notGreaterThanOrEqualTo: LocalDateTime @cost(weight: "10")
+  notIn: [LocalDateTime] @cost(weight: "10")
+  notLessThan: LocalDateTime @cost(weight: "10")
+  notLessThanOrEqualTo: LocalDateTime @cost(weight: "10")
 }
 
 input LocalTimeFilterInput {
-  and: [LocalTimeFilterInput!]
-  or: [LocalTimeFilterInput!]
-  hour: IntFilterInput
-  clockHourOfHalfDay: IntFilterInput
-  minute: IntFilterInput
-  second: IntFilterInput
-  millisecond: IntFilterInput
-  tickOfSecond: IntFilterInput
-  tickOfDay: LongFilterInput
-  nanosecondOfSecond: IntFilterInput
-  nanosecondOfDay: LongFilterInput
+  equalTo: LocalTime @cost(weight: "10")
+  greaterThan: LocalTime @cost(weight: "10")
+  greaterThanOrEqualTo: LocalTime @cost(weight: "10")
+  in: [LocalTime] @cost(weight: "10")
+  lessThan: LocalTime @cost(weight: "10")
+  lessThanOrEqualTo: LocalTime @cost(weight: "10")
+  notEqualTo: LocalTime @cost(weight: "10")
+  notGreaterThan: LocalTime @cost(weight: "10")
+  notGreaterThanOrEqualTo: LocalTime @cost(weight: "10")
+  notIn: [LocalTime] @cost(weight: "10")
+  notLessThan: LocalTime @cost(weight: "10")
+  notLessThanOrEqualTo: LocalTime @cost(weight: "10")
 }
 
 input LoginUserInput {
@@ -3083,46 +3304,60 @@ input LoginUserWithTwoFactorCodeInput {
 
 input LongFilterInput {
   equalTo: Long @cost(weight: "10")
-  notEqualTo: Long @cost(weight: "10")
-  in: [Long] @cost(weight: "10")
-  notIn: [Long] @cost(weight: "10")
   greaterThan: Long @cost(weight: "10")
-  notGreaterThan: Long @cost(weight: "10")
   greaterThanOrEqualTo: Long @cost(weight: "10")
-  notGreaterThanOrEqualTo: Long @cost(weight: "10")
+  in: [Long] @cost(weight: "10")
   lessThan: Long @cost(weight: "10")
-  notLessThan: Long @cost(weight: "10")
   lessThanOrEqualTo: Long @cost(weight: "10")
+  notEqualTo: Long @cost(weight: "10")
+  notGreaterThan: Long @cost(weight: "10")
+  notGreaterThanOrEqualTo: Long @cost(weight: "10")
+  notIn: [Long] @cost(weight: "10")
+  notLessThan: Long @cost(weight: "10")
   notLessThanOrEqualTo: Long @cost(weight: "10")
 }
 
 input MethodCategoryFilterInput {
   equalTo: MethodCategory @cost(weight: "10")
-  notEqualTo: MethodCategory @cost(weight: "10")
   in: [MethodCategory!] @cost(weight: "10")
+  notEqualTo: MethodCategory @cost(weight: "10")
   notIn: [MethodCategory!] @cost(weight: "10")
 }
 
 input MethodCategorysFilterInput {
   all: MethodCategoryFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
   none: MethodCategoryFilterInput @cost(weight: "10")
   some: MethodCategoryFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
+}
+
+input MethodDeveloperFilterInput {
+  and: [MethodDeveloperFilterInput!]
+  createdAt: DateTimeFilterInput
+  or: [MethodDeveloperFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input MethodDeveloperSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input MethodFilterInput {
   and: [MethodFilterInput!]
-  or: [MethodFilterInput!]
-  id: UuidFilterInput
-  name: StringFilterInput
-  description: StringFilterInput
   calculationLocator: UrlFilterInput
   categories: MethodCategorysFilterInput
-  institutionDevelopers: FilterInputTypeOfInstitutionsFilterInput
+  createdAt: DateTimeFilterInput
+  description: StringFilterInput
+  id: UuidFilterInput
   institutionDeveloperEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  userDevelopers: FilterInputTypeOfUsersFilterInput
-  userDeveloperEdges: FilterInputTypeOfUserMethodDevelopersFilterInput
+  institutionDevelopers: FilterInputTypeOfInstitutionsFilterInput
   manager: InstitutionFilterInput
+  name: StringFilterInput
+  or: [MethodFilterInput!]
+  updatedAt: DateTimeFilterInput
+  userDeveloperEdges: FilterInputTypeOfUserMethodDevelopersFilterInput
+  userDevelopers: FilterInputTypeOfUsersFilterInput
 }
 
 input MethodParameterInput {
@@ -3131,11 +3366,12 @@ input MethodParameterInput {
 }
 
 input MethodSortInput {
+  calculationLocator: UriSortInput @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
   id: SortEnumType @cost(weight: "10")
   name: SortEnumType @cost(weight: "10")
-  description: SortEnumType @cost(weight: "10")
-  calculationLocator: UriSortInput @cost(weight: "10")
-  manager: InstitutionSortInput @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 "A data source given as a cross-database data reference when this method is applied."
@@ -3146,8 +3382,8 @@ input MethodSourceInput {
 
 input NullableOfPrimeSurfaceFilterInput {
   equalTo: PrimeSurface @cost(weight: "10")
-  notEqualTo: PrimeSurface @cost(weight: "10")
   in: [PrimeSurface] @cost(weight: "10")
+  notEqualTo: PrimeSurface @cost(weight: "10")
   notIn: [PrimeSurface] @cost(weight: "10")
 }
 
@@ -3157,41 +3393,6 @@ input NumerationInput {
   suffix: String
 }
 
-input OffsetDateTimeFilterInput {
-  and: [OffsetDateTimeFilterInput!]
-  or: [OffsetDateTimeFilterInput!]
-  calendar: CalendarSystemFilterInput
-  year: IntFilterInput
-  month: IntFilterInput
-  day: IntFilterInput
-  dayOfWeek: IsoDayOfWeekFilterInput
-  yearOfEra: IntFilterInput
-  era: EraFilterInput
-  dayOfYear: IntFilterInput
-  hour: IntFilterInput
-  clockHourOfHalfDay: IntFilterInput
-  minute: IntFilterInput
-  second: IntFilterInput
-  millisecond: IntFilterInput
-  tickOfSecond: IntFilterInput
-  tickOfDay: LongFilterInput
-  nanosecondOfSecond: IntFilterInput
-  nanosecondOfDay: LongFilterInput
-  localDateTime: LocalDateTimeFilterInput
-  date: LocalDateFilterInput
-  timeOfDay: LocalTimeFilterInput
-  offset: OffsetFilterInput
-}
-
-input OffsetFilterInput {
-  and: [OffsetFilterInput!]
-  or: [OffsetFilterInput!]
-  seconds: IntFilterInput
-  milliseconds: IntFilterInput
-  ticks: LongFilterInput
-  nanoseconds: LongFilterInput
-}
-
 input OpenEndedDateTimeRangeInput {
   from: DateTime
   to: DateTime
@@ -3199,35 +3400,73 @@ input OpenEndedDateTimeRangeInput {
 
 input OpenIdConnectApplicationFilterInput {
   and: [OpenIdConnectApplicationFilterInput!]
-  or: [OpenIdConnectApplicationFilterInput!]
-  id: UuidFilterInput
   applicationType: StringFilterInput
   clientId: StringFilterInput
   consentType: StringFilterInput
+  createdAt: DateTimeFilterInput
   displayName: StringFilterInput
+  id: UuidFilterInput
+  or: [OpenIdConnectApplicationFilterInput!]
+  owner: InstitutionFilterInput
+  updatedAt: DateTimeFilterInput
+}
+
+input OpenIdConnectApplicationSortInput {
+  applicationType: SortEnumType @cost(weight: "10")
+  clientId: SortEnumType @cost(weight: "10")
+  consentType: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  displayName: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input OpenIdConnectAuthorizationFilterInput {
   and: [OpenIdConnectAuthorizationFilterInput!]
-  or: [OpenIdConnectAuthorizationFilterInput!]
+  application: InstitutionOwnedOpenIdConnectApplicationFilterInput
+  createdAt: DateTimeFilterInput
   id: UuidFilterInput
-  creationDate: DateTimeFilterInput
+  or: [OpenIdConnectAuthorizationFilterInput!]
   status: StringFilterInput
   subject: StringFilterInput
   tokens: FilterInputTypeOfOpenIdConnectTokensFilterInput
   type: StringFilterInput
+  updatedAt: DateTimeFilterInput
+}
+
+input OpenIdConnectAuthorizationSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  status: SortEnumType @cost(weight: "10")
+  subject: SortEnumType @cost(weight: "10")
+  type: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input OpenIdConnectTokenFilterInput {
   and: [OpenIdConnectTokenFilterInput!]
-  or: [OpenIdConnectTokenFilterInput!]
+  application: InstitutionOwnedOpenIdConnectApplicationFilterInput
+  authorization: OpenIdConnectAuthorizationFilterInput
+  createdAt: DateTimeFilterInput
+  expiredAt: DateTimeFilterInput
   id: UuidFilterInput
-  creationDate: DateTimeFilterInput
-  expirationDate: DateTimeFilterInput
-  redemptionDate: DateTimeFilterInput
+  or: [OpenIdConnectTokenFilterInput!]
+  redeemedAt: DateTimeFilterInput
   status: StringFilterInput
   subject: StringFilterInput
   type: StringFilterInput
+  updatedAt: DateTimeFilterInput
+}
+
+input OpenIdConnectTokenSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  expiredAt: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  redeemedAt: SortEnumType @cost(weight: "10")
+  status: SortEnumType @cost(weight: "10")
+  subject: SortEnumType @cost(weight: "10")
+  type: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input OpticalComponentSubtypePropositionInput {
@@ -3379,16 +3618,16 @@ input SetUserPhoneNumberInput {
 
 input ShortFilterInput {
   equalTo: Short @cost(weight: "10")
-  notEqualTo: Short @cost(weight: "10")
-  in: [Short] @cost(weight: "10")
-  notIn: [Short] @cost(weight: "10")
   greaterThan: Short @cost(weight: "10")
-  notGreaterThan: Short @cost(weight: "10")
   greaterThanOrEqualTo: Short @cost(weight: "10")
-  notGreaterThanOrEqualTo: Short @cost(weight: "10")
+  in: [Short] @cost(weight: "10")
   lessThan: Short @cost(weight: "10")
-  notLessThan: Short @cost(weight: "10")
   lessThanOrEqualTo: Short @cost(weight: "10")
+  notEqualTo: Short @cost(weight: "10")
+  notGreaterThan: Short @cost(weight: "10")
+  notGreaterThanOrEqualTo: Short @cost(weight: "10")
+  notIn: [Short] @cost(weight: "10")
+  notLessThan: Short @cost(weight: "10")
   notLessThanOrEqualTo: Short @cost(weight: "10")
 }
 
@@ -3404,41 +3643,26 @@ input StandardInput {
 
 input StringFilterInput {
   and: [StringFilterInput!]
-  or: [StringFilterInput!]
-  equalTo: String @cost(weight: "10")
-  notEqualTo: String @cost(weight: "10")
   contains: String @cost(weight: "20")
   doesNotContain: String @cost(weight: "20")
+  doesNotEndWith: String @cost(weight: "20")
+  doesNotStartWith: String @cost(weight: "20")
+  endsWith: String @cost(weight: "20")
+  equalTo: String @cost(weight: "10")
   in: [String] @cost(weight: "10")
+  notEqualTo: String @cost(weight: "10")
   notIn: [String] @cost(weight: "10")
+  or: [StringFilterInput!]
   startsWith: String @cost(weight: "20")
-  doesNotStartWith: String @cost(weight: "20")
-  endsWith: String @cost(weight: "20")
-  doesNotEndWith: String @cost(weight: "20")
 }
 
 input SwitchInstitutionOperatingStateInput {
   institutionId: Uuid!
 }
 
-input TimeSpanFilterInput {
-  equalTo: TimeSpan @cost(weight: "10")
-  notEqualTo: TimeSpan @cost(weight: "10")
-  in: [TimeSpan] @cost(weight: "10")
-  notIn: [TimeSpan] @cost(weight: "10")
-  greaterThan: TimeSpan @cost(weight: "10")
-  notGreaterThan: TimeSpan @cost(weight: "10")
-  greaterThanOrEqualTo: TimeSpan @cost(weight: "10")
-  notGreaterThanOrEqualTo: TimeSpan @cost(weight: "10")
-  lessThan: TimeSpan @cost(weight: "10")
-  notLessThan: TimeSpan @cost(weight: "10")
-  lessThanOrEqualTo: TimeSpan @cost(weight: "10")
-  notLessThanOrEqualTo: TimeSpan @cost(weight: "10")
-}
-
 input UpdateComponentAssemblyInput {
   assembledComponentId: Uuid!
-  index: Byte
+  index: UnsignedByte
   partComponentId: Uuid!
   primeSurface: PrimeSurface
 }
@@ -3512,97 +3736,125 @@ input UpdateOpenIdConnectApplicationInput {
 input UriSortInput {
   absolutePath: SortEnumType @cost(weight: "10")
   absoluteUri: SortEnumType @cost(weight: "10")
-  localPath: SortEnumType @cost(weight: "10")
   authority: SortEnumType @cost(weight: "10")
+  dnsSafeHost: SortEnumType @cost(weight: "10")
+  fragment: SortEnumType @cost(weight: "10")
+  host: SortEnumType @cost(weight: "10")
   hostNameType: SortEnumType @cost(weight: "10")
+  idnHost: SortEnumType @cost(weight: "10")
+  isAbsoluteUri: SortEnumType @cost(weight: "10")
   isDefaultPort: SortEnumType @cost(weight: "10")
   isFile: SortEnumType @cost(weight: "10")
   isLoopback: SortEnumType @cost(weight: "10")
-  pathAndQuery: SortEnumType @cost(weight: "10")
   isUnc: SortEnumType @cost(weight: "10")
-  host: SortEnumType @cost(weight: "10")
+  localPath: SortEnumType @cost(weight: "10")
+  originalString: SortEnumType @cost(weight: "10")
+  pathAndQuery: SortEnumType @cost(weight: "10")
   port: SortEnumType @cost(weight: "10")
   query: SortEnumType @cost(weight: "10")
-  fragment: SortEnumType @cost(weight: "10")
   scheme: SortEnumType @cost(weight: "10")
-  originalString: SortEnumType @cost(weight: "10")
-  dnsSafeHost: SortEnumType @cost(weight: "10")
-  idnHost: SortEnumType @cost(weight: "10")
-  isAbsoluteUri: SortEnumType @cost(weight: "10")
   userEscaped: SortEnumType @cost(weight: "10")
   userInfo: SortEnumType @cost(weight: "10")
 }
 
 input UrlFilterInput {
   equalTo: Url @cost(weight: "10")
-  notEqualTo: Url @cost(weight: "10")
-  in: [Url] @cost(weight: "10")
-  notIn: [Url] @cost(weight: "10")
   greaterThan: Url @cost(weight: "10")
-  notGreaterThan: Url @cost(weight: "10")
   greaterThanOrEqualTo: Url @cost(weight: "10")
-  notGreaterThanOrEqualTo: Url @cost(weight: "10")
+  in: [Url] @cost(weight: "10")
   lessThan: Url @cost(weight: "10")
-  notLessThan: Url @cost(weight: "10")
   lessThanOrEqualTo: Url @cost(weight: "10")
+  notEqualTo: Url @cost(weight: "10")
+  notGreaterThan: Url @cost(weight: "10")
+  notGreaterThanOrEqualTo: Url @cost(weight: "10")
+  notIn: [Url] @cost(weight: "10")
+  notLessThan: Url @cost(weight: "10")
   notLessThanOrEqualTo: Url @cost(weight: "10")
 }
 
 input UserDevelopedMethodFilterInput {
   and: [UserDevelopedMethodFilterInput!]
-  or: [UserDevelopedMethodFilterInput!]
+  createdAt: DateTimeFilterInput
   method: InstitutionManagedMethodFilterInput
+  or: [UserDevelopedMethodFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input UserDevelopedMethodSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input UserFilterInput {
   and: [UserFilterInput!]
-  or: [UserFilterInput!]
-  id: UuidFilterInput
-  developedMethods: FilterInputTypeOfMethodsFilterInput
+  createdAt: DateTimeFilterInput
   developedMethodEdges: FilterInputTypeOfUserMethodDevelopersFilterInput
-  representedInstitutions: FilterInputTypeOfInstitutionsFilterInput
+  developedMethods: FilterInputTypeOfMethodsFilterInput
+  id: UuidFilterInput
+  "Full name"
+  name: StringFilterInput
+  or: [UserFilterInput!]
   representedInstitutionEdges: FilterInputTypeOfInstitutionRepresentativesFilterInput
+  representedInstitutions: FilterInputTypeOfInstitutionsFilterInput
+  updatedAt: DateTimeFilterInput
 }
 
 input UserGnuPgKeyFingerprintFilterInput {
+  allowedAt: DateTimeFilterInput
   and: [UserGnuPgKeyFingerprintFilterInput!]
-  or: [UserGnuPgKeyFingerprintFilterInput!]
-  id: UuidFilterInput
+  createdAt: DateTimeFilterInput
   fingerprint: StringFilterInput
-  createdAt: OffsetDateTimeFilterInput
-  allowedAt: OffsetDateTimeFilterInput
-  forbiddenAt: OffsetDateTimeFilterInput
+  forbiddenAt: DateTimeFilterInput
+  id: UuidFilterInput
   institution: InstitutionFilterInput
+  or: [UserGnuPgKeyFingerprintFilterInput!]
+  updatedAt: DateTimeFilterInput
 }
 
-input UserMethodDeveloperSortInput {
-  method: MethodSortInput @cost(weight: "10")
-  user: UserSortInput @cost(weight: "10")
+input UserGnuPgKeyFingerprintSortInput {
+  allowedAt: SortEnumType @cost(weight: "10")
+  createdAt: SortEnumType @cost(weight: "10")
+  fingerprint: SortEnumType @cost(weight: "10")
+  forbiddenAt: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input UserRepresentedInstitutionFilterInput {
   and: [UserRepresentedInstitutionFilterInput!]
-  or: [UserRepresentedInstitutionFilterInput!]
+  createdAt: DateTimeFilterInput
   institution: InstitutionFilterInput
+  or: [UserRepresentedInstitutionFilterInput!]
   role: InstitutionRepresentativeRoleFilterInput
+  updatedAt: DateTimeFilterInput
+}
+
+input UserRepresentedInstitutionSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  role: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input UserSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
   id: SortEnumType @cost(weight: "10")
+  "Full name"
+  name: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
 }
 
 input UuidFilterInput {
   equalTo: Uuid @cost(weight: "10")
-  notEqualTo: Uuid @cost(weight: "10")
-  in: [Uuid] @cost(weight: "10")
-  notIn: [Uuid] @cost(weight: "10")
   greaterThan: Uuid @cost(weight: "10")
-  notGreaterThan: Uuid @cost(weight: "10")
   greaterThanOrEqualTo: Uuid @cost(weight: "10")
-  notGreaterThanOrEqualTo: Uuid @cost(weight: "10")
+  in: [Uuid] @cost(weight: "10")
   lessThan: Uuid @cost(weight: "10")
-  notLessThan: Uuid @cost(weight: "10")
   lessThanOrEqualTo: Uuid @cost(weight: "10")
+  notEqualTo: Uuid @cost(weight: "10")
+  notGreaterThan: Uuid @cost(weight: "10")
+  notGreaterThanOrEqualTo: Uuid @cost(weight: "10")
+  notIn: [Uuid] @cost(weight: "10")
+  notLessThan: Uuid @cost(weight: "10")
   notLessThanOrEqualTo: Uuid @cost(weight: "10")
 }
 
@@ -3938,17 +4190,6 @@ enum InstitutionState {
   VERIFIED
 }
 
-enum IsoDayOfWeek {
-  NONE
-  MONDAY
-  TUESDAY
-  WEDNESDAY
-  THURSDAY
-  FRIDAY
-  SATURDAY
-  SUNDAY
-}
-
 enum JsonValueKind {
   UNDEFINED
   OBJECT
@@ -4334,62 +4575,56 @@ enum VerifyInstitutionErrorCode {
 }
 
 "The authorize directive."
-directive @authorize("Defines when when the authorize directive shall be applied.By default the authorize directives are applied during the validation phase." apply: ApplyPolicy! = BEFORE_RESOLVER "The name of the authorization policy that determines access to the annotated resource." policy: String "Roles that are allowed to access the annotated resource." roles: [String!]) repeatable on OBJECT | FIELD_DEFINITION
+directive @authorize("Defines when the authorize directive shall be applied. By default the authorize directive is applied before the resolver is executed." apply: ApplyPolicy! = BEFORE_RESOLVER "The name of the authorization policy that determines access to the annotated resource." policy: String "Roles that are allowed to access the annotated resource." roles: [String!]) repeatable on OBJECT | FIELD_DEFINITION
 
 "The purpose of the `cost` directive is to define a `weight` for GraphQL types, fields, and arguments. Static analysis can use these weights when calculating the overall cost of a query or response."
 directive @cost("The `weight` argument defines what value to add to the overall cost for every appearance, or possible appearance, of a type, field, argument, etc." weight: String!) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM | INPUT_FIELD_DEFINITION
 
 "The purpose of the `@listSize` directive is to either inform the static analysis about the size of returned lists (if that information is statically available), or to point the analysis to where to find that information."
-directive @listSize("The `assumedSize` argument can be used to statically define the maximum length of a list returned by a field." assumedSize: Int "The `requireOneSlicingArgument` argument can be used to inform the static analysis that it should expect that exactly one of the defined slicing arguments is present in a query. If that is not the case (i.e., if none or multiple slicing arguments are present), the static analysis may throw an error." requireOneSlicingArgument: Boolean! = true "The `sizedFields` argument can be used to define that the value of the `assumedSize` argument or of a slicing argument does not affect the size of a list returned by a field itself, but that of a list returned by one of its sub-fields." sizedFields: [String!] "The `slicingArgumentDefaultValue` argument can be used to define a default value for a slicing argument, which is used if the argument is not present in a query." slicingArgumentDefaultValue: Int "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments." slicingArguments: [String!]) on FIELD_DEFINITION
+directive @listSize("The `assumedSize` argument can be used to statically define the maximum length of a list returned by a field." assumedSize: Int "The `requireOneSlicingArgument` argument can be used to inform the static analysis that it should expect that exactly one of the defined slicing arguments is present in a query. If that is not the case (i.e., if none or multiple slicing arguments are present), the static analysis may throw an error." requireOneSlicingArgument: Boolean = true "The `sizedFields` argument can be used to define that the value of the `assumedSize` argument or of a slicing argument does not affect the size of a list returned by a field itself, but that of a list returned by one of its sub-fields." sizedFields: [String!] "The `slicingArgumentDefaultValue` argument can be used to define a default value for a slicing argument, which is used if the argument is not present in a query." slicingArgumentDefaultValue: Int "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments." slicingArguments: [String!]) on FIELD_DEFINITION
 
 "The `@specifiedBy` directive is used within the type system definition language to provide a URL for specifying the behavior of custom scalar definitions."
 directive @specifiedBy("The specifiedBy URL points to a human-readable specification. This field will only read a result for scalar types." url: String!) on SCALAR
 
-scalar Any
-
-"The `Byte` scalar type represents non-fractional whole numeric values. Byte can represent values between 0 and 255."
-scalar Byte
+scalar Any @specifiedBy(url: "https://scalars.graphql.org/chillicream/any.html")
 
-"The `DateTime` scalar represents an ISO-8601 compliant date time type."
-scalar DateTime @specifiedBy(url: "https:\/\/www.graphql-scalars.com\/date-time")
+"The `Byte` scalar type represents a signed 8-bit integer."
+scalar Byte @specifiedBy(url: "https://scalars.graphql.org/chillicream/byte.html")
 
-"""
-Represents a time zone - a mapping between UTC and local time.
-A time zone maps UTC instants to local times - or, equivalently, to the offset from UTC at any particular instant.
+"The `DateTime` scalar type represents a date and time with time zone offset information."
+scalar DateTime @specifiedBy(url: "https://scalars.graphql.org/chillicream/date-time.html")
 
-Example: `Europe/Zurich`
-"""
-scalar DateTimeZone
+"The `Decimal` scalar type represents a decimal floating-point number with high precision."
+scalar Decimal @specifiedBy(url: "https://scalars.graphql.org/chillicream/decimal.html")
 
-"The `Decimal` scalar type represents a decimal floating-point number."
-scalar Decimal
+"The `Duration` scalar type represents a duration of time."
+scalar Duration @specifiedBy(url: "https://scalars.graphql.org/chillicream/duration.html")
 
-"""
-Represents a fixed (and calendar-independent) length of time.
+"The `LocalDate` scalar type represents a date without time or time zone information."
+scalar LocalDate @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-date.html")
 
-Allowed patterns:
-- `-D:hh:mm:ss.sssssssss`
+"The `LocalDateTime` scalar type represents a date and time without time zone information."
+scalar LocalDateTime @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-date-time.html")
 
-Examples:
-- `-1:20:00:00.999999999`
-"""
-scalar Duration
+"The `LocalTime` scalar type represents a time of day without date or time zone information."
+scalar LocalTime @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-time.html")
 
 "BCP 47 compliant Language Tag string"
 scalar Locale
 
-"The `Long` scalar type represents non-fractional signed whole 64-bit numeric values. Long can represent values between -(2^63) and 2^63 - 1."
-scalar Long
+"The `Long` scalar type represents a signed 64-bit integer."
+scalar Long @specifiedBy(url: "https://scalars.graphql.org/chillicream/long.html")
 
-"The NonNegativeInt scalar type represents a unsigned 32-bit numeric non-fractional value equal to or greater than 0."
+"The `NonNegativeInt` scalar type represents an unsigned 32-bit numeric non-fractional value."
 scalar NonNegativeInt
 
-"The `Short` scalar type represents non-fractional signed whole 16-bit numeric values. Short can represent values between -(2^15) and 2^15 - 1."
-scalar Short
+"The `Short` scalar type represents a signed 16-bit integer."
+scalar Short @specifiedBy(url: "https://scalars.graphql.org/chillicream/short.html")
 
-"The `TimeSpan` scalar represents an ISO-8601 compliant duration type."
-scalar TimeSpan
+"The `UnsignedByte` scalar type represents an unsigned 8-bit integer."
+scalar UnsignedByte @specifiedBy(url: "https://scalars.graphql.org/chillicream/unsigned-byte.html")
 
-scalar Url
+"The `Url` scalar type represents a Uniform Resource Identifier (URI) as defined by RFC 3986."
+scalar Url @specifiedBy(url: "https://tools.ietf.org/html/rfc3986")
 
-scalar Uuid
\ No newline at end of file
+scalar Uuid @specifiedBy(url: "https://scalars.graphql.org/chillicream/uuid.html")
\ No newline at end of file
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 5fcd58865..65634fa70 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -622,6 +622,17 @@
     change-case-all "1.0.15"
     tslib "~2.6.0"
 
+"@graphql-codegen/typescript-apollo-client-helpers@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-apollo-client-helpers/-/typescript-apollo-client-helpers-4.0.0.tgz#237a29fd6db62d5452d4b150f07f7bfd776c89f5"
+  integrity sha512-1faLt8usmEbAjWQYe4U2lniri0lU0p5fyc7BdfdCu5eW7m05ukXqWWL2WACzF7JcL5Lvx3HDVIZp96oGkUTFPQ==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^6.1.1"
+    "@graphql-codegen/visitor-plugin-common" "^6.2.4"
+    auto-bind "~4.0.0"
+    change-case-all "1.0.15"
+    tslib "^2.8.1"
+
 "@graphql-codegen/typescript-operations@^5.0.4", "@graphql-codegen/typescript-operations@^5.0.9":
   version "5.0.9"
   resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-5.0.9.tgz#95388b2c80434118d5dd102ef5eff7f0de4ca29c"
@@ -2949,10 +2960,10 @@ balanced-match@^4.0.2:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-4.0.4.tgz#bfb10662feed8196a2c62e7c68e17720c274179a"
   integrity sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==
 
-baseline-browser-mapping@^2.10.12:
-  version "2.10.12"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.12.tgz#60f9e2172e962839ac313d4e0c8e182090fb6621"
-  integrity sha512-qyq26DxfY4awP2gIRXhhLWfwzwI+N5Nxk6iQi8EFizIaWIjqicQTE4sLnZZVdeKPRcVNoJOkkpfzoIYuvCKaIQ==
+baseline-browser-mapping@^2.10.27:
+  version "2.10.27"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.27.tgz#fee941c2a0b42cdf83c6427e4c830b1d0bdab2c3"
+  integrity sha512-zEs/ufmZoUd7WftKpKyXaT6RFxpQ5Qm9xytKRHvJfxFV9DFJkZph9RvJ1LcOUi0Z1ZVijMte65JbILeV+8QQEA==
 
 baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
   version "2.10.10"
diff --git a/nginx/templates/default.conf.template b/nginx/templates/default.conf.template
index f8b043a35..1ebfaf11c 100644
--- a/nginx/templates/default.conf.template
+++ b/nginx/templates/default.conf.template
@@ -57,9 +57,13 @@ send_timeout          10s;
 # Distniguish through which proxies the request passed
 add_header X-Proxy-Layer "inner" always;
 
+types {
+  application/javascript js mjs;
+}
+
 map $http_accept $error_type {
-    default           "text/html";
-    ~application/json "application/json";
+  default           "text/html";
+  ~application/json "application/json";
 }
 
 upstream backend {
@@ -98,9 +102,24 @@ server {
     limit_req zone=general burst=100 nodelay;
   }
 
+  location /_next/static {
+    proxy_pass http://frontend;
+    expires 365d;
+    access_log off;
+    limit_req zone=general burst=100 nodelay;
+  }
+
   location /_next/webpack-hmr {
     proxy_pass http://frontend;
     proxy_read_timeout 86400s;
+    proxy_send_timeout 86400s;
+    limit_req zone=general burst=100 nodelay;
+  }
+
+  location ~ /_next/static/.*/_clientMiddlewareManifest\.js$ {
+    proxy_pass http://frontend;
+    proxy_hide_header Content-Type;
+    add_header Content-Type application/javascript;
     limit_req zone=general burst=100 nodelay;
   }
 

From 8a301394d883d0f3e98fb31107e75cbce6c75953 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sat, 18 Apr 2026 21:05:42 +0200
Subject: [PATCH 009/145] Document environment and target variables

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index b0853e348..005f07a03 100644
--- a/README.md
+++ b/README.md
@@ -275,6 +275,12 @@ and the pages following it.
       some information on what the variables mean
       - `NAME` is the name Docker project name, in particular, it is the prefix
         of the Docker container names listed by `docker ps --all`;
+      - `ENVIRONMENT` is either `staging` or `production`;
+      - `TARGET` is the deployed tag or commit. It is set later by running
+        `./deploy.mk do TARGET=${TAG}`. The corresponding Docker images named
+        `${NAME}-backend:${TARGET}` and `${NAME}-frontend:${TARGET}` are built
+        on a build or development machine and pushed to the server later with
+        GNU Make targets from `./forge.mk`;
       - `HOST` is the domain name with sub-domain of the deployment, in
         particular, it is used by the OpenId Connect provider and to make
         URLs absolute in emails sent for example when a user registers;

From 9139ce535fc12955a07218c64db00895cb1e0e6f Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sat, 18 Apr 2026 21:07:26 +0200
Subject: [PATCH 010/145] Discourage using branch as deploy target

---
 deploy.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy.mk b/deploy.mk
index 2d7c1bba4..e4bcb5475 100755
--- a/deploy.mk
+++ b/deploy.mk
@@ -27,7 +27,7 @@ help : ## Print this help
 .DEFAULT_GOAL := help
 
 do : ON_ERROR = pause
-do : symlink ## Deploy tag, branch, or commit `${TARGET}`, for example, `./deploy.mk do TARGET=v1.0.0 ON_ERROR=pause`
+do : symlink ## Deploy tag or commit `${TARGET}`, for example, `./deploy.mk do TARGET=v1.0.0 ON_ERROR=pause`
 	./deploy.sh target "${TARGET}" --on-error "${ON_ERROR}"
 .PHONY : do
 

From 5b2b62c34062b6dcbf0c537f88440c109ae86a15 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 24 Apr 2026 12:55:05 +0200
Subject: [PATCH 011/145] Use Fraunhofer mail-transfer agent with redundancy

---
 .env.production.sample | 2 +-
 .env.staging.sample    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.production.sample b/.env.production.sample
index 0fbc3b58e..8958c14ea 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -21,7 +21,7 @@ IGSDB_OPEN_ID_CONNECT_CLIENT_SECRET=
 OPEN_TELEMETRY_HOST=host.docker.internal
 OPEN_TELEMETRY_GRPC_PORT=4317
 
-SMTP_HOST=mail-mtaKA26.fraunhofer.de
+SMTP_HOST=mta01.mx.fraunhofer.de
 SMTP_PORT=25
 RELAY_SMTP_HOST=
 RELAY_SMTP_PORT=25
diff --git a/.env.staging.sample b/.env.staging.sample
index f732c1e61..30b601405 100644
--- a/.env.staging.sample
+++ b/.env.staging.sample
@@ -23,6 +23,6 @@ OPEN_TELEMETRY_GRPC_PORT=4317
 
 SMTP_HOST=email
 SMTP_PORT=25
-RELAY_SMTP_HOST=mail-mtaKA26.fraunhofer.de
+RELAY_SMTP_HOST=mta01.mx.fraunhofer.de
 RELAY_SMTP_PORT=25
 RELAY_ALLOWED_EMAILS=

From c1792baf429c9e75e5994ff7a9a3f6f8dfb97a14 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 28 Apr 2026 17:43:58 +0200
Subject: [PATCH 012/145] Add steps for the very first deployment

---
 README.md | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 005f07a03..26f77b2d9 100644
--- a/README.md
+++ b/README.md
@@ -308,7 +308,17 @@ and the pages following it.
       - `ln --symbolic ./docker.mk ./Makefile` and
       - `ln --symbolic ./docker-compose.production.yaml ./docker-compose.yaml`.
 
-   1. Create the PostgreSQL database by running `./database.mk create`.
+   1. Switch to the Git branch, tag, or commit you want to deploy by either running
+      `git switch ${BRANCH}`,
+      `git switch --detach release/${TAG}`, or
+      `git switch --detach ${COMMIT_HASH}`,
+      where, for example, `${BRANCH}` is `develop` or `${TAG}` is `v1.0.0` or
+      `${COMMIT_HASH}` is `5e14d7d0858f26c00c82ab9c248cd750606a24b6`.
+
+   1. Create the PostgreSQL database and schema by running
+      `./database.mk create migrate`.
+
+   1. Build and start all services by running `make build up`.
 
 ### Creating a release
 
@@ -339,8 +349,8 @@ and the pages following it.
    `git switch --detach release/${TAG}`, where `${TAG}` is the release tag to
    be deployed, for example, `v1.0.0`.
 1. Build and push the Docker images for the services `frontend` and `backend`
-   services by running `./forge.mk all USER=cloud HOST=${IP}`, where `${IP}` is
-   the server's IP address.
+   by running `./forge.mk all USER=cloud HOST=${IP}`, where `${IP}` is the
+   server's IP address.
 1. Enter a shell on the production machine using `ssh`.
 1. Navigate into `/app/production` by running `cd /app/production`.
 1. Back up the production database by running

From 26164951fd65a3199838fe6f0bec8899e024baf5 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 5 May 2026 11:18:09 +0200
Subject: [PATCH 013/145] Seed institutions, databases, and OpenId Connect
 applications in production

---
 backend/src/Data/DbSeeder.cs | 302 +++++++++++++++++------------------
 backend/src/Program.cs       |   1 -
 2 files changed, 145 insertions(+), 158 deletions(-)

diff --git a/backend/src/Data/DbSeeder.cs b/backend/src/Data/DbSeeder.cs
index 6be341dd0..07d203653 100644
--- a/backend/src/Data/DbSeeder.cs
+++ b/backend/src/Data/DbSeeder.cs
@@ -119,7 +119,7 @@ ILogger<DbSeeder> logger
         var manager = services.GetRequiredService<UserManager<User>>();
         if (environment.IsProduction())
         {
-            if ((await manager.GetUsersInRoleAsync(Role.Administrator)).Count == 0)
+            if ((await manager.GetUsersInRoleAsync(Role.Administrator)).Count is 0)
             {
                 await CreateUserAsync(manager, AdministratorUser, appSettings.BootstrapUserPassword, logger);
             }
@@ -198,64 +198,60 @@ IWebHostEnvironment environment
             context.Institutions.Add(iseInstitution);
             await context.SaveChangesAsync();
         }
-        if (environment.IsDevelopment())
+        if (!await context.Institutions.Where(x => x.Id == new Guid(DataConstants.TestlabInstitutionUuid)).AnyAsync())
         {
-            if (!await context.Institutions.Where(x => x.Id == new Guid(DataConstants.TestlabInstitutionUuid)).AnyAsync())
+            var institution = new Institution(
+                new Guid(DataConstants.TestlabInstitutionUuid),
+                "TestLab Solar Facades",
+                "TLSF",
+                "This institution represents the TestLab Solar Facades of Fraunhofer ISE",
+                new ContactInformation(
+                    phoneNumber: "+49 761 4588-5673",
+                    isPhoneNumberConfirmed: true,
+                    postalAddress: "Heidenhofstraße 2, 79110 Freiburg im Breisgau",
+                    emailAddress: null,
+                    isEmailAddressConfirmed: false,
+                    websiteLocator: new Uri("https://www.ise.fraunhofer.de/en/rd-infrastructure/accredited-labs/testlab-solar-facades.html", UriKind.Absolute)
+                ),
+                InstitutionState.VERIFIED,
+                InstitutionOperatingState.OPERATING,
+                null
+            )
             {
-                var institution = new Institution(
-                    new Guid(DataConstants.TestlabInstitutionUuid),
-                    "TestLab Solar Facades",
-                    "TLSF",
-                    "This institution represents the TestLab Solar Facades of Fraunhofer ISE",
-                    new ContactInformation(
-                        phoneNumber: "+49 761 4588-5673",
-                        isPhoneNumberConfirmed: true,
-                        postalAddress: "Heidenhofstraße 2, 79110 Freiburg im Breisgau",
-                        emailAddress: null,
-                        isEmailAddressConfirmed: false,
-                        websiteLocator: new Uri("https://www.ise.fraunhofer.de/en/rd-infrastructure/accredited-labs/testlab-solar-facades.html", UriKind.Absolute)
-                    ),
-                    InstitutionState.VERIFIED,
-                    InstitutionOperatingState.OPERATING,
-                    null
-                )
-                {
-                    ManagerId = iseInstitution.Id
-                };
-
-                var application = await manager.FindByClientIdAsync(DataConstants.TestlabSolarFacadesOpenIdConnectClientId).AsTask();
-                if (application is not null)
-                {
-                    institution.OpenIdConnectApplications.Add(application);
-                }
-                context.Institutions.Add(institution);
-                await context.SaveChangesAsync();
-            }
-            if (!await context.Institutions.Where(x => x.Id == new Guid(DataConstants.LbnlInstitutionUuid)).AnyAsync())
+                ManagerId = iseInstitution.Id
+            };
+            var application = await manager.FindByClientIdAsync(DataConstants.TestlabSolarFacadesOpenIdConnectClientId).AsTask();
+            if (application is not null)
             {
-                var institution = new Institution(
-                    new Guid(DataConstants.LbnlInstitutionUuid),
-                    "LBNL",
-                    "LBNL",
-                    "Lawrence Berkeley National Laboratory",
-                    new ContactInformation(
-                        phoneNumber: "(510) 486-4000",
-                        isPhoneNumberConfirmed: true,
-                        postalAddress: "1 Cyclotron Road, Berkeley, CA 94720",
-                        emailAddress: null,
-                        isEmailAddressConfirmed: false,
-                        websiteLocator: new Uri("https://www.lbl.gov", UriKind.Absolute)
-                    ),
-                    InstitutionState.VERIFIED,
-                    InstitutionOperatingState.OPERATING,
-                    null
-                )
-                {
-                    ManagerId = iseInstitution.Id
-                };
-                context.Institutions.Add(institution);
-                await context.SaveChangesAsync();
+                institution.OpenIdConnectApplications.Add(application);
             }
+            context.Institutions.Add(institution);
+            await context.SaveChangesAsync();
+        }
+        if (!await context.Institutions.Where(x => x.Id == new Guid(DataConstants.LbnlInstitutionUuid)).AnyAsync())
+        {
+            var institution = new Institution(
+                new Guid(DataConstants.LbnlInstitutionUuid),
+                "LBNL",
+                "LBNL",
+                "Lawrence Berkeley National Laboratory",
+                new ContactInformation(
+                    phoneNumber: "(510) 486-4000",
+                    isPhoneNumberConfirmed: true,
+                    postalAddress: "1 Cyclotron Road, Berkeley, CA 94720",
+                    emailAddress: null,
+                    isEmailAddressConfirmed: false,
+                    websiteLocator: new Uri("https://www.lbl.gov", UriKind.Absolute)
+                ),
+                InstitutionState.VERIFIED,
+                InstitutionOperatingState.OPERATING,
+                null
+            )
+            {
+                ManagerId = iseInstitution.Id
+            };
+            context.Institutions.Add(institution);
+            await context.SaveChangesAsync();
         }
     }
 
@@ -265,47 +261,44 @@ private static async Task CreateDatabasesAsync(
         AppSettings appSettings
     )
     {
-        if (environment.IsDevelopment())
+        var context = services.GetRequiredService<ApplicationDbContext>();
+        if (!await context.Databases.Where(x => x.Id == new Guid(DataConstants.TestlabDatabaseUuid)).AnyAsync())
         {
-            var context = services.GetRequiredService<ApplicationDbContext>();
-            if (!await context.Databases.Where(x => x.Id == new Guid(DataConstants.TestlabDatabaseUuid)).AnyAsync())
+            var uriBuilder = new UriBuilder(appSettings.TestlabSolarFacades.Uri)
             {
-                var uriBuilder = new UriBuilder(appSettings.TestlabSolarFacades.Uri)
-                {
-                    Path = "/graphql/"
-                };
-                var database = new Database(
-                    new Guid(DataConstants.TestlabDatabaseUuid),
-                    "TestLab DB",
-                    "The database of the TestLab Solar Facades of Fraunhofer ISE",
-                    uriBuilder.Uri
-                )
-                {
-                    OperatorId = new Guid(DataConstants.TestlabInstitutionUuid)
-                };
-                database.Verify();
-                context.Databases.Add(database);
-                await context.SaveChangesAsync();
-            }
-            if (!await context.Databases.Where(x => x.Id == new Guid(DataConstants.IgsdbDatabaseUuid)).AnyAsync())
+                Path = "/graphql/"
+            };
+            var database = new Database(
+                new Guid(DataConstants.TestlabDatabaseUuid),
+                "TestLab DB",
+                "The database of the TestLab Solar Facades of Fraunhofer ISE",
+                uriBuilder.Uri
+            )
             {
-                var uriBuilder = new UriBuilder(new Uri("https://igsdb-v2-staging.herokuapp.com", UriKind.Absolute))
-                {
-                    Path = "/graphql/"
-                };
-                var database = new Database(
-                    new Guid(DataConstants.IgsdbDatabaseUuid),
-                    "IGSDB",
-                    "The International Glazing and Shading Database (IGSDB)",
-                    uriBuilder.Uri
-                )
-                {
-                    OperatorId = new Guid(DataConstants.LbnlInstitutionUuid)
-                };
-                database.Verify();
-                context.Databases.Add(database);
-                await context.SaveChangesAsync();
-            }
+                OperatorId = new Guid(DataConstants.TestlabInstitutionUuid)
+            };
+            database.Verify();
+            context.Databases.Add(database);
+            await context.SaveChangesAsync();
+        }
+        if (!await context.Databases.Where(x => x.Id == new Guid(DataConstants.IgsdbDatabaseUuid)).AnyAsync())
+        {
+            var uriBuilder = new UriBuilder(new Uri("https://igsdb-v2-staging.herokuapp.com", UriKind.Absolute))
+            {
+                Path = "/graphql/"
+            };
+            var database = new Database(
+                new Guid(DataConstants.IgsdbDatabaseUuid),
+                "IGSDB",
+                "The International Glazing and Shading Database (IGSDB)",
+                uriBuilder.Uri
+            )
+            {
+                OperatorId = new Guid(DataConstants.LbnlInstitutionUuid)
+            };
+            database.Verify();
+            context.Databases.Add(database);
+            await context.SaveChangesAsync();
         }
     }
 
@@ -525,28 +518,25 @@ AppSettings appSettings
             // the metabase client, see `OPEN_ID_CONNECT_CLIENT_SECRET` in `.env.*`.
             await manager.CreateAsync(application, appSettings.OpenIdConnectClientSecret);
         }
-
-        if (environment.IsDevelopment())
+        if (await manager.FindByClientIdAsync(DataConstants.TestlabSolarFacadesOpenIdConnectClientId) is null)
         {
-            if (await manager.FindByClientIdAsync(DataConstants.TestlabSolarFacadesOpenIdConnectClientId) is null)
+            logger.CreatingApplicationClient(DataConstants.TestlabSolarFacadesOpenIdConnectClientId);
+            var host = appSettings.TestlabSolarFacades.Uri;
+            var descriptor = new OpenIddictApplicationDescriptor
             {
-                logger.CreatingApplicationClient(DataConstants.TestlabSolarFacadesOpenIdConnectClientId);
-                var host = appSettings.TestlabSolarFacades.Uri;
-                var descriptor = new OpenIddictApplicationDescriptor
-                {
-                    ClientId = DataConstants.TestlabSolarFacadesOpenIdConnectClientId,
-                    ClientSecret = null,
-                    ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
-                    DisplayName = "Testlab-Solar-Facades client application",
-                    RedirectUris =
+                ClientId = DataConstants.TestlabSolarFacadesOpenIdConnectClientId,
+                ClientSecret = null,
+                ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
+                DisplayName = "Testlab-Solar-Facades client application",
+                RedirectUris =
                     {
                         new UriBuilder(host) { Path = "/connect/callback/login/metabase" }.Uri
                     },
-                    PostLogoutRedirectUris =
+                PostLogoutRedirectUris =
                     {
                         new UriBuilder(host) { Path = "/connect/callback/logout/metabase" }.Uri
                     },
-                    Permissions =
+                Permissions =
                     {
                         OpenIddictConstants.Permissions.Endpoints.Authorization,
                         OpenIddictConstants.Permissions.Endpoints.EndSession,
@@ -557,45 +547,44 @@ AppSettings appSettings
                         OpenIddictConstants.Permissions.ResponseTypes.Code,
                         OpenIddictConstants.Permissions.ResponseTypes.Token,
                     },
-                    Requirements =
+                Requirements =
                     {
                         OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange,
                         OpenIddictConstants.Requirements.Features.PushedAuthorizationRequests
                     }
-                }
-                .AddGrantTypePermissions(
-                    OpenIddictConstants.GrantTypes.AuthorizationCode,
-                    OpenIddictConstants.GrantTypes.RefreshToken
-                )
-                .AddScopePermissions(
-                    OpenIddictConstants.Scopes.Profile,
-                    OpenIdConnectScope.ReadApiScope,
-                    OpenIdConnectScope.WriteApiScope,
-                    OpenIdConnectScope.ManageDatabaseApiScope
-                )
-                .AddAudiencePermissions(OpenIdConnectConstants.Client.MetabaseClientId);
-                var application = new OpenIdConnectApplication
-                {
-                    OwnerId = new Guid(DataConstants.TestlabInstitutionUuid)
-                };
-                await manager.PopulateAsync(application, descriptor);
-                // The secret is used in the database client, see
-                // `OPEN_ID_CONNECT_CLIENT_SECRET` in `.env.*`.
-                await manager.CreateAsync(application, appSettings.TestlabSolarFacades.OpenIdConnectClientSecret);
             }
-
-            if (await manager.FindByClientIdAsync(DataConstants.IgsdbOpenIdConnectClientId) is null)
+            .AddGrantTypePermissions(
+                OpenIddictConstants.GrantTypes.AuthorizationCode,
+                OpenIddictConstants.GrantTypes.RefreshToken
+            )
+            .AddScopePermissions(
+                OpenIddictConstants.Scopes.Profile,
+                OpenIdConnectScope.ReadApiScope,
+                OpenIdConnectScope.WriteApiScope,
+                OpenIdConnectScope.ManageDatabaseApiScope
+            )
+            .AddAudiencePermissions(OpenIdConnectConstants.Client.MetabaseClientId);
+            var application = new OpenIdConnectApplication
             {
-                logger.CreatingApplicationClient(DataConstants.IgsdbOpenIdConnectClientId);
-                var descriptor = new OpenIddictApplicationDescriptor
-                {
-                    ClientId = DataConstants.IgsdbOpenIdConnectClientId,
-                    ClientSecret = null,
-                    ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
-                    DisplayName = "IGSDB client application",
-                    RedirectUris = { },
-                    PostLogoutRedirectUris = { },
-                    Permissions =
+                OwnerId = new Guid(DataConstants.TestlabInstitutionUuid)
+            };
+            await manager.PopulateAsync(application, descriptor);
+            // The secret is used in the database client, see
+            // `OPEN_ID_CONNECT_CLIENT_SECRET` in `.env.*`.
+            await manager.CreateAsync(application, appSettings.TestlabSolarFacades.OpenIdConnectClientSecret);
+        }
+        if (await manager.FindByClientIdAsync(DataConstants.IgsdbOpenIdConnectClientId) is null)
+        {
+            logger.CreatingApplicationClient(DataConstants.IgsdbOpenIdConnectClientId);
+            var descriptor = new OpenIddictApplicationDescriptor
+            {
+                ClientId = DataConstants.IgsdbOpenIdConnectClientId,
+                ClientSecret = null,
+                ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
+                DisplayName = "IGSDB client application",
+                RedirectUris = { },
+                PostLogoutRedirectUris = { },
+                Permissions =
                     {
                         OpenIddictConstants.Permissions.Endpoints.EndSession,
                         OpenIddictConstants.Permissions.Endpoints.Introspection,
@@ -603,28 +592,27 @@ AppSettings appSettings
                         OpenIddictConstants.Permissions.Endpoints.Token,
                         OpenIddictConstants.Permissions.ResponseTypes.Token,
                     },
-                    Requirements =
+                Requirements =
                     {
                         OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange,
                         OpenIddictConstants.Requirements.Features.PushedAuthorizationRequests
                     }
-                }
-                .AddGrantTypePermissions(
-                    OpenIddictConstants.GrantTypes.ClientCredentials,
-                    OpenIddictConstants.GrantTypes.RefreshToken
-                )
-                .AddScopePermissions(
-                    OpenIdConnectScope.ReadApiScope,
-                    OpenIdConnectScope.WriteApiScope
-                )
-                .AddAudiencePermissions(OpenIdConnectConstants.Client.MetabaseClientId);
-                var application = new OpenIdConnectApplication
-                {
-                    OwnerId = new Guid(DataConstants.LbnlInstitutionUuid)
-                };
-                await manager.PopulateAsync(application, descriptor);
-                await manager.CreateAsync(application, appSettings.Igsdb.OpenIdConnectClientSecret);
             }
+            .AddGrantTypePermissions(
+                OpenIddictConstants.GrantTypes.ClientCredentials,
+                OpenIddictConstants.GrantTypes.RefreshToken
+            )
+            .AddScopePermissions(
+                OpenIdConnectScope.ReadApiScope,
+                OpenIdConnectScope.WriteApiScope
+            )
+            .AddAudiencePermissions(OpenIdConnectConstants.Client.MetabaseClientId);
+            var application = new OpenIdConnectApplication
+            {
+                OwnerId = new Guid(DataConstants.LbnlInstitutionUuid)
+            };
+            await manager.PopulateAsync(application, descriptor);
+            await manager.CreateAsync(application, appSettings.Igsdb.OpenIdConnectClientSecret);
         }
     }
 }
\ No newline at end of file
diff --git a/backend/src/Program.cs b/backend/src/Program.cs
index e515aeffd..9b4b55592 100644
--- a/backend/src/Program.cs
+++ b/backend/src/Program.cs
@@ -4,7 +4,6 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using HotChocolate;
 using Metabase.Data;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.EntityFrameworkCore;

From 73db85f0f58d9e6444519c6e01925516fc154e95 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 6 May 2026 20:50:30 +0200
Subject: [PATCH 014/145] Add space between entities and GraphQL information

---
 frontend/components/databases/DatabaseSummary.tsx | 7 ++++---
 frontend/pages/data/calorimetric.tsx              | 2 +-
 frontend/pages/data/geometric.tsx                 | 2 +-
 frontend/pages/data/hygrothermal.tsx              | 2 +-
 frontend/pages/data/life-cycle.tsx                | 2 +-
 frontend/pages/data/optical.tsx                   | 2 +-
 frontend/pages/data/photovoltaic.tsx              | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/frontend/components/databases/DatabaseSummary.tsx b/frontend/components/databases/DatabaseSummary.tsx
index 4568256c0..1111bf86b 100644
--- a/frontend/components/databases/DatabaseSummary.tsx
+++ b/frontend/components/databases/DatabaseSummary.tsx
@@ -1,4 +1,4 @@
-import { Tag, Typography } from "antd";
+import { Typography } from "antd";
 import paths from "../../paths";
 import {
   DatabasesPartialFragment,
@@ -11,6 +11,7 @@ import { DatabaseVerificationState } from "../../__generated__/graphql";
 import { isTruthy } from "../../lib/array";
 import UpdateDatabase from "./UpdateDatabase";
 import VerifyDatabase from "./VerifyDatabase";
+import EnumTag from "../EnumTag";
 
 export default function DatabaseSummary({
   entity,
@@ -25,9 +26,9 @@ export default function DatabaseSummary({
       entity={entity}
       route={paths.database}
       tags={[
-        <Tag key="verificationState" color="magenta">
+        <EnumTag key="verificationState" color="magenta">
           {entity.verificationState}
-        </Tag>,
+        </EnumTag>,
       ]}
       extra={[
         "isAuthorizedToVerifyNode" in entity &&
diff --git a/frontend/pages/data/calorimetric.tsx b/frontend/pages/data/calorimetric.tsx
index 4270b62f3..84e1d22ce 100644
--- a/frontend/pages/data/calorimetric.tsx
+++ b/frontend/pages/data/calorimetric.tsx
@@ -13,7 +13,7 @@ export default function Page() {
         <Link href={paths.components}>components</Link>.
       </Typography.Paragraph>
       <PaginatedCalorimetricData />
-      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+      <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         is the most powerful way of querying the databases.
       </Typography.Paragraph>
diff --git a/frontend/pages/data/geometric.tsx b/frontend/pages/data/geometric.tsx
index 96a250319..35e60150d 100644
--- a/frontend/pages/data/geometric.tsx
+++ b/frontend/pages/data/geometric.tsx
@@ -13,7 +13,7 @@ export default function Page() {
         <Link href={paths.components}>components</Link>.
       </Typography.Paragraph>
       <PaginatedGeometricData />
-      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+      <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         is the most powerful way of querying the databases.
       </Typography.Paragraph>
diff --git a/frontend/pages/data/hygrothermal.tsx b/frontend/pages/data/hygrothermal.tsx
index 1312c0c62..e6fb996e1 100644
--- a/frontend/pages/data/hygrothermal.tsx
+++ b/frontend/pages/data/hygrothermal.tsx
@@ -13,7 +13,7 @@ export default function Page() {
         <Link href={paths.components}>components</Link>.
       </Typography.Paragraph>
       <PaginatedHygrothermalData />
-      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+      <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         is the most powerful way of querying the databases.
       </Typography.Paragraph>
diff --git a/frontend/pages/data/life-cycle.tsx b/frontend/pages/data/life-cycle.tsx
index 3205d471e..423f7d367 100644
--- a/frontend/pages/data/life-cycle.tsx
+++ b/frontend/pages/data/life-cycle.tsx
@@ -13,7 +13,7 @@ export default function Page() {
         <Link href={paths.components}>components</Link>.
       </Typography.Paragraph>
       <PaginatedLifeCycleData />
-      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+      <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         is the most powerful way of querying the databases.
       </Typography.Paragraph>
diff --git a/frontend/pages/data/optical.tsx b/frontend/pages/data/optical.tsx
index 4ba482d08..c70a7e4a7 100644
--- a/frontend/pages/data/optical.tsx
+++ b/frontend/pages/data/optical.tsx
@@ -13,7 +13,7 @@ export default function Page() {
         <Link href={paths.components}>components</Link>.
       </Typography.Paragraph>
       <PaginatedOpticalData />
-      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+      <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         is the most powerful way of querying the databases.
       </Typography.Paragraph>
diff --git a/frontend/pages/data/photovoltaic.tsx b/frontend/pages/data/photovoltaic.tsx
index 5f807bad1..67f8c8c20 100644
--- a/frontend/pages/data/photovoltaic.tsx
+++ b/frontend/pages/data/photovoltaic.tsx
@@ -13,7 +13,7 @@ export default function Page() {
         <Link href={paths.components}>components</Link>.
       </Typography.Paragraph>
       <PaginatedPhotovoltaicData />
-      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+      <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         is the most powerful way of querying the databases.
       </Typography.Paragraph>

From c8970216ca137bb615736d205551f01bf4b4a6f3 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 7 May 2026 23:05:40 +0200
Subject: [PATCH 015/145] Use modals for entity-creation forms, add pages for
 GnuPG keys, and paginated authorizations and tokens of OpenId Connect
 applications

---
 .../src/Configuration/GraphQlConfiguration.cs |    2 +
 backend/src/Data/ApplicationDbContext.cs      |   16 +
 backend/src/Extensions/NodaTimeExtensions.cs  |    5 +
 .../src/GraphQl/Databases/DatabaseQueries.cs  |   16 +
 .../GnuPgKeyFingerprintQueries.cs             |    3 -
 .../InstitutionDevelopedMethodEdge.cs         |   35 +
 .../OffsetDateTimeCursorKeySerializer.cs      |   40 +
 .../OpenIdConnectAuthorizationType.cs         |    1 +
 .../Tokens/OpenIdConnectTokenType.cs          |    2 +
 .../GraphQl/Users/UserDevelopedMethodEdge.cs  |   34 +
 .../GraphQlSchemaTests.IsUnchanged.snap       | 1709 ++++++++++++-----
 .../components/ActiveFilterAndSortBar.tsx     |    8 +-
 frontend/components/CielabColorViewer.tsx     |    8 +-
 frontend/components/CopyButton.tsx            |   16 +-
 frontend/components/CopyableBlock.tsx         |    4 +-
 frontend/components/DeleteButton.tsx          |   10 +-
 frontend/components/GnuPgKeyLink.tsx          |   20 +
 frontend/components/InlineList.tsx            |   29 +-
 frontend/components/JumpToId.tsx              |    9 +-
 frontend/components/NewButton.tsx             |   32 +
 frontend/components/SafeDeleteButton.tsx      |   20 +-
 .../components/ComponentSummary.tsx           |   63 +-
 .../components/components/CreateComponent.tsx |  237 ++-
 .../components/PaginatedComponents.tsx        |   19 +-
 .../components/components/UpdateComponent.tsx |    6 +-
 .../components/UpdateComponentAssembly.tsx    |    6 +-
 frontend/components/data/DataSummary.tsx      |   30 +-
 .../PaginatedCalorimetricData.tsx             |    8 +-
 .../data/geometric/PaginatedGeometricData.tsx |    8 +-
 .../PaginatedHygrothermalData.tsx             |    8 +-
 .../data/lifeCycle/PaginatedLifeCycleData.tsx |    8 +-
 .../data/optical/PaginatedOpticalData.tsx     |    8 +-
 .../PaginatedPhotovoltaicData.tsx             |    8 +-
 .../dataFormats/CreateDataFormat.tsx          |  203 +-
 .../dataFormats/DataFormatSummary.tsx         |   17 +-
 .../dataFormats/PaginatedDataFormats.tsx      |   17 +-
 .../dataFormats/UpdateDataFormat.tsx          |    6 +-
 .../components/databases/CreateDatabase.tsx   |  175 +-
 frontend/components/databases/Database.tsx    |   20 +-
 .../components/databases/DatabaseSummary.tsx  |   51 +-
 .../databases/PaginatedAnyDatabases.tsx       |   77 +
 .../databases/PaginatedDatabases.tsx          |   17 +-
 .../components/databases/UpdateDatabase.tsx   |    6 +-
 .../components/entities/EntitySummary.tsx     |   12 +-
 .../components/entities/PaginatedEntities.tsx |   60 +-
 .../AddGnuPgKeyFingerprint.tsx                |  132 --
 .../GnuPgKeyFingerprintSummary.tsx            |   68 -
 .../gnuPgKeys/AddGnuPgKeyFingerprint.tsx      |  176 ++
 .../AllowGnuPgKeyFingerprint.tsx              |    0
 .../ForbidGnuPgKeyFingerprint.tsx             |    0
 frontend/components/gnuPgKeys/GnuPgKey.tsx    |   47 +
 .../GnuPgKeyList.tsx}                         |    6 +-
 .../components/gnuPgKeys/GnuPgKeySummary.tsx  |   87 +
 .../PaginatedGnuPgKeys.tsx}                   |   25 +-
 .../institutions/CreateInstitution.tsx        |  212 +-
 .../components/institutions/Institution.tsx   |  138 +-
 .../institutions/InstitutionSummary.tsx       |   57 +-
 .../institutions/PaginatedInstitutions.tsx    |   17 +-
 .../RemoveInstitutionRepresentative.tsx       |    6 +-
 .../institutions/UpdateInstitution.tsx        |    6 +-
 frontend/components/methods/CreateMethod.tsx  |  234 ++-
 frontend/components/methods/MethodSummary.tsx |   44 +-
 .../components/methods/PaginatedMethods.tsx   |   19 +-
 .../methods/RemoveUserMethodDeveloper.tsx     |   11 +-
 frontend/components/methods/UpdateMethod.tsx  |    6 +-
 .../CreateOpenIdConnectApplication.tsx        |  330 ++--
 .../applications/OpenIdConnectApplication.tsx |   59 +-
 .../OpenIdConnectApplicationSummary.tsx       |   53 +-
 .../PaginatedOpenIdConnectApplications.tsx    |   17 +-
 ...etOpenIdConnectApplicationClientSecret.tsx |    8 +-
 .../UpdateOpenIdConnectApplication.tsx        |    6 +-
 .../DeleteOpenIdConnectAuthorization.tsx      |   17 +-
 .../OpenIdConnectAuthorizationList.tsx        |   24 +
 .../OpenIdConnectAuthorizationSummary.tsx     |   37 +
 .../OpenIdConnectAuthorizationTable.tsx       |   68 -
 .../PaginatedOpenIdConnectAuthorizations.tsx  |   67 +
 .../tokens/OpenIdConnectTokenList.tsx         |   24 +
 .../tokens/OpenIdConnectTokenSummary.tsx      |   61 +
 .../tokens/OpenIdConnectTokenTable.tsx        |   55 -
 .../tokens/PaginatedOpenIdConnectTokens.tsx   |   90 +
 .../tokens/RevokeOpenIdConnectToken.tsx       |   24 +-
 frontend/components/users/PaginatedUsers.tsx  |   10 +-
 frontend/components/users/User.tsx            |   35 +-
 frontend/components/users/UserSummary.tsx     |   31 +-
 frontend/lib/hooks/usePaginatedQuery.ts       |    5 +-
 frontend/pages/gnupg-keys/[fingerprint].tsx   |   22 +
 frontend/pages/gnupg-keys/index.tsx           |   22 +
 frontend/pages/institutions/index.tsx         |   11 +-
 frontend/paths.ts                             |    6 +-
 frontend/queries/databases.graphql            |   25 +
 frontend/queries/gnuPgKeyFingerprints.graphql |    3 +
 frontend/queries/openIdConnect.graphql        |   87 +-
 frontend/queries/users.graphql                |    3 +
 frontend/type-defs.graphqls                   | 1709 ++++++++++++-----
 94 files changed, 4899 insertions(+), 2390 deletions(-)
 create mode 100644 backend/src/GraphQl/NodaTime/OffsetDateTimeCursorKeySerializer.cs
 create mode 100644 frontend/components/GnuPgKeyLink.tsx
 create mode 100644 frontend/components/NewButton.tsx
 create mode 100644 frontend/components/databases/PaginatedAnyDatabases.tsx
 delete mode 100644 frontend/components/gnuPgKeyFingerprints/AddGnuPgKeyFingerprint.tsx
 delete mode 100644 frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintSummary.tsx
 create mode 100644 frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
 rename frontend/components/{gnuPgKeyFingerprints => gnuPgKeys}/AllowGnuPgKeyFingerprint.tsx (100%)
 rename frontend/components/{gnuPgKeyFingerprints => gnuPgKeys}/ForbidGnuPgKeyFingerprint.tsx (100%)
 create mode 100644 frontend/components/gnuPgKeys/GnuPgKey.tsx
 rename frontend/components/{gnuPgKeyFingerprints/GnuPgKeyFingerprintList.tsx => gnuPgKeys/GnuPgKeyList.tsx} (72%)
 create mode 100644 frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
 rename frontend/components/{gnuPgKeyFingerprints/PaginatedGnuPgKeyFingerprints.tsx => gnuPgKeys/PaginatedGnuPgKeys.tsx} (69%)
 create mode 100644 frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationList.tsx
 create mode 100644 frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx
 delete mode 100644 frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationTable.tsx
 create mode 100644 frontend/components/openIdConnect/authorizations/PaginatedOpenIdConnectAuthorizations.tsx
 create mode 100644 frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx
 create mode 100644 frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx
 delete mode 100644 frontend/components/openIdConnect/tokens/OpenIdConnectTokenTable.tsx
 create mode 100644 frontend/components/openIdConnect/tokens/PaginatedOpenIdConnectTokens.tsx
 create mode 100644 frontend/pages/gnupg-keys/[fingerprint].tsx
 create mode 100644 frontend/pages/gnupg-keys/index.tsx

diff --git a/backend/src/Configuration/GraphQlConfiguration.cs b/backend/src/Configuration/GraphQlConfiguration.cs
index 19685c0d7..6c5e95849 100644
--- a/backend/src/Configuration/GraphQlConfiguration.cs
+++ b/backend/src/Configuration/GraphQlConfiguration.cs
@@ -16,6 +16,7 @@
 using Metabase.GraphQl;
 using Metabase.GraphQl.DataX;
 using Metabase.GraphQl.Filters;
+using Metabase.GraphQl.NodaTime;
 using Metabase.GraphQl.Scalars;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -162,6 +163,7 @@ await httpContext.RequestServices
             .AddTypes()
             // Paging
             .AddDbContextCursorPagingProvider()
+            .AddCursorKeySerializer(new OffsetDateTimeCursorKeySerializer())
             .ModifyPagingOptions(_ =>
                 {
                     _.MaxPageSize = (int)GraphQlConstants.MaximumPageSize;
diff --git a/backend/src/Data/ApplicationDbContext.cs b/backend/src/Data/ApplicationDbContext.cs
index 69ec6da83..4c0e2e94f 100644
--- a/backend/src/Data/ApplicationDbContext.cs
+++ b/backend/src/Data/ApplicationDbContext.cs
@@ -410,6 +410,21 @@ private static void ConfigureMethodManager(ModelBuilder builder)
             .OnDelete(DeleteBehavior.Restrict);
     }
 
+    private static void ConfigureOpenIdConnect(ModelBuilder builder)
+    {
+        // auto-include for GraphQL `OpenIdConnectAuthorizationType`
+        builder.Entity<OpenIdConnectAuthorization>()
+            .Navigation(a => a.Application)
+            .AutoInclude();
+        // auto-include for GraphQL `OpenIdConnectTokenType`
+        builder.Entity<OpenIdConnectToken>()
+            .Navigation(a => a.Application)
+            .AutoInclude();
+        builder.Entity<OpenIdConnectToken>()
+            .Navigation(a => a.Authorization)
+            .AutoInclude();
+    }
+
     protected override void OnModelCreating(ModelBuilder builder)
     {
         base.OnModelCreating(builder);
@@ -435,6 +450,7 @@ protected override void OnModelCreating(ModelBuilder builder)
         ConfigureComponentManager(builder);
         ConfigureDataFormatManager(builder);
         ConfigureMethodManager(builder);
+        ConfigureOpenIdConnect(builder);
         foreach (var entityType in builder.Model.GetEntityTypes())
         {
             if (typeof(IEntity).IsAssignableFrom(entityType.ClrType))
diff --git a/backend/src/Extensions/NodaTimeExtensions.cs b/backend/src/Extensions/NodaTimeExtensions.cs
index 498b73049..471653d19 100644
--- a/backend/src/Extensions/NodaTimeExtensions.cs
+++ b/backend/src/Extensions/NodaTimeExtensions.cs
@@ -9,6 +9,11 @@ public static OffsetDateTime GetUtcNow(this IClock clock)
         return clock.GetCurrentInstant().WithOffset(Offset.Zero);
     }
 
+    public static int CompareTo(this OffsetDateTime current, OffsetDateTime other)
+    {
+        return OffsetDateTime.Comparer.Instant.Compare(current, other);
+    }
+
     extension(OffsetDateTime)
     {
         public static bool operator >(OffsetDateTime x, OffsetDateTime y)
diff --git a/backend/src/GraphQl/Databases/DatabaseQueries.cs b/backend/src/GraphQl/Databases/DatabaseQueries.cs
index 06e69e008..37afad608 100644
--- a/backend/src/GraphQl/Databases/DatabaseQueries.cs
+++ b/backend/src/GraphQl/Databases/DatabaseQueries.cs
@@ -53,6 +53,22 @@ CancellationToken cancellationToken
             .ToConnectionAsync();
     }
 
+    [UsePaging]
+    [UseFiltering<DatabaseFilterType>]
+    [UseSorting<DatabaseSortType>]
+    public ValueTask<HotChocolate.Types.Pagination.Connection<Database>> GetAnyDatabasesAsync(
+        IResolverContext resolverContext,
+        ApplicationDbContext databaseContext,
+        CancellationToken cancellationToken
+    )
+    {
+        return databaseContext.Databases
+            .AsNoTracking()
+            .With(resolverContext.GetQueryContext<Database>(), Sorting.DefaultEntityOrder)
+            .ToPageAsync(resolverContext.GetPagingArguments(), cancellationToken)
+            .ToConnectionAsync();
+    }
+
     public Task<Database?> GetDatabaseAsync(
         Guid id,
         IDatabaseByIdDataLoader byId,
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintQueries.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintQueries.cs
index cec7c6fad..8a26aa128 100644
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintQueries.cs
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintQueries.cs
@@ -4,7 +4,6 @@
 using GreenDonut.Data;
 using HotChocolate.Authorization;
 using HotChocolate.Data;
-using HotChocolate.Data.Sorting;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Authorization;
@@ -24,7 +23,6 @@ public sealed class GnuPgKeyFingerprintQueries
     public ValueTask<HotChocolate.Types.Pagination.Connection<GnuPgKeyFingerprint>> GetGnuPgKeyFingerprintsAsync(
         IResolverContext resolverContext,
         ApplicationDbContext databaseContext,
-        QueryContext<GnuPgKeyFingerprint> queryContext,
         CancellationToken cancellationToken
     )
     {
@@ -39,7 +37,6 @@ CancellationToken cancellationToken
     public Task<GnuPgKeyFingerprint?> GetGnuPgKeyFingerprintAsync(
         string fingerprint,
         IGnuPgKeyFingerprintByFingerprintDataLoader byFingerprint,
-        QueryContext<GnuPgKeyFingerprint> queryContext,
         CancellationToken cancellationToken
     )
     {
diff --git a/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodEdge.cs b/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodEdge.cs
index 14c4f7329..b70c48fae 100644
--- a/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodEdge.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodEdge.cs
@@ -1,5 +1,11 @@
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
+using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Methods;
+using Metabase.GraphQl.Users;
 
 namespace Metabase.GraphQl.Institutions;
 
@@ -11,4 +17,33 @@ string cursor
     association.MethodId, cursor
 )
 {
+    [UseUserManager]
+    [Cost(1)]
+    public Task<bool> IsAuthorizedToConfirmEdgeAsync(
+        ClaimsPrincipal claimsPrincipal,
+        InstitutionMethodDeveloperAuthorization authorization,
+        CancellationToken cancellationToken
+    )
+    {
+        return authorization.IsAuthorizedToConfirm(
+            claimsPrincipal,
+            association.InstitutionId,
+            cancellationToken
+        );
+    }
+
+    [UseUserManager]
+    [Cost(1)]
+    public Task<bool> IsAuthorizedToRemoveEdgeAsync(
+        ClaimsPrincipal claimsPrincipal,
+        InstitutionMethodDeveloperAuthorization authorization,
+        CancellationToken cancellationToken
+    )
+    {
+        return authorization.IsAuthorizedToRemove(
+            claimsPrincipal,
+            association.MethodId,
+            cancellationToken
+        );
+    }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/NodaTime/OffsetDateTimeCursorKeySerializer.cs b/backend/src/GraphQl/NodaTime/OffsetDateTimeCursorKeySerializer.cs
new file mode 100644
index 000000000..a20925981
--- /dev/null
+++ b/backend/src/GraphQl/NodaTime/OffsetDateTimeCursorKeySerializer.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Buffers;
+using System.Text.Unicode;
+using GreenDonut.Data.Cursors.Serializers;
+using Metabase.Extensions;
+using NodaTime;
+using NodaTime.Text;
+
+namespace Metabase.GraphQl.NodaTime;
+
+// Inspired by https://github.com/ChilliCream/graphql-platform/blob/main/src/GreenDonut/src/GreenDonut.Data/Cursors/Serializers/DateTimeOffsetCursorKeySerializer.cs
+public sealed class OffsetDateTimeCursorKeySerializer : ICursorKeySerializer
+{
+    private static readonly OffsetDateTimePattern _pattern = OffsetDateTimePattern.ExtendedIso;
+
+    public bool IsSupported(Type type)
+        => type == typeof(OffsetDateTime) || type == typeof(OffsetDateTime?);
+
+    public System.Reflection.MethodInfo GetCompareToMethod(Type type)
+        => typeof(OffsetDateTime).GetMethod(nameof(NodaTimeExtensions.CompareTo), [typeof(OffsetDateTime), typeof(OffsetDateTime)])!;
+
+    public object Parse(ReadOnlySpan<byte> formattedKey)
+    {
+        Span<char> chars = stackalloc char[formattedKey.Length];
+        if (Utf8.ToUtf16(formattedKey, chars, out _, out _) != OperationStatus.Done)
+        {
+            throw new FormatException("Invalid cursor format");
+        }
+        var result = _pattern.Parse(new string(chars));
+        if (!result.Success) throw new FormatException("Could not parse OffsetDateTime cursor");
+        return result.Value;
+    }
+
+    public bool TryFormat(object key, Span<byte> buffer, out int written)
+    {
+        var value = (OffsetDateTime)key;
+        var formatted = _pattern.Format(value);
+        return Utf8.FromUtf16(formatted, buffer, out _, out written) == OperationStatus.Done;
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationType.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationType.cs
index 6dcf9c908..3f0864105 100644
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationType.cs
@@ -44,6 +44,7 @@ IObjectTypeDescriptor<OpenIdConnectAuthorization> descriptor
             .Type<NonNullType<ObjectType<OpenIdConnectAuthorizationApplicationEdge>>>()
             .Resolve(context =>
                 new OpenIdConnectAuthorizationApplicationEdge(
+                    // auto-included in `ApplicationDbContext`
                     context.Parent<OpenIdConnectAuthorization>().Application!
                 )
             );
diff --git a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenType.cs b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenType.cs
index fa390c47a..57ca3fddb 100644
--- a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenType.cs
@@ -37,6 +37,7 @@ IObjectTypeDescriptor<OpenIdConnectToken> descriptor
             .Type<NonNullType<ObjectType<OpenIdConnectTokenApplicationEdge>>>()
             .Resolve(context =>
                 new OpenIdConnectTokenApplicationEdge(
+                    // auto-included in `ApplicationDbContext`
                     context.Parent<OpenIdConnectToken>().Application!
                 )
             );
@@ -45,6 +46,7 @@ IObjectTypeDescriptor<OpenIdConnectToken> descriptor
             .Type<NonNullType<ObjectType<OpenIdConnectTokenAuthorizationEdge>>>()
             .Resolve(context =>
                 new OpenIdConnectTokenAuthorizationEdge(
+                    // auto-included in `ApplicationDbContext`
                     context.Parent<OpenIdConnectToken>().Authorization!
                 )
             );
diff --git a/backend/src/GraphQl/Users/UserDevelopedMethodEdge.cs b/backend/src/GraphQl/Users/UserDevelopedMethodEdge.cs
index 9009daa92..7d8bb935b 100644
--- a/backend/src/GraphQl/Users/UserDevelopedMethodEdge.cs
+++ b/backend/src/GraphQl/Users/UserDevelopedMethodEdge.cs
@@ -1,3 +1,8 @@
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
+using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Methods;
 
@@ -12,4 +17,33 @@ string cursor
     cursor
 )
 {
+    [UseUserManager]
+    [Cost(1)]
+    public Task<bool> IsAuthorizedToConfirmEdgeAsync(
+        ClaimsPrincipal claimsPrincipal,
+        UserMethodDeveloperAuthorization authorization,
+        CancellationToken cancellationToken
+    )
+    {
+        return authorization.IsAuthorizedToConfirm(
+            claimsPrincipal,
+            association.UserId,
+            cancellationToken
+        );
+    }
+
+    [UseUserManager]
+    [Cost(1)]
+    public Task<bool> IsAuthorizedToRemoveEdgeAsync(
+        ClaimsPrincipal claimsPrincipal,
+        UserMethodDeveloperAuthorization authorization,
+        CancellationToken cancellationToken
+    )
+    {
+        return authorization.IsAuthorizedToRemove(
+            claimsPrincipal,
+            association.MethodId,
+            cancellationToken
+        );
+    }
 }
\ No newline at end of file
diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index 77b33725d..f3c841933 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -3,50 +3,505 @@ schema {
   mutation: Mutation
 }
 
-interface Approval {
-  approverId: Uuid!
-  keyFingerprint: String!
-  message: String!
-  query: String!
-  signature: String!
-  timestamp: DateTime!
-  variables: Any!
-}
-
-interface Data {
-  appliedMethod: AppliedMethod!
-  approvals: [DataApproval!]!
-  component: Component
-  componentId: Uuid!
-  createdAt: DateTime!
-  creator: Institution
-  creatorId: Uuid!
-  database: Database
-  databaseId: Uuid!
-  description: String
-  id: ID!
-  kind: DataKind!
-  locale: Locale!
-  name: String
-  resources: [GetHttpsResource!]!
-  resourceTree: GetHttpsResourceTree!
-  timestamp: DateTime!
-  uuid: Uuid!
-  warnings: [String!]!
-}
-
-interface GetHttpsResourceTreeVertex {
-  value: GetHttpsResource!
-}
-
-"The node interface is implemented by entities that have a global unique identifier."
-interface Node {
-  id: ID!
+type Query {
+  allCalorimetricData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: String
+    where: CalorimetricDataPropositionInput
+  ): CalorimetricDataConnection! @cost(weight: "10")
+  allGeometricData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: String
+    where: GeometricDataPropositionInput
+  ): GeometricDataConnection! @cost(weight: "10")
+  allHygrothermalData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: String
+    where: HygrothermalDataPropositionInput
+  ): HygrothermalDataConnection! @cost(weight: "10")
+  allLifeCycleData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: String
+    where: LifeCycleDataPropositionInput
+  ): LifeCycleDataConnection! @cost(weight: "10")
+  allOpticalData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: String
+    where: OpticalDataPropositionInput
+  ): OpticalDataConnection! @cost(weight: "10")
+  allPhotovoltaicData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: String
+    where: PhotovoltaicDataPropositionInput
+  ): PhotovoltaicDataConnection! @cost(weight: "10")
+  anyDatabases(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [DatabaseSortInput!] @cost(weight: "10")
+    where: DatabaseFilterInput @cost(weight: "10")
+  ): AnyDatabasesConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  calorimetricData(databaseId: Uuid!, id: Uuid!, locale: String): CalorimetricData
+    @cost(weight: "10")
+  component(id: Uuid!): Component @cost(weight: "10")
+  components(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [ComponentSortInput!] @cost(weight: "10")
+    where: ComponentFilterInput @cost(weight: "10")
+  ): ComponentsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  currentInstitution: Institution @cost(weight: "10")
+  currentOpenIdConnectApplication: OpenIdConnectApplication @cost(weight: "10")
+  currentUser: User @cost(weight: "10")
+  database(id: Uuid!): Database @cost(weight: "10")
+  databases(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [DatabaseSortInput!] @cost(weight: "10")
+    where: DatabaseFilterInput @cost(weight: "10")
+  ): DatabasesConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  dataFormat(id: Uuid!): DataFormat @cost(weight: "10")
+  dataFormats(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [DataFormatSortInput!] @cost(weight: "10")
+    where: DataFormatFilterInput @cost(weight: "10")
+  ): DataFormatsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  geometricData(databaseId: Uuid!, id: Uuid!, locale: String): GeometricData
+    @cost(weight: "10")
+  gnuPgKeyFingerprint(fingerprint: String!): GnuPgKeyFingerprint
+    @cost(weight: "10")
+  gnuPgKeyFingerprints(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [GnuPgKeyFingerprintSortInput!] @cost(weight: "10")
+    where: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  ): GnuPgKeyFingerprintsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  hasCalorimetricData(locale: String, where: CalorimetricDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasGeometricData(locale: String, where: GeometricDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasHygrothermalData(locale: String, where: HygrothermalDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasLifeCycleData(locale: String, where: LifeCycleDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasOpticalData(locale: String, where: OpticalDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasPhotovoltaicData(locale: String, where: PhotovoltaicDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hygrothermalData(databaseId: Uuid!, id: Uuid!, locale: String): HygrothermalData
+    @cost(weight: "10")
+  institution(id: Uuid!): Institution @cost(weight: "10")
+  institutions(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionSortInput!] @cost(weight: "10")
+    where: InstitutionFilterInput @cost(weight: "10")
+  ): InstitutionsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  lifeCycleData(databaseId: Uuid!, id: Uuid!, locale: String): LifeCycleData
+    @cost(weight: "10")
+  method(id: Uuid!): Method @cost(weight: "10")
+  methods(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [MethodSortInput!] @cost(weight: "10")
+    where: MethodFilterInput @cost(weight: "10")
+  ): MethodsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  "Fetches an object given its ID."
+  node("ID of the object." id: ID!): Node @cost(weight: "10")
+  "Lookup nodes by a list of IDs."
+  nodes("The list of node IDs." ids: [ID!]!): [Node]! @cost(weight: "10")
+  openIdConnectApplication(id: Uuid!): OpenIdConnectApplication
+    @cost(weight: "10")
+  openIdConnectApplications(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [OpenIdConnectApplicationSortInput!] @cost(weight: "10")
+    where: OpenIdConnectApplicationFilterInput @cost(weight: "10")
+  ): OpenIdConnectApplicationsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  openIdConnectAuthorization(id: Uuid!): OpenIdConnectAuthorization
+    @cost(weight: "10")
+  openIdConnectAuthorizations(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [OpenIdConnectAuthorizationSortInput!] @cost(weight: "10")
+    where: OpenIdConnectAuthorizationFilterInput @cost(weight: "10")
+  ): OpenIdConnectAuthorizationsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  openIdConnectToken(id: Uuid!): OpenIdConnectToken @cost(weight: "10")
+  openIdConnectTokens(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [OpenIdConnectTokenSortInput!] @cost(weight: "10")
+    where: OpenIdConnectTokenFilterInput @cost(weight: "10")
+  ): OpenIdConnectTokensConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  opticalData(databaseId: Uuid!, id: Uuid!, locale: String): OpticalData
+    @cost(weight: "10")
+  pendingDatabases(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [DatabaseSortInput!] @cost(weight: "10")
+    where: DatabaseFilterInput @cost(weight: "10")
+  ): PendingDatabasesConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  pendingInstitutions(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionSortInput!] @cost(weight: "10")
+    where: InstitutionFilterInput @cost(weight: "10")
+  ): PendingInstitutionsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  photovoltaicData(databaseId: Uuid!, id: Uuid!, locale: String): PhotovoltaicData
+    @cost(weight: "10")
+  user(id: Uuid!): User @cost(weight: "10")
+  users(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [UserSortInput!] @cost(weight: "10")
+    where: UserFilterInput @cost(weight: "10")
+  ): UsersConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
 }
 
-interface UserError {
-  message: String!
-  path: [String!]!
+type Mutation {
+  addComponentAssembly(input: AddComponentAssemblyInput!): AddComponentAssemblyPayload!
+    @cost(weight: "10")
+  addComponentGeneralization(input: AddComponentGeneralizationInput!): AddComponentGeneralizationPayload!
+    @cost(weight: "10")
+  addComponentManufacturer(input: AddComponentManufacturerInput!): AddComponentManufacturerPayload!
+    @cost(weight: "10")
+  addComponentVariant(input: AddComponentVariantInput!): AddComponentVariantPayload!
+    @cost(weight: "10")
+  addGnuPgKeyFingerprint(input: AddGnuPgKeyFingerprintInput!): AddGnuPgKeyFingerprintPayload!
+    @cost(weight: "10")
+  addInstitutionMethodDeveloper(input: AddInstitutionMethodDeveloperInput!): AddInstitutionMethodDeveloperPayload!
+    @cost(weight: "10")
+  addInstitutionRepresentative(input: AddInstitutionRepresentativeInput!): AddInstitutionRepresentativePayload!
+    @cost(weight: "10")
+  addUserMethodDeveloper(input: AddUserMethodDeveloperInput!): AddUserMethodDeveloperPayload!
+    @cost(weight: "10")
+  addUserRole(input: AddUserRoleInput!): AddUserRolePayload! @cost(weight: "10")
+  allowGnuPgKeyFingerprint(input: AllowGnuPgKeyFingerprintInput!): AllowGnuPgKeyFingerprintPayload!
+    @cost(weight: "10")
+  changeInstitutionRepresentativeRole(
+    input: ChangeInstitutionRepresentativeRoleInput!
+  ): ChangeInstitutionRepresentativeRolePayload! @cost(weight: "10")
+  changeUserEmail(input: ChangeUserEmailInput!): ChangeUserEmailPayload!
+    @cost(weight: "10")
+  changeUserPassword(input: ChangeUserPasswordInput!): ChangeUserPasswordPayload!
+    @cost(weight: "10")
+  confirmComponentManufacturer(input: ConfirmComponentManufacturerInput!): ConfirmComponentManufacturerPayload!
+    @cost(weight: "10")
+  confirmInstitutionMethodDeveloper(
+    input: ConfirmInstitutionMethodDeveloperInput!
+  ): ConfirmInstitutionMethodDeveloperPayload! @cost(weight: "10")
+  confirmInstitutionRepresentative(
+    input: ConfirmInstitutionRepresentativeInput!
+  ): ConfirmInstitutionRepresentativePayload! @cost(weight: "10")
+  confirmUserEmail(input: ConfirmUserEmailInput!): ConfirmUserEmailPayload!
+    @cost(weight: "10")
+  confirmUserEmailChange(input: ConfirmUserEmailChangeInput!): ConfirmUserEmailChangePayload!
+    @cost(weight: "10")
+  confirmUserMethodDeveloper(input: ConfirmUserMethodDeveloperInput!): ConfirmUserMethodDeveloperPayload!
+    @cost(weight: "10")
+  createComponent(input: CreateComponentInput!): CreateComponentPayload!
+    @cost(weight: "10")
+  createDatabase(input: CreateDatabaseInput!): CreateDatabasePayload!
+    @cost(weight: "10")
+  createDataFormat(input: CreateDataFormatInput!): CreateDataFormatPayload!
+    @cost(weight: "10")
+  createInstitution(input: CreateInstitutionInput!): CreateInstitutionPayload!
+    @cost(weight: "10")
+  createMethod(input: CreateMethodInput!): CreateMethodPayload!
+    @cost(weight: "10")
+  createOpenIdConnectApplication(input: CreateOpenIdConnectApplicationInput!): CreateOpenIdConnectApplicationPayload!
+    @cost(weight: "10")
+  deleteInstitution(input: DeleteInstitutionInput!): DeleteInstitutionPayload!
+    @cost(weight: "10")
+  deleteOpenIdConnectApplication(input: DeleteOpenIdConnectApplicationInput!): DeleteOpenIdConnectApplicationPayload!
+    @cost(weight: "10")
+  deleteOpenIdConnectAuthorization(
+    input: DeleteOpenIdConnectAuthorizationInput!
+  ): DeleteOpenIdConnectAuthorizationPayload! @cost(weight: "10")
+  deletePersonalUserData(input: DeletePersonalUserDataInput!): DeletePersonalUserDataPayload!
+    @cost(weight: "10")
+  deleteUser(input: DeleteUserInput!): DeleteUserPayload! @cost(weight: "10")
+  disableUserTwoFactorAuthentication: DisableUserTwoFactorAuthenticationPayload!
+    @cost(weight: "10")
+  enableUserTwoFactorAuthenticator(
+    input: EnableUserTwoFactorAuthenticatorInput!
+  ): EnableUserTwoFactorAuthenticatorPayload! @cost(weight: "10")
+  forbidGnuPgKeyFingerprint(input: ForbidGnuPgKeyFingerprintInput!): ForbidGnuPgKeyFingerprintPayload!
+    @cost(weight: "10")
+  forgetUserTwoFactorAuthenticationClient: ForgetUserTwoFactorAuthenticationClientPayload!
+    @cost(weight: "10")
+  generateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri: GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUriPayload!
+    @cost(weight: "10")
+  generateUserTwoFactorRecoveryCodes: GenerateUserTwoFactorRecoveryCodesPayload!
+    @cost(weight: "10")
+  loginUser(input: LoginUserInput!): LoginUserPayload! @cost(weight: "10")
+  loginUserWithRecoveryCode(input: LoginUserWithRecoveryCodeInput!): LoginUserWithRecoveryCodePayload!
+    @cost(weight: "10")
+  loginUserWithTwoFactorCode(input: LoginUserWithTwoFactorCodeInput!): LoginUserWithTwoFactorCodePayload!
+    @cost(weight: "10")
+  logoutUser: LogoutUserPayload! @cost(weight: "10")
+  registerUser(input: RegisterUserInput!): RegisterUserPayload!
+    @cost(weight: "10")
+  removeComponentAssembly(input: RemoveComponentAssemblyInput!): RemoveComponentAssemblyPayload!
+    @cost(weight: "10")
+  removeComponentGeneralization(input: RemoveComponentGeneralizationInput!): RemoveComponentGeneralizationPayload!
+    @cost(weight: "10")
+  removeComponentManufacturer(input: RemoveComponentManufacturerInput!): RemoveComponentManufacturerPayload!
+    @cost(weight: "10")
+  removeComponentVariant(input: RemoveComponentVariantInput!): RemoveComponentVariantPayload!
+    @cost(weight: "10")
+  removeInstitutionMethodDeveloper(
+    input: RemoveInstitutionMethodDeveloperInput!
+  ): RemoveInstitutionMethodDeveloperPayload! @cost(weight: "10")
+  removeInstitutionRepresentative(input: RemoveInstitutionRepresentativeInput!): RemoveInstitutionRepresentativePayload!
+    @cost(weight: "10")
+  removeUserMethodDeveloper(input: RemoveUserMethodDeveloperInput!): RemoveUserMethodDeveloperPayload!
+    @cost(weight: "10")
+  removeUserRole(input: RemoveUserRoleInput!): RemoveUserRolePayload!
+    @cost(weight: "10")
+  requestUserPasswordReset(input: RequestUserPasswordResetInput!): RequestUserPasswordResetPayload!
+    @cost(weight: "10")
+  resendUserEmailConfirmation(input: ResendUserEmailConfirmationInput!): ResendUserEmailConfirmationPayload!
+    @cost(weight: "10")
+  resendUserEmailVerification: ResendUserEmailVerificationPayload!
+    @cost(weight: "10")
+  resetOpenIdConnectApplicationClientSecret(
+    input: ResetOpenIdConnectApplicationClientSecretInput!
+  ): ResetOpenIdConnectApplicationClientSecretPayload! @cost(weight: "10")
+  resetUserPassword(input: ResetUserPasswordInput!): ResetUserPasswordPayload!
+    @cost(weight: "10")
+  resetUserTwoFactorAuthenticator: ResetUserTwoFactorAuthenticatorPayload!
+    @cost(weight: "10")
+  revokeOpenIdConnectToken(input: RevokeOpenIdConnectTokenInput!): RevokeOpenIdConnectTokenPayload!
+    @cost(weight: "10")
+  setComponentExtras(input: SetComponentExtrasInput!): SetComponentExtrasPayload!
+    @cost(weight: "10")
+  setInstitutionExtras(input: SetInstitutionExtrasInput!): SetInstitutionExtrasPayload!
+    @cost(weight: "10")
+  setUserPassword(input: SetUserPasswordInput!): SetUserPasswordPayload!
+    @cost(weight: "10")
+  setUserPhoneNumber(input: SetUserPhoneNumberInput!): SetUserPhoneNumberPayload!
+    @cost(weight: "10")
+  switchInstitutionOperatingState(input: SwitchInstitutionOperatingStateInput!): SwitchInstitutionOperatingStatePayload!
+    @cost(weight: "10")
+  updateComponent(input: UpdateComponentInput!): UpdateComponentPayload!
+    @cost(weight: "10")
+  updateComponentAssembly(input: UpdateComponentAssemblyInput!): UpdateComponentAssemblyPayload!
+    @cost(weight: "10")
+  updateDatabase(input: UpdateDatabaseInput!): UpdateDatabasePayload!
+    @cost(weight: "10")
+  updateDataFormat(input: UpdateDataFormatInput!): UpdateDataFormatPayload!
+    @cost(weight: "10")
+  updateInstitution(input: UpdateInstitutionInput!): UpdateInstitutionPayload!
+    @cost(weight: "10")
+  updateMethod(input: UpdateMethodInput!): UpdateMethodPayload!
+    @cost(weight: "10")
+  updateOpenIdConnectApplication(input: UpdateOpenIdConnectApplicationInput!): UpdateOpenIdConnectApplicationPayload!
+    @cost(weight: "10")
+  verifyDatabase(input: VerifyDatabaseInput!): VerifyDatabasePayload!
+    @cost(weight: "10")
+  verifyInstitution(input: VerifyInstitutionInput!): VerifyInstitutionPayload!
+    @cost(weight: "10")
 }
 
 type AddComponentAssemblyError implements UserError {
@@ -176,6 +631,24 @@ type AllowGnuPgKeyFingerprintPayload {
   query: Query!
 }
 
+"A connection to a list of items."
+type AnyDatabasesConnection {
+  "A list of edges."
+  edges: [AnyDatabasesEdge!]
+  "Information to aid in pagination."
+  pageInfo: PageInfo!
+  "Identifies the total count of items in the connection."
+  totalCount: Int! @cost(weight: "10")
+}
+
+"An edge in a connection."
+type AnyDatabasesEdge {
+  "A cursor for use in pagination."
+  cursor: String!
+  "The item at the end of the edge."
+  node: Database!
+}
+
 type AppliedMethod {
   arguments: [NamedMethodArgument!]!
   method: Method @cost(weight: "10")
@@ -263,26 +736,47 @@ type CielabColor {
 
 type Component implements Node {
   abbreviation: String
-  assembledOf(order: [ComponentAssembledOfSortInput!] @cost(weight: "10") where: ComponentAssembledOfFilterInput @cost(weight: "10")): ComponentAssembledOfConnection! @cost(weight: "10")
+  assembledOf(
+    order: [ComponentAssembledOfSortInput!] @cost(weight: "10")
+    where: ComponentAssembledOfFilterInput @cost(weight: "10")
+  ): ComponentAssembledOfConnection! @cost(weight: "10")
   availability: OpenEndedDateTimeRange
   categories: [ComponentCategory!]!
-  concretizationOf(order: [ComponentConcretizationOfSortInput!] @cost(weight: "10") where: ComponentConcretizationOfFilterInput @cost(weight: "10")): ComponentConcretizationOfConnection! @cost(weight: "10")
+  concretizationOf(
+    order: [ComponentConcretizationOfSortInput!] @cost(weight: "10")
+    where: ComponentConcretizationOfFilterInput @cost(weight: "10")
+  ): ComponentConcretizationOfConnection! @cost(weight: "10")
   createdAt: DateTime!
   description: String!
   extras: Any
-  generalizationOf(order: [ComponentGeneralizationOfSortInput!] @cost(weight: "10") where: ComponentGeneralizationOfFilterInput @cost(weight: "10")): ComponentGeneralizationOfConnection! @cost(weight: "10")
+  generalizationOf(
+    order: [ComponentGeneralizationOfSortInput!] @cost(weight: "10")
+    where: ComponentGeneralizationOfFilterInput @cost(weight: "10")
+  ): ComponentGeneralizationOfConnection! @cost(weight: "10")
   id: ID!
   isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
   manager: ComponentManagerEdge! @cost(weight: "10")
-  manufacturers(order: [ComponentManufacturerSortInput!] @cost(weight: "10") where: ComponentManufacturerFilterInput @cost(weight: "10")): ComponentManufacturerConnection! @cost(weight: "10")
+  manufacturers(
+    order: [ComponentManufacturerSortInput!] @cost(weight: "10")
+    where: ComponentManufacturerFilterInput @cost(weight: "10")
+  ): ComponentManufacturerConnection! @cost(weight: "10")
   name: String!
-  partOf(order: [ComponentPartOfSortInput!] @cost(weight: "10") where: ComponentPartOfFilterInput @cost(weight: "10")): ComponentPartOfConnection! @cost(weight: "10")
-  pendingManufacturers(order: [ComponentManufacturerSortInput!] @cost(weight: "10") where: ComponentManufacturerFilterInput @cost(weight: "10")): PendingComponentManufacturerConnection @authorize(policy: "WriteScope") @cost(weight: "10")
+  partOf(
+    order: [ComponentPartOfSortInput!] @cost(weight: "10")
+    where: ComponentPartOfFilterInput @cost(weight: "10")
+  ): ComponentPartOfConnection! @cost(weight: "10")
+  pendingManufacturers(
+    order: [ComponentManufacturerSortInput!] @cost(weight: "10")
+    where: ComponentManufacturerFilterInput @cost(weight: "10")
+  ): PendingComponentManufacturerConnection @cost(weight: "10")
   prime: PrimeSurfaceOrDirection @cost(weight: "0")
   switchableLayers: DescriptionOrReference
   updatedAt: DateTime!
   uuid: Uuid!
-  variantOf(order: [ComponentVariantOfSortInput!] @cost(weight: "10") where: ComponentVariantOfFilterInput @cost(weight: "10")): ComponentVariantOfConnection! @cost(weight: "10")
+  variantOf(
+    order: [ComponentVariantOfSortInput!] @cost(weight: "10")
+    where: ComponentVariantOfFilterInput @cost(weight: "10")
+  ): ComponentVariantOfConnection! @cost(weight: "10")
 }
 
 type ComponentAssembledOfConnection {
@@ -351,17 +845,6 @@ type ComponentPartOfEdge {
   primeSurface: PrimeSurface
 }
 
-type ComponentVariantOfConnection {
-  edges: [ComponentVariantOfEdge!]! @cost(weight: "0")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
-}
-
-type ComponentVariantOfEdge {
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
-  node: Component! @cost(weight: "0")
-}
-
 "A connection to a list of items."
 type ComponentsConnection {
   "A list of edges."
@@ -380,6 +863,17 @@ type ComponentsEdge {
   node: Component!
 }
 
+type ComponentVariantOfConnection {
+  edges: [ComponentVariantOfEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
+}
+
+type ComponentVariantOfEdge {
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Component! @cost(weight: "0")
+}
+
 type ConfirmComponentManufacturerError implements UserError {
   code: ConfirmComponentManufacturerErrorCode!
   message: String!
@@ -477,27 +971,27 @@ type CreateComponentPayload {
   query: Query!
 }
 
-type CreateDataFormatError implements UserError {
-  code: CreateDataFormatErrorCode!
+type CreateDatabaseError implements UserError {
+  code: CreateDatabaseErrorCode!
   message: String!
   path: [String!]!
 }
 
-type CreateDataFormatPayload {
-  dataFormat: DataFormat
-  errors: [CreateDataFormatError!]
+type CreateDatabasePayload {
+  database: Database
+  errors: [CreateDatabaseError!]
   query: Query!
 }
 
-type CreateDatabaseError implements UserError {
-  code: CreateDatabaseErrorCode!
+type CreateDataFormatError implements UserError {
+  code: CreateDataFormatErrorCode!
   message: String!
   path: [String!]!
 }
 
-type CreateDatabasePayload {
-  database: Database
-  errors: [CreateDatabaseError!]
+type CreateDataFormatPayload {
+  dataFormat: DataFormat
+  errors: [CreateDataFormatError!]
   query: Query!
 }
 
@@ -558,40 +1052,101 @@ type DataApproval implements Approval {
   variables: Any!
 }
 
-type DataConnection {
-  edges: [DataEdge!]! @cost(weight: "0")
-  pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
-}
-
-type DataEdge {
-  cursor: String!
-  node: Data! @cost(weight: "0")
-}
-
-type DataFormat implements Node {
+type Database implements Node {
+  allCalorimetricData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: Locale
+    where: CalorimetricDataPropositionInput
+  ): CalorimetricDataConnection @cost(weight: "10")
+  allGeometricData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: Locale
+    where: GeometricDataPropositionInput
+  ): GeometricDataConnection @cost(weight: "10")
+  allHygrothermalData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: Locale
+    where: HygrothermalDataPropositionInput
+  ): HygrothermalDataConnection @cost(weight: "10")
+  allLifeCycleData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: Locale
+    where: LifeCycleDataPropositionInput
+  ): LifeCycleDataConnection @cost(weight: "10")
+  allOpticalData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: Locale
+    where: OpticalDataPropositionInput
+  ): OpticalDataConnection @cost(weight: "10")
+  allPhotovoltaicData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: Locale
+    where: PhotovoltaicDataPropositionInput
+  ): PhotovoltaicDataConnection @cost(weight: "10")
+  calorimetricData(id: Uuid!, locale: Locale): CalorimetricData
+    @cost(weight: "10")
   createdAt: DateTime!
+  data(id: Uuid!, kind: DataKind!, locale: Locale): Data @cost(weight: "10")
   description: String!
-  extension: String
+  geometricData(id: Uuid!, locale: Locale): GeometricData @cost(weight: "10")
+  hasCalorimetricData(locale: Locale, where: CalorimetricDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasData(kind: DataKind!, locale: Locale, where: DataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasGeometricData(locale: Locale, where: GeometricDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasHygrothermalData(locale: Locale, where: HygrothermalDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasLifeCycleData(locale: Locale, where: LifeCycleDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasOpticalData(locale: Locale, where: OpticalDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasPhotovoltaicData(locale: Locale, where: PhotovoltaicDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hygrothermalData(id: Uuid!, locale: Locale): HygrothermalData
+    @cost(weight: "10")
   id: ID!
   isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
-  manager: DataFormatManagerEdge! @cost(weight: "10")
-  mediaType: String!
+  isAuthorizedToVerifyNode: Boolean! @cost(weight: "1")
+  lifeCycleData(id: Uuid!, locale: Locale): LifeCycleData @cost(weight: "10")
+  locator: Url!
   name: String!
-  reference: Reference @cost(weight: "0")
-  schemaLocator: Url
+  operator: DatabaseOperatorEdge! @cost(weight: "10")
+  opticalData(id: Uuid!, locale: Locale): OpticalData @cost(weight: "10")
+  photovoltaicData(id: Uuid!, locale: Locale): PhotovoltaicData
+    @cost(weight: "10")
   updatedAt: DateTime!
   uuid: Uuid!
+  verificationCode: String!
+  verificationState: DatabaseVerificationState!
 }
 
-type DataFormatManagerEdge {
+type DatabaseOperatorEdge {
   node: Institution! @cost(weight: "0")
 }
 
 "A connection to a list of items."
-type DataFormatsConnection {
+type DatabasesConnection {
   "A list of edges."
-  edges: [DataFormatsEdge!]
+  edges: [DatabasesEdge!]
   "Information to aid in pagination."
   pageInfo: PageInfo!
   "Identifies the total count of items in the connection."
@@ -599,56 +1154,47 @@ type DataFormatsConnection {
 }
 
 "An edge in a connection."
-type DataFormatsEdge {
+type DatabasesEdge {
   "A cursor for use in pagination."
   cursor: String!
   "The item at the end of the edge."
-  node: DataFormat!
+  node: Database!
 }
 
-type Database implements Node {
-  allCalorimetricData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: CalorimetricDataPropositionInput): CalorimetricDataConnection @cost(weight: "10")
-  allGeometricData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: GeometricDataPropositionInput): GeometricDataConnection @cost(weight: "10")
-  allHygrothermalData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: HygrothermalDataPropositionInput): HygrothermalDataConnection @cost(weight: "10")
-  allLifeCycleData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: LifeCycleDataPropositionInput): LifeCycleDataConnection @cost(weight: "10")
-  allOpticalData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: OpticalDataPropositionInput): OpticalDataConnection @cost(weight: "10")
-  allPhotovoltaicData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: PhotovoltaicDataPropositionInput): PhotovoltaicDataConnection @cost(weight: "10")
-  calorimetricData(id: Uuid! locale: Locale): CalorimetricData @cost(weight: "10")
+type DataConnection {
+  edges: [DataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: NonNegativeInt!
+}
+
+type DataEdge {
+  cursor: String!
+  node: Data! @cost(weight: "0")
+}
+
+type DataFormat implements Node {
   createdAt: DateTime!
-  data(id: Uuid! kind: DataKind! locale: Locale): Data @cost(weight: "10")
   description: String!
-  geometricData(id: Uuid! locale: Locale): GeometricData @cost(weight: "10")
-  hasCalorimetricData(locale: Locale where: CalorimetricDataPropositionInput): Boolean @cost(weight: "10")
-  hasData(kind: DataKind! locale: Locale where: DataPropositionInput): Boolean @cost(weight: "10")
-  hasGeometricData(locale: Locale where: GeometricDataPropositionInput): Boolean @cost(weight: "10")
-  hasHygrothermalData(locale: Locale where: HygrothermalDataPropositionInput): Boolean @cost(weight: "10")
-  hasLifeCycleData(locale: Locale where: LifeCycleDataPropositionInput): Boolean @cost(weight: "10")
-  hasOpticalData(locale: Locale where: OpticalDataPropositionInput): Boolean @cost(weight: "10")
-  hasPhotovoltaicData(locale: Locale where: PhotovoltaicDataPropositionInput): Boolean @cost(weight: "10")
-  hygrothermalData(id: Uuid! locale: Locale): HygrothermalData @cost(weight: "10")
+  extension: String
   id: ID!
   isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
-  isAuthorizedToVerifyNode: Boolean! @cost(weight: "1")
-  lifeCycleData(id: Uuid! locale: Locale): LifeCycleData @cost(weight: "10")
-  locator: Url!
+  manager: DataFormatManagerEdge! @cost(weight: "10")
+  mediaType: String!
   name: String!
-  operator: DatabaseOperatorEdge! @cost(weight: "10")
-  opticalData(id: Uuid! locale: Locale): OpticalData @cost(weight: "10")
-  photovoltaicData(id: Uuid! locale: Locale): PhotovoltaicData @cost(weight: "10")
+  reference: Reference @cost(weight: "0")
+  schemaLocator: Url
   updatedAt: DateTime!
   uuid: Uuid!
-  verificationCode: String!
-  verificationState: DatabaseVerificationState!
 }
 
-type DatabaseOperatorEdge {
+type DataFormatManagerEdge {
   node: Institution! @cost(weight: "0")
 }
 
 "A connection to a list of items."
-type DatabasesConnection {
+type DataFormatsConnection {
   "A list of edges."
-  edges: [DatabasesEdge!]
+  edges: [DataFormatsEdge!]
   "Information to aid in pagination."
   pageInfo: PageInfo!
   "Identifies the total count of items in the connection."
@@ -656,11 +1202,11 @@ type DatabasesConnection {
 }
 
 "An edge in a connection."
-type DatabasesEdge {
+type DataFormatsEdge {
   "A cursor for use in pagination."
   cursor: String!
   "The item at the end of the edge."
-  node: Database!
+  node: DataFormat!
 }
 
 type DeleteInstitutionError implements UserError {
@@ -887,10 +1433,6 @@ type GnuPgKeyFingerprintInstitutionEdge {
   node: Institution! @cost(weight: "0")
 }
 
-type GnuPgKeyFingerprintUserEdge {
-  node: User! @cost(weight: "0")
-}
-
 "A connection to a list of items."
 type GnuPgKeyFingerprintsConnection {
   "A list of edges."
@@ -909,6 +1451,10 @@ type GnuPgKeyFingerprintsEdge {
   node: GnuPgKeyFingerprint!
 }
 
+type GnuPgKeyFingerprintUserEdge {
+  node: User! @cost(weight: "0")
+}
+
 type HygrothermalData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
@@ -947,29 +1493,135 @@ type Institution implements Node {
   contact: ContactInformation
   createdAt: DateTime!
   description: String!
-  developedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionDevelopedMethodSortInput!] @cost(weight: "10") where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")): InstitutionDevelopedMethodConnection! @cost(weight: "10")
+  developedMethods(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionDevelopedMethodSortInput!] @cost(weight: "10")
+    where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
+  ): InstitutionDevelopedMethodConnection! @cost(weight: "10")
   extras: Any
-  gnuPgKeyFingerprints(order: [InstitutionGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")): InstitutionGnuPgKeyFingerprintConnection! @cost(weight: "10")
-  hasGnuPgKeyFingerprint(order: [InstitutionGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")): Boolean! @cost(weight: "10")
+  gnuPgKeyFingerprints(
+    order: [InstitutionGnuPgKeyFingerprintSortInput!] @cost(weight: "10")
+    where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  ): InstitutionGnuPgKeyFingerprintConnection! @cost(weight: "10")
+  hasGnuPgKeyFingerprint(
+    order: [InstitutionGnuPgKeyFingerprintSortInput!] @cost(weight: "10")
+    where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  ): Boolean! @cost(weight: "10")
   id: ID!
   isAuthorizedToDeleteNode: Boolean! @cost(weight: "1")
   isAuthorizedToSwitchOperatingStateOfNode: Boolean! @cost(weight: "1")
   isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
   isAuthorizedToVerifyNode: Boolean! @cost(weight: "1")
-  managedComponents("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedComponentSortInput!] @cost(weight: "10") where: InstitutionManagedComponentFilterInput @cost(weight: "10")): InstitutionManagedComponentConnection! @cost(weight: "10")
-  managedDataFormats("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedDataFormatSortInput!] @cost(weight: "10") where: InstitutionManagedDataFormatFilterInput @cost(weight: "10")): InstitutionManagedDataFormatConnection! @cost(weight: "10")
-  managedInstitutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedInstitutionSortInput!] @cost(weight: "10") where: InstitutionManagedInstitutionFilterInput @cost(weight: "10")): InstitutionManagedInstitutionConnection! @cost(weight: "10")
-  managedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedMethodSortInput!] @cost(weight: "10") where: InstitutionManagedMethodFilterInput @cost(weight: "10")): InstitutionManagedMethodConnection! @cost(weight: "10")
+  managedComponents(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionManagedComponentSortInput!] @cost(weight: "10")
+    where: InstitutionManagedComponentFilterInput @cost(weight: "10")
+  ): InstitutionManagedComponentConnection! @cost(weight: "10")
+  managedDataFormats(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionManagedDataFormatSortInput!] @cost(weight: "10")
+    where: InstitutionManagedDataFormatFilterInput @cost(weight: "10")
+  ): InstitutionManagedDataFormatConnection! @cost(weight: "10")
+  managedInstitutions(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionManagedInstitutionSortInput!] @cost(weight: "10")
+    where: InstitutionManagedInstitutionFilterInput @cost(weight: "10")
+  ): InstitutionManagedInstitutionConnection! @cost(weight: "10")
+  managedMethods(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionManagedMethodSortInput!] @cost(weight: "10")
+    where: InstitutionManagedMethodFilterInput @cost(weight: "10")
+  ): InstitutionManagedMethodConnection! @cost(weight: "10")
   manager: InstitutionManagerEdge @cost(weight: "10")
-  manufacturedComponents("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManufacturedComponentSortInput!] @cost(weight: "10") where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")): InstitutionManufacturedComponentConnection! @cost(weight: "10")
+  manufacturedComponents(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionManufacturedComponentSortInput!] @cost(weight: "10")
+    where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")
+  ): InstitutionManufacturedComponentConnection! @cost(weight: "10")
   name: String!
-  openIdConnectApplications(order: [InstitutionOwnedOpenIdConnectApplicationSortInput!] @cost(weight: "10") where: InstitutionOwnedOpenIdConnectApplicationFilterInput @cost(weight: "10")): InstitutionOwnedOpenIdConnectApplicationConnection! @cost(weight: "10")
-  operatedDatabases(order: [InstitutionOperatedDatabaseSortInput!] @cost(weight: "10") where: InstitutionOperatedDatabaseFilterInput @cost(weight: "10")): InstitutionOperatedDatabaseConnection! @cost(weight: "10")
+  openIdConnectApplications(
+    order: [InstitutionOwnedOpenIdConnectApplicationSortInput!] @cost(weight: "10")
+    where: InstitutionOwnedOpenIdConnectApplicationFilterInput @cost(weight: "10")
+  ): InstitutionOwnedOpenIdConnectApplicationConnection! @cost(weight: "10")
+  operatedDatabases(
+    order: [InstitutionOperatedDatabaseSortInput!] @cost(weight: "10")
+    where: InstitutionOperatedDatabaseFilterInput @cost(weight: "10")
+  ): InstitutionOperatedDatabaseConnection! @cost(weight: "10")
   operatingState: InstitutionOperatingState!
-  pendingDevelopedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionDevelopedMethodSortInput!] @cost(weight: "10") where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")): PendingInstitutionDevelopedMethodConnection! @cost(weight: "10")
-  pendingManufacturedComponents("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManufacturedComponentSortInput!] @cost(weight: "10") where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")): PendingInstitutionManufacturedComponentConnection! @cost(weight: "10")
-  pendingRepresentatives(order: [InstitutionRepresentativeSortInput!] @cost(weight: "10") where: InstitutionRepresentativeFilterInput @cost(weight: "10")): PendingInstitutionRepresentativeConnection @authorize(policy: "ManageInstitutionRepresentativeScope") @cost(weight: "10")
-  representatives(order: [InstitutionRepresentativeSortInput!] @cost(weight: "10") where: InstitutionRepresentativeFilterInput @cost(weight: "10")): InstitutionRepresentativeConnection! @cost(weight: "10")
+  pendingDevelopedMethods(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionDevelopedMethodSortInput!] @cost(weight: "10")
+    where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
+  ): PendingInstitutionDevelopedMethodConnection! @cost(weight: "10")
+  pendingManufacturedComponents(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionManufacturedComponentSortInput!] @cost(weight: "10")
+    where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")
+  ): PendingInstitutionManufacturedComponentConnection! @cost(weight: "10")
+  pendingRepresentatives(
+    order: [InstitutionRepresentativeSortInput!] @cost(weight: "10")
+    where: InstitutionRepresentativeFilterInput @cost(weight: "10")
+  ): PendingInstitutionRepresentativeConnection @cost(weight: "10")
+  representatives(
+    order: [InstitutionRepresentativeSortInput!] @cost(weight: "10")
+    where: InstitutionRepresentativeFilterInput @cost(weight: "10")
+  ): InstitutionRepresentativeConnection! @cost(weight: "10")
   state: InstitutionState!
   updatedAt: DateTime!
   uuid: Uuid!
@@ -983,6 +1635,8 @@ type InstitutionDevelopedMethodConnection {
 
 type InstitutionDevelopedMethodEdge {
   cursor: String!
+  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
   node: Method! @cost(weight: "0")
 }
 
@@ -1205,13 +1859,19 @@ type Method implements Node {
   categories: [MethodCategory!]!
   createdAt: DateTime!
   description: String!
-  developers(order: [MethodDeveloperSortInput!] @cost(weight: "10") where: MethodDeveloperFilterInput @cost(weight: "10")): MethodDeveloperConnection! @cost(weight: "10")
+  developers(
+    order: [MethodDeveloperSortInput!] @cost(weight: "10")
+    where: MethodDeveloperFilterInput @cost(weight: "10")
+  ): MethodDeveloperConnection! @cost(weight: "10")
   id: ID!
   isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
   manager: MethodManagerEdge! @cost(weight: "10")
   name: String!
   parameters: [MethodParameter!]!
-  pendingDevelopers(order: [MethodDeveloperSortInput!] @cost(weight: "10") where: MethodDeveloperFilterInput @cost(weight: "10")): PendingMethodDeveloperConnection @authorize(policy: "WriteScope") @cost(weight: "10")
+  pendingDevelopers(
+    order: [MethodDeveloperSortInput!] @cost(weight: "10")
+    where: MethodDeveloperFilterInput @cost(weight: "10")
+  ): PendingMethodDeveloperConnection @cost(weight: "10")
   reference: Reference @cost(weight: "0")
   sources: [MethodSource!]!
   updatedAt: DateTime!
@@ -1244,14 +1904,6 @@ type MethodParameter {
   type: Any!
 }
 
-"A data source given as a cross-database data reference when this method is applied."
-type MethodSource {
-  "The significance of the source for the method."
-  description: String!
-  "The source name."
-  name: String!
-}
-
 "A connection to a list of items."
 type MethodsConnection {
   "A list of edges."
@@ -1270,77 +1922,12 @@ type MethodsEdge {
   node: Method!
 }
 
-type Mutation {
-  addComponentAssembly(input: AddComponentAssemblyInput!): AddComponentAssemblyPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  addComponentGeneralization(input: AddComponentGeneralizationInput!): AddComponentGeneralizationPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  addComponentManufacturer(input: AddComponentManufacturerInput!): AddComponentManufacturerPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  addComponentVariant(input: AddComponentVariantInput!): AddComponentVariantPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  addGnuPgKeyFingerprint(input: AddGnuPgKeyFingerprintInput!): AddGnuPgKeyFingerprintPayload! @authorize(policy: "ManageGnuPgScope") @cost(weight: "10")
-  addInstitutionMethodDeveloper(input: AddInstitutionMethodDeveloperInput!): AddInstitutionMethodDeveloperPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  addInstitutionRepresentative(input: AddInstitutionRepresentativeInput!): AddInstitutionRepresentativePayload! @authorize(policy: "ManageInstitutionRepresentativeScope") @cost(weight: "10")
-  addUserMethodDeveloper(input: AddUserMethodDeveloperInput!): AddUserMethodDeveloperPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  addUserRole(input: AddUserRoleInput!): AddUserRolePayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  allowGnuPgKeyFingerprint(input: AllowGnuPgKeyFingerprintInput!): AllowGnuPgKeyFingerprintPayload! @authorize(policy: "ManageGnuPgScope") @cost(weight: "10")
-  changeInstitutionRepresentativeRole(input: ChangeInstitutionRepresentativeRoleInput!): ChangeInstitutionRepresentativeRolePayload! @authorize(policy: "ManageInstitutionRepresentativeScope") @cost(weight: "10")
-  changeUserEmail(input: ChangeUserEmailInput!): ChangeUserEmailPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  changeUserPassword(input: ChangeUserPasswordInput!): ChangeUserPasswordPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  confirmComponentManufacturer(input: ConfirmComponentManufacturerInput!): ConfirmComponentManufacturerPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  confirmInstitutionMethodDeveloper(input: ConfirmInstitutionMethodDeveloperInput!): ConfirmInstitutionMethodDeveloperPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  confirmInstitutionRepresentative(input: ConfirmInstitutionRepresentativeInput!): ConfirmInstitutionRepresentativePayload! @authorize(policy: "ManageInstitutionRepresentativeScope") @cost(weight: "10")
-  confirmUserEmail(input: ConfirmUserEmailInput!): ConfirmUserEmailPayload! @cost(weight: "10")
-  confirmUserEmailChange(input: ConfirmUserEmailChangeInput!): ConfirmUserEmailChangePayload! @cost(weight: "10")
-  confirmUserMethodDeveloper(input: ConfirmUserMethodDeveloperInput!): ConfirmUserMethodDeveloperPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  createComponent(input: CreateComponentInput!): CreateComponentPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  createDatabase(input: CreateDatabaseInput!): CreateDatabasePayload! @authorize(policy: "ManageDatabaseScope") @cost(weight: "10")
-  createDataFormat(input: CreateDataFormatInput!): CreateDataFormatPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  createInstitution(input: CreateInstitutionInput!): CreateInstitutionPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  createMethod(input: CreateMethodInput!): CreateMethodPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  createOpenIdConnectApplication(input: CreateOpenIdConnectApplicationInput!): CreateOpenIdConnectApplicationPayload! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  deleteInstitution(input: DeleteInstitutionInput!): DeleteInstitutionPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  deleteOpenIdConnectApplication(input: DeleteOpenIdConnectApplicationInput!): DeleteOpenIdConnectApplicationPayload! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  deleteOpenIdConnectAuthorization(input: DeleteOpenIdConnectAuthorizationInput!): DeleteOpenIdConnectAuthorizationPayload! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  deletePersonalUserData(input: DeletePersonalUserDataInput!): DeletePersonalUserDataPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  deleteUser(input: DeleteUserInput!): DeleteUserPayload! @authorize(policy: "ManageUserScope") @authorize(policy: "AdministrateScope") @cost(weight: "10")
-  disableUserTwoFactorAuthentication: DisableUserTwoFactorAuthenticationPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  enableUserTwoFactorAuthenticator(input: EnableUserTwoFactorAuthenticatorInput!): EnableUserTwoFactorAuthenticatorPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  forbidGnuPgKeyFingerprint(input: ForbidGnuPgKeyFingerprintInput!): ForbidGnuPgKeyFingerprintPayload! @authorize(policy: "ManageGnuPgScope") @cost(weight: "10")
-  forgetUserTwoFactorAuthenticationClient: ForgetUserTwoFactorAuthenticationClientPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  generateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri: GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUriPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  generateUserTwoFactorRecoveryCodes: GenerateUserTwoFactorRecoveryCodesPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  loginUser(input: LoginUserInput!): LoginUserPayload! @cost(weight: "10")
-  loginUserWithRecoveryCode(input: LoginUserWithRecoveryCodeInput!): LoginUserWithRecoveryCodePayload! @cost(weight: "10")
-  loginUserWithTwoFactorCode(input: LoginUserWithTwoFactorCodeInput!): LoginUserWithTwoFactorCodePayload! @cost(weight: "10")
-  logoutUser: LogoutUserPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  registerUser(input: RegisterUserInput!): RegisterUserPayload! @cost(weight: "10")
-  removeComponentAssembly(input: RemoveComponentAssemblyInput!): RemoveComponentAssemblyPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  removeComponentGeneralization(input: RemoveComponentGeneralizationInput!): RemoveComponentGeneralizationPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  removeComponentManufacturer(input: RemoveComponentManufacturerInput!): RemoveComponentManufacturerPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  removeComponentVariant(input: RemoveComponentVariantInput!): RemoveComponentVariantPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  removeInstitutionMethodDeveloper(input: RemoveInstitutionMethodDeveloperInput!): RemoveInstitutionMethodDeveloperPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  removeInstitutionRepresentative(input: RemoveInstitutionRepresentativeInput!): RemoveInstitutionRepresentativePayload! @authorize(policy: "ManageInstitutionRepresentativeScope") @cost(weight: "10")
-  removeUserMethodDeveloper(input: RemoveUserMethodDeveloperInput!): RemoveUserMethodDeveloperPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  removeUserRole(input: RemoveUserRoleInput!): RemoveUserRolePayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  requestUserPasswordReset(input: RequestUserPasswordResetInput!): RequestUserPasswordResetPayload! @cost(weight: "10")
-  resendUserEmailConfirmation(input: ResendUserEmailConfirmationInput!): ResendUserEmailConfirmationPayload! @cost(weight: "10")
-  resendUserEmailVerification: ResendUserEmailVerificationPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  resetOpenIdConnectApplicationClientSecret(input: ResetOpenIdConnectApplicationClientSecretInput!): ResetOpenIdConnectApplicationClientSecretPayload! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  resetUserPassword(input: ResetUserPasswordInput!): ResetUserPasswordPayload! @cost(weight: "10")
-  resetUserTwoFactorAuthenticator: ResetUserTwoFactorAuthenticatorPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  revokeOpenIdConnectToken(input: RevokeOpenIdConnectTokenInput!): RevokeOpenIdConnectTokenPayload! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  setComponentExtras(input: SetComponentExtrasInput!): SetComponentExtrasPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  setInstitutionExtras(input: SetInstitutionExtrasInput!): SetInstitutionExtrasPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  setUserPassword(input: SetUserPasswordInput!): SetUserPasswordPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  setUserPhoneNumber(input: SetUserPhoneNumberInput!): SetUserPhoneNumberPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  switchInstitutionOperatingState(input: SwitchInstitutionOperatingStateInput!): SwitchInstitutionOperatingStatePayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  updateComponent(input: UpdateComponentInput!): UpdateComponentPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  updateComponentAssembly(input: UpdateComponentAssemblyInput!): UpdateComponentAssemblyPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  updateDatabase(input: UpdateDatabaseInput!): UpdateDatabasePayload! @authorize(policy: "ManageDatabaseScope") @cost(weight: "10")
-  updateDataFormat(input: UpdateDataFormatInput!): UpdateDataFormatPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  updateInstitution(input: UpdateInstitutionInput!): UpdateInstitutionPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  updateMethod(input: UpdateMethodInput!): UpdateMethodPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  updateOpenIdConnectApplication(input: UpdateOpenIdConnectApplicationInput!): UpdateOpenIdConnectApplicationPayload! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  verifyDatabase(input: VerifyDatabaseInput!): VerifyDatabasePayload! @authorize(policy: "ManageDatabaseScope") @cost(weight: "10")
-  verifyInstitution(input: VerifyInstitutionInput!): VerifyInstitutionPayload! @authorize(policy: "WriteScope") @authorize(policy: "VerifyScope") @cost(weight: "10")
+"A data source given as a cross-database data reference when this method is applied."
+type MethodSource {
+  "The significance of the source for the method."
+  description: String!
+  "The source name."
+  name: String!
 }
 
 type NamedMethodArgument {
@@ -1366,7 +1953,8 @@ type OpenEndedDateTimeRange {
 
 type OpenIdConnectApplication implements Node {
   applicationType: String
-  authorizations: OpenIdConnectApplicationGrantedAuthorizationConnection! @cost(weight: "0")
+  authorizations: OpenIdConnectApplicationGrantedAuthorizationConnection!
+    @cost(weight: "0")
   clientId: String!
   clientType: String
   consentType: OpenIdConnectConsentType!
@@ -1704,56 +2292,6 @@ type Publication {
   webAddress: Url
 }
 
-type Query {
-  allCalorimetricData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: CalorimetricDataPropositionInput): CalorimetricDataConnection! @cost(weight: "10")
-  allGeometricData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: GeometricDataPropositionInput): GeometricDataConnection! @cost(weight: "10")
-  allHygrothermalData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: HygrothermalDataPropositionInput): HygrothermalDataConnection! @cost(weight: "10")
-  allLifeCycleData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: LifeCycleDataPropositionInput): LifeCycleDataConnection! @cost(weight: "10")
-  allOpticalData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: OpticalDataPropositionInput): OpticalDataConnection! @cost(weight: "10")
-  allPhotovoltaicData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: PhotovoltaicDataPropositionInput): PhotovoltaicDataConnection! @cost(weight: "10")
-  calorimetricData(databaseId: Uuid! id: Uuid! locale: String): CalorimetricData @cost(weight: "10")
-  component(id: Uuid!): Component @cost(weight: "10")
-  components("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [ComponentSortInput!] @cost(weight: "10") where: ComponentFilterInput @cost(weight: "10")): ComponentsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  currentInstitution: Institution @authorize(policy: "Authenticated") @cost(weight: "10")
-  currentOpenIdConnectApplication: OpenIdConnectApplication @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  currentUser: User @authorize(policy: "Authenticated") @cost(weight: "10")
-  database(id: Uuid!): Database @cost(weight: "10")
-  databases("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DatabaseSortInput!] @cost(weight: "10") where: DatabaseFilterInput @cost(weight: "10")): DatabasesConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  dataFormat(id: Uuid!): DataFormat @cost(weight: "10")
-  dataFormats("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DataFormatSortInput!] @cost(weight: "10") where: DataFormatFilterInput @cost(weight: "10")): DataFormatsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  geometricData(databaseId: Uuid! id: Uuid! locale: String): GeometricData @cost(weight: "10")
-  gnuPgKeyFingerprint(fingerprint: String!): GnuPgKeyFingerprint @authorize(policy: "ManageGnuPgScope") @cost(weight: "10")
-  gnuPgKeyFingerprints("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [GnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: GnuPgKeyFingerprintFilterInput @cost(weight: "10")): GnuPgKeyFingerprintsConnection @authorize(policy: "ManageGnuPgScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  hasCalorimetricData(locale: String where: CalorimetricDataPropositionInput): Boolean! @cost(weight: "10")
-  hasGeometricData(locale: String where: GeometricDataPropositionInput): Boolean! @cost(weight: "10")
-  hasHygrothermalData(locale: String where: HygrothermalDataPropositionInput): Boolean! @cost(weight: "10")
-  hasLifeCycleData(locale: String where: LifeCycleDataPropositionInput): Boolean! @cost(weight: "10")
-  hasOpticalData(locale: String where: OpticalDataPropositionInput): Boolean! @cost(weight: "10")
-  hasPhotovoltaicData(locale: String where: PhotovoltaicDataPropositionInput): Boolean! @cost(weight: "10")
-  hygrothermalData(databaseId: Uuid! id: Uuid! locale: String): HygrothermalData @cost(weight: "10")
-  institution(id: Uuid!): Institution @cost(weight: "10")
-  institutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionSortInput!] @cost(weight: "10") where: InstitutionFilterInput @cost(weight: "10")): InstitutionsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  lifeCycleData(databaseId: Uuid! id: Uuid! locale: String): LifeCycleData @cost(weight: "10")
-  method(id: Uuid!): Method @cost(weight: "10")
-  methods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [MethodSortInput!] @cost(weight: "10") where: MethodFilterInput @cost(weight: "10")): MethodsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  "Fetches an object given its ID."
-  node("ID of the object." id: ID!): Node @cost(weight: "10")
-  "Lookup nodes by a list of IDs."
-  nodes("The list of node IDs." ids: [ID!]!): [Node]! @cost(weight: "10")
-  openIdConnectApplication(id: Uuid!): OpenIdConnectApplication @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  openIdConnectApplications("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [OpenIdConnectApplicationSortInput!] @cost(weight: "10") where: OpenIdConnectApplicationFilterInput @cost(weight: "10")): OpenIdConnectApplicationsConnection @authorize(policy: "ManageOpenIdConnectScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  openIdConnectAuthorization(id: Uuid!): OpenIdConnectAuthorization @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  openIdConnectAuthorizations("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [OpenIdConnectAuthorizationSortInput!] @cost(weight: "10") where: OpenIdConnectAuthorizationFilterInput @cost(weight: "10")): OpenIdConnectAuthorizationsConnection @authorize(policy: "ManageOpenIdConnectScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  openIdConnectToken(id: Uuid!): OpenIdConnectToken @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  openIdConnectTokens("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [OpenIdConnectTokenSortInput!] @cost(weight: "10") where: OpenIdConnectTokenFilterInput @cost(weight: "10")): OpenIdConnectTokensConnection @authorize(policy: "ManageOpenIdConnectScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  opticalData(databaseId: Uuid! id: Uuid! locale: String): OpticalData @cost(weight: "10")
-  pendingDatabases("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DatabaseSortInput!] @cost(weight: "10") where: DatabaseFilterInput @cost(weight: "10")): PendingDatabasesConnection @authorize(policy: "ManageDatabaseScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  pendingInstitutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionSortInput!] @cost(weight: "10") where: InstitutionFilterInput @cost(weight: "10")): PendingInstitutionsConnection @authorize(policy: "WriteScope") @authorize(policy: "VerifyScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  photovoltaicData(databaseId: Uuid! id: Uuid! locale: String): PhotovoltaicData @cost(weight: "10")
-  user(id: Uuid!): User @cost(weight: "10")
-  users("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [UserSortInput!] @cost(weight: "10") where: UserFilterInput @cost(weight: "10")): UsersConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-}
-
 type RegisterUserError implements UserError {
   code: RegisterUserErrorCode!
   message: String!
@@ -2063,27 +2601,27 @@ type UpdateComponentPayload {
   query: Query!
 }
 
-type UpdateDataFormatError implements UserError {
-  code: UpdateDataFormatErrorCode!
+type UpdateDatabaseError implements UserError {
+  code: UpdateDatabaseErrorCode!
   message: String!
   path: [String!]!
 }
 
-type UpdateDataFormatPayload {
-  dataFormat: DataFormat
-  errors: [UpdateDataFormatError!]
+type UpdateDatabasePayload {
+  database: Database
+  errors: [UpdateDatabaseError!]
   query: Query!
 }
 
-type UpdateDatabaseError implements UserError {
-  code: UpdateDatabaseErrorCode!
+type UpdateDataFormatError implements UserError {
+  code: UpdateDataFormatErrorCode!
   message: String!
   path: [String!]!
 }
 
-type UpdateDatabasePayload {
-  database: Database
-  errors: [UpdateDatabaseError!]
+type UpdateDataFormatPayload {
+  dataFormat: DataFormat
+  errors: [UpdateDataFormatError!]
   query: Query!
 }
 
@@ -2125,9 +2663,26 @@ type UpdateOpenIdConnectApplicationPayload {
 
 type User implements Node {
   contact: ContactInformation! @cost(weight: "0")
-  developedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [UserDevelopedMethodSortInput!] @cost(weight: "10") where: UserDevelopedMethodFilterInput @cost(weight: "10")): UserDevelopedMethodConnection! @cost(weight: "10")
-  gnuPgKeyFingerprints(order: [UserGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")): UserGnuPgKeyFingerprintConnection! @cost(weight: "10")
-  hasGnuPgKeyFingerprint(order: [UserGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")): Boolean! @cost(weight: "10")
+  developedMethods(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [UserDevelopedMethodSortInput!] @cost(weight: "10")
+    where: UserDevelopedMethodFilterInput @cost(weight: "10")
+  ): UserDevelopedMethodConnection! @cost(weight: "10")
+  gnuPgKeyFingerprints(
+    order: [UserGnuPgKeyFingerprintSortInput!] @cost(weight: "10")
+    where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  ): UserGnuPgKeyFingerprintConnection! @cost(weight: "10")
+  hasGnuPgKeyFingerprint(
+    order: [UserGnuPgKeyFingerprintSortInput!] @cost(weight: "10")
+    where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  ): Boolean! @cost(weight: "10")
   hasPassword: Boolean
   id: ID!
   isAuthorizedToAddApprovals: Boolean! @cost(weight: "1")
@@ -2135,9 +2690,26 @@ type User implements Node {
   isAuthorizedToManageOpenIdConnect: Boolean! @cost(weight: "1")
   "Full name"
   name: String!
-  pendingDevelopedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [UserDevelopedMethodSortInput!] @cost(weight: "10") where: UserDevelopedMethodFilterInput @cost(weight: "10")): PendingUserDevelopedMethodConnection @authorize(policy: "WriteScope") @cost(weight: "10")
-  pendingRepresentedInstitutions(order: [UserRepresentedInstitutionSortInput!] @cost(weight: "10") where: UserRepresentedInstitutionFilterInput @cost(weight: "10")): PendingUserRepresentedInstitutionConnection @authorize(policy: "WriteScope") @cost(weight: "10")
-  representedInstitutions(order: [UserRepresentedInstitutionSortInput!] @cost(weight: "10") where: UserRepresentedInstitutionFilterInput @cost(weight: "10")): UserRepresentedInstitutionConnection! @cost(weight: "10")
+  pendingDevelopedMethods(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [UserDevelopedMethodSortInput!] @cost(weight: "10")
+    where: UserDevelopedMethodFilterInput @cost(weight: "10")
+  ): PendingUserDevelopedMethodConnection @cost(weight: "10")
+  pendingRepresentedInstitutions(
+    order: [UserRepresentedInstitutionSortInput!] @cost(weight: "10")
+    where: UserRepresentedInstitutionFilterInput @cost(weight: "10")
+  ): PendingUserRepresentedInstitutionConnection @cost(weight: "10")
+  representedInstitutions(
+    order: [UserRepresentedInstitutionSortInput!] @cost(weight: "10")
+    where: UserRepresentedInstitutionFilterInput @cost(weight: "10")
+  ): UserRepresentedInstitutionConnection! @cost(weight: "10")
   roles: [UserRole!] @cost(weight: "0")
   rolesCurrentUserCanAdd: [UserRole!]!
   rolesCurrentUserCanRemove: [UserRole!]!
@@ -2153,6 +2725,8 @@ type UserDevelopedMethodConnection {
 
 type UserDevelopedMethodEdge {
   cursor: String!
+  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
   node: Method! @cost(weight: "0")
 }
 
@@ -2224,15 +2798,61 @@ type VerifyInstitutionPayload {
   query: Query!
 }
 
-union Reference = Publication | Standard
-
-union Stakeholder = Institution | User
-
-input AddComponentAssemblyInput {
-  assembledComponentId: Uuid!
-  index: UnsignedByte
-  partComponentId: Uuid!
-  primeSurface: PrimeSurface
+interface Approval {
+  approverId: Uuid!
+  keyFingerprint: String!
+  message: String!
+  query: String!
+  signature: String!
+  timestamp: DateTime!
+  variables: Any!
+}
+
+interface Data {
+  appliedMethod: AppliedMethod!
+  approvals: [DataApproval!]!
+  component: Component
+  componentId: Uuid!
+  createdAt: DateTime!
+  creator: Institution
+  creatorId: Uuid!
+  database: Database
+  databaseId: Uuid!
+  description: String
+  id: ID!
+  kind: DataKind!
+  locale: Locale!
+  name: String
+  resources: [GetHttpsResource!]!
+  resourceTree: GetHttpsResourceTree!
+  timestamp: DateTime!
+  uuid: Uuid!
+  warnings: [String!]!
+}
+
+interface GetHttpsResourceTreeVertex {
+  value: GetHttpsResource!
+}
+
+"The node interface is implemented by entities that have a global unique identifier."
+interface Node {
+  id: ID!
+}
+
+interface UserError {
+  message: String!
+  path: [String!]!
+}
+
+union Reference = Publication | Standard
+
+union Stakeholder = Institution | User
+
+input AddComponentAssemblyInput {
+  assembledComponentId: Uuid!
+  index: UnsignedByte
+  partComponentId: Uuid!
+  primeSurface: PrimeSurface
 }
 
 input AddComponentGeneralizationInput {
@@ -2558,6 +3178,13 @@ input CreateComponentInput {
   switchableLayers: DescriptionOrReferenceInput
 }
 
+input CreateDatabaseInput {
+  description: String!
+  locator: Url!
+  name: String!
+  operatorId: Uuid!
+}
+
 input CreateDataFormatInput {
   description: String!
   extension: String
@@ -2568,13 +3195,6 @@ input CreateDataFormatInput {
   schemaLocator: Url
 }
 
-input CreateDatabaseInput {
-  description: String!
-  locator: Url!
-  name: String!
-  operatorId: Uuid!
-}
-
 input CreateInstitutionInput {
   abbreviation: String
   contact: ContactInformationInput
@@ -2614,6 +3234,27 @@ input CreateOpenIdConnectApplicationInput {
   scopes: [OpenIdConnectScope!]!
 }
 
+input DatabaseFilterInput {
+  and: [DatabaseFilterInput!]
+  createdAt: DateTimeFilterInput
+  description: StringFilterInput
+  id: UuidFilterInput
+  locator: UrlFilterInput
+  name: StringFilterInput
+  operator: InstitutionFilterInput
+  or: [DatabaseFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input DatabaseSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  locator: UriSortInput @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
+}
+
 input DataFormatFilterInput {
   and: [DataFormatFilterInput!]
   createdAt: DateTimeFilterInput
@@ -2647,27 +3288,6 @@ input DataPropositionInput {
   resources: GetHttpsResourcesPropositionInput
 }
 
-input DatabaseFilterInput {
-  and: [DatabaseFilterInput!]
-  createdAt: DateTimeFilterInput
-  description: StringFilterInput
-  id: UuidFilterInput
-  locator: UrlFilterInput
-  name: StringFilterInput
-  operator: InstitutionFilterInput
-  or: [DatabaseFilterInput!]
-  updatedAt: DateTimeFilterInput
-}
-
-input DatabaseSortInput {
-  createdAt: SortEnumType @cost(weight: "10")
-  description: SortEnumType @cost(weight: "10")
-  id: SortEnumType @cost(weight: "10")
-  locator: UriSortInput @cost(weight: "10")
-  name: SortEnumType @cost(weight: "10")
-  updatedAt: SortEnumType @cost(weight: "10")
-}
-
 input DateTimeFilterInput {
   equalTo: DateTime @cost(weight: "10")
   greaterThan: DateTime @cost(weight: "10")
@@ -2783,13 +3403,6 @@ input FilterInputTypeOfComponentsFilterInput {
   some: ComponentFilterInput @cost(weight: "10")
 }
 
-input FilterInputTypeOfDataFormatsFilterInput {
-  all: DataFormatFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: DataFormatFilterInput @cost(weight: "10")
-  some: DataFormatFilterInput @cost(weight: "10")
-}
-
 input FilterInputTypeOfDatabasesFilterInput {
   all: DatabaseFilterInput @cost(weight: "10")
   any: Boolean @cost(weight: "10")
@@ -2797,6 +3410,13 @@ input FilterInputTypeOfDatabasesFilterInput {
   some: DatabaseFilterInput @cost(weight: "10")
 }
 
+input FilterInputTypeOfDataFormatsFilterInput {
+  all: DataFormatFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: DataFormatFilterInput @cost(weight: "10")
+  some: DataFormatFilterInput @cost(weight: "10")
+}
+
 input FilterInputTypeOfGnuPgKeyFingerprintsFilterInput {
   all: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
   any: Boolean @cost(weight: "10")
@@ -3681,6 +4301,13 @@ input UpdateComponentInput {
   switchableLayers: DescriptionOrReferenceInput
 }
 
+input UpdateDatabaseInput {
+  databaseId: Uuid!
+  description: String!
+  locator: Url!
+  name: String!
+}
+
 input UpdateDataFormatInput {
   dataFormatId: Uuid!
   description: String!
@@ -3691,13 +4318,6 @@ input UpdateDataFormatInput {
   schemaLocator: Url
 }
 
-input UpdateDatabaseInput {
-  databaseId: Uuid!
-  description: String!
-  locator: Url!
-  name: String!
-}
-
 input UpdateInstitutionInput {
   abbreviation: String
   contact: ContactInformationInput
@@ -3871,110 +4491,108 @@ input VerifyInstitutionInput {
 }
 
 enum AddComponentAssemblyErrorCode {
+  DUPLICATE
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ASSEMBLED_COMPONENT
   UNKNOWN_PART_COMPONENT
-  DUPLICATE
-  UNAUTHORIZED
 }
 
 enum AddComponentGeneralizationErrorCode {
-  UNKNOWN
-  UNKNOWN_GENERAL_COMPONENT
-  UNKNOWN_CONCRETE_COMPONENT
   DUPLICATE
   UNAUTHORIZED
+  UNKNOWN
+  UNKNOWN_CONCRETE_COMPONENT
+  UNKNOWN_GENERAL_COMPONENT
 }
 
 enum AddComponentManufacturerErrorCode {
+  DUPLICATE
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_COMPONENT
   UNKNOWN_INSTITUTION
-  UNAUTHORIZED
-  DUPLICATE
 }
 
 enum AddComponentVariantErrorCode {
+  DUPLICATE
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ONE_COMPONENT
   UNKNOWN_OTHER_COMPONENT
-  DUPLICATE
-  UNAUTHORIZED
 }
 
 enum AddGnuPgKeyFingerprintErrorCode {
-  UNKNOWN
+  DUPLICATE_FINGERPRINT
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_INSTITUTION
-  DUPLICATE_FINGERPRINT
   UNKNOWN_KEY
 }
 
 enum AddInstitutionMethodDeveloperErrorCode {
+  DUPLICATE
+  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_METHOD
   UNKNOWN_INSTITUTION
-  UNAUTHORIZED
-  DUPLICATE
+  UNKNOWN_METHOD
 }
 
 enum AddInstitutionRepresentativeErrorCode {
+  DUPLICATE
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
   UNKNOWN_USER
-  DUPLICATE
-  UNAUTHORIZED
 }
 
 enum AddUserMethodDeveloperErrorCode {
+  DUPLICATE
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_METHOD
   UNKNOWN_USER
-  UNAUTHORIZED
-  DUPLICATE
 }
 
 enum AddUserRoleErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_USER
-  UNAUTHORIZED
 }
 
 enum AllowGnuPgKeyFingerprintErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_FINGERPRINT
 }
 
 "Defines when a policy shall be executed."
 enum ApplyPolicy {
-  "Before the resolver was executed."
-  BEFORE_RESOLVER
   "After the resolver was executed."
   AFTER_RESOLVER
+  "Before the resolver was executed."
+  BEFORE_RESOLVER
   "The policy is applied in the validation step before the execution."
   VALIDATION
 }
 
 enum ChangeInstitutionRepresentativeRoleErrorCode {
+  LAST_OWNER
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
-  UNKNOWN_USER
-  UNAUTHORIZED
   UNKNOWN_REPRESENTATIVE
-  LAST_OWNER
+  UNKNOWN_USER
 }
 
 enum ChangeUserEmailErrorCode {
-  UNKNOWN
-  UNKNOWN_USER
   UNCHANGED_EMAIL
+  UNKNOWN
   UNKNOWN_CURRENT_EMAIL
+  UNKNOWN_USER
 }
 
 enum ChangeUserPasswordErrorCode {
-  UNKNOWN
-  UNKNOWN_USER
   NO_PASSWORD
   PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
@@ -3982,113 +4600,120 @@ enum ChangeUserPasswordErrorCode {
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
+  UNKNOWN
+  UNKNOWN_USER
 }
 
 enum CoatedSide {
-  PRIME
-  NON_PRIME
   BOTH
   NEITHER
-  UNKNOWN
+  NON_PRIME
   NOT_APPLICABLE
+  PRIME
+  UNKNOWN
 }
 
 enum ComponentCategory {
-  MATERIAL
   LAYER
+  MATERIAL
   UNIT
 }
 
 enum ConfirmComponentManufacturerErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_COMPONENT
   UNKNOWN_INSTITUTION
-  UNAUTHORIZED
   UNKNOWN_MANUFACTURER
 }
 
 enum ConfirmInstitutionMethodDeveloperErrorCode {
-  UNKNOWN
-  UNKNOWN_METHOD
-  UNKNOWN_INSTITUTION
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_DEVELOPER
+  UNKNOWN_INSTITUTION
+  UNKNOWN_METHOD
 }
 
 enum ConfirmInstitutionRepresentativeErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
-  UNKNOWN_USER
-  UNAUTHORIZED
   UNKNOWN_REPRESENTATIVE
+  UNKNOWN_USER
 }
 
 enum ConfirmUserEmailChangeErrorCode {
-  UNKNOWN
   DUPLICATE_EMAIL
   INVALID_CONFIRMATION_CODE
+  UNKNOWN
   UNKNOWN_USER
 }
 
 enum ConfirmUserEmailErrorCode {
+  INVALID_CONFIRMATION_CODE
   UNKNOWN
   UNKNOWN_USER
-  INVALID_CONFIRMATION_CODE
 }
 
 enum ConfirmUserMethodDeveloperErrorCode {
+  UNAUTHORIZED
   UNKNOWN
+  UNKNOWN_DEVELOPER
   UNKNOWN_METHOD
   UNKNOWN_USER
-  UNAUTHORIZED
-  UNKNOWN_DEVELOPER
 }
 
 enum CreateComponentErrorCode {
+  AMBIGUOUS_REFERENCE
+  DUPLICATE_COMPONENT_ID
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_MANAGER
   UNKNOWN_MANUFACTURER
+}
+
+enum CreateDatabaseErrorCode {
   UNAUTHORIZED
-  AMBIGUOUS_REFERENCE
-  DUPLICATE_COMPONENT_ID
+  UNKNOWN
+  UNKNOWN_OPERATOR
 }
 
 enum CreateDataFormatErrorCode {
-  UNKNOWN
   TWO_REFERENCES
-  UNKNOWN_MANAGER
   UNAUTHORIZED
-}
-
-enum CreateDatabaseErrorCode {
   UNKNOWN
-  UNAUTHORIZED
-  UNKNOWN_OPERATOR
+  UNKNOWN_MANAGER
 }
 
 enum CreateInstitutionErrorCode {
-  UNKNOWN
+  DUPLICATE_INSTITUTION_ID
   NEITHER_OWNER_NOR_MANAGER
-  UNKNOWN_OWNERS
-  UNKNOWN_MANAGER
   UNAUTHORIZED
-  DUPLICATE_INSTITUTION_ID
+  UNKNOWN
+  UNKNOWN_MANAGER
+  UNKNOWN_OWNERS
 }
 
 enum CreateMethodErrorCode {
-  UNKNOWN
   TWO_REFERENCES
-  UNKNOWN_MANAGER
+  UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_INSTITUTION_DEVELOPERS
+  UNKNOWN_MANAGER
   UNKNOWN_USER_DEVELOPERS
-  UNAUTHORIZED
 }
 
 enum CreateOpenIdConnectApplicationErrorCode {
-  UNKNOWN
+  DUPLICATE_CLIENT_ID
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_INSTITUTION
-  DUPLICATE_CLIENT_ID
+}
+
+enum DatabaseVerificationState {
+  PENDING
+  VERIFIED
 }
 
 enum DataKind {
@@ -4100,41 +4725,36 @@ enum DataKind {
   PHOTOVOLTAIC_DATA
 }
 
-enum DatabaseVerificationState {
-  PENDING
-  VERIFIED
-}
-
 enum DeleteInstitutionErrorCode {
+  MANAGING
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
-  UNAUTHORIZED
-  MANAGING
 }
 
 enum DeleteOpenIdConnectApplicationErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_APPLICATION
 }
 
 enum DeleteOpenIdConnectAuthorizationErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_AUTHORIZATION
 }
 
 enum DeletePersonalUserDataErrorCode {
+  INCORRECT_PASSWORD
+  MISSING_PASSWORD
   UNKNOWN
   UNKNOWN_USER
-  MISSING_PASSWORD
-  INCORRECT_PASSWORD
 }
 
 enum DeleteUserErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_USER
-  UNAUTHORIZED
 }
 
 enum DisableUserTwoFactorAuthenticationErrorCode {
@@ -4143,15 +4763,15 @@ enum DisableUserTwoFactorAuthenticationErrorCode {
 }
 
 enum EnableUserTwoFactorAuthenticatorErrorCode {
-  UNKNOWN
-  UNKNOWN_USER
   ENABLING_FAILED
   INVALID_VERIFICATION_CODE
+  UNKNOWN
+  UNKNOWN_USER
 }
 
 enum ForbidGnuPgKeyFingerprintErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_FINGERPRINT
 }
 
@@ -4161,28 +4781,28 @@ enum ForgetUserTwoFactorAuthenticationClientErrorCode {
 }
 
 enum GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUriErrorCode {
-  UNKNOWN
-  UNKNOWN_USER
-  RESETTING_AUTHENTICATOR_KEY_FAILED
   GETTING_AUTHENTICATOR_KEY_FAILED
   GETTING_EMAIL_FAILED
+  RESETTING_AUTHENTICATOR_KEY_FAILED
+  UNKNOWN
+  UNKNOWN_USER
 }
 
 enum GenerateUserTwoFactorRecoveryCodesErrorCode {
+  CODE_GENERATION_FAILED
+  TWO_FACTOR_AUTHENTICATION_DISABLED
   UNKNOWN
   UNKNOWN_USER
-  TWO_FACTOR_AUTHENTICATION_DISABLED
-  CODE_GENERATION_FAILED
 }
 
 enum InstitutionOperatingState {
-  OPERATING
   NOT_OPERATING
+  OPERATING
 }
 
 enum InstitutionRepresentativeRole {
-  OWNER
   ASSISTANT
+  OWNER
 }
 
 enum InstitutionState {
@@ -4191,14 +4811,14 @@ enum InstitutionState {
 }
 
 enum JsonValueKind {
-  UNDEFINED
-  OBJECT
   ARRAY
-  STRING
-  NUMBER
-  TRUE
   FALSE
   NULL
+  NUMBER
+  OBJECT
+  STRING
+  TRUE
+  UNDEFINED
 }
 
 enum LoginUserErrorCode {
@@ -4209,19 +4829,19 @@ enum LoginUserErrorCode {
 }
 
 enum LoginUserWithRecoveryCodeErrorCode {
+  INVALID_RECOVERY_CODE
+  LOCKED_OUT
+  NOT_ALLOWED
   UNKNOWN
   UNKNOWN_USER
-  NOT_ALLOWED
-  LOCKED_OUT
-  INVALID_RECOVERY_CODE
 }
 
 enum LoginUserWithTwoFactorCodeErrorCode {
+  INVALID_AUTHENTICATOR_CODE
+  LOCKED_OUT
+  NOT_ALLOWED
   UNKNOWN
   UNKNOWN_USER
-  NOT_ALLOWED
-  LOCKED_OUT
-  INVALID_AUTHENTICATOR_CODE
 }
 
 enum LogoutUserErrorCode {
@@ -4229,8 +4849,8 @@ enum LogoutUserErrorCode {
 }
 
 enum MethodCategory {
-  MEASUREMENT
   CALCULATION
+  MEASUREMENT
 }
 
 enum OpenIdConnectConsentType {
@@ -4266,44 +4886,44 @@ enum OpenIdConnectResponseType {
 
 enum OpenIdConnectScope {
   ADDRESS
-  EMAIL
-  PHONE
-  PROFILE
-  ROLES
-  READ_API
-  WRITE_API
   ADMINISTRATE_API
-  VERIFY_API
+  EMAIL
   MANAGE_DATABASE_API
   MANAGE_GNU_PG_API
   MANAGE_INSTITUTION_REPRESENTATIVE_API
   MANAGE_OPEN_ID_CONNECT_API
   MANAGE_USER_API
+  PHONE
+  PROFILE
+  READ_API
+  ROLES
+  VERIFY_API
+  WRITE_API
 }
 
 enum OpticalComponentSubtype {
-  MONOLITHIC
-  LAMINATE
-  INTERLAYER
-  EMBEDDED_COATING
+  ACID_ETCHED_GLASS
+  APPLIED_FILM
+  CELLULAR_SHADE
+  CHROMOGENIC
   COATED
   COATING
-  APPLIED_FILM
-  FILM
-  VENETIAN_BLIND
   DIFFUSING_SHADE
-  ROLLER_SHADE
-  WOVEN_SHADE
-  VERTICAL_LOUVER
+  EMBEDDED_COATING
+  FILM
+  FRITTED_GLASS
+  INTERLAYER
+  LAMINATE
+  MONOLITHIC
   PERFORATED_SCREEN
-  CELLULAR_SHADE
   PLEATED_SHADE
+  ROLLER_SHADE
   ROMAN_SHADE
-  SHADE_MATERIAL
-  FRITTED_GLASS
-  ACID_ETCHED_GLASS
   SANDBLASTED_GLASS
-  CHROMOGENIC
+  SHADE_MATERIAL
+  VENETIAN_BLIND
+  VERTICAL_LOUVER
+  WOVEN_SHADE
 }
 
 enum OpticalComponentType {
@@ -4317,80 +4937,80 @@ enum PrimeSurface {
 }
 
 enum RegisterUserErrorCode {
-  UNKNOWN
-  PASSWORD_CONFIRMATION_MISMATCH
   DUPLICATE_EMAIL
   INVALID_EMAIL
+  NULL_OR_EMPTY_EMAIL
+  PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
   PASSWORD_REQUIRES_LOWER
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
-  NULL_OR_EMPTY_EMAIL
+  UNKNOWN
 }
 
 enum RemoveComponentAssemblyErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ASSEMBLED_COMPONENT
-  UNKNOWN_PART_COMPONENT
   UNKNOWN_ASSEMBLY
-  UNAUTHORIZED
+  UNKNOWN_PART_COMPONENT
 }
 
 enum RemoveComponentGeneralizationErrorCode {
+  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_GENERAL_COMPONENT
   UNKNOWN_CONCRETE_COMPONENT
+  UNKNOWN_GENERAL_COMPONENT
   UNKNOWN_GENERALIZATION
-  UNAUTHORIZED
 }
 
 enum RemoveComponentManufacturerErrorCode {
+  LAST_MANUFACTURER
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_COMPONENT
   UNKNOWN_INSTITUTION
-  UNAUTHORIZED
   UNKNOWN_MANUFACTURER
-  LAST_MANUFACTURER
 }
 
 enum RemoveComponentVariantErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ONE_COMPONENT
   UNKNOWN_OTHER_COMPONENT
   UNKNOWN_VARIANT
-  UNAUTHORIZED
 }
 
 enum RemoveInstitutionMethodDeveloperErrorCode {
-  UNKNOWN
-  UNKNOWN_METHOD
-  UNKNOWN_INSTITUTION
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_DEVELOPER
+  UNKNOWN_INSTITUTION
+  UNKNOWN_METHOD
 }
 
 enum RemoveInstitutionRepresentativeErrorCode {
-  UNKNOWN
   LAST_OWNER
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_INSTITUTION
   UNKNOWN_REPRESENTATIVE
   UNKNOWN_USER
 }
 
 enum RemoveUserMethodDeveloperErrorCode {
+  UNAUTHORIZED
   UNKNOWN
+  UNKNOWN_DEVELOPER
   UNKNOWN_METHOD
   UNKNOWN_USER
-  UNAUTHORIZED
-  UNKNOWN_DEVELOPER
 }
 
 enum RemoveUserRoleErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_USER
-  UNAUTHORIZED
 }
 
 enum RequestUserPasswordResetErrorCode {
@@ -4403,18 +5023,17 @@ enum ResendUserEmailConfirmationErrorCode {
 
 enum ResendUserEmailVerificationErrorCode {
   UNKNOWN
-  UNKNOWN_USER
   UNKNOWN_EMAIL
+  UNKNOWN_USER
 }
 
 enum ResetOpenIdConnectApplicationClientSecretErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_APPLICATION
 }
 
 enum ResetUserPasswordErrorCode {
-  UNKNOWN
   INVALID_RESET_CODE
   PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
@@ -4422,37 +5041,36 @@ enum ResetUserPasswordErrorCode {
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
+  UNKNOWN
 }
 
 enum ResetUserTwoFactorAuthenticatorErrorCode {
-  UNKNOWN
-  UNKNOWN_USER
   DISABLING_FAILED
   RESETTING_FAILED
+  UNKNOWN
+  UNKNOWN_USER
 }
 
 enum RevokeOpenIdConnectTokenErrorCode {
-  UNKNOWN
+  FAILED
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_TOKEN
-  FAILED
 }
 
 enum SetComponentExtrasErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_COMPONENT
 }
 
 enum SetInstitutionExtrasErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_INSTITUTION
 }
 
 enum SetUserPasswordErrorCode {
-  UNKNOWN
-  UNKNOWN_USER
   EXISTING_PASSWORD
   PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
@@ -4460,12 +5078,14 @@ enum SetUserPasswordErrorCode {
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
+  UNKNOWN
+  UNKNOWN_USER
 }
 
 enum SetUserPhoneNumberErrorCode {
+  UNCHANGED_PHONE_NUMBER
   UNKNOWN
   UNKNOWN_USER
-  UNCHANGED_PHONE_NUMBER
 }
 
 enum SortEnumType {
@@ -4501,56 +5121,56 @@ enum Standardizer {
 }
 
 enum SwitchInstitutionOperatingStateErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
-  UNAUTHORIZED
 }
 
 enum UpdateComponentAssemblyErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ASSEMBLED_COMPONENT
-  UNKNOWN_PART_COMPONENT
   UNKNOWN_ASSEMBLY
-  UNAUTHORIZED
+  UNKNOWN_PART_COMPONENT
 }
 
 enum UpdateComponentErrorCode {
-  UNKNOWN
+  AMBIGUOUS_REFERENCE
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_COMPONENT
   UNKNOWN_MANUFACTURER
-  AMBIGUOUS_REFERENCE
 }
 
-enum UpdateDataFormatErrorCode {
-  UNKNOWN
-  TWO_REFERENCES
+enum UpdateDatabaseErrorCode {
   UNAUTHORIZED
-  UNKNOWN_DATA_FORMAT
+  UNKNOWN
+  UNKNOWN_DATABASE
 }
 
-enum UpdateDatabaseErrorCode {
-  UNKNOWN
+enum UpdateDataFormatErrorCode {
+  TWO_REFERENCES
   UNAUTHORIZED
-  UNKNOWN_DATABASE
+  UNKNOWN
+  UNKNOWN_DATA_FORMAT
 }
 
 enum UpdateInstitutionErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_INSTITUTION
 }
 
 enum UpdateMethodErrorCode {
-  UNKNOWN
   TWO_REFERENCES
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_METHOD
 }
 
 enum UpdateOpenIdConnectApplicationErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_APPLICATION
 }
 
@@ -4560,71 +5180,100 @@ enum UserRole {
 }
 
 enum VerifyDatabaseErrorCode {
-  UNKNOWN
+  DESERIALIZATION_FAILED
+  REQUEST_FAILED
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_DATABASE
   WRONG_VERIFICATION_CODE
-  REQUEST_FAILED
-  DESERIALIZATION_FAILED
 }
 
 enum VerifyInstitutionErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
-  UNAUTHORIZED
 }
 
-"The authorize directive."
-directive @authorize("Defines when the authorize directive shall be applied. By default the authorize directive is applied before the resolver is executed." apply: ApplyPolicy! = BEFORE_RESOLVER "The name of the authorization policy that determines access to the annotated resource." policy: String "Roles that are allowed to access the annotated resource." roles: [String!]) repeatable on OBJECT | FIELD_DEFINITION
-
-"The purpose of the `cost` directive is to define a `weight` for GraphQL types, fields, and arguments. Static analysis can use these weights when calculating the overall cost of a query or response."
-directive @cost("The `weight` argument defines what value to add to the overall cost for every appearance, or possible appearance, of a type, field, argument, etc." weight: String!) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM | INPUT_FIELD_DEFINITION
-
-"The purpose of the `@listSize` directive is to either inform the static analysis about the size of returned lists (if that information is statically available), or to point the analysis to where to find that information."
-directive @listSize("The `assumedSize` argument can be used to statically define the maximum length of a list returned by a field." assumedSize: Int "The `requireOneSlicingArgument` argument can be used to inform the static analysis that it should expect that exactly one of the defined slicing arguments is present in a query. If that is not the case (i.e., if none or multiple slicing arguments are present), the static analysis may throw an error." requireOneSlicingArgument: Boolean = true "The `sizedFields` argument can be used to define that the value of the `assumedSize` argument or of a slicing argument does not affect the size of a list returned by a field itself, but that of a list returned by one of its sub-fields." sizedFields: [String!] "The `slicingArgumentDefaultValue` argument can be used to define a default value for a slicing argument, which is used if the argument is not present in a query." slicingArgumentDefaultValue: Int "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments." slicingArguments: [String!]) on FIELD_DEFINITION
-
-"The `@specifiedBy` directive is used within the type system definition language to provide a URL for specifying the behavior of custom scalar definitions."
-directive @specifiedBy("The specifiedBy URL points to a human-readable specification. This field will only read a result for scalar types." url: String!) on SCALAR
-
 scalar Any @specifiedBy(url: "https://scalars.graphql.org/chillicream/any.html")
 
 "The `Byte` scalar type represents a signed 8-bit integer."
-scalar Byte @specifiedBy(url: "https://scalars.graphql.org/chillicream/byte.html")
+scalar Byte
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/byte.html")
 
 "The `DateTime` scalar type represents a date and time with time zone offset information."
-scalar DateTime @specifiedBy(url: "https://scalars.graphql.org/chillicream/date-time.html")
+scalar DateTime
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/date-time.html")
 
 "The `Decimal` scalar type represents a decimal floating-point number with high precision."
-scalar Decimal @specifiedBy(url: "https://scalars.graphql.org/chillicream/decimal.html")
+scalar Decimal
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/decimal.html")
 
 "The `Duration` scalar type represents a duration of time."
-scalar Duration @specifiedBy(url: "https://scalars.graphql.org/chillicream/duration.html")
+scalar Duration
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/duration.html")
 
 "The `LocalDate` scalar type represents a date without time or time zone information."
-scalar LocalDate @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-date.html")
+scalar LocalDate
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-date.html")
 
 "The `LocalDateTime` scalar type represents a date and time without time zone information."
-scalar LocalDateTime @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-date-time.html")
-
-"The `LocalTime` scalar type represents a time of day without date or time zone information."
-scalar LocalTime @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-time.html")
+scalar LocalDateTime
+  @specifiedBy(
+    url: "https://scalars.graphql.org/chillicream/local-date-time.html"
+  )
 
 "BCP 47 compliant Language Tag string"
 scalar Locale
 
+"The `LocalTime` scalar type represents a time of day without date or time zone information."
+scalar LocalTime
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-time.html")
+
 "The `Long` scalar type represents a signed 64-bit integer."
-scalar Long @specifiedBy(url: "https://scalars.graphql.org/chillicream/long.html")
+scalar Long
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/long.html")
 
 "The `NonNegativeInt` scalar type represents an unsigned 32-bit numeric non-fractional value."
 scalar NonNegativeInt
 
 "The `Short` scalar type represents a signed 16-bit integer."
-scalar Short @specifiedBy(url: "https://scalars.graphql.org/chillicream/short.html")
+scalar Short
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/short.html")
 
 "The `UnsignedByte` scalar type represents an unsigned 8-bit integer."
-scalar UnsignedByte @specifiedBy(url: "https://scalars.graphql.org/chillicream/unsigned-byte.html")
+scalar UnsignedByte
+  @specifiedBy(
+    url: "https://scalars.graphql.org/chillicream/unsigned-byte.html"
+  )
 
 "The `Url` scalar type represents a Uniform Resource Identifier (URI) as defined by RFC 3986."
 scalar Url @specifiedBy(url: "https://tools.ietf.org/html/rfc3986")
 
-scalar Uuid @specifiedBy(url: "https://scalars.graphql.org/chillicream/uuid.html")
\ No newline at end of file
+scalar Uuid
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/uuid.html")
+
+"The purpose of the `cost` directive is to define a `weight` for GraphQL types, fields, and arguments. Static analysis can use these weights when calculating the overall cost of a query or response."
+directive @cost(
+  "The `weight` argument defines what value to add to the overall cost for every appearance, or possible appearance, of a type, field, argument, etc."
+  weight: String!
+) on
+  | SCALAR
+  | OBJECT
+  | FIELD_DEFINITION
+  | ARGUMENT_DEFINITION
+  | ENUM
+  | INPUT_FIELD_DEFINITION
+
+"The purpose of the `@listSize` directive is to either inform the static analysis about the size of returned lists (if that information is statically available), or to point the analysis to where to find that information."
+directive @listSize(
+  "The `assumedSize` argument can be used to statically define the maximum length of a list returned by a field."
+  assumedSize: Int
+  "The `requireOneSlicingArgument` argument can be used to inform the static analysis that it should expect that exactly one of the defined slicing arguments is present in a query. If that is not the case (i.e., if none or multiple slicing arguments are present), the static analysis may throw an error."
+  requireOneSlicingArgument: Boolean = true
+  "The `sizedFields` argument can be used to define that the value of the `assumedSize` argument or of a slicing argument does not affect the size of a list returned by a field itself, but that of a list returned by one of its sub-fields."
+  sizedFields: [String!]
+  "The `slicingArgumentDefaultValue` argument can be used to define a default value for a slicing argument, which is used if the argument is not present in a query."
+  slicingArgumentDefaultValue: Int
+  "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments."
+  slicingArguments: [String!]
+) on FIELD_DEFINITION
\ No newline at end of file
diff --git a/frontend/components/ActiveFilterAndSortBar.tsx b/frontend/components/ActiveFilterAndSortBar.tsx
index 1f393d0e2..8b0af10b2 100644
--- a/frontend/components/ActiveFilterAndSortBar.tsx
+++ b/frontend/components/ActiveFilterAndSortBar.tsx
@@ -93,7 +93,9 @@ export default function ActiveFilterAndSortBar<TFilterInput, TSortInput>({
                 color="green"
                 closable
                 closeIcon={
-                  <DeleteButton type="icon" kind="remove" title="Remove" />
+                  <DeleteButton type="icon" kind="remove">
+                    Remove
+                  </DeleteButton>
                 }
                 key={stringifyFilter(filter, filterDefinitions)}
                 onClose={() => onRemoveFilter(index)}
@@ -121,7 +123,9 @@ export default function ActiveFilterAndSortBar<TFilterInput, TSortInput>({
         )}
       </Space>
       {(values.filters.length > 0 || values.sorts.length > 0) && (
-        <DeleteButton title="Remove All" type="text" onClick={onRemoveAll} />
+        <DeleteButton type="text" onClick={onRemoveAll}>
+          Remove All
+        </DeleteButton>
       )}
     </Flex>
   );
diff --git a/frontend/components/CielabColorViewer.tsx b/frontend/components/CielabColorViewer.tsx
index 272d5f4ff..7c576e8fa 100644
--- a/frontend/components/CielabColorViewer.tsx
+++ b/frontend/components/CielabColorViewer.tsx
@@ -3,7 +3,13 @@ import { CielabColor } from "../__generated__/graphql";
 
 export default function CielabColorViewer({ value }: { value: CielabColor }) {
   return (
-    <Copyable onlyIcon text={JSON.stringify(value)}>
+    <Copyable
+      onlyIcon
+      text={JSON.stringify(value, (key, value) => {
+        if (key === "__typename") return undefined;
+        return value;
+      })}
+    >
       L*={value.lStar}, a*={value.aStar}, b*={value.bStar}
     </Copyable>
   );
diff --git a/frontend/components/CopyButton.tsx b/frontend/components/CopyButton.tsx
index 3cbc231cf..952d734e8 100644
--- a/frontend/components/CopyButton.tsx
+++ b/frontend/components/CopyButton.tsx
@@ -26,7 +26,13 @@ export default function CopyButton({
       <Button
         type={type}
         size={size}
-        icon={copied ? <CheckOutlined /> : copyIcon}
+        icon={
+          copied ? (
+            <CheckOutlined style={{ color: color }} />
+          ) : (
+            <span style={{ color: color }}>{copyIcon}</span>
+          )
+        }
         onClick={() => {
           navigator.clipboard.writeText(getText());
           setCopied(true);
@@ -38,7 +44,13 @@ export default function CopyButton({
     <Button
       type={type}
       size={size}
-      icon={copied ? <CheckOutlined /> : copyIcon}
+      icon={
+        copied ? (
+          <CheckOutlined style={{ color: color }} />
+        ) : (
+          <span style={{ color: color }}>{copyIcon}</span>
+        )
+      }
       color="danger"
       onClick={() => {
         navigator.clipboard.writeText(getText());
diff --git a/frontend/components/CopyableBlock.tsx b/frontend/components/CopyableBlock.tsx
index 745e5ad46..97d7d1702 100644
--- a/frontend/components/CopyableBlock.tsx
+++ b/frontend/components/CopyableBlock.tsx
@@ -15,8 +15,8 @@ export default function CopyableBlock({
     <div
       style={{
         position: "relative",
-        paddingBottom: "1em",
-        borderBottom: "1px solid grey",
+        // paddingBottom: "1.5em",
+        // borderBottom: "1px solid grey",
       }}
     >
       {children}
diff --git a/frontend/components/DeleteButton.tsx b/frontend/components/DeleteButton.tsx
index 0a923d81c..d38c06d0e 100644
--- a/frontend/components/DeleteButton.tsx
+++ b/frontend/components/DeleteButton.tsx
@@ -4,12 +4,12 @@ import { capitalize } from "../lib/string";
 import { CSSProperties, forwardRef } from "react";
 
 interface DeleteButtonProps {
-  title?: React.ReactNode;
   kind?: "delete" | "remove";
   type?: "primary" | "text" | "default" | "icon";
   deleting?: boolean;
   style?: CSSProperties;
   onClick?: (e?: React.MouseEvent<HTMLElement>) => void;
+  children?: React.ReactNode;
   // This allows Popconfirm to inject its internal event handlers
   [key: string]: any;
 }
@@ -17,17 +17,17 @@ interface DeleteButtonProps {
 const DeleteButton = forwardRef<HTMLButtonElement, DeleteButtonProps>(
   (
     {
-      title,
       kind = "delete",
       type = "primary",
       deleting = false,
       style,
       onClick,
+      children,
       ...rest
     },
     ref,
   ) => {
-    const theTitle = title ?? capitalize(kind);
+    const label = children ?? capitalize(kind);
 
     const commonProps = {
       ...rest, // contains Popconfirm's events
@@ -41,7 +41,7 @@ const DeleteButton = forwardRef<HTMLButtonElement, DeleteButtonProps>(
     switch (type) {
       case "icon":
         return (
-          <Tooltip title={theTitle}>
+          <Tooltip title={label}>
             <Button
               {...commonProps}
               type="text"
@@ -53,7 +53,7 @@ const DeleteButton = forwardRef<HTMLButtonElement, DeleteButtonProps>(
       default:
         return (
           <Button {...commonProps} type={type} icon={<DeleteOutlined />}>
-            {theTitle}
+            {label}
           </Button>
         );
     }
diff --git a/frontend/components/GnuPgKeyLink.tsx b/frontend/components/GnuPgKeyLink.tsx
new file mode 100644
index 000000000..a4f787d37
--- /dev/null
+++ b/frontend/components/GnuPgKeyLink.tsx
@@ -0,0 +1,20 @@
+import Link from "next/link";
+import Copyable from "./Copyable";
+import paths from "../paths";
+import CopyableBlock from "./CopyableBlock";
+
+export default function GnuPgKeyLink({
+  fingerprint,
+  block = false,
+}: {
+  fingerprint: string;
+  block?: boolean;
+}) {
+  const link = <Link href={paths.gnuPgKey(fingerprint)}>{fingerprint}</Link>;
+
+  return block ? (
+    <CopyableBlock text={fingerprint}>{link}</CopyableBlock>
+  ) : (
+    <Copyable text={fingerprint}>{link}</Copyable>
+  );
+}
diff --git a/frontend/components/InlineList.tsx b/frontend/components/InlineList.tsx
index 0063081c6..e6542433b 100644
--- a/frontend/components/InlineList.tsx
+++ b/frontend/components/InlineList.tsx
@@ -1,3 +1,5 @@
+import { Fragment } from "react/jsx-runtime";
+
 export default function InlineList<TItem>({
   items,
   renderItem,
@@ -7,15 +9,26 @@ export default function InlineList<TItem>({
 }) {
   return (
     <>
-      <style>{`
-        .inline-list {
-          & > *:not(:last-child)::after { content: ", "; }
-          & > *:first-child:nth-last-child(2)::after { content: " and "; }
-          & > *:nth-last-child(2):not(:first-child)::after { content: ", and "; }
-        }
-      `}</style>
+      {/* <style>{` */}
+      {/*   .inline-list { */}
+      {/*     & > *:not(:last-child)::after { content: ", "; } */}
+      {/*     & > *:first-child:nth-last-child(2)::after { content: " and "; } */}
+      {/*     & > *:nth-last-child(2):not(:first-child)::after { content: ", and "; } */}
+      {/*   } */}
+      {/* `}</style> */}
       <span className="inline-list">
-        {items.map((item, index) => renderItem(item, index))}
+        {items.map((item, index) => {
+          const isLast = index === items.length - 1;
+          const isSecondToLast = index === items.length - 2;
+          const isOnlyTwo = items.length === 2;
+          return (
+            <Fragment key={index}>
+              {renderItem(item, index)}
+              {!isLast &&
+                (isSecondToLast ? (isOnlyTwo ? " and " : ", and ") : ", ")}
+            </Fragment>
+          );
+        })}
       </span>
     </>
   );
diff --git a/frontend/components/JumpToId.tsx b/frontend/components/JumpToId.tsx
index 71041df52..0121e167a 100644
--- a/frontend/components/JumpToId.tsx
+++ b/frontend/components/JumpToId.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { CSSProperties, useState } from "react";
 import { Button, Input, Space } from "antd";
 import { useRouter } from "next/router";
 import { Scalars } from "../__generated__/graphql";
@@ -8,9 +8,10 @@ import PaginatedIdSelect, { PaginatedSelectProps } from "./PaginatedIdSelect";
 export type JumpToIdProps = {
   query?: PaginatedSelectProps["query"];
   route: (id: Scalars["Uuid"]["output"]) => Route;
+  style?: CSSProperties;
 };
 
-export default function JumpToId({ query, route }: JumpToIdProps) {
+export default function JumpToId({ query, route, style }: JumpToIdProps) {
   const router = useRouter();
   const [id, setId] = useState("");
 
@@ -27,13 +28,13 @@ export default function JumpToId({ query, route }: JumpToIdProps) {
         <PaginatedIdSelect
           value={id}
           query={query}
-          style={{ minWidth: "66ch" }}
+          style={{ minWidth: "66ch", ...style }}
           onChange={setId}
         />
       ) : (
         <Input
           placeholder="ID"
-          style={{ fontFamily: "monospace", width: "66ch" }}
+          style={{ fontFamily: "monospace", minWidth: "66ch", ...style }}
           maxLength={36}
           value={id}
           onChange={(e) => setId(e.target.value)}
diff --git a/frontend/components/NewButton.tsx b/frontend/components/NewButton.tsx
new file mode 100644
index 000000000..9f9b59a3d
--- /dev/null
+++ b/frontend/components/NewButton.tsx
@@ -0,0 +1,32 @@
+import { FormOutlined } from "@ant-design/icons";
+import { Button, Tooltip } from "antd";
+
+export default function NewButton({
+  type = "default",
+  onClick,
+  children,
+}: {
+  type?: "text" | "default" | "icon";
+  onClick?: (e?: React.MouseEvent<HTMLElement>) => void;
+  children?: React.ReactNode;
+}) {
+  switch (type) {
+    case "icon":
+      return (
+        <Tooltip title="New">
+          <Button
+            type="text"
+            icon={<FormOutlined />}
+            shape="circle"
+            onClick={onClick}
+          />
+        </Tooltip>
+      );
+    default:
+      return (
+        <Button type="default" onClick={onClick}>
+          New {children}
+        </Button>
+      );
+  }
+}
diff --git a/frontend/components/SafeDeleteButton.tsx b/frontend/components/SafeDeleteButton.tsx
index ca2b370ea..e6e37809b 100644
--- a/frontend/components/SafeDeleteButton.tsx
+++ b/frontend/components/SafeDeleteButton.tsx
@@ -4,38 +4,34 @@ import { capitalize } from "../lib/string";
 import { CSSProperties } from "react";
 
 export default function SafeDeleteButton({
-  title,
   kind = "delete",
   type = "primary",
   deleting = false,
   style,
   onConfirm,
+  children,
 }: {
-  title?: React.ReactNode;
   kind?: "delete" | "remove";
-  type?: "primary" | "icon";
+  type?: "primary" | "default" | "icon";
   deleting?: boolean;
   style?: CSSProperties;
   onConfirm: (e?: React.MouseEvent<HTMLElement>) => void;
+  children?: React.ReactNode;
 }) {
-  const theTitle = title ?? capitalize(kind);
+  const label = children ?? capitalize(kind);
 
   return (
     <Popconfirm
-      title={theTitle}
+      title={label}
       description="Are you sure?"
       okText="Yes"
       cancelText="No"
       okButtonProps={{ danger: true }}
       onConfirm={onConfirm}
     >
-      <DeleteButton
-        title={theTitle}
-        kind={kind}
-        type={type}
-        deleting={deleting}
-        style={style}
-      />
+      <DeleteButton kind={kind} type={type} deleting={deleting} style={style}>
+        {children}
+      </DeleteButton>
     </Popconfirm>
   );
 }
diff --git a/frontend/components/components/ComponentSummary.tsx b/frontend/components/components/ComponentSummary.tsx
index d817017da..efb3d0613 100644
--- a/frontend/components/components/ComponentSummary.tsx
+++ b/frontend/components/components/ComponentSummary.tsx
@@ -31,13 +31,14 @@ const renderManufacturerList = (
     | NonNullable<ComponentPartialFragment["manufacturers"]>
     | NonNullable<ComponentPartialFragment["pendingManufacturers"]>,
   componentId: Scalars["Uuid"]["output"],
+  hideExtra: boolean | undefined,
 ) => (
   <InlineList
     items={manufacturers.edges}
     renderItem={(edge) => (
       <span key={edge.node.id}>
         <EntityLink entity={edge.node} route={paths.institution} />{" "}
-        {edge.isAuthorizedToRemoveEdge && (
+        {!hideExtra && edge.isAuthorizedToRemoveEdge && (
           <RemoveComponentManufacturer
             componentId={componentId}
             institutionId={edge.node.uuid}
@@ -50,8 +51,10 @@ const renderManufacturerList = (
 
 export default function ComponentSummary({
   entity,
+  hideExtra = false,
 }: {
   entity: ComponentsPartialFragment | ComponentPartialFragment;
+  hideExtra?: boolean;
 }) {
   return (
     <EntitySummary
@@ -60,12 +63,15 @@ export default function ComponentSummary({
       tags={entity.categories.map((x) => (
         <EnumTag>{x}</EnumTag>
       ))}
-      extra={[
-        "isAuthorizedToUpdateNode" in entity &&
-          entity.isAuthorizedToUpdateNode && (
-            <UpdateComponent key="UpdateComponent" component={entity} />
-          ),
-      ].filter(isTruthy)}
+      extra={
+        !hideExtra &&
+        [
+          "isAuthorizedToUpdateNode" in entity &&
+            entity.isAuthorizedToUpdateNode && (
+              <UpdateComponent key="UpdateComponent" component={entity} />
+            ),
+        ].filter(isTruthy)
+      }
     >
       {(entity.availability?.from || entity.availability?.to) && (
         <div>
@@ -76,7 +82,11 @@ export default function ComponentSummary({
         Manufactured by{" "}
         {"pendingManufacturers" in entity ? (
           <>
-            {renderManufacturerList(entity.manufacturers, entity.uuid)}
+            {renderManufacturerList(
+              entity.manufacturers,
+              entity.uuid,
+              hideExtra,
+            )}
             {entity.pendingManufacturers &&
               entity.pendingManufacturers.edges.length > 0 && (
                 <>
@@ -84,10 +94,11 @@ export default function ComponentSummary({
                   {renderManufacturerList(
                     entity.pendingManufacturers,
                     entity.uuid,
+                    hideExtra,
                   )}
                 </>
               )}
-            {entity.manufacturers.isAuthorizedToAddEdge && (
+            {!hideExtra && entity.manufacturers.isAuthorizedToAddEdge && (
               <AddComponentManufacturer componentId={entity.uuid} />
             )}
           </>
@@ -104,7 +115,7 @@ export default function ComponentSummary({
       </div>
       {"assembledOf" in entity &&
         (entity.assembledOf.edges.length > 0 ||
-          entity.assembledOf.isAuthorizedToAddEdge) && (
+          (!hideExtra && entity.assembledOf.isAuthorizedToAddEdge)) && (
           <div>
             Assembled of{" "}
             <InlineList
@@ -118,7 +129,7 @@ export default function ComponentSummary({
                       Prime Surface "{edge.primeSurface}"
                     </Tag>
                   )}
-                  {edge.isAuthorizedToUpdateEdge && (
+                  {!hideExtra && edge.isAuthorizedToUpdateEdge && (
                     <UpdateComponentAssembly
                       assembledComponent={{
                         uuid: entity.uuid,
@@ -132,7 +143,7 @@ export default function ComponentSummary({
                       primeSurface={edge.primeSurface}
                     />
                   )}
-                  {edge.isAuthorizedToRemoveEdge && (
+                  {!hideExtra && edge.isAuthorizedToRemoveEdge && (
                     <RemoveComponentAssembly
                       assembledComponentId={entity.uuid}
                       partComponentId={edge.node.uuid}
@@ -141,14 +152,14 @@ export default function ComponentSummary({
                 </span>
               )}
             />
-            {entity.assembledOf.isAuthorizedToAddEdge && (
+            {!hideExtra && entity.assembledOf.isAuthorizedToAddEdge && (
               <AddPartOfComponent assembledComponentId={entity.uuid} />
             )}
           </div>
         )}
       {"partOf" in entity &&
         (entity.partOf.edges.length > 0 ||
-          entity.partOf.isAuthorizedToAddEdge) && (
+          (!hideExtra && entity.partOf.isAuthorizedToAddEdge)) && (
           <div>
             Part of{" "}
             <InlineList
@@ -168,7 +179,7 @@ export default function ComponentSummary({
                       )}
                     </span>
                   </Space>
-                  {edge.isAuthorizedToUpdateEdge && (
+                  {!hideExtra && edge.isAuthorizedToUpdateEdge && (
                     <UpdateComponentAssembly
                       assembledComponent={{
                         uuid: edge.node.uuid,
@@ -182,7 +193,7 @@ export default function ComponentSummary({
                       primeSurface={edge.primeSurface}
                     />
                   )}
-                  {edge.isAuthorizedToRemoveEdge && (
+                  {!hideExtra && edge.isAuthorizedToRemoveEdge && (
                     <RemoveComponentAssembly
                       assembledComponentId={edge.node.uuid}
                       partComponentId={entity.uuid}
@@ -191,14 +202,14 @@ export default function ComponentSummary({
                 </span>
               )}
             />
-            {entity.partOf.isAuthorizedToAddEdge && (
+            {!hideExtra && entity.partOf.isAuthorizedToAddEdge && (
               <AddAssembledOfComponent partComponentId={entity.uuid} />
             )}
           </div>
         )}
       {"variantOf" in entity &&
         (entity.variantOf.edges.length > 0 ||
-          entity.variantOf.isAuthorizedToAddEdge) && (
+          (!hideExtra && entity.variantOf.isAuthorizedToAddEdge)) && (
           <div>
             Variant of{" "}
             <InlineList
@@ -206,7 +217,7 @@ export default function ComponentSummary({
               renderItem={(edge) => (
                 <span key={edge.node.id}>
                   <EntityLink entity={edge.node} route={paths.component} />{" "}
-                  {edge.isAuthorizedToRemoveEdge && (
+                  {!hideExtra && edge.isAuthorizedToRemoveEdge && (
                     <RemoveComponentVariant
                       oneComponentId={entity.uuid}
                       otherComponentId={edge.node.uuid}
@@ -215,14 +226,14 @@ export default function ComponentSummary({
                 </span>
               )}
             />
-            {entity.variantOf.isAuthorizedToAddEdge && (
+            {!hideExtra && entity.variantOf.isAuthorizedToAddEdge && (
               <AddVariantOfComponent componentId={entity.uuid} />
             )}
           </div>
         )}
       {"generalizationOf" in entity &&
         (entity.generalizationOf.edges.length > 0 ||
-          entity.generalizationOf.isAuthorizedToAddEdge) && (
+          (!hideExtra && entity.generalizationOf.isAuthorizedToAddEdge)) && (
           <div>
             Generalization of{" "}
             <InlineList
@@ -230,7 +241,7 @@ export default function ComponentSummary({
               renderItem={(edge) => (
                 <span key={edge.node.id}>
                   <EntityLink entity={edge.node} route={paths.component} />{" "}
-                  {edge.isAuthorizedToRemoveEdge && (
+                  {!hideExtra && edge.isAuthorizedToRemoveEdge && (
                     <RemoveComponentGeneralization
                       generalComponentId={entity.uuid}
                       concreteComponentId={edge.node.uuid}
@@ -239,14 +250,14 @@ export default function ComponentSummary({
                 </span>
               )}
             />
-            {entity.generalizationOf.isAuthorizedToAddEdge && (
+            {!hideExtra && entity.generalizationOf.isAuthorizedToAddEdge && (
               <AddConcretizationOfComponent generalComponentId={entity.uuid} />
             )}
           </div>
         )}
       {"concretizationOf" in entity &&
         (entity.concretizationOf.edges.length > 0 ||
-          entity.concretizationOf.isAuthorizedToAddEdge) && (
+          (!hideExtra && entity.concretizationOf.isAuthorizedToAddEdge)) && (
           <div>
             Concretization of{" "}
             <InlineList
@@ -254,7 +265,7 @@ export default function ComponentSummary({
               renderItem={(edge) => (
                 <span key={edge.node.id}>
                   <EntityLink entity={edge.node} route={paths.component} />{" "}
-                  {edge.isAuthorizedToRemoveEdge && (
+                  {!hideExtra && edge.isAuthorizedToRemoveEdge && (
                     <RemoveComponentGeneralization
                       generalComponentId={edge.node.uuid}
                       concreteComponentId={entity.uuid}
@@ -263,7 +274,7 @@ export default function ComponentSummary({
                 </span>
               )}
             />
-            {entity.concretizationOf.isAuthorizedToAddEdge && (
+            {!hideExtra && entity.concretizationOf.isAuthorizedToAddEdge && (
               <AddGeneralizationOfComponent concreteComponentId={entity.uuid} />
             )}
           </div>
diff --git a/frontend/components/components/CreateComponent.tsx b/frontend/components/components/CreateComponent.tsx
index 0dd83113b..618326d25 100644
--- a/frontend/components/components/CreateComponent.tsx
+++ b/frontend/components/components/CreateComponent.tsx
@@ -7,7 +7,7 @@ import {
   Button,
   Divider,
   App,
-  Typography,
+  Modal,
 } from "antd";
 import {
   CreateComponentDocument,
@@ -27,11 +27,8 @@ import { InstitutionIdSelect } from "../institutions/InstitutionIdSelect";
 import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
-import Link from "next/link";
-import paths from "../../paths";
-import { pluralize, pluralizeIrregular } from "../../lib/array";
-import Copyable from "../Copyable";
-import Id from "../Id";
+import NewButton from "../NewButton";
+import ComponentSummary from "./ComponentSummary";
 
 type FormValues = {
   name: string;
@@ -57,6 +54,7 @@ export default function CreateComponent({
   managerId,
   initialManufacturerId,
 }: CreateComponentProps) {
+  const [open, setOpen] = useState(false);
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
   );
@@ -73,9 +71,7 @@ export default function CreateComponent({
           uuid: managerId,
         },
       },
-      {
-        query: ComponentsDocument,
-      },
+      ComponentsDocument,
     ],
   });
 
@@ -133,51 +129,20 @@ export default function CreateComponent({
       },
       {
         onSuccess: (data) => {
-          const component = data?.createComponent?.component;
-          if (component == null) {
+          const model = data?.createComponent?.component;
+          if (model == null) {
             messageMissingModel();
           } else {
             setGlobalErrorMessages([]);
             form.resetFields();
+            setOpen(false);
             notification.success({
               title: "Created Component",
               placement: "top",
               showProgress: true,
               pauseOnHover: true,
-              description: (
-                <div>
-                  <Typography.Paragraph style={{ maxWidth: "75ch" }}>
-                    <Copyable text={component.uuid}>
-                      <Link href={paths.component(component.uuid)}>
-                        <Id value={component.uuid} />
-                      </Link>{" "}
-                    </Copyable>
-                  </Typography.Paragraph>
-                  {component?.pendingManufacturers != null &&
-                    component.pendingManufacturers.totalCount > 0 && (
-                      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
-                        The{" "}
-                        {pluralize(
-                          component.pendingManufacturers.totalCount,
-                          "manufacturer",
-                        )}{" "}
-                        {component.pendingManufacturers.edges
-                          .map((x) => (
-                            <Link href={paths.institution(x.node.uuid)}>
-                              {x.node.name}
-                            </Link>
-                          ))
-                          .join(", ")}{" "}
-                        {pluralizeIrregular(
-                          component.pendingManufacturers.totalCount,
-                          "is",
-                          "are",
-                        )}{" "}
-                        are waiting for confirmation.
-                      </Typography.Paragraph>
-                    )}
-                </div>
-              ),
+              duration: 0,
+              description: <ComponentSummary hideExtra entity={model} />,
             });
           }
         },
@@ -195,100 +160,118 @@ export default function CreateComponent({
 
   return (
     <>
-      <ErrorAlert messages={globalErrorMessages} />
-      <Form
-        {...layout}
-        form={form}
-        name="createComponent"
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+      <NewButton onClick={() => setOpen(true)}>Component</NewButton>
+      <Modal
+        open={open}
+        title="New Component"
+        // onOk={handleOk}
+        onCancel={() => {
+          setGlobalErrorMessages([]);
+          form.resetFields();
+          setOpen(false);
+        }}
+        footer={false}
       >
-        <Form.Item
-          label="Name"
-          name="name"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item label="Abbreviation" name="abbreviation">
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Description"
-          name="description"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
+        <ErrorAlert messages={globalErrorMessages} />
+        <Form
+          {...layout}
+          form={form}
+          name="createComponent"
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
         >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Manufacturer"
-          name="manufacturerId"
-          rules={[{ required: true }]}
-          initialValue={initialManufacturerId}
-        >
-          <InstitutionIdSelect />
-        </Form.Item>
-        <Form.Item label="Availability" name="availability">
-          <DatePicker.RangePicker allowEmpty={[true, true]} showTime />
-        </Form.Item>
-        <Form.Item label="Categories" name="categories">
-          <Select
-            mode="multiple"
-            placeholder="Please select"
-            options={Object.entries(ComponentCategory).map(([_key, value]) => ({
-              label: value,
-              value: value,
-            }))}
-          />
-        </Form.Item>
-        <Divider />
-        <Form.Item label="Prime Surface">
-          <Form.Item label="Description" name={["primeSurface", "description"]}>
+          <Form.Item
+            label="Name"
+            name="name"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item label="Abbreviation" name="abbreviation">
             <Input />
           </Form.Item>
-          <ReferenceSubform
-            form={form}
-            namespace={["primeSurface", "reference"]}
-          />
-        </Form.Item>
-        <Form.Item label="Prime Direction">
           <Form.Item
             label="Description"
-            name={["primeDirection", "description"]}
+            name="description"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
           >
             <Input />
           </Form.Item>
-          <ReferenceSubform
-            form={form}
-            namespace={["primeDirection", "reference"]}
-          />
-        </Form.Item>
-        <Form.Item label="Switchable Layers">
           <Form.Item
-            label="Description"
-            name={["switchableLayers", "description"]}
+            label="Manufacturer"
+            name="manufacturerId"
+            rules={[{ required: true }]}
+            initialValue={initialManufacturerId}
           >
-            <Input />
+            <InstitutionIdSelect />
+          </Form.Item>
+          <Form.Item label="Availability" name="availability">
+            <DatePicker.RangePicker allowEmpty={[true, true]} showTime />
+          </Form.Item>
+          <Form.Item label="Categories" name="categories">
+            <Select
+              mode="multiple"
+              placeholder="Please select"
+              options={Object.entries(ComponentCategory).map(
+                ([_key, value]) => ({
+                  label: value,
+                  value: value,
+                }),
+              )}
+            />
+          </Form.Item>
+          <Divider />
+          <Form.Item label="Prime Surface">
+            <Form.Item
+              label="Description"
+              name={["primeSurface", "description"]}
+            >
+              <Input />
+            </Form.Item>
+            <ReferenceSubform
+              form={form}
+              namespace={["primeSurface", "reference"]}
+            />
+          </Form.Item>
+          <Form.Item label="Prime Direction">
+            <Form.Item
+              label="Description"
+              name={["primeDirection", "description"]}
+            >
+              <Input />
+            </Form.Item>
+            <ReferenceSubform
+              form={form}
+              namespace={["primeDirection", "reference"]}
+            />
+          </Form.Item>
+          <Form.Item label="Switchable Layers">
+            <Form.Item
+              label="Description"
+              name={["switchableLayers", "description"]}
+            >
+              <Input />
+            </Form.Item>
+            <ReferenceSubform
+              form={form}
+              namespace={["switchableLayers", "reference"]}
+            />
+          </Form.Item>
+          <Form.Item {...tailLayout}>
+            <Button type="primary" htmlType="submit" loading={mutating}>
+              Create
+            </Button>
           </Form.Item>
-          <ReferenceSubform
-            form={form}
-            namespace={["switchableLayers", "reference"]}
-          />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
-          <Button type="primary" htmlType="submit" loading={mutating}>
-            Create
-          </Button>
-        </Form.Item>
-      </Form>
+        </Form>
+      </Modal>
     </>
   );
 }
diff --git a/frontend/components/components/PaginatedComponents.tsx b/frontend/components/components/PaginatedComponents.tsx
index 0b7172bcc..2bb02b4ce 100644
--- a/frontend/components/components/PaginatedComponents.tsx
+++ b/frontend/components/components/PaginatedComponents.tsx
@@ -2,26 +2,41 @@ import {
   ComponentsDocument,
   ComponentNamesDocument,
   ComponentsQueryVariables,
+  ComponentsPartialFragment,
 } from "../../queries/components.generated";
 import paths from "../../paths";
 import ComponentList from "./ComponentList";
 import PaginatedEntities from "../entities/PaginatedEntities";
-import { ComponentCategory } from "../../__generated__/graphql";
+import {
+  ComponentCategory,
+  ComponentFilterInput,
+  ComponentSortInput,
+} from "../../__generated__/graphql";
 
 export default function PaginatedComponents({
   where,
+  order,
   showJump = false,
+  extra,
 }: {
   where?: ComponentsQueryVariables["where"];
+  order?: ComponentsQueryVariables["order"];
   showJump?: boolean;
+  extra?: React.ReactNode;
 }) {
   return (
-    <PaginatedEntities
+    <PaginatedEntities<
+      ComponentsPartialFragment,
+      ComponentFilterInput,
+      ComponentSortInput
+    >
       entitiesQuery={ComponentsDocument}
       namesQuery={ComponentNamesDocument}
       where={where}
+      order={order}
       showJump={showJump}
       route={paths.component}
+      extra={extra}
       list={(props) => <ComponentList {...props} />}
       filterDefinitions={[
         {
diff --git a/frontend/components/components/UpdateComponent.tsx b/frontend/components/components/UpdateComponent.tsx
index 349f3e9ea..b3488bc2c 100644
--- a/frontend/components/components/UpdateComponent.tsx
+++ b/frontend/components/components/UpdateComponent.tsx
@@ -115,7 +115,11 @@ export default function UpdateComponent({ component }: UpdateComponentProps) {
         open={open}
         title="Edit Component"
         // onOk={handleOk}
-        onCancel={() => setOpen(false)}
+        onCancel={() => {
+          setGlobalErrorMessages([]);
+          form.resetFields();
+          setOpen(false);
+        }}
         footer={false}
       >
         <ErrorAlert messages={globalErrorMessages} />
diff --git a/frontend/components/components/UpdateComponentAssembly.tsx b/frontend/components/components/UpdateComponentAssembly.tsx
index aec25e8d9..b92e05593 100644
--- a/frontend/components/components/UpdateComponentAssembly.tsx
+++ b/frontend/components/components/UpdateComponentAssembly.tsx
@@ -95,7 +95,11 @@ export default function UpdateComponentAssembly(
         open={open}
         title="Edit Assembly"
         // onOk={handleOk}
-        onCancel={() => setOpen(false)}
+        onCancel={() => {
+          setGlobalErrorMessages([]);
+          form.resetFields();
+          setOpen(false);
+        }}
         footer={false}
       >
         <ErrorAlert messages={globalErrorMessages} />
diff --git a/frontend/components/data/DataSummary.tsx b/frontend/components/data/DataSummary.tsx
index 02cd58709..11db0ed92 100644
--- a/frontend/components/data/DataSummary.tsx
+++ b/frontend/components/data/DataSummary.tsx
@@ -15,10 +15,9 @@ import JsonViewer from "../JsonViewer";
 import { useMemo, useState } from "react";
 import Copyable from "../Copyable";
 import { Reference } from "../Reference";
-import Link from "next/link";
-import CopyableBlock from "../CopyableBlock";
 import CodeViewer from "../CodeViewer";
 import AppliedMethodViewer from "../methods/AppliedMethodViewer";
+import GnuPgKeyLink from "../GnuPgKeyLink";
 
 interface ResourceTreeNode {
   key: string;
@@ -248,29 +247,12 @@ export default function DataSummary({
               approved on {dayjs(approval.timestamp).format("DD/MM/YYYY")} that
               the data satisfies the statement given by the reference
               <Reference data={approval.statement} />
-              This is proven by the GnuPG signature{" "}
-              <Copyable text={approval.signature}>
-                &ldquo;{approval.signature}
-                &rdquo;
-              </Copyable>{" "}
+              This is proven by the GnuPG signature
+              <CodeViewer code={approval.signature} />
               generated with the institution's GnuPG key{" "}
-              <Copyable text={approval.keyFingerprint}>
-                <Link href={paths.gnuPgKeyFingerprint(approval.keyFingerprint)}>
-                  {approval.keyFingerprint}
-                </Link>
-              </Copyable>{" "}
-              of the message
-              <CopyableBlock text={approval.message}>
-                <pre
-                  style={{
-                    overflow: "visible",
-                  }}
-                >
-                  <code style={{ whiteSpace: "nowrap" }}>
-                    {approval.message}
-                  </code>
-                </pre>
-              </CopyableBlock>
+              <GnuPgKeyLink fingerprint={approval.keyFingerprint} /> of the
+              message
+              <CodeViewer code={approval.message} />
               The message contains the statement and the response of the query
               <CodeViewer code={graphql.print(graphql.parse(approval.query))} />
               with the variables
diff --git a/frontend/components/data/calorimetric/PaginatedCalorimetricData.tsx b/frontend/components/data/calorimetric/PaginatedCalorimetricData.tsx
index 23448c017..9e8f3b687 100644
--- a/frontend/components/data/calorimetric/PaginatedCalorimetricData.tsx
+++ b/frontend/components/data/calorimetric/PaginatedCalorimetricData.tsx
@@ -1,9 +1,11 @@
 import {
   AllCalorimetricDataDocument,
   AllCalorimetricDataQueryVariables,
+  CalorimetricDataPartialFragment,
 } from "../../../queries/data.generated";
 import CalorimetricDataList from "./CalorimetricDataList";
 import PaginatedEntities from "../../entities/PaginatedEntities";
+import { CalorimetricDataPropositionInput } from "../../../__generated__/graphql";
 
 export default function PaginatedCalorimetricData({
   where,
@@ -11,7 +13,11 @@ export default function PaginatedCalorimetricData({
   where?: AllCalorimetricDataQueryVariables["where"];
 }) {
   return (
-    <PaginatedEntities
+    <PaginatedEntities<
+      CalorimetricDataPartialFragment,
+      CalorimetricDataPropositionInput,
+      any
+    >
       showJump={false}
       entitiesQuery={AllCalorimetricDataDocument}
       where={where}
diff --git a/frontend/components/data/geometric/PaginatedGeometricData.tsx b/frontend/components/data/geometric/PaginatedGeometricData.tsx
index 362c3d3f1..65a3e1fbe 100644
--- a/frontend/components/data/geometric/PaginatedGeometricData.tsx
+++ b/frontend/components/data/geometric/PaginatedGeometricData.tsx
@@ -1,9 +1,11 @@
 import {
   AllGeometricDataDocument,
   AllGeometricDataQueryVariables,
+  GeometricDataPartialFragment,
 } from "../../../queries/data.generated";
 import GeometricDataList from "./GeometricDataList";
 import PaginatedEntities from "../../entities/PaginatedEntities";
+import { GeometricDataPropositionInput } from "../../../__generated__/graphql";
 
 export default function PaginatedGeometricData({
   where,
@@ -11,7 +13,11 @@ export default function PaginatedGeometricData({
   where?: AllGeometricDataQueryVariables["where"];
 }) {
   return (
-    <PaginatedEntities
+    <PaginatedEntities<
+      GeometricDataPartialFragment,
+      GeometricDataPropositionInput,
+      any
+    >
       showJump={false}
       entitiesQuery={AllGeometricDataDocument}
       where={where}
diff --git a/frontend/components/data/hygrothermal/PaginatedHygrothermalData.tsx b/frontend/components/data/hygrothermal/PaginatedHygrothermalData.tsx
index 6fd55c2fe..b94fca1d9 100644
--- a/frontend/components/data/hygrothermal/PaginatedHygrothermalData.tsx
+++ b/frontend/components/data/hygrothermal/PaginatedHygrothermalData.tsx
@@ -1,9 +1,11 @@
 import {
   AllHygrothermalDataDocument,
   AllHygrothermalDataQueryVariables,
+  HygrothermalDataPartialFragment,
 } from "../../../queries/data.generated";
 import HygrothermalDataList from "./HygrothermalDataList";
 import PaginatedEntities from "../../entities/PaginatedEntities";
+import { HygrothermalDataPropositionInput } from "../../../__generated__/graphql";
 
 export default function PaginatedHygrothermalData({
   where,
@@ -11,7 +13,11 @@ export default function PaginatedHygrothermalData({
   where?: AllHygrothermalDataQueryVariables["where"];
 }) {
   return (
-    <PaginatedEntities
+    <PaginatedEntities<
+      HygrothermalDataPartialFragment,
+      HygrothermalDataPropositionInput,
+      any
+    >
       showJump={false}
       entitiesQuery={AllHygrothermalDataDocument}
       where={where}
diff --git a/frontend/components/data/lifeCycle/PaginatedLifeCycleData.tsx b/frontend/components/data/lifeCycle/PaginatedLifeCycleData.tsx
index 2cd3c2ab7..277e005cc 100644
--- a/frontend/components/data/lifeCycle/PaginatedLifeCycleData.tsx
+++ b/frontend/components/data/lifeCycle/PaginatedLifeCycleData.tsx
@@ -1,9 +1,11 @@
 import {
   AllLifeCycleDataDocument,
   AllLifeCycleDataQueryVariables,
+  LifeCycleDataPartialFragment,
 } from "../../../queries/data.generated";
 import LifeCycleDataList from "./LifeCycleDataList";
 import PaginatedEntities from "../../entities/PaginatedEntities";
+import { LifeCycleDataPropositionInput } from "../../../__generated__/graphql";
 
 export default function PaginatedLifeCycleData({
   where,
@@ -11,7 +13,11 @@ export default function PaginatedLifeCycleData({
   where?: AllLifeCycleDataQueryVariables["where"];
 }) {
   return (
-    <PaginatedEntities
+    <PaginatedEntities<
+      LifeCycleDataPartialFragment,
+      LifeCycleDataPropositionInput,
+      any
+    >
       showJump={false}
       entitiesQuery={AllLifeCycleDataDocument}
       where={where}
diff --git a/frontend/components/data/optical/PaginatedOpticalData.tsx b/frontend/components/data/optical/PaginatedOpticalData.tsx
index cf8876545..095b28c1d 100644
--- a/frontend/components/data/optical/PaginatedOpticalData.tsx
+++ b/frontend/components/data/optical/PaginatedOpticalData.tsx
@@ -1,9 +1,11 @@
 import {
   AllOpticalDataDocument,
   AllOpticalDataQueryVariables,
+  OpticalDataPartialFragment,
 } from "../../../queries/data.generated";
 import OpticalDataList from "./OpticalDataList";
 import PaginatedEntities from "../../entities/PaginatedEntities";
+import { OpticalDataPropositionInput } from "../../../__generated__/graphql";
 
 export default function PaginatedOpticalData({
   where,
@@ -11,7 +13,11 @@ export default function PaginatedOpticalData({
   where?: AllOpticalDataQueryVariables["where"];
 }) {
   return (
-    <PaginatedEntities
+    <PaginatedEntities<
+      OpticalDataPartialFragment,
+      OpticalDataPropositionInput,
+      any
+    >
       showJump={false}
       entitiesQuery={AllOpticalDataDocument}
       where={where}
diff --git a/frontend/components/data/photovoltaic/PaginatedPhotovoltaicData.tsx b/frontend/components/data/photovoltaic/PaginatedPhotovoltaicData.tsx
index 6dd105c20..790b0ffce 100644
--- a/frontend/components/data/photovoltaic/PaginatedPhotovoltaicData.tsx
+++ b/frontend/components/data/photovoltaic/PaginatedPhotovoltaicData.tsx
@@ -1,9 +1,11 @@
 import {
   AllPhotovoltaicDataDocument,
   AllPhotovoltaicDataQueryVariables,
+  PhotovoltaicDataPartialFragment,
 } from "../../../queries/data.generated";
 import PhotovoltaicDataList from "./PhotovoltaicDataList";
 import PaginatedEntities from "../../entities/PaginatedEntities";
+import { PhotovoltaicDataPropositionInput } from "../../../__generated__/graphql";
 
 export default function PaginatedPhotovoltaicData({
   where,
@@ -11,7 +13,11 @@ export default function PaginatedPhotovoltaicData({
   where?: AllPhotovoltaicDataQueryVariables["where"];
 }) {
   return (
-    <PaginatedEntities
+    <PaginatedEntities<
+      PhotovoltaicDataPartialFragment,
+      PhotovoltaicDataPropositionInput,
+      any
+    >
       showJump={false}
       entitiesQuery={AllPhotovoltaicDataDocument}
       where={where}
diff --git a/frontend/components/dataFormats/CreateDataFormat.tsx b/frontend/components/dataFormats/CreateDataFormat.tsx
index 42acde436..203ef3018 100644
--- a/frontend/components/dataFormats/CreateDataFormat.tsx
+++ b/frontend/components/dataFormats/CreateDataFormat.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Form, Input, Button, Divider } from "antd";
+import { Form, Input, Button, Divider, App, Modal } from "antd";
 import {
   CreateDataFormatDocument,
   CreateDataFormatMutation,
@@ -12,6 +12,8 @@ import { ReferenceSubform } from "../ReferenceSubform";
 import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import DataFormatSummary from "./DataFormatSummary";
+import NewButton from "../NewButton";
 
 type FormValues = {
   name: string;
@@ -27,10 +29,12 @@ interface CreateDataFormatProps {
 }
 
 export default function CreateDataFormat({ managerId }: CreateDataFormatProps) {
+  const [open, setOpen] = useState(false);
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
   );
   const [form] = Form.useForm<FormValues>();
+  const { notification } = App.useApp();
 
   const [createDataFormatMutation] = useMutation(CreateDataFormatDocument, {
     // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
@@ -42,16 +46,18 @@ export default function CreateDataFormat({ managerId }: CreateDataFormatProps) {
           uuid: managerId,
         },
       },
-      {
-        query: DataFormatsDocument,
-      },
+      DataFormatsDocument,
     ],
   });
 
-  const { mutating, withMutationHandler, augmentFormWithErrors } =
-    useMutationHandler<CreateDataFormatMutation>({
-      getErrors: (data) => data.createDataFormat.errors,
-    });
+  const {
+    mutating,
+    withMutationHandler,
+    messageMissingModel,
+    augmentFormWithErrors,
+  } = useMutationHandler<CreateDataFormatMutation>({
+    getErrors: (data) => data.createDataFormat.errors,
+  });
 
   const onFinish = (values: FormValues) => {
     withMutationHandler(
@@ -79,9 +85,27 @@ export default function CreateDataFormat({ managerId }: CreateDataFormatProps) {
         });
       },
       {
-        onSuccess: () => {
-          setGlobalErrorMessages([]);
-          form.resetFields();
+        onSuccess: (data) => {
+          const model = data?.createDataFormat?.dataFormat;
+          if (!model) {
+            messageMissingModel();
+          } else {
+            setGlobalErrorMessages([]);
+            form.resetFields();
+            setOpen(false);
+            notification.success({
+              title: "Created Data Format",
+              placement: "top",
+              showProgress: true,
+              pauseOnHover: true,
+              duration: 0,
+              style: {
+                width: "max-content",
+                minWidth: "384px",
+              },
+              description: <DataFormatSummary hideExtra entity={model} />,
+            });
+          }
         },
         onError: (graphQlErrors, userErrors) =>
           setGlobalErrorMessages(
@@ -97,80 +121,93 @@ export default function CreateDataFormat({ managerId }: CreateDataFormatProps) {
 
   return (
     <>
-      <ErrorAlert messages={globalErrorMessages} />
-      <Form
-        {...layout}
-        form={form}
-        name="createDataFormat"
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+      <NewButton onClick={() => setOpen(true)}>Data Format</NewButton>
+      <Modal
+        open={open}
+        title="New Data Format"
+        // onOk={handleOk}
+        onCancel={() => {
+          setGlobalErrorMessages([]);
+          form.resetFields();
+          setOpen(false);
+        }}
+        footer={false}
       >
-        <Form.Item
-          label="Name"
-          name="name"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Extension"
-          name="extension"
-          rules={[
-            {
-              required: false,
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Description"
-          name="description"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Media Type"
-          name="mediaType"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Schema Locator"
-          name="schemaLocator"
-          rules={[
-            {
-              required: false,
-            },
-            {
-              type: "url",
-            },
-          ]}
+        <ErrorAlert messages={globalErrorMessages} />
+        <Form
+          {...layout}
+          form={form}
+          name="createDataFormat"
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
         >
-          <Input />
-        </Form.Item>
-        <Divider />
-        <ReferenceSubform form={form} namespace={["reference"]} />
-        <Form.Item {...tailLayout}>
-          <Button type="primary" htmlType="submit" loading={mutating}>
-            Create
-          </Button>
-        </Form.Item>
-      </Form>
+          <Form.Item
+            label="Name"
+            name="name"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label="Extension"
+            name="extension"
+            rules={[
+              {
+                required: false,
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label="Description"
+            name="description"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label="Media Type"
+            name="mediaType"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label="Schema Locator"
+            name="schemaLocator"
+            rules={[
+              {
+                required: false,
+              },
+              {
+                type: "url",
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Divider />
+          <ReferenceSubform form={form} namespace={["reference"]} />
+          <Form.Item {...tailLayout}>
+            <Button type="primary" htmlType="submit" loading={mutating}>
+              Create
+            </Button>
+          </Form.Item>
+        </Form>
+      </Modal>
     </>
   );
 }
diff --git a/frontend/components/dataFormats/DataFormatSummary.tsx b/frontend/components/dataFormats/DataFormatSummary.tsx
index f7c747e18..6c7a33225 100644
--- a/frontend/components/dataFormats/DataFormatSummary.tsx
+++ b/frontend/components/dataFormats/DataFormatSummary.tsx
@@ -12,8 +12,10 @@ import Manager from "../Manager";
 
 export default function DataFormatSummary({
   entity,
+  hideExtra = false,
 }: {
   entity: DataFormatsPartialFragment | DataFormatPartialFragment;
+  hideExtra?: boolean;
 }) {
   return (
     <EntitySummary
@@ -35,12 +37,15 @@ export default function DataFormatSummary({
           </Tooltip>
         </Tag>,
       ]}
-      extra={[
-        "isAuthorizedToUpdateNode" in entity &&
-          entity.isAuthorizedToUpdateNode && (
-            <UpdateDataFormat key="updateDataFormat" dataFormat={entity} />
-          ),
-      ].filter(isTruthy)}
+      extra={
+        !hideExtra &&
+        [
+          "isAuthorizedToUpdateNode" in entity &&
+            entity.isAuthorizedToUpdateNode && (
+              <UpdateDataFormat key="updateDataFormat" dataFormat={entity} />
+            ),
+        ].filter(isTruthy)
+      }
     >
       {entity.schemaLocator && (
         <div>
diff --git a/frontend/components/dataFormats/PaginatedDataFormats.tsx b/frontend/components/dataFormats/PaginatedDataFormats.tsx
index 578116afd..f283c72d2 100644
--- a/frontend/components/dataFormats/PaginatedDataFormats.tsx
+++ b/frontend/components/dataFormats/PaginatedDataFormats.tsx
@@ -2,25 +2,40 @@ import {
   DataFormatsDocument,
   DataFormatNamesDocument,
   DataFormatsQueryVariables,
+  DataFormatsPartialFragment,
 } from "../../queries/dataFormats.generated";
 import paths from "../../paths";
 import DataFormatList from "./DataFormatList";
 import PaginatedEntities from "../entities/PaginatedEntities";
+import {
+  DataFormatFilterInput,
+  DataFormatSortInput,
+} from "../../__generated__/graphql";
 
 export default function PaginatedDataFormats({
   where,
+  order,
   showJump = false,
+  extra,
 }: {
   where?: DataFormatsQueryVariables["where"];
+  order?: DataFormatsQueryVariables["order"];
   showJump?: boolean;
+  extra?: React.ReactNode;
 }) {
   return (
-    <PaginatedEntities
+    <PaginatedEntities<
+      DataFormatsPartialFragment,
+      DataFormatFilterInput,
+      DataFormatSortInput
+    >
       entitiesQuery={DataFormatsDocument}
       namesQuery={DataFormatNamesDocument}
       where={where}
+      order={order}
       showJump={showJump}
       route={paths.dataFormat}
+      extra={extra}
       list={(props) => <DataFormatList {...props} />}
       filterDefinitions={[
         {
diff --git a/frontend/components/dataFormats/UpdateDataFormat.tsx b/frontend/components/dataFormats/UpdateDataFormat.tsx
index 1b7bf9387..7f181a8b2 100644
--- a/frontend/components/dataFormats/UpdateDataFormat.tsx
+++ b/frontend/components/dataFormats/UpdateDataFormat.tsx
@@ -91,7 +91,11 @@ export default function UpdateDataFormat({
         open={open}
         title="Edit Data Format"
         // onOk={handleOk}
-        onCancel={() => setOpen(false)}
+        onCancel={() => {
+          setGlobalErrorMessages([]);
+          form.resetFields();
+          setOpen(false);
+        }}
         footer={false}
       >
         <ErrorAlert messages={globalErrorMessages} />
diff --git a/frontend/components/databases/CreateDatabase.tsx b/frontend/components/databases/CreateDatabase.tsx
index 8be04c05f..7e2e1e149 100644
--- a/frontend/components/databases/CreateDatabase.tsx
+++ b/frontend/components/databases/CreateDatabase.tsx
@@ -1,22 +1,19 @@
 import { useMutation } from "@apollo/client/react";
-import { Form, Input, Button, App, Typography } from "antd";
+import { Form, Input, Button, App, Modal } from "antd";
 import {
+  AnyDatabasesDocument,
   CreateDatabaseDocument,
   CreateDatabaseMutation,
   DatabasesDocument,
 } from "../../queries/databases.generated";
-import {
-  DatabaseVerificationState,
-  Scalars,
-} from "../../__generated__/graphql";
+import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
-import { InstitutionDocument } from "../../queries/institutions.generated";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
-import { ExclamationCircleTwoTone } from "@ant-design/icons";
-import Link from "next/link";
-import paths from "../../paths";
+import NewButton from "../NewButton";
+import DatabaseSummary from "./DatabaseSummary";
+import { InstitutionDocument } from "../../queries/institutions.generated";
 
 type FormValues = {
   name: string;
@@ -29,11 +26,12 @@ interface CreateDatabaseProps {
 }
 
 export default function CreateDatabase({ operatorId }: CreateDatabaseProps) {
+  const [open, setOpen] = useState(false);
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
   );
   const [form] = Form.useForm<FormValues>();
-  const { modal } = App.useApp();
+  const { notification } = App.useApp();
 
   const [createDatabaseMutation] = useMutation(CreateDatabaseDocument, {
     // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
@@ -45,9 +43,8 @@ export default function CreateDatabase({ operatorId }: CreateDatabaseProps) {
           uuid: operatorId,
         },
       },
-      {
-        query: DatabasesDocument,
-      },
+      DatabasesDocument,
+      AnyDatabasesDocument,
     ],
   });
 
@@ -75,38 +72,25 @@ export default function CreateDatabase({ operatorId }: CreateDatabaseProps) {
         }),
       {
         onSuccess: (data) => {
-          setGlobalErrorMessages([]);
-          form.resetFields();
           const model = data?.createDatabase.database;
           if (!model) {
             messageMissingModel();
           } else {
-            if (model.verificationState == DatabaseVerificationState.Pending) {
-              modal.info({
-                title: "Database Verification Code",
-                centered: true,
-                width: 500,
-                content: (
-                  <Typography.Paragraph style={{ maxWidth: "75ch" }}>
-                    <span>
-                      <ExclamationCircleTwoTone twoToneColor="#f9b02e" />{" "}
-                    </span>
-                    Have your database&apos;s GraphQL endpoint return the
-                    verification code &ldquo;{model.verificationCode}&rdquo;
-                    (without the quotation marks), when queried for the GraphQL
-                    query &ldquo;verificationCode&rdquo;. Then, press the
-                    &ldquo;Verify&rdquo; button on
-                    <Link href={paths.database(model.uuid)}>{model.name}</Link>
-                    to make the metabase assert that the verification codes
-                    match which proves that you control the GraphQL endpoint
-                    {model.locator}. Verified databases are publicly listed and
-                    included in data searches. When you are logged-in and the
-                    database is unverified, the verification code is shown on
-                    <Link href={paths.database(model.uuid)}>{model.name}</Link>.
-                  </Typography.Paragraph>
-                ),
-              });
-            }
+            setGlobalErrorMessages([]);
+            form.resetFields();
+            setOpen(false);
+            notification.success({
+              title: "Created Database",
+              placement: "top",
+              showProgress: true,
+              pauseOnHover: true,
+              duration: 0,
+              style: {
+                width: "max-content",
+                minWidth: "384px",
+              },
+              description: <DatabaseSummary hideExtra entity={model} />,
+            });
           }
         },
         onError: (graphQlErrors, userErrors) =>
@@ -123,56 +107,69 @@ export default function CreateDatabase({ operatorId }: CreateDatabaseProps) {
 
   return (
     <>
-      <ErrorAlert messages={globalErrorMessages} />
-      <Form
-        {...layout}
-        form={form}
-        name="createDatabase"
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+      <NewButton onClick={() => setOpen(true)}>Database</NewButton>
+      <Modal
+        open={open}
+        title="New Database"
+        // onOk={handleOk}
+        onCancel={() => {
+          setGlobalErrorMessages([]);
+          form.resetFields();
+          setOpen(false);
+        }}
+        footer={false}
       >
-        <Form.Item
-          label="Name"
-          name="name"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Description"
-          name="description"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Locator"
-          name="locator"
-          rules={[
-            {
-              required: true,
-            },
-            {
-              type: "url",
-            },
-          ]}
+        <ErrorAlert messages={globalErrorMessages} />
+        <Form
+          {...layout}
+          form={form}
+          name="createDatabase"
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
         >
-          <Input />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
-          <Button type="primary" htmlType="submit" loading={mutating}>
-            Create
-          </Button>
-        </Form.Item>
-      </Form>
+          <Form.Item
+            label="Name"
+            name="name"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label="Description"
+            name="description"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label="Locator"
+            name="locator"
+            rules={[
+              {
+                required: true,
+              },
+              {
+                type: "url",
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item {...tailLayout}>
+            <Button type="primary" htmlType="submit" loading={mutating}>
+              Create
+            </Button>
+          </Form.Item>
+        </Form>
+      </Modal>
     </>
   );
 }
diff --git a/frontend/components/databases/Database.tsx b/frontend/components/databases/Database.tsx
index a9df81799..a40136ef5 100644
--- a/frontend/components/databases/Database.tsx
+++ b/frontend/components/databases/Database.tsx
@@ -1,9 +1,6 @@
-import {
-  DatabaseVerificationState,
-  Scalars,
-} from "../../__generated__/graphql";
+import { Scalars } from "../../__generated__/graphql";
 import { DatabaseDocument } from "../../queries/databases.generated";
-import { Skeleton, Result, Typography, Card, Divider } from "antd";
+import { Skeleton, Result, Card, Divider } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import DatabaseSummary from "./DatabaseSummary";
@@ -40,19 +37,6 @@ export default function Database({ databaseId }: DatabaseProps) {
   return (
     <Card>
       <DatabaseSummary entity={database} />
-      {database.isAuthorizedToVerifyNode &&
-        database.verificationState == DatabaseVerificationState.Pending && (
-          <Typography.Paragraph style={{ maxWidth: "75ch" }}>
-            Have your database&apos;s GraphQL endpoint return the verification
-            code &ldquo;{database.verificationCode}&rdquo; (without the
-            quotation marks), when queried for the GraphQL query
-            &ldquo;verificationCode&rdquo;. Then, press the &ldquo;Verify&rdquo;
-            button above to make the metabase assert that the verification codes
-            match which proves that you control the GraphQL endpoint{" "}
-            {database.locator}. Verified databases are publicly listed and
-            included in data searches.
-          </Typography.Paragraph>
-        )}
       <Divider />
       <QueryToolbar query={DatabaseDocument} variables={queryVariables} />
     </Card>
diff --git a/frontend/components/databases/DatabaseSummary.tsx b/frontend/components/databases/DatabaseSummary.tsx
index 1111bf86b..ba1adc939 100644
--- a/frontend/components/databases/DatabaseSummary.tsx
+++ b/frontend/components/databases/DatabaseSummary.tsx
@@ -12,14 +12,17 @@ import { isTruthy } from "../../lib/array";
 import UpdateDatabase from "./UpdateDatabase";
 import VerifyDatabase from "./VerifyDatabase";
 import EnumTag from "../EnumTag";
+import CodeViewer from "../CodeViewer";
 
 export default function DatabaseSummary({
   entity,
+  hideExtra = false,
 }: {
   entity:
     | DatabasesPartialFragment
     | PendingDatabasesPartialFragment
     | DatabasePartialFragment;
+  hideExtra?: boolean;
 }) {
   return (
     <EntitySummary
@@ -30,17 +33,20 @@ export default function DatabaseSummary({
           {entity.verificationState}
         </EnumTag>,
       ]}
-      extra={[
-        "isAuthorizedToVerifyNode" in entity &&
-          entity.isAuthorizedToVerifyNode &&
-          entity.verificationState == DatabaseVerificationState.Pending && (
-            <VerifyDatabase key="verifyDatabase" databaseId={entity.uuid} />
-          ),
-        "isAuthorizedToUpdateNode" in entity &&
-          entity.isAuthorizedToUpdateNode && (
-            <UpdateDatabase key="updateDatabase" database={entity} />
-          ),
-      ].filter(isTruthy)}
+      extra={
+        !hideExtra &&
+        [
+          "isAuthorizedToVerifyNode" in entity &&
+            entity.isAuthorizedToVerifyNode &&
+            entity.verificationState == DatabaseVerificationState.Pending && (
+              <VerifyDatabase key="verifyDatabase" databaseId={entity.uuid} />
+            ),
+          "isAuthorizedToUpdateNode" in entity &&
+            entity.isAuthorizedToUpdateNode && (
+              <UpdateDatabase key="updateDatabase" database={entity} />
+            ),
+        ].filter(isTruthy)
+      }
     >
       <div>
         Operated by <EntityLink entity={entity} route={paths.database} />
@@ -50,6 +56,29 @@ export default function DatabaseSummary({
           {entity.locator}
         </Typography.Link>
       </div>
+      {"isAuthorizedToVerifyNode" in entity &&
+        entity.isAuthorizedToVerifyNode &&
+        entity.verificationState == DatabaseVerificationState.Pending && (
+          <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+            Have your database&apos;s GraphQL endpoint return the verification
+            code
+            <CodeViewer code={entity.verificationCode} />
+            when queried for the GraphQL query
+            <CodeViewer code="query { verificationCode }" />
+            Then, press the &ldquo;Verify&rdquo; button{" "}
+            {!hideExtra ? (
+              "above"
+            ) : (
+              <>
+                on <EntityLink entity={entity} route={paths.database} />
+              </>
+            )}{" "}
+            to make the metabase assert that the verification codes match which
+            proves that you control the GraphQL endpoint {entity.locator}.
+            Verified databases are publicly listed and included in data
+            searches.
+          </Typography.Paragraph>
+        )}
     </EntitySummary>
   );
 }
diff --git a/frontend/components/databases/PaginatedAnyDatabases.tsx b/frontend/components/databases/PaginatedAnyDatabases.tsx
new file mode 100644
index 000000000..4c1135bfe
--- /dev/null
+++ b/frontend/components/databases/PaginatedAnyDatabases.tsx
@@ -0,0 +1,77 @@
+import {
+  AnyDatabasesDocument,
+  DatabaseNamesDocument,
+  AnyDatabasesQueryVariables,
+  DatabasesPartialFragment,
+} from "../../queries/databases.generated";
+import paths from "../../paths";
+import DatabaseList from "./DatabaseList";
+import PaginatedEntities from "../entities/PaginatedEntities";
+import {
+  DatabaseFilterInput,
+  DatabaseSortInput,
+} from "../../__generated__/graphql";
+
+export default function PaginatedAnyDatabases({
+  where,
+  order,
+  showJump = false,
+  extra,
+}: {
+  where?: AnyDatabasesQueryVariables["where"];
+  order?: AnyDatabasesQueryVariables["order"];
+  showJump?: boolean;
+  extra?: React.ReactNode;
+}) {
+  return (
+    <PaginatedEntities<
+      DatabasesPartialFragment,
+      DatabaseFilterInput,
+      DatabaseSortInput
+    >
+      entitiesQuery={AnyDatabasesDocument}
+      namesQuery={DatabaseNamesDocument}
+      where={where}
+      order={order}
+      showJump={showJump}
+      route={paths.database}
+      extra={extra}
+      list={(props) => <DatabaseList {...props} />}
+      filterDefinitions={[
+        {
+          field: "name",
+          type: "string",
+        },
+        {
+          field: "description",
+          type: "string",
+        },
+        {
+          field: "locator",
+          type: "url",
+        },
+        {
+          field: "operator",
+          type: "object",
+          items: [
+            {
+              field: "name",
+              type: "string",
+            },
+            { field: "id", type: "uuid" },
+          ],
+        },
+        {
+          field: "id",
+          type: "uuid",
+        },
+      ]}
+      sortDefinitions={[
+        { field: "name" },
+        { field: "createdAt" },
+        { field: "updatedAt" },
+        { field: "id" },
+      ]}
+    />
+  );
+}
diff --git a/frontend/components/databases/PaginatedDatabases.tsx b/frontend/components/databases/PaginatedDatabases.tsx
index de97cbaea..c3ec92110 100644
--- a/frontend/components/databases/PaginatedDatabases.tsx
+++ b/frontend/components/databases/PaginatedDatabases.tsx
@@ -2,25 +2,40 @@ import {
   DatabasesDocument,
   DatabaseNamesDocument,
   DatabasesQueryVariables,
+  DatabasesPartialFragment,
 } from "../../queries/databases.generated";
 import paths from "../../paths";
 import DatabaseList from "./DatabaseList";
 import PaginatedEntities from "../entities/PaginatedEntities";
+import {
+  DatabaseFilterInput,
+  DatabaseSortInput,
+} from "../../__generated__/graphql";
 
 export default function PaginatedDatabases({
   where,
+  order,
   showJump = false,
+  extra,
 }: {
   where?: DatabasesQueryVariables["where"];
+  order?: DatabasesQueryVariables["order"];
   showJump?: boolean;
+  extra?: React.ReactNode;
 }) {
   return (
-    <PaginatedEntities
+    <PaginatedEntities<
+      DatabasesPartialFragment,
+      DatabaseFilterInput,
+      DatabaseSortInput
+    >
       entitiesQuery={DatabasesDocument}
       namesQuery={DatabaseNamesDocument}
       where={where}
+      order={order}
       showJump={showJump}
       route={paths.database}
+      extra={extra}
       list={(props) => <DatabaseList {...props} />}
       filterDefinitions={[
         {
diff --git a/frontend/components/databases/UpdateDatabase.tsx b/frontend/components/databases/UpdateDatabase.tsx
index 4c766412a..9417ea6d5 100644
--- a/frontend/components/databases/UpdateDatabase.tsx
+++ b/frontend/components/databases/UpdateDatabase.tsx
@@ -73,7 +73,11 @@ export default function UpdateDatabase({ database }: UpdateDatabaseProps) {
         open={open}
         title="Edit Database"
         // onOk={handleOk}
-        onCancel={() => setOpen(false)}
+        onCancel={() => {
+          setGlobalErrorMessages([]);
+          form.resetFields();
+          setOpen(false);
+        }}
         footer={false}
       >
         <ErrorAlert messages={globalErrorMessages} />
diff --git a/frontend/components/entities/EntitySummary.tsx b/frontend/components/entities/EntitySummary.tsx
index 96cd1e7ff..e4bc37f91 100644
--- a/frontend/components/entities/EntitySummary.tsx
+++ b/frontend/components/entities/EntitySummary.tsx
@@ -14,7 +14,7 @@ interface Props {
     abbreviation?: string | null;
     description?: string | null;
   };
-  route: (id: Scalars["Uuid"]["output"]) => Route;
+  route?: (id: Scalars["Uuid"]["output"]) => Route;
   tags?: React.ReactNode[];
   onBack?: () => void;
   extra?: React.ReactNode;
@@ -79,9 +79,13 @@ export default function EntitySummary({
               </div>
               <Space align="center">
                 <Typography.Title level={4} style={{ margin: 0 }}>
-                  <Link href={route(entity.uuid)}>
-                    {entity.name ?? "Unnamed"}
-                  </Link>
+                  {route ? (
+                    <Link href={route(entity.uuid)}>
+                      {entity.name ?? "Unnamed"}
+                    </Link>
+                  ) : (
+                    (entity.name ?? "Unnamed")
+                  )}
                   {entity.abbreviation && <span> ({entity.abbreviation})</span>}
                 </Typography.Title>
                 {tags && (
diff --git a/frontend/components/entities/PaginatedEntities.tsx b/frontend/components/entities/PaginatedEntities.tsx
index 4c4346eb3..30d6f31fb 100644
--- a/frontend/components/entities/PaginatedEntities.tsx
+++ b/frontend/components/entities/PaginatedEntities.tsx
@@ -52,17 +52,26 @@ type FilterAndSortFormValues = {
   sorts: SortState[] | null | undefined;
 };
 
-type BaseProps<TNode, TFilterInput, TSortInput> = {
+type BaseProps<
+  TNode,
+  TFilterInput extends FilterInput,
+  TSortInput extends SortInput,
+> = {
   entitiesQuery: QueryDocument<TNode, TFilterInput, TSortInput>;
+  extra?: React.ReactNode;
   list: (props: { loading: boolean; nodes: TNode[] }) => React.ReactNode;
   filterDefinitions: readonly FilterDefinition<TFilterInput>[];
   sortDefinitions: readonly SortDefinition<TSortInput>[];
   where?: TFilterInput | null;
-  order?: TSortInput | null;
+  order?: TSortInput[] | TSortInput | null;
   loading?: boolean;
 };
 
-type Props<TNode, TFilterInput, TSortInput> =
+type Props<
+  TNode,
+  TFilterInput extends FilterInput,
+  TSortInput extends SortInput,
+> =
   | (BaseProps<TNode, TFilterInput, TSortInput> & {
       showJump: false;
     })
@@ -72,12 +81,25 @@ type Props<TNode, TFilterInput, TSortInput> =
       namesQuery?: JumpToIdProps["query"];
     });
 
+type FilterInput =
+  | {
+      and?: (FilterInput | undefined)[] | null;
+      or?: (FilterInput | undefined)[] | null;
+      [x: string]: { [x: string]: any | null | undefined } | null | undefined;
+    }
+  | null
+  | undefined;
+
+type SortInput =
+  | { [x: string]: SortInput | SortEnumType | null | undefined }
+  | { [x: string]: SortInput | SortEnumType | null | undefined }[]
+  | null
+  | undefined;
+
 export default function PaginatedEntities<
   TNode,
-  TFilterInput extends {
-    [x: string]: { [x: string]: any | null } | null;
-  },
-  TSortInput extends { [x: string]: SortEnumType | null },
+  TFilterInput extends FilterInput,
+  TSortInput extends SortInput,
 >(props: Props<TNode, TFilterInput, TSortInput>) {
   // const router = useRouter();
   const [form] = Form.useForm<FilterAndSortFormValues>();
@@ -163,8 +185,8 @@ export default function PaginatedEntities<
           ].filter(notEmpty),
         },
         order: [
-          props.order,
           ...sorts.map((sort) => toOrderClause(sort, props.sortDefinitions)),
+          ...(Array.isArray(props.order) ? props.order : [props.order]),
         ].filter(notEmpty),
       }),
     [filters, sorts],
@@ -181,15 +203,22 @@ export default function PaginatedEntities<
     items: props.filterDefinitions as readonly FilterDefinition<any>[],
   };
 
+  const jump =
+    (props.showJump && (
+      <JumpToId
+        query={props.namesQuery}
+        route={props.route}
+        style={{ width: props.extra ? "100%" : undefined }}
+      />
+    )) ||
+    null;
+
   return (
     <div>
       <Flex vertical gap="medium">
+        {props.extra != null && jump}
         <Flex justify="space-between" align="baseline">
-          {props.showJump ? (
-            <JumpToId query={props.namesQuery} route={props.route} />
-          ) : (
-            <div />
-          )}
+          {props.extra ?? jump ?? <div />}
           <Button
             type={isFilterAndSortOpen ? "text" : "default"}
             icon={<FilterOutlined />}
@@ -298,10 +327,11 @@ export default function PaginatedEntities<
                 >
                   <Space>
                     <DeleteButton
-                      title="Clear"
                       type="default"
                       onClick={clearFiltersAndSortsForm}
-                    />
+                    >
+                      Clear
+                    </DeleteButton>
                     <Button
                       type="default"
                       onClick={() => setIsFilterAndSortOpen(false)}
diff --git a/frontend/components/gnuPgKeyFingerprints/AddGnuPgKeyFingerprint.tsx b/frontend/components/gnuPgKeyFingerprints/AddGnuPgKeyFingerprint.tsx
deleted file mode 100644
index de51a87d3..000000000
--- a/frontend/components/gnuPgKeyFingerprints/AddGnuPgKeyFingerprint.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import { useMutation } from "@apollo/client/react";
-import { Form, Input, Button, Typography } from "antd";
-import {
-  AddGnuPgKeyFingerprintDocument,
-  AddGnuPgKeyFingerprintMutation,
-} from "../../queries/gnuPgKeyFingerprints.generated";
-import { Scalars } from "../../__generated__/graphql";
-import { useState } from "react";
-import { InstitutionDocument } from "../../queries/institutions.generated";
-import { layout, tailLayout } from "../../lib/form";
-import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
-import ErrorAlert from "../ErrorAlert";
-
-type FormValues = {
-  fingerprint: string;
-};
-
-interface AddGnuPgKeyFingerprintProps {
-  institutionId: Scalars["Uuid"]["input"];
-}
-
-export default function AddGnuPgKeyFingerprint({
-  institutionId,
-}: AddGnuPgKeyFingerprintProps) {
-  const [globalErrorMessages, setGlobalErrorMessages] = useState(
-    new Array<string>(),
-  );
-  const [form] = Form.useForm<FormValues>();
-
-  const [addGnuPgKeyFingerprintMutation] = useMutation(
-    AddGnuPgKeyFingerprintDocument,
-    {
-      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-      // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: InstitutionDocument,
-          variables: {
-            uuid: institutionId,
-          },
-        },
-      ],
-    },
-  );
-
-  const { mutating, withMutationHandler, augmentFormWithErrors } =
-    useMutationHandler<AddGnuPgKeyFingerprintMutation>({
-      getErrors: (data) => data.addGnuPgKeyFingerprint.errors,
-    });
-
-  const onFinish = (values: FormValues) => {
-    withMutationHandler(
-      () =>
-        // https://www.apollographql.com/docs/react/networking/authentication/#reset-store-on-logout
-        addGnuPgKeyFingerprintMutation({
-          variables: {
-            input: {
-              fingerprint: values.fingerprint,
-              institutionId: institutionId,
-            },
-          },
-        }),
-      {
-        onSuccess: () => {
-          setGlobalErrorMessages([]);
-          form.resetFields();
-        },
-        onError: (graphQlErrors, userErrors) =>
-          setGlobalErrorMessages(
-            augmentFormWithErrors(graphQlErrors, userErrors, form),
-          ),
-      },
-    );
-  };
-
-  const onFinishFailed = () => {
-    setGlobalErrorMessages(["Fix the errors below."]);
-  };
-
-  return (
-    <>
-      <ErrorAlert messages={globalErrorMessages} />
-      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
-        Before adding the GnuPG fingerprint of your GnuPG key here, you need to
-        upload the GnuPG public key to the{" "}
-        <Typography.Link href="https://keys.openpgp.org/">
-          OpenPGP Keyserver
-        </Typography.Link>{" "}
-        and then verify the user ID of the key, which should be your email
-        address. You can add your key either by running{" "}
-        <Typography.Text code>
-          gpg --keyserver hkps://keys.openpgp.org --send-keys
-          $SIGNING_KEY_FINGERPRINT
-        </Typography.Text>{" "}
-        or by exporting it with{" "}
-        <Typography.Text code>
-          gpg --export --armor --output ./my.pub.asc $SIGNING_KEY_FINGERPRINT
-        </Typography.Text>{" "}
-        and then uploading it via the form on{" "}
-        <Typography.Link href="https://keys.openpgp.org/upload">
-          OpenPGP Key Upload
-        </Typography.Link>{" "}
-        You can verify the user ID by following the link in the email sent to
-        you by the OpenPGP Keyserver.
-      </Typography.Paragraph>
-      <Form
-        {...layout}
-        form={form}
-        name="addGnuPgKeyFingerprint"
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
-      >
-        <Form.Item
-          label="Fingerprint"
-          name="fingerprint"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
-          <Button type="primary" htmlType="submit" loading={mutating}>
-            Add
-          </Button>
-        </Form.Item>
-      </Form>
-    </>
-  );
-}
diff --git a/frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintSummary.tsx b/frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintSummary.tsx
deleted file mode 100644
index e66b6a26e..000000000
--- a/frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintSummary.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { GnuPgKeyFingerprintsPartialFragment } from "../../queries/gnuPgKeyFingerprints.generated";
-import paths from "../../paths";
-import { Tag } from "antd";
-import AllowGnuPgKeyFingerprint from "./AllowGnuPgKeyFingerprint";
-import ForbidGnuPgKeyFingerprint from "./ForbidGnuPgKeyFingerprint";
-import EntityLink from "../entities/EntityLink";
-import EntitySummary from "../entities/EntitySummary";
-
-type Status = "pending" | "allowed" | "forbidden";
-
-const color = (status: Status) => {
-  switch (status) {
-    case "pending":
-      return "processing"; // "warning"
-    case "allowed":
-      return "success";
-    case "forbidden":
-      return "error";
-  }
-};
-
-export default function GnuPgKeyFingerprintSummary({
-  entity,
-}: {
-  entity: GnuPgKeyFingerprintsPartialFragment;
-}) {
-  const status: Status = entity.allowedAt
-    ? entity.forbiddenAt
-      ? "forbidden"
-      : "allowed"
-    : "pending";
-
-  return (
-    <EntitySummary
-      entity={entity}
-      route={(_) => paths.gnuPgKeyFingerprint(entity.fingerprint)}
-      tags={[
-        <Tag
-          key="status"
-          color={color(status)}
-          style={{ fontWeight: "normal" }}
-        >
-          {status}
-        </Tag>,
-      ]}
-      extra={[
-        entity.isAuthorizedToAllowNode && entity.allowedAt == undefined && (
-          <AllowGnuPgKeyFingerprint
-            fingerprint={entity.fingerprint}
-            institutionId={entity.institution.node.uuid}
-          />
-        ),
-        entity.isAuthorizedToForbidNode && entity.forbiddenAt == undefined && (
-          <ForbidGnuPgKeyFingerprint
-            fingerprint={entity.fingerprint}
-            institutionId={entity.institution.node.uuid}
-          />
-        ),
-      ]}
-    >
-      {entity.allowedAt && <div>Allowed at {entity.allowedAt}</div>}
-      {entity.forbiddenAt && <div>Forbidden at {entity.forbiddenAt}</div>}
-      <div>
-        Owned by <EntityLink entity={entity.user.node} route={paths.user} />
-      </div>
-    </EntitySummary>
-  );
-}
diff --git a/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx b/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
new file mode 100644
index 000000000..644bfcad6
--- /dev/null
+++ b/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
@@ -0,0 +1,176 @@
+import { useMutation } from "@apollo/client/react";
+import { Form, Input, Button, Typography, App, Modal } from "antd";
+import {
+  AddGnuPgKeyFingerprintDocument,
+  AddGnuPgKeyFingerprintMutation,
+} from "../../queries/gnuPgKeyFingerprints.generated";
+import { Scalars } from "../../__generated__/graphql";
+import { useState } from "react";
+import { InstitutionDocument } from "../../queries/institutions.generated";
+import { layout, tailLayout } from "../../lib/form";
+import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import ErrorAlert from "../ErrorAlert";
+import GnuPgKeySummary from "./GnuPgKeySummary";
+import NewButton from "../NewButton";
+import CodeViewer from "../CodeViewer";
+
+type FormValues = {
+  fingerprint: string;
+};
+
+interface AddGnuPgKeyFingerprintProps {
+  institutionId: Scalars["Uuid"]["input"];
+}
+
+export default function AddGnuPgKeyFingerprint({
+  institutionId,
+}: AddGnuPgKeyFingerprintProps) {
+  const [open, setOpen] = useState(false);
+  const [globalErrorMessages, setGlobalErrorMessages] = useState(
+    new Array<string>(),
+  );
+  const [form] = Form.useForm<FormValues>();
+  const { notification } = App.useApp();
+
+  const [addGnuPgKeyFingerprintMutation] = useMutation(
+    AddGnuPgKeyFingerprintDocument,
+    {
+      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
+      // See https://www.apollographql.com/docs/react/data/mutations/#options
+      refetchQueries: [
+        {
+          query: InstitutionDocument,
+          variables: {
+            uuid: institutionId,
+          },
+        },
+      ],
+    },
+  );
+
+  const {
+    mutating,
+    withMutationHandler,
+    augmentFormWithErrors,
+    messageMissingModel,
+  } = useMutationHandler<AddGnuPgKeyFingerprintMutation>({
+    getErrors: (data) => data.addGnuPgKeyFingerprint.errors,
+  });
+
+  const onFinish = (values: FormValues) => {
+    withMutationHandler(
+      () =>
+        // https://www.apollographql.com/docs/react/networking/authentication/#reset-store-on-logout
+        addGnuPgKeyFingerprintMutation({
+          variables: {
+            input: {
+              fingerprint: values.fingerprint,
+              institutionId: institutionId,
+            },
+          },
+        }),
+      {
+        onSuccess: (data) => {
+          const model = data?.addGnuPgKeyFingerprint?.gnuPgKeyFingerprint;
+          if (!model) {
+            messageMissingModel();
+          } else {
+            setGlobalErrorMessages([]);
+            form.resetFields();
+            setOpen(false);
+            notification.success({
+              title: "Added GnuPG Key Fingerprint",
+              placement: "top",
+              showProgress: true,
+              pauseOnHover: true,
+              duration: 0,
+              style: {
+                width: "max-content",
+                minWidth: "384px",
+              },
+              description: <GnuPgKeySummary hideExtra entity={model} />,
+            });
+          }
+        },
+        onError: (graphQlErrors, userErrors) =>
+          setGlobalErrorMessages(
+            augmentFormWithErrors(graphQlErrors, userErrors, form),
+          ),
+      },
+    );
+  };
+
+  const onFinishFailed = () => {
+    setGlobalErrorMessages(["Fix the errors below."]);
+  };
+
+  return (
+    <>
+      <NewButton onClick={() => setOpen(true)}>GnuPG Key Fingerprint</NewButton>
+      <Modal
+        open={open}
+        title="Add GnuPG Key Fingerprint"
+        // onOk={handleOk}
+        onCancel={() => {
+          setGlobalErrorMessages([]);
+          form.resetFields();
+          setOpen(false);
+        }}
+        footer={false}
+      >
+        <ErrorAlert messages={globalErrorMessages} />
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          Before adding the GnuPG fingerprint of your GnuPG key here, you need
+          to upload the GnuPG public key to the{" "}
+          <Typography.Link href="https://keys.openpgp.org/">
+            OpenPGP Keyserver
+          </Typography.Link>{" "}
+          and then verify the user ID of the key, which should be your email
+          address. You can add your key either by running
+          <CodeViewer
+            code={`gpg \\
+  --keyserver "hkps://keys.openpgp.org" \\
+  --send-keys "\${SIGNING_KEY_FINGERPRINT}"`}
+          />
+          or by exporting it with
+          <CodeViewer
+            code={`gpg \\
+  --export --armor \\
+  --output ./my.pub.asc \\
+  \${SIGNING_KEY_FINGERPRINT}`}
+          />
+          and then uploading it via the form on{" "}
+          <Typography.Link href="https://keys.openpgp.org/upload">
+            OpenPGP Key Upload
+          </Typography.Link>{" "}
+          You can verify the user ID by following the link in the email sent to
+          you by the OpenPGP Keyserver.
+        </Typography.Paragraph>
+        <Form
+          {...layout}
+          form={form}
+          name="addGnuPgKeyFingerprint"
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
+        >
+          <Form.Item
+            label="Fingerprint"
+            name="fingerprint"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item {...tailLayout}>
+            <Button type="primary" htmlType="submit" loading={mutating}>
+              Add
+            </Button>
+          </Form.Item>
+        </Form>
+      </Modal>
+    </>
+  );
+}
diff --git a/frontend/components/gnuPgKeyFingerprints/AllowGnuPgKeyFingerprint.tsx b/frontend/components/gnuPgKeys/AllowGnuPgKeyFingerprint.tsx
similarity index 100%
rename from frontend/components/gnuPgKeyFingerprints/AllowGnuPgKeyFingerprint.tsx
rename to frontend/components/gnuPgKeys/AllowGnuPgKeyFingerprint.tsx
diff --git a/frontend/components/gnuPgKeyFingerprints/ForbidGnuPgKeyFingerprint.tsx b/frontend/components/gnuPgKeys/ForbidGnuPgKeyFingerprint.tsx
similarity index 100%
rename from frontend/components/gnuPgKeyFingerprints/ForbidGnuPgKeyFingerprint.tsx
rename to frontend/components/gnuPgKeys/ForbidGnuPgKeyFingerprint.tsx
diff --git a/frontend/components/gnuPgKeys/GnuPgKey.tsx b/frontend/components/gnuPgKeys/GnuPgKey.tsx
new file mode 100644
index 000000000..0b9e062c3
--- /dev/null
+++ b/frontend/components/gnuPgKeys/GnuPgKey.tsx
@@ -0,0 +1,47 @@
+import { Scalars } from "../../__generated__/graphql";
+import { GnuPgKeyFingerprintDocument } from "../../queries/gnuPgKeyFingerprints.generated";
+import { Skeleton, Result, Card, Divider } from "antd";
+import { useQuery } from "@apollo/client/react";
+import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
+import GnuPgKeySummary from "./GnuPgKeySummary";
+import QueryToolbar from "../QueryToolbar";
+
+interface GnuPgKeyProps {
+  fingerprint: Scalars["String"]["output"];
+}
+
+export default function GnuPgKey({ fingerprint }: GnuPgKeyProps) {
+  const queryVariables = {
+    fingerprint: fingerprint,
+  };
+  const { loading, error, data } = useQuery(GnuPgKeyFingerprintDocument, {
+    variables: queryVariables,
+  });
+  useQueryHandler({ error });
+  const gnuPgKey = data?.gnuPgKeyFingerprint;
+
+  if (loading) {
+    return <Skeleton active avatar title />;
+  }
+
+  if (!gnuPgKey) {
+    return (
+      <Result
+        status="500"
+        title="500"
+        subTitle="Sorry, something went wrong."
+      />
+    );
+  }
+
+  return (
+    <Card>
+      <GnuPgKeySummary entity={gnuPgKey} />
+      <Divider />
+      <QueryToolbar
+        query={GnuPgKeyFingerprintDocument}
+        variables={queryVariables}
+      />
+    </Card>
+  );
+}
diff --git a/frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintList.tsx b/frontend/components/gnuPgKeys/GnuPgKeyList.tsx
similarity index 72%
rename from frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintList.tsx
rename to frontend/components/gnuPgKeys/GnuPgKeyList.tsx
index 997b949cb..4f6508c82 100644
--- a/frontend/components/gnuPgKeyFingerprints/GnuPgKeyFingerprintList.tsx
+++ b/frontend/components/gnuPgKeys/GnuPgKeyList.tsx
@@ -1,9 +1,9 @@
 import { GnuPgKeyFingerprintsPartialFragment } from "../../queries/gnuPgKeyFingerprints.generated";
 import EntityList from "../entities/EntityList";
-import GnuPgKeyFingerprintSummary from "./GnuPgKeyFingerprintSummary";
+import GnuPgKeySummary from "./GnuPgKeySummary";
 import EntityItem from "../entities/EntityItem";
 
-export default function GnuPgKeyFingerprintList({
+export default function GnuPgKeyList({
   loading,
   nodes,
 }: {
@@ -16,7 +16,7 @@ export default function GnuPgKeyFingerprintList({
       dataSource={nodes}
       renderItem={(node) => (
         <EntityItem>
-          <GnuPgKeyFingerprintSummary entity={node} />
+          <GnuPgKeySummary entity={node} />
         </EntityItem>
       )}
     />
diff --git a/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx b/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
new file mode 100644
index 000000000..6f1340dc8
--- /dev/null
+++ b/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
@@ -0,0 +1,87 @@
+import { GnuPgKeyFingerprintsPartialFragment } from "../../queries/gnuPgKeyFingerprints.generated";
+import paths from "../../paths";
+import { Tag } from "antd";
+import AllowGnuPgKeyFingerprint from "./AllowGnuPgKeyFingerprint";
+import ForbidGnuPgKeyFingerprint from "./ForbidGnuPgKeyFingerprint";
+import EntityLink from "../entities/EntityLink";
+import EntitySummary from "../entities/EntitySummary";
+import { isTruthy } from "../../lib/array";
+
+type Status = "pending" | "allowed" | "forbidden";
+
+const color = (status: Status) => {
+  switch (status) {
+    case "pending":
+      return "processing"; // "warning"
+    case "allowed":
+      return "success";
+    case "forbidden":
+      return "error";
+  }
+};
+
+export default function GnuPgKeySummary({
+  entity,
+  hideExtra = false,
+}: {
+  entity: GnuPgKeyFingerprintsPartialFragment;
+  hideExtra?: boolean;
+}) {
+  const status: Status = entity.allowedAt
+    ? entity.forbiddenAt
+      ? "forbidden"
+      : "allowed"
+    : "pending";
+
+  const dateTimes = [
+    entity.allowedAt && <div>Allowed at {entity.allowedAt}</div>,
+    entity.forbiddenAt && <div>Forbidden at {entity.forbiddenAt}</div>,
+  ].filter(isTruthy);
+
+  return (
+    <EntitySummary
+      entity={entity}
+      route={(_) => paths.gnuPgKey(entity.fingerprint)}
+      tags={[
+        <Tag
+          key="status"
+          color={color(status)}
+          style={{ fontWeight: "normal" }}
+        >
+          {status}
+        </Tag>,
+      ]}
+      extra={
+        !hideExtra && [
+          entity.isAuthorizedToAllowNode && entity.allowedAt == undefined && (
+            <AllowGnuPgKeyFingerprint
+              fingerprint={entity.fingerprint}
+              institutionId={entity.institution.node.uuid}
+            />
+          ),
+          entity.isAuthorizedToForbidNode &&
+            entity.forbiddenAt == undefined && (
+              <ForbidGnuPgKeyFingerprint
+                fingerprint={entity.fingerprint}
+                institutionId={entity.institution.node.uuid}
+              />
+            ),
+        ]
+      }
+    >
+      {dateTimes.length > 0 && <div>{dateTimes}</div>}
+      <div>
+        <div>
+          Associated with{" "}
+          <EntityLink
+            entity={entity.institution.node}
+            route={paths.institution}
+          />
+        </div>
+        <div>
+          Owned by <EntityLink entity={entity.user.node} route={paths.user} />
+        </div>
+      </div>
+    </EntitySummary>
+  );
+}
diff --git a/frontend/components/gnuPgKeyFingerprints/PaginatedGnuPgKeyFingerprints.tsx b/frontend/components/gnuPgKeys/PaginatedGnuPgKeys.tsx
similarity index 69%
rename from frontend/components/gnuPgKeyFingerprints/PaginatedGnuPgKeyFingerprints.tsx
rename to frontend/components/gnuPgKeys/PaginatedGnuPgKeys.tsx
index 5bc08c87f..cec5942a5 100644
--- a/frontend/components/gnuPgKeyFingerprints/PaginatedGnuPgKeyFingerprints.tsx
+++ b/frontend/components/gnuPgKeys/PaginatedGnuPgKeys.tsx
@@ -1,26 +1,41 @@
 import {
   GnuPgKeyFingerprintsDocument,
+  GnuPgKeyFingerprintsPartialFragment,
   GnuPgKeyFingerprintsQueryVariables,
 } from "../../queries/gnuPgKeyFingerprints.generated";
 import paths from "../../paths";
-import GnuPgKeyFingerprintList from "./GnuPgKeyFingerprintList";
+import GnuPgKeyList from "./GnuPgKeyList";
 import PaginatedEntities from "../entities/PaginatedEntities";
+import {
+  GnuPgKeyFingerprintFilterInput,
+  GnuPgKeyFingerprintSortInput,
+} from "../../__generated__/graphql";
 
-export default function PaginatedGnuPgKeyFingerprints({
+export default function PaginatedGnuPgKeys({
   where,
+  order,
   showJump = false,
+  extra,
 }: {
   where?: GnuPgKeyFingerprintsQueryVariables["where"];
+  order?: GnuPgKeyFingerprintsQueryVariables["order"];
   showJump?: boolean;
+  extra?: React.ReactNode;
 }) {
   return (
-    <PaginatedEntities
+    <PaginatedEntities<
+      GnuPgKeyFingerprintsPartialFragment,
+      GnuPgKeyFingerprintFilterInput,
+      GnuPgKeyFingerprintSortInput
+    >
       entitiesQuery={GnuPgKeyFingerprintsDocument}
       // namesQuery={GnuPgKeyFingerprintNamesDocument}
       where={where}
+      order={order}
       showJump={showJump}
-      route={paths.gnuPgKeyFingerprint}
-      list={(props) => <GnuPgKeyFingerprintList {...props} />}
+      route={paths.gnuPgKey}
+      extra={extra}
+      list={(props) => <GnuPgKeyList {...props} />}
       filterDefinitions={[
         {
           field: "fingerprint",
diff --git a/frontend/components/institutions/CreateInstitution.tsx b/frontend/components/institutions/CreateInstitution.tsx
index ea81ab266..82d912adc 100644
--- a/frontend/components/institutions/CreateInstitution.tsx
+++ b/frontend/components/institutions/CreateInstitution.tsx
@@ -1,5 +1,4 @@
 import { useMutation } from "@apollo/client/react";
-import { useRouter } from "next/router";
 import {
   InstitutionDocument,
   InstitutionsDocument,
@@ -7,12 +6,14 @@ import {
   CreateInstitutionMutation,
 } from "../../queries/institutions.generated";
 import { Scalars } from "../../__generated__/graphql";
-import { Form, Input, Button } from "antd";
-import paths from "../../paths";
+import { Form, Input, Button, Modal, App } from "antd";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 import { useState } from "react";
 import { layout, tailLayout } from "../../lib/form";
+import NewButton from "../NewButton";
+import { isTruthy } from "../../lib/array";
+import InstitutionSummary from "./InstitutionSummary";
 
 type ContactFormValues = {
   phoneNumber: string | null | undefined;
@@ -28,35 +29,26 @@ type FormValues = {
   contact: ContactFormValues | null | undefined;
 };
 
-interface CreateInstitutionProps {
-  ownerIds?: Scalars["Uuid"]["input"][];
-  managerId?: Scalars["Uuid"]["input"];
-}
+type CreateInstitutionProps =
+  | { ownerIds: Scalars["Uuid"]["input"][] }
+  | { managerId: Scalars["Uuid"]["input"] };
 
-export default function CreateInstitution({
-  ownerIds,
-  managerId,
-}: CreateInstitutionProps) {
-  const router = useRouter();
+export default function CreateInstitution(props: CreateInstitutionProps) {
+  const [open, setOpen] = useState(false);
   const [globalErrorMessages, setGlobalErrorMessages] = useState<string[]>([]);
   const [form] = Form.useForm<FormValues>();
+  const { notification } = App.useApp();
 
   const [createInstitutionMutation] = useMutation(CreateInstitutionDocument, {
     // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
     // See https://www.apollographql.com/docs/react/data/mutations/#options
     refetchQueries: [
-      {
-        query: InstitutionsDocument,
+      "managerId" in props && {
+        query: InstitutionDocument,
+        variables: { uuid: props.managerId },
       },
-      ...(managerId
-        ? [
-            {
-              query: InstitutionDocument,
-              variables: { uuid: managerId },
-            },
-          ]
-        : []),
-    ],
+      InstitutionsDocument,
+    ].filter(isTruthy),
   });
 
   const {
@@ -84,21 +76,32 @@ export default function CreateInstitution({
                 emailAddress: values.contact?.emailAddress,
                 websiteLocator: values.contact?.websiteLocator,
               },
-              ownerIds: ownerIds || [],
-              managerId: managerId,
+              ownerIds: ("ownerIds" in props && props.ownerIds) || [],
+              managerId: "managerId" in props && props.managerId,
             },
           },
         }),
       {
         onSuccess: (data) => {
-          if (!managerId) {
-            const model = data?.createInstitution?.institution;
-            if (!model) {
-              setGlobalErrorMessages([]);
-              messageMissingModel();
-            } else {
-              return router.push(paths.institution(model.uuid));
-            }
+          const model = data?.createInstitution?.institution;
+          if (!model) {
+            messageMissingModel();
+          } else {
+            setGlobalErrorMessages([]);
+            form.resetFields();
+            setOpen(false);
+            notification.success({
+              title: "Created Institution",
+              placement: "top",
+              showProgress: true,
+              pauseOnHover: true,
+              duration: 0,
+              style: {
+                width: "max-content",
+                minWidth: "384px",
+              },
+              description: <InstitutionSummary hideExtra entity={model} />,
+            });
           }
         },
         onError: (graphQlErrors, userErrors) =>
@@ -115,73 +118,86 @@ export default function CreateInstitution({
 
   return (
     <>
-      <ErrorAlert messages={globalErrorMessages} />
-      <Form
-        {...layout}
-        form={form}
-        name="basic"
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+      <NewButton onClick={() => setOpen(true)}>Institution</NewButton>
+      <Modal
+        open={open}
+        title="New Institution"
+        // onOk={handleOk}
+        onCancel={() => {
+          setGlobalErrorMessages([]);
+          form.resetFields();
+          setOpen(false);
+        }}
+        footer={false}
       >
-        <Form.Item
-          label="Name"
-          name="name"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item label="Abbreviation" name="abbreviation">
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Description"
-          name="description"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
+        <ErrorAlert messages={globalErrorMessages} />
+        <Form
+          {...layout}
+          form={form}
+          name="basic"
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
         >
-          <Input />
-        </Form.Item>
-        <Form.Item label="Phone Number" name={["contact", "phoneNumber"]}>
-          <Input />
-        </Form.Item>
-        <Form.Item label="Postal Address" name={["contact", "postalAddress"]}>
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="E-Mail Address"
-          name={["contact", "emailAddress"]}
-          rules={[
-            {
-              type: "email",
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Website Locator"
-          name={["contact", "websiteLocator"]}
-          rules={[
-            {
-              type: "url",
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
-          <Button type="primary" htmlType="submit" loading={mutating}>
-            Create
-          </Button>
-        </Form.Item>
-      </Form>
+          <Form.Item
+            label="Name"
+            name="name"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item label="Abbreviation" name="abbreviation">
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label="Description"
+            name="description"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item label="Phone Number" name={["contact", "phoneNumber"]}>
+            <Input />
+          </Form.Item>
+          <Form.Item label="Postal Address" name={["contact", "postalAddress"]}>
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label="E-Mail Address"
+            name={["contact", "emailAddress"]}
+            rules={[
+              {
+                type: "email",
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label="Website Locator"
+            name={["contact", "websiteLocator"]}
+            rules={[
+              {
+                type: "url",
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item {...tailLayout}>
+            <Button type="primary" htmlType="submit" loading={mutating}>
+              Create
+            </Button>
+          </Form.Item>
+        </Form>
+      </Modal>
     </>
   );
 }
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index 59478af20..b87abab73 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -4,7 +4,7 @@ import {
   InstitutionDocument,
   InstitutionPartialFragment,
 } from "../../queries/institutions.generated";
-import { Scalars } from "../../__generated__/graphql";
+import { Scalars, SortEnumType } from "../../__generated__/graphql";
 import CreateComponent from "../components/CreateComponent";
 import CreateMethod from "../methods/CreateMethod";
 import CreateDataFormat from "../dataFormats/CreateDataFormat";
@@ -13,23 +13,23 @@ import CreateDatabase from "../databases/CreateDatabase";
 import Link from "next/link";
 import paths from "../../paths";
 import CreateOpenIdConnectApplication from "../openIdConnect/applications/CreateOpenIdConnectApplication";
-import AddGnuPgKeyFingerprint from "../gnuPgKeyFingerprints/AddGnuPgKeyFingerprint";
+import AddGnuPgKeyFingerprint from "../gnuPgKeys/AddGnuPgKeyFingerprint";
 import RemoveInstitutionRepresentative from "./RemoveInstitutionRepresentative";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import ConfirmInstitutionMethodDeveloper from "../methods/ConfirmInstitutionMethodDeveloper";
 import { ConfirmComponentManufacturer } from "../components/ConfirmComponentManufacturer";
 import { isTruthy } from "../../lib/array";
 import PaginatedMethods from "../methods/PaginatedMethods";
-import PaginatedDatabases from "../databases/PaginatedDatabases";
 import PaginatedDataFormats from "../dataFormats/PaginatedDataFormats";
 import PaginatedInstitutions from "./PaginatedInstitutions";
 import PaginatedOpenIdConnectApplications from "../openIdConnect/applications/PaginatedOpenIdConnectApplications";
 import PaginatedComponents from "../components/PaginatedComponents";
 import LazyTabs, { LazyTabsProps } from "../LazyTabs";
 import QueryToolbar from "../QueryToolbar";
-import PaginatedGnuPgKeyFingerprints from "../gnuPgKeyFingerprints/PaginatedGnuPgKeyFingerprints";
+import PaginatedGnuPgKeys from "../gnuPgKeys/PaginatedGnuPgKeys";
 import { useMemo } from "react";
 import InstitutionSummary from "./InstitutionSummary";
+import PaginatedAnyDatabases from "../databases/PaginatedAnyDatabases";
 
 const getMainTabs = (
   institution: InstitutionPartialFragment,
@@ -46,6 +46,15 @@ const getMainTabs = (
               some: { id: { equalTo: institution.uuid } },
             },
           }}
+          order={{ createdAt: SortEnumType.Desc }}
+          extra={
+            institution.managedComponents.isAuthorizedToAddEdge && (
+              <CreateComponent
+                managerId={institution.uuid}
+                initialManufacturerId={institution.uuid}
+              />
+            )
+          }
         />
       ),
     },
@@ -60,6 +69,12 @@ const getMainTabs = (
               some: { id: { equalTo: institution.uuid } },
             },
           }}
+          order={{ createdAt: SortEnumType.Desc }}
+          extra={
+            institution.managedMethods.isAuthorizedToAddEdge && (
+              <CreateMethod managerId={institution.uuid} />
+            )
+          }
         />
       ),
     },
@@ -68,12 +83,18 @@ const getMainTabs = (
       count: institution.operatedDatabases.totalCount,
       label: "Operated Databases",
       children: (
-        <PaginatedDatabases
+        <PaginatedAnyDatabases
           where={{
             operator: {
               id: { equalTo: institution.uuid },
             },
           }}
+          order={{ createdAt: SortEnumType.Desc }}
+          extra={
+            institution.operatedDatabases.isAuthorizedToAddEdge && (
+              <CreateDatabase operatorId={institution.uuid} />
+            )
+          }
         />
       ),
     },
@@ -83,12 +104,18 @@ const getMainTabs = (
       count: institution.gnuPgKeyFingerprints.totalCount,
       label: "GnuPG Key Fingerprints",
       children: (
-        <PaginatedGnuPgKeyFingerprints
+        <PaginatedGnuPgKeys
           where={{
             institution: {
               id: { equalTo: institution.uuid },
             },
           }}
+          order={{ createdAt: SortEnumType.Desc }}
+          extra={
+            institution.gnuPgKeyFingerprints.isAuthorizedToAddEdge && (
+              <AddGnuPgKeyFingerprint institutionId={institution.uuid} />
+            )
+          }
         />
       ),
     },
@@ -109,6 +136,15 @@ const getManagedTabs = (
               id: { equalTo: institution.uuid },
             },
           }}
+          order={{ createdAt: SortEnumType.Desc }}
+          extra={
+            institution.managedComponents.isAuthorizedToAddEdge && (
+              <CreateComponent
+                managerId={institution.uuid}
+                initialManufacturerId={institution.uuid}
+              />
+            )
+          }
         />
       ),
     },
@@ -123,6 +159,12 @@ const getManagedTabs = (
               id: { equalTo: institution.uuid },
             },
           }}
+          order={{ createdAt: SortEnumType.Desc }}
+          extra={
+            institution.managedMethods.isAuthorizedToAddEdge && (
+              <CreateMethod managerId={institution.uuid} />
+            )
+          }
         />
       ),
     },
@@ -137,6 +179,12 @@ const getManagedTabs = (
               id: { equalTo: institution.uuid },
             },
           }}
+          order={{ createdAt: SortEnumType.Desc }}
+          extra={
+            institution.managedDataFormats.isAuthorizedToAddEdge && (
+              <CreateDataFormat managerId={institution.uuid} />
+            )
+          }
         />
       ),
     },
@@ -151,6 +199,12 @@ const getManagedTabs = (
               id: { equalTo: institution.uuid },
             },
           }}
+          order={{ createdAt: SortEnumType.Desc }}
+          extra={
+            institution.managedInstitutions.isAuthorizedToAddEdge && (
+              <CreateInstitution managerId={institution.uuid} />
+            )
+          }
         />
       ),
     },
@@ -165,59 +219,19 @@ const getManagedTabs = (
               id: { equalTo: institution.uuid },
             },
           }}
+          order={{ createdAt: SortEnumType.Desc }}
+          extra={
+            institution.openIdConnectApplications.isAuthorizedToAddEdge && (
+              <CreateOpenIdConnectApplication
+                institutionId={institution.uuid}
+              />
+            )
+          }
         />
       ),
     },
   ].filter(isTruthy);
 
-const getCreateTabs = (
-  institution: InstitutionPartialFragment,
-): LazyTabsProps["items"] =>
-  [
-    institution.managedComponents.isAuthorizedToAddEdge && {
-      key: "components",
-      label: "Components",
-      children: (
-        <CreateComponent
-          managerId={institution.uuid}
-          initialManufacturerId={institution.uuid}
-        />
-      ),
-    },
-    institution.managedMethods.isAuthorizedToAddEdge && {
-      key: "methods",
-      label: "Methods",
-      children: <CreateMethod managerId={institution.uuid} />,
-    },
-    institution.managedDataFormats.isAuthorizedToAddEdge && {
-      key: "dataFormats",
-      label: "Data Formats",
-      children: <CreateDataFormat managerId={institution.uuid} />,
-    },
-    institution.managedInstitutions.isAuthorizedToAddEdge && {
-      key: "institutions",
-      label: "Institutions",
-      children: <CreateInstitution managerId={institution.uuid} />,
-    },
-    institution.operatedDatabases.isAuthorizedToAddEdge && {
-      key: "databases",
-      label: "Databases",
-      children: <CreateDatabase operatorId={institution.uuid} />,
-    },
-    institution.gnuPgKeyFingerprints.isAuthorizedToAddEdge && {
-      key: "gnuPgKeyFingerprints",
-      label: "GnuPG Key Fingerprints",
-      children: <AddGnuPgKeyFingerprint institutionId={institution.uuid} />,
-    },
-    institution.openIdConnectApplications.isAuthorizedToAddEdge && {
-      key: "openIdConnectApplications",
-      label: "OpenId Connect Applications",
-      children: (
-        <CreateOpenIdConnectApplication institutionId={institution.uuid} />
-      ),
-    },
-  ].filter(isTruthy);
-
 const getPendingTabs = (
   institution: InstitutionPartialFragment,
 ): LazyTabsProps["items"] =>
@@ -319,7 +333,6 @@ export default function Institution({ institutionId }: Props) {
     return {
       main: getMainTabs(institution),
       managed: getManagedTabs(institution),
-      create: getCreateTabs(institution),
       pending: getPendingTabs(institution),
     };
   }, [institution]);
@@ -327,7 +340,7 @@ export default function Institution({ institutionId }: Props) {
   if (loading) {
     return <Skeleton active avatar title />;
   }
-  Card;
+
   if (!institution) {
     return (
       <Result
@@ -340,7 +353,9 @@ export default function Institution({ institutionId }: Props) {
 
   return (
     <>
-      <InstitutionSummary entity={institution} />
+      <Card>
+        <InstitutionSummary entity={institution} />
+      </Card>
       <Divider />
       {tabs?.main && <LazyTabs items={tabs?.main} />}
       {tabs?.managed && tabs.managed.length > 0 && (
@@ -352,15 +367,6 @@ export default function Institution({ institutionId }: Props) {
           <LazyTabs items={tabs.managed} />
         </>
       )}
-      {tabs?.create && tabs.create.length > 0 && (
-        <>
-          <Divider />
-          <Typography.Title level={4}>
-            Create &amp; Add Entities
-          </Typography.Title>
-          <LazyTabs items={tabs.create} />
-        </>
-      )}
       {tabs?.pending && tabs.pending.length > 0 && (
         <>
           <Divider />
diff --git a/frontend/components/institutions/InstitutionSummary.tsx b/frontend/components/institutions/InstitutionSummary.tsx
index fb648217f..3b7efe76a 100644
--- a/frontend/components/institutions/InstitutionSummary.tsx
+++ b/frontend/components/institutions/InstitutionSummary.tsx
@@ -1,4 +1,4 @@
-import { Typography } from "antd";
+import { Space, Typography } from "antd";
 import { asReadonlyMixed, isTruthy } from "../../lib/array";
 import paths from "../../paths";
 import {
@@ -24,11 +24,13 @@ import EnumTag from "../EnumTag";
 
 export default function InstitutionSummary({
   entity,
+  hideExtra = false,
 }: {
   entity:
     | InstitutionsPartialFragment
     | PendingInstitutionsPartialFragment
     | InstitutionPartialFragment;
+  hideExtra?: boolean;
 }) {
   return (
     <EntitySummary
@@ -42,25 +44,28 @@ export default function InstitutionSummary({
           {entity.operatingState}
         </EnumTag>,
       ]}
-      extra={[
-        "isAuthorizedToVerifyNode" in entity &&
-          entity.isAuthorizedToVerifyNode &&
-          entity.state == InstitutionState.Pending && (
-            <VerifyInstitution institutionId={entity.uuid} />
-          ),
-        "isAuthorizedToUpdateNode" in entity &&
-          entity.isAuthorizedToUpdateNode && (
-            <UpdateInstitution institution={entity} />
-          ),
-        "isAuthorizedToSwitchOperatingStateOfNode" in entity &&
-          entity.isAuthorizedToSwitchOperatingStateOfNode && (
-            <SwitchInstitutionOperatingState institutionId={entity.uuid} />
-          ),
-        "isAuthorizedToDeleteNode" in entity &&
-          entity.isAuthorizedToDeleteNode && (
-            <DeleteInstitution institutionId={entity.uuid} />
-          ),
-      ].filter(isTruthy)}
+      extra={
+        !hideExtra &&
+        [
+          "isAuthorizedToVerifyNode" in entity &&
+            entity.isAuthorizedToVerifyNode &&
+            entity.state == InstitutionState.Pending && (
+              <VerifyInstitution institutionId={entity.uuid} />
+            ),
+          "isAuthorizedToUpdateNode" in entity &&
+            entity.isAuthorizedToUpdateNode && (
+              <UpdateInstitution institution={entity} />
+            ),
+          "isAuthorizedToSwitchOperatingStateOfNode" in entity &&
+            entity.isAuthorizedToSwitchOperatingStateOfNode && (
+              <SwitchInstitutionOperatingState institutionId={entity.uuid} />
+            ),
+          "isAuthorizedToDeleteNode" in entity &&
+            entity.isAuthorizedToDeleteNode && (
+              <DeleteInstitution institutionId={entity.uuid} />
+            ),
+        ].filter(isTruthy)
+      }
     >
       {entity.state == InstitutionState.Pending && (
         <Typography.Paragraph style={{ maxWidth: "75ch" }}>
@@ -79,22 +84,24 @@ export default function InstitutionSummary({
           <InlineList
             items={asReadonlyMixed(entity.representatives.edges)}
             renderItem={(edge) => (
-              <span key={edge.node.id}>
-                <EntityLink entity={edge.node} route={paths.user} />{" "}
+              <Space key={edge.node.id}>
+                <EntityLink entity={edge.node} route={paths.user} />
                 <EnumTag color="grey" variant="outlined">
                   {edge.role}
                 </EnumTag>
-                {"isAuthorizedToRemoveEdge" in edge &&
+                {!hideExtra &&
+                  "isAuthorizedToRemoveEdge" in edge &&
                   edge.isAuthorizedToRemoveEdge && (
                     <RemoveInstitutionRepresentative
                       institutionId={entity.uuid}
                       userId={edge.node.uuid}
                     />
                   )}
-              </span>
+              </Space>
             )}
           />
-          {"isAuthorizedToAddEdge" in entity.representatives &&
+          {!hideExtra &&
+            "isAuthorizedToAddEdge" in entity.representatives &&
             entity.representatives.isAuthorizedToAddEdge && (
               <AddInstitutionRepresentative institutionId={entity.uuid} />
             )}
diff --git a/frontend/components/institutions/PaginatedInstitutions.tsx b/frontend/components/institutions/PaginatedInstitutions.tsx
index d76efee61..067d4cb80 100644
--- a/frontend/components/institutions/PaginatedInstitutions.tsx
+++ b/frontend/components/institutions/PaginatedInstitutions.tsx
@@ -2,25 +2,40 @@ import {
   InstitutionsDocument,
   InstitutionNamesDocument,
   InstitutionsQueryVariables,
+  InstitutionsPartialFragment,
 } from "../../queries/institutions.generated";
 import paths from "../../paths";
 import InstitutionList from "./InstitutionList";
 import PaginatedEntities from "../entities/PaginatedEntities";
+import {
+  InstitutionFilterInput,
+  InstitutionSortInput,
+} from "../../__generated__/graphql";
 
 export default function PaginatedInstitutions({
   where,
+  order,
   showJump = false,
+  extra,
 }: {
   where?: InstitutionsQueryVariables["where"];
+  order?: InstitutionsQueryVariables["order"];
   showJump?: boolean;
+  extra?: React.ReactNode;
 }) {
   return (
-    <PaginatedEntities
+    <PaginatedEntities<
+      InstitutionsPartialFragment,
+      InstitutionFilterInput,
+      InstitutionSortInput
+    >
       entitiesQuery={InstitutionsDocument}
       namesQuery={InstitutionNamesDocument}
       where={where}
+      order={order}
       showJump={showJump}
       route={paths.institution}
+      extra={extra}
       list={(props) => <InstitutionList {...props} />}
       filterDefinitions={[
         {
diff --git a/frontend/components/institutions/RemoveInstitutionRepresentative.tsx b/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
index ded835e82..ea3a9684a 100644
--- a/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
+++ b/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
@@ -12,11 +12,13 @@ import SafeDeleteButton from "../SafeDeleteButton";
 interface Props {
   institutionId: Scalars["Uuid"]["input"];
   userId: Scalars["Uuid"]["input"];
+  children?: React.ReactNode;
 }
 
 export default function RemoveInstitutionRepresentative({
   institutionId,
   userId,
+  children,
 }: Props) {
   const [removeInstitutionRepresentativeMutation] = useMutation(
     RemoveInstitutionRepresentativeDocument,
@@ -68,6 +70,8 @@ export default function RemoveInstitutionRepresentative({
       kind="remove"
       deleting={mutating}
       onConfirm={remove}
-    />
+    >
+      {children}
+    </SafeDeleteButton>
   );
 }
diff --git a/frontend/components/institutions/UpdateInstitution.tsx b/frontend/components/institutions/UpdateInstitution.tsx
index 0eba8e3f2..b6b6d38b1 100644
--- a/frontend/components/institutions/UpdateInstitution.tsx
+++ b/frontend/components/institutions/UpdateInstitution.tsx
@@ -89,7 +89,11 @@ export default function UpdateInstitution({
         open={open}
         title="Edit Institution"
         // onOk={handleOk}
-        onCancel={() => setOpen(false)}
+        onCancel={() => {
+          setGlobalErrorMessages([]);
+          form.resetFields();
+          setOpen(false);
+        }}
         footer={false}
       >
         <ErrorAlert messages={globalErrorMessages} />
diff --git a/frontend/components/methods/CreateMethod.tsx b/frontend/components/methods/CreateMethod.tsx
index 8d6a8a094..48deda46e 100644
--- a/frontend/components/methods/CreateMethod.tsx
+++ b/frontend/components/methods/CreateMethod.tsx
@@ -1,5 +1,14 @@
 import { useMutation } from "@apollo/client/react";
-import { DatePicker, Select, Form, Input, Button, Divider } from "antd";
+import {
+  DatePicker,
+  Select,
+  Form,
+  Input,
+  Button,
+  Divider,
+  App,
+  Modal,
+} from "antd";
 import {
   CreateMethodDocument,
   CreateMethodMutation,
@@ -22,6 +31,8 @@ import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 import { MethodParametersSubform } from "./MethodParametersSubform";
+import MethodSummary from "./MethodSummary";
+import NewButton from "../NewButton";
 
 type FormValues = {
   name: string;
@@ -48,10 +59,12 @@ interface CreateMethodProps {
 }
 
 export default function CreateMethod({ managerId }: CreateMethodProps) {
+  const [open, setOpen] = useState(false);
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
   );
   const [form] = Form.useForm<FormValues>();
+  const { notification } = App.useApp();
 
   const [createMethodMutation] = useMutation(CreateMethodDocument, {
     // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
@@ -63,16 +76,18 @@ export default function CreateMethod({ managerId }: CreateMethodProps) {
           uuid: managerId,
         },
       },
-      {
-        query: MethodsDocument,
-      },
+      MethodsDocument,
     ],
   });
 
-  const { mutating, withMutationHandler, augmentFormWithErrors } =
-    useMutationHandler<CreateMethodMutation>({
-      getErrors: (data) => data.createMethod.errors,
-    });
+  const {
+    mutating,
+    withMutationHandler,
+    augmentFormWithErrors,
+    messageMissingModel,
+  } = useMutationHandler<CreateMethodMutation>({
+    getErrors: (data) => data.createMethod.errors,
+  });
 
   const onFinish = (values: FormValues) => {
     withMutationHandler(
@@ -117,9 +132,27 @@ export default function CreateMethod({ managerId }: CreateMethodProps) {
         });
       },
       {
-        onSuccess: () => {
-          setGlobalErrorMessages([]);
-          form.resetFields();
+        onSuccess: (data) => {
+          const model = data?.createMethod?.method;
+          if (!model) {
+            messageMissingModel();
+          } else {
+            setGlobalErrorMessages([]);
+            form.resetFields();
+            setOpen(false);
+            notification.success({
+              title: "Created Method",
+              placement: "top",
+              showProgress: true,
+              pauseOnHover: true,
+              duration: 0,
+              style: {
+                width: "max-content",
+                minWidth: "384px",
+              },
+              description: <MethodSummary hideExtra entity={model} />,
+            });
+          }
         },
         onError: (graphQlErrors, userErrors) =>
           setGlobalErrorMessages(
@@ -135,91 +168,104 @@ export default function CreateMethod({ managerId }: CreateMethodProps) {
 
   return (
     <>
-      <ErrorAlert messages={globalErrorMessages} />
-      <Form
-        {...layout}
-        form={form}
-        name="createMethod"
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+      <NewButton onClick={() => setOpen(true)}>Method</NewButton>
+      <Modal
+        open={open}
+        title="New Method"
+        // onOk={handleOk}
+        onCancel={() => {
+          setGlobalErrorMessages([]);
+          form.resetFields();
+          setOpen(false);
+        }}
+        footer={false}
       >
-        <Form.Item
-          label="Name"
-          name="name"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
+        <ErrorAlert messages={globalErrorMessages} />
+        <Form
+          {...layout}
+          form={form}
+          name="createMethod"
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
         >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Description"
-          name="description"
-          rules={[
-            {
-              required: true,
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item label="Validity" name="validity">
-          <DatePicker.RangePicker allowEmpty={[true, true]} showTime />
-        </Form.Item>
-        <Form.Item label="Availability" name="availability">
-          <DatePicker.RangePicker allowEmpty={[true, true]} showTime />
-        </Form.Item>
-        <Form.Item
-          label="Calculation Locator"
-          name="calculationLocator"
-          rules={[
-            {
-              required: false,
-            },
-            {
-              type: "url",
-            },
-          ]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item label="Categories" name="categories" initialValue={[]}>
-          <Select
-            mode="multiple"
-            placeholder="Please select"
-            options={Object.entries(MethodCategory).map(([_key, value]) => ({
-              label: value,
-              value: value,
-            }))}
-          />
-        </Form.Item>
-        <Form.Item label="Parameter(s)">
-          <MethodParametersSubform namespace={["parameters"]} />
-        </Form.Item>
-        <Form.Item
-          label="Institution Developers"
-          name="institutionDeveloperIds"
-          initialValue={[]}
-        >
-          <InstitutionIdSelect mode="multiple" />
-        </Form.Item>
-        <Form.Item
-          label="User Developers"
-          name="userDeveloperIds"
-          initialValue={[]}
-        >
-          <UserIdSelect mode="multiple" />
-        </Form.Item>
-        <Divider />
-        <ReferenceSubform form={form} namespace={["reference"]} />
-        <Form.Item {...tailLayout}>
-          <Button type="primary" htmlType="submit" loading={mutating}>
-            Create
-          </Button>
-        </Form.Item>
-      </Form>
+          <Form.Item
+            label="Name"
+            name="name"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label="Description"
+            name="description"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item label="Validity" name="validity">
+            <DatePicker.RangePicker allowEmpty={[true, true]} showTime />
+          </Form.Item>
+          <Form.Item label="Availability" name="availability">
+            <DatePicker.RangePicker allowEmpty={[true, true]} showTime />
+          </Form.Item>
+          <Form.Item
+            label="Calculation Locator"
+            name="calculationLocator"
+            rules={[
+              {
+                required: false,
+              },
+              {
+                type: "url",
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item label="Categories" name="categories" initialValue={[]}>
+            <Select
+              mode="multiple"
+              placeholder="Please select"
+              options={Object.entries(MethodCategory).map(([_key, value]) => ({
+                label: value,
+                value: value,
+              }))}
+            />
+          </Form.Item>
+          <Form.Item label="Parameter(s)">
+            <MethodParametersSubform namespace={["parameters"]} />
+          </Form.Item>
+          <Form.Item
+            label="Institution Developers"
+            name="institutionDeveloperIds"
+            initialValue={[]}
+          >
+            <InstitutionIdSelect mode="multiple" />
+          </Form.Item>
+          <Form.Item
+            label="User Developers"
+            name="userDeveloperIds"
+            initialValue={[]}
+          >
+            <UserIdSelect mode="multiple" />
+          </Form.Item>
+          <Divider />
+          <ReferenceSubform form={form} namespace={["reference"]} />
+          <Form.Item {...tailLayout}>
+            <Button type="primary" htmlType="submit" loading={mutating}>
+              Create
+            </Button>
+          </Form.Item>
+        </Form>
+      </Modal>
     </>
   );
 }
diff --git a/frontend/components/methods/MethodSummary.tsx b/frontend/components/methods/MethodSummary.tsx
index 96d1db352..02aa64bb1 100644
--- a/frontend/components/methods/MethodSummary.tsx
+++ b/frontend/components/methods/MethodSummary.tsx
@@ -1,4 +1,4 @@
-import { Typography } from "antd";
+import { Space, Typography } from "antd";
 import { asReadonlyMixed, isTruthy } from "../../lib/array";
 import paths from "../../paths";
 import Manager from "../Manager";
@@ -26,11 +26,12 @@ const renderDeveloperList = (
     | NonNullable<MethodPartialFragment["developers"]>
     | NonNullable<MethodPartialFragment["pendingDevelopers"]>,
   methodId: Scalars["Uuid"]["output"],
+  hideExtra: boolean | undefined,
 ) => (
   <InlineList
     items={asReadonlyMixed(developers.edges)}
     renderItem={(edge) => (
-      <span key={edge.node.id}>
+      <Space key={edge.node.id}>
         <EntityLink
           entity={edge.node}
           route={
@@ -38,8 +39,9 @@ const renderDeveloperList = (
               ? paths.institution
               : paths.user
           }
-        />{" "}
-        {"isAuthorizedToRemoveEdge" in edge &&
+        />
+        {!hideExtra &&
+          "isAuthorizedToRemoveEdge" in edge &&
           edge.isAuthorizedToRemoveEdge &&
           (edge.node.__typename == "Institution" ? (
             <RemoveInstitutionMethodDeveloper
@@ -52,15 +54,17 @@ const renderDeveloperList = (
               userId={edge.node.uuid}
             />
           ))}
-      </span>
+      </Space>
     )}
   />
 );
 
 export default function MethodSummary({
   entity,
+  hideExtra = false,
 }: {
   entity: MethodsPartialFragment | MethodPartialFragment;
+  hideExtra?: boolean;
 }) {
   const dateTimeRanges = [
     (entity.validity?.from || entity.validity?.to) && (
@@ -84,12 +88,15 @@ export default function MethodSummary({
           {x}
         </EnumTag>
       ))}
-      extra={[
-        "isAuthorizedToUpdateNode" in entity &&
-          entity.isAuthorizedToUpdateNode && (
-            <UpdateMethod key="updateMethod" method={entity} />
-          ),
-      ].filter(isTruthy)}
+      extra={
+        !hideExtra &&
+        [
+          "isAuthorizedToUpdateNode" in entity &&
+            entity.isAuthorizedToUpdateNode && (
+              <UpdateMethod key="updateMethod" method={entity} />
+            ),
+        ].filter(isTruthy)
+      }
     >
       {dateTimeRanges.length > 0 && <div>{dateTimeRanges}</div>}
       {(entity.parameters.length > 0 || entity.sources.length > 0) && (
@@ -133,20 +140,27 @@ export default function MethodSummary({
       )}
       {entity.developers.edges.length > 0 && (
         <div>
-          Developed by {renderDeveloperList(entity.developers, entity.uuid)}
+          Developed by{" "}
+          {renderDeveloperList(entity.developers, entity.uuid, hideExtra)}
           {"pendingDevelopers" in entity &&
             entity.pendingDevelopers &&
             entity.pendingDevelopers.edges.length > 0 && (
               <>
                 Awaiting verification of
-                {renderDeveloperList(entity.pendingDevelopers, entity.uuid)}
+                {renderDeveloperList(
+                  entity.pendingDevelopers,
+                  entity.uuid,
+                  hideExtra,
+                )}
               </>
             )}
-          {"isAuthorizedToAddInstitutionEdge" in entity.developers &&
+          {!hideExtra &&
+            "isAuthorizedToAddInstitutionEdge" in entity.developers &&
             entity.developers.isAuthorizedToAddInstitutionEdge && (
               <AddInstitutionMethodDeveloper methodId={entity.uuid} />
             )}
-          {"isAuthorizedToAddUserEdge" in entity.developers &&
+          {!hideExtra &&
+            "isAuthorizedToAddUserEdge" in entity.developers &&
             entity.developers.isAuthorizedToAddUserEdge && (
               <AddUserMethodDeveloper methodId={entity.uuid} />
             )}
diff --git a/frontend/components/methods/PaginatedMethods.tsx b/frontend/components/methods/PaginatedMethods.tsx
index 61b43591a..f744388af 100644
--- a/frontend/components/methods/PaginatedMethods.tsx
+++ b/frontend/components/methods/PaginatedMethods.tsx
@@ -2,26 +2,41 @@ import {
   MethodsDocument,
   MethodNamesDocument,
   MethodsQueryVariables,
+  MethodsPartialFragment,
 } from "../../queries/methods.generated";
 import paths from "../../paths";
 import MethodList from "./MethodList";
 import PaginatedEntities from "../entities/PaginatedEntities";
-import { MethodCategory } from "../../__generated__/graphql";
+import {
+  MethodCategory,
+  MethodFilterInput,
+  MethodSortInput,
+} from "../../__generated__/graphql";
 
 export default function PaginatedMethods({
   where,
+  order,
   showJump = false,
+  extra,
 }: {
   where?: MethodsQueryVariables["where"];
+  order?: MethodsQueryVariables["order"];
   showJump?: boolean;
+  extra?: React.ReactNode;
 }) {
   return (
-    <PaginatedEntities
+    <PaginatedEntities<
+      MethodsPartialFragment,
+      MethodFilterInput,
+      MethodSortInput
+    >
       entitiesQuery={MethodsDocument}
       namesQuery={MethodNamesDocument}
       where={where}
+      order={order}
       showJump={showJump}
       route={paths.method}
+      extra={extra}
       list={(props) => <MethodList {...props} />}
       filterDefinitions={[
         {
diff --git a/frontend/components/methods/RemoveUserMethodDeveloper.tsx b/frontend/components/methods/RemoveUserMethodDeveloper.tsx
index 3a77378f7..b4063ddf2 100644
--- a/frontend/components/methods/RemoveUserMethodDeveloper.tsx
+++ b/frontend/components/methods/RemoveUserMethodDeveloper.tsx
@@ -15,9 +15,14 @@ import SafeDeleteButton from "../SafeDeleteButton";
 interface Props {
   methodId: Scalars["Uuid"]["input"];
   userId: Scalars["Uuid"]["input"];
+  children?: React.ReactNode;
 }
 
-export default function RemoveUserMethodDeveloper({ methodId, userId }: Props) {
+export default function RemoveUserMethodDeveloper({
+  methodId,
+  userId,
+  children,
+}: Props) {
   const [removeUserMethodDeveloperMutation] = useMutation(
     RemoveUserMethodDeveloperDocument,
     {
@@ -69,6 +74,8 @@ export default function RemoveUserMethodDeveloper({ methodId, userId }: Props) {
       kind="remove"
       onConfirm={mutate}
       deleting={mutating}
-    />
+    >
+      {children}
+    </SafeDeleteButton>
   );
 }
diff --git a/frontend/components/methods/UpdateMethod.tsx b/frontend/components/methods/UpdateMethod.tsx
index 533614ee7..2f8936ece 100644
--- a/frontend/components/methods/UpdateMethod.tsx
+++ b/frontend/components/methods/UpdateMethod.tsx
@@ -122,7 +122,11 @@ export default function UpdateMethod({ method }: UpdateMethodProps) {
         open={open}
         title="Edit Method"
         // onOk={handleOk}
-        onCancel={() => setOpen(false)}
+        onCancel={() => {
+          setGlobalErrorMessages([]);
+          form.resetFields();
+          setOpen(false);
+        }}
         footer={false}
       >
         <ErrorAlert messages={globalErrorMessages} />
diff --git a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
index 7d1dd3824..0061d7852 100644
--- a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
@@ -5,7 +5,16 @@ import {
   CreateApplicationDocument,
   CreateApplicationMutation,
 } from "../../../queries/openIdConnect.generated";
-import { Button, Form, Input, App, Select, Typography } from "antd";
+import {
+  Button,
+  Form,
+  Input,
+  App,
+  Select,
+  Typography,
+  Modal,
+  Divider,
+} from "antd";
 import { ExclamationCircleTwoTone } from "@ant-design/icons";
 import {
   OpenIdConnectConsentType,
@@ -20,6 +29,11 @@ import { InstitutionDocument } from "../../../queries/institutions.generated";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
 import { layout, tailLayout } from "../../../lib/form";
 import ErrorAlert from "../../ErrorAlert";
+import NewButton from "../../NewButton";
+import OpenIdConnectApplicationSummary from "./OpenIdConnectApplicationSummary";
+import EntityLink from "../../entities/EntityLink";
+import paths from "../../../paths";
+import CodeViewer from "../../CodeViewer";
 
 type FormValues = {
   clientId: string;
@@ -43,8 +57,9 @@ export default function CreateOpenIdConnectApplication({
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
   );
+  const [open, setOpen] = useState(false);
   const [form] = Form.useForm<FormValues>();
-  const { modal } = App.useApp();
+  const { notification } = App.useApp();
 
   const [createApplicationMutation] = useMutation(CreateApplicationDocument, {
     // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
@@ -56,9 +71,7 @@ export default function CreateOpenIdConnectApplication({
           uuid: institutionId,
         },
       },
-      {
-        query: ApplicationsDocument,
-      },
+      ApplicationsDocument,
     ],
   });
 
@@ -92,27 +105,42 @@ export default function CreateOpenIdConnectApplication({
         }),
       {
         onSuccess: (data) => {
-          setGlobalErrorMessages([]);
-          const model = data?.createOpenIdConnectApplication?.clientSecret;
-          if (!model) {
+          const model = data?.createOpenIdConnectApplication?.application;
+          if (!model || !data?.createOpenIdConnectApplication.clientSecret) {
             messageMissingModel();
           } else {
-            modal.info({
-              title: "Application Client Secret",
-              centered: true,
-              width: 500,
-              content: (
-                <Typography.Paragraph style={{ maxWidth: "75ch" }}>
-                  <span>
-                    <ExclamationCircleTwoTone twoToneColor="#f9b02e" />{" "}
-                  </span>
-                  Please copy an save the client secret now, you will not be
-                  able to access it later.
-                  <p />
-                  <Typography.Paragraph copyable>
-                    {data.createOpenIdConnectApplication.clientSecret}
+            setGlobalErrorMessages([]);
+            form.resetFields();
+            setOpen(false);
+            notification.success({
+              title: "Created OpenId-Connect Application",
+              placement: "top",
+              showProgress: true,
+              pauseOnHover: true,
+              duration: 0,
+              style: {
+                width: "max-content",
+                minWidth: "384px",
+              },
+              description: (
+                <div>
+                  <OpenIdConnectApplicationSummary hideExtra entity={model} />
+                  <Divider />
+                  <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+                    <ExclamationCircleTwoTone twoToneColor="#f9b02e" /> Please
+                    copy and save the following client secret now, you will not
+                    be able to access it later
+                    <CodeViewer
+                      code={data.createOpenIdConnectApplication.clientSecret}
+                    />
+                    Should you forget it, you may reset it on{" "}
+                    <EntityLink
+                      entity={model}
+                      route={paths.openIdConnectApplication}
+                    />
+                    .
                   </Typography.Paragraph>
-                </Typography.Paragraph>
+                </div>
               ),
             });
           }
@@ -131,130 +159,146 @@ export default function CreateOpenIdConnectApplication({
 
   return (
     <>
-      <ErrorAlert messages={globalErrorMessages} />
-      <Form
-        {...layout}
-        form={form}
-        name="createApplication"
-        onFinish={onFinish}
-        onFinishFailed={onFinishFailed}
+      <NewButton onClick={() => setOpen(true)}>
+        OpenId-Connect Application
+      </NewButton>
+      <Modal
+        open={open}
+        title="New OpenId-Connect Application"
+        // onOk={handleOk}
+        onCancel={() => {
+          setGlobalErrorMessages([]);
+          form.resetFields();
+          setOpen(false);
+        }}
+        footer={false}
       >
-        <Form.Item
-          label="Client Id"
-          name="clientId"
-          rules={[{ required: true }]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Display Name"
-          name="displayName"
-          rules={[{ required: true }]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Consent Type"
-          name="consentType"
-          rules={[{ required: true }]}
-        >
-          <Select
-            placeholder="Please select"
-            options={Object.entries(OpenIdConnectConsentType).map(
-              ([_key, value]) => ({ label: value, value: value }),
-            )}
-          />
-        </Form.Item>
-        <Form.Item
-          label="Login Redirect URL"
-          name="redirectUri"
-          rules={[{ type: "url" }]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Logout Redirect URL"
-          name="postLogoutRedirectUri"
-          rules={[{ type: "url" }]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label="Endpoints"
-          name="endpoints"
-          rules={[{ required: true }]}
-        >
-          <Select
-            mode="multiple"
-            allowClear
-            placeholder="Please select"
-            options={Object.entries(OpenIdConnectEndpoint).map(
-              ([_key, value]) => ({ label: value, value: value }),
-            )}
-          />
-        </Form.Item>
-        <Form.Item
-          label="GrantTypes"
-          name="grantTypes"
-          rules={[{ required: true }]}
-        >
-          <Select
-            mode="multiple"
-            allowClear
-            placeholder="Please select"
-            options={Object.entries(OpenIdConnectGrantType).map(
-              ([_key, value]) => ({ label: value, value: value }),
-            )}
-          />
-        </Form.Item>
-        <Form.Item
-          label="ResponseTypes"
-          name="responseTypes"
-          rules={[{ required: true }]}
-        >
-          <Select
-            mode="multiple"
-            allowClear
-            placeholder="Please select"
-            options={Object.entries(OpenIdConnectResponseType).map(
-              ([_key, value]) => ({ label: value, value: value }),
-            )}
-          />
-        </Form.Item>
-        <Form.Item label="Scopes" name="scopes" rules={[{ required: true }]}>
-          <Select
-            mode="multiple"
-            allowClear
-            placeholder="Please select"
-            options={Object.entries(OpenIdConnectScope).map(
-              ([_key, value]) => ({ label: value, value: value }),
-            )}
-          />
-        </Form.Item>
-        <Form.Item
-          label="Requirements"
-          name="requirements"
-          rules={[{ required: true }]}
-          initialValue={Object.entries(OpenIdConnectRequirement).map(
-            ([_key, value]) => ({ label: value, value: value }),
-          )}
+        <ErrorAlert messages={globalErrorMessages} />
+        <Form
+          {...layout}
+          form={form}
+          name="createApplication"
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
         >
-          <Select
-            disabled
-            mode="multiple"
-            allowClear
-            placeholder="Please select"
-            options={Object.entries(OpenIdConnectRequirement).map(
+          <Form.Item
+            label="Client Id"
+            name="clientId"
+            rules={[{ required: true }]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label="Display Name"
+            name="displayName"
+            rules={[{ required: true }]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label="Consent Type"
+            name="consentType"
+            rules={[{ required: true }]}
+            initialValue={OpenIdConnectConsentType.Explicit}
+          >
+            <Select
+              placeholder="Please select"
+              options={Object.entries(OpenIdConnectConsentType).map(
+                ([_key, value]) => ({ label: value, value: value }),
+              )}
+            />
+          </Form.Item>
+          <Form.Item
+            label="Login Redirect URL"
+            name="redirectUri"
+            rules={[{ type: "url" }]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label="Logout Redirect URL"
+            name="postLogoutRedirectUri"
+            rules={[{ type: "url" }]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            label="Endpoints"
+            name="endpoints"
+            rules={[{ required: true }]}
+          >
+            <Select
+              mode="multiple"
+              allowClear
+              placeholder="Please select"
+              options={Object.entries(OpenIdConnectEndpoint).map(
+                ([_key, value]) => ({ label: value, value: value }),
+              )}
+            />
+          </Form.Item>
+          <Form.Item
+            label="GrantTypes"
+            name="grantTypes"
+            rules={[{ required: true }]}
+          >
+            <Select
+              mode="multiple"
+              allowClear
+              placeholder="Please select"
+              options={Object.entries(OpenIdConnectGrantType).map(
+                ([_key, value]) => ({ label: value, value: value }),
+              )}
+            />
+          </Form.Item>
+          <Form.Item
+            label="ResponseTypes"
+            name="responseTypes"
+            rules={[{ required: true }]}
+          >
+            <Select
+              mode="multiple"
+              allowClear
+              placeholder="Please select"
+              options={Object.entries(OpenIdConnectResponseType).map(
+                ([_key, value]) => ({ label: value, value: value }),
+              )}
+            />
+          </Form.Item>
+          <Form.Item label="Scopes" name="scopes" rules={[{ required: true }]}>
+            <Select
+              mode="multiple"
+              allowClear
+              placeholder="Please select"
+              options={Object.entries(OpenIdConnectScope).map(
+                ([_key, value]) => ({ label: value, value: value }),
+              )}
+            />
+          </Form.Item>
+          <Form.Item
+            label="Requirements"
+            name="requirements"
+            rules={[{ required: true }]}
+            initialValue={Object.entries(OpenIdConnectRequirement).map(
               ([_key, value]) => ({ label: value, value: value }),
             )}
-          />
-        </Form.Item>
-        <Form.Item {...tailLayout}>
-          <Button type="primary" htmlType="submit" loading={mutating}>
-            Create
-          </Button>
-        </Form.Item>
-      </Form>
+          >
+            <Select
+              disabled
+              mode="multiple"
+              allowClear
+              placeholder="Please select"
+              options={Object.entries(OpenIdConnectRequirement).map(
+                ([_key, value]) => ({ label: value, value: value }),
+              )}
+            />
+          </Form.Item>
+          <Form.Item {...tailLayout}>
+            <Button type="primary" htmlType="submit" loading={mutating}>
+              Create
+            </Button>
+          </Form.Item>
+        </Form>
+      </Modal>
     </>
   );
 }
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
index ae902bcb3..fd3cc6351 100644
--- a/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
@@ -1,12 +1,13 @@
-import { Scalars } from "../../../__generated__/graphql";
-import { Card, Divider, Result, Skeleton, Typography } from "antd";
-import OpenIdConnectAutorizationTable from "../authorizations/OpenIdConnectAuthorizationTable";
-import OpenIdConnectTokenTable from "../tokens/OpenIdConnectTokenTable";
+import { Scalars, SortEnumType } from "../../../__generated__/graphql";
+import { Card, Divider, Result, Skeleton } from "antd";
 import { ApplicationDocument } from "../../../queries/openIdConnect.generated";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
 import OpenIdConnectApplicationSummary from "./OpenIdConnectApplicationSummary";
 import QueryToolbar from "../../QueryToolbar";
+import LazyTabs from "../../LazyTabs";
+import PaginatedOpenIdConnectAuthorizations from "../authorizations/PaginatedOpenIdConnectAuthorizations";
+import PaginatedOpenIdConnectTokens from "../tokens/PaginatedOpenIdConnectTokens";
 
 interface Props {
   applicationId: Scalars["Uuid"]["input"];
@@ -37,21 +38,47 @@ export default function OpenIdConnectApplication({ applicationId }: Props) {
   }
 
   return (
-    <Card>
-      <OpenIdConnectApplicationSummary entity={application} />
+    <>
+      <Card>
+        <OpenIdConnectApplicationSummary entity={application} />
+      </Card>
       <Divider />
-      <Typography.Title level={4}>Authorizations</Typography.Title>
-      <OpenIdConnectAutorizationTable
-        applicationId={application.uuid}
-        authorizations={application.authorizations.edges.map((x) => x.node)}
-      />
-      <Divider />
-      <Typography.Title level={4}>Tokens</Typography.Title>
-      <OpenIdConnectTokenTable
-        tokens={application.tokens.edges.map((x) => x.node)}
+      <LazyTabs
+        items={[
+          {
+            key: "authorizations",
+            label: "Authorizations",
+            count: application.authorizations.totalCount,
+            children: (
+              <PaginatedOpenIdConnectAuthorizations
+                where={{
+                  application: {
+                    id: { equalTo: application.uuid },
+                  },
+                }}
+                order={{ createdAt: SortEnumType.Desc }}
+              />
+            ),
+          },
+          {
+            key: "tokens",
+            label: "Tokens",
+            count: application.tokens.totalCount,
+            children: (
+              <PaginatedOpenIdConnectTokens
+                where={{
+                  application: {
+                    id: { equalTo: application.uuid },
+                  },
+                }}
+                order={{ createdAt: SortEnumType.Desc }}
+              />
+            ),
+          },
+        ]}
       />
       <Divider />
       <QueryToolbar query={ApplicationDocument} variables={queryVariables} />
-    </Card>
+    </>
   );
 }
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
index dc2cd2fce..4cdc3fa0f 100644
--- a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
@@ -14,40 +14,45 @@ import EntityLink from "../../entities/EntityLink";
 
 export default function OpenIdConnectApplicationSummary({
   entity,
+  hideExtra = false,
 }: {
   entity:
     | OpenIdConnectApplicationsPartialFragment
     | OpenIdConnectApplicationPartialFragment;
+  hideExtra?: boolean;
 }) {
   return (
     <EntitySummary
       entity={entity}
       route={paths.openIdConnectApplication}
       tags={[<Tag key="consentType">Consent Type "{entity.consentType}"</Tag>]}
-      extra={[
-        "isAuthorizedToManageNode" in entity &&
-          entity.isAuthorizedToManageNode && (
-            <UpdateOpenIdConnectApplication
-              key="updateApplication"
-              application={entity}
-            />
-          ),
-        "isAuthorizedToManageNode" in entity &&
-          entity.isAuthorizedToManageNode && (
-            <ResetOpenIdConnectApplicationClientSecret
-              key="resetApplicationClientSecret"
-              applicationId={entity.uuid}
-            />
-          ),
-        "isAuthorizedToManageNode" in entity &&
-          entity.isAuthorizedToManageNode && (
-            <DeleteOpenIdConnectApplication
-              key="deleteApplication"
-              applicationId={entity.uuid}
-              redirectTo={paths.institution(entity.owner.node.uuid)}
-            />
-          ),
-      ].filter(isTruthy)}
+      extra={
+        !hideExtra &&
+        [
+          "isAuthorizedToManageNode" in entity &&
+            entity.isAuthorizedToManageNode && (
+              <UpdateOpenIdConnectApplication
+                key="updateApplication"
+                application={entity}
+              />
+            ),
+          "isAuthorizedToManageNode" in entity &&
+            entity.isAuthorizedToManageNode && (
+              <ResetOpenIdConnectApplicationClientSecret
+                key="resetApplicationClientSecret"
+                applicationId={entity.uuid}
+              />
+            ),
+          "isAuthorizedToManageNode" in entity &&
+            entity.isAuthorizedToManageNode && (
+              <DeleteOpenIdConnectApplication
+                key="deleteApplication"
+                applicationId={entity.uuid}
+                redirectTo={paths.institution(entity.owner.node.uuid)}
+              />
+            ),
+        ].filter(isTruthy)
+      }
     >
       {(entity.redirectUri || entity.postLogoutRedirectUri) && (
         <div>
diff --git a/frontend/components/openIdConnect/applications/PaginatedOpenIdConnectApplications.tsx b/frontend/components/openIdConnect/applications/PaginatedOpenIdConnectApplications.tsx
index 14dc60c61..ae28eb3fa 100644
--- a/frontend/components/openIdConnect/applications/PaginatedOpenIdConnectApplications.tsx
+++ b/frontend/components/openIdConnect/applications/PaginatedOpenIdConnectApplications.tsx
@@ -1,28 +1,43 @@
 import {
   ApplicationsDocument,
   ApplicationsQueryVariables,
+  OpenIdConnectApplicationsPartialFragment,
 } from "../../../queries/openIdConnect.generated";
 import paths from "../../../paths";
 import OpenIdConnectApplicationList from "./OpenIdConnectApplicationList";
 import PaginatedEntities from "../../entities/PaginatedEntities";
+import {
+  OpenIdConnectApplicationFilterInput,
+  OpenIdConnectApplicationSortInput,
+} from "../../../__generated__/graphql";
 
 export default function PaginatedOpenIdConnectApplications({
   where,
+  order,
   showJump = false,
+  extra,
   loading,
 }: {
   where?: ApplicationsQueryVariables["where"];
+  order?: ApplicationsQueryVariables["order"];
+  extra?: React.ReactNode;
   showJump?: boolean;
   loading?: boolean;
 }) {
   return (
-    <PaginatedEntities
+    <PaginatedEntities<
+      OpenIdConnectApplicationsPartialFragment,
+      OpenIdConnectApplicationFilterInput,
+      OpenIdConnectApplicationSortInput
+    >
       loading={loading}
       where={where}
+      order={order}
       showJump={showJump}
       entitiesQuery={ApplicationsDocument}
       // namesQuery={ApplicationNamesDocument}
       route={paths.openIdConnectApplication}
+      extra={extra}
       list={(props) => <OpenIdConnectApplicationList {...props} />}
       filterDefinitions={[
         {
diff --git a/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx b/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
index a4848f58d..cdefa9fbb 100644
--- a/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
+++ b/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
@@ -72,10 +72,8 @@ export default function ResetOpenIdConnectApplicationClientSecret({
   };
 
   return (
-    <SafeDeleteButton
-      title="Reset Client Secret"
-      deleting={mutating}
-      onConfirm={mutate}
-    />
+    <SafeDeleteButton type="default" deleting={mutating} onConfirm={mutate}>
+      Reset Client Secret
+    </SafeDeleteButton>
   );
 }
diff --git a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
index 2fccc70fe..1eaae1aac 100644
--- a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
@@ -94,7 +94,11 @@ export default function UpdateOpenIdConnectApplication({
         open={open}
         title="Edit Application"
         // onOk={handleOk}
-        onCancel={() => setOpen(false)}
+        onCancel={() => {
+          setGlobalErrorMessages([]);
+          form.resetFields();
+          setOpen(false);
+        }}
         footer={false}
       >
         <ErrorAlert messages={globalErrorMessages} />
diff --git a/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx b/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx
index 30d046c74..9a7d833c6 100644
--- a/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx
+++ b/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx
@@ -1,28 +1,37 @@
 import { useMutation } from "@apollo/client/react";
 import {
+  ApplicationDocument,
+  AuthorizationsDocument,
   DeleteAuthorizationDocument,
   DeleteAuthorizationMutation,
 } from "../../../queries/openIdConnect.generated";
 import { Scalars } from "../../../__generated__/graphql";
-import { DocumentNode } from "graphql";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
 import SafeDeleteButton from "../../SafeDeleteButton";
 
 interface DeleteAuthorizationProps {
   authorizationId: Scalars["Uuid"]["input"];
-  refetchQueries: { query: DocumentNode; variables: { [key: string]: any } }[];
+  applicationId: Scalars["Uuid"]["input"];
 }
 
 export default function DeleteOpenIdConnectAuthorization({
   authorizationId,
-  refetchQueries,
+  applicationId,
 }: DeleteAuthorizationProps) {
   const [deleteAuthorizationMutation] = useMutation(
     DeleteAuthorizationDocument,
     {
       // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
       // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: refetchQueries,
+      refetchQueries: [
+        {
+          query: ApplicationDocument,
+          variables: {
+            uuid: applicationId,
+          },
+        },
+        AuthorizationsDocument,
+      ],
     },
   );
 
diff --git a/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationList.tsx b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationList.tsx
new file mode 100644
index 000000000..a2d73e208
--- /dev/null
+++ b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationList.tsx
@@ -0,0 +1,24 @@
+import { OpenIdConnectAuthorizationsPartialFragment } from "../../../queries/openIdConnect.generated";
+import EntityList from "../../entities/EntityList";
+import OpenIdConnectAuthorizationSummary from "./OpenIdConnectAuthorizationSummary";
+import EntityItem from "../../entities/EntityItem";
+
+export default function OpenIdConnectAuthorizationList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: OpenIdConnectAuthorizationsPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <OpenIdConnectAuthorizationSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx
new file mode 100644
index 000000000..4b1081266
--- /dev/null
+++ b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx
@@ -0,0 +1,37 @@
+import { OpenIdConnectAuthorizationsPartialFragment } from "../../../queries/openIdConnect.generated";
+import { Tag } from "antd";
+import { isTruthy } from "../../../lib/array";
+import EntitySummary from "../../entities/EntitySummary";
+import DeleteOpenIdConnectAuthorization from "./DeleteOpenIdConnectAuthorization";
+
+export default function OpenIdConnectAuthorizationSummary({
+  entity,
+  hideExtra = false,
+}: {
+  entity: OpenIdConnectAuthorizationsPartialFragment;
+  hideExtra?: boolean;
+}) {
+  return (
+    <EntitySummary
+      entity={entity}
+      tags={[
+        <Tag key="status">{entity.status}</Tag>,
+        <Tag key="type">{entity.type}</Tag>,
+      ]}
+      extra={
+        !hideExtra &&
+        [
+          entity.isAuthorizedToDeleteNode && (
+            <DeleteOpenIdConnectAuthorization
+              authorizationId={entity.uuid}
+              applicationId={entity.application.node.uuid}
+            />
+          ),
+        ].filter(isTruthy)
+      }
+    >
+      <div>Subject {entity.subject}</div>
+      <div>Created At {entity.createdAt}</div>
+    </EntitySummary>
+  );
+}
diff --git a/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationTable.tsx b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationTable.tsx
deleted file mode 100644
index 90a244b8d..000000000
--- a/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationTable.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { Space, Table, TableProps } from "antd";
-import { OpenIdConnectAuthorizationPartialFragment } from "../../../queries/openIdConnect.generated";
-import DeleteOpenIdConnectAuthorization from "./DeleteOpenIdConnectAuthorization";
-import { ApplicationDocument } from "../../../queries/openIdConnect.generated";
-import { Scalars } from "../../../__generated__/graphql";
-
-interface AuthorizationTableProps {
-  applicationId: Scalars["Uuid"]["input"];
-  authorizations: OpenIdConnectAuthorizationPartialFragment[];
-}
-
-export default function OpenIdConnectAutorizationTable({
-  applicationId,
-  authorizations,
-}: AuthorizationTableProps) {
-  const authorizationColumns: TableProps<OpenIdConnectAuthorizationPartialFragment>["columns"] =
-    [
-      {
-        title: "Satus",
-        dataIndex: "status",
-        key: "status",
-      },
-      {
-        title: "Type",
-        dataIndex: "type",
-        key: "type",
-      },
-      {
-        title: "Subject",
-        dataIndex: "subject",
-        key: "subject",
-      },
-      {
-        title: "Action",
-        key: "action",
-        render: (_, authorization) => (
-          <Space size="middle">
-            {authorization.isAuthorizedToDeleteNode ? (
-              <>
-                <DeleteOpenIdConnectAuthorization
-                  authorizationId={authorization.uuid}
-                  refetchQueries={[
-                    {
-                      query: ApplicationDocument,
-                      variables: {
-                        uuid: applicationId,
-                      },
-                    },
-                  ]}
-                />
-              </>
-            ) : (
-              <></>
-            )}
-          </Space>
-        ),
-      },
-    ];
-
-  return (
-    <>
-      <Table<OpenIdConnectAuthorizationPartialFragment>
-        columns={authorizationColumns}
-        dataSource={authorizations}
-      />
-    </>
-  );
-}
diff --git a/frontend/components/openIdConnect/authorizations/PaginatedOpenIdConnectAuthorizations.tsx b/frontend/components/openIdConnect/authorizations/PaginatedOpenIdConnectAuthorizations.tsx
new file mode 100644
index 000000000..5e2a59ba0
--- /dev/null
+++ b/frontend/components/openIdConnect/authorizations/PaginatedOpenIdConnectAuthorizations.tsx
@@ -0,0 +1,67 @@
+import {
+  AuthorizationsDocument,
+  AuthorizationsQueryVariables,
+  OpenIdConnectAuthorizationsPartialFragment,
+} from "../../../queries/openIdConnect.generated";
+import OpenIdConnectAuthorizationList from "./OpenIdConnectAuthorizationList";
+import PaginatedEntities from "../../entities/PaginatedEntities";
+import {
+  OpenIdConnectAuthorizationFilterInput,
+  OpenIdConnectAuthorizationSortInput,
+} from "../../../__generated__/graphql";
+
+export default function PaginatedOpenIdConnectAuthorizations({
+  where,
+  order,
+  extra,
+  loading,
+}: {
+  where?: AuthorizationsQueryVariables["where"];
+  order?: AuthorizationsQueryVariables["order"];
+  extra?: React.ReactNode;
+  showJump?: boolean;
+  loading?: boolean;
+}) {
+  return (
+    <PaginatedEntities<
+      OpenIdConnectAuthorizationsPartialFragment,
+      OpenIdConnectAuthorizationFilterInput,
+      OpenIdConnectAuthorizationSortInput
+    >
+      loading={loading}
+      where={where}
+      order={order}
+      showJump={false}
+      entitiesQuery={AuthorizationsDocument}
+      extra={extra}
+      list={(props) => <OpenIdConnectAuthorizationList {...props} />}
+      filterDefinitions={[
+        {
+          field: "status",
+          type: "string",
+        },
+        {
+          field: "subject",
+          type: "string",
+        },
+        {
+          field: "type",
+          type: "string",
+        },
+        {
+          field: "id",
+
+          type: "uuid",
+        },
+      ]}
+      sortDefinitions={[
+        { field: "status" },
+        { field: "subject" },
+        { field: "type" },
+        { field: "createdAt" },
+        { field: "updatedAt" },
+        { field: "id" },
+      ]}
+    />
+  );
+}
diff --git a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx
new file mode 100644
index 000000000..48f9f2b26
--- /dev/null
+++ b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx
@@ -0,0 +1,24 @@
+import { OpenIdConnectTokensPartialFragment } from "../../../queries/openIdConnect.generated";
+import EntityList from "../../entities/EntityList";
+import OpenIdConnectTokenSummary from "./OpenIdConnectTokenSummary";
+import EntityItem from "../../entities/EntityItem";
+
+export default function OpenIdConnectTokenList({
+  loading,
+  nodes,
+}: {
+  loading: boolean;
+  nodes: OpenIdConnectTokensPartialFragment[];
+}) {
+  return (
+    <EntityList
+      loading={loading}
+      dataSource={nodes}
+      renderItem={(node) => (
+        <EntityItem>
+          <OpenIdConnectTokenSummary entity={node} />
+        </EntityItem>
+      )}
+    />
+  );
+}
diff --git a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx
new file mode 100644
index 000000000..38271479a
--- /dev/null
+++ b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx
@@ -0,0 +1,61 @@
+import { OpenIdConnectTokensPartialFragment } from "../../../queries/openIdConnect.generated";
+import { Tag } from "antd";
+import { isTruthy } from "../../../lib/array";
+import EntitySummary from "../../entities/EntitySummary";
+import RevokeOpenIdConnectToken from "./RevokeOpenIdConnectToken";
+import { humanize } from "../../../lib/string";
+
+export default function OpenIdConnectTokenSummary({
+  entity,
+  hideExtra = false,
+}: {
+  entity: OpenIdConnectTokensPartialFragment;
+  hideExtra?: boolean;
+}) {
+  const dateTimes = [
+    {
+      key: "createdAt",
+      value: entity.createdAt,
+    },
+    {
+      key: "expiredAt",
+      value: entity.expiredAt,
+    },
+    {
+      key: "redeemedAt",
+      value: entity.redeemedAt,
+    },
+  ].filter((x) => x.value != null);
+
+  return (
+    <EntitySummary
+      entity={entity}
+      tags={[
+        <Tag key="status">{entity.status}</Tag>,
+        <Tag key="type">{entity.type}</Tag>,
+      ]}
+      extra={
+        !hideExtra &&
+        [
+          entity.isAuthorizedToRevokeNode && (
+            <RevokeOpenIdConnectToken
+              tokenId={entity.uuid}
+              applicationId={entity.application.node.uuid}
+            />
+          ),
+        ].filter(isTruthy)
+      }
+    >
+      <div>Subject {entity.subject}</div>
+      {dateTimes.length > 0 && (
+        <div>
+          {dateTimes.map((x) => (
+            <div key={x.key}>
+              {humanize(x.key, "all-upper")} {x.value}
+            </div>
+          ))}
+        </div>
+      )}
+    </EntitySummary>
+  );
+}
diff --git a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenTable.tsx b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenTable.tsx
deleted file mode 100644
index 822efdfe0..000000000
--- a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenTable.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Space, Table, TableProps } from "antd";
-import { OpenIdConnectTokenPartialFragment } from "../../../queries/openIdConnect.generated";
-import RevokeOpenIdConnectToken from "./RevokeOpenIdConnectToken";
-
-interface TokenTableProps {
-  tokens: OpenIdConnectTokenPartialFragment[];
-}
-
-export default function OpenIdConnectTokenTable({ tokens }: TokenTableProps) {
-  const tokenColumns: TableProps<OpenIdConnectTokenPartialFragment>["columns"] =
-    [
-      {
-        title: "Satus",
-        dataIndex: "status",
-        key: "status",
-      },
-      {
-        title: "Type",
-        dataIndex: "type",
-        key: "type",
-      },
-      {
-        title: "Subject",
-        dataIndex: "subject",
-        key: "subject",
-      },
-      {
-        title: "Expiration Date",
-        dataIndex: "expiredAt",
-        key: "expiredAt",
-      },
-      {
-        title: "Action",
-        key: "action",
-        render: (_, token) => (
-          <Space size="middle">
-            {token.isAuthorizedToRevokeNode ? (
-              <>
-                <RevokeOpenIdConnectToken tokenId={token.uuid} />
-              </>
-            ) : (
-              <></>
-            )}
-          </Space>
-        ),
-      },
-    ];
-
-  return (
-    <Table<OpenIdConnectTokenPartialFragment>
-      columns={tokenColumns}
-      dataSource={tokens}
-    />
-  );
-}
diff --git a/frontend/components/openIdConnect/tokens/PaginatedOpenIdConnectTokens.tsx b/frontend/components/openIdConnect/tokens/PaginatedOpenIdConnectTokens.tsx
new file mode 100644
index 000000000..dd8cadcd9
--- /dev/null
+++ b/frontend/components/openIdConnect/tokens/PaginatedOpenIdConnectTokens.tsx
@@ -0,0 +1,90 @@
+import {
+  TokensDocument,
+  TokensQueryVariables,
+  OpenIdConnectTokensPartialFragment,
+} from "../../../queries/openIdConnect.generated";
+import OpenIdConnectTokenList from "./OpenIdConnectTokenList";
+import PaginatedEntities from "../../entities/PaginatedEntities";
+import {
+  OpenIdConnectTokenFilterInput,
+  OpenIdConnectTokenSortInput,
+} from "../../../__generated__/graphql";
+
+export default function PaginatedOpenIdConnectTokens({
+  where,
+  order,
+  extra,
+  loading,
+}: {
+  where?: TokensQueryVariables["where"];
+  order?: TokensQueryVariables["order"];
+  extra?: React.ReactNode;
+  showJump?: boolean;
+  loading?: boolean;
+}) {
+  return (
+    <PaginatedEntities<
+      OpenIdConnectTokensPartialFragment,
+      OpenIdConnectTokenFilterInput,
+      OpenIdConnectTokenSortInput
+    >
+      loading={loading}
+      where={where}
+      order={order}
+      showJump={false}
+      entitiesQuery={TokensDocument}
+      extra={extra}
+      list={(props) => <OpenIdConnectTokenList {...props} />}
+      filterDefinitions={[
+        {
+          field: "status",
+          type: "string",
+        },
+        {
+          field: "subject",
+          type: "string",
+        },
+        {
+          field: "type",
+          type: "string",
+        },
+        {
+          field: "authorization",
+          type: "object",
+          items: [
+            {
+              field: "id",
+              type: "uuid",
+            },
+            {
+              field: "status",
+              type: "string",
+            },
+            {
+              field: "subject",
+              type: "string",
+            },
+            {
+              field: "type",
+              type: "string",
+            },
+          ],
+        },
+        {
+          field: "id",
+          type: "uuid",
+        },
+      ]}
+      sortDefinitions={[
+        { field: "status" },
+        { field: "subject" },
+        { field: "type" },
+        { field: "createdAt" },
+        { field: "expiredAt" },
+        { field: "redeemedAt" },
+        { field: "updatedAt" },
+        { field: "id" },
+      ]}
+    />
+  );
+}
diff --git a/frontend/components/openIdConnect/tokens/RevokeOpenIdConnectToken.tsx b/frontend/components/openIdConnect/tokens/RevokeOpenIdConnectToken.tsx
index 439c9503b..95a97a62f 100644
--- a/frontend/components/openIdConnect/tokens/RevokeOpenIdConnectToken.tsx
+++ b/frontend/components/openIdConnect/tokens/RevokeOpenIdConnectToken.tsx
@@ -1,7 +1,9 @@
 import { useMutation } from "@apollo/client/react";
 import {
+  ApplicationDocument,
   RevokeTokenDocument,
   RevokeTokenMutation,
+  TokensDocument,
 } from "../../../queries/openIdConnect.generated";
 import { Scalars } from "../../../__generated__/graphql";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
@@ -9,12 +11,26 @@ import DeleteButton from "../../DeleteButton";
 
 interface RevokeTokenProps {
   tokenId: Scalars["Uuid"]["input"];
+  applicationId: Scalars["Uuid"]["input"];
 }
 
 export default function RevokeOpenIdConnectToken({
   tokenId,
+  applicationId,
 }: RevokeTokenProps) {
-  const [revokeTokenMutation] = useMutation(RevokeTokenDocument, {});
+  const [revokeTokenMutation] = useMutation(RevokeTokenDocument, {
+    // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
+    // See https://www.apollographql.com/docs/react/data/mutations/#options
+    refetchQueries: [
+      {
+        query: ApplicationDocument,
+        variables: {
+          uuid: applicationId,
+        },
+      },
+      TokensDocument,
+    ],
+  });
 
   const { mutating, withMutationHandler, messageErrors } =
     useMutationHandler<RevokeTokenMutation>({
@@ -37,5 +53,9 @@ export default function RevokeOpenIdConnectToken({
     );
   };
 
-  return <DeleteButton title="Revoke" deleting={mutating} onClick={mutate} />;
+  return (
+    <DeleteButton deleting={mutating} onClick={mutate}>
+      Revoke
+    </DeleteButton>
+  );
 }
diff --git a/frontend/components/users/PaginatedUsers.tsx b/frontend/components/users/PaginatedUsers.tsx
index 6d2561252..644ef6df1 100644
--- a/frontend/components/users/PaginatedUsers.tsx
+++ b/frontend/components/users/PaginatedUsers.tsx
@@ -2,25 +2,33 @@ import {
   UsersDocument,
   UserNamesDocument,
   UsersQueryVariables,
+  UsersPartialFragment,
 } from "../../queries/users.generated";
 import paths from "../../paths";
 import UserList from "./UserList";
 import PaginatedEntities from "../entities/PaginatedEntities";
+import { UserFilterInput, UserSortInput } from "../../__generated__/graphql";
 
 export default function PaginatedUsers({
   where,
+  order,
   showJump = false,
+  extra,
 }: {
   where?: UsersQueryVariables["where"];
+  order?: UsersQueryVariables["order"];
   showJump?: boolean;
+  extra?: React.ReactNode;
 }) {
   return (
-    <PaginatedEntities
+    <PaginatedEntities<UsersPartialFragment, UserFilterInput, UserSortInput>
       entitiesQuery={UsersDocument}
       namesQuery={UserNamesDocument}
       where={where}
+      order={order}
       showJump={showJump}
       route={paths.user}
+      extra={extra}
       list={(props) => <UserList {...props} />}
       filterDefinitions={[
         {
diff --git a/frontend/components/users/User.tsx b/frontend/components/users/User.tsx
index c6b840c76..03986ecb7 100644
--- a/frontend/components/users/User.tsx
+++ b/frontend/components/users/User.tsx
@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client/react";
-import { Skeleton, Result, Card, Flex, Divider } from "antd";
+import { Skeleton, Result, Card, Flex, Divider, Typography, Space } from "antd";
 import { UserDocument } from "../../queries/users.generated";
 import { Scalars } from "../../__generated__/graphql";
 import paths from "../../paths";
@@ -12,6 +12,8 @@ import EntityLink from "../entities/EntityLink";
 import InlineList from "../InlineList";
 import EnumTag from "../EnumTag";
 import QueryToolbar from "../QueryToolbar";
+import RemoveInstitutionRepresentative from "../institutions/RemoveInstitutionRepresentative";
+import RemoveUserMethodDeveloper from "../methods/RemoveUserMethodDeveloper";
 
 interface UserProps {
   userId: Scalars["Uuid"]["input"];
@@ -49,10 +51,10 @@ export default function User({ userId }: UserProps) {
           The following institutions asked to add you as representative. Confirm
           or deny their request:{" "}
           <InlineList
-            items={asReadonlyMixed(user.representedInstitutions.edges)}
+            items={asReadonlyMixed(user.pendingRepresentedInstitutions.edges)}
             renderItem={(edge) => (
-              <span key={edge.node.id}>
-                <EntityLink entity={edge.node} route={paths.institution} />{" "}
+              <Space key={edge.node.id}>
+                <EntityLink entity={edge.node} route={paths.institution} />
                 <EnumTag color="grey" variant="outlined">
                   {edge.role}
                 </EnumTag>
@@ -60,7 +62,15 @@ export default function User({ userId }: UserProps) {
                   userId={user.uuid}
                   institutionId={edge.node.uuid}
                 />
-              </span>
+                {edge.isAuthorizedToRemoveEdge && (
+                  <RemoveInstitutionRepresentative
+                    userId={user.uuid}
+                    institutionId={edge.node.uuid}
+                  >
+                    Deny
+                  </RemoveInstitutionRepresentative>
+                )}
+              </Space>
             )}
           />
         </div>
@@ -74,13 +84,21 @@ export default function User({ userId }: UserProps) {
           <InlineList
             items={user.pendingDevelopedMethods.edges}
             renderItem={(edge) => (
-              <span key={edge.node.uuid}>
-                <EntityLink entity={edge.node} route={paths.method} />{" "}
+              <Space key={edge.node.uuid}>
+                <EntityLink entity={edge.node} route={paths.method} />
                 <ConfirmUserMethodDeveloper
                   userId={user.uuid}
                   methodId={edge.node.uuid}
                 />
-              </span>
+                {edge.isAuthorizedToRemoveEdge && (
+                  <RemoveUserMethodDeveloper
+                    userId={user.uuid}
+                    methodId={edge.node.uuid}
+                  >
+                    Deny
+                  </RemoveUserMethodDeveloper>
+                )}
+              </Space>
             )}
           />
         </div>
@@ -93,6 +111,7 @@ export default function User({ userId }: UserProps) {
       {pending.length > 0 && (
         <>
           <Divider />
+          <Typography.Title level={4}>Pending</Typography.Title>
           <Flex vertical gap="medium">
             {pending}
           </Flex>
diff --git a/frontend/components/users/UserSummary.tsx b/frontend/components/users/UserSummary.tsx
index 194a3af99..1030956b1 100644
--- a/frontend/components/users/UserSummary.tsx
+++ b/frontend/components/users/UserSummary.tsx
@@ -13,11 +13,14 @@ import DeleteUser from "./DeleteUser";
 import RemoveInstitutionRepresentative from "../institutions/RemoveInstitutionRepresentative";
 import AddUserRole from "./AddUserRole";
 import EnumTag from "../EnumTag";
+import { Space } from "antd";
 
 export default function UserSummary({
   entity,
+  hideExtra = false,
 }: {
   entity: UsersPartialFragment | UserPartialFragment;
+  hideExtra?: boolean;
 }) {
   const rolesCurrentUserCanAndMayWantToAdd =
     "rolesCurrentUserCanAdd" in entity &&
@@ -36,12 +39,14 @@ export default function UserSummary({
             userId={entity.uuid}
             role={role}
             canRemove={
+              !hideExtra &&
               "rolesCurrentUserCanRemove" in entity &&
               entity.rolesCurrentUserCanRemove?.includes(role)
             }
           />
         )) ?? []),
-        rolesCurrentUserCanAndMayWantToAdd &&
+        !hideExtra &&
+          rolesCurrentUserCanAndMayWantToAdd &&
           rolesCurrentUserCanAndMayWantToAdd.length > 0 && (
             <AddUserRole
               userId={entity.uuid}
@@ -49,12 +54,15 @@ export default function UserSummary({
             />
           ),
       ].filter(isTruthy)}
-      extra={[
-        "isAuthorizedToDeleteUser" in entity &&
-          entity.isAuthorizedToDeleteUser && (
-            <DeleteUser userId={entity.uuid} />
-          ),
-      ].filter(isTruthy)}
+      extra={
+        !hideExtra &&
+        [
+          "isAuthorizedToDeleteUser" in entity &&
+            entity.isAuthorizedToDeleteUser && (
+              <DeleteUser userId={entity.uuid} />
+            ),
+        ].filter(isTruthy)
+      }
     >
       <ContactInformation contact={entity.contact} />
       {entity.representedInstitutions.edges.length > 0 && (
@@ -63,19 +71,20 @@ export default function UserSummary({
           <InlineList
             items={asReadonlyMixed(entity.representedInstitutions.edges)}
             renderItem={(edge) => (
-              <span key={edge.node.id}>
-                <EntityLink entity={edge.node} route={paths.institution} />{" "}
+              <Space key={edge.node.id}>
+                <EntityLink entity={edge.node} route={paths.institution} />
                 <EnumTag color="grey" variant="outlined">
                   {edge.role}
                 </EnumTag>
-                {"isAuthorizedToRemoveEdge" in edge &&
+                {!hideExtra &&
+                  "isAuthorizedToRemoveEdge" in edge &&
                   edge.isAuthorizedToRemoveEdge && (
                     <RemoveInstitutionRepresentative
                       institutionId={edge.node.uuid}
                       userId={entity.uuid}
                     />
                   )}
-              </span>
+              </Space>
             )}
           />
         </div>
diff --git a/frontend/lib/hooks/usePaginatedQuery.ts b/frontend/lib/hooks/usePaginatedQuery.ts
index e9fb5bdee..dd7c585c6 100644
--- a/frontend/lib/hooks/usePaginatedQuery.ts
+++ b/frontend/lib/hooks/usePaginatedQuery.ts
@@ -2,7 +2,6 @@ import { useState, useMemo, useEffect } from "react";
 import { TypedDocumentNode } from "@apollo/client";
 import { useQuery } from "@apollo/client/react";
 import { Connection } from "../connection";
-import { useQueryHandler } from "./useQueryHandler";
 import { initialPageSize, PaginationProps } from "../../components/Pagination";
 
 export type QueryData<TNode> = {
@@ -57,7 +56,9 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
     variables,
     notifyOnNetworkStatusChange: true,
   });
-  useQueryHandler({ error });
+  if (error) {
+    console.error(error);
+  }
 
   // Reset: If where OR order change, jump back to page 1
   useEffect(() => {
diff --git a/frontend/pages/gnupg-keys/[fingerprint].tsx b/frontend/pages/gnupg-keys/[fingerprint].tsx
new file mode 100644
index 000000000..b456737f9
--- /dev/null
+++ b/frontend/pages/gnupg-keys/[fingerprint].tsx
@@ -0,0 +1,22 @@
+import { useRouter } from "next/router";
+import GnuPgKey from "../../components/gnuPgKeys/GnuPgKey";
+import Layout from "../../components/Layout";
+
+function Page() {
+  const router = useRouter();
+
+  if (!router.isReady) {
+    // Otherwise `fingerprint`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
+    return null;
+  }
+
+  const { fingerprint } = router.query;
+
+  return (
+    <Layout>
+      <GnuPgKey fingerprint={String(fingerprint)} />
+    </Layout>
+  );
+}
+
+export default Page;
diff --git a/frontend/pages/gnupg-keys/index.tsx b/frontend/pages/gnupg-keys/index.tsx
new file mode 100644
index 000000000..2453d533c
--- /dev/null
+++ b/frontend/pages/gnupg-keys/index.tsx
@@ -0,0 +1,22 @@
+import Layout from "../../components/Layout";
+import paths from "../../paths";
+import { Typography } from "antd";
+import Link from "next/link";
+import PaginatedGnuPgKeys from "../../components/gnuPgKeys/PaginatedGnuPgKeys";
+
+export default function Page() {
+  return (
+    <Layout>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        GnuPG keys of <Link href={paths.institutions}>institutions</Link> used
+        for approvals of <Link href={paths.allData}>data</Link> or GraphQL query
+        responses.
+      </Typography.Paragraph>
+      <PaginatedGnuPgKeys showJump />
+      <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
+        The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
+        provides all information about GnuPG keys.
+      </Typography.Paragraph>
+    </Layout>
+  );
+}
diff --git a/frontend/pages/institutions/index.tsx b/frontend/pages/institutions/index.tsx
index 553cf78fe..9a9b9ba42 100644
--- a/frontend/pages/institutions/index.tsx
+++ b/frontend/pages/institutions/index.tsx
@@ -7,6 +7,7 @@ import { CurrentUserDocument } from "../../queries/currentUser.generated";
 import PendingInstitutionList from "../../components/institutions/PendingInstitutionList";
 import { UserRole } from "../../__generated__/graphql";
 import PaginatedInstitutions from "../../components/institutions/PaginatedInstitutions";
+import CreateInstitution from "../../components/institutions/CreateInstitution";
 
 export default function Page() {
   const currentUser = useQuery(CurrentUserDocument)?.data?.currentUser;
@@ -20,10 +21,12 @@ export default function Page() {
         <Link href={paths.dataFormats}>data formats</Link> and{" "}
         <Link href={paths.methods}>methods</Link>.
       </Typography.Paragraph>
-      {currentUser && (
-        <Link href={paths.institutionCreate}>Create Institution</Link>
-      )}
-      <PaginatedInstitutions showJump />
+      <PaginatedInstitutions
+        showJump
+        extra={
+          currentUser && <CreateInstitution ownerIds={[currentUser.uuid]} />
+        }
+      />
       <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         provides all information about institutions.
diff --git a/frontend/paths.ts b/frontend/paths.ts
index 13836d908..1a207b84f 100644
--- a/frontend/paths.ts
+++ b/frontend/paths.ts
@@ -55,9 +55,9 @@ export default {
   component(id: Scalars["Uuid"]["output"]) {
     return `/components/${encodeURIComponent(id)}` as Route;
   },
-  gnuPgKeyFingerprints: "/gnuPgKeys" as Route,
-  gnuPgKeyFingerprint(fingerprint: string) {
-    return `/gnuPgKeys/${encodeURIComponent(fingerprint)}` as Route;
+  gnuPgKeys: "/gnupg-keys" as Route,
+  gnuPgKey(fingerprint: string) {
+    return `/gnupg-keys/${encodeURIComponent(fingerprint)}` as Route;
   },
   allData: "/data" as Route,
   data(
diff --git a/frontend/queries/databases.graphql b/frontend/queries/databases.graphql
index 42c6de2a0..304477a1f 100644
--- a/frontend/queries/databases.graphql
+++ b/frontend/queries/databases.graphql
@@ -77,6 +77,31 @@ query Databases(
   }
 }
 
+query AnyDatabases(
+  $first: Int!
+  $after: String
+  $where: DatabaseFilterInput
+  $order: [DatabaseSortInput!]
+) {
+  connection: anyDatabases(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+    edges {
+      node {
+        ...DatabasesPartial
+      }
+    }
+  }
+}
+
 query PendingDatabases {
   pendingDatabases {
     edges {
diff --git a/frontend/queries/gnuPgKeyFingerprints.graphql b/frontend/queries/gnuPgKeyFingerprints.graphql
index ed2cd9bd7..a37a7a0a5 100644
--- a/frontend/queries/gnuPgKeyFingerprints.graphql
+++ b/frontend/queries/gnuPgKeyFingerprints.graphql
@@ -7,13 +7,16 @@ fragment GnuPgKeyFingerprintsPartial on GnuPgKeyFingerprint {
   forbiddenAt
   user {
     node {
+      id
       uuid
       name
     }
   }
   institution {
     node {
+      id
       uuid
+      name
     }
   }
   isAuthorizedToAllowNode
diff --git a/frontend/queries/openIdConnect.graphql b/frontend/queries/openIdConnect.graphql
index 83ed2704a..645571ee8 100644
--- a/frontend/queries/openIdConnect.graphql
+++ b/frontend/queries/openIdConnect.graphql
@@ -21,19 +21,28 @@ fragment OpenIdConnectApplicationsPartial on OpenIdConnectApplication {
   }
 }
 
-fragment OpenIdConnectAuthorizationPartial on OpenIdConnectAuthorization {
+fragment OpenIdConnectAuthorizationsPartial on OpenIdConnectAuthorization {
   id
   uuid
+  name: uuid
   createdAt
   status
   subject
   type
   isAuthorizedToDeleteNode
+  application {
+    node {
+      id
+      uuid
+      name: clientId
+    }
+  }
 }
 
-fragment OpenIdConnectTokenPartial on OpenIdConnectToken {
+fragment OpenIdConnectTokensPartial on OpenIdConnectToken {
   id
   uuid
+  name: uuid
   createdAt
   expiredAt
   redeemedAt
@@ -41,6 +50,20 @@ fragment OpenIdConnectTokenPartial on OpenIdConnectToken {
   subject
   type
   isAuthorizedToRevokeNode
+  authorization {
+    node {
+      id
+      uuid
+      name: uuid
+    }
+  }
+  application {
+    node {
+      id
+      uuid
+      name: clientId
+    }
+  }
 }
 
 fragment OpenIdConnectApplicationPartial on OpenIdConnectApplication {
@@ -48,19 +71,9 @@ fragment OpenIdConnectApplicationPartial on OpenIdConnectApplication {
   isAuthorizedToManageNode
   authorizations {
     totalCount
-    edges {
-      node {
-        ...OpenIdConnectAuthorizationPartial
-      }
-    }
   }
   tokens {
     totalCount
-    edges {
-      node {
-        ...OpenIdConnectTokenPartial
-      }
-    }
   }
 }
 
@@ -172,6 +185,31 @@ mutation DeleteApplication($input: DeleteOpenIdConnectApplicationInput!) {
   }
 }
 
+query Authorizations(
+  $first: Int!
+  $after: String
+  $where: OpenIdConnectAuthorizationFilterInput
+  $order: [OpenIdConnectAuthorizationSortInput!]
+) {
+  connection: openIdConnectAuthorizations(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+    edges {
+      node {
+        ...OpenIdConnectAuthorizationsPartial
+      }
+    }
+  }
+}
+
 mutation DeleteAuthorization($input: DeleteOpenIdConnectAuthorizationInput!) {
   deleteOpenIdConnectAuthorization(input: $input) {
     errors {
@@ -182,6 +220,31 @@ mutation DeleteAuthorization($input: DeleteOpenIdConnectAuthorizationInput!) {
   }
 }
 
+query Tokens(
+  $first: Int!
+  $after: String
+  $where: OpenIdConnectTokenFilterInput
+  $order: [OpenIdConnectTokenSortInput!]
+) {
+  connection: openIdConnectTokens(
+    first: $first
+    after: $after
+    where: $where
+    order: $order
+  ) {
+    totalCount
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+    edges {
+      node {
+        ...OpenIdConnectTokensPartial
+      }
+    }
+  }
+}
+
 mutation RevokeToken($input: RevokeOpenIdConnectTokenInput!) {
   revokeOpenIdConnectToken(input: $input) {
     token {
diff --git a/frontend/queries/users.graphql b/frontend/queries/users.graphql
index c6ca0f3df..1771d83ba 100644
--- a/frontend/queries/users.graphql
+++ b/frontend/queries/users.graphql
@@ -41,6 +41,7 @@ fragment UserPartial on User {
         uuid
         name
       }
+      isAuthorizedToRemoveEdge
     }
   }
   pendingDevelopedMethods {
@@ -51,6 +52,7 @@ fragment UserPartial on User {
         uuid
         name
       }
+      isAuthorizedToRemoveEdge
     }
     isAuthorizedToConfirmEdges
   }
@@ -75,6 +77,7 @@ fragment UserPartial on User {
         name
       }
       role
+      isAuthorizedToRemoveEdge
     }
     isAuthorizedToConfirmEdges
   }
diff --git a/frontend/type-defs.graphqls b/frontend/type-defs.graphqls
index 77b33725d..f3c841933 100644
--- a/frontend/type-defs.graphqls
+++ b/frontend/type-defs.graphqls
@@ -3,50 +3,505 @@ schema {
   mutation: Mutation
 }
 
-interface Approval {
-  approverId: Uuid!
-  keyFingerprint: String!
-  message: String!
-  query: String!
-  signature: String!
-  timestamp: DateTime!
-  variables: Any!
-}
-
-interface Data {
-  appliedMethod: AppliedMethod!
-  approvals: [DataApproval!]!
-  component: Component
-  componentId: Uuid!
-  createdAt: DateTime!
-  creator: Institution
-  creatorId: Uuid!
-  database: Database
-  databaseId: Uuid!
-  description: String
-  id: ID!
-  kind: DataKind!
-  locale: Locale!
-  name: String
-  resources: [GetHttpsResource!]!
-  resourceTree: GetHttpsResourceTree!
-  timestamp: DateTime!
-  uuid: Uuid!
-  warnings: [String!]!
-}
-
-interface GetHttpsResourceTreeVertex {
-  value: GetHttpsResource!
-}
-
-"The node interface is implemented by entities that have a global unique identifier."
-interface Node {
-  id: ID!
+type Query {
+  allCalorimetricData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: String
+    where: CalorimetricDataPropositionInput
+  ): CalorimetricDataConnection! @cost(weight: "10")
+  allGeometricData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: String
+    where: GeometricDataPropositionInput
+  ): GeometricDataConnection! @cost(weight: "10")
+  allHygrothermalData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: String
+    where: HygrothermalDataPropositionInput
+  ): HygrothermalDataConnection! @cost(weight: "10")
+  allLifeCycleData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: String
+    where: LifeCycleDataPropositionInput
+  ): LifeCycleDataConnection! @cost(weight: "10")
+  allOpticalData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: String
+    where: OpticalDataPropositionInput
+  ): OpticalDataConnection! @cost(weight: "10")
+  allPhotovoltaicData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: String
+    where: PhotovoltaicDataPropositionInput
+  ): PhotovoltaicDataConnection! @cost(weight: "10")
+  anyDatabases(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [DatabaseSortInput!] @cost(weight: "10")
+    where: DatabaseFilterInput @cost(weight: "10")
+  ): AnyDatabasesConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  calorimetricData(databaseId: Uuid!, id: Uuid!, locale: String): CalorimetricData
+    @cost(weight: "10")
+  component(id: Uuid!): Component @cost(weight: "10")
+  components(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [ComponentSortInput!] @cost(weight: "10")
+    where: ComponentFilterInput @cost(weight: "10")
+  ): ComponentsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  currentInstitution: Institution @cost(weight: "10")
+  currentOpenIdConnectApplication: OpenIdConnectApplication @cost(weight: "10")
+  currentUser: User @cost(weight: "10")
+  database(id: Uuid!): Database @cost(weight: "10")
+  databases(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [DatabaseSortInput!] @cost(weight: "10")
+    where: DatabaseFilterInput @cost(weight: "10")
+  ): DatabasesConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  dataFormat(id: Uuid!): DataFormat @cost(weight: "10")
+  dataFormats(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [DataFormatSortInput!] @cost(weight: "10")
+    where: DataFormatFilterInput @cost(weight: "10")
+  ): DataFormatsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  geometricData(databaseId: Uuid!, id: Uuid!, locale: String): GeometricData
+    @cost(weight: "10")
+  gnuPgKeyFingerprint(fingerprint: String!): GnuPgKeyFingerprint
+    @cost(weight: "10")
+  gnuPgKeyFingerprints(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [GnuPgKeyFingerprintSortInput!] @cost(weight: "10")
+    where: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  ): GnuPgKeyFingerprintsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  hasCalorimetricData(locale: String, where: CalorimetricDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasGeometricData(locale: String, where: GeometricDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasHygrothermalData(locale: String, where: HygrothermalDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasLifeCycleData(locale: String, where: LifeCycleDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasOpticalData(locale: String, where: OpticalDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasPhotovoltaicData(locale: String, where: PhotovoltaicDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hygrothermalData(databaseId: Uuid!, id: Uuid!, locale: String): HygrothermalData
+    @cost(weight: "10")
+  institution(id: Uuid!): Institution @cost(weight: "10")
+  institutions(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionSortInput!] @cost(weight: "10")
+    where: InstitutionFilterInput @cost(weight: "10")
+  ): InstitutionsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  lifeCycleData(databaseId: Uuid!, id: Uuid!, locale: String): LifeCycleData
+    @cost(weight: "10")
+  method(id: Uuid!): Method @cost(weight: "10")
+  methods(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [MethodSortInput!] @cost(weight: "10")
+    where: MethodFilterInput @cost(weight: "10")
+  ): MethodsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  "Fetches an object given its ID."
+  node("ID of the object." id: ID!): Node @cost(weight: "10")
+  "Lookup nodes by a list of IDs."
+  nodes("The list of node IDs." ids: [ID!]!): [Node]! @cost(weight: "10")
+  openIdConnectApplication(id: Uuid!): OpenIdConnectApplication
+    @cost(weight: "10")
+  openIdConnectApplications(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [OpenIdConnectApplicationSortInput!] @cost(weight: "10")
+    where: OpenIdConnectApplicationFilterInput @cost(weight: "10")
+  ): OpenIdConnectApplicationsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  openIdConnectAuthorization(id: Uuid!): OpenIdConnectAuthorization
+    @cost(weight: "10")
+  openIdConnectAuthorizations(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [OpenIdConnectAuthorizationSortInput!] @cost(weight: "10")
+    where: OpenIdConnectAuthorizationFilterInput @cost(weight: "10")
+  ): OpenIdConnectAuthorizationsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  openIdConnectToken(id: Uuid!): OpenIdConnectToken @cost(weight: "10")
+  openIdConnectTokens(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [OpenIdConnectTokenSortInput!] @cost(weight: "10")
+    where: OpenIdConnectTokenFilterInput @cost(weight: "10")
+  ): OpenIdConnectTokensConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  opticalData(databaseId: Uuid!, id: Uuid!, locale: String): OpticalData
+    @cost(weight: "10")
+  pendingDatabases(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [DatabaseSortInput!] @cost(weight: "10")
+    where: DatabaseFilterInput @cost(weight: "10")
+  ): PendingDatabasesConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  pendingInstitutions(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionSortInput!] @cost(weight: "10")
+    where: InstitutionFilterInput @cost(weight: "10")
+  ): PendingInstitutionsConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
+  photovoltaicData(databaseId: Uuid!, id: Uuid!, locale: String): PhotovoltaicData
+    @cost(weight: "10")
+  user(id: Uuid!): User @cost(weight: "10")
+  users(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [UserSortInput!] @cost(weight: "10")
+    where: UserFilterInput @cost(weight: "10")
+  ): UsersConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
 }
 
-interface UserError {
-  message: String!
-  path: [String!]!
+type Mutation {
+  addComponentAssembly(input: AddComponentAssemblyInput!): AddComponentAssemblyPayload!
+    @cost(weight: "10")
+  addComponentGeneralization(input: AddComponentGeneralizationInput!): AddComponentGeneralizationPayload!
+    @cost(weight: "10")
+  addComponentManufacturer(input: AddComponentManufacturerInput!): AddComponentManufacturerPayload!
+    @cost(weight: "10")
+  addComponentVariant(input: AddComponentVariantInput!): AddComponentVariantPayload!
+    @cost(weight: "10")
+  addGnuPgKeyFingerprint(input: AddGnuPgKeyFingerprintInput!): AddGnuPgKeyFingerprintPayload!
+    @cost(weight: "10")
+  addInstitutionMethodDeveloper(input: AddInstitutionMethodDeveloperInput!): AddInstitutionMethodDeveloperPayload!
+    @cost(weight: "10")
+  addInstitutionRepresentative(input: AddInstitutionRepresentativeInput!): AddInstitutionRepresentativePayload!
+    @cost(weight: "10")
+  addUserMethodDeveloper(input: AddUserMethodDeveloperInput!): AddUserMethodDeveloperPayload!
+    @cost(weight: "10")
+  addUserRole(input: AddUserRoleInput!): AddUserRolePayload! @cost(weight: "10")
+  allowGnuPgKeyFingerprint(input: AllowGnuPgKeyFingerprintInput!): AllowGnuPgKeyFingerprintPayload!
+    @cost(weight: "10")
+  changeInstitutionRepresentativeRole(
+    input: ChangeInstitutionRepresentativeRoleInput!
+  ): ChangeInstitutionRepresentativeRolePayload! @cost(weight: "10")
+  changeUserEmail(input: ChangeUserEmailInput!): ChangeUserEmailPayload!
+    @cost(weight: "10")
+  changeUserPassword(input: ChangeUserPasswordInput!): ChangeUserPasswordPayload!
+    @cost(weight: "10")
+  confirmComponentManufacturer(input: ConfirmComponentManufacturerInput!): ConfirmComponentManufacturerPayload!
+    @cost(weight: "10")
+  confirmInstitutionMethodDeveloper(
+    input: ConfirmInstitutionMethodDeveloperInput!
+  ): ConfirmInstitutionMethodDeveloperPayload! @cost(weight: "10")
+  confirmInstitutionRepresentative(
+    input: ConfirmInstitutionRepresentativeInput!
+  ): ConfirmInstitutionRepresentativePayload! @cost(weight: "10")
+  confirmUserEmail(input: ConfirmUserEmailInput!): ConfirmUserEmailPayload!
+    @cost(weight: "10")
+  confirmUserEmailChange(input: ConfirmUserEmailChangeInput!): ConfirmUserEmailChangePayload!
+    @cost(weight: "10")
+  confirmUserMethodDeveloper(input: ConfirmUserMethodDeveloperInput!): ConfirmUserMethodDeveloperPayload!
+    @cost(weight: "10")
+  createComponent(input: CreateComponentInput!): CreateComponentPayload!
+    @cost(weight: "10")
+  createDatabase(input: CreateDatabaseInput!): CreateDatabasePayload!
+    @cost(weight: "10")
+  createDataFormat(input: CreateDataFormatInput!): CreateDataFormatPayload!
+    @cost(weight: "10")
+  createInstitution(input: CreateInstitutionInput!): CreateInstitutionPayload!
+    @cost(weight: "10")
+  createMethod(input: CreateMethodInput!): CreateMethodPayload!
+    @cost(weight: "10")
+  createOpenIdConnectApplication(input: CreateOpenIdConnectApplicationInput!): CreateOpenIdConnectApplicationPayload!
+    @cost(weight: "10")
+  deleteInstitution(input: DeleteInstitutionInput!): DeleteInstitutionPayload!
+    @cost(weight: "10")
+  deleteOpenIdConnectApplication(input: DeleteOpenIdConnectApplicationInput!): DeleteOpenIdConnectApplicationPayload!
+    @cost(weight: "10")
+  deleteOpenIdConnectAuthorization(
+    input: DeleteOpenIdConnectAuthorizationInput!
+  ): DeleteOpenIdConnectAuthorizationPayload! @cost(weight: "10")
+  deletePersonalUserData(input: DeletePersonalUserDataInput!): DeletePersonalUserDataPayload!
+    @cost(weight: "10")
+  deleteUser(input: DeleteUserInput!): DeleteUserPayload! @cost(weight: "10")
+  disableUserTwoFactorAuthentication: DisableUserTwoFactorAuthenticationPayload!
+    @cost(weight: "10")
+  enableUserTwoFactorAuthenticator(
+    input: EnableUserTwoFactorAuthenticatorInput!
+  ): EnableUserTwoFactorAuthenticatorPayload! @cost(weight: "10")
+  forbidGnuPgKeyFingerprint(input: ForbidGnuPgKeyFingerprintInput!): ForbidGnuPgKeyFingerprintPayload!
+    @cost(weight: "10")
+  forgetUserTwoFactorAuthenticationClient: ForgetUserTwoFactorAuthenticationClientPayload!
+    @cost(weight: "10")
+  generateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri: GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUriPayload!
+    @cost(weight: "10")
+  generateUserTwoFactorRecoveryCodes: GenerateUserTwoFactorRecoveryCodesPayload!
+    @cost(weight: "10")
+  loginUser(input: LoginUserInput!): LoginUserPayload! @cost(weight: "10")
+  loginUserWithRecoveryCode(input: LoginUserWithRecoveryCodeInput!): LoginUserWithRecoveryCodePayload!
+    @cost(weight: "10")
+  loginUserWithTwoFactorCode(input: LoginUserWithTwoFactorCodeInput!): LoginUserWithTwoFactorCodePayload!
+    @cost(weight: "10")
+  logoutUser: LogoutUserPayload! @cost(weight: "10")
+  registerUser(input: RegisterUserInput!): RegisterUserPayload!
+    @cost(weight: "10")
+  removeComponentAssembly(input: RemoveComponentAssemblyInput!): RemoveComponentAssemblyPayload!
+    @cost(weight: "10")
+  removeComponentGeneralization(input: RemoveComponentGeneralizationInput!): RemoveComponentGeneralizationPayload!
+    @cost(weight: "10")
+  removeComponentManufacturer(input: RemoveComponentManufacturerInput!): RemoveComponentManufacturerPayload!
+    @cost(weight: "10")
+  removeComponentVariant(input: RemoveComponentVariantInput!): RemoveComponentVariantPayload!
+    @cost(weight: "10")
+  removeInstitutionMethodDeveloper(
+    input: RemoveInstitutionMethodDeveloperInput!
+  ): RemoveInstitutionMethodDeveloperPayload! @cost(weight: "10")
+  removeInstitutionRepresentative(input: RemoveInstitutionRepresentativeInput!): RemoveInstitutionRepresentativePayload!
+    @cost(weight: "10")
+  removeUserMethodDeveloper(input: RemoveUserMethodDeveloperInput!): RemoveUserMethodDeveloperPayload!
+    @cost(weight: "10")
+  removeUserRole(input: RemoveUserRoleInput!): RemoveUserRolePayload!
+    @cost(weight: "10")
+  requestUserPasswordReset(input: RequestUserPasswordResetInput!): RequestUserPasswordResetPayload!
+    @cost(weight: "10")
+  resendUserEmailConfirmation(input: ResendUserEmailConfirmationInput!): ResendUserEmailConfirmationPayload!
+    @cost(weight: "10")
+  resendUserEmailVerification: ResendUserEmailVerificationPayload!
+    @cost(weight: "10")
+  resetOpenIdConnectApplicationClientSecret(
+    input: ResetOpenIdConnectApplicationClientSecretInput!
+  ): ResetOpenIdConnectApplicationClientSecretPayload! @cost(weight: "10")
+  resetUserPassword(input: ResetUserPasswordInput!): ResetUserPasswordPayload!
+    @cost(weight: "10")
+  resetUserTwoFactorAuthenticator: ResetUserTwoFactorAuthenticatorPayload!
+    @cost(weight: "10")
+  revokeOpenIdConnectToken(input: RevokeOpenIdConnectTokenInput!): RevokeOpenIdConnectTokenPayload!
+    @cost(weight: "10")
+  setComponentExtras(input: SetComponentExtrasInput!): SetComponentExtrasPayload!
+    @cost(weight: "10")
+  setInstitutionExtras(input: SetInstitutionExtrasInput!): SetInstitutionExtrasPayload!
+    @cost(weight: "10")
+  setUserPassword(input: SetUserPasswordInput!): SetUserPasswordPayload!
+    @cost(weight: "10")
+  setUserPhoneNumber(input: SetUserPhoneNumberInput!): SetUserPhoneNumberPayload!
+    @cost(weight: "10")
+  switchInstitutionOperatingState(input: SwitchInstitutionOperatingStateInput!): SwitchInstitutionOperatingStatePayload!
+    @cost(weight: "10")
+  updateComponent(input: UpdateComponentInput!): UpdateComponentPayload!
+    @cost(weight: "10")
+  updateComponentAssembly(input: UpdateComponentAssemblyInput!): UpdateComponentAssemblyPayload!
+    @cost(weight: "10")
+  updateDatabase(input: UpdateDatabaseInput!): UpdateDatabasePayload!
+    @cost(weight: "10")
+  updateDataFormat(input: UpdateDataFormatInput!): UpdateDataFormatPayload!
+    @cost(weight: "10")
+  updateInstitution(input: UpdateInstitutionInput!): UpdateInstitutionPayload!
+    @cost(weight: "10")
+  updateMethod(input: UpdateMethodInput!): UpdateMethodPayload!
+    @cost(weight: "10")
+  updateOpenIdConnectApplication(input: UpdateOpenIdConnectApplicationInput!): UpdateOpenIdConnectApplicationPayload!
+    @cost(weight: "10")
+  verifyDatabase(input: VerifyDatabaseInput!): VerifyDatabasePayload!
+    @cost(weight: "10")
+  verifyInstitution(input: VerifyInstitutionInput!): VerifyInstitutionPayload!
+    @cost(weight: "10")
 }
 
 type AddComponentAssemblyError implements UserError {
@@ -176,6 +631,24 @@ type AllowGnuPgKeyFingerprintPayload {
   query: Query!
 }
 
+"A connection to a list of items."
+type AnyDatabasesConnection {
+  "A list of edges."
+  edges: [AnyDatabasesEdge!]
+  "Information to aid in pagination."
+  pageInfo: PageInfo!
+  "Identifies the total count of items in the connection."
+  totalCount: Int! @cost(weight: "10")
+}
+
+"An edge in a connection."
+type AnyDatabasesEdge {
+  "A cursor for use in pagination."
+  cursor: String!
+  "The item at the end of the edge."
+  node: Database!
+}
+
 type AppliedMethod {
   arguments: [NamedMethodArgument!]!
   method: Method @cost(weight: "10")
@@ -263,26 +736,47 @@ type CielabColor {
 
 type Component implements Node {
   abbreviation: String
-  assembledOf(order: [ComponentAssembledOfSortInput!] @cost(weight: "10") where: ComponentAssembledOfFilterInput @cost(weight: "10")): ComponentAssembledOfConnection! @cost(weight: "10")
+  assembledOf(
+    order: [ComponentAssembledOfSortInput!] @cost(weight: "10")
+    where: ComponentAssembledOfFilterInput @cost(weight: "10")
+  ): ComponentAssembledOfConnection! @cost(weight: "10")
   availability: OpenEndedDateTimeRange
   categories: [ComponentCategory!]!
-  concretizationOf(order: [ComponentConcretizationOfSortInput!] @cost(weight: "10") where: ComponentConcretizationOfFilterInput @cost(weight: "10")): ComponentConcretizationOfConnection! @cost(weight: "10")
+  concretizationOf(
+    order: [ComponentConcretizationOfSortInput!] @cost(weight: "10")
+    where: ComponentConcretizationOfFilterInput @cost(weight: "10")
+  ): ComponentConcretizationOfConnection! @cost(weight: "10")
   createdAt: DateTime!
   description: String!
   extras: Any
-  generalizationOf(order: [ComponentGeneralizationOfSortInput!] @cost(weight: "10") where: ComponentGeneralizationOfFilterInput @cost(weight: "10")): ComponentGeneralizationOfConnection! @cost(weight: "10")
+  generalizationOf(
+    order: [ComponentGeneralizationOfSortInput!] @cost(weight: "10")
+    where: ComponentGeneralizationOfFilterInput @cost(weight: "10")
+  ): ComponentGeneralizationOfConnection! @cost(weight: "10")
   id: ID!
   isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
   manager: ComponentManagerEdge! @cost(weight: "10")
-  manufacturers(order: [ComponentManufacturerSortInput!] @cost(weight: "10") where: ComponentManufacturerFilterInput @cost(weight: "10")): ComponentManufacturerConnection! @cost(weight: "10")
+  manufacturers(
+    order: [ComponentManufacturerSortInput!] @cost(weight: "10")
+    where: ComponentManufacturerFilterInput @cost(weight: "10")
+  ): ComponentManufacturerConnection! @cost(weight: "10")
   name: String!
-  partOf(order: [ComponentPartOfSortInput!] @cost(weight: "10") where: ComponentPartOfFilterInput @cost(weight: "10")): ComponentPartOfConnection! @cost(weight: "10")
-  pendingManufacturers(order: [ComponentManufacturerSortInput!] @cost(weight: "10") where: ComponentManufacturerFilterInput @cost(weight: "10")): PendingComponentManufacturerConnection @authorize(policy: "WriteScope") @cost(weight: "10")
+  partOf(
+    order: [ComponentPartOfSortInput!] @cost(weight: "10")
+    where: ComponentPartOfFilterInput @cost(weight: "10")
+  ): ComponentPartOfConnection! @cost(weight: "10")
+  pendingManufacturers(
+    order: [ComponentManufacturerSortInput!] @cost(weight: "10")
+    where: ComponentManufacturerFilterInput @cost(weight: "10")
+  ): PendingComponentManufacturerConnection @cost(weight: "10")
   prime: PrimeSurfaceOrDirection @cost(weight: "0")
   switchableLayers: DescriptionOrReference
   updatedAt: DateTime!
   uuid: Uuid!
-  variantOf(order: [ComponentVariantOfSortInput!] @cost(weight: "10") where: ComponentVariantOfFilterInput @cost(weight: "10")): ComponentVariantOfConnection! @cost(weight: "10")
+  variantOf(
+    order: [ComponentVariantOfSortInput!] @cost(weight: "10")
+    where: ComponentVariantOfFilterInput @cost(weight: "10")
+  ): ComponentVariantOfConnection! @cost(weight: "10")
 }
 
 type ComponentAssembledOfConnection {
@@ -351,17 +845,6 @@ type ComponentPartOfEdge {
   primeSurface: PrimeSurface
 }
 
-type ComponentVariantOfConnection {
-  edges: [ComponentVariantOfEdge!]! @cost(weight: "0")
-  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
-}
-
-type ComponentVariantOfEdge {
-  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
-  node: Component! @cost(weight: "0")
-}
-
 "A connection to a list of items."
 type ComponentsConnection {
   "A list of edges."
@@ -380,6 +863,17 @@ type ComponentsEdge {
   node: Component!
 }
 
+type ComponentVariantOfConnection {
+  edges: [ComponentVariantOfEdge!]! @cost(weight: "0")
+  isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
+  totalCount: NonNegativeInt!
+}
+
+type ComponentVariantOfEdge {
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
+  node: Component! @cost(weight: "0")
+}
+
 type ConfirmComponentManufacturerError implements UserError {
   code: ConfirmComponentManufacturerErrorCode!
   message: String!
@@ -477,27 +971,27 @@ type CreateComponentPayload {
   query: Query!
 }
 
-type CreateDataFormatError implements UserError {
-  code: CreateDataFormatErrorCode!
+type CreateDatabaseError implements UserError {
+  code: CreateDatabaseErrorCode!
   message: String!
   path: [String!]!
 }
 
-type CreateDataFormatPayload {
-  dataFormat: DataFormat
-  errors: [CreateDataFormatError!]
+type CreateDatabasePayload {
+  database: Database
+  errors: [CreateDatabaseError!]
   query: Query!
 }
 
-type CreateDatabaseError implements UserError {
-  code: CreateDatabaseErrorCode!
+type CreateDataFormatError implements UserError {
+  code: CreateDataFormatErrorCode!
   message: String!
   path: [String!]!
 }
 
-type CreateDatabasePayload {
-  database: Database
-  errors: [CreateDatabaseError!]
+type CreateDataFormatPayload {
+  dataFormat: DataFormat
+  errors: [CreateDataFormatError!]
   query: Query!
 }
 
@@ -558,40 +1052,101 @@ type DataApproval implements Approval {
   variables: Any!
 }
 
-type DataConnection {
-  edges: [DataEdge!]! @cost(weight: "0")
-  pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
-}
-
-type DataEdge {
-  cursor: String!
-  node: Data! @cost(weight: "0")
-}
-
-type DataFormat implements Node {
+type Database implements Node {
+  allCalorimetricData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: Locale
+    where: CalorimetricDataPropositionInput
+  ): CalorimetricDataConnection @cost(weight: "10")
+  allGeometricData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: Locale
+    where: GeometricDataPropositionInput
+  ): GeometricDataConnection @cost(weight: "10")
+  allHygrothermalData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: Locale
+    where: HygrothermalDataPropositionInput
+  ): HygrothermalDataConnection @cost(weight: "10")
+  allLifeCycleData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: Locale
+    where: LifeCycleDataPropositionInput
+  ): LifeCycleDataConnection @cost(weight: "10")
+  allOpticalData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: Locale
+    where: OpticalDataPropositionInput
+  ): OpticalDataConnection @cost(weight: "10")
+  allPhotovoltaicData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: Locale
+    where: PhotovoltaicDataPropositionInput
+  ): PhotovoltaicDataConnection @cost(weight: "10")
+  calorimetricData(id: Uuid!, locale: Locale): CalorimetricData
+    @cost(weight: "10")
   createdAt: DateTime!
+  data(id: Uuid!, kind: DataKind!, locale: Locale): Data @cost(weight: "10")
   description: String!
-  extension: String
+  geometricData(id: Uuid!, locale: Locale): GeometricData @cost(weight: "10")
+  hasCalorimetricData(locale: Locale, where: CalorimetricDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasData(kind: DataKind!, locale: Locale, where: DataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasGeometricData(locale: Locale, where: GeometricDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasHygrothermalData(locale: Locale, where: HygrothermalDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasLifeCycleData(locale: Locale, where: LifeCycleDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasOpticalData(locale: Locale, where: OpticalDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasPhotovoltaicData(locale: Locale, where: PhotovoltaicDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hygrothermalData(id: Uuid!, locale: Locale): HygrothermalData
+    @cost(weight: "10")
   id: ID!
   isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
-  manager: DataFormatManagerEdge! @cost(weight: "10")
-  mediaType: String!
+  isAuthorizedToVerifyNode: Boolean! @cost(weight: "1")
+  lifeCycleData(id: Uuid!, locale: Locale): LifeCycleData @cost(weight: "10")
+  locator: Url!
   name: String!
-  reference: Reference @cost(weight: "0")
-  schemaLocator: Url
+  operator: DatabaseOperatorEdge! @cost(weight: "10")
+  opticalData(id: Uuid!, locale: Locale): OpticalData @cost(weight: "10")
+  photovoltaicData(id: Uuid!, locale: Locale): PhotovoltaicData
+    @cost(weight: "10")
   updatedAt: DateTime!
   uuid: Uuid!
+  verificationCode: String!
+  verificationState: DatabaseVerificationState!
 }
 
-type DataFormatManagerEdge {
+type DatabaseOperatorEdge {
   node: Institution! @cost(weight: "0")
 }
 
 "A connection to a list of items."
-type DataFormatsConnection {
+type DatabasesConnection {
   "A list of edges."
-  edges: [DataFormatsEdge!]
+  edges: [DatabasesEdge!]
   "Information to aid in pagination."
   pageInfo: PageInfo!
   "Identifies the total count of items in the connection."
@@ -599,56 +1154,47 @@ type DataFormatsConnection {
 }
 
 "An edge in a connection."
-type DataFormatsEdge {
+type DatabasesEdge {
   "A cursor for use in pagination."
   cursor: String!
   "The item at the end of the edge."
-  node: DataFormat!
+  node: Database!
 }
 
-type Database implements Node {
-  allCalorimetricData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: CalorimetricDataPropositionInput): CalorimetricDataConnection @cost(weight: "10")
-  allGeometricData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: GeometricDataPropositionInput): GeometricDataConnection @cost(weight: "10")
-  allHygrothermalData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: HygrothermalDataPropositionInput): HygrothermalDataConnection @cost(weight: "10")
-  allLifeCycleData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: LifeCycleDataPropositionInput): LifeCycleDataConnection @cost(weight: "10")
-  allOpticalData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: OpticalDataPropositionInput): OpticalDataConnection @cost(weight: "10")
-  allPhotovoltaicData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: Locale where: PhotovoltaicDataPropositionInput): PhotovoltaicDataConnection @cost(weight: "10")
-  calorimetricData(id: Uuid! locale: Locale): CalorimetricData @cost(weight: "10")
+type DataConnection {
+  edges: [DataEdge!]! @cost(weight: "0")
+  pageInfo: PageInfo! @cost(weight: "0")
+  totalCount: NonNegativeInt!
+}
+
+type DataEdge {
+  cursor: String!
+  node: Data! @cost(weight: "0")
+}
+
+type DataFormat implements Node {
   createdAt: DateTime!
-  data(id: Uuid! kind: DataKind! locale: Locale): Data @cost(weight: "10")
   description: String!
-  geometricData(id: Uuid! locale: Locale): GeometricData @cost(weight: "10")
-  hasCalorimetricData(locale: Locale where: CalorimetricDataPropositionInput): Boolean @cost(weight: "10")
-  hasData(kind: DataKind! locale: Locale where: DataPropositionInput): Boolean @cost(weight: "10")
-  hasGeometricData(locale: Locale where: GeometricDataPropositionInput): Boolean @cost(weight: "10")
-  hasHygrothermalData(locale: Locale where: HygrothermalDataPropositionInput): Boolean @cost(weight: "10")
-  hasLifeCycleData(locale: Locale where: LifeCycleDataPropositionInput): Boolean @cost(weight: "10")
-  hasOpticalData(locale: Locale where: OpticalDataPropositionInput): Boolean @cost(weight: "10")
-  hasPhotovoltaicData(locale: Locale where: PhotovoltaicDataPropositionInput): Boolean @cost(weight: "10")
-  hygrothermalData(id: Uuid! locale: Locale): HygrothermalData @cost(weight: "10")
+  extension: String
   id: ID!
   isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
-  isAuthorizedToVerifyNode: Boolean! @cost(weight: "1")
-  lifeCycleData(id: Uuid! locale: Locale): LifeCycleData @cost(weight: "10")
-  locator: Url!
+  manager: DataFormatManagerEdge! @cost(weight: "10")
+  mediaType: String!
   name: String!
-  operator: DatabaseOperatorEdge! @cost(weight: "10")
-  opticalData(id: Uuid! locale: Locale): OpticalData @cost(weight: "10")
-  photovoltaicData(id: Uuid! locale: Locale): PhotovoltaicData @cost(weight: "10")
+  reference: Reference @cost(weight: "0")
+  schemaLocator: Url
   updatedAt: DateTime!
   uuid: Uuid!
-  verificationCode: String!
-  verificationState: DatabaseVerificationState!
 }
 
-type DatabaseOperatorEdge {
+type DataFormatManagerEdge {
   node: Institution! @cost(weight: "0")
 }
 
 "A connection to a list of items."
-type DatabasesConnection {
+type DataFormatsConnection {
   "A list of edges."
-  edges: [DatabasesEdge!]
+  edges: [DataFormatsEdge!]
   "Information to aid in pagination."
   pageInfo: PageInfo!
   "Identifies the total count of items in the connection."
@@ -656,11 +1202,11 @@ type DatabasesConnection {
 }
 
 "An edge in a connection."
-type DatabasesEdge {
+type DataFormatsEdge {
   "A cursor for use in pagination."
   cursor: String!
   "The item at the end of the edge."
-  node: Database!
+  node: DataFormat!
 }
 
 type DeleteInstitutionError implements UserError {
@@ -887,10 +1433,6 @@ type GnuPgKeyFingerprintInstitutionEdge {
   node: Institution! @cost(weight: "0")
 }
 
-type GnuPgKeyFingerprintUserEdge {
-  node: User! @cost(weight: "0")
-}
-
 "A connection to a list of items."
 type GnuPgKeyFingerprintsConnection {
   "A list of edges."
@@ -909,6 +1451,10 @@ type GnuPgKeyFingerprintsEdge {
   node: GnuPgKeyFingerprint!
 }
 
+type GnuPgKeyFingerprintUserEdge {
+  node: User! @cost(weight: "0")
+}
+
 type HygrothermalData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
@@ -947,29 +1493,135 @@ type Institution implements Node {
   contact: ContactInformation
   createdAt: DateTime!
   description: String!
-  developedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionDevelopedMethodSortInput!] @cost(weight: "10") where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")): InstitutionDevelopedMethodConnection! @cost(weight: "10")
+  developedMethods(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionDevelopedMethodSortInput!] @cost(weight: "10")
+    where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
+  ): InstitutionDevelopedMethodConnection! @cost(weight: "10")
   extras: Any
-  gnuPgKeyFingerprints(order: [InstitutionGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")): InstitutionGnuPgKeyFingerprintConnection! @cost(weight: "10")
-  hasGnuPgKeyFingerprint(order: [InstitutionGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")): Boolean! @cost(weight: "10")
+  gnuPgKeyFingerprints(
+    order: [InstitutionGnuPgKeyFingerprintSortInput!] @cost(weight: "10")
+    where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  ): InstitutionGnuPgKeyFingerprintConnection! @cost(weight: "10")
+  hasGnuPgKeyFingerprint(
+    order: [InstitutionGnuPgKeyFingerprintSortInput!] @cost(weight: "10")
+    where: InstitutionGnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  ): Boolean! @cost(weight: "10")
   id: ID!
   isAuthorizedToDeleteNode: Boolean! @cost(weight: "1")
   isAuthorizedToSwitchOperatingStateOfNode: Boolean! @cost(weight: "1")
   isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
   isAuthorizedToVerifyNode: Boolean! @cost(weight: "1")
-  managedComponents("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedComponentSortInput!] @cost(weight: "10") where: InstitutionManagedComponentFilterInput @cost(weight: "10")): InstitutionManagedComponentConnection! @cost(weight: "10")
-  managedDataFormats("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedDataFormatSortInput!] @cost(weight: "10") where: InstitutionManagedDataFormatFilterInput @cost(weight: "10")): InstitutionManagedDataFormatConnection! @cost(weight: "10")
-  managedInstitutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedInstitutionSortInput!] @cost(weight: "10") where: InstitutionManagedInstitutionFilterInput @cost(weight: "10")): InstitutionManagedInstitutionConnection! @cost(weight: "10")
-  managedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManagedMethodSortInput!] @cost(weight: "10") where: InstitutionManagedMethodFilterInput @cost(weight: "10")): InstitutionManagedMethodConnection! @cost(weight: "10")
+  managedComponents(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionManagedComponentSortInput!] @cost(weight: "10")
+    where: InstitutionManagedComponentFilterInput @cost(weight: "10")
+  ): InstitutionManagedComponentConnection! @cost(weight: "10")
+  managedDataFormats(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionManagedDataFormatSortInput!] @cost(weight: "10")
+    where: InstitutionManagedDataFormatFilterInput @cost(weight: "10")
+  ): InstitutionManagedDataFormatConnection! @cost(weight: "10")
+  managedInstitutions(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionManagedInstitutionSortInput!] @cost(weight: "10")
+    where: InstitutionManagedInstitutionFilterInput @cost(weight: "10")
+  ): InstitutionManagedInstitutionConnection! @cost(weight: "10")
+  managedMethods(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionManagedMethodSortInput!] @cost(weight: "10")
+    where: InstitutionManagedMethodFilterInput @cost(weight: "10")
+  ): InstitutionManagedMethodConnection! @cost(weight: "10")
   manager: InstitutionManagerEdge @cost(weight: "10")
-  manufacturedComponents("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManufacturedComponentSortInput!] @cost(weight: "10") where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")): InstitutionManufacturedComponentConnection! @cost(weight: "10")
+  manufacturedComponents(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionManufacturedComponentSortInput!] @cost(weight: "10")
+    where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")
+  ): InstitutionManufacturedComponentConnection! @cost(weight: "10")
   name: String!
-  openIdConnectApplications(order: [InstitutionOwnedOpenIdConnectApplicationSortInput!] @cost(weight: "10") where: InstitutionOwnedOpenIdConnectApplicationFilterInput @cost(weight: "10")): InstitutionOwnedOpenIdConnectApplicationConnection! @cost(weight: "10")
-  operatedDatabases(order: [InstitutionOperatedDatabaseSortInput!] @cost(weight: "10") where: InstitutionOperatedDatabaseFilterInput @cost(weight: "10")): InstitutionOperatedDatabaseConnection! @cost(weight: "10")
+  openIdConnectApplications(
+    order: [InstitutionOwnedOpenIdConnectApplicationSortInput!] @cost(weight: "10")
+    where: InstitutionOwnedOpenIdConnectApplicationFilterInput @cost(weight: "10")
+  ): InstitutionOwnedOpenIdConnectApplicationConnection! @cost(weight: "10")
+  operatedDatabases(
+    order: [InstitutionOperatedDatabaseSortInput!] @cost(weight: "10")
+    where: InstitutionOperatedDatabaseFilterInput @cost(weight: "10")
+  ): InstitutionOperatedDatabaseConnection! @cost(weight: "10")
   operatingState: InstitutionOperatingState!
-  pendingDevelopedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionDevelopedMethodSortInput!] @cost(weight: "10") where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")): PendingInstitutionDevelopedMethodConnection! @cost(weight: "10")
-  pendingManufacturedComponents("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionManufacturedComponentSortInput!] @cost(weight: "10") where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")): PendingInstitutionManufacturedComponentConnection! @cost(weight: "10")
-  pendingRepresentatives(order: [InstitutionRepresentativeSortInput!] @cost(weight: "10") where: InstitutionRepresentativeFilterInput @cost(weight: "10")): PendingInstitutionRepresentativeConnection @authorize(policy: "ManageInstitutionRepresentativeScope") @cost(weight: "10")
-  representatives(order: [InstitutionRepresentativeSortInput!] @cost(weight: "10") where: InstitutionRepresentativeFilterInput @cost(weight: "10")): InstitutionRepresentativeConnection! @cost(weight: "10")
+  pendingDevelopedMethods(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionDevelopedMethodSortInput!] @cost(weight: "10")
+    where: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
+  ): PendingInstitutionDevelopedMethodConnection! @cost(weight: "10")
+  pendingManufacturedComponents(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [InstitutionManufacturedComponentSortInput!] @cost(weight: "10")
+    where: InstitutionManufacturedComponentFilterInput @cost(weight: "10")
+  ): PendingInstitutionManufacturedComponentConnection! @cost(weight: "10")
+  pendingRepresentatives(
+    order: [InstitutionRepresentativeSortInput!] @cost(weight: "10")
+    where: InstitutionRepresentativeFilterInput @cost(weight: "10")
+  ): PendingInstitutionRepresentativeConnection @cost(weight: "10")
+  representatives(
+    order: [InstitutionRepresentativeSortInput!] @cost(weight: "10")
+    where: InstitutionRepresentativeFilterInput @cost(weight: "10")
+  ): InstitutionRepresentativeConnection! @cost(weight: "10")
   state: InstitutionState!
   updatedAt: DateTime!
   uuid: Uuid!
@@ -983,6 +1635,8 @@ type InstitutionDevelopedMethodConnection {
 
 type InstitutionDevelopedMethodEdge {
   cursor: String!
+  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
   node: Method! @cost(weight: "0")
 }
 
@@ -1205,13 +1859,19 @@ type Method implements Node {
   categories: [MethodCategory!]!
   createdAt: DateTime!
   description: String!
-  developers(order: [MethodDeveloperSortInput!] @cost(weight: "10") where: MethodDeveloperFilterInput @cost(weight: "10")): MethodDeveloperConnection! @cost(weight: "10")
+  developers(
+    order: [MethodDeveloperSortInput!] @cost(weight: "10")
+    where: MethodDeveloperFilterInput @cost(weight: "10")
+  ): MethodDeveloperConnection! @cost(weight: "10")
   id: ID!
   isAuthorizedToUpdateNode: Boolean! @cost(weight: "1")
   manager: MethodManagerEdge! @cost(weight: "10")
   name: String!
   parameters: [MethodParameter!]!
-  pendingDevelopers(order: [MethodDeveloperSortInput!] @cost(weight: "10") where: MethodDeveloperFilterInput @cost(weight: "10")): PendingMethodDeveloperConnection @authorize(policy: "WriteScope") @cost(weight: "10")
+  pendingDevelopers(
+    order: [MethodDeveloperSortInput!] @cost(weight: "10")
+    where: MethodDeveloperFilterInput @cost(weight: "10")
+  ): PendingMethodDeveloperConnection @cost(weight: "10")
   reference: Reference @cost(weight: "0")
   sources: [MethodSource!]!
   updatedAt: DateTime!
@@ -1244,14 +1904,6 @@ type MethodParameter {
   type: Any!
 }
 
-"A data source given as a cross-database data reference when this method is applied."
-type MethodSource {
-  "The significance of the source for the method."
-  description: String!
-  "The source name."
-  name: String!
-}
-
 "A connection to a list of items."
 type MethodsConnection {
   "A list of edges."
@@ -1270,77 +1922,12 @@ type MethodsEdge {
   node: Method!
 }
 
-type Mutation {
-  addComponentAssembly(input: AddComponentAssemblyInput!): AddComponentAssemblyPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  addComponentGeneralization(input: AddComponentGeneralizationInput!): AddComponentGeneralizationPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  addComponentManufacturer(input: AddComponentManufacturerInput!): AddComponentManufacturerPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  addComponentVariant(input: AddComponentVariantInput!): AddComponentVariantPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  addGnuPgKeyFingerprint(input: AddGnuPgKeyFingerprintInput!): AddGnuPgKeyFingerprintPayload! @authorize(policy: "ManageGnuPgScope") @cost(weight: "10")
-  addInstitutionMethodDeveloper(input: AddInstitutionMethodDeveloperInput!): AddInstitutionMethodDeveloperPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  addInstitutionRepresentative(input: AddInstitutionRepresentativeInput!): AddInstitutionRepresentativePayload! @authorize(policy: "ManageInstitutionRepresentativeScope") @cost(weight: "10")
-  addUserMethodDeveloper(input: AddUserMethodDeveloperInput!): AddUserMethodDeveloperPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  addUserRole(input: AddUserRoleInput!): AddUserRolePayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  allowGnuPgKeyFingerprint(input: AllowGnuPgKeyFingerprintInput!): AllowGnuPgKeyFingerprintPayload! @authorize(policy: "ManageGnuPgScope") @cost(weight: "10")
-  changeInstitutionRepresentativeRole(input: ChangeInstitutionRepresentativeRoleInput!): ChangeInstitutionRepresentativeRolePayload! @authorize(policy: "ManageInstitutionRepresentativeScope") @cost(weight: "10")
-  changeUserEmail(input: ChangeUserEmailInput!): ChangeUserEmailPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  changeUserPassword(input: ChangeUserPasswordInput!): ChangeUserPasswordPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  confirmComponentManufacturer(input: ConfirmComponentManufacturerInput!): ConfirmComponentManufacturerPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  confirmInstitutionMethodDeveloper(input: ConfirmInstitutionMethodDeveloperInput!): ConfirmInstitutionMethodDeveloperPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  confirmInstitutionRepresentative(input: ConfirmInstitutionRepresentativeInput!): ConfirmInstitutionRepresentativePayload! @authorize(policy: "ManageInstitutionRepresentativeScope") @cost(weight: "10")
-  confirmUserEmail(input: ConfirmUserEmailInput!): ConfirmUserEmailPayload! @cost(weight: "10")
-  confirmUserEmailChange(input: ConfirmUserEmailChangeInput!): ConfirmUserEmailChangePayload! @cost(weight: "10")
-  confirmUserMethodDeveloper(input: ConfirmUserMethodDeveloperInput!): ConfirmUserMethodDeveloperPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  createComponent(input: CreateComponentInput!): CreateComponentPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  createDatabase(input: CreateDatabaseInput!): CreateDatabasePayload! @authorize(policy: "ManageDatabaseScope") @cost(weight: "10")
-  createDataFormat(input: CreateDataFormatInput!): CreateDataFormatPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  createInstitution(input: CreateInstitutionInput!): CreateInstitutionPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  createMethod(input: CreateMethodInput!): CreateMethodPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  createOpenIdConnectApplication(input: CreateOpenIdConnectApplicationInput!): CreateOpenIdConnectApplicationPayload! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  deleteInstitution(input: DeleteInstitutionInput!): DeleteInstitutionPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  deleteOpenIdConnectApplication(input: DeleteOpenIdConnectApplicationInput!): DeleteOpenIdConnectApplicationPayload! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  deleteOpenIdConnectAuthorization(input: DeleteOpenIdConnectAuthorizationInput!): DeleteOpenIdConnectAuthorizationPayload! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  deletePersonalUserData(input: DeletePersonalUserDataInput!): DeletePersonalUserDataPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  deleteUser(input: DeleteUserInput!): DeleteUserPayload! @authorize(policy: "ManageUserScope") @authorize(policy: "AdministrateScope") @cost(weight: "10")
-  disableUserTwoFactorAuthentication: DisableUserTwoFactorAuthenticationPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  enableUserTwoFactorAuthenticator(input: EnableUserTwoFactorAuthenticatorInput!): EnableUserTwoFactorAuthenticatorPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  forbidGnuPgKeyFingerprint(input: ForbidGnuPgKeyFingerprintInput!): ForbidGnuPgKeyFingerprintPayload! @authorize(policy: "ManageGnuPgScope") @cost(weight: "10")
-  forgetUserTwoFactorAuthenticationClient: ForgetUserTwoFactorAuthenticationClientPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  generateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri: GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUriPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  generateUserTwoFactorRecoveryCodes: GenerateUserTwoFactorRecoveryCodesPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  loginUser(input: LoginUserInput!): LoginUserPayload! @cost(weight: "10")
-  loginUserWithRecoveryCode(input: LoginUserWithRecoveryCodeInput!): LoginUserWithRecoveryCodePayload! @cost(weight: "10")
-  loginUserWithTwoFactorCode(input: LoginUserWithTwoFactorCodeInput!): LoginUserWithTwoFactorCodePayload! @cost(weight: "10")
-  logoutUser: LogoutUserPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  registerUser(input: RegisterUserInput!): RegisterUserPayload! @cost(weight: "10")
-  removeComponentAssembly(input: RemoveComponentAssemblyInput!): RemoveComponentAssemblyPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  removeComponentGeneralization(input: RemoveComponentGeneralizationInput!): RemoveComponentGeneralizationPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  removeComponentManufacturer(input: RemoveComponentManufacturerInput!): RemoveComponentManufacturerPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  removeComponentVariant(input: RemoveComponentVariantInput!): RemoveComponentVariantPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  removeInstitutionMethodDeveloper(input: RemoveInstitutionMethodDeveloperInput!): RemoveInstitutionMethodDeveloperPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  removeInstitutionRepresentative(input: RemoveInstitutionRepresentativeInput!): RemoveInstitutionRepresentativePayload! @authorize(policy: "ManageInstitutionRepresentativeScope") @cost(weight: "10")
-  removeUserMethodDeveloper(input: RemoveUserMethodDeveloperInput!): RemoveUserMethodDeveloperPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  removeUserRole(input: RemoveUserRoleInput!): RemoveUserRolePayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  requestUserPasswordReset(input: RequestUserPasswordResetInput!): RequestUserPasswordResetPayload! @cost(weight: "10")
-  resendUserEmailConfirmation(input: ResendUserEmailConfirmationInput!): ResendUserEmailConfirmationPayload! @cost(weight: "10")
-  resendUserEmailVerification: ResendUserEmailVerificationPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  resetOpenIdConnectApplicationClientSecret(input: ResetOpenIdConnectApplicationClientSecretInput!): ResetOpenIdConnectApplicationClientSecretPayload! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  resetUserPassword(input: ResetUserPasswordInput!): ResetUserPasswordPayload! @cost(weight: "10")
-  resetUserTwoFactorAuthenticator: ResetUserTwoFactorAuthenticatorPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  revokeOpenIdConnectToken(input: RevokeOpenIdConnectTokenInput!): RevokeOpenIdConnectTokenPayload! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  setComponentExtras(input: SetComponentExtrasInput!): SetComponentExtrasPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  setInstitutionExtras(input: SetInstitutionExtrasInput!): SetInstitutionExtrasPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  setUserPassword(input: SetUserPasswordInput!): SetUserPasswordPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  setUserPhoneNumber(input: SetUserPhoneNumberInput!): SetUserPhoneNumberPayload! @authorize(policy: "ManageUserScope") @cost(weight: "10")
-  switchInstitutionOperatingState(input: SwitchInstitutionOperatingStateInput!): SwitchInstitutionOperatingStatePayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  updateComponent(input: UpdateComponentInput!): UpdateComponentPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  updateComponentAssembly(input: UpdateComponentAssemblyInput!): UpdateComponentAssemblyPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  updateDatabase(input: UpdateDatabaseInput!): UpdateDatabasePayload! @authorize(policy: "ManageDatabaseScope") @cost(weight: "10")
-  updateDataFormat(input: UpdateDataFormatInput!): UpdateDataFormatPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  updateInstitution(input: UpdateInstitutionInput!): UpdateInstitutionPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  updateMethod(input: UpdateMethodInput!): UpdateMethodPayload! @authorize(policy: "WriteScope") @cost(weight: "10")
-  updateOpenIdConnectApplication(input: UpdateOpenIdConnectApplicationInput!): UpdateOpenIdConnectApplicationPayload! @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  verifyDatabase(input: VerifyDatabaseInput!): VerifyDatabasePayload! @authorize(policy: "ManageDatabaseScope") @cost(weight: "10")
-  verifyInstitution(input: VerifyInstitutionInput!): VerifyInstitutionPayload! @authorize(policy: "WriteScope") @authorize(policy: "VerifyScope") @cost(weight: "10")
+"A data source given as a cross-database data reference when this method is applied."
+type MethodSource {
+  "The significance of the source for the method."
+  description: String!
+  "The source name."
+  name: String!
 }
 
 type NamedMethodArgument {
@@ -1366,7 +1953,8 @@ type OpenEndedDateTimeRange {
 
 type OpenIdConnectApplication implements Node {
   applicationType: String
-  authorizations: OpenIdConnectApplicationGrantedAuthorizationConnection! @cost(weight: "0")
+  authorizations: OpenIdConnectApplicationGrantedAuthorizationConnection!
+    @cost(weight: "0")
   clientId: String!
   clientType: String
   consentType: OpenIdConnectConsentType!
@@ -1704,56 +2292,6 @@ type Publication {
   webAddress: Url
 }
 
-type Query {
-  allCalorimetricData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: CalorimetricDataPropositionInput): CalorimetricDataConnection! @cost(weight: "10")
-  allGeometricData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: GeometricDataPropositionInput): GeometricDataConnection! @cost(weight: "10")
-  allHygrothermalData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: HygrothermalDataPropositionInput): HygrothermalDataConnection! @cost(weight: "10")
-  allLifeCycleData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: LifeCycleDataPropositionInput): LifeCycleDataConnection! @cost(weight: "10")
-  allOpticalData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: OpticalDataPropositionInput): OpticalDataConnection! @cost(weight: "10")
-  allPhotovoltaicData(after: String before: String first: NonNegativeInt last: NonNegativeInt locale: String where: PhotovoltaicDataPropositionInput): PhotovoltaicDataConnection! @cost(weight: "10")
-  calorimetricData(databaseId: Uuid! id: Uuid! locale: String): CalorimetricData @cost(weight: "10")
-  component(id: Uuid!): Component @cost(weight: "10")
-  components("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [ComponentSortInput!] @cost(weight: "10") where: ComponentFilterInput @cost(weight: "10")): ComponentsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  currentInstitution: Institution @authorize(policy: "Authenticated") @cost(weight: "10")
-  currentOpenIdConnectApplication: OpenIdConnectApplication @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  currentUser: User @authorize(policy: "Authenticated") @cost(weight: "10")
-  database(id: Uuid!): Database @cost(weight: "10")
-  databases("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DatabaseSortInput!] @cost(weight: "10") where: DatabaseFilterInput @cost(weight: "10")): DatabasesConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  dataFormat(id: Uuid!): DataFormat @cost(weight: "10")
-  dataFormats("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DataFormatSortInput!] @cost(weight: "10") where: DataFormatFilterInput @cost(weight: "10")): DataFormatsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  geometricData(databaseId: Uuid! id: Uuid! locale: String): GeometricData @cost(weight: "10")
-  gnuPgKeyFingerprint(fingerprint: String!): GnuPgKeyFingerprint @authorize(policy: "ManageGnuPgScope") @cost(weight: "10")
-  gnuPgKeyFingerprints("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [GnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: GnuPgKeyFingerprintFilterInput @cost(weight: "10")): GnuPgKeyFingerprintsConnection @authorize(policy: "ManageGnuPgScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  hasCalorimetricData(locale: String where: CalorimetricDataPropositionInput): Boolean! @cost(weight: "10")
-  hasGeometricData(locale: String where: GeometricDataPropositionInput): Boolean! @cost(weight: "10")
-  hasHygrothermalData(locale: String where: HygrothermalDataPropositionInput): Boolean! @cost(weight: "10")
-  hasLifeCycleData(locale: String where: LifeCycleDataPropositionInput): Boolean! @cost(weight: "10")
-  hasOpticalData(locale: String where: OpticalDataPropositionInput): Boolean! @cost(weight: "10")
-  hasPhotovoltaicData(locale: String where: PhotovoltaicDataPropositionInput): Boolean! @cost(weight: "10")
-  hygrothermalData(databaseId: Uuid! id: Uuid! locale: String): HygrothermalData @cost(weight: "10")
-  institution(id: Uuid!): Institution @cost(weight: "10")
-  institutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionSortInput!] @cost(weight: "10") where: InstitutionFilterInput @cost(weight: "10")): InstitutionsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  lifeCycleData(databaseId: Uuid! id: Uuid! locale: String): LifeCycleData @cost(weight: "10")
-  method(id: Uuid!): Method @cost(weight: "10")
-  methods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [MethodSortInput!] @cost(weight: "10") where: MethodFilterInput @cost(weight: "10")): MethodsConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  "Fetches an object given its ID."
-  node("ID of the object." id: ID!): Node @cost(weight: "10")
-  "Lookup nodes by a list of IDs."
-  nodes("The list of node IDs." ids: [ID!]!): [Node]! @cost(weight: "10")
-  openIdConnectApplication(id: Uuid!): OpenIdConnectApplication @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  openIdConnectApplications("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [OpenIdConnectApplicationSortInput!] @cost(weight: "10") where: OpenIdConnectApplicationFilterInput @cost(weight: "10")): OpenIdConnectApplicationsConnection @authorize(policy: "ManageOpenIdConnectScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  openIdConnectAuthorization(id: Uuid!): OpenIdConnectAuthorization @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  openIdConnectAuthorizations("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [OpenIdConnectAuthorizationSortInput!] @cost(weight: "10") where: OpenIdConnectAuthorizationFilterInput @cost(weight: "10")): OpenIdConnectAuthorizationsConnection @authorize(policy: "ManageOpenIdConnectScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  openIdConnectToken(id: Uuid!): OpenIdConnectToken @authorize(policy: "ManageOpenIdConnectScope") @cost(weight: "10")
-  openIdConnectTokens("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [OpenIdConnectTokenSortInput!] @cost(weight: "10") where: OpenIdConnectTokenFilterInput @cost(weight: "10")): OpenIdConnectTokensConnection @authorize(policy: "ManageOpenIdConnectScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  opticalData(databaseId: Uuid! id: Uuid! locale: String): OpticalData @cost(weight: "10")
-  pendingDatabases("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [DatabaseSortInput!] @cost(weight: "10") where: DatabaseFilterInput @cost(weight: "10")): PendingDatabasesConnection @authorize(policy: "ManageDatabaseScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  pendingInstitutions("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [InstitutionSortInput!] @cost(weight: "10") where: InstitutionFilterInput @cost(weight: "10")): PendingInstitutionsConnection @authorize(policy: "WriteScope") @authorize(policy: "VerifyScope") @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-  photovoltaicData(databaseId: Uuid! id: Uuid! locale: String): PhotovoltaicData @cost(weight: "10")
-  user(id: Uuid!): User @cost(weight: "10")
-  users("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [UserSortInput!] @cost(weight: "10") where: UserFilterInput @cost(weight: "10")): UsersConnection @listSize(assumedSize: 100, slicingArguments: ["first", "last"], slicingArgumentDefaultValue: 100, sizedFields: ["edges", "nodes"], requireOneSlicingArgument: false) @cost(weight: "10")
-}
-
 type RegisterUserError implements UserError {
   code: RegisterUserErrorCode!
   message: String!
@@ -2063,27 +2601,27 @@ type UpdateComponentPayload {
   query: Query!
 }
 
-type UpdateDataFormatError implements UserError {
-  code: UpdateDataFormatErrorCode!
+type UpdateDatabaseError implements UserError {
+  code: UpdateDatabaseErrorCode!
   message: String!
   path: [String!]!
 }
 
-type UpdateDataFormatPayload {
-  dataFormat: DataFormat
-  errors: [UpdateDataFormatError!]
+type UpdateDatabasePayload {
+  database: Database
+  errors: [UpdateDatabaseError!]
   query: Query!
 }
 
-type UpdateDatabaseError implements UserError {
-  code: UpdateDatabaseErrorCode!
+type UpdateDataFormatError implements UserError {
+  code: UpdateDataFormatErrorCode!
   message: String!
   path: [String!]!
 }
 
-type UpdateDatabasePayload {
-  database: Database
-  errors: [UpdateDatabaseError!]
+type UpdateDataFormatPayload {
+  dataFormat: DataFormat
+  errors: [UpdateDataFormatError!]
   query: Query!
 }
 
@@ -2125,9 +2663,26 @@ type UpdateOpenIdConnectApplicationPayload {
 
 type User implements Node {
   contact: ContactInformation! @cost(weight: "0")
-  developedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [UserDevelopedMethodSortInput!] @cost(weight: "10") where: UserDevelopedMethodFilterInput @cost(weight: "10")): UserDevelopedMethodConnection! @cost(weight: "10")
-  gnuPgKeyFingerprints(order: [UserGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")): UserGnuPgKeyFingerprintConnection! @cost(weight: "10")
-  hasGnuPgKeyFingerprint(order: [UserGnuPgKeyFingerprintSortInput!] @cost(weight: "10") where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")): Boolean! @cost(weight: "10")
+  developedMethods(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [UserDevelopedMethodSortInput!] @cost(weight: "10")
+    where: UserDevelopedMethodFilterInput @cost(weight: "10")
+  ): UserDevelopedMethodConnection! @cost(weight: "10")
+  gnuPgKeyFingerprints(
+    order: [UserGnuPgKeyFingerprintSortInput!] @cost(weight: "10")
+    where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  ): UserGnuPgKeyFingerprintConnection! @cost(weight: "10")
+  hasGnuPgKeyFingerprint(
+    order: [UserGnuPgKeyFingerprintSortInput!] @cost(weight: "10")
+    where: UserGnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  ): Boolean! @cost(weight: "10")
   hasPassword: Boolean
   id: ID!
   isAuthorizedToAddApprovals: Boolean! @cost(weight: "1")
@@ -2135,9 +2690,26 @@ type User implements Node {
   isAuthorizedToManageOpenIdConnect: Boolean! @cost(weight: "1")
   "Full name"
   name: String!
-  pendingDevelopedMethods("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int order: [UserDevelopedMethodSortInput!] @cost(weight: "10") where: UserDevelopedMethodFilterInput @cost(weight: "10")): PendingUserDevelopedMethodConnection @authorize(policy: "WriteScope") @cost(weight: "10")
-  pendingRepresentedInstitutions(order: [UserRepresentedInstitutionSortInput!] @cost(weight: "10") where: UserRepresentedInstitutionFilterInput @cost(weight: "10")): PendingUserRepresentedInstitutionConnection @authorize(policy: "WriteScope") @cost(weight: "10")
-  representedInstitutions(order: [UserRepresentedInstitutionSortInput!] @cost(weight: "10") where: UserRepresentedInstitutionFilterInput @cost(weight: "10")): UserRepresentedInstitutionConnection! @cost(weight: "10")
+  pendingDevelopedMethods(
+    "Returns the elements in the list that come after the specified cursor."
+    after: String
+    "Returns the elements in the list that come before the specified cursor."
+    before: String
+    "Returns the first _n_ elements from the list."
+    first: Int
+    "Returns the last _n_ elements from the list."
+    last: Int
+    order: [UserDevelopedMethodSortInput!] @cost(weight: "10")
+    where: UserDevelopedMethodFilterInput @cost(weight: "10")
+  ): PendingUserDevelopedMethodConnection @cost(weight: "10")
+  pendingRepresentedInstitutions(
+    order: [UserRepresentedInstitutionSortInput!] @cost(weight: "10")
+    where: UserRepresentedInstitutionFilterInput @cost(weight: "10")
+  ): PendingUserRepresentedInstitutionConnection @cost(weight: "10")
+  representedInstitutions(
+    order: [UserRepresentedInstitutionSortInput!] @cost(weight: "10")
+    where: UserRepresentedInstitutionFilterInput @cost(weight: "10")
+  ): UserRepresentedInstitutionConnection! @cost(weight: "10")
   roles: [UserRole!] @cost(weight: "0")
   rolesCurrentUserCanAdd: [UserRole!]!
   rolesCurrentUserCanRemove: [UserRole!]!
@@ -2153,6 +2725,8 @@ type UserDevelopedMethodConnection {
 
 type UserDevelopedMethodEdge {
   cursor: String!
+  isAuthorizedToConfirmEdge: Boolean! @cost(weight: "1")
+  isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
   node: Method! @cost(weight: "0")
 }
 
@@ -2224,15 +2798,61 @@ type VerifyInstitutionPayload {
   query: Query!
 }
 
-union Reference = Publication | Standard
-
-union Stakeholder = Institution | User
-
-input AddComponentAssemblyInput {
-  assembledComponentId: Uuid!
-  index: UnsignedByte
-  partComponentId: Uuid!
-  primeSurface: PrimeSurface
+interface Approval {
+  approverId: Uuid!
+  keyFingerprint: String!
+  message: String!
+  query: String!
+  signature: String!
+  timestamp: DateTime!
+  variables: Any!
+}
+
+interface Data {
+  appliedMethod: AppliedMethod!
+  approvals: [DataApproval!]!
+  component: Component
+  componentId: Uuid!
+  createdAt: DateTime!
+  creator: Institution
+  creatorId: Uuid!
+  database: Database
+  databaseId: Uuid!
+  description: String
+  id: ID!
+  kind: DataKind!
+  locale: Locale!
+  name: String
+  resources: [GetHttpsResource!]!
+  resourceTree: GetHttpsResourceTree!
+  timestamp: DateTime!
+  uuid: Uuid!
+  warnings: [String!]!
+}
+
+interface GetHttpsResourceTreeVertex {
+  value: GetHttpsResource!
+}
+
+"The node interface is implemented by entities that have a global unique identifier."
+interface Node {
+  id: ID!
+}
+
+interface UserError {
+  message: String!
+  path: [String!]!
+}
+
+union Reference = Publication | Standard
+
+union Stakeholder = Institution | User
+
+input AddComponentAssemblyInput {
+  assembledComponentId: Uuid!
+  index: UnsignedByte
+  partComponentId: Uuid!
+  primeSurface: PrimeSurface
 }
 
 input AddComponentGeneralizationInput {
@@ -2558,6 +3178,13 @@ input CreateComponentInput {
   switchableLayers: DescriptionOrReferenceInput
 }
 
+input CreateDatabaseInput {
+  description: String!
+  locator: Url!
+  name: String!
+  operatorId: Uuid!
+}
+
 input CreateDataFormatInput {
   description: String!
   extension: String
@@ -2568,13 +3195,6 @@ input CreateDataFormatInput {
   schemaLocator: Url
 }
 
-input CreateDatabaseInput {
-  description: String!
-  locator: Url!
-  name: String!
-  operatorId: Uuid!
-}
-
 input CreateInstitutionInput {
   abbreviation: String
   contact: ContactInformationInput
@@ -2614,6 +3234,27 @@ input CreateOpenIdConnectApplicationInput {
   scopes: [OpenIdConnectScope!]!
 }
 
+input DatabaseFilterInput {
+  and: [DatabaseFilterInput!]
+  createdAt: DateTimeFilterInput
+  description: StringFilterInput
+  id: UuidFilterInput
+  locator: UrlFilterInput
+  name: StringFilterInput
+  operator: InstitutionFilterInput
+  or: [DatabaseFilterInput!]
+  updatedAt: DateTimeFilterInput
+}
+
+input DatabaseSortInput {
+  createdAt: SortEnumType @cost(weight: "10")
+  description: SortEnumType @cost(weight: "10")
+  id: SortEnumType @cost(weight: "10")
+  locator: UriSortInput @cost(weight: "10")
+  name: SortEnumType @cost(weight: "10")
+  updatedAt: SortEnumType @cost(weight: "10")
+}
+
 input DataFormatFilterInput {
   and: [DataFormatFilterInput!]
   createdAt: DateTimeFilterInput
@@ -2647,27 +3288,6 @@ input DataPropositionInput {
   resources: GetHttpsResourcesPropositionInput
 }
 
-input DatabaseFilterInput {
-  and: [DatabaseFilterInput!]
-  createdAt: DateTimeFilterInput
-  description: StringFilterInput
-  id: UuidFilterInput
-  locator: UrlFilterInput
-  name: StringFilterInput
-  operator: InstitutionFilterInput
-  or: [DatabaseFilterInput!]
-  updatedAt: DateTimeFilterInput
-}
-
-input DatabaseSortInput {
-  createdAt: SortEnumType @cost(weight: "10")
-  description: SortEnumType @cost(weight: "10")
-  id: SortEnumType @cost(weight: "10")
-  locator: UriSortInput @cost(weight: "10")
-  name: SortEnumType @cost(weight: "10")
-  updatedAt: SortEnumType @cost(weight: "10")
-}
-
 input DateTimeFilterInput {
   equalTo: DateTime @cost(weight: "10")
   greaterThan: DateTime @cost(weight: "10")
@@ -2783,13 +3403,6 @@ input FilterInputTypeOfComponentsFilterInput {
   some: ComponentFilterInput @cost(weight: "10")
 }
 
-input FilterInputTypeOfDataFormatsFilterInput {
-  all: DataFormatFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: DataFormatFilterInput @cost(weight: "10")
-  some: DataFormatFilterInput @cost(weight: "10")
-}
-
 input FilterInputTypeOfDatabasesFilterInput {
   all: DatabaseFilterInput @cost(weight: "10")
   any: Boolean @cost(weight: "10")
@@ -2797,6 +3410,13 @@ input FilterInputTypeOfDatabasesFilterInput {
   some: DatabaseFilterInput @cost(weight: "10")
 }
 
+input FilterInputTypeOfDataFormatsFilterInput {
+  all: DataFormatFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: DataFormatFilterInput @cost(weight: "10")
+  some: DataFormatFilterInput @cost(weight: "10")
+}
+
 input FilterInputTypeOfGnuPgKeyFingerprintsFilterInput {
   all: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
   any: Boolean @cost(weight: "10")
@@ -3681,6 +4301,13 @@ input UpdateComponentInput {
   switchableLayers: DescriptionOrReferenceInput
 }
 
+input UpdateDatabaseInput {
+  databaseId: Uuid!
+  description: String!
+  locator: Url!
+  name: String!
+}
+
 input UpdateDataFormatInput {
   dataFormatId: Uuid!
   description: String!
@@ -3691,13 +4318,6 @@ input UpdateDataFormatInput {
   schemaLocator: Url
 }
 
-input UpdateDatabaseInput {
-  databaseId: Uuid!
-  description: String!
-  locator: Url!
-  name: String!
-}
-
 input UpdateInstitutionInput {
   abbreviation: String
   contact: ContactInformationInput
@@ -3871,110 +4491,108 @@ input VerifyInstitutionInput {
 }
 
 enum AddComponentAssemblyErrorCode {
+  DUPLICATE
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ASSEMBLED_COMPONENT
   UNKNOWN_PART_COMPONENT
-  DUPLICATE
-  UNAUTHORIZED
 }
 
 enum AddComponentGeneralizationErrorCode {
-  UNKNOWN
-  UNKNOWN_GENERAL_COMPONENT
-  UNKNOWN_CONCRETE_COMPONENT
   DUPLICATE
   UNAUTHORIZED
+  UNKNOWN
+  UNKNOWN_CONCRETE_COMPONENT
+  UNKNOWN_GENERAL_COMPONENT
 }
 
 enum AddComponentManufacturerErrorCode {
+  DUPLICATE
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_COMPONENT
   UNKNOWN_INSTITUTION
-  UNAUTHORIZED
-  DUPLICATE
 }
 
 enum AddComponentVariantErrorCode {
+  DUPLICATE
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ONE_COMPONENT
   UNKNOWN_OTHER_COMPONENT
-  DUPLICATE
-  UNAUTHORIZED
 }
 
 enum AddGnuPgKeyFingerprintErrorCode {
-  UNKNOWN
+  DUPLICATE_FINGERPRINT
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_INSTITUTION
-  DUPLICATE_FINGERPRINT
   UNKNOWN_KEY
 }
 
 enum AddInstitutionMethodDeveloperErrorCode {
+  DUPLICATE
+  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_METHOD
   UNKNOWN_INSTITUTION
-  UNAUTHORIZED
-  DUPLICATE
+  UNKNOWN_METHOD
 }
 
 enum AddInstitutionRepresentativeErrorCode {
+  DUPLICATE
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
   UNKNOWN_USER
-  DUPLICATE
-  UNAUTHORIZED
 }
 
 enum AddUserMethodDeveloperErrorCode {
+  DUPLICATE
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_METHOD
   UNKNOWN_USER
-  UNAUTHORIZED
-  DUPLICATE
 }
 
 enum AddUserRoleErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_USER
-  UNAUTHORIZED
 }
 
 enum AllowGnuPgKeyFingerprintErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_FINGERPRINT
 }
 
 "Defines when a policy shall be executed."
 enum ApplyPolicy {
-  "Before the resolver was executed."
-  BEFORE_RESOLVER
   "After the resolver was executed."
   AFTER_RESOLVER
+  "Before the resolver was executed."
+  BEFORE_RESOLVER
   "The policy is applied in the validation step before the execution."
   VALIDATION
 }
 
 enum ChangeInstitutionRepresentativeRoleErrorCode {
+  LAST_OWNER
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
-  UNKNOWN_USER
-  UNAUTHORIZED
   UNKNOWN_REPRESENTATIVE
-  LAST_OWNER
+  UNKNOWN_USER
 }
 
 enum ChangeUserEmailErrorCode {
-  UNKNOWN
-  UNKNOWN_USER
   UNCHANGED_EMAIL
+  UNKNOWN
   UNKNOWN_CURRENT_EMAIL
+  UNKNOWN_USER
 }
 
 enum ChangeUserPasswordErrorCode {
-  UNKNOWN
-  UNKNOWN_USER
   NO_PASSWORD
   PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
@@ -3982,113 +4600,120 @@ enum ChangeUserPasswordErrorCode {
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
+  UNKNOWN
+  UNKNOWN_USER
 }
 
 enum CoatedSide {
-  PRIME
-  NON_PRIME
   BOTH
   NEITHER
-  UNKNOWN
+  NON_PRIME
   NOT_APPLICABLE
+  PRIME
+  UNKNOWN
 }
 
 enum ComponentCategory {
-  MATERIAL
   LAYER
+  MATERIAL
   UNIT
 }
 
 enum ConfirmComponentManufacturerErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_COMPONENT
   UNKNOWN_INSTITUTION
-  UNAUTHORIZED
   UNKNOWN_MANUFACTURER
 }
 
 enum ConfirmInstitutionMethodDeveloperErrorCode {
-  UNKNOWN
-  UNKNOWN_METHOD
-  UNKNOWN_INSTITUTION
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_DEVELOPER
+  UNKNOWN_INSTITUTION
+  UNKNOWN_METHOD
 }
 
 enum ConfirmInstitutionRepresentativeErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
-  UNKNOWN_USER
-  UNAUTHORIZED
   UNKNOWN_REPRESENTATIVE
+  UNKNOWN_USER
 }
 
 enum ConfirmUserEmailChangeErrorCode {
-  UNKNOWN
   DUPLICATE_EMAIL
   INVALID_CONFIRMATION_CODE
+  UNKNOWN
   UNKNOWN_USER
 }
 
 enum ConfirmUserEmailErrorCode {
+  INVALID_CONFIRMATION_CODE
   UNKNOWN
   UNKNOWN_USER
-  INVALID_CONFIRMATION_CODE
 }
 
 enum ConfirmUserMethodDeveloperErrorCode {
+  UNAUTHORIZED
   UNKNOWN
+  UNKNOWN_DEVELOPER
   UNKNOWN_METHOD
   UNKNOWN_USER
-  UNAUTHORIZED
-  UNKNOWN_DEVELOPER
 }
 
 enum CreateComponentErrorCode {
+  AMBIGUOUS_REFERENCE
+  DUPLICATE_COMPONENT_ID
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_MANAGER
   UNKNOWN_MANUFACTURER
+}
+
+enum CreateDatabaseErrorCode {
   UNAUTHORIZED
-  AMBIGUOUS_REFERENCE
-  DUPLICATE_COMPONENT_ID
+  UNKNOWN
+  UNKNOWN_OPERATOR
 }
 
 enum CreateDataFormatErrorCode {
-  UNKNOWN
   TWO_REFERENCES
-  UNKNOWN_MANAGER
   UNAUTHORIZED
-}
-
-enum CreateDatabaseErrorCode {
   UNKNOWN
-  UNAUTHORIZED
-  UNKNOWN_OPERATOR
+  UNKNOWN_MANAGER
 }
 
 enum CreateInstitutionErrorCode {
-  UNKNOWN
+  DUPLICATE_INSTITUTION_ID
   NEITHER_OWNER_NOR_MANAGER
-  UNKNOWN_OWNERS
-  UNKNOWN_MANAGER
   UNAUTHORIZED
-  DUPLICATE_INSTITUTION_ID
+  UNKNOWN
+  UNKNOWN_MANAGER
+  UNKNOWN_OWNERS
 }
 
 enum CreateMethodErrorCode {
-  UNKNOWN
   TWO_REFERENCES
-  UNKNOWN_MANAGER
+  UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_INSTITUTION_DEVELOPERS
+  UNKNOWN_MANAGER
   UNKNOWN_USER_DEVELOPERS
-  UNAUTHORIZED
 }
 
 enum CreateOpenIdConnectApplicationErrorCode {
-  UNKNOWN
+  DUPLICATE_CLIENT_ID
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_INSTITUTION
-  DUPLICATE_CLIENT_ID
+}
+
+enum DatabaseVerificationState {
+  PENDING
+  VERIFIED
 }
 
 enum DataKind {
@@ -4100,41 +4725,36 @@ enum DataKind {
   PHOTOVOLTAIC_DATA
 }
 
-enum DatabaseVerificationState {
-  PENDING
-  VERIFIED
-}
-
 enum DeleteInstitutionErrorCode {
+  MANAGING
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
-  UNAUTHORIZED
-  MANAGING
 }
 
 enum DeleteOpenIdConnectApplicationErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_APPLICATION
 }
 
 enum DeleteOpenIdConnectAuthorizationErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_AUTHORIZATION
 }
 
 enum DeletePersonalUserDataErrorCode {
+  INCORRECT_PASSWORD
+  MISSING_PASSWORD
   UNKNOWN
   UNKNOWN_USER
-  MISSING_PASSWORD
-  INCORRECT_PASSWORD
 }
 
 enum DeleteUserErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_USER
-  UNAUTHORIZED
 }
 
 enum DisableUserTwoFactorAuthenticationErrorCode {
@@ -4143,15 +4763,15 @@ enum DisableUserTwoFactorAuthenticationErrorCode {
 }
 
 enum EnableUserTwoFactorAuthenticatorErrorCode {
-  UNKNOWN
-  UNKNOWN_USER
   ENABLING_FAILED
   INVALID_VERIFICATION_CODE
+  UNKNOWN
+  UNKNOWN_USER
 }
 
 enum ForbidGnuPgKeyFingerprintErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_FINGERPRINT
 }
 
@@ -4161,28 +4781,28 @@ enum ForgetUserTwoFactorAuthenticationClientErrorCode {
 }
 
 enum GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUriErrorCode {
-  UNKNOWN
-  UNKNOWN_USER
-  RESETTING_AUTHENTICATOR_KEY_FAILED
   GETTING_AUTHENTICATOR_KEY_FAILED
   GETTING_EMAIL_FAILED
+  RESETTING_AUTHENTICATOR_KEY_FAILED
+  UNKNOWN
+  UNKNOWN_USER
 }
 
 enum GenerateUserTwoFactorRecoveryCodesErrorCode {
+  CODE_GENERATION_FAILED
+  TWO_FACTOR_AUTHENTICATION_DISABLED
   UNKNOWN
   UNKNOWN_USER
-  TWO_FACTOR_AUTHENTICATION_DISABLED
-  CODE_GENERATION_FAILED
 }
 
 enum InstitutionOperatingState {
-  OPERATING
   NOT_OPERATING
+  OPERATING
 }
 
 enum InstitutionRepresentativeRole {
-  OWNER
   ASSISTANT
+  OWNER
 }
 
 enum InstitutionState {
@@ -4191,14 +4811,14 @@ enum InstitutionState {
 }
 
 enum JsonValueKind {
-  UNDEFINED
-  OBJECT
   ARRAY
-  STRING
-  NUMBER
-  TRUE
   FALSE
   NULL
+  NUMBER
+  OBJECT
+  STRING
+  TRUE
+  UNDEFINED
 }
 
 enum LoginUserErrorCode {
@@ -4209,19 +4829,19 @@ enum LoginUserErrorCode {
 }
 
 enum LoginUserWithRecoveryCodeErrorCode {
+  INVALID_RECOVERY_CODE
+  LOCKED_OUT
+  NOT_ALLOWED
   UNKNOWN
   UNKNOWN_USER
-  NOT_ALLOWED
-  LOCKED_OUT
-  INVALID_RECOVERY_CODE
 }
 
 enum LoginUserWithTwoFactorCodeErrorCode {
+  INVALID_AUTHENTICATOR_CODE
+  LOCKED_OUT
+  NOT_ALLOWED
   UNKNOWN
   UNKNOWN_USER
-  NOT_ALLOWED
-  LOCKED_OUT
-  INVALID_AUTHENTICATOR_CODE
 }
 
 enum LogoutUserErrorCode {
@@ -4229,8 +4849,8 @@ enum LogoutUserErrorCode {
 }
 
 enum MethodCategory {
-  MEASUREMENT
   CALCULATION
+  MEASUREMENT
 }
 
 enum OpenIdConnectConsentType {
@@ -4266,44 +4886,44 @@ enum OpenIdConnectResponseType {
 
 enum OpenIdConnectScope {
   ADDRESS
-  EMAIL
-  PHONE
-  PROFILE
-  ROLES
-  READ_API
-  WRITE_API
   ADMINISTRATE_API
-  VERIFY_API
+  EMAIL
   MANAGE_DATABASE_API
   MANAGE_GNU_PG_API
   MANAGE_INSTITUTION_REPRESENTATIVE_API
   MANAGE_OPEN_ID_CONNECT_API
   MANAGE_USER_API
+  PHONE
+  PROFILE
+  READ_API
+  ROLES
+  VERIFY_API
+  WRITE_API
 }
 
 enum OpticalComponentSubtype {
-  MONOLITHIC
-  LAMINATE
-  INTERLAYER
-  EMBEDDED_COATING
+  ACID_ETCHED_GLASS
+  APPLIED_FILM
+  CELLULAR_SHADE
+  CHROMOGENIC
   COATED
   COATING
-  APPLIED_FILM
-  FILM
-  VENETIAN_BLIND
   DIFFUSING_SHADE
-  ROLLER_SHADE
-  WOVEN_SHADE
-  VERTICAL_LOUVER
+  EMBEDDED_COATING
+  FILM
+  FRITTED_GLASS
+  INTERLAYER
+  LAMINATE
+  MONOLITHIC
   PERFORATED_SCREEN
-  CELLULAR_SHADE
   PLEATED_SHADE
+  ROLLER_SHADE
   ROMAN_SHADE
-  SHADE_MATERIAL
-  FRITTED_GLASS
-  ACID_ETCHED_GLASS
   SANDBLASTED_GLASS
-  CHROMOGENIC
+  SHADE_MATERIAL
+  VENETIAN_BLIND
+  VERTICAL_LOUVER
+  WOVEN_SHADE
 }
 
 enum OpticalComponentType {
@@ -4317,80 +4937,80 @@ enum PrimeSurface {
 }
 
 enum RegisterUserErrorCode {
-  UNKNOWN
-  PASSWORD_CONFIRMATION_MISMATCH
   DUPLICATE_EMAIL
   INVALID_EMAIL
+  NULL_OR_EMPTY_EMAIL
+  PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
   PASSWORD_REQUIRES_LOWER
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
-  NULL_OR_EMPTY_EMAIL
+  UNKNOWN
 }
 
 enum RemoveComponentAssemblyErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ASSEMBLED_COMPONENT
-  UNKNOWN_PART_COMPONENT
   UNKNOWN_ASSEMBLY
-  UNAUTHORIZED
+  UNKNOWN_PART_COMPONENT
 }
 
 enum RemoveComponentGeneralizationErrorCode {
+  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_GENERAL_COMPONENT
   UNKNOWN_CONCRETE_COMPONENT
+  UNKNOWN_GENERAL_COMPONENT
   UNKNOWN_GENERALIZATION
-  UNAUTHORIZED
 }
 
 enum RemoveComponentManufacturerErrorCode {
+  LAST_MANUFACTURER
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_COMPONENT
   UNKNOWN_INSTITUTION
-  UNAUTHORIZED
   UNKNOWN_MANUFACTURER
-  LAST_MANUFACTURER
 }
 
 enum RemoveComponentVariantErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ONE_COMPONENT
   UNKNOWN_OTHER_COMPONENT
   UNKNOWN_VARIANT
-  UNAUTHORIZED
 }
 
 enum RemoveInstitutionMethodDeveloperErrorCode {
-  UNKNOWN
-  UNKNOWN_METHOD
-  UNKNOWN_INSTITUTION
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_DEVELOPER
+  UNKNOWN_INSTITUTION
+  UNKNOWN_METHOD
 }
 
 enum RemoveInstitutionRepresentativeErrorCode {
-  UNKNOWN
   LAST_OWNER
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_INSTITUTION
   UNKNOWN_REPRESENTATIVE
   UNKNOWN_USER
 }
 
 enum RemoveUserMethodDeveloperErrorCode {
+  UNAUTHORIZED
   UNKNOWN
+  UNKNOWN_DEVELOPER
   UNKNOWN_METHOD
   UNKNOWN_USER
-  UNAUTHORIZED
-  UNKNOWN_DEVELOPER
 }
 
 enum RemoveUserRoleErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_USER
-  UNAUTHORIZED
 }
 
 enum RequestUserPasswordResetErrorCode {
@@ -4403,18 +5023,17 @@ enum ResendUserEmailConfirmationErrorCode {
 
 enum ResendUserEmailVerificationErrorCode {
   UNKNOWN
-  UNKNOWN_USER
   UNKNOWN_EMAIL
+  UNKNOWN_USER
 }
 
 enum ResetOpenIdConnectApplicationClientSecretErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_APPLICATION
 }
 
 enum ResetUserPasswordErrorCode {
-  UNKNOWN
   INVALID_RESET_CODE
   PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
@@ -4422,37 +5041,36 @@ enum ResetUserPasswordErrorCode {
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
+  UNKNOWN
 }
 
 enum ResetUserTwoFactorAuthenticatorErrorCode {
-  UNKNOWN
-  UNKNOWN_USER
   DISABLING_FAILED
   RESETTING_FAILED
+  UNKNOWN
+  UNKNOWN_USER
 }
 
 enum RevokeOpenIdConnectTokenErrorCode {
-  UNKNOWN
+  FAILED
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_TOKEN
-  FAILED
 }
 
 enum SetComponentExtrasErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_COMPONENT
 }
 
 enum SetInstitutionExtrasErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_INSTITUTION
 }
 
 enum SetUserPasswordErrorCode {
-  UNKNOWN
-  UNKNOWN_USER
   EXISTING_PASSWORD
   PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
@@ -4460,12 +5078,14 @@ enum SetUserPasswordErrorCode {
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
+  UNKNOWN
+  UNKNOWN_USER
 }
 
 enum SetUserPhoneNumberErrorCode {
+  UNCHANGED_PHONE_NUMBER
   UNKNOWN
   UNKNOWN_USER
-  UNCHANGED_PHONE_NUMBER
 }
 
 enum SortEnumType {
@@ -4501,56 +5121,56 @@ enum Standardizer {
 }
 
 enum SwitchInstitutionOperatingStateErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
-  UNAUTHORIZED
 }
 
 enum UpdateComponentAssemblyErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ASSEMBLED_COMPONENT
-  UNKNOWN_PART_COMPONENT
   UNKNOWN_ASSEMBLY
-  UNAUTHORIZED
+  UNKNOWN_PART_COMPONENT
 }
 
 enum UpdateComponentErrorCode {
-  UNKNOWN
+  AMBIGUOUS_REFERENCE
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_COMPONENT
   UNKNOWN_MANUFACTURER
-  AMBIGUOUS_REFERENCE
 }
 
-enum UpdateDataFormatErrorCode {
-  UNKNOWN
-  TWO_REFERENCES
+enum UpdateDatabaseErrorCode {
   UNAUTHORIZED
-  UNKNOWN_DATA_FORMAT
+  UNKNOWN
+  UNKNOWN_DATABASE
 }
 
-enum UpdateDatabaseErrorCode {
-  UNKNOWN
+enum UpdateDataFormatErrorCode {
+  TWO_REFERENCES
   UNAUTHORIZED
-  UNKNOWN_DATABASE
+  UNKNOWN
+  UNKNOWN_DATA_FORMAT
 }
 
 enum UpdateInstitutionErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_INSTITUTION
 }
 
 enum UpdateMethodErrorCode {
-  UNKNOWN
   TWO_REFERENCES
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_METHOD
 }
 
 enum UpdateOpenIdConnectApplicationErrorCode {
-  UNKNOWN
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_APPLICATION
 }
 
@@ -4560,71 +5180,100 @@ enum UserRole {
 }
 
 enum VerifyDatabaseErrorCode {
-  UNKNOWN
+  DESERIALIZATION_FAILED
+  REQUEST_FAILED
   UNAUTHORIZED
+  UNKNOWN
   UNKNOWN_DATABASE
   WRONG_VERIFICATION_CODE
-  REQUEST_FAILED
-  DESERIALIZATION_FAILED
 }
 
 enum VerifyInstitutionErrorCode {
+  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
-  UNAUTHORIZED
 }
 
-"The authorize directive."
-directive @authorize("Defines when the authorize directive shall be applied. By default the authorize directive is applied before the resolver is executed." apply: ApplyPolicy! = BEFORE_RESOLVER "The name of the authorization policy that determines access to the annotated resource." policy: String "Roles that are allowed to access the annotated resource." roles: [String!]) repeatable on OBJECT | FIELD_DEFINITION
-
-"The purpose of the `cost` directive is to define a `weight` for GraphQL types, fields, and arguments. Static analysis can use these weights when calculating the overall cost of a query or response."
-directive @cost("The `weight` argument defines what value to add to the overall cost for every appearance, or possible appearance, of a type, field, argument, etc." weight: String!) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM | INPUT_FIELD_DEFINITION
-
-"The purpose of the `@listSize` directive is to either inform the static analysis about the size of returned lists (if that information is statically available), or to point the analysis to where to find that information."
-directive @listSize("The `assumedSize` argument can be used to statically define the maximum length of a list returned by a field." assumedSize: Int "The `requireOneSlicingArgument` argument can be used to inform the static analysis that it should expect that exactly one of the defined slicing arguments is present in a query. If that is not the case (i.e., if none or multiple slicing arguments are present), the static analysis may throw an error." requireOneSlicingArgument: Boolean = true "The `sizedFields` argument can be used to define that the value of the `assumedSize` argument or of a slicing argument does not affect the size of a list returned by a field itself, but that of a list returned by one of its sub-fields." sizedFields: [String!] "The `slicingArgumentDefaultValue` argument can be used to define a default value for a slicing argument, which is used if the argument is not present in a query." slicingArgumentDefaultValue: Int "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments." slicingArguments: [String!]) on FIELD_DEFINITION
-
-"The `@specifiedBy` directive is used within the type system definition language to provide a URL for specifying the behavior of custom scalar definitions."
-directive @specifiedBy("The specifiedBy URL points to a human-readable specification. This field will only read a result for scalar types." url: String!) on SCALAR
-
 scalar Any @specifiedBy(url: "https://scalars.graphql.org/chillicream/any.html")
 
 "The `Byte` scalar type represents a signed 8-bit integer."
-scalar Byte @specifiedBy(url: "https://scalars.graphql.org/chillicream/byte.html")
+scalar Byte
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/byte.html")
 
 "The `DateTime` scalar type represents a date and time with time zone offset information."
-scalar DateTime @specifiedBy(url: "https://scalars.graphql.org/chillicream/date-time.html")
+scalar DateTime
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/date-time.html")
 
 "The `Decimal` scalar type represents a decimal floating-point number with high precision."
-scalar Decimal @specifiedBy(url: "https://scalars.graphql.org/chillicream/decimal.html")
+scalar Decimal
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/decimal.html")
 
 "The `Duration` scalar type represents a duration of time."
-scalar Duration @specifiedBy(url: "https://scalars.graphql.org/chillicream/duration.html")
+scalar Duration
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/duration.html")
 
 "The `LocalDate` scalar type represents a date without time or time zone information."
-scalar LocalDate @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-date.html")
+scalar LocalDate
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-date.html")
 
 "The `LocalDateTime` scalar type represents a date and time without time zone information."
-scalar LocalDateTime @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-date-time.html")
-
-"The `LocalTime` scalar type represents a time of day without date or time zone information."
-scalar LocalTime @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-time.html")
+scalar LocalDateTime
+  @specifiedBy(
+    url: "https://scalars.graphql.org/chillicream/local-date-time.html"
+  )
 
 "BCP 47 compliant Language Tag string"
 scalar Locale
 
+"The `LocalTime` scalar type represents a time of day without date or time zone information."
+scalar LocalTime
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-time.html")
+
 "The `Long` scalar type represents a signed 64-bit integer."
-scalar Long @specifiedBy(url: "https://scalars.graphql.org/chillicream/long.html")
+scalar Long
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/long.html")
 
 "The `NonNegativeInt` scalar type represents an unsigned 32-bit numeric non-fractional value."
 scalar NonNegativeInt
 
 "The `Short` scalar type represents a signed 16-bit integer."
-scalar Short @specifiedBy(url: "https://scalars.graphql.org/chillicream/short.html")
+scalar Short
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/short.html")
 
 "The `UnsignedByte` scalar type represents an unsigned 8-bit integer."
-scalar UnsignedByte @specifiedBy(url: "https://scalars.graphql.org/chillicream/unsigned-byte.html")
+scalar UnsignedByte
+  @specifiedBy(
+    url: "https://scalars.graphql.org/chillicream/unsigned-byte.html"
+  )
 
 "The `Url` scalar type represents a Uniform Resource Identifier (URI) as defined by RFC 3986."
 scalar Url @specifiedBy(url: "https://tools.ietf.org/html/rfc3986")
 
-scalar Uuid @specifiedBy(url: "https://scalars.graphql.org/chillicream/uuid.html")
\ No newline at end of file
+scalar Uuid
+  @specifiedBy(url: "https://scalars.graphql.org/chillicream/uuid.html")
+
+"The purpose of the `cost` directive is to define a `weight` for GraphQL types, fields, and arguments. Static analysis can use these weights when calculating the overall cost of a query or response."
+directive @cost(
+  "The `weight` argument defines what value to add to the overall cost for every appearance, or possible appearance, of a type, field, argument, etc."
+  weight: String!
+) on
+  | SCALAR
+  | OBJECT
+  | FIELD_DEFINITION
+  | ARGUMENT_DEFINITION
+  | ENUM
+  | INPUT_FIELD_DEFINITION
+
+"The purpose of the `@listSize` directive is to either inform the static analysis about the size of returned lists (if that information is statically available), or to point the analysis to where to find that information."
+directive @listSize(
+  "The `assumedSize` argument can be used to statically define the maximum length of a list returned by a field."
+  assumedSize: Int
+  "The `requireOneSlicingArgument` argument can be used to inform the static analysis that it should expect that exactly one of the defined slicing arguments is present in a query. If that is not the case (i.e., if none or multiple slicing arguments are present), the static analysis may throw an error."
+  requireOneSlicingArgument: Boolean = true
+  "The `sizedFields` argument can be used to define that the value of the `assumedSize` argument or of a slicing argument does not affect the size of a list returned by a field itself, but that of a list returned by one of its sub-fields."
+  sizedFields: [String!]
+  "The `slicingArgumentDefaultValue` argument can be used to define a default value for a slicing argument, which is used if the argument is not present in a query."
+  slicingArgumentDefaultValue: Int
+  "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments."
+  slicingArguments: [String!]
+) on FIELD_DEFINITION
\ No newline at end of file

From 8ac59b37cdf1867413ea4479f2df946e14f6fed6 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 7 May 2026 23:14:11 +0200
Subject: [PATCH 016/145] Correct description of login redirection URL and
 improve client-secret display

---
 .../OpenIdConnectApplicationSummary.tsx          |  2 +-
 ...ResetOpenIdConnectApplicationClientSecret.tsx | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
index 4cdc3fa0f..46c43212c 100644
--- a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
@@ -58,7 +58,7 @@ export default function OpenIdConnectApplicationSummary({
         <div>
           {entity.redirectUri && (
             <div>
-              For login, redirect to{" "}
+              After login, redirect to{" "}
               <Typography.Link href={entity.redirectUri}>
                 {entity.redirectUri}
               </Typography.Link>
diff --git a/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx b/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
index cdefa9fbb..d1396606e 100644
--- a/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
+++ b/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
@@ -4,10 +4,10 @@ import {
   ResetApplicationClientSecretDocument,
   ResetApplicationClientSecretMutation,
 } from "../../../queries/openIdConnect.generated";
-import { ExclamationCircleTwoTone } from "@ant-design/icons";
 import { Scalars } from "../../../__generated__/graphql";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
 import SafeDeleteButton from "../../SafeDeleteButton";
+import CodeViewer from "../../CodeViewer";
 
 interface ResetApplicationClientSecretProps {
   applicationId: Scalars["Uuid"]["input"];
@@ -49,18 +49,14 @@ export default function ResetOpenIdConnectApplicationClientSecret({
               width: 500,
               content: (
                 <Typography.Paragraph style={{ maxWidth: "75ch" }}>
-                  <span>
-                    <ExclamationCircleTwoTone twoToneColor="#f9b02e" />{" "}
-                  </span>
-                  Please copy an save the client secret now, you will not be
-                  able to access it later.
-                  <p />
-                  <Typography.Paragraph copyable>
-                    {
+                  Please copy and save the following client secret now, you will
+                  not be able to access it later
+                  <CodeViewer
+                    code={
                       data.resetOpenIdConnectApplicationClientSecret
                         .clientSecret
                     }
-                  </Typography.Paragraph>
+                  />
                 </Typography.Paragraph>
               ),
             });

From be3fa36b82fce08454cd9cf8ae2e7df264f3e8a4 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 8 May 2026 19:21:39 +0200
Subject: [PATCH 017/145] Fetch associated entities with mutations to get view
 updates with refetches, make manager/owner/... in forms explicit, use
 `DateTimeOffset` for sortable fields with pagination (NodaTime
 `OffsetDateTime` as currently not supported), return entity for OpenId
 Connect token/authorization subject, and make some frontend refinements

---
 .../src/Authorization/CommonAuthorization.cs  |   30 +-
 .../src/Configuration/GraphQlConfiguration.cs |    9 +-
 .../Controllers/AuthorizationController.cs    |   10 +-
 backend/src/Data/ApplicationDbContext.cs      |   11 +-
 backend/src/Data/AuditableAssociation.cs      |    8 +-
 backend/src/Data/AuditableEntity.cs           |    7 +-
 backend/src/Data/IAuditable.cs                |    9 +-
 .../OpenIdConnect/IOpenIdConnectSubject.cs    |   43 +
 .../OpenIdConnect/OpenIdConnectApplication.cs |   14 +-
 .../OpenIdConnectAuthorization.cs             |    7 +-
 .../Data/OpenIdConnect/OpenIdConnectScope.cs  |    7 +-
 .../Data/OpenIdConnect/OpenIdConnectToken.cs  |    7 +-
 backend/src/Data/User.cs                      |   10 +-
 ...RemoveInstitutionMethodDeveloperPayload.cs |   36 +-
 .../OffsetDateTimeCursorKeySerializer.cs      |   17 +-
 ...DeleteOpenIdConnectAuthorizationPayload.cs |    5 +-
 .../OpenIdConnectAuthorizationMutations.cs    |    2 +-
 .../OpenIdConnectAuthorizationType.cs         |   44 +-
 .../OpenIdConnect/OpenIdConnectSubjectType.cs |   13 +
 .../Tokens/OpenIdConnectTokenType.cs          |   59 +-
 .../Tokens/RevokeOpenIdConnectTokenPayload.cs |    3 +-
 .../RemoveUserMethodDeveloperPayload.cs       |   36 +-
 backend/src/GraphQl/Users/UserType.cs         |    2 +-
 ...ditableEntitiesAndAssociations.Designer.cs | 2298 +++++++++++++++++
 ...luesForAuditableEntitiesAndAssociations.cs |  264 ++
 .../ApplicationDbContextModelSnapshot.cs      |  133 +-
 backend/src/Migrations/migrate.sql            |  144 ++
 ...uesForAuditableEntitiesAndAssociations.sql |  144 ++
 ...04629_AddUpdatedAndCreatedAtTimestamps.sql |  124 +
 .../GraphQlSchemaTests.IsUnchanged.snap       |   23 +-
 ...labColorViewer.tsx => CielabColorView.tsx} |    6 +-
 .../{CodeViewer.tsx => CodeView.tsx}          |    2 +-
 frontend/components/CopyableBlock.tsx         |   14 +-
 frontend/components/DateTimeX.tsx             |   34 +
 frontend/components/Float.tsx                 |   20 +-
 .../{JsonViewer.tsx => JsonView.tsx}          |   15 +-
 frontend/components/Layout.tsx                |    3 +-
 .../components/OpenEndedDateTimeRangeX.tsx    |   27 +-
 frontend/components/PaginatedIdSelect.tsx     |   15 +-
 frontend/components/Reference.tsx             |    2 +-
 frontend/components/ReferenceSubform.tsx      |    4 +-
 frontend/components/SearchSelect.tsx          |   20 +-
 .../components/AddAssembledOfComponent.tsx    |   15 +-
 .../components/AddComponentManufacturer.tsx   |   15 +-
 .../AddConcretizationOfComponent.tsx          |   15 +-
 .../AddGeneralizationOfComponent.tsx          |   15 +-
 .../components/AddPartOfComponent.tsx         |   15 +-
 .../components/AddVariantOfComponent.tsx      |   15 +-
 frontend/components/components/Component.tsx  |   11 +-
 .../components/ComponentIdSelect.tsx          |   17 +-
 .../components/ComponentSummary.tsx           |   12 +-
 .../ConfirmComponentManufacturer.tsx          |   20 +-
 .../components/components/CreateComponent.tsx |   49 +-
 .../components/RemoveComponentAssembly.tsx    |   25 +-
 .../RemoveComponentGeneralization.tsx         |   25 +-
 .../RemoveComponentManufacturer.tsx           |   26 +-
 .../components/RemoveComponentVariant.tsx     |   25 +-
 .../components/components/UpdateComponent.tsx |    2 +-
 .../components/UpdateComponentAssembly.tsx    |   17 -
 frontend/components/data/DataSummary.tsx      |  329 +--
 .../data/calorimetric/CalorimetricData.tsx    |   11 +-
 .../data/geometric/GeometricData.tsx          |   11 +-
 .../data/hygrothermal/HygrothermalData.tsx    |   11 +-
 .../data/lifeCycle/LifeCycleData.tsx          |   11 +-
 .../components/data/optical/OpticalData.tsx   |   17 +-
 .../data/optical/OpticalDataSummary.tsx       |    4 +-
 .../data/photovoltaic/PhotovoltaicData.tsx    |   11 +-
 .../dataFormats/CreateDataFormat.tsx          |   33 +-
 .../components/dataFormats/DataFormat.tsx     |   11 +-
 .../dataFormats/DataFormatSummary.tsx         |    2 +-
 .../dataFormats/UpdateDataFormat.tsx          |    2 +-
 .../components/databases/CreateDatabase.tsx   |   32 +-
 frontend/components/databases/Database.tsx    |   11 +-
 .../components/databases/DatabaseSummary.tsx  |    6 +-
 .../components/databases/VerifyDatabase.tsx   |    9 +-
 .../components/entities/PaginatedEntities.tsx |   18 +-
 .../gnuPgKeys/AddGnuPgKeyFingerprint.tsx      |   19 +-
 .../gnuPgKeys/AllowGnuPgKeyFingerprint.tsx    |   16 +-
 .../gnuPgKeys/ForbidGnuPgKeyFingerprint.tsx   |   16 +-
 frontend/components/gnuPgKeys/GnuPgKey.tsx    |   11 +-
 .../components/gnuPgKeys/GnuPgKeySummary.tsx  |   10 +-
 .../AddInstitutionRepresentative.tsx          |   15 +-
 .../ConfirmInstitutionRepresentative.tsx      |   18 -
 .../institutions/CreateInstitution.tsx        |   45 +-
 .../institutions/DeleteInstitution.tsx        |    6 +-
 .../components/institutions/Institution.tsx   |   38 +-
 .../institutions/InstitutionIdSelect.tsx      |   17 +-
 .../institutions/InstitutionSummary.tsx       |    4 +-
 .../RemoveInstitutionRepresentative.tsx       |   20 -
 .../RepresentedInstitutionIdSelect.tsx        |   22 +
 .../institutions/VerifyInstitution.tsx        |    9 +-
 frontend/components/me/ChangeUserEmail.tsx    |    2 +-
 .../components/me/DeletePersonalUserData.tsx  |    2 +-
 .../me/EnableUserTwoFactorAuthenticator.tsx   |    2 +-
 ...ctorAuthenticatorSharedKeyAndQrCodeUri.tsx |    2 +-
 .../me/ResendUserEmailVerification.tsx        |    2 +-
 frontend/components/me/SetUserPhoneNumber.tsx |    4 +-
 .../methods/AddInstitutionMethodDeveloper.tsx |   15 +-
 .../methods/AddUserMethodDeveloper.tsx        |   15 +-
 ...MethodViewer.tsx => AppliedMethodView.tsx} |   10 +-
 .../ConfirmInstitutionMethodDeveloper.tsx     |   20 -
 .../methods/ConfirmUserMethodDeveloper.tsx    |   20 -
 frontend/components/methods/CreateMethod.tsx  |   45 +-
 frontend/components/methods/Method.tsx        |   11 +-
 .../methods/MethodParametersSubform.tsx       |    2 +-
 .../methods/MethodSourcesSubform.tsx          |    2 +-
 frontend/components/methods/MethodSummary.tsx |    8 +-
 .../RemoveInstitutionMethodDeveloper.tsx      |   24 -
 .../methods/RemoveUserMethodDeveloper.tsx     |   24 -
 frontend/components/methods/UpdateMethod.tsx  |    6 +-
 .../CreateOpenIdConnectApplication.tsx        |   41 +-
 .../DeleteOpenIdConnectApplication.tsx        |   13 +-
 .../applications/OpenIdConnectApplication.tsx |    9 +-
 ...etOpenIdConnectApplicationClientSecret.tsx |    4 +-
 .../DeleteOpenIdConnectAuthorization.tsx      |   13 +-
 .../OpenIdConnectAuthorizationSummary.tsx     |   32 +-
 .../tokens/OpenIdConnectTokenSummary.tsx      |   39 +-
 .../tokens/RevokeOpenIdConnectToken.tsx       |   15 +-
 frontend/components/users/AddUserRole.tsx     |   16 +-
 frontend/components/users/DeleteUser.tsx      |    6 +-
 frontend/components/users/User.tsx            |   37 +-
 frontend/components/users/UserIdSelect.tsx    |   17 +-
 frontend/components/users/UserRoleTag.tsx     |   18 +-
 frontend/components/users/UserSummary.tsx     |   10 +-
 frontend/lib/array.ts                         |   10 +
 frontend/lib/hooks/usePaginatedQuery.ts       |   31 +-
 frontend/lib/string.ts                        |    2 +-
 frontend/package.json                         |    2 +-
 frontend/pages/institutions/create.tsx        |    2 +-
 frontend/pages/institutions/index.tsx         |    2 +-
 frontend/pages/me/manage/email.tsx            |   29 +-
 .../pages/me/manage/enable-authenticator.tsx  |    4 +-
 frontend/pages/me/manage/personal-data.tsx    |    2 +-
 frontend/pages/me/manage/profile.tsx          |    8 +-
 frontend/queries/componentAssemblies.graphql  |   28 +
 .../queries/componentGeneralizations.graphql  |   18 +
 .../queries/componentManufacturers.graphql    |   28 +
 frontend/queries/componentVariants.graphql    |   18 +
 frontend/queries/components.graphql           |   20 +
 frontend/queries/currentUser.graphql          |   17 +
 frontend/queries/dataFormats.graphql          |    6 +
 frontend/queries/databases.graphql            |   11 +
 .../institutionMethodDevelopers.graphql       |   29 +
 .../institutionRepresentatives.graphql        |   43 +-
 frontend/queries/institutions.graphql         |   45 +-
 frontend/queries/methods.graphql              |   30 +
 frontend/queries/openIdConnect.graphql        |   31 +-
 frontend/queries/userMethodDevelopers.graphql |   26 +
 frontend/queries/users.graphql                |    4 +-
 frontend/styles/global.css                    |    4 -
 frontend/test/index.test.tsx                  |    2 +-
 frontend/type-defs.graphqls                   |   23 +-
 frontend/yarn.lock                            |    8 +-
 153 files changed, 4474 insertions(+), 1290 deletions(-)
 create mode 100644 backend/src/Data/OpenIdConnect/IOpenIdConnectSubject.cs
 create mode 100644 backend/src/GraphQl/OpenIdConnect/OpenIdConnectSubjectType.cs
 create mode 100644 backend/src/Migrations/20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.Designer.cs
 create mode 100644 backend/src/Migrations/20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.cs
 create mode 100644 backend/src/Migrations/migrate_from_20260402204629_AddUpdatedAndCreatedAtTimestamps_to_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.sql
 create mode 100644 backend/src/Migrations/rollback_from_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations_to_20260402204629_AddUpdatedAndCreatedAtTimestamps.sql
 rename frontend/components/{CielabColorViewer.tsx => CielabColorView.tsx} (56%)
 rename frontend/components/{CodeViewer.tsx => CodeView.tsx} (94%)
 create mode 100644 frontend/components/DateTimeX.tsx
 rename frontend/components/{JsonViewer.tsx => JsonView.tsx} (66%)
 create mode 100644 frontend/components/institutions/RepresentedInstitutionIdSelect.tsx
 rename frontend/components/methods/{AppliedMethodViewer.tsx => AppliedMethodView.tsx} (89%)

diff --git a/backend/src/Authorization/CommonAuthorization.cs b/backend/src/Authorization/CommonAuthorization.cs
index e8147f87f..a5285b521 100644
--- a/backend/src/Authorization/CommonAuthorization.cs
+++ b/backend/src/Authorization/CommonAuthorization.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading;
@@ -28,8 +27,6 @@ OpenIddictApplicationManager<OpenIdConnectApplication> applicationManager
     protected UserManager<User> UserManager { get; } = userManager;
     protected OpenIddictApplicationManager<OpenIdConnectApplication> ApplicationManager { get; } = applicationManager;
 
-    internal const string ClientSubjectPrefix = "client:";
-
     // [Implement a DisposeAsync method](https://learn.microsoft.com/en-us/dotnet/standard/garbage-collection/implementing-disposeasync)
     public void Dispose()
     {
@@ -57,30 +54,25 @@ protected virtual ValueTask DisposeAsyncCore()
         return Context.DisposeAsync();
     }
 
-    public async Task<T> SwitchUserOrApplicationAsync<T>(
+    public Task<T> SwitchUserOrApplicationAsync<T>(
         ClaimsPrincipal claimsPrincipal,
         Func<User?, Task<T>> handleUser,
         Func<OpenIdConnectApplication?, Task<T>> handleApplication,
         CancellationToken cancellationToken
     )
     {
-        var userOrPrefixedClientId = claimsPrincipal.GetClaim(Claims.Subject);
-        // Note that a user ID is a UUID and thus cannot start with the client-subject prefix.
-        if (userOrPrefixedClientId is not null
-            && userOrPrefixedClientId.StartsWith(ClientSubjectPrefix, ignoreCase: false, culture: CultureInfo.InvariantCulture)
-        )
-        {
-            var clientId = userOrPrefixedClientId[ClientSubjectPrefix.Length..];
-            return await handleApplication(
+        return IOpenIdConnectSubject.SwitchSubjectAsync(
+            claimsPrincipal.GetClaim(Claims.Subject),
+            async (_) => await handleUser(
+                await GetUserAsync(claimsPrincipal)
+            ),
+            async (clientId) => await handleApplication(
                 await ApplicationManager.FindByClientIdAsync(clientId, cancellationToken)
-            );
-        }
-        else
-        {
-            return await handleUser(
+            ),
+            async () => await handleUser(
                 await GetUserAsync(claimsPrincipal)
-            );
-        }
+            )
+        );
     }
 
     protected Task<bool> AuthorizeAsync(
diff --git a/backend/src/Configuration/GraphQlConfiguration.cs b/backend/src/Configuration/GraphQlConfiguration.cs
index 6c5e95849..c823b529e 100644
--- a/backend/src/Configuration/GraphQlConfiguration.cs
+++ b/backend/src/Configuration/GraphQlConfiguration.cs
@@ -16,7 +16,6 @@
 using Metabase.GraphQl;
 using Metabase.GraphQl.DataX;
 using Metabase.GraphQl.Filters;
-using Metabase.GraphQl.NodaTime;
 using Metabase.GraphQl.Scalars;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -54,6 +53,12 @@ IWebHostEnvironment environment
             .AddMutationConventions(new MutationConventionOptions { ApplyToAllMutations = false })
             // Extensions
             .AddNodaTime()
+            // .AddTypeConverter<OffsetDateTime, DateTimeOffset>(
+            //     _ => _.ToDateTimeOffset()
+            // )
+            // .AddTypeConverter<DateTimeOffset, OffsetDateTime>(
+            //     _ => OffsetDateTime.FromDateTimeOffset(_)
+            // )
             // .AddProjections()
             .AddFiltering<CustomFilterConvention>()
             .AddSorting<CustomSortConvention>()
@@ -163,7 +168,7 @@ await httpContext.RequestServices
             .AddTypes()
             // Paging
             .AddDbContextCursorPagingProvider()
-            .AddCursorKeySerializer(new OffsetDateTimeCursorKeySerializer())
+            // .AddCursorKeySerializer(new OffsetDateTimeCursorKeySerializer())
             .ModifyPagingOptions(_ =>
                 {
                     _.MaxPageSize = (int)GraphQlConstants.MaximumPageSize;
diff --git a/backend/src/Controllers/AuthorizationController.cs b/backend/src/Controllers/AuthorizationController.cs
index a42e2bdd8..5331d2500 100644
--- a/backend/src/Controllers/AuthorizationController.cs
+++ b/backend/src/Controllers/AuthorizationController.cs
@@ -12,7 +12,6 @@
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using Metabase.Authentication;
-using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.Data.OpenIdConnect;
 using Metabase.Extensions;
@@ -92,7 +91,7 @@ private async Task<ClaimsIdentity> CreateClaimsIdentityAsync(
         // `user.Name` instead of the default value `user.UserName` for the
         // claim `Claims.Name` because `user.UserName` is actually the email
         // address.
-        identity.SetClaim(Claims.Subject, await userManager.GetUserIdAsync(user));
+        identity.SetClaim(Claims.Subject, IOpenIdConnectSubject.BuildUserSubject(user.Id));
         identity.SetClaim(Claims.Name, user.Name);
         // identity.SetClaim(Claims.Email, await userManager.GetEmailAsync(user));
         // identity.SetClaims(Claims.Role, [.. await userManager.GetRolesAsync(user)]);
@@ -138,7 +137,7 @@ string applicationId
         var authorization = authorizations.LastOrDefault();
         authorization ??= await authorizationManager.CreateAsync(
                 identity,
-                subject: await userManager.GetUserIdAsync(user),
+                subject: IOpenIdConnectSubject.BuildUserSubject(user.Id),
                 client: applicationId,
                 type: AuthorizationTypes.Permanent,
                 scopes: identity.GetScopes()
@@ -653,9 +652,10 @@ public async Task<IActionResult> Exchange()
                 roleType: Claims.Role);
 
             // Add the claims that will be persisted in the tokens (use the client_id as the subject identifier).
-            var clientId = await applicationManager.GetClientIdAsync(application);
+            var clientId = await applicationManager.GetClientIdAsync(application)
+                ?? throw new InvalidOperationException("The application does not have a client ID.");
             var displayName = await applicationManager.GetDisplayNameAsync(application);
-            identity.SetClaim(Claims.Subject, $"{CommonAuthorization.ClientSubjectPrefix}{clientId}");
+            identity.SetClaim(Claims.Subject, IOpenIdConnectSubject.BuildClientSubject(clientId));
             identity.SetClaim(Claims.Name, displayName);
 
             // Note: In the original OAuth 2.0 specification, the client credentials grant
diff --git a/backend/src/Data/ApplicationDbContext.cs b/backend/src/Data/ApplicationDbContext.cs
index 4c0e2e94f..ab3866238 100644
--- a/backend/src/Data/ApplicationDbContext.cs
+++ b/backend/src/Data/ApplicationDbContext.cs
@@ -141,7 +141,7 @@ private void UpdateTimestamps()
                 || _.State == EntityState.Modified
             // || _.State == EntityState.Deleted
             );
-        var now = _clock.GetUtcNow();
+        var now = _clock.GetUtcNow().ToDateTimeOffset();
         foreach (var entry in entries)
         {
             switch (entry.State)
@@ -499,6 +499,15 @@ protected override void OnModelCreating(ModelBuilder builder)
                     .HasIndex(nameof(INamed.Name), nameof(IEntity.Id))
                     .IsUnique();
             }
+            if (typeof(IEntity).IsAssignableFrom(entityType.ClrType)
+                && typeof(IAuditable).IsAssignableFrom(entityType.ClrType))
+            {
+                var entity = builder.Entity(entityType.ClrType);
+                // https://www.npgsql.org/efcore/modeling/generated-properties.html#guiduuid-generation
+                entity
+                    .HasIndex(nameof(IAuditable.CreatedAt), nameof(IEntity.Id))
+                    .IsUnique();
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/backend/src/Data/AuditableAssociation.cs b/backend/src/Data/AuditableAssociation.cs
index 7d19140bd..680b89c46 100644
--- a/backend/src/Data/AuditableAssociation.cs
+++ b/backend/src/Data/AuditableAssociation.cs
@@ -1,10 +1,10 @@
-using NodaTime;
+using System;
 
 namespace Metabase.Data;
 
 public abstract class AuditableAssociation
 : Association, IAuditable
 {
-    public OffsetDateTime CreatedAt { get; set; }
-    public OffsetDateTime UpdatedAt { get; set; }
-}
+    public DateTimeOffset CreatedAt { get; set; }
+    public DateTimeOffset UpdatedAt { get; set; }
+}
\ No newline at end of file
diff --git a/backend/src/Data/AuditableEntity.cs b/backend/src/Data/AuditableEntity.cs
index 0416283f4..f6b87de99 100644
--- a/backend/src/Data/AuditableEntity.cs
+++ b/backend/src/Data/AuditableEntity.cs
@@ -1,5 +1,4 @@
 using System;
-using NodaTime;
 
 namespace Metabase.Data;
 
@@ -16,6 +15,6 @@ public AuditableEntity(Guid id)
     {
     }
 
-    public OffsetDateTime CreatedAt { get; set; }
-    public OffsetDateTime UpdatedAt { get; set; }
-}
+    public DateTimeOffset CreatedAt { get; set; }
+    public DateTimeOffset UpdatedAt { get; set; }
+}
\ No newline at end of file
diff --git a/backend/src/Data/IAuditable.cs b/backend/src/Data/IAuditable.cs
index e9205aa93..e87fd4650 100644
--- a/backend/src/Data/IAuditable.cs
+++ b/backend/src/Data/IAuditable.cs
@@ -1,12 +1,13 @@
-using NodaTime;
+using System;
 
 namespace Metabase.Data;
 
 public interface IAuditable
 {
-    public OffsetDateTime CreatedAt { get; set; }
-    public OffsetDateTime UpdatedAt { get; set; }
+    // TODO Switch to NodaTime `OffsetDateTime` once there is a `ICursorKeySerializer` implementation for it. Then sorting by `CreatedAt` and `UpdatedAt` with pagination will keep working.
+    public DateTimeOffset CreatedAt { get; set; }
+    public DateTimeOffset UpdatedAt { get; set; }
 
     // soft delete
     // public Instant? DeletedAt { get; set; }
-}
+}
\ No newline at end of file
diff --git a/backend/src/Data/OpenIdConnect/IOpenIdConnectSubject.cs b/backend/src/Data/OpenIdConnect/IOpenIdConnectSubject.cs
new file mode 100644
index 000000000..457825c5a
--- /dev/null
+++ b/backend/src/Data/OpenIdConnect/IOpenIdConnectSubject.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Globalization;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+using Metabase.GraphQl;
+
+namespace Metabase.Data.OpenIdConnect;
+
+[JsonPolymorphic(TypeDiscriminatorPropertyName = GraphQlConstants.TypeDiscriminatorPropertyName)]
+[JsonDerivedType(typeof(User), typeDiscriminator: nameof(User))]
+[JsonDerivedType(typeof(OpenIdConnectApplication), typeDiscriminator: nameof(OpenIdConnectApplication))]
+public interface IOpenIdConnectSubject
+{
+    private const string ClientSubjectPrefix = "client:";
+
+    public static string BuildUserSubject(Guid userId) =>
+        userId.ToString("D");
+
+    public static string BuildClientSubject(string clientId) =>
+        $"{ClientSubjectPrefix}{clientId}";
+
+    public static Task<T> SwitchSubjectAsync<T>(
+        string? subject,
+        Func<Guid, Task<T>> handleUserId,
+        Func<string, Task<T>> handleClientId,
+        Func<Task<T>> handleUnknownSubject
+    )
+    {
+        if (subject is null)
+        {
+            return handleUnknownSubject();
+        }
+        if (subject.StartsWith(ClientSubjectPrefix, ignoreCase: false, culture: CultureInfo.InvariantCulture))
+        {
+            return handleClientId(subject[ClientSubjectPrefix.Length..]);
+        }
+        if (Guid.TryParse(subject, out Guid userId))
+        {
+            return handleUserId(userId);
+        }
+        return handleUnknownSubject();
+    }
+}
\ No newline at end of file
diff --git a/backend/src/Data/OpenIdConnect/OpenIdConnectApplication.cs b/backend/src/Data/OpenIdConnect/OpenIdConnectApplication.cs
index 51f335b2f..6f39fbafd 100644
--- a/backend/src/Data/OpenIdConnect/OpenIdConnectApplication.cs
+++ b/backend/src/Data/OpenIdConnect/OpenIdConnectApplication.cs
@@ -1,24 +1,24 @@
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
-using NodaTime;
 using OpenIddict.EntityFrameworkCore.Models;
 
 namespace Metabase.Data.OpenIdConnect;
 
 public sealed class OpenIdConnectApplication
-    : OpenIddictEntityFrameworkCoreApplication<Guid, OpenIdConnectAuthorization, OpenIdConnectToken>,
-      IEntity,
-      IAuditable
+: OpenIddictEntityFrameworkCoreApplication<Guid, OpenIdConnectAuthorization, OpenIdConnectToken>,
+  IEntity,
+  IAuditable,
+  IOpenIdConnectSubject
 {
     public Guid OwnerId { get; set; }
 
     [InverseProperty(nameof(Institution.OpenIdConnectApplications))]
     public Institution Owner { get; set; } = null!;
 
-    public OffsetDateTime CreatedAt { get; set; }
-    public OffsetDateTime UpdatedAt { get; set; }
+    public DateTimeOffset CreatedAt { get; set; }
+    public DateTimeOffset UpdatedAt { get; set; }
 
     // Configured via `IsRowVersion` in `ApplicationDbContext` instead of the annotation
     // [Timestamp]
     public uint Version { get; private set; } // https://www.npgsql.org/efcore/modeling/concurrency.html
-}
+}
\ No newline at end of file
diff --git a/backend/src/Data/OpenIdConnect/OpenIdConnectAuthorization.cs b/backend/src/Data/OpenIdConnect/OpenIdConnectAuthorization.cs
index ffc22de68..704cccc9a 100644
--- a/backend/src/Data/OpenIdConnect/OpenIdConnectAuthorization.cs
+++ b/backend/src/Data/OpenIdConnect/OpenIdConnectAuthorization.cs
@@ -1,5 +1,4 @@
 using System;
-using NodaTime;
 using OpenIddict.EntityFrameworkCore.Models;
 
 namespace Metabase.Data.OpenIdConnect;
@@ -10,10 +9,10 @@ public sealed class OpenIdConnectAuthorization
       IAuditable
 {
     // `createdAt` could be an alias of `creationDate`
-    public OffsetDateTime CreatedAt { get; set; }
-    public OffsetDateTime UpdatedAt { get; set; }
+    public DateTimeOffset CreatedAt { get; set; }
+    public DateTimeOffset UpdatedAt { get; set; }
 
     // Configured via `IsRowVersion` in `ApplicationDbContext` instead of the annotation
     // [Timestamp]
     public uint Version { get; private set; } // https://www.npgsql.org/efcore/modeling/concurrency.html
-}
+}
\ No newline at end of file
diff --git a/backend/src/Data/OpenIdConnect/OpenIdConnectScope.cs b/backend/src/Data/OpenIdConnect/OpenIdConnectScope.cs
index 90cfc7345..f823bfaaa 100644
--- a/backend/src/Data/OpenIdConnect/OpenIdConnectScope.cs
+++ b/backend/src/Data/OpenIdConnect/OpenIdConnectScope.cs
@@ -1,5 +1,4 @@
 using System;
-using NodaTime;
 using OpenIddict.Abstractions;
 using OpenIddict.EntityFrameworkCore.Models;
 
@@ -46,10 +45,10 @@ public sealed class OpenIdConnectScope
         ManageUserApiScope,
     ];
 
-    public OffsetDateTime CreatedAt { get; set; }
-    public OffsetDateTime UpdatedAt { get; set; }
+    public DateTimeOffset CreatedAt { get; set; }
+    public DateTimeOffset UpdatedAt { get; set; }
 
     // Configured via `IsRowVersion` in `ApplicationDbContext` instead of the annotation
     // [Timestamp]
     public uint Version { get; private set; } // https://www.npgsql.org/efcore/modeling/concurrency.html
-}
+}
\ No newline at end of file
diff --git a/backend/src/Data/OpenIdConnect/OpenIdConnectToken.cs b/backend/src/Data/OpenIdConnect/OpenIdConnectToken.cs
index 2a12d55c2..d9c7b7d54 100644
--- a/backend/src/Data/OpenIdConnect/OpenIdConnectToken.cs
+++ b/backend/src/Data/OpenIdConnect/OpenIdConnectToken.cs
@@ -1,5 +1,4 @@
 using System;
-using NodaTime;
 using OpenIddict.EntityFrameworkCore.Models;
 
 namespace Metabase.Data.OpenIdConnect;
@@ -10,10 +9,10 @@ public sealed class OpenIdConnectToken
       IAuditable
 {
     // `createdAt` could be an alias of `creationDate`
-    public OffsetDateTime CreatedAt { get; set; }
-    public OffsetDateTime UpdatedAt { get; set; }
+    public DateTimeOffset CreatedAt { get; set; }
+    public DateTimeOffset UpdatedAt { get; set; }
 
     // Configured via `IsRowVersion` in `ApplicationDbContext` instead of the annotation
     // [Timestamp]
     public uint Version { get; private set; } // https://www.npgsql.org/efcore/modeling/concurrency.html
-}
+}
\ No newline at end of file
diff --git a/backend/src/Data/User.cs b/backend/src/Data/User.cs
index 58e1c0758..49decc61b 100644
--- a/backend/src/Data/User.cs
+++ b/backend/src/Data/User.cs
@@ -4,8 +4,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using HotChocolate;
 using Microsoft.AspNetCore.Identity;
-using NodaTime;
-using Guid = System.Guid;
+using Metabase.Data.OpenIdConnect;
 
 // TODO Make `User`, `Role`, ... subtype `Entity` and use `Version` to catch update conflicts. Add interface `IEntity`.
 namespace Metabase.Data;
@@ -15,7 +14,8 @@ public sealed class User
   IEntity,
   IAuditable,
   INamed,
-  IStakeholder
+  IStakeholder,
+  IOpenIdConnectSubject
 {
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     public User()
@@ -68,8 +68,8 @@ public User(
     [InverseProperty(nameof(GnuPgKeyFingerprint.User))]
     public ICollection<GnuPgKeyFingerprint> GnuPgKeyFingerprints { get; } = [];
 
-    public OffsetDateTime CreatedAt { get; set; }
-    public OffsetDateTime UpdatedAt { get; set; }
+    public DateTimeOffset CreatedAt { get; set; }
+    public DateTimeOffset UpdatedAt { get; set; }
 
     public uint Version { get; private set; } // https://www.npgsql.org/efcore/modeling/concurrency.html
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/InstitutionMethodDevelopers/RemoveInstitutionMethodDeveloperPayload.cs b/backend/src/GraphQl/InstitutionMethodDevelopers/RemoveInstitutionMethodDeveloperPayload.cs
index ba7a60634..d7fe58621 100644
--- a/backend/src/GraphQl/InstitutionMethodDevelopers/RemoveInstitutionMethodDeveloperPayload.cs
+++ b/backend/src/GraphQl/InstitutionMethodDevelopers/RemoveInstitutionMethodDeveloperPayload.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 using Metabase.Data;
 using Metabase.GraphQl.Institutions;
 using Metabase.GraphQl.Methods;
@@ -7,15 +9,13 @@ namespace Metabase.GraphQl.InstitutionMethodDevelopers;
 
 public sealed class RemoveInstitutionMethodDeveloperPayload
 {
+    private readonly InstitutionMethodDeveloper? _association;
+
     public RemoveInstitutionMethodDeveloperPayload(
         InstitutionMethodDeveloper institutionMethodDeveloper
     )
     {
-        DevelopedMethodEdge = new InstitutionDevelopedMethodEdge(
-            institutionMethodDeveloper,
-            PaginationHelpers.ConstructCursor(institutionMethodDeveloper.MethodId, institutionMethodDeveloper.InstitutionId)
-        );
-        MethodDeveloperEdge = new InstitutionMethodDeveloperEdge(institutionMethodDeveloper);
+        _association = institutionMethodDeveloper;
     }
 
     public RemoveInstitutionMethodDeveloperPayload(
@@ -32,7 +32,29 @@ RemoveInstitutionMethodDeveloperError error
     {
     }
 
-    public InstitutionDevelopedMethodEdge? DevelopedMethodEdge { get; }
-    public InstitutionMethodDeveloperEdge? MethodDeveloperEdge { get; }
     public IReadOnlyCollection<RemoveInstitutionMethodDeveloperError>? Errors { get; }
+
+    public async Task<Method?> GetMethodAsync(
+        IMethodByIdDataLoader byId,
+        CancellationToken cancellationToken
+    )
+    {
+        if (_association is null)
+        {
+            return null;
+        }
+        return await byId.LoadAsync(_association.MethodId, cancellationToken);
+    }
+
+    public async Task<Institution?> GetInstitutionAsync(
+        IInstitutionByIdDataLoader byId,
+        CancellationToken cancellationToken
+    )
+    {
+        if (_association is null)
+        {
+            return null;
+        }
+        return await byId.LoadAsync(_association.InstitutionId, cancellationToken);
+    }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/NodaTime/OffsetDateTimeCursorKeySerializer.cs b/backend/src/GraphQl/NodaTime/OffsetDateTimeCursorKeySerializer.cs
index a20925981..c3bd39ec4 100644
--- a/backend/src/GraphQl/NodaTime/OffsetDateTimeCursorKeySerializer.cs
+++ b/backend/src/GraphQl/NodaTime/OffsetDateTimeCursorKeySerializer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Buffers;
+using System.Reflection;
 using System.Text.Unicode;
 using GreenDonut.Data.Cursors.Serializers;
 using Metabase.Extensions;
@@ -11,13 +12,14 @@ namespace Metabase.GraphQl.NodaTime;
 // Inspired by https://github.com/ChilliCream/graphql-platform/blob/main/src/GreenDonut/src/GreenDonut.Data/Cursors/Serializers/DateTimeOffsetCursorKeySerializer.cs
 public sealed class OffsetDateTimeCursorKeySerializer : ICursorKeySerializer
 {
-    private static readonly OffsetDateTimePattern _pattern = OffsetDateTimePattern.ExtendedIso;
+    private static readonly OffsetDateTimePattern s_pattern = OffsetDateTimePattern.ExtendedIso;
 
     public bool IsSupported(Type type)
         => type == typeof(OffsetDateTime) || type == typeof(OffsetDateTime?);
 
-    public System.Reflection.MethodInfo GetCompareToMethod(Type type)
-        => typeof(OffsetDateTime).GetMethod(nameof(NodaTimeExtensions.CompareTo), [typeof(OffsetDateTime), typeof(OffsetDateTime)])!;
+    // TODO causes a runtime exception because `CompareTo` is not an instance method of `OffsetDateTime`
+    public MethodInfo GetCompareToMethod(Type type)
+        => typeof(NodaTimeExtensions).GetMethod(nameof(NodaTimeExtensions.CompareTo), [typeof(OffsetDateTime)])!;
 
     public object Parse(ReadOnlySpan<byte> formattedKey)
     {
@@ -26,15 +28,18 @@ public object Parse(ReadOnlySpan<byte> formattedKey)
         {
             throw new FormatException("Invalid cursor format");
         }
-        var result = _pattern.Parse(new string(chars));
-        if (!result.Success) throw new FormatException("Could not parse OffsetDateTime cursor");
+        var result = s_pattern.Parse(new string(chars));
+        if (!result.Success)
+        {
+            throw new FormatException("Could not parse `OffsetDateTime` cursor");
+        }
         return result.Value;
     }
 
     public bool TryFormat(object key, Span<byte> buffer, out int written)
     {
         var value = (OffsetDateTime)key;
-        var formatted = _pattern.Format(value);
+        var formatted = s_pattern.Format(value);
         return Utf8.FromUtf16(formatted, buffer, out _, out written) == OperationStatus.Done;
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/DeleteOpenIdConnectAuthorizationPayload.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/DeleteOpenIdConnectAuthorizationPayload.cs
index cf11882cc..ce6e14807 100644
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/DeleteOpenIdConnectAuthorizationPayload.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/DeleteOpenIdConnectAuthorizationPayload.cs
@@ -1,11 +1,13 @@
 using System.Collections.Generic;
+using Metabase.Data.OpenIdConnect;
 
 namespace Metabase.GraphQl.OpenIdConnect.Authorizations;
 
 public sealed class DeleteOpenIdConnectAuthorizationPayload
 {
-    public DeleteOpenIdConnectAuthorizationPayload()
+    public DeleteOpenIdConnectAuthorizationPayload(OpenIdConnectApplication? application)
     {
+        Application = application;
     }
 
     public DeleteOpenIdConnectAuthorizationPayload(
@@ -15,5 +17,6 @@ DeleteOpenIdConnectAuthorizationError error
         Errors = [error];
     }
 
+    public OpenIdConnectApplication? Application { get; }
     public IReadOnlyCollection<DeleteOpenIdConnectAuthorizationError>? Errors { get; }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationMutations.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationMutations.cs
index b1d42536b..a4c88e8d1 100644
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationMutations.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationMutations.cs
@@ -50,6 +50,6 @@ CancellationToken cancellationToken
             );
         }
         await authorizationManager.DeleteAsync(authorization, cancellationToken);
-        return new DeleteOpenIdConnectAuthorizationPayload();
+        return new DeleteOpenIdConnectAuthorizationPayload(authorization.Application);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationType.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationType.cs
index 3f0864105..d93571261 100644
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationType.cs
@@ -9,6 +9,8 @@
 using System.Text.Json;
 using System.Collections.Generic;
 using System.Linq;
+using Metabase.Data;
+using Microsoft.EntityFrameworkCore;
 
 namespace Metabase.GraphQl.OpenIdConnect.Authorizations;
 
@@ -25,7 +27,14 @@ IObjectTypeDescriptor<OpenIdConnectAuthorization> descriptor
         descriptor.Field(authorization => authorization.CreationDate).Ignore(); // use `CreatedAt` instead
 
         descriptor
-            .Field(authorization => authorization.Scopes)
+            .Field(_ => _.Subject)
+            .Type<ObjectType<User>>()
+            .Cost(1)
+            .ResolveWith<AuthorizationResolvers>(x =>
+                AuthorizationResolvers.GetSubjectAsync(default!, default!, default!)
+            );
+        descriptor
+            .Field(_ => _.Scopes)
             .Type<NonNullType<ListType<NonNullType<EnumType<OpenIdConnectScope>>>>>()
             .Cost(0)
             .Resolve(context =>
@@ -41,13 +50,15 @@ IObjectTypeDescriptor<OpenIdConnectAuthorization> descriptor
         });
         descriptor
             .Field(t => t.Application)
-            .Type<NonNullType<ObjectType<OpenIdConnectAuthorizationApplicationEdge>>>()
+            .Type<ObjectType<OpenIdConnectAuthorizationApplicationEdge>>()
             .Resolve(context =>
-                new OpenIdConnectAuthorizationApplicationEdge(
-                    // auto-included in `ApplicationDbContext`
-                    context.Parent<OpenIdConnectAuthorization>().Application!
-                )
-            );
+            {
+                // auto-included in `ApplicationDbContext`
+                var application = context.Parent<OpenIdConnectAuthorization>().Application;
+                return application is null
+                    ? null
+                    : new OpenIdConnectAuthorizationApplicationEdge(application);
+            });
         descriptor
             .Field(authorization => authorization.Tokens)
             .Type<NonNullType<ObjectType<OpenIdConnectAuthorizationIssuedTokenConnection>>>()
@@ -60,12 +71,29 @@ IObjectTypeDescriptor<OpenIdConnectAuthorization> descriptor
             .Field("isAuthorizedToDeleteNode")
             .Cost(1)
             .ResolveWith<AuthorizationResolvers>(x =>
-                AuthorizationResolvers.IsAuthorizedToDeleteNodeAsync(default!, default!, default!, default!))
+                AuthorizationResolvers.IsAuthorizedToDeleteNodeAsync(default!, default!, default!, default!)
+            )
             .UseUserManager();
     }
 
     private sealed class AuthorizationResolvers
     {
+        public static Task<IOpenIdConnectSubject?> GetSubjectAsync(
+            [Parent] OpenIdConnectAuthorization authorization,
+            ApplicationDbContext databaseContext,
+            CancellationToken cancellationToken
+        )
+        {
+            return IOpenIdConnectSubject.SwitchSubjectAsync<IOpenIdConnectSubject?>(
+                authorization.Subject,
+                async (userId) =>
+                    await databaseContext.Users.AsNoTracking()
+                    .SingleOrDefaultAsync(_ => _.Id == userId, cancellationToken),
+                async (clientId) => null,
+                async () => null
+            );
+        }
+
         public static Task<bool> IsAuthorizedToDeleteNodeAsync(
             [Parent] OpenIdConnectAuthorization authorization,
             ClaimsPrincipal claimsPrincipal,
diff --git a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectSubjectType.cs b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectSubjectType.cs
new file mode 100644
index 000000000..0290185a0
--- /dev/null
+++ b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectSubjectType.cs
@@ -0,0 +1,13 @@
+using HotChocolate.Types;
+using Metabase.Data.OpenIdConnect;
+
+namespace Metabase.GraphQl.OpenIdConnect;
+
+public sealed class OpenIdConnectSubjectType
+    : UnionType<IOpenIdConnectSubject>
+{
+    protected override void Configure(IUnionTypeDescriptor descriptor)
+    {
+        descriptor.Name(nameof(IOpenIdConnectSubject)[1..]);
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenType.cs b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenType.cs
index 57ca3fddb..eef544cea 100644
--- a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenType.cs
@@ -6,6 +6,9 @@
 using Metabase.Data.OpenIdConnect;
 using Metabase.GraphQl.Users;
 using Metabase.GraphQl.Entities;
+using Metabase.Data;
+using Microsoft.EntityFrameworkCore;
+using OpenIddict.Core;
 
 namespace Metabase.GraphQl.OpenIdConnect.Tokens;
 
@@ -32,34 +35,64 @@ IObjectTypeDescriptor<OpenIdConnectToken> descriptor
         descriptor
             .Field(_ => _.RedemptionDate)
             .Name(RedeemedAtName);
+        descriptor
+            .Field(_ => _.Subject)
+            .Type<UnionType<IOpenIdConnectSubject>>()
+            .Cost(1)
+            .ResolveWith<TokenResolvers>(x =>
+                TokenResolvers.GetSubjectAsync(default!, default!, default!, default!)
+            );
         descriptor
             .Field(t => t.Application)
-            .Type<NonNullType<ObjectType<OpenIdConnectTokenApplicationEdge>>>()
+            .Type<ObjectType<OpenIdConnectTokenApplicationEdge>>()
             .Resolve(context =>
-                new OpenIdConnectTokenApplicationEdge(
-                    // auto-included in `ApplicationDbContext`
-                    context.Parent<OpenIdConnectToken>().Application!
-                )
-            );
+            {
+                // auto-included in `ApplicationDbContext`
+                var application = context.Parent<OpenIdConnectToken>().Application;
+                return application is null
+                    ? null
+                    : new OpenIdConnectTokenApplicationEdge(application);
+            });
         descriptor
             .Field(t => t.Authorization)
-            .Type<NonNullType<ObjectType<OpenIdConnectTokenAuthorizationEdge>>>()
+            .Type<ObjectType<OpenIdConnectTokenAuthorizationEdge>>()
             .Resolve(context =>
-                new OpenIdConnectTokenAuthorizationEdge(
-                    // auto-included in `ApplicationDbContext`
-                    context.Parent<OpenIdConnectToken>().Authorization!
-                )
-            );
+            {
+                // auto-included in `ApplicationDbContext`
+                var authorization = context.Parent<OpenIdConnectToken>().Authorization;
+                return authorization is null
+                    ? null
+                    : new OpenIdConnectTokenAuthorizationEdge(authorization);
+            });
         descriptor
             .Field("isAuthorizedToRevokeNode")
             .Cost(1)
             .ResolveWith<TokenResolvers>(x =>
-                TokenResolvers.IsAuthorizedToRevokeNodeAsync(default!, default!, default!, default!))
+                TokenResolvers.IsAuthorizedToRevokeNodeAsync(default!, default!, default!, default!)
+            )
             .UseUserManager();
     }
 
     private sealed class TokenResolvers
     {
+        public static Task<IOpenIdConnectSubject?> GetSubjectAsync(
+            [Parent] OpenIdConnectToken token,
+            OpenIddictApplicationManager<OpenIdConnectApplication> applicationManager,
+            ApplicationDbContext databaseContext,
+            CancellationToken cancellationToken
+        )
+        {
+            return IOpenIdConnectSubject.SwitchSubjectAsync<IOpenIdConnectSubject?>(
+                token.Subject,
+                async (userId) =>
+                    await databaseContext.Users.AsNoTracking()
+                    .SingleOrDefaultAsync(_ => _.Id == userId, cancellationToken),
+                async (clientId) =>
+                    await applicationManager.FindByClientIdAsync(clientId, cancellationToken),
+                async () => null
+            );
+        }
+
         public static Task<bool> IsAuthorizedToRevokeNodeAsync(
             [Parent] OpenIdConnectToken token,
             ClaimsPrincipal claimsPrincipal,
diff --git a/backend/src/GraphQl/OpenIdConnect/Tokens/RevokeOpenIdConnectTokenPayload.cs b/backend/src/GraphQl/OpenIdConnect/Tokens/RevokeOpenIdConnectTokenPayload.cs
index b210ebaa6..99fdc8199 100644
--- a/backend/src/GraphQl/OpenIdConnect/Tokens/RevokeOpenIdConnectTokenPayload.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Tokens/RevokeOpenIdConnectTokenPayload.cs
@@ -5,8 +5,6 @@ namespace Metabase.GraphQl.OpenIdConnect.Tokens;
 
 public sealed class RevokeOpenIdConnectTokenPayload
 {
-    public OpenIdConnectToken? Token { get; }
-
     public RevokeOpenIdConnectTokenPayload(OpenIdConnectToken token)
     {
         Token = token;
@@ -19,5 +17,6 @@ RevokeOpenIdConnectTokenError error
         Errors = [error];
     }
 
+    public OpenIdConnectToken? Token { get; }
     public IReadOnlyCollection<RevokeOpenIdConnectTokenError>? Errors { get; }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/UserMethodDevelopers/RemoveUserMethodDeveloperPayload.cs b/backend/src/GraphQl/UserMethodDevelopers/RemoveUserMethodDeveloperPayload.cs
index 3454d6b46..3fb77511a 100644
--- a/backend/src/GraphQl/UserMethodDevelopers/RemoveUserMethodDeveloperPayload.cs
+++ b/backend/src/GraphQl/UserMethodDevelopers/RemoveUserMethodDeveloperPayload.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 using Metabase.Data;
 using Metabase.GraphQl.Methods;
 using Metabase.GraphQl.Users;
@@ -7,15 +9,13 @@ namespace Metabase.GraphQl.UserMethodDevelopers;
 
 public sealed class RemoveUserMethodDeveloperPayload
 {
+    private readonly UserMethodDeveloper? _association;
+
     public RemoveUserMethodDeveloperPayload(
         UserMethodDeveloper userMethodDeveloper
     )
     {
-        DevelopedMethodEdge = new UserDevelopedMethodEdge(
-            userMethodDeveloper,
-            PaginationHelpers.ConstructCursor(userMethodDeveloper.MethodId, userMethodDeveloper.UserId)
-        );
-        MethodDeveloperEdge = new UserMethodDeveloperEdge(userMethodDeveloper);
+        _association = userMethodDeveloper;
     }
 
     public RemoveUserMethodDeveloperPayload(
@@ -32,7 +32,29 @@ RemoveUserMethodDeveloperError error
     {
     }
 
-    public UserDevelopedMethodEdge? DevelopedMethodEdge { get; }
-    public UserMethodDeveloperEdge? MethodDeveloperEdge { get; }
     public IReadOnlyCollection<RemoveUserMethodDeveloperError>? Errors { get; }
+
+    public async Task<Method?> GetMethodAsync(
+        IMethodByIdDataLoader byId,
+        CancellationToken cancellationToken
+    )
+    {
+        if (_association is null)
+        {
+            return null;
+        }
+        return await byId.LoadAsync(_association.MethodId, cancellationToken);
+    }
+
+    public async Task<User?> GetUserAsync(
+        IUserByIdDataLoader byId,
+        CancellationToken cancellationToken
+    )
+    {
+        if (_association is null)
+        {
+            return null;
+        }
+        return await byId.LoadAsync(_association.UserId, cancellationToken);
+    }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/UserType.cs b/backend/src/GraphQl/Users/UserType.cs
index 693803303..2378e733d 100644
--- a/backend/src/GraphQl/Users/UserType.cs
+++ b/backend/src/GraphQl/Users/UserType.cs
@@ -148,7 +148,7 @@ await Authorize(context, user => user.Name, Scopes.Profile)
             .UseUserManager();
         descriptor
             .Field("contact")
-            .Type<NonNullType<ObjectType<ContactInformation>>>()
+            .Type<ObjectType<ContactInformation>>()
             .Cost(0)
             .Resolve(async context =>
                 new ContactInformation(
diff --git a/backend/src/Migrations/20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.Designer.cs b/backend/src/Migrations/20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.Designer.cs
new file mode 100644
index 000000000..52880f6a0
--- /dev/null
+++ b/backend/src/Migrations/20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.Designer.cs
@@ -0,0 +1,2298 @@
+// <auto-generated />
+using System;
+using System.Text.Json;
+using Metabase.Data;
+using Metabase.Enumerations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Metabase.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations")]
+    partial class AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("metabase")
+                .HasAnnotation("ProductVersion", "10.0.7")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "component_category", new[] { "layer", "material", "unit" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "database_verification_state", new[] { "pending", "verified" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_operating_state", new[] { "not_operating", "operating" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_representative_role", new[] { "assistant", "owner" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_state", new[] { "pending", "verified" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "method_category", new[] { "calculation", "measurement" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "prime_surface", new[] { "inside", "outside" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "standardizer", new[] { "aerc", "agi", "ashrae", "breeam", "bs", "bsi", "cen", "cie", "dgnb", "din", "dvwg", "iec", "ies", "ift", "iso", "jis", "leed", "nfrc", "riba", "ul", "unece", "vdi", "vff", "well" });
+            NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "pgcrypto");
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("Abbreviation")
+                        .HasColumnType("text");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
+                        .HasColumnType("tstzrange");
+
+                    b.PrimitiveCollection<ComponentCategory[]>("Categories")
+                        .IsRequired()
+                        .HasColumnType("metabase.component_category[]");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<JsonElement?>("Extras")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("component", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentAssembly", b =>
+                {
+                    b.Property<Guid>("AssembledComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("PartComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<byte?>("Index")
+                        .HasColumnType("smallint");
+
+                    b.Property<PrimeSurface?>("PrimeSurface")
+                        .HasColumnType("metabase.prime_surface");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("AssembledComponentId", "PartComponentId");
+
+                    b.HasIndex("PartComponentId");
+
+                    b.ToTable("component_assembly", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentConcretizationAndGeneralization", b =>
+                {
+                    b.Property<Guid>("GeneralComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ConcreteComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("GeneralComponentId", "ConcreteComponentId");
+
+                    b.HasIndex("ConcreteComponentId");
+
+                    b.ToTable("component_concretization_and_generalization", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentManufacturer", b =>
+                {
+                    b.Property<Guid>("ComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("ComponentId", "InstitutionId");
+
+                    b.HasIndex("InstitutionId");
+
+                    b.ToTable("component_manufacturer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentVariant", b =>
+                {
+                    b.Property<Guid>("OfComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ToComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("OfComponentId", "ToComponentId");
+
+                    b.HasIndex("ToComponentId");
+
+                    b.ToTable("component_variant", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.DataFormat", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Extension")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("MediaType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SchemaLocator")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("data_format", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Database", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Locator")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OperatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("VerificationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DatabaseVerificationState>("VerificationState")
+                        .HasColumnType("metabase.database_verification_state");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OperatorId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("database", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.GnuPgKeyFingerprint", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<OffsetDateTime?>("AllowedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Fingerprint")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<OffsetDateTime?>("ForbiddenAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Fingerprint")
+                        .IsUnique();
+
+                    b.HasIndex("InstitutionId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("gnu_pg_fingerprint", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("Abbreviation")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<JsonElement?>("Extras")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<InstitutionOperatingState>("OperatingState")
+                        .HasColumnType("metabase.institution_operating_state");
+
+                    b.Property<InstitutionState>("State")
+                        .HasColumnType("metabase.institution_state");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("institution", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionMethodDeveloper", b =>
+                {
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MethodId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("InstitutionId", "MethodId");
+
+                    b.HasIndex("MethodId");
+
+                    b.ToTable("institution_method_developer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionRepresentative", b =>
+                {
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<InstitutionRepresentativeRole>("Role")
+                        .HasColumnType("metabase.institution_representative_role");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("InstitutionId", "UserId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("institution_representative", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
+                        .HasColumnType("tstzrange");
+
+                    b.Property<string>("CalculationLocator")
+                        .HasColumnType("text");
+
+                    b.PrimitiveCollection<MethodCategory[]>("Categories")
+                        .IsRequired()
+                        .HasColumnType("metabase.method_category[]");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Validity")
+                        .HasColumnType("tstzrange");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("method", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("ApplicationType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("ClientSecret")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClientType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ConsentType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayNames")
+                        .HasColumnType("text");
+
+                    b.Property<string>("JsonWebKeySet")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Permissions")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostLogoutRedirectUris")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RedirectUris")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Requirements")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Settings")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId")
+                        .IsUnique();
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("OpenIddictApplications", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTime?>("CreationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Scopes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Subject")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                    b.ToTable("OpenIddictAuthorizations", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectScope", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Descriptions")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayNames")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Resources")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("OpenIddictScopes", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AuthorizationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTime?>("CreationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("ExpirationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("RedemptionDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ReferenceId")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Status")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Subject")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuthorizationId");
+
+                    b.HasIndex("ReferenceId")
+                        .IsUnique();
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                    b.ToTable("OpenIddictTokens", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Role", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("role", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.RoleClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("role_claim", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PostalAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.Property<string>("WebsiteLocator")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("user", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("user_claim", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserLogin", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("user_login", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserMethodDeveloper", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MethodId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("UserId", "MethodId");
+
+                    b.HasIndex("MethodId");
+
+                    b.ToTable("user_method_developer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserRole", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("user_role", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserToken", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("user_token", "metabase");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedComponents")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "PrimeDirection", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "PrimeSurface", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "SwitchableLayers", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("PrimeDirection");
+
+                    b.Navigation("PrimeSurface");
+
+                    b.Navigation("SwitchableLayers");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentAssembly", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "AssembledComponent")
+                        .WithMany("PartEdges")
+                        .HasForeignKey("AssembledComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "PartComponent")
+                        .WithMany("PartOfEdges")
+                        .HasForeignKey("PartComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("AssembledComponent");
+
+                    b.Navigation("PartComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentConcretizationAndGeneralization", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "ConcreteComponent")
+                        .WithMany("GeneralizationEdges")
+                        .HasForeignKey("ConcreteComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "GeneralComponent")
+                        .WithMany("ConcretizationEdges")
+                        .HasForeignKey("GeneralComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ConcreteComponent");
+
+                    b.Navigation("GeneralComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentManufacturer", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "Component")
+                        .WithMany("ManufacturerEdges")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("ManufacturedComponentEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Institution");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentVariant", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "OfComponent")
+                        .WithMany("VariantEdges")
+                        .HasForeignKey("OfComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "ToComponent")
+                        .WithMany("VariantOfEdges")
+                        .HasForeignKey("ToComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("OfComponent");
+
+                    b.Navigation("ToComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.DataFormat", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedDataFormats")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.Reference", "Reference", b1 =>
+                        {
+                            b1.Property<Guid>("DataFormatId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("DataFormatId");
+
+                            b1.ToTable("data_format", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("DataFormatId");
+
+                            b1.OwnsOne("Metabase.Data.Publication", "Publication", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceDataFormatId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("ArXiv")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<string[]>("Authors")
+                                        .HasColumnType("text[]");
+
+                                    b2.Property<string>("Doi")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Urn")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("WebAddress")
+                                        .HasColumnType("text");
+
+                                    b2.HasKey("ReferenceDataFormatId");
+
+                                    b2.ToTable("data_format", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceDataFormatId");
+                                });
+
+                            b1.OwnsOne("Metabase.Data.Standard", "Standard", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceDataFormatId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Locator")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                        .IsRequired()
+                                        .HasColumnType("metabase.standardizer[]");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<int?>("Year")
+                                        .HasColumnType("integer");
+
+                                    b2.HasKey("ReferenceDataFormatId");
+
+                                    b2.ToTable("data_format", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceDataFormatId");
+
+                                    b2.OwnsOne("Metabase.Data.Numeration", "Numeration", b3 =>
+                                        {
+                                            b3.Property<Guid>("StandardReferenceDataFormatId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("MainNumber")
+                                                .IsRequired()
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Prefix")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Suffix")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("StandardReferenceDataFormatId");
+
+                                            b3.ToTable("data_format", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("StandardReferenceDataFormatId");
+                                        });
+
+                                    b2.Navigation("Numeration")
+                                        .IsRequired();
+                                });
+
+                            b1.Navigation("Publication");
+
+                            b1.Navigation("Standard");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("Reference");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Database", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Operator")
+                        .WithMany("OperatedDatabases")
+                        .HasForeignKey("OperatorId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Operator");
+                });
+
+            modelBuilder.Entity("Metabase.Data.GnuPgKeyFingerprint", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("GnuPgKeyFingerprints")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("GnuPgKeyFingerprints")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedInstitutions")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.OwnsOne("Metabase.Data.ContactInformation", "Contact", b1 =>
+                        {
+                            b1.Property<Guid>("InstitutionId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("EmailAddress")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("IsEmailAddressConfirmed")
+                                .HasColumnType("boolean");
+
+                            b1.Property<bool>("IsPhoneNumberConfirmed")
+                                .HasColumnType("boolean");
+
+                            b1.Property<string>("PhoneNumber")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("PostalAddress")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("WebsiteLocator")
+                                .HasColumnType("text");
+
+                            b1.HasKey("InstitutionId");
+
+                            b1.ToTable("institution", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("InstitutionId");
+                        });
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Manager");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionMethodDeveloper", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("DevelopedMethodEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Method", "Method")
+                        .WithMany("InstitutionDeveloperEdges")
+                        .HasForeignKey("MethodId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("Method");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionRepresentative", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("RepresentativeEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("RepresentedInstitutionEdges")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedMethods")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.Reference", "Reference", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("MethodId");
+
+                            b1.ToTable("method", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+
+                            b1.OwnsOne("Metabase.Data.Publication", "Publication", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceMethodId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("ArXiv")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<string[]>("Authors")
+                                        .HasColumnType("text[]");
+
+                                    b2.Property<string>("Doi")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Urn")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("WebAddress")
+                                        .HasColumnType("text");
+
+                                    b2.HasKey("ReferenceMethodId");
+
+                                    b2.ToTable("method", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceMethodId");
+                                });
+
+                            b1.OwnsOne("Metabase.Data.Standard", "Standard", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceMethodId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Locator")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                        .IsRequired()
+                                        .HasColumnType("metabase.standardizer[]");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<int?>("Year")
+                                        .HasColumnType("integer");
+
+                                    b2.HasKey("ReferenceMethodId");
+
+                                    b2.ToTable("method", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceMethodId");
+
+                                    b2.OwnsOne("Metabase.Data.Numeration", "Numeration", b3 =>
+                                        {
+                                            b3.Property<Guid>("StandardReferenceMethodId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("MainNumber")
+                                                .IsRequired()
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Prefix")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Suffix")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("StandardReferenceMethodId");
+
+                                            b3.ToTable("method", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("StandardReferenceMethodId");
+                                        });
+
+                                    b2.Navigation("Numeration")
+                                        .IsRequired();
+                                });
+
+                            b1.Navigation("Publication");
+
+                            b1.Navigation("Standard");
+                        });
+
+                    b.OwnsMany("Metabase.Data.MethodParameter", "Parameters", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<JsonElement>("Type")
+                                .HasColumnType("jsonb");
+
+                            b1.HasKey("MethodId", "Id");
+
+                            b1.ToTable("MethodParameter", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+                        });
+
+                    b.OwnsMany("Metabase.Data.MethodSource", "Sources", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Description")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.HasKey("MethodId", "Id");
+
+                            b1.ToTable("MethodSource", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("Parameters");
+
+                    b.Navigation("Reference");
+
+                    b.Navigation("Sources");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Owner")
+                        .WithMany("OpenIdConnectApplications")
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", "Application")
+                        .WithMany("Authorizations")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectToken", b =>
+                {
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", "Application")
+                        .WithMany("Tokens")
+                        .HasForeignKey("ApplicationId");
+
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", "Authorization")
+                        .WithMany("Tokens")
+                        .HasForeignKey("AuthorizationId");
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Authorization");
+                });
+
+            modelBuilder.Entity("Metabase.Data.RoleClaim", b =>
+                {
+                    b.HasOne("Metabase.Data.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserClaim", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserLogin", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserMethodDeveloper", b =>
+                {
+                    b.HasOne("Metabase.Data.Method", "Method")
+                        .WithMany("UserDeveloperEdges")
+                        .HasForeignKey("MethodId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("DevelopedMethodEdges")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Method");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserRole", b =>
+                {
+                    b.HasOne("Metabase.Data.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserToken", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.Navigation("ConcretizationEdges");
+
+                    b.Navigation("GeneralizationEdges");
+
+                    b.Navigation("ManufacturerEdges");
+
+                    b.Navigation("PartEdges");
+
+                    b.Navigation("PartOfEdges");
+
+                    b.Navigation("VariantEdges");
+
+                    b.Navigation("VariantOfEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.Navigation("DevelopedMethodEdges");
+
+                    b.Navigation("GnuPgKeyFingerprints");
+
+                    b.Navigation("ManagedComponents");
+
+                    b.Navigation("ManagedDataFormats");
+
+                    b.Navigation("ManagedInstitutions");
+
+                    b.Navigation("ManagedMethods");
+
+                    b.Navigation("ManufacturedComponentEdges");
+
+                    b.Navigation("OpenIdConnectApplications");
+
+                    b.Navigation("OperatedDatabases");
+
+                    b.Navigation("RepresentativeEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.Navigation("InstitutionDeveloperEdges");
+
+                    b.Navigation("UserDeveloperEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.Navigation("Authorizations");
+
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Metabase.Data.User", b =>
+                {
+                    b.Navigation("DevelopedMethodEdges");
+
+                    b.Navigation("GnuPgKeyFingerprints");
+
+                    b.Navigation("RepresentedInstitutionEdges");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/backend/src/Migrations/20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.cs b/backend/src/Migrations/20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.cs
new file mode 100644
index 000000000..7df8ee736
--- /dev/null
+++ b/backend/src/Migrations/20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.cs
@@ -0,0 +1,264 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using NodaTime;
+
+#nullable disable
+
+namespace Metabase.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<DateTimeOffset>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "OpenIddictScopes",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()",
+                oldClrType: typeof(Instant),
+                oldType: "timestamp with time zone");
+
+            migrationBuilder.AlterColumn<DateTimeOffset>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "OpenIddictScopes",
+                type: "timestamp with time zone",
+                nullable: false,
+                defaultValueSql: "now()",
+                oldClrType: typeof(Instant),
+                oldType: "timestamp with time zone");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_user_CreatedAt_Id",
+                schema: "metabase",
+                table: "user",
+                columns: new[] { "CreatedAt", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_user_Name_Id",
+                schema: "metabase",
+                table: "user",
+                columns: new[] { "Name", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_OpenIddictTokens_CreatedAt_Id",
+                schema: "metabase",
+                table: "OpenIddictTokens",
+                columns: new[] { "CreatedAt", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_OpenIddictScopes_CreatedAt_Id",
+                schema: "metabase",
+                table: "OpenIddictScopes",
+                columns: new[] { "CreatedAt", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_OpenIddictAuthorizations_CreatedAt_Id",
+                schema: "metabase",
+                table: "OpenIddictAuthorizations",
+                columns: new[] { "CreatedAt", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_OpenIddictApplications_CreatedAt_Id",
+                schema: "metabase",
+                table: "OpenIddictApplications",
+                columns: new[] { "CreatedAt", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_method_CreatedAt_Id",
+                schema: "metabase",
+                table: "method",
+                columns: new[] { "CreatedAt", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_method_Name_Id",
+                schema: "metabase",
+                table: "method",
+                columns: new[] { "Name", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_institution_CreatedAt_Id",
+                schema: "metabase",
+                table: "institution",
+                columns: new[] { "CreatedAt", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_institution_Name_Id",
+                schema: "metabase",
+                table: "institution",
+                columns: new[] { "Name", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_gnu_pg_fingerprint_CreatedAt_Id",
+                schema: "metabase",
+                table: "gnu_pg_fingerprint",
+                columns: new[] { "CreatedAt", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_database_CreatedAt_Id",
+                schema: "metabase",
+                table: "database",
+                columns: new[] { "CreatedAt", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_database_Name_Id",
+                schema: "metabase",
+                table: "database",
+                columns: new[] { "Name", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_data_format_CreatedAt_Id",
+                schema: "metabase",
+                table: "data_format",
+                columns: new[] { "CreatedAt", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_data_format_Name_Id",
+                schema: "metabase",
+                table: "data_format",
+                columns: new[] { "Name", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_component_CreatedAt_Id",
+                schema: "metabase",
+                table: "component",
+                columns: new[] { "CreatedAt", "Id" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_component_Name_Id",
+                schema: "metabase",
+                table: "component",
+                columns: new[] { "Name", "Id" },
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_user_CreatedAt_Id",
+                schema: "metabase",
+                table: "user");
+
+            migrationBuilder.DropIndex(
+                name: "IX_user_Name_Id",
+                schema: "metabase",
+                table: "user");
+
+            migrationBuilder.DropIndex(
+                name: "IX_OpenIddictTokens_CreatedAt_Id",
+                schema: "metabase",
+                table: "OpenIddictTokens");
+
+            migrationBuilder.DropIndex(
+                name: "IX_OpenIddictScopes_CreatedAt_Id",
+                schema: "metabase",
+                table: "OpenIddictScopes");
+
+            migrationBuilder.DropIndex(
+                name: "IX_OpenIddictAuthorizations_CreatedAt_Id",
+                schema: "metabase",
+                table: "OpenIddictAuthorizations");
+
+            migrationBuilder.DropIndex(
+                name: "IX_OpenIddictApplications_CreatedAt_Id",
+                schema: "metabase",
+                table: "OpenIddictApplications");
+
+            migrationBuilder.DropIndex(
+                name: "IX_method_CreatedAt_Id",
+                schema: "metabase",
+                table: "method");
+
+            migrationBuilder.DropIndex(
+                name: "IX_method_Name_Id",
+                schema: "metabase",
+                table: "method");
+
+            migrationBuilder.DropIndex(
+                name: "IX_institution_CreatedAt_Id",
+                schema: "metabase",
+                table: "institution");
+
+            migrationBuilder.DropIndex(
+                name: "IX_institution_Name_Id",
+                schema: "metabase",
+                table: "institution");
+
+            migrationBuilder.DropIndex(
+                name: "IX_gnu_pg_fingerprint_CreatedAt_Id",
+                schema: "metabase",
+                table: "gnu_pg_fingerprint");
+
+            migrationBuilder.DropIndex(
+                name: "IX_database_CreatedAt_Id",
+                schema: "metabase",
+                table: "database");
+
+            migrationBuilder.DropIndex(
+                name: "IX_database_Name_Id",
+                schema: "metabase",
+                table: "database");
+
+            migrationBuilder.DropIndex(
+                name: "IX_data_format_CreatedAt_Id",
+                schema: "metabase",
+                table: "data_format");
+
+            migrationBuilder.DropIndex(
+                name: "IX_data_format_Name_Id",
+                schema: "metabase",
+                table: "data_format");
+
+            migrationBuilder.DropIndex(
+                name: "IX_component_CreatedAt_Id",
+                schema: "metabase",
+                table: "component");
+
+            migrationBuilder.DropIndex(
+                name: "IX_component_Name_Id",
+                schema: "metabase",
+                table: "component");
+
+            migrationBuilder.AlterColumn<Instant>(
+                name: "UpdatedAt",
+                schema: "metabase",
+                table: "OpenIddictScopes",
+                type: "timestamp with time zone",
+                nullable: false,
+                oldClrType: typeof(DateTimeOffset),
+                oldType: "timestamp with time zone",
+                oldDefaultValueSql: "now()");
+
+            migrationBuilder.AlterColumn<Instant>(
+                name: "CreatedAt",
+                schema: "metabase",
+                table: "OpenIddictScopes",
+                type: "timestamp with time zone",
+                nullable: false,
+                oldClrType: typeof(DateTimeOffset),
+                oldType: "timestamp with time zone",
+                oldDefaultValueSql: "now()");
+        }
+    }
+}
diff --git a/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs b/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
index 92a16a3f5..6575f2d7d 100644
--- a/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -22,7 +22,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 #pragma warning disable 612, 618
             modelBuilder
                 .HasDefaultSchema("metabase")
-                .HasAnnotation("ProductVersion", "10.0.5")
+                .HasAnnotation("ProductVersion", "10.0.7")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "component_category", new[] { "layer", "material", "unit" });
@@ -53,7 +53,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("metabase.component_category[]");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -72,7 +72,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("text");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -87,6 +87,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("ManagerId");
 
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
                     b.ToTable("component", "metabase");
                 });
 
@@ -98,7 +104,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("PartComponentId")
                         .HasColumnType("uuid");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -109,7 +115,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<PrimeSurface?>("PrimeSurface")
                         .HasColumnType("metabase.prime_surface");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -135,12 +141,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("ConcreteComponentId")
                         .HasColumnType("uuid");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -166,7 +172,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("InstitutionId")
                         .HasColumnType("uuid");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -174,7 +180,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<bool>("Pending")
                         .HasColumnType("boolean");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -200,12 +206,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("ToComponentId")
                         .HasColumnType("uuid");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -230,7 +236,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasDefaultValueSql("gen_random_uuid()");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -256,7 +262,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("SchemaLocator")
                         .HasColumnType("text");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -271,6 +277,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("ManagerId");
 
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
                     b.ToTable("data_format", "metabase");
                 });
 
@@ -281,7 +293,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasDefaultValueSql("gen_random_uuid()");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -301,7 +313,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("OperatorId")
                         .HasColumnType("uuid");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -323,6 +335,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("OperatorId");
 
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
                     b.ToTable("database", "metabase");
                 });
 
@@ -336,7 +354,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<OffsetDateTime?>("AllowedAt")
                         .HasColumnType("timestamp with time zone");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -351,7 +369,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("InstitutionId")
                         .HasColumnType("uuid");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -374,6 +392,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("UserId");
 
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
                     b.ToTable("gnu_pg_fingerprint", "metabase");
                 });
 
@@ -387,7 +408,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("Abbreviation")
                         .HasColumnType("text");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -412,7 +433,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<InstitutionState>("State")
                         .HasColumnType("metabase.institution_state");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -427,6 +448,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("ManagerId");
 
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
                     b.ToTable("institution", "metabase");
                 });
 
@@ -438,7 +465,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("MethodId")
                         .HasColumnType("uuid");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -446,7 +473,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<bool>("Pending")
                         .HasColumnType("boolean");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -472,7 +499,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("UserId")
                         .HasColumnType("uuid");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -483,7 +510,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<InstitutionRepresentativeRole>("Role")
                         .HasColumnType("metabase.institution_representative_role");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -518,7 +545,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("metabase.method_category[]");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -534,7 +561,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("text");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -552,6 +579,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("ManagerId");
 
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
                     b.ToTable("method", "metabase");
                 });
 
@@ -586,7 +619,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("character varying(50)");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -621,7 +654,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("Settings")
                         .HasColumnType("text");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -639,6 +672,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("OwnerId");
 
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
                     b.ToTable("OpenIddictApplications", "metabase");
                 });
 
@@ -657,7 +693,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("character varying(50)");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -683,7 +719,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("character varying(50)");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -696,6 +732,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("Id");
 
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
                     b.HasIndex("ApplicationId", "Status", "Subject", "Type");
 
                     b.ToTable("OpenIddictAuthorizations", "metabase");
@@ -713,8 +752,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("character varying(50)");
 
-                    b.Property<Instant>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
 
                     b.Property<string>("Description")
                         .HasColumnType("text");
@@ -738,8 +779,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("Resources")
                         .HasColumnType("text");
 
-                    b.Property<Instant>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
 
                     b.Property<uint>("Version")
                         .IsConcurrencyToken()
@@ -752,6 +795,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasIndex("Name")
                         .IsUnique();
 
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
                     b.ToTable("OpenIddictScopes", "metabase");
                 });
 
@@ -773,7 +819,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("character varying(50)");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -809,7 +855,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(150)
                         .HasColumnType("character varying(150)");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -827,6 +873,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasIndex("ReferenceId")
                         .IsUnique();
 
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
                     b.HasIndex("ApplicationId", "Status", "Subject", "Type");
 
                     b.ToTable("OpenIddictTokens", "metabase");
@@ -897,7 +946,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsConcurrencyToken()
                         .HasColumnType("text");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -945,7 +994,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<bool>("TwoFactorEnabled")
                         .HasColumnType("boolean");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -972,6 +1021,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsUnique()
                         .HasDatabaseName("UserNameIndex");
 
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
                     b.ToTable("user", "metabase");
                 });
 
@@ -1028,7 +1083,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("MethodId")
                         .HasColumnType("uuid");
 
-                    b.Property<Instant>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
@@ -1036,7 +1091,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<bool>("Pending")
                         .HasColumnType("boolean");
 
-                    b.Property<Instant>("UpdatedAt")
+                    b.Property<DateTimeOffset>("UpdatedAt")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("timestamp with time zone")
                         .HasDefaultValueSql("now()");
diff --git a/backend/src/Migrations/migrate.sql b/backend/src/Migrations/migrate.sql
index f55e2c020..0d8eae86f 100644
--- a/backend/src/Migrations/migrate.sql
+++ b/backend/src/Migrations/migrate.sql
@@ -2591,3 +2591,147 @@ BEGIN
 END $EF$;
 COMMIT;
 
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ALTER COLUMN "UpdatedAt" SET DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ALTER COLUMN "CreatedAt" SET DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_user_CreatedAt_Id" ON metabase."user" ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_user_Name_Id" ON metabase."user" ("Name", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_OpenIddictTokens_CreatedAt_Id" ON metabase."OpenIddictTokens" ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_OpenIddictScopes_CreatedAt_Id" ON metabase."OpenIddictScopes" ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_OpenIddictAuthorizations_CreatedAt_Id" ON metabase."OpenIddictAuthorizations" ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_OpenIddictApplications_CreatedAt_Id" ON metabase."OpenIddictApplications" ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_method_CreatedAt_Id" ON metabase.method ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_method_Name_Id" ON metabase.method ("Name", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_institution_CreatedAt_Id" ON metabase.institution ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_institution_Name_Id" ON metabase.institution ("Name", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_gnu_pg_fingerprint_CreatedAt_Id" ON metabase.gnu_pg_fingerprint ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_database_CreatedAt_Id" ON metabase.database ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_database_Name_Id" ON metabase.database ("Name", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_data_format_CreatedAt_Id" ON metabase.data_format ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_data_format_Name_Id" ON metabase.data_format ("Name", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_component_CreatedAt_Id" ON metabase.component ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_component_Name_Id" ON metabase.component ("Name", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+    VALUES ('20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations', '10.0.7');
+    END IF;
+END $EF$;
+COMMIT;
+
diff --git a/backend/src/Migrations/migrate_from_20260402204629_AddUpdatedAndCreatedAtTimestamps_to_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.sql b/backend/src/Migrations/migrate_from_20260402204629_AddUpdatedAndCreatedAtTimestamps_to_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.sql
new file mode 100644
index 000000000..41b1621d3
--- /dev/null
+++ b/backend/src/Migrations/migrate_from_20260402204629_AddUpdatedAndCreatedAtTimestamps_to_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.sql
@@ -0,0 +1,144 @@
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ALTER COLUMN "UpdatedAt" SET DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ALTER COLUMN "CreatedAt" SET DEFAULT (now());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_user_CreatedAt_Id" ON metabase."user" ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_user_Name_Id" ON metabase."user" ("Name", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_OpenIddictTokens_CreatedAt_Id" ON metabase."OpenIddictTokens" ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_OpenIddictScopes_CreatedAt_Id" ON metabase."OpenIddictScopes" ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_OpenIddictAuthorizations_CreatedAt_Id" ON metabase."OpenIddictAuthorizations" ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_OpenIddictApplications_CreatedAt_Id" ON metabase."OpenIddictApplications" ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_method_CreatedAt_Id" ON metabase.method ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_method_Name_Id" ON metabase.method ("Name", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_institution_CreatedAt_Id" ON metabase.institution ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_institution_Name_Id" ON metabase.institution ("Name", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_gnu_pg_fingerprint_CreatedAt_Id" ON metabase.gnu_pg_fingerprint ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_database_CreatedAt_Id" ON metabase.database ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_database_Name_Id" ON metabase.database ("Name", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_data_format_CreatedAt_Id" ON metabase.data_format ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_data_format_Name_Id" ON metabase.data_format ("Name", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_component_CreatedAt_Id" ON metabase.component ("CreatedAt", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    CREATE UNIQUE INDEX "IX_component_Name_Id" ON metabase.component ("Name", "Id");
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+    VALUES ('20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations', '10.0.7');
+    END IF;
+END $EF$;
+COMMIT;
+
diff --git a/backend/src/Migrations/rollback_from_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations_to_20260402204629_AddUpdatedAndCreatedAtTimestamps.sql b/backend/src/Migrations/rollback_from_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations_to_20260402204629_AddUpdatedAndCreatedAtTimestamps.sql
new file mode 100644
index 000000000..119d9f8b9
--- /dev/null
+++ b/backend/src/Migrations/rollback_from_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations_to_20260402204629_AddUpdatedAndCreatedAtTimestamps.sql
@@ -0,0 +1,124 @@
+START TRANSACTION;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_user_CreatedAt_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_user_Name_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_OpenIddictTokens_CreatedAt_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_OpenIddictScopes_CreatedAt_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_OpenIddictAuthorizations_CreatedAt_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_OpenIddictApplications_CreatedAt_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_method_CreatedAt_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_method_Name_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_institution_CreatedAt_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_institution_Name_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_gnu_pg_fingerprint_CreatedAt_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_database_CreatedAt_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_database_Name_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_data_format_CreatedAt_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_data_format_Name_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_component_CreatedAt_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DROP INDEX metabase."IX_component_Name_Id";
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ALTER COLUMN "UpdatedAt" DROP DEFAULT;
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ALTER COLUMN "CreatedAt" DROP DEFAULT;
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations') THEN
+    DELETE FROM "__EFMigrationsHistory"
+    WHERE "MigrationId" = '20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations';
+    END IF;
+END $EF$;
+COMMIT;
+
diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index f3c841933..4fb673b87 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -1238,6 +1238,7 @@ type DeleteOpenIdConnectAuthorizationError implements UserError {
 }
 
 type DeleteOpenIdConnectAuthorizationPayload {
+  application: OpenIdConnectApplication
   errors: [DeleteOpenIdConnectAuthorizationError!]
   query: Query!
 }
@@ -2016,13 +2017,13 @@ type OpenIdConnectApplicationsEdge {
 }
 
 type OpenIdConnectAuthorization implements Node {
-  application: OpenIdConnectAuthorizationApplicationEdge! @cost(weight: "10")
+  application: OpenIdConnectAuthorizationApplicationEdge @cost(weight: "10")
   createdAt: DateTime!
   id: ID!
   isAuthorizedToDeleteNode: Boolean! @cost(weight: "1")
   scopes: [OpenIdConnectScope!]! @cost(weight: "0")
   status: String
-  subject: String
+  subject: User
   tokens: OpenIdConnectAuthorizationIssuedTokenConnection! @cost(weight: "10")
   type: String
   updatedAt: DateTime!
@@ -2061,15 +2062,15 @@ type OpenIdConnectAuthorizationsEdge {
 }
 
 type OpenIdConnectToken implements Node {
-  application: OpenIdConnectTokenApplicationEdge! @cost(weight: "10")
-  authorization: OpenIdConnectTokenAuthorizationEdge! @cost(weight: "10")
+  application: OpenIdConnectTokenApplicationEdge @cost(weight: "10")
+  authorization: OpenIdConnectTokenAuthorizationEdge @cost(weight: "10")
   createdAt: DateTime!
   expiredAt: LocalDateTime
   id: ID!
   isAuthorizedToRevokeNode: Boolean! @cost(weight: "1")
   redeemedAt: LocalDateTime
   status: String
-  subject: String
+  subject: OpenIdConnectSubject
   type: String
   updatedAt: DateTime!
   uuid: Uuid!
@@ -2363,9 +2364,9 @@ type RemoveInstitutionMethodDeveloperError implements UserError {
 }
 
 type RemoveInstitutionMethodDeveloperPayload {
-  developedMethodEdge: InstitutionDevelopedMethodEdge
   errors: [RemoveInstitutionMethodDeveloperError!]
-  methodDeveloperEdge: InstitutionMethodDeveloperEdge
+  institution: Institution @cost(weight: "10")
+  method: Method @cost(weight: "10")
   query: Query!
 }
 
@@ -2389,10 +2390,10 @@ type RemoveUserMethodDeveloperError implements UserError {
 }
 
 type RemoveUserMethodDeveloperPayload {
-  developedMethodEdge: UserDevelopedMethodEdge
   errors: [RemoveUserMethodDeveloperError!]
-  methodDeveloperEdge: UserMethodDeveloperEdge
+  method: Method @cost(weight: "10")
   query: Query!
+  user: User @cost(weight: "10")
 }
 
 type RemoveUserRoleError implements UserError {
@@ -2662,7 +2663,7 @@ type UpdateOpenIdConnectApplicationPayload {
 }
 
 type User implements Node {
-  contact: ContactInformation! @cost(weight: "0")
+  contact: ContactInformation @cost(weight: "0")
   developedMethods(
     "Returns the elements in the list that come after the specified cursor."
     after: String
@@ -2844,6 +2845,8 @@ interface UserError {
   path: [String!]!
 }
 
+union OpenIdConnectSubject = OpenIdConnectApplication | User
+
 union Reference = Publication | Standard
 
 union Stakeholder = Institution | User
diff --git a/frontend/components/CielabColorViewer.tsx b/frontend/components/CielabColorView.tsx
similarity index 56%
rename from frontend/components/CielabColorViewer.tsx
rename to frontend/components/CielabColorView.tsx
index 7c576e8fa..f65c73c75 100644
--- a/frontend/components/CielabColorViewer.tsx
+++ b/frontend/components/CielabColorView.tsx
@@ -1,7 +1,8 @@
 import Copyable from "./Copyable";
 import { CielabColor } from "../__generated__/graphql";
+import Float from "./Float";
 
-export default function CielabColorViewer({ value }: { value: CielabColor }) {
+export default function CielabColorView({ value }: { value: CielabColor }) {
   return (
     <Copyable
       onlyIcon
@@ -10,7 +11,8 @@ export default function CielabColorViewer({ value }: { value: CielabColor }) {
         return value;
       })}
     >
-      L*={value.lStar}, a*={value.aStar}, b*={value.bStar}
+      (L* <Float value={value.lStar} />, a* <Float value={value.aStar} />, b*{" "}
+      <Float value={value.bStar} />)
     </Copyable>
   );
 }
diff --git a/frontend/components/CodeViewer.tsx b/frontend/components/CodeView.tsx
similarity index 94%
rename from frontend/components/CodeViewer.tsx
rename to frontend/components/CodeView.tsx
index 88d94bb4e..fb828e3d7 100644
--- a/frontend/components/CodeViewer.tsx
+++ b/frontend/components/CodeView.tsx
@@ -1,7 +1,7 @@
 import Copyable from "./Copyable";
 import CopyableBlock from "./CopyableBlock";
 
-export default function CodeViewer({
+export default function CodeView({
   code,
   inline = false,
 }: {
diff --git a/frontend/components/CopyableBlock.tsx b/frontend/components/CopyableBlock.tsx
index 97d7d1702..1ce132e91 100644
--- a/frontend/components/CopyableBlock.tsx
+++ b/frontend/components/CopyableBlock.tsx
@@ -4,9 +4,11 @@ import { ReactNode, useState } from "react";
 
 export default function CopyableBlock({
   text,
+  color,
   children,
 }: {
   text: string;
+  color?: "white";
   children: ReactNode;
 }) {
   const [copied, setCopied] = useState(false);
@@ -15,15 +17,23 @@ export default function CopyableBlock({
     <div
       style={{
         position: "relative",
+        minHeight: "2.5lh",
+        minWidth: "10ch",
         // paddingBottom: "1.5em",
         // borderBottom: "1px solid grey",
       }}
     >
       {children}
       <Button
-        style={{ position: "absolute", right: 0, bottom: 0 }}
+        style={{ position: "absolute", right: 0, bottom: 0, color: color }}
         type="text"
-        icon={copied ? <CheckOutlined /> : <CopyOutlined />}
+        icon={
+          copied ? (
+            <CheckOutlined style={{ color: color }} />
+          ) : (
+            <CopyOutlined style={{ color: color }} />
+          )
+        }
         onClick={() => {
           navigator.clipboard.writeText(text);
           setCopied(true);
diff --git a/frontend/components/DateTimeX.tsx b/frontend/components/DateTimeX.tsx
new file mode 100644
index 000000000..fdd12a3e5
--- /dev/null
+++ b/frontend/components/DateTimeX.tsx
@@ -0,0 +1,34 @@
+import { Calendar, Popover } from "antd";
+import dayjs from "dayjs";
+import { Scalars } from "../__generated__/graphql";
+
+interface DateTimeProps {
+  value: Scalars["DateTime"]["output"];
+}
+
+export default function DateTimeX({ value }: DateTimeProps) {
+  const parsedValue = dayjs(value);
+
+  const calendarContent = (
+    <div style={{ width: 300 }}>
+      <Calendar
+        value={parsedValue}
+        fullscreen={false}
+        headerRender={() => null}
+      />
+    </div>
+  );
+
+  return (
+    <Popover
+      title={false}
+      content={calendarContent}
+      trigger="hover"
+      placement="bottomLeft"
+    >
+      <span style={{ cursor: "pointer", borderBottom: "1px solid grey" }}>
+        {parsedValue.format("YYYY-MM-DD HH:mm")}
+      </span>
+    </Popover>
+  );
+}
diff --git a/frontend/components/Float.tsx b/frontend/components/Float.tsx
index ab72ce580..44591394a 100644
--- a/frontend/components/Float.tsx
+++ b/frontend/components/Float.tsx
@@ -1,5 +1,6 @@
 import Copyable from "./Copyable";
 import { Scalars } from "../__generated__/graphql";
+import { Tooltip } from "antd";
 
 export default function Float({
   value,
@@ -7,8 +8,21 @@ export default function Float({
   value: Scalars["Float"]["output"];
 }) {
   return (
-    <Copyable onlyIcon text={value.toString()}>
-      {value}
-    </Copyable>
+    <Tooltip
+      title={
+        <Copyable text={value.toString()} color="white">
+          <code>{value}</code>
+        </Copyable>
+      }
+      styles={{
+        container: {
+          whiteSpace: "nowrap",
+          minWidth: "max-content",
+          maxWidth: "none",
+        },
+      }}
+    >
+      <code>{value}</code>
+    </Tooltip>
   );
 }
diff --git a/frontend/components/JsonViewer.tsx b/frontend/components/JsonView.tsx
similarity index 66%
rename from frontend/components/JsonViewer.tsx
rename to frontend/components/JsonView.tsx
index ce8559e94..dc53cfb31 100644
--- a/frontend/components/JsonViewer.tsx
+++ b/frontend/components/JsonView.tsx
@@ -1,27 +1,26 @@
 import { Tooltip } from "antd";
-import Copyable from "./Copyable";
 import CopyableBlock from "./CopyableBlock";
 
-export default function JsonViewer({
+export default function JsonView({
   data,
   inline = false,
+  color,
 }: {
   data: object;
   inline?: boolean;
+  color?: "white";
 }) {
   if (inline) {
     const jsonString = JSON.stringify(data);
     return (
-      <Copyable onlyIcon text={jsonString}>
-        <Tooltip title={<JsonViewer data={data} />}>
-          <code>{jsonString}</code>
-        </Tooltip>
-      </Copyable>
+      <Tooltip title={<JsonView data={data} color="white" />}>
+        <code>{jsonString}</code>
+      </Tooltip>
     );
   } else {
     const jsonString = JSON.stringify(data, null, 2);
     return (
-      <CopyableBlock text={jsonString}>
+      <CopyableBlock text={jsonString} color={color}>
         <pre
           style={{
             overflow: "auto",
diff --git a/frontend/components/Layout.tsx b/frontend/components/Layout.tsx
index 8b20d326c..c1cf5e352 100644
--- a/frontend/components/Layout.tsx
+++ b/frontend/components/Layout.tsx
@@ -2,7 +2,7 @@ import Head from "next/head";
 import { ReactNode, useEffect } from "react";
 import Footer from "./Footer";
 import NavBar from "./NavBar";
-import { Layout as AntLayout, App, Flex, Typography } from "antd";
+import { Layout as AntLayout, App, Divider, Flex, Typography } from "antd";
 import paths from "../paths";
 import { useCookies } from "react-cookie";
 
@@ -136,6 +136,7 @@ export default function Layout({ children }: LayoutProps) {
         </Flex>
       </AntLayout.Content>
       <AntLayout.Footer>
+        <Divider />
         <Flex justify="center">
           <Footer />
         </Flex>
diff --git a/frontend/components/OpenEndedDateTimeRangeX.tsx b/frontend/components/OpenEndedDateTimeRangeX.tsx
index f2239975d..ab7e0de85 100644
--- a/frontend/components/OpenEndedDateTimeRangeX.tsx
+++ b/frontend/components/OpenEndedDateTimeRangeX.tsx
@@ -1,7 +1,7 @@
 import { Typography } from "antd";
-import dayjs from "dayjs";
 import { OpenEndedDateTimeRange } from "../__generated__/graphql";
-import { isTruthy } from "../lib/array";
+import { intersperse, isTruthy } from "../lib/array";
+import DateTimeX from "./DateTimeX";
 
 interface OpenEndedDateTimeRangeProps {
   range: OpenEndedDateTimeRange;
@@ -12,13 +12,22 @@ export default function OpenEndedDateTimeRangeX({
 }: OpenEndedDateTimeRangeProps) {
   return (
     <Typography.Text>
-      {[
-        range.from == null && range.to == null && "unrestricted",
-        range.from != null && `from ${dayjs(range.from).format("DD/MM/YYYY")}`,
-        range.to != null && `to ${dayjs(range.to).format("DD/MM/YYYY")}`,
-      ]
-        .filter(isTruthy)
-        .join(" ")}
+      {intersperse(
+        [
+          range.from == null && range.to == null && "unrestricted",
+          range.from != null && (
+            <>
+              from <DateTimeX value={range.from} />
+            </>
+          ),
+          range.to != null && (
+            <>
+              to <DateTimeX value={range.to} />
+            </>
+          ),
+        ].filter(isTruthy),
+        " ",
+      )}
     </Typography.Text>
   );
 }
diff --git a/frontend/components/PaginatedIdSelect.tsx b/frontend/components/PaginatedIdSelect.tsx
index 4b4c34621..42200a5cd 100644
--- a/frontend/components/PaginatedIdSelect.tsx
+++ b/frontend/components/PaginatedIdSelect.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { Select, Space, Spin } from "antd";
+import { Select, SelectProps, Space, Spin } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useDebounce } from "../lib/hooks/useDebounce";
 import { Scalars, SortEnumType } from "../__generated__/graphql";
@@ -34,11 +34,8 @@ interface ItemsVariables {
   order?: { name?: SortEnumType };
 }
 
-interface BaseProps {
+interface BaseProps extends SelectProps {
   query: TypedDocumentNode<any, ItemsVariables>;
-  value?: string;
-  style?: React.CSSProperties;
-  onChange?: (value: string) => void;
 }
 
 interface SingleProps extends BaseProps {
@@ -57,10 +54,8 @@ const order = {
 
 export default function PaginatedIdSelect({
   query,
-  mode,
-  value,
   style = { width: "100%" },
-  onChange,
+  ...rest
 }: PaginatedSelectProps) {
   const [search, setSearch] = useState<string>("");
   const pageSize = 10;
@@ -116,10 +111,8 @@ export default function PaginatedIdSelect({
 
   return (
     <Select
+      {...rest}
       popupMatchSelectWidth={false}
-      mode={mode}
-      value={value}
-      onChange={onChange}
       showSearch={{
         filterOption: false,
         onSearch: handleSearch,
diff --git a/frontend/components/Reference.tsx b/frontend/components/Reference.tsx
index 1cf20ffff..d5e730121 100644
--- a/frontend/components/Reference.tsx
+++ b/frontend/components/Reference.tsx
@@ -29,7 +29,7 @@ interface ReferenceProps {
   data: ReferencePartialFragment;
 }
 
-export function Reference({ data }: ReferenceProps) {
+export default function Reference({ data }: ReferenceProps) {
   const Icon =
     data.__typename === "Standard" ? SafetyCertificateOutlined : BookOutlined;
 
diff --git a/frontend/components/ReferenceSubform.tsx b/frontend/components/ReferenceSubform.tsx
index 4f3bbc551..bc1be9a24 100644
--- a/frontend/components/ReferenceSubform.tsx
+++ b/frontend/components/ReferenceSubform.tsx
@@ -58,8 +58,8 @@ export type ReferenceSubformProps<Values> = {
   namespace: string[];
 };
 
-// TODO Harden types: export function ReferenceForm<Values extends ReferenceInput>({form}: ReferenceFormProps<Values>) {
-export function ReferenceSubform({
+// TODO Harden types: export default function ReferenceForm<Values extends ReferenceInput>({form}: ReferenceFormProps<Values>) {
+export default function ReferenceSubform({
   form,
   initialValue,
   namespace,
diff --git a/frontend/components/SearchSelect.tsx b/frontend/components/SearchSelect.tsx
index b46e35ced..08a8ecd82 100644
--- a/frontend/components/SearchSelect.tsx
+++ b/frontend/components/SearchSelect.tsx
@@ -1,23 +1,23 @@
-import { Select } from "antd";
+import { Select, SelectProps } from "antd";
 
-export type SearchSelectProps<ValueType> = {
+export interface SearchSelectProps<ValueType> extends Omit<
+  SelectProps,
+  "options" | "value"
+> {
   options: { label: string; value: ValueType }[];
   mode?: "multiple" | "tags";
   value?: ValueType;
   onChange?: (value: ValueType) => void;
-};
+}
 
-export function SearchSelect<ValueType>({
+export default function SearchSelect<ValueType>({
   options,
-  mode,
-  value,
-  onChange,
+  ...rest
 }: SearchSelectProps<ValueType>) {
   return (
     <Select
-      mode={mode}
+      {...rest}
       placeholder="Search and select..."
-      options={options}
       showSearch={{
         optionFilterProp: "label",
         filterOption: (input, option) =>
@@ -29,8 +29,6 @@ export function SearchSelect<ValueType>({
                 .localeCompare(optionB.label.toLocaleString(), "en")
             : 0,
       }}
-      value={value}
-      onChange={onChange}
     />
   );
 }
diff --git a/frontend/components/components/AddAssembledOfComponent.tsx b/frontend/components/components/AddAssembledOfComponent.tsx
index 6cd313891..21e79f5b1 100644
--- a/frontend/components/components/AddAssembledOfComponent.tsx
+++ b/frontend/components/components/AddAssembledOfComponent.tsx
@@ -7,8 +7,7 @@ import {
 import { PrimeSurface, Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
-import { ComponentDocument } from "../../queries/components.generated";
-import { ComponentIdSelect } from "./ComponentIdSelect";
+import ComponentIdSelect from "./ComponentIdSelect";
 import ErrorAlert from "../ErrorAlert";
 
 type FormValues = {
@@ -31,18 +30,6 @@ export default function AddAssembledOfComponent({
 
   const [addComponentAssemblyMutation] = useMutation(
     AddComponentAssemblyDocument,
-    {
-      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-      // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: partComponentId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, augmentFormWithErrors } =
diff --git a/frontend/components/components/AddComponentManufacturer.tsx b/frontend/components/components/AddComponentManufacturer.tsx
index e607690ff..4bd4a24d9 100644
--- a/frontend/components/components/AddComponentManufacturer.tsx
+++ b/frontend/components/components/AddComponentManufacturer.tsx
@@ -6,8 +6,7 @@ import {
 } from "../../queries/componentManufacturers.generated";
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
-import { ComponentDocument } from "../../queries/components.generated";
-import { InstitutionIdSelect } from "../institutions/InstitutionIdSelect";
+import InstitutionIdSelect from "../institutions/InstitutionIdSelect";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 
@@ -27,18 +26,6 @@ export default function AddComponentManufacturer({
 
   const [addComponentManufacturerMutation] = useMutation(
     AddComponentManufacturerDocument,
-    {
-      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-      // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: componentId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, augmentFormWithErrors } =
diff --git a/frontend/components/components/AddConcretizationOfComponent.tsx b/frontend/components/components/AddConcretizationOfComponent.tsx
index 1fadbaf60..d12114375 100644
--- a/frontend/components/components/AddConcretizationOfComponent.tsx
+++ b/frontend/components/components/AddConcretizationOfComponent.tsx
@@ -6,8 +6,7 @@ import {
 } from "../../queries/componentGeneralizations.generated";
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
-import { ComponentDocument } from "../../queries/components.generated";
-import { ComponentIdSelect } from "./ComponentIdSelect";
+import ComponentIdSelect from "./ComponentIdSelect";
 import ErrorAlert from "../ErrorAlert";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 
@@ -29,18 +28,6 @@ export default function AddConcretizationOfComponent({
 
   const [addComponentGeneralizationMutation] = useMutation(
     AddComponentGeneralizationDocument,
-    {
-      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-      // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: generalComponentId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, augmentFormWithErrors } =
diff --git a/frontend/components/components/AddGeneralizationOfComponent.tsx b/frontend/components/components/AddGeneralizationOfComponent.tsx
index 2f6f8f82b..1c1f4983d 100644
--- a/frontend/components/components/AddGeneralizationOfComponent.tsx
+++ b/frontend/components/components/AddGeneralizationOfComponent.tsx
@@ -6,8 +6,7 @@ import {
 } from "../../queries/componentGeneralizations.generated";
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
-import { ComponentDocument } from "../../queries/components.generated";
-import { ComponentIdSelect } from "./ComponentIdSelect";
+import ComponentIdSelect from "./ComponentIdSelect";
 import ErrorAlert from "../ErrorAlert";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 
@@ -29,18 +28,6 @@ export default function AddGeneralizationOfComponent({
 
   const [addComponentGeneralizationMutation] = useMutation(
     AddComponentGeneralizationDocument,
-    {
-      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-      // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: concreteComponentId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, augmentFormWithErrors } =
diff --git a/frontend/components/components/AddPartOfComponent.tsx b/frontend/components/components/AddPartOfComponent.tsx
index 845251972..7fcf21a68 100644
--- a/frontend/components/components/AddPartOfComponent.tsx
+++ b/frontend/components/components/AddPartOfComponent.tsx
@@ -6,8 +6,7 @@ import {
 } from "../../queries/componentAssemblies.generated";
 import { PrimeSurface, Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
-import { ComponentDocument } from "../../queries/components.generated";
-import { ComponentIdSelect } from "./ComponentIdSelect";
+import ComponentIdSelect from "./ComponentIdSelect";
 import ErrorAlert from "../ErrorAlert";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 
@@ -31,18 +30,6 @@ export default function AddPartOfComponent({
 
   const [addComponentAssemblyMutation] = useMutation(
     AddComponentAssemblyDocument,
-    {
-      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-      // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: assembledComponentId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, augmentFormWithErrors } =
diff --git a/frontend/components/components/AddVariantOfComponent.tsx b/frontend/components/components/AddVariantOfComponent.tsx
index 5e4101ebf..64f2e953e 100644
--- a/frontend/components/components/AddVariantOfComponent.tsx
+++ b/frontend/components/components/AddVariantOfComponent.tsx
@@ -6,8 +6,7 @@ import {
 } from "../../queries/componentVariants.generated";
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
-import { ComponentDocument } from "../../queries/components.generated";
-import { ComponentIdSelect } from "./ComponentIdSelect";
+import ComponentIdSelect from "./ComponentIdSelect";
 import ErrorAlert from "../ErrorAlert";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 
@@ -29,18 +28,6 @@ export default function AddVariantOfComponent({
 
   const [addComponentVariantMutation] = useMutation(
     AddComponentVariantDocument,
-    {
-      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-      // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: componentId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, augmentFormWithErrors } =
diff --git a/frontend/components/components/Component.tsx b/frontend/components/components/Component.tsx
index 5867ac604..a1ccba1c6 100644
--- a/frontend/components/components/Component.tsx
+++ b/frontend/components/components/Component.tsx
@@ -1,7 +1,7 @@
 import { useQuery } from "@apollo/client/react";
 import { Scalars } from "../../__generated__/graphql";
 import { ComponentDocument } from "../../queries/components.generated";
-import { Skeleton, Result, Card, Divider } from "antd";
+import { Skeleton, Result, Card } from "antd";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import ComponentSummary from "./ComponentSummary";
 import QueryToolbar from "../QueryToolbar";
@@ -35,10 +35,11 @@ export default function Component({ componentId }: ComponentProps) {
   }
 
   return (
-    <Card>
-      <ComponentSummary entity={component} />
-      <Divider />
+    <div>
+      <Card style={{ marginBottom: "1em" }}>
+        <ComponentSummary entity={component} />
+      </Card>
       <QueryToolbar query={ComponentDocument} variables={queryVariables} />
-    </Card>
+    </div>
   );
 }
diff --git a/frontend/components/components/ComponentIdSelect.tsx b/frontend/components/components/ComponentIdSelect.tsx
index 1dd2b5124..df4ed7182 100644
--- a/frontend/components/components/ComponentIdSelect.tsx
+++ b/frontend/components/components/ComponentIdSelect.tsx
@@ -1,17 +1,8 @@
 import { ComponentNamesDocument } from "../../queries/components.generated";
 import PaginatedIdSelect, { PaginatedSelectProps } from "../PaginatedIdSelect";
 
-export function ComponentIdSelect({
-  mode,
-  value,
-  onChange,
-}: Omit<PaginatedSelectProps, "query">) {
-  return (
-    <PaginatedIdSelect
-      query={ComponentNamesDocument}
-      value={value}
-      mode={mode}
-      onChange={onChange}
-    />
-  );
+export default function ComponentIdSelect(
+  props: Omit<PaginatedSelectProps, "query">,
+) {
+  return <PaginatedIdSelect {...props} query={ComponentNamesDocument} />;
 }
diff --git a/frontend/components/components/ComponentSummary.tsx b/frontend/components/components/ComponentSummary.tsx
index efb3d0613..18fe6c02c 100644
--- a/frontend/components/components/ComponentSummary.tsx
+++ b/frontend/components/components/ComponentSummary.tsx
@@ -5,23 +5,23 @@ import {
   ComponentPartialFragment,
 } from "../../queries/components.generated";
 import EntitySummary from "../entities/EntitySummary";
-import JsonViewer from "../JsonViewer";
+import JsonView from "../JsonView";
 import Manager from "../Manager";
 import UpdateComponent from "./UpdateComponent";
 import paths from "../../paths";
 import EntityLink from "../entities/EntityLink";
 import OpenEndedDateTimeRangeX from "../OpenEndedDateTimeRangeX";
-import { RemoveComponentManufacturer } from "./RemoveComponentManufacturer";
+import RemoveComponentManufacturer from "./RemoveComponentManufacturer";
 import InlineList from "../InlineList";
 import { Scalars } from "../../__generated__/graphql";
 import AddComponentManufacturer from "./AddComponentManufacturer";
 import AddVariantOfComponent from "./AddVariantOfComponent";
-import { RemoveComponentVariant } from "./RemoveComponentVariant";
+import RemoveComponentVariant from "./RemoveComponentVariant";
 import AddConcretizationOfComponent from "./AddConcretizationOfComponent";
 import AddGeneralizationOfComponent from "./AddGeneralizationOfComponent";
-import { RemoveComponentGeneralization } from "./RemoveComponentGeneralization";
+import RemoveComponentGeneralization from "./RemoveComponentGeneralization";
 import AddPartOfComponent from "./AddPartOfComponent";
-import { RemoveComponentAssembly } from "./RemoveComponentAssembly";
+import RemoveComponentAssembly from "./RemoveComponentAssembly";
 import UpdateComponentAssembly from "./UpdateComponentAssembly";
 import AddAssembledOfComponent from "./AddAssembledOfComponent";
 import EnumTag from "../EnumTag";
@@ -286,7 +286,7 @@ export default function ComponentSummary({
       )}
       {"extras" in entity && entity.extras != null && (
         <div>
-          <JsonViewer data={entity.extras} />
+          <JsonView data={entity.extras} />
         </div>
       )}
       <Descriptions size="small" column={1}>
diff --git a/frontend/components/components/ConfirmComponentManufacturer.tsx b/frontend/components/components/ConfirmComponentManufacturer.tsx
index 0b1f9969b..f88d65fe9 100644
--- a/frontend/components/components/ConfirmComponentManufacturer.tsx
+++ b/frontend/components/components/ConfirmComponentManufacturer.tsx
@@ -4,8 +4,6 @@ import {
   ConfirmComponentManufacturerDocument,
   ConfirmComponentManufacturerMutation,
 } from "../../queries/componentManufacturers.generated";
-import { ComponentDocument } from "../../queries/components.generated";
-import { InstitutionDocument } from "../../queries/institutions.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import { Button } from "antd";
 
@@ -14,28 +12,12 @@ interface Props {
   institutionId: Scalars["Uuid"]["input"];
 }
 
-export function ConfirmComponentManufacturer({
+export default function ConfirmComponentManufacturer({
   componentId,
   institutionId,
 }: Props) {
   const [confirmComponentManufacturerMutation] = useMutation(
     ConfirmComponentManufacturerDocument,
-    {
-      refetchQueries: [
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: componentId,
-          },
-        },
-        {
-          query: InstitutionDocument,
-          variables: {
-            uuid: institutionId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/components/CreateComponent.tsx b/frontend/components/components/CreateComponent.tsx
index 618326d25..b10676c92 100644
--- a/frontend/components/components/CreateComponent.tsx
+++ b/frontend/components/components/CreateComponent.tsx
@@ -21,20 +21,19 @@ import {
 } from "../../__generated__/graphql";
 import { useState } from "react";
 import dayjs from "dayjs";
-import { InstitutionDocument } from "../../queries/institutions.generated";
-import { ReferenceSubform } from "../ReferenceSubform";
-import { InstitutionIdSelect } from "../institutions/InstitutionIdSelect";
+import InstitutionIdSelect from "../institutions/InstitutionIdSelect";
+import ReferenceSubform from "../ReferenceSubform";
 import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import NewButton from "../NewButton";
 import ComponentSummary from "./ComponentSummary";
+import RepresentedInstitutionIdSelect from "../institutions/RepresentedInstitutionIdSelect";
 
 type FormValues = {
   name: string;
   abbreviation: string | null | undefined;
   description: string;
-  manufacturerId: Scalars["Uuid"]["input"];
   availability:
     | [dayjs.Dayjs | null | undefined, dayjs.Dayjs | null | undefined]
     | null
@@ -43,15 +42,17 @@ type FormValues = {
   primeSurface: DescriptionOrReferenceInput | null | undefined;
   primeDirection: DescriptionOrReferenceInput | null | undefined;
   switchableLayers: DescriptionOrReferenceInput | null | undefined;
+  manufacturerId: Scalars["Uuid"]["input"];
+  managerId: Scalars["Uuid"]["input"];
 };
 
 interface CreateComponentProps {
-  managerId: Scalars["Uuid"]["input"];
+  initialManagerId: Scalars["Uuid"]["input"];
   initialManufacturerId: Scalars["Uuid"]["input"];
 }
 
 export default function CreateComponent({
-  managerId,
+  initialManagerId,
   initialManufacturerId,
 }: CreateComponentProps) {
   const [open, setOpen] = useState(false);
@@ -64,15 +65,7 @@ export default function CreateComponent({
   const [createComponentMutation] = useMutation(CreateComponentDocument, {
     // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
     // See https://www.apollographql.com/docs/react/data/mutations/#options
-    refetchQueries: [
-      {
-        query: InstitutionDocument,
-        variables: {
-          uuid: managerId,
-        },
-      },
-      ComponentsDocument,
-    ],
+    refetchQueries: [ComponentsDocument],
   });
 
   const {
@@ -121,7 +114,7 @@ export default function CreateComponent({
               primeSurface: values.primeSurface,
               primeDirection: values.primeDirection,
               switchableLayers: values.switchableLayers,
-              managerId: managerId,
+              managerId: values.managerId,
               manufacturerId: values.manufacturerId,
             },
           },
@@ -205,14 +198,6 @@ export default function CreateComponent({
           >
             <Input />
           </Form.Item>
-          <Form.Item
-            label="Manufacturer"
-            name="manufacturerId"
-            rules={[{ required: true }]}
-            initialValue={initialManufacturerId}
-          >
-            <InstitutionIdSelect />
-          </Form.Item>
           <Form.Item label="Availability" name="availability">
             <DatePicker.RangePicker allowEmpty={[true, true]} showTime />
           </Form.Item>
@@ -228,6 +213,22 @@ export default function CreateComponent({
               )}
             />
           </Form.Item>
+          <Form.Item
+            label="Manufacturer"
+            name="manufacturerId"
+            rules={[{ required: true }]}
+            initialValue={initialManufacturerId}
+          >
+            <InstitutionIdSelect />
+          </Form.Item>
+          <Form.Item
+            label="Manager"
+            name="managerId"
+            rules={[{ required: true }]}
+            initialValue={initialManagerId}
+          >
+            <RepresentedInstitutionIdSelect />
+          </Form.Item>
           <Divider />
           <Form.Item label="Prime Surface">
             <Form.Item
diff --git a/frontend/components/components/RemoveComponentAssembly.tsx b/frontend/components/components/RemoveComponentAssembly.tsx
index c3ef1c181..33dc877ad 100644
--- a/frontend/components/components/RemoveComponentAssembly.tsx
+++ b/frontend/components/components/RemoveComponentAssembly.tsx
@@ -4,10 +4,6 @@ import {
   RemoveComponentAssemblyDocument,
   RemoveComponentAssemblyMutation,
 } from "../../queries/componentAssemblies.generated";
-import {
-  ComponentDocument,
-  ComponentsDocument,
-} from "../../queries/components.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import SafeDeleteButton from "../SafeDeleteButton";
 
@@ -16,31 +12,12 @@ interface Props {
   partComponentId: Scalars["Uuid"]["input"];
 }
 
-export function RemoveComponentAssembly({
+export default function RemoveComponentAssembly({
   assembledComponentId,
   partComponentId,
 }: Props) {
   const [removeComponentAssemblyMutation] = useMutation(
     RemoveComponentAssemblyDocument,
-    {
-      refetchQueries: [
-        {
-          query: ComponentsDocument,
-        },
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: assembledComponentId,
-          },
-        },
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: partComponentId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/components/RemoveComponentGeneralization.tsx b/frontend/components/components/RemoveComponentGeneralization.tsx
index b2ed0f6ae..697462950 100644
--- a/frontend/components/components/RemoveComponentGeneralization.tsx
+++ b/frontend/components/components/RemoveComponentGeneralization.tsx
@@ -4,10 +4,6 @@ import {
   RemoveComponentGeneralizationDocument,
   RemoveComponentGeneralizationMutation,
 } from "../../queries/componentGeneralizations.generated";
-import {
-  ComponentDocument,
-  ComponentsDocument,
-} from "../../queries/components.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import SafeDeleteButton from "../SafeDeleteButton";
 
@@ -16,31 +12,12 @@ interface Props {
   concreteComponentId: Scalars["Uuid"]["input"];
 }
 
-export function RemoveComponentGeneralization({
+export default function RemoveComponentGeneralization({
   generalComponentId,
   concreteComponentId,
 }: Props) {
   const [removeComponentGeneralizationMutation] = useMutation(
     RemoveComponentGeneralizationDocument,
-    {
-      refetchQueries: [
-        {
-          query: ComponentsDocument,
-        },
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: generalComponentId,
-          },
-        },
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: concreteComponentId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/components/RemoveComponentManufacturer.tsx b/frontend/components/components/RemoveComponentManufacturer.tsx
index f647f9b4d..f0db7fb68 100644
--- a/frontend/components/components/RemoveComponentManufacturer.tsx
+++ b/frontend/components/components/RemoveComponentManufacturer.tsx
@@ -4,11 +4,6 @@ import {
   RemoveComponentManufacturerDocument,
   RemoveComponentManufacturerMutation,
 } from "../../queries/componentManufacturers.generated";
-import {
-  ComponentDocument,
-  ComponentsDocument,
-} from "../../queries/components.generated";
-import { InstitutionDocument } from "../../queries/institutions.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import SafeDeleteButton from "../SafeDeleteButton";
 
@@ -17,31 +12,12 @@ interface Props {
   institutionId: Scalars["Uuid"]["input"];
 }
 
-export function RemoveComponentManufacturer({
+export default function RemoveComponentManufacturer({
   componentId,
   institutionId,
 }: Props) {
   const [removeComponentManufacturerMutation] = useMutation(
     RemoveComponentManufacturerDocument,
-    {
-      refetchQueries: [
-        {
-          query: ComponentsDocument,
-        },
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: componentId,
-          },
-        },
-        {
-          query: InstitutionDocument,
-          variables: {
-            uuid: institutionId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/components/RemoveComponentVariant.tsx b/frontend/components/components/RemoveComponentVariant.tsx
index 6eeaf9887..312a472a0 100644
--- a/frontend/components/components/RemoveComponentVariant.tsx
+++ b/frontend/components/components/RemoveComponentVariant.tsx
@@ -4,10 +4,6 @@ import {
   RemoveComponentVariantDocument,
   RemoveComponentVariantMutation,
 } from "../../queries/componentVariants.generated";
-import {
-  ComponentDocument,
-  ComponentsDocument,
-} from "../../queries/components.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import SafeDeleteButton from "../SafeDeleteButton";
 
@@ -16,31 +12,12 @@ interface Props {
   otherComponentId: Scalars["Uuid"]["input"];
 }
 
-export function RemoveComponentVariant({
+export default function RemoveComponentVariant({
   oneComponentId,
   otherComponentId,
 }: Props) {
   const [removeComponentVariantMutation] = useMutation(
     RemoveComponentVariantDocument,
-    {
-      refetchQueries: [
-        {
-          query: ComponentsDocument,
-        },
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: oneComponentId,
-          },
-        },
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: otherComponentId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/components/UpdateComponent.tsx b/frontend/components/components/UpdateComponent.tsx
index b3488bc2c..3c447de77 100644
--- a/frontend/components/components/UpdateComponent.tsx
+++ b/frontend/components/components/UpdateComponent.tsx
@@ -11,7 +11,7 @@ import {
   ComponentCategory,
   DescriptionOrReferenceInput,
 } from "../../__generated__/graphql";
-import { ReferenceSubform } from "../ReferenceSubform";
+import ReferenceSubform from "../ReferenceSubform";
 import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
diff --git a/frontend/components/components/UpdateComponentAssembly.tsx b/frontend/components/components/UpdateComponentAssembly.tsx
index b92e05593..7472c8b1e 100644
--- a/frontend/components/components/UpdateComponentAssembly.tsx
+++ b/frontend/components/components/UpdateComponentAssembly.tsx
@@ -6,7 +6,6 @@ import {
 } from "../../queries/componentAssemblies.generated";
 import { PrimeSurface, Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
-import { ComponentDocument } from "../../queries/components.generated";
 import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
@@ -35,22 +34,6 @@ export default function UpdateComponentAssembly(
 
   const [updateComponentAssemblyMutation] = useMutation(
     UpdateComponentAssemblyDocument,
-    {
-      refetchQueries: [
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: componentAssembly.assembledComponent.uuid,
-          },
-        },
-        {
-          query: ComponentDocument,
-          variables: {
-            uuid: componentAssembly.partComponent.uuid,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, augmentFormWithErrors } =
diff --git a/frontend/components/data/DataSummary.tsx b/frontend/components/data/DataSummary.tsx
index 11db0ed92..ec84ca6c4 100644
--- a/frontend/components/data/DataSummary.tsx
+++ b/frontend/components/data/DataSummary.tsx
@@ -1,5 +1,13 @@
 import * as graphql from "graphql";
-import { Breadcrumb, Flex, Tag, Tooltip, Tree, Typography } from "antd";
+import {
+  Breadcrumb,
+  Divider,
+  Flex,
+  Tag,
+  Tooltip,
+  Tree,
+  Typography,
+} from "antd";
 import paths from "../../paths";
 import EntitySummary from "../entities/EntitySummary";
 import {
@@ -7,17 +15,17 @@ import {
   DataPartialFragment,
   ToTreeVertexAppliedConversionMethodPartialFragment,
 } from "../../queries/data.generated";
-import dayjs from "dayjs";
 import InlineList from "../InlineList";
 import EntityLink from "../entities/EntityLink";
 import { Scalars } from "../../__generated__/graphql";
-import JsonViewer from "../JsonViewer";
+import JsonViewer from "../JsonView";
 import { useMemo, useState } from "react";
 import Copyable from "../Copyable";
-import { Reference } from "../Reference";
-import CodeViewer from "../CodeViewer";
-import AppliedMethodViewer from "../methods/AppliedMethodViewer";
+import Reference from "../Reference";
+import CodeViewer from "../CodeView";
+import AppliedMethodViewer from "../methods/AppliedMethodView";
 import GnuPgKeyLink from "../GnuPgKeyLink";
+import DateTimeX from "../DateTimeX";
 
 interface ResourceTreeNode {
   key: string;
@@ -111,16 +119,10 @@ export default function DataSummary({
       route={(id) => paths.opticalData(entity.database?.uuid, id)}
       tags={[
         <Tag key="updatedAt" style={{ fontWeight: "normal" }}>
-          <Tooltip title={`Updated At ${entity.timestamp}`}>
-            Updated At &ldquo;{dayjs(entity.timestamp).format("DD/MM/YYYY")}
-            &rdquo;
-          </Tooltip>
+          Updated At <DateTimeX value={entity.timestamp} />
         </Tag>,
         <Tag key="createdAt" style={{ fontWeight: "normal" }}>
-          <Tooltip title={`Created At ${entity.createdAt}`}>
-            Created At &ldquo;{dayjs(entity.createdAt).format("DD/MM/YYYY")}
-            &rdquo;
-          </Tooltip>
+          Created At <DateTimeX value={entity.createdAt} />
         </Tag>,
         <Tag key="locale" style={{ fontWeight: "normal" }}>
           Locale &ldquo;<Tooltip title="Locale">{entity.locale}</Tooltip>&rdquo;
@@ -128,162 +130,183 @@ export default function DataSummary({
       ]}
     >
       <div>
-        Data for component{" "}
-        {entity.component && (
+        <div>
+          Data for component{" "}
+          {entity.component && (
+            <EntityLink
+              entity={entity.component ?? nameFallback(entity.componentId)}
+              route={paths.component}
+            />
+          )}{" "}
+          created by{" "}
           <EntityLink
-            entity={entity.component ?? nameFallback(entity.componentId)}
-            route={paths.component}
+            entity={entity.creator ?? nameFallback(entity.creatorId)}
+            route={paths.institution}
+          />{" "}
+          and stored in the{" "}
+          <EntityLink
+            entity={entity.database ?? nameFallback(entity.databaseId)}
+            route={paths.database}
           />
-        )}{" "}
-        created by{" "}
-        <EntityLink
-          entity={entity.creator ?? nameFallback(entity.creatorId)}
-          route={paths.institution}
-        />{" "}
-        and stored in the{" "}
-        <EntityLink
-          entity={entity.database ?? nameFallback(entity.databaseId)}
-          route={paths.database}
-        />
-      </div>
-      <div>
-        Generated by applying the method{" "}
-        <AppliedMethodViewer value={entity.appliedMethod} />
-      </div>
-      {children && <div>{children}</div>}
-      {rootResource.children && rootResource.children.length > 0 && (
-        <Tree
-          showLine
-          treeData={[rootResource]}
-          onSelect={(_, info) => setSelectedResource(info.node)}
-        />
-      )}
-      {selectedResource && (
+        </div>
         <div>
-          {resourceNodes.length > 1 && (
-            <Breadcrumb
-              items={getBreadcrumbItems(
-                selectedResource.vertexId,
-                resourceNodes,
-              )}
-            />
-          )}
-          {selectedResource.value.description && (
-            <div>{selectedResource.value.description}</div>
-          )}
-          <div>
-            Located at{" "}
-            <Copyable onlyIcon text={selectedResource.value.locator}>
-              <Typography.Link
-                href={selectedResource.value.locator}
-                target="_blank"
-              >
-                {selectedResource.value.locator}
-              </Typography.Link>
-            </Copyable>
-          </div>
+          Generated by applying the method{" "}
+          <AppliedMethodViewer value={entity.appliedMethod} />
+        </div>
+        {entity.warnings.length > 0 && (
           <div>
-            Having the{" "}
-            <Typography.Link
-              href="https://csrc.nist.gov/pubs/fips/180-4/upd1/final"
-              target="_blank"
-            >
-              SHA-256
-            </Typography.Link>{" "}
-            hash value{" "}
-            <CodeViewer inline code={selectedResource.value.hashValue} /> as
-            unique digital fingerprint. Use it after downloading the data to
-            ensure that it has not been tampered with or gotten corrupted.
+            Beware of{" "}
+            <InlineList
+              items={entity.warnings}
+              renderItem={(item) => <span>&ldquo;{item}&rdquo;</span>}
+            />
           </div>
+        )}
+      </div>
+      <Divider style={{ margin: 0 }} />
+      <div>
+        {rootResource.children && rootResource.children.length > 0 && (
+          <Tree
+            showLine
+            treeData={[rootResource]}
+            onSelect={(_, info) => setSelectedResource(info.node)}
+          />
+        )}
+        {selectedResource && (
           <div>
-            Being of the data format{" "}
-            <EntityLink
-              entity={
-                selectedResource.value.dataFormat ??
-                nameFallback(selectedResource.value.dataFormatId)
-              }
-              route={paths.dataFormat}
-            />
-            {selectedResource.value.archivedFilesMetaInformation?.length >
-              0 && (
-              <>
-                It is an archive format and the archive file contains the files{" "}
-                <InlineList
-                  items={selectedResource.value.archivedFilesMetaInformation}
-                  renderItem={(item) => (
-                    <span>
-                      ./{item.path.join("/")}=
-                      <EntityLink
-                        entity={
-                          item.dataFormat ?? nameFallback(item.dataFormatId)
-                        }
-                        route={paths.dataFormat}
-                      />
-                    </span>
-                  )}
-                />
-              </>
+            {resourceNodes.length > 1 && (
+              <Breadcrumb
+                items={getBreadcrumbItems(
+                  selectedResource.vertexId,
+                  resourceNodes,
+                )}
+              />
+            )}
+            {selectedResource.value.description && (
+              <div>{selectedResource.value.description}</div>
             )}
-          </div>
-          {selectedResource.appliedConversionMethod && (
             <div>
-              Generated by applying the conversion method{" "}
-              <AppliedMethodViewer
-                value={selectedResource.appliedConversionMethod}
-              />
+              Located at{" "}
+              <Copyable onlyIcon text={selectedResource.value.locator}>
+                <Typography.Link
+                  href={selectedResource.value.locator}
+                  target="_blank"
+                >
+                  {selectedResource.value.locator}
+                </Typography.Link>
+              </Copyable>
             </div>
-          )}
-        </div>
-      )}
-      {entity.approvals.length > 0 && (
-        <Flex gap="small">
-          {entity.approvals.map((approval) => (
             <div>
-              The institution{" "}
-              <EntityLink
-                entity={approval.approver ?? nameFallback(approval.approverId)}
-                route={paths.institution}
-              />{" "}
-              approved on {dayjs(approval.timestamp).format("DD/MM/YYYY")} that
-              the data satisfies the statement given by the reference
-              <Reference data={approval.statement} />
-              This is proven by the GnuPG signature
-              <CodeViewer code={approval.signature} />
-              generated with the institution's GnuPG key{" "}
-              <GnuPgKeyLink fingerprint={approval.keyFingerprint} /> of the
-              message
-              <CodeViewer code={approval.message} />
-              The message contains the statement and the response of the query
-              <CodeViewer code={graphql.print(graphql.parse(approval.query))} />
-              with the variables
-              <JsonViewer data={approval.variables} />
-              against the GraphQL endpoint of the database{" "}
+              Having the{" "}
+              <Typography.Link
+                href="https://csrc.nist.gov/pubs/fips/180-4/upd1/final"
+                target="_blank"
+              >
+                SHA-256
+              </Typography.Link>{" "}
+              hash value{" "}
+              <CodeViewer inline code={selectedResource.value.hashValue} /> as
+              unique digital fingerprint. Use it after downloading the data to
+              ensure that it has not been tampered with or gotten corrupted.
+            </div>
+            <div>
+              Being of the data format{" "}
               <EntityLink
-                entity={entity.database ?? nameFallback(entity.databaseId)}
-                route={paths.database}
+                entity={
+                  selectedResource.value.dataFormat ??
+                  nameFallback(selectedResource.value.dataFormatId)
+                }
+                route={paths.dataFormat}
               />
-              {entity.database?.locator && (
+              {selectedResource.value.archivedFilesMetaInformation?.length >
+                0 && (
                 <>
-                  {" "}
-                  located at{" "}
-                  <Typography.Link href={entity.database.locator}>
-                    {entity.database.locator}
-                  </Typography.Link>
+                  It is an archive format and the archive file contains the
+                  files{" "}
+                  <InlineList
+                    items={selectedResource.value.archivedFilesMetaInformation}
+                    renderItem={(item) => (
+                      <span>
+                        ./{item.path.join("/")}=
+                        <EntityLink
+                          entity={
+                            item.dataFormat ?? nameFallback(item.dataFormatId)
+                          }
+                          route={paths.dataFormat}
+                        />
+                      </span>
+                    )}
+                  />
                 </>
               )}
-              .
             </div>
-          ))}
-        </Flex>
+            {selectedResource.appliedConversionMethod && (
+              <div>
+                Generated by applying the conversion method{" "}
+                <AppliedMethodViewer
+                  value={selectedResource.appliedConversionMethod}
+                />
+              </div>
+            )}
+          </div>
+        )}
+      </div>
+      {entity.approvals.length > 0 && (
+        <>
+          <Divider style={{ margin: 0 }} />
+          <div>
+            <Flex gap="small">
+              {entity.approvals.map((approval) => (
+                <div>
+                  The institution{" "}
+                  <EntityLink
+                    entity={
+                      approval.approver ?? nameFallback(approval.approverId)
+                    }
+                    route={paths.institution}
+                  />{" "}
+                  approved on <DateTimeX value={approval.timestamp} /> that the
+                  data satisfies the statement given by the reference
+                  <Reference data={approval.statement} />
+                  This is proven by the GnuPG signature
+                  <CodeViewer code={approval.signature} />
+                  generated with the institution's GnuPG key{" "}
+                  <GnuPgKeyLink fingerprint={approval.keyFingerprint} /> of the
+                  message
+                  <CodeViewer code={approval.message} />
+                  The message contains the statement and the response of the
+                  query
+                  <CodeViewer
+                    code={graphql.print(graphql.parse(approval.query))}
+                  />
+                  with the variables
+                  <JsonViewer data={approval.variables} />
+                  against the GraphQL endpoint of the database{" "}
+                  <EntityLink
+                    entity={entity.database ?? nameFallback(entity.databaseId)}
+                    route={paths.database}
+                  />
+                  {entity.database?.locator && (
+                    <>
+                      {" "}
+                      located at{" "}
+                      <Typography.Link href={entity.database.locator}>
+                        {entity.database.locator}
+                      </Typography.Link>
+                    </>
+                  )}
+                  .
+                </div>
+              ))}
+            </Flex>
+          </div>
+        </>
       )}
-      {entity.warnings.length > 0 && (
-        <div>
-          Beware of{" "}
-          <InlineList
-            items={entity.warnings}
-            renderItem={(item) => <span>&ldquo;{item}&rdquo;</span>}
-          />
-        </div>
+      {children && (
+        <>
+          <Divider style={{ margin: 0 }} />
+          <div>{children}</div>
+        </>
       )}
     </EntitySummary>
   );
diff --git a/frontend/components/data/calorimetric/CalorimetricData.tsx b/frontend/components/data/calorimetric/CalorimetricData.tsx
index f0231e315..744a4bdc5 100644
--- a/frontend/components/data/calorimetric/CalorimetricData.tsx
+++ b/frontend/components/data/calorimetric/CalorimetricData.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../../__generated__/graphql";
 import { CalorimetricDataDocument } from "../../../queries/data.generated";
-import { Skeleton, Result, Card, Divider } from "antd";
+import { Skeleton, Result, Card } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
 import CalorimetricDataSummary from "./CalorimetricDataSummary";
@@ -40,13 +40,14 @@ export default function CalorimetricData({
   }
 
   return (
-    <Card>
-      <CalorimetricDataSummary entity={theData} />
-      <Divider />
+    <div>
+      <Card style={{ marginBottom: "1em" }}>
+        <CalorimetricDataSummary entity={theData} />
+      </Card>
       <QueryToolbar
         query={CalorimetricDataDocument}
         variables={queryVariables}
       />
-    </Card>
+    </div>
   );
 }
diff --git a/frontend/components/data/geometric/GeometricData.tsx b/frontend/components/data/geometric/GeometricData.tsx
index a8d82cd81..60eaec772 100644
--- a/frontend/components/data/geometric/GeometricData.tsx
+++ b/frontend/components/data/geometric/GeometricData.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../../__generated__/graphql";
 import { GeometricDataDocument } from "../../../queries/data.generated";
-import { Skeleton, Result, Card, Divider } from "antd";
+import { Skeleton, Result, Card } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
 import GeometricDataSummary from "./GeometricDataSummary";
@@ -37,10 +37,11 @@ export default function GeometricData({ databaseId, id }: GeometricDataProps) {
   }
 
   return (
-    <Card>
-      <GeometricDataSummary entity={theData} />
-      <Divider />
+    <div>
+      <Card style={{ marginBottom: "1em" }}>
+        <GeometricDataSummary entity={theData} />
+      </Card>
       <QueryToolbar query={GeometricDataDocument} variables={queryVariables} />
-    </Card>
+    </div>
   );
 }
diff --git a/frontend/components/data/hygrothermal/HygrothermalData.tsx b/frontend/components/data/hygrothermal/HygrothermalData.tsx
index 38cf700fc..aaaf43335 100644
--- a/frontend/components/data/hygrothermal/HygrothermalData.tsx
+++ b/frontend/components/data/hygrothermal/HygrothermalData.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../../__generated__/graphql";
 import { HygrothermalDataDocument } from "../../../queries/data.generated";
-import { Skeleton, Result, Card, Divider } from "antd";
+import { Skeleton, Result, Card } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
 import HygrothermalDataSummary from "./HygrothermalDataSummary";
@@ -40,13 +40,14 @@ export default function HygrothermalData({
   }
 
   return (
-    <Card>
-      <HygrothermalDataSummary entity={theData} />
-      <Divider />
+    <div>
+      <Card style={{ marginBottom: "1em" }}>
+        <HygrothermalDataSummary entity={theData} />
+      </Card>
       <QueryToolbar
         query={HygrothermalDataDocument}
         variables={queryVariables}
       />
-    </Card>
+    </div>
   );
 }
diff --git a/frontend/components/data/lifeCycle/LifeCycleData.tsx b/frontend/components/data/lifeCycle/LifeCycleData.tsx
index 6e5acab55..fda1d4fd1 100644
--- a/frontend/components/data/lifeCycle/LifeCycleData.tsx
+++ b/frontend/components/data/lifeCycle/LifeCycleData.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../../__generated__/graphql";
 import { LifeCycleDataDocument } from "../../../queries/data.generated";
-import { Skeleton, Result, Card, Divider } from "antd";
+import { Skeleton, Result, Card } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
 import LifeCycleDataSummary from "./LifeCycleDataSummary";
@@ -37,10 +37,11 @@ export default function LifeCycleData({ databaseId, id }: LifeCycleDataProps) {
   }
 
   return (
-    <Card>
-      <LifeCycleDataSummary entity={theData} />
-      <Divider />
+    <div>
+      <Card style={{ marginBottom: "1em" }}>
+        <LifeCycleDataSummary entity={theData} />
+      </Card>
       <QueryToolbar query={LifeCycleDataDocument} variables={queryVariables} />
-    </Card>
+    </div>
   );
 }
diff --git a/frontend/components/data/optical/OpticalData.tsx b/frontend/components/data/optical/OpticalData.tsx
index 941997550..10b922fd1 100644
--- a/frontend/components/data/optical/OpticalData.tsx
+++ b/frontend/components/data/optical/OpticalData.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../../__generated__/graphql";
 import { OpticalDataDocument } from "../../../queries/data.generated";
-import { Skeleton, Result, Card, Divider } from "antd";
+import { Skeleton, Result, Card } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
 import OpticalDataSummary from "./OpticalDataSummary";
@@ -38,12 +38,13 @@ export default function OpticalData({ databaseId, id }: OpticalDataProps) {
   }
 
   return (
-    <OpticalDataRibbon {...theData}>
-      <Card>
-        <OpticalDataSummary entity={theData} />
-        <Divider />
-        <QueryToolbar query={OpticalDataDocument} variables={queryVariables} />
-      </Card>
-    </OpticalDataRibbon>
+    <div>
+      <OpticalDataRibbon {...theData}>
+        <Card style={{ marginBottom: "1em" }}>
+          <OpticalDataSummary entity={theData} />
+        </Card>
+      </OpticalDataRibbon>
+      <QueryToolbar query={OpticalDataDocument} variables={queryVariables} />
+    </div>
   );
 }
diff --git a/frontend/components/data/optical/OpticalDataSummary.tsx b/frontend/components/data/optical/OpticalDataSummary.tsx
index 68cfc9511..8c6fb5df0 100644
--- a/frontend/components/data/optical/OpticalDataSummary.tsx
+++ b/frontend/components/data/optical/OpticalDataSummary.tsx
@@ -2,7 +2,7 @@ import { OpticalDataPartialFragment } from "../../../queries/data.generated";
 import Float from "../../Float";
 import InlineList from "../../InlineList";
 import DataSummary from "../DataSummary";
-import CielabColorViewer from "../../CielabColorViewer";
+import CielabColorView from "../../CielabColorView";
 import { CoatedSide } from "../../../__generated__/graphql";
 import { isTruthy } from "../../../lib/array";
 
@@ -66,7 +66,7 @@ export default function OpticalDataSummary({
         <InlineList
           items={entity.cielabColors}
           renderItem={(item, index) => (
-            <CielabColorViewer key={index} value={item} />
+            <CielabColorView key={index} value={item} />
           )}
         />
       </div>
diff --git a/frontend/components/data/photovoltaic/PhotovoltaicData.tsx b/frontend/components/data/photovoltaic/PhotovoltaicData.tsx
index 149ed0d10..980b59850 100644
--- a/frontend/components/data/photovoltaic/PhotovoltaicData.tsx
+++ b/frontend/components/data/photovoltaic/PhotovoltaicData.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../../__generated__/graphql";
 import { PhotovoltaicDataDocument } from "../../../queries/data.generated";
-import { Skeleton, Result, Card, Divider } from "antd";
+import { Skeleton, Result, Card } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
 import PhotovoltaicDataSummary from "./PhotovoltaicDataSummary";
@@ -40,13 +40,14 @@ export default function PhotovoltaicData({
   }
 
   return (
-    <Card>
-      <PhotovoltaicDataSummary entity={theData} />
-      <Divider />
+    <div>
+      <Card style={{ marginBottom: "1em" }}>
+        <PhotovoltaicDataSummary entity={theData} />
+      </Card>
       <QueryToolbar
         query={PhotovoltaicDataDocument}
         variables={queryVariables}
       />
-    </Card>
+    </div>
   );
 }
diff --git a/frontend/components/dataFormats/CreateDataFormat.tsx b/frontend/components/dataFormats/CreateDataFormat.tsx
index 203ef3018..72884987d 100644
--- a/frontend/components/dataFormats/CreateDataFormat.tsx
+++ b/frontend/components/dataFormats/CreateDataFormat.tsx
@@ -7,13 +7,13 @@ import {
 } from "../../queries/dataFormats.generated";
 import { ReferenceInput, Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
-import { InstitutionDocument } from "../../queries/institutions.generated";
-import { ReferenceSubform } from "../ReferenceSubform";
 import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import DataFormatSummary from "./DataFormatSummary";
 import NewButton from "../NewButton";
+import ReferenceSubform from "../ReferenceSubform";
+import RepresentedInstitutionIdSelect from "../institutions/RepresentedInstitutionIdSelect";
 
 type FormValues = {
   name: string;
@@ -22,13 +22,16 @@ type FormValues = {
   mediaType: string;
   schemaLocator: Scalars["Url"]["input"] | null | undefined;
   reference: ReferenceInput | null | undefined;
+  managerId: Scalars["Uuid"]["input"];
 };
 
 interface CreateDataFormatProps {
-  managerId: Scalars["Uuid"]["input"];
+  initialManagerId: Scalars["Uuid"]["input"];
 }
 
-export default function CreateDataFormat({ managerId }: CreateDataFormatProps) {
+export default function CreateDataFormat({
+  initialManagerId,
+}: CreateDataFormatProps) {
   const [open, setOpen] = useState(false);
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
@@ -37,17 +40,7 @@ export default function CreateDataFormat({ managerId }: CreateDataFormatProps) {
   const { notification } = App.useApp();
 
   const [createDataFormatMutation] = useMutation(CreateDataFormatDocument, {
-    // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-    // See https://www.apollographql.com/docs/react/data/mutations/#options
-    refetchQueries: [
-      {
-        query: InstitutionDocument,
-        variables: {
-          uuid: managerId,
-        },
-      },
-      DataFormatsDocument,
-    ],
+    refetchQueries: [DataFormatsDocument],
   });
 
   const {
@@ -79,7 +72,7 @@ export default function CreateDataFormat({ managerId }: CreateDataFormatProps) {
               mediaType: values.mediaType,
               schemaLocator: values.schemaLocator,
               reference: values.reference,
-              managerId: managerId,
+              managerId: values.managerId,
             },
           },
         });
@@ -199,6 +192,14 @@ export default function CreateDataFormat({ managerId }: CreateDataFormatProps) {
           >
             <Input />
           </Form.Item>
+          <Form.Item
+            label="Manager"
+            name="managerId"
+            rules={[{ required: true }]}
+            initialValue={initialManagerId}
+          >
+            <RepresentedInstitutionIdSelect />
+          </Form.Item>
           <Divider />
           <ReferenceSubform form={form} namespace={["reference"]} />
           <Form.Item {...tailLayout}>
diff --git a/frontend/components/dataFormats/DataFormat.tsx b/frontend/components/dataFormats/DataFormat.tsx
index b7951d537..19960a6f8 100644
--- a/frontend/components/dataFormats/DataFormat.tsx
+++ b/frontend/components/dataFormats/DataFormat.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../__generated__/graphql";
 import { DataFormatDocument } from "../../queries/dataFormats.generated";
-import { Skeleton, Result, Card, Divider } from "antd";
+import { Skeleton, Result, Card } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import DataFormatSummary from "./DataFormatSummary";
@@ -35,10 +35,11 @@ export default function DataFormat({ dataFormatId }: DataFormatProps) {
   }
 
   return (
-    <Card>
-      <DataFormatSummary entity={dataFormat} />
-      <Divider />
+    <div>
+      <Card style={{ marginBottom: "1em" }}>
+        <DataFormatSummary entity={dataFormat} />
+      </Card>
       <QueryToolbar query={DataFormatDocument} variables={queryVariables} />
-    </Card>
+    </div>
   );
 }
diff --git a/frontend/components/dataFormats/DataFormatSummary.tsx b/frontend/components/dataFormats/DataFormatSummary.tsx
index 6c7a33225..05a111b8a 100644
--- a/frontend/components/dataFormats/DataFormatSummary.tsx
+++ b/frontend/components/dataFormats/DataFormatSummary.tsx
@@ -2,7 +2,7 @@ import { Tag, Tooltip, Typography } from "antd";
 import { isTruthy } from "../../lib/array";
 import paths from "../../paths";
 import EntitySummary from "../entities/EntitySummary";
-import { Reference } from "../Reference";
+import Reference from "../Reference";
 import UpdateDataFormat from "./UpdateDataFormat";
 import {
   DataFormatsPartialFragment,
diff --git a/frontend/components/dataFormats/UpdateDataFormat.tsx b/frontend/components/dataFormats/UpdateDataFormat.tsx
index 7f181a8b2..658070efd 100644
--- a/frontend/components/dataFormats/UpdateDataFormat.tsx
+++ b/frontend/components/dataFormats/UpdateDataFormat.tsx
@@ -7,7 +7,7 @@ import {
 } from "../../queries/dataFormats.generated";
 import { ReferenceInput, Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
-import { ReferenceSubform } from "../ReferenceSubform";
+import ReferenceSubform from "../ReferenceSubform";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
diff --git a/frontend/components/databases/CreateDatabase.tsx b/frontend/components/databases/CreateDatabase.tsx
index 7e2e1e149..7f1df450a 100644
--- a/frontend/components/databases/CreateDatabase.tsx
+++ b/frontend/components/databases/CreateDatabase.tsx
@@ -13,19 +13,22 @@ import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 import NewButton from "../NewButton";
 import DatabaseSummary from "./DatabaseSummary";
-import { InstitutionDocument } from "../../queries/institutions.generated";
+import RepresentedInstitutionIdSelect from "../institutions/RepresentedInstitutionIdSelect";
 
 type FormValues = {
   name: string;
   description: string;
   locator: Scalars["Url"]["input"];
+  operatorId: Scalars["Uuid"]["input"];
 };
 
 interface CreateDatabaseProps {
-  operatorId: Scalars["Uuid"]["input"];
+  initialOperatorId: Scalars["Uuid"]["input"];
 }
 
-export default function CreateDatabase({ operatorId }: CreateDatabaseProps) {
+export default function CreateDatabase({
+  initialOperatorId,
+}: CreateDatabaseProps) {
   const [open, setOpen] = useState(false);
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
@@ -34,18 +37,7 @@ export default function CreateDatabase({ operatorId }: CreateDatabaseProps) {
   const { notification } = App.useApp();
 
   const [createDatabaseMutation] = useMutation(CreateDatabaseDocument, {
-    // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-    // See https://www.apollographql.com/docs/react/data/mutations/#options
-    refetchQueries: [
-      {
-        query: InstitutionDocument,
-        variables: {
-          uuid: operatorId,
-        },
-      },
-      DatabasesDocument,
-      AnyDatabasesDocument,
-    ],
+    refetchQueries: [DatabasesDocument, AnyDatabasesDocument],
   });
 
   const {
@@ -66,7 +58,7 @@ export default function CreateDatabase({ operatorId }: CreateDatabaseProps) {
               name: values.name,
               description: values.description,
               locator: values.locator,
-              operatorId: operatorId,
+              operatorId: values.operatorId,
             },
           },
         }),
@@ -163,6 +155,14 @@ export default function CreateDatabase({ operatorId }: CreateDatabaseProps) {
           >
             <Input />
           </Form.Item>
+          <Form.Item
+            label="Operator"
+            name="operatorId"
+            rules={[{ required: true }]}
+            initialValue={initialOperatorId}
+          >
+            <RepresentedInstitutionIdSelect />
+          </Form.Item>
           <Form.Item {...tailLayout}>
             <Button type="primary" htmlType="submit" loading={mutating}>
               Create
diff --git a/frontend/components/databases/Database.tsx b/frontend/components/databases/Database.tsx
index a40136ef5..94b51c3a3 100644
--- a/frontend/components/databases/Database.tsx
+++ b/frontend/components/databases/Database.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../__generated__/graphql";
 import { DatabaseDocument } from "../../queries/databases.generated";
-import { Skeleton, Result, Card, Divider } from "antd";
+import { Skeleton, Result, Card } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import DatabaseSummary from "./DatabaseSummary";
@@ -35,10 +35,11 @@ export default function Database({ databaseId }: DatabaseProps) {
   }
 
   return (
-    <Card>
-      <DatabaseSummary entity={database} />
-      <Divider />
+    <div>
+      <Card style={{ marginBottom: "1em" }}>
+        <DatabaseSummary entity={database} />
+      </Card>
       <QueryToolbar query={DatabaseDocument} variables={queryVariables} />
-    </Card>
+    </div>
   );
 }
diff --git a/frontend/components/databases/DatabaseSummary.tsx b/frontend/components/databases/DatabaseSummary.tsx
index ba1adc939..aae9f11af 100644
--- a/frontend/components/databases/DatabaseSummary.tsx
+++ b/frontend/components/databases/DatabaseSummary.tsx
@@ -12,7 +12,7 @@ import { isTruthy } from "../../lib/array";
 import UpdateDatabase from "./UpdateDatabase";
 import VerifyDatabase from "./VerifyDatabase";
 import EnumTag from "../EnumTag";
-import CodeViewer from "../CodeViewer";
+import CodeView from "../CodeView";
 
 export default function DatabaseSummary({
   entity,
@@ -62,9 +62,9 @@ export default function DatabaseSummary({
           <Typography.Paragraph style={{ maxWidth: "75ch" }}>
             Have your database&apos;s GraphQL endpoint return the verification
             code
-            <CodeViewer code={entity.verificationCode} />
+            <CodeView code={entity.verificationCode} />
             when queried for the GraphQL query
-            <CodeViewer code="query { verificationCode }" />
+            <CodeView code="query { verificationCode }" />
             Then, press the &ldquo;Verify&rdquo; button{" "}
             {!hideExtra ? (
               "above"
diff --git a/frontend/components/databases/VerifyDatabase.tsx b/frontend/components/databases/VerifyDatabase.tsx
index ab8c94566..c08cc9011 100644
--- a/frontend/components/databases/VerifyDatabase.tsx
+++ b/frontend/components/databases/VerifyDatabase.tsx
@@ -15,14 +15,7 @@ interface VerifyDatabaseProps {
 
 export default function VerifyDatabase({ databaseId }: VerifyDatabaseProps) {
   const [verifyDatabaseMutation] = useMutation(VerifyDatabaseDocument, {
-    refetchQueries: [
-      {
-        query: DatabasesDocument,
-      },
-      {
-        query: PendingDatabasesDocument,
-      },
-    ],
+    refetchQueries: [DatabasesDocument, PendingDatabasesDocument],
   });
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/entities/PaginatedEntities.tsx b/frontend/components/entities/PaginatedEntities.tsx
index 30d6f31fb..e4d274306 100644
--- a/frontend/components/entities/PaginatedEntities.tsx
+++ b/frontend/components/entities/PaginatedEntities.tsx
@@ -203,22 +203,20 @@ export default function PaginatedEntities<
     items: props.filterDefinitions as readonly FilterDefinition<any>[],
   };
 
-  const jump =
-    (props.showJump && (
-      <JumpToId
-        query={props.namesQuery}
-        route={props.route}
-        style={{ width: props.extra ? "100%" : undefined }}
-      />
-    )) ||
-    null;
+  const jump = props.showJump && (
+    <JumpToId
+      query={props.namesQuery}
+      route={props.route}
+      style={{ width: props.extra ? "100%" : undefined }}
+    />
+  );
 
   return (
     <div>
       <Flex vertical gap="medium">
         {props.extra != null && jump}
         <Flex justify="space-between" align="baseline">
-          {props.extra ?? jump ?? <div />}
+          {props.extra || jump ? (props.extra ?? jump) : <div />}
           <Button
             type={isFilterAndSortOpen ? "text" : "default"}
             icon={<FilterOutlined />}
diff --git a/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx b/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
index 644bfcad6..7f45219c5 100644
--- a/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
+++ b/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
@@ -6,13 +6,12 @@ import {
 } from "../../queries/gnuPgKeyFingerprints.generated";
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
-import { InstitutionDocument } from "../../queries/institutions.generated";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 import GnuPgKeySummary from "./GnuPgKeySummary";
 import NewButton from "../NewButton";
-import CodeViewer from "../CodeViewer";
+import CodeView from "../CodeView";
 
 type FormValues = {
   fingerprint: string;
@@ -34,18 +33,6 @@ export default function AddGnuPgKeyFingerprint({
 
   const [addGnuPgKeyFingerprintMutation] = useMutation(
     AddGnuPgKeyFingerprintDocument,
-    {
-      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-      // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: InstitutionDocument,
-          variables: {
-            uuid: institutionId,
-          },
-        },
-      ],
-    },
   );
 
   const {
@@ -127,13 +114,13 @@ export default function AddGnuPgKeyFingerprint({
           </Typography.Link>{" "}
           and then verify the user ID of the key, which should be your email
           address. You can add your key either by running
-          <CodeViewer
+          <CodeView
             code={`gpg \\
   --keyserver "hkps://keys.openpgp.org" \\
   --send-keys "\${SIGNING_KEY_FINGERPRINT}"`}
           />
           or by exporting it with
-          <CodeViewer
+          <CodeView
             code={`gpg \\
   --export --armor \\
   --output ./my.pub.asc \\
diff --git a/frontend/components/gnuPgKeys/AllowGnuPgKeyFingerprint.tsx b/frontend/components/gnuPgKeys/AllowGnuPgKeyFingerprint.tsx
index d1ba4d5c9..82b1f778a 100644
--- a/frontend/components/gnuPgKeys/AllowGnuPgKeyFingerprint.tsx
+++ b/frontend/components/gnuPgKeys/AllowGnuPgKeyFingerprint.tsx
@@ -4,31 +4,17 @@ import {
   AllowGnuPgKeyFingerprintDocument,
   AllowGnuPgKeyFingerprintMutation,
 } from "../../queries/gnuPgKeyFingerprints.generated";
-import { Scalars } from "../../__generated__/graphql";
-import { InstitutionDocument } from "../../queries/institutions.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 
 interface AllowGnuPgKeyFingerprintProps {
   fingerprint: string;
-  institutionId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function AllowGnuPgKeyFingerprint({
   fingerprint,
-  institutionId,
 }: AllowGnuPgKeyFingerprintProps) {
   const [allowGnuPgKeyFingerprintMutation] = useMutation(
     AllowGnuPgKeyFingerprintDocument,
-    {
-      refetchQueries: [
-        {
-          query: InstitutionDocument,
-          variables: {
-            uuid: institutionId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/gnuPgKeys/ForbidGnuPgKeyFingerprint.tsx b/frontend/components/gnuPgKeys/ForbidGnuPgKeyFingerprint.tsx
index 78863db59..eb7cf5a6c 100644
--- a/frontend/components/gnuPgKeys/ForbidGnuPgKeyFingerprint.tsx
+++ b/frontend/components/gnuPgKeys/ForbidGnuPgKeyFingerprint.tsx
@@ -4,31 +4,17 @@ import {
   ForbidGnuPgKeyFingerprintDocument,
   ForbidGnuPgKeyFingerprintMutation,
 } from "../../queries/gnuPgKeyFingerprints.generated";
-import { Scalars } from "../../__generated__/graphql";
-import { InstitutionDocument } from "../../queries/institutions.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 
 interface ForbidGnuPgKeyFingerprintProps {
   fingerprint: string;
-  institutionId: Scalars["Uuid"]["input"];
-};
+}
 
 export default function ForbidGnuPgKeyFingerprint({
   fingerprint,
-  institutionId,
 }: ForbidGnuPgKeyFingerprintProps) {
   const [forbidGnuPgKeyFingerprintMutation] = useMutation(
     ForbidGnuPgKeyFingerprintDocument,
-    {
-      refetchQueries: [
-        {
-          query: InstitutionDocument,
-          variables: {
-            uuid: institutionId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/gnuPgKeys/GnuPgKey.tsx b/frontend/components/gnuPgKeys/GnuPgKey.tsx
index 0b9e062c3..d48d64bf3 100644
--- a/frontend/components/gnuPgKeys/GnuPgKey.tsx
+++ b/frontend/components/gnuPgKeys/GnuPgKey.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../__generated__/graphql";
 import { GnuPgKeyFingerprintDocument } from "../../queries/gnuPgKeyFingerprints.generated";
-import { Skeleton, Result, Card, Divider } from "antd";
+import { Skeleton, Result, Card } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import GnuPgKeySummary from "./GnuPgKeySummary";
@@ -35,13 +35,14 @@ export default function GnuPgKey({ fingerprint }: GnuPgKeyProps) {
   }
 
   return (
-    <Card>
-      <GnuPgKeySummary entity={gnuPgKey} />
-      <Divider />
+    <div>
+      <Card style={{ marginBottom: "1em" }}>
+        <GnuPgKeySummary entity={gnuPgKey} />
+      </Card>
       <QueryToolbar
         query={GnuPgKeyFingerprintDocument}
         variables={queryVariables}
       />
-    </Card>
+    </div>
   );
 }
diff --git a/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx b/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
index 6f1340dc8..dd3877335 100644
--- a/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
+++ b/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
@@ -54,17 +54,11 @@ export default function GnuPgKeySummary({
       extra={
         !hideExtra && [
           entity.isAuthorizedToAllowNode && entity.allowedAt == undefined && (
-            <AllowGnuPgKeyFingerprint
-              fingerprint={entity.fingerprint}
-              institutionId={entity.institution.node.uuid}
-            />
+            <AllowGnuPgKeyFingerprint fingerprint={entity.fingerprint} />
           ),
           entity.isAuthorizedToForbidNode &&
             entity.forbiddenAt == undefined && (
-              <ForbidGnuPgKeyFingerprint
-                fingerprint={entity.fingerprint}
-                institutionId={entity.institution.node.uuid}
-              />
+              <ForbidGnuPgKeyFingerprint fingerprint={entity.fingerprint} />
             ),
         ]
       }
diff --git a/frontend/components/institutions/AddInstitutionRepresentative.tsx b/frontend/components/institutions/AddInstitutionRepresentative.tsx
index f9fa5d6d5..af589040a 100644
--- a/frontend/components/institutions/AddInstitutionRepresentative.tsx
+++ b/frontend/components/institutions/AddInstitutionRepresentative.tsx
@@ -7,8 +7,7 @@ import {
 import { InstitutionRepresentativeRole } from "../../__generated__/graphql";
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
-import { InstitutionDocument } from "../../queries/institutions.generated";
-import { UserIdSelect } from "../users/UserIdSelect";
+import UserIdSelect from "../users/UserIdSelect";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 
@@ -31,18 +30,6 @@ export default function AddInstitutionRepresentative({
 
   const [addInstitutionRepresentativeMutation] = useMutation(
     AddInstitutionRepresentativeDocument,
-    {
-      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-      // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: InstitutionDocument,
-          variables: {
-            uuid: institutionId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, augmentFormWithErrors } =
diff --git a/frontend/components/institutions/ConfirmInstitutionRepresentative.tsx b/frontend/components/institutions/ConfirmInstitutionRepresentative.tsx
index 12667daa2..49b1eb445 100644
--- a/frontend/components/institutions/ConfirmInstitutionRepresentative.tsx
+++ b/frontend/components/institutions/ConfirmInstitutionRepresentative.tsx
@@ -1,8 +1,6 @@
 import { useMutation } from "@apollo/client/react";
 import { Button } from "antd";
-import { InstitutionDocument } from "../../queries/institutions.generated";
 import { Scalars } from "../../__generated__/graphql";
-import { UserDocument } from "../../queries/users.generated";
 import {
   ConfirmInstitutionRepresentativeDocument,
   ConfirmInstitutionRepresentativeMutation,
@@ -20,22 +18,6 @@ export default function ConfirmInstitutionRepresentative({
 }: Props) {
   const [confirmInstitutionRepresentativeMutation] = useMutation(
     ConfirmInstitutionRepresentativeDocument,
-    {
-      refetchQueries: [
-        {
-          query: InstitutionDocument,
-          variables: {
-            uuid: institutionId,
-          },
-        },
-        {
-          query: UserDocument,
-          variables: {
-            uuid: userId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/institutions/CreateInstitution.tsx b/frontend/components/institutions/CreateInstitution.tsx
index 82d912adc..cfa098360 100644
--- a/frontend/components/institutions/CreateInstitution.tsx
+++ b/frontend/components/institutions/CreateInstitution.tsx
@@ -1,6 +1,5 @@
 import { useMutation } from "@apollo/client/react";
 import {
-  InstitutionDocument,
   InstitutionsDocument,
   CreateInstitutionDocument,
   CreateInstitutionMutation,
@@ -12,8 +11,10 @@ import ErrorAlert from "../ErrorAlert";
 import { useState } from "react";
 import { layout, tailLayout } from "../../lib/form";
 import NewButton from "../NewButton";
-import { isTruthy } from "../../lib/array";
 import InstitutionSummary from "./InstitutionSummary";
+import RepresentedInstitutionIdSelect from "./RepresentedInstitutionIdSelect";
+import { notEmpty } from "../../lib/array";
+import UserIdSelect from "../users/UserIdSelect";
 
 type ContactFormValues = {
   phoneNumber: string | null | undefined;
@@ -27,11 +28,13 @@ type FormValues = {
   abbreviation: string | null | undefined;
   description: string;
   contact: ContactFormValues | null | undefined;
+  ownerId: Scalars["Uuid"]["input"] | null | undefined;
+  managerId: Scalars["Uuid"]["input"] | null | undefined;
 };
 
 type CreateInstitutionProps =
-  | { ownerIds: Scalars["Uuid"]["input"][] }
-  | { managerId: Scalars["Uuid"]["input"] };
+  | { initialOwnerId: Scalars["Uuid"]["input"] }
+  | { initialManagerId: Scalars["Uuid"]["input"] };
 
 export default function CreateInstitution(props: CreateInstitutionProps) {
   const [open, setOpen] = useState(false);
@@ -40,15 +43,7 @@ export default function CreateInstitution(props: CreateInstitutionProps) {
   const { notification } = App.useApp();
 
   const [createInstitutionMutation] = useMutation(CreateInstitutionDocument, {
-    // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-    // See https://www.apollographql.com/docs/react/data/mutations/#options
-    refetchQueries: [
-      "managerId" in props && {
-        query: InstitutionDocument,
-        variables: { uuid: props.managerId },
-      },
-      InstitutionsDocument,
-    ].filter(isTruthy),
+    refetchQueries: [InstitutionsDocument],
   });
 
   const {
@@ -76,8 +71,8 @@ export default function CreateInstitution(props: CreateInstitutionProps) {
                 emailAddress: values.contact?.emailAddress,
                 websiteLocator: values.contact?.websiteLocator,
               },
-              ownerIds: ("ownerIds" in props && props.ownerIds) || [],
-              managerId: "managerId" in props && props.managerId,
+              ownerIds: [values.ownerId].filter(notEmpty),
+              managerId: values.managerId,
             },
           },
         }),
@@ -191,6 +186,26 @@ export default function CreateInstitution(props: CreateInstitutionProps) {
           >
             <Input />
           </Form.Item>
+          {"initialManagerId" in props && (
+            <Form.Item
+              label="Manager"
+              name="managerId"
+              rules={[{ required: true }]}
+              initialValue={props.initialManagerId}
+            >
+              <RepresentedInstitutionIdSelect />
+            </Form.Item>
+          )}
+          {"initialOwnerId" in props && (
+            <Form.Item
+              label="Owner"
+              name="ownerId"
+              rules={[{ required: true }]}
+              initialValue={props.initialOwnerId}
+            >
+              <UserIdSelect />
+            </Form.Item>
+          )}
           <Form.Item {...tailLayout}>
             <Button type="primary" htmlType="submit" loading={mutating}>
               Create
diff --git a/frontend/components/institutions/DeleteInstitution.tsx b/frontend/components/institutions/DeleteInstitution.tsx
index 83544fe9c..58576842e 100644
--- a/frontend/components/institutions/DeleteInstitution.tsx
+++ b/frontend/components/institutions/DeleteInstitution.tsx
@@ -22,11 +22,7 @@ export default function DeleteInstitution({
   const [deleteInstitutionMutation] = useMutation(DeleteInstitutionDocument, {
     // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
     // See https://www.apollographql.com/docs/react/data/mutations/#options
-    refetchQueries: [
-      {
-        query: InstitutionsDocument,
-      },
-    ],
+    refetchQueries: [InstitutionsDocument],
   });
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index b87abab73..418ac7edf 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -17,7 +17,7 @@ import AddGnuPgKeyFingerprint from "../gnuPgKeys/AddGnuPgKeyFingerprint";
 import RemoveInstitutionRepresentative from "./RemoveInstitutionRepresentative";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import ConfirmInstitutionMethodDeveloper from "../methods/ConfirmInstitutionMethodDeveloper";
-import { ConfirmComponentManufacturer } from "../components/ConfirmComponentManufacturer";
+import ConfirmComponentManufacturer from "../components/ConfirmComponentManufacturer";
 import { isTruthy } from "../../lib/array";
 import PaginatedMethods from "../methods/PaginatedMethods";
 import PaginatedDataFormats from "../dataFormats/PaginatedDataFormats";
@@ -50,7 +50,7 @@ const getMainTabs = (
           extra={
             institution.managedComponents.isAuthorizedToAddEdge && (
               <CreateComponent
-                managerId={institution.uuid}
+                initialManagerId={institution.uuid}
                 initialManufacturerId={institution.uuid}
               />
             )
@@ -60,7 +60,7 @@ const getMainTabs = (
     },
     {
       key: "methods",
-      count: institution.developedMethods.totalCount,
+      count: institution.institutionDevelopedMethods.totalCount,
       label: "Developed Methods",
       children: (
         <PaginatedMethods
@@ -72,7 +72,10 @@ const getMainTabs = (
           order={{ createdAt: SortEnumType.Desc }}
           extra={
             institution.managedMethods.isAuthorizedToAddEdge && (
-              <CreateMethod managerId={institution.uuid} />
+              <CreateMethod
+                initialManagerId={institution.uuid}
+                initialInstitutionDeveloperIds={[institution.uuid]}
+              />
             )
           }
         />
@@ -92,7 +95,7 @@ const getMainTabs = (
           order={{ createdAt: SortEnumType.Desc }}
           extra={
             institution.operatedDatabases.isAuthorizedToAddEdge && (
-              <CreateDatabase operatorId={institution.uuid} />
+              <CreateDatabase initialOperatorId={institution.uuid} />
             )
           }
         />
@@ -140,7 +143,7 @@ const getManagedTabs = (
           extra={
             institution.managedComponents.isAuthorizedToAddEdge && (
               <CreateComponent
-                managerId={institution.uuid}
+                initialManagerId={institution.uuid}
                 initialManufacturerId={institution.uuid}
               />
             )
@@ -162,7 +165,7 @@ const getManagedTabs = (
           order={{ createdAt: SortEnumType.Desc }}
           extra={
             institution.managedMethods.isAuthorizedToAddEdge && (
-              <CreateMethod managerId={institution.uuid} />
+              <CreateMethod initialManagerId={institution.uuid} />
             )
           }
         />
@@ -182,7 +185,7 @@ const getManagedTabs = (
           order={{ createdAt: SortEnumType.Desc }}
           extra={
             institution.managedDataFormats.isAuthorizedToAddEdge && (
-              <CreateDataFormat managerId={institution.uuid} />
+              <CreateDataFormat initialManagerId={institution.uuid} />
             )
           }
         />
@@ -202,7 +205,7 @@ const getManagedTabs = (
           order={{ createdAt: SortEnumType.Desc }}
           extra={
             institution.managedInstitutions.isAuthorizedToAddEdge && (
-              <CreateInstitution managerId={institution.uuid} />
+              <CreateInstitution initialManagerId={institution.uuid} />
             )
           }
         />
@@ -223,7 +226,7 @@ const getManagedTabs = (
           extra={
             institution.openIdConnectApplications.isAuthorizedToAddEdge && (
               <CreateOpenIdConnectApplication
-                institutionId={institution.uuid}
+                initialOwnerId={institution.uuid}
               />
             )
           }
@@ -260,15 +263,15 @@ const getPendingTabs = (
           </>
         ),
       },
-    institution.pendingDevelopedMethods.isAuthorizedToConfirmEdges &&
-      institution.pendingDevelopedMethods.edges.length > 0 && {
+    institution.pendingInstitutionDevelopedMethods.isAuthorizedToConfirmEdges &&
+      institution.pendingInstitutionDevelopedMethods.edges.length > 0 && {
         key: "methods",
         label: "Methods",
         children: (
           <>
             <List
               size="small"
-              dataSource={institution.pendingDevelopedMethods.edges}
+              dataSource={institution.pendingInstitutionDevelopedMethods.edges}
               renderItem={(item) => (
                 <List.Item key={item.node.uuid}>
                   <Link href={paths.method(item.node.uuid)}>
@@ -352,10 +355,11 @@ export default function Institution({ institutionId }: Props) {
   }
 
   return (
-    <>
-      <Card>
+    <div>
+      <Card style={{ marginBottom: "1em" }}>
         <InstitutionSummary entity={institution} />
       </Card>
+      <QueryToolbar query={InstitutionDocument} variables={queryVariables} />
       <Divider />
       {tabs?.main && <LazyTabs items={tabs?.main} />}
       {tabs?.managed && tabs.managed.length > 0 && (
@@ -374,8 +378,6 @@ export default function Institution({ institutionId }: Props) {
           <LazyTabs items={tabs.pending} />
         </>
       )}
-      <Divider />
-      <QueryToolbar query={InstitutionDocument} variables={queryVariables} />
-    </>
+    </div>
   );
 }
diff --git a/frontend/components/institutions/InstitutionIdSelect.tsx b/frontend/components/institutions/InstitutionIdSelect.tsx
index 3d321dba3..8f4d2d223 100644
--- a/frontend/components/institutions/InstitutionIdSelect.tsx
+++ b/frontend/components/institutions/InstitutionIdSelect.tsx
@@ -1,17 +1,8 @@
 import { InstitutionNamesDocument } from "../../queries/institutions.generated";
 import PaginatedIdSelect, { PaginatedSelectProps } from "../PaginatedIdSelect";
 
-export function InstitutionIdSelect({
-  mode,
-  value,
-  onChange,
-}: Omit<PaginatedSelectProps, "query">) {
-  return (
-    <PaginatedIdSelect
-      query={InstitutionNamesDocument}
-      value={value}
-      mode={mode}
-      onChange={onChange}
-    />
-  );
+export default function InstitutionIdSelect(
+  props: Omit<PaginatedSelectProps, "query">,
+) {
+  return <PaginatedIdSelect {...props} query={InstitutionNamesDocument} />;
 }
diff --git a/frontend/components/institutions/InstitutionSummary.tsx b/frontend/components/institutions/InstitutionSummary.tsx
index 3b7efe76a..ee9d43626 100644
--- a/frontend/components/institutions/InstitutionSummary.tsx
+++ b/frontend/components/institutions/InstitutionSummary.tsx
@@ -10,7 +10,7 @@ import ContactInformation from "../ContactInformation";
 import EntityLink from "../entities/EntityLink";
 import EntitySummary from "../entities/EntitySummary";
 import InlineList from "../InlineList";
-import JsonViewer from "../JsonViewer";
+import JsonView from "../JsonView";
 import Manager from "../Manager";
 import DeleteInstitution from "./DeleteInstitution";
 import RemoveInstitutionRepresentative from "./RemoveInstitutionRepresentative";
@@ -113,7 +113,7 @@ export default function InstitutionSummary({
         </div>
       )}
       {"extras" in entity && entity.extras != null && (
-        <JsonViewer data={entity.extras} />
+        <JsonView data={entity.extras} />
       )}
     </EntitySummary>
   );
diff --git a/frontend/components/institutions/RemoveInstitutionRepresentative.tsx b/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
index ea3a9684a..93f96c5c5 100644
--- a/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
+++ b/frontend/components/institutions/RemoveInstitutionRepresentative.tsx
@@ -1,7 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { InstitutionDocument } from "../../queries/institutions.generated";
 import { Scalars } from "../../__generated__/graphql";
-import { UserDocument } from "../../queries/users.generated";
 import {
   RemoveInstitutionRepresentativeDocument,
   RemoveInstitutionRepresentativeMutation,
@@ -22,24 +20,6 @@ export default function RemoveInstitutionRepresentative({
 }: Props) {
   const [removeInstitutionRepresentativeMutation] = useMutation(
     RemoveInstitutionRepresentativeDocument,
-    {
-      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-      // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: InstitutionDocument,
-          variables: {
-            uuid: institutionId,
-          },
-        },
-        {
-          query: UserDocument,
-          variables: {
-            uuid: userId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/institutions/RepresentedInstitutionIdSelect.tsx b/frontend/components/institutions/RepresentedInstitutionIdSelect.tsx
new file mode 100644
index 000000000..e5cd05d44
--- /dev/null
+++ b/frontend/components/institutions/RepresentedInstitutionIdSelect.tsx
@@ -0,0 +1,22 @@
+import { useQuery } from "@apollo/client/react";
+import { CurrentUserDocument } from "../../queries/currentUser.generated";
+import { Select, SelectProps, Space } from "antd";
+import Id from "../Id";
+
+export default function RepresentedInstitutionIdSelect(props: SelectProps) {
+  const currentUser = useQuery(CurrentUserDocument)?.data?.currentUser;
+
+  return (
+    <Select
+      {...props}
+      options={currentUser?.representedInstitutions.edges.map((edge) => ({
+        value: edge.node.id,
+        label: (
+          <Space>
+            {edge.node.name} (<Id value={edge.node.uuid} />)
+          </Space>
+        ),
+      }))}
+    />
+  );
+}
diff --git a/frontend/components/institutions/VerifyInstitution.tsx b/frontend/components/institutions/VerifyInstitution.tsx
index 968e04a61..fcab85c78 100644
--- a/frontend/components/institutions/VerifyInstitution.tsx
+++ b/frontend/components/institutions/VerifyInstitution.tsx
@@ -15,14 +15,7 @@ interface Props {
 
 export default function VerifyInstitution({ institutionId }: Props) {
   const [verifyInstitutionMutation] = useMutation(VerifyInstitutionDocument, {
-    refetchQueries: [
-      {
-        query: InstitutionsDocument,
-      },
-      {
-        query: PendingInstitutionsDocument,
-      },
-    ],
+    refetchQueries: [InstitutionsDocument, PendingInstitutionsDocument],
   });
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/me/ChangeUserEmail.tsx b/frontend/components/me/ChangeUserEmail.tsx
index 64eff998f..7b9df8e20 100644
--- a/frontend/components/me/ChangeUserEmail.tsx
+++ b/frontend/components/me/ChangeUserEmail.tsx
@@ -13,7 +13,7 @@ interface FormValues {
   newEmail: string;
 }
 
-export function ChangeUserEmail() {
+export default function ChangeUserEmail() {
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
   );
diff --git a/frontend/components/me/DeletePersonalUserData.tsx b/frontend/components/me/DeletePersonalUserData.tsx
index d4cd0a9d2..3adc30e4d 100644
--- a/frontend/components/me/DeletePersonalUserData.tsx
+++ b/frontend/components/me/DeletePersonalUserData.tsx
@@ -20,7 +20,7 @@ interface DeletePersonalUserDataProps {
   hasPassword: boolean | null;
 }
 
-export function DeletePersonalUserData({
+export default function DeletePersonalUserData({
   hasPassword,
 }: DeletePersonalUserDataProps) {
   const router = useRouter();
diff --git a/frontend/components/me/EnableUserTwoFactorAuthenticator.tsx b/frontend/components/me/EnableUserTwoFactorAuthenticator.tsx
index a5412e0cd..80ecb8ca9 100644
--- a/frontend/components/me/EnableUserTwoFactorAuthenticator.tsx
+++ b/frontend/components/me/EnableUserTwoFactorAuthenticator.tsx
@@ -19,7 +19,7 @@ interface Props {
   setAuthenticatorUri: Dispatch<SetStateAction<string | null | undefined>>;
 }
 
-export function EnableUserTwoFactorAuthenticator({
+export default function EnableUserTwoFactorAuthenticator({
   setSharedKey,
   setAuthenticatorUri,
 }: Props) {
diff --git a/frontend/components/me/GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri.tsx b/frontend/components/me/GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri.tsx
index 3cccbf302..3f34a0562 100644
--- a/frontend/components/me/GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri.tsx
+++ b/frontend/components/me/GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri.tsx
@@ -13,7 +13,7 @@ interface Props {
   setAuthenticatorUri: Dispatch<SetStateAction<string | null | undefined>>;
 }
 
-export function GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri({
+export default function GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri({
   setSharedKey,
   setAuthenticatorUri,
 }: Props) {
diff --git a/frontend/components/me/ResendUserEmailVerification.tsx b/frontend/components/me/ResendUserEmailVerification.tsx
index eca5bba29..3f219b6e8 100644
--- a/frontend/components/me/ResendUserEmailVerification.tsx
+++ b/frontend/components/me/ResendUserEmailVerification.tsx
@@ -6,7 +6,7 @@ import {
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import { useMutation } from "@apollo/client/react";
 
-export function ResendUserEmailVerification() {
+export default function ResendUserEmailVerification() {
   const { message } = App.useApp();
 
   const [resendUserEmailVerificationMutation] = useMutation(
diff --git a/frontend/components/me/SetUserPhoneNumber.tsx b/frontend/components/me/SetUserPhoneNumber.tsx
index 17474ec84..7a493f2d8 100644
--- a/frontend/components/me/SetUserPhoneNumber.tsx
+++ b/frontend/components/me/SetUserPhoneNumber.tsx
@@ -17,7 +17,9 @@ interface SetUserPhoneNumberProps {
   phoneNumber: string | null | undefined;
 }
 
-export function SetUserPhoneNumber({ phoneNumber }: SetUserPhoneNumberProps) {
+export default function SetUserPhoneNumber({
+  phoneNumber,
+}: SetUserPhoneNumberProps) {
   const { message } = App.useApp();
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
diff --git a/frontend/components/methods/AddInstitutionMethodDeveloper.tsx b/frontend/components/methods/AddInstitutionMethodDeveloper.tsx
index 9b5859cd9..6e52dba42 100644
--- a/frontend/components/methods/AddInstitutionMethodDeveloper.tsx
+++ b/frontend/components/methods/AddInstitutionMethodDeveloper.tsx
@@ -2,8 +2,7 @@ import { useMutation } from "@apollo/client/react";
 import { Form, Button, Space } from "antd";
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
-import { MethodDocument } from "../../queries/methods.generated";
-import { InstitutionIdSelect } from "../institutions/InstitutionIdSelect";
+import InstitutionIdSelect from "../institutions/InstitutionIdSelect";
 import {
   AddInstitutionMethodDeveloperDocument,
   AddInstitutionMethodDeveloperMutation,
@@ -27,18 +26,6 @@ export default function AddInstitutionMethodDeveloper({
 
   const [addInstitutionMethodDeveloperMutation] = useMutation(
     AddInstitutionMethodDeveloperDocument,
-    {
-      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-      // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: MethodDocument,
-          variables: {
-            uuid: methodId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, augmentFormWithErrors } =
diff --git a/frontend/components/methods/AddUserMethodDeveloper.tsx b/frontend/components/methods/AddUserMethodDeveloper.tsx
index e5344714c..633b60949 100644
--- a/frontend/components/methods/AddUserMethodDeveloper.tsx
+++ b/frontend/components/methods/AddUserMethodDeveloper.tsx
@@ -2,8 +2,7 @@ import { useMutation } from "@apollo/client/react";
 import { Form, Button, Space } from "antd";
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
-import { MethodDocument } from "../../queries/methods.generated";
-import { UserIdSelect } from "../users/UserIdSelect";
+import UserIdSelect from "../users/UserIdSelect";
 import {
   AddUserMethodDeveloperDocument,
   AddUserMethodDeveloperMutation,
@@ -27,18 +26,6 @@ export default function AddUserMethodDeveloper({
 
   const [addUserMethodDeveloperMutation] = useMutation(
     AddUserMethodDeveloperDocument,
-    {
-      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-      // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: MethodDocument,
-          variables: {
-            uuid: methodId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, augmentFormWithErrors } =
diff --git a/frontend/components/methods/AppliedMethodViewer.tsx b/frontend/components/methods/AppliedMethodView.tsx
similarity index 89%
rename from frontend/components/methods/AppliedMethodViewer.tsx
rename to frontend/components/methods/AppliedMethodView.tsx
index b2480db12..3fc46adfb 100644
--- a/frontend/components/methods/AppliedMethodViewer.tsx
+++ b/frontend/components/methods/AppliedMethodView.tsx
@@ -1,20 +1,20 @@
 import { Scalars } from "../../__generated__/graphql";
-import dayjs from "dayjs";
 import paths from "../../paths";
 import EntityLink from "../entities/EntityLink";
 import InlineList from "../InlineList";
-import JsonViewer from "../JsonViewer";
+import JsonView from "../JsonView";
 import {
   AppliedMethodPartialFragment,
   ToTreeVertexAppliedConversionMethodPartialFragment,
 } from "../../queries/data.generated";
+import DateTimeX from "../DateTimeX";
 
 const nameFallback = (id: Scalars["Uuid"]["output"]) => ({
   uuid: id,
   name: id,
 });
 
-export default function AppliedMethodViewer({
+export default function AppliedMethodView({
   value,
 }: {
   value:
@@ -36,7 +36,7 @@ export default function AppliedMethodViewer({
             renderItem={(item) => (
               <span>
                 <code>{item.name}</code>=&ldquo;
-                <JsonViewer inline data={item.value} />
+                <JsonView inline data={item.value} />
                 &rdquo;
               </span>
             )}
@@ -55,7 +55,7 @@ export default function AppliedMethodViewer({
                 <EntityLink
                   entity={{
                     uuid: item.value.dataId,
-                    name: `data ${item.value.dataId} in database ${item.value.database?.name ?? item.value.databaseId} at timestamp ${dayjs(item.value.dataTimestamp)}`,
+                    name: `data ${item.value.dataId} in database ${item.value.database?.name ?? item.value.databaseId} at timestamp ${(<DateTimeX value={item.value.dataTimestamp} />)}`,
                   }}
                   route={(id) =>
                     paths.data(item.value.databaseId, item.value.dataKind, id)
diff --git a/frontend/components/methods/ConfirmInstitutionMethodDeveloper.tsx b/frontend/components/methods/ConfirmInstitutionMethodDeveloper.tsx
index e04b1e204..50d822576 100644
--- a/frontend/components/methods/ConfirmInstitutionMethodDeveloper.tsx
+++ b/frontend/components/methods/ConfirmInstitutionMethodDeveloper.tsx
@@ -1,8 +1,6 @@
 import { useMutation } from "@apollo/client/react";
 import { Button } from "antd";
-import { MethodDocument } from "../../queries/methods.generated";
 import { Scalars } from "../../__generated__/graphql";
-import { InstitutionDocument } from "../../queries/institutions.generated";
 import {
   ConfirmInstitutionMethodDeveloperDocument,
   ConfirmInstitutionMethodDeveloperMutation,
@@ -20,24 +18,6 @@ export default function ConfirmInstitutionMethodDeveloper({
 }: Props) {
   const [confirmInstitutionMethodDeveloperMutation] = useMutation(
     ConfirmInstitutionMethodDeveloperDocument,
-    {
-      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-      // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: MethodDocument,
-          variables: {
-            uuid: methodId,
-          },
-        },
-        {
-          query: InstitutionDocument,
-          variables: {
-            uuid: institutionId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/methods/ConfirmUserMethodDeveloper.tsx b/frontend/components/methods/ConfirmUserMethodDeveloper.tsx
index 3b801f2f4..069e6bda2 100644
--- a/frontend/components/methods/ConfirmUserMethodDeveloper.tsx
+++ b/frontend/components/methods/ConfirmUserMethodDeveloper.tsx
@@ -1,8 +1,6 @@
 import { useMutation } from "@apollo/client/react";
 import { Button } from "antd";
-import { MethodDocument } from "../../queries/methods.generated";
 import { Scalars } from "../../__generated__/graphql";
-import { UserDocument } from "../../queries/users.generated";
 import {
   ConfirmUserMethodDeveloperDocument,
   ConfirmUserMethodDeveloperMutation,
@@ -20,24 +18,6 @@ export default function ConfirmUserMethodDeveloper({
 }: Props) {
   const [confirmUserMethodDeveloperMutation] = useMutation(
     ConfirmUserMethodDeveloperDocument,
-    {
-      // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-      // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: MethodDocument,
-          variables: {
-            uuid: methodId,
-          },
-        },
-        {
-          query: UserDocument,
-          variables: {
-            uuid: userId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/methods/CreateMethod.tsx b/frontend/components/methods/CreateMethod.tsx
index 48deda46e..ef6b330fb 100644
--- a/frontend/components/methods/CreateMethod.tsx
+++ b/frontend/components/methods/CreateMethod.tsx
@@ -22,17 +22,17 @@ import {
   MethodSourceInput,
 } from "../../__generated__/graphql";
 import { useState } from "react";
-import { InstitutionDocument } from "../../queries/institutions.generated";
-import { InstitutionIdSelect } from "../institutions/InstitutionIdSelect";
-import { UserIdSelect } from "../users/UserIdSelect";
-import { ReferenceSubform } from "../ReferenceSubform";
+import InstitutionIdSelect from "../institutions/InstitutionIdSelect";
+import UserIdSelect from "../users/UserIdSelect";
+import ReferenceSubform from "../ReferenceSubform";
 import dayjs from "dayjs";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
-import { MethodParametersSubform } from "./MethodParametersSubform";
+import MethodParametersSubform from "./MethodParametersSubform";
 import MethodSummary from "./MethodSummary";
 import NewButton from "../NewButton";
+import RepresentedInstitutionIdSelect from "../institutions/RepresentedInstitutionIdSelect";
 
 type FormValues = {
   name: string;
@@ -52,13 +52,20 @@ type FormValues = {
   categories: MethodCategory[] | null | undefined;
   institutionDeveloperIds: Scalars["Uuid"]["input"][] | null | undefined;
   userDeveloperIds: Scalars["Uuid"]["input"][] | null | undefined;
+  managerId: Scalars["Uuid"]["input"];
 };
 
 interface CreateMethodProps {
-  managerId: Scalars["Uuid"]["input"];
+  initialManagerId: Scalars["Uuid"]["input"];
+  initialInstitutionDeveloperIds?: Scalars["Uuid"]["input"][];
+  initialUserDeveloperIds?: Scalars["Uuid"]["input"][];
 }
 
-export default function CreateMethod({ managerId }: CreateMethodProps) {
+export default function CreateMethod({
+  initialManagerId,
+  initialInstitutionDeveloperIds = [],
+  initialUserDeveloperIds = [],
+}: CreateMethodProps) {
   const [open, setOpen] = useState(false);
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
@@ -69,15 +76,7 @@ export default function CreateMethod({ managerId }: CreateMethodProps) {
   const [createMethodMutation] = useMutation(CreateMethodDocument, {
     // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
     // See https://www.apollographql.com/docs/react/data/mutations/#options
-    refetchQueries: [
-      {
-        query: InstitutionDocument,
-        variables: {
-          uuid: managerId,
-        },
-      },
-      MethodsDocument,
-    ],
+    refetchQueries: [MethodsDocument],
   });
 
   const {
@@ -124,7 +123,7 @@ export default function CreateMethod({ managerId }: CreateMethodProps) {
               parameters: values.parameters,
               sources: values.sources,
               categories: values.categories || [],
-              managerId: managerId,
+              managerId: values.managerId,
               institutionDeveloperIds: values.institutionDeveloperIds || [],
               userDeveloperIds: values.userDeveloperIds || [],
             },
@@ -246,17 +245,25 @@ export default function CreateMethod({ managerId }: CreateMethodProps) {
           <Form.Item
             label="Institution Developers"
             name="institutionDeveloperIds"
-            initialValue={[]}
+            initialValue={initialInstitutionDeveloperIds}
           >
             <InstitutionIdSelect mode="multiple" />
           </Form.Item>
           <Form.Item
             label="User Developers"
             name="userDeveloperIds"
-            initialValue={[]}
+            initialValue={initialUserDeveloperIds}
           >
             <UserIdSelect mode="multiple" />
           </Form.Item>
+          <Form.Item
+            label="Manager"
+            name="managerId"
+            rules={[{ required: true }]}
+            initialValue={initialManagerId}
+          >
+            <RepresentedInstitutionIdSelect />
+          </Form.Item>
           <Divider />
           <ReferenceSubform form={form} namespace={["reference"]} />
           <Form.Item {...tailLayout}>
diff --git a/frontend/components/methods/Method.tsx b/frontend/components/methods/Method.tsx
index a67207397..18d1b175a 100644
--- a/frontend/components/methods/Method.tsx
+++ b/frontend/components/methods/Method.tsx
@@ -1,7 +1,7 @@
 import { useQuery } from "@apollo/client/react";
 import { Scalars } from "../../__generated__/graphql";
 import { MethodDocument } from "../../queries/methods.generated";
-import { Skeleton, Result, Card, Divider } from "antd";
+import { Skeleton, Result, Card } from "antd";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import MethodSummary from "./MethodSummary";
 import QueryToolbar from "../QueryToolbar";
@@ -35,10 +35,11 @@ export default function Method({ methodId }: MethodProps) {
   }
 
   return (
-    <Card>
-      <MethodSummary entity={method} />
-      <Divider />
+    <div>
+      <Card style={{ marginBottom: "1em" }}>
+        <MethodSummary entity={method} />
+      </Card>
       <QueryToolbar query={MethodDocument} variables={queryVariables} />
-    </Card>
+    </div>
   );
 }
diff --git a/frontend/components/methods/MethodParametersSubform.tsx b/frontend/components/methods/MethodParametersSubform.tsx
index 8e8713eec..62fd2567e 100644
--- a/frontend/components/methods/MethodParametersSubform.tsx
+++ b/frontend/components/methods/MethodParametersSubform.tsx
@@ -9,7 +9,7 @@ export type MethodParametersSubformProps = {
   namespace: string[];
 };
 
-export function MethodParametersSubform({
+export default function MethodParametersSubform({
   initialValue,
   namespace,
 }: MethodParametersSubformProps) {
diff --git a/frontend/components/methods/MethodSourcesSubform.tsx b/frontend/components/methods/MethodSourcesSubform.tsx
index 97a141a69..387c89378 100644
--- a/frontend/components/methods/MethodSourcesSubform.tsx
+++ b/frontend/components/methods/MethodSourcesSubform.tsx
@@ -9,7 +9,7 @@ export type MethodSourcesSubformProps = {
   namespace: string[];
 };
 
-export function MethodSourcesSubform({
+export default function MethodSourcesSubform({
   initialValue,
   namespace,
 }: MethodSourcesSubformProps) {
diff --git a/frontend/components/methods/MethodSummary.tsx b/frontend/components/methods/MethodSummary.tsx
index 02aa64bb1..870892ca7 100644
--- a/frontend/components/methods/MethodSummary.tsx
+++ b/frontend/components/methods/MethodSummary.tsx
@@ -4,7 +4,7 @@ import paths from "../../paths";
 import Manager from "../Manager";
 import OpenEndedDateTimeRangeX from "../OpenEndedDateTimeRangeX";
 import EntitySummary from "../entities/EntitySummary";
-import { Reference } from "../Reference";
+import Reference from "../Reference";
 import UpdateMethod from "./UpdateMethod";
 import {
   MethodPartialFragment,
@@ -17,7 +17,7 @@ import RemoveUserMethodDeveloper from "./RemoveUserMethodDeveloper";
 import AddInstitutionMethodDeveloper from "./AddInstitutionMethodDeveloper";
 import AddUserMethodDeveloper from "./AddUserMethodDeveloper";
 import { Scalars } from "../../__generated__/graphql";
-import JsonViewer from "../JsonViewer";
+import JsonView from "../JsonView";
 import EnumTag from "../EnumTag";
 
 const renderDeveloperList = (
@@ -108,8 +108,8 @@ export default function MethodSummary({
                 items={entity.parameters}
                 renderItem={(item) => (
                   <span key={item.name}>
-                    &ldquo;{item.name}&rdquo; of type{" "}
-                    <JsonViewer inline data={item.type} />
+                    <code>{item.name}</code> of type{" "}
+                    <JsonView inline data={item.type} />
                   </span>
                 )}
               />
diff --git a/frontend/components/methods/RemoveInstitutionMethodDeveloper.tsx b/frontend/components/methods/RemoveInstitutionMethodDeveloper.tsx
index 977ba8c35..d7f111540 100644
--- a/frontend/components/methods/RemoveInstitutionMethodDeveloper.tsx
+++ b/frontend/components/methods/RemoveInstitutionMethodDeveloper.tsx
@@ -1,10 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import {
-  MethodDocument,
-  MethodsDocument,
-} from "../../queries/methods.generated";
 import { Scalars } from "../../__generated__/graphql";
-import { InstitutionDocument } from "../../queries/institutions.generated";
 import {
   RemoveInstitutionMethodDeveloperDocument,
   RemoveInstitutionMethodDeveloperMutation,
@@ -23,25 +18,6 @@ export default function RemoveInstitutionMethodDeveloper({
 }: Props) {
   const [removeInstitutionMethodDeveloperMutation] = useMutation(
     RemoveInstitutionMethodDeveloperDocument,
-    {
-      refetchQueries: [
-        {
-          query: MethodsDocument,
-        },
-        {
-          query: MethodDocument,
-          variables: {
-            uuid: methodId,
-          },
-        },
-        {
-          query: InstitutionDocument,
-          variables: {
-            uuid: institutionId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/methods/RemoveUserMethodDeveloper.tsx b/frontend/components/methods/RemoveUserMethodDeveloper.tsx
index b4063ddf2..46e8dfcae 100644
--- a/frontend/components/methods/RemoveUserMethodDeveloper.tsx
+++ b/frontend/components/methods/RemoveUserMethodDeveloper.tsx
@@ -1,10 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import {
-  MethodDocument,
-  MethodsDocument,
-} from "../../queries/methods.generated";
 import { Scalars } from "../../__generated__/graphql";
-import { UserDocument } from "../../queries/users.generated";
 import {
   RemoveUserMethodDeveloperDocument,
   RemoveUserMethodDeveloperMutation,
@@ -25,25 +20,6 @@ export default function RemoveUserMethodDeveloper({
 }: Props) {
   const [removeUserMethodDeveloperMutation] = useMutation(
     RemoveUserMethodDeveloperDocument,
-    {
-      refetchQueries: [
-        {
-          query: MethodsDocument,
-        },
-        {
-          query: MethodDocument,
-          variables: {
-            uuid: methodId,
-          },
-        },
-        {
-          query: UserDocument,
-          variables: {
-            uuid: userId,
-          },
-        },
-      ],
-    },
   );
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/methods/UpdateMethod.tsx b/frontend/components/methods/UpdateMethod.tsx
index 2f8936ece..8ddf499e6 100644
--- a/frontend/components/methods/UpdateMethod.tsx
+++ b/frontend/components/methods/UpdateMethod.tsx
@@ -13,13 +13,13 @@ import {
   MethodSourceInput,
 } from "../../__generated__/graphql";
 import { useState } from "react";
-import { ReferenceSubform } from "../ReferenceSubform";
+import ReferenceSubform from "../ReferenceSubform";
 import dayjs from "dayjs";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
-import { MethodParametersSubform } from "./MethodParametersSubform";
-import { MethodSourcesSubform } from "./MethodSourcesSubform";
+import MethodParametersSubform from "./MethodParametersSubform";
+import MethodSourcesSubform from "./MethodSourcesSubform";
 import EditButton from "../EditButton";
 
 type FormValues = {
diff --git a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
index 0061d7852..94759299c 100644
--- a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
@@ -15,7 +15,6 @@ import {
   Modal,
   Divider,
 } from "antd";
-import { ExclamationCircleTwoTone } from "@ant-design/icons";
 import {
   OpenIdConnectConsentType,
   OpenIdConnectEndpoint,
@@ -25,7 +24,6 @@ import {
   OpenIdConnectRequirement,
   Scalars,
 } from "../../../__generated__/graphql";
-import { InstitutionDocument } from "../../../queries/institutions.generated";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
 import { layout, tailLayout } from "../../../lib/form";
 import ErrorAlert from "../../ErrorAlert";
@@ -33,7 +31,8 @@ import NewButton from "../../NewButton";
 import OpenIdConnectApplicationSummary from "./OpenIdConnectApplicationSummary";
 import EntityLink from "../../entities/EntityLink";
 import paths from "../../../paths";
-import CodeViewer from "../../CodeViewer";
+import CodeView from "../../CodeView";
+import RepresentedInstitutionIdSelect from "../../institutions/RepresentedInstitutionIdSelect";
 
 type FormValues = {
   clientId: string;
@@ -45,14 +44,15 @@ type FormValues = {
   grantTypes: OpenIdConnectGrantType[];
   responseTypes: OpenIdConnectResponseType[];
   scopes: OpenIdConnectScope[];
+  ownerId: Scalars["Uuid"]["input"];
 };
 
 interface CreateApplicationProps {
-  institutionId: Scalars["Uuid"]["input"];
+  initialOwnerId: Scalars["Uuid"]["input"];
 }
 
 export default function CreateOpenIdConnectApplication({
-  institutionId,
+  initialOwnerId,
 }: CreateApplicationProps) {
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
@@ -64,15 +64,7 @@ export default function CreateOpenIdConnectApplication({
   const [createApplicationMutation] = useMutation(CreateApplicationDocument, {
     // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
     // See https://www.apollographql.com/docs/react/data/mutations/#options
-    refetchQueries: [
-      {
-        query: InstitutionDocument,
-        variables: {
-          uuid: institutionId,
-        },
-      },
-      ApplicationsDocument,
-    ],
+    refetchQueries: [ApplicationsDocument],
   });
 
   const {
@@ -90,7 +82,7 @@ export default function CreateOpenIdConnectApplication({
         createApplicationMutation({
           variables: {
             input: {
-              institutionId: institutionId,
+              institutionId: values.ownerId,
               clientId: values.clientId,
               displayName: values.displayName,
               consentType: values.consentType,
@@ -124,13 +116,10 @@ export default function CreateOpenIdConnectApplication({
               },
               description: (
                 <div>
-                  <OpenIdConnectApplicationSummary hideExtra entity={model} />
-                  <Divider />
                   <Typography.Paragraph style={{ maxWidth: "75ch" }}>
-                    <ExclamationCircleTwoTone twoToneColor="#f9b02e" /> Please
-                    copy and save the following client secret now, you will not
-                    be able to access it later
-                    <CodeViewer
+                    Please copy and save the following client secret now, you
+                    will not be able to access it later
+                    <CodeView
                       code={data.createOpenIdConnectApplication.clientSecret}
                     />
                     Should you forget it, you may reset it on{" "}
@@ -140,6 +129,8 @@ export default function CreateOpenIdConnectApplication({
                     />
                     .
                   </Typography.Paragraph>
+                  <Divider />
+                  <OpenIdConnectApplicationSummary hideExtra entity={model} />
                 </div>
               ),
             });
@@ -292,6 +283,14 @@ export default function CreateOpenIdConnectApplication({
               )}
             />
           </Form.Item>
+          <Form.Item
+            label="Owner"
+            name="ownerId"
+            rules={[{ required: true }]}
+            initialValue={initialOwnerId}
+          >
+            <RepresentedInstitutionIdSelect />
+          </Form.Item>
           <Form.Item {...tailLayout}>
             <Button type="primary" htmlType="submit" loading={mutating}>
               Create
diff --git a/frontend/components/openIdConnect/applications/DeleteOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/DeleteOpenIdConnectApplication.tsx
index 6c2399985..c1c478fb3 100644
--- a/frontend/components/openIdConnect/applications/DeleteOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/DeleteOpenIdConnectApplication.tsx
@@ -1,6 +1,5 @@
 import { useMutation } from "@apollo/client/react";
 import {
-  ApplicationDocument,
   ApplicationsDocument,
   DeleteApplicationDocument,
   DeleteApplicationMutation,
@@ -25,17 +24,7 @@ export default function DeleteOpenIdConnectApplication({
   const [deleteApplicationMutation] = useMutation(DeleteApplicationDocument, {
     // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
     // See https://www.apollographql.com/docs/react/data/mutations/#options
-    refetchQueries: [
-      {
-        query: ApplicationsDocument,
-      },
-      {
-        query: ApplicationDocument,
-        variables: {
-          uuid: applicationId,
-        },
-      },
-    ],
+    refetchQueries: [ApplicationsDocument],
   });
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
index fd3cc6351..a490d0150 100644
--- a/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
@@ -38,10 +38,11 @@ export default function OpenIdConnectApplication({ applicationId }: Props) {
   }
 
   return (
-    <>
-      <Card>
+    <div>
+      <Card style={{ marginBottom: "1em" }}>
         <OpenIdConnectApplicationSummary entity={application} />
       </Card>
+      <QueryToolbar query={ApplicationDocument} variables={queryVariables} />
       <Divider />
       <LazyTabs
         items={[
@@ -77,8 +78,6 @@ export default function OpenIdConnectApplication({ applicationId }: Props) {
           },
         ]}
       />
-      <Divider />
-      <QueryToolbar query={ApplicationDocument} variables={queryVariables} />
-    </>
+    </div>
   );
 }
diff --git a/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx b/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
index d1396606e..1a637e7a8 100644
--- a/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
+++ b/frontend/components/openIdConnect/applications/ResetOpenIdConnectApplicationClientSecret.tsx
@@ -7,7 +7,7 @@ import {
 import { Scalars } from "../../../__generated__/graphql";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
 import SafeDeleteButton from "../../SafeDeleteButton";
-import CodeViewer from "../../CodeViewer";
+import CodeView from "../../CodeView";
 
 interface ResetApplicationClientSecretProps {
   applicationId: Scalars["Uuid"]["input"];
@@ -51,7 +51,7 @@ export default function ResetOpenIdConnectApplicationClientSecret({
                 <Typography.Paragraph style={{ maxWidth: "75ch" }}>
                   Please copy and save the following client secret now, you will
                   not be able to access it later
-                  <CodeViewer
+                  <CodeView
                     code={
                       data.resetOpenIdConnectApplicationClientSecret
                         .clientSecret
diff --git a/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx b/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx
index 9a7d833c6..8ec7e7019 100644
--- a/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx
+++ b/frontend/components/openIdConnect/authorizations/DeleteOpenIdConnectAuthorization.tsx
@@ -1,6 +1,5 @@
 import { useMutation } from "@apollo/client/react";
 import {
-  ApplicationDocument,
   AuthorizationsDocument,
   DeleteAuthorizationDocument,
   DeleteAuthorizationMutation,
@@ -11,27 +10,17 @@ import SafeDeleteButton from "../../SafeDeleteButton";
 
 interface DeleteAuthorizationProps {
   authorizationId: Scalars["Uuid"]["input"];
-  applicationId: Scalars["Uuid"]["input"];
 }
 
 export default function DeleteOpenIdConnectAuthorization({
   authorizationId,
-  applicationId,
 }: DeleteAuthorizationProps) {
   const [deleteAuthorizationMutation] = useMutation(
     DeleteAuthorizationDocument,
     {
       // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
       // See https://www.apollographql.com/docs/react/data/mutations/#options
-      refetchQueries: [
-        {
-          query: ApplicationDocument,
-          variables: {
-            uuid: applicationId,
-          },
-        },
-        AuthorizationsDocument,
-      ],
+      refetchQueries: [AuthorizationsDocument],
     },
   );
 
diff --git a/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx
index 4b1081266..a4e8b3127 100644
--- a/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx
+++ b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx
@@ -3,6 +3,10 @@ import { Tag } from "antd";
 import { isTruthy } from "../../../lib/array";
 import EntitySummary from "../../entities/EntitySummary";
 import DeleteOpenIdConnectAuthorization from "./DeleteOpenIdConnectAuthorization";
+import { humanize } from "../../../lib/string";
+import DateTimeX from "../../DateTimeX";
+import paths from "../../../paths";
+import EntityLink from "../../entities/EntityLink";
 
 export default function OpenIdConnectAuthorizationSummary({
   entity,
@@ -11,6 +15,13 @@ export default function OpenIdConnectAuthorizationSummary({
   entity: OpenIdConnectAuthorizationsPartialFragment;
   hideExtra?: boolean;
 }) {
+  const dateTimes = [
+    entity.createdAt && {
+      key: "createdAt",
+      value: entity.createdAt,
+    },
+  ].filter(isTruthy);
+
   return (
     <EntitySummary
       entity={entity}
@@ -22,16 +33,25 @@ export default function OpenIdConnectAuthorizationSummary({
         !hideExtra &&
         [
           entity.isAuthorizedToDeleteNode && (
-            <DeleteOpenIdConnectAuthorization
-              authorizationId={entity.uuid}
-              applicationId={entity.application.node.uuid}
-            />
+            <DeleteOpenIdConnectAuthorization authorizationId={entity.uuid} />
           ),
         ].filter(isTruthy)
       }
     >
-      <div>Subject {entity.subject}</div>
-      <div>Created At {entity.createdAt}</div>
+      {entity.subject && (
+        <div>
+          Subject <EntityLink entity={entity.subject} route={paths.user} />
+        </div>
+      )}
+      {dateTimes.length > 0 && (
+        <div>
+          {dateTimes.map((x) => (
+            <div key={x.key}>
+              {humanize(x.key, "all-upper")} <DateTimeX value={x.value} />
+            </div>
+          ))}
+        </div>
+      )}
     </EntitySummary>
   );
 }
diff --git a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx
index 38271479a..0bc16a3ee 100644
--- a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx
+++ b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx
@@ -4,6 +4,9 @@ import { isTruthy } from "../../../lib/array";
 import EntitySummary from "../../entities/EntitySummary";
 import RevokeOpenIdConnectToken from "./RevokeOpenIdConnectToken";
 import { humanize } from "../../../lib/string";
+import DateTimeX from "../../DateTimeX";
+import paths from "../../../paths";
+import EntityLink from "../../entities/EntityLink";
 
 export default function OpenIdConnectTokenSummary({
   entity,
@@ -12,20 +15,39 @@ export default function OpenIdConnectTokenSummary({
   entity: OpenIdConnectTokensPartialFragment;
   hideExtra?: boolean;
 }) {
+  const associates = [
+    entity.subject && (
+      <div>
+        Subject{" "}
+        <EntityLink
+          entity={entity.subject}
+          route={
+            entity.subject.__typename == "User"
+              ? paths.user
+              : paths.openIdConnectApplication
+          }
+        />
+      </div>
+    ),
+    entity.authorization && (
+      <div>Authorization {entity.authorization.node.uuid}</div>
+    ),
+  ].filter(isTruthy);
+
   const dateTimes = [
-    {
+    entity.createdAt && {
       key: "createdAt",
       value: entity.createdAt,
     },
-    {
+    entity.expiredAt && {
       key: "expiredAt",
       value: entity.expiredAt,
     },
-    {
+    entity.redeemedAt && {
       key: "redeemedAt",
       value: entity.redeemedAt,
     },
-  ].filter((x) => x.value != null);
+  ].filter(isTruthy);
 
   return (
     <EntitySummary
@@ -38,20 +60,17 @@ export default function OpenIdConnectTokenSummary({
         !hideExtra &&
         [
           entity.isAuthorizedToRevokeNode && (
-            <RevokeOpenIdConnectToken
-              tokenId={entity.uuid}
-              applicationId={entity.application.node.uuid}
-            />
+            <RevokeOpenIdConnectToken tokenId={entity.uuid} />
           ),
         ].filter(isTruthy)
       }
     >
-      <div>Subject {entity.subject}</div>
+      {associates.length > 0 && <div>{associates}</div>}
       {dateTimes.length > 0 && (
         <div>
           {dateTimes.map((x) => (
             <div key={x.key}>
-              {humanize(x.key, "all-upper")} {x.value}
+              {humanize(x.key, "all-upper")} <DateTimeX value={x.value} />
             </div>
           ))}
         </div>
diff --git a/frontend/components/openIdConnect/tokens/RevokeOpenIdConnectToken.tsx b/frontend/components/openIdConnect/tokens/RevokeOpenIdConnectToken.tsx
index 95a97a62f..08395e486 100644
--- a/frontend/components/openIdConnect/tokens/RevokeOpenIdConnectToken.tsx
+++ b/frontend/components/openIdConnect/tokens/RevokeOpenIdConnectToken.tsx
@@ -1,6 +1,5 @@
 import { useMutation } from "@apollo/client/react";
 import {
-  ApplicationDocument,
   RevokeTokenDocument,
   RevokeTokenMutation,
   TokensDocument,
@@ -11,25 +10,15 @@ import DeleteButton from "../../DeleteButton";
 
 interface RevokeTokenProps {
   tokenId: Scalars["Uuid"]["input"];
-  applicationId: Scalars["Uuid"]["input"];
 }
 
 export default function RevokeOpenIdConnectToken({
   tokenId,
-  applicationId,
 }: RevokeTokenProps) {
   const [revokeTokenMutation] = useMutation(RevokeTokenDocument, {
     // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
     // See https://www.apollographql.com/docs/react/data/mutations/#options
-    refetchQueries: [
-      {
-        query: ApplicationDocument,
-        variables: {
-          uuid: applicationId,
-        },
-      },
-      TokensDocument,
-    ],
+    refetchQueries: [TokensDocument],
   });
 
   const { mutating, withMutationHandler, messageErrors } =
@@ -54,7 +43,7 @@ export default function RevokeOpenIdConnectToken({
   };
 
   return (
-    <DeleteButton deleting={mutating} onClick={mutate}>
+    <DeleteButton type="default" deleting={mutating} onClick={mutate}>
       Revoke
     </DeleteButton>
   );
diff --git a/frontend/components/users/AddUserRole.tsx b/frontend/components/users/AddUserRole.tsx
index aaab2262a..6e7c57513 100644
--- a/frontend/components/users/AddUserRole.tsx
+++ b/frontend/components/users/AddUserRole.tsx
@@ -1,7 +1,5 @@
 import { useMutation } from "@apollo/client/react";
 import {
-  UserDocument,
-  UsersDocument,
   AddUserRoleDocument,
   AddUserRoleMutation,
 } from "../../queries/users.generated";
@@ -24,19 +22,7 @@ export default function AddUserRole({ userId, roles }: AddUserRoleProps) {
   );
   const [form] = Form.useForm<FormValues>();
 
-  const [addUserRoleMutation] = useMutation(AddUserRoleDocument, {
-    // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
-    // See https://www.apollographql.com/docs/react/data/mutations/#options
-    refetchQueries: [
-      {
-        query: UsersDocument,
-      },
-      {
-        query: UserDocument,
-        variables: { uuid: userId },
-      },
-    ],
-  });
+  const [addUserRoleMutation] = useMutation(AddUserRoleDocument);
 
   const { mutating, withMutationHandler, augmentFormWithErrors } =
     useMutationHandler<AddUserRoleMutation>({
diff --git a/frontend/components/users/DeleteUser.tsx b/frontend/components/users/DeleteUser.tsx
index 8e290bfe7..97518649d 100644
--- a/frontend/components/users/DeleteUser.tsx
+++ b/frontend/components/users/DeleteUser.tsx
@@ -18,11 +18,7 @@ export default function DeleteUser({ userId }: DeleteUserProps) {
   const router = useRouter();
 
   const [deleteUserMutation] = useMutation(DeleteUserDocument, {
-    refetchQueries: [
-      {
-        query: UsersDocument,
-      },
-    ],
+    refetchQueries: [UsersDocument],
   });
 
   const { mutating, withMutationHandler, messageErrors } =
diff --git a/frontend/components/users/User.tsx b/frontend/components/users/User.tsx
index 03986ecb7..ec4014f77 100644
--- a/frontend/components/users/User.tsx
+++ b/frontend/components/users/User.tsx
@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client/react";
-import { Skeleton, Result, Card, Flex, Divider, Typography, Space } from "antd";
+import { Skeleton, Result, Card, Flex, Typography, Space, Divider } from "antd";
 import { UserDocument } from "../../queries/users.generated";
 import { Scalars } from "../../__generated__/graphql";
 import paths from "../../paths";
@@ -75,14 +75,14 @@ export default function User({ userId }: UserProps) {
           />
         </div>
       ),
-    user.pendingDevelopedMethods != null &&
-      user.pendingDevelopedMethods.isAuthorizedToConfirmEdges &&
-      user.pendingDevelopedMethods.edges.length > 0 && (
+    user.pendingUserDevelopedMethods != null &&
+      user.pendingUserDevelopedMethods.isAuthorizedToConfirmEdges &&
+      user.pendingUserDevelopedMethods.edges.length > 0 && (
         <div>
           The developers of the following methods asked to add you as a
           developer. Confirm or deny their request:{" "}
           <InlineList
-            items={user.pendingDevelopedMethods.edges}
+            items={user.pendingUserDevelopedMethods.edges}
             renderItem={(edge) => (
               <Space key={edge.node.uuid}>
                 <EntityLink entity={edge.node} route={paths.method} />
@@ -106,19 +106,20 @@ export default function User({ userId }: UserProps) {
   ].filter(isTruthy);
 
   return (
-    <Card>
-      <UserSummary entity={user} />
-      {pending.length > 0 && (
-        <>
-          <Divider />
-          <Typography.Title level={4}>Pending</Typography.Title>
-          <Flex vertical gap="medium">
-            {pending}
-          </Flex>
-        </>
-      )}
-      <Divider />
+    <div>
+      <Card style={{ marginBottom: "1em" }}>
+        <UserSummary entity={user} />
+        {pending.length > 0 && (
+          <>
+            <Divider />
+            <Typography.Title level={4}>Pending</Typography.Title>
+            <Flex vertical gap="medium">
+              {pending}
+            </Flex>
+          </>
+        )}
+      </Card>
       <QueryToolbar query={UserDocument} variables={queryVariables} />
-    </Card>
+    </div>
   );
 }
diff --git a/frontend/components/users/UserIdSelect.tsx b/frontend/components/users/UserIdSelect.tsx
index ab8ee4bc8..fcceb5a43 100644
--- a/frontend/components/users/UserIdSelect.tsx
+++ b/frontend/components/users/UserIdSelect.tsx
@@ -1,17 +1,8 @@
 import { UserNamesDocument } from "../../queries/users.generated";
 import PaginatedIdSelect, { PaginatedSelectProps } from "../PaginatedIdSelect";
 
-export function UserIdSelect({
-  mode,
-  value,
-  onChange,
-}: Omit<PaginatedSelectProps, "query">) {
-  return (
-    <PaginatedIdSelect
-      query={UserNamesDocument}
-      value={value}
-      mode={mode}
-      onChange={onChange}
-    />
-  );
+export default function UserIdSelect(
+  props: Omit<PaginatedSelectProps, "query">,
+) {
+  return <PaginatedIdSelect {...props} query={UserNamesDocument} />;
 }
diff --git a/frontend/components/users/UserRoleTag.tsx b/frontend/components/users/UserRoleTag.tsx
index 0b3f35c91..21fc86fd2 100644
--- a/frontend/components/users/UserRoleTag.tsx
+++ b/frontend/components/users/UserRoleTag.tsx
@@ -3,8 +3,6 @@ import { Scalars, UserRole } from "../../__generated__/graphql";
 import {
   RemoveUserRoleDocument,
   RemoveUserRoleMutation,
-  UserDocument,
-  UsersDocument,
 } from "../../queries/users.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import SafeDeleteButton from "../SafeDeleteButton";
@@ -16,20 +14,8 @@ interface Props {
   canRemove: boolean;
 }
 
-export function UserRoleTag({ userId, role, canRemove }: Props) {
-  const [removeUserRoleMutation] = useMutation(RemoveUserRoleDocument, {
-    refetchQueries: [
-      {
-        query: UsersDocument,
-      },
-      {
-        query: UserDocument,
-        variables: {
-          uuid: userId,
-        },
-      },
-    ],
-  });
+export default function UserRoleTag({ userId, role, canRemove }: Props) {
+  const [removeUserRoleMutation] = useMutation(RemoveUserRoleDocument);
 
   const { mutating, withMutationHandler, messageErrors } =
     useMutationHandler<RemoveUserRoleMutation>({
diff --git a/frontend/components/users/UserSummary.tsx b/frontend/components/users/UserSummary.tsx
index 1030956b1..a4302f8a9 100644
--- a/frontend/components/users/UserSummary.tsx
+++ b/frontend/components/users/UserSummary.tsx
@@ -3,7 +3,7 @@ import {
   UsersPartialFragment,
 } from "../../queries/users.generated";
 import paths from "../../paths";
-import { UserRoleTag } from "./UserRoleTag";
+import UserRoleTag from "./UserRoleTag";
 import InlineList from "../InlineList";
 import EntityLink from "../entities/EntityLink";
 import ContactInformation from "../ContactInformation";
@@ -89,13 +89,13 @@ export default function UserSummary({
           />
         </div>
       )}
-      {"developedMethods" in entity &&
-        entity.developedMethods.edges.length > 0 && (
+      {"userDevelopedMethods" in entity &&
+        entity.userDevelopedMethods.edges.length > 0 && (
           <div>
             Developed the{" "}
-            {pluralize(entity.developedMethods.edges.length, "method")}{" "}
+            {pluralize(entity.userDevelopedMethods.edges.length, "method")}{" "}
             <InlineList
-              items={entity.developedMethods.edges}
+              items={entity.userDevelopedMethods.edges}
               renderItem={(item) => (
                 <EntityLink
                   key={item.node.id}
diff --git a/frontend/lib/array.ts b/frontend/lib/array.ts
index a4baa96a4..df06a85e7 100644
--- a/frontend/lib/array.ts
+++ b/frontend/lib/array.ts
@@ -18,6 +18,16 @@ export function isMember<T extends string>(
   return array.includes(value as T);
 }
 
+export const intersperse = (
+  array: React.ReactNode[],
+  separator: string,
+): React.ReactNode[] =>
+  array.reduce(
+    (accumulator: React.ReactNode[], currrent, index) =>
+      index === 0 ? [currrent] : [...accumulator, separator, currrent],
+    [],
+  );
+
 /**
  * Unwraps T if T is an array, otherwise becomes `never`.
  * When applied to a union like `A[] | B[]`, it results in `A | B`.
diff --git a/frontend/lib/hooks/usePaginatedQuery.ts b/frontend/lib/hooks/usePaginatedQuery.ts
index dd7c585c6..b6ad482a3 100644
--- a/frontend/lib/hooks/usePaginatedQuery.ts
+++ b/frontend/lib/hooks/usePaginatedQuery.ts
@@ -55,9 +55,10 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
   const { loading, error, data, fetchMore, refetch } = useQuery(queryDocument, {
     variables,
     notifyOnNetworkStatusChange: true,
+    errorPolicy: "ignore",
   });
   if (error) {
-    console.error(error);
+    console.error("Paginated query failed", error);
   }
 
   // Reset: If where OR order change, jump back to page 1
@@ -98,11 +99,15 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
         where: where,
         order: order,
       };
-      fetchMore({ variables }).then(() => {
-        setCurrentPage((previous) => previous + 1);
-        setAfterCursors((previous) => [...previous, endCursor]);
-        onQueryVariablesChange(variables);
-      });
+      fetchMore({ variables, errorPolicy: "ignore" })
+        .then(() => {
+          setCurrentPage((previous) => previous + 1);
+          setAfterCursors((previous) => [...previous, endCursor]);
+          onQueryVariablesChange(variables);
+        })
+        .catch((error) => {
+          console.error("Fetching next page failed", error);
+        });
     } else if (!isLastPageInMemory) {
       setCurrentPage(currentPage + 1);
       onQueryVariablesChange({
@@ -120,11 +125,15 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
       where: where,
       order: order,
     };
-    refetch(variables).then(() => {
-      setCurrentPage(1);
-      setAfterCursors([null]);
-      onQueryVariablesChange(variables);
-    });
+    refetch(variables)
+      .then(() => {
+        setCurrentPage(1);
+        setAfterCursors([null]);
+        onQueryVariablesChange(variables);
+      })
+      .catch((error) => {
+        console.error("Changing page size failed", error);
+      });
   };
 
   return {
diff --git a/frontend/lib/string.ts b/frontend/lib/string.ts
index ad25e6ca0..9daf89af0 100644
--- a/frontend/lib/string.ts
+++ b/frontend/lib/string.ts
@@ -1,5 +1,5 @@
 export const uuidRegex =
-  /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+  /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 
 export const isUuid = <T extends string>(value: T) => uuidRegex.test(value);
 
diff --git a/frontend/package.json b/frontend/package.json
index c52305c5e..7586728be 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -43,7 +43,7 @@
     "@types/react-highlight-words": "^0.20.0",
     "@types/react-test-renderer": "^19.1.0",
     "babel-jest": "^30.2.0",
-    "baseline-browser-mapping": "^2.10.27",
+    "baseline-browser-mapping": "^2.10.28",
     "concurrently": "^9.2.1",
     "deepmerge": "^4.0",
     "eslint": "^10.1.0",
diff --git a/frontend/pages/institutions/create.tsx b/frontend/pages/institutions/create.tsx
index e27864824..16d89123c 100644
--- a/frontend/pages/institutions/create.tsx
+++ b/frontend/pages/institutions/create.tsx
@@ -20,7 +20,7 @@ function Page() {
       <Row justify="center">
         <Col>
           <Card title="Create">
-            <CreateInstitution ownerIds={[currentUser.uuid]} />
+            <CreateInstitution initialOwnerId={currentUser.uuid} />
           </Card>
         </Col>
       </Row>
diff --git a/frontend/pages/institutions/index.tsx b/frontend/pages/institutions/index.tsx
index 9a9b9ba42..355da7b2f 100644
--- a/frontend/pages/institutions/index.tsx
+++ b/frontend/pages/institutions/index.tsx
@@ -24,7 +24,7 @@ export default function Page() {
       <PaginatedInstitutions
         showJump
         extra={
-          currentUser && <CreateInstitution ownerIds={[currentUser.uuid]} />
+          currentUser && <CreateInstitution initialOwnerId={currentUser.uuid} />
         }
       />
       <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
diff --git a/frontend/pages/me/manage/email.tsx b/frontend/pages/me/manage/email.tsx
index 2fc5b25ff..c577d36a2 100644
--- a/frontend/pages/me/manage/email.tsx
+++ b/frontend/pages/me/manage/email.tsx
@@ -1,7 +1,7 @@
 import { Typography, Skeleton } from "antd";
 import ManageLayout from "../../../components/me/ManageLayout";
-import { ChangeUserEmail } from "../../../components/me/ChangeUserEmail";
-import { ResendUserEmailVerification } from "../../../components/me/ResendUserEmailVerification";
+import ChangeUserEmail from "../../../components/me/ChangeUserEmail";
+import ResendUserEmailVerification from "../../../components/me/ResendUserEmailVerification";
 import { useRequireAuth } from "../../../lib/hooks/useRequireAuth";
 import paths from "../../../paths";
 
@@ -19,14 +19,23 @@ function Page() {
   return (
     <ManageLayout>
       <Typography.Paragraph style={{ maxWidth: "75ch" }}>
-        Your current email address is {currentUser.contact.emailAddress}.
-        {!currentUser.contact.isEmailAddressConfirmed && (
-          <>
-            Please verify it by following the verification link in the
-            verification email you received. If you didn&apos;t receive a
-            verification email, click the following button to resend it:{" "}
-            <ResendUserEmailVerification />
-          </>
+        {currentUser.contact && [
+          currentUser.contact.emailAddress && (
+            <>
+              Your current email address is {currentUser.contact.emailAddress}.
+            </>
+          ),
+          !currentUser.contact.isEmailAddressConfirmed && (
+            <>
+              Please verify it by following the verification link in the
+              verification email you received. If you didn&apos;t receive a
+              verification email, click the following button to resend it:{" "}
+              <ResendUserEmailVerification />
+            </>
+          ),
+        ]}
+        {!currentUser.contact && (
+          <>We don't have any contact information about you.</>
         )}
       </Typography.Paragraph>
       <ChangeUserEmail />
diff --git a/frontend/pages/me/manage/enable-authenticator.tsx b/frontend/pages/me/manage/enable-authenticator.tsx
index 9695fa489..57a5bf643 100644
--- a/frontend/pages/me/manage/enable-authenticator.tsx
+++ b/frontend/pages/me/manage/enable-authenticator.tsx
@@ -1,8 +1,8 @@
 import ManageLayout from "../../../components/me/ManageLayout";
 import { Typography, List, QRCode } from "antd";
 import { useState } from "react";
-import { GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri } from "../../../components/me/GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri";
-import { EnableUserTwoFactorAuthenticator } from "../../../components/me/EnableUserTwoFactorAuthenticator";
+import GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri from "../../../components/me/GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri";
+import EnableUserTwoFactorAuthenticator from "../../../components/me/EnableUserTwoFactorAuthenticator";
 
 function Page() {
   const [sharedKey, setSharedKey] = useState<string | null | undefined>(
diff --git a/frontend/pages/me/manage/personal-data.tsx b/frontend/pages/me/manage/personal-data.tsx
index 3e52d91f7..116d33917 100644
--- a/frontend/pages/me/manage/personal-data.tsx
+++ b/frontend/pages/me/manage/personal-data.tsx
@@ -1,7 +1,7 @@
 import { Typography, Skeleton } from "antd";
 import ManageLayout from "../../../components/me/ManageLayout";
 import paths from "../../../paths";
-import { DeletePersonalUserData } from "../../../components/me/DeletePersonalUserData";
+import DeletePersonalUserData from "../../../components/me/DeletePersonalUserData";
 import { useRequireAuth } from "../../../lib/hooks/useRequireAuth";
 
 function Page() {
diff --git a/frontend/pages/me/manage/profile.tsx b/frontend/pages/me/manage/profile.tsx
index 78af2e468..7dad0ae6d 100644
--- a/frontend/pages/me/manage/profile.tsx
+++ b/frontend/pages/me/manage/profile.tsx
@@ -1,6 +1,6 @@
 import { Typography, Skeleton } from "antd";
 import ManageLayout from "../../../components/me/ManageLayout";
-import { SetUserPhoneNumber } from "../../../components/me/SetUserPhoneNumber";
+import SetUserPhoneNumber from "../../../components/me/SetUserPhoneNumber";
 import { useRequireAuth } from "../../../lib/hooks/useRequireAuth";
 import paths from "../../../paths";
 
@@ -17,9 +17,11 @@ function Page() {
 
   return (
     <ManageLayout>
-      <Typography.Paragraph style={{ maxWidth: "75ch" }}>Hello {currentUser.name}!</Typography.Paragraph>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        Hello {currentUser.name}!
+      </Typography.Paragraph>
       {/* TODO Change name, postal address, and website locator */}
-      <SetUserPhoneNumber phoneNumber={currentUser.contact.phoneNumber} />
+      <SetUserPhoneNumber phoneNumber={currentUser.contact?.phoneNumber} />
     </ManageLayout>
   );
 }
diff --git a/frontend/queries/componentAssemblies.graphql b/frontend/queries/componentAssemblies.graphql
index 6272664a8..404f033b8 100644
--- a/frontend/queries/componentAssemblies.graphql
+++ b/frontend/queries/componentAssemblies.graphql
@@ -1,5 +1,17 @@
+#import "./components.graphql"
+
 mutation AddComponentAssembly($input: AddComponentAssemblyInput!) {
   addComponentAssembly(input: $input) {
+    assembledOfEdge {
+      node {
+        ...ComponentPartial
+      }
+    }
+    partOfEdge {
+      node {
+        ...ComponentPartial
+      }
+    }
     errors {
       code
       message
@@ -10,6 +22,16 @@ mutation AddComponentAssembly($input: AddComponentAssemblyInput!) {
 
 mutation UpdateComponentAssembly($input: UpdateComponentAssemblyInput!) {
   updateComponentAssembly(input: $input) {
+    assembledOfEdge {
+      node {
+        ...ComponentPartial
+      }
+    }
+    partOfEdge {
+      node {
+        ...ComponentPartial
+      }
+    }
     errors {
       code
       message
@@ -20,6 +42,12 @@ mutation UpdateComponentAssembly($input: UpdateComponentAssemblyInput!) {
 
 mutation RemoveComponentAssembly($input: RemoveComponentAssemblyInput!) {
   removeComponentAssembly(input: $input) {
+    assembledComponent {
+      ...ComponentPartial
+    }
+    partComponent {
+      ...ComponentPartial
+    }
     errors {
       code
       message
diff --git a/frontend/queries/componentGeneralizations.graphql b/frontend/queries/componentGeneralizations.graphql
index d5e8142f6..e3500e199 100644
--- a/frontend/queries/componentGeneralizations.graphql
+++ b/frontend/queries/componentGeneralizations.graphql
@@ -1,5 +1,17 @@
+#import "./components.graphql"
+
 mutation AddComponentGeneralization($input: AddComponentGeneralizationInput!) {
   addComponentGeneralization(input: $input) {
+    concretizationOfEdge {
+      node {
+        ...ComponentPartial
+      }
+    }
+    generalizationOfEdge {
+      node {
+        ...ComponentPartial
+      }
+    }
     errors {
       code
       message
@@ -12,6 +24,12 @@ mutation RemoveComponentGeneralization(
   $input: RemoveComponentGeneralizationInput!
 ) {
   removeComponentGeneralization(input: $input) {
+    generalComponent {
+      ...ComponentPartial
+    }
+    concreteComponent {
+      ...ComponentPartial
+    }
     errors {
       code
       message
diff --git a/frontend/queries/componentManufacturers.graphql b/frontend/queries/componentManufacturers.graphql
index 6bd5c2d91..a6c4afdda 100644
--- a/frontend/queries/componentManufacturers.graphql
+++ b/frontend/queries/componentManufacturers.graphql
@@ -1,5 +1,17 @@
+#import "./components.graphql"
+
 mutation AddComponentManufacturer($input: AddComponentManufacturerInput!) {
   addComponentManufacturer(input: $input) {
+    componentManufacturerEdge {
+      node {
+        ...InstitutionPartial
+      }
+    }
+    manufacturedComponentEdge {
+      node {
+        ...ComponentPartial
+      }
+    }
     errors {
       code
       message
@@ -12,6 +24,16 @@ mutation ConfirmComponentManufacturer(
   $input: ConfirmComponentManufacturerInput!
 ) {
   confirmComponentManufacturer(input: $input) {
+    componentManufacturerEdge {
+      node {
+        ...InstitutionPartial
+      }
+    }
+    manufacturedComponentEdge {
+      node {
+        ...ComponentPartial
+      }
+    }
     errors {
       code
       message
@@ -24,6 +46,12 @@ mutation RemoveComponentManufacturer(
   $input: RemoveComponentManufacturerInput!
 ) {
   removeComponentManufacturer(input: $input) {
+    component {
+      ...ComponentPartial
+    }
+    institution {
+      ...InstitutionPartial
+    }
     errors {
       code
       message
diff --git a/frontend/queries/componentVariants.graphql b/frontend/queries/componentVariants.graphql
index 9b1f6fa17..f7b13f54e 100644
--- a/frontend/queries/componentVariants.graphql
+++ b/frontend/queries/componentVariants.graphql
@@ -1,5 +1,17 @@
+#import "./components.graphql"
+
 mutation AddComponentVariant($input: AddComponentVariantInput!) {
   addComponentVariant(input: $input) {
+    variantOfEdge {
+      node {
+        ...ComponentPartial
+      }
+    }
+    reverseVariantOfEdge {
+      node {
+        ...ComponentPartial
+      }
+    }
     errors {
       code
       message
@@ -10,6 +22,12 @@ mutation AddComponentVariant($input: AddComponentVariantInput!) {
 
 mutation RemoveComponentVariant($input: RemoveComponentVariantInput!) {
   removeComponentVariant(input: $input) {
+    oneComponent {
+      ...ComponentPartial
+    }
+    otherComponent {
+      ...ComponentPartial
+    }
     errors {
       code
       message
diff --git a/frontend/queries/components.graphql b/frontend/queries/components.graphql
index ad2e789c8..69cddaa5c 100644
--- a/frontend/queries/components.graphql
+++ b/frontend/queries/components.graphql
@@ -1,4 +1,5 @@
 #import "./common.graphql"
+#import "./institution.graphql"
 
 fragment ComponentsPartial on Component {
   id
@@ -212,6 +213,25 @@ mutation CreateComponent($input: CreateComponentInput!) {
   createComponent(input: $input) {
     component {
       ...ComponentPartial
+      manager {
+        node {
+          ...InstitutionPartial
+        }
+      }
+      manufacturers {
+        edges {
+          node {
+            ...InstitutionPartial
+          }
+        }
+      }
+      pendingManufacturers {
+        edges {
+          node {
+            ...InstitutionPartial
+          }
+        }
+      }
     }
     errors {
       code
diff --git a/frontend/queries/currentUser.graphql b/frontend/queries/currentUser.graphql
index 663b118d4..0ab2a439f 100644
--- a/frontend/queries/currentUser.graphql
+++ b/frontend/queries/currentUser.graphql
@@ -176,6 +176,10 @@ mutation EnableUserTwoFactorAuthenticator(
 
 mutation ChangeUserPassword($input: ChangeUserPasswordInput!) {
   changeUserPassword(input: $input) {
+    user {
+      id
+      hasPassword
+    }
     errors {
       code
       message
@@ -186,6 +190,10 @@ mutation ChangeUserPassword($input: ChangeUserPasswordInput!) {
 
 mutation SetUserPassword($input: SetUserPasswordInput!) {
   setUserPassword(input: $input) {
+    user {
+      id
+      hasPassword
+    }
     errors {
       code
       message
@@ -196,6 +204,9 @@ mutation SetUserPassword($input: SetUserPasswordInput!) {
 
 mutation DeletePersonalUserData($input: DeletePersonalUserDataInput!) {
   deletePersonalUserData(input: $input) {
+    user {
+      ...CurrentUserPartial
+    }
     errors {
       code
       message
@@ -206,6 +217,12 @@ mutation DeletePersonalUserData($input: DeletePersonalUserDataInput!) {
 
 mutation ResendUserEmailVerification {
   resendUserEmailVerification {
+    user {
+      id
+      contact {
+        isEmailAddressConfirmed
+      }
+    }
     errors {
       code
       message
diff --git a/frontend/queries/dataFormats.graphql b/frontend/queries/dataFormats.graphql
index a750c287b..dc361b3a1 100644
--- a/frontend/queries/dataFormats.graphql
+++ b/frontend/queries/dataFormats.graphql
@@ -1,4 +1,5 @@
 #import "./common.graphql"
+#import "./institution.graphql"
 
 fragment DataFormatsPartial on DataFormat {
   id
@@ -87,6 +88,11 @@ mutation CreateDataFormat($input: CreateDataFormatInput!) {
   createDataFormat(input: $input) {
     dataFormat {
       ...DataFormatPartial
+      manager {
+        node {
+          ...InstitutionPartial
+        }
+      }
     }
     errors {
       code
diff --git a/frontend/queries/databases.graphql b/frontend/queries/databases.graphql
index 304477a1f..60a5cc978 100644
--- a/frontend/queries/databases.graphql
+++ b/frontend/queries/databases.graphql
@@ -1,3 +1,6 @@
+#import "./common.graphql"
+#import "./institution.graphql"
+
 fragment DatabasesPartial on Database {
   id
   uuid
@@ -122,6 +125,11 @@ mutation CreateDatabase($input: CreateDatabaseInput!) {
   createDatabase(input: $input) {
     database {
       ...DatabasePartial
+      operator {
+        node {
+          ...InstitutionPartial
+        }
+      }
     }
     errors {
       code
@@ -146,6 +154,9 @@ mutation UpdateDatabase($input: UpdateDatabaseInput!) {
 
 mutation VerifyDatabase($input: VerifyDatabaseInput!) {
   verifyDatabase(input: $input) {
+    database {
+      ...DatabasesPartial
+    }
     errors {
       code
       message
diff --git a/frontend/queries/institutionMethodDevelopers.graphql b/frontend/queries/institutionMethodDevelopers.graphql
index 6aa87aaa5..8fffc0446 100644
--- a/frontend/queries/institutionMethodDevelopers.graphql
+++ b/frontend/queries/institutionMethodDevelopers.graphql
@@ -1,7 +1,20 @@
+#import "./method.graphql"
+#import "./institution.graphql"
+
 mutation AddInstitutionMethodDeveloper(
   $input: AddInstitutionMethodDeveloperInput!
 ) {
   addInstitutionMethodDeveloper(input: $input) {
+    developedMethodEdge {
+      node {
+        ...MethodPartial
+      }
+    }
+    methodDeveloperEdge {
+      node {
+        ...InstitutionPartial
+      }
+    }
     errors {
       code
       message
@@ -14,6 +27,16 @@ mutation ConfirmInstitutionMethodDeveloper(
   $input: ConfirmInstitutionMethodDeveloperInput!
 ) {
   confirmInstitutionMethodDeveloper(input: $input) {
+    developedMethodEdge {
+      node {
+        ...MethodPartial
+      }
+    }
+    methodDeveloperEdge {
+      node {
+        ...InstitutionPartial
+      }
+    }
     errors {
       code
       message
@@ -26,6 +49,12 @@ mutation RemoveInstitutionMethodDeveloper(
   $input: RemoveInstitutionMethodDeveloperInput!
 ) {
   removeInstitutionMethodDeveloper(input: $input) {
+    method {
+      ...MethodPartial
+    }
+    institution {
+      ...InstitutionPartial
+    }
     errors {
       code
       message
diff --git a/frontend/queries/institutionRepresentatives.graphql b/frontend/queries/institutionRepresentatives.graphql
index 269e5be45..8bd7ef25a 100644
--- a/frontend/queries/institutionRepresentatives.graphql
+++ b/frontend/queries/institutionRepresentatives.graphql
@@ -1,12 +1,19 @@
+#import "./institutions.graphql"
+#import "./users.graphql"
+
 mutation AddInstitutionRepresentative(
   $input: AddInstitutionRepresentativeInput!
 ) {
   addInstitutionRepresentative(input: $input) {
     institutionRepresentativeEdge {
       node {
-        id
-        uuid
-        name
+        ...UserPartial
+      }
+      role
+    }
+    representedInstitutionEdge {
+      node {
+        ...InstitutionPartial
       }
       role
     }
@@ -18,10 +25,22 @@ mutation AddInstitutionRepresentative(
   }
 }
 
-mutation RemoveInstitutionRepresentative(
-  $input: RemoveInstitutionRepresentativeInput!
+mutation ConfirmInstitutionRepresentative(
+  $input: ConfirmInstitutionRepresentativeInput!
 ) {
-  removeInstitutionRepresentative(input: $input) {
+  confirmInstitutionRepresentative(input: $input) {
+    institutionRepresentativeEdge {
+      node {
+        ...UserPartial
+      }
+      role
+    }
+    representedInstitutionEdge {
+      node {
+        ...InstitutionPartial
+      }
+      role
+    }
     errors {
       code
       message
@@ -30,10 +49,16 @@ mutation RemoveInstitutionRepresentative(
   }
 }
 
-mutation ConfirmInstitutionRepresentative(
-  $input: ConfirmInstitutionRepresentativeInput!
+mutation RemoveInstitutionRepresentative(
+  $input: RemoveInstitutionRepresentativeInput!
 ) {
-  confirmInstitutionRepresentative(input: $input) {
+  removeInstitutionRepresentative(input: $input) {
+    institution {
+      ...InstitutionPartial
+    }
+    user {
+      ...UserPartial
+    }
     errors {
       code
       message
diff --git a/frontend/queries/institutions.graphql b/frontend/queries/institutions.graphql
index bc37c170a..a58114310 100644
--- a/frontend/queries/institutions.graphql
+++ b/frontend/queries/institutions.graphql
@@ -104,10 +104,10 @@ fragment InstitutionPartial on Institution {
     totalCount
     isAuthorizedToAddEdge
   }
-  developedMethods {
+  institutionDevelopedMethods: developedMethods {
     totalCount
   }
-  pendingDevelopedMethods {
+  pendingInstitutionDevelopedMethods: pendingDevelopedMethods {
     totalCount
     edges {
       node {
@@ -200,10 +200,29 @@ query PendingInstitutions {
   }
 }
 
+query Institution($uuid: Uuid!) {
+  institution(id: $uuid) {
+    ...InstitutionPartial
+  }
+}
+
 mutation CreateInstitution($input: CreateInstitutionInput!) {
   createInstitution(input: $input) {
     institution {
       ...InstitutionPartial
+      manager {
+        node {
+          ...InstitutionPartial
+        }
+      }
+      representatives {
+        edges {
+          node {
+            ...UserPartial
+          }
+          role
+        }
+      }
     }
     errors {
       code
@@ -228,16 +247,9 @@ mutation UpdateInstitution($input: UpdateInstitutionInput!) {
 
 mutation VerifyInstitution($institutionId: Uuid!) {
   verifyInstitution(input: { institutionId: $institutionId }) {
-    errors {
-      code
-      message
-      path
+    institution {
+      ...InstitutionPartial
     }
-  }
-}
-
-mutation DeleteInstitution($institutionId: Uuid!) {
-  deleteInstitution(input: { institutionId: $institutionId }) {
     errors {
       code
       message
@@ -245,6 +257,7 @@ mutation DeleteInstitution($institutionId: Uuid!) {
     }
   }
 }
+
 mutation SwitchInstitutionOperatingState($institutionId: Uuid!) {
   switchInstitutionOperatingState(input: { institutionId: $institutionId }) {
     institution {
@@ -259,8 +272,12 @@ mutation SwitchInstitutionOperatingState($institutionId: Uuid!) {
   }
 }
 
-query Institution($uuid: Uuid!) {
-  institution(id: $uuid) {
-    ...InstitutionPartial
+mutation DeleteInstitution($institutionId: Uuid!) {
+  deleteInstitution(input: { institutionId: $institutionId }) {
+    errors {
+      code
+      message
+      path
+    }
   }
 }
diff --git a/frontend/queries/methods.graphql b/frontend/queries/methods.graphql
index 9c0e5b3c4..54a5b0831 100644
--- a/frontend/queries/methods.graphql
+++ b/frontend/queries/methods.graphql
@@ -1,4 +1,5 @@
 #import "./common.graphql"
+#import "./institution.graphql"
 
 fragment MethodsPartial on Method {
   id
@@ -153,6 +154,35 @@ mutation CreateMethod($input: CreateMethodInput!) {
   createMethod(input: $input) {
     method {
       ...MethodPartial
+      manager {
+        node {
+          ...InstitutionPartial
+        }
+      }
+      developers {
+        edges {
+          node {
+            ... on Institution {
+              ...InstitutionPartial
+            }
+            ... on User {
+              ...UserPartial
+            }
+          }
+        }
+      }
+      pendingDevelopers {
+        edges {
+          node {
+            ... on Institution {
+              ...InstitutionPartial
+            }
+            ... on User {
+              ...UserPartial
+            }
+          }
+        }
+      }
     }
     errors {
       code
diff --git a/frontend/queries/openIdConnect.graphql b/frontend/queries/openIdConnect.graphql
index 645571ee8..ee34a0ddf 100644
--- a/frontend/queries/openIdConnect.graphql
+++ b/frontend/queries/openIdConnect.graphql
@@ -1,3 +1,6 @@
+#import "./common.graphql"
+#import "./institution.graphql"
+
 fragment OpenIdConnectApplicationsPartial on OpenIdConnectApplication {
   id
   uuid
@@ -15,6 +18,7 @@ fragment OpenIdConnectApplicationsPartial on OpenIdConnectApplication {
   requirements
   owner {
     node {
+      id
       uuid
       name
     }
@@ -27,7 +31,11 @@ fragment OpenIdConnectAuthorizationsPartial on OpenIdConnectAuthorization {
   name: uuid
   createdAt
   status
-  subject
+  subject {
+    id
+    uuid
+    name
+  }
   type
   isAuthorizedToDeleteNode
   application {
@@ -47,7 +55,18 @@ fragment OpenIdConnectTokensPartial on OpenIdConnectToken {
   expiredAt
   redeemedAt
   status
-  subject
+  subject {
+    ... on User {
+      id
+      uuid
+      name
+    }
+    ... on OpenIdConnectApplication {
+      id
+      uuid
+      name: clientId
+    }
+  }
   type
   isAuthorizedToRevokeNode
   authorization {
@@ -139,6 +158,11 @@ mutation CreateApplication($input: CreateOpenIdConnectApplicationInput!) {
   createOpenIdConnectApplication(input: $input) {
     application {
       ...OpenIdConnectApplicationPartial
+      owner {
+        node {
+          ...InstitutionPartial
+        }
+      }
     }
     clientSecret
     errors {
@@ -212,6 +236,9 @@ query Authorizations(
 
 mutation DeleteAuthorization($input: DeleteOpenIdConnectAuthorizationInput!) {
   deleteOpenIdConnectAuthorization(input: $input) {
+    application {
+      ...OpenIdConnectApplicationPartial
+    }
     errors {
       code
       message
diff --git a/frontend/queries/userMethodDevelopers.graphql b/frontend/queries/userMethodDevelopers.graphql
index 6ac0b42a9..a07ab6e67 100644
--- a/frontend/queries/userMethodDevelopers.graphql
+++ b/frontend/queries/userMethodDevelopers.graphql
@@ -1,5 +1,15 @@
 mutation AddUserMethodDeveloper($input: AddUserMethodDeveloperInput!) {
   addUserMethodDeveloper(input: $input) {
+    developedMethodEdge {
+      node {
+        ...MethodPartial
+      }
+    }
+    methodDeveloperEdge {
+      node {
+        ...UserPartial
+      }
+    }
     errors {
       code
       message
@@ -10,6 +20,16 @@ mutation AddUserMethodDeveloper($input: AddUserMethodDeveloperInput!) {
 
 mutation ConfirmUserMethodDeveloper($input: ConfirmUserMethodDeveloperInput!) {
   confirmUserMethodDeveloper(input: $input) {
+    developedMethodEdge {
+      node {
+        ...MethodPartial
+      }
+    }
+    methodDeveloperEdge {
+      node {
+        ...UserPartial
+      }
+    }
     errors {
       code
       message
@@ -20,6 +40,12 @@ mutation ConfirmUserMethodDeveloper($input: ConfirmUserMethodDeveloperInput!) {
 
 mutation RemoveUserMethodDeveloper($input: RemoveUserMethodDeveloperInput!) {
   removeUserMethodDeveloper(input: $input) {
+    method {
+      ...MethodPartial
+    }
+    user {
+      ...UserPartial
+    }
     errors {
       code
       message
diff --git a/frontend/queries/users.graphql b/frontend/queries/users.graphql
index 1771d83ba..851faeec0 100644
--- a/frontend/queries/users.graphql
+++ b/frontend/queries/users.graphql
@@ -33,7 +33,7 @@ fragment UserPartial on User {
   rolesCurrentUserCanRemove
   isAuthorizedToDeleteUser
   isAuthorizedToManageOpenIdConnect
-  developedMethods {
+  userDevelopedMethods: developedMethods {
     totalCount
     edges {
       node {
@@ -44,7 +44,7 @@ fragment UserPartial on User {
       isAuthorizedToRemoveEdge
     }
   }
-  pendingDevelopedMethods {
+  pendingUserDevelopedMethods: pendingDevelopedMethods {
     totalCount
     edges {
       node {
diff --git a/frontend/styles/global.css b/frontend/styles/global.css
index 13143a34e..e69de29bb 100644
--- a/frontend/styles/global.css
+++ b/frontend/styles/global.css
@@ -1,4 +0,0 @@
-/* .ant-modal-container { */
-/*   width: 100%; */
-/*   max-width: 1024px; */
-/* } */
diff --git a/frontend/test/index.test.tsx b/frontend/test/index.test.tsx
index f5dc1577c..2f8767c51 100644
--- a/frontend/test/index.test.tsx
+++ b/frontend/test/index.test.tsx
@@ -6,7 +6,7 @@
 // const cache = new InMemoryCache();
 // // cache.writeQuery({
 //   query: gql`
-//     query Viewer {
+//     query View {
 //       viewer {
 //         id
 //         name
diff --git a/frontend/type-defs.graphqls b/frontend/type-defs.graphqls
index f3c841933..4fb673b87 100644
--- a/frontend/type-defs.graphqls
+++ b/frontend/type-defs.graphqls
@@ -1238,6 +1238,7 @@ type DeleteOpenIdConnectAuthorizationError implements UserError {
 }
 
 type DeleteOpenIdConnectAuthorizationPayload {
+  application: OpenIdConnectApplication
   errors: [DeleteOpenIdConnectAuthorizationError!]
   query: Query!
 }
@@ -2016,13 +2017,13 @@ type OpenIdConnectApplicationsEdge {
 }
 
 type OpenIdConnectAuthorization implements Node {
-  application: OpenIdConnectAuthorizationApplicationEdge! @cost(weight: "10")
+  application: OpenIdConnectAuthorizationApplicationEdge @cost(weight: "10")
   createdAt: DateTime!
   id: ID!
   isAuthorizedToDeleteNode: Boolean! @cost(weight: "1")
   scopes: [OpenIdConnectScope!]! @cost(weight: "0")
   status: String
-  subject: String
+  subject: User
   tokens: OpenIdConnectAuthorizationIssuedTokenConnection! @cost(weight: "10")
   type: String
   updatedAt: DateTime!
@@ -2061,15 +2062,15 @@ type OpenIdConnectAuthorizationsEdge {
 }
 
 type OpenIdConnectToken implements Node {
-  application: OpenIdConnectTokenApplicationEdge! @cost(weight: "10")
-  authorization: OpenIdConnectTokenAuthorizationEdge! @cost(weight: "10")
+  application: OpenIdConnectTokenApplicationEdge @cost(weight: "10")
+  authorization: OpenIdConnectTokenAuthorizationEdge @cost(weight: "10")
   createdAt: DateTime!
   expiredAt: LocalDateTime
   id: ID!
   isAuthorizedToRevokeNode: Boolean! @cost(weight: "1")
   redeemedAt: LocalDateTime
   status: String
-  subject: String
+  subject: OpenIdConnectSubject
   type: String
   updatedAt: DateTime!
   uuid: Uuid!
@@ -2363,9 +2364,9 @@ type RemoveInstitutionMethodDeveloperError implements UserError {
 }
 
 type RemoveInstitutionMethodDeveloperPayload {
-  developedMethodEdge: InstitutionDevelopedMethodEdge
   errors: [RemoveInstitutionMethodDeveloperError!]
-  methodDeveloperEdge: InstitutionMethodDeveloperEdge
+  institution: Institution @cost(weight: "10")
+  method: Method @cost(weight: "10")
   query: Query!
 }
 
@@ -2389,10 +2390,10 @@ type RemoveUserMethodDeveloperError implements UserError {
 }
 
 type RemoveUserMethodDeveloperPayload {
-  developedMethodEdge: UserDevelopedMethodEdge
   errors: [RemoveUserMethodDeveloperError!]
-  methodDeveloperEdge: UserMethodDeveloperEdge
+  method: Method @cost(weight: "10")
   query: Query!
+  user: User @cost(weight: "10")
 }
 
 type RemoveUserRoleError implements UserError {
@@ -2662,7 +2663,7 @@ type UpdateOpenIdConnectApplicationPayload {
 }
 
 type User implements Node {
-  contact: ContactInformation! @cost(weight: "0")
+  contact: ContactInformation @cost(weight: "0")
   developedMethods(
     "Returns the elements in the list that come after the specified cursor."
     after: String
@@ -2844,6 +2845,8 @@ interface UserError {
   path: [String!]!
 }
 
+union OpenIdConnectSubject = OpenIdConnectApplication | User
+
 union Reference = Publication | Standard
 
 union Stakeholder = Institution | User
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 65634fa70..0de66f60b 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2960,10 +2960,10 @@ balanced-match@^4.0.2:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-4.0.4.tgz#bfb10662feed8196a2c62e7c68e17720c274179a"
   integrity sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==
 
-baseline-browser-mapping@^2.10.27:
-  version "2.10.27"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.27.tgz#fee941c2a0b42cdf83c6427e4c830b1d0bdab2c3"
-  integrity sha512-zEs/ufmZoUd7WftKpKyXaT6RFxpQ5Qm9xytKRHvJfxFV9DFJkZph9RvJ1LcOUi0Z1ZVijMte65JbILeV+8QQEA==
+baseline-browser-mapping@^2.10.28:
+  version "2.10.28"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.28.tgz#9ba8e7b5ef9d40ceb3dd1cdcb936f63383b6833b"
+  integrity sha512-Ic44hnOtFIgravCunj1ifSoQPSUrkNiJuH9Mf6jr2jjoA74icqV8wU0KuadXeOR8zuIJMOoTv0GuQjZ9ZYNMeA==
 
 baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
   version "2.10.10"

From 386c346758ba6b722a983ba7008634f60cfce372 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 8 May 2026 20:02:04 +0200
Subject: [PATCH 018/145] Correct email sender address

---
 backend/src/AppSettings.cs                        | 1 +
 backend/src/Services/EmailSender.cs               | 2 +-
 backend/test/AuditableTests.cs                    | 8 ++++----
 frontend/components/CodeView.tsx                  | 2 +-
 frontend/components/CopyableBlock.tsx             | 6 ++++--
 frontend/components/GnuPgKeyLink.tsx              | 6 +++++-
 frontend/components/JsonView.tsx                  | 6 ++++--
 frontend/components/databases/DatabaseSummary.tsx | 7 +++++--
 frontend/pages/me/manage/email.tsx                | 2 +-
 9 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/backend/src/AppSettings.cs b/backend/src/AppSettings.cs
index ad018b9c1..07190bb7d 100644
--- a/backend/src/AppSettings.cs
+++ b/backend/src/AppSettings.cs
@@ -11,6 +11,7 @@ public sealed record AppSettings
     public string Host { get; init; } = "";
     public string Subdomain { private get; init; } = "";
     public Uri Uri => new($"https://{Subdomain}.{Host}", UriKind.Absolute);
+    public Uri NonSubdomainUri => new Uri($"https://{Host}", UriKind.Absolute);
     public Uri GraphQlEndpoint => new UriBuilder(Uri) { Path = GraphQlPathSegment }.Uri;
 
     public string BootstrapUserPassword { get; init; } = "";
diff --git a/backend/src/Services/EmailSender.cs b/backend/src/Services/EmailSender.cs
index f0c1cc692..9efafbe67 100644
--- a/backend/src/Services/EmailSender.cs
+++ b/backend/src/Services/EmailSender.cs
@@ -36,7 +36,7 @@ string body
         message.From.Add(
             new MailboxAddress(
                 "Metabase",
-                $"metabase@{appSettings.Host}"
+                $"metabase@{appSettings.NonSubdomainUri.Host}"
             )
         );
         message.To.Add(
diff --git a/backend/test/AuditableTests.cs b/backend/test/AuditableTests.cs
index 3e3ae745e..5d9a3ba9a 100644
--- a/backend/test/AuditableTests.cs
+++ b/backend/test/AuditableTests.cs
@@ -37,8 +37,8 @@ public async Task SaveChanges_SetsAndUpdatesTimestamps_UsingFakeClock()
         // Assert
         Assert.Multiple(() =>
         {
-            Assert.That(entity.CreatedAt, Is.EqualTo(startInstant.WithOffset(Offset.Zero)));
-            Assert.That(entity.UpdatedAt, Is.EqualTo(startInstant.WithOffset(Offset.Zero)));
+            Assert.That(entity.CreatedAt, Is.EqualTo(startInstant.WithOffset(Offset.Zero).ToDateTimeOffset()));
+            Assert.That(entity.UpdatedAt, Is.EqualTo(startInstant.WithOffset(Offset.Zero).ToDateTimeOffset()));
         });
         // Act
         var duration = Duration.FromHours(1);
@@ -49,8 +49,8 @@ public async Task SaveChanges_SetsAndUpdatesTimestamps_UsingFakeClock()
         // Assert
         Assert.Multiple(() =>
         {
-            Assert.That(entity.CreatedAt, Is.EqualTo(startInstant.WithOffset(Offset.Zero)), "CreatedAt should not change on update.");
-            Assert.That(entity.UpdatedAt, Is.EqualTo(updatedInstant.WithOffset(Offset.Zero)), "UpdatedAt should reflect the new fake time.");
+            Assert.That(entity.CreatedAt, Is.EqualTo(startInstant.WithOffset(Offset.Zero).ToDateTimeOffset()), "CreatedAt should not change on update.");
+            Assert.That(entity.UpdatedAt, Is.EqualTo(updatedInstant.WithOffset(Offset.Zero).ToDateTimeOffset()), "UpdatedAt should reflect the new fake time.");
         });
     }
 
diff --git a/frontend/components/CodeView.tsx b/frontend/components/CodeView.tsx
index fb828e3d7..da97b090f 100644
--- a/frontend/components/CodeView.tsx
+++ b/frontend/components/CodeView.tsx
@@ -16,7 +16,7 @@ export default function CodeView({
     );
   } else {
     return (
-      <CopyableBlock text={code}>
+      <CopyableBlock autoSize text={code}>
         <pre
           style={{
             overflow: "auto",
diff --git a/frontend/components/CopyableBlock.tsx b/frontend/components/CopyableBlock.tsx
index 1ce132e91..223353328 100644
--- a/frontend/components/CopyableBlock.tsx
+++ b/frontend/components/CopyableBlock.tsx
@@ -5,10 +5,12 @@ import { ReactNode, useState } from "react";
 export default function CopyableBlock({
   text,
   color,
+  autoSize = false,
   children,
 }: {
   text: string;
   color?: "white";
+  autoSize?: boolean;
   children: ReactNode;
 }) {
   const [copied, setCopied] = useState(false);
@@ -17,8 +19,8 @@ export default function CopyableBlock({
     <div
       style={{
         position: "relative",
-        minHeight: "2.5lh",
-        minWidth: "10ch",
+        minHeight: autoSize ? undefined : "2.5lh",
+        minWidth: autoSize ? undefined : "10ch",
         // paddingBottom: "1.5em",
         // borderBottom: "1px solid grey",
       }}
diff --git a/frontend/components/GnuPgKeyLink.tsx b/frontend/components/GnuPgKeyLink.tsx
index a4f787d37..2e23e18fd 100644
--- a/frontend/components/GnuPgKeyLink.tsx
+++ b/frontend/components/GnuPgKeyLink.tsx
@@ -10,7 +10,11 @@ export default function GnuPgKeyLink({
   fingerprint: string;
   block?: boolean;
 }) {
-  const link = <Link href={paths.gnuPgKey(fingerprint)}>{fingerprint}</Link>;
+  const link = (
+    <Link href={paths.gnuPgKey(fingerprint)}>
+      <code>{fingerprint}</code>
+    </Link>
+  );
 
   return block ? (
     <CopyableBlock text={fingerprint}>{link}</CopyableBlock>
diff --git a/frontend/components/JsonView.tsx b/frontend/components/JsonView.tsx
index dc53cfb31..fc8a5d4bc 100644
--- a/frontend/components/JsonView.tsx
+++ b/frontend/components/JsonView.tsx
@@ -5,22 +5,24 @@ export default function JsonView({
   data,
   inline = false,
   color,
+  autoSize = true,
 }: {
   data: object;
   inline?: boolean;
   color?: "white";
+  autoSize?: boolean;
 }) {
   if (inline) {
     const jsonString = JSON.stringify(data);
     return (
-      <Tooltip title={<JsonView data={data} color="white" />}>
+      <Tooltip title={<JsonView autoSize={false} data={data} color="white" />}>
         <code>{jsonString}</code>
       </Tooltip>
     );
   } else {
     const jsonString = JSON.stringify(data, null, 2);
     return (
-      <CopyableBlock text={jsonString} color={color}>
+      <CopyableBlock autoSize={autoSize} text={jsonString} color={color}>
         <pre
           style={{
             overflow: "auto",
diff --git a/frontend/components/databases/DatabaseSummary.tsx b/frontend/components/databases/DatabaseSummary.tsx
index aae9f11af..94bf99922 100644
--- a/frontend/components/databases/DatabaseSummary.tsx
+++ b/frontend/components/databases/DatabaseSummary.tsx
@@ -74,8 +74,11 @@ export default function DatabaseSummary({
               </>
             )}{" "}
             to make the metabase assert that the verification codes match which
-            proves that you control the GraphQL endpoint {entity.locator}.
-            Verified databases are publicly listed and included in data
+            proves that you control the GraphQL endpoint{" "}
+            <Typography.Link href={entity.locator}>
+              {entity.locator}
+            </Typography.Link>
+            . Verified databases are publicly listed and included in data
             searches.
           </Typography.Paragraph>
         )}
diff --git a/frontend/pages/me/manage/email.tsx b/frontend/pages/me/manage/email.tsx
index c577d36a2..eb9d078af 100644
--- a/frontend/pages/me/manage/email.tsx
+++ b/frontend/pages/me/manage/email.tsx
@@ -35,7 +35,7 @@ function Page() {
           ),
         ]}
         {!currentUser.contact && (
-          <>We don't have any contact information about you.</>
+          <>We don&apos;t have any contact information about you.</>
         )}
       </Typography.Paragraph>
       <ChangeUserEmail />

From 63ed1a3b1aba5ddc5c3a4f874de23e917098de80 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sun, 10 May 2026 15:57:29 +0200
Subject: [PATCH 019/145] Prevent removal of role from last user in that role

---
 backend/src/GraphQl/Users/RemoveUserRoleErrorCode.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/GraphQl/Users/RemoveUserRoleErrorCode.cs b/backend/src/GraphQl/Users/RemoveUserRoleErrorCode.cs
index 6e8567b86..bce048268 100644
--- a/backend/src/GraphQl/Users/RemoveUserRoleErrorCode.cs
+++ b/backend/src/GraphQl/Users/RemoveUserRoleErrorCode.cs
@@ -7,5 +7,6 @@ public enum RemoveUserRoleErrorCode
 {
     UNKNOWN,
     UNKNOWN_USER,
+    LAST_USER,
     UNAUTHORIZED
 }
\ No newline at end of file

From 54ca4b9533e6d4aee4374f7cae6071e9885f9fa8 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sun, 10 May 2026 16:31:43 +0200
Subject: [PATCH 020/145] Add customer support role to users

---
 .env.development.sample                       |  2 ++
 .env.production.sample                        |  2 ++
 .env.staging.sample                           |  2 ++
 backend/src/AppSettings.cs                    |  3 +++
 backend/src/Data/DbSeeder.cs                  | 25 ++++++++++++++++---
 backend/src/Data/Role.cs                      |  7 ++++--
 backend/src/Data/User.cs                      | 17 +++++++++++++
 backend/src/Enumerations/UserRole.cs          |  1 +
 .../ComponentManufacturerMutations.cs         |  1 -
 backend/src/GraphQl/Users/UserMutations.cs    | 16 ++++++++++++
 backend/test/Integration/IntegrationTests.cs  | 15 +++++++++--
 docker-compose.development.yaml               |  1 +
 docker-compose.production.yaml                |  1 +
 frontend/package.json                         |  2 +-
 frontend/yarn.lock                            |  8 +++---
 15 files changed, 90 insertions(+), 13 deletions(-)

diff --git a/.env.development.sample b/.env.development.sample
index 088320e61..912867069 100644
--- a/.env.development.sample
+++ b/.env.development.sample
@@ -22,5 +22,7 @@ IGSDB_OPEN_ID_CONNECT_CLIENT_SECRET=secret
 OPEN_TELEMETRY_HOST=host.docker.internal
 OPEN_TELEMETRY_GRPC_PORT=4017
 
+CUSTOMER_SUPPORT_USER=2c103b27-eb15-423a-a184-fdd6c64eefe2
+
 SMTP_HOST=email
 SMTP_PORT=25
diff --git a/.env.production.sample b/.env.production.sample
index 8958c14ea..ed0966e2c 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -21,6 +21,8 @@ IGSDB_OPEN_ID_CONNECT_CLIENT_SECRET=
 OPEN_TELEMETRY_HOST=host.docker.internal
 OPEN_TELEMETRY_GRPC_PORT=4317
 
+CUSTOMER_SUPPORT_USER=2c103b27-eb15-423a-a184-fdd6c64eefe2
+
 SMTP_HOST=mta01.mx.fraunhofer.de
 SMTP_PORT=25
 RELAY_SMTP_HOST=
diff --git a/.env.staging.sample b/.env.staging.sample
index 30b601405..6274cb3d3 100644
--- a/.env.staging.sample
+++ b/.env.staging.sample
@@ -21,6 +21,8 @@ IGSDB_OPEN_ID_CONNECT_CLIENT_SECRET=
 OPEN_TELEMETRY_HOST=host.docker.internal
 OPEN_TELEMETRY_GRPC_PORT=4317
 
+CUSTOMER_SUPPORT_USER=2c103b27-eb15-423a-a184-fdd6c64eefe2
+
 SMTP_HOST=email
 SMTP_PORT=25
 RELAY_SMTP_HOST=mta01.mx.fraunhofer.de
diff --git a/backend/src/AppSettings.cs b/backend/src/AppSettings.cs
index 07190bb7d..fdb4fa81b 100644
--- a/backend/src/AppSettings.cs
+++ b/backend/src/AppSettings.cs
@@ -16,6 +16,9 @@ public sealed record AppSettings
 
     public string BootstrapUserPassword { get; init; } = "";
     public string OpenIdConnectClientSecret { get; init; } = "";
+    public string CustomerSupportUser { get; init; } = "";
+    public Guid CustomerSupportUserId => new Guid(CustomerSupportUser);
+
     public TestlabSolarFacadesSettings TestlabSolarFacades { get; init; } = new();
     public IgsdbSettings Igsdb { get; init; } = new();
     public LoggingSettings Logging { get; init; } = new();
diff --git a/backend/src/Data/DbSeeder.cs b/backend/src/Data/DbSeeder.cs
index 07d203653..efdfc2d18 100644
--- a/backend/src/Data/DbSeeder.cs
+++ b/backend/src/Data/DbSeeder.cs
@@ -75,6 +75,10 @@ public static readonly (string Name, string EmailAddress, Enumerations.UserRole
         VerifierUser =
             Users.First(x => x.Role == Enumerations.UserRole.VERIFIER);
 
+    public static readonly (string Name, string EmailAddress, Enumerations.UserRole Role)
+        SupporterUser =
+            Users.First(x => x.Role == Enumerations.UserRole.SUPPORTER);
+
     public static async Task DoAsync(
         IServiceProvider services
     )
@@ -121,16 +125,28 @@ ILogger<DbSeeder> logger
         {
             if ((await manager.GetUsersInRoleAsync(Role.Administrator)).Count is 0)
             {
-                await CreateUserAsync(manager, AdministratorUser, appSettings.BootstrapUserPassword, logger);
+                await CreateUserAsync(manager, null, AdministratorUser, appSettings.BootstrapUserPassword, logger);
             }
         }
         else
         {
+            var context = services.GetRequiredService<ApplicationDbContext>();
+            var customerSupportUser = await context.Users.AsNoTracking().SingleOrDefaultAsync(_ => _.Id == appSettings.CustomerSupportUserId);
+            if (customerSupportUser is not null)
+            {
+                await manager.AddToRoleAsync(customerSupportUser, Role.EnumToName(Enumerations.UserRole.SUPPORTER));
+            }
             foreach (var userInfo in Users)
             {
                 if (await manager.FindByEmailAsync(userInfo.EmailAddress) is null)
                 {
-                    await CreateUserAsync(manager, userInfo, appSettings.BootstrapUserPassword, logger);
+                    await CreateUserAsync(
+                        manager,
+                        userInfo.Role is Enumerations.UserRole.SUPPORTER && customerSupportUser is null ? appSettings.CustomerSupportUserId : null,
+                        userInfo,
+                        appSettings.BootstrapUserPassword,
+                        logger
+                    );
                 }
             }
         }
@@ -138,13 +154,16 @@ ILogger<DbSeeder> logger
 
     private static async Task CreateUserAsync(
         UserManager<User> manager,
+        Guid? id,
         (string Name, string EmailAddress, Enumerations.UserRole Role) userInfo,
         string password,
         ILogger<DbSeeder> logger
     )
     {
         logger.CreatingUser(userInfo.Name);
-        var user = new User(userInfo.Name, userInfo.EmailAddress, null, null);
+        var user = id is null
+            ? new User(userInfo.Name, userInfo.EmailAddress, null, null)
+            : new User(userInfo.Name, userInfo.EmailAddress, null, null);
         await manager.CreateAsync(
             user,
             password
diff --git a/backend/src/Data/Role.cs b/backend/src/Data/Role.cs
index 920dde358..9e907a3b2 100644
--- a/backend/src/Data/Role.cs
+++ b/backend/src/Data/Role.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.ObjectModel;
 using Microsoft.AspNetCore.Identity;
-using Guid = System.Guid;
 
 namespace Metabase.Data;
 
@@ -9,12 +8,14 @@ public sealed class Role : IdentityRole<Guid>
 {
     public const string Administrator = "Administrator";
     private const string Verifier = "Verifier";
+    private const string Supporter = "Supporter";
 
     public static readonly ReadOnlyCollection<Enumerations.UserRole> AllEnum =
         Array.AsReadOnly(
         [
             Enumerations.UserRole.ADMINISTRATOR,
-            Enumerations.UserRole.VERIFIER
+            Enumerations.UserRole.VERIFIER,
+            Enumerations.UserRole.SUPPORTER
         ]);
 
     // public ICollection<UserRole> UserRoles { get; } = new List<UserRole>();
@@ -39,6 +40,7 @@ public static string EnumToName(Enumerations.UserRole role)
         {
             Enumerations.UserRole.ADMINISTRATOR => Administrator,
             Enumerations.UserRole.VERIFIER => Verifier,
+            Enumerations.UserRole.SUPPORTER => Supporter,
             _ => throw new ArgumentOutOfRangeException(nameof(role), $"Unknown role `{role}.`")
         };
     }
@@ -49,6 +51,7 @@ public static Enumerations.UserRole EnumFromName(string name)
         {
             Administrator => Enumerations.UserRole.ADMINISTRATOR,
             Verifier => Enumerations.UserRole.VERIFIER,
+            Supporter => Enumerations.UserRole.SUPPORTER,
             _ => throw new ArgumentOutOfRangeException(nameof(name), $"Unknown name `{name}.`")
         };
     }
diff --git a/backend/src/Data/User.cs b/backend/src/Data/User.cs
index 49decc61b..75fd5dcf2 100644
--- a/backend/src/Data/User.cs
+++ b/backend/src/Data/User.cs
@@ -24,6 +24,23 @@ public User()
         // Parameterless constructor is needed by HotChocolate's `UseProjection`
     }
 
+    public User(
+        Guid id,
+        string name,
+        string email,
+        string? postalAddress,
+        Uri? websiteLocator
+    )
+    : this(
+        name,
+        email,
+        postalAddress,
+        websiteLocator
+    )
+    {
+        Id = id;
+    }
+
     public User(
         string name,
         string email,
diff --git a/backend/src/Enumerations/UserRole.cs b/backend/src/Enumerations/UserRole.cs
index e4147b47d..c483604c5 100644
--- a/backend/src/Enumerations/UserRole.cs
+++ b/backend/src/Enumerations/UserRole.cs
@@ -4,4 +4,5 @@ public enum UserRole
 {
     ADMINISTRATOR,
     VERIFIER,
+    SUPPORTER
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerMutations.cs b/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerMutations.cs
index 3637a7093..337895967 100644
--- a/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerMutations.cs
+++ b/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerMutations.cs
@@ -9,7 +9,6 @@
 using Metabase.Data;
 using Metabase.Extensions;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 
 namespace Metabase.GraphQl.ComponentManufacturers;
diff --git a/backend/src/GraphQl/Users/UserMutations.cs b/backend/src/GraphQl/Users/UserMutations.cs
index a5bf4017e..0c0d86ad6 100644
--- a/backend/src/GraphQl/Users/UserMutations.cs
+++ b/backend/src/GraphQl/Users/UserMutations.cs
@@ -1691,6 +1691,7 @@ public async Task<RemoveUserRolePayload> RemoveUserRoleAsync(
         ClaimsPrincipal claimsPrincipal,
         UserAuthorization authorization,
         UserManager<User> userManager,
+        RoleManager<Role> roleManager,
         ApplicationDbContext context,
         CancellationToken cancellationToken
     )
@@ -1722,6 +1723,21 @@ CancellationToken cancellationToken
             );
         }
 
+        var role = (await roleManager.FindByNameAsync(Role.EnumToName(input.Role)))!;
+        if (!await context.UserRoles.AsQueryable()
+            .Where(_ => _.RoleId == role.Id && _.UserId != user.Id)
+            .AnyAsync(cancellationToken)
+        )
+        {
+            return new RemoveUserRolePayload(
+                new RemoveUserRoleError(
+                    RemoveUserRoleErrorCode.LAST_USER,
+                    "Cannot remove last user in role.",
+                    [nameof(input), nameof(input.Role).FirstCharToLower()]
+                )
+            );
+        }
+
         var identityResult = await userManager.RemoveFromRoleAsync(user, Role.EnumToName(input.Role));
         if (!identityResult.Succeeded)
         {
diff --git a/backend/test/Integration/IntegrationTests.cs b/backend/test/Integration/IntegrationTests.cs
index e076c1047..a7ac2bc1b 100644
--- a/backend/test/Integration/IntegrationTests.cs
+++ b/backend/test/Integration/IntegrationTests.cs
@@ -253,6 +253,17 @@ Func<HttpClient, Task<TResult>> task
         );
     }
 
+    protected Task<TResult> AsAdministrator<TResult>(
+        Func<HttpClient, Task<TResult>> task
+    )
+    {
+        return AsUser(
+            emailAddress: DbSeeder.AdministratorUser.EmailAddress,
+            password: AppSettings.BootstrapUserPassword,
+            task: task
+        );
+    }
+
     protected Task<TResult> AsVerifier<TResult>(
         Func<HttpClient, Task<TResult>> task
     )
@@ -264,12 +275,12 @@ Func<HttpClient, Task<TResult>> task
         );
     }
 
-    protected Task<TResult> AsAdministrator<TResult>(
+    protected Task<TResult> AsSupporter<TResult>(
         Func<HttpClient, Task<TResult>> task
     )
     {
         return AsUser(
-            emailAddress: DbSeeder.AdministratorUser.EmailAddress,
+            emailAddress: DbSeeder.SupporterUser.EmailAddress,
             password: AppSettings.BootstrapUserPassword,
             task: task
         );
diff --git a/docker-compose.development.yaml b/docker-compose.development.yaml
index a0459aeb0..46a2b1711 100644
--- a/docker-compose.development.yaml
+++ b/docker-compose.development.yaml
@@ -117,6 +117,7 @@ services:
       XBASE_Subdomain: "${SUBDOMAIN:?required}"
       XBASE_BootstrapUserPassword: "${BOOTSTRAP_USER_PASSWORD:?required}"
       XBASE_OpenIdConnectClientSecret: "${OPEN_ID_CONNECT_CLIENT_SECRET:?required}"
+      XBASE_CustomerSupportUser: "${CUSTOMER_SUPPORT_USER:?required}"
       XBASE_Database__Host: "database"
       XBASE_Database__Port: 5432
       XBASE_Database__Name: "${POSTGRES_DATABASE_NAME:?required}"
diff --git a/docker-compose.production.yaml b/docker-compose.production.yaml
index cddd9c04f..c4bd53fc1 100644
--- a/docker-compose.production.yaml
+++ b/docker-compose.production.yaml
@@ -102,6 +102,7 @@ services:
       XBASE_Subdomain: "${SUBDOMAIN:?required}"
       XBASE_BootstrapUserPassword: "${BOOTSTRAP_USER_PASSWORD:?required}"
       XBASE_OpenIdConnectClientSecret: "${OPEN_ID_CONNECT_CLIENT_SECRET:?required}"
+      XBASE_CustomerSupportUser: "${CUSTOMER_SUPPORT_USER:?required}"
       XBASE_Database__Host: "database"
       XBASE_Database__Port: 5432
       XBASE_Database__Name: "${POSTGRES_DATABASE_NAME:?required}"
diff --git a/frontend/package.json b/frontend/package.json
index 7586728be..e465565e4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -43,7 +43,7 @@
     "@types/react-highlight-words": "^0.20.0",
     "@types/react-test-renderer": "^19.1.0",
     "babel-jest": "^30.2.0",
-    "baseline-browser-mapping": "^2.10.28",
+    "baseline-browser-mapping": "^2.10.29",
     "concurrently": "^9.2.1",
     "deepmerge": "^4.0",
     "eslint": "^10.1.0",
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 0de66f60b..de737767b 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2960,10 +2960,10 @@ balanced-match@^4.0.2:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-4.0.4.tgz#bfb10662feed8196a2c62e7c68e17720c274179a"
   integrity sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==
 
-baseline-browser-mapping@^2.10.28:
-  version "2.10.28"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.28.tgz#9ba8e7b5ef9d40ceb3dd1cdcb936f63383b6833b"
-  integrity sha512-Ic44hnOtFIgravCunj1ifSoQPSUrkNiJuH9Mf6jr2jjoA74icqV8wU0KuadXeOR8zuIJMOoTv0GuQjZ9ZYNMeA==
+baseline-browser-mapping@^2.10.29:
+  version "2.10.29"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.29.tgz#47bdc13027af28d341f367a4f35a07ce872e27b4"
+  integrity sha512-Asa2krT+XTPZINCS+2QcyS8WTkObE77RwkydwF7h6DmnKqbvlalz93m/dnphUyCa6SWSP51VgtEUf2FN+gelFQ==
 
 baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
   version "2.10.10"

From 914d1c8130c18a97869ef2fca1f632091e40bca5 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sun, 10 May 2026 17:09:25 +0200
Subject: [PATCH 021/145] Show loading indicators in pagination (and disable
 interaction therewhile to prevent race conditions)

---
 frontend/components/Pagination.tsx      | 34 ++++++++++++++++++++-----
 frontend/lib/hooks/usePaginatedQuery.ts | 30 +++++++++++++++++++---
 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/frontend/components/Pagination.tsx b/frontend/components/Pagination.tsx
index f2edb7d0c..85f0ec080 100644
--- a/frontend/components/Pagination.tsx
+++ b/frontend/components/Pagination.tsx
@@ -1,14 +1,27 @@
-import { Space, Button, Select, Tooltip } from "antd";
-import { LeftOutlined, RightOutlined } from "@ant-design/icons";
+import { Space, Button, Select, Tooltip, Spin } from "antd";
+import {
+  LeftOutlined,
+  RightOutlined,
+  LoadingOutlined,
+} from "@ant-design/icons";
 
 export const initialPageSize = 10;
 
+export enum Fetching {
+  INITIAL,
+  NEXT,
+  PREVIOUS,
+}
+
+const loadingIndicator = <Spin indicator={<LoadingOutlined spin />} />;
+
 const pageSizeOptions = [3, initialPageSize, 20, 50, 100].map((size) => ({
   label: `${size} per page`,
   value: size,
 }));
 
 export interface PaginationProps {
+  fetching: Fetching | null;
   current: number;
   total: number;
   pageSize: number;
@@ -20,6 +33,7 @@ export interface PaginationProps {
 }
 
 export default function Pagination({
+  fetching,
   current,
   total,
   pageSize,
@@ -34,20 +48,25 @@ export default function Pagination({
       <Tooltip title="Previous">
         <Button
           onClick={onPrevious}
-          disabled={!hasPrevious}
+          disabled={fetching != null || !hasPrevious}
           type="text"
-          icon={<LeftOutlined />}
+          icon={
+            fetching == Fetching.PREVIOUS ? loadingIndicator : <LeftOutlined />
+          }
         />
       </Tooltip>
       <span>
-        Page {current} of {total}
+        Page {current} of{" "}
+        {fetching == Fetching.INITIAL ? loadingIndicator : total}
       </span>
       <Tooltip title="Next">
         <Button
           onClick={onNext}
-          disabled={!hasNext}
+          disabled={fetching != null || !hasNext}
           type="text"
-          icon={<RightOutlined />}
+          icon={
+            fetching == Fetching.NEXT ? loadingIndicator : <RightOutlined />
+          }
         />
       </Tooltip>
       <Select
@@ -55,6 +74,7 @@ export default function Pagination({
         defaultValue={pageSize}
         onChange={onPageSizeChange}
         showSearch
+        disabled={fetching != null}
         style={{ width: "max-content" }}
       />
     </Space>
diff --git a/frontend/lib/hooks/usePaginatedQuery.ts b/frontend/lib/hooks/usePaginatedQuery.ts
index b6ad482a3..74d749f09 100644
--- a/frontend/lib/hooks/usePaginatedQuery.ts
+++ b/frontend/lib/hooks/usePaginatedQuery.ts
@@ -1,8 +1,12 @@
-import { useState, useMemo, useEffect } from "react";
+import { useState, useMemo, useEffect, useRef } from "react";
 import { TypedDocumentNode } from "@apollo/client";
 import { useQuery } from "@apollo/client/react";
 import { Connection } from "../connection";
-import { initialPageSize, PaginationProps } from "../../components/Pagination";
+import {
+  Fetching,
+  initialPageSize,
+  PaginationProps,
+} from "../../components/Pagination";
 
 export type QueryData<TNode> = {
   connection: Connection<TNode> | null;
@@ -45,6 +49,8 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
   const [currentPage, setCurrentPage] = useState(1);
   const [pageSize, setPageSize] = useState(initialPageSize);
   const [afterCursors, setAfterCursors] = useState<(string | null)[]>([null]);
+  const [fetching, setFetching] = useState<Fetching | null>(Fetching.INITIAL);
+  const hasLoadedInitially = useRef(false);
 
   const variables = {
     first: pageSize,
@@ -61,6 +67,13 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
     console.error("Paginated query failed", error);
   }
 
+  useEffect(() => {
+    if (!loading && !hasLoadedInitially.current) {
+      setFetching(null);
+      hasLoadedInitially.current = true;
+    }
+  }, [loading]);
+
   // Reset: If where OR order change, jump back to page 1
   useEffect(() => {
     setCurrentPage(1);
@@ -99,15 +112,19 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
         where: where,
         order: order,
       };
+      setFetching(Fetching.NEXT);
       fetchMore({ variables, errorPolicy: "ignore" })
         .then(() => {
+          // do not use `currentPage` or `afterCursors` to determine the new
+          // values because they may have changed when this callback fires
           setCurrentPage((previous) => previous + 1);
           setAfterCursors((previous) => [...previous, endCursor]);
           onQueryVariablesChange(variables);
         })
         .catch((error) => {
           console.error("Fetching next page failed", error);
-        });
+        })
+        .finally(() => setFetching(null));
     } else if (!isLastPageInMemory) {
       setCurrentPage(currentPage + 1);
       onQueryVariablesChange({
@@ -127,19 +144,24 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
     };
     refetch(variables)
       .then(() => {
+        setFetching(Fetching.INITIAL);
+        // note that `currentPage` or `afterCursors` may have changed when this
+        // callback fires
         setCurrentPage(1);
         setAfterCursors([null]);
         onQueryVariablesChange(variables);
       })
       .catch((error) => {
         console.error("Changing page size failed", error);
-      });
+      })
+      .finally(() => setFetching(null));
   };
 
   return {
     loading,
     nodes: currentPageNodes,
     paginationProps: {
+      fetching,
       current: currentPage,
       total: Math.ceil((connection?.totalCount ?? 0) / pageSize),
       pageSize: pageSize,

From 45dd2d8bd48020e78845c76a209a66322f4314cd Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sun, 10 May 2026 17:11:14 +0200
Subject: [PATCH 022/145] Use email address from dotenv file as "from" when
 sending emails

---
 .env.development.sample             |  2 +-
 .env.production.sample              |  2 +-
 .env.staging.sample                 |  2 +-
 backend/src/AppSettings.cs          |  3 +--
 backend/src/Data/DbSeeder.cs        | 13 ++-----------
 backend/src/Data/User.cs            | 17 -----------------
 backend/src/Services/EmailSender.cs |  2 +-
 docker-compose.development.yaml     |  2 +-
 docker-compose.production.yaml      |  2 +-
 9 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/.env.development.sample b/.env.development.sample
index 912867069..906214f0a 100644
--- a/.env.development.sample
+++ b/.env.development.sample
@@ -22,7 +22,7 @@ IGSDB_OPEN_ID_CONNECT_CLIENT_SECRET=secret
 OPEN_TELEMETRY_HOST=host.docker.internal
 OPEN_TELEMETRY_GRPC_PORT=4017
 
-CUSTOMER_SUPPORT_USER=2c103b27-eb15-423a-a184-fdd6c64eefe2
+EMAIL_ADDRESS=christoph.maurer@ise.fraunhofer.de
 
 SMTP_HOST=email
 SMTP_PORT=25
diff --git a/.env.production.sample b/.env.production.sample
index ed0966e2c..1dbda821f 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -21,7 +21,7 @@ IGSDB_OPEN_ID_CONNECT_CLIENT_SECRET=
 OPEN_TELEMETRY_HOST=host.docker.internal
 OPEN_TELEMETRY_GRPC_PORT=4317
 
-CUSTOMER_SUPPORT_USER=2c103b27-eb15-423a-a184-fdd6c64eefe2
+EMAIL_ADDRESS=christoph.maurer@ise.fraunhofer.de
 
 SMTP_HOST=mta01.mx.fraunhofer.de
 SMTP_PORT=25
diff --git a/.env.staging.sample b/.env.staging.sample
index 6274cb3d3..749bbed18 100644
--- a/.env.staging.sample
+++ b/.env.staging.sample
@@ -21,7 +21,7 @@ IGSDB_OPEN_ID_CONNECT_CLIENT_SECRET=
 OPEN_TELEMETRY_HOST=host.docker.internal
 OPEN_TELEMETRY_GRPC_PORT=4317
 
-CUSTOMER_SUPPORT_USER=2c103b27-eb15-423a-a184-fdd6c64eefe2
+EMAIL_ADDRESS=christoph.maurer@ise.fraunhofer.de
 
 SMTP_HOST=email
 SMTP_PORT=25
diff --git a/backend/src/AppSettings.cs b/backend/src/AppSettings.cs
index fdb4fa81b..7882ee829 100644
--- a/backend/src/AppSettings.cs
+++ b/backend/src/AppSettings.cs
@@ -16,8 +16,7 @@ public sealed record AppSettings
 
     public string BootstrapUserPassword { get; init; } = "";
     public string OpenIdConnectClientSecret { get; init; } = "";
-    public string CustomerSupportUser { get; init; } = "";
-    public Guid CustomerSupportUserId => new Guid(CustomerSupportUser);
+    public string EmailAddress { get; init; } = "";
 
     public TestlabSolarFacadesSettings TestlabSolarFacades { get; init; } = new();
     public IgsdbSettings Igsdb { get; init; } = new();
diff --git a/backend/src/Data/DbSeeder.cs b/backend/src/Data/DbSeeder.cs
index efdfc2d18..2c59f3852 100644
--- a/backend/src/Data/DbSeeder.cs
+++ b/backend/src/Data/DbSeeder.cs
@@ -125,24 +125,18 @@ ILogger<DbSeeder> logger
         {
             if ((await manager.GetUsersInRoleAsync(Role.Administrator)).Count is 0)
             {
-                await CreateUserAsync(manager, null, AdministratorUser, appSettings.BootstrapUserPassword, logger);
+                await CreateUserAsync(manager, AdministratorUser, appSettings.BootstrapUserPassword, logger);
             }
         }
         else
         {
             var context = services.GetRequiredService<ApplicationDbContext>();
-            var customerSupportUser = await context.Users.AsNoTracking().SingleOrDefaultAsync(_ => _.Id == appSettings.CustomerSupportUserId);
-            if (customerSupportUser is not null)
-            {
-                await manager.AddToRoleAsync(customerSupportUser, Role.EnumToName(Enumerations.UserRole.SUPPORTER));
-            }
             foreach (var userInfo in Users)
             {
                 if (await manager.FindByEmailAsync(userInfo.EmailAddress) is null)
                 {
                     await CreateUserAsync(
                         manager,
-                        userInfo.Role is Enumerations.UserRole.SUPPORTER && customerSupportUser is null ? appSettings.CustomerSupportUserId : null,
                         userInfo,
                         appSettings.BootstrapUserPassword,
                         logger
@@ -154,16 +148,13 @@ await CreateUserAsync(
 
     private static async Task CreateUserAsync(
         UserManager<User> manager,
-        Guid? id,
         (string Name, string EmailAddress, Enumerations.UserRole Role) userInfo,
         string password,
         ILogger<DbSeeder> logger
     )
     {
         logger.CreatingUser(userInfo.Name);
-        var user = id is null
-            ? new User(userInfo.Name, userInfo.EmailAddress, null, null)
-            : new User(userInfo.Name, userInfo.EmailAddress, null, null);
+        var user = new User(userInfo.Name, userInfo.EmailAddress, null, null);
         await manager.CreateAsync(
             user,
             password
diff --git a/backend/src/Data/User.cs b/backend/src/Data/User.cs
index 75fd5dcf2..49decc61b 100644
--- a/backend/src/Data/User.cs
+++ b/backend/src/Data/User.cs
@@ -24,23 +24,6 @@ public User()
         // Parameterless constructor is needed by HotChocolate's `UseProjection`
     }
 
-    public User(
-        Guid id,
-        string name,
-        string email,
-        string? postalAddress,
-        Uri? websiteLocator
-    )
-    : this(
-        name,
-        email,
-        postalAddress,
-        websiteLocator
-    )
-    {
-        Id = id;
-    }
-
     public User(
         string name,
         string email,
diff --git a/backend/src/Services/EmailSender.cs b/backend/src/Services/EmailSender.cs
index 9efafbe67..1d554f90f 100644
--- a/backend/src/Services/EmailSender.cs
+++ b/backend/src/Services/EmailSender.cs
@@ -36,7 +36,7 @@ string body
         message.From.Add(
             new MailboxAddress(
                 "Metabase",
-                $"metabase@{appSettings.NonSubdomainUri.Host}"
+                appSettings.EmailAddress
             )
         );
         message.To.Add(
diff --git a/docker-compose.development.yaml b/docker-compose.development.yaml
index 46a2b1711..5efa61628 100644
--- a/docker-compose.development.yaml
+++ b/docker-compose.development.yaml
@@ -117,7 +117,7 @@ services:
       XBASE_Subdomain: "${SUBDOMAIN:?required}"
       XBASE_BootstrapUserPassword: "${BOOTSTRAP_USER_PASSWORD:?required}"
       XBASE_OpenIdConnectClientSecret: "${OPEN_ID_CONNECT_CLIENT_SECRET:?required}"
-      XBASE_CustomerSupportUser: "${CUSTOMER_SUPPORT_USER:?required}"
+      XBASE_EmailAddress: "${EMAIL_ADDRESS:?required}"
       XBASE_Database__Host: "database"
       XBASE_Database__Port: 5432
       XBASE_Database__Name: "${POSTGRES_DATABASE_NAME:?required}"
diff --git a/docker-compose.production.yaml b/docker-compose.production.yaml
index c4bd53fc1..bbcf6b1b4 100644
--- a/docker-compose.production.yaml
+++ b/docker-compose.production.yaml
@@ -102,7 +102,7 @@ services:
       XBASE_Subdomain: "${SUBDOMAIN:?required}"
       XBASE_BootstrapUserPassword: "${BOOTSTRAP_USER_PASSWORD:?required}"
       XBASE_OpenIdConnectClientSecret: "${OPEN_ID_CONNECT_CLIENT_SECRET:?required}"
-      XBASE_CustomerSupportUser: "${CUSTOMER_SUPPORT_USER:?required}"
+      XBASE_EmailAddress: "${EMAIL_ADDRESS:?required}"
       XBASE_Database__Host: "database"
       XBASE_Database__Port: 5432
       XBASE_Database__Name: "${POSTGRES_DATABASE_NAME:?required}"

From 7c756bf4eb9a31d9ec85c84a766025eff99641b5 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sun, 10 May 2026 20:12:18 +0200
Subject: [PATCH 023/145] Cut long floats, add units, improve spacing, show
 full information for prime direction/surface and switchable layers, and
 humanize display of tag names

---
 frontend/components/CielabColorView.tsx       |   7 +-
 frontend/components/CodeView.tsx              |   2 +-
 frontend/components/ConfirmButton.tsx         |  34 ++
 frontend/components/Copyable.tsx              |  18 +-
 frontend/components/CopyableBlock.tsx         |   7 +-
 .../components/DescriptionOrReference.tsx     |  28 ++
 frontend/components/EditButton.tsx            |  20 +-
 frontend/components/EnumSelect.tsx            |  27 ++
 frontend/components/EnumTag.tsx               |   4 +-
 frontend/components/ErrorAlert.tsx            |   1 +
 frontend/components/Float.tsx                 |  37 +-
 frontend/components/JsonView.tsx              |   6 +-
 frontend/components/JumpToId.tsx              |   5 +-
 frontend/components/NewButton.tsx             |  17 +-
 frontend/components/PaginatedIdSelect.tsx     |   6 +-
 frontend/components/Pagination.tsx            |   6 +-
 frontend/components/Reference.tsx             |  22 +-
 frontend/components/ReferenceSubform.tsx      |   8 +-
 .../components/AddAssembledOfComponent.tsx    |  10 +-
 .../components/AddPartOfComponent.tsx         |  10 +-
 .../components/ComponentSummary.tsx           | 387 +++++++++---------
 .../ConfirmComponentManufacturer.tsx          |   8 +-
 .../components/components/CreateComponent.tsx |  21 +-
 .../components/PaginatedComponents.tsx        |   4 +-
 .../components/components/UpdateComponent.tsx |  12 +-
 .../components/UpdateComponentAssembly.tsx    |  10 +-
 .../calorimetric/CalorimetricDataSummary.tsx  |  14 +-
 .../PaginatedCalorimetricData.tsx             |   2 +-
 .../data/geometric/GeometricDataSummary.tsx   |   6 +-
 .../data/geometric/PaginatedGeometricData.tsx |   2 +-
 .../PaginatedHygrothermalData.tsx             |   2 +-
 .../data/lifeCycle/PaginatedLifeCycleData.tsx |   2 +-
 .../data/optical/OpticalDataSummary.tsx       |  31 +-
 .../data/optical/PaginatedOpticalData.tsx     |   2 +-
 .../PaginatedPhotovoltaicData.tsx             |   2 +-
 .../dataFormats/PaginatedDataFormats.tsx      |   4 +-
 .../databases/PaginatedAnyDatabases.tsx       |   4 +-
 .../databases/PaginatedDatabases.tsx          |   4 +-
 .../components/entities/PaginatedEntities.tsx |  42 +-
 .../filtering/EnumFilterSubform.tsx           |  17 +-
 .../gnuPgKeys/PaginatedGnuPgKeys.tsx          |   4 +-
 .../AddInstitutionRepresentative.tsx          |   9 +-
 .../ConfirmInstitutionRepresentative.tsx      |   8 +-
 .../institutions/InstitutionSummary.tsx       |  14 +-
 .../institutions/PaginatedInstitutions.tsx    |   4 +-
 .../RepresentedInstitutionIdSelect.tsx        |   6 +-
 .../ConfirmInstitutionMethodDeveloper.tsx     |   8 +-
 .../methods/ConfirmUserMethodDeveloper.tsx    |   8 +-
 frontend/components/methods/CreateMethod.tsx  |  19 +-
 frontend/components/methods/MethodSummary.tsx |   6 +-
 .../components/methods/PaginatedMethods.tsx   |   4 +-
 frontend/components/methods/UpdateMethod.tsx  |  10 +-
 .../CreateOpenIdConnectApplication.tsx        |  52 +--
 .../OpenIdConnectApplicationSummary.tsx       |   7 +-
 .../PaginatedOpenIdConnectApplications.tsx    |   4 +-
 .../UpdateOpenIdConnectApplication.tsx        |  43 +-
 .../PaginatedOpenIdConnectAuthorizations.tsx  |   4 +-
 .../tokens/PaginatedOpenIdConnectTokens.tsx   |   4 +-
 frontend/components/users/AddUserRole.tsx     |   3 +-
 frontend/components/users/PaginatedUsers.tsx  |   4 +-
 frontend/components/users/User.tsx            |  18 +-
 frontend/components/users/UserSummary.tsx     |  14 +-
 frontend/lib/array.ts                         |   2 +-
 frontend/lib/string.ts                        |   4 +-
 frontend/queries/common.graphql               |   7 +
 frontend/queries/components.graphql           |  15 +-
 66 files changed, 596 insertions(+), 536 deletions(-)
 create mode 100644 frontend/components/ConfirmButton.tsx
 create mode 100644 frontend/components/DescriptionOrReference.tsx
 create mode 100644 frontend/components/EnumSelect.tsx

diff --git a/frontend/components/CielabColorView.tsx b/frontend/components/CielabColorView.tsx
index f65c73c75..8dc5fbc40 100644
--- a/frontend/components/CielabColorView.tsx
+++ b/frontend/components/CielabColorView.tsx
@@ -1,6 +1,6 @@
 import Copyable from "./Copyable";
 import { CielabColor } from "../__generated__/graphql";
-import Float from "./Float";
+import Float, { Unit } from "./Float";
 
 export default function CielabColorView({ value }: { value: CielabColor }) {
   return (
@@ -11,8 +11,9 @@ export default function CielabColorView({ value }: { value: CielabColor }) {
         return value;
       })}
     >
-      (L* <Float value={value.lStar} />, a* <Float value={value.aStar} />, b*{" "}
-      <Float value={value.bStar} />)
+      (L* <Float value={value.lStar} unit={Unit.UNITLESS} />, a*{" "}
+      <Float value={value.aStar} unit={Unit.UNITLESS} />, b*{" "}
+      <Float value={value.bStar} unit={Unit.UNITLESS} />)
     </Copyable>
   );
 }
diff --git a/frontend/components/CodeView.tsx b/frontend/components/CodeView.tsx
index da97b090f..fb828e3d7 100644
--- a/frontend/components/CodeView.tsx
+++ b/frontend/components/CodeView.tsx
@@ -16,7 +16,7 @@ export default function CodeView({
     );
   } else {
     return (
-      <CopyableBlock autoSize text={code}>
+      <CopyableBlock text={code}>
         <pre
           style={{
             overflow: "auto",
diff --git a/frontend/components/ConfirmButton.tsx b/frontend/components/ConfirmButton.tsx
new file mode 100644
index 000000000..8244964ea
--- /dev/null
+++ b/frontend/components/ConfirmButton.tsx
@@ -0,0 +1,34 @@
+import { CheckOutlined } from "@ant-design/icons";
+import { Button, ButtonProps, Tooltip } from "antd";
+
+interface ConfirmButtonProps extends Omit<
+  ButtonProps,
+  "type" | "icon" | "shape" | "children"
+> {
+  type?: "primary" | "default" | "icon";
+}
+
+export default function ConfirmButton({
+  type = "default",
+  ...rest
+}: ConfirmButtonProps) {
+  switch (type) {
+    case "icon":
+      return (
+        <Tooltip title="Confirm">
+          <Button
+            type="text"
+            icon={<CheckOutlined />}
+            shape="circle"
+            {...rest}
+          />
+        </Tooltip>
+      );
+    default:
+      return (
+        <Button type="primary" {...rest}>
+          Confirm
+        </Button>
+      );
+  }
+}
diff --git a/frontend/components/Copyable.tsx b/frontend/components/Copyable.tsx
index f72dc9778..29d321a15 100644
--- a/frontend/components/Copyable.tsx
+++ b/frontend/components/Copyable.tsx
@@ -13,14 +13,14 @@ export default function Copyable({
   color?: "white";
   children?: ReactNode;
 }) {
-  return (
-    <span>
-      <Space>
-        <span>{children == null ? text : children}</span>
-        <CopyButton getText={() => text} onlyIcon={onlyIcon} color={color}>
-          Copy
-        </CopyButton>
-      </Space>
-    </span>
+  const content = (
+    <>
+      <span>{children == null ? text : children}</span>
+      <CopyButton getText={() => text} onlyIcon={onlyIcon} color={color}>
+        Copy
+      </CopyButton>
+    </>
   );
+
+  return <span>{onlyIcon ? content : <Space>{content}</Space>}</span>;
 }
diff --git a/frontend/components/CopyableBlock.tsx b/frontend/components/CopyableBlock.tsx
index 223353328..fabb29b5b 100644
--- a/frontend/components/CopyableBlock.tsx
+++ b/frontend/components/CopyableBlock.tsx
@@ -5,12 +5,10 @@ import { ReactNode, useState } from "react";
 export default function CopyableBlock({
   text,
   color,
-  autoSize = false,
   children,
 }: {
   text: string;
   color?: "white";
-  autoSize?: boolean;
   children: ReactNode;
 }) {
   const [copied, setCopied] = useState(false);
@@ -19,10 +17,7 @@ export default function CopyableBlock({
     <div
       style={{
         position: "relative",
-        minHeight: autoSize ? undefined : "2.5lh",
-        minWidth: autoSize ? undefined : "10ch",
-        // paddingBottom: "1.5em",
-        // borderBottom: "1px solid grey",
+        minWidth: "16ch",
       }}
     >
       {children}
diff --git a/frontend/components/DescriptionOrReference.tsx b/frontend/components/DescriptionOrReference.tsx
new file mode 100644
index 000000000..b49d2ce05
--- /dev/null
+++ b/frontend/components/DescriptionOrReference.tsx
@@ -0,0 +1,28 @@
+import { Typography } from "antd";
+import { DescriptionOrReferencePartialFragment } from "../queries/common.generated";
+import Reference from "./Reference";
+
+interface ReferenceProps {
+  title: string;
+  data: DescriptionOrReferencePartialFragment;
+}
+
+export default function DescriptionOrReference({
+  title,
+  data,
+}: ReferenceProps) {
+  if (!data.description && !data.reference) {
+    return null;
+  }
+  return (
+    <div>
+      <Typography.Title level={5}>{title}</Typography.Title>
+      {data.description && (
+        <Typography.Paragraph type={data.reference ? "secondary" : undefined}>
+          {data.description}
+        </Typography.Paragraph>
+      )}
+      {data.reference && <Reference data={data.reference} />}
+    </div>
+  );
+}
diff --git a/frontend/components/EditButton.tsx b/frontend/components/EditButton.tsx
index 37a6111ef..21a085b86 100644
--- a/frontend/components/EditButton.tsx
+++ b/frontend/components/EditButton.tsx
@@ -1,13 +1,17 @@
 import { EditOutlined } from "@ant-design/icons";
-import { Button, Tooltip } from "antd";
+import { Button, ButtonProps, Tooltip } from "antd";
+
+interface EditButtonProps extends Omit<
+  ButtonProps,
+  "type" | "icon" | "shape" | "children"
+> {
+  type?: "text" | "default" | "icon";
+}
 
 export default function EditButton({
   type = "default",
-  onClick,
-}: {
-  type?: "text" | "default" | "icon";
-  onClick?: (e?: React.MouseEvent<HTMLElement>) => void;
-}) {
+  ...rest
+}: EditButtonProps) {
   switch (type) {
     case "icon":
       return (
@@ -16,13 +20,13 @@ export default function EditButton({
             type="text"
             icon={<EditOutlined />}
             shape="circle"
-            onClick={onClick}
+            {...rest}
           />
         </Tooltip>
       );
     default:
       return (
-        <Button type="default" onClick={onClick}>
+        <Button type="default" {...rest}>
           Edit
         </Button>
       );
diff --git a/frontend/components/EnumSelect.tsx b/frontend/components/EnumSelect.tsx
new file mode 100644
index 000000000..78ad26bc1
--- /dev/null
+++ b/frontend/components/EnumSelect.tsx
@@ -0,0 +1,27 @@
+import { Select, SelectProps } from "antd";
+import { humanize } from "../lib/string";
+
+export const allEnumSelectOptions = <T extends string | number>(
+  enumObject: Record<string, T>,
+) =>
+  Object.entries(enumObject)
+    // exclude reverse mappings
+    .filter(([key]) => isNaN(Number(key)))
+    .map(([_, value]) => ({
+      label: humanize(String(value), "all-upper"),
+      value: value,
+    }));
+
+interface EnumSelectProps<T extends string | number> extends Omit<
+  SelectProps<T>,
+  "options"
+> {
+  enumObject: Record<string, T>;
+}
+
+export default function EnumSelect<T extends string | number>({
+  enumObject,
+  ...rest
+}: EnumSelectProps<T>) {
+  return <Select<T> {...rest} options={allEnumSelectOptions(enumObject)} />;
+}
diff --git a/frontend/components/EnumTag.tsx b/frontend/components/EnumTag.tsx
index ea6b35e4a..5cb078379 100644
--- a/frontend/components/EnumTag.tsx
+++ b/frontend/components/EnumTag.tsx
@@ -1,16 +1,16 @@
 import { Tag, TagProps } from "antd";
+import { humanize } from "../lib/string";
 
 export default function EnumTag(props: TagProps) {
   return (
     <Tag
       {...props}
       style={{
-        textTransform: "lowercase",
         fontWeight: "normal",
         ...props.style,
       }}
     >
-      {props.children}
+      {props.children && humanize(props.children.toString(), "none-upper")}
     </Tag>
   );
 }
diff --git a/frontend/components/ErrorAlert.tsx b/frontend/components/ErrorAlert.tsx
index 23537461e..d0c05dcad 100644
--- a/frontend/components/ErrorAlert.tsx
+++ b/frontend/components/ErrorAlert.tsx
@@ -16,6 +16,7 @@ export default function ErrorAlert({ messages }: { messages: string[] }) {
           </ul>
         )
       }
+      style={{ marginBottom: "1em" }}
     />
   ) : null;
 }
diff --git a/frontend/components/Float.tsx b/frontend/components/Float.tsx
index 44591394a..5b11ac080 100644
--- a/frontend/components/Float.tsx
+++ b/frontend/components/Float.tsx
@@ -2,10 +2,42 @@ import Copyable from "./Copyable";
 import { Scalars } from "../__generated__/graphql";
 import { Tooltip } from "antd";
 
+export enum Unit {
+  UNITLESS,
+  METER,
+  WATT_PER_SQUARE_METER_KELVIN,
+}
+
+function formatSmartCut(value: number) {
+  const string = value.toString();
+  const dotIndex = string.indexOf(".");
+  if (dotIndex === -1) return string;
+  const firstNonZero = string.search(/[1-9]/);
+  const significantCut = firstNonZero + 3;
+  const minDecimalCut = dotIndex + 4;
+  const finalCutIndex = Math.max(significantCut, minDecimalCut);
+  if (string.length > finalCutIndex) {
+    return string.substring(0, finalCutIndex) + "…";
+  }
+  return string;
+}
+
+const unitLabels = {
+  [Unit.METER]: "m",
+  [Unit.WATT_PER_SQUARE_METER_KELVIN]: (
+    <>
+      W·m<sup>-2</sup>·K<sup>-1</sup>
+      {/* <span>W/(m<sup>2</sup>·K)</span> */}
+    </>
+  ),
+};
+
 export default function Float({
   value,
+  unit,
 }: {
   value: Scalars["Float"]["output"];
+  unit: Unit;
 }) {
   return (
     <Tooltip
@@ -22,7 +54,10 @@ export default function Float({
         },
       }}
     >
-      <code>{value}</code>
+      <code>
+        {formatSmartCut(value)}
+        {unit != Unit.UNITLESS && <> {unitLabels[unit]}</>}
+      </code>
     </Tooltip>
   );
 }
diff --git a/frontend/components/JsonView.tsx b/frontend/components/JsonView.tsx
index fc8a5d4bc..dc53cfb31 100644
--- a/frontend/components/JsonView.tsx
+++ b/frontend/components/JsonView.tsx
@@ -5,24 +5,22 @@ export default function JsonView({
   data,
   inline = false,
   color,
-  autoSize = true,
 }: {
   data: object;
   inline?: boolean;
   color?: "white";
-  autoSize?: boolean;
 }) {
   if (inline) {
     const jsonString = JSON.stringify(data);
     return (
-      <Tooltip title={<JsonView autoSize={false} data={data} color="white" />}>
+      <Tooltip title={<JsonView data={data} color="white" />}>
         <code>{jsonString}</code>
       </Tooltip>
     );
   } else {
     const jsonString = JSON.stringify(data, null, 2);
     return (
-      <CopyableBlock autoSize={autoSize} text={jsonString} color={color}>
+      <CopyableBlock text={jsonString} color={color}>
         <pre
           style={{
             overflow: "auto",
diff --git a/frontend/components/JumpToId.tsx b/frontend/components/JumpToId.tsx
index 0121e167a..093b5fdea 100644
--- a/frontend/components/JumpToId.tsx
+++ b/frontend/components/JumpToId.tsx
@@ -4,6 +4,7 @@ import { useRouter } from "next/router";
 import { Scalars } from "../__generated__/graphql";
 import { Route } from "next";
 import PaginatedIdSelect, { PaginatedSelectProps } from "./PaginatedIdSelect";
+import { isUuid } from "../lib/string";
 
 export type JumpToIdProps = {
   query?: PaginatedSelectProps["query"];
@@ -13,10 +14,10 @@ export type JumpToIdProps = {
 
 export default function JumpToId({ query, route, style }: JumpToIdProps) {
   const router = useRouter();
-  const [id, setId] = useState("");
+  const [id, setId] = useState<string | undefined>(undefined);
 
   const handleJump = () => {
-    if (id) {
+    if (id && isUuid(id)) {
       router.push(route(id));
     }
   };
diff --git a/frontend/components/NewButton.tsx b/frontend/components/NewButton.tsx
index 9f9b59a3d..e00fa98c7 100644
--- a/frontend/components/NewButton.tsx
+++ b/frontend/components/NewButton.tsx
@@ -1,15 +1,16 @@
 import { FormOutlined } from "@ant-design/icons";
-import { Button, Tooltip } from "antd";
+import { Button, ButtonProps, Tooltip } from "antd";
+
+interface NewButtonProps extends Omit<ButtonProps, "type" | "icon" | "shape"> {
+  type?: "text" | "default" | "icon";
+}
 
 export default function NewButton({
   type = "default",
   onClick,
   children,
-}: {
-  type?: "text" | "default" | "icon";
-  onClick?: (e?: React.MouseEvent<HTMLElement>) => void;
-  children?: React.ReactNode;
-}) {
+  ...rest
+}: NewButtonProps) {
   switch (type) {
     case "icon":
       return (
@@ -18,13 +19,13 @@ export default function NewButton({
             type="text"
             icon={<FormOutlined />}
             shape="circle"
-            onClick={onClick}
+            {...rest}
           />
         </Tooltip>
       );
     default:
       return (
-        <Button type="default" onClick={onClick}>
+        <Button type="default" {...rest}>
           New {children}
         </Button>
       );
diff --git a/frontend/components/PaginatedIdSelect.tsx b/frontend/components/PaginatedIdSelect.tsx
index 42200a5cd..6e8d17644 100644
--- a/frontend/components/PaginatedIdSelect.tsx
+++ b/frontend/components/PaginatedIdSelect.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { Select, SelectProps, Space, Spin } from "antd";
+import { Select, SelectProps, Spin } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useDebounce } from "../lib/hooks/useDebounce";
 import { Scalars, SortEnumType } from "../__generated__/graphql";
@@ -130,9 +130,9 @@ export default function PaginatedIdSelect({
       loading={loading}
       options={edges?.map(({ node }) => ({
         label: (
-          <Space>
+          <span>
             {node.name} (<Id value={node.uuid} />)
-          </Space>
+          </span>
         ),
         value: node.uuid,
       }))}
diff --git a/frontend/components/Pagination.tsx b/frontend/components/Pagination.tsx
index 85f0ec080..f6dbacfde 100644
--- a/frontend/components/Pagination.tsx
+++ b/frontend/components/Pagination.tsx
@@ -1,4 +1,4 @@
-import { Space, Button, Select, Tooltip, Spin } from "antd";
+import { Button, Select, Tooltip, Spin, Flex } from "antd";
 import {
   LeftOutlined,
   RightOutlined,
@@ -44,7 +44,7 @@ export default function Pagination({
   onPageSizeChange,
 }: PaginationProps) {
   return (
-    <Space style={{ display: "flex", justifyContent: "flex-end" }}>
+    <Flex justify="flex-end" align="center" gap="small">
       <Tooltip title="Previous">
         <Button
           onClick={onPrevious}
@@ -77,6 +77,6 @@ export default function Pagination({
         disabled={fetching != null}
         style={{ width: "max-content" }}
       />
-    </Space>
+    </Flex>
   );
 }
diff --git a/frontend/components/Reference.tsx b/frontend/components/Reference.tsx
index d5e730121..285f1fbca 100644
--- a/frontend/components/Reference.tsx
+++ b/frontend/components/Reference.tsx
@@ -5,26 +5,10 @@ import {
   SafetyCertificateOutlined,
 } from "@ant-design/icons";
 import { Iconize } from "./Iconize";
-import { isTruthy } from "../lib/array";
-import { ReactNode } from "react";
-import { Fragment } from "react/jsx-runtime";
+import { intersperse, isTruthy } from "../lib/array";
 import IdentifierItem from "./IdentifierItem";
 import { ReferencePartialFragment } from "../queries/common.generated";
 
-const joinWithCopyableSpace = (
-  nodes: ReactNode[],
-  separator: string = " ",
-): ReactNode => {
-  return nodes.reduce((acc, curr, index) => {
-    if (index === 0) return [curr];
-    return [
-      ...(acc as ReactNode[]),
-      <Fragment key={index}>{separator}</Fragment>,
-      curr,
-    ];
-  }, [] as ReactNode[]);
-};
-
 interface ReferenceProps {
   data: ReferencePartialFragment;
 }
@@ -38,7 +22,7 @@ export default function Reference({ data }: ReferenceProps) {
       <Iconize icon={<Icon />}>{data.__typename}</Iconize>{" "}
       <span>
         {data.__typename === "Publication" &&
-          joinWithCopyableSpace(
+          intersperse(
             [
               data.authors && data.authors.length > 0 && (
                 <Typography.Text strong key="authors">
@@ -75,7 +59,7 @@ export default function Reference({ data }: ReferenceProps) {
             ].filter(isTruthy),
           )}
         {data.__typename === "Standard" &&
-          joinWithCopyableSpace(
+          intersperse(
             [
               data.standardizers && data.standardizers.length > 0 && (
                 <Typography.Text strong key="standardizers">
diff --git a/frontend/components/ReferenceSubform.tsx b/frontend/components/ReferenceSubform.tsx
index bc1be9a24..f07a0a697 100644
--- a/frontend/components/ReferenceSubform.tsx
+++ b/frontend/components/ReferenceSubform.tsx
@@ -13,6 +13,7 @@ import { useState } from "react";
 import { Standardizer, Standard, Publication } from "../__generated__/graphql";
 import DeleteButton from "./DeleteButton";
 import TextArea from "antd/es/input/TextArea";
+import EnumSelect from "./EnumSelect";
 
 enum ReferenceKind {
   None = "None",
@@ -357,13 +358,10 @@ export default function ReferenceSubform({
                 : null
             }
           >
-            <Select
+            <EnumSelect
+              enumObject={Standardizer}
               mode="multiple"
               placeholder="Please select"
-              options={Object.entries(Standardizer).map(([_key, value]) => ({
-                label: value,
-                value: value,
-              }))}
             />
           </Form.Item>
         </>
diff --git a/frontend/components/components/AddAssembledOfComponent.tsx b/frontend/components/components/AddAssembledOfComponent.tsx
index 21e79f5b1..f7a4e67a9 100644
--- a/frontend/components/components/AddAssembledOfComponent.tsx
+++ b/frontend/components/components/AddAssembledOfComponent.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Form, Button, InputNumber, Select, Space } from "antd";
+import { Form, Button, InputNumber, Space } from "antd";
 import {
   AddComponentAssemblyDocument,
   AddComponentAssemblyMutation,
@@ -9,6 +9,7 @@ import { useState } from "react";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ComponentIdSelect from "./ComponentIdSelect";
 import ErrorAlert from "../ErrorAlert";
+import EnumSelect from "../EnumSelect";
 
 type FormValues = {
   assembledComponentId: Scalars["Uuid"]["input"];
@@ -90,13 +91,10 @@ export default function AddAssembledOfComponent({
             <InputNumber placeholder="Index" min={1} max={255} />
           </Form.Item>
           <Form.Item noStyle label="Prime Surface" name="primeSurface">
-            <Select
+            <EnumSelect
+              enumObject={PrimeSurface}
               allowClear={true}
               placeholder="Prime Surface"
-              options={Object.entries(PrimeSurface).map(([_key, value]) => ({
-                label: value,
-                value: value,
-              }))}
             />
           </Form.Item>
           <Button type="primary" htmlType="submit" loading={mutating}>
diff --git a/frontend/components/components/AddPartOfComponent.tsx b/frontend/components/components/AddPartOfComponent.tsx
index 7fcf21a68..46b03170c 100644
--- a/frontend/components/components/AddPartOfComponent.tsx
+++ b/frontend/components/components/AddPartOfComponent.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Form, Button, InputNumber, Select, Space } from "antd";
+import { Form, Button, InputNumber, Space } from "antd";
 import {
   AddComponentAssemblyDocument,
   AddComponentAssemblyMutation,
@@ -9,6 +9,7 @@ import { useState } from "react";
 import ComponentIdSelect from "./ComponentIdSelect";
 import ErrorAlert from "../ErrorAlert";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import EnumSelect from "../EnumSelect";
 
 type FormValues = {
   partComponentId: Scalars["Uuid"]["input"];
@@ -90,13 +91,10 @@ export default function AddPartOfComponent({
             <InputNumber placeholder="Index" min={1} max={255} />
           </Form.Item>
           <Form.Item noStyle label="Prime Surface" name="primeSurface">
-            <Select
+            <EnumSelect
+              enumObject={PrimeSurface}
               allowClear={true}
               placeholder="Prime Surface"
-              options={Object.entries(PrimeSurface).map(([_key, value]) => ({
-                label: value,
-                value: value,
-              }))}
             />
           </Form.Item>
           <Button type="primary" htmlType="submit" loading={mutating}>
diff --git a/frontend/components/components/ComponentSummary.tsx b/frontend/components/components/ComponentSummary.tsx
index 18fe6c02c..54ec00b6b 100644
--- a/frontend/components/components/ComponentSummary.tsx
+++ b/frontend/components/components/ComponentSummary.tsx
@@ -1,4 +1,4 @@
-import { Descriptions, Space, Tag } from "antd";
+import { Space, Tag } from "antd";
 import { isTruthy } from "../../lib/array";
 import {
   ComponentsPartialFragment,
@@ -25,6 +25,8 @@ import RemoveComponentAssembly from "./RemoveComponentAssembly";
 import UpdateComponentAssembly from "./UpdateComponentAssembly";
 import AddAssembledOfComponent from "./AddAssembledOfComponent";
 import EnumTag from "../EnumTag";
+import { humanize } from "../../lib/string";
+import DescriptionOrReference from "../DescriptionOrReference";
 
 const renderManufacturerList = (
   manufacturers:
@@ -37,7 +39,7 @@ const renderManufacturerList = (
     items={manufacturers.edges}
     renderItem={(edge) => (
       <span key={edge.node.id}>
-        <EntityLink entity={edge.node} route={paths.institution} />{" "}
+        <EntityLink entity={edge.node} route={paths.institution} />
         {!hideExtra && edge.isAuthorizedToRemoveEdge && (
           <RemoveComponentManufacturer
             componentId={componentId}
@@ -56,6 +58,173 @@ export default function ComponentSummary({
   entity: ComponentsPartialFragment | ComponentPartialFragment;
   hideExtra?: boolean;
 }) {
+  const reflexiveRelations = [
+    "assembledOf" in entity &&
+      (entity.assembledOf.edges.length > 0 ||
+        (!hideExtra && entity.assembledOf.isAuthorizedToAddEdge)) && (
+        <div>
+          Assembled of{" "}
+          <InlineList
+            items={entity.assembledOf.edges}
+            renderItem={(edge) => (
+              <span key={edge.node.id}>
+                <Space>
+                  <EntityLink entity={edge.node} route={paths.component} />
+                  {edge.index && <Tag color="purple">Layer {edge.index}</Tag>}
+                  {edge.primeSurface && (
+                    <Tag color="volcano">
+                      Prime Surface "{humanize(edge.primeSurface, "all-upper")}"
+                    </Tag>
+                  )}
+                </Space>
+                {!hideExtra && edge.isAuthorizedToUpdateEdge && (
+                  <UpdateComponentAssembly
+                    assembledComponent={{
+                      uuid: entity.uuid,
+                      name: entity.name,
+                    }}
+                    partComponent={{
+                      uuid: edge.node.uuid,
+                      name: edge.node.name,
+                    }}
+                    index={edge.index}
+                    primeSurface={edge.primeSurface}
+                  />
+                )}
+                {!hideExtra && edge.isAuthorizedToRemoveEdge && (
+                  <RemoveComponentAssembly
+                    assembledComponentId={entity.uuid}
+                    partComponentId={edge.node.uuid}
+                  />
+                )}
+              </span>
+            )}
+          />
+          {!hideExtra && entity.assembledOf.isAuthorizedToAddEdge && (
+            <AddPartOfComponent assembledComponentId={entity.uuid} />
+          )}
+        </div>
+      ),
+    "partOf" in entity &&
+      (entity.partOf.edges.length > 0 ||
+        (!hideExtra && entity.partOf.isAuthorizedToAddEdge)) && (
+        <div>
+          Part of{" "}
+          <InlineList
+            items={entity.partOf.edges}
+            renderItem={(edge) => (
+              <span key={edge.node.id}>
+                <Space>
+                  <EntityLink entity={edge.node} route={paths.component} />
+                  {edge.index && <Tag color="purple">Layer {edge.index}</Tag>}
+                  {edge.primeSurface && (
+                    <Tag color="volcano">
+                      Prime Surface "{humanize(edge.primeSurface, "all-upper")}"
+                    </Tag>
+                  )}
+                </Space>
+                {!hideExtra && edge.isAuthorizedToUpdateEdge && (
+                  <UpdateComponentAssembly
+                    assembledComponent={{
+                      uuid: edge.node.uuid,
+                      name: edge.node.name,
+                    }}
+                    partComponent={{
+                      uuid: entity.uuid,
+                      name: entity.name,
+                    }}
+                    index={edge.index}
+                    primeSurface={edge.primeSurface}
+                  />
+                )}
+                {!hideExtra && edge.isAuthorizedToRemoveEdge && (
+                  <RemoveComponentAssembly
+                    assembledComponentId={edge.node.uuid}
+                    partComponentId={entity.uuid}
+                  />
+                )}
+              </span>
+            )}
+          />
+          {!hideExtra && entity.partOf.isAuthorizedToAddEdge && (
+            <AddAssembledOfComponent partComponentId={entity.uuid} />
+          )}
+        </div>
+      ),
+    "variantOf" in entity &&
+      (entity.variantOf.edges.length > 0 ||
+        (!hideExtra && entity.variantOf.isAuthorizedToAddEdge)) && (
+        <div>
+          Variant of{" "}
+          <InlineList
+            items={entity.variantOf.edges}
+            renderItem={(edge) => (
+              <span key={edge.node.id}>
+                <EntityLink entity={edge.node} route={paths.component} />
+                {!hideExtra && edge.isAuthorizedToRemoveEdge && (
+                  <RemoveComponentVariant
+                    oneComponentId={entity.uuid}
+                    otherComponentId={edge.node.uuid}
+                  />
+                )}
+              </span>
+            )}
+          />
+          {!hideExtra && entity.variantOf.isAuthorizedToAddEdge && (
+            <AddVariantOfComponent componentId={entity.uuid} />
+          )}
+        </div>
+      ),
+    "generalizationOf" in entity &&
+      (entity.generalizationOf.edges.length > 0 ||
+        (!hideExtra && entity.generalizationOf.isAuthorizedToAddEdge)) && (
+        <div>
+          Generalization of{" "}
+          <InlineList
+            items={entity.generalizationOf.edges}
+            renderItem={(edge) => (
+              <span key={edge.node.id}>
+                <EntityLink entity={edge.node} route={paths.component} />
+                {!hideExtra && edge.isAuthorizedToRemoveEdge && (
+                  <RemoveComponentGeneralization
+                    generalComponentId={entity.uuid}
+                    concreteComponentId={edge.node.uuid}
+                  />
+                )}
+              </span>
+            )}
+          />
+          {!hideExtra && entity.generalizationOf.isAuthorizedToAddEdge && (
+            <AddConcretizationOfComponent generalComponentId={entity.uuid} />
+          )}
+        </div>
+      ),
+    "concretizationOf" in entity &&
+      (entity.concretizationOf.edges.length > 0 ||
+        (!hideExtra && entity.concretizationOf.isAuthorizedToAddEdge)) && (
+        <div>
+          Concretization of{" "}
+          <InlineList
+            items={entity.concretizationOf.edges}
+            renderItem={(edge) => (
+              <span key={edge.node.id}>
+                <EntityLink entity={edge.node} route={paths.component} />
+                {!hideExtra && edge.isAuthorizedToRemoveEdge && (
+                  <RemoveComponentGeneralization
+                    generalComponentId={edge.node.uuid}
+                    concreteComponentId={entity.uuid}
+                  />
+                )}
+              </span>
+            )}
+          />
+          {!hideExtra && entity.concretizationOf.isAuthorizedToAddEdge && (
+            <AddGeneralizationOfComponent concreteComponentId={entity.uuid} />
+          )}
+        </div>
+      ),
+  ].filter(isTruthy);
+
   return (
     <EntitySummary
       entity={entity}
@@ -90,6 +259,7 @@ export default function ComponentSummary({
             {entity.pendingManufacturers &&
               entity.pendingManufacturers.edges.length > 0 && (
                 <>
+                  {" "}
                   Awaiting verification of
                   {renderManufacturerList(
                     entity.pendingManufacturers,
@@ -113,202 +283,35 @@ export default function ComponentSummary({
           />
         )}
       </div>
-      {"assembledOf" in entity &&
-        (entity.assembledOf.edges.length > 0 ||
-          (!hideExtra && entity.assembledOf.isAuthorizedToAddEdge)) && (
-          <div>
-            Assembled of{" "}
-            <InlineList
-              items={entity.assembledOf.edges}
-              renderItem={(edge) => (
-                <span key={edge.node.id}>
-                  <EntityLink entity={edge.node} route={paths.component} />{" "}
-                  {edge.index && <Tag color="purple">Layer {edge.index}</Tag>}
-                  {edge.primeSurface && (
-                    <Tag color="volcano">
-                      Prime Surface "{edge.primeSurface}"
-                    </Tag>
-                  )}
-                  {!hideExtra && edge.isAuthorizedToUpdateEdge && (
-                    <UpdateComponentAssembly
-                      assembledComponent={{
-                        uuid: entity.uuid,
-                        name: entity.name,
-                      }}
-                      partComponent={{
-                        uuid: edge.node.uuid,
-                        name: edge.node.name,
-                      }}
-                      index={edge.index}
-                      primeSurface={edge.primeSurface}
-                    />
-                  )}
-                  {!hideExtra && edge.isAuthorizedToRemoveEdge && (
-                    <RemoveComponentAssembly
-                      assembledComponentId={entity.uuid}
-                      partComponentId={edge.node.uuid}
-                    />
-                  )}
-                </span>
-              )}
-            />
-            {!hideExtra && entity.assembledOf.isAuthorizedToAddEdge && (
-              <AddPartOfComponent assembledComponentId={entity.uuid} />
-            )}
-          </div>
-        )}
-      {"partOf" in entity &&
-        (entity.partOf.edges.length > 0 ||
-          (!hideExtra && entity.partOf.isAuthorizedToAddEdge)) && (
-          <div>
-            Part of{" "}
-            <InlineList
-              items={entity.partOf.edges}
-              renderItem={(edge) => (
-                <span key={edge.node.id}>
-                  <Space>
-                    <EntityLink entity={edge.node} route={paths.component} />
-                    <span>
-                      {edge.index && (
-                        <Tag color="purple">Layer {edge.index}</Tag>
-                      )}
-                      {edge.primeSurface && (
-                        <Tag color="volcano">
-                          Prime Surface "{edge.primeSurface}"
-                        </Tag>
-                      )}
-                    </span>
-                  </Space>
-                  {!hideExtra && edge.isAuthorizedToUpdateEdge && (
-                    <UpdateComponentAssembly
-                      assembledComponent={{
-                        uuid: edge.node.uuid,
-                        name: edge.node.name,
-                      }}
-                      partComponent={{
-                        uuid: entity.uuid,
-                        name: entity.name,
-                      }}
-                      index={edge.index}
-                      primeSurface={edge.primeSurface}
-                    />
-                  )}
-                  {!hideExtra && edge.isAuthorizedToRemoveEdge && (
-                    <RemoveComponentAssembly
-                      assembledComponentId={edge.node.uuid}
-                      partComponentId={entity.uuid}
-                    />
-                  )}
-                </span>
-              )}
-            />
-            {!hideExtra && entity.partOf.isAuthorizedToAddEdge && (
-              <AddAssembledOfComponent partComponentId={entity.uuid} />
-            )}
-          </div>
-        )}
-      {"variantOf" in entity &&
-        (entity.variantOf.edges.length > 0 ||
-          (!hideExtra && entity.variantOf.isAuthorizedToAddEdge)) && (
-          <div>
-            Variant of{" "}
-            <InlineList
-              items={entity.variantOf.edges}
-              renderItem={(edge) => (
-                <span key={edge.node.id}>
-                  <EntityLink entity={edge.node} route={paths.component} />{" "}
-                  {!hideExtra && edge.isAuthorizedToRemoveEdge && (
-                    <RemoveComponentVariant
-                      oneComponentId={entity.uuid}
-                      otherComponentId={edge.node.uuid}
-                    />
-                  )}
-                </span>
-              )}
-            />
-            {!hideExtra && entity.variantOf.isAuthorizedToAddEdge && (
-              <AddVariantOfComponent componentId={entity.uuid} />
-            )}
-          </div>
-        )}
-      {"generalizationOf" in entity &&
-        (entity.generalizationOf.edges.length > 0 ||
-          (!hideExtra && entity.generalizationOf.isAuthorizedToAddEdge)) && (
-          <div>
-            Generalization of{" "}
-            <InlineList
-              items={entity.generalizationOf.edges}
-              renderItem={(edge) => (
-                <span key={edge.node.id}>
-                  <EntityLink entity={edge.node} route={paths.component} />{" "}
-                  {!hideExtra && edge.isAuthorizedToRemoveEdge && (
-                    <RemoveComponentGeneralization
-                      generalComponentId={entity.uuid}
-                      concreteComponentId={edge.node.uuid}
-                    />
-                  )}
-                </span>
-              )}
-            />
-            {!hideExtra && entity.generalizationOf.isAuthorizedToAddEdge && (
-              <AddConcretizationOfComponent generalComponentId={entity.uuid} />
-            )}
-          </div>
-        )}
-      {"concretizationOf" in entity &&
-        (entity.concretizationOf.edges.length > 0 ||
-          (!hideExtra && entity.concretizationOf.isAuthorizedToAddEdge)) && (
-          <div>
-            Concretization of{" "}
-            <InlineList
-              items={entity.concretizationOf.edges}
-              renderItem={(edge) => (
-                <span key={edge.node.id}>
-                  <EntityLink entity={edge.node} route={paths.component} />{" "}
-                  {!hideExtra && edge.isAuthorizedToRemoveEdge && (
-                    <RemoveComponentGeneralization
-                      generalComponentId={edge.node.uuid}
-                      concreteComponentId={entity.uuid}
-                    />
-                  )}
-                </span>
-              )}
-            />
-            {!hideExtra && entity.concretizationOf.isAuthorizedToAddEdge && (
-              <AddGeneralizationOfComponent concreteComponentId={entity.uuid} />
-            )}
-          </div>
-        )}
-      {"manager" in entity && entity.manager?.node && (
-        <div>
-          <Manager data={entity.manager.node} />
-        </div>
+      {reflexiveRelations.length > 0 && <div>{reflexiveRelations}</div>}
+      {"prime" in entity && entity.prime?.surface && (
+        <DescriptionOrReference
+          title="Prime Surface"
+          data={entity.prime.surface}
+        />
+      )}
+      {"prime" in entity && entity.prime?.direction && (
+        <DescriptionOrReference
+          title="Prime Direction"
+          data={entity.prime.direction}
+        />
+      )}
+      {"switchableLayers" in entity && entity.switchableLayers && (
+        <DescriptionOrReference
+          title="Switchable Layers"
+          data={entity.switchableLayers}
+        />
       )}
       {"extras" in entity && entity.extras != null && (
         <div>
           <JsonView data={entity.extras} />
         </div>
       )}
-      <Descriptions size="small" column={1}>
-        {"prime" in entity && entity.prime?.surface && (
-          <Descriptions.Item label="Prime Surface">
-            {entity.prime?.surface?.description}{" "}
-            {entity.prime?.surface?.reference?.title}
-          </Descriptions.Item>
-        )}
-        {"prime" in entity && entity.prime?.direction && (
-          <Descriptions.Item label="Prime Direction">
-            {entity.prime?.direction?.description}{" "}
-            {entity.prime?.direction?.reference?.title}
-          </Descriptions.Item>
-        )}
-        {"switchableLayers" in entity && entity.switchableLayers && (
-          <Descriptions.Item label="Switchable Layers">
-            {entity.switchableLayers?.description}{" "}
-            {entity.switchableLayers?.reference?.title}
-          </Descriptions.Item>
-        )}
-      </Descriptions>
+      {"manager" in entity && entity.manager?.node && (
+        <div>
+          <Manager data={entity.manager.node} />
+        </div>
+      )}
     </EntitySummary>
   );
 }
diff --git a/frontend/components/components/ConfirmComponentManufacturer.tsx b/frontend/components/components/ConfirmComponentManufacturer.tsx
index f88d65fe9..0678c5624 100644
--- a/frontend/components/components/ConfirmComponentManufacturer.tsx
+++ b/frontend/components/components/ConfirmComponentManufacturer.tsx
@@ -5,7 +5,7 @@ import {
   ConfirmComponentManufacturerMutation,
 } from "../../queries/componentManufacturers.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
-import { Button } from "antd";
+import ConfirmButton from "../ConfirmButton";
 
 interface Props {
   componentId: Scalars["Uuid"]["input"];
@@ -41,9 +41,5 @@ export default function ConfirmComponentManufacturer({
       },
     );
 
-  return (
-    <Button onClick={confirm} loading={mutating}>
-      Confirm
-    </Button>
-  );
+  return <ConfirmButton onClick={confirm} loading={mutating} />;
 }
diff --git a/frontend/components/components/CreateComponent.tsx b/frontend/components/components/CreateComponent.tsx
index b10676c92..48af608d0 100644
--- a/frontend/components/components/CreateComponent.tsx
+++ b/frontend/components/components/CreateComponent.tsx
@@ -1,14 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import {
-  DatePicker,
-  Select,
-  Form,
-  Input,
-  Button,
-  Divider,
-  App,
-  Modal,
-} from "antd";
+import { DatePicker, Form, Input, Button, Divider, App, Modal } from "antd";
 import {
   CreateComponentDocument,
   ComponentsDocument,
@@ -29,6 +20,7 @@ import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import NewButton from "../NewButton";
 import ComponentSummary from "./ComponentSummary";
 import RepresentedInstitutionIdSelect from "../institutions/RepresentedInstitutionIdSelect";
+import EnumSelect from "../EnumSelect";
 
 type FormValues = {
   name: string;
@@ -202,15 +194,10 @@ export default function CreateComponent({
             <DatePicker.RangePicker allowEmpty={[true, true]} showTime />
           </Form.Item>
           <Form.Item label="Categories" name="categories">
-            <Select
+            <EnumSelect
+              enumObject={ComponentCategory}
               mode="multiple"
               placeholder="Please select"
-              options={Object.entries(ComponentCategory).map(
-                ([_key, value]) => ({
-                  label: value,
-                  value: value,
-                }),
-              )}
             />
           </Form.Item>
           <Form.Item
diff --git a/frontend/components/components/PaginatedComponents.tsx b/frontend/components/components/PaginatedComponents.tsx
index 2bb02b4ce..ba0f3b226 100644
--- a/frontend/components/components/PaginatedComponents.tsx
+++ b/frontend/components/components/PaginatedComponents.tsx
@@ -32,8 +32,8 @@ export default function PaginatedComponents({
     >
       entitiesQuery={ComponentsDocument}
       namesQuery={ComponentNamesDocument}
-      where={where}
-      order={order}
+      baseWhere={where}
+      defaultOrder={order}
       showJump={showJump}
       route={paths.component}
       extra={extra}
diff --git a/frontend/components/components/UpdateComponent.tsx b/frontend/components/components/UpdateComponent.tsx
index 3c447de77..cc75e7fbd 100644
--- a/frontend/components/components/UpdateComponent.tsx
+++ b/frontend/components/components/UpdateComponent.tsx
@@ -5,7 +5,7 @@ import {
   ComponentPartialFragment,
 } from "../../queries/components.generated";
 import dayjs from "dayjs";
-import { Form, Input, Button, Modal, DatePicker, Select, Divider } from "antd";
+import { Form, Input, Button, Modal, DatePicker, Divider } from "antd";
 import { useState } from "react";
 import {
   ComponentCategory,
@@ -16,6 +16,7 @@ import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import EditButton from "../EditButton";
+import EnumSelect from "../EnumSelect";
 
 type FormValues = {
   name: string;
@@ -180,15 +181,10 @@ export default function UpdateComponent({ component }: UpdateComponentProps) {
             name="categories"
             initialValue={component.categories}
           >
-            <Select
+            <EnumSelect
+              enumObject={ComponentCategory}
               mode="multiple"
               placeholder="Please select"
-              options={Object.entries(ComponentCategory).map(
-                ([_key, value]) => ({
-                  label: value,
-                  value: value,
-                }),
-              )}
             />
           </Form.Item>
           <Divider />
diff --git a/frontend/components/components/UpdateComponentAssembly.tsx b/frontend/components/components/UpdateComponentAssembly.tsx
index 7472c8b1e..5af7fd967 100644
--- a/frontend/components/components/UpdateComponentAssembly.tsx
+++ b/frontend/components/components/UpdateComponentAssembly.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Form, Button, InputNumber, Input, Select, Modal, Space } from "antd";
+import { Form, Button, InputNumber, Input, Modal, Space } from "antd";
 import {
   UpdateComponentAssemblyDocument,
   UpdateComponentAssemblyMutation,
@@ -10,6 +10,7 @@ import ErrorAlert from "../ErrorAlert";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import EditButton from "../EditButton";
+import EnumSelect from "../EnumSelect";
 
 type FormValues = {
   index: Scalars["Byte"]["input"] | null | undefined;
@@ -117,13 +118,10 @@ export default function UpdateComponentAssembly(
             label="Prime Surface"
             name="primeSurface"
           >
-            <Select
+            <EnumSelect
+              enumObject={PrimeSurface}
               allowClear={true}
               placeholder="Please select"
-              options={Object.entries(PrimeSurface).map(([_key, value]) => ({
-                label: value,
-                value: value,
-              }))}
             />
           </Form.Item>
           <Form.Item {...tailLayout}>
diff --git a/frontend/components/data/calorimetric/CalorimetricDataSummary.tsx b/frontend/components/data/calorimetric/CalorimetricDataSummary.tsx
index 653ce9036..9d512482b 100644
--- a/frontend/components/data/calorimetric/CalorimetricDataSummary.tsx
+++ b/frontend/components/data/calorimetric/CalorimetricDataSummary.tsx
@@ -1,6 +1,6 @@
 import { isTruthy } from "../../../lib/array";
 import { CalorimetricDataPartialFragment } from "../../../queries/data.generated";
-import Float from "../../Float";
+import Float, { Unit } from "../../Float";
 import InlineList from "../../InlineList";
 import DataSummary from "../DataSummary";
 
@@ -15,7 +15,9 @@ export default function CalorimetricDataSummary({
         G-Values{" "}
         <InlineList
           items={entity.gValues}
-          renderItem={(item, index) => <Float key={index} value={item} />}
+          renderItem={(item, index) => (
+            <Float key={index} value={item} unit={Unit.UNITLESS} />
+          )}
         />
       </div>
     ),
@@ -24,7 +26,13 @@ export default function CalorimetricDataSummary({
         U-Values{" "}
         <InlineList
           items={entity.uValues}
-          renderItem={(item, index) => <Float key={index} value={item} />}
+          renderItem={(item, index) => (
+            <Float
+              key={index}
+              value={item}
+              unit={Unit.WATT_PER_SQUARE_METER_KELVIN}
+            />
+          )}
         />
       </div>
     ),
diff --git a/frontend/components/data/calorimetric/PaginatedCalorimetricData.tsx b/frontend/components/data/calorimetric/PaginatedCalorimetricData.tsx
index 9e8f3b687..92f613bd8 100644
--- a/frontend/components/data/calorimetric/PaginatedCalorimetricData.tsx
+++ b/frontend/components/data/calorimetric/PaginatedCalorimetricData.tsx
@@ -20,7 +20,7 @@ export default function PaginatedCalorimetricData({
     >
       showJump={false}
       entitiesQuery={AllCalorimetricDataDocument}
-      where={where}
+      baseWhere={where}
       list={(props) => <CalorimetricDataList {...props} />}
       filterDefinitions={[
         {
diff --git a/frontend/components/data/geometric/GeometricDataSummary.tsx b/frontend/components/data/geometric/GeometricDataSummary.tsx
index 595004546..813bee18f 100644
--- a/frontend/components/data/geometric/GeometricDataSummary.tsx
+++ b/frontend/components/data/geometric/GeometricDataSummary.tsx
@@ -1,6 +1,6 @@
 import { isTruthy } from "../../../lib/array";
 import { GeometricDataPartialFragment } from "../../../queries/data.generated";
-import Float from "../../Float";
+import Float, { Unit } from "../../Float";
 import InlineList from "../../InlineList";
 import DataSummary from "../DataSummary";
 
@@ -15,7 +15,9 @@ export default function GeometricDataSummary({
         Thicknesses{" "}
         <InlineList
           items={entity.thicknesses}
-          renderItem={(item, index) => <Float key={index} value={item} />}
+          renderItem={(item, index) => (
+            <Float key={index} value={item} unit={Unit.METER} />
+          )}
         />
       </div>
     ),
diff --git a/frontend/components/data/geometric/PaginatedGeometricData.tsx b/frontend/components/data/geometric/PaginatedGeometricData.tsx
index 65a3e1fbe..b8381e110 100644
--- a/frontend/components/data/geometric/PaginatedGeometricData.tsx
+++ b/frontend/components/data/geometric/PaginatedGeometricData.tsx
@@ -20,7 +20,7 @@ export default function PaginatedGeometricData({
     >
       showJump={false}
       entitiesQuery={AllGeometricDataDocument}
-      where={where}
+      baseWhere={where}
       list={(props) => <GeometricDataList {...props} />}
       filterDefinitions={[
         {
diff --git a/frontend/components/data/hygrothermal/PaginatedHygrothermalData.tsx b/frontend/components/data/hygrothermal/PaginatedHygrothermalData.tsx
index b94fca1d9..38d86edae 100644
--- a/frontend/components/data/hygrothermal/PaginatedHygrothermalData.tsx
+++ b/frontend/components/data/hygrothermal/PaginatedHygrothermalData.tsx
@@ -20,7 +20,7 @@ export default function PaginatedHygrothermalData({
     >
       showJump={false}
       entitiesQuery={AllHygrothermalDataDocument}
-      where={where}
+      baseWhere={where}
       list={(props) => <HygrothermalDataList {...props} />}
       filterDefinitions={[
         {
diff --git a/frontend/components/data/lifeCycle/PaginatedLifeCycleData.tsx b/frontend/components/data/lifeCycle/PaginatedLifeCycleData.tsx
index 277e005cc..d50e22cb1 100644
--- a/frontend/components/data/lifeCycle/PaginatedLifeCycleData.tsx
+++ b/frontend/components/data/lifeCycle/PaginatedLifeCycleData.tsx
@@ -20,7 +20,7 @@ export default function PaginatedLifeCycleData({
     >
       showJump={false}
       entitiesQuery={AllLifeCycleDataDocument}
-      where={where}
+      baseWhere={where}
       list={(props) => <LifeCycleDataList {...props} />}
       filterDefinitions={[
         {
diff --git a/frontend/components/data/optical/OpticalDataSummary.tsx b/frontend/components/data/optical/OpticalDataSummary.tsx
index 8c6fb5df0..febf46901 100644
--- a/frontend/components/data/optical/OpticalDataSummary.tsx
+++ b/frontend/components/data/optical/OpticalDataSummary.tsx
@@ -1,10 +1,11 @@
 import { OpticalDataPartialFragment } from "../../../queries/data.generated";
-import Float from "../../Float";
+import Float, { Unit } from "../../Float";
 import InlineList from "../../InlineList";
 import DataSummary from "../DataSummary";
 import CielabColorView from "../../CielabColorView";
 import { CoatedSide } from "../../../__generated__/graphql";
 import { isTruthy } from "../../../lib/array";
+import { humanize } from "../../../lib/string";
 
 export default function OpticalDataSummary({
   entity,
@@ -13,14 +14,18 @@ export default function OpticalDataSummary({
 }) {
   const values = [
     entity.coatedSide && entity.coatedSide != CoatedSide.NotApplicable && (
-      <div key="coatedSide">Coated Side {entity.coatedSide}</div>
+      <div key="coatedSide">
+        Coated Side "{humanize(entity.coatedSide, "all-upper")}"
+      </div>
     ),
     entity.infraredEmittances.length > 0 && (
       <div key="infraredEmittances">
         Infrared Emittances{" "}
         <InlineList
           items={entity.infraredEmittances}
-          renderItem={(item, index) => <Float key={index} value={item} />}
+          renderItem={(item, index) => (
+            <Float key={index} value={item} unit={Unit.UNITLESS} />
+          )}
         />
       </div>
     ),
@@ -29,7 +34,9 @@ export default function OpticalDataSummary({
         Near-Normal Hemispherical Solar Reflectances{" "}
         <InlineList
           items={entity.nearnormalHemisphericalSolarReflectances}
-          renderItem={(item, index) => <Float key={index} value={item} />}
+          renderItem={(item, index) => (
+            <Float key={index} value={item} unit={Unit.UNITLESS} />
+          )}
         />
       </div>
     ),
@@ -38,7 +45,9 @@ export default function OpticalDataSummary({
         Near-Normal Hemispherical Solar Transmittances{" "}
         <InlineList
           items={entity.nearnormalHemisphericalSolarTransmittances}
-          renderItem={(item, index) => <Float key={index} value={item} />}
+          renderItem={(item, index) => (
+            <Float key={index} value={item} unit={Unit.UNITLESS} />
+          )}
         />
       </div>
     ),
@@ -47,7 +56,9 @@ export default function OpticalDataSummary({
         Near-Normal Hemispherical Visible Reflectances{" "}
         <InlineList
           items={entity.nearnormalHemisphericalVisibleReflectances}
-          renderItem={(item, index) => <Float key={index} value={item} />}
+          renderItem={(item, index) => (
+            <Float key={index} value={item} unit={Unit.UNITLESS} />
+          )}
         />
       </div>
     ),
@@ -56,7 +67,9 @@ export default function OpticalDataSummary({
         Near-Normal Hemispherical Visible Transmittances{" "}
         <InlineList
           items={entity.nearnormalHemisphericalVisibleTransmittances}
-          renderItem={(item, index) => <Float key={index} value={item} />}
+          renderItem={(item, index) => (
+            <Float key={index} value={item} unit={Unit.UNITLESS} />
+          )}
         />
       </div>
     ),
@@ -76,7 +89,9 @@ export default function OpticalDataSummary({
         Color Rendering Indices{" "}
         <InlineList
           items={entity.colorRenderingIndices}
-          renderItem={(item, index) => <Float key={index} value={item} />}
+          renderItem={(item, index) => (
+            <Float key={index} value={item} unit={Unit.UNITLESS} />
+          )}
         />
       </div>
     ),
diff --git a/frontend/components/data/optical/PaginatedOpticalData.tsx b/frontend/components/data/optical/PaginatedOpticalData.tsx
index 095b28c1d..73aabd836 100644
--- a/frontend/components/data/optical/PaginatedOpticalData.tsx
+++ b/frontend/components/data/optical/PaginatedOpticalData.tsx
@@ -20,7 +20,7 @@ export default function PaginatedOpticalData({
     >
       showJump={false}
       entitiesQuery={AllOpticalDataDocument}
-      where={where}
+      baseWhere={where}
       list={(props) => <OpticalDataList {...props} />}
       filterDefinitions={[
         {
diff --git a/frontend/components/data/photovoltaic/PaginatedPhotovoltaicData.tsx b/frontend/components/data/photovoltaic/PaginatedPhotovoltaicData.tsx
index 790b0ffce..63d3d05ec 100644
--- a/frontend/components/data/photovoltaic/PaginatedPhotovoltaicData.tsx
+++ b/frontend/components/data/photovoltaic/PaginatedPhotovoltaicData.tsx
@@ -20,7 +20,7 @@ export default function PaginatedPhotovoltaicData({
     >
       showJump={false}
       entitiesQuery={AllPhotovoltaicDataDocument}
-      where={where}
+      baseWhere={where}
       list={(props) => <PhotovoltaicDataList {...props} />}
       filterDefinitions={[
         {
diff --git a/frontend/components/dataFormats/PaginatedDataFormats.tsx b/frontend/components/dataFormats/PaginatedDataFormats.tsx
index f283c72d2..687165834 100644
--- a/frontend/components/dataFormats/PaginatedDataFormats.tsx
+++ b/frontend/components/dataFormats/PaginatedDataFormats.tsx
@@ -31,8 +31,8 @@ export default function PaginatedDataFormats({
     >
       entitiesQuery={DataFormatsDocument}
       namesQuery={DataFormatNamesDocument}
-      where={where}
-      order={order}
+      baseWhere={where}
+      defaultOrder={order}
       showJump={showJump}
       route={paths.dataFormat}
       extra={extra}
diff --git a/frontend/components/databases/PaginatedAnyDatabases.tsx b/frontend/components/databases/PaginatedAnyDatabases.tsx
index 4c1135bfe..227d091c6 100644
--- a/frontend/components/databases/PaginatedAnyDatabases.tsx
+++ b/frontend/components/databases/PaginatedAnyDatabases.tsx
@@ -31,8 +31,8 @@ export default function PaginatedAnyDatabases({
     >
       entitiesQuery={AnyDatabasesDocument}
       namesQuery={DatabaseNamesDocument}
-      where={where}
-      order={order}
+      baseWhere={where}
+      defaultOrder={order}
       showJump={showJump}
       route={paths.database}
       extra={extra}
diff --git a/frontend/components/databases/PaginatedDatabases.tsx b/frontend/components/databases/PaginatedDatabases.tsx
index c3ec92110..77abf32e3 100644
--- a/frontend/components/databases/PaginatedDatabases.tsx
+++ b/frontend/components/databases/PaginatedDatabases.tsx
@@ -31,8 +31,8 @@ export default function PaginatedDatabases({
     >
       entitiesQuery={DatabasesDocument}
       namesQuery={DatabaseNamesDocument}
-      where={where}
-      order={order}
+      baseWhere={where}
+      defaultOrder={order}
       showJump={showJump}
       route={paths.database}
       extra={extra}
diff --git a/frontend/components/entities/PaginatedEntities.tsx b/frontend/components/entities/PaginatedEntities.tsx
index e4d274306..a8292e220 100644
--- a/frontend/components/entities/PaginatedEntities.tsx
+++ b/frontend/components/entities/PaginatedEntities.tsx
@@ -31,20 +31,26 @@ import QueryToolbar from "../QueryToolbar";
 import SlideDown from "../SlideDown";
 import { notEmpty } from "../../lib/array";
 
+const reduceWhere = <TFilterInput,>(where: { and: TFilterInput[] }) =>
+  where.and.length == 0 ? null : where.and.length == 1 ? where.and[0] : where;
+
+const reduceOrder = <TSortInput,>(
+  order: TSortInput | TSortInput[] | null | undefined,
+) => {
+  if (!Array.isArray(order)) return order;
+  return order.length == 0 ? null : order.length == 1 ? order[0] : order;
+};
+
 const reduceClauses = <TFilterInput, TSortInput>(clauses: {
   where: { and: TFilterInput[] };
-  order: TSortInput[];
+  order?: TSortInput | TSortInput[] | null | undefined;
 }) => {
-  if (clauses.where.and.length == 0 && clauses.order.length == 0) {
-    return {};
-  }
-  if (clauses.where.and.length == 0) {
-    return { order: clauses.order };
-  }
-  if (clauses.order.length == 0) {
-    return { where: clauses.where };
-  }
-  return clauses;
+  var where = reduceWhere(clauses.where);
+  var order = reduceOrder(clauses.order);
+  return {
+    ...(where !== null && { where }),
+    ...(order !== null && { order }),
+  };
 };
 
 type FilterAndSortFormValues = {
@@ -62,8 +68,8 @@ type BaseProps<
   list: (props: { loading: boolean; nodes: TNode[] }) => React.ReactNode;
   filterDefinitions: readonly FilterDefinition<TFilterInput>[];
   sortDefinitions: readonly SortDefinition<TSortInput>[];
-  where?: TFilterInput | null;
-  order?: TSortInput[] | TSortInput | null;
+  baseWhere?: TFilterInput | null;
+  defaultOrder?: TSortInput[] | TSortInput | null;
   loading?: boolean;
 };
 
@@ -178,16 +184,16 @@ export default function PaginatedEntities<
       reduceClauses({
         where: {
           and: [
-            props.where,
+            props.baseWhere,
             ...filters.map<TFilterInput>((filter) =>
               toWhereClause(filter, props.filterDefinitions),
             ),
           ].filter(notEmpty),
         },
-        order: [
-          ...sorts.map((sort) => toOrderClause(sort, props.sortDefinitions)),
-          ...(Array.isArray(props.order) ? props.order : [props.order]),
-        ].filter(notEmpty),
+        order:
+          sorts.length == 0
+            ? props.defaultOrder
+            : sorts.map((sort) => toOrderClause(sort, props.sortDefinitions)),
       }),
     [filters, sorts],
   );
diff --git a/frontend/components/filtering/EnumFilterSubform.tsx b/frontend/components/filtering/EnumFilterSubform.tsx
index a49888e52..571add7d3 100644
--- a/frontend/components/filtering/EnumFilterSubform.tsx
+++ b/frontend/components/filtering/EnumFilterSubform.tsx
@@ -1,11 +1,13 @@
-import { Select, Form } from "antd";
+import { Form } from "antd";
 import BaseFilterSubform from "./BaseFilterSubform";
 import { EnumFilterInput } from "../../lib/filter";
 import { FilterTypeMap } from "../../lib/filter";
+import EnumSelect from "../EnumSelect";
 
 export default function EnumFilterSubform<
   TFilterInput extends EnumFilterInput<TEnum>,
-  TEnum extends object,
+  TEnum extends Record<string, TEnumValue>,
+  TEnumValue extends string | number,
 >({
   name,
   ancestors,
@@ -15,11 +17,6 @@ export default function EnumFilterSubform<
   ancestors: readonly (string | number)[];
   enumObject: TEnum;
 }) {
-  const selectOptions = Object.entries(enumObject).map(([_key, value]) => ({
-    label: value,
-    value: value,
-  }));
-
   return (
     <BaseFilterSubform<TFilterInput>
       name={name}
@@ -36,7 +33,7 @@ export default function EnumFilterSubform<
             },
           ]}
         >
-          <Select options={selectOptions} style={{ width: "100%" }} />
+          <EnumSelect enumObject={enumObject} style={{ width: "100%" }} />
         </Form.Item>
       )}
       renderMultipleFormItem={(props) => (
@@ -49,9 +46,9 @@ export default function EnumFilterSubform<
             },
           ]}
         >
-          <Select
+          <EnumSelect
+            enumObject={enumObject}
             mode="multiple"
-            options={selectOptions}
             style={{ width: "100%" }}
           />
         </Form.Item>
diff --git a/frontend/components/gnuPgKeys/PaginatedGnuPgKeys.tsx b/frontend/components/gnuPgKeys/PaginatedGnuPgKeys.tsx
index cec5942a5..b0b843f54 100644
--- a/frontend/components/gnuPgKeys/PaginatedGnuPgKeys.tsx
+++ b/frontend/components/gnuPgKeys/PaginatedGnuPgKeys.tsx
@@ -30,8 +30,8 @@ export default function PaginatedGnuPgKeys({
     >
       entitiesQuery={GnuPgKeyFingerprintsDocument}
       // namesQuery={GnuPgKeyFingerprintNamesDocument}
-      where={where}
-      order={order}
+      baseWhere={where}
+      defaultOrder={order}
       showJump={showJump}
       route={paths.gnuPgKey}
       extra={extra}
diff --git a/frontend/components/institutions/AddInstitutionRepresentative.tsx b/frontend/components/institutions/AddInstitutionRepresentative.tsx
index af589040a..7b65651d0 100644
--- a/frontend/components/institutions/AddInstitutionRepresentative.tsx
+++ b/frontend/components/institutions/AddInstitutionRepresentative.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Select, Form, Button, Space } from "antd";
+import { Form, Button, Space } from "antd";
 import {
   AddInstitutionRepresentativeDocument,
   AddInstitutionRepresentativeMutation,
@@ -10,6 +10,7 @@ import { useState } from "react";
 import UserIdSelect from "../users/UserIdSelect";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
+import EnumSelect from "../EnumSelect";
 
 type FormValues = {
   userId: Scalars["Uuid"]["input"];
@@ -96,11 +97,9 @@ export default function AddInstitutionRepresentative({
             ]}
             initialValue={InstitutionRepresentativeRole.Assistant}
           >
-            <Select
+            <EnumSelect
+              enumObject={InstitutionRepresentativeRole}
               placeholder="Role"
-              options={Object.entries(InstitutionRepresentativeRole).map(
-                ([_key, value]) => ({ label: value, value: value }),
-              )}
             />
           </Form.Item>
           <Button type="primary" htmlType="submit" loading={mutating}>
diff --git a/frontend/components/institutions/ConfirmInstitutionRepresentative.tsx b/frontend/components/institutions/ConfirmInstitutionRepresentative.tsx
index 49b1eb445..6a2cae092 100644
--- a/frontend/components/institutions/ConfirmInstitutionRepresentative.tsx
+++ b/frontend/components/institutions/ConfirmInstitutionRepresentative.tsx
@@ -1,11 +1,11 @@
 import { useMutation } from "@apollo/client/react";
-import { Button } from "antd";
 import { Scalars } from "../../__generated__/graphql";
 import {
   ConfirmInstitutionRepresentativeDocument,
   ConfirmInstitutionRepresentativeMutation,
 } from "../../queries/institutionRepresentatives.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import ConfirmButton from "../ConfirmButton";
 
 interface Props {
   institutionId: Scalars["Uuid"]["input"];
@@ -42,9 +42,5 @@ export default function ConfirmInstitutionRepresentative({
     );
   };
 
-  return (
-    <Button type="primary" onClick={confirm} loading={mutating}>
-      Confirm
-    </Button>
-  );
+  return <ConfirmButton type="icon" onClick={confirm} loading={mutating} />;
 }
diff --git a/frontend/components/institutions/InstitutionSummary.tsx b/frontend/components/institutions/InstitutionSummary.tsx
index ee9d43626..09059b9d9 100644
--- a/frontend/components/institutions/InstitutionSummary.tsx
+++ b/frontend/components/institutions/InstitutionSummary.tsx
@@ -84,11 +84,13 @@ export default function InstitutionSummary({
           <InlineList
             items={asReadonlyMixed(entity.representatives.edges)}
             renderItem={(edge) => (
-              <Space key={edge.node.id}>
-                <EntityLink entity={edge.node} route={paths.user} />
-                <EnumTag color="grey" variant="outlined">
-                  {edge.role}
-                </EnumTag>
+              <span key={edge.node.id}>
+                <Space>
+                  <EntityLink entity={edge.node} route={paths.user} />
+                  <EnumTag color="grey" variant="outlined">
+                    {edge.role}
+                  </EnumTag>
+                </Space>
                 {!hideExtra &&
                   "isAuthorizedToRemoveEdge" in edge &&
                   edge.isAuthorizedToRemoveEdge && (
@@ -97,7 +99,7 @@ export default function InstitutionSummary({
                       userId={edge.node.uuid}
                     />
                   )}
-              </Space>
+              </span>
             )}
           />
           {!hideExtra &&
diff --git a/frontend/components/institutions/PaginatedInstitutions.tsx b/frontend/components/institutions/PaginatedInstitutions.tsx
index 067d4cb80..3cdf84225 100644
--- a/frontend/components/institutions/PaginatedInstitutions.tsx
+++ b/frontend/components/institutions/PaginatedInstitutions.tsx
@@ -31,8 +31,8 @@ export default function PaginatedInstitutions({
     >
       entitiesQuery={InstitutionsDocument}
       namesQuery={InstitutionNamesDocument}
-      where={where}
-      order={order}
+      baseWhere={where}
+      defaultOrder={order}
       showJump={showJump}
       route={paths.institution}
       extra={extra}
diff --git a/frontend/components/institutions/RepresentedInstitutionIdSelect.tsx b/frontend/components/institutions/RepresentedInstitutionIdSelect.tsx
index e5cd05d44..6db1f4e29 100644
--- a/frontend/components/institutions/RepresentedInstitutionIdSelect.tsx
+++ b/frontend/components/institutions/RepresentedInstitutionIdSelect.tsx
@@ -1,6 +1,6 @@
 import { useQuery } from "@apollo/client/react";
 import { CurrentUserDocument } from "../../queries/currentUser.generated";
-import { Select, SelectProps, Space } from "antd";
+import { Select, SelectProps } from "antd";
 import Id from "../Id";
 
 export default function RepresentedInstitutionIdSelect(props: SelectProps) {
@@ -12,9 +12,9 @@ export default function RepresentedInstitutionIdSelect(props: SelectProps) {
       options={currentUser?.representedInstitutions.edges.map((edge) => ({
         value: edge.node.id,
         label: (
-          <Space>
+          <span>
             {edge.node.name} (<Id value={edge.node.uuid} />)
-          </Space>
+          </span>
         ),
       }))}
     />
diff --git a/frontend/components/methods/ConfirmInstitutionMethodDeveloper.tsx b/frontend/components/methods/ConfirmInstitutionMethodDeveloper.tsx
index 50d822576..b440b8a2d 100644
--- a/frontend/components/methods/ConfirmInstitutionMethodDeveloper.tsx
+++ b/frontend/components/methods/ConfirmInstitutionMethodDeveloper.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Button } from "antd";
+import ConfirmButton from "../ConfirmButton";
 import { Scalars } from "../../__generated__/graphql";
 import {
   ConfirmInstitutionMethodDeveloperDocument,
@@ -42,9 +42,5 @@ export default function ConfirmInstitutionMethodDeveloper({
     );
   };
 
-  return (
-    <Button type="primary" onClick={confirm} loading={mutating}>
-      Confirm
-    </Button>
-  );
+  return <ConfirmButton type="primary" onClick={confirm} loading={mutating} />;
 }
diff --git a/frontend/components/methods/ConfirmUserMethodDeveloper.tsx b/frontend/components/methods/ConfirmUserMethodDeveloper.tsx
index 069e6bda2..5de3690c3 100644
--- a/frontend/components/methods/ConfirmUserMethodDeveloper.tsx
+++ b/frontend/components/methods/ConfirmUserMethodDeveloper.tsx
@@ -1,11 +1,11 @@
 import { useMutation } from "@apollo/client/react";
-import { Button } from "antd";
 import { Scalars } from "../../__generated__/graphql";
 import {
   ConfirmUserMethodDeveloperDocument,
   ConfirmUserMethodDeveloperMutation,
 } from "../../queries/userMethodDevelopers.generated";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import ConfirmButton from "../ConfirmButton";
 
 interface Props {
   methodId: Scalars["Uuid"]["input"];
@@ -42,9 +42,5 @@ export default function ConfirmUserMethodDeveloper({
     );
   };
 
-  return (
-    <Button type="primary" onClick={confirm} loading={mutating}>
-      Confirm
-    </Button>
-  );
+  return <ConfirmButton type="icon" onClick={confirm} loading={mutating} />;
 }
diff --git a/frontend/components/methods/CreateMethod.tsx b/frontend/components/methods/CreateMethod.tsx
index ef6b330fb..7af892baf 100644
--- a/frontend/components/methods/CreateMethod.tsx
+++ b/frontend/components/methods/CreateMethod.tsx
@@ -1,14 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import {
-  DatePicker,
-  Select,
-  Form,
-  Input,
-  Button,
-  Divider,
-  App,
-  Modal,
-} from "antd";
+import { DatePicker, Form, Input, Button, Divider, App, Modal } from "antd";
 import {
   CreateMethodDocument,
   CreateMethodMutation,
@@ -33,6 +24,7 @@ import MethodParametersSubform from "./MethodParametersSubform";
 import MethodSummary from "./MethodSummary";
 import NewButton from "../NewButton";
 import RepresentedInstitutionIdSelect from "../institutions/RepresentedInstitutionIdSelect";
+import EnumSelect from "../EnumSelect";
 
 type FormValues = {
   name: string;
@@ -230,13 +222,10 @@ export default function CreateMethod({
             <Input />
           </Form.Item>
           <Form.Item label="Categories" name="categories" initialValue={[]}>
-            <Select
+            <EnumSelect
+              enumObject={MethodCategory}
               mode="multiple"
               placeholder="Please select"
-              options={Object.entries(MethodCategory).map(([_key, value]) => ({
-                label: value,
-                value: value,
-              }))}
             />
           </Form.Item>
           <Form.Item label="Parameter(s)">
diff --git a/frontend/components/methods/MethodSummary.tsx b/frontend/components/methods/MethodSummary.tsx
index 870892ca7..6295c86ce 100644
--- a/frontend/components/methods/MethodSummary.tsx
+++ b/frontend/components/methods/MethodSummary.tsx
@@ -1,4 +1,4 @@
-import { Space, Typography } from "antd";
+import { Typography } from "antd";
 import { asReadonlyMixed, isTruthy } from "../../lib/array";
 import paths from "../../paths";
 import Manager from "../Manager";
@@ -31,7 +31,7 @@ const renderDeveloperList = (
   <InlineList
     items={asReadonlyMixed(developers.edges)}
     renderItem={(edge) => (
-      <Space key={edge.node.id}>
+      <span key={edge.node.id}>
         <EntityLink
           entity={edge.node}
           route={
@@ -54,7 +54,7 @@ const renderDeveloperList = (
               userId={edge.node.uuid}
             />
           ))}
-      </Space>
+      </span>
     )}
   />
 );
diff --git a/frontend/components/methods/PaginatedMethods.tsx b/frontend/components/methods/PaginatedMethods.tsx
index f744388af..578af937f 100644
--- a/frontend/components/methods/PaginatedMethods.tsx
+++ b/frontend/components/methods/PaginatedMethods.tsx
@@ -32,8 +32,8 @@ export default function PaginatedMethods({
     >
       entitiesQuery={MethodsDocument}
       namesQuery={MethodNamesDocument}
-      where={where}
-      order={order}
+      baseWhere={where}
+      defaultOrder={order}
       showJump={showJump}
       route={paths.method}
       extra={extra}
diff --git a/frontend/components/methods/UpdateMethod.tsx b/frontend/components/methods/UpdateMethod.tsx
index 8ddf499e6..477b35394 100644
--- a/frontend/components/methods/UpdateMethod.tsx
+++ b/frontend/components/methods/UpdateMethod.tsx
@@ -1,5 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { DatePicker, Select, Form, Input, Button, Divider, Modal } from "antd";
+import { DatePicker, Form, Input, Button, Divider, Modal } from "antd";
 import {
   UpdateMethodDocument,
   UpdateMethodMutation,
@@ -21,6 +21,7 @@ import ErrorAlert from "../ErrorAlert";
 import MethodParametersSubform from "./MethodParametersSubform";
 import MethodSourcesSubform from "./MethodSourcesSubform";
 import EditButton from "../EditButton";
+import EnumSelect from "../EnumSelect";
 
 type FormValues = {
   name: string;
@@ -207,13 +208,10 @@ export default function UpdateMethod({ method }: UpdateMethodProps) {
             name="categories"
             initialValue={method.categories}
           >
-            <Select
+            <EnumSelect
+              enumObject={MethodCategory}
               mode="multiple"
               placeholder="Please select"
-              options={Object.entries(MethodCategory).map(([_key, value]) => ({
-                label: value,
-                value: value,
-              }))}
             />
           </Form.Item>
           <Form.Item label="Parameter(s)">
diff --git a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
index 94759299c..736c8767b 100644
--- a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
@@ -5,16 +5,7 @@ import {
   CreateApplicationDocument,
   CreateApplicationMutation,
 } from "../../../queries/openIdConnect.generated";
-import {
-  Button,
-  Form,
-  Input,
-  App,
-  Select,
-  Typography,
-  Modal,
-  Divider,
-} from "antd";
+import { Button, Form, Input, App, Typography, Modal, Divider } from "antd";
 import {
   OpenIdConnectConsentType,
   OpenIdConnectEndpoint,
@@ -33,6 +24,7 @@ import EntityLink from "../../entities/EntityLink";
 import paths from "../../../paths";
 import CodeView from "../../CodeView";
 import RepresentedInstitutionIdSelect from "../../institutions/RepresentedInstitutionIdSelect";
+import EnumSelect, { allEnumSelectOptions } from "../../EnumSelect";
 
 type FormValues = {
   clientId: string;
@@ -192,11 +184,9 @@ export default function CreateOpenIdConnectApplication({
             rules={[{ required: true }]}
             initialValue={OpenIdConnectConsentType.Explicit}
           >
-            <Select
+            <EnumSelect
+              enumObject={OpenIdConnectConsentType}
               placeholder="Please select"
-              options={Object.entries(OpenIdConnectConsentType).map(
-                ([_key, value]) => ({ label: value, value: value }),
-              )}
             />
           </Form.Item>
           <Form.Item
@@ -218,13 +208,11 @@ export default function CreateOpenIdConnectApplication({
             name="endpoints"
             rules={[{ required: true }]}
           >
-            <Select
+            <EnumSelect
+              enumObject={OpenIdConnectEndpoint}
               mode="multiple"
               allowClear
               placeholder="Please select"
-              options={Object.entries(OpenIdConnectEndpoint).map(
-                ([_key, value]) => ({ label: value, value: value }),
-              )}
             />
           </Form.Item>
           <Form.Item
@@ -232,13 +220,11 @@ export default function CreateOpenIdConnectApplication({
             name="grantTypes"
             rules={[{ required: true }]}
           >
-            <Select
+            <EnumSelect
+              enumObject={OpenIdConnectGrantType}
               mode="multiple"
               allowClear
               placeholder="Please select"
-              options={Object.entries(OpenIdConnectGrantType).map(
-                ([_key, value]) => ({ label: value, value: value }),
-              )}
             />
           </Form.Item>
           <Form.Item
@@ -246,41 +232,33 @@ export default function CreateOpenIdConnectApplication({
             name="responseTypes"
             rules={[{ required: true }]}
           >
-            <Select
+            <EnumSelect
+              enumObject={OpenIdConnectResponseType}
               mode="multiple"
               allowClear
               placeholder="Please select"
-              options={Object.entries(OpenIdConnectResponseType).map(
-                ([_key, value]) => ({ label: value, value: value }),
-              )}
             />
           </Form.Item>
           <Form.Item label="Scopes" name="scopes" rules={[{ required: true }]}>
-            <Select
+            <EnumSelect
+              enumObject={OpenIdConnectScope}
               mode="multiple"
               allowClear
               placeholder="Please select"
-              options={Object.entries(OpenIdConnectScope).map(
-                ([_key, value]) => ({ label: value, value: value }),
-              )}
             />
           </Form.Item>
           <Form.Item
             label="Requirements"
             name="requirements"
             rules={[{ required: true }]}
-            initialValue={Object.entries(OpenIdConnectRequirement).map(
-              ([_key, value]) => ({ label: value, value: value }),
-            )}
+            initialValue={allEnumSelectOptions(OpenIdConnectRequirement)}
           >
-            <Select
+            <EnumSelect
+              enumObject={OpenIdConnectRequirement}
               disabled
               mode="multiple"
               allowClear
               placeholder="Please select"
-              options={Object.entries(OpenIdConnectRequirement).map(
-                ([_key, value]) => ({ label: value, value: value }),
-              )}
             />
           </Form.Item>
           <Form.Item
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
index 46c43212c..b95ed6c1d 100644
--- a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
@@ -11,6 +11,7 @@ import ResetOpenIdConnectApplicationClientSecret from "./ResetOpenIdConnectAppli
 import UpdateOpenIdConnectApplication from "./UpdateOpenIdConnectApplication";
 import InlineList from "../../InlineList";
 import EntityLink from "../../entities/EntityLink";
+import { humanize } from "../../../lib/string";
 
 export default function OpenIdConnectApplicationSummary({
   entity,
@@ -25,7 +26,11 @@ export default function OpenIdConnectApplicationSummary({
     <EntitySummary
       entity={entity}
       route={paths.openIdConnectApplication}
-      tags={[<Tag key="consentType">Consent Type "{entity.consentType}"</Tag>]}
+      tags={[
+        <Tag key="consentType">
+          Consent Type "{humanize(entity.consentType, "all-upper")}"
+        </Tag>,
+      ]}
       extra={
         !hideExtra &&
         [
diff --git a/frontend/components/openIdConnect/applications/PaginatedOpenIdConnectApplications.tsx b/frontend/components/openIdConnect/applications/PaginatedOpenIdConnectApplications.tsx
index ae28eb3fa..701503a30 100644
--- a/frontend/components/openIdConnect/applications/PaginatedOpenIdConnectApplications.tsx
+++ b/frontend/components/openIdConnect/applications/PaginatedOpenIdConnectApplications.tsx
@@ -31,8 +31,8 @@ export default function PaginatedOpenIdConnectApplications({
       OpenIdConnectApplicationSortInput
     >
       loading={loading}
-      where={where}
-      order={order}
+      baseWhere={where}
+      defaultOrder={order}
       showJump={showJump}
       entitiesQuery={ApplicationsDocument}
       // namesQuery={ApplicationNamesDocument}
diff --git a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
index 1eaae1aac..60af6f998 100644
--- a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
@@ -5,7 +5,7 @@ import {
   UpdateApplicationMutation,
   OpenIdConnectApplicationPartialFragment,
 } from "../../../queries/openIdConnect.generated";
-import { Button, Form, Input, Modal, Select } from "antd";
+import { Button, Form, Input, Modal } from "antd";
 import {
   OpenIdConnectConsentType,
   OpenIdConnectEndpoint,
@@ -18,6 +18,7 @@ import { layout, tailLayout } from "../../../lib/form";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../../ErrorAlert";
 import EditButton from "../../EditButton";
+import EnumSelect, { allEnumSelectOptions } from "../../EnumSelect";
 
 interface UpdateApplicationProps {
   application: OpenIdConnectApplicationPartialFragment;
@@ -131,11 +132,9 @@ export default function UpdateOpenIdConnectApplication({
             rules={[{ required: true }]}
             initialValue={application.consentType}
           >
-            <Select
+            <EnumSelect
+              enumObject={OpenIdConnectConsentType}
               placeholder="Please select"
-              options={Object.entries(OpenIdConnectConsentType).map(
-                ([_key, value]) => ({ label: value, value: value }),
-              )}
             />
           </Form.Item>
           <Form.Item
@@ -160,13 +159,11 @@ export default function UpdateOpenIdConnectApplication({
             rules={[{ required: true }]}
             initialValue={application.endpoints}
           >
-            <Select
+            <EnumSelect
+              enumObject={OpenIdConnectEndpoint}
               mode="multiple"
               allowClear
               placeholder="Please select"
-              options={Object.entries(OpenIdConnectEndpoint).map(
-                ([_key, value]) => ({ label: value, value: value }),
-              )}
             />
           </Form.Item>
           <Form.Item
@@ -175,13 +172,11 @@ export default function UpdateOpenIdConnectApplication({
             rules={[{ required: true }]}
             initialValue={application.grantTypes}
           >
-            <Select
+            <EnumSelect
+              enumObject={OpenIdConnectGrantType}
               mode="multiple"
               allowClear
               placeholder="Please select"
-              options={Object.entries(OpenIdConnectGrantType).map(
-                ([_key, value]) => ({ label: value, value: value }),
-              )}
             />
           </Form.Item>
           <Form.Item
@@ -190,13 +185,11 @@ export default function UpdateOpenIdConnectApplication({
             rules={[{ required: true }]}
             initialValue={application.responseTypes}
           >
-            <Select
+            <EnumSelect
+              enumObject={OpenIdConnectResponseType}
               mode="multiple"
               allowClear
               placeholder="Please select"
-              options={Object.entries(OpenIdConnectResponseType).map(
-                ([_key, value]) => ({ label: value, value: value }),
-              )}
             />
           </Form.Item>
           <Form.Item
@@ -205,31 +198,25 @@ export default function UpdateOpenIdConnectApplication({
             rules={[{ required: true }]}
             initialValue={application.scopes}
           >
-            <Select
+            <EnumSelect
+              enumObject={OpenIdConnectScope}
               mode="multiple"
               allowClear
               placeholder="Please select"
-              options={Object.entries(OpenIdConnectScope).map(
-                ([_key, value]) => ({ label: value, value: value }),
-              )}
             />
           </Form.Item>
           <Form.Item
             label="Requirements"
             name="requirements"
             rules={[{ required: true }]}
-            initialValue={Object.entries(OpenIdConnectRequirement).map(
-              ([_key, value]) => ({ label: value, value: value }),
-            )}
+            initialValue={allEnumSelectOptions(OpenIdConnectRequirement)}
           >
-            <Select
+            <EnumSelect
+              enumObject={OpenIdConnectRequirement}
               disabled
               mode="multiple"
               allowClear
               placeholder="Please select"
-              options={Object.entries(OpenIdConnectRequirement).map(
-                ([_key, value]) => ({ label: value, value: value }),
-              )}
             />
           </Form.Item>
           <Form.Item {...tailLayout}>
diff --git a/frontend/components/openIdConnect/authorizations/PaginatedOpenIdConnectAuthorizations.tsx b/frontend/components/openIdConnect/authorizations/PaginatedOpenIdConnectAuthorizations.tsx
index 5e2a59ba0..c4a7aaae5 100644
--- a/frontend/components/openIdConnect/authorizations/PaginatedOpenIdConnectAuthorizations.tsx
+++ b/frontend/components/openIdConnect/authorizations/PaginatedOpenIdConnectAuthorizations.tsx
@@ -29,8 +29,8 @@ export default function PaginatedOpenIdConnectAuthorizations({
       OpenIdConnectAuthorizationSortInput
     >
       loading={loading}
-      where={where}
-      order={order}
+      baseWhere={where}
+      defaultOrder={order}
       showJump={false}
       entitiesQuery={AuthorizationsDocument}
       extra={extra}
diff --git a/frontend/components/openIdConnect/tokens/PaginatedOpenIdConnectTokens.tsx b/frontend/components/openIdConnect/tokens/PaginatedOpenIdConnectTokens.tsx
index dd8cadcd9..5d686c3b9 100644
--- a/frontend/components/openIdConnect/tokens/PaginatedOpenIdConnectTokens.tsx
+++ b/frontend/components/openIdConnect/tokens/PaginatedOpenIdConnectTokens.tsx
@@ -29,8 +29,8 @@ export default function PaginatedOpenIdConnectTokens({
       OpenIdConnectTokenSortInput
     >
       loading={loading}
-      where={where}
-      order={order}
+      baseWhere={where}
+      defaultOrder={order}
       showJump={false}
       entitiesQuery={TokensDocument}
       extra={extra}
diff --git a/frontend/components/users/AddUserRole.tsx b/frontend/components/users/AddUserRole.tsx
index 6e7c57513..1dc600cab 100644
--- a/frontend/components/users/AddUserRole.tsx
+++ b/frontend/components/users/AddUserRole.tsx
@@ -8,6 +8,7 @@ import { Form, Button, Select, Space } from "antd";
 import { useState } from "react";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
+import { humanize } from "../../lib/string";
 
 type FormValues = { role: UserRole };
 
@@ -75,7 +76,7 @@ export default function AddUserRole({ userId, roles }: AddUserRoleProps) {
           >
             <Select
               options={roles.map((role) => ({
-                label: role,
+                label: humanize(role, "all-upper"),
                 value: role,
               }))}
             />
diff --git a/frontend/components/users/PaginatedUsers.tsx b/frontend/components/users/PaginatedUsers.tsx
index 644ef6df1..e9f79d6ed 100644
--- a/frontend/components/users/PaginatedUsers.tsx
+++ b/frontend/components/users/PaginatedUsers.tsx
@@ -24,8 +24,8 @@ export default function PaginatedUsers({
     <PaginatedEntities<UsersPartialFragment, UserFilterInput, UserSortInput>
       entitiesQuery={UsersDocument}
       namesQuery={UserNamesDocument}
-      where={where}
-      order={order}
+      baseWhere={where}
+      defaultOrder={order}
       showJump={showJump}
       route={paths.user}
       extra={extra}
diff --git a/frontend/components/users/User.tsx b/frontend/components/users/User.tsx
index ec4014f77..0a8f5a0bd 100644
--- a/frontend/components/users/User.tsx
+++ b/frontend/components/users/User.tsx
@@ -53,11 +53,13 @@ export default function User({ userId }: UserProps) {
           <InlineList
             items={asReadonlyMixed(user.pendingRepresentedInstitutions.edges)}
             renderItem={(edge) => (
-              <Space key={edge.node.id}>
-                <EntityLink entity={edge.node} route={paths.institution} />
-                <EnumTag color="grey" variant="outlined">
-                  {edge.role}
-                </EnumTag>
+              <span key={edge.node.id}>
+                <Space>
+                  <EntityLink entity={edge.node} route={paths.institution} />
+                  <EnumTag color="grey" variant="outlined">
+                    {edge.role}
+                  </EnumTag>
+                </Space>
                 <ConfirmInstitutionRepresentative
                   userId={user.uuid}
                   institutionId={edge.node.uuid}
@@ -70,7 +72,7 @@ export default function User({ userId }: UserProps) {
                     Deny
                   </RemoveInstitutionRepresentative>
                 )}
-              </Space>
+              </span>
             )}
           />
         </div>
@@ -84,7 +86,7 @@ export default function User({ userId }: UserProps) {
           <InlineList
             items={user.pendingUserDevelopedMethods.edges}
             renderItem={(edge) => (
-              <Space key={edge.node.uuid}>
+              <span key={edge.node.uuid}>
                 <EntityLink entity={edge.node} route={paths.method} />
                 <ConfirmUserMethodDeveloper
                   userId={user.uuid}
@@ -98,7 +100,7 @@ export default function User({ userId }: UserProps) {
                     Deny
                   </RemoveUserMethodDeveloper>
                 )}
-              </Space>
+              </span>
             )}
           />
         </div>
diff --git a/frontend/components/users/UserSummary.tsx b/frontend/components/users/UserSummary.tsx
index a4302f8a9..edcfbaaa4 100644
--- a/frontend/components/users/UserSummary.tsx
+++ b/frontend/components/users/UserSummary.tsx
@@ -71,11 +71,13 @@ export default function UserSummary({
           <InlineList
             items={asReadonlyMixed(entity.representedInstitutions.edges)}
             renderItem={(edge) => (
-              <Space key={edge.node.id}>
-                <EntityLink entity={edge.node} route={paths.institution} />
-                <EnumTag color="grey" variant="outlined">
-                  {edge.role}
-                </EnumTag>
+              <span key={edge.node.id}>
+                <Space>
+                  <EntityLink entity={edge.node} route={paths.institution} />
+                  <EnumTag color="grey" variant="outlined">
+                    {edge.role}
+                  </EnumTag>
+                </Space>
                 {!hideExtra &&
                   "isAuthorizedToRemoveEdge" in edge &&
                   edge.isAuthorizedToRemoveEdge && (
@@ -84,7 +86,7 @@ export default function UserSummary({
                       userId={entity.uuid}
                     />
                   )}
-              </Space>
+              </span>
             )}
           />
         </div>
diff --git a/frontend/lib/array.ts b/frontend/lib/array.ts
index df06a85e7..501cfa682 100644
--- a/frontend/lib/array.ts
+++ b/frontend/lib/array.ts
@@ -20,7 +20,7 @@ export function isMember<T extends string>(
 
 export const intersperse = (
   array: React.ReactNode[],
-  separator: string,
+  separator: string = " ",
 ): React.ReactNode[] =>
   array.reduce(
     (accumulator: React.ReactNode[], currrent, index) =>
diff --git a/frontend/lib/string.ts b/frontend/lib/string.ts
index 9daf89af0..bc0f03991 100644
--- a/frontend/lib/string.ts
+++ b/frontend/lib/string.ts
@@ -42,9 +42,9 @@ export const humanize = (
       return upper;
     }
     switch (style) {
-      case "all-upper": // title Case
+      case "all-upper": // title case
         return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
-      case "first-upper": // sentence Case
+      case "first-upper": // sentence case
         return index === 0
           ? word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()
           : word.toLowerCase();
diff --git a/frontend/queries/common.graphql b/frontend/queries/common.graphql
index fb9e7ed76..b9fcb41b4 100644
--- a/frontend/queries/common.graphql
+++ b/frontend/queries/common.graphql
@@ -32,3 +32,10 @@ fragment ReferencePartial on Reference {
     webAddress
   }
 }
+
+fragment DescriptionOrReferencePartial on DescriptionOrReference {
+  description
+  reference {
+    ...ReferencePartial
+  }
+}
diff --git a/frontend/queries/components.graphql b/frontend/queries/components.graphql
index 69cddaa5c..ee105ea5b 100644
--- a/frontend/queries/components.graphql
+++ b/frontend/queries/components.graphql
@@ -14,23 +14,14 @@ fragment ComponentsPartial on Component {
   }
   prime {
     surface {
-      description
-      reference {
-        ...ReferencePartial
-      }
+      ...DescriptionOrReferencePartial
     }
     direction {
-      description
-      reference {
-        ...ReferencePartial
-      }
+      ...DescriptionOrReferencePartial
     }
   }
   switchableLayers {
-    description
-    reference {
-      ...ReferencePartial
-    }
+    ...DescriptionOrReferencePartial
   }
   manufacturers {
     totalCount

From 6d36e0954d3f6dd9c2137b5cc61bb88a187a2a98 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sun, 10 May 2026 20:15:53 +0200
Subject: [PATCH 024/145] Pass `onClick` along with `rest` catch-all param

---
 frontend/components/NewButton.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/components/NewButton.tsx b/frontend/components/NewButton.tsx
index e00fa98c7..9629da7db 100644
--- a/frontend/components/NewButton.tsx
+++ b/frontend/components/NewButton.tsx
@@ -7,7 +7,6 @@ interface NewButtonProps extends Omit<ButtonProps, "type" | "icon" | "shape"> {
 
 export default function NewButton({
   type = "default",
-  onClick,
   children,
   ...rest
 }: NewButtonProps) {

From 37d27b6232fe1b77bd3e6f899c534462f7aa0f5d Mon Sep 17 00:00:00 2001
From: christoph-maurer <christoph.maurer@ise.fraunhofer.de>
Date: Mon, 11 May 2026 17:16:52 +0200
Subject: [PATCH 025/145] Check `rsrc` in README

---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 26f77b2d9..f647aeb6c 100644
--- a/README.md
+++ b/README.md
@@ -375,7 +375,8 @@ and the pages following it.
    `https://staging.buildingenvelopedata.org/email/` and emails to addresses in
    the variable `RELAY_ALLOWED_EMAILS` in `./.env` are delivered to the
    respective inboxes (the variable's value is a comma separated list of email
-   addresses). Note that in order for OpenId Connect to work as expected in
+   addresses). 
+1. Note that in order for OpenId Connect to work as expected in
    staging, make sure that the redirect URIs use the sub-domain `staging`
    (instead of `www`) by entering `psql` with `./database.mk psql`, examining
    the output of the SQL statement
@@ -384,7 +385,9 @@ and the pages following it.
    `update metabase."OpenIddictApplications" set "RedirectUris"='["https://staging.buildingenvelopedata.org/connect/callback/login/metabase"]', "PostLogoutRedirectUris"='["https://staging.buildingenvelopedata.org/connect/callback/logout/metabase"]' where "ClientId"='metabase';`
    and
    `update metabase."OpenIddictApplications" set "RedirectUris"='["https://staging.solarbuildingenvelopes.com/connect/callback/login/metabase"]', "PostLogoutRedirectUris"='["https://staging.solarbuildingenvelopes.com/connect/callback/logout/metabase"]' where "ClientId"='testlab-solar-facades';`
-   And if you want the staging environment to forward queries to the staging
+   Verify that the resource `rsrc` is set correctly. You can update it with 
+   `update metabase."OpenIddictApplications" set "Permissions"='["ept:authorization","ept:end_session","ept:introspection","ept:pushed_authorization","ept:revocation","ept:token","rst:code","rst:id_token","rst:token","gt:authorization_code","gt:client_credentials","gt:refresh_token","gt:urn:ietf:params:oauth:grant-type:token-exchange","scp:address","scp:email","scp:phone","scp:profile","scp:roles","scp:api:read","scp:api:write","scp:api:administrate","scp:api:verify","scp:api:database:manage","scp:api:gnu_pg:manage","scp:api:institution_representative:manage","scp:api:open_id_connect:manage","scp:api:user:manage","aud:metabase","rsrc:https://staging.buildingenvelopedata.org/graphql/"]' where "ClientId"='metabase';`
+   If you want the staging environment to forward queries to the staging
    environments of product-data databases, then examine the output of the SQL
    statement `select * from metabase.database;` and if necessary execute SQL
    statements along the lines

From 05d33816e061c6e843ad1da5303e8c3c366617c3 Mon Sep 17 00:00:00 2001
From: christoph-maurer <christoph.maurer@ise.fraunhofer.de>
Date: Mon, 11 May 2026 17:37:06 +0200
Subject: [PATCH 026/145] Mention the `OPEN_ID_CONNECT_CLIENT_SECRET` in the
 staging deployment

---
 README.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index f647aeb6c..9303e6f2a 100644
--- a/README.md
+++ b/README.md
@@ -370,13 +370,14 @@ and the pages following it.
    create a new release, and try to deploy that release instead.
 1. If it succeeds, deploy the new reverse proxy that handles sub-domains by
    running `cd /app/machine && ./deploy.mk do` and test whether everything works
-   as expected and if that is the case, continue. Note that in the
+   as expected and if that is the case, continue.
+   - Note that in the
    staging environment sent emails can be viewed in the web browser under
    `https://staging.buildingenvelopedata.org/email/` and emails to addresses in
    the variable `RELAY_ALLOWED_EMAILS` in `./.env` are delivered to the
    respective inboxes (the variable's value is a comma separated list of email
    addresses). 
-1. Note that in order for OpenId Connect to work as expected in
+   - Note that in order for OpenId Connect to work as expected in
    staging, make sure that the redirect URIs use the sub-domain `staging`
    (instead of `www`) by entering `psql` with `./database.mk psql`, examining
    the output of the SQL statement
@@ -385,15 +386,16 @@ and the pages following it.
    `update metabase."OpenIddictApplications" set "RedirectUris"='["https://staging.buildingenvelopedata.org/connect/callback/login/metabase"]', "PostLogoutRedirectUris"='["https://staging.buildingenvelopedata.org/connect/callback/logout/metabase"]' where "ClientId"='metabase';`
    and
    `update metabase."OpenIddictApplications" set "RedirectUris"='["https://staging.solarbuildingenvelopes.com/connect/callback/login/metabase"]', "PostLogoutRedirectUris"='["https://staging.solarbuildingenvelopes.com/connect/callback/logout/metabase"]' where "ClientId"='testlab-solar-facades';`
-   Verify that the resource `rsrc` is set correctly. You can update it with 
+   - Verify that the resource `rsrc` is set correctly. You can update it with 
    `update metabase."OpenIddictApplications" set "Permissions"='["ept:authorization","ept:end_session","ept:introspection","ept:pushed_authorization","ept:revocation","ept:token","rst:code","rst:id_token","rst:token","gt:authorization_code","gt:client_credentials","gt:refresh_token","gt:urn:ietf:params:oauth:grant-type:token-exchange","scp:address","scp:email","scp:phone","scp:profile","scp:roles","scp:api:read","scp:api:write","scp:api:administrate","scp:api:verify","scp:api:database:manage","scp:api:gnu_pg:manage","scp:api:institution_representative:manage","scp:api:open_id_connect:manage","scp:api:user:manage","aud:metabase","rsrc:https://staging.buildingenvelopedata.org/graphql/"]' where "ClientId"='metabase';`
-   If you want the staging environment to forward queries to the staging
+   - If you want the staging environment to forward queries to the staging
    environments of product-data databases, then examine the output of the SQL
    statement `select * from metabase.database;` and if necessary execute SQL
    statements along the lines
    `update metabase.database set "Locator"='https://staging.solarbuildingenvelopes.com/graphql/' where "Locator"='https://www.solarbuildingenvelopes.com/graphql/';`
    and
    `update metabase.database set "Locator"='https://igsdb-v2-staging.herokuapp.com/graphql/' where "Locator"='https://igsdb-v2.herokuapp.com/graphql/';`
+   - The client credentials of the metabase may be invalid. In this case, copy the `OPEN_ID_CONNECT_CLIENT_SECRET` from `/app/production/.env` into `/app/staging/.env`.
 1. Change to the production environment by running `cd /app/production`.
 1. Adapt the environment file `./.env` if necessary by comparing it with the
    `./.env.production.sample` file of the release to be deployed.

From 73b24a57d81f27ff4b82ae7a1ccaebd39822797f Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Mon, 11 May 2026 17:44:42 +0200
Subject: [PATCH 027/145] Add page to resend email confirmation and clean-up
 login/registration pages

---
 frontend/components/Layout.tsx                |  34 +--
 frontend/components/SingleSignOnLayout.tsx    |  55 +----
 frontend/pages/institutions/create.tsx        |  31 ---
 ...our-inbox-after-password-reset-request.tsx |   4 +-
 .../check-your-inbox-after-registration.tsx   |   4 +-
 ...box-after-resending-email-confirmation.tsx |  30 +++
 frontend/pages/users/forgot-password.tsx      |  92 ++++-----
 frontend/pages/users/login/index.tsx          | 150 +++++++-------
 .../pages/users/login/with-recovery-code.tsx  |  98 +++++----
 .../users/login/with-two-factor-code.tsx      | 113 +++++-----
 frontend/pages/users/register.tsx             | 194 +++++++++---------
 .../pages/users/resend-email-confirmation.tsx | 102 +++++++++
 frontend/pages/users/reset-password.tsx       | 140 ++++++-------
 frontend/paths.ts                             |   8 +-
 frontend/queries/users.graphql                |  12 ++
 15 files changed, 563 insertions(+), 504 deletions(-)
 delete mode 100644 frontend/pages/institutions/create.tsx
 create mode 100644 frontend/pages/users/check-your-inbox-after-resending-email-confirmation.tsx
 create mode 100644 frontend/pages/users/resend-email-confirmation.tsx

diff --git a/frontend/components/Layout.tsx b/frontend/components/Layout.tsx
index c1cf5e352..f25f14bf4 100644
--- a/frontend/components/Layout.tsx
+++ b/frontend/components/Layout.tsx
@@ -74,13 +74,19 @@ const navItems = [
 ];
 
 interface LayoutProps {
+  pageTitles?: string[];
+  hideNav?: boolean;
   children?: ReactNode;
 }
 
 const cookieConsentName = "consent";
 const cookieConsentValue = "yes";
 
-export default function Layout({ children }: LayoutProps) {
+export default function Layout({
+  pageTitles = [],
+  hideNav = false,
+  children,
+}: LayoutProps) {
   const appTitle = "Building Envelope Data";
 
   const [cookies, setCookie] = useCookies([cookieConsentName]);
@@ -110,21 +116,23 @@ export default function Layout({ children }: LayoutProps) {
   return (
     <AntLayout>
       <Head>
-        <title>{appTitle}</title>
+        <title>{[...pageTitles, appTitle].join(" • ")}</title>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <meta charSet="utf-8" />
       </Head>
-      <AntLayout.Header>
-        <Flex justify="center">
-          <NavBar
-            items={navItems}
-            style={{
-              width: "100%",
-              maxWidth: 1024,
-            }}
-          />
-        </Flex>
-      </AntLayout.Header>
+      {!hideNav && (
+        <AntLayout.Header>
+          <Flex justify="center">
+            <NavBar
+              items={navItems}
+              style={{
+                width: "100%",
+                maxWidth: 1024,
+              }}
+            />
+          </Flex>
+        </AntLayout.Header>
+      )}
       <AntLayout.Content
         style={{
           paddingTop: "24px",
diff --git a/frontend/components/SingleSignOnLayout.tsx b/frontend/components/SingleSignOnLayout.tsx
index 2599cfa8d..76695b6ab 100644
--- a/frontend/components/SingleSignOnLayout.tsx
+++ b/frontend/components/SingleSignOnLayout.tsx
@@ -1,58 +1,17 @@
-import Head from "next/head";
-import { ReactNode, useEffect } from "react";
-import Footer from "./Footer";
-import { Layout as AntLayout, Typography, App } from "antd";
-import { useCookies } from "react-cookie";
+import { ReactNode } from "react";
+import Layout from "./Layout";
+import { Flex } from "antd";
 
 interface SingleSignOnLayoutProps {
   children?: ReactNode;
-};
-
-const cookieConsentName = "consent";
-const cookieConsentValue = "yes";
+}
 
 export default function SingleSignOnLayout({
   children,
 }: SingleSignOnLayoutProps) {
-  const appTitle = "Single-Sign On • Building Envelope Data";
-
-  const [cookies, setCookie] = useCookies([cookieConsentName]);
-  const shouldShowCookieConsent =
-    cookies[cookieConsentName] != cookieConsentValue;
-  const { modal } = App.useApp();
-
-  useEffect(() => {
-    if (shouldShowCookieConsent) {
-      modal.info({
-        title: "Cookie Consent",
-        content: (
-          <Typography.Paragraph style={{ maxWidth: "75ch" }}>
-            This website employs cookies to make it work securely. As these
-            cookies are essential you need to agree to their usage to use this
-            website.
-          </Typography.Paragraph>
-        ),
-        okText: "I agree",
-        onOk: () => {
-          setCookie(cookieConsentName, cookieConsentValue);
-        },
-      });
-    }
-  }, [shouldShowCookieConsent, setCookie]);
-
   return (
-    <AntLayout>
-      <Head>
-        <title>{appTitle}</title>
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <meta charSet="utf-8" />
-      </Head>
-      <AntLayout.Content style={{ padding: "50px" }}>
-        {children}
-      </AntLayout.Content>
-      <AntLayout.Footer>
-        <Footer />
-      </AntLayout.Footer>
-    </AntLayout>
+    <Layout hideNav pageTitles={["Single-Sign On"]}>
+      <Flex justify="center">{children}</Flex>
+    </Layout>
   );
 }
diff --git a/frontend/pages/institutions/create.tsx b/frontend/pages/institutions/create.tsx
deleted file mode 100644
index 16d89123c..000000000
--- a/frontend/pages/institutions/create.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Skeleton, Row, Col, Card } from "antd";
-import Layout from "../../components/Layout";
-import paths from "../../paths";
-import CreateInstitution from "../../components/institutions/CreateInstitution";
-import { useRequireAuth } from "../../lib/hooks/useRequireAuth";
-
-function Page() {
-  const { currentUser } = useRequireAuth({ returnTo: paths.institutionCreate });
-
-  if (!currentUser) {
-    return (
-      <Layout>
-        <Skeleton active avatar title />
-      </Layout>
-    );
-  }
-
-  return (
-    <Layout>
-      <Row justify="center">
-        <Col>
-          <Card title="Create">
-            <CreateInstitution initialOwnerId={currentUser.uuid} />
-          </Card>
-        </Col>
-      </Row>
-    </Layout>
-  );
-}
-
-export default Page;
diff --git a/frontend/pages/users/check-your-inbox-after-password-reset-request.tsx b/frontend/pages/users/check-your-inbox-after-password-reset-request.tsx
index 6c3c3f0f6..000599afb 100644
--- a/frontend/pages/users/check-your-inbox-after-password-reset-request.tsx
+++ b/frontend/pages/users/check-your-inbox-after-password-reset-request.tsx
@@ -4,7 +4,7 @@ import { Card, Typography } from "antd";
 import paths from "../../paths";
 import Link from "next/link";
 
-function CheckYourInboxAfterPasswordResetRequest() {
+export default function Page() {
   const router = useRouter();
   const returnTo = router.query.returnTo;
 
@@ -28,5 +28,3 @@ function CheckYourInboxAfterPasswordResetRequest() {
     </SingleSignOnLayout>
   );
 }
-
-export default CheckYourInboxAfterPasswordResetRequest;
diff --git a/frontend/pages/users/check-your-inbox-after-registration.tsx b/frontend/pages/users/check-your-inbox-after-registration.tsx
index f9a49d73d..efd9a59ce 100644
--- a/frontend/pages/users/check-your-inbox-after-registration.tsx
+++ b/frontend/pages/users/check-your-inbox-after-registration.tsx
@@ -4,7 +4,7 @@ import { Card, Typography } from "antd";
 import paths from "../../paths";
 import Link from "next/link";
 
-function CheckYourInboxAfterRegistration() {
+export default function Page() {
   const router = useRouter();
   const returnTo = router.query.returnTo;
 
@@ -28,5 +28,3 @@ function CheckYourInboxAfterRegistration() {
     </Layout>
   );
 }
-
-export default CheckYourInboxAfterRegistration;
diff --git a/frontend/pages/users/check-your-inbox-after-resending-email-confirmation.tsx b/frontend/pages/users/check-your-inbox-after-resending-email-confirmation.tsx
new file mode 100644
index 000000000..efd9a59ce
--- /dev/null
+++ b/frontend/pages/users/check-your-inbox-after-resending-email-confirmation.tsx
@@ -0,0 +1,30 @@
+import { useRouter } from "next/router";
+import Layout from "../../components/Layout";
+import { Card, Typography } from "antd";
+import paths from "../../paths";
+import Link from "next/link";
+
+export default function Page() {
+  const router = useRouter();
+  const returnTo = router.query.returnTo;
+
+  return (
+    <Layout>
+      <Card title="Check your inbox!">
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          Confirm your email address by following the confirmation link in your
+          inbox and then{" "}
+          <Link
+            href={{
+              pathname: paths.openIdConnectClientLogin,
+              query: returnTo ? { returnTo: returnTo } : null,
+            }}
+          >
+            Login
+          </Link>
+          .
+        </Typography.Paragraph>
+      </Card>
+    </Layout>
+  );
+}
diff --git a/frontend/pages/users/forgot-password.tsx b/frontend/pages/users/forgot-password.tsx
index 3e852f542..31fd1270a 100644
--- a/frontend/pages/users/forgot-password.tsx
+++ b/frontend/pages/users/forgot-password.tsx
@@ -3,7 +3,7 @@ import {
   RequestUserPasswordResetDocument,
   RequestUserPasswordResetMutation,
 } from "../../queries/users.generated";
-import { Form, Input, Button, Row, Col, Card } from "antd";
+import { Form, Input, Button, Card } from "antd";
 import SingleSignOnLayout from "../../components/SingleSignOnLayout";
 import { UserOutlined } from "@ant-design/icons";
 import { useState } from "react";
@@ -64,54 +64,52 @@ function Page() {
 
   return (
     <SingleSignOnLayout>
-      <Row justify="center">
-        <Col>
-          <Card title="Forgot Password">
-            <ErrorAlert messages={globalErrorMessages} />
-            <Form
-              form={form}
-              name="basic"
-              onFinish={onFinish}
-              onFinishFailed={onFinishFailed}
+      <Card title="Forgot Password">
+        <ErrorAlert messages={globalErrorMessages} />
+        <Form
+          form={form}
+          name="basic"
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
+        >
+          <Form.Item
+            name="email"
+            rules={[
+              {
+                required: true,
+                message: "Please input your email address",
+              },
+              {
+                type: "email",
+                message: "Invalid email address",
+              },
+            ]}
+          >
+            <Input prefix={<UserOutlined />} placeholder="Email" />
+          </Form.Item>
+          <Form.Item>
+            <Button
+              type="primary"
+              htmlType="submit"
+              loading={mutating}
+              style={{ width: "100%" }}
             >
-              <Form.Item
-                name="email"
-                rules={[
-                  {
-                    required: true,
-                    message: "Please input your email!",
-                  },
-                  {
-                    type: "email",
-                    message: "Invalid email!",
-                  },
-                ]}
+              Request Password Reset
+            </Button>
+            <div style={{ float: "right" }}>
+              or{" "}
+              <Link
+                href={{
+                  pathname: paths.openIdConnectClientLogin,
+                  query: returnTo ? { returnTo: returnTo } : null,
+                }}
               >
-                <Input prefix={<UserOutlined />} placeholder="Email" />
-              </Form.Item>
-              <Form.Item>
-                <Button
-                  type="primary"
-                  htmlType="submit"
-                  loading={mutating}
-                  style={{ width: "100%" }}
-                >
-                  Reset Password
-                </Button>
-                Or{" "}
-                <Link
-                  href={{
-                    pathname: paths.openIdConnectClientLogin,
-                    query: returnTo ? { returnTo: returnTo } : null,
-                  }}
-                >
-                  Login instead!
-                </Link>
-              </Form.Item>
-            </Form>
-          </Card>
-        </Col>
-      </Row>
+                login instead!
+              </Link>
+            </div>
+          </Form.Item>
+        </Form>
+      </Card>
     </SingleSignOnLayout>
   );
 }
diff --git a/frontend/pages/users/login/index.tsx b/frontend/pages/users/login/index.tsx
index 869ece00e..5445c728e 100644
--- a/frontend/pages/users/login/index.tsx
+++ b/frontend/pages/users/login/index.tsx
@@ -5,7 +5,7 @@ import {
   LoginUserDocument,
   LoginUserMutation,
 } from "../../../queries/currentUser.generated";
-import { Form, Input, Button, Row, Col, Card } from "antd";
+import { Form, Input, Button, Card, Divider } from "antd";
 import SingleSignOnLayout from "../../../components/SingleSignOnLayout";
 import Link from "next/link";
 import { UserOutlined, LockOutlined } from "@ant-design/icons";
@@ -87,81 +87,83 @@ function Login() {
 
   return (
     <SingleSignOnLayout>
-      <Row justify="center">
-        <Col>
-          <Card title="Login">
-            <ErrorAlert messages={globalErrorMessages} />
-            <Form
-              form={form}
-              name="basic"
-              onFinish={onFinish}
-              onFinishFailed={onFinishFailed}
+      <Card title="Login">
+        <ErrorAlert messages={globalErrorMessages} />
+        <Form
+          form={form}
+          name="basic"
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
+        >
+          <Form.Item
+            name="email"
+            rules={[
+              {
+                required: true,
+                message: "Please input your email address",
+              },
+              {
+                type: "email",
+                message: "Invalid email address",
+              },
+            ]}
+          >
+            <Input prefix={<UserOutlined />} placeholder="Email" />
+          </Form.Item>
+          <Form.Item
+            name="password"
+            rules={[
+              {
+                required: true,
+                message: "Please input your password",
+              },
+            ]}
+          >
+            <Input.Password prefix={<LockOutlined />} placeholder="Password" />
+            <Link
+              href={{
+                pathname: paths.userForgotPassword,
+                query: returnTo ? { returnTo: returnTo } : null,
+              }}
+              style={{ float: "right" }}
             >
-              <Form.Item
-                name="email"
-                rules={[
-                  {
-                    required: true,
-                    message: "Please input your email!",
-                  },
-                  {
-                    type: "email",
-                    message: "Invalid email!",
-                  },
-                ]}
-              >
-                <Input prefix={<UserOutlined />} placeholder="Email" />
-              </Form.Item>
-
-              <Form.Item
-                name="password"
-                rules={[
-                  {
-                    required: true,
-                    message: "Please input your password!",
-                  },
-                ]}
+              Forgot password?
+            </Link>
+          </Form.Item>
+          <Form.Item>
+            <Button
+              type="primary"
+              htmlType="submit"
+              loading={mutating}
+              style={{ width: "100%" }}
+            >
+              Login
+            </Button>
+            <div style={{ float: "right" }}>
+              or{" "}
+              <Link
+                href={{
+                  pathname: paths.userRegister,
+                  query: returnTo ? { returnTo: returnTo } : null,
+                }}
               >
-                <Input.Password
-                  prefix={<LockOutlined />}
-                  placeholder="Password"
-                />
-              </Form.Item>
-
-              <Form.Item>
-                <Link
-                  href={{
-                    pathname: paths.userForgotPassword,
-                    query: returnTo ? { returnTo: returnTo } : null,
-                  }}
-                >
-                  Forgot password
-                </Link>
-              </Form.Item>
-
-              <Form.Item>
-                <Button
-                  type="primary"
-                  htmlType="submit"
-                  loading={mutating}
-                  style={{ width: "100%" }}
-                >
-                  Login
-                </Button>
-                Or{" "}
-                <Link
-                  href={{
-                    pathname: paths.userRegister,
-                    query: returnTo ? { returnTo: returnTo } : null,
-                  }}
-                >
-                  Register now!
-                </Link>
-              </Form.Item>
-            </Form>
-          </Card>
-        </Col>
-      </Row>
+                register now!
+              </Link>
+            </div>
+          </Form.Item>
+        </Form>
+        <Divider />
+        <div style={{ textAlign: "center" }}>
+          <Link
+            href={{
+              pathname: paths.userResendEmailConfirmation,
+              query: returnTo ? { returnTo: returnTo } : null,
+            }}
+          >
+            Have you registered but not received a confirmation email?
+          </Link>
+        </div>
+      </Card>
     </SingleSignOnLayout>
   );
 }
diff --git a/frontend/pages/users/login/with-recovery-code.tsx b/frontend/pages/users/login/with-recovery-code.tsx
index f452e2aa8..edd26858e 100644
--- a/frontend/pages/users/login/with-recovery-code.tsx
+++ b/frontend/pages/users/login/with-recovery-code.tsx
@@ -5,7 +5,7 @@ import {
   LoginUserWithRecoveryCodeDocument,
   LoginUserWithRecoveryCodeMutation,
 } from "../../../queries/currentUser.generated";
-import { Form, Input, Button, Row, Col, Card, Typography } from "antd";
+import { Form, Input, Button, Card, Typography } from "antd";
 import SingleSignOnLayout from "../../../components/SingleSignOnLayout";
 import paths from "../../../paths";
 import { useState } from "react";
@@ -69,57 +69,53 @@ function LoginWithRecoveryCode() {
 
   return (
     <SingleSignOnLayout>
-      <Row justify="center">
-        <Col>
-          <Card title="Login">
-            <ErrorAlert messages={globalErrorMessages} />
-            <Typography.Paragraph style={{ maxWidth: "75ch" }}>
-              You have requested to log in with a recovery code. This login will
-              not be remembered until you provide an authenticator app code at
-              log in or disable two-factor authentication and log in again.
-            </Typography.Paragraph>
-            <Form
-              form={form}
-              name="basic"
-              onFinish={onFinish}
-              onFinishFailed={onFinishFailed}
-            >
-              <Form.Item
-                name="recoveryCode"
-                rules={[
-                  {
-                    required: true,
-                    message: "Please input your recovery code!",
-                  },
-                ]}
-              >
-                <Input placeholder="Recovery Code" />
-              </Form.Item>
+      <Card title="Login">
+        <ErrorAlert messages={globalErrorMessages} />
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          You have requested to log in with a recovery code. This login will not
+          be remembered until you provide an authenticator app code at log in or
+          disable two-factor authentication and log in again.
+        </Typography.Paragraph>
+        <Form
+          form={form}
+          name="basic"
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
+        >
+          <Form.Item
+            name="recoveryCode"
+            rules={[
+              {
+                required: true,
+                message: "Please input your recovery code!",
+              },
+            ]}
+          >
+            <Input placeholder="Recovery Code" />
+          </Form.Item>
 
-              <Form.Item>
-                <Button
-                  type="primary"
-                  htmlType="submit"
-                  loading={mutating}
-                  style={{ width: "100%" }}
-                >
-                  Login
-                </Button>
-                Don&apos;t have access to your recovery code? You can{" "}
-                <Link
-                  href={{
-                    pathname: paths.userLoginWithTwoFactorCode,
-                    query: returnTo ? { returnTo: returnTo } : null,
-                  }}
-                >
-                  login with a two-factor code
-                </Link>
-                .
-              </Form.Item>
-            </Form>
-          </Card>
-        </Col>
-      </Row>
+          <Form.Item>
+            <Button
+              type="primary"
+              htmlType="submit"
+              loading={mutating}
+              style={{ width: "100%" }}
+            >
+              Login
+            </Button>
+            Don&apos;t have access to your recovery code? You can{" "}
+            <Link
+              href={{
+                pathname: paths.userLoginWithTwoFactorCode,
+                query: returnTo ? { returnTo: returnTo } : null,
+              }}
+            >
+              login with a two-factor code
+            </Link>
+            .
+          </Form.Item>
+        </Form>
+      </Card>
     </SingleSignOnLayout>
   );
 }
diff --git a/frontend/pages/users/login/with-two-factor-code.tsx b/frontend/pages/users/login/with-two-factor-code.tsx
index 54910609c..43751b90f 100644
--- a/frontend/pages/users/login/with-two-factor-code.tsx
+++ b/frontend/pages/users/login/with-two-factor-code.tsx
@@ -5,16 +5,7 @@ import {
   LoginUserWithTwoFactorCodeDocument,
   LoginUserWithTwoFactorCodeMutation,
 } from "../../../queries/currentUser.generated";
-import {
-  Form,
-  Input,
-  Button,
-  Checkbox,
-  Row,
-  Col,
-  Card,
-  Typography,
-} from "antd";
+import { Form, Input, Button, Checkbox, Card, Typography } from "antd";
 import SingleSignOnLayout from "../../../components/SingleSignOnLayout";
 import Link from "next/link";
 import paths from "../../../paths";
@@ -80,61 +71,57 @@ function LoginWithTwoFactorCode() {
 
   return (
     <SingleSignOnLayout>
-      <Row justify="center">
-        <Col>
-          <Card title="Login">
-            <ErrorAlert messages={globalErrorMessages} />
-            <Typography.Paragraph style={{ maxWidth: "75ch" }}>
-              Your login is protected with an authenticator app. Enter your
-              authenticator code below.
-            </Typography.Paragraph>
-            <Form
-              form={form}
-              name="basic"
-              initialValues={{ rememberMachine: true }}
-              onFinish={onFinish}
-              onFinishFailed={onFinishFailed}
-            >
-              <Form.Item
-                name="authenticatorCode"
-                rules={[
-                  {
-                    required: true,
-                    message: "Please input your authenticator code!",
-                  },
-                ]}
-              >
-                <Input placeholder="Authenticator Code" />
-              </Form.Item>
+      <Card title="Login">
+        <ErrorAlert messages={globalErrorMessages} />
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          Your login is protected with an authenticator app. Enter your
+          authenticator code below.
+        </Typography.Paragraph>
+        <Form
+          form={form}
+          name="basic"
+          initialValues={{ rememberMachine: true }}
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
+        >
+          <Form.Item
+            name="authenticatorCode"
+            rules={[
+              {
+                required: true,
+                message: "Please input your authenticator code!",
+              },
+            ]}
+          >
+            <Input placeholder="Authenticator Code" />
+          </Form.Item>
 
-              <Form.Item name="rememberMachine" valuePropName="checked" noStyle>
-                <Checkbox>Remember machine</Checkbox>
-              </Form.Item>
+          <Form.Item name="rememberMachine" valuePropName="checked" noStyle>
+            <Checkbox>Remember machine</Checkbox>
+          </Form.Item>
 
-              <Form.Item>
-                <Button
-                  type="primary"
-                  htmlType="submit"
-                  loading={mutating}
-                  style={{ width: "100%" }}
-                >
-                  Login
-                </Button>
-                Don&apos;t have access to your authenticator device? You can{" "}
-                <Link
-                  href={{
-                    pathname: paths.userLoginWithRecoveryCode,
-                    query: returnTo ? { returnTo: returnTo } : null,
-                  }}
-                >
-                  login with a recovery code
-                </Link>
-                .
-              </Form.Item>
-            </Form>
-          </Card>
-        </Col>
-      </Row>
+          <Form.Item>
+            <Button
+              type="primary"
+              htmlType="submit"
+              loading={mutating}
+              style={{ width: "100%" }}
+            >
+              Login
+            </Button>
+            Don&apos;t have access to your authenticator device? You can{" "}
+            <Link
+              href={{
+                pathname: paths.userLoginWithRecoveryCode,
+                query: returnTo ? { returnTo: returnTo } : null,
+              }}
+            >
+              login with a recovery code
+            </Link>
+            .
+          </Form.Item>
+        </Form>
+      </Card>
     </SingleSignOnLayout>
   );
 }
diff --git a/frontend/pages/users/register.tsx b/frontend/pages/users/register.tsx
index 21f38e7ab..ee335aacb 100644
--- a/frontend/pages/users/register.tsx
+++ b/frontend/pages/users/register.tsx
@@ -5,7 +5,7 @@ import {
   RegisterUserDocument,
   RegisterUserMutation,
 } from "../../queries/users.generated";
-import { Form, Input, Button, Row, Col, Card, Typography } from "antd";
+import { Form, Input, Button, Card, Typography, Divider } from "antd";
 import Layout from "../../components/Layout";
 import paths from "../../paths";
 import { useState } from "react";
@@ -73,103 +73,109 @@ function Register() {
 
   return (
     <Layout>
-      <Row justify="center">
-        <Col>
-          <Card title="Register">
-            <Typography.Paragraph style={{ maxWidth: "75ch" }}>
-              No account is needed to query the{" "}
-              <Link href={paths.allData}>data</Link> for free! However, if you
-              want to change information about{" "}
-              <Link href={paths.institutions}>institutions</Link>,{" "}
-              <Link href={paths.dataFormats}>data formats</Link>,{" "}
-              <Link href={paths.methods}>methods</Link>,{" "}
-              <Link href={paths.components}>components</Link> or{" "}
-              <Link href={paths.databases}>databases</Link>, you can register
-              here.
-            </Typography.Paragraph>
-            <ErrorAlert messages={globalErrorMessages} />
-            <Form
-              {...layout}
-              form={form}
-              name="basic"
-              onFinish={onFinish}
-              onFinishFailed={onFinishFailed}
-            >
-              <Form.Item
-                label="Name"
-                name="name"
-                rules={[
-                  {
-                    required: true,
-                  },
-                ]}
-              >
-                <Input />
-              </Form.Item>
+      <Card title="Register">
+        <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+          No account is needed to query the{" "}
+          <Link href={paths.allData}>data</Link> for free! However, if you want
+          to change information about{" "}
+          <Link href={paths.institutions}>institutions</Link>,{" "}
+          <Link href={paths.dataFormats}>data formats</Link>,{" "}
+          <Link href={paths.methods}>methods</Link>,{" "}
+          <Link href={paths.components}>components</Link> or{" "}
+          <Link href={paths.databases}>databases</Link>, you can register here.
+        </Typography.Paragraph>
+        <ErrorAlert messages={globalErrorMessages} />
+        <Form
+          {...layout}
+          form={form}
+          name="basic"
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
+        >
+          <Form.Item
+            label="Name"
+            name="name"
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
 
-              <Form.Item
-                label="Email"
-                name="email"
-                rules={[
-                  {
-                    required: true,
-                    message: "Please input your email!",
-                  },
-                  {
-                    type: "email",
-                    message: "Invalid email!",
-                  },
-                ]}
-              >
-                <Input />
-              </Form.Item>
+          <Form.Item
+            label="Email"
+            name="email"
+            rules={[
+              {
+                required: true,
+                message: "Please input your email!",
+              },
+              {
+                type: "email",
+                message: "Invalid email!",
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
 
-              <Form.Item
-                label="Password"
-                name="password"
-                rules={[
-                  {
-                    required: true,
-                    message: "Please input your password!",
-                  },
-                ]}
-              >
-                <Input.Password />
-              </Form.Item>
+          <Form.Item
+            label="Password"
+            name="password"
+            rules={[
+              {
+                required: true,
+                message: "Please input your password!",
+              },
+            ]}
+          >
+            <Input.Password />
+          </Form.Item>
 
-              <Form.Item
-                label="Confirm Password"
-                name="passwordConfirmation"
-                dependencies={["password"]}
-                rules={[
-                  {
-                    required: true,
-                    message: "Please input your password!",
-                  },
-                  ({ getFieldValue }) => ({
-                    validator(_, value) {
-                      if (!value || getFieldValue("password") === value) {
-                        return Promise.resolve();
-                      }
-                      return Promise.reject(
-                        "Password and confirmation do not match!",
-                      );
-                    },
-                  }),
-                ]}
-              >
-                <Input.Password />
-              </Form.Item>
+          <Form.Item
+            label="Confirm Password"
+            name="passwordConfirmation"
+            dependencies={["password"]}
+            rules={[
+              {
+                required: true,
+                message: "Please input your password!",
+              },
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (!value || getFieldValue("password") === value) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(
+                    "Password and confirmation do not match!",
+                  );
+                },
+              }),
+            ]}
+          >
+            <Input.Password />
+          </Form.Item>
 
-              <Form.Item {...tailLayout}>
-                <Button type="primary" htmlType="submit" loading={mutating}>
-                  Register
-                </Button>
-              </Form.Item>
-            </Form>
-          </Card>
-        </Col>
-      </Row>
+          <Form.Item {...tailLayout}>
+            <Button type="primary" htmlType="submit" loading={mutating}>
+              Register
+            </Button>
+          </Form.Item>
+        </Form>
+        <Divider />
+        <div style={{ textAlign: "center" }}>
+          <Link
+            href={{
+              pathname: paths.userResendEmailConfirmation,
+              query: returnTo ? { returnTo: returnTo } : null,
+            }}
+          >
+            Have you registered but not received a confirmation email?
+          </Link>
+        </div>
+      </Card>
     </Layout>
   );
 }
diff --git a/frontend/pages/users/resend-email-confirmation.tsx b/frontend/pages/users/resend-email-confirmation.tsx
new file mode 100644
index 000000000..25f561e9a
--- /dev/null
+++ b/frontend/pages/users/resend-email-confirmation.tsx
@@ -0,0 +1,102 @@
+import { useMutation } from "@apollo/client/react";
+import { useRouter } from "next/router";
+import {
+  ResendUserEmailConfirmationDocument,
+  ResendUserEmailConfirmationMutation,
+} from "../../queries/users.generated";
+import paths from "../../paths";
+import { Button, Form, Input, Card } from "antd";
+import { useState } from "react";
+import { layout, tailLayout } from "../../lib/form";
+import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import ErrorAlert from "../../components/ErrorAlert";
+import Layout from "../../components/Layout";
+
+interface FormValues {
+  email: string;
+}
+
+export default function Page() {
+  const router = useRouter();
+  const { returnTo } = router.query;
+
+  const [globalErrorMessages, setGlobalErrorMessages] = useState(
+    new Array<string>(),
+  );
+  const [form] = Form.useForm();
+
+  const [resendUserEmailConfirmationMutation] = useMutation(
+    ResendUserEmailConfirmationDocument,
+  );
+
+  const { mutating, withMutationHandler, augmentFormWithErrors } =
+    useMutationHandler<ResendUserEmailConfirmationMutation>({
+      getErrors: (data) => data.resendUserEmailConfirmation.errors,
+    });
+
+  const onFinish = (values: FormValues) => {
+    withMutationHandler(
+      () =>
+        resendUserEmailConfirmationMutation({
+          variables: {
+            input: {
+              email: values.email,
+            },
+          },
+        }),
+      {
+        onSuccess: () => {
+          return router.push({
+            pathname: paths.userCheckYourInboxAfterResendingEmailConfirmation,
+            query: returnTo ? { returnTo: returnTo } : {},
+          });
+        },
+        onError: (graphQlErrors, userErrors) =>
+          setGlobalErrorMessages(
+            augmentFormWithErrors(graphQlErrors, userErrors, form),
+          ),
+      },
+    );
+  };
+
+  const onFinishFailed = () => {
+    setGlobalErrorMessages(["Fix the errors below."]);
+  };
+
+  return (
+    <Layout>
+      <Card title="Resend Email Confirmation">
+        <ErrorAlert messages={globalErrorMessages} />
+        <Form
+          {...layout}
+          form={form}
+          name="basic"
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
+        >
+          <Form.Item
+            label="Email"
+            name="email"
+            rules={[
+              {
+                required: true,
+                message: "Please input your email address",
+              },
+              {
+                type: "email",
+                message: "Invalid email address",
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item {...tailLayout}>
+            <Button type="primary" htmlType="submit" loading={mutating}>
+              Resend email confirmation
+            </Button>
+          </Form.Item>
+        </Form>
+      </Card>
+    </Layout>
+  );
+}
diff --git a/frontend/pages/users/reset-password.tsx b/frontend/pages/users/reset-password.tsx
index 685ada8d1..e54975969 100644
--- a/frontend/pages/users/reset-password.tsx
+++ b/frontend/pages/users/reset-password.tsx
@@ -6,7 +6,7 @@ import {
 } from "../../queries/users.generated";
 import SingleSignOnLayout from "../../components/SingleSignOnLayout";
 import paths from "../../paths";
-import { Button, Form, Input, App, Card, Col, Row } from "antd";
+import { Button, Form, Input, App, Card } from "antd";
 import { useState } from "react";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
@@ -74,80 +74,76 @@ function Page() {
 
   return (
     <SingleSignOnLayout>
-      <Row justify="center">
-        <Col>
-          <Card title="Register">
-            <ErrorAlert messages={globalErrorMessages} />
-            <Form
-              {...layout}
-              form={form}
-              name="basic"
-              onFinish={onFinish}
-              onFinishFailed={onFinishFailed}
-            >
-              <Form.Item
-                label="Email"
-                name="email"
-                rules={[
-                  {
-                    required: true,
-                    message: "Please input your email!",
-                  },
-                  {
-                    type: "email",
-                    message: "Invalid email!",
-                  },
-                ]}
-              >
-                <Input />
-              </Form.Item>
+      <Card title="Reset Password">
+        <ErrorAlert messages={globalErrorMessages} />
+        <Form
+          {...layout}
+          form={form}
+          name="basic"
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
+        >
+          <Form.Item
+            label="Email"
+            name="email"
+            rules={[
+              {
+                required: true,
+                message: "Please input your email!",
+              },
+              {
+                type: "email",
+                message: "Invalid email!",
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
 
-              <Form.Item
-                label="Password"
-                name="password"
-                rules={[
-                  {
-                    required: true,
-                    message: "Please input your password!",
-                  },
-                ]}
-              >
-                <Input.Password />
-              </Form.Item>
+          <Form.Item
+            label="Password"
+            name="password"
+            rules={[
+              {
+                required: true,
+                message: "Please input your password!",
+              },
+            ]}
+          >
+            <Input.Password />
+          </Form.Item>
 
-              <Form.Item
-                label="Confirm Password"
-                name="passwordConfirmation"
-                dependencies={["password"]}
-                rules={[
-                  {
-                    required: true,
-                    message: "Please input your password!",
-                  },
-                  ({ getFieldValue }) => ({
-                    validator(_, value) {
-                      if (!value || getFieldValue("password") === value) {
-                        return Promise.resolve();
-                      }
-                      return Promise.reject(
-                        "Password and confirmation do not match!",
-                      );
-                    },
-                  }),
-                ]}
-              >
-                <Input.Password />
-              </Form.Item>
+          <Form.Item
+            label="Confirm Password"
+            name="passwordConfirmation"
+            dependencies={["password"]}
+            rules={[
+              {
+                required: true,
+                message: "Please input your password!",
+              },
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (!value || getFieldValue("password") === value) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(
+                    "Password and confirmation do not match!",
+                  );
+                },
+              }),
+            ]}
+          >
+            <Input.Password />
+          </Form.Item>
 
-              <Form.Item {...tailLayout}>
-                <Button type="primary" htmlType="submit" loading={mutating}>
-                  Reset password
-                </Button>
-              </Form.Item>
-            </Form>
-          </Card>
-        </Col>
-      </Row>
+          <Form.Item {...tailLayout}>
+            <Button type="primary" htmlType="submit" loading={mutating}>
+              Reset password
+            </Button>
+          </Form.Item>
+        </Form>
+      </Card>
     </SingleSignOnLayout>
   );
 }
diff --git a/frontend/paths.ts b/frontend/paths.ts
index 1a207b84f..fca0bf77e 100644
--- a/frontend/paths.ts
+++ b/frontend/paths.ts
@@ -14,7 +14,6 @@ export default {
   institution(id: Scalars["Uuid"]["output"]) {
     return `/institutions/${encodeURIComponent(id)}` as Route;
   },
-  institutionCreate: "/institutions/create" as Route,
   users: "/users" as Route,
   user(id: Scalars["Uuid"]["output"]) {
     return `/users/${encodeURIComponent(id)}` as Route;
@@ -33,14 +32,15 @@ export default {
     },
   },
   personalUserData: "/personal-user-data" as Route,
-  userLogin: "/users/login" as Route,
   userRegister: "/users/register" as Route,
-  userConfirmEmail: "/users/confirm-email" as Route,
   userForgotPassword: "/users/forgot-password" as Route,
   userLoginWithTwoFactorCode: "/users/login/with-two-factor-code" as Route,
   userLoginWithRecoveryCode: "/users/login/with-recovery-code" as Route,
+  userResendEmailConfirmation: "/users/resend-email-confirmation" as Route,
   userCheckYourInboxAfterRegistration:
     "/users/check-your-inbox-after-registration" as Route,
+  userCheckYourInboxAfterResendingEmailConfirmation:
+    "/users/check-your-inbox-after-resending-email-confirmation" as Route,
   userCheckYourInboxAfterPasswordResetRequest:
     "/users/check-your-inbox-after-password-reset-request" as Route,
   dataFormats: "/data-formats" as Route,
@@ -127,8 +127,6 @@ export default {
   openIdConnectApplication(id: Scalars["Uuid"]["output"]) {
     return `/open-id-connect/application/${encodeURIComponent(id)}` as Route;
   },
-  openIdConnectApplicationCreate:
-    "/open-id-connect/application/create" as Route,
   openIdConnect: "/open-id-connect" as Route,
   openIdConnectClientLogin: "/connect/client/login" as Route,
   openIdConnectClientLogout: "/connect/client/logout" as Route,
diff --git a/frontend/queries/users.graphql b/frontend/queries/users.graphql
index 851faeec0..ba722448b 100644
--- a/frontend/queries/users.graphql
+++ b/frontend/queries/users.graphql
@@ -208,6 +208,18 @@ mutation ResetUserPassword($input: ResetUserPasswordInput!) {
   }
 }
 
+mutation ResendUserEmailConfirmation(
+  $input: ResendUserEmailConfirmationInput!
+) {
+  resendUserEmailConfirmation(input: $input) {
+    errors {
+      code
+      message
+      path
+    }
+  }
+}
+
 mutation DeleteUser($input: DeleteUserInput!) {
   deleteUser(input: $input) {
     errors {

From dcb51c0c168057d355be0e0d3e2cedbba3bd794b Mon Sep 17 00:00:00 2001
From: christoph-maurer <christoph.maurer@ise.fraunhofer.de>
Date: Mon, 11 May 2026 17:48:52 +0200
Subject: [PATCH 028/145] The `OPEN_ID_CONNECT_CLIENT_SECRET` of `database`
 should be copied, too.

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9303e6f2a..d4ca61833 100644
--- a/README.md
+++ b/README.md
@@ -395,7 +395,11 @@ and the pages following it.
    `update metabase.database set "Locator"='https://staging.solarbuildingenvelopes.com/graphql/' where "Locator"='https://www.solarbuildingenvelopes.com/graphql/';`
    and
    `update metabase.database set "Locator"='https://igsdb-v2-staging.herokuapp.com/graphql/' where "Locator"='https://igsdb-v2.herokuapp.com/graphql/';`
-   - The client credentials of the metabase may be invalid. In this case, copy the `OPEN_ID_CONNECT_CLIENT_SECRET` from `/app/production/.env` into `/app/staging/.env`.
+   - The client credentials of the metabase may be invalid. In this case, copy
+   the `OPEN_ID_CONNECT_CLIENT_SECRET` from `/app/production/.env` into
+   `/app/staging/.env`. Do the same in your deployment of the repository
+   `database`, because the backup from production includes an encrypted version
+   of that `OPEN_ID_CONNECT_CLIENT_SECRET`, too.
 1. Change to the production environment by running `cd /app/production`.
 1. Adapt the environment file `./.env` if necessary by comparing it with the
    `./.env.production.sample` file of the release to be deployed.

From 2e1bdb12c8314470f851771c52a4a9e67f30c9e7 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Mon, 11 May 2026 18:45:10 +0200
Subject: [PATCH 029/145] Show summary of institution and method to verify with
 the verify-button as only input control and rename `hideExtra` to
 `hideInputControls` to capture its proper intent

---
 .../components/ComponentSummary.tsx           |  84 +++++++------
 .../components/components/CreateComponent.tsx |   2 +-
 .../dataFormats/CreateDataFormat.tsx          |   2 +-
 .../dataFormats/DataFormatSummary.tsx         |   6 +-
 .../components/databases/CreateDatabase.tsx   |   2 +-
 .../components/databases/DatabaseSummary.tsx  |  31 ++---
 .../databases/PendingDatabaseList.tsx         |   2 +-
 .../gnuPgKeys/AddGnuPgKeyFingerprint.tsx      |   2 +-
 .../components/gnuPgKeys/GnuPgKeySummary.tsx  |   6 +-
 .../institutions/CreateInstitution.tsx        |   2 +-
 .../components/institutions/Institution.tsx   | 107 +++++++---------
 .../institutions/InstitutionSummary.tsx       | 115 +++++++++++-------
 .../institutions/PendingInstitutionList.tsx   |   6 +-
 frontend/components/methods/CreateMethod.tsx  |   2 +-
 frontend/components/methods/MethodSummary.tsx |  39 +++---
 .../CreateOpenIdConnectApplication.tsx        |   2 +-
 .../OpenIdConnectApplicationSummary.tsx       |   6 +-
 .../OpenIdConnectAuthorizationSummary.tsx     |   6 +-
 .../tokens/OpenIdConnectTokenSummary.tsx      |   6 +-
 frontend/components/users/UserSummary.tsx     |  12 +-
 frontend/pages/users/forgot-password.tsx      |  18 +--
 frontend/pages/users/login/index.tsx          |  43 ++++---
 frontend/queries/institutions.graphql         |   8 +-
 23 files changed, 270 insertions(+), 239 deletions(-)

diff --git a/frontend/components/components/ComponentSummary.tsx b/frontend/components/components/ComponentSummary.tsx
index 54ec00b6b..82f7b9530 100644
--- a/frontend/components/components/ComponentSummary.tsx
+++ b/frontend/components/components/ComponentSummary.tsx
@@ -33,14 +33,14 @@ const renderManufacturerList = (
     | NonNullable<ComponentPartialFragment["manufacturers"]>
     | NonNullable<ComponentPartialFragment["pendingManufacturers"]>,
   componentId: Scalars["Uuid"]["output"],
-  hideExtra: boolean | undefined,
+  hideInputControls: boolean | undefined,
 ) => (
   <InlineList
     items={manufacturers.edges}
     renderItem={(edge) => (
       <span key={edge.node.id}>
         <EntityLink entity={edge.node} route={paths.institution} />
-        {!hideExtra && edge.isAuthorizedToRemoveEdge && (
+        {!hideInputControls && edge.isAuthorizedToRemoveEdge && (
           <RemoveComponentManufacturer
             componentId={componentId}
             institutionId={edge.node.uuid}
@@ -53,15 +53,17 @@ const renderManufacturerList = (
 
 export default function ComponentSummary({
   entity,
-  hideExtra = false,
+  extra,
+  hideInputControls = false,
 }: {
   entity: ComponentsPartialFragment | ComponentPartialFragment;
-  hideExtra?: boolean;
+  extra?: React.ReactNode;
+  hideInputControls?: boolean;
 }) {
   const reflexiveRelations = [
     "assembledOf" in entity &&
       (entity.assembledOf.edges.length > 0 ||
-        (!hideExtra && entity.assembledOf.isAuthorizedToAddEdge)) && (
+        (!hideInputControls && entity.assembledOf.isAuthorizedToAddEdge)) && (
         <div>
           Assembled of{" "}
           <InlineList
@@ -77,7 +79,7 @@ export default function ComponentSummary({
                     </Tag>
                   )}
                 </Space>
-                {!hideExtra && edge.isAuthorizedToUpdateEdge && (
+                {!hideInputControls && edge.isAuthorizedToUpdateEdge && (
                   <UpdateComponentAssembly
                     assembledComponent={{
                       uuid: entity.uuid,
@@ -91,7 +93,7 @@ export default function ComponentSummary({
                     primeSurface={edge.primeSurface}
                   />
                 )}
-                {!hideExtra && edge.isAuthorizedToRemoveEdge && (
+                {!hideInputControls && edge.isAuthorizedToRemoveEdge && (
                   <RemoveComponentAssembly
                     assembledComponentId={entity.uuid}
                     partComponentId={edge.node.uuid}
@@ -100,14 +102,14 @@ export default function ComponentSummary({
               </span>
             )}
           />
-          {!hideExtra && entity.assembledOf.isAuthorizedToAddEdge && (
+          {!hideInputControls && entity.assembledOf.isAuthorizedToAddEdge && (
             <AddPartOfComponent assembledComponentId={entity.uuid} />
           )}
         </div>
       ),
     "partOf" in entity &&
       (entity.partOf.edges.length > 0 ||
-        (!hideExtra && entity.partOf.isAuthorizedToAddEdge)) && (
+        (!hideInputControls && entity.partOf.isAuthorizedToAddEdge)) && (
         <div>
           Part of{" "}
           <InlineList
@@ -123,7 +125,7 @@ export default function ComponentSummary({
                     </Tag>
                   )}
                 </Space>
-                {!hideExtra && edge.isAuthorizedToUpdateEdge && (
+                {!hideInputControls && edge.isAuthorizedToUpdateEdge && (
                   <UpdateComponentAssembly
                     assembledComponent={{
                       uuid: edge.node.uuid,
@@ -137,7 +139,7 @@ export default function ComponentSummary({
                     primeSurface={edge.primeSurface}
                   />
                 )}
-                {!hideExtra && edge.isAuthorizedToRemoveEdge && (
+                {!hideInputControls && edge.isAuthorizedToRemoveEdge && (
                   <RemoveComponentAssembly
                     assembledComponentId={edge.node.uuid}
                     partComponentId={entity.uuid}
@@ -146,14 +148,14 @@ export default function ComponentSummary({
               </span>
             )}
           />
-          {!hideExtra && entity.partOf.isAuthorizedToAddEdge && (
+          {!hideInputControls && entity.partOf.isAuthorizedToAddEdge && (
             <AddAssembledOfComponent partComponentId={entity.uuid} />
           )}
         </div>
       ),
     "variantOf" in entity &&
       (entity.variantOf.edges.length > 0 ||
-        (!hideExtra && entity.variantOf.isAuthorizedToAddEdge)) && (
+        (!hideInputControls && entity.variantOf.isAuthorizedToAddEdge)) && (
         <div>
           Variant of{" "}
           <InlineList
@@ -161,7 +163,7 @@ export default function ComponentSummary({
             renderItem={(edge) => (
               <span key={edge.node.id}>
                 <EntityLink entity={edge.node} route={paths.component} />
-                {!hideExtra && edge.isAuthorizedToRemoveEdge && (
+                {!hideInputControls && edge.isAuthorizedToRemoveEdge && (
                   <RemoveComponentVariant
                     oneComponentId={entity.uuid}
                     otherComponentId={edge.node.uuid}
@@ -170,14 +172,15 @@ export default function ComponentSummary({
               </span>
             )}
           />
-          {!hideExtra && entity.variantOf.isAuthorizedToAddEdge && (
+          {!hideInputControls && entity.variantOf.isAuthorizedToAddEdge && (
             <AddVariantOfComponent componentId={entity.uuid} />
           )}
         </div>
       ),
     "generalizationOf" in entity &&
       (entity.generalizationOf.edges.length > 0 ||
-        (!hideExtra && entity.generalizationOf.isAuthorizedToAddEdge)) && (
+        (!hideInputControls &&
+          entity.generalizationOf.isAuthorizedToAddEdge)) && (
         <div>
           Generalization of{" "}
           <InlineList
@@ -185,7 +188,7 @@ export default function ComponentSummary({
             renderItem={(edge) => (
               <span key={edge.node.id}>
                 <EntityLink entity={edge.node} route={paths.component} />
-                {!hideExtra && edge.isAuthorizedToRemoveEdge && (
+                {!hideInputControls && edge.isAuthorizedToRemoveEdge && (
                   <RemoveComponentGeneralization
                     generalComponentId={entity.uuid}
                     concreteComponentId={edge.node.uuid}
@@ -194,14 +197,16 @@ export default function ComponentSummary({
               </span>
             )}
           />
-          {!hideExtra && entity.generalizationOf.isAuthorizedToAddEdge && (
-            <AddConcretizationOfComponent generalComponentId={entity.uuid} />
-          )}
+          {!hideInputControls &&
+            entity.generalizationOf.isAuthorizedToAddEdge && (
+              <AddConcretizationOfComponent generalComponentId={entity.uuid} />
+            )}
         </div>
       ),
     "concretizationOf" in entity &&
       (entity.concretizationOf.edges.length > 0 ||
-        (!hideExtra && entity.concretizationOf.isAuthorizedToAddEdge)) && (
+        (!hideInputControls &&
+          entity.concretizationOf.isAuthorizedToAddEdge)) && (
         <div>
           Concretization of{" "}
           <InlineList
@@ -209,7 +214,7 @@ export default function ComponentSummary({
             renderItem={(edge) => (
               <span key={edge.node.id}>
                 <EntityLink entity={edge.node} route={paths.component} />
-                {!hideExtra && edge.isAuthorizedToRemoveEdge && (
+                {!hideInputControls && edge.isAuthorizedToRemoveEdge && (
                   <RemoveComponentGeneralization
                     generalComponentId={edge.node.uuid}
                     concreteComponentId={entity.uuid}
@@ -218,9 +223,10 @@ export default function ComponentSummary({
               </span>
             )}
           />
-          {!hideExtra && entity.concretizationOf.isAuthorizedToAddEdge && (
-            <AddGeneralizationOfComponent concreteComponentId={entity.uuid} />
-          )}
+          {!hideInputControls &&
+            entity.concretizationOf.isAuthorizedToAddEdge && (
+              <AddGeneralizationOfComponent concreteComponentId={entity.uuid} />
+            )}
         </div>
       ),
   ].filter(isTruthy);
@@ -232,15 +238,14 @@ export default function ComponentSummary({
       tags={entity.categories.map((x) => (
         <EnumTag>{x}</EnumTag>
       ))}
-      extra={
-        !hideExtra &&
-        [
+      extra={[
+        extra,
+        !hideInputControls &&
           "isAuthorizedToUpdateNode" in entity &&
-            entity.isAuthorizedToUpdateNode && (
-              <UpdateComponent key="UpdateComponent" component={entity} />
-            ),
-        ].filter(isTruthy)
-      }
+          entity.isAuthorizedToUpdateNode && (
+            <UpdateComponent key="UpdateComponent" component={entity} />
+          ),
+      ].filter(isTruthy)}
     >
       {(entity.availability?.from || entity.availability?.to) && (
         <div>
@@ -254,23 +259,24 @@ export default function ComponentSummary({
             {renderManufacturerList(
               entity.manufacturers,
               entity.uuid,
-              hideExtra,
+              hideInputControls,
             )}
             {entity.pendingManufacturers &&
               entity.pendingManufacturers.edges.length > 0 && (
                 <>
                   {" "}
-                  Awaiting verification of
+                  and awaiting verification of
                   {renderManufacturerList(
                     entity.pendingManufacturers,
                     entity.uuid,
-                    hideExtra,
+                    hideInputControls,
                   )}
                 </>
               )}
-            {!hideExtra && entity.manufacturers.isAuthorizedToAddEdge && (
-              <AddComponentManufacturer componentId={entity.uuid} />
-            )}
+            {!hideInputControls &&
+              entity.manufacturers.isAuthorizedToAddEdge && (
+                <AddComponentManufacturer componentId={entity.uuid} />
+              )}
           </>
         ) : (
           <InlineList
diff --git a/frontend/components/components/CreateComponent.tsx b/frontend/components/components/CreateComponent.tsx
index 48af608d0..023831aa3 100644
--- a/frontend/components/components/CreateComponent.tsx
+++ b/frontend/components/components/CreateComponent.tsx
@@ -127,7 +127,7 @@ export default function CreateComponent({
               showProgress: true,
               pauseOnHover: true,
               duration: 0,
-              description: <ComponentSummary hideExtra entity={model} />,
+              description: <ComponentSummary hideInputControls entity={model} />,
             });
           }
         },
diff --git a/frontend/components/dataFormats/CreateDataFormat.tsx b/frontend/components/dataFormats/CreateDataFormat.tsx
index 72884987d..c083019f4 100644
--- a/frontend/components/dataFormats/CreateDataFormat.tsx
+++ b/frontend/components/dataFormats/CreateDataFormat.tsx
@@ -96,7 +96,7 @@ export default function CreateDataFormat({
                 width: "max-content",
                 minWidth: "384px",
               },
-              description: <DataFormatSummary hideExtra entity={model} />,
+              description: <DataFormatSummary hideInputControls entity={model} />,
             });
           }
         },
diff --git a/frontend/components/dataFormats/DataFormatSummary.tsx b/frontend/components/dataFormats/DataFormatSummary.tsx
index 05a111b8a..ba4d4d343 100644
--- a/frontend/components/dataFormats/DataFormatSummary.tsx
+++ b/frontend/components/dataFormats/DataFormatSummary.tsx
@@ -12,10 +12,10 @@ import Manager from "../Manager";
 
 export default function DataFormatSummary({
   entity,
-  hideExtra = false,
+  hideInputControls = false,
 }: {
   entity: DataFormatsPartialFragment | DataFormatPartialFragment;
-  hideExtra?: boolean;
+  hideInputControls?: boolean;
 }) {
   return (
     <EntitySummary
@@ -38,7 +38,7 @@ export default function DataFormatSummary({
         </Tag>,
       ]}
       extra={
-        !hideExtra &&
+        !hideInputControls &&
         [
           "isAuthorizedToUpdateNode" in entity &&
             entity.isAuthorizedToUpdateNode && (
diff --git a/frontend/components/databases/CreateDatabase.tsx b/frontend/components/databases/CreateDatabase.tsx
index 7f1df450a..69ed31f87 100644
--- a/frontend/components/databases/CreateDatabase.tsx
+++ b/frontend/components/databases/CreateDatabase.tsx
@@ -81,7 +81,7 @@ export default function CreateDatabase({
                 width: "max-content",
                 minWidth: "384px",
               },
-              description: <DatabaseSummary hideExtra entity={model} />,
+              description: <DatabaseSummary hideInputControls entity={model} />,
             });
           }
         },
diff --git a/frontend/components/databases/DatabaseSummary.tsx b/frontend/components/databases/DatabaseSummary.tsx
index 94bf99922..bb3f6ceca 100644
--- a/frontend/components/databases/DatabaseSummary.tsx
+++ b/frontend/components/databases/DatabaseSummary.tsx
@@ -16,13 +16,15 @@ import CodeView from "../CodeView";
 
 export default function DatabaseSummary({
   entity,
-  hideExtra = false,
+  hideInputControls = false,
+  showVerifyAnyway = false,
 }: {
   entity:
     | DatabasesPartialFragment
     | PendingDatabasesPartialFragment
     | DatabasePartialFragment;
-  hideExtra?: boolean;
+  hideInputControls?: boolean;
+  showVerifyAnyway?: boolean;
 }) {
   return (
     <EntitySummary
@@ -33,20 +35,19 @@ export default function DatabaseSummary({
           {entity.verificationState}
         </EnumTag>,
       ]}
-      extra={
-        !hideExtra &&
-        [
+      extra={[
+        (!hideInputControls || showVerifyAnyway) &&
           "isAuthorizedToVerifyNode" in entity &&
-            entity.isAuthorizedToVerifyNode &&
-            entity.verificationState == DatabaseVerificationState.Pending && (
-              <VerifyDatabase key="verifyDatabase" databaseId={entity.uuid} />
-            ),
+          entity.isAuthorizedToVerifyNode &&
+          entity.verificationState == DatabaseVerificationState.Pending && (
+            <VerifyDatabase key="verifyDatabase" databaseId={entity.uuid} />
+          ),
+        !hideInputControls &&
           "isAuthorizedToUpdateNode" in entity &&
-            entity.isAuthorizedToUpdateNode && (
-              <UpdateDatabase key="updateDatabase" database={entity} />
-            ),
-        ].filter(isTruthy)
-      }
+          entity.isAuthorizedToUpdateNode && (
+            <UpdateDatabase key="updateDatabase" database={entity} />
+          ),
+      ].filter(isTruthy)}
     >
       <div>
         Operated by <EntityLink entity={entity} route={paths.database} />
@@ -66,7 +67,7 @@ export default function DatabaseSummary({
             when queried for the GraphQL query
             <CodeView code="query { verificationCode }" />
             Then, press the &ldquo;Verify&rdquo; button{" "}
-            {!hideExtra ? (
+            {!hideInputControls ? (
               "above"
             ) : (
               <>
diff --git a/frontend/components/databases/PendingDatabaseList.tsx b/frontend/components/databases/PendingDatabaseList.tsx
index 8475bfbfe..8f4a1e5b8 100644
--- a/frontend/components/databases/PendingDatabaseList.tsx
+++ b/frontend/components/databases/PendingDatabaseList.tsx
@@ -16,7 +16,7 @@ export default function PendingDatabaseList() {
       dataSource={nodes}
       renderItem={(node) => (
         <EntityItem>
-          <DatabaseSummary entity={node} />
+          <DatabaseSummary hideInputControls showVerifyAnyway entity={node} />
         </EntityItem>
       )}
     />
diff --git a/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx b/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
index 7f45219c5..1b1964587 100644
--- a/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
+++ b/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
@@ -75,7 +75,7 @@ export default function AddGnuPgKeyFingerprint({
                 width: "max-content",
                 minWidth: "384px",
               },
-              description: <GnuPgKeySummary hideExtra entity={model} />,
+              description: <GnuPgKeySummary hideInputControls entity={model} />,
             });
           }
         },
diff --git a/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx b/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
index dd3877335..9c51e9bca 100644
--- a/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
+++ b/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
@@ -22,10 +22,10 @@ const color = (status: Status) => {
 
 export default function GnuPgKeySummary({
   entity,
-  hideExtra = false,
+  hideInputControls = false,
 }: {
   entity: GnuPgKeyFingerprintsPartialFragment;
-  hideExtra?: boolean;
+  hideInputControls?: boolean;
 }) {
   const status: Status = entity.allowedAt
     ? entity.forbiddenAt
@@ -52,7 +52,7 @@ export default function GnuPgKeySummary({
         </Tag>,
       ]}
       extra={
-        !hideExtra && [
+        !hideInputControls && [
           entity.isAuthorizedToAllowNode && entity.allowedAt == undefined && (
             <AllowGnuPgKeyFingerprint fingerprint={entity.fingerprint} />
           ),
diff --git a/frontend/components/institutions/CreateInstitution.tsx b/frontend/components/institutions/CreateInstitution.tsx
index cfa098360..cd7195285 100644
--- a/frontend/components/institutions/CreateInstitution.tsx
+++ b/frontend/components/institutions/CreateInstitution.tsx
@@ -95,7 +95,7 @@ export default function CreateInstitution(props: CreateInstitutionProps) {
                 width: "max-content",
                 minWidth: "384px",
               },
-              description: <InstitutionSummary hideExtra entity={model} />,
+              description: <InstitutionSummary hideInputControls entity={model} />,
             });
           }
         },
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index 418ac7edf..383285097 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client/react";
-import { Divider, List, Typography, Skeleton, Result, Card } from "antd";
+import { Divider, Typography, Skeleton, Result, Card } from "antd";
 import {
   InstitutionDocument,
   InstitutionPartialFragment,
@@ -10,11 +10,8 @@ import CreateMethod from "../methods/CreateMethod";
 import CreateDataFormat from "../dataFormats/CreateDataFormat";
 import CreateInstitution from "../institutions/CreateInstitution";
 import CreateDatabase from "../databases/CreateDatabase";
-import Link from "next/link";
-import paths from "../../paths";
 import CreateOpenIdConnectApplication from "../openIdConnect/applications/CreateOpenIdConnectApplication";
 import AddGnuPgKeyFingerprint from "../gnuPgKeys/AddGnuPgKeyFingerprint";
-import RemoveInstitutionRepresentative from "./RemoveInstitutionRepresentative";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import ConfirmInstitutionMethodDeveloper from "../methods/ConfirmInstitutionMethodDeveloper";
 import ConfirmComponentManufacturer from "../components/ConfirmComponentManufacturer";
@@ -30,6 +27,10 @@ import PaginatedGnuPgKeys from "../gnuPgKeys/PaginatedGnuPgKeys";
 import { useMemo } from "react";
 import InstitutionSummary from "./InstitutionSummary";
 import PaginatedAnyDatabases from "../databases/PaginatedAnyDatabases";
+import EntityItem from "../entities/EntityItem";
+import EntityList from "../entities/EntityList";
+import ComponentSummary from "../components/ComponentSummary";
+import MethodSummary from "../methods/MethodSummary";
 
 const getMainTabs = (
   institution: InstitutionPartialFragment,
@@ -244,23 +245,26 @@ const getPendingTabs = (
         key: "components",
         label: "Components",
         children: (
-          <>
-            <List
-              size="small"
-              dataSource={institution.pendingManufacturedComponents.edges}
-              renderItem={(item) => (
-                <List.Item key={item.node.uuid}>
-                  <Link href={paths.component(item.node.uuid)}>
-                    {item.node.name}
-                  </Link>
-                  <ConfirmComponentManufacturer
-                    componentId={item.node.uuid}
-                    institutionId={institution.uuid}
-                  />
-                </List.Item>
-              )}
-            />
-          </>
+          <EntityList
+            loading={false}
+            dataSource={institution.pendingManufacturedComponents.edges.map(
+              (edge) => edge.node,
+            )}
+            renderItem={(node) => (
+              <EntityItem>
+                <ComponentSummary
+                  hideInputControls
+                  entity={node}
+                  extra={
+                    <ConfirmComponentManufacturer
+                      componentId={node.uuid}
+                      institutionId={institution.uuid}
+                    />
+                  }
+                />
+              </EntityItem>
+            )}
+          />
         ),
       },
     institution.pendingInstitutionDevelopedMethods.isAuthorizedToConfirmEdges &&
@@ -268,51 +272,26 @@ const getPendingTabs = (
         key: "methods",
         label: "Methods",
         children: (
-          <>
-            <List
-              size="small"
-              dataSource={institution.pendingInstitutionDevelopedMethods.edges}
-              renderItem={(item) => (
-                <List.Item key={item.node.uuid}>
-                  <Link href={paths.method(item.node.uuid)}>
-                    {item.node.name}
-                  </Link>
-                  <ConfirmInstitutionMethodDeveloper
-                    methodId={item.node.uuid}
-                    institutionId={institution.uuid}
-                  />
-                </List.Item>
-              )}
-            />
-          </>
-        ),
-      },
-    institution.representatives.isAuthorizedToAddEdge &&
-      institution.pendingRepresentatives != null &&
-      institution.pendingRepresentatives.edges.length > 0 && {
-        key: "representatives",
-        label: "Representatives",
-        children: (
-          <>
-            <List
-              size="small"
-              dataSource={institution.pendingRepresentatives.edges}
-              renderItem={(item) => (
-                <List.Item key={item.node.uuid}>
-                  <Link href={paths.user(item.node.uuid)}>
-                    {`${item.node.name} (${item.node.uuid})`}
-                  </Link>
-                  <Typography.Text>{item.role}</Typography.Text>
-                  {item.isAuthorizedToRemoveEdge && (
-                    <RemoveInstitutionRepresentative
+          <EntityList
+            loading={false}
+            dataSource={institution.pendingInstitutionDevelopedMethods.edges.map(
+              (edge) => edge.node,
+            )}
+            renderItem={(node) => (
+              <EntityItem>
+                <MethodSummary
+                  hideInputControls
+                  entity={node}
+                  extra={
+                    <ConfirmInstitutionMethodDeveloper
+                      methodId={node.uuid}
                       institutionId={institution.uuid}
-                      userId={item.node.uuid}
                     />
-                  )}
-                </List.Item>
-              )}
-            />
-          </>
+                  }
+                />
+              </EntityItem>
+            )}
+          />
         ),
       },
   ].filter(isTruthy);
diff --git a/frontend/components/institutions/InstitutionSummary.tsx b/frontend/components/institutions/InstitutionSummary.tsx
index 09059b9d9..5ba9c2e02 100644
--- a/frontend/components/institutions/InstitutionSummary.tsx
+++ b/frontend/components/institutions/InstitutionSummary.tsx
@@ -17,20 +17,53 @@ import RemoveInstitutionRepresentative from "./RemoveInstitutionRepresentative";
 import SwitchInstitutionOperatingState from "./SwitchInstitutionOperatingState";
 import UpdateInstitution from "./UpdateInstitution";
 import VerifyInstitution from "./VerifyInstitution";
-import { InstitutionState } from "../../__generated__/graphql";
+import { InstitutionState, Scalars } from "../../__generated__/graphql";
 import Link from "next/link";
 import AddInstitutionRepresentative from "./AddInstitutionRepresentative";
 import EnumTag from "../EnumTag";
 
+const renderRepresentativeList = (
+  representatives:
+    | NonNullable<InstitutionsPartialFragment["representatives"]>
+    | NonNullable<InstitutionPartialFragment["representatives"]>
+    | NonNullable<InstitutionPartialFragment["pendingRepresentatives"]>,
+  institutionId: Scalars["Uuid"]["output"],
+  hideInputControls: boolean | undefined,
+) => (
+  <InlineList
+    items={asReadonlyMixed(representatives.edges)}
+    renderItem={(edge) => (
+      <span key={edge.node.id}>
+        <Space>
+          <EntityLink entity={edge.node} route={paths.user} />
+          <EnumTag color="grey" variant="outlined">
+            {edge.role}
+          </EnumTag>
+        </Space>
+        {!hideInputControls &&
+          "isAuthorizedToRemoveEdge" in edge &&
+          edge.isAuthorizedToRemoveEdge && (
+            <RemoveInstitutionRepresentative
+              institutionId={institutionId}
+              userId={edge.node.uuid}
+            />
+          )}
+      </span>
+    )}
+  />
+);
+
 export default function InstitutionSummary({
   entity,
-  hideExtra = false,
+  hideInputControls = false,
+  showVerifyAnyway = false,
 }: {
   entity:
     | InstitutionsPartialFragment
     | PendingInstitutionsPartialFragment
     | InstitutionPartialFragment;
-  hideExtra?: boolean;
+  hideInputControls?: boolean;
+  showVerifyAnyway?: boolean;
 }) {
   return (
     <EntitySummary
@@ -44,28 +77,29 @@ export default function InstitutionSummary({
           {entity.operatingState}
         </EnumTag>,
       ]}
-      extra={
-        !hideExtra &&
-        [
+      extra={[
+        (!hideInputControls || showVerifyAnyway) &&
           "isAuthorizedToVerifyNode" in entity &&
-            entity.isAuthorizedToVerifyNode &&
-            entity.state == InstitutionState.Pending && (
-              <VerifyInstitution institutionId={entity.uuid} />
-            ),
+          entity.isAuthorizedToVerifyNode &&
+          entity.state == InstitutionState.Pending && (
+            <VerifyInstitution institutionId={entity.uuid} />
+          ),
+        !hideInputControls &&
           "isAuthorizedToUpdateNode" in entity &&
-            entity.isAuthorizedToUpdateNode && (
-              <UpdateInstitution institution={entity} />
-            ),
+          entity.isAuthorizedToUpdateNode && (
+            <UpdateInstitution institution={entity} />
+          ),
+        !hideInputControls &&
           "isAuthorizedToSwitchOperatingStateOfNode" in entity &&
-            entity.isAuthorizedToSwitchOperatingStateOfNode && (
-              <SwitchInstitutionOperatingState institutionId={entity.uuid} />
-            ),
+          entity.isAuthorizedToSwitchOperatingStateOfNode && (
+            <SwitchInstitutionOperatingState institutionId={entity.uuid} />
+          ),
+        !hideInputControls &&
           "isAuthorizedToDeleteNode" in entity &&
-            entity.isAuthorizedToDeleteNode && (
-              <DeleteInstitution institutionId={entity.uuid} />
-            ),
-        ].filter(isTruthy)
-      }
+          entity.isAuthorizedToDeleteNode && (
+            <DeleteInstitution institutionId={entity.uuid} />
+          ),
+      ].filter(isTruthy)}
     >
       {entity.state == InstitutionState.Pending && (
         <Typography.Paragraph style={{ maxWidth: "75ch" }}>
@@ -81,28 +115,25 @@ export default function InstitutionSummary({
       {entity.representatives.edges.length > 0 && (
         <div>
           Represented by{" "}
-          <InlineList
-            items={asReadonlyMixed(entity.representatives.edges)}
-            renderItem={(edge) => (
-              <span key={edge.node.id}>
-                <Space>
-                  <EntityLink entity={edge.node} route={paths.user} />
-                  <EnumTag color="grey" variant="outlined">
-                    {edge.role}
-                  </EnumTag>
-                </Space>
-                {!hideExtra &&
-                  "isAuthorizedToRemoveEdge" in edge &&
-                  edge.isAuthorizedToRemoveEdge && (
-                    <RemoveInstitutionRepresentative
-                      institutionId={entity.uuid}
-                      userId={edge.node.uuid}
-                    />
-                  )}
-              </span>
+          {renderRepresentativeList(
+            entity.representatives,
+            entity.uuid,
+            hideInputControls,
+          )}
+          {"pendingRepresentatives" in entity &&
+            entity.pendingRepresentatives &&
+            entity.pendingRepresentatives.edges.length > 0 && (
+              <>
+                {" "}
+                and awaiting confirmation of
+                {renderRepresentativeList(
+                  entity.pendingRepresentatives,
+                  entity.uuid,
+                  hideInputControls,
+                )}
+              </>
             )}
-          />
-          {!hideExtra &&
+          {!hideInputControls &&
             "isAuthorizedToAddEdge" in entity.representatives &&
             entity.representatives.isAuthorizedToAddEdge && (
               <AddInstitutionRepresentative institutionId={entity.uuid} />
diff --git a/frontend/components/institutions/PendingInstitutionList.tsx b/frontend/components/institutions/PendingInstitutionList.tsx
index 3d2422c47..1923c9af9 100644
--- a/frontend/components/institutions/PendingInstitutionList.tsx
+++ b/frontend/components/institutions/PendingInstitutionList.tsx
@@ -16,7 +16,11 @@ export default function PendingInstitutionList() {
       dataSource={nodes}
       renderItem={(node) => (
         <EntityItem>
-          <InstitutionSummary entity={node} />
+          <InstitutionSummary
+            hideInputControls
+            showVerifyAnyway
+            entity={node}
+          />
         </EntityItem>
       )}
     />
diff --git a/frontend/components/methods/CreateMethod.tsx b/frontend/components/methods/CreateMethod.tsx
index 7af892baf..2893229da 100644
--- a/frontend/components/methods/CreateMethod.tsx
+++ b/frontend/components/methods/CreateMethod.tsx
@@ -141,7 +141,7 @@ export default function CreateMethod({
                 width: "max-content",
                 minWidth: "384px",
               },
-              description: <MethodSummary hideExtra entity={model} />,
+              description: <MethodSummary hideInputControls entity={model} />,
             });
           }
         },
diff --git a/frontend/components/methods/MethodSummary.tsx b/frontend/components/methods/MethodSummary.tsx
index 6295c86ce..c5d450a5d 100644
--- a/frontend/components/methods/MethodSummary.tsx
+++ b/frontend/components/methods/MethodSummary.tsx
@@ -26,7 +26,7 @@ const renderDeveloperList = (
     | NonNullable<MethodPartialFragment["developers"]>
     | NonNullable<MethodPartialFragment["pendingDevelopers"]>,
   methodId: Scalars["Uuid"]["output"],
-  hideExtra: boolean | undefined,
+  hideInputControls: boolean | undefined,
 ) => (
   <InlineList
     items={asReadonlyMixed(developers.edges)}
@@ -40,7 +40,7 @@ const renderDeveloperList = (
               : paths.user
           }
         />
-        {!hideExtra &&
+        {!hideInputControls &&
           "isAuthorizedToRemoveEdge" in edge &&
           edge.isAuthorizedToRemoveEdge &&
           (edge.node.__typename == "Institution" ? (
@@ -61,10 +61,12 @@ const renderDeveloperList = (
 
 export default function MethodSummary({
   entity,
-  hideExtra = false,
+  extra,
+  hideInputControls = false,
 }: {
   entity: MethodsPartialFragment | MethodPartialFragment;
-  hideExtra?: boolean;
+  extra?: React.ReactNode;
+  hideInputControls?: boolean;
 }) {
   const dateTimeRanges = [
     (entity.validity?.from || entity.validity?.to) && (
@@ -88,15 +90,14 @@ export default function MethodSummary({
           {x}
         </EnumTag>
       ))}
-      extra={
-        !hideExtra &&
-        [
+      extra={[
+        extra,
+        !hideInputControls &&
           "isAuthorizedToUpdateNode" in entity &&
-            entity.isAuthorizedToUpdateNode && (
-              <UpdateMethod key="updateMethod" method={entity} />
-            ),
-        ].filter(isTruthy)
-      }
+          entity.isAuthorizedToUpdateNode && (
+            <UpdateMethod key="updateMethod" method={entity} />
+          ),
+      ].filter(isTruthy)}
     >
       {dateTimeRanges.length > 0 && <div>{dateTimeRanges}</div>}
       {(entity.parameters.length > 0 || entity.sources.length > 0) && (
@@ -141,25 +142,29 @@ export default function MethodSummary({
       {entity.developers.edges.length > 0 && (
         <div>
           Developed by{" "}
-          {renderDeveloperList(entity.developers, entity.uuid, hideExtra)}
+          {renderDeveloperList(
+            entity.developers,
+            entity.uuid,
+            hideInputControls,
+          )}
           {"pendingDevelopers" in entity &&
             entity.pendingDevelopers &&
             entity.pendingDevelopers.edges.length > 0 && (
               <>
-                Awaiting verification of
+                and awaiting verification of
                 {renderDeveloperList(
                   entity.pendingDevelopers,
                   entity.uuid,
-                  hideExtra,
+                  hideInputControls,
                 )}
               </>
             )}
-          {!hideExtra &&
+          {!hideInputControls &&
             "isAuthorizedToAddInstitutionEdge" in entity.developers &&
             entity.developers.isAuthorizedToAddInstitutionEdge && (
               <AddInstitutionMethodDeveloper methodId={entity.uuid} />
             )}
-          {!hideExtra &&
+          {!hideInputControls &&
             "isAuthorizedToAddUserEdge" in entity.developers &&
             entity.developers.isAuthorizedToAddUserEdge && (
               <AddUserMethodDeveloper methodId={entity.uuid} />
diff --git a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
index 736c8767b..6b69c472b 100644
--- a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
@@ -122,7 +122,7 @@ export default function CreateOpenIdConnectApplication({
                     .
                   </Typography.Paragraph>
                   <Divider />
-                  <OpenIdConnectApplicationSummary hideExtra entity={model} />
+                  <OpenIdConnectApplicationSummary hideInputControls entity={model} />
                 </div>
               ),
             });
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
index b95ed6c1d..0ba271eb6 100644
--- a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
@@ -15,12 +15,12 @@ import { humanize } from "../../../lib/string";
 
 export default function OpenIdConnectApplicationSummary({
   entity,
-  hideExtra = false,
+  hideInputControls = false,
 }: {
   entity:
     | OpenIdConnectApplicationsPartialFragment
     | OpenIdConnectApplicationPartialFragment;
-  hideExtra?: boolean;
+  hideInputControls?: boolean;
 }) {
   return (
     <EntitySummary
@@ -32,7 +32,7 @@ export default function OpenIdConnectApplicationSummary({
         </Tag>,
       ]}
       extra={
-        !hideExtra &&
+        !hideInputControls &&
         [
           "isAuthorizedToManageNode" in entity &&
             entity.isAuthorizedToManageNode && (
diff --git a/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx
index a4e8b3127..08a70f6a2 100644
--- a/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx
+++ b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx
@@ -10,10 +10,10 @@ import EntityLink from "../../entities/EntityLink";
 
 export default function OpenIdConnectAuthorizationSummary({
   entity,
-  hideExtra = false,
+  hideInputControls = false,
 }: {
   entity: OpenIdConnectAuthorizationsPartialFragment;
-  hideExtra?: boolean;
+  hideInputControls?: boolean;
 }) {
   const dateTimes = [
     entity.createdAt && {
@@ -30,7 +30,7 @@ export default function OpenIdConnectAuthorizationSummary({
         <Tag key="type">{entity.type}</Tag>,
       ]}
       extra={
-        !hideExtra &&
+        !hideInputControls &&
         [
           entity.isAuthorizedToDeleteNode && (
             <DeleteOpenIdConnectAuthorization authorizationId={entity.uuid} />
diff --git a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx
index 0bc16a3ee..8c253d3d9 100644
--- a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx
+++ b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx
@@ -10,10 +10,10 @@ import EntityLink from "../../entities/EntityLink";
 
 export default function OpenIdConnectTokenSummary({
   entity,
-  hideExtra = false,
+  hideInputControls = false,
 }: {
   entity: OpenIdConnectTokensPartialFragment;
-  hideExtra?: boolean;
+  hideInputControls?: boolean;
 }) {
   const associates = [
     entity.subject && (
@@ -57,7 +57,7 @@ export default function OpenIdConnectTokenSummary({
         <Tag key="type">{entity.type}</Tag>,
       ]}
       extra={
-        !hideExtra &&
+        !hideInputControls &&
         [
           entity.isAuthorizedToRevokeNode && (
             <RevokeOpenIdConnectToken tokenId={entity.uuid} />
diff --git a/frontend/components/users/UserSummary.tsx b/frontend/components/users/UserSummary.tsx
index edcfbaaa4..44ad2eda3 100644
--- a/frontend/components/users/UserSummary.tsx
+++ b/frontend/components/users/UserSummary.tsx
@@ -17,10 +17,10 @@ import { Space } from "antd";
 
 export default function UserSummary({
   entity,
-  hideExtra = false,
+  hideInputControls = false,
 }: {
   entity: UsersPartialFragment | UserPartialFragment;
-  hideExtra?: boolean;
+  hideInputControls?: boolean;
 }) {
   const rolesCurrentUserCanAndMayWantToAdd =
     "rolesCurrentUserCanAdd" in entity &&
@@ -39,13 +39,13 @@ export default function UserSummary({
             userId={entity.uuid}
             role={role}
             canRemove={
-              !hideExtra &&
+              !hideInputControls &&
               "rolesCurrentUserCanRemove" in entity &&
               entity.rolesCurrentUserCanRemove?.includes(role)
             }
           />
         )) ?? []),
-        !hideExtra &&
+        !hideInputControls &&
           rolesCurrentUserCanAndMayWantToAdd &&
           rolesCurrentUserCanAndMayWantToAdd.length > 0 && (
             <AddUserRole
@@ -55,7 +55,7 @@ export default function UserSummary({
           ),
       ].filter(isTruthy)}
       extra={
-        !hideExtra &&
+        !hideInputControls &&
         [
           "isAuthorizedToDeleteUser" in entity &&
             entity.isAuthorizedToDeleteUser && (
@@ -78,7 +78,7 @@ export default function UserSummary({
                     {edge.role}
                   </EnumTag>
                 </Space>
-                {!hideExtra &&
+                {!hideInputControls &&
                   "isAuthorizedToRemoveEdge" in edge &&
                   edge.isAuthorizedToRemoveEdge && (
                     <RemoveInstitutionRepresentative
diff --git a/frontend/pages/users/forgot-password.tsx b/frontend/pages/users/forgot-password.tsx
index 31fd1270a..49915a338 100644
--- a/frontend/pages/users/forgot-password.tsx
+++ b/frontend/pages/users/forgot-password.tsx
@@ -88,14 +88,16 @@ function Page() {
             <Input prefix={<UserOutlined />} placeholder="Email" />
           </Form.Item>
           <Form.Item>
-            <Button
-              type="primary"
-              htmlType="submit"
-              loading={mutating}
-              style={{ width: "100%" }}
-            >
-              Request Password Reset
-            </Button>
+            <Form.Item>
+              <Button
+                type="primary"
+                htmlType="submit"
+                loading={mutating}
+                style={{ width: "100%" }}
+              >
+                Request Password Reset
+              </Button>
+            </Form.Item>
             <div style={{ float: "right" }}>
               or{" "}
               <Link
diff --git a/frontend/pages/users/login/index.tsx b/frontend/pages/users/login/index.tsx
index 5445c728e..263692b20 100644
--- a/frontend/pages/users/login/index.tsx
+++ b/frontend/pages/users/login/index.tsx
@@ -110,16 +110,21 @@ function Login() {
           >
             <Input prefix={<UserOutlined />} placeholder="Email" />
           </Form.Item>
-          <Form.Item
-            name="password"
-            rules={[
-              {
-                required: true,
-                message: "Please input your password",
-              },
-            ]}
-          >
-            <Input.Password prefix={<LockOutlined />} placeholder="Password" />
+          <Form.Item>
+            <Form.Item
+              name="password"
+              rules={[
+                {
+                  required: true,
+                  message: "Please input your password",
+                },
+              ]}
+            >
+              <Input.Password
+                prefix={<LockOutlined />}
+                placeholder="Password"
+              />
+            </Form.Item>
             <Link
               href={{
                 pathname: paths.userForgotPassword,
@@ -131,14 +136,16 @@ function Login() {
             </Link>
           </Form.Item>
           <Form.Item>
-            <Button
-              type="primary"
-              htmlType="submit"
-              loading={mutating}
-              style={{ width: "100%" }}
-            >
-              Login
-            </Button>
+            <Form.Item>
+              <Button
+                type="primary"
+                htmlType="submit"
+                loading={mutating}
+                style={{ width: "100%" }}
+              >
+                Login
+              </Button>
+            </Form.Item>
             <div style={{ float: "right" }}>
               or{" "}
               <Link
diff --git a/frontend/queries/institutions.graphql b/frontend/queries/institutions.graphql
index a58114310..f89f004a1 100644
--- a/frontend/queries/institutions.graphql
+++ b/frontend/queries/institutions.graphql
@@ -53,9 +53,7 @@ fragment InstitutionPartial on Institution {
     totalCount
     edges {
       node {
-        id
-        uuid
-        name
+        ...ComponentsPartial
       }
     }
     isAuthorizedToConfirmEdges
@@ -111,9 +109,7 @@ fragment InstitutionPartial on Institution {
     totalCount
     edges {
       node {
-        id
-        uuid
-        name
+        ...MethodsPartial
       }
     }
     isAuthorizedToConfirmEdges

From 1a4d988966a98e36719967a82ce211790797e0f0 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Mon, 11 May 2026 20:40:03 +0200
Subject: [PATCH 030/145] Show all pending entities or relations that are
 awaiting confirmation or denial by a user in his/her/their profile

---
 frontend/components/LazyTabs.tsx              |  21 +--
 .../components/components/ComponentList.tsx   |   2 +-
 frontend/components/entities/EntityList.tsx   |  23 +--
 .../components/entities/PaginatedEntities.tsx |   2 +-
 .../components/institutions/Institution.tsx   |   6 +-
 frontend/components/users/User.tsx            | 174 +++++++++---------
 frontend/components/users/UserSummary.tsx     | 146 ++++++++++++---
 frontend/lib/hooks/useDebounce.ts             |   6 +-
 frontend/lib/hooks/usePaginatedQuery.ts       |  14 +-
 frontend/lib/hooks/usePreviousNonNull.ts      |   9 +
 frontend/queries/currentUser.graphql          |   8 +
 11 files changed, 261 insertions(+), 150 deletions(-)
 create mode 100644 frontend/lib/hooks/usePreviousNonNull.ts

diff --git a/frontend/components/LazyTabs.tsx b/frontend/components/LazyTabs.tsx
index e9b4eac29..f2a95afc4 100644
--- a/frontend/components/LazyTabs.tsx
+++ b/frontend/components/LazyTabs.tsx
@@ -13,26 +13,23 @@ export type LazyTabsProps = Omit<TabsProps, "items"> & {
 };
 
 /**
- * Internal wrapper that tracks if a tab has ever been "active".
- * Once initialized, it stays mounted.
+ * Wrapper that tracks if a tab has ever been "active". Once initialized, it
+ * stays mounted.
  */
-const LazyWrapper: React.FC<{ active: boolean; children: React.ReactNode }> = ({
+function LazyWrapper({
   active,
   children,
-}) => {
+}: {
+  active: boolean;
+  children: React.ReactNode;
+}) {
   const [initialized, setInitialized] = useState(false);
-
   if (active && !initialized) {
     setInitialized(true);
   }
-  if (!initialized) return null;
-  return <>{children}</>;
-};
+  return initialized ? children : null;
+}
 
-/**
- * Reusable LazyTabs Component
- * Extends standard Ant Design TabsProps
- */
 export default function LazyTabs({ items, onChange, ...props }: LazyTabsProps) {
   const [activeKey, setActiveKey] = useState<string>(() => {
     return (
diff --git a/frontend/components/components/ComponentList.tsx b/frontend/components/components/ComponentList.tsx
index 42ea9727c..88b027877 100644
--- a/frontend/components/components/ComponentList.tsx
+++ b/frontend/components/components/ComponentList.tsx
@@ -8,7 +8,7 @@ export default function ComponentList({
   nodes,
 }: {
   loading: boolean;
-  nodes: ComponentsPartialFragment[];
+  nodes: ComponentsPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/entities/EntityList.tsx b/frontend/components/entities/EntityList.tsx
index 4601e8e18..21818776c 100644
--- a/frontend/components/entities/EntityList.tsx
+++ b/frontend/components/entities/EntityList.tsx
@@ -1,8 +1,9 @@
 import { Card, Empty, Flex, Skeleton } from "antd";
 import { Scalars } from "../../__generated__/graphql";
-import { useState, useEffect } from "react";
+import { useState } from "react";
 import { initialPageSize } from "../Pagination";
 import { range } from "../../lib/array";
+import { usePreviousNonNull } from "../../lib/hooks/usePreviousNonNull";
 
 export default function EntityList<
   TEntity extends { uuid: Scalars["Uuid"]["output"] },
@@ -12,16 +13,16 @@ export default function EntityList<
   renderItem,
 }: {
   loading: boolean;
-  dataSource: TEntity[];
+  dataSource: TEntity[] | null;
   renderItem: (entity: TEntity) => React.ReactNode;
 }) {
   const [hasLoadedOnce, setHasLoadedOnce] = useState(false);
+  const previousDataSource = usePreviousNonNull(dataSource);
+  const currentOrPreviousDataSource = dataSource ?? previousDataSource ?? [];
 
-  useEffect(() => {
-    if (!loading && dataSource?.length > 0) {
-      setHasLoadedOnce(true);
-    }
-  }, [loading, dataSource]);
+  if (!hasLoadedOnce && !loading) {
+    setHasLoadedOnce(true);
+  }
 
   if (loading && !hasLoadedOnce) {
     return (
@@ -35,7 +36,7 @@ export default function EntityList<
     );
   }
 
-  if (!loading && (!dataSource || dataSource.length === 0)) {
+  if (!loading && currentOrPreviousDataSource.length === 0) {
     return <Empty description="No data found" />;
   }
 
@@ -44,12 +45,12 @@ export default function EntityList<
       vertical
       gap="middle"
       style={{
-        opacity: loading ? 0.6 : 1,
+        opacity: loading ? 0.4 : 1,
         transition: "opacity 0.3s ease-in-out",
-        pointerEvents: loading ? "none" : "auto", // Prevent clicks while loading
+        pointerEvents: loading ? "none" : "auto", // prevent clicks while loading
       }}
     >
-      {dataSource.map((entity) => (
+      {currentOrPreviousDataSource.map((entity) => (
         <div key={entity.uuid}>{renderItem(entity)}</div>
       ))}
     </Flex>
diff --git a/frontend/components/entities/PaginatedEntities.tsx b/frontend/components/entities/PaginatedEntities.tsx
index a8292e220..817718e6b 100644
--- a/frontend/components/entities/PaginatedEntities.tsx
+++ b/frontend/components/entities/PaginatedEntities.tsx
@@ -65,7 +65,7 @@ type BaseProps<
 > = {
   entitiesQuery: QueryDocument<TNode, TFilterInput, TSortInput>;
   extra?: React.ReactNode;
-  list: (props: { loading: boolean; nodes: TNode[] }) => React.ReactNode;
+  list: (props: { loading: boolean; nodes: TNode[] | null }) => React.ReactNode;
   filterDefinitions: readonly FilterDefinition<TFilterInput>[];
   sortDefinitions: readonly SortDefinition<TSortInput>[];
   baseWhere?: TFilterInput | null;
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index 383285097..90bc5dc27 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -243,6 +243,7 @@ const getPendingTabs = (
     institution.pendingManufacturedComponents.isAuthorizedToConfirmEdges &&
       institution.pendingManufacturedComponents.edges.length > 0 && {
         key: "components",
+        count: institution.pendingManufacturedComponents.totalCount,
         label: "Components",
         children: (
           <EntityList
@@ -270,6 +271,7 @@ const getPendingTabs = (
     institution.pendingInstitutionDevelopedMethods.isAuthorizedToConfirmEdges &&
       institution.pendingInstitutionDevelopedMethods.edges.length > 0 && {
         key: "methods",
+        count: institution.pendingInstitutionDevelopedMethods.totalCount,
         label: "Methods",
         children: (
           <EntityList
@@ -353,7 +355,9 @@ export default function Institution({ institutionId }: Props) {
       {tabs?.pending && tabs.pending.length > 0 && (
         <>
           <Divider />
-          <Typography.Title level={4}>Pending Entities</Typography.Title>
+          <Typography.Title level={4} id="pending-entities">
+            Pending Entities
+          </Typography.Title>
           <LazyTabs items={tabs.pending} />
         </>
       )}
diff --git a/frontend/components/users/User.tsx b/frontend/components/users/User.tsx
index 0a8f5a0bd..d4dd1ef98 100644
--- a/frontend/components/users/User.tsx
+++ b/frontend/components/users/User.tsx
@@ -1,25 +1,90 @@
 import { useQuery } from "@apollo/client/react";
-import { Skeleton, Result, Card, Flex, Typography, Space, Divider } from "antd";
-import { UserDocument } from "../../queries/users.generated";
-import { Scalars } from "../../__generated__/graphql";
-import paths from "../../paths";
+import { Skeleton, Result, Card, Typography, Divider, Flex } from "antd";
+import {
+  UserDocument,
+  UserPartialFragment,
+} from "../../queries/users.generated";
+import { Scalars, UserRole } from "../../__generated__/graphql";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
-import ConfirmUserMethodDeveloper from "../methods/ConfirmUserMethodDeveloper";
-import ConfirmInstitutionRepresentative from "../institutions/ConfirmInstitutionRepresentative";
 import UserSummary from "./UserSummary";
-import { asReadonlyMixed, isTruthy } from "../../lib/array";
-import EntityLink from "../entities/EntityLink";
-import InlineList from "../InlineList";
-import EnumTag from "../EnumTag";
+import { isTruthy } from "../../lib/array";
 import QueryToolbar from "../QueryToolbar";
-import RemoveInstitutionRepresentative from "../institutions/RemoveInstitutionRepresentative";
-import RemoveUserMethodDeveloper from "../methods/RemoveUserMethodDeveloper";
+import PendingInstitutionList from "../institutions/PendingInstitutionList";
+import {
+  CurrentUserDocument,
+  CurrentUserPartialFragment,
+} from "../../queries/currentUser.generated";
+import PendingDatabaseList from "../databases/PendingDatabaseList";
+import LazyTabs, { LazyTabsProps } from "../LazyTabs";
+import { useMemo } from "react";
+import EntityLink from "../entities/EntityLink";
+import paths from "../../paths";
+
+const getPendingTabs = (
+  currentUser: CurrentUserPartialFragment,
+  user: UserPartialFragment,
+): LazyTabsProps["items"] =>
+  [
+    currentUser.uuid == user.uuid &&
+      currentUser.representedInstitutions.edges.some(
+        (edge) =>
+          (edge.node.pendingManufacturedComponents.totalCount > 0 &&
+            edge.node.pendingDevelopedMethods.isAuthorizedToConfirmEdges) ||
+          (edge.node.pendingDevelopedMethods.totalCount > 0 &&
+            edge.node.pendingDevelopedMethods.isAuthorizedToConfirmEdges),
+      ) && {
+        key: "represented",
+        label: "Represented Institutions",
+        children: (
+          <Flex vertical gap="middle">
+            {currentUser.representedInstitutions.edges.map((edge) => (
+              <div key={edge.node.id}>
+                The institution{" "}
+                <EntityLink entity={edge.node} route={paths.institution} /> has
+                pending{" "}
+                {[
+                  edge.node.pendingManufacturedComponents.totalCount > 0 &&
+                    edge.node.pendingDevelopedMethods
+                      .isAuthorizedToConfirmEdges &&
+                    "manufactured components",
+                  edge.node.pendingDevelopedMethods.totalCount > 0 &&
+                    edge.node.pendingDevelopedMethods
+                      .isAuthorizedToConfirmEdges &&
+                    "developed methods",
+                ]
+                  .filter(isTruthy)
+                  .join("and")}{" "}
+                that are awaiting confirmation or denial on{" "}
+                <EntityLink
+                  entity={edge.node}
+                  route={(id) => `${paths.institution(id)}#pending-entities`}
+                />
+              </div>
+            ))}
+          </Flex>
+        ),
+      },
+    currentUser.uuid == user.uuid &&
+      user.roles?.includes(UserRole.Verifier) && {
+        key: "institutions",
+        label: "Institutions",
+        children: <PendingInstitutionList />,
+      },
+    currentUser.uuid == user.uuid &&
+      user.roles?.includes(UserRole.Administrator) && {
+        key: "databases",
+        label: "Databases",
+        children: <PendingDatabaseList />,
+      },
+  ].filter(isTruthy);
 
 interface UserProps {
   userId: Scalars["Uuid"]["input"];
 }
 
 export default function User({ userId }: UserProps) {
+  const currentUser = useQuery(CurrentUserDocument)?.data?.currentUser;
+
   const queryVariables = {
     uuid: userId,
   };
@@ -29,6 +94,11 @@ export default function User({ userId }: UserProps) {
   useQueryHandler({ error });
   const user = data?.user;
 
+  const pendingTabs = useMemo(() => {
+    if (!currentUser || !user) return null;
+    return getPendingTabs(currentUser, user);
+  }, [currentUser, user]);
+
   if (loading) {
     return <Skeleton active avatar title />;
   }
@@ -43,85 +113,19 @@ export default function User({ userId }: UserProps) {
     );
   }
 
-  const pending = [
-    user.pendingRepresentedInstitutions &&
-      user.pendingRepresentedInstitutions.isAuthorizedToConfirmEdges &&
-      user.pendingRepresentedInstitutions.edges.length > 0 && (
-        <div>
-          The following institutions asked to add you as representative. Confirm
-          or deny their request:{" "}
-          <InlineList
-            items={asReadonlyMixed(user.pendingRepresentedInstitutions.edges)}
-            renderItem={(edge) => (
-              <span key={edge.node.id}>
-                <Space>
-                  <EntityLink entity={edge.node} route={paths.institution} />
-                  <EnumTag color="grey" variant="outlined">
-                    {edge.role}
-                  </EnumTag>
-                </Space>
-                <ConfirmInstitutionRepresentative
-                  userId={user.uuid}
-                  institutionId={edge.node.uuid}
-                />
-                {edge.isAuthorizedToRemoveEdge && (
-                  <RemoveInstitutionRepresentative
-                    userId={user.uuid}
-                    institutionId={edge.node.uuid}
-                  >
-                    Deny
-                  </RemoveInstitutionRepresentative>
-                )}
-              </span>
-            )}
-          />
-        </div>
-      ),
-    user.pendingUserDevelopedMethods != null &&
-      user.pendingUserDevelopedMethods.isAuthorizedToConfirmEdges &&
-      user.pendingUserDevelopedMethods.edges.length > 0 && (
-        <div>
-          The developers of the following methods asked to add you as a
-          developer. Confirm or deny their request:{" "}
-          <InlineList
-            items={user.pendingUserDevelopedMethods.edges}
-            renderItem={(edge) => (
-              <span key={edge.node.uuid}>
-                <EntityLink entity={edge.node} route={paths.method} />
-                <ConfirmUserMethodDeveloper
-                  userId={user.uuid}
-                  methodId={edge.node.uuid}
-                />
-                {edge.isAuthorizedToRemoveEdge && (
-                  <RemoveUserMethodDeveloper
-                    userId={user.uuid}
-                    methodId={edge.node.uuid}
-                  >
-                    Deny
-                  </RemoveUserMethodDeveloper>
-                )}
-              </span>
-            )}
-          />
-        </div>
-      ),
-  ].filter(isTruthy);
-
   return (
     <div>
       <Card style={{ marginBottom: "1em" }}>
         <UserSummary entity={user} />
-        {pending.length > 0 && (
-          <>
-            <Divider />
-            <Typography.Title level={4}>Pending</Typography.Title>
-            <Flex vertical gap="medium">
-              {pending}
-            </Flex>
-          </>
-        )}
       </Card>
       <QueryToolbar query={UserDocument} variables={queryVariables} />
+      {pendingTabs && pendingTabs.length > 0 && (
+        <>
+          <Divider />
+          <Typography.Title level={4}>Pending Entities</Typography.Title>
+          <LazyTabs items={pendingTabs} />
+        </>
+      )}
     </div>
   );
 }
diff --git a/frontend/components/users/UserSummary.tsx b/frontend/components/users/UserSummary.tsx
index 44ad2eda3..69560f882 100644
--- a/frontend/components/users/UserSummary.tsx
+++ b/frontend/components/users/UserSummary.tsx
@@ -14,6 +14,85 @@ import RemoveInstitutionRepresentative from "../institutions/RemoveInstitutionRe
 import AddUserRole from "./AddUserRole";
 import EnumTag from "../EnumTag";
 import { Space } from "antd";
+import { Scalars } from "../../__generated__/graphql";
+import ConfirmInstitutionRepresentative from "../institutions/ConfirmInstitutionRepresentative";
+import RemoveUserMethodDeveloper from "../methods/RemoveUserMethodDeveloper";
+import ConfirmUserMethodDeveloper from "../methods/ConfirmUserMethodDeveloper";
+
+const renderRepresentedInstitutionList = (
+  representedInstitutions:
+    | NonNullable<UsersPartialFragment["representedInstitutions"]>
+    | NonNullable<UserPartialFragment["representedInstitutions"]>
+    | NonNullable<UserPartialFragment["pendingRepresentedInstitutions"]>,
+  userId: Scalars["Uuid"]["output"],
+  hideInputControls: boolean | undefined,
+) => (
+  <InlineList
+    items={asReadonlyMixed(representedInstitutions.edges)}
+    renderItem={(edge) => (
+      <span key={edge.node.id}>
+        <Space>
+          <EntityLink entity={edge.node} route={paths.institution} />
+          <EnumTag color="grey" variant="outlined">
+            {edge.role}
+          </EnumTag>
+        </Space>
+        {!hideInputControls &&
+          "isAuthorizedToConfirmEdges" in representedInstitutions &&
+          representedInstitutions.isAuthorizedToConfirmEdges && (
+            <ConfirmInstitutionRepresentative
+              institutionId={edge.node.uuid}
+              userId={userId}
+            />
+          )}
+        {!hideInputControls &&
+          "isAuthorizedToRemoveEdge" in edge &&
+          edge.isAuthorizedToRemoveEdge && (
+            <RemoveInstitutionRepresentative
+              institutionId={edge.node.uuid}
+              userId={userId}
+            >
+              Deny
+            </RemoveInstitutionRepresentative>
+          )}
+      </span>
+    )}
+  />
+);
+
+const renderUserDevelopedMethodList = (
+  userDevelopedMethods:
+    | NonNullable<UserPartialFragment["userDevelopedMethods"]>
+    | NonNullable<UserPartialFragment["pendingUserDevelopedMethods"]>,
+  userId: Scalars["Uuid"]["output"],
+  hideInputControls: boolean | undefined,
+) => (
+  <InlineList
+    items={userDevelopedMethods.edges}
+    renderItem={(edge) => (
+      <span key={edge.node.id}>
+        <EntityLink
+          key={edge.node.id}
+          entity={edge.node}
+          route={paths.method}
+        />
+        {!hideInputControls &&
+          "isAuthorizedToConfirmEdges" in userDevelopedMethods &&
+          userDevelopedMethods.isAuthorizedToConfirmEdges && (
+            <ConfirmUserMethodDeveloper
+              userId={userId}
+              methodId={edge.node.uuid}
+            />
+          )}
+        {!hideInputControls && edge.isAuthorizedToRemoveEdge && (
+          <RemoveUserMethodDeveloper userId={userId} methodId={edge.node.uuid}>
+            Deny
+          </RemoveUserMethodDeveloper>
+        )}
+      </span>
+    )}
+  />
+);
 
 export default function UserSummary({
   entity,
@@ -68,27 +147,24 @@ export default function UserSummary({
       {entity.representedInstitutions.edges.length > 0 && (
         <div>
           Represents{" "}
-          <InlineList
-            items={asReadonlyMixed(entity.representedInstitutions.edges)}
-            renderItem={(edge) => (
-              <span key={edge.node.id}>
-                <Space>
-                  <EntityLink entity={edge.node} route={paths.institution} />
-                  <EnumTag color="grey" variant="outlined">
-                    {edge.role}
-                  </EnumTag>
-                </Space>
-                {!hideInputControls &&
-                  "isAuthorizedToRemoveEdge" in edge &&
-                  edge.isAuthorizedToRemoveEdge && (
-                    <RemoveInstitutionRepresentative
-                      institutionId={edge.node.uuid}
-                      userId={entity.uuid}
-                    />
-                  )}
-              </span>
+          {renderRepresentedInstitutionList(
+            entity.representedInstitutions,
+            entity.uuid,
+            hideInputControls,
+          )}
+          {"pendingRepresentedInstitutions" in entity &&
+            entity.pendingRepresentedInstitutions &&
+            entity.pendingRepresentedInstitutions.edges.length > 0 && (
+              <>
+                {" "}
+                and was asked to represent{" "}
+                {renderRepresentedInstitutionList(
+                  entity.pendingRepresentedInstitutions,
+                  entity.uuid,
+                  hideInputControls,
+                )}
+              </>
             )}
-          />
         </div>
       )}
       {"userDevelopedMethods" in entity &&
@@ -96,16 +172,28 @@ export default function UserSummary({
           <div>
             Developed the{" "}
             {pluralize(entity.userDevelopedMethods.edges.length, "method")}{" "}
-            <InlineList
-              items={entity.userDevelopedMethods.edges}
-              renderItem={(item) => (
-                <EntityLink
-                  key={item.node.id}
-                  entity={item.node}
-                  route={paths.method}
-                />
+            {renderUserDevelopedMethodList(
+              entity.userDevelopedMethods,
+              entity.uuid,
+              hideInputControls,
+            )}
+            {"pendingUserDevelopedMethods" in entity &&
+              entity.pendingUserDevelopedMethods &&
+              entity.pendingUserDevelopedMethods.edges.length > 0 && (
+                <>
+                  {" "}
+                  and was asked whether he/she/they developed the{" "}
+                  {pluralize(
+                    entity.userDevelopedMethods.edges.length,
+                    "method",
+                  )}{" "}
+                  {renderUserDevelopedMethodList(
+                    entity.pendingUserDevelopedMethods,
+                    entity.uuid,
+                    hideInputControls,
+                  )}
+                </>
               )}
-            />
           </div>
         )}
     </EntitySummary>
diff --git a/frontend/lib/hooks/useDebounce.ts b/frontend/lib/hooks/useDebounce.ts
index 9ddeb77df..bcc0b2216 100644
--- a/frontend/lib/hooks/useDebounce.ts
+++ b/frontend/lib/hooks/useDebounce.ts
@@ -6,7 +6,7 @@ export function useDebounce<T extends (...args: any[]) => any>(
 ) {
   const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
-  const debouncedFn = useCallback(
+  const debouncedFunction = useCallback(
     (...args: Parameters<T>) => {
       if (timeoutRef.current) clearTimeout(timeoutRef.current);
       timeoutRef.current = setTimeout(() => callback(...args), delay);
@@ -14,7 +14,7 @@ export function useDebounce<T extends (...args: any[]) => any>(
     [callback, delay],
   );
 
-  // Cleanup on unmount
+  // cleanup on unmount
   useEffect(
     () => () => {
       if (timeoutRef.current) clearTimeout(timeoutRef.current);
@@ -22,5 +22,5 @@ export function useDebounce<T extends (...args: any[]) => any>(
     [],
   );
 
-  return debouncedFn;
+  return debouncedFunction;
 }
diff --git a/frontend/lib/hooks/usePaginatedQuery.ts b/frontend/lib/hooks/usePaginatedQuery.ts
index 74d749f09..43e61b9cd 100644
--- a/frontend/lib/hooks/usePaginatedQuery.ts
+++ b/frontend/lib/hooks/usePaginatedQuery.ts
@@ -43,7 +43,7 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
   ) => void,
 ): {
   loading: boolean;
-  nodes: TNode[];
+  nodes: TNode[] | null;
   paginationProps: PaginationProps;
 } {
   const [currentPage, setCurrentPage] = useState(1);
@@ -82,12 +82,12 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
   }, [JSON.stringify(where), JSON.stringify(order)]);
 
   const connection = data?.connection;
-  const edges = connection?.edges || [];
+  const edges = connection?.edges;
 
-  // Window the current page from the cache
+  // window the current page from the cache
   const currentPageNodes = useMemo(() => {
     const start = (currentPage - 1) * pageSize;
-    return edges.slice(start, start + pageSize).map((e) => e.node);
+    return edges?.slice(start, start + pageSize).map((e) => e.node);
   }, [edges, currentPage, pageSize]);
 
   const handlePrevious = () => {
@@ -102,7 +102,7 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
   };
 
   const handleNext = () => {
-    if (loading) return;
+    if (loading || edges == null) return;
     const isLastPageInMemory = currentPage * pageSize >= edges.length;
     if (isLastPageInMemory && connection?.pageInfo.hasNextPage) {
       const endCursor = connection?.pageInfo.endCursor ?? null;
@@ -159,7 +159,7 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
 
   return {
     loading,
-    nodes: currentPageNodes,
+    nodes: currentPageNodes ?? null,
     paginationProps: {
       fetching,
       current: currentPage,
@@ -167,7 +167,7 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
       pageSize: pageSize,
       hasNext:
         !!connection?.pageInfo.hasNextPage ||
-        currentPage * pageSize < edges.length,
+        currentPage * pageSize < (edges?.length ?? 0),
       hasPrevious: currentPage > 1,
       onNext: handleNext,
       onPrevious: handlePrevious,
diff --git a/frontend/lib/hooks/usePreviousNonNull.ts b/frontend/lib/hooks/usePreviousNonNull.ts
new file mode 100644
index 000000000..4dff1fa7b
--- /dev/null
+++ b/frontend/lib/hooks/usePreviousNonNull.ts
@@ -0,0 +1,9 @@
+import { useRef } from "react";
+
+export function usePreviousNonNull<T>(value: T | null) {
+  const ref = useRef<T | null>(null);
+  if (value !== null) {
+    ref.current = value;
+  }
+  return ref.current;
+}
diff --git a/frontend/queries/currentUser.graphql b/frontend/queries/currentUser.graphql
index 0ab2a439f..934a368e5 100644
--- a/frontend/queries/currentUser.graphql
+++ b/frontend/queries/currentUser.graphql
@@ -16,6 +16,14 @@ fragment CurrentUserPartial on User {
         id
         uuid
         name
+        pendingManufacturedComponents {
+          totalCount
+          isAuthorizedToConfirmEdges
+        }
+        pendingDevelopedMethods {
+          totalCount
+          isAuthorizedToConfirmEdges
+        }
       }
     }
   }

From b14090bd1c3f6139bd58180b4c894e566c0d8c9d Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Mon, 11 May 2026 22:08:29 +0200
Subject: [PATCH 031/145] Tell users what the scopes mean that the OpenId
 connect application requests and add the customer support scope to the
 metabase application

---
 .../Authorization/AuthorizationPolicies.cs    |    1 +
 .../src/Authorization/CommonAuthorization.cs  |   13 +
 .../src/Configuration/AuthConfiguration.cs    |    1 +
 .../Controllers/AuthorizationController.cs    |   26 +-
 backend/src/Data/DbSeeder.cs                  |   16 +
 .../Data/OpenIdConnect/OpenIdConnectScope.cs  |    3 +
 backend/src/Extensions/EnumExtensions.cs      |   18 +
 .../CreateOpenIdConnectApplicationInput.cs    |    1 +
 .../UpdateOpenIdConnectApplicationInput.cs    |    1 +
 .../OpenIdConnect/OpenIdConnectScope.cs       |   31 +
 .../OpenIdConnectScopeExtensions.cs           |    3 +
 ...luesForAuditableEntitiesAndAssociations.cs |    2 +
 ...OpenIdConnectClientApplication.Designer.cs | 2298 +++++++++++++++++
 ...oMetabaseOpenIdConnectClientApplication.cs |   32 +
 backend/src/Migrations/migrate.sql            |   21 +
 ...MetabaseOpenIdConnectClientApplication.sql |   21 +
 ...uesForAuditableEntitiesAndAssociations.sql |   21 +
 .../Authorization/AuthorizeViewModel.cs       |   11 +-
 .../src/Views/Authorization/Authorize.cshtml  |   13 +-
 .../components/entities/PaginatedEntities.tsx |    6 +-
 frontend/pages/users/register.tsx             |    4 +-
 21 files changed, 2524 insertions(+), 19 deletions(-)
 create mode 100644 backend/src/Extensions/EnumExtensions.cs
 create mode 100644 backend/src/Migrations/20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.Designer.cs
 create mode 100644 backend/src/Migrations/20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.cs
 create mode 100644 backend/src/Migrations/migrate_from_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations_to_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.sql
 create mode 100644 backend/src/Migrations/rollback_from_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication_to_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.sql

diff --git a/backend/src/Authorization/AuthorizationPolicies.cs b/backend/src/Authorization/AuthorizationPolicies.cs
index 6f69a50e8..6240e6d59 100644
--- a/backend/src/Authorization/AuthorizationPolicies.cs
+++ b/backend/src/Authorization/AuthorizationPolicies.cs
@@ -7,6 +7,7 @@ public static class AuthorizationPolicies
     public const string WriteScopePolicy = "WriteScope";
     public const string AdministrateScopePolicy = "AdministrateScope";
     public const string VerifyScopePolicy = "VerifyScope";
+    public const string SupportScopePolicy = "SupportScope";
     public const string ManageDatabaseScopePolicy = "ManageDatabaseScope";
     public const string ManageGnuPgScopePolicy = "ManageGnuPgScope";
     public const string ManageInstitutionRepresentativeScopePolicy = "ManageInstitutionRepresentativeScope";
diff --git a/backend/src/Authorization/CommonAuthorization.cs b/backend/src/Authorization/CommonAuthorization.cs
index a5285b521..10f4980ff 100644
--- a/backend/src/Authorization/CommonAuthorization.cs
+++ b/backend/src/Authorization/CommonAuthorization.cs
@@ -133,6 +133,19 @@ ClaimsPrincipal claimsPrincipal
             );
     }
 
+    public async Task<bool> CanSupport(
+        User user,
+        ClaimsPrincipal claimsPrincipal
+    )
+    {
+        return
+            claimsPrincipal.HasScope(OpenIdConnectScope.SupportApiScope)
+            && await IsInRole(
+                user,
+                UserRole.SUPPORTER
+            );
+    }
+
     private Task<bool> IsInRole(
         User user,
         UserRole role
diff --git a/backend/src/Configuration/AuthConfiguration.cs b/backend/src/Configuration/AuthConfiguration.cs
index c3cff0a9f..2c1290a99 100644
--- a/backend/src/Configuration/AuthConfiguration.cs
+++ b/backend/src/Configuration/AuthConfiguration.cs
@@ -29,6 +29,7 @@ public static class AuthConfiguration
         { AuthorizationPolicies.WriteScopePolicy, OpenIdConnectScope.WriteApiScope },
         { AuthorizationPolicies.AdministrateScopePolicy, OpenIdConnectScope.AdministrateApiScope },
         { AuthorizationPolicies.VerifyScopePolicy, OpenIdConnectScope.VerifyApiScope },
+        { AuthorizationPolicies.SupportScopePolicy, OpenIdConnectScope.SupportApiScope },
         { AuthorizationPolicies.ManageDatabaseScopePolicy, OpenIdConnectScope.ManageDatabaseApiScope },
         { AuthorizationPolicies.ManageGnuPgScopePolicy, OpenIdConnectScope.ManageGnuPgApiScope },
         { AuthorizationPolicies.ManageInstitutionRepresentativeScopePolicy, OpenIdConnectScope.ManageInstitutionRepresentativeApiScope },
diff --git a/backend/src/Controllers/AuthorizationController.cs b/backend/src/Controllers/AuthorizationController.cs
index 5331d2500..d9492d79f 100644
--- a/backend/src/Controllers/AuthorizationController.cs
+++ b/backend/src/Controllers/AuthorizationController.cs
@@ -15,6 +15,7 @@
 using Metabase.Data;
 using Metabase.Data.OpenIdConnect;
 using Metabase.Extensions;
+using Metabase.GraphQl.OpenIdConnect;
 using Metabase.ViewModels.Authorization;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Antiforgery;
@@ -42,7 +43,7 @@ public sealed class AuthorizationController(
     IClock clock,
     OpenIddictApplicationManager<OpenIdConnectApplication> applicationManager,
     OpenIddictAuthorizationManager<Data.OpenIdConnect.OpenIdConnectAuthorization> authorizationManager,
-    OpenIddictScopeManager<OpenIdConnectScope> scopeManager,
+    OpenIddictScopeManager<Data.OpenIdConnect.OpenIdConnectScope> scopeManager,
     SignInManager<User> signInManager,
     UserManager<User> userManager,
     ApplicationDbContext dbContext,
@@ -317,11 +318,24 @@ await CreatePermanentAuthorization(
 
             // In every other case, render the consent form.
             default:
-                return View(new AuthorizeViewModel
-                {
-                    ApplicationName = await applicationManager.GetLocalizedDisplayNameAsync(application),
-                    Scope = request.Scope
-                });
+                return View(new AuthorizeViewModel(
+                    await applicationManager.GetLocalizedDisplayNameAsync(application) ?? application.ClientId ?? "Unknown",
+                    request.GetScopes()
+                    .Where(_ =>
+                    {
+                        try
+                        {
+                            _.ToOpenIdConnectScope();
+                            return true;
+                        }
+                        catch (ArgumentOutOfRangeException)
+                        {
+                            return false;
+                        }
+                    })
+                    .Select(_ => _.ToOpenIdConnectScope())
+                    .ToArray()
+                ));
         }
     }
 
diff --git a/backend/src/Data/DbSeeder.cs b/backend/src/Data/DbSeeder.cs
index 2c59f3852..d85293c35 100644
--- a/backend/src/Data/DbSeeder.cs
+++ b/backend/src/Data/DbSeeder.cs
@@ -382,6 +382,22 @@ await manager.CreateAsync(
             );
         }
 
+        if (await manager.FindByNameAsync(OpenIdConnectScope.SupportApiScope) is null)
+        {
+            logger.CreatingScope(OpenIdConnectScope.SupportApiScope);
+            await manager.CreateAsync(
+                new OpenIddictScopeDescriptor
+                {
+                    DisplayName = "Allow customer support role",
+                    Name = OpenIdConnectScope.SupportApiScope,
+                    Resources =
+                    {
+                        OpenIdConnectConstants.Client.MetabaseClientId
+                    }
+                }
+            );
+        }
+
         if (await manager.FindByNameAsync(OpenIdConnectScope.ManageUserApiScope) is null)
         {
             logger.CreatingScope(OpenIdConnectScope.ManageUserApiScope);
diff --git a/backend/src/Data/OpenIdConnect/OpenIdConnectScope.cs b/backend/src/Data/OpenIdConnect/OpenIdConnectScope.cs
index f823bfaaa..4cc0b6c5a 100644
--- a/backend/src/Data/OpenIdConnect/OpenIdConnectScope.cs
+++ b/backend/src/Data/OpenIdConnect/OpenIdConnectScope.cs
@@ -20,6 +20,8 @@ public sealed class OpenIdConnectScope
     public const string AdministrateApiScope = ApiScopePrefix + ScopeSeparator + "administrate";
     // Allow elevated privileges for users with role "Verifier"
     public const string VerifyApiScope = ApiScopePrefix + ScopeSeparator + "verify";
+    // Allow elevated privileges for users with role "Supporter"
+    public const string SupportApiScope = ApiScopePrefix + ScopeSeparator + "support";
     public const string ManageDatabaseApiScope = ApiScopePrefix + ScopeSeparator + "database" + ScopeSeparator + "manage";
     public const string ManageGnuPgApiScope = ApiScopePrefix + ScopeSeparator + "gnu_pg" + ScopeSeparator + "manage";
     public const string ManageInstitutionRepresentativeApiScope = ApiScopePrefix + ScopeSeparator + "institution_representative" + ScopeSeparator + "manage";
@@ -38,6 +40,7 @@ public sealed class OpenIdConnectScope
         WriteApiScope,
         AdministrateApiScope,
         VerifyApiScope,
+        SupportApiScope,
         ManageDatabaseApiScope,
         ManageGnuPgApiScope,
         ManageInstitutionRepresentativeApiScope,
diff --git a/backend/src/Extensions/EnumExtensions.cs b/backend/src/Extensions/EnumExtensions.cs
new file mode 100644
index 000000000..fa1cf3898
--- /dev/null
+++ b/backend/src/Extensions/EnumExtensions.cs
@@ -0,0 +1,18 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Reflection;
+
+namespace Metabase.Extensions;
+
+public static class EnumExtensions
+{
+    public static string GetDescription(this Enum value)
+    {
+        return value.GetType()
+            .GetMember(value.ToString())
+            .FirstOrDefault()
+            ?.GetCustomAttribute<DisplayAttribute>()
+            ?.Description ?? value.ToString();
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationInput.cs b/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationInput.cs
index 4e377bb2e..68d3af4fa 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationInput.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationInput.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Metabase.Enumerations;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationInput.cs b/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationInput.cs
index 4b2408a22..feca34294 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationInput.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationInput.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Metabase.Enumerations;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
diff --git a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs
index f9ccbf8a9..46877122b 100644
--- a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs
+++ b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Metabase.GraphQl.OpenIdConnect;
@@ -5,18 +6,48 @@ namespace Metabase.GraphQl.OpenIdConnect;
 [SuppressMessage("Naming", "CA1707")]
 public enum OpenIdConnectScope
 {
+    [Display(Description = "Access to your postal address information.")]
     ADDRESS,
+
+    [Display(Description = "Access to your email address.")]
     EMAIL,
+
+    [Display(Description = "Access to your phone number.")]
     PHONE,
+
+    [Display(Description = "Access to your basic profile, for example, name, gender, picture, and so forth.")]
     PROFILE,
+
+    [Display(Description = "Access to your user roles.")]
     ROLES,
+
+    [Display(Description = "Read-only access to API resources in your name.")]
     READ_API,
+
+    [Display(Description = "Full write access to API resources in your name.")]
     WRITE_API,
+
+    [Display(Description = "Permission to perform administrative tasks in your name.")]
     ADMINISTRATE_API,
+
+    [Display(Description = "Permission to perform verification tasks in your name.")]
     VERIFY_API,
+
+    [Display(Description = "Permission to perform customer support tasks in your name.")]
+    SUPPORT_API,
+
+    [Display(Description = "Authorization to manage databases in your name.")]
     MANAGE_DATABASE_API,
+
+    [Display(Description = "Authorization to manage GnuPG keys in your name.")]
     MANAGE_GNU_PG_API,
+
+    [Display(Description = "Authorization to manage institution representatives in your name.")]
     MANAGE_INSTITUTION_REPRESENTATIVE_API,
+
+    [Display(Description = "Authorization to manage OpenID Connect settings in your name.")]
     MANAGE_OPEN_ID_CONNECT_API,
+
+    [Display(Description = "Authorization to manage your user account.")]
     MANAGE_USER_API,
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
index 3a1449dcb..f82d7d042 100644
--- a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
@@ -18,6 +18,7 @@ public static OpenIdConnectScope ToOpenIdConnectScope(this string scope)
             Data.OpenIdConnect.OpenIdConnectScope.WriteApiScope => OpenIdConnectScope.WRITE_API,
             Data.OpenIdConnect.OpenIdConnectScope.AdministrateApiScope => OpenIdConnectScope.ADMINISTRATE_API,
             Data.OpenIdConnect.OpenIdConnectScope.VerifyApiScope => OpenIdConnectScope.VERIFY_API,
+            Data.OpenIdConnect.OpenIdConnectScope.SupportApiScope => OpenIdConnectScope.SUPPORT_API,
             Data.OpenIdConnect.OpenIdConnectScope.ManageDatabaseApiScope => OpenIdConnectScope.MANAGE_DATABASE_API,
             Data.OpenIdConnect.OpenIdConnectScope.ManageGnuPgApiScope => OpenIdConnectScope.MANAGE_GNU_PG_API,
             Data.OpenIdConnect.OpenIdConnectScope.ManageInstitutionRepresentativeApiScope => OpenIdConnectScope.MANAGE_INSTITUTION_REPRESENTATIVE_API,
@@ -40,6 +41,7 @@ public static OpenIdConnectScope PermissionToOpenIdConnectScope(this string scop
             OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.WriteApiScope => OpenIdConnectScope.WRITE_API,
             OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.AdministrateApiScope => OpenIdConnectScope.ADMINISTRATE_API,
             OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.VerifyApiScope => OpenIdConnectScope.VERIFY_API,
+            OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.SupportApiScope => OpenIdConnectScope.SUPPORT_API,
             OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.ManageDatabaseApiScope => OpenIdConnectScope.MANAGE_DATABASE_API,
             OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.ManageGnuPgApiScope => OpenIdConnectScope.MANAGE_GNU_PG_API,
             OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.ManageInstitutionRepresentativeApiScope => OpenIdConnectScope.MANAGE_INSTITUTION_REPRESENTATIVE_API,
@@ -62,6 +64,7 @@ public static string ToPermissionString(this OpenIdConnectScope scope)
             OpenIdConnectScope.WRITE_API => OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.WriteApiScope,
             OpenIdConnectScope.ADMINISTRATE_API => OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.AdministrateApiScope,
             OpenIdConnectScope.VERIFY_API => OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.VerifyApiScope,
+            OpenIdConnectScope.SUPPORT_API => OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.SupportApiScope,
             OpenIdConnectScope.MANAGE_DATABASE_API => OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.ManageDatabaseApiScope,
             OpenIdConnectScope.MANAGE_GNU_PG_API => OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.ManageGnuPgApiScope,
             OpenIdConnectScope.MANAGE_INSTITUTION_REPRESENTATIVE_API => OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.ManageInstitutionRepresentativeApiScope,
diff --git a/backend/src/Migrations/20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.cs b/backend/src/Migrations/20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.cs
index 7df8ee736..52a80f0ea 100644
--- a/backend/src/Migrations/20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.cs
+++ b/backend/src/Migrations/20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore.Migrations;
 using NodaTime;
 
@@ -10,6 +11,7 @@ namespace Metabase.Migrations
     public partial class AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations : Migration
     {
         /// <inheritdoc />
+        [SuppressMessage("Performance", "CA1861")]
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.AlterColumn<DateTimeOffset>(
diff --git a/backend/src/Migrations/20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.Designer.cs b/backend/src/Migrations/20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.Designer.cs
new file mode 100644
index 000000000..35ff8fa96
--- /dev/null
+++ b/backend/src/Migrations/20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.Designer.cs
@@ -0,0 +1,2298 @@
+// <auto-generated />
+using System;
+using System.Text.Json;
+using Metabase.Data;
+using Metabase.Enumerations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Metabase.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication")]
+    partial class AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("metabase")
+                .HasAnnotation("ProductVersion", "10.0.7")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "component_category", new[] { "layer", "material", "unit" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "database_verification_state", new[] { "pending", "verified" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_operating_state", new[] { "not_operating", "operating" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_representative_role", new[] { "assistant", "owner" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_state", new[] { "pending", "verified" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "method_category", new[] { "calculation", "measurement" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "prime_surface", new[] { "inside", "outside" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "standardizer", new[] { "aerc", "agi", "ashrae", "breeam", "bs", "bsi", "cen", "cie", "dgnb", "din", "dvwg", "iec", "ies", "ift", "iso", "jis", "leed", "nfrc", "riba", "ul", "unece", "vdi", "vff", "well" });
+            NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "pgcrypto");
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("Abbreviation")
+                        .HasColumnType("text");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
+                        .HasColumnType("tstzrange");
+
+                    b.PrimitiveCollection<ComponentCategory[]>("Categories")
+                        .IsRequired()
+                        .HasColumnType("metabase.component_category[]");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<JsonElement?>("Extras")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("component", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentAssembly", b =>
+                {
+                    b.Property<Guid>("AssembledComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("PartComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<byte?>("Index")
+                        .HasColumnType("smallint");
+
+                    b.Property<PrimeSurface?>("PrimeSurface")
+                        .HasColumnType("metabase.prime_surface");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("AssembledComponentId", "PartComponentId");
+
+                    b.HasIndex("PartComponentId");
+
+                    b.ToTable("component_assembly", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentConcretizationAndGeneralization", b =>
+                {
+                    b.Property<Guid>("GeneralComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ConcreteComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("GeneralComponentId", "ConcreteComponentId");
+
+                    b.HasIndex("ConcreteComponentId");
+
+                    b.ToTable("component_concretization_and_generalization", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentManufacturer", b =>
+                {
+                    b.Property<Guid>("ComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("ComponentId", "InstitutionId");
+
+                    b.HasIndex("InstitutionId");
+
+                    b.ToTable("component_manufacturer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentVariant", b =>
+                {
+                    b.Property<Guid>("OfComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ToComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("OfComponentId", "ToComponentId");
+
+                    b.HasIndex("ToComponentId");
+
+                    b.ToTable("component_variant", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.DataFormat", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Extension")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("MediaType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SchemaLocator")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("data_format", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Database", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Locator")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OperatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("VerificationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DatabaseVerificationState>("VerificationState")
+                        .HasColumnType("metabase.database_verification_state");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OperatorId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("database", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.GnuPgKeyFingerprint", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<OffsetDateTime?>("AllowedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Fingerprint")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<OffsetDateTime?>("ForbiddenAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Fingerprint")
+                        .IsUnique();
+
+                    b.HasIndex("InstitutionId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("gnu_pg_fingerprint", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("Abbreviation")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<JsonElement?>("Extras")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<InstitutionOperatingState>("OperatingState")
+                        .HasColumnType("metabase.institution_operating_state");
+
+                    b.Property<InstitutionState>("State")
+                        .HasColumnType("metabase.institution_state");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("institution", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionMethodDeveloper", b =>
+                {
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MethodId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("InstitutionId", "MethodId");
+
+                    b.HasIndex("MethodId");
+
+                    b.ToTable("institution_method_developer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionRepresentative", b =>
+                {
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<InstitutionRepresentativeRole>("Role")
+                        .HasColumnType("metabase.institution_representative_role");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("InstitutionId", "UserId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("institution_representative", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
+                        .HasColumnType("tstzrange");
+
+                    b.Property<string>("CalculationLocator")
+                        .HasColumnType("text");
+
+                    b.PrimitiveCollection<MethodCategory[]>("Categories")
+                        .IsRequired()
+                        .HasColumnType("metabase.method_category[]");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Validity")
+                        .HasColumnType("tstzrange");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("method", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("ApplicationType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("ClientSecret")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClientType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ConsentType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayNames")
+                        .HasColumnType("text");
+
+                    b.Property<string>("JsonWebKeySet")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Permissions")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostLogoutRedirectUris")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RedirectUris")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Requirements")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Settings")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId")
+                        .IsUnique();
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("OpenIddictApplications", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTime?>("CreationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Scopes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Subject")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                    b.ToTable("OpenIddictAuthorizations", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectScope", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Descriptions")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayNames")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Resources")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("OpenIddictScopes", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AuthorizationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTime?>("CreationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("ExpirationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("RedemptionDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ReferenceId")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Status")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Subject")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuthorizationId");
+
+                    b.HasIndex("ReferenceId")
+                        .IsUnique();
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                    b.ToTable("OpenIddictTokens", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Role", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("role", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.RoleClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("role_claim", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PostalAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.Property<string>("WebsiteLocator")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("user", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("user_claim", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserLogin", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("user_login", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserMethodDeveloper", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MethodId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("UserId", "MethodId");
+
+                    b.HasIndex("MethodId");
+
+                    b.ToTable("user_method_developer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserRole", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("user_role", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserToken", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("user_token", "metabase");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedComponents")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "PrimeDirection", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "PrimeSurface", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "SwitchableLayers", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("PrimeDirection");
+
+                    b.Navigation("PrimeSurface");
+
+                    b.Navigation("SwitchableLayers");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentAssembly", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "AssembledComponent")
+                        .WithMany("PartEdges")
+                        .HasForeignKey("AssembledComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "PartComponent")
+                        .WithMany("PartOfEdges")
+                        .HasForeignKey("PartComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("AssembledComponent");
+
+                    b.Navigation("PartComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentConcretizationAndGeneralization", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "ConcreteComponent")
+                        .WithMany("GeneralizationEdges")
+                        .HasForeignKey("ConcreteComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "GeneralComponent")
+                        .WithMany("ConcretizationEdges")
+                        .HasForeignKey("GeneralComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ConcreteComponent");
+
+                    b.Navigation("GeneralComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentManufacturer", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "Component")
+                        .WithMany("ManufacturerEdges")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("ManufacturedComponentEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Institution");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentVariant", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "OfComponent")
+                        .WithMany("VariantEdges")
+                        .HasForeignKey("OfComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "ToComponent")
+                        .WithMany("VariantOfEdges")
+                        .HasForeignKey("ToComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("OfComponent");
+
+                    b.Navigation("ToComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.DataFormat", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedDataFormats")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.Reference", "Reference", b1 =>
+                        {
+                            b1.Property<Guid>("DataFormatId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("DataFormatId");
+
+                            b1.ToTable("data_format", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("DataFormatId");
+
+                            b1.OwnsOne("Metabase.Data.Publication", "Publication", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceDataFormatId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("ArXiv")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<string[]>("Authors")
+                                        .HasColumnType("text[]");
+
+                                    b2.Property<string>("Doi")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Urn")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("WebAddress")
+                                        .HasColumnType("text");
+
+                                    b2.HasKey("ReferenceDataFormatId");
+
+                                    b2.ToTable("data_format", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceDataFormatId");
+                                });
+
+                            b1.OwnsOne("Metabase.Data.Standard", "Standard", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceDataFormatId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Locator")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                        .IsRequired()
+                                        .HasColumnType("metabase.standardizer[]");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<int?>("Year")
+                                        .HasColumnType("integer");
+
+                                    b2.HasKey("ReferenceDataFormatId");
+
+                                    b2.ToTable("data_format", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceDataFormatId");
+
+                                    b2.OwnsOne("Metabase.Data.Numeration", "Numeration", b3 =>
+                                        {
+                                            b3.Property<Guid>("StandardReferenceDataFormatId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("MainNumber")
+                                                .IsRequired()
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Prefix")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Suffix")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("StandardReferenceDataFormatId");
+
+                                            b3.ToTable("data_format", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("StandardReferenceDataFormatId");
+                                        });
+
+                                    b2.Navigation("Numeration")
+                                        .IsRequired();
+                                });
+
+                            b1.Navigation("Publication");
+
+                            b1.Navigation("Standard");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("Reference");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Database", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Operator")
+                        .WithMany("OperatedDatabases")
+                        .HasForeignKey("OperatorId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Operator");
+                });
+
+            modelBuilder.Entity("Metabase.Data.GnuPgKeyFingerprint", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("GnuPgKeyFingerprints")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("GnuPgKeyFingerprints")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedInstitutions")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.OwnsOne("Metabase.Data.ContactInformation", "Contact", b1 =>
+                        {
+                            b1.Property<Guid>("InstitutionId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("EmailAddress")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("IsEmailAddressConfirmed")
+                                .HasColumnType("boolean");
+
+                            b1.Property<bool>("IsPhoneNumberConfirmed")
+                                .HasColumnType("boolean");
+
+                            b1.Property<string>("PhoneNumber")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("PostalAddress")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("WebsiteLocator")
+                                .HasColumnType("text");
+
+                            b1.HasKey("InstitutionId");
+
+                            b1.ToTable("institution", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("InstitutionId");
+                        });
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Manager");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionMethodDeveloper", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("DevelopedMethodEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Method", "Method")
+                        .WithMany("InstitutionDeveloperEdges")
+                        .HasForeignKey("MethodId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("Method");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionRepresentative", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("RepresentativeEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("RepresentedInstitutionEdges")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedMethods")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.Reference", "Reference", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("MethodId");
+
+                            b1.ToTable("method", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+
+                            b1.OwnsOne("Metabase.Data.Publication", "Publication", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceMethodId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("ArXiv")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<string[]>("Authors")
+                                        .HasColumnType("text[]");
+
+                                    b2.Property<string>("Doi")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Urn")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("WebAddress")
+                                        .HasColumnType("text");
+
+                                    b2.HasKey("ReferenceMethodId");
+
+                                    b2.ToTable("method", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceMethodId");
+                                });
+
+                            b1.OwnsOne("Metabase.Data.Standard", "Standard", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceMethodId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Locator")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                        .IsRequired()
+                                        .HasColumnType("metabase.standardizer[]");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<int?>("Year")
+                                        .HasColumnType("integer");
+
+                                    b2.HasKey("ReferenceMethodId");
+
+                                    b2.ToTable("method", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceMethodId");
+
+                                    b2.OwnsOne("Metabase.Data.Numeration", "Numeration", b3 =>
+                                        {
+                                            b3.Property<Guid>("StandardReferenceMethodId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("MainNumber")
+                                                .IsRequired()
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Prefix")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Suffix")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("StandardReferenceMethodId");
+
+                                            b3.ToTable("method", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("StandardReferenceMethodId");
+                                        });
+
+                                    b2.Navigation("Numeration")
+                                        .IsRequired();
+                                });
+
+                            b1.Navigation("Publication");
+
+                            b1.Navigation("Standard");
+                        });
+
+                    b.OwnsMany("Metabase.Data.MethodParameter", "Parameters", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<JsonElement>("Type")
+                                .HasColumnType("jsonb");
+
+                            b1.HasKey("MethodId", "Id");
+
+                            b1.ToTable("MethodParameter", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+                        });
+
+                    b.OwnsMany("Metabase.Data.MethodSource", "Sources", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Description")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.HasKey("MethodId", "Id");
+
+                            b1.ToTable("MethodSource", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("Parameters");
+
+                    b.Navigation("Reference");
+
+                    b.Navigation("Sources");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Owner")
+                        .WithMany("OpenIdConnectApplications")
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", "Application")
+                        .WithMany("Authorizations")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectToken", b =>
+                {
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", "Application")
+                        .WithMany("Tokens")
+                        .HasForeignKey("ApplicationId");
+
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", "Authorization")
+                        .WithMany("Tokens")
+                        .HasForeignKey("AuthorizationId");
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Authorization");
+                });
+
+            modelBuilder.Entity("Metabase.Data.RoleClaim", b =>
+                {
+                    b.HasOne("Metabase.Data.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserClaim", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserLogin", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserMethodDeveloper", b =>
+                {
+                    b.HasOne("Metabase.Data.Method", "Method")
+                        .WithMany("UserDeveloperEdges")
+                        .HasForeignKey("MethodId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("DevelopedMethodEdges")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Method");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserRole", b =>
+                {
+                    b.HasOne("Metabase.Data.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserToken", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.Navigation("ConcretizationEdges");
+
+                    b.Navigation("GeneralizationEdges");
+
+                    b.Navigation("ManufacturerEdges");
+
+                    b.Navigation("PartEdges");
+
+                    b.Navigation("PartOfEdges");
+
+                    b.Navigation("VariantEdges");
+
+                    b.Navigation("VariantOfEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.Navigation("DevelopedMethodEdges");
+
+                    b.Navigation("GnuPgKeyFingerprints");
+
+                    b.Navigation("ManagedComponents");
+
+                    b.Navigation("ManagedDataFormats");
+
+                    b.Navigation("ManagedInstitutions");
+
+                    b.Navigation("ManagedMethods");
+
+                    b.Navigation("ManufacturedComponentEdges");
+
+                    b.Navigation("OpenIdConnectApplications");
+
+                    b.Navigation("OperatedDatabases");
+
+                    b.Navigation("RepresentativeEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.Navigation("InstitutionDeveloperEdges");
+
+                    b.Navigation("UserDeveloperEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.Navigation("Authorizations");
+
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Metabase.Data.User", b =>
+                {
+                    b.Navigation("DevelopedMethodEdges");
+
+                    b.Navigation("GnuPgKeyFingerprints");
+
+                    b.Navigation("RepresentedInstitutionEdges");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/backend/src/Migrations/20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.cs b/backend/src/Migrations/20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.cs
new file mode 100644
index 000000000..f73d3538b
--- /dev/null
+++ b/backend/src/Migrations/20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.cs
@@ -0,0 +1,32 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Metabase.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql("""
+                UPDATE metabase."OpenIddictApplications" 
+                SET "Permissions" = ("Permissions"::jsonb || '["scp:api:support"]'::jsonb)::text
+                WHERE "ClientId" = 'metabase';
+            """
+            );
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql("""
+                UPDATE metabase."OpenIddictApplications" 
+                SET "Permissions" = ("Permissions"::jsonb - 'scp:api:support')::text
+                WHERE "ClientId" = 'metabase';
+            """
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/Migrations/migrate.sql b/backend/src/Migrations/migrate.sql
index 0d8eae86f..6df98fabc 100644
--- a/backend/src/Migrations/migrate.sql
+++ b/backend/src/Migrations/migrate.sql
@@ -2735,3 +2735,24 @@ BEGIN
 END $EF$;
 COMMIT;
 
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication') THEN
+                UPDATE metabase."OpenIddictApplications" 
+                SET "Permissions" = ("Permissions"::jsonb || '["scp:api:support"]'::jsonb)::text
+                WHERE "ClientId" = 'metabase';
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication') THEN
+    INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+    VALUES ('20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication', '10.0.7');
+    END IF;
+END $EF$;
+
+COMMIT;
+
diff --git a/backend/src/Migrations/migrate_from_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations_to_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.sql b/backend/src/Migrations/migrate_from_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations_to_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.sql
new file mode 100644
index 000000000..bda8484f9
--- /dev/null
+++ b/backend/src/Migrations/migrate_from_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations_to_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.sql
@@ -0,0 +1,21 @@
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication') THEN
+                UPDATE metabase."OpenIddictApplications" 
+                SET "Permissions" = ("Permissions"::jsonb || '["scp:api:support"]'::jsonb)::text
+                WHERE "ClientId" = 'metabase';
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication') THEN
+    INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+    VALUES ('20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication', '10.0.7');
+    END IF;
+END $EF$;
+
+COMMIT;
+
diff --git a/backend/src/Migrations/rollback_from_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication_to_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.sql b/backend/src/Migrations/rollback_from_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication_to_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.sql
new file mode 100644
index 000000000..922ee8a1d
--- /dev/null
+++ b/backend/src/Migrations/rollback_from_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication_to_20260508172623_AddIndicesForNameAndCreatedAtAndAtDefaultValuesForAuditableEntitiesAndAssociations.sql
@@ -0,0 +1,21 @@
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication') THEN
+                UPDATE metabase."OpenIddictApplications" 
+                SET "Permissions" = ("Permissions"::jsonb - 'scp:api:support')::text
+                WHERE "ClientId" = 'metabase';
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication') THEN
+    DELETE FROM "__EFMigrationsHistory"
+    WHERE "MigrationId" = '20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication';
+    END IF;
+END $EF$;
+
+COMMIT;
+
diff --git a/backend/src/ViewModels/Authorization/AuthorizeViewModel.cs b/backend/src/ViewModels/Authorization/AuthorizeViewModel.cs
index 800803d0d..d12acbbf6 100644
--- a/backend/src/ViewModels/Authorization/AuthorizeViewModel.cs
+++ b/backend/src/ViewModels/Authorization/AuthorizeViewModel.cs
@@ -1,10 +1,9 @@
 using System.ComponentModel.DataAnnotations;
+using Metabase.GraphQl.OpenIdConnect;
 
 namespace Metabase.ViewModels.Authorization;
 
-public sealed record AuthorizeViewModel
-{
-    [Display(Name = "Application")] public string? ApplicationName { get; init; }
-
-    [Display(Name = "Scope")] public string? Scope { get; init; }
-}
\ No newline at end of file
+public sealed record AuthorizeViewModel(
+    [property: Display(Name = "Application")] string ApplicationName,
+    [property: Display(Name = "Scopes")] OpenIdConnectScope[] Scopes
+);
\ No newline at end of file
diff --git a/backend/src/Views/Authorization/Authorize.cshtml b/backend/src/Views/Authorization/Authorize.cshtml
index a219051de..d7efb0e4f 100644
--- a/backend/src/Views/Authorization/Authorize.cshtml
+++ b/backend/src/Views/Authorization/Authorize.cshtml
@@ -1,11 +1,18 @@
 @using Microsoft.Extensions.Primitives
 @model AuthorizeViewModel
+@using Metabase.Extensions
 
 <h1>Authorize</h1>
 <p>
-    Do you want to grant <strong>@Model.ApplicationName</strong> access to your
-    data associated with the scopes <em>@Model.Scope</em>?
+    Do you want to grant <strong>@Model.ApplicationName</strong> access to some
+    of your data and to act on your behalf? The application asks for
 </p>
+<ul>
+    @foreach (var scope in @Model.Scopes)
+    {
+        <li>@scope.GetDescription()</li>
+    }
+</ul>
 <form asp-controller="Authorization" asp-action="Authorize" method="post">
     @* Flow the request parameters so they can be received by the Accept/Reject actions: *@
     @foreach (var parameter in Context.Request.HasFormContentType ? (IEnumerable<KeyValuePair<string,
@@ -15,4 +22,4 @@
     }
     <input name="submit.Accept" type="submit" value="Yes" />
     <input name="submit.Deny" type="submit" value="No" />
-</form>
\ No newline at end of file
+</form>
diff --git a/frontend/components/entities/PaginatedEntities.tsx b/frontend/components/entities/PaginatedEntities.tsx
index 817718e6b..519379718 100644
--- a/frontend/components/entities/PaginatedEntities.tsx
+++ b/frontend/components/entities/PaginatedEntities.tsx
@@ -342,7 +342,11 @@ export default function PaginatedEntities<
                     >
                       Close
                     </Button>
-                    <Button type="primary" onClick={form.submit}>
+                    <Button
+                      type="primary"
+                      onClick={form.submit}
+                      loading={loading}
+                    >
                       Apply
                     </Button>
                   </Space>
diff --git a/frontend/pages/users/register.tsx b/frontend/pages/users/register.tsx
index ee335aacb..4384fa6d8 100644
--- a/frontend/pages/users/register.tsx
+++ b/frontend/pages/users/register.tsx
@@ -21,7 +21,7 @@ interface FormValues {
   passwordConfirmation: string;
 }
 
-function Register() {
+export default function Page() {
   const router = useRouter();
   const returnTo = router.query.returnTo;
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
@@ -179,5 +179,3 @@ function Register() {
     </Layout>
   );
 }
-
-export default Register;

From f3828e3bbe76d2a19bd18d3b72ea70f328ebf070 Mon Sep 17 00:00:00 2001
From: christoph-maurer <christoph.maurer@ise.fraunhofer.de>
Date: Tue, 12 May 2026 18:00:08 +0200
Subject: [PATCH 032/145] Correct snapshots to fix tests

---
 ...ComponentTests.AnonymousUser_IsAuthenticationError.snap | 2 +-
 ...itutionTests.AnonymousUser_CannotCreateInstitution.snap | 2 +-
 ...stitutionTests.AnonymousUser_IsAuthenticationError.snap | 2 +-
 ...erEmailTests.NonLoggedInUser_IsAuthenticationError.snap | 2 +-
 ...asswordTests.NonLoggedInUser_IsAuthenticationError.snap | 2 +-
 ...serDataTests.NonLoggedInUser_IsAuthenticationError.snap | 2 +-
 ...icationTests.NonLoggedInUser_IsAuthenticationError.snap | 2 +-
 .../__snapshots__/GraphQlSchemaTests.IsUnchanged.snap      | 7 +++++--
 8 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/backend/test/Integration/GraphQl/Components/__snapshots__/CreateComponentTests.AnonymousUser_IsAuthenticationError.snap b/backend/test/Integration/GraphQl/Components/__snapshots__/CreateComponentTests.AnonymousUser_IsAuthenticationError.snap
index dbee716b3..f00bf8f70 100644
--- a/backend/test/Integration/GraphQl/Components/__snapshots__/CreateComponentTests.AnonymousUser_IsAuthenticationError.snap
+++ b/backend/test/Integration/GraphQl/Components/__snapshots__/CreateComponentTests.AnonymousUser_IsAuthenticationError.snap
@@ -1 +1 @@
-{"errors":[{"message":"The current user is not authorized to access this resource.","locations":[{"line":4,"column":3}],"path":["createComponent"],"extensions":{"code":"AUTH_NOT_AUTHENTICATED"}}],"data":null}
+{"errors":[{"message":"The current user is not authorized to access this resource.","path":["createComponent"],"extensions":{"code":"AUTH_NOT_AUTHENTICATED"}}],"data":null}
diff --git a/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.AnonymousUser_CannotCreateInstitution.snap b/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.AnonymousUser_CannotCreateInstitution.snap
index 2e29402a5..20d442303 100644
--- a/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.AnonymousUser_CannotCreateInstitution.snap
+++ b/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.AnonymousUser_CannotCreateInstitution.snap
@@ -1 +1 @@
-{"data":{"institutions":{"edges":[{"node":{"id":"SW5zdGl0dXRpb246QAnd/RDrMEegz76vPWQQMg==","uuid":"fddd0940-eb10-4730-a0cf-beaf3d641032","name":"Fraunhofer ISE","abbreviation":"ISE","description":"Fraunhofer Institute for Solar Energy Systems (ISE)","contact":{"phoneNumber":"+49 761 45880","postalAddress":"Heidenhofstraße 2, 79110 Freiburg im Breisgau","emailAddress":null,"websiteLocator":"https://www.ise.fraunhofer.de/"},"state":"VERIFIED"}}]}}}
+{"data":{"institutions":{"edges":[{"node":{"id":"SW5zdGl0dXRpb2467/V6wR0vc0y8yfz7ciQg8w==","uuid":"c17af5ef-2f1d-4c73-bcc9-fcfb722420f3","name":"LBNL","abbreviation":"LBNL","description":"Lawrence Berkeley National Laboratory","contact":{"phoneNumber":"(510) 486-4000","postalAddress":"1 Cyclotron Road, Berkeley, CA 94720","emailAddress":null,"websiteLocator":"https://www.lbl.gov/"},"state":"VERIFIED"}},{"node":{"id":"SW5zdGl0dXRpb246XPm5gmEyOkaQ/g6dpwevFw==","uuid":"82b9f95c-3261-463a-90fe-0e9da707af17","name":"TestLab Solar Facades","abbreviation":"TLSF","description":"This institution represents the TestLab Solar Facades of Fraunhofer ISE","contact":{"phoneNumber":"+49 761 4588-5673","postalAddress":"Heidenhofstraße 2, 79110 Freiburg im Breisgau","emailAddress":null,"websiteLocator":"https://www.ise.fraunhofer.de/en/rd-infrastructure/accredited-labs/testlab-solar-facades.html"},"state":"VERIFIED"}},{"node":{"id":"SW5zdGl0dXRpb246+9YgU22560qiTOtwNtNDeg==","uuid":"5320d6fb-b96d-4aeb-a24c-eb7036d3437a","name":"Fraunhofer ISE","abbreviation":"ISE","description":"Fraunhofer Institute for Solar Energy Systems (ISE)","contact":{"phoneNumber":"+49 761 45880","postalAddress":"Heidenhofstraße 2, 79110 Freiburg im Breisgau","emailAddress":null,"websiteLocator":"https://www.ise.fraunhofer.de/"},"state":"VERIFIED"}}]}}}
diff --git a/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.AnonymousUser_IsAuthenticationError.snap b/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.AnonymousUser_IsAuthenticationError.snap
index 91ebf7903..57270f8ce 100644
--- a/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.AnonymousUser_IsAuthenticationError.snap
+++ b/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.AnonymousUser_IsAuthenticationError.snap
@@ -1 +1 @@
-{"errors":[{"message":"The current user is not authorized to access this resource.","locations":[{"line":4,"column":3}],"path":["createInstitution"],"extensions":{"code":"AUTH_NOT_AUTHENTICATED"}}],"data":null}
+{"errors":[{"message":"The current user is not authorized to access this resource.","path":["createInstitution"],"extensions":{"code":"AUTH_NOT_AUTHENTICATED"}}],"data":null}
diff --git a/backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserEmailTests.NonLoggedInUser_IsAuthenticationError.snap b/backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserEmailTests.NonLoggedInUser_IsAuthenticationError.snap
index 53c977494..9959c92e8 100644
--- a/backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserEmailTests.NonLoggedInUser_IsAuthenticationError.snap
+++ b/backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserEmailTests.NonLoggedInUser_IsAuthenticationError.snap
@@ -1 +1 @@
-{"errors":[{"message":"The current user is not authorized to access this resource.","locations":[{"line":4,"column":3}],"path":["changeUserEmail"],"extensions":{"code":"AUTH_NOT_AUTHENTICATED"}}],"data":null}
+{"errors":[{"message":"The current user is not authorized to access this resource.","path":["changeUserEmail"],"extensions":{"code":"AUTH_NOT_AUTHENTICATED"}}],"data":null}
diff --git a/backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserPasswordTests.NonLoggedInUser_IsAuthenticationError.snap b/backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserPasswordTests.NonLoggedInUser_IsAuthenticationError.snap
index 0a60e5e9c..083c68952 100644
--- a/backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserPasswordTests.NonLoggedInUser_IsAuthenticationError.snap
+++ b/backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserPasswordTests.NonLoggedInUser_IsAuthenticationError.snap
@@ -1 +1 @@
-{"errors":[{"message":"The current user is not authorized to access this resource.","locations":[{"line":6,"column":3}],"path":["changeUserPassword"],"extensions":{"code":"AUTH_NOT_AUTHENTICATED"}}],"data":null}
+{"errors":[{"message":"The current user is not authorized to access this resource.","path":["changeUserPassword"],"extensions":{"code":"AUTH_NOT_AUTHENTICATED"}}],"data":null}
diff --git a/backend/test/Integration/GraphQl/Users/__snapshots__/DeletePersonalUserDataTests.NonLoggedInUser_IsAuthenticationError.snap b/backend/test/Integration/GraphQl/Users/__snapshots__/DeletePersonalUserDataTests.NonLoggedInUser_IsAuthenticationError.snap
index c6a014f0f..55d84a56f 100644
--- a/backend/test/Integration/GraphQl/Users/__snapshots__/DeletePersonalUserDataTests.NonLoggedInUser_IsAuthenticationError.snap
+++ b/backend/test/Integration/GraphQl/Users/__snapshots__/DeletePersonalUserDataTests.NonLoggedInUser_IsAuthenticationError.snap
@@ -1 +1 @@
-{"errors":[{"message":"The current user is not authorized to access this resource.","locations":[{"line":4,"column":3}],"path":["deletePersonalUserData"],"extensions":{"code":"AUTH_NOT_AUTHENTICATED"}}],"data":null}
+{"errors":[{"message":"The current user is not authorized to access this resource.","path":["deletePersonalUserData"],"extensions":{"code":"AUTH_NOT_AUTHENTICATED"}}],"data":null}
diff --git a/backend/test/Integration/GraphQl/Users/__snapshots__/ResendUserEmailVerificationTests.NonLoggedInUser_IsAuthenticationError.snap b/backend/test/Integration/GraphQl/Users/__snapshots__/ResendUserEmailVerificationTests.NonLoggedInUser_IsAuthenticationError.snap
index d19c76523..d4e756273 100644
--- a/backend/test/Integration/GraphQl/Users/__snapshots__/ResendUserEmailVerificationTests.NonLoggedInUser_IsAuthenticationError.snap
+++ b/backend/test/Integration/GraphQl/Users/__snapshots__/ResendUserEmailVerificationTests.NonLoggedInUser_IsAuthenticationError.snap
@@ -1 +1 @@
-{"errors":[{"message":"The current user is not authorized to access this resource.","locations":[{"line":2,"column":5}],"path":["resendUserEmailVerification"],"extensions":{"code":"AUTH_NOT_AUTHENTICATED"}}],"data":null}
+{"errors":[{"message":"The current user is not authorized to access this resource.","path":["resendUserEmailVerification"],"extensions":{"code":"AUTH_NOT_AUTHENTICATED"}}],"data":null}
diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index 4fb673b87..69f572a92 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -1,4 +1,4 @@
-schema {
+schema {
   query: Query
   mutation: Mutation
 }
@@ -4900,6 +4900,7 @@ enum OpenIdConnectScope {
   PROFILE
   READ_API
   ROLES
+  SUPPORT_API
   VERIFY_API
   WRITE_API
 }
@@ -5011,6 +5012,7 @@ enum RemoveUserMethodDeveloperErrorCode {
 }
 
 enum RemoveUserRoleErrorCode {
+  LAST_USER
   UNAUTHORIZED
   UNKNOWN
   UNKNOWN_USER
@@ -5179,6 +5181,7 @@ enum UpdateOpenIdConnectApplicationErrorCode {
 
 enum UserRole {
   ADMINISTRATOR
+  SUPPORTER
   VERIFIER
 }
 
@@ -5279,4 +5282,4 @@ directive @listSize(
   slicingArgumentDefaultValue: Int
   "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments."
   slicingArguments: [String!]
-) on FIELD_DEFINITION
\ No newline at end of file
+) on FIELD_DEFINITION

From d0a7eda969583a24c0de0875ed6e852711a6043e Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 13 May 2026 16:25:12 +0200
Subject: [PATCH 033/145] Repair auditable tests by changing entity attributes
 before saving it

---
 backend/test/AuditableTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/test/AuditableTests.cs b/backend/test/AuditableTests.cs
index 5d9a3ba9a..fd7e5eaa1 100644
--- a/backend/test/AuditableTests.cs
+++ b/backend/test/AuditableTests.cs
@@ -44,7 +44,7 @@ public async Task SaveChanges_SetsAndUpdatesTimestamps_UsingFakeClock()
         var duration = Duration.FromHours(1);
         fakeClock.Advance(duration);
         var updatedInstant = startInstant.Plus(duration);
-        entity.Update("Name", "Description", null, null, null, [], [], []);
+        entity.Update("New Name", "New Description", null, null, null, [], [], []);
         await context.SaveChangesAsync();
         // Assert
         Assert.Multiple(() =>

From 9094d619aef66e0d9e5fed8b3ea25173b2fff8d8 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 13 May 2026 16:26:34 +0200
Subject: [PATCH 034/145] Use HotChocolate 16.0.2 (instead of the pre-release
 version)

---
 backend/dotnet-tools.json                     |  2 +-
 .../src/Authorization/UserAuthorization.cs    |  1 -
 .../src/Configuration/GraphQlConfiguration.cs |  5 ++-
 backend/src/Metabase.csproj                   | 39 ++++++++++---------
 backend/src/Startup.cs                        |  1 +
 backend/test/Metabase.Tests.csproj            |  6 +--
 6 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/backend/dotnet-tools.json b/backend/dotnet-tools.json
index 5695b5050..972eb2a49 100644
--- a/backend/dotnet-tools.json
+++ b/backend/dotnet-tools.json
@@ -24,7 +24,7 @@
       "rollForward": false
     },
     "dotnet-ef": {
-      "version": "10.0.7",
+      "version": "10.0.8",
       "commands": [
         "dotnet-ef"
       ],
diff --git a/backend/src/Authorization/UserAuthorization.cs b/backend/src/Authorization/UserAuthorization.cs
index 0d0324247..b94c1a996 100644
--- a/backend/src/Authorization/UserAuthorization.cs
+++ b/backend/src/Authorization/UserAuthorization.cs
@@ -8,7 +8,6 @@
 using Metabase.Data.OpenIdConnect;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
-using OpenIddict.Abstractions;
 using OpenIddict.Core;
 using UserRole = Metabase.Enumerations.UserRole;
 
diff --git a/backend/src/Configuration/GraphQlConfiguration.cs b/backend/src/Configuration/GraphQlConfiguration.cs
index c823b529e..ffaa7fc92 100644
--- a/backend/src/Configuration/GraphQlConfiguration.cs
+++ b/backend/src/Configuration/GraphQlConfiguration.cs
@@ -50,6 +50,7 @@ IWebHostEnvironment environment
             .AddApplicationService<ILogger<ErrorLoggingDiagnosticEventListener>>() // for `AddDiagnosticEventListener`
             .DisableIntrospection(false) // if the introspection result becomes too big we need to disable it in production
             .RegisterDbContextFactory<ApplicationDbContext>()
+            // .AddInstrumentation()
             .AddMutationConventions(new MutationConventionOptions { ApplyToAllMutations = false })
             // Extensions
             .AddNodaTime()
@@ -83,6 +84,7 @@ IWebHostEnvironment environment
                     _.DefaultBindingBehavior = BindingBehavior.Implicit;
                     // options.DefaultFieldBindingFlags = FieldBindingFlags.InstanceAndStatic;
                     _.EnableDirectiveIntrospection = true;
+                    _.EnableOptInFeatures = true;
                     _.DefaultDirectiveVisibility = DirectiveVisibility.Public;
                     _.DefaultResolverStrategy = ExecutionStrategy.Parallel;
                     _.ValidatePipelineOrder = true;
@@ -100,7 +102,7 @@ IWebHostEnvironment environment
             .ModifyServerOptions(_ =>
                 {
                     _.AllowedGetOperations = AllowedGetOperations.Query;
-                    _.Batching = AllowedBatching.None;
+                    _.Batching = AllowedBatching.All;
                     _.EnableGetRequests = false;
                     _.EnableMultipartRequests = true;
                     _.EnableSchemaRequests = true;
@@ -119,6 +121,7 @@ IWebHostEnvironment environment
                     // https://github.com/ChilliCream/hotchocolate/blob/main/src/HotChocolate/Core/src/Execution/Options/RequestExecutorOptions.cs
                     _.ExecutionTimeout = TimeSpan.FromSeconds(120);
                     _.IncludeExceptionDetails = !environment.IsProduction(); // Default is `Debugger.IsAttached`.
+                    _.AllowErrorHandlingModeOverride = true;
                     // options.QueryCacheSize = ...;
                     // options.UseComplexityMultipliers = ...;
                     // options.EnableSchemaFileSupport = true;
diff --git a/backend/src/Metabase.csproj b/backend/src/Metabase.csproj
index 73681a48c..0142e8dd5 100644
--- a/backend/src/Metabase.csproj
+++ b/backend/src/Metabase.csproj
@@ -17,31 +17,32 @@
     <PackageReference Include="AspNetCore.HealthChecks.OpenIdConnectServer" Version="9.0.0" />
     <PackageReference Include="GraphQL.Client" Version="6.1.0" />
     <PackageReference Include="GraphQL.Client.Serializer.SystemTextJson" Version="6.1.0" />
-    <PackageReference Include="HotChocolate" Version="16.1.0-p.1.10" />
-    <PackageReference Include="HotChocolate.AspNetCore" Version="16.1.0-p.1.10" />
-    <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="16.1.0-p.1.10" />
-    <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="16.0.0" />
-    <PackageReference Include="HotChocolate.Data" Version="16.1.0-p.1.10" />
-    <PackageReference Include="HotChocolate.Data.EntityFramework" Version="16.1.0-p.1.10" />
-    <PackageReference Include="HotChocolate.PersistedOperations.InMemory" Version="16.1.0-p.1.10" />
-    <PackageReference Include="HotChocolate.Types.Analyzers" Version="16.1.0-p.1.10" />
-    <PackageReference Include="HotChocolate.Types.NodaTime" Version="16.1.0-p.1.10" />
-    <PackageReference Include="HotChocolate.Types.Scalars" Version="16.1.0-p.1.10" />
+    <PackageReference Include="HotChocolate" Version="16.0.2" />
+    <PackageReference Include="HotChocolate.AspNetCore" Version="16.0.2" />
+    <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="16.0.2" />
+    <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="16.0.2" />
+    <PackageReference Include="HotChocolate.Data" Version="16.0.2" />
+    <PackageReference Include="HotChocolate.Data.EntityFramework" Version="16.0.2" />
+    <PackageReference Include="HotChocolate.Diagnostics" Version="16.0.2" />
+    <PackageReference Include="HotChocolate.PersistedOperations.InMemory" Version="16.0.2" />
+    <PackageReference Include="HotChocolate.Types.Analyzers" Version="16.0.2" />
+    <PackageReference Include="HotChocolate.Types.NodaTime" Version="16.0.2" />
+    <PackageReference Include="HotChocolate.Types.Scalars" Version="16.0.2" />
     <PackageReference Include="IdentityModel" Version="7.0.0" />
     <PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="10.0.11" />
     <PackageReference Include="MailKit" Version="4.16.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Common" Version="10.5.0" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.7" />
-    <PackageReference Include="Microsoft.Extensions.Telemetry.Abstractions" Version="10.5.0" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Common" Version="10.6.0" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Telemetry.Abstractions" Version="10.6.0" />
     <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.3.1" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="10.0.1" />
diff --git a/backend/src/Startup.cs b/backend/src/Startup.cs
index e18bcd9db..cc60dda5a 100644
--- a/backend/src/Startup.cs
+++ b/backend/src/Startup.cs
@@ -172,6 +172,7 @@ IServiceCollection services
             // {
             //     _.AddAspNetCoreInstrumentation();
             //     _.AddHttpClientInstrumentation();
+            //     _.AddHotChocolateInstrumentation();
             //     _.AddOtlpExporter(_ =>
             //     {
             //         _.Endpoint = _appSettings.OpenTelemetry.GrpcUri;
diff --git a/backend/test/Metabase.Tests.csproj b/backend/test/Metabase.Tests.csproj
index 8a49335e2..e154a802c 100644
--- a/backend/test/Metabase.Tests.csproj
+++ b/backend/test/Metabase.Tests.csproj
@@ -9,11 +9,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="8.9.0" />
+    <PackageReference Include="FluentAssertions" Version="8.10.0" />
     <PackageReference Include="IdentityModel" Version="7.0.0" />
     <PackageReference Include="JsonPath.Net" Version="3.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
     <PackageReference Include="NodaTime.Testing" Version="3.3.2" />
     <PackageReference Include="NUnit" Version="4.6.0" />

From 3a7bcfeaf6a085bfea3219748800e216376806c6 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 13 May 2026 16:29:53 +0200
Subject: [PATCH 035/145] Correct example in documentation

---
 backend/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Makefile b/backend/Makefile
index c5bf26845..106017b0e 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -22,7 +22,7 @@ help : ## Print this help
 
 # See https://learn.microsoft.com/en-us/dotnet/core/testing/microsoft-testing-platform-run-and-debug?tabs=dotnetcli
 list : ARGS =
-list : ## List tests, for example, `make list-tests ARGS='--filter "FullyQualifiedName~LoggedInUser_CreatesComponent"'`
+list : ## List tests, for example, `make list ARGS='--filter "FullyQualifiedName~LoggedInUser_CreatesComponent"'`
 	dotnet run \
 		--project ./test/*.Tests.csproj \
 		--list-tests \

From 4c2299487f45bf68b17775dc032c5a6c300c91aa Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 13 May 2026 16:41:48 +0200
Subject: [PATCH 036/145] Add option `null` to nodes param of *List components

---
 frontend/components/data/calorimetric/CalorimetricDataList.tsx  | 2 +-
 frontend/components/data/geometric/GeometricDataList.tsx        | 2 +-
 frontend/components/data/hygrothermal/HygrothermalDataList.tsx  | 2 +-
 frontend/components/data/lifeCycle/LifeCycleDataList.tsx        | 2 +-
 frontend/components/data/optical/OpticalDataList.tsx            | 2 +-
 frontend/components/data/photovoltaic/PhotovoltaicDataList.tsx  | 2 +-
 frontend/components/dataFormats/DataFormatList.tsx              | 2 +-
 frontend/components/databases/DatabaseList.tsx                  | 2 +-
 frontend/components/gnuPgKeys/GnuPgKeyList.tsx                  | 2 +-
 frontend/components/institutions/InstitutionList.tsx            | 2 +-
 frontend/components/methods/MethodList.tsx                      | 2 +-
 .../openIdConnect/applications/OpenIdConnectApplicationList.tsx | 2 +-
 .../authorizations/OpenIdConnectAuthorizationList.tsx           | 2 +-
 .../components/openIdConnect/tokens/OpenIdConnectTokenList.tsx  | 2 +-
 frontend/components/users/UserList.tsx                          | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/components/data/calorimetric/CalorimetricDataList.tsx b/frontend/components/data/calorimetric/CalorimetricDataList.tsx
index 9a39f4ce3..68e90fe42 100644
--- a/frontend/components/data/calorimetric/CalorimetricDataList.tsx
+++ b/frontend/components/data/calorimetric/CalorimetricDataList.tsx
@@ -8,7 +8,7 @@ export default function CalorimetricDataList({
   nodes,
 }: {
   loading: boolean;
-  nodes: CalorimetricDataPartialFragment[];
+  nodes: CalorimetricDataPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/data/geometric/GeometricDataList.tsx b/frontend/components/data/geometric/GeometricDataList.tsx
index 355f10f79..721bebe0f 100644
--- a/frontend/components/data/geometric/GeometricDataList.tsx
+++ b/frontend/components/data/geometric/GeometricDataList.tsx
@@ -8,7 +8,7 @@ export default function GeometricDataList({
   nodes,
 }: {
   loading: boolean;
-  nodes: GeometricDataPartialFragment[];
+  nodes: GeometricDataPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/data/hygrothermal/HygrothermalDataList.tsx b/frontend/components/data/hygrothermal/HygrothermalDataList.tsx
index 75dea2140..b54175707 100644
--- a/frontend/components/data/hygrothermal/HygrothermalDataList.tsx
+++ b/frontend/components/data/hygrothermal/HygrothermalDataList.tsx
@@ -8,7 +8,7 @@ export default function HygrothermalDataList({
   nodes,
 }: {
   loading: boolean;
-  nodes: HygrothermalDataPartialFragment[];
+  nodes: HygrothermalDataPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/data/lifeCycle/LifeCycleDataList.tsx b/frontend/components/data/lifeCycle/LifeCycleDataList.tsx
index 7b0000480..1453e0301 100644
--- a/frontend/components/data/lifeCycle/LifeCycleDataList.tsx
+++ b/frontend/components/data/lifeCycle/LifeCycleDataList.tsx
@@ -8,7 +8,7 @@ export default function LifeCycleDataList({
   nodes,
 }: {
   loading: boolean;
-  nodes: LifeCycleDataPartialFragment[];
+  nodes: LifeCycleDataPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/data/optical/OpticalDataList.tsx b/frontend/components/data/optical/OpticalDataList.tsx
index 25ed8009a..076856120 100644
--- a/frontend/components/data/optical/OpticalDataList.tsx
+++ b/frontend/components/data/optical/OpticalDataList.tsx
@@ -9,7 +9,7 @@ export default function OpticalDataList({
   nodes,
 }: {
   loading: boolean;
-  nodes: OpticalDataPartialFragment[];
+  nodes: OpticalDataPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/data/photovoltaic/PhotovoltaicDataList.tsx b/frontend/components/data/photovoltaic/PhotovoltaicDataList.tsx
index c451adb73..01a71e6d9 100644
--- a/frontend/components/data/photovoltaic/PhotovoltaicDataList.tsx
+++ b/frontend/components/data/photovoltaic/PhotovoltaicDataList.tsx
@@ -8,7 +8,7 @@ export default function PhotovoltaicDataList({
   nodes,
 }: {
   loading: boolean;
-  nodes: PhotovoltaicDataPartialFragment[];
+  nodes: PhotovoltaicDataPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/dataFormats/DataFormatList.tsx b/frontend/components/dataFormats/DataFormatList.tsx
index d1e33c3f5..4a6035223 100644
--- a/frontend/components/dataFormats/DataFormatList.tsx
+++ b/frontend/components/dataFormats/DataFormatList.tsx
@@ -8,7 +8,7 @@ export default function DataFormatList({
   nodes,
 }: {
   loading: boolean;
-  nodes: DataFormatsPartialFragment[];
+  nodes: DataFormatsPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/databases/DatabaseList.tsx b/frontend/components/databases/DatabaseList.tsx
index c439bdb2d..ed8e652af 100644
--- a/frontend/components/databases/DatabaseList.tsx
+++ b/frontend/components/databases/DatabaseList.tsx
@@ -8,7 +8,7 @@ export default function DatabaseList({
   nodes,
 }: {
   loading: boolean;
-  nodes: DatabasesPartialFragment[];
+  nodes: DatabasesPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/gnuPgKeys/GnuPgKeyList.tsx b/frontend/components/gnuPgKeys/GnuPgKeyList.tsx
index 4f6508c82..699256858 100644
--- a/frontend/components/gnuPgKeys/GnuPgKeyList.tsx
+++ b/frontend/components/gnuPgKeys/GnuPgKeyList.tsx
@@ -8,7 +8,7 @@ export default function GnuPgKeyList({
   nodes,
 }: {
   loading: boolean;
-  nodes: GnuPgKeyFingerprintsPartialFragment[];
+  nodes: GnuPgKeyFingerprintsPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/institutions/InstitutionList.tsx b/frontend/components/institutions/InstitutionList.tsx
index 570c8fad5..892c8f512 100644
--- a/frontend/components/institutions/InstitutionList.tsx
+++ b/frontend/components/institutions/InstitutionList.tsx
@@ -8,7 +8,7 @@ export default function InstitutionList({
   nodes,
 }: {
   loading: boolean;
-  nodes: InstitutionsPartialFragment[];
+  nodes: InstitutionsPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/methods/MethodList.tsx b/frontend/components/methods/MethodList.tsx
index 238603db5..11d940ccb 100644
--- a/frontend/components/methods/MethodList.tsx
+++ b/frontend/components/methods/MethodList.tsx
@@ -8,7 +8,7 @@ export default function MethodList({
   nodes,
 }: {
   loading: boolean;
-  nodes: MethodsPartialFragment[];
+  nodes: MethodsPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationList.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationList.tsx
index 7154f261e..6626f84db 100644
--- a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationList.tsx
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationList.tsx
@@ -8,7 +8,7 @@ export default function OpenIdConnectApplicationList({
   nodes,
 }: {
   loading: boolean;
-  nodes: OpenIdConnectApplicationsPartialFragment[];
+  nodes: OpenIdConnectApplicationsPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationList.tsx b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationList.tsx
index a2d73e208..73d2b71fa 100644
--- a/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationList.tsx
+++ b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationList.tsx
@@ -8,7 +8,7 @@ export default function OpenIdConnectAuthorizationList({
   nodes,
 }: {
   loading: boolean;
-  nodes: OpenIdConnectAuthorizationsPartialFragment[];
+  nodes: OpenIdConnectAuthorizationsPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx
index 48f9f2b26..d68f39518 100644
--- a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx
+++ b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx
@@ -8,7 +8,7 @@ export default function OpenIdConnectTokenList({
   nodes,
 }: {
   loading: boolean;
-  nodes: OpenIdConnectTokensPartialFragment[];
+  nodes: OpenIdConnectTokensPartialFragment[] | null;
 }) {
   return (
     <EntityList
diff --git a/frontend/components/users/UserList.tsx b/frontend/components/users/UserList.tsx
index 01bcdb9d0..3a84cede3 100644
--- a/frontend/components/users/UserList.tsx
+++ b/frontend/components/users/UserList.tsx
@@ -8,7 +8,7 @@ export default function UserList({
   nodes,
 }: {
   loading: boolean;
-  nodes: UsersPartialFragment[];
+  nodes: UsersPartialFragment[] | null;
 }) {
   return (
     <EntityList

From 54156f3e230a7c895bff2507a92232589fac0fd9 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 13 May 2026 17:59:47 +0200
Subject: [PATCH 037/145] Show labels for prefilled initial values like
 manager, owner, manufacturer, ...

---
 frontend/components/JumpToId.tsx              |  2 -
 frontend/components/PaginatedIdSelect.tsx     | 26 ++++++----
 .../components/components/CreateComponent.tsx | 29 ++++++-----
 .../dataFormats/CreateDataFormat.tsx          | 17 +++---
 .../dataFormats/DataFormatSummary.tsx         |  8 +--
 .../components/databases/CreateDatabase.tsx   | 13 ++---
 .../institutions/CreateInstitution.tsx        | 35 ++++++++-----
 .../components/institutions/Institution.tsx   | 24 ++++-----
 .../RepresentedInstitutionIdSelect.tsx        | 17 +++---
 frontend/components/methods/CreateMethod.tsx  | 52 ++++++++++++-------
 .../CreateOpenIdConnectApplication.tsx        | 18 ++++---
 frontend/pages/institutions/index.tsx         |  4 +-
 12 files changed, 141 insertions(+), 104 deletions(-)

diff --git a/frontend/components/JumpToId.tsx b/frontend/components/JumpToId.tsx
index 093b5fdea..5356e671d 100644
--- a/frontend/components/JumpToId.tsx
+++ b/frontend/components/JumpToId.tsx
@@ -27,7 +27,6 @@ export default function JumpToId({ query, route, style }: JumpToIdProps) {
       {/* 36 characters is what a UUID of the form "ffffffff-ffff-ffff-ffff-ffffffffffff" has */}
       {query ? (
         <PaginatedIdSelect
-          value={id}
           query={query}
           style={{ minWidth: "66ch", ...style }}
           onChange={setId}
@@ -37,7 +36,6 @@ export default function JumpToId({ query, route, style }: JumpToIdProps) {
           placeholder="ID"
           style={{ fontFamily: "monospace", minWidth: "66ch", ...style }}
           maxLength={36}
-          value={id}
           onChange={(e) => setId(e.target.value)}
         />
       )}
diff --git a/frontend/components/PaginatedIdSelect.tsx b/frontend/components/PaginatedIdSelect.tsx
index 6e8d17644..f15146a50 100644
--- a/frontend/components/PaginatedIdSelect.tsx
+++ b/frontend/components/PaginatedIdSelect.tsx
@@ -10,6 +10,18 @@ import Id from "./Id";
 
 // Inspired by https://ant.design/components/select/#components-select-demo-select-users
 
+export const createPaginatedIdSelectOption = (entity: {
+  uuid: Scalars["Uuid"]["output"];
+  name: string;
+}) => ({
+  label: (
+    <span>
+      {entity.name} (<Id value={entity.uuid} />)
+    </span>
+  ),
+  value: entity.uuid,
+});
+
 interface PageInfo {
   endCursor: string | null;
   hasNextPage: boolean;
@@ -34,7 +46,10 @@ interface ItemsVariables {
   order?: { name?: SortEnumType };
 }
 
-interface BaseProps extends SelectProps {
+interface BaseProps extends Pick<
+  SelectProps,
+  "value" | "onChange" | "labelInValue" | "style"
+> {
   query: TypedDocumentNode<any, ItemsVariables>;
 }
 
@@ -128,14 +143,7 @@ export default function PaginatedIdSelect({
         });
       }}
       loading={loading}
-      options={edges?.map(({ node }) => ({
-        label: (
-          <span>
-            {node.name} (<Id value={node.uuid} />)
-          </span>
-        ),
-        value: node.uuid,
-      }))}
+      options={edges?.map(({ node }) => createPaginatedIdSelectOption(node))}
       maxTagCount="responsive"
       // 36 characters is what a UUID of the form "ffffffff-ffff-ffff-ffff-ffffffffffff" has
       style={style}
diff --git a/frontend/components/components/CreateComponent.tsx b/frontend/components/components/CreateComponent.tsx
index 023831aa3..befa23f46 100644
--- a/frontend/components/components/CreateComponent.tsx
+++ b/frontend/components/components/CreateComponent.tsx
@@ -21,6 +21,7 @@ import NewButton from "../NewButton";
 import ComponentSummary from "./ComponentSummary";
 import RepresentedInstitutionIdSelect from "../institutions/RepresentedInstitutionIdSelect";
 import EnumSelect from "../EnumSelect";
+import { createPaginatedIdSelectOption } from "../PaginatedIdSelect";
 
 type FormValues = {
   name: string;
@@ -34,18 +35,18 @@ type FormValues = {
   primeSurface: DescriptionOrReferenceInput | null | undefined;
   primeDirection: DescriptionOrReferenceInput | null | undefined;
   switchableLayers: DescriptionOrReferenceInput | null | undefined;
-  manufacturerId: Scalars["Uuid"]["input"];
-  managerId: Scalars["Uuid"]["input"];
+  manufacturerId: { value: Scalars["Uuid"]["input"]; label: string };
+  managerId: { value: Scalars["Uuid"]["input"]; label: string };
 };
 
 interface CreateComponentProps {
-  initialManagerId: Scalars["Uuid"]["input"];
-  initialManufacturerId: Scalars["Uuid"]["input"];
+  initialManager: { uuid: Scalars["Uuid"]["input"]; name: string };
+  initialManufacturer: { uuid: Scalars["Uuid"]["input"]; name: string };
 }
 
 export default function CreateComponent({
-  initialManagerId,
-  initialManufacturerId,
+  initialManager,
+  initialManufacturer,
 }: CreateComponentProps) {
   const [open, setOpen] = useState(false);
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
@@ -106,8 +107,8 @@ export default function CreateComponent({
               primeSurface: values.primeSurface,
               primeDirection: values.primeDirection,
               switchableLayers: values.switchableLayers,
-              managerId: values.managerId,
-              manufacturerId: values.manufacturerId,
+              managerId: values.managerId.value,
+              manufacturerId: values.manufacturerId.value,
             },
           },
         });
@@ -127,7 +128,9 @@ export default function CreateComponent({
               showProgress: true,
               pauseOnHover: true,
               duration: 0,
-              description: <ComponentSummary hideInputControls entity={model} />,
+              description: (
+                <ComponentSummary hideInputControls entity={model} />
+              ),
             });
           }
         },
@@ -204,17 +207,17 @@ export default function CreateComponent({
             label="Manufacturer"
             name="manufacturerId"
             rules={[{ required: true }]}
-            initialValue={initialManufacturerId}
+            initialValue={createPaginatedIdSelectOption(initialManufacturer)}
           >
-            <InstitutionIdSelect />
+            <InstitutionIdSelect labelInValue />
           </Form.Item>
           <Form.Item
             label="Manager"
             name="managerId"
             rules={[{ required: true }]}
-            initialValue={initialManagerId}
+            initialValue={createPaginatedIdSelectOption(initialManager)}
           >
-            <RepresentedInstitutionIdSelect />
+            <RepresentedInstitutionIdSelect labelInValue />
           </Form.Item>
           <Divider />
           <Form.Item label="Prime Surface">
diff --git a/frontend/components/dataFormats/CreateDataFormat.tsx b/frontend/components/dataFormats/CreateDataFormat.tsx
index c083019f4..38b65fd4e 100644
--- a/frontend/components/dataFormats/CreateDataFormat.tsx
+++ b/frontend/components/dataFormats/CreateDataFormat.tsx
@@ -14,6 +14,7 @@ import DataFormatSummary from "./DataFormatSummary";
 import NewButton from "../NewButton";
 import ReferenceSubform from "../ReferenceSubform";
 import RepresentedInstitutionIdSelect from "../institutions/RepresentedInstitutionIdSelect";
+import { createPaginatedIdSelectOption } from "../PaginatedIdSelect";
 
 type FormValues = {
   name: string;
@@ -22,15 +23,15 @@ type FormValues = {
   mediaType: string;
   schemaLocator: Scalars["Url"]["input"] | null | undefined;
   reference: ReferenceInput | null | undefined;
-  managerId: Scalars["Uuid"]["input"];
+  managerId: { value: Scalars["Uuid"]["input"]; label: string };
 };
 
 interface CreateDataFormatProps {
-  initialManagerId: Scalars["Uuid"]["input"];
+  initialManager: { uuid: Scalars["Uuid"]["input"]; name: string };
 }
 
 export default function CreateDataFormat({
-  initialManagerId,
+  initialManager,
 }: CreateDataFormatProps) {
   const [open, setOpen] = useState(false);
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
@@ -72,7 +73,7 @@ export default function CreateDataFormat({
               mediaType: values.mediaType,
               schemaLocator: values.schemaLocator,
               reference: values.reference,
-              managerId: values.managerId,
+              managerId: values.managerId.value,
             },
           },
         });
@@ -96,7 +97,9 @@ export default function CreateDataFormat({
                 width: "max-content",
                 minWidth: "384px",
               },
-              description: <DataFormatSummary hideInputControls entity={model} />,
+              description: (
+                <DataFormatSummary hideInputControls entity={model} />
+              ),
             });
           }
         },
@@ -196,9 +199,9 @@ export default function CreateDataFormat({
             label="Manager"
             name="managerId"
             rules={[{ required: true }]}
-            initialValue={initialManagerId}
+            initialValue={createPaginatedIdSelectOption(initialManager)}
           >
-            <RepresentedInstitutionIdSelect />
+            <RepresentedInstitutionIdSelect labelInValue />
           </Form.Item>
           <Divider />
           <ReferenceSubform form={form} namespace={["reference"]} />
diff --git a/frontend/components/dataFormats/DataFormatSummary.tsx b/frontend/components/dataFormats/DataFormatSummary.tsx
index ba4d4d343..899c7f849 100644
--- a/frontend/components/dataFormats/DataFormatSummary.tsx
+++ b/frontend/components/dataFormats/DataFormatSummary.tsx
@@ -22,9 +22,11 @@ export default function DataFormatSummary({
       entity={entity}
       route={paths.dataFormat}
       tags={[
-        <Tag key="extension" style={{ fontWeight: "normal" }}>
-          <Tooltip title="File Extension">*.{entity.extension}</Tooltip>
-        </Tag>,
+        entity.extension && (
+          <Tag key="extension" style={{ fontWeight: "normal" }}>
+            <Tooltip title="File Extension">*.{entity.extension}</Tooltip>
+          </Tag>
+        ),
         <Tag key="mediaType" style={{ fontWeight: "normal" }}>
           <Tooltip title="Open Media-Type Specification">
             <Typography.Link
diff --git a/frontend/components/databases/CreateDatabase.tsx b/frontend/components/databases/CreateDatabase.tsx
index 69ed31f87..cb49f18cc 100644
--- a/frontend/components/databases/CreateDatabase.tsx
+++ b/frontend/components/databases/CreateDatabase.tsx
@@ -14,20 +14,21 @@ import ErrorAlert from "../ErrorAlert";
 import NewButton from "../NewButton";
 import DatabaseSummary from "./DatabaseSummary";
 import RepresentedInstitutionIdSelect from "../institutions/RepresentedInstitutionIdSelect";
+import { createPaginatedIdSelectOption } from "../PaginatedIdSelect";
 
 type FormValues = {
   name: string;
   description: string;
   locator: Scalars["Url"]["input"];
-  operatorId: Scalars["Uuid"]["input"];
+  operatorId: { value: Scalars["Uuid"]["input"]; label: string };
 };
 
 interface CreateDatabaseProps {
-  initialOperatorId: Scalars["Uuid"]["input"];
+  initialOperator: { uuid: Scalars["Uuid"]["input"]; name: string };
 }
 
 export default function CreateDatabase({
-  initialOperatorId,
+  initialOperator,
 }: CreateDatabaseProps) {
   const [open, setOpen] = useState(false);
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
@@ -58,7 +59,7 @@ export default function CreateDatabase({
               name: values.name,
               description: values.description,
               locator: values.locator,
-              operatorId: values.operatorId,
+              operatorId: values.operatorId.value,
             },
           },
         }),
@@ -159,9 +160,9 @@ export default function CreateDatabase({
             label="Operator"
             name="operatorId"
             rules={[{ required: true }]}
-            initialValue={initialOperatorId}
+            initialValue={createPaginatedIdSelectOption(initialOperator)}
           >
-            <RepresentedInstitutionIdSelect />
+            <RepresentedInstitutionIdSelect labelInValue />
           </Form.Item>
           <Form.Item {...tailLayout}>
             <Button type="primary" htmlType="submit" loading={mutating}>
diff --git a/frontend/components/institutions/CreateInstitution.tsx b/frontend/components/institutions/CreateInstitution.tsx
index cd7195285..278aeda57 100644
--- a/frontend/components/institutions/CreateInstitution.tsx
+++ b/frontend/components/institutions/CreateInstitution.tsx
@@ -15,6 +15,7 @@ import InstitutionSummary from "./InstitutionSummary";
 import RepresentedInstitutionIdSelect from "./RepresentedInstitutionIdSelect";
 import { notEmpty } from "../../lib/array";
 import UserIdSelect from "../users/UserIdSelect";
+import { createPaginatedIdSelectOption } from "../PaginatedIdSelect";
 
 type ContactFormValues = {
   phoneNumber: string | null | undefined;
@@ -28,13 +29,19 @@ type FormValues = {
   abbreviation: string | null | undefined;
   description: string;
   contact: ContactFormValues | null | undefined;
-  ownerId: Scalars["Uuid"]["input"] | null | undefined;
-  managerId: Scalars["Uuid"]["input"] | null | undefined;
+  ownerId:
+    | { value: Scalars["Uuid"]["input"]; label: string }
+    | null
+    | undefined;
+  managerId:
+    | { value: Scalars["Uuid"]["input"]; label: string }
+    | null
+    | undefined;
 };
 
 type CreateInstitutionProps =
-  | { initialOwnerId: Scalars["Uuid"]["input"] }
-  | { initialManagerId: Scalars["Uuid"]["input"] };
+  | { initialOwner: { uuid: Scalars["Uuid"]["input"]; name: string } }
+  | { initialManager: { uuid: Scalars["Uuid"]["input"]; name: string } };
 
 export default function CreateInstitution(props: CreateInstitutionProps) {
   const [open, setOpen] = useState(false);
@@ -71,8 +78,8 @@ export default function CreateInstitution(props: CreateInstitutionProps) {
                 emailAddress: values.contact?.emailAddress,
                 websiteLocator: values.contact?.websiteLocator,
               },
-              ownerIds: [values.ownerId].filter(notEmpty),
-              managerId: values.managerId,
+              ownerIds: [values.ownerId?.value].filter(notEmpty),
+              managerId: values.managerId?.value,
             },
           },
         }),
@@ -95,7 +102,9 @@ export default function CreateInstitution(props: CreateInstitutionProps) {
                 width: "max-content",
                 minWidth: "384px",
               },
-              description: <InstitutionSummary hideInputControls entity={model} />,
+              description: (
+                <InstitutionSummary hideInputControls entity={model} />
+              ),
             });
           }
         },
@@ -186,24 +195,24 @@ export default function CreateInstitution(props: CreateInstitutionProps) {
           >
             <Input />
           </Form.Item>
-          {"initialManagerId" in props && (
+          {"initialManager" in props && (
             <Form.Item
               label="Manager"
               name="managerId"
               rules={[{ required: true }]}
-              initialValue={props.initialManagerId}
+              initialValue={createPaginatedIdSelectOption(props.initialManager)}
             >
-              <RepresentedInstitutionIdSelect />
+              <RepresentedInstitutionIdSelect labelInValue />
             </Form.Item>
           )}
-          {"initialOwnerId" in props && (
+          {"initialOwner" in props && (
             <Form.Item
               label="Owner"
               name="ownerId"
               rules={[{ required: true }]}
-              initialValue={props.initialOwnerId}
+              initialValue={createPaginatedIdSelectOption(props.initialOwner)}
             >
-              <UserIdSelect />
+              <UserIdSelect labelInValue />
             </Form.Item>
           )}
           <Form.Item {...tailLayout}>
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index 90bc5dc27..4187bd5b7 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -51,8 +51,8 @@ const getMainTabs = (
           extra={
             institution.managedComponents.isAuthorizedToAddEdge && (
               <CreateComponent
-                initialManagerId={institution.uuid}
-                initialManufacturerId={institution.uuid}
+                initialManager={institution}
+                initialManufacturer={institution}
               />
             )
           }
@@ -74,8 +74,8 @@ const getMainTabs = (
           extra={
             institution.managedMethods.isAuthorizedToAddEdge && (
               <CreateMethod
-                initialManagerId={institution.uuid}
-                initialInstitutionDeveloperIds={[institution.uuid]}
+                initialManager={institution}
+                initialInstitutionDevelopers={[institution]}
               />
             )
           }
@@ -96,7 +96,7 @@ const getMainTabs = (
           order={{ createdAt: SortEnumType.Desc }}
           extra={
             institution.operatedDatabases.isAuthorizedToAddEdge && (
-              <CreateDatabase initialOperatorId={institution.uuid} />
+              <CreateDatabase initialOperator={institution} />
             )
           }
         />
@@ -144,8 +144,8 @@ const getManagedTabs = (
           extra={
             institution.managedComponents.isAuthorizedToAddEdge && (
               <CreateComponent
-                initialManagerId={institution.uuid}
-                initialManufacturerId={institution.uuid}
+                initialManager={institution}
+                initialManufacturer={institution}
               />
             )
           }
@@ -166,7 +166,7 @@ const getManagedTabs = (
           order={{ createdAt: SortEnumType.Desc }}
           extra={
             institution.managedMethods.isAuthorizedToAddEdge && (
-              <CreateMethod initialManagerId={institution.uuid} />
+              <CreateMethod initialManager={institution} />
             )
           }
         />
@@ -186,7 +186,7 @@ const getManagedTabs = (
           order={{ createdAt: SortEnumType.Desc }}
           extra={
             institution.managedDataFormats.isAuthorizedToAddEdge && (
-              <CreateDataFormat initialManagerId={institution.uuid} />
+              <CreateDataFormat initialManager={institution} />
             )
           }
         />
@@ -206,7 +206,7 @@ const getManagedTabs = (
           order={{ createdAt: SortEnumType.Desc }}
           extra={
             institution.managedInstitutions.isAuthorizedToAddEdge && (
-              <CreateInstitution initialManagerId={institution.uuid} />
+              <CreateInstitution initialManager={institution} />
             )
           }
         />
@@ -226,9 +226,7 @@ const getManagedTabs = (
           order={{ createdAt: SortEnumType.Desc }}
           extra={
             institution.openIdConnectApplications.isAuthorizedToAddEdge && (
-              <CreateOpenIdConnectApplication
-                initialOwnerId={institution.uuid}
-              />
+              <CreateOpenIdConnectApplication initialOwner={institution} />
             )
           }
         />
diff --git a/frontend/components/institutions/RepresentedInstitutionIdSelect.tsx b/frontend/components/institutions/RepresentedInstitutionIdSelect.tsx
index 6db1f4e29..8d65f8ece 100644
--- a/frontend/components/institutions/RepresentedInstitutionIdSelect.tsx
+++ b/frontend/components/institutions/RepresentedInstitutionIdSelect.tsx
@@ -1,22 +1,19 @@
 import { useQuery } from "@apollo/client/react";
 import { CurrentUserDocument } from "../../queries/currentUser.generated";
 import { Select, SelectProps } from "antd";
-import Id from "../Id";
+import { createPaginatedIdSelectOption } from "../PaginatedIdSelect";
 
-export default function RepresentedInstitutionIdSelect(props: SelectProps) {
+export default function RepresentedInstitutionIdSelect(
+  props: Omit<SelectProps, "options">,
+) {
   const currentUser = useQuery(CurrentUserDocument)?.data?.currentUser;
 
   return (
     <Select
       {...props}
-      options={currentUser?.representedInstitutions.edges.map((edge) => ({
-        value: edge.node.id,
-        label: (
-          <span>
-            {edge.node.name} (<Id value={edge.node.uuid} />)
-          </span>
-        ),
-      }))}
+      options={currentUser?.representedInstitutions.edges.map(({ node }) =>
+        createPaginatedIdSelectOption(node),
+      )}
     />
   );
 }
diff --git a/frontend/components/methods/CreateMethod.tsx b/frontend/components/methods/CreateMethod.tsx
index 2893229da..1d22e4d08 100644
--- a/frontend/components/methods/CreateMethod.tsx
+++ b/frontend/components/methods/CreateMethod.tsx
@@ -25,6 +25,7 @@ import MethodSummary from "./MethodSummary";
 import NewButton from "../NewButton";
 import RepresentedInstitutionIdSelect from "../institutions/RepresentedInstitutionIdSelect";
 import EnumSelect from "../EnumSelect";
+import { createPaginatedIdSelectOption } from "../PaginatedIdSelect";
 
 type FormValues = {
   name: string;
@@ -42,21 +43,30 @@ type FormValues = {
   parameters: MethodParameterInput[] | null | undefined;
   sources: MethodSourceInput[] | null | undefined;
   categories: MethodCategory[] | null | undefined;
-  institutionDeveloperIds: Scalars["Uuid"]["input"][] | null | undefined;
-  userDeveloperIds: Scalars["Uuid"]["input"][] | null | undefined;
-  managerId: Scalars["Uuid"]["input"];
+  institutionDeveloperIds:
+    | { value: Scalars["Uuid"]["input"]; label: string }[]
+    | null
+    | undefined;
+  userDeveloperIds:
+    | { value: Scalars["Uuid"]["input"]; label: string }[]
+    | null
+    | undefined;
+  managerId: { value: Scalars["Uuid"]["input"]; label: string };
 };
 
 interface CreateMethodProps {
-  initialManagerId: Scalars["Uuid"]["input"];
-  initialInstitutionDeveloperIds?: Scalars["Uuid"]["input"][];
-  initialUserDeveloperIds?: Scalars["Uuid"]["input"][];
+  initialManager: { uuid: Scalars["Uuid"]["input"]; name: string };
+  initialInstitutionDevelopers?: {
+    uuid: Scalars["Uuid"]["input"];
+    name: string;
+  }[];
+  initialUserDevelopers?: { uuid: Scalars["Uuid"]["input"]; name: string }[];
 }
 
 export default function CreateMethod({
-  initialManagerId,
-  initialInstitutionDeveloperIds = [],
-  initialUserDeveloperIds = [],
+  initialManager,
+  initialInstitutionDevelopers = [],
+  initialUserDevelopers = [],
 }: CreateMethodProps) {
   const [open, setOpen] = useState(false);
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
@@ -115,9 +125,11 @@ export default function CreateMethod({
               parameters: values.parameters,
               sources: values.sources,
               categories: values.categories || [],
-              managerId: values.managerId,
-              institutionDeveloperIds: values.institutionDeveloperIds || [],
-              userDeveloperIds: values.userDeveloperIds || [],
+              managerId: values.managerId.value,
+              institutionDeveloperIds:
+                values.institutionDeveloperIds?.map((x) => x.value) || [],
+              userDeveloperIds:
+                values.userDeveloperIds?.map((x) => x.value) || [],
             },
           },
         });
@@ -234,24 +246,28 @@ export default function CreateMethod({
           <Form.Item
             label="Institution Developers"
             name="institutionDeveloperIds"
-            initialValue={initialInstitutionDeveloperIds}
+            initialValue={initialInstitutionDevelopers.map((x) =>
+              createPaginatedIdSelectOption(x),
+            )}
           >
-            <InstitutionIdSelect mode="multiple" />
+            <InstitutionIdSelect labelInValue mode="multiple" />
           </Form.Item>
           <Form.Item
             label="User Developers"
             name="userDeveloperIds"
-            initialValue={initialUserDeveloperIds}
+            initialValue={initialUserDevelopers.map((x) =>
+              createPaginatedIdSelectOption(x),
+            )}
           >
-            <UserIdSelect mode="multiple" />
+            <UserIdSelect labelInValue mode="multiple" />
           </Form.Item>
           <Form.Item
             label="Manager"
             name="managerId"
             rules={[{ required: true }]}
-            initialValue={initialManagerId}
+            initialValue={createPaginatedIdSelectOption(initialManager)}
           >
-            <RepresentedInstitutionIdSelect />
+            <RepresentedInstitutionIdSelect labelInValue />
           </Form.Item>
           <Divider />
           <ReferenceSubform form={form} namespace={["reference"]} />
diff --git a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
index 6b69c472b..82945933c 100644
--- a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
@@ -25,6 +25,7 @@ import paths from "../../../paths";
 import CodeView from "../../CodeView";
 import RepresentedInstitutionIdSelect from "../../institutions/RepresentedInstitutionIdSelect";
 import EnumSelect, { allEnumSelectOptions } from "../../EnumSelect";
+import { createPaginatedIdSelectOption } from "../../PaginatedIdSelect";
 
 type FormValues = {
   clientId: string;
@@ -36,15 +37,15 @@ type FormValues = {
   grantTypes: OpenIdConnectGrantType[];
   responseTypes: OpenIdConnectResponseType[];
   scopes: OpenIdConnectScope[];
-  ownerId: Scalars["Uuid"]["input"];
+  ownerId: { value: Scalars["Uuid"]["input"]; label: string };
 };
 
 interface CreateApplicationProps {
-  initialOwnerId: Scalars["Uuid"]["input"];
+  initialOwner: { uuid: Scalars["Uuid"]["input"]; name: string };
 }
 
 export default function CreateOpenIdConnectApplication({
-  initialOwnerId,
+  initialOwner,
 }: CreateApplicationProps) {
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
@@ -74,7 +75,7 @@ export default function CreateOpenIdConnectApplication({
         createApplicationMutation({
           variables: {
             input: {
-              institutionId: values.ownerId,
+              institutionId: values.ownerId.value,
               clientId: values.clientId,
               displayName: values.displayName,
               consentType: values.consentType,
@@ -122,7 +123,10 @@ export default function CreateOpenIdConnectApplication({
                     .
                   </Typography.Paragraph>
                   <Divider />
-                  <OpenIdConnectApplicationSummary hideInputControls entity={model} />
+                  <OpenIdConnectApplicationSummary
+                    hideInputControls
+                    entity={model}
+                  />
                 </div>
               ),
             });
@@ -265,9 +269,9 @@ export default function CreateOpenIdConnectApplication({
             label="Owner"
             name="ownerId"
             rules={[{ required: true }]}
-            initialValue={initialOwnerId}
+            initialValue={createPaginatedIdSelectOption(initialOwner)}
           >
-            <RepresentedInstitutionIdSelect />
+            <RepresentedInstitutionIdSelect labelInValue />
           </Form.Item>
           <Form.Item {...tailLayout}>
             <Button type="primary" htmlType="submit" loading={mutating}>
diff --git a/frontend/pages/institutions/index.tsx b/frontend/pages/institutions/index.tsx
index 355da7b2f..cba1fcaf5 100644
--- a/frontend/pages/institutions/index.tsx
+++ b/frontend/pages/institutions/index.tsx
@@ -23,9 +23,7 @@ export default function Page() {
       </Typography.Paragraph>
       <PaginatedInstitutions
         showJump
-        extra={
-          currentUser && <CreateInstitution initialOwnerId={currentUser.uuid} />
-        }
+        extra={currentUser && <CreateInstitution initialOwner={currentUser} />}
       />
       <Typography.Paragraph style={{ marginTop: "1em", maxWidth: "75ch" }}>
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}

From fa29ee5ccd178f9d160acb46d6aefed3d6582952 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 13 May 2026 18:32:40 +0200
Subject: [PATCH 038/145] Integrate pending tasks associated with institutions
 directly into user dashboard and show count of pending entities

---
 frontend/components/NavBar.tsx                |  6 +-
 .../components/institutions/Institution.tsx   | 15 +--
 frontend/components/users/User.tsx            | 94 +++++++------------
 frontend/pages/databases/index.tsx            | 19 ++--
 frontend/pages/institutions/index.tsx         | 19 ++--
 frontend/queries/common.graphql               |  9 ++
 frontend/queries/currentUser.graphql          |  6 ++
 frontend/queries/users.graphql                | 18 ++++
 8 files changed, 102 insertions(+), 84 deletions(-)

diff --git a/frontend/components/NavBar.tsx b/frontend/components/NavBar.tsx
index 160a3af9c..b53a8feec 100644
--- a/frontend/components/NavBar.tsx
+++ b/frontend/components/NavBar.tsx
@@ -47,7 +47,11 @@ const userItems = (currentUser: CurrentUserPartialFragment) =>
       children: [
         {
           key: paths.user(currentUser.uuid),
-          label: <Link href={paths.user(currentUser.uuid)}>Profile</Link>,
+          label: (
+            <Link href={paths.user(currentUser.uuid)}>
+              Profile &amp; Dashboard
+            </Link>
+          ),
         },
         {
           key: paths.me.manage.profile,
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index 4187bd5b7..d00b088cf 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -234,8 +234,13 @@ const getManagedTabs = (
     },
   ].filter(isTruthy);
 
-const getPendingTabs = (
-  institution: InstitutionPartialFragment,
+export const getPendingTabsOfInstitution = (
+  institution: Pick<
+    InstitutionPartialFragment,
+    | "uuid"
+    | "pendingManufacturedComponents"
+    | "pendingInstitutionDevelopedMethods"
+  >,
 ): LazyTabsProps["items"] =>
   [
     institution.pendingManufacturedComponents.isAuthorizedToConfirmEdges &&
@@ -315,7 +320,7 @@ export default function Institution({ institutionId }: Props) {
     return {
       main: getMainTabs(institution),
       managed: getManagedTabs(institution),
-      pending: getPendingTabs(institution),
+      pending: getPendingTabsOfInstitution(institution),
     };
   }, [institution]);
 
@@ -353,9 +358,7 @@ export default function Institution({ institutionId }: Props) {
       {tabs?.pending && tabs.pending.length > 0 && (
         <>
           <Divider />
-          <Typography.Title level={4} id="pending-entities">
-            Pending Entities
-          </Typography.Title>
+          <Typography.Title level={4}>Pending Entities</Typography.Title>
           <LazyTabs items={tabs.pending} />
         </>
       )}
diff --git a/frontend/components/users/User.tsx b/frontend/components/users/User.tsx
index d4dd1ef98..61134de58 100644
--- a/frontend/components/users/User.tsx
+++ b/frontend/components/users/User.tsx
@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client/react";
-import { Skeleton, Result, Card, Typography, Divider, Flex } from "antd";
+import { Skeleton, Result, Card, Typography, Divider } from "antd";
 import {
   UserDocument,
   UserPartialFragment,
@@ -12,70 +12,33 @@ import QueryToolbar from "../QueryToolbar";
 import PendingInstitutionList from "../institutions/PendingInstitutionList";
 import {
   CurrentUserDocument,
-  CurrentUserPartialFragment,
+  CurrentUserQuery,
 } from "../../queries/currentUser.generated";
 import PendingDatabaseList from "../databases/PendingDatabaseList";
 import LazyTabs, { LazyTabsProps } from "../LazyTabs";
 import { useMemo } from "react";
-import EntityLink from "../entities/EntityLink";
-import paths from "../../paths";
+import { getPendingTabsOfInstitution } from "../institutions/Institution";
 
-const getPendingTabs = (
-  currentUser: CurrentUserPartialFragment,
+const getPendingTabsOfUser = (
   user: UserPartialFragment,
+  currentUserData?: CurrentUserQuery,
 ): LazyTabsProps["items"] =>
   [
-    currentUser.uuid == user.uuid &&
-      currentUser.representedInstitutions.edges.some(
-        (edge) =>
-          (edge.node.pendingManufacturedComponents.totalCount > 0 &&
-            edge.node.pendingDevelopedMethods.isAuthorizedToConfirmEdges) ||
-          (edge.node.pendingDevelopedMethods.totalCount > 0 &&
-            edge.node.pendingDevelopedMethods.isAuthorizedToConfirmEdges),
-      ) && {
-        key: "represented",
-        label: "Represented Institutions",
-        children: (
-          <Flex vertical gap="middle">
-            {currentUser.representedInstitutions.edges.map((edge) => (
-              <div key={edge.node.id}>
-                The institution{" "}
-                <EntityLink entity={edge.node} route={paths.institution} /> has
-                pending{" "}
-                {[
-                  edge.node.pendingManufacturedComponents.totalCount > 0 &&
-                    edge.node.pendingDevelopedMethods
-                      .isAuthorizedToConfirmEdges &&
-                    "manufactured components",
-                  edge.node.pendingDevelopedMethods.totalCount > 0 &&
-                    edge.node.pendingDevelopedMethods
-                      .isAuthorizedToConfirmEdges &&
-                    "developed methods",
-                ]
-                  .filter(isTruthy)
-                  .join("and")}{" "}
-                that are awaiting confirmation or denial on{" "}
-                <EntityLink
-                  entity={edge.node}
-                  route={(id) => `${paths.institution(id)}#pending-entities`}
-                />
-              </div>
-            ))}
-          </Flex>
-        ),
-      },
-    currentUser.uuid == user.uuid &&
-      user.roles?.includes(UserRole.Verifier) && {
-        key: "institutions",
-        label: "Institutions",
-        children: <PendingInstitutionList />,
-      },
-    currentUser.uuid == user.uuid &&
-      user.roles?.includes(UserRole.Administrator) && {
-        key: "databases",
-        label: "Databases",
-        children: <PendingDatabaseList />,
-      },
+    ...user.representedInstitutions.edges.flatMap(({ node }) =>
+      getPendingTabsOfInstitution(node),
+    ),
+    user.roles?.includes(UserRole.Verifier) && {
+      key: "institutions",
+      label: "Institutions",
+      count: currentUserData?.pendingInstitutions?.totalCount,
+      children: <PendingInstitutionList />,
+    },
+    user.roles?.includes(UserRole.Administrator) && {
+      key: "databases",
+      label: "Databases",
+      count: currentUserData?.pendingDatabases?.totalCount,
+      children: <PendingDatabaseList />,
+    },
   ].filter(isTruthy);
 
 interface UserProps {
@@ -83,7 +46,8 @@ interface UserProps {
 }
 
 export default function User({ userId }: UserProps) {
-  const currentUser = useQuery(CurrentUserDocument)?.data?.currentUser;
+  const currentUserData = useQuery(CurrentUserDocument)?.data;
+  const currentUser = currentUserData?.currentUser;
 
   const queryVariables = {
     uuid: userId,
@@ -94,10 +58,18 @@ export default function User({ userId }: UserProps) {
   useQueryHandler({ error });
   const user = data?.user;
 
+  const showInputControls =
+    (currentUser &&
+      user &&
+      (currentUser.uuid == user.uuid ||
+        currentUser.roles?.includes(UserRole.Administrator))) ??
+    false;
+
   const pendingTabs = useMemo(() => {
-    if (!currentUser || !user) return null;
-    return getPendingTabs(currentUser, user);
-  }, [currentUser, user]);
+    return showInputControls && user
+      ? getPendingTabsOfUser(user, currentUserData)
+      : null;
+  }, [showInputControls, user, currentUserData]);
 
   if (loading) {
     return <Skeleton active avatar title />;
diff --git a/frontend/pages/databases/index.tsx b/frontend/pages/databases/index.tsx
index f15270f74..d21eaa0d1 100644
--- a/frontend/pages/databases/index.tsx
+++ b/frontend/pages/databases/index.tsx
@@ -9,7 +9,8 @@ import { UserRole } from "../../__generated__/graphql";
 import PaginatedDatabases from "../../components/databases/PaginatedDatabases";
 
 export default function Page() {
-  const currentUser = useQuery(CurrentUserDocument)?.data?.currentUser;
+  const currentUserData = useQuery(CurrentUserDocument)?.data;
+  const currentUser = currentUserData?.currentUser;
 
   return (
     <Layout>
@@ -24,13 +25,15 @@ export default function Page() {
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         provides all information about databases.
       </Typography.Paragraph>
-      {currentUser?.roles?.includes(UserRole.Administrator) && (
-        <div>
-          <Divider />
-          <Typography.Title level={4}>Pending Databases</Typography.Title>
-          <PendingDatabaseList />
-        </div>
-      )}
+      {currentUser?.roles?.includes(UserRole.Administrator) &&
+        currentUserData?.pendingDatabases &&
+        currentUserData.pendingDatabases.totalCount > 0 && (
+          <div>
+            <Divider />
+            <Typography.Title level={4}>Pending Databases</Typography.Title>
+            <PendingDatabaseList />
+          </div>
+        )}
     </Layout>
   );
 }
diff --git a/frontend/pages/institutions/index.tsx b/frontend/pages/institutions/index.tsx
index cba1fcaf5..783fc8f64 100644
--- a/frontend/pages/institutions/index.tsx
+++ b/frontend/pages/institutions/index.tsx
@@ -10,7 +10,8 @@ import PaginatedInstitutions from "../../components/institutions/PaginatedInstit
 import CreateInstitution from "../../components/institutions/CreateInstitution";
 
 export default function Page() {
-  const currentUser = useQuery(CurrentUserDocument)?.data?.currentUser;
+  const currentUserData = useQuery(CurrentUserDocument)?.data;
+  const currentUser = currentUserData?.currentUser;
 
   return (
     <Layout>
@@ -29,13 +30,15 @@ export default function Page() {
         The <Typography.Link href="/graphql/">GraphQL endpoint</Typography.Link>{" "}
         provides all information about institutions.
       </Typography.Paragraph>
-      {currentUser?.roles?.includes(UserRole.Verifier) && (
-        <div>
-          <Divider />
-          <Typography.Title level={4}>Pending Institutions</Typography.Title>
-          <PendingInstitutionList />
-        </div>
-      )}
+      {currentUser?.roles?.includes(UserRole.Verifier) &&
+        currentUserData?.pendingInstitutions &&
+        currentUserData.pendingInstitutions.totalCount > 0 && (
+          <div>
+            <Divider />
+            <Typography.Title level={4}>Pending Institutions</Typography.Title>
+            <PendingInstitutionList />
+          </div>
+        )}
     </Layout>
   );
 }
diff --git a/frontend/queries/common.graphql b/frontend/queries/common.graphql
index b9fcb41b4..f748a8a42 100644
--- a/frontend/queries/common.graphql
+++ b/frontend/queries/common.graphql
@@ -39,3 +39,12 @@ fragment DescriptionOrReferencePartial on DescriptionOrReference {
     ...ReferencePartial
   }
 }
+
+query PendingEntityCounts {
+  pendingDatabases {
+    totalCount
+  }
+  pendingInstitutions {
+    totalCount
+  }
+}
diff --git a/frontend/queries/currentUser.graphql b/frontend/queries/currentUser.graphql
index 934a368e5..392075125 100644
--- a/frontend/queries/currentUser.graphql
+++ b/frontend/queries/currentUser.graphql
@@ -33,6 +33,12 @@ query CurrentUser {
   currentUser {
     ...CurrentUserPartial
   }
+  pendingDatabases {
+    totalCount
+  }
+  pendingInstitutions {
+    totalCount
+  }
 }
 
 mutation LoginUser($input: LoginUserInput!) {
diff --git a/frontend/queries/users.graphql b/frontend/queries/users.graphql
index ba722448b..1262f557d 100644
--- a/frontend/queries/users.graphql
+++ b/frontend/queries/users.graphql
@@ -63,6 +63,24 @@ fragment UserPartial on User {
         id
         uuid
         name
+        pendingManufacturedComponents {
+          totalCount
+          edges {
+            node {
+              ...ComponentsPartial
+            }
+          }
+          isAuthorizedToConfirmEdges
+        }
+        pendingInstitutionDevelopedMethods: pendingDevelopedMethods {
+          totalCount
+          edges {
+            node {
+              ...MethodsPartial
+            }
+          }
+          isAuthorizedToConfirmEdges
+        }
       }
       role
       isAuthorizedToRemoveEdge

From 9390620dc36cd2a8e3e3d5f441f63db538510a18 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 13 May 2026 18:37:48 +0200
Subject: [PATCH 039/145] Remove unused query

---
 frontend/queries/common.graphql | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/frontend/queries/common.graphql b/frontend/queries/common.graphql
index f748a8a42..b9fcb41b4 100644
--- a/frontend/queries/common.graphql
+++ b/frontend/queries/common.graphql
@@ -39,12 +39,3 @@ fragment DescriptionOrReferencePartial on DescriptionOrReference {
     ...ReferencePartial
   }
 }
-
-query PendingEntityCounts {
-  pendingDatabases {
-    totalCount
-  }
-  pendingInstitutions {
-    totalCount
-  }
-}

From e62cf571e85787de4aa2cc12780bbc67ed6c45ec Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 13 May 2026 19:30:02 +0200
Subject: [PATCH 040/145] Reformulate some procedures necessary to use a
 production backup in staging, simplify one SQL query, and do minor layout
 improvements

---
 README.md | 94 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 54 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index d4ca61833..f3cdec48a 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ When doing so, please adhere to our
    - OpenAPI reference at `https://www.local.buildingenvelopedata.org:${HTTPS_PORT}/openapi/docs/`,
    - dummy email server at `https://www.local.buildingenvelopedata.org:${HTTPS_PORT}/email/`
      (to view for example the confirmation email sent during registration),
-   - OpenId Connect configuration at
+   - OpenID Connect configuration at
      `https://www.local.buildingenvelopedata.org:${HTTPS_PORT}/.well-known/openid-configuration`,
    - telemetry web frontend at `https://telemetry.local.buildingenvelopedata.org:${HTTPS_PORT}`,
    - staging web frontend at `https://staging.local.buildingenvelopedata.org:${HTTPS_PORT}`,
@@ -282,16 +282,16 @@ and the pages following it.
         on a build or development machine and pushed to the server later with
         GNU Make targets from `./forge.mk`;
       - `HOST` is the domain name with sub-domain of the deployment, in
-        particular, it is used by the OpenId Connect provider and to make
+        particular, it is used by the OpenID Connect provider and to make
         URLs absolute in emails sent for example when a user registers;
       - `HTTP_PORT` is the HTTP port on which the reverse proxy NGINX listens
         for requests;
       - `BOOTSTRAP_USER_PASSWORD` is the password used by the database seeder
         for the administrator account if there is none yet;
-      - `OPEN_ID_CONNECT_CLIENT_SECRET` is the OpenId Connect client secret of
+      - `OPEN_ID_CONNECT_CLIENT_SECRET` is the OpenID Connect client secret of
         the metabase as a client of itself as identity provider;
       - `TESTLAB_SOLAR_FACADES_HOST` is the host with sub-domain of the TestLab
-        Solar Façades used by the database seeder to add it as an OpenId
+        Solar Façades used by the database seeder to add it as an OpenID
         Connect client;
       - `TESTLAB_SOLAR_FACADES_OPEN_ID_CONNECT_CLIENT_SECRET` is the
         corresponding client secret;
@@ -363,43 +363,57 @@ and the pages following it.
 1. Deploy the new release in the staging environment by running
    `./deploy.mk do TARGET=${TAG}`, where `${TAG}` is
    the release tag to be deployed, for example, `v1.0.0`.
-1. If it fails _after_ the database backup was made, rollback to the previous
-   state by running
-   `./deploy.mk rollback`,
-   figure out what went wrong, apply the necessary fixes to the codebase,
-   create a new release, and try to deploy that release instead.
+1. If it fails rollback to the previous state by running
+   `./deploy.mk rollback`, figure out what went wrong, apply the necessary
+   fixes to the codebase, create a new release, and try to deploy that release
+   instead.
 1. If it succeeds, deploy the new reverse proxy that handles sub-domains by
    running `cd /app/machine && ./deploy.mk do` and test whether everything works
    as expected and if that is the case, continue.
-   - Note that in the
-   staging environment sent emails can be viewed in the web browser under
-   `https://staging.buildingenvelopedata.org/email/` and emails to addresses in
-   the variable `RELAY_ALLOWED_EMAILS` in `./.env` are delivered to the
-   respective inboxes (the variable's value is a comma separated list of email
-   addresses). 
-   - Note that in order for OpenId Connect to work as expected in
-   staging, make sure that the redirect URIs use the sub-domain `staging`
-   (instead of `www`) by entering `psql` with `./database.mk psql`, examining
-   the output of the SQL statement
-   `select * from metabase."OpenIddictApplications";`
-   and if necessary executing SQL statements along the lines
-   `update metabase."OpenIddictApplications" set "RedirectUris"='["https://staging.buildingenvelopedata.org/connect/callback/login/metabase"]', "PostLogoutRedirectUris"='["https://staging.buildingenvelopedata.org/connect/callback/logout/metabase"]' where "ClientId"='metabase';`
-   and
-   `update metabase."OpenIddictApplications" set "RedirectUris"='["https://staging.solarbuildingenvelopes.com/connect/callback/login/metabase"]', "PostLogoutRedirectUris"='["https://staging.solarbuildingenvelopes.com/connect/callback/logout/metabase"]' where "ClientId"='testlab-solar-facades';`
-   - Verify that the resource `rsrc` is set correctly. You can update it with 
-   `update metabase."OpenIddictApplications" set "Permissions"='["ept:authorization","ept:end_session","ept:introspection","ept:pushed_authorization","ept:revocation","ept:token","rst:code","rst:id_token","rst:token","gt:authorization_code","gt:client_credentials","gt:refresh_token","gt:urn:ietf:params:oauth:grant-type:token-exchange","scp:address","scp:email","scp:phone","scp:profile","scp:roles","scp:api:read","scp:api:write","scp:api:administrate","scp:api:verify","scp:api:database:manage","scp:api:gnu_pg:manage","scp:api:institution_representative:manage","scp:api:open_id_connect:manage","scp:api:user:manage","aud:metabase","rsrc:https://staging.buildingenvelopedata.org/graphql/"]' where "ClientId"='metabase';`
+   - In the staging environment sent emails can be viewed in the web browser
+     under `https://staging.buildingenvelopedata.org/email/` and emails to
+     addresses in the variable `RELAY_ALLOWED_EMAILS` in `./.env` are delivered
+     to the respective inboxes (the variable's value is a comma separated list of
+     email addresses).
+
    - If you want the staging environment to forward queries to the staging
-   environments of product-data databases, then examine the output of the SQL
-   statement `select * from metabase.database;` and if necessary execute SQL
-   statements along the lines
-   `update metabase.database set "Locator"='https://staging.solarbuildingenvelopes.com/graphql/' where "Locator"='https://www.solarbuildingenvelopes.com/graphql/';`
-   and
-   `update metabase.database set "Locator"='https://igsdb-v2-staging.herokuapp.com/graphql/' where "Locator"='https://igsdb-v2.herokuapp.com/graphql/';`
-   - The client credentials of the metabase may be invalid. In this case, copy
-   the `OPEN_ID_CONNECT_CLIENT_SECRET` from `/app/production/.env` into
-   `/app/staging/.env`. Do the same in your deployment of the repository
-   `database`, because the backup from production includes an encrypted version
-   of that `OPEN_ID_CONNECT_CLIENT_SECRET`, too.
+     environments of product-data databases, then examine the output of the SQL
+     statement `select * from metabase.database;` and if necessary execute SQL
+     statements along the lines
+
+     ```
+     update metabase.database set "Locator" = 'https://staging.solarbuildingenvelopes.com/graphql/' where "Locator" = 'https://www.solarbuildingenvelopes.com/graphql/';
+     update metabase.database set "Locator" = 'https://igsdb-v2-staging.herokuapp.com/graphql/' where "Locator" = 'https://igsdb-v2.herokuapp.com/graphql/';
+     ```
+
+   - In order for OpenID Connect to work in staging,
+     - replace `OPEN_ID_CONNECT_CLIENT_SECRET` in `/app/staging/.env` by the
+       respective value in `/app/production/.env` and run `make up` to recreate
+       Docker compose services which depend on that value. If you have a
+       staging deployment of a
+       [product-data database](https://github.com/building-envelope-data/database)
+       that communicates with the staging deployment of the metabase, then
+       replace `OPEN_ID_CONNECT_CLIENT_SECRET` there also. Both changes are
+       necessary to make the OpenID Connect clients in metabase and product-data
+       database use the client secret whose hash value is stored in the metabase;
+
+     - make sure that the redirect URIs and resource permissions use the
+       sub-domain `staging` (instead of `www`) by entering `psql` with
+       `./database.mk psql`, examining the output of the SQL statement
+       `select * from metabase."OpenIddictApplications";`
+       and, if necessary, executing SQL statements along the lines
+
+       ```
+       update metabase."OpenIddictApplications" set "RedirectUris" = '["https://staging.buildingenvelopedata.org/connect/callback/login/metabase"]', "PostLogoutRedirectUris" = '["https://staging.buildingenvelopedata.org/connect/callback/logout/metabase"]' where "ClientId" = 'metabase';
+       update metabase."OpenIddictApplications" set "RedirectUris" = '["https://staging.solarbuildingenvelopes.com/connect/callback/login/metabase"]', "PostLogoutRedirectUris" = '["https://staging.solarbuildingenvelopes.com/connect/callback/logout/metabase"]' where "ClientId" = 'testlab-solar-facades';
+       ```
+
+       and
+
+       ```
+       update metabase."OpenIddictApplications" set "Permissions" = ("Permissions"::jsonb - 'rsrc:https://www.buildingenvelopedata.org/graphql/' || '"rsrc:https://staging.buildingenvelopedata.org/graphql/"'::jsonb)::text where "ClientId" = 'metabase';
+       ```
+
 1. Change to the production environment by running `cd /app/production`.
 1. Adapt the environment file `./.env` if necessary by comparing it with the
    `./.env.production.sample` file of the release to be deployed.
@@ -514,7 +528,7 @@ calculations.
 The access right management of the product data network is based on the
 framework [OpenID Connect](https://openid.net/developers/how-connect-works/).
 The general idea is that users and applications can authenticate at the
-metabase (OpenId Connect Provider) and receive an access token (security
+metabase (OpenID Connect Provider) and receive an access token (security
 credentials). When an application sends queries and mutations to product data
 servers, it can attach the token. The product data server receives the token
 and determines the access rights accordingly (authorization) using information
@@ -565,11 +579,11 @@ data server, please
    to your institution. For `${UUID_OF_YOUR_INSTITUTION}` please use the UUID
    which your institution has received when it was created.
 
-1. equip your product data server with an OpenId Connect Client partly configuring
+1. equip your product data server with an OpenID Connect Client partly configuring
    it via OpenID Connect Discovery using the [Well-Known Configuration
    Endpoint](https://www.buildingenvelopedata.org/.well-known/openid-configuration).
 
-When adding an OpenId Connect Application, you need to make various decisions:
+When adding an OpenID Connect Application, you need to make various decisions:
 [Which OAuth 2.0 Flow Should
 I Use?](https://auth0.com/docs/get-started/authentication-and-authorization-flow/which-oauth-2-0-flow-should-i-use)
 We support the [Authorization Code Flow with Pushed Authorization Requests

From 0573b68cecb96bd17aaa962c6746b73e20338468 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 13 May 2026 20:37:54 +0200
Subject: [PATCH 041/145] Allow all OpenID Connect consent types to be set by
 administrators (other users still can only use `explicit`)

---
 .../src/Authorization/CommonAuthorization.cs  |   13 +
 backend/src/Data/DbSeeder.cs                  |    6 +-
 .../GraphQl/Components/ComponentMutations.cs  |   39 +-
 ...CreateOpenIdConnectApplicationErrorCode.cs |    1 +
 .../CreateOpenIdConnectApplicationPayload.cs  |    8 +
 .../OpenIdConnectApplicationMutations.cs      |   30 +-
 .../Applications/OpenIdConnectConsentType.cs  |    3 +
 .../OpenIdConnectConsentTypeExtensions.cs     |    6 +
 ...UpdateOpenIdConnectApplicationErrorCode.cs |    3 +-
 .../OpenIdConnect/OpenIdConnectScope.cs       |    6 +-
 ...eOpenIdConnectClientToImplicit.Designer.cs | 2298 +++++++++++++++++
 ...OfMetabaseOpenIdConnectClientToImplicit.cs |   32 +
 .../ApplicationDbContextModelSnapshot.cs      |    2 +-
 backend/src/Migrations/migrate.sql            |   21 +
 ...fMetabaseOpenIdConnectClientToImplicit.sql |   20 +
 ...MetabaseOpenIdConnectClientApplication.sql |   21 +
 .../GraphQlSchemaTests.IsUnchanged.snap       |    9 +-
 frontend/components/EnumSelect.tsx            |    8 +-
 .../CreateOpenIdConnectApplication.tsx        |   10 +-
 .../UpdateOpenIdConnectApplication.tsx        |   10 +-
 frontend/type-defs.graphqls                   |    8 +
 21 files changed, 2522 insertions(+), 32 deletions(-)
 create mode 100644 backend/src/Migrations/20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.Designer.cs
 create mode 100644 backend/src/Migrations/20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.cs
 create mode 100644 backend/src/Migrations/migrate_from_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication_to_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.sql
 create mode 100644 backend/src/Migrations/rollback_from_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit_to_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.sql

diff --git a/backend/src/Authorization/CommonAuthorization.cs b/backend/src/Authorization/CommonAuthorization.cs
index 10f4980ff..add0f7333 100644
--- a/backend/src/Authorization/CommonAuthorization.cs
+++ b/backend/src/Authorization/CommonAuthorization.cs
@@ -107,6 +107,19 @@ Guid userId
         return user.Id == userId;
     }
 
+    public Task<bool> CanAdministrate(
+        ClaimsPrincipal claimsPrincipal,
+        CancellationToken cancellationToken
+    )
+    {
+        return AuthorizeAsync(
+            claimsPrincipal,
+            user => CanAdministrate(user, claimsPrincipal),
+            application => Task.FromResult(false),
+            cancellationToken
+        );
+    }
+
     public async Task<bool> CanAdministrate(
         User user,
         ClaimsPrincipal claimsPrincipal
diff --git a/backend/src/Data/DbSeeder.cs b/backend/src/Data/DbSeeder.cs
index d85293c35..ae0c0c40f 100644
--- a/backend/src/Data/DbSeeder.cs
+++ b/backend/src/Data/DbSeeder.cs
@@ -497,7 +497,7 @@ AppSettings appSettings
                 ClientId = OpenIdConnectConstants.Client.MetabaseClientId,
                 ClientSecret = null,
                 ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
-                DisplayName = "Metabase client application",
+                DisplayName = "Metabase",
                 RedirectUris =
                 {
                     new UriBuilder(host) { Path = "/connect/callback/login/metabase" }.Uri
@@ -553,7 +553,7 @@ AppSettings appSettings
                 ClientId = DataConstants.TestlabSolarFacadesOpenIdConnectClientId,
                 ClientSecret = null,
                 ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
-                DisplayName = "Testlab-Solar-Facades client application",
+                DisplayName = "TestLab Solar Façades",
                 RedirectUris =
                     {
                         new UriBuilder(host) { Path = "/connect/callback/login/metabase" }.Uri
@@ -607,7 +607,7 @@ AppSettings appSettings
                 ClientId = DataConstants.IgsdbOpenIdConnectClientId,
                 ClientSecret = null,
                 ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
-                DisplayName = "IGSDB client application",
+                DisplayName = "IGSDB",
                 RedirectUris = { },
                 PostLogoutRedirectUris = { },
                 Permissions =
diff --git a/backend/src/GraphQl/Components/ComponentMutations.cs b/backend/src/GraphQl/Components/ComponentMutations.cs
index 47079a263..530db5dfe 100644
--- a/backend/src/GraphQl/Components/ComponentMutations.cs
+++ b/backend/src/GraphQl/Components/ComponentMutations.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading;
@@ -51,6 +52,7 @@ CancellationToken cancellationToken
             );
         }
 
+        var errors = new List<CreateComponentError>();
         if (input.ComponentId is not null
             && await context.Components.AsQueryable()
                 .AnyAsync(
@@ -59,7 +61,7 @@ CancellationToken cancellationToken
                 )
            )
         {
-            return new CreateComponentPayload(
+            errors.Add(
                 new CreateComponentError(
                     CreateComponentErrorCode.DUPLICATE_COMPONENT_ID,
                     "The component ID is already in use.",
@@ -67,7 +69,6 @@ CancellationToken cancellationToken
                 )
             );
         }
-
         if (input.ManagerId is not null &&
             !await context.Institutions.AsQueryable()
                 .AnyAsync(
@@ -76,7 +77,7 @@ CancellationToken cancellationToken
                 )
            )
         {
-            return new CreateComponentPayload(
+            errors.Add(
                 new CreateComponentError(
                     CreateComponentErrorCode.UNKNOWN_MANAGER,
                     "Unknown manager.",
@@ -84,7 +85,6 @@ CancellationToken cancellationToken
                 )
             );
         }
-
         if (!await context.Institutions.AsQueryable()
                 .AnyAsync(
                     x => x.Id == input.ManufacturerId,
@@ -92,7 +92,7 @@ CancellationToken cancellationToken
                 )
            )
         {
-            return new CreateComponentPayload(
+            errors.Add(
                 new CreateComponentError(
                     CreateComponentErrorCode.UNKNOWN_MANUFACTURER,
                     "Unknown manufacturer.",
@@ -100,11 +100,10 @@ CancellationToken cancellationToken
                 )
             );
         }
-
         if (input.PrimeSurface?.Reference?.Standard is not null
             && input.PrimeSurface?.Reference?.Publication is not null)
         {
-            return new CreateComponentPayload(
+            errors.Add(
                 new CreateComponentError(
                     CreateComponentErrorCode.AMBIGUOUS_REFERENCE,
                     "Both standard and publication are non-null.",
@@ -112,11 +111,10 @@ CancellationToken cancellationToken
                 )
             );
         }
-
         if (input.PrimeDirection?.Reference?.Standard is not null
             && input.PrimeDirection?.Reference?.Publication is not null)
         {
-            return new CreateComponentPayload(
+            errors.Add(
                 new CreateComponentError(
                     CreateComponentErrorCode.AMBIGUOUS_REFERENCE,
                     "Both standard and publication are non-null.",
@@ -124,11 +122,10 @@ CancellationToken cancellationToken
                 )
             );
         }
-
         if (input.SwitchableLayers?.Reference?.Standard is not null
             && input.SwitchableLayers?.Reference?.Publication is not null)
         {
-            return new CreateComponentPayload(
+            errors.Add(
                 new CreateComponentError(
                     CreateComponentErrorCode.AMBIGUOUS_REFERENCE,
                     "Both standard and publication are non-null.",
@@ -136,6 +133,10 @@ CancellationToken cancellationToken
                 )
             );
         }
+        if (errors.Count > 0)
+        {
+            return new CreateComponentPayload(errors);
+        }
 
         var availability = input.Availability?.ToDomainModel();
         // Note that above we make sure that, for each reference, standard and publication are *not* both non-null.
@@ -263,6 +264,7 @@ await context.Components.AsQueryable()
             );
         }
 
+        var errors = new List<UpdateComponentError>();
         if (input.ManufacturerId is not null
                 && !await context.Institutions.AsQueryable()
                     .AnyAsync(
@@ -271,7 +273,7 @@ await context.Components.AsQueryable()
                 )
             )
         {
-            return new UpdateComponentPayload(
+            errors.Add(
                 new UpdateComponentError(
                     UpdateComponentErrorCode.UNKNOWN_MANUFACTURER,
                     "Unknown manufacturer",
@@ -279,11 +281,10 @@ await context.Components.AsQueryable()
                 )
             );
         }
-
         if (input.PrimeSurface?.Reference?.Standard is not null
             && input.PrimeSurface?.Reference?.Publication is not null)
         {
-            return new UpdateComponentPayload(
+            errors.Add(
                 new UpdateComponentError(
                     UpdateComponentErrorCode.AMBIGUOUS_REFERENCE,
                     "Both standard and publication are non-null.",
@@ -291,11 +292,10 @@ await context.Components.AsQueryable()
                 )
             );
         }
-
         if (input.PrimeDirection?.Reference?.Standard is not null
             && input.PrimeDirection?.Reference?.Publication is not null)
         {
-            return new UpdateComponentPayload(
+            errors.Add(
                 new UpdateComponentError(
                     UpdateComponentErrorCode.AMBIGUOUS_REFERENCE,
                     "Both standard and publication are non-null.",
@@ -303,11 +303,10 @@ await context.Components.AsQueryable()
                 )
             );
         }
-
         if (input.SwitchableLayers?.Reference?.Standard is not null
             && input.SwitchableLayers?.Reference?.Publication is not null)
         {
-            return new UpdateComponentPayload(
+            errors.Add(
                 new UpdateComponentError(
                     UpdateComponentErrorCode.AMBIGUOUS_REFERENCE,
                     "Both standard and publication are non-null.",
@@ -315,6 +314,10 @@ await context.Components.AsQueryable()
                 )
             );
         }
+        if (errors.Count > 0)
+        {
+            return new UpdateComponentPayload(errors);
+        }
 
         component.Update(
             input.Name,
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationErrorCode.cs b/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationErrorCode.cs
index 09ff7b25f..3b8f9ba3f 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationErrorCode.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationErrorCode.cs
@@ -9,4 +9,5 @@ public enum CreateOpenIdConnectApplicationErrorCode
     UNAUTHORIZED,
     UNKNOWN_INSTITUTION,
     DUPLICATE_CLIENT_ID,
+    ILLEGAL_CONSENT_TYPE,
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationPayload.cs b/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationPayload.cs
index c7830fad7..0347092de 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationPayload.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationPayload.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Metabase.Data.OpenIdConnect;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
@@ -22,4 +23,11 @@ CreateOpenIdConnectApplicationError error
         : base(error)
     {
     }
+
+    public CreateOpenIdConnectApplicationPayload(
+        IReadOnlyCollection<CreateOpenIdConnectApplicationError> errors
+    )
+        : base(errors)
+    {
+    }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
index f3e7bc7a7..5fd64a6c5 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Security.Cryptography;
@@ -50,6 +51,7 @@ CancellationToken cancellationToken
                 )
             );
         }
+        var errors = new List<CreateOpenIdConnectApplicationError>();
         if (!await context.Institutions.AsQueryable()
                 .AnyAsync(
                     x => x.Id == input.InstitutionId,
@@ -57,7 +59,7 @@ CancellationToken cancellationToken
                 )
            )
         {
-            return new CreateOpenIdConnectApplicationPayload(
+            errors.Add(
                 new CreateOpenIdConnectApplicationError(
                     CreateOpenIdConnectApplicationErrorCode.UNKNOWN_INSTITUTION,
                     "Unknown institution.",
@@ -67,7 +69,7 @@ CancellationToken cancellationToken
         }
         if (await applicationManager.FindByClientIdAsync(input.ClientId, cancellationToken) is not null)
         {
-            return new CreateOpenIdConnectApplicationPayload(
+            errors.Add(
                 new CreateOpenIdConnectApplicationError(
                     CreateOpenIdConnectApplicationErrorCode.DUPLICATE_CLIENT_ID,
                     "The client ID is already in use.",
@@ -75,6 +77,20 @@ CancellationToken cancellationToken
                 )
             );
         }
+        if (input.ConsentType is not OpenIdConnectConsentType.EXPLICIT && !await authorization.CanAdministrate(claimsPrincipal, cancellationToken))
+        {
+            errors.Add(
+                new CreateOpenIdConnectApplicationError(
+                    CreateOpenIdConnectApplicationErrorCode.ILLEGAL_CONSENT_TYPE,
+                    $"As non-administrator may only use the consent type `{OpenIdConnectConsentType.EXPLICIT}`",
+                    [nameof(input), nameof(input.ConsentType).FirstCharToLower()]
+                )
+            );
+        }
+        if (errors.Count > 0)
+        {
+            return new CreateOpenIdConnectApplicationPayload(errors);
+        }
         var clientSecret = GenerateClientSecret();
         var descriptor = new OpenIddictApplicationDescriptor
         {
@@ -186,6 +202,16 @@ CancellationToken cancellationToken
                 )
             );
         }
+        if (input.ConsentType is not OpenIdConnectConsentType.EXPLICIT && !await authorization.CanAdministrate(claimsPrincipal, cancellationToken))
+        {
+            return new UpdateOpenIdConnectApplicationPayload(
+                new UpdateOpenIdConnectApplicationError(
+                    UpdateOpenIdConnectApplicationErrorCode.ILLEGAL_CONSENT_TYPE,
+                    $"As non-administrator may only use the consent type `{OpenIdConnectConsentType.EXPLICIT}`",
+                    [nameof(input), nameof(input.ConsentType).FirstCharToLower()]
+                )
+            );
+        }
         var descriptor = new OpenIddictApplicationDescriptor();
         await applicationManager.PopulateAsync(descriptor, application, cancellationToken);
         UpdateOpenIdConnectApplicationDescriptor(input, descriptor);
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectConsentType.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectConsentType.cs
index 29bb8bf05..0fe4099b5 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectConsentType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectConsentType.cs
@@ -3,4 +3,7 @@ namespace Metabase.GraphQl.OpenIdConnect.Applications;
 public enum OpenIdConnectConsentType
 {
     EXPLICIT,
+    EXTERNAL,
+    IMPLICIT,
+    SYSTEMATIC,
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectConsentTypeExtensions.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectConsentTypeExtensions.cs
index 9008f1a9f..b6fc94b00 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectConsentTypeExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectConsentTypeExtensions.cs
@@ -10,6 +10,9 @@ public static OpenIdConnectConsentType ToOpenIdConnectConsentType(this string co
         return consentType switch
         {
             OpenIddictConstants.ConsentTypes.Explicit => OpenIdConnectConsentType.EXPLICIT,
+            OpenIddictConstants.ConsentTypes.External => OpenIdConnectConsentType.EXTERNAL,
+            OpenIddictConstants.ConsentTypes.Implicit => OpenIdConnectConsentType.IMPLICIT,
+            OpenIddictConstants.ConsentTypes.Systematic => OpenIdConnectConsentType.SYSTEMATIC,
             _ => throw new ArgumentOutOfRangeException(nameof(consentType), $"Unsupported consent type `{consentType}`")
         };
     }
@@ -19,6 +22,9 @@ public static string ToStringConsentType(this OpenIdConnectConsentType consentTy
         return consentType switch
         {
             OpenIdConnectConsentType.EXPLICIT => OpenIddictConstants.ConsentTypes.Explicit,
+            OpenIdConnectConsentType.EXTERNAL => OpenIddictConstants.ConsentTypes.External,
+            OpenIdConnectConsentType.IMPLICIT => OpenIddictConstants.ConsentTypes.Implicit,
+            OpenIdConnectConsentType.SYSTEMATIC => OpenIddictConstants.ConsentTypes.Systematic,
             _ => throw new ArgumentOutOfRangeException(nameof(consentType), $"Unsupported consent type `{consentType}`")
         };
     }
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationErrorCode.cs b/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationErrorCode.cs
index 2870acf6f..c38527250 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationErrorCode.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationErrorCode.cs
@@ -7,5 +7,6 @@ public enum UpdateOpenIdConnectApplicationErrorCode
 {
     UNKNOWN,
     UNAUTHORIZED,
-    UNKNOWN_APPLICATION
+    UNKNOWN_APPLICATION,
+    ILLEGAL_CONSENT_TYPE
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs
index 46877122b..ec787cb78 100644
--- a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs
+++ b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs
@@ -6,6 +6,8 @@ namespace Metabase.GraphQl.OpenIdConnect;
 [SuppressMessage("Naming", "CA1707")]
 public enum OpenIdConnectScope
 {
+    // The descriptions are used through `EnumExtensions.GetDescription` in the view `Authorize.cshtml`.
+
     [Display(Description = "Access to your postal address information.")]
     ADDRESS,
 
@@ -21,10 +23,10 @@ public enum OpenIdConnectScope
     [Display(Description = "Access to your user roles.")]
     ROLES,
 
-    [Display(Description = "Read-only access to API resources in your name.")]
+    [Display(Description = "Read-only access to resources in your name.")]
     READ_API,
 
-    [Display(Description = "Full write access to API resources in your name.")]
+    [Display(Description = "Basic write access to resources in your name.")]
     WRITE_API,
 
     [Display(Description = "Permission to perform administrative tasks in your name.")]
diff --git a/backend/src/Migrations/20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.Designer.cs b/backend/src/Migrations/20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.Designer.cs
new file mode 100644
index 000000000..2df6e91d6
--- /dev/null
+++ b/backend/src/Migrations/20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.Designer.cs
@@ -0,0 +1,2298 @@
+// <auto-generated />
+using System;
+using System.Text.Json;
+using Metabase.Data;
+using Metabase.Enumerations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Metabase.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit")]
+    partial class SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("metabase")
+                .HasAnnotation("ProductVersion", "10.0.8")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "component_category", new[] { "layer", "material", "unit" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "database_verification_state", new[] { "pending", "verified" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_operating_state", new[] { "not_operating", "operating" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_representative_role", new[] { "assistant", "owner" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_state", new[] { "pending", "verified" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "method_category", new[] { "calculation", "measurement" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "prime_surface", new[] { "inside", "outside" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "standardizer", new[] { "aerc", "agi", "ashrae", "breeam", "bs", "bsi", "cen", "cie", "dgnb", "din", "dvwg", "iec", "ies", "ift", "iso", "jis", "leed", "nfrc", "riba", "ul", "unece", "vdi", "vff", "well" });
+            NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "pgcrypto");
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("Abbreviation")
+                        .HasColumnType("text");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
+                        .HasColumnType("tstzrange");
+
+                    b.PrimitiveCollection<ComponentCategory[]>("Categories")
+                        .IsRequired()
+                        .HasColumnType("metabase.component_category[]");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<JsonElement?>("Extras")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("component", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentAssembly", b =>
+                {
+                    b.Property<Guid>("AssembledComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("PartComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<byte?>("Index")
+                        .HasColumnType("smallint");
+
+                    b.Property<PrimeSurface?>("PrimeSurface")
+                        .HasColumnType("metabase.prime_surface");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("AssembledComponentId", "PartComponentId");
+
+                    b.HasIndex("PartComponentId");
+
+                    b.ToTable("component_assembly", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentConcretizationAndGeneralization", b =>
+                {
+                    b.Property<Guid>("GeneralComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ConcreteComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("GeneralComponentId", "ConcreteComponentId");
+
+                    b.HasIndex("ConcreteComponentId");
+
+                    b.ToTable("component_concretization_and_generalization", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentManufacturer", b =>
+                {
+                    b.Property<Guid>("ComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("ComponentId", "InstitutionId");
+
+                    b.HasIndex("InstitutionId");
+
+                    b.ToTable("component_manufacturer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentVariant", b =>
+                {
+                    b.Property<Guid>("OfComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ToComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("OfComponentId", "ToComponentId");
+
+                    b.HasIndex("ToComponentId");
+
+                    b.ToTable("component_variant", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.DataFormat", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Extension")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("MediaType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SchemaLocator")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("data_format", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Database", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Locator")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OperatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("VerificationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DatabaseVerificationState>("VerificationState")
+                        .HasColumnType("metabase.database_verification_state");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OperatorId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("database", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.GnuPgKeyFingerprint", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<OffsetDateTime?>("AllowedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Fingerprint")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<OffsetDateTime?>("ForbiddenAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Fingerprint")
+                        .IsUnique();
+
+                    b.HasIndex("InstitutionId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("gnu_pg_fingerprint", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("Abbreviation")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<JsonElement?>("Extras")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<InstitutionOperatingState>("OperatingState")
+                        .HasColumnType("metabase.institution_operating_state");
+
+                    b.Property<InstitutionState>("State")
+                        .HasColumnType("metabase.institution_state");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("institution", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionMethodDeveloper", b =>
+                {
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MethodId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("InstitutionId", "MethodId");
+
+                    b.HasIndex("MethodId");
+
+                    b.ToTable("institution_method_developer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionRepresentative", b =>
+                {
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<InstitutionRepresentativeRole>("Role")
+                        .HasColumnType("metabase.institution_representative_role");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("InstitutionId", "UserId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("institution_representative", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
+                        .HasColumnType("tstzrange");
+
+                    b.Property<string>("CalculationLocator")
+                        .HasColumnType("text");
+
+                    b.PrimitiveCollection<MethodCategory[]>("Categories")
+                        .IsRequired()
+                        .HasColumnType("metabase.method_category[]");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Validity")
+                        .HasColumnType("tstzrange");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("method", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("ApplicationType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("ClientSecret")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClientType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ConsentType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayNames")
+                        .HasColumnType("text");
+
+                    b.Property<string>("JsonWebKeySet")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Permissions")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostLogoutRedirectUris")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RedirectUris")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Requirements")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Settings")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId")
+                        .IsUnique();
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("OpenIddictApplications", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTime?>("CreationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Scopes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Subject")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                    b.ToTable("OpenIddictAuthorizations", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectScope", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Descriptions")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayNames")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Resources")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("OpenIddictScopes", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AuthorizationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTime?>("CreationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("ExpirationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("RedemptionDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ReferenceId")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Status")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Subject")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuthorizationId");
+
+                    b.HasIndex("ReferenceId")
+                        .IsUnique();
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                    b.ToTable("OpenIddictTokens", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Role", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("role", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.RoleClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("role_claim", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("gen_random_uuid()");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PostalAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.Property<string>("WebsiteLocator")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("user", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("user_claim", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserLogin", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("user_login", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserMethodDeveloper", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MethodId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("UserId", "MethodId");
+
+                    b.HasIndex("MethodId");
+
+                    b.ToTable("user_method_developer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserRole", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("user_role", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserToken", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("user_token", "metabase");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedComponents")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "PrimeDirection", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "PrimeSurface", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "SwitchableLayers", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("PrimeDirection");
+
+                    b.Navigation("PrimeSurface");
+
+                    b.Navigation("SwitchableLayers");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentAssembly", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "AssembledComponent")
+                        .WithMany("PartEdges")
+                        .HasForeignKey("AssembledComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "PartComponent")
+                        .WithMany("PartOfEdges")
+                        .HasForeignKey("PartComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("AssembledComponent");
+
+                    b.Navigation("PartComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentConcretizationAndGeneralization", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "ConcreteComponent")
+                        .WithMany("GeneralizationEdges")
+                        .HasForeignKey("ConcreteComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "GeneralComponent")
+                        .WithMany("ConcretizationEdges")
+                        .HasForeignKey("GeneralComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ConcreteComponent");
+
+                    b.Navigation("GeneralComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentManufacturer", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "Component")
+                        .WithMany("ManufacturerEdges")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("ManufacturedComponentEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Institution");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentVariant", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "OfComponent")
+                        .WithMany("VariantEdges")
+                        .HasForeignKey("OfComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "ToComponent")
+                        .WithMany("VariantOfEdges")
+                        .HasForeignKey("ToComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("OfComponent");
+
+                    b.Navigation("ToComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.DataFormat", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedDataFormats")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.Reference", "Reference", b1 =>
+                        {
+                            b1.Property<Guid>("DataFormatId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("DataFormatId");
+
+                            b1.ToTable("data_format", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("DataFormatId");
+
+                            b1.OwnsOne("Metabase.Data.Publication", "Publication", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceDataFormatId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("ArXiv")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<string[]>("Authors")
+                                        .HasColumnType("text[]");
+
+                                    b2.Property<string>("Doi")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Urn")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("WebAddress")
+                                        .HasColumnType("text");
+
+                                    b2.HasKey("ReferenceDataFormatId");
+
+                                    b2.ToTable("data_format", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceDataFormatId");
+                                });
+
+                            b1.OwnsOne("Metabase.Data.Standard", "Standard", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceDataFormatId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Locator")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                        .IsRequired()
+                                        .HasColumnType("metabase.standardizer[]");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<int?>("Year")
+                                        .HasColumnType("integer");
+
+                                    b2.HasKey("ReferenceDataFormatId");
+
+                                    b2.ToTable("data_format", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceDataFormatId");
+
+                                    b2.OwnsOne("Metabase.Data.Numeration", "Numeration", b3 =>
+                                        {
+                                            b3.Property<Guid>("StandardReferenceDataFormatId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("MainNumber")
+                                                .IsRequired()
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Prefix")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Suffix")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("StandardReferenceDataFormatId");
+
+                                            b3.ToTable("data_format", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("StandardReferenceDataFormatId");
+                                        });
+
+                                    b2.Navigation("Numeration")
+                                        .IsRequired();
+                                });
+
+                            b1.Navigation("Publication");
+
+                            b1.Navigation("Standard");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("Reference");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Database", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Operator")
+                        .WithMany("OperatedDatabases")
+                        .HasForeignKey("OperatorId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Operator");
+                });
+
+            modelBuilder.Entity("Metabase.Data.GnuPgKeyFingerprint", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("GnuPgKeyFingerprints")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("GnuPgKeyFingerprints")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedInstitutions")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.OwnsOne("Metabase.Data.ContactInformation", "Contact", b1 =>
+                        {
+                            b1.Property<Guid>("InstitutionId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("EmailAddress")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("IsEmailAddressConfirmed")
+                                .HasColumnType("boolean");
+
+                            b1.Property<bool>("IsPhoneNumberConfirmed")
+                                .HasColumnType("boolean");
+
+                            b1.Property<string>("PhoneNumber")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("PostalAddress")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("WebsiteLocator")
+                                .HasColumnType("text");
+
+                            b1.HasKey("InstitutionId");
+
+                            b1.ToTable("institution", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("InstitutionId");
+                        });
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Manager");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionMethodDeveloper", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("DevelopedMethodEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Method", "Method")
+                        .WithMany("InstitutionDeveloperEdges")
+                        .HasForeignKey("MethodId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("Method");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionRepresentative", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("RepresentativeEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("RepresentedInstitutionEdges")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedMethods")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.Reference", "Reference", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("MethodId");
+
+                            b1.ToTable("method", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+
+                            b1.OwnsOne("Metabase.Data.Publication", "Publication", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceMethodId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("ArXiv")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<string[]>("Authors")
+                                        .HasColumnType("text[]");
+
+                                    b2.Property<string>("Doi")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Urn")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("WebAddress")
+                                        .HasColumnType("text");
+
+                                    b2.HasKey("ReferenceMethodId");
+
+                                    b2.ToTable("method", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceMethodId");
+                                });
+
+                            b1.OwnsOne("Metabase.Data.Standard", "Standard", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceMethodId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Locator")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                        .IsRequired()
+                                        .HasColumnType("metabase.standardizer[]");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<int?>("Year")
+                                        .HasColumnType("integer");
+
+                                    b2.HasKey("ReferenceMethodId");
+
+                                    b2.ToTable("method", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceMethodId");
+
+                                    b2.OwnsOne("Metabase.Data.Numeration", "Numeration", b3 =>
+                                        {
+                                            b3.Property<Guid>("StandardReferenceMethodId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("MainNumber")
+                                                .IsRequired()
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Prefix")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Suffix")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("StandardReferenceMethodId");
+
+                                            b3.ToTable("method", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("StandardReferenceMethodId");
+                                        });
+
+                                    b2.Navigation("Numeration")
+                                        .IsRequired();
+                                });
+
+                            b1.Navigation("Publication");
+
+                            b1.Navigation("Standard");
+                        });
+
+                    b.OwnsMany("Metabase.Data.MethodParameter", "Parameters", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<JsonElement>("Type")
+                                .HasColumnType("jsonb");
+
+                            b1.HasKey("MethodId", "Id");
+
+                            b1.ToTable("MethodParameter", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+                        });
+
+                    b.OwnsMany("Metabase.Data.MethodSource", "Sources", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Description")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.HasKey("MethodId", "Id");
+
+                            b1.ToTable("MethodSource", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("Parameters");
+
+                    b.Navigation("Reference");
+
+                    b.Navigation("Sources");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Owner")
+                        .WithMany("OpenIdConnectApplications")
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", "Application")
+                        .WithMany("Authorizations")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectToken", b =>
+                {
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", "Application")
+                        .WithMany("Tokens")
+                        .HasForeignKey("ApplicationId");
+
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", "Authorization")
+                        .WithMany("Tokens")
+                        .HasForeignKey("AuthorizationId");
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Authorization");
+                });
+
+            modelBuilder.Entity("Metabase.Data.RoleClaim", b =>
+                {
+                    b.HasOne("Metabase.Data.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserClaim", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserLogin", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserMethodDeveloper", b =>
+                {
+                    b.HasOne("Metabase.Data.Method", "Method")
+                        .WithMany("UserDeveloperEdges")
+                        .HasForeignKey("MethodId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("DevelopedMethodEdges")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Method");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserRole", b =>
+                {
+                    b.HasOne("Metabase.Data.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserToken", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.Navigation("ConcretizationEdges");
+
+                    b.Navigation("GeneralizationEdges");
+
+                    b.Navigation("ManufacturerEdges");
+
+                    b.Navigation("PartEdges");
+
+                    b.Navigation("PartOfEdges");
+
+                    b.Navigation("VariantEdges");
+
+                    b.Navigation("VariantOfEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.Navigation("DevelopedMethodEdges");
+
+                    b.Navigation("GnuPgKeyFingerprints");
+
+                    b.Navigation("ManagedComponents");
+
+                    b.Navigation("ManagedDataFormats");
+
+                    b.Navigation("ManagedInstitutions");
+
+                    b.Navigation("ManagedMethods");
+
+                    b.Navigation("ManufacturedComponentEdges");
+
+                    b.Navigation("OpenIdConnectApplications");
+
+                    b.Navigation("OperatedDatabases");
+
+                    b.Navigation("RepresentativeEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.Navigation("InstitutionDeveloperEdges");
+
+                    b.Navigation("UserDeveloperEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.Navigation("Authorizations");
+
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Metabase.Data.User", b =>
+                {
+                    b.Navigation("DevelopedMethodEdges");
+
+                    b.Navigation("GnuPgKeyFingerprints");
+
+                    b.Navigation("RepresentedInstitutionEdges");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/backend/src/Migrations/20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.cs b/backend/src/Migrations/20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.cs
new file mode 100644
index 000000000..279f4ef94
--- /dev/null
+++ b/backend/src/Migrations/20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.cs
@@ -0,0 +1,32 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Metabase.Migrations
+{
+    /// <inheritdoc />
+    public partial class SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql("""
+                UPDATE metabase."OpenIddictApplications" 
+                SET "ConsentType" = 'implicit'
+                WHERE "ClientId" = 'metabase';
+            """
+            );
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql("""
+                UPDATE metabase."OpenIddictApplications" 
+                SET "ConsentType" = 'explicit'
+                WHERE "ClientId" = 'metabase';
+            """
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs b/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
index 6575f2d7d..a46612ca3 100644
--- a/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -22,7 +22,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 #pragma warning disable 612, 618
             modelBuilder
                 .HasDefaultSchema("metabase")
-                .HasAnnotation("ProductVersion", "10.0.7")
+                .HasAnnotation("ProductVersion", "10.0.8")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "component_category", new[] { "layer", "material", "unit" });
diff --git a/backend/src/Migrations/migrate.sql b/backend/src/Migrations/migrate.sql
index 6df98fabc..ea045d533 100644
--- a/backend/src/Migrations/migrate.sql
+++ b/backend/src/Migrations/migrate.sql
@@ -2756,3 +2756,24 @@ END $EF$;
 
 COMMIT;
 
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit') THEN
+                UPDATE metabase."OpenIddictApplications" 
+                SET "ConsentType" = 'implicit'
+                WHERE "ClientId" = 'metabase';
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit') THEN
+    INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+    VALUES ('20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit', '10.0.8');
+    END IF;
+END $EF$;
+
+COMMIT;
+
diff --git a/backend/src/Migrations/migrate_from_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication_to_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.sql b/backend/src/Migrations/migrate_from_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication_to_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.sql
new file mode 100644
index 000000000..36554cd1d
--- /dev/null
+++ b/backend/src/Migrations/migrate_from_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication_to_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.sql
@@ -0,0 +1,20 @@
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit') THEN
+                UPDATE metabase."OpenIddictApplications" 
+                SET "ConsentType" = 'implicit'
+                WHERE "ClientId" = 'metabase';
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit') THEN
+    INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+    VALUES ('20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit', '10.0.8');
+    END IF;
+END $EF$;
+COMMIT;
+
diff --git a/backend/src/Migrations/rollback_from_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit_to_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.sql b/backend/src/Migrations/rollback_from_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit_to_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.sql
new file mode 100644
index 000000000..ac05aceb9
--- /dev/null
+++ b/backend/src/Migrations/rollback_from_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit_to_20260511201930_AddCustomerSupportScopeToMetabaseOpenIdConnectClientApplication.sql
@@ -0,0 +1,21 @@
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit') THEN
+                UPDATE metabase."OpenIddictApplications" 
+                SET "ConsentType" = 'explicit'
+                WHERE "ClientId" = 'metabase';
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit') THEN
+    DELETE FROM "__EFMigrationsHistory"
+    WHERE "MigrationId" = '20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit';
+    END IF;
+END $EF$;
+
+COMMIT;
+
diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index 69f572a92..42d3ffe29 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -1,4 +1,4 @@
-schema {
+schema {
   query: Query
   mutation: Mutation
 }
@@ -4709,6 +4709,7 @@ enum CreateMethodErrorCode {
 
 enum CreateOpenIdConnectApplicationErrorCode {
   DUPLICATE_CLIENT_ID
+  ILLEGAL_CONSENT_TYPE
   UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
@@ -4858,6 +4859,9 @@ enum MethodCategory {
 
 enum OpenIdConnectConsentType {
   EXPLICIT
+  EXTERNAL
+  IMPLICIT
+  SYSTEMATIC
 }
 
 enum OpenIdConnectEndpoint {
@@ -5174,6 +5178,7 @@ enum UpdateMethodErrorCode {
 }
 
 enum UpdateOpenIdConnectApplicationErrorCode {
+  ILLEGAL_CONSENT_TYPE
   UNAUTHORIZED
   UNKNOWN
   UNKNOWN_APPLICATION
@@ -5282,4 +5287,4 @@ directive @listSize(
   slicingArgumentDefaultValue: Int
   "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments."
   slicingArguments: [String!]
-) on FIELD_DEFINITION
+) on FIELD_DEFINITION
\ No newline at end of file
diff --git a/frontend/components/EnumSelect.tsx b/frontend/components/EnumSelect.tsx
index 78ad26bc1..2bbbebdd5 100644
--- a/frontend/components/EnumSelect.tsx
+++ b/frontend/components/EnumSelect.tsx
@@ -3,10 +3,12 @@ import { humanize } from "../lib/string";
 
 export const allEnumSelectOptions = <T extends string | number>(
   enumObject: Record<string, T>,
+  filter?: (value: T) => boolean,
 ) =>
   Object.entries(enumObject)
     // exclude reverse mappings
     .filter(([key]) => isNaN(Number(key)))
+    .filter(([_, value]) => filter?.(value) ?? true)
     .map(([_, value]) => ({
       label: humanize(String(value), "all-upper"),
       value: value,
@@ -17,11 +19,15 @@ interface EnumSelectProps<T extends string | number> extends Omit<
   "options"
 > {
   enumObject: Record<string, T>;
+  filter?: (value: T) => boolean;
 }
 
 export default function EnumSelect<T extends string | number>({
   enumObject,
+  filter = () => true,
   ...rest
 }: EnumSelectProps<T>) {
-  return <Select<T> {...rest} options={allEnumSelectOptions(enumObject)} />;
+  return (
+    <Select<T> {...rest} options={allEnumSelectOptions(enumObject, filter)} />
+  );
 }
diff --git a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
index 82945933c..a2cb55370 100644
--- a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client/react";
+import { useMutation, useQuery } from "@apollo/client/react";
 import { useState } from "react";
 import {
   ApplicationsDocument,
@@ -14,6 +14,7 @@ import {
   OpenIdConnectScope,
   OpenIdConnectRequirement,
   Scalars,
+  UserRole,
 } from "../../../__generated__/graphql";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
 import { layout, tailLayout } from "../../../lib/form";
@@ -26,6 +27,7 @@ import CodeView from "../../CodeView";
 import RepresentedInstitutionIdSelect from "../../institutions/RepresentedInstitutionIdSelect";
 import EnumSelect, { allEnumSelectOptions } from "../../EnumSelect";
 import { createPaginatedIdSelectOption } from "../../PaginatedIdSelect";
+import { CurrentUserDocument } from "../../../queries/currentUser.generated";
 
 type FormValues = {
   clientId: string;
@@ -47,6 +49,8 @@ interface CreateApplicationProps {
 export default function CreateOpenIdConnectApplication({
   initialOwner,
 }: CreateApplicationProps) {
+  const currentUser = useQuery(CurrentUserDocument)?.data?.currentUser;
+
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
   );
@@ -190,6 +194,10 @@ export default function CreateOpenIdConnectApplication({
           >
             <EnumSelect
               enumObject={OpenIdConnectConsentType}
+              filter={(value) =>
+                value == OpenIdConnectConsentType.Explicit ||
+                (currentUser?.roles?.includes(UserRole.Administrator) ?? false)
+              }
               placeholder="Please select"
             />
           </Form.Item>
diff --git a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
index 60af6f998..3c4584e97 100644
--- a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
@@ -1,4 +1,4 @@
-import { useMutation } from "@apollo/client/react";
+import { useMutation, useQuery } from "@apollo/client/react";
 import { useState } from "react";
 import {
   UpdateApplicationDocument,
@@ -13,12 +13,14 @@ import {
   OpenIdConnectResponseType,
   OpenIdConnectScope,
   OpenIdConnectRequirement,
+  UserRole,
 } from "../../../__generated__/graphql";
 import { layout, tailLayout } from "../../../lib/form";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../../ErrorAlert";
 import EditButton from "../../EditButton";
 import EnumSelect, { allEnumSelectOptions } from "../../EnumSelect";
+import { CurrentUserDocument } from "../../../queries/currentUser.generated";
 
 interface UpdateApplicationProps {
   application: OpenIdConnectApplicationPartialFragment;
@@ -39,6 +41,8 @@ type FormValues = {
 export default function UpdateOpenIdConnectApplication({
   application,
 }: UpdateApplicationProps) {
+  const currentUser = useQuery(CurrentUserDocument)?.data?.currentUser;
+
   const [open, setOpen] = useState(false);
   const [form] = Form.useForm<FormValues>();
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
@@ -134,6 +138,10 @@ export default function UpdateOpenIdConnectApplication({
           >
             <EnumSelect
               enumObject={OpenIdConnectConsentType}
+              filter={(value) =>
+                value == OpenIdConnectConsentType.Explicit ||
+                (currentUser?.roles?.includes(UserRole.Administrator) ?? false)
+              }
               placeholder="Please select"
             />
           </Form.Item>
diff --git a/frontend/type-defs.graphqls b/frontend/type-defs.graphqls
index 4fb673b87..42d3ffe29 100644
--- a/frontend/type-defs.graphqls
+++ b/frontend/type-defs.graphqls
@@ -4709,6 +4709,7 @@ enum CreateMethodErrorCode {
 
 enum CreateOpenIdConnectApplicationErrorCode {
   DUPLICATE_CLIENT_ID
+  ILLEGAL_CONSENT_TYPE
   UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
@@ -4858,6 +4859,9 @@ enum MethodCategory {
 
 enum OpenIdConnectConsentType {
   EXPLICIT
+  EXTERNAL
+  IMPLICIT
+  SYSTEMATIC
 }
 
 enum OpenIdConnectEndpoint {
@@ -4900,6 +4904,7 @@ enum OpenIdConnectScope {
   PROFILE
   READ_API
   ROLES
+  SUPPORT_API
   VERIFY_API
   WRITE_API
 }
@@ -5011,6 +5016,7 @@ enum RemoveUserMethodDeveloperErrorCode {
 }
 
 enum RemoveUserRoleErrorCode {
+  LAST_USER
   UNAUTHORIZED
   UNKNOWN
   UNKNOWN_USER
@@ -5172,6 +5178,7 @@ enum UpdateMethodErrorCode {
 }
 
 enum UpdateOpenIdConnectApplicationErrorCode {
+  ILLEGAL_CONSENT_TYPE
   UNAUTHORIZED
   UNKNOWN
   UNKNOWN_APPLICATION
@@ -5179,6 +5186,7 @@ enum UpdateOpenIdConnectApplicationErrorCode {
 
 enum UserRole {
   ADMINISTRATOR
+  SUPPORTER
   VERIFIER
 }
 

From 40fc97cae83c39ceb1d8e25cc66cb8341655b103 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Mon, 18 May 2026 16:27:50 +0200
Subject: [PATCH 042/145] Authorize endpoints, grant types, response types, and
 scopes (some may be used by all and others only by administrators)

---
 .../OpenIdConnectAuthorization.cs             |  60 +++++++++
 ...CreateOpenIdConnectApplicationErrorCode.cs |   4 +
 .../OpenIdConnectApplicationMutations.cs      | 121 +++++++++++++++++-
 ...UpdateOpenIdConnectApplicationErrorCode.cs |   6 +-
 .../UpdateOpenIdConnectApplicationPayload.cs  |   8 ++
 backend/src/GraphQl/Users/UserQueries.cs      |   1 -
 backend/src/GraphQl/Users/UserType.cs         |  76 +++++++++++
 .../GraphQlSchemaTests.IsUnchanged.snap       |  13 ++
 frontend/components/EnumSelect.tsx            |  55 +++++---
 frontend/components/NavBar.tsx                |   2 +-
 .../components/institutions/Institution.tsx   |   2 +-
 .../institutions/InstitutionSummary.tsx       |   2 +-
 .../CreateOpenIdConnectApplication.tsx        |  36 +++---
 .../UpdateOpenIdConnectApplication.tsx        |   6 +-
 frontend/package.json                         |   2 +-
 frontend/queries/currentUser.graphql          |   5 +
 frontend/type-defs.graphqls                   |  13 ++
 frontend/yarn.lock                            |   8 +-
 18 files changed, 366 insertions(+), 54 deletions(-)

diff --git a/backend/src/Authorization/OpenIdConnectAuthorization.cs b/backend/src/Authorization/OpenIdConnectAuthorization.cs
index ed82ab89e..c9509e330 100644
--- a/backend/src/Authorization/OpenIdConnectAuthorization.cs
+++ b/backend/src/Authorization/OpenIdConnectAuthorization.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading;
@@ -132,4 +133,63 @@ CancellationToken cancellationToken
             )
             .AnyAsync(cancellationToken);
     }
+
+    internal async Task<IReadOnlyList<GraphQl.OpenIdConnect.Applications.OpenIdConnectConsentType>> AuthorizedConsentTypes(
+        ClaimsPrincipal claimsPrincipal,
+        CancellationToken cancellationToken
+    )
+    {
+        return await CanAdministrate(claimsPrincipal, cancellationToken)
+            ? Enum.GetValues<GraphQl.OpenIdConnect.Applications.OpenIdConnectConsentType>().ToList().AsReadOnly()
+            : [GraphQl.OpenIdConnect.Applications.OpenIdConnectConsentType.EXPLICIT];
+    }
+
+    internal async Task<IReadOnlyList<GraphQl.OpenIdConnect.Applications.OpenIdConnectEndpoint>> AuthorizedEndpoints(
+        ClaimsPrincipal claimsPrincipal,
+        CancellationToken cancellationToken
+    )
+    {
+        return Enum.GetValues<GraphQl.OpenIdConnect.Applications.OpenIdConnectEndpoint>().ToList().AsReadOnly();
+    }
+
+    internal async Task<IReadOnlyList<GraphQl.OpenIdConnect.Applications.OpenIdConnectGrantType>> AuthorizedGrantTypes(
+        ClaimsPrincipal claimsPrincipal,
+        CancellationToken cancellationToken
+    )
+    {
+        return await CanAdministrate(claimsPrincipal, cancellationToken)
+            ? Enum.GetValues<GraphQl.OpenIdConnect.Applications.OpenIdConnectGrantType>().ToList().AsReadOnly()
+            : Enum.GetValues<GraphQl.OpenIdConnect.Applications.OpenIdConnectGrantType>()
+                .Where(_ =>
+                    _ != GraphQl.OpenIdConnect.Applications.OpenIdConnectGrantType.TOKEN_EXCHANGE
+                )
+                .ToList()
+                .AsReadOnly();
+    }
+
+    internal async Task<IReadOnlyList<GraphQl.OpenIdConnect.Applications.OpenIdConnectResponseType>> AuthorizedResponseTypes(
+        ClaimsPrincipal claimsPrincipal,
+        CancellationToken cancellationToken
+    )
+    {
+        return Enum.GetValues<GraphQl.OpenIdConnect.Applications.OpenIdConnectResponseType>().ToList().AsReadOnly();
+    }
+
+    internal async Task<IReadOnlyList<GraphQl.OpenIdConnect.OpenIdConnectScope>> AuthorizedScopes(
+        ClaimsPrincipal claimsPrincipal,
+        CancellationToken cancellationToken
+    )
+    {
+        return await CanAdministrate(claimsPrincipal, cancellationToken)
+            ? Enum.GetValues<GraphQl.OpenIdConnect.OpenIdConnectScope>().ToList().AsReadOnly()
+            : Enum.GetValues<GraphQl.OpenIdConnect.OpenIdConnectScope>()
+                .Where(_ =>
+                    _ != GraphQl.OpenIdConnect.OpenIdConnectScope.ADMINISTRATE_API
+                    && _ != GraphQl.OpenIdConnect.OpenIdConnectScope.SUPPORT_API
+                    && _ != GraphQl.OpenIdConnect.OpenIdConnectScope.MANAGE_USER_API
+                )
+                .ToList()
+                .AsReadOnly();
+    }
+
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationErrorCode.cs b/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationErrorCode.cs
index 3b8f9ba3f..0facd5b6f 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationErrorCode.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/CreateOpenIdConnectApplicationErrorCode.cs
@@ -10,4 +10,8 @@ public enum CreateOpenIdConnectApplicationErrorCode
     UNKNOWN_INSTITUTION,
     DUPLICATE_CLIENT_ID,
     ILLEGAL_CONSENT_TYPE,
+    ILLEGAL_SCOPE,
+    ILLEGAL_GRANT_TYPE,
+    ILLEGAL_ENDPOINT,
+    ILLEGAL_RESPONSE_TYPE,
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
index 5fd64a6c5..b7944b601 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
@@ -77,16 +77,69 @@ CancellationToken cancellationToken
                 )
             );
         }
-        if (input.ConsentType is not OpenIdConnectConsentType.EXPLICIT && !await authorization.CanAdministrate(claimsPrincipal, cancellationToken))
+        var authorizedConsentTypes = await authorization.AuthorizedConsentTypes(claimsPrincipal, cancellationToken);
+        if (!authorizedConsentTypes.Contains(input.ConsentType))
         {
             errors.Add(
                 new CreateOpenIdConnectApplicationError(
                     CreateOpenIdConnectApplicationErrorCode.ILLEGAL_CONSENT_TYPE,
-                    $"As non-administrator may only use the consent type `{OpenIdConnectConsentType.EXPLICIT}`",
+                    $"You may only use the consent type(s) {string.Join(", ", authorizedConsentTypes)}",
                     [nameof(input), nameof(input.ConsentType).FirstCharToLower()]
                 )
             );
         }
+        var unauthorizedEndpoints = input.Endpoints
+            .Except(await authorization.AuthorizedEndpoints(claimsPrincipal, cancellationToken))
+            .ToList().AsReadOnly();
+        if (unauthorizedEndpoints.Count > 0)
+        {
+            errors.Add(
+                new CreateOpenIdConnectApplicationError(
+                    CreateOpenIdConnectApplicationErrorCode.ILLEGAL_ENDPOINT,
+                    $"You may not use the endpoint(s) {string.Join(", ", unauthorizedEndpoints)}",
+                    [nameof(input), nameof(input.Endpoints).FirstCharToLower()]
+                )
+            );
+        }
+        var unauthorizedGrantTypes = input.GrantTypes
+            .Except(await authorization.AuthorizedGrantTypes(claimsPrincipal, cancellationToken))
+            .ToList().AsReadOnly();
+        if (unauthorizedGrantTypes.Count > 0)
+        {
+            errors.Add(
+                new CreateOpenIdConnectApplicationError(
+                    CreateOpenIdConnectApplicationErrorCode.ILLEGAL_GRANT_TYPE,
+                    $"You may not use the grant type(s) {string.Join(", ", unauthorizedGrantTypes)}",
+                    [nameof(input), nameof(input.GrantTypes).FirstCharToLower()]
+                )
+            );
+        }
+        var unauthorizedResponseTypes = input.ResponseTypes
+            .Except(await authorization.AuthorizedResponseTypes(claimsPrincipal, cancellationToken))
+            .ToList().AsReadOnly();
+        if (unauthorizedResponseTypes.Count > 0)
+        {
+            errors.Add(
+                new CreateOpenIdConnectApplicationError(
+                    CreateOpenIdConnectApplicationErrorCode.ILLEGAL_RESPONSE_TYPE,
+                    $"You may not use the response type(s) {string.Join(", ", unauthorizedResponseTypes)}",
+                    [nameof(input), nameof(input.ResponseTypes).FirstCharToLower()]
+                )
+            );
+        }
+        var unauthorizedScopes = input.Scopes
+            .Except(await authorization.AuthorizedScopes(claimsPrincipal, cancellationToken))
+            .ToList().AsReadOnly();
+        if (unauthorizedScopes.Count > 0)
+        {
+            errors.Add(
+                new CreateOpenIdConnectApplicationError(
+                    CreateOpenIdConnectApplicationErrorCode.ILLEGAL_SCOPE,
+                    $"You may not use the scope(s) {string.Join(", ", unauthorizedScopes)}",
+                    [nameof(input), nameof(input.Scopes).FirstCharToLower()]
+                )
+            );
+        }
         if (errors.Count > 0)
         {
             return new CreateOpenIdConnectApplicationPayload(errors);
@@ -202,16 +255,74 @@ CancellationToken cancellationToken
                 )
             );
         }
-        if (input.ConsentType is not OpenIdConnectConsentType.EXPLICIT && !await authorization.CanAdministrate(claimsPrincipal, cancellationToken))
+        var errors = new List<UpdateOpenIdConnectApplicationError>();
+        var authorizedConsentTypes = await authorization.AuthorizedConsentTypes(claimsPrincipal, cancellationToken);
+        if (!authorizedConsentTypes.Contains(input.ConsentType))
         {
-            return new UpdateOpenIdConnectApplicationPayload(
+            errors.Add(
                 new UpdateOpenIdConnectApplicationError(
                     UpdateOpenIdConnectApplicationErrorCode.ILLEGAL_CONSENT_TYPE,
-                    $"As non-administrator may only use the consent type `{OpenIdConnectConsentType.EXPLICIT}`",
+                    $"You may only use the consent type(s) {string.Join(", ", authorizedConsentTypes)}",
                     [nameof(input), nameof(input.ConsentType).FirstCharToLower()]
                 )
             );
         }
+        var unauthorizedEndpoints = input.Endpoints
+            .Except(await authorization.AuthorizedEndpoints(claimsPrincipal, cancellationToken))
+            .ToList().AsReadOnly();
+        if (unauthorizedEndpoints.Count > 0)
+        {
+            errors.Add(
+                new UpdateOpenIdConnectApplicationError(
+                    UpdateOpenIdConnectApplicationErrorCode.ILLEGAL_ENDPOINT,
+                    $"You may not use the endpoint(s) {string.Join(", ", unauthorizedEndpoints)}",
+                    [nameof(input), nameof(input.Endpoints).FirstCharToLower()]
+                )
+            );
+        }
+        var unauthorizedGrantTypes = input.GrantTypes
+            .Except(await authorization.AuthorizedGrantTypes(claimsPrincipal, cancellationToken))
+            .ToList().AsReadOnly();
+        if (unauthorizedGrantTypes.Count > 0)
+        {
+            errors.Add(
+                new UpdateOpenIdConnectApplicationError(
+                    UpdateOpenIdConnectApplicationErrorCode.ILLEGAL_GRANT_TYPE,
+                    $"You may not use the grant type(s) {string.Join(", ", unauthorizedGrantTypes)}",
+                    [nameof(input), nameof(input.GrantTypes).FirstCharToLower()]
+                )
+            );
+        }
+        var unauthorizedResponseTypes = input.ResponseTypes
+            .Except(await authorization.AuthorizedResponseTypes(claimsPrincipal, cancellationToken))
+            .ToList().AsReadOnly();
+        if (unauthorizedResponseTypes.Count > 0)
+        {
+            errors.Add(
+                new UpdateOpenIdConnectApplicationError(
+                    UpdateOpenIdConnectApplicationErrorCode.ILLEGAL_RESPONSE_TYPE,
+                    $"You may not use the response type(s) {string.Join(", ", unauthorizedResponseTypes)}",
+                    [nameof(input), nameof(input.ResponseTypes).FirstCharToLower()]
+                )
+            );
+        }
+        var unauthorizedScopes = input.Scopes
+            .Except(await authorization.AuthorizedScopes(claimsPrincipal, cancellationToken))
+            .ToList().AsReadOnly();
+        if (unauthorizedScopes.Count > 0)
+        {
+            errors.Add(
+                new UpdateOpenIdConnectApplicationError(
+                    UpdateOpenIdConnectApplicationErrorCode.ILLEGAL_SCOPE,
+                    $"You may not use the scope(s) {string.Join(", ", unauthorizedScopes)}",
+                    [nameof(input), nameof(input.Scopes).FirstCharToLower()]
+                )
+            );
+        }
+        if (errors.Count > 0)
+        {
+            return new UpdateOpenIdConnectApplicationPayload(errors);
+        }
         var descriptor = new OpenIddictApplicationDescriptor();
         await applicationManager.PopulateAsync(descriptor, application, cancellationToken);
         UpdateOpenIdConnectApplicationDescriptor(input, descriptor);
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationErrorCode.cs b/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationErrorCode.cs
index c38527250..c6050e706 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationErrorCode.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationErrorCode.cs
@@ -8,5 +8,9 @@ public enum UpdateOpenIdConnectApplicationErrorCode
     UNKNOWN,
     UNAUTHORIZED,
     UNKNOWN_APPLICATION,
-    ILLEGAL_CONSENT_TYPE
+    ILLEGAL_CONSENT_TYPE,
+    ILLEGAL_GRANT_TYPE,
+    ILLEGAL_SCOPE,
+    ILLEGAL_RESPONSE_TYPE,
+    ILLEGAL_ENDPOINT
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationPayload.cs b/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationPayload.cs
index bec1d977f..27c5d6184 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationPayload.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/UpdateOpenIdConnectApplicationPayload.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Metabase.Data.OpenIdConnect;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
@@ -18,4 +19,11 @@ UpdateOpenIdConnectApplicationError error
         : base(error)
     {
     }
+
+    public UpdateOpenIdConnectApplicationPayload(
+        IReadOnlyList<UpdateOpenIdConnectApplicationError> errors
+    )
+        : base(errors)
+    {
+    }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/UserQueries.cs b/backend/src/GraphQl/Users/UserQueries.cs
index 4638db867..d9c71e750 100644
--- a/backend/src/GraphQl/Users/UserQueries.cs
+++ b/backend/src/GraphQl/Users/UserQueries.cs
@@ -6,7 +6,6 @@
 using GreenDonut.Data;
 using HotChocolate.Authorization;
 using HotChocolate.Data;
-using HotChocolate.Data.Sorting;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Authorization;
diff --git a/backend/src/GraphQl/Users/UserType.cs b/backend/src/GraphQl/Users/UserType.cs
index 2378e733d..10e5a042d 100644
--- a/backend/src/GraphQl/Users/UserType.cs
+++ b/backend/src/GraphQl/Users/UserType.cs
@@ -16,6 +16,7 @@
 using Metabase.Extensions;
 using Metabase.GraphQl.Entities;
 using Metabase.GraphQl.Extensions;
+using Metabase.GraphQl.OpenIdConnect.Applications;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using OpenIddict.Abstractions;
@@ -191,6 +192,36 @@ await Authorize(context, user => user.WebsiteLocator, Scopes.Profile)
                 )
             )
             .UseUserManager();
+        descriptor
+            .Field("authorizedOpenIdConnectConsentTypes")
+            .Cost(1)
+            .ResolveWith<UserResolvers>(x =>
+                UserResolvers.GetAuthorizedOpenIdConnectConsentTypesAsync(default!, default!, default!))
+            .UseUserManager();
+        descriptor
+            .Field("authorizedOpenIdConnectEndpoints")
+            .Cost(1)
+            .ResolveWith<UserResolvers>(x =>
+                UserResolvers.GetAuthorizedOpenIdConnectEndpointsAsync(default!, default!, default!))
+            .UseUserManager();
+        descriptor
+            .Field("authorizedOpenIdConnectGrantTypes")
+            .Cost(1)
+            .ResolveWith<UserResolvers>(x =>
+                UserResolvers.GetAuthorizedOpenIdConnectGrantTypesAsync(default!, default!, default!))
+            .UseUserManager();
+        descriptor
+            .Field("authorizedOpenIdConnectResponseTypes")
+            .Cost(1)
+            .ResolveWith<UserResolvers>(x =>
+                UserResolvers.GetAuthorizedOpenIdConnectResponseTypesAsync(default!, default!, default!))
+            .UseUserManager();
+        descriptor
+            .Field("authorizedOpenIdConnectScopes")
+            .Cost(1)
+            .ResolveWith<UserResolvers>(x =>
+                UserResolvers.GetAuthorizedOpenIdConnectScopesAsync(default!, default!, default!))
+            .UseUserManager();
         descriptor
             .Field("rolesCurrentUserCanAdd")
             .Cost(1)
@@ -371,5 +402,50 @@ [EnumeratorCancellation] CancellationToken cancellationToken
                 }
             }
         }
+
+        public static Task<IReadOnlyList<OpenIdConnectConsentType>> GetAuthorizedOpenIdConnectConsentTypesAsync(
+            ClaimsPrincipal claimsPrincipal,
+            Authorization.OpenIdConnectAuthorization authorization,
+            CancellationToken cancellationToken
+        )
+        {
+            return authorization.AuthorizedConsentTypes(claimsPrincipal, cancellationToken);
+        }
+
+        public static Task<IReadOnlyList<OpenIdConnectEndpoint>> GetAuthorizedOpenIdConnectEndpointsAsync(
+            ClaimsPrincipal claimsPrincipal,
+            Authorization.OpenIdConnectAuthorization authorization,
+            CancellationToken cancellationToken
+        )
+        {
+            return authorization.AuthorizedEndpoints(claimsPrincipal, cancellationToken);
+        }
+
+        public static Task<IReadOnlyList<OpenIdConnectGrantType>> GetAuthorizedOpenIdConnectGrantTypesAsync(
+            ClaimsPrincipal claimsPrincipal,
+            Authorization.OpenIdConnectAuthorization authorization,
+            CancellationToken cancellationToken
+        )
+        {
+            return authorization.AuthorizedGrantTypes(claimsPrincipal, cancellationToken);
+        }
+
+        public static Task<IReadOnlyList<OpenIdConnectResponseType>> GetAuthorizedOpenIdConnectResponseTypesAsync(
+            ClaimsPrincipal claimsPrincipal,
+            Authorization.OpenIdConnectAuthorization authorization,
+            CancellationToken cancellationToken
+        )
+        {
+            return authorization.AuthorizedResponseTypes(claimsPrincipal, cancellationToken);
+        }
+
+        public static Task<IReadOnlyList<GraphQl.OpenIdConnect.OpenIdConnectScope>> GetAuthorizedOpenIdConnectScopesAsync(
+            ClaimsPrincipal claimsPrincipal,
+            Authorization.OpenIdConnectAuthorization authorization,
+            CancellationToken cancellationToken
+        )
+        {
+            return authorization.AuthorizedScopes(claimsPrincipal, cancellationToken);
+        }
     }
 }
\ No newline at end of file
diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index 42d3ffe29..68e620d85 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -2663,6 +2663,11 @@ type UpdateOpenIdConnectApplicationPayload {
 }
 
 type User implements Node {
+  authorizedOpenIdConnectConsentTypes: [OpenIdConnectConsentType!]!
+  authorizedOpenIdConnectEndpoints: [OpenIdConnectEndpoint!]!
+  authorizedOpenIdConnectGrantTypes: [OpenIdConnectGrantType!]!
+  authorizedOpenIdConnectResponseTypes: [OpenIdConnectResponseType!]!
+  authorizedOpenIdConnectScopes: [OpenIdConnectScope!]!
   contact: ContactInformation @cost(weight: "0")
   developedMethods(
     "Returns the elements in the list that come after the specified cursor."
@@ -4710,6 +4715,10 @@ enum CreateMethodErrorCode {
 enum CreateOpenIdConnectApplicationErrorCode {
   DUPLICATE_CLIENT_ID
   ILLEGAL_CONSENT_TYPE
+  ILLEGAL_ENDPOINT
+  ILLEGAL_GRANT_TYPE
+  ILLEGAL_RESPONSE_TYPE
+  ILLEGAL_SCOPE
   UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
@@ -5179,6 +5188,10 @@ enum UpdateMethodErrorCode {
 
 enum UpdateOpenIdConnectApplicationErrorCode {
   ILLEGAL_CONSENT_TYPE
+  ILLEGAL_ENDPOINT
+  ILLEGAL_GRANT_TYPE
+  ILLEGAL_RESPONSE_TYPE
+  ILLEGAL_SCOPE
   UNAUTHORIZED
   UNKNOWN
   UNKNOWN_APPLICATION
diff --git a/frontend/components/EnumSelect.tsx b/frontend/components/EnumSelect.tsx
index 2bbbebdd5..6c6476c77 100644
--- a/frontend/components/EnumSelect.tsx
+++ b/frontend/components/EnumSelect.tsx
@@ -1,33 +1,52 @@
 import { Select, SelectProps } from "antd";
 import { humanize } from "../lib/string";
 
-export const allEnumSelectOptions = <T extends string | number>(
+export const allEnumValues = <T extends string | number>(
   enumObject: Record<string, T>,
-  filter?: (value: T) => boolean,
 ) =>
   Object.entries(enumObject)
-    // exclude reverse mappings
     .filter(([key]) => isNaN(Number(key)))
-    .filter(([_, value]) => filter?.(value) ?? true)
-    .map(([_, value]) => ({
+    .map(([_, value]) => value);
+
+export const allEnumSelectOptions = <T extends string | number>(
+  values: T[],
+  filter?: (value: T) => boolean,
+) =>
+  values
+    // exclude reverse mappings
+    .filter((value) => filter?.(value) ?? true)
+    .map((value) => ({
       label: humanize(String(value), "all-upper"),
       value: value,
     }));
 
-interface EnumSelectProps<T extends string | number> extends Omit<
+interface BaseProps<T extends string | number> extends Omit<
   SelectProps<T>,
   "options"
-> {
-  enumObject: Record<string, T>;
-  filter?: (value: T) => boolean;
-}
+> {}
+
+type EnumSelectProps<T extends string | number> =
+  | (BaseProps<T> & {
+      enumObject: Record<string, T>;
+      filter?: (value: T) => boolean;
+    })
+  | (BaseProps<T> & {
+      values: T[];
+    });
 
-export default function EnumSelect<T extends string | number>({
-  enumObject,
-  filter = () => true,
-  ...rest
-}: EnumSelectProps<T>) {
-  return (
-    <Select<T> {...rest} options={allEnumSelectOptions(enumObject, filter)} />
-  );
+export default function EnumSelect<T extends string | number>(
+  props: EnumSelectProps<T>,
+) {
+  if ("enumObject" in props) {
+    const { enumObject, filter, ...rest } = props;
+    return (
+      <Select<T>
+        {...rest}
+        options={allEnumSelectOptions(allEnumValues(enumObject))}
+      />
+    );
+  } else {
+    const { values, ...rest } = props;
+    return <Select<T> {...rest} options={allEnumSelectOptions(values)} />;
+  }
 }
diff --git a/frontend/components/NavBar.tsx b/frontend/components/NavBar.tsx
index b53a8feec..5be7e8baf 100644
--- a/frontend/components/NavBar.tsx
+++ b/frontend/components/NavBar.tsx
@@ -37,7 +37,7 @@ const userItems = (currentUser: CurrentUserPartialFragment) =>
   [
     currentUser?.isAuthorizedToManageOpenIdConnect && {
       key: paths.openIdConnect,
-      label: <Link href={paths.openIdConnect}>OpenId Connect</Link>,
+      label: <Link href={paths.openIdConnect}>OpenID Connect</Link>,
     },
     {
       key: paths.me.manage.home,
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index d00b088cf..a13e1d7e1 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -215,7 +215,7 @@ const getManagedTabs = (
     institution.openIdConnectApplications.isAuthorizedToAddEdge && {
       key: "openIdConnectApplications",
       count: institution.openIdConnectApplications.totalCount,
-      label: "OpenId Connect Applications",
+      label: "OpenID Connect Applications",
       children: (
         <PaginatedOpenIdConnectApplications
           where={{
diff --git a/frontend/components/institutions/InstitutionSummary.tsx b/frontend/components/institutions/InstitutionSummary.tsx
index 5ba9c2e02..b0b4e7cf2 100644
--- a/frontend/components/institutions/InstitutionSummary.tsx
+++ b/frontend/components/institutions/InstitutionSummary.tsx
@@ -107,7 +107,7 @@ export default function InstitutionSummary({
           it is verified, it will be listed on{" "}
           <Link href={paths.institutions}>Institutions</Link> and its
           representatives will be able to manage its components, databases, data
-          formats, methods, OpenId Connect applications, and other
+          formats, methods, OpenID Connect applications, and other
           representatives.
         </Typography.Paragraph>
       )}
diff --git a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
index a2cb55370..afee76bc5 100644
--- a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
@@ -14,7 +14,6 @@ import {
   OpenIdConnectScope,
   OpenIdConnectRequirement,
   Scalars,
-  UserRole,
 } from "../../../__generated__/graphql";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
 import { layout, tailLayout } from "../../../lib/form";
@@ -25,7 +24,10 @@ import EntityLink from "../../entities/EntityLink";
 import paths from "../../../paths";
 import CodeView from "../../CodeView";
 import RepresentedInstitutionIdSelect from "../../institutions/RepresentedInstitutionIdSelect";
-import EnumSelect, { allEnumSelectOptions } from "../../EnumSelect";
+import EnumSelect, {
+  allEnumSelectOptions,
+  allEnumValues,
+} from "../../EnumSelect";
 import { createPaginatedIdSelectOption } from "../../PaginatedIdSelect";
 import { CurrentUserDocument } from "../../../queries/currentUser.generated";
 
@@ -102,7 +104,7 @@ export default function CreateOpenIdConnectApplication({
             form.resetFields();
             setOpen(false);
             notification.success({
-              title: "Created OpenId-Connect Application",
+              title: "Created OpenID-Connect Application",
               placement: "top",
               showProgress: true,
               pauseOnHover: true,
@@ -151,11 +153,11 @@ export default function CreateOpenIdConnectApplication({
   return (
     <>
       <NewButton onClick={() => setOpen(true)}>
-        OpenId-Connect Application
+        OpenID-Connect Application
       </NewButton>
       <Modal
         open={open}
-        title="New OpenId-Connect Application"
+        title="New OpenID-Connect Application"
         // onOk={handleOk}
         onCancel={() => {
           setGlobalErrorMessages([]);
@@ -173,7 +175,7 @@ export default function CreateOpenIdConnectApplication({
           onFinishFailed={onFinishFailed}
         >
           <Form.Item
-            label="Client Id"
+            label="Client ID"
             name="clientId"
             rules={[{ required: true }]}
           >
@@ -193,11 +195,7 @@ export default function CreateOpenIdConnectApplication({
             initialValue={OpenIdConnectConsentType.Explicit}
           >
             <EnumSelect
-              enumObject={OpenIdConnectConsentType}
-              filter={(value) =>
-                value == OpenIdConnectConsentType.Explicit ||
-                (currentUser?.roles?.includes(UserRole.Administrator) ?? false)
-              }
+              values={currentUser?.authorizedOpenIdConnectConsentTypes ?? []}
               placeholder="Please select"
             />
           </Form.Item>
@@ -221,31 +219,31 @@ export default function CreateOpenIdConnectApplication({
             rules={[{ required: true }]}
           >
             <EnumSelect
-              enumObject={OpenIdConnectEndpoint}
+              values={currentUser?.authorizedOpenIdConnectEndpoints ?? []}
               mode="multiple"
               allowClear
               placeholder="Please select"
             />
           </Form.Item>
           <Form.Item
-            label="GrantTypes"
+            label="Grant Types"
             name="grantTypes"
             rules={[{ required: true }]}
           >
             <EnumSelect
-              enumObject={OpenIdConnectGrantType}
+              values={currentUser?.authorizedOpenIdConnectGrantTypes ?? []}
               mode="multiple"
               allowClear
               placeholder="Please select"
             />
           </Form.Item>
           <Form.Item
-            label="ResponseTypes"
+            label="Response Types"
             name="responseTypes"
             rules={[{ required: true }]}
           >
             <EnumSelect
-              enumObject={OpenIdConnectResponseType}
+              values={currentUser?.authorizedOpenIdConnectResponseTypes ?? []}
               mode="multiple"
               allowClear
               placeholder="Please select"
@@ -253,7 +251,7 @@ export default function CreateOpenIdConnectApplication({
           </Form.Item>
           <Form.Item label="Scopes" name="scopes" rules={[{ required: true }]}>
             <EnumSelect
-              enumObject={OpenIdConnectScope}
+              values={currentUser?.authorizedOpenIdConnectScopes ?? []}
               mode="multiple"
               allowClear
               placeholder="Please select"
@@ -263,7 +261,9 @@ export default function CreateOpenIdConnectApplication({
             label="Requirements"
             name="requirements"
             rules={[{ required: true }]}
-            initialValue={allEnumSelectOptions(OpenIdConnectRequirement)}
+            initialValue={allEnumSelectOptions(
+              allEnumValues(OpenIdConnectRequirement),
+            )}
           >
             <EnumSelect
               enumObject={OpenIdConnectRequirement}
diff --git a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
index 3c4584e97..024a9fea2 100644
--- a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
@@ -115,7 +115,7 @@ export default function UpdateOpenIdConnectApplication({
           onFinishFailed={onFinishFailed}
         >
           <Form.Item
-            label="ClientId"
+            label="Client ID"
             name="clientId"
             rules={[{ required: true }]}
             initialValue={application.name}
@@ -175,7 +175,7 @@ export default function UpdateOpenIdConnectApplication({
             />
           </Form.Item>
           <Form.Item
-            label="GrantTypes"
+            label="Grant Types"
             name="grantTypes"
             rules={[{ required: true }]}
             initialValue={application.grantTypes}
@@ -188,7 +188,7 @@ export default function UpdateOpenIdConnectApplication({
             />
           </Form.Item>
           <Form.Item
-            label="ResponseTypes"
+            label="Response Types"
             name="responseTypes"
             rules={[{ required: true }]}
             initialValue={application.responseTypes}
diff --git a/frontend/package.json b/frontend/package.json
index e465565e4..1eac3a7bc 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -43,7 +43,7 @@
     "@types/react-highlight-words": "^0.20.0",
     "@types/react-test-renderer": "^19.1.0",
     "babel-jest": "^30.2.0",
-    "baseline-browser-mapping": "^2.10.29",
+    "baseline-browser-mapping": "^2.10.30",
     "concurrently": "^9.2.1",
     "deepmerge": "^4.0",
     "eslint": "^10.1.0",
diff --git a/frontend/queries/currentUser.graphql b/frontend/queries/currentUser.graphql
index 392075125..4ee316f99 100644
--- a/frontend/queries/currentUser.graphql
+++ b/frontend/queries/currentUser.graphql
@@ -5,6 +5,11 @@ fragment CurrentUserPartial on User {
   hasPassword
   roles
   isAuthorizedToManageOpenIdConnect
+  authorizedOpenIdConnectConsentTypes
+  authorizedOpenIdConnectEndpoints
+  authorizedOpenIdConnectGrantTypes
+  authorizedOpenIdConnectResponseTypes
+  authorizedOpenIdConnectScopes
   contact {
     emailAddress
     isEmailAddressConfirmed
diff --git a/frontend/type-defs.graphqls b/frontend/type-defs.graphqls
index 42d3ffe29..68e620d85 100644
--- a/frontend/type-defs.graphqls
+++ b/frontend/type-defs.graphqls
@@ -2663,6 +2663,11 @@ type UpdateOpenIdConnectApplicationPayload {
 }
 
 type User implements Node {
+  authorizedOpenIdConnectConsentTypes: [OpenIdConnectConsentType!]!
+  authorizedOpenIdConnectEndpoints: [OpenIdConnectEndpoint!]!
+  authorizedOpenIdConnectGrantTypes: [OpenIdConnectGrantType!]!
+  authorizedOpenIdConnectResponseTypes: [OpenIdConnectResponseType!]!
+  authorizedOpenIdConnectScopes: [OpenIdConnectScope!]!
   contact: ContactInformation @cost(weight: "0")
   developedMethods(
     "Returns the elements in the list that come after the specified cursor."
@@ -4710,6 +4715,10 @@ enum CreateMethodErrorCode {
 enum CreateOpenIdConnectApplicationErrorCode {
   DUPLICATE_CLIENT_ID
   ILLEGAL_CONSENT_TYPE
+  ILLEGAL_ENDPOINT
+  ILLEGAL_GRANT_TYPE
+  ILLEGAL_RESPONSE_TYPE
+  ILLEGAL_SCOPE
   UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
@@ -5179,6 +5188,10 @@ enum UpdateMethodErrorCode {
 
 enum UpdateOpenIdConnectApplicationErrorCode {
   ILLEGAL_CONSENT_TYPE
+  ILLEGAL_ENDPOINT
+  ILLEGAL_GRANT_TYPE
+  ILLEGAL_RESPONSE_TYPE
+  ILLEGAL_SCOPE
   UNAUTHORIZED
   UNKNOWN
   UNKNOWN_APPLICATION
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index de737767b..7d1016399 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2960,10 +2960,10 @@ balanced-match@^4.0.2:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-4.0.4.tgz#bfb10662feed8196a2c62e7c68e17720c274179a"
   integrity sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==
 
-baseline-browser-mapping@^2.10.29:
-  version "2.10.29"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.29.tgz#47bdc13027af28d341f367a4f35a07ce872e27b4"
-  integrity sha512-Asa2krT+XTPZINCS+2QcyS8WTkObE77RwkydwF7h6DmnKqbvlalz93m/dnphUyCa6SWSP51VgtEUf2FN+gelFQ==
+baseline-browser-mapping@^2.10.30:
+  version "2.10.30"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.30.tgz#58915c74388b05f3b3504026194ea9fa98f6e6b6"
+  integrity sha512-xjOFN16Ha1+Rz4nFYKqHU/LSB+gx/Vi3yQLX7r7sAW+Wa+8hhF2h4pvqTrTMc8+WcDBEunnUurr46Jvv0jk3Vg==
 
 baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
   version "2.10.10"

From c3a76482df51b53c6ef13b09b86b8a46e7df1303 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Mon, 18 May 2026 20:00:27 +0200
Subject: [PATCH 043/145] Allow anyone with the write scope to read all OpenId
 Connect applications

---
 .../OpenIdConnectApplicationQueries.cs        | 17 ++++++++++-----
 .../UpdateOpenIdConnectApplication.tsx        |  9 ++++++--
 .../tokens/OpenIdConnectTokenList.tsx         |  9 +++++---
 .../tokens/OpenIdConnectTokenRibbon.tsx       | 21 +++++++++++++++++++
 .../tokens/OpenIdConnectTokenSummary.tsx      |  5 +----
 5 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 frontend/components/openIdConnect/tokens/OpenIdConnectTokenRibbon.tsx

diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
index 07f31a124..f2c0841ac 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
@@ -50,7 +50,13 @@ CancellationToken cancellationToken
     [UseFiltering<OpenIdConnectApplicationFilterType>]
     [UseSorting<OpenIdConnectApplicationSortType>]
     [UseUserManager]
-    [Authorize(Policy = AuthorizationPolicies.ManageOpenIdConnectScopePolicy)]
+    // The database reference implementation uses applications to restrict data
+    // access and checks if applications exist when restrictions are added.
+    // These checks should be possible even if the application cannot be
+    // managed. From a security perspective it may be better to provide a way
+    // to just check existence without getting any other information.
+    // TODO [Authorize(Policy = AuthorizationPolicies.ManageOpenIdConnectScopePolicy)]
+    [Authorize(Policy = AuthorizationPolicies.WriteScopePolicy)]
     public async ValueTask<HotChocolate.Types.Pagination.Connection<OpenIdConnectApplication>> GetOpenIdConnectApplicationsAsync(
         IResolverContext resolverContext,
         ApplicationDbContext databaseContext,
@@ -59,10 +65,11 @@ CancellationToken cancellationToken
         CancellationToken cancellationToken
     )
     {
-        if (!await authorization.IsAuthorizedToManageOpenIdConnect(claimsPrincipal, cancellationToken))
-        {
-            return HotChocolate.Types.Pagination.Connection.Empty<OpenIdConnectApplication>();
-        }
+        // TODO See comment and todo above
+        // if (!await authorization.IsAuthorizedToManageOpenIdConnect(claimsPrincipal, cancellationToken))
+        // {
+        //     return HotChocolate.Types.Pagination.Connection.Empty<OpenIdConnectApplication>();
+        // }
         return await databaseContext.OpenIdConnectApplications
             .AsNoTracking()
             .With(resolverContext.GetQueryContext<OpenIdConnectApplication>(), Sorting.DefaultEntityOrder)
diff --git a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
index 024a9fea2..87dddecdf 100644
--- a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
@@ -19,7 +19,10 @@ import { layout, tailLayout } from "../../../lib/form";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../../ErrorAlert";
 import EditButton from "../../EditButton";
-import EnumSelect, { allEnumSelectOptions } from "../../EnumSelect";
+import EnumSelect, {
+  allEnumSelectOptions,
+  allEnumValues,
+} from "../../EnumSelect";
 import { CurrentUserDocument } from "../../../queries/currentUser.generated";
 
 interface UpdateApplicationProps {
@@ -217,7 +220,9 @@ export default function UpdateOpenIdConnectApplication({
             label="Requirements"
             name="requirements"
             rules={[{ required: true }]}
-            initialValue={allEnumSelectOptions(OpenIdConnectRequirement)}
+            initialValue={allEnumSelectOptions(
+              allEnumValues(OpenIdConnectRequirement),
+            )}
           >
             <EnumSelect
               enumObject={OpenIdConnectRequirement}
diff --git a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx
index d68f39518..c41c06b43 100644
--- a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx
+++ b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx
@@ -2,6 +2,7 @@ import { OpenIdConnectTokensPartialFragment } from "../../../queries/openIdConne
 import EntityList from "../../entities/EntityList";
 import OpenIdConnectTokenSummary from "./OpenIdConnectTokenSummary";
 import EntityItem from "../../entities/EntityItem";
+import OpenIdConnectTokenRibbon from "./OpenIdConnectTokenRibbon";
 
 export default function OpenIdConnectTokenList({
   loading,
@@ -15,9 +16,11 @@ export default function OpenIdConnectTokenList({
       loading={loading}
       dataSource={nodes}
       renderItem={(node) => (
-        <EntityItem>
-          <OpenIdConnectTokenSummary entity={node} />
-        </EntityItem>
+        <OpenIdConnectTokenRibbon {...node}>
+          <EntityItem>
+            <OpenIdConnectTokenSummary entity={node} />
+          </EntityItem>
+        </OpenIdConnectTokenRibbon>
       )}
     />
   );
diff --git a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenRibbon.tsx b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenRibbon.tsx
new file mode 100644
index 000000000..3fe0ef885
--- /dev/null
+++ b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenRibbon.tsx
@@ -0,0 +1,21 @@
+import { Badge, Tooltip } from "antd";
+
+export default function OpticalIdConnectTokenRibbon({
+  type,
+  children,
+}: {
+  type?: string | null;
+  children: React.ReactNode;
+}) {
+  return type == null ? (
+    children
+  ) : (
+    <Badge.Ribbon
+      placement="end"
+      text={<Tooltip title={type}>{type.split(":").pop()}</Tooltip>}
+      style={{ textTransform: "lowercase", fontWeight: "normal" }}
+    >
+      {children}
+    </Badge.Ribbon>
+  );
+}
diff --git a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx
index 8c253d3d9..693413460 100644
--- a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx
+++ b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenSummary.tsx
@@ -52,10 +52,7 @@ export default function OpenIdConnectTokenSummary({
   return (
     <EntitySummary
       entity={entity}
-      tags={[
-        <Tag key="status">{entity.status}</Tag>,
-        <Tag key="type">{entity.type}</Tag>,
-      ]}
+      tags={[<Tag key="status">{entity.status}</Tag>]}
       extra={
         !hideInputControls &&
         [

From 8abb59d797682265c91469b7bea695328df15e5b Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 19 May 2026 12:18:48 +0200
Subject: [PATCH 044/145] Rename count-only pending databases/institutions
 queries (otherwise its response is used for the actual pending* queries)

---
 frontend/components/databases/PendingDatabaseList.tsx | 3 +++
 frontend/components/users/User.tsx                    | 4 ++--
 frontend/pages/databases/index.tsx                    | 4 ++--
 frontend/queries/currentUser.graphql                  | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/frontend/components/databases/PendingDatabaseList.tsx b/frontend/components/databases/PendingDatabaseList.tsx
index 8f4a1e5b8..00df38322 100644
--- a/frontend/components/databases/PendingDatabaseList.tsx
+++ b/frontend/components/databases/PendingDatabaseList.tsx
@@ -9,6 +9,9 @@ export default function PendingDatabaseList() {
   const { data, loading, error } = useQuery(PendingDatabasesDocument);
   useQueryHandler({ error });
   const nodes = data?.pendingDatabases?.edges?.map((e) => e.node) || [];
+  console.error(loading);
+  console.error(data);
+  console.error(error);
 
   return (
     <EntityList
diff --git a/frontend/components/users/User.tsx b/frontend/components/users/User.tsx
index 61134de58..adbd15a17 100644
--- a/frontend/components/users/User.tsx
+++ b/frontend/components/users/User.tsx
@@ -30,13 +30,13 @@ const getPendingTabsOfUser = (
     user.roles?.includes(UserRole.Verifier) && {
       key: "institutions",
       label: "Institutions",
-      count: currentUserData?.pendingInstitutions?.totalCount,
+      count: currentUserData?.pendingInstitutionCount?.totalCount,
       children: <PendingInstitutionList />,
     },
     user.roles?.includes(UserRole.Administrator) && {
       key: "databases",
       label: "Databases",
-      count: currentUserData?.pendingDatabases?.totalCount,
+      count: currentUserData?.pendingDatabaseCount?.totalCount,
       children: <PendingDatabaseList />,
     },
   ].filter(isTruthy);
diff --git a/frontend/pages/databases/index.tsx b/frontend/pages/databases/index.tsx
index d21eaa0d1..85579582a 100644
--- a/frontend/pages/databases/index.tsx
+++ b/frontend/pages/databases/index.tsx
@@ -26,8 +26,8 @@ export default function Page() {
         provides all information about databases.
       </Typography.Paragraph>
       {currentUser?.roles?.includes(UserRole.Administrator) &&
-        currentUserData?.pendingDatabases &&
-        currentUserData.pendingDatabases.totalCount > 0 && (
+        currentUserData?.pendingDatabaseCount &&
+        currentUserData.pendingDatabaseCount.totalCount > 0 && (
           <div>
             <Divider />
             <Typography.Title level={4}>Pending Databases</Typography.Title>
diff --git a/frontend/queries/currentUser.graphql b/frontend/queries/currentUser.graphql
index 4ee316f99..c09ad70ba 100644
--- a/frontend/queries/currentUser.graphql
+++ b/frontend/queries/currentUser.graphql
@@ -38,10 +38,10 @@ query CurrentUser {
   currentUser {
     ...CurrentUserPartial
   }
-  pendingDatabases {
+  pendingDatabaseCount: pendingDatabases {
     totalCount
   }
-  pendingInstitutions {
+  pendingInstitutionCount: pendingInstitutions {
     totalCount
   }
 }

From 5249d417f8f80cbb716346c645fe370a8dbed5de Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 19 May 2026 12:29:16 +0200
Subject: [PATCH 045/145] Allow supporters to add suporters

---
 backend/src/Authorization/UserAuthorization.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/src/Authorization/UserAuthorization.cs b/backend/src/Authorization/UserAuthorization.cs
index b94c1a996..f7d702646 100644
--- a/backend/src/Authorization/UserAuthorization.cs
+++ b/backend/src/Authorization/UserAuthorization.cs
@@ -70,6 +70,8 @@ CancellationToken cancellationToken
                     await CanAdministrate(user, claimsPrincipal),
                 UserRole.VERIFIER =>
                     await CanVerify(user, claimsPrincipal),
+                UserRole.SUPPORTER =>
+                    await CanSupport(user, claimsPrincipal),
                 _ => throw new ArgumentOutOfRangeException(nameof(role), $"Unknown role `{role}.`")
             },
             application => Task.FromResult(false),

From ce7300647f001d335e412dff5129c3a2c285572f Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 19 May 2026 12:57:00 +0200
Subject: [PATCH 046/145] Always load pending databases and institutions to
 avoid caching issues

---
 .../components/databases/PendingDatabaseList.tsx   |  8 ++++----
 .../institutions/PendingInstitutionList.tsx        |  5 ++++-
 frontend/lib/hooks/usePaginatedQuery.ts            | 14 ++++++--------
 frontend/package.json                              |  2 +-
 frontend/yarn.lock                                 |  8 ++++----
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/frontend/components/databases/PendingDatabaseList.tsx b/frontend/components/databases/PendingDatabaseList.tsx
index 00df38322..3a59cc14a 100644
--- a/frontend/components/databases/PendingDatabaseList.tsx
+++ b/frontend/components/databases/PendingDatabaseList.tsx
@@ -6,12 +6,12 @@ import EntityItem from "../entities/EntityItem";
 import DatabaseSummary from "./DatabaseSummary";
 
 export default function PendingDatabaseList() {
-  const { data, loading, error } = useQuery(PendingDatabasesDocument);
+  const { data, loading, error } = useQuery(PendingDatabasesDocument, {
+    // always fetch instead of erroneously using the cached pending databases that contain only the total count coming from `query CurrentUser`
+    fetchPolicy: "network-only",
+  });
   useQueryHandler({ error });
   const nodes = data?.pendingDatabases?.edges?.map((e) => e.node) || [];
-  console.error(loading);
-  console.error(data);
-  console.error(error);
 
   return (
     <EntityList
diff --git a/frontend/components/institutions/PendingInstitutionList.tsx b/frontend/components/institutions/PendingInstitutionList.tsx
index 1923c9af9..b5c62fe55 100644
--- a/frontend/components/institutions/PendingInstitutionList.tsx
+++ b/frontend/components/institutions/PendingInstitutionList.tsx
@@ -6,7 +6,10 @@ import EntityItem from "../entities/EntityItem";
 import InstitutionSummary from "./InstitutionSummary";
 
 export default function PendingInstitutionList() {
-  const { data, loading, error } = useQuery(PendingInstitutionsDocument);
+  const { data, loading, error } = useQuery(PendingInstitutionsDocument, {
+    // always fetch instead of erroneously using the cached pending institutions that contain only the total count coming from `query CurrentUser`
+    fetchPolicy: "network-only",
+  });
   useQueryHandler({ error });
   const nodes = data?.pendingInstitutions?.edges?.map((e) => e.node) || [];
 
diff --git a/frontend/lib/hooks/usePaginatedQuery.ts b/frontend/lib/hooks/usePaginatedQuery.ts
index 43e61b9cd..4c173c93c 100644
--- a/frontend/lib/hooks/usePaginatedQuery.ts
+++ b/frontend/lib/hooks/usePaginatedQuery.ts
@@ -1,4 +1,4 @@
-import { useState, useMemo, useEffect, useRef } from "react";
+import { useState, useMemo, useEffect } from "react";
 import { TypedDocumentNode } from "@apollo/client";
 import { useQuery } from "@apollo/client/react";
 import { Connection } from "../connection";
@@ -50,7 +50,7 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
   const [pageSize, setPageSize] = useState(initialPageSize);
   const [afterCursors, setAfterCursors] = useState<(string | null)[]>([null]);
   const [fetching, setFetching] = useState<Fetching | null>(Fetching.INITIAL);
-  const hasLoadedInitially = useRef(false);
+  const [hasLoadedOnce, setHasLoadedOnce] = useState(false);
 
   const variables = {
     first: pageSize,
@@ -67,12 +67,10 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
     console.error("Paginated query failed", error);
   }
 
-  useEffect(() => {
-    if (!loading && !hasLoadedInitially.current) {
-      setFetching(null);
-      hasLoadedInitially.current = true;
-    }
-  }, [loading]);
+  if (!hasLoadedOnce && !loading) {
+    setFetching(null);
+    setHasLoadedOnce(true);
+  }
 
   // Reset: If where OR order change, jump back to page 1
   useEffect(() => {
diff --git a/frontend/package.json b/frontend/package.json
index 1eac3a7bc..fefb233c4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -43,7 +43,7 @@
     "@types/react-highlight-words": "^0.20.0",
     "@types/react-test-renderer": "^19.1.0",
     "babel-jest": "^30.2.0",
-    "baseline-browser-mapping": "^2.10.30",
+    "baseline-browser-mapping": "^2.10.31",
     "concurrently": "^9.2.1",
     "deepmerge": "^4.0",
     "eslint": "^10.1.0",
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 7d1016399..f51f93bc2 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2960,10 +2960,10 @@ balanced-match@^4.0.2:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-4.0.4.tgz#bfb10662feed8196a2c62e7c68e17720c274179a"
   integrity sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==
 
-baseline-browser-mapping@^2.10.30:
-  version "2.10.30"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.30.tgz#58915c74388b05f3b3504026194ea9fa98f6e6b6"
-  integrity sha512-xjOFN16Ha1+Rz4nFYKqHU/LSB+gx/Vi3yQLX7r7sAW+Wa+8hhF2h4pvqTrTMc8+WcDBEunnUurr46Jvv0jk3Vg==
+baseline-browser-mapping@^2.10.31:
+  version "2.10.31"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.31.tgz#9c6825f052601ce6974a90dd49683b1726887b0b"
+  integrity sha512-MujYO3eP72uvmSE0i4wltsodRfIpZATP3jvzRNRGGxgzId7aVocVJJV3nf01qnzzKFGxQVC9bpWxl5cjxTr/7Q==
 
 baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
   version "2.10.10"

From f5b355a64bf9df19b25daa3b8394b784d70311a0 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 19 May 2026 14:47:54 +0200
Subject: [PATCH 047/145] Upgrade frontend and backend dependencies

---
 backend/src/Metabase.csproj        |   28 +-
 backend/test/Metabase.Tests.csproj |    4 +-
 frontend/package.json              |   10 +-
 frontend/yarn.lock                 | 2969 ++++++++++++++--------------
 4 files changed, 1553 insertions(+), 1458 deletions(-)

diff --git a/backend/src/Metabase.csproj b/backend/src/Metabase.csproj
index 0142e8dd5..331ef67e2 100644
--- a/backend/src/Metabase.csproj
+++ b/backend/src/Metabase.csproj
@@ -13,21 +13,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EntityFrameworkCore.Projectables" Version="6.0.4" />
+    <PackageReference Include="EntityFrameworkCore.Projectables" Version="6.0.5" />
     <PackageReference Include="AspNetCore.HealthChecks.OpenIdConnectServer" Version="9.0.0" />
     <PackageReference Include="GraphQL.Client" Version="6.1.0" />
     <PackageReference Include="GraphQL.Client.Serializer.SystemTextJson" Version="6.1.0" />
-    <PackageReference Include="HotChocolate" Version="16.0.2" />
-    <PackageReference Include="HotChocolate.AspNetCore" Version="16.0.2" />
-    <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="16.0.2" />
-    <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="16.0.2" />
-    <PackageReference Include="HotChocolate.Data" Version="16.0.2" />
-    <PackageReference Include="HotChocolate.Data.EntityFramework" Version="16.0.2" />
-    <PackageReference Include="HotChocolate.Diagnostics" Version="16.0.2" />
-    <PackageReference Include="HotChocolate.PersistedOperations.InMemory" Version="16.0.2" />
-    <PackageReference Include="HotChocolate.Types.Analyzers" Version="16.0.2" />
-    <PackageReference Include="HotChocolate.Types.NodaTime" Version="16.0.2" />
-    <PackageReference Include="HotChocolate.Types.Scalars" Version="16.0.2" />
+    <PackageReference Include="HotChocolate" Version="16.0.4" />
+    <PackageReference Include="HotChocolate.AspNetCore" Version="16.0.4" />
+    <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="16.0.4" />
+    <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="16.0.4" />
+    <PackageReference Include="HotChocolate.Data" Version="16.0.4" />
+    <PackageReference Include="HotChocolate.Data.EntityFramework" Version="16.0.4" />
+    <PackageReference Include="HotChocolate.Diagnostics" Version="16.0.4" />
+    <PackageReference Include="HotChocolate.PersistedOperations.InMemory" Version="16.0.4" />
+    <PackageReference Include="HotChocolate.Types.Analyzers" Version="16.0.4" />
+    <PackageReference Include="HotChocolate.Types.NodaTime" Version="16.0.4" />
+    <PackageReference Include="HotChocolate.Types.Scalars" Version="16.0.4" />
     <PackageReference Include="IdentityModel" Version="7.0.0" />
     <PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="10.0.11" />
     <PackageReference Include="MailKit" Version="4.16.0" />
@@ -60,8 +60,8 @@
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
     <PackageReference Include="Quartz" Version="3.18.1" />
     <PackageReference Include="Quartz.AspNetCore" Version="3.18.1" />
-    <PackageReference Include="Scalar.AspNetCore" Version="2.14.11" />
-    <PackageReference Include="Scalar.AspNetCore.Microsoft" Version="2.14.11" />
+    <PackageReference Include="Scalar.AspNetCore" Version="2.14.14" />
+    <PackageReference Include="Scalar.AspNetCore.Microsoft" Version="2.14.14" />
     <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
     <PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
diff --git a/backend/test/Metabase.Tests.csproj b/backend/test/Metabase.Tests.csproj
index e154a802c..b7b746844 100644
--- a/backend/test/Metabase.Tests.csproj
+++ b/backend/test/Metabase.Tests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
     <PackageReference Include="NodaTime.Testing" Version="3.3.2" />
-    <PackageReference Include="NUnit" Version="4.6.0" />
+    <PackageReference Include="NUnit" Version="4.6.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.13.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -25,7 +25,7 @@
     <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
     <PackageReference Include="Serilog.Sinks.NUnit" Version="1.0.3" />
     <PackageReference Include="Snapshooter.NUnit" Version="1.3.1" />
-    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.6.2" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.7.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/frontend/package.json b/frontend/package.json
index fefb233c4..372744ee1 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -31,12 +31,12 @@
   },
   "devDependencies": {
     "@babel/core": "^7.0",
-    "@graphql-codegen/cli": "^6.0.2",
-    "@graphql-codegen/fragment-matcher": "^6.0.0",
+    "@graphql-codegen/cli": "^7.0.0",
+    "@graphql-codegen/fragment-matcher": "^7.0.0",
     "@graphql-codegen/near-operation-file-preset": "^5.0.0",
-    "@graphql-codegen/typescript": "^5.0.4",
+    "@graphql-codegen/typescript": "^6.0.1",
     "@graphql-codegen/typescript-apollo-client-helpers": "^4.0.0",
-    "@graphql-codegen/typescript-operations": "^5.0.4",
+    "@graphql-codegen/typescript-operations": "^6.0.2",
     "@types/node": "^24.10.1",
     "@types/react": "^19.2.5",
     "@types/react-dom": "^19.2.3",
@@ -54,7 +54,7 @@
     "prettier": "^3.3.2",
     "react-test-renderer": "^19.2.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4",
+    "typescript": "^6.0.3",
     "yaml-loader": "^0.9.0"
   },
   "browserslist": {
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index f51f93bc2..60761e3c8 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@ant-design/colors@^8.0.0", "@ant-design/colors@^8.0.1":
+"@ant-design/colors@^8.0.1":
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-8.0.1.tgz#6b5444f2ab4061c7b1aa4bc776adb023b0253161"
   integrity sha512-foPVl0+SWIslGUtD/xBr1p9U4AKzPhNYEseXYRRo5QSzGACYZrQbe11AYJbYfAWnWSpGBx6JjBmSeugUsD9vqQ==
@@ -36,19 +36,19 @@
   resolved "https://registry.yarnpkg.com/@ant-design/fast-color/-/fast-color-3.0.1.tgz#fee56b95427c0b55b216c93d9a7f3473f31615b5"
   integrity sha512-esKJegpW4nckh0o6kV3Tkb7NPIZYbPnnFxmQDUmL08ukXZAvV85TZBr70eGuke/CIArLaP6aw8lt9KILjnWuOw==
 
-"@ant-design/icons-svg@^4.4.0":
+"@ant-design/icons-svg@^4.4.2":
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz#ed2be7fb4d82ac7e1d45a54a5b06d6cecf8be6f6"
   integrity sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==
 
-"@ant-design/icons@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-6.1.0.tgz#97cc14a3c0528b8e2b37f41f232b019f2ca38c2c"
-  integrity sha512-KrWMu1fIg3w/1F2zfn+JlfNDU8dDqILfA5Tg85iqs1lf8ooyGlbkA+TkwfOKKgqpUmAiRY1PTFpuOU2DAIgSUg==
+"@ant-design/icons@^6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-6.2.3.tgz#66e1c7fdea009b9c3fab6964062bedc76f308ad8"
+  integrity sha512-Pl3aoAtxQeKryYnt6VvDJtOxMOtA8wrRSACe/pTjOAIG3fdHrWm6Ivb4ku9tsFjYroSXBKirvuxG4QkwBXD9gg==
   dependencies:
-    "@ant-design/colors" "^8.0.0"
-    "@ant-design/icons-svg" "^4.4.0"
-    "@rc-component/util" "^1.3.0"
+    "@ant-design/colors" "^8.0.1"
+    "@ant-design/icons-svg" "^4.4.2"
+    "@rc-component/util" "^1.10.1"
     clsx "^2.1.1"
 
 "@ant-design/react-slick@~2.0.0":
@@ -62,9 +62,9 @@
     throttle-debounce "^5.0.0"
 
 "@apollo/client@^4.0.9":
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-4.1.6.tgz#6eff1cfc09b1a2ef15f4f46471e6767958e109f7"
-  integrity sha512-ak8uzqmKeX3u9BziGf83RRyODAJKFkPG72hTNvEj4WjMWFmuKW2gGN1i3OfajKT6yuGjvo+n23ES2zqWDKFCZg==
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-4.1.9.tgz#797186c27ad98f728e40a7e33b7539675d1509b7"
+  integrity sha512-qfpkQD51tdU/7iAR6aLb4w9o/L7I475DluWHRb61U/3Q0AH29nNOxOBHjBbWDdf16ncPOoQuxne1sEs2NjqBFw==
   dependencies:
     "@graphql-typed-document-node/core" "^3.1.1"
     "@wry/caches" "^1.0.0"
@@ -74,12 +74,12 @@
     optimism "^0.18.0"
     tslib "^2.3.0"
 
-"@ardatan/relay-compiler@^13.0.0":
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/@ardatan/relay-compiler/-/relay-compiler-13.0.0.tgz#20038e20b0ce751947d8e142b6b45e322d90f2bd"
-  integrity sha512-ite4+xng5McO8MflWCi0un0YmnorTujsDnfPfhzYzAgoJ+jkI1pZj6jtmTl8Jptyi1H+Pa0zlatJIsxDD++ETA==
+"@ardatan/relay-compiler@^13.0.1":
+  version "13.0.1"
+  resolved "https://registry.yarnpkg.com/@ardatan/relay-compiler/-/relay-compiler-13.0.1.tgz#b00a4c1f986156fa2472db8036e9087877d37be3"
+  integrity sha512-afG3YPwuSA0E5foouZusz5GlXKs74dObv4cuWyLyfKsYFj2r7oGRNB28v18HvwuLSQtQFCi+DpIe0TZkgQDYyg==
   dependencies:
-    "@babel/runtime" "^7.26.10"
+    "@babel/runtime" "^7.29.2"
     immutable "^5.1.5"
     invariant "^2.2.4"
 
@@ -93,11 +93,11 @@
     picocolors "^1.1.1"
 
 "@babel/compat-data@^7.28.6":
-  version "7.29.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.0.tgz#00d03e8c0ac24dd9be942c5370990cbe1f17d88d"
-  integrity sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==
+  version "7.29.3"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.3.tgz#e3f5347f0589596c91d227ccb6a541d37fb1307b"
+  integrity sha512-LIVqM46zQWZhj17qA8wb4nW/ixr2y1Nw+r1etiAWgRM6U1IqP+LNhL1yg440jYZR72jCWcWbLWzIosH+uP1fqg==
 
-"@babel/core@^7.0", "@babel/core@^7.23.9", "@babel/core@^7.24.4", "@babel/core@^7.26.10", "@babel/core@^7.27.4":
+"@babel/core@^7.0", "@babel/core@^7.23.9", "@babel/core@^7.24.4", "@babel/core@^7.27.4", "@babel/core@^7.28.6":
   version "7.29.0"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.29.0.tgz#5286ad785df7f79d656e88ce86e650d16ca5f322"
   integrity sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==
@@ -190,10 +190,10 @@
     "@babel/template" "^7.28.6"
     "@babel/types" "^7.29.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.4", "@babel/parser@^7.26.10", "@babel/parser@^7.28.6", "@babel/parser@^7.29.0":
-  version "7.29.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.2.tgz#58bd50b9a7951d134988a1ae177a35ef9a703ba1"
-  integrity sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.4", "@babel/parser@^7.28.6", "@babel/parser@^7.29.0", "@babel/parser@^7.29.2":
+  version "7.29.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.3.tgz#116f70a77958307fceac27747573032f8a62f88e"
+  integrity sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==
   dependencies:
     "@babel/types" "^7.29.0"
 
@@ -323,7 +323,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.28.6"
 
-"@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.18.0", "@babel/runtime@^7.20.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.24.4", "@babel/runtime@^7.24.7", "@babel/runtime@^7.26.10", "@babel/runtime@^7.28.4":
+"@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.18.0", "@babel/runtime@^7.20.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.24.4", "@babel/runtime@^7.24.7", "@babel/runtime@^7.28.4", "@babel/runtime@^7.29.2":
   version "7.29.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.29.2.tgz#9a6e2d05f4b6692e1801cd4fb176ad823930ed5e"
   integrity sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==
@@ -370,25 +370,25 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@emnapi/core@^1.4.3":
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.9.1.tgz#2143069c744ca2442074f8078462e51edd63c7bd"
-  integrity sha512-mukuNALVsoix/w1BJwFzwXBN/dHeejQtuVzcDsfOEsdpCumXb/E9j8w11h5S54tT1xhifGfbbSm/ICrObRb3KA==
+"@emnapi/core@1.10.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.10.0.tgz#380ccc8f2412ea22d1d972df7f8ee23a3b9c7467"
+  integrity sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==
   dependencies:
-    "@emnapi/wasi-threads" "1.2.0"
+    "@emnapi/wasi-threads" "1.2.1"
     tslib "^2.4.0"
 
-"@emnapi/runtime@^1.4.3", "@emnapi/runtime@^1.7.0":
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.9.1.tgz#115ff2a0d589865be6bd8e9d701e499c473f2a8d"
-  integrity sha512-VYi5+ZVLhpgK4hQ0TAjiQiZ6ol0oe4mBx7mVv7IflsiEp0OWoVsp/+f9Vc1hOhE0TtkORVrI1GvzyreqpgWtkA==
+"@emnapi/runtime@1.10.0", "@emnapi/runtime@^1.7.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.10.0.tgz#4b260c0d3534204e98c6110b8db1a987d26ec87c"
+  integrity sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==
   dependencies:
     tslib "^2.4.0"
 
-"@emnapi/wasi-threads@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.2.0.tgz#a19d9772cc3d195370bf6e2a805eec40aa75e18e"
-  integrity sha512-N10dEJNSsUx41Z6pZsXU8FjPjpBEplgH24sfkmITrBED1/U2Esum9F3lfLrMjKHHjmi557zQn7kR9R+XWXu5Rg==
+"@emnapi/wasi-threads@1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz#28fed21a1ba1ce797c44a070abc94d42f3ae8548"
+  integrity sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==
   dependencies:
     tslib "^2.4.0"
 
@@ -440,40 +440,40 @@
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz#bccdf615bcf7b6e8db830ec0b8d21c9a25de597b"
   integrity sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==
 
-"@eslint/config-array@^0.23.3":
-  version "0.23.3"
-  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.23.3.tgz#3f4a93dd546169c09130cbd10f2415b13a20a219"
-  integrity sha512-j+eEWmB6YYLwcNOdlwQ6L2OsptI/LO6lNBuLIqe5R7RetD658HLoF+Mn7LzYmAWWNNzdC6cqP+L6r8ujeYXWLw==
+"@eslint/config-array@^0.23.5":
+  version "0.23.5"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.23.5.tgz#56e86d243049195d8acc0c06a1b3dfdc3fa3de95"
+  integrity sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==
   dependencies:
-    "@eslint/object-schema" "^3.0.3"
+    "@eslint/object-schema" "^3.0.5"
     debug "^4.3.1"
     minimatch "^10.2.4"
 
-"@eslint/config-helpers@^0.5.3":
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.5.3.tgz#721fe6bbb90d74b0c80d6ff2428e5bbcb002becb"
-  integrity sha512-lzGN0onllOZCGroKJmRwY6QcEHxbjBw1gwB8SgRSqK8YbbtEXMvKynsXc3553ckIEBxsbMBU7oOZXKIPGZNeZw==
+"@eslint/config-helpers@^0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.6.0.tgz#ef9a36881d39dfd5dbeac22b0da997fabfb08b03"
+  integrity sha512-ii6Bw9jJ2zi2cWA2Z+9/QZ/+3DX6kwaV5Q986D/CdP3Lap3w/pgQZ373FV7byY/i7L4IRH/G43I5dz1ClsCbpA==
   dependencies:
-    "@eslint/core" "^1.1.1"
+    "@eslint/core" "^1.2.1"
 
-"@eslint/core@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-1.1.1.tgz#450f3d2be2d463ccd51119544092256b4e88df32"
-  integrity sha512-QUPblTtE51/7/Zhfv8BDwO0qkkzQL7P/aWWbqcf4xWLEYn1oKjdO0gglQBB4GAsu7u6wjijbCmzsUTy6mnk6oQ==
+"@eslint/core@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-1.2.1.tgz#c1da7cd1b82fa8787f98b5629fb811848a1b63ce"
+  integrity sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==
   dependencies:
     "@types/json-schema" "^7.0.15"
 
-"@eslint/object-schema@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-3.0.3.tgz#5bf671e52e382e4adc47a9906f2699374637db6b"
-  integrity sha512-iM869Pugn9Nsxbh/YHRqYiqd23AmIbxJOcpUMOuWCVNdoQJ5ZtwL6h3t0bcZzJUlC3Dq9jCFCESBZnX0GTv7iQ==
+"@eslint/object-schema@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-3.0.5.tgz#88e9bf4d11d2b19c082e78ebe7ce88724a5eb091"
+  integrity sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==
 
-"@eslint/plugin-kit@^0.6.1":
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.6.1.tgz#eb9e6689b56ce8bc1855bb33090e63f3fc115e8e"
-  integrity sha512-iH1B076HoAshH1mLpHMgwdGeTs0CYwL0SPMkGuSebZrwBp16v415e9NZXg2jtrqPVQjf6IANe2Vtlr5KswtcZQ==
+"@eslint/plugin-kit@^0.7.1":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.7.1.tgz#c4125fd015eceeb09b793109fdbcd4dd0a02d346"
+  integrity sha512-rZAP3aVgB9ds9KOeUSL+zZ21hPmo8dh6fnIFwRQj5EAZl9gzR7wxYbYXYysAM8CTqGmUGyp2S4kUdV17MnGuWQ==
   dependencies:
-    "@eslint/core" "^1.1.1"
+    "@eslint/core" "^1.2.1"
     levn "^0.4.1"
 
 "@fastify/busboy@^3.1.1":
@@ -481,25 +481,25 @@
   resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-3.2.0.tgz#13ed8212f3b9ba697611529d15347f8528058cea"
   integrity sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==
 
-"@graphql-codegen/add@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-6.0.0.tgz#d195051d7c4bd6d3955a92361cc9eec7784bb541"
-  integrity sha512-biFdaURX0KTwEJPQ1wkT6BRgNasqgQ5KbCI1a3zwtLtO7XTo7/vKITPylmiU27K5DSOWYnY/1jfSqUAEBuhZrQ==
+"@graphql-codegen/add@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-7.0.0.tgz#ec4854030d2e091dd2f8abf8ede7fd1f73364b19"
+  integrity sha512-fQGlUQd0BpoevCTOKi3b7M+kuXCI13udXmJrIh1QMtTCLXUTYGgsubNVcPLr0cVjVwyBK/ZRgwtxdCmkVXqTwQ==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^6.0.0"
-    tslib "~2.6.0"
+    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    tslib "^2.8.0"
 
-"@graphql-codegen/cli@^6.0.2":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-6.2.1.tgz#c9f4e6ee180bafa433cd635d5e30d27ed9c0c900"
-  integrity sha512-E1B+5nBda2l89Pci5M0HcEj2Hmx2yhORFX+1T3rmwpQjdOiulo+h9JifWxKomUpjfbmU1YkBSd47CCGLFPU10A==
+"@graphql-codegen/cli@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-7.0.0.tgz#58c5d6a877a7bfe82c40185d9835027ffc5fae6d"
+  integrity sha512-SNgTiFU/jB3VJLr8koJjmXAwl60wG/9r5iQBiOmlf0m9KRaiCNmfDG6+VbeejJPkDIGJKQd0SwqV5i+fxdnjqA==
   dependencies:
     "@babel/generator" "^7.18.13"
     "@babel/template" "^7.18.10"
     "@babel/types" "^7.18.13"
-    "@graphql-codegen/client-preset" "^5.2.4"
-    "@graphql-codegen/core" "^5.0.1"
-    "@graphql-codegen/plugin-helpers" "^6.2.0"
+    "@graphql-codegen/client-preset" "^6.0.0"
+    "@graphql-codegen/core" "^6.0.0"
+    "@graphql-codegen/plugin-helpers" "^7.0.0"
     "@graphql-tools/apollo-engine-loader" "^8.0.28"
     "@graphql-tools/code-file-loader" "^8.1.28"
     "@graphql-tools/git-loader" "^8.0.32"
@@ -510,157 +510,167 @@
     "@graphql-tools/merge" "^9.0.6"
     "@graphql-tools/url-loader" "^9.0.6"
     "@graphql-tools/utils" "^11.0.0"
-    "@inquirer/prompts" "^7.8.2"
+    "@inquirer/prompts" "^8.3.2"
     "@whatwg-node/fetch" "^0.10.0"
-    chalk "^4.1.0"
+    chalk "^5.6.0"
     cosmiconfig "^9.0.0"
-    debounce "^2.0.0"
-    detect-indent "^6.0.0"
+    debounce "^3.0.0"
+    detect-indent "^7.0.0"
     graphql-config "^5.1.6"
     is-glob "^4.0.1"
     jiti "^2.3.0"
     json-to-pretty-yaml "^1.2.2"
-    listr2 "^9.0.0"
-    log-symbols "^4.0.0"
+    listr2 "^10.2.1"
+    log-symbols "^7.0.0"
     micromatch "^4.0.5"
     shell-quote "^1.7.3"
     string-env-interpolation "^1.0.1"
-    ts-log "^2.2.3"
+    ts-log "^3.0.0"
     tslib "^2.4.0"
     yaml "^2.3.1"
-    yargs "^17.0.0"
+    yargs "^18.0.0"
 
-"@graphql-codegen/client-preset@^5.2.4":
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/client-preset/-/client-preset-5.2.4.tgz#f5096cfd19d8726a6282ec07640c7e5411196755"
-  integrity sha512-k4f9CoepkVznXRReCHBVnG/FeQVQgIOhgtkaJ6I9FcQRzUkrm9ASmQjOdNdMlZt0DHTU4nbVxIBGZW7gk1RavA==
+"@graphql-codegen/client-preset@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/client-preset/-/client-preset-6.0.0.tgz#bc95bb9abbebe7d1c96245af787022c488fcd442"
+  integrity sha512-nqidNH4rrulv0E2ZVkYcIWz5Jon+hLBKkx/Xp8KyRJ8WnNRD0kJO1ra8ECLU/JS8LuZehSJyCfoQh555TT5TEw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/template" "^7.20.7"
-    "@graphql-codegen/add" "^6.0.0"
-    "@graphql-codegen/gql-tag-operations" "5.1.4"
-    "@graphql-codegen/plugin-helpers" "^6.1.1"
-    "@graphql-codegen/typed-document-node" "^6.1.7"
-    "@graphql-codegen/typescript" "^5.0.9"
-    "@graphql-codegen/typescript-operations" "^5.0.9"
-    "@graphql-codegen/visitor-plugin-common" "^6.2.4"
+    "@graphql-codegen/add" "^7.0.0"
+    "@graphql-codegen/gql-tag-operations" "6.0.0"
+    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    "@graphql-codegen/typed-document-node" "^7.0.0"
+    "@graphql-codegen/typescript" "^6.0.0"
+    "@graphql-codegen/typescript-operations" "^6.0.0"
+    "@graphql-codegen/visitor-plugin-common" "^7.0.0"
     "@graphql-tools/documents" "^1.0.0"
     "@graphql-tools/utils" "^11.0.0"
     "@graphql-typed-document-node/core" "3.2.0"
-    tslib "~2.6.0"
+    tslib "^2.8.0"
 
-"@graphql-codegen/core@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-5.0.1.tgz#0b34d222e30a2dd97b42c2ffbec4087800a883dc"
-  integrity sha512-eQD7aXpKkKvaydMv5Bu0FnKCPnNMAhZ3vZW+K4Rl9IAC2w5PDv9lJhs3YTWM9W58zNOZpGQGT2F0ekS3QNIiKw==
+"@graphql-codegen/core@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-6.0.0.tgz#4cffc9d52abcd6e32ca818924f6c34548987c2b1"
+  integrity sha512-/UDolbUC6q6MTHNvEUDq+vC3ugycxAQ71S62WB3RDXzbBVIG5MG5Kw89WFOh+dt/s+mRuX+tx+Vz/si81sZ0aw==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^6.1.1"
+    "@graphql-codegen/plugin-helpers" "^7.0.0"
     "@graphql-tools/schema" "^10.0.0"
     "@graphql-tools/utils" "^11.0.0"
-    tslib "~2.6.0"
+    tslib "^2.8.0"
 
-"@graphql-codegen/fragment-matcher@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/fragment-matcher/-/fragment-matcher-6.0.0.tgz#4beb848c0fdb38bbdc7b99250de84ec4456e7a5d"
-  integrity sha512-lXdFWrUSEbOL2KhmYxdeNPLllcBGZnNunwgV72C12+21v9lyKaOqFnYueyt0pT110MGCwUhKTnXzUtV1D5i9Jw==
+"@graphql-codegen/fragment-matcher@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/fragment-matcher/-/fragment-matcher-7.0.0.tgz#87bee8fab80ae90ea9af70fc1bc5070525c9235b"
+  integrity sha512-XvKb4SYcyNXbQuaKU1nu7+1R51+vOsrDgkOAPKpI83its2l9qQRfV2Q7yK0O2s+i0/jnGJJqlvQfytqXXIrxCA==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^6.0.0"
-    tslib "~2.6.0"
+    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    tslib "^2.8.0"
 
-"@graphql-codegen/gql-tag-operations@5.1.4":
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-5.1.4.tgz#4714f2475868b43015420aba05a9dc04868a7d5e"
-  integrity sha512-tDj/0a1U7rDH3PQgLeA+PlgBNb593MIJ43oAOKMRgJPwIQ9T7p2oqBRLxwfFZFTDLwnwsGZ7xIKqIcGgyAIj5Q==
+"@graphql-codegen/gql-tag-operations@6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-6.0.0.tgz#1957ede9a5b6bd6962913adbce5f9ca7385b4f3d"
+  integrity sha512-IBwQ/jYx5Z4yMV78oVGU3hhNu/I7xFiQpFXavZujwCvoyH611M/JAoZ/RTExjr9stzcKMmNxJV/1Pknv+5M9Fg==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^6.1.1"
-    "@graphql-codegen/visitor-plugin-common" "^6.2.4"
+    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    "@graphql-codegen/visitor-plugin-common" "^7.0.0"
     "@graphql-tools/utils" "^11.0.0"
-    auto-bind "~4.0.0"
-    tslib "~2.6.0"
+    auto-bind "^5.0.0"
+    tslib "^2.8.0"
 
 "@graphql-codegen/near-operation-file-preset@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/near-operation-file-preset/-/near-operation-file-preset-5.0.0.tgz#00cf43ce61eba094f82751f3b1709b7a9b9857b9"
-  integrity sha512-Ck5jMu2izbKFwODYCM/sGWNQKN4BN4fpxr8g99fs6ESH29yfWMjA1dbUlTbtQtR7iXy39jT8451BLTG4/vOIxQ==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/near-operation-file-preset/-/near-operation-file-preset-5.2.1.tgz#18aaec7e781812965845b16a11ec52b2ef6be7f3"
+  integrity sha512-F+9gln4QboYozcMfsXwOxsPDdqUmMBOQoGZww+9qegvpWNvQVcZXm1LbYibi1iWOfuM0TTXVtMsDDjMeyNJcHA==
   dependencies:
-    "@graphql-codegen/add" "^6.0.0"
-    "@graphql-codegen/plugin-helpers" "^6.1.1"
-    "@graphql-codegen/visitor-plugin-common" "^6.2.4"
+    "@graphql-codegen/add" "^7.0.0"
+    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    "@graphql-codegen/visitor-plugin-common" "^7.0.0"
     "@graphql-tools/utils" "^11.0.0"
     parse-filepath "^1.0.2"
     tslib "^2.8.1"
 
-"@graphql-codegen/plugin-helpers@^6.0.0", "@graphql-codegen/plugin-helpers@^6.1.1", "@graphql-codegen/plugin-helpers@^6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-6.2.0.tgz#d10a56939c9341522e30c23aa2a83b10eafcd0c0"
-  integrity sha512-TKm0Q0+wRlg354Qt3PyXc+sy6dCKxmNofBsgmHoFZNVHtzMQSSgNT+rUWdwBwObQ9bFHiUVsDIv8QqxKMiKmpw==
+"@graphql-codegen/plugin-helpers@^6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-6.3.0.tgz#d4ba4660c68cb703291fbc6616a6510df26dd5f3"
+  integrity sha512-Auc+/B7okDx9+pVgLVliZtZLYh6iltWXlnzzM+bRE+zh1T4r3hKbnr8xAmtT937ArfSgk5GHcQHr8LfPYnrRBg==
   dependencies:
     "@graphql-tools/utils" "^11.0.0"
     change-case-all "1.0.15"
     common-tags "1.8.2"
     import-from "4.0.0"
-    lodash "~4.17.0"
-    tslib "~2.6.0"
+    tslib "^2.8.0"
 
-"@graphql-codegen/schema-ast@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-5.0.1.tgz#01034d85460179f552ac495853539eb318d93732"
-  integrity sha512-svLffXddnXxq1qFXQqqh+zYrxdiMnIKm+CXCUv0MYhLh0R4L5vpnaTzIUCk3icHNNXhKRm2uBD70+K8VY0xiCg==
+"@graphql-codegen/plugin-helpers@^7.0.0":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-7.0.1.tgz#b806262faf5db4ce42e4d803a8f4bfd657574672"
+  integrity sha512-S2X0YT3XQbP2haqhIeku8GOXo2j8QuBu7BrLsOEHz4UeMu78y3rja1Q4ri3oJ0jq4dMgaQlazoVHI/A+FAKMGw==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^6.1.1"
     "@graphql-tools/utils" "^11.0.0"
-    tslib "~2.6.0"
+    change-case-all "^2.1.0"
+    common-tags "1.8.2"
+    import-from "4.0.0"
+    tslib "^2.8.0"
 
-"@graphql-codegen/typed-document-node@^6.1.7":
-  version "6.1.7"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typed-document-node/-/typed-document-node-6.1.7.tgz#cdb3bbc6a5c430d16fd23be60ce2734cfb73a901"
-  integrity sha512-VLL9hB+YPigc/W2QYCkSNMZrkKv42nTchb9mJ0h5VY98YmW/zWb6NeYM80iHSpk8ZvHsuUT5geA53/s1phO2NQ==
+"@graphql-codegen/schema-ast@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-6.0.0.tgz#dcb943c917a740d82146faa16e427055bf35b210"
+  integrity sha512-ww6lfCZYBZk8SbnOKp76FLvBrMD6oqFhAGj8Ov8f+bsrNh0SG1M6mxLWh4nl9hWIu/iwsZgrJcuIrTfyBeF6jQ==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^6.1.1"
-    "@graphql-codegen/visitor-plugin-common" "^6.2.4"
-    auto-bind "~4.0.0"
-    change-case-all "1.0.15"
-    tslib "~2.6.0"
+    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    "@graphql-tools/utils" "^11.0.0"
+    tslib "^2.8.0"
+
+"@graphql-codegen/typed-document-node@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typed-document-node/-/typed-document-node-7.0.0.tgz#9e7488e3bc3eeaf86af9176fd13c5aaffd6855dc"
+  integrity sha512-gSsMEKe1QV5QmF+TsijSyhLYGYRYGD2fe7rGIJwca4s1gZK+aD3qjNFq3C0yFUsb92bsCxiOJTWeiPPfdPSMTg==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    "@graphql-codegen/visitor-plugin-common" "^7.0.0"
+    auto-bind "^5.0.0"
+    change-case-all "^2.1.0"
+    tslib "^2.8.0"
 
 "@graphql-codegen/typescript-apollo-client-helpers@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-apollo-client-helpers/-/typescript-apollo-client-helpers-4.0.0.tgz#237a29fd6db62d5452d4b150f07f7bfd776c89f5"
-  integrity sha512-1faLt8usmEbAjWQYe4U2lniri0lU0p5fyc7BdfdCu5eW7m05ukXqWWL2WACzF7JcL5Lvx3HDVIZp96oGkUTFPQ==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-apollo-client-helpers/-/typescript-apollo-client-helpers-4.0.1.tgz#574eb57432102dd41411f285eac6ca978d6b90f6"
+  integrity sha512-qYIuhDtcn5FBPr6IjSfP+PhgOEGYgNFj0C7MaNX+V9ri2FdY8C/m1vZp86TmHKt3X+ppjeOLgUDRYlKFaap83A==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^6.1.1"
-    "@graphql-codegen/visitor-plugin-common" "^6.2.4"
+    "@graphql-codegen/plugin-helpers" "^6.3.0"
+    "@graphql-codegen/visitor-plugin-common" "^6.3.0"
     auto-bind "~4.0.0"
     change-case-all "1.0.15"
     tslib "^2.8.1"
 
-"@graphql-codegen/typescript-operations@^5.0.4", "@graphql-codegen/typescript-operations@^5.0.9":
-  version "5.0.9"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-5.0.9.tgz#95388b2c80434118d5dd102ef5eff7f0de4ca29c"
-  integrity sha512-jJFdJKMS5Cqisb5QMi7xXHPsJH9yHBMYOxBc8laFkFjHk/AOqJK90qCKbO9lwwTMPZUDe6N/HslmA0ax4J0zsg==
+"@graphql-codegen/typescript-operations@^6.0.0", "@graphql-codegen/typescript-operations@^6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-6.0.2.tgz#afd94cf6dc6f77ac7f579b3b82043b75e37861f7"
+  integrity sha512-QYs8eQIOXsGKiWBlx4ZtIwYALa5RlLwznJELcnKayGubuEbglOsapJBswERXoogf3SMDrU21L58c1CYkYlyKIA==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^6.1.1"
-    "@graphql-codegen/typescript" "^5.0.9"
-    "@graphql-codegen/visitor-plugin-common" "^6.2.4"
-    auto-bind "~4.0.0"
-    tslib "~2.6.0"
+    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    "@graphql-codegen/schema-ast" "^6.0.0"
+    "@graphql-codegen/visitor-plugin-common" "^7.0.1"
+    auto-bind "^5.0.0"
+    tslib "^2.8.0"
 
-"@graphql-codegen/typescript@^5.0.4", "@graphql-codegen/typescript@^5.0.9":
-  version "5.0.9"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-5.0.9.tgz#967c3fdd11c79f7adbd612c994367f3b38272435"
-  integrity sha512-YlIZ4nqdFdzr5vxuNtQtZnnMYuZ5cLYB2HaGhGI2zvqHxCmkBjIRpu/5sfccawKy23wetV+aoWvoNqxGKIryig==
+"@graphql-codegen/typescript@^6.0.0", "@graphql-codegen/typescript@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-6.0.1.tgz#c45576b0c1702ae4edb6d90cb32951efdcc7a12d"
+  integrity sha512-UmHKlOBqnmGs0ioZsfi7INIb6+YCXVMi3KSp/INO359fT3RJxWPLPiE7T30UaWXtLeO6fBNZcvhy3EGBI9UCvw==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^6.1.1"
-    "@graphql-codegen/schema-ast" "^5.0.1"
-    "@graphql-codegen/visitor-plugin-common" "^6.2.4"
-    auto-bind "~4.0.0"
-    tslib "~2.6.0"
+    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    "@graphql-codegen/schema-ast" "^6.0.0"
+    "@graphql-codegen/visitor-plugin-common" "^7.0.1"
+    auto-bind "^5.0.0"
+    tslib "~2.8.0"
 
-"@graphql-codegen/visitor-plugin-common@^6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-6.2.4.tgz#73906f34e8baaaadf5bfe5fefece4d86f835aebc"
-  integrity sha512-iwiVCc7Mv8/XAa3K35AdFQ9chJSDv/gYEnBeQFF/Sq/W8EyJoHypOGOTTLk7OSrWO4xea65ggv0e7fGt7rPJjQ==
+"@graphql-codegen/visitor-plugin-common@^6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-6.3.0.tgz#5c3d1b6397acd27a552beab989c5d8af155e2aef"
+  integrity sha512-vGBoE+4huzZyNhyGSAhXAkdROHlwKxxuziZm4XtP1mxe7nuI+VgyOmXebafLijbmuDsptPXQN0C/htL54O8hrg==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^6.1.1"
+    "@graphql-codegen/plugin-helpers" "^6.3.0"
     "@graphql-tools/optimize" "^2.0.0"
     "@graphql-tools/relay-operation-optimizer" "^7.1.1"
     "@graphql-tools/utils" "^11.0.0"
@@ -669,7 +679,23 @@
     dependency-graph "^1.0.0"
     graphql-tag "^2.11.0"
     parse-filepath "^1.0.2"
-    tslib "~2.6.0"
+    tslib "^2.8.0"
+
+"@graphql-codegen/visitor-plugin-common@^7.0.0", "@graphql-codegen/visitor-plugin-common@^7.0.1":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-7.0.2.tgz#3df94980fff51dd0dd140d1a6428d55ea24c2f75"
+  integrity sha512-3v1dPjkSiAIsqwZ/6btSZ6BCYlYYpr3FdLhsBZ/JoPP2hYgN6AlGKdUyhYm5FsgDKU04L7al3+rfnTOCxqM0gw==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    "@graphql-tools/optimize" "^2.0.0"
+    "@graphql-tools/relay-operation-optimizer" "^7.1.1"
+    "@graphql-tools/utils" "^11.0.0"
+    auto-bind "^5.0.0"
+    change-case-all "^2.1.0"
+    dependency-graph "^1.0.0"
+    graphql-tag "^2.11.0"
+    parse-filepath "^1.0.2"
+    tslib "^2.8.0"
 
 "@graphql-hive/signal@^2.0.0":
   version "2.0.0"
@@ -677,19 +703,19 @@
   integrity sha512-Pz8wB3K0iU6ae9S1fWfsmJX24CcGeTo6hE7T44ucmV/ALKRj+bxClmqrYcDT7v3f0d12Rh4FAXBb6gon+WkDpQ==
 
 "@graphql-tools/apollo-engine-loader@^8.0.28":
-  version "8.0.28"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-8.0.28.tgz#b69334ea21540faee316f0026a53b3889dd90a01"
-  integrity sha512-MzgDrUuoxp6dZeo54zLBL3cEJKJtM3N/2RqK0rbPxPq5X2z6TUA7EGg8vIFTUkt5xelAsUrm8/4ai41ZDdxOng==
+  version "8.0.30"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-8.0.30.tgz#f7440938acfb0fa00a7e8ffe9d39d3df24d3724c"
+  integrity sha512-hUydKGGECrWloERMmfoMzHZi12X99AM9geCGF5XVsv4iMRl/Iyuet24th4kC9bZ8MlAdCwAwtUsCyv9uRfYwSA==
   dependencies:
-    "@graphql-tools/utils" "^11.0.0"
+    "@graphql-tools/utils" "^11.1.0"
     "@whatwg-node/fetch" "^0.10.13"
     sync-fetch "0.6.0"
     tslib "^2.4.0"
 
-"@graphql-tools/batch-execute@^10.0.7":
-  version "10.0.7"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-10.0.7.tgz#20a5b2c9cec281e38d6ed13e8d8f0163aa88d947"
-  integrity sha512-vKo9XUiy2sc5tzMupXoxZbu5afVY/9yJ0+yLrM5Dhh38yHYULf3z9VC1eAwW0kj8pWpOo8d8CV3jpleGwv83PA==
+"@graphql-tools/batch-execute@^10.0.8":
+  version "10.0.8"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-10.0.8.tgz#11f3967dc2df25c149a5dc7c495fd9363f63388e"
+  integrity sha512-Kobt37qrVTFhX4HUK5/vPgMXFw/5f97AzmAlfmDBSRh/GnoAmLKCb48FrEI3gdeIwZB2fEhVHJyDqsojldnLQA==
   dependencies:
     "@graphql-tools/utils" "^11.0.0"
     "@whatwg-node/promise-helpers" "^1.3.2"
@@ -697,22 +723,22 @@
     tslib "^2.8.1"
 
 "@graphql-tools/code-file-loader@^8.1.28":
-  version "8.1.28"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-8.1.28.tgz#c90655d86210d7ad8489f452867754b49c89f57a"
-  integrity sha512-BL3Ft/PFlXDE5nNuqA36hYci7Cx+8bDrPDc8X3VSpZy9iKFBY+oQ+IwqnEHCkt8OSp2n2V0gqTg4u3fcQP1Kwg==
+  version "8.1.32"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-8.1.32.tgz#6bfc8091fb35692174824f1e714586725e2a3bff"
+  integrity sha512-gR5mNQjn0BugDL8a4A+ovS2KEvU52RNOGnbwiq9oWAEHiSv7iqJu77bpWARTzlE1ZFPK5MSQe9218+1t5PbXmQ==
   dependencies:
-    "@graphql-tools/graphql-tag-pluck" "8.3.27"
-    "@graphql-tools/utils" "^11.0.0"
+    "@graphql-tools/graphql-tag-pluck" "8.3.31"
+    "@graphql-tools/utils" "^11.1.0"
     globby "^11.0.3"
     tslib "^2.4.0"
     unixify "^1.0.0"
 
-"@graphql-tools/delegate@^12.0.12":
-  version "12.0.12"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-12.0.12.tgz#19d669b3cb7ebe360848ae55f42f4b9769d5bd71"
-  integrity sha512-/vgLWhIwm+Mgo5VUOJQj6EOpaxXRQmA7mk8j6/8vBbPi56LoYA/UPRygcpEnm9EuXTspFKCTBil+xqThU3EmqQ==
+"@graphql-tools/delegate@^12.0.16":
+  version "12.0.16"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-12.0.16.tgz#2f6636abadcf0c57ac1356431d70cf4ac1be1e2d"
+  integrity sha512-WEJaFwWG82a0VzhfE4sRsaOPjxgCVfn4fOe3ho+r3uIbPYpc7qHpFdu1PLg6meikq6fuW9NJ1J88fEgnWuXDVg==
   dependencies:
-    "@graphql-tools/batch-execute" "^10.0.7"
+    "@graphql-tools/batch-execute" "^10.0.8"
     "@graphql-tools/executor" "^1.4.13"
     "@graphql-tools/schema" "^10.0.29"
     "@graphql-tools/utils" "^11.0.0"
@@ -737,7 +763,7 @@
     "@envelop/core" "^5.4.0"
     "@graphql-tools/utils" "^11.0.0"
 
-"@graphql-tools/executor-graphql-ws@^3.1.2":
+"@graphql-tools/executor-graphql-ws@^3.1.4":
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-3.1.5.tgz#5d4ecc7a406126ae77489a0d1129ed7ccd9e5331"
   integrity sha512-WXRsfwu9AkrORD9nShrd61OwwxeQ5+eXYcABRR3XPONFIS8pWQfDJGGqxql9/227o/s0DV5SIfkBURb5Knzv+A==
@@ -750,10 +776,10 @@
     tslib "^2.8.1"
     ws "^8.18.3"
 
-"@graphql-tools/executor-http@^3.0.6":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/executor-http/-/executor-http-3.1.1.tgz#2952fec496178b4b0c994cc3ff448bc005401b29"
-  integrity sha512-Le57fMdN7nGBp8XddkpGreCzcPGCZ+uHs1kPw/xMKPJMsn/vZUHbWJ0FY0cb0jfE3OVhbMIjjSe/OHlG3Mm3zw==
+"@graphql-tools/executor-http@^3.2.1":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/executor-http/-/executor-http-3.3.0.tgz#64d351b90aa94577cdd57d44596f775cd9309534"
+  integrity sha512-IkKXIjSg9U8MNsQUBVJAXE4+LSxaQ0cs7p5JTALLGDABY1o17vPDRwWALsX81AXD5dY27ihi/+OhGMueW/Fopg==
   dependencies:
     "@graphql-hive/signal" "^2.0.0"
     "@graphql-tools/executor-common" "^1.0.6"
@@ -765,23 +791,23 @@
     meros "^1.3.2"
     tslib "^2.8.1"
 
-"@graphql-tools/executor-legacy-ws@^1.1.25":
-  version "1.1.25"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-1.1.25.tgz#235c334443a4dba79ceff9c20b0a03e766743d4c"
-  integrity sha512-6uf4AEXO0QMxJ7AWKVPqEZXgYBJaiz5vf29X0boG8QtcqWy8mqkXKWLND2Swdx0SbEx0efoGFcjuKufUcB0ASQ==
+"@graphql-tools/executor-legacy-ws@^1.1.28":
+  version "1.1.28"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-1.1.28.tgz#e640359a0c65af59609989510ba47849fa3e6680"
+  integrity sha512-O4uj93GG9iUb3s32eyhUohvyfA8mLhN8FvGzEdK628hFQPhZN75yurtVFrR08DHex71mQ3wYCCFkErpwdJbDDQ==
   dependencies:
-    "@graphql-tools/utils" "^11.0.0"
+    "@graphql-tools/utils" "^11.1.0"
     "@types/ws" "^8.0.0"
     isomorphic-ws "^5.0.0"
     tslib "^2.4.0"
-    ws "^8.19.0"
+    ws "^8.20.0"
 
 "@graphql-tools/executor@^1.4.13":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/executor/-/executor-1.5.1.tgz#2171473cc7cd0b7ca468c21d767eec9ac9df00fe"
-  integrity sha512-n94Qcu875Mji9GQ52n5UbgOTxlgvFJicBPYD+FRks9HKIQpdNPjkkrKZUYNG51XKa+bf03rxNflm4+wXhoHHrA==
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/executor/-/executor-1.5.3.tgz#3c567ec4854fe8ed69eb6a890e41db7bdae2b0bc"
+  integrity sha512-mgBFC0bsrZPZLu9EnydpMnAuQ8Iiq0CEbUcsmvXsm2/iYektGHDN/+bmb7hicA6dWZtdPfklYJmr21WD0GnOfA==
   dependencies:
-    "@graphql-tools/utils" "^11.0.0"
+    "@graphql-tools/utils" "^11.1.0"
     "@graphql-typed-document-node/core" "^3.2.0"
     "@repeaterjs/repeater" "^3.0.4"
     "@whatwg-node/disposablestack" "^0.0.6"
@@ -789,89 +815,89 @@
     tslib "^2.4.0"
 
 "@graphql-tools/git-loader@^8.0.32":
-  version "8.0.32"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/git-loader/-/git-loader-8.0.32.tgz#b72f8830aacf26a10044c39c3a3e512d8f23e8c2"
-  integrity sha512-H5HTp2vevv0rRMEnCJBVmVF8md3LpJI1C1+d6OtzvmuONJ8mOX2mkf9rtoqwiztynVegaDUekvMFsc9k5iE2WA==
+  version "8.0.36"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/git-loader/-/git-loader-8.0.36.tgz#f3e2a8da8c65e086f176146616d24f16e36ce9fe"
+  integrity sha512-PDDakesRu8FJYHJLf9/gkTweh8M19Bymz9i+vOlk9OTs9XmNcCqKM+1S610KX2AodvuBFz/xbesjTtTJIppLPg==
   dependencies:
-    "@graphql-tools/graphql-tag-pluck" "8.3.27"
-    "@graphql-tools/utils" "^11.0.0"
+    "@graphql-tools/graphql-tag-pluck" "8.3.31"
+    "@graphql-tools/utils" "^11.1.0"
     is-glob "4.0.3"
     micromatch "^4.0.8"
     tslib "^2.4.0"
     unixify "^1.0.0"
 
 "@graphql-tools/github-loader@^9.0.6":
-  version "9.0.6"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/github-loader/-/github-loader-9.0.6.tgz#75353e71c431cae3ac04751b804b5122c1704556"
-  integrity sha512-hhlt2MMkRcvDva/qyzqFddXzaMmRnriJ0Ts+/LcNeYnB8hcEqRMpF9RCsHYjo1mFRaiu8i4PSIpXyyFu3To7Ow==
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/github-loader/-/github-loader-9.1.2.tgz#58346bcdf175bf44849a6280e1e9a7e022cb5eb1"
+  integrity sha512-jhRJncj9Wkr1Cd8Mo3QI2oG6fTw5ILr1/OXcHIqx744NBj8pPwQBXmQzZqh7MXxbekl2EAcum7SJIjq1HpYcPA==
   dependencies:
-    "@graphql-tools/executor-http" "^3.0.6"
-    "@graphql-tools/graphql-tag-pluck" "^8.3.27"
-    "@graphql-tools/utils" "^11.0.0"
+    "@graphql-tools/executor-http" "^3.2.1"
+    "@graphql-tools/graphql-tag-pluck" "^8.3.31"
+    "@graphql-tools/utils" "^11.1.0"
     "@whatwg-node/fetch" "^0.10.13"
     "@whatwg-node/promise-helpers" "^1.0.0"
     sync-fetch "0.6.0"
     tslib "^2.4.0"
 
 "@graphql-tools/graphql-file-loader@^8.0.0", "@graphql-tools/graphql-file-loader@^8.1.11":
-  version "8.1.12"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-file-loader/-/graphql-file-loader-8.1.12.tgz#9a0f3f4a27bfd849a90d5b2297f64f60e54a949c"
-  integrity sha512-Nma7gBgJoUbqXWTmdHjouo36tjzewA8MptVcHoH7widzkciaUVzBhriHzqICFB/dVxig//g9MX8s1XawZo7UAg==
+  version "8.1.14"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-file-loader/-/graphql-file-loader-8.1.14.tgz#cc69e84e1566637052d401a4d3f117c67277bfc5"
+  integrity sha512-CfAcsSEVkkHfEXLFzrd5rUYpcQEGWNV8lfc1Tb1p5m9HnYICzDDH08I5V33iMrEDza3GuujjjRBYqplBkqwIow==
   dependencies:
-    "@graphql-tools/import" "^7.1.12"
-    "@graphql-tools/utils" "^11.0.0"
+    "@graphql-tools/import" "^7.1.14"
+    "@graphql-tools/utils" "^11.1.0"
     globby "^11.0.3"
     tslib "^2.4.0"
     unixify "^1.0.0"
 
-"@graphql-tools/graphql-tag-pluck@8.3.27", "@graphql-tools/graphql-tag-pluck@^8.3.27":
-  version "8.3.27"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-8.3.27.tgz#5f138347addfa3df5c169be69dbe41c902c6227f"
-  integrity sha512-CJ0WVXhGYsfFngpRrAAcjRHyxSDHx4dEz2W15bkwvt9he/AWhuyXm07wuGcoLrl0q0iQp1BiRjU7D8SxWZo3JQ==
+"@graphql-tools/graphql-tag-pluck@8.3.31", "@graphql-tools/graphql-tag-pluck@^8.3.31":
+  version "8.3.31"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-8.3.31.tgz#3ea68b94e62b6c4cc68f612ec10068b07c01cdbd"
+  integrity sha512-ema2RRPZGj8TKruNElyDBHVCNFMxioGIVfLBuiA+GdfmRGt95b/i7Uksnj4EwItA6MCmhxokxZoa/fl6mJt3tw==
   dependencies:
-    "@babel/core" "^7.26.10"
-    "@babel/parser" "^7.26.10"
+    "@babel/core" "^7.28.6"
+    "@babel/parser" "^7.29.2"
     "@babel/plugin-syntax-import-assertions" "^7.26.0"
     "@babel/traverse" "^7.26.10"
     "@babel/types" "^7.26.10"
-    "@graphql-tools/utils" "^11.0.0"
+    "@graphql-tools/utils" "^11.1.0"
     tslib "^2.4.0"
 
-"@graphql-tools/import@^7.1.12":
-  version "7.1.12"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/import/-/import-7.1.12.tgz#a6b04c0c53b58cccb132950913e55b1f31f0f30a"
-  integrity sha512-QSsdPsdJ7yCgQ5XODyKYpC7NlB9R1Koi0R3418PT7GiRm+9O8gYXSs/23dumcOnpiLrnf4qR2aytBn1+JOAhnA==
+"@graphql-tools/import@^7.1.14":
+  version "7.1.14"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/import/-/import-7.1.14.tgz#33e435ae5afc0e19ec1baed7e74066e71455dbbf"
+  integrity sha512-aqLcu04aEidszbXM6M0PWWL8bP17eX9sxXwjYWpglLvIRd4NFqb3C9QzBY8pleqXNMtWqXktlm9BQjevgSrirQ==
   dependencies:
-    "@graphql-tools/utils" "^11.0.0"
+    "@graphql-tools/utils" "^11.1.0"
     resolve-from "5.0.0"
     tslib "^2.4.0"
 
 "@graphql-tools/json-file-loader@^8.0.0", "@graphql-tools/json-file-loader@^8.0.26":
-  version "8.0.26"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/json-file-loader/-/json-file-loader-8.0.26.tgz#82ff8afbecb77082625c7ee76384da7aed0f70ce"
-  integrity sha512-kwy9IFi5QtXXTLBgWkvA1RqsZeJDn0CxsTbhNlziCzmga9fNo7qtZ18k9FYIq3EIoQQlok+b7W7yeyJATA2xhw==
+  version "8.0.28"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/json-file-loader/-/json-file-loader-8.0.28.tgz#6075780add2715c7b0126ecf3b9b4585758aaa5a"
+  integrity sha512-qgCsSkPArnjlNkcYpgGKiXxCTNkrAT9E+l1LhR+Por2jTlKBBeZ8stortkQ/PNDDjuL0WPrLQmHKhNPHabnB3A==
   dependencies:
-    "@graphql-tools/utils" "^11.0.0"
+    "@graphql-tools/utils" "^11.1.0"
     globby "^11.0.3"
     tslib "^2.4.0"
     unixify "^1.0.0"
 
 "@graphql-tools/load@^8.1.0", "@graphql-tools/load@^8.1.8":
-  version "8.1.8"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-8.1.8.tgz#977fdf0005078283942e0e4a028ff97c78dd6f0b"
-  integrity sha512-gxO662b64qZSToK3N6XUxWG5E6HOUjlg5jEnmGvD4bMtGJ0HwEe/BaVZbBQemCfLkxYjwRIBiVfOY9o0JyjZJg==
+  version "8.1.10"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-8.1.10.tgz#23d14a3028b66090d51102c7e7c6fa72f70901eb"
+  integrity sha512-hjcvfEFtwtc8vGi46wtpmGWadNzfEhzbjqinyFIZuIZPlR4aYdWQtqWtY/RMM4Ew4t1USkMNm6xrqC2TH1vCSA==
   dependencies:
-    "@graphql-tools/schema" "^10.0.31"
-    "@graphql-tools/utils" "^11.0.0"
+    "@graphql-tools/schema" "^10.0.33"
+    "@graphql-tools/utils" "^11.1.0"
     p-limit "3.1.0"
     tslib "^2.4.0"
 
-"@graphql-tools/merge@^9.0.0", "@graphql-tools/merge@^9.0.6", "@graphql-tools/merge@^9.1.7":
-  version "9.1.7"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-9.1.7.tgz#8040553c19aeadf6df41060b811e9c5df8716be1"
-  integrity sha512-Y5E1vTbTabvcXbkakdFUt4zUIzB1fyaEnVmIWN0l0GMed2gdD01TpZWLUm4RNAxpturvolrb24oGLQrBbPLSoQ==
+"@graphql-tools/merge@^9.0.0", "@graphql-tools/merge@^9.0.6", "@graphql-tools/merge@^9.1.9":
+  version "9.1.9"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-9.1.9.tgz#d5b042ef11695ca130a36477e25786100353609b"
+  integrity sha512-iHUWNjRHeQRYdgIMIuChThOwoKzA9vrzYeslgfBo5eUYEyHGZCoDPjAavssoYXLwstYt1dZj2J22jSzc2DrN0Q==
   dependencies:
-    "@graphql-tools/utils" "^11.0.0"
+    "@graphql-tools/utils" "^11.1.0"
     tslib "^2.4.0"
 
 "@graphql-tools/optimize@^2.0.0":
@@ -882,32 +908,32 @@
     tslib "^2.4.0"
 
 "@graphql-tools/relay-operation-optimizer@^7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-7.1.1.tgz#5294ffc075dcdf0c2ffcd1f02339374cefba51b8"
-  integrity sha512-va+ZieMlz6Fj18xUbwyQkZ34PsnzIdPT6Ccy1BNOQw1iclQwk52HejLMZeE/4fH+4cu80Q2HXi5+FjCKpmnJCg==
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-7.1.4.tgz#6e25416d78d7bc8d92c64df89d39d30644c26042"
+  integrity sha512-cwOD/GEo/R//1uGCP0/urIxsMFoUgzkJVyMt9BDM2HhQhU6rSgH5l6lFukAFTJyPJVdyeOdYm2i0Jj5vYWbHTw==
   dependencies:
-    "@ardatan/relay-compiler" "^13.0.0"
-    "@graphql-tools/utils" "^11.0.0"
+    "@ardatan/relay-compiler" "^13.0.1"
+    "@graphql-tools/utils" "^11.1.0"
     tslib "^2.4.0"
 
-"@graphql-tools/schema@^10.0.0", "@graphql-tools/schema@^10.0.29", "@graphql-tools/schema@^10.0.31":
-  version "10.0.31"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-10.0.31.tgz#dea275db4d7423f293826cff2aa11e7b3027ddce"
-  integrity sha512-ZewRgWhXef6weZ0WiP7/MV47HXiuFbFpiDUVLQl6mgXsWSsGELKFxQsyUCBos60Qqy1JEFAIu3Ns6GGYjGkqkQ==
+"@graphql-tools/schema@^10.0.0", "@graphql-tools/schema@^10.0.29", "@graphql-tools/schema@^10.0.33":
+  version "10.0.33"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-10.0.33.tgz#147d70aa9bb12123ffca2c091be1f3f3ec592911"
+  integrity sha512-O6P3RIftO0jafnSsFAqpjurUuUxJ43s/AdPVLQsBkI6y4Ic/tKm4C1Qm1KKQsCDTOxXPJClh/v3g7k7yLKCFBQ==
   dependencies:
-    "@graphql-tools/merge" "^9.1.7"
-    "@graphql-tools/utils" "^11.0.0"
+    "@graphql-tools/merge" "^9.1.9"
+    "@graphql-tools/utils" "^11.1.0"
     tslib "^2.4.0"
 
 "@graphql-tools/url-loader@^9.0.0", "@graphql-tools/url-loader@^9.0.6":
-  version "9.0.6"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-9.0.6.tgz#281ad72428170a08167423071e2ee9a06d910f49"
-  integrity sha512-QdJI3f7ANDMYfYazRgJzzybznjOrQAOuDXweC9xmKgPZoTqNxEAsatiy69zcpTf6092taJLyrqRH6R7xUTzf4A==
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-9.1.2.tgz#cb299cab94ae694503c6c7cb124a42278452fff5"
+  integrity sha512-pVSiPrfWQKb3jq23Pl7EjbB2uv3tgZLnWo/axkmg4itAEZ5s/vV/jKa8P1HZzUnSVUTR+8tcEZVeNsUbzFCbkg==
   dependencies:
-    "@graphql-tools/executor-graphql-ws" "^3.1.2"
-    "@graphql-tools/executor-http" "^3.0.6"
-    "@graphql-tools/executor-legacy-ws" "^1.1.25"
-    "@graphql-tools/utils" "^11.0.0"
+    "@graphql-tools/executor-graphql-ws" "^3.1.4"
+    "@graphql-tools/executor-http" "^3.2.1"
+    "@graphql-tools/executor-legacy-ws" "^1.1.28"
+    "@graphql-tools/utils" "^11.1.0"
     "@graphql-tools/wrap" "^11.1.1"
     "@types/ws" "^8.0.0"
     "@whatwg-node/fetch" "^0.10.13"
@@ -915,12 +941,12 @@
     isomorphic-ws "^5.0.0"
     sync-fetch "0.6.0"
     tslib "^2.4.0"
-    ws "^8.19.0"
+    ws "^8.20.0"
 
-"@graphql-tools/utils@^11.0.0":
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-11.0.0.tgz#f54a09372e96c32416fcbd0eb8e9e0f1338900bd"
-  integrity sha512-bM1HeZdXA2C3LSIeLOnH/bcqSgbQgKEDrjxODjqi3y58xai2TkNrtYcQSoWzGbt9VMN1dORGjR7Vem8SPnUFQA==
+"@graphql-tools/utils@^11.0.0", "@graphql-tools/utils@^11.1.0":
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-11.1.0.tgz#03593c3ae1177e04a3620c688fd29df912aa094f"
+  integrity sha512-PtFVG4r8Z2LEBSaPYQMusBiB3o6kjLVJyjCLbnWem/SpSuM21v6LTmgpkXfYU1qpBV2UGsFyuEnSJInl8fR1Ag==
   dependencies:
     "@graphql-typed-document-node/core" "^3.1.1"
     "@whatwg-node/promise-helpers" "^1.0.0"
@@ -928,11 +954,11 @@
     tslib "^2.4.0"
 
 "@graphql-tools/wrap@^11.1.1":
-  version "11.1.12"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-11.1.12.tgz#2a26247c6d1953b32f5ae08899266ad2529af174"
-  integrity sha512-PJ0tuiGbEOOZAJk2/pTKyzMEbwBncPBfO7Z84tCPzM/CAR4ZlAXbXjaXOw4fdi0ReUDyOG06Z8DGgEQjr68dKw==
+  version "11.1.15"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-11.1.15.tgz#d0e19db5d4075e3768ffcd0f5249f9856141a792"
+  integrity sha512-GCMx6l0MPwHVaBMHf29oG8eIrsJ8PBXq9y5DNX9/r9oCpCBfqxfWzcejx4CpO4chA3+yylGOKcAyEbOUgxfI1Q==
   dependencies:
-    "@graphql-tools/delegate" "^12.0.12"
+    "@graphql-tools/delegate" "^12.0.16"
     "@graphql-tools/schema" "^10.0.29"
     "@graphql-tools/utils" "^11.0.0"
     "@whatwg-node/promise-helpers" "^1.3.2"
@@ -943,19 +969,27 @@
   resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861"
   integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==
 
-"@humanfs/core@^0.19.1":
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77"
-  integrity sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==
+"@humanfs/core@^0.19.2":
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.2.tgz#a8272ca03b2acf492670222b2320b6c421bfde60"
+  integrity sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==
+  dependencies:
+    "@humanfs/types" "^0.15.0"
 
 "@humanfs/node@^0.16.6":
-  version "0.16.7"
-  resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.7.tgz#822cb7b3a12c5a240a24f621b5a2413e27a45f26"
-  integrity sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==
+  version "0.16.8"
+  resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.8.tgz#8f800cccc13f4f8cd3116e2d9c0a94939da3e3ed"
+  integrity sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==
   dependencies:
-    "@humanfs/core" "^0.19.1"
+    "@humanfs/core" "^0.19.2"
+    "@humanfs/types" "^0.15.0"
     "@humanwhocodes/retry" "^0.4.0"
 
+"@humanfs/types@^0.15.0":
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/@humanfs/types/-/types-0.15.0.tgz#f2a09f62012390b2bff3fc6fb248ddec8c09a090"
+  integrity sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==
+
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
@@ -1113,150 +1147,144 @@
   resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.5.tgz#a81ffb00e69267cd0a1d626eaedb8a8430b2b2f8"
   integrity sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==
 
-"@inquirer/ansi@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@inquirer/ansi/-/ansi-1.0.2.tgz#674a4c4d81ad460695cb2a1fc69d78cd187f337e"
-  integrity sha512-S8qNSZiYzFd0wAcyG5AXCvUHC5Sr7xpZ9wZ2py9XR88jUz8wooStVx5M6dRzczbBWjic9NP7+rY0Xi7qqK/aMQ==
+"@inquirer/ansi@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@inquirer/ansi/-/ansi-2.0.5.tgz#7b7e121f6a0c40128711daf20325e6ff2cdff8b7"
+  integrity sha512-doc2sWgJpbFQ64UflSVd17ibMGDuxO1yKgOgLMwavzESnXjFWJqUeG8saYosqKpHp4kWiM5x1nXvEjbpx90gzw==
 
-"@inquirer/checkbox@^4.3.2":
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/@inquirer/checkbox/-/checkbox-4.3.2.tgz#e1483e6519d6ffef97281a54d2a5baa0d81b3f3b"
-  integrity sha512-VXukHf0RR1doGe6Sm4F0Em7SWYLTHSsbGfJdS9Ja2bX5/D5uwVOEjr07cncLROdBvmnvCATYEWlHqYmXv2IlQA==
-  dependencies:
-    "@inquirer/ansi" "^1.0.2"
-    "@inquirer/core" "^10.3.2"
-    "@inquirer/figures" "^1.0.15"
-    "@inquirer/type" "^3.0.10"
-    yoctocolors-cjs "^2.1.3"
-
-"@inquirer/confirm@^5.1.21":
-  version "5.1.21"
-  resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-5.1.21.tgz#610c4acd7797d94890a6e2dde2c98eb1e891dd12"
-  integrity sha512-KR8edRkIsUayMXV+o3Gv+q4jlhENF9nMYUZs9PA2HzrXeHI8M5uDag70U7RJn9yyiMZSbtF5/UexBtAVtZGSbQ==
-  dependencies:
-    "@inquirer/core" "^10.3.2"
-    "@inquirer/type" "^3.0.10"
-
-"@inquirer/core@^10.3.2":
-  version "10.3.2"
-  resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-10.3.2.tgz#535979ff3ff4fe1e7cc4f83e2320504c743b7e20"
-  integrity sha512-43RTuEbfP8MbKzedNqBrlhhNKVwoK//vUFNW3Q3vZ88BLcrs4kYpGg+B2mm5p2K/HfygoCxuKwJJiv8PbGmE0A==
-  dependencies:
-    "@inquirer/ansi" "^1.0.2"
-    "@inquirer/figures" "^1.0.15"
-    "@inquirer/type" "^3.0.10"
+"@inquirer/checkbox@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@inquirer/checkbox/-/checkbox-5.1.5.tgz#362472b9dbf8ddee869b61e4ccc6b198b975c955"
+  integrity sha512-Jmf9tgBHIEK5SAOB7swYfStqmtkZb00xOTpSQmkoGEpdxOTpJi9RS0A8bkfDPHTTItZRJrRdZrEMu25wyj0VfQ==
+  dependencies:
+    "@inquirer/ansi" "^2.0.5"
+    "@inquirer/core" "^11.1.10"
+    "@inquirer/figures" "^2.0.5"
+    "@inquirer/type" "^4.0.5"
+
+"@inquirer/confirm@^6.0.13":
+  version "6.0.13"
+  resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-6.0.13.tgz#8a698ca38baab64ae468fb9f04e7e8800ef4367c"
+  integrity sha512-wkGPC7yJ5WJk1DJ5SX7fzk+gfj4BM8cf5dDDi71B/551xHrdsZVRJOC0WyikXd0pEsb/9cLniuE4atbsMqmFkw==
+  dependencies:
+    "@inquirer/core" "^11.1.10"
+    "@inquirer/type" "^4.0.5"
+
+"@inquirer/core@^11.1.10":
+  version "11.1.10"
+  resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-11.1.10.tgz#bab578cb1b908dd72fab79ee75d51231270cb7ad"
+  integrity sha512-a4Q5BXHQAHa9eO202sTaFCHFYVB3x5fauDuThEAdZ9gfn76pSxiKU7wWcEH0N1O0XmQvNfQNU6QXpiRxmYQx+A==
+  dependencies:
+    "@inquirer/ansi" "^2.0.5"
+    "@inquirer/figures" "^2.0.5"
+    "@inquirer/type" "^4.0.5"
     cli-width "^4.1.0"
-    mute-stream "^2.0.0"
+    fast-wrap-ansi "^0.2.0"
+    mute-stream "^3.0.0"
     signal-exit "^4.1.0"
-    wrap-ansi "^6.2.0"
-    yoctocolors-cjs "^2.1.3"
 
-"@inquirer/editor@^4.2.23":
-  version "4.2.23"
-  resolved "https://registry.yarnpkg.com/@inquirer/editor/-/editor-4.2.23.tgz#fe046a3bfdae931262de98c1052437d794322e0b"
-  integrity sha512-aLSROkEwirotxZ1pBaP8tugXRFCxW94gwrQLxXfrZsKkfjOYC1aRvAZuhpJOb5cu4IBTJdsCigUlf2iCOu4ZDQ==
+"@inquirer/editor@^5.1.2":
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@inquirer/editor/-/editor-5.1.2.tgz#35d3c378ca2b442c45ad38687f1ffd051a368d77"
+  integrity sha512-Y3Nor7S/DhIPo+8Ym/dSY4efwKI4BsflKDwXh0jNeXJsSF3dteS/3Yf+z4wkibVZDvYMyCgknSTQlNahfunGHg==
   dependencies:
-    "@inquirer/core" "^10.3.2"
-    "@inquirer/external-editor" "^1.0.3"
-    "@inquirer/type" "^3.0.10"
+    "@inquirer/core" "^11.1.10"
+    "@inquirer/external-editor" "^3.0.0"
+    "@inquirer/type" "^4.0.5"
 
-"@inquirer/expand@^4.0.23":
-  version "4.0.23"
-  resolved "https://registry.yarnpkg.com/@inquirer/expand/-/expand-4.0.23.tgz#a38b5f32226d75717c370bdfed792313b92bdc05"
-  integrity sha512-nRzdOyFYnpeYTTR2qFwEVmIWypzdAx/sIkCMeTNTcflFOovfqUk+HcFhQQVBftAh9gmGrpFj6QcGEqrDMDOiew==
+"@inquirer/expand@^5.0.14":
+  version "5.0.14"
+  resolved "https://registry.yarnpkg.com/@inquirer/expand/-/expand-5.0.14.tgz#978abf072bd1270484a6d324c08e49e9e0a58ea9"
+  integrity sha512-qyY9zcIX2eKYwaAUiQo9zORd61Lc3sXeM72fVbeHkYnDkqfr8/armcRbmVAIrExeJhI2puk+uomeKtWrpUVUmQ==
   dependencies:
-    "@inquirer/core" "^10.3.2"
-    "@inquirer/type" "^3.0.10"
-    yoctocolors-cjs "^2.1.3"
+    "@inquirer/core" "^11.1.10"
+    "@inquirer/type" "^4.0.5"
 
-"@inquirer/external-editor@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@inquirer/external-editor/-/external-editor-1.0.3.tgz#c23988291ee676290fdab3fd306e64010a6d13b8"
-  integrity sha512-RWbSrDiYmO4LbejWY7ttpxczuwQyZLBUyygsA9Nsv95hpzUWwnNTVQmAq3xuh7vNwCp07UTmE5i11XAEExx4RA==
+"@inquirer/external-editor@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@inquirer/external-editor/-/external-editor-3.0.0.tgz#915e7d3f808e3d2213c4fe0f525dcd7ea890e78a"
+  integrity sha512-lDSwMgg+M5rq6JKBYaJwSX6T9e/HK2qqZ1oxmOwn4AQoJE5D+7TumsxLGC02PWS//rkIVqbZv3XA3ejsc9FYvg==
   dependencies:
     chardet "^2.1.1"
-    iconv-lite "^0.7.0"
-
-"@inquirer/figures@^1.0.15":
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/@inquirer/figures/-/figures-1.0.15.tgz#dbb49ed80df11df74268023b496ac5d9acd22b3a"
-  integrity sha512-t2IEY+unGHOzAaVM5Xx6DEWKeXlDDcNPeDyUpsRc6CUhBfU3VQOEl+Vssh7VNp1dR8MdUJBWhuObjXCsVpjN5g==
+    iconv-lite "^0.7.2"
 
-"@inquirer/input@^4.3.1":
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/@inquirer/input/-/input-4.3.1.tgz#778683b4c4c4d95d05d4b05c4a854964b73565b4"
-  integrity sha512-kN0pAM4yPrLjJ1XJBjDxyfDduXOuQHrBB8aLDMueuwUGn+vNpF7Gq7TvyVxx8u4SHlFFj4trmj+a2cbpG4Jn1g==
-  dependencies:
-    "@inquirer/core" "^10.3.2"
-    "@inquirer/type" "^3.0.10"
-
-"@inquirer/number@^3.0.23":
-  version "3.0.23"
-  resolved "https://registry.yarnpkg.com/@inquirer/number/-/number-3.0.23.tgz#3fdec2540d642093fd7526818fd8d4bdc7335094"
-  integrity sha512-5Smv0OK7K0KUzUfYUXDXQc9jrf8OHo4ktlEayFlelCjwMXz0299Y8OrI+lj7i4gCBY15UObk76q0QtxjzFcFcg==
-  dependencies:
-    "@inquirer/core" "^10.3.2"
-    "@inquirer/type" "^3.0.10"
-
-"@inquirer/password@^4.0.23":
-  version "4.0.23"
-  resolved "https://registry.yarnpkg.com/@inquirer/password/-/password-4.0.23.tgz#b9f5187c8c92fd7aa9eceb9d8f2ead0d7e7b000d"
-  integrity sha512-zREJHjhT5vJBMZX/IUbyI9zVtVfOLiTO66MrF/3GFZYZ7T4YILW5MSkEYHceSii/KtRk+4i3RE7E1CUXA2jHcA==
-  dependencies:
-    "@inquirer/ansi" "^1.0.2"
-    "@inquirer/core" "^10.3.2"
-    "@inquirer/type" "^3.0.10"
-
-"@inquirer/prompts@^7.8.2":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@inquirer/prompts/-/prompts-7.10.1.tgz#e1436c0484cf04c22548c74e2cd239e989d5f847"
-  integrity sha512-Dx/y9bCQcXLI5ooQ5KyvA4FTgeo2jYj/7plWfV5Ak5wDPKQZgudKez2ixyfz7tKXzcJciTxqLeK7R9HItwiByg==
-  dependencies:
-    "@inquirer/checkbox" "^4.3.2"
-    "@inquirer/confirm" "^5.1.21"
-    "@inquirer/editor" "^4.2.23"
-    "@inquirer/expand" "^4.0.23"
-    "@inquirer/input" "^4.3.1"
-    "@inquirer/number" "^3.0.23"
-    "@inquirer/password" "^4.0.23"
-    "@inquirer/rawlist" "^4.1.11"
-    "@inquirer/search" "^3.2.2"
-    "@inquirer/select" "^4.4.2"
-
-"@inquirer/rawlist@^4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@inquirer/rawlist/-/rawlist-4.1.11.tgz#313c8c3ffccb7d41e990c606465726b4a898a033"
-  integrity sha512-+LLQB8XGr3I5LZN/GuAHo+GpDJegQwuPARLChlMICNdwW7OwV2izlCSCxN6cqpL0sMXmbKbFcItJgdQq5EBXTw==
-  dependencies:
-    "@inquirer/core" "^10.3.2"
-    "@inquirer/type" "^3.0.10"
-    yoctocolors-cjs "^2.1.3"
-
-"@inquirer/search@^3.2.2":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@inquirer/search/-/search-3.2.2.tgz#4cc6fd574dcd434e4399badc37c742c3fd534ac8"
-  integrity sha512-p2bvRfENXCZdWF/U2BXvnSI9h+tuA8iNqtUKb9UWbmLYCRQxd8WkvwWvYn+3NgYaNwdUkHytJMGG4MMLucI1kA==
-  dependencies:
-    "@inquirer/core" "^10.3.2"
-    "@inquirer/figures" "^1.0.15"
-    "@inquirer/type" "^3.0.10"
-    yoctocolors-cjs "^2.1.3"
-
-"@inquirer/select@^4.4.2":
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/@inquirer/select/-/select-4.4.2.tgz#2ac8fca960913f18f1d1b35323ed8fcd27d89323"
-  integrity sha512-l4xMuJo55MAe+N7Qr4rX90vypFwCajSakx59qe/tMaC1aEHWLyw68wF4o0A4SLAY4E0nd+Vt+EyskeDIqu1M6w==
+"@inquirer/figures@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@inquirer/figures/-/figures-2.0.5.tgz#d12f4889ac6ea7731ebc52bd9c066ca51d8fdee7"
+  integrity sha512-NsSs4kzfm12lNetHwAn3GEuH317IzpwrMCbOuMIVytpjnJ90YYHNwdRgYGuKmVxwuIqSgqk3M5qqQt1cDk0tGQ==
+
+"@inquirer/input@^5.0.13":
+  version "5.0.13"
+  resolved "https://registry.yarnpkg.com/@inquirer/input/-/input-5.0.13.tgz#e55cbd66ff7dee6d958c52bbe75675e65d664707"
+  integrity sha512-0l0jCHlJnXIV8CTxwQC0C+5Ziq8WP22edWgmciW2xYvoeoSck4v5FvCS1ctKdqLLR0dUo93uAHgWHywgBSoRyw==
+  dependencies:
+    "@inquirer/core" "^11.1.10"
+    "@inquirer/type" "^4.0.5"
+
+"@inquirer/number@^4.0.13":
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/@inquirer/number/-/number-4.0.13.tgz#34e9e4a256fd2c666251e082dc6e2cfa01048d65"
+  integrity sha512-WHmkYnnJAou5gx7RgcvAfUggnHNM1zWfoh0dFPl3dxVssuqt+dK5rIbaOYQXNyOegvFnopbKupjnhw2O8gANNg==
+  dependencies:
+    "@inquirer/core" "^11.1.10"
+    "@inquirer/type" "^4.0.5"
+
+"@inquirer/password@^5.0.13":
+  version "5.0.13"
+  resolved "https://registry.yarnpkg.com/@inquirer/password/-/password-5.0.13.tgz#7271099c1214814147bde615c0382abc0bbec8d1"
+  integrity sha512-XDGu64ROHZjOOXLAANvJN7iIxWKhOSCG5VakrZ5kaScVR+snVJCFglD/hL3/677awtWcu4pXoWa280CDIYcBeg==
+  dependencies:
+    "@inquirer/ansi" "^2.0.5"
+    "@inquirer/core" "^11.1.10"
+    "@inquirer/type" "^4.0.5"
+
+"@inquirer/prompts@^8.3.2":
+  version "8.4.3"
+  resolved "https://registry.yarnpkg.com/@inquirer/prompts/-/prompts-8.4.3.tgz#8387cd6c2b9a0c01895566e73564ef8e7e864c5f"
+  integrity sha512-ai5LseTw9HhegupIgmo4cn7RpnCGznjjXu4OI+7jMR8vu7T1ZCCNMzFFAovUCjL1fl0cceksIN1++yQE59SmZw==
+  dependencies:
+    "@inquirer/checkbox" "^5.1.5"
+    "@inquirer/confirm" "^6.0.13"
+    "@inquirer/editor" "^5.1.2"
+    "@inquirer/expand" "^5.0.14"
+    "@inquirer/input" "^5.0.13"
+    "@inquirer/number" "^4.0.13"
+    "@inquirer/password" "^5.0.13"
+    "@inquirer/rawlist" "^5.2.9"
+    "@inquirer/search" "^4.1.9"
+    "@inquirer/select" "^5.1.5"
+
+"@inquirer/rawlist@^5.2.9":
+  version "5.2.9"
+  resolved "https://registry.yarnpkg.com/@inquirer/rawlist/-/rawlist-5.2.9.tgz#f0e37240810c1dd3d8e6a0f7e1e04acca8e84085"
+  integrity sha512-a1ErXEfgjfPYpyQ89dp+7n2IISjH9oQg3ygvF5adz8B7aHn4n2PjEgu1wpVTp69K3bj3lVLxP0qJ2b1clk1Whw==
+  dependencies:
+    "@inquirer/core" "^11.1.10"
+    "@inquirer/type" "^4.0.5"
+
+"@inquirer/search@^4.1.9":
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/@inquirer/search/-/search-4.1.9.tgz#1a8072812f5244b787c63f9388a6d7ac26d57e4a"
+  integrity sha512-ZlbM28Q9lmLkFPNAIv+ZuY530n5Km8U1WW48oYEvDhe9yc2uL3m3t+JSdRUkQlk5fuIuskgiIVjcb7czFzQpuA==
+  dependencies:
+    "@inquirer/core" "^11.1.10"
+    "@inquirer/figures" "^2.0.5"
+    "@inquirer/type" "^4.0.5"
+
+"@inquirer/select@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@inquirer/select/-/select-5.1.5.tgz#3f0b4c5add402e6cb958a135a2a853ae4d42d323"
+  integrity sha512-6SRg6kHfK/sjLXOsuqNebuir+sjwrf/iWuRUnXgB2slzEewppI1WfzeS16XxDcOQmXBruMmmB9Cgrz7wsAxqMg==
   dependencies:
-    "@inquirer/ansi" "^1.0.2"
-    "@inquirer/core" "^10.3.2"
-    "@inquirer/figures" "^1.0.15"
-    "@inquirer/type" "^3.0.10"
-    yoctocolors-cjs "^2.1.3"
+    "@inquirer/ansi" "^2.0.5"
+    "@inquirer/core" "^11.1.10"
+    "@inquirer/figures" "^2.0.5"
+    "@inquirer/type" "^4.0.5"
 
-"@inquirer/type@^3.0.10":
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-3.0.10.tgz#11ed564ec78432a200ea2601a212d24af8150d50"
-  integrity sha512-BvziSRxfz5Ov8ch0z/n3oijRSEcEsHnhggm4xFZe93DHcUCTlutlq9Ox4SVENAfcRD22UQq7T/atg9Wr3k09eA==
+"@inquirer/type@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-4.0.5.tgz#a02d90e5da8a36dce27ac8e7237a50c99a9003a3"
+  integrity sha512-aetVUNeKNc/VriqXlw1NRSW0zhMBB0W4bNbWRJgzRl/3d0QNDQFfk0GO5SDdtjMZVg6o8ZKEiadd7SCCzoOn5Q==
 
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
@@ -1282,130 +1310,131 @@
     resolve-from "^5.0.0"
 
 "@istanbuljs/schema@^0.1.2", "@istanbuljs/schema@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
-  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.6.tgz#8dc9afa2ac1506cb1a58f89940f1c124446c8df3"
+  integrity sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==
 
-"@jest/console@30.3.0":
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-30.3.0.tgz#42ccc3f995d400a8fe35b8850cfe10a8d4804cdf"
-  integrity sha512-PAwCvFJ4696XP2qZj+LAn1BWjZaJ6RjG6c7/lkMaUJnkyMS34ucuIsfqYvfskVNvUI27R/u4P1HMYFnlVXG/Ww==
+"@jest/console@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-30.4.1.tgz#e57725678c3fcc9f7e5597e691e454fee4ce0939"
+  integrity sha512-v3bhyxUh9Hgmo5p6hAOXe14/R3ZxZDOsvHleh4B07z3m/x4/ngPUXEm9XwK4sF4u+f+P2ORb0Ge+MgpaqRMVDA==
   dependencies:
-    "@jest/types" "30.3.0"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
     chalk "^4.1.2"
-    jest-message-util "30.3.0"
-    jest-util "30.3.0"
+    jest-message-util "30.4.1"
+    jest-util "30.4.1"
     slash "^3.0.0"
 
-"@jest/core@30.3.0":
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-30.3.0.tgz#d06bb8456f35350f6494fd2405bcec4abb97b994"
-  integrity sha512-U5mVPsBxLSO6xYbf+tgkymLx+iAhvZX43/xI1+ej2ZOPnPdkdO1CzDmFKh2mZBn2s4XZixszHeQnzp1gm/DIxw==
-  dependencies:
-    "@jest/console" "30.3.0"
-    "@jest/pattern" "30.0.1"
-    "@jest/reporters" "30.3.0"
-    "@jest/test-result" "30.3.0"
-    "@jest/transform" "30.3.0"
-    "@jest/types" "30.3.0"
+"@jest/core@30.4.2":
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-30.4.2.tgz#3d4081f894b7e2ff57d04a31842416bd07b76c32"
+  integrity sha512-TZJA6cPJUFxoWhxaLo8t0VX/MZX2wPWr0uIDvLSHIvN4gu9h02vSzqI2kBADG1ExqQlC+cY09xKMSreivvrChQ==
+  dependencies:
+    "@jest/console" "30.4.1"
+    "@jest/pattern" "30.4.0"
+    "@jest/reporters" "30.4.1"
+    "@jest/test-result" "30.4.1"
+    "@jest/transform" "30.4.1"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
     ansi-escapes "^4.3.2"
     chalk "^4.1.2"
     ci-info "^4.2.0"
     exit-x "^0.2.2"
+    fast-json-stable-stringify "^2.1.0"
     graceful-fs "^4.2.11"
-    jest-changed-files "30.3.0"
-    jest-config "30.3.0"
-    jest-haste-map "30.3.0"
-    jest-message-util "30.3.0"
-    jest-regex-util "30.0.1"
-    jest-resolve "30.3.0"
-    jest-resolve-dependencies "30.3.0"
-    jest-runner "30.3.0"
-    jest-runtime "30.3.0"
-    jest-snapshot "30.3.0"
-    jest-util "30.3.0"
-    jest-validate "30.3.0"
-    jest-watcher "30.3.0"
-    pretty-format "30.3.0"
+    jest-changed-files "30.4.1"
+    jest-config "30.4.2"
+    jest-haste-map "30.4.1"
+    jest-message-util "30.4.1"
+    jest-regex-util "30.4.0"
+    jest-resolve "30.4.1"
+    jest-resolve-dependencies "30.4.2"
+    jest-runner "30.4.2"
+    jest-runtime "30.4.2"
+    jest-snapshot "30.4.1"
+    jest-util "30.4.1"
+    jest-validate "30.4.1"
+    jest-watcher "30.4.1"
+    pretty-format "30.4.1"
     slash "^3.0.0"
 
-"@jest/diff-sequences@30.3.0":
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/diff-sequences/-/diff-sequences-30.3.0.tgz#25b0818d3d83f00b9c7b04e069b8810f9014b143"
-  integrity sha512-cG51MVnLq1ecVUaQ3fr6YuuAOitHK1S4WUJHnsPFE/quQr33ADUx1FfrTCpMCRxvy0Yr9BThKpDjSlcTi91tMA==
+"@jest/diff-sequences@30.4.0":
+  version "30.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/diff-sequences/-/diff-sequences-30.4.0.tgz#8be2d260e6241d6cddddd102c304fe13b4fc8e3e"
+  integrity sha512-zOpzlfUs45l6u7jm39qr87JCHUDsaeCtvL+kQe/Vn9jSnRB4/5IPXISm0h9I1vZW/o00Kn4UTJ2MOlhnUGwv3g==
 
-"@jest/environment@30.3.0":
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-30.3.0.tgz#b0657c2944b6ef3352f7b25903cc3a23e6ab70f6"
-  integrity sha512-SlLSF4Be735yQXyh2+mctBOzNDx5s5uLv88/j8Qn1wH679PDcwy67+YdADn8NJnGjzlXtN62asGH/T4vWOkfaw==
+"@jest/environment@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-30.4.1.tgz#1ab5b736e3ce6336d59e00765fa24019649f1a30"
+  integrity sha512-AK9yNRqgKxiabqMoe4oW+3/TSSeV8vkdC7BGaxZdU0AFXfOpofTLqdru2GXKZghP3sdgwE9XXpnVwfZ8JnFV4w==
   dependencies:
-    "@jest/fake-timers" "30.3.0"
-    "@jest/types" "30.3.0"
+    "@jest/fake-timers" "30.4.1"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
-    jest-mock "30.3.0"
+    jest-mock "30.4.1"
 
-"@jest/expect-utils@30.3.0":
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-30.3.0.tgz#c45b2da9802ffed33bf43b3e019ddb95e5ad95e8"
-  integrity sha512-j0+W5iQQ8hBh7tHZkTQv3q2Fh/M7Je72cIsYqC4OaktgtO7v1So9UTjp6uPBHIaB6beoF/RRsCgMJKvti0wADA==
+"@jest/expect-utils@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-30.4.1.tgz#e0c7436d52b08610de9027841912dc3734ae80b2"
+  integrity sha512-ZBn5CglH8fBsQsvs4VWNzD4aWfUYks+IdOOQU3MEK71ol/BcVm+P+rtb1KpiFBpSWSCE27uOahyyf1vfqOVbcQ==
   dependencies:
     "@jest/get-type" "30.1.0"
 
-"@jest/expect@30.3.0":
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-30.3.0.tgz#08ee7f5b610167b0068743246c0b568f4c40c773"
-  integrity sha512-76Nlh4xJxk2D/9URCn3wFi98d2hb19uWE1idLsTt2ywhvdOldbw3S570hBgn25P4ICUZ/cBjybrBex2g17IDbg==
+"@jest/expect@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-30.4.1.tgz#7fefc67f86c2cb2af3c86d9d41fe4a1d74862b8c"
+  integrity sha512-ginrj6TMgh2GshLUGCjO94Ptx9HhdZA/I6A9iUfyeLKFtdAjnKzHDgzgP9HYQgbxM1lbXScQ2eUBz2lGeVDPWA==
   dependencies:
-    expect "30.3.0"
-    jest-snapshot "30.3.0"
+    expect "30.4.1"
+    jest-snapshot "30.4.1"
 
-"@jest/fake-timers@30.3.0":
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-30.3.0.tgz#2b2868130c1d28233a79566874c42cae1c5a70bc"
-  integrity sha512-WUQDs8SOP9URStX1DzhD425CqbN/HxUYCTwVrT8sTVBfMvFqYt/s61EK5T05qnHu0po6RitXIvP9otZxYDzTGQ==
+"@jest/fake-timers@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-30.4.1.tgz#ad2d3412d5d005a3e45740bd4c8ee1ccae2f89e1"
+  integrity sha512-iW5umdmfPeWzehrVhugFQZqCchSCud5S1l2YT0O9ZhjRR0ExclANDZkiSBwzqtnlOn0J1JXvO+HZ6rkuyOVOgQ==
   dependencies:
-    "@jest/types" "30.3.0"
-    "@sinonjs/fake-timers" "^15.0.0"
+    "@jest/types" "30.4.1"
+    "@sinonjs/fake-timers" "^15.4.0"
     "@types/node" "*"
-    jest-message-util "30.3.0"
-    jest-mock "30.3.0"
-    jest-util "30.3.0"
+    jest-message-util "30.4.1"
+    jest-mock "30.4.1"
+    jest-util "30.4.1"
 
 "@jest/get-type@30.1.0":
   version "30.1.0"
   resolved "https://registry.yarnpkg.com/@jest/get-type/-/get-type-30.1.0.tgz#4fcb4dc2ebcf0811be1c04fd1cb79c2dba431cbc"
   integrity sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==
 
-"@jest/globals@30.3.0":
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-30.3.0.tgz#40f4c90e5602629ecda1ca773a8fb21575bb64ea"
-  integrity sha512-+owLCBBdfpgL3HU+BD5etr1SvbXpSitJK0is1kiYjJxAAJggYMRQz5hSdd5pq1sSggfxPbw2ld71pt4x5wwViA==
+"@jest/globals@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-30.4.1.tgz#6376975e137ef87926349b5e75ccf230f491e843"
+  integrity sha512-ZbuY4cmXC8DkxYjfvT2DbcHWL2T6vmsMhXCDcmTB2T0y0gaezBI77ufq5ZAIdcRkYZ7NEQEDg1xFeKbxUJ5v5Q==
   dependencies:
-    "@jest/environment" "30.3.0"
-    "@jest/expect" "30.3.0"
-    "@jest/types" "30.3.0"
-    jest-mock "30.3.0"
+    "@jest/environment" "30.4.1"
+    "@jest/expect" "30.4.1"
+    "@jest/types" "30.4.1"
+    jest-mock "30.4.1"
 
-"@jest/pattern@30.0.1":
-  version "30.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/pattern/-/pattern-30.0.1.tgz#d5304147f49a052900b4b853dedb111d080e199f"
-  integrity sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==
+"@jest/pattern@30.4.0":
+  version "30.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/pattern/-/pattern-30.4.0.tgz#fcb519eeacc25caa3768f787595a27afa15302ae"
+  integrity sha512-RAWn3+f9u8BsHijKJ71uHcFp6vmyEt6VvoWXkl6hKF3qVIuWNmudVjg12DlBPGup/frIl5UcUlH5HfEuvHpEXg==
   dependencies:
     "@types/node" "*"
-    jest-regex-util "30.0.1"
+    jest-regex-util "30.4.0"
 
-"@jest/reporters@30.3.0":
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-30.3.0.tgz#0c1065f6c892665e5a051df22b19df4466ed816b"
-  integrity sha512-a09z89S+PkQnL055bVj8+pe2Caed2PBOaczHcXCykW5ngxX9EWx/1uAwncxc/HiU0oZqfwseMjyhxgRjS49qPw==
+"@jest/reporters@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-30.4.1.tgz#41d42533f199e737ae352a0a0b32ff300826efe2"
+  integrity sha512-/SnkPCzEQpUaBH81kjdEdDdo2WZl5hxw+BmLDGWjRkm8o7XlhjwsU36cqwe5PGBE5WYpBvDzRSdXx9rbGuJtNA==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "30.3.0"
-    "@jest/test-result" "30.3.0"
-    "@jest/transform" "30.3.0"
-    "@jest/types" "30.3.0"
+    "@jest/console" "30.4.1"
+    "@jest/test-result" "30.4.1"
+    "@jest/transform" "30.4.1"
+    "@jest/types" "30.4.1"
     "@jridgewell/trace-mapping" "^0.3.25"
     "@types/node" "*"
     chalk "^4.1.2"
@@ -1418,26 +1447,26 @@
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^5.0.0"
     istanbul-reports "^3.1.3"
-    jest-message-util "30.3.0"
-    jest-util "30.3.0"
-    jest-worker "30.3.0"
+    jest-message-util "30.4.1"
+    jest-util "30.4.1"
+    jest-worker "30.4.1"
     slash "^3.0.0"
     string-length "^4.0.2"
     v8-to-istanbul "^9.0.1"
 
-"@jest/schemas@30.0.5":
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-30.0.5.tgz#7bdf69fc5a368a5abdb49fd91036c55225846473"
-  integrity sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==
+"@jest/schemas@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-30.4.1.tgz#c3703fdd71357e2c83aa59bd38469e60a11529c6"
+  integrity sha512-i6b4qw5qnP8c5FEeBJg/uZQ4ddrkN6Ca8qISJh0pr7a5hfn3h3v5x60BEbOC7OYAGZNMs1LfFLwnW2CuK8F57Q==
   dependencies:
     "@sinclair/typebox" "^0.34.0"
 
-"@jest/snapshot-utils@30.3.0":
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/snapshot-utils/-/snapshot-utils-30.3.0.tgz#ca003c91a3e1e4e4956dee716a2aaf04b6707f31"
-  integrity sha512-ORbRN9sf5PP82v3FXNSwmO1OTDR2vzR2YTaR+E3VkSBZ8zadQE6IqYdYEeFH1NIkeB2HIGdF02dapb6K0Mj05g==
+"@jest/snapshot-utils@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/snapshot-utils/-/snapshot-utils-30.4.1.tgz#0f829488b9d46b118854a16a56d509a3c6d9e064"
+  integrity sha512-ObY4ljvQ95mt6iwKtVLetR/4yXiAgl3H4nJxhztr0MTjrN97TwDYrnCp/kF60Ec9HdhkWTHSu+Hg05aXfngpOA==
   dependencies:
-    "@jest/types" "30.3.0"
+    "@jest/types" "30.4.1"
     chalk "^4.1.2"
     graceful-fs "^4.2.11"
     natural-compare "^1.4.0"
@@ -1451,53 +1480,53 @@
     callsites "^3.1.0"
     graceful-fs "^4.2.11"
 
-"@jest/test-result@30.3.0":
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-30.3.0.tgz#cd8882d683d467fcffb98c09501a65687a76aae9"
-  integrity sha512-e/52nJGuD74AKTSe0P4y5wFRlaXP0qmrS17rqOMHeSwm278VyNyXE3gFO/4DTGF9w+65ra3lo3VKj0LBrzmgdQ==
+"@jest/test-result@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-30.4.1.tgz#e21146ebbb3e1f7f76c3c49805d9f39ae45f8de1"
+  integrity sha512-/ZG7pgEiOmmWkN9TplKbOu4id2N5lh7FHwRwlkgBVAzGdRH+OkkQ8wX/kIxg4zmd3ZQvAL1RwL2yWsvNYYECTw==
   dependencies:
-    "@jest/console" "30.3.0"
-    "@jest/types" "30.3.0"
+    "@jest/console" "30.4.1"
+    "@jest/types" "30.4.1"
     "@types/istanbul-lib-coverage" "^2.0.6"
     collect-v8-coverage "^1.0.2"
 
-"@jest/test-sequencer@30.3.0":
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-30.3.0.tgz#27002b2093f4e0d9e0e1ebb0bc274a242fdadc14"
-  integrity sha512-dgbWy9b8QDlQeRZcv7LNF+/jFiiYHTKho1xirauZ7kVwY7avjFF6uTT0RqlgudB5OuIPagFdVtfFMosjVbk1eA==
+"@jest/test-sequencer@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-30.4.1.tgz#caf9a5e0924ed3b04957441edf9e8cef6a804391"
+  integrity sha512-PeYE+4td5rKjoRPxztObrXU+H8hsjZfxKMXOcmrr34JerSyB/ROOxbbicz8B7A5j9R9VayDnVPvBmedqCsFCdw==
   dependencies:
-    "@jest/test-result" "30.3.0"
+    "@jest/test-result" "30.4.1"
     graceful-fs "^4.2.11"
-    jest-haste-map "30.3.0"
+    jest-haste-map "30.4.1"
     slash "^3.0.0"
 
-"@jest/transform@30.3.0":
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-30.3.0.tgz#9e6f78ffa205449bf956e269fd707c160f47ce2f"
-  integrity sha512-TLKY33fSLVd/lKB2YI1pH69ijyUblO/BQvCj566YvnwuzoTNr648iE0j22vRvVNk2HsPwByPxATg3MleS3gf5A==
+"@jest/transform@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-30.4.1.tgz#1646cddb800d38d9c4e30fecfd4a6eba0fa8acfa"
+  integrity sha512-Wz0LyktlTvRefoymh+n64hQ84KNXsRGcwdoZ8CSa0Ea+fgYcHZlnk+hDP7v2MS7il2bQ5uTEIxf4/NNfhMN4KQ==
   dependencies:
     "@babel/core" "^7.27.4"
-    "@jest/types" "30.3.0"
+    "@jest/types" "30.4.1"
     "@jridgewell/trace-mapping" "^0.3.25"
     babel-plugin-istanbul "^7.0.1"
     chalk "^4.1.2"
     convert-source-map "^2.0.0"
     fast-json-stable-stringify "^2.1.0"
     graceful-fs "^4.2.11"
-    jest-haste-map "30.3.0"
-    jest-regex-util "30.0.1"
-    jest-util "30.3.0"
+    jest-haste-map "30.4.1"
+    jest-regex-util "30.4.0"
+    jest-util "30.4.1"
     pirates "^4.0.7"
     slash "^3.0.0"
     write-file-atomic "^5.0.1"
 
-"@jest/types@30.3.0":
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-30.3.0.tgz#cada800d323cb74945c24ac74615fdb312a6c85f"
-  integrity sha512-JHm87k7bA33hpBngtU8h6UBub/fqqA9uXfw+21j5Hmk7ooPHlboRNxHq0JcMtC+n8VJGP1mcfnD3Mk+XKe1oSw==
+"@jest/types@30.4.1":
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-30.4.1.tgz#f79b647a85cb2ff4a90cc55984b31dae820db1f7"
+  integrity sha512-f1x/vJXIfjOlEmejYpbkbgw1gOqpPECwMvMEtBqe47j7H2Hg8h8w3o3ikhSXq3MI15kg+oQ0exWO0uCtTNJLoQ==
   dependencies:
-    "@jest/pattern" "30.0.1"
-    "@jest/schemas" "30.0.5"
+    "@jest/pattern" "30.4.0"
+    "@jest/schemas" "30.4.1"
     "@types/istanbul-lib-coverage" "^2.0.6"
     "@types/istanbul-reports" "^3.0.4"
     "@types/node" "*"
@@ -1546,66 +1575,64 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@napi-rs/wasm-runtime@^0.2.11":
-  version "0.2.12"
-  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz#3e78a8b96e6c33a6c517e1894efbd5385a7cb6f2"
-  integrity sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==
+"@napi-rs/wasm-runtime@^1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz#a46bbfedc29751b7170c5d23bc1d8ee8c7e3c1e1"
+  integrity sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==
   dependencies:
-    "@emnapi/core" "^1.4.3"
-    "@emnapi/runtime" "^1.4.3"
-    "@tybys/wasm-util" "^0.10.0"
+    "@tybys/wasm-util" "^0.10.1"
 
-"@next/env@16.2.1":
-  version "16.2.1"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-16.2.1.tgz#3896715e28c850355b7b1c9c687beb9d7e9cdc40"
-  integrity sha512-n8P/HCkIWW+gVal2Z8XqXJ6aB3J0tuM29OcHpCsobWlChH/SITBs1DFBk/HajgrwDkqqBXPbuUuzgDvUekREPg==
+"@next/env@16.2.6":
+  version "16.2.6"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-16.2.6.tgz#93a173801cb088463070cc6a113c68e26c1838ea"
+  integrity sha512-gd8HoHN4ufj73WmR3JmVolrpJR47ILK6LouP5xElPglaVxir6e1a7VzvTvDWkOoPXT9rkkTzyCxBu4yeZfZwcw==
 
-"@next/eslint-plugin-next@16.2.1":
-  version "16.2.1"
-  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-16.2.1.tgz#994717439ae3259268ed5f7d6830966f0fbb3c9d"
-  integrity sha512-r0epZGo24eT4g08jJlg2OEryBphXqO8aL18oajoTKLzHJ6jVr6P6FI58DLMug04MwD3j8Fj0YK0slyzneKVyzA==
+"@next/eslint-plugin-next@16.2.6":
+  version "16.2.6"
+  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-16.2.6.tgz#24f3b2945b2856a5559af5ad630b7cddf1f65329"
+  integrity sha512-Z8l6o4JWKUl755x4R+wogD86KPeU+Ckw4K+SYG4kHeOJtRenDeK+OSbGcqZpDtbwn9DsJVdir2UxmwXuinUbUw==
   dependencies:
     fast-glob "3.3.1"
 
-"@next/swc-darwin-arm64@16.2.1":
-  version "16.2.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.2.1.tgz#8bd5c16ee04eb5f07d4f3ca71a3d5270093a9de6"
-  integrity sha512-BwZ8w8YTaSEr2HIuXLMLxIdElNMPvY9fLqb20LX9A9OMGtJilhHLbCL3ggyd0TwjmMcTxi0XXt+ur1vWUoxj2Q==
-
-"@next/swc-darwin-x64@16.2.1":
-  version "16.2.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-16.2.1.tgz#4c1a9134cd442e7fcd74bbe85ab283616ece06cb"
-  integrity sha512-/vrcE6iQSJq3uL3VGVHiXeaKbn8Es10DGTGRJnRZlkNQQk3kaNtAJg8Y6xuAlrx/6INKVjkfi5rY0iEXorZ6uA==
-
-"@next/swc-linux-arm64-gnu@16.2.1":
-  version "16.2.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.2.1.tgz#ec08722d22551ea649872df907a8fee027ab1828"
-  integrity sha512-uLn+0BK+C31LTVbQ/QU+UaVrV0rRSJQ8RfniQAHPghDdgE+SlroYqcmFnO5iNjNfVWCyKZHYrs3Nl0mUzWxbBw==
-
-"@next/swc-linux-arm64-musl@16.2.1":
-  version "16.2.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.2.1.tgz#4d6270f5be7905c1a3e4f1c4f9cf4b8c62331561"
-  integrity sha512-ssKq6iMRnHdnycGp9hCuGnXJZ0YPr4/wNwrfE5DbmvEcgl9+yv97/Kq3TPVDfYome1SW5geciLB9aiEqKXQjlQ==
-
-"@next/swc-linux-x64-gnu@16.2.1":
-  version "16.2.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.2.1.tgz#2d55519ba822cd27d9d65ed45a0ace3562df1dcc"
-  integrity sha512-HQm7SrHRELJ30T1TSmT706IWovFFSRGxfgUkyWJZF/RKBMdbdRWJuFrcpDdE5vy9UXjFOx6L3mRdqH04Mmx0hg==
-
-"@next/swc-linux-x64-musl@16.2.1":
-  version "16.2.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.2.1.tgz#607b03c3a5bade2368beb4f5b4cac9c243333638"
-  integrity sha512-aV2iUaC/5HGEpbBkE+4B8aHIudoOy5DYekAKOMSHoIYQ66y/wIVeaRx8MS2ZMdxe/HIXlMho4ubdZs/J8441Tg==
-
-"@next/swc-win32-arm64-msvc@16.2.1":
-  version "16.2.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.2.1.tgz#a96e776f37287b39e309e0850a8d8e2c6c749070"
-  integrity sha512-IXdNgiDHaSk0ZUJ+xp0OQTdTgnpx1RCfRTalhn3cjOP+IddTMINwA7DXZrwTmGDO8SUr5q2hdP/du4DcrB1GxA==
-
-"@next/swc-win32-x64-msvc@16.2.1":
-  version "16.2.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.2.1.tgz#a299bf2b5688029429061d13492c57ccf947c9c5"
-  integrity sha512-qvU+3a39Hay+ieIztkGSbF7+mccbbg1Tk25hc4JDylf8IHjYmY/Zm64Qq1602yPyQqvie+vf5T/uPwNxDNIoeg==
+"@next/swc-darwin-arm64@16.2.6":
+  version "16.2.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.2.6.tgz#0e19055594fbd2d198ce95cf5842bdbe57235d4e"
+  integrity sha512-ZJGkkcNfYgrrMkqOdZ7zoLa1TOy0qpcMfk/z4Mh/FKUz40gVO+HNQWqmLxf67Z5WB64DRp0dhEbyHfel+6sJUg==
+
+"@next/swc-darwin-x64@16.2.6":
+  version "16.2.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-16.2.6.tgz#487086280b56017bb547f5975ef1a3d6235a070f"
+  integrity sha512-v/YLBHIY132Ced3puBJ7YJKw1lqsCrgcNo2aRJlCEyQrrCeRJlvGlnmxhPxNQI3KE3N1DN5r9TPNPvka3nq5RQ==
+
+"@next/swc-linux-arm64-gnu@16.2.6":
+  version "16.2.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.2.6.tgz#b28ffbc31ee527a3ad48f29c2fd7b7f75bbdf180"
+  integrity sha512-RPOvqlYBbcQjkz9VQQDZ2T2bARIjXZV1KFlt+V2Mr6SW/e4I9fcKsaA0hdyf2FHoTlsV2xnBd5Y912rP/1Ce6w==
+
+"@next/swc-linux-arm64-musl@16.2.6":
+  version "16.2.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.2.6.tgz#d2eac5600e7083527669fa8cb8758efbbf9c8210"
+  integrity sha512-URUTu1+dMkxJsPFgm+OeEvq9wf5sujw0EvgYy80TDGHTSLTnIHeqb0Eu8A3sC95IRgjejQL+kC4mw+4yPxiAXA==
+
+"@next/swc-linux-x64-gnu@16.2.6":
+  version "16.2.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.2.6.tgz#e70dc3469bf9bfef16da2ba240c07ef6cfe8ad55"
+  integrity sha512-DOj182mPV8G3UkrayLoREM5YEYI+Dk5wv7Ox9xl1fFibAELEsFD0lDPfHIeILlutMMfdyhlzYPELG3peuKaurw==
+
+"@next/swc-linux-x64-musl@16.2.6":
+  version "16.2.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.2.6.tgz#49ecd2f622d0f3741654c59411f604dbbe1a38de"
+  integrity sha512-HKQ5SP/V/ub73UvF7n/zeJlxk2kLmtL7Wzrg4WfmkjmNos5onJ2tKu7yZOPdL18A6Svfn3max29ym+ry7NkK4g==
+
+"@next/swc-win32-arm64-msvc@16.2.6":
+  version "16.2.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.2.6.tgz#8a6dfec005364e1cf4fa1724c3d7fa0093660406"
+  integrity sha512-LZXpTlPyS5v7HhSmnvsLGP3iIYgYOBnc8r8ArlT55sGHV89bR2HlDdBjWQ+PY6SJMmk8TuVGFuxalnP3k/0Dwg==
+
+"@next/swc-win32-x64-msvc@16.2.6":
+  version "16.2.6"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.2.6.tgz#4fb656ccfcf60cbf8ffedb40fc1b625987c82742"
+  integrity sha512-F0+4i0h9J6C4eE3EAPWsoCk7UW/dbzOjyzxY0qnDUOYFu6FFmdZ6l97/XdV3/Nz3VYyO7UWjyEJUXkGqcoXfMA==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -1739,13 +1766,13 @@
   dependencies:
     "@babel/runtime" "^7.24.4"
 
-"@rc-component/cascader@~1.14.0":
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/cascader/-/cascader-1.14.0.tgz#74e1fca58cb14f8f75f6e4bf1debd90534aaea7c"
-  integrity sha512-Ip9356xwZUR2nbW5PRVGif4B/bDve4pLa/N+PGbvBaTnjbvmN4PFMBGQSmlDlzKP1ovxaYMvwF/dI9lXNLT4iQ==
+"@rc-component/cascader@~1.15.0":
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/cascader/-/cascader-1.15.0.tgz#554cba8e01e94a1288547cec96422b2cfc73ff40"
+  integrity sha512-ZzpMtwFCRo3fbXHuDnncARJMZQjdqA2w7aDuPofNQt+aDx39st1hgfIpEwTBLhe2Hqsvs/zOr8RTtgxTkCPySw==
   dependencies:
     "@rc-component/select" "~1.6.0"
-    "@rc-component/tree" "~1.2.0"
+    "@rc-component/tree" "~1.3.0"
     "@rc-component/util" "^1.4.0"
     clsx "^2.1.1"
 
@@ -1783,10 +1810,10 @@
   dependencies:
     "@rc-component/util" "^1.3.0"
 
-"@rc-component/dialog@~1.8.4":
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/@rc-component/dialog/-/dialog-1.8.4.tgz#e1f05f311539852f40a5717bc3874ce0af64c6ff"
-  integrity sha512-Ay6PM7phkTkquplG8fWfUGFZ2GTLx9diTl4f0d8Eqxd7W1u1KjE9AQooFQHOHnhZf0Ya3z51+5EKCWHmt/dNEw==
+"@rc-component/dialog@~1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/dialog/-/dialog-1.9.0.tgz#3134f8fa8644d9bc228c862668b90de048c7ea1a"
+  integrity sha512-zbAAogkg4kkKum79sLE6M+vq1jSAW25zdkafrahgcTP9t9S//SD634Znd1A4c8F2Gc12ZKnehGLsVaaOvZzD2A==
   dependencies:
     "@rc-component/motion" "^1.1.3"
     "@rc-component/portal" "^2.1.0"
@@ -1812,23 +1839,23 @@
     "@rc-component/util" "^1.2.1"
     clsx "^2.1.1"
 
-"@rc-component/form@~1.7.2":
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@rc-component/form/-/form-1.7.2.tgz#5e9db42f7fb6a55abff5d4eb0c263ccce6473710"
-  integrity sha512-5C90rXH7aZvvvxB4M5ew+QxROvimdL/lqhSshR8NsyiR7HKOoGQYSitxdfENnH6/0KNFxEy2ranVe2LrTnHZIw==
+"@rc-component/form@~1.8.1":
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/form/-/form-1.8.1.tgz#d811fb52df41bf72297938ebfe5cf4a4774588d4"
+  integrity sha512-8O7TB55Fi2mWIGvSnwZjk8jFqVNYyKDAswglwGShcbndxqzKz4cHwNtNaLjZlAeRge9wcB0LL8IWsC/Bl18raQ==
   dependencies:
     "@rc-component/async-validator" "^5.1.0"
     "@rc-component/util" "^1.6.2"
     clsx "^2.1.1"
 
-"@rc-component/image@~1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/image/-/image-1.6.0.tgz#4c3f66b07a1d7c50de23a7bf24660262161daf8d"
-  integrity sha512-tSfn2ZE/oP082g4QIOxeehkmgnXB7R+5AFj/lIFr4k7pEuxHBdyGIq9axoCY9qea8NN0DY6p4IB/F07tLqaT5A==
+"@rc-component/image@~1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/image/-/image-1.9.0.tgz#110785d735d20336afcdbac84e8fbfd059a7a44e"
+  integrity sha512-khF7w7xkBH5B1bsBcI1FSUZdkyd1aqpl2eYyILCqCzzQH3XdfehGUaZTnptyaJJfs09/R5hv9jXWyazOMFIClQ==
   dependencies:
     "@rc-component/motion" "^1.0.0"
     "@rc-component/portal" "^2.1.2"
-    "@rc-component/util" "^1.3.0"
+    "@rc-component/util" "^1.10.1"
     clsx "^2.1.1"
 
 "@rc-component/input-number@~1.6.2":
@@ -1840,30 +1867,30 @@
     "@rc-component/util" "^1.4.0"
     clsx "^2.1.1"
 
-"@rc-component/input@~1.1.0", "@rc-component/input@~1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@rc-component/input/-/input-1.1.2.tgz#5fdb55741c012a3f8847d7bd24e318ed1d02cc05"
-  integrity sha512-Q61IMR47piUBudgixJ30CciKIy9b1H95qe7GgEKOmSJVJXvFRWJllJfQry9tif+MX2cWFXWJf/RXz4kaCeq/Fg==
+"@rc-component/input@~1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/input/-/input-1.3.0.tgz#a8c113000bbc39089cf75337bec68120115b9e05"
+  integrity sha512-IUUNOdAuWuEvDEFFgfmwQl818tiDbvXwLgon4HL1q2hJeYkqrRrYwYhJN0zfPHGTDxs3gvyVC/C02D4hWFoIcA==
   dependencies:
+    "@rc-component/resize-observer" "^1.1.1"
     "@rc-component/util" "^1.4.0"
     clsx "^2.1.1"
 
-"@rc-component/mentions@~1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/mentions/-/mentions-1.6.0.tgz#8ffc86052ac6891b83ecf17beff17c7d5cd20f91"
-  integrity sha512-KIkQNP6habNuTsLhUv0UGEOwG67tlmE7KNIJoQZZNggEZl5lQJTytFDb69sl5CK3TDdISCTjKP3nGEBKgT61CQ==
+"@rc-component/mentions@~1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/mentions/-/mentions-1.9.0.tgz#1e133d607835854430e264b681b7b32c4b49daa7"
+  integrity sha512-WUwfFKDSOF5S9UPsNsXcLYtzjTxBGsftTXWRbZuxX6BYrsySISTnujfJNgaaQ6qVzaCDJ35QUkZKvsYxip1C5g==
   dependencies:
-    "@rc-component/input" "~1.1.0"
-    "@rc-component/menu" "~1.2.0"
-    "@rc-component/textarea" "~1.1.0"
+    "@rc-component/input" "~1.3.0"
+    "@rc-component/menu" "~1.3.0"
     "@rc-component/trigger" "^3.0.0"
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/menu@~1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/menu/-/menu-1.2.0.tgz#3ec1afd2030b2f3d7917f54eb9a9d6e5d5d1d84a"
-  integrity sha512-VWwDuhvYHSnTGj4n6bV3ISrLACcPAzdPOq3d0BzkeiM5cve8BEYfvkEhNoM0PLzv51jpcejeyrLXeMVIJ+QJlg==
+"@rc-component/menu@~1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/menu/-/menu-1.3.0.tgz#fc70d81ca76ae6013b0d7955f20a2393adef04b3"
+  integrity sha512-u3NfiwpiEgT177qa5Yxm5QsI8i/93EBGpWj8HYZQDnh2pCZ2xtQCe/+w3pSR2NlwKOZDTCKzEhEyD09mGphssA==
   dependencies:
     "@rc-component/motion" "^1.1.4"
     "@rc-component/overflow" "^1.0.0"
@@ -1878,10 +1905,10 @@
   dependencies:
     "@babel/runtime" "^7.18.0"
 
-"@rc-component/motion@^1.0.0", "@rc-component/motion@^1.1.3", "@rc-component/motion@^1.1.4", "@rc-component/motion@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@rc-component/motion/-/motion-1.3.1.tgz#1e56b06841ee677261251e6e69fedc8d73e65b22"
-  integrity sha512-Wo1mkd0tCcHtvYvpPOmlYJz546z16qlsiwaygmW7NPJpOZOF9GBjhGzdzZSsC2lEJ1IUkWLF4gMHlRA1aSA+Yw==
+"@rc-component/motion@^1.0.0", "@rc-component/motion@^1.1.3", "@rc-component/motion@^1.1.4", "@rc-component/motion@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@rc-component/motion/-/motion-1.3.2.tgz#bd96e0fd16ee9d98c1d9be14198f003e367d8feb"
+  integrity sha512-itfd+GztzJYAb04Z4RkEub1TbJAfZc2Iuy8p44U44xD1F5+fNYFKI3897ijlbIyfvXkTmMm+KGcjkQQGMHywEQ==
   dependencies:
     "@rc-component/util" "^1.2.0"
     clsx "^2.1.1"
@@ -1893,19 +1920,19 @@
   dependencies:
     "@rc-component/util" "^1.2.0"
 
-"@rc-component/notification@~1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/notification/-/notification-1.2.0.tgz#dd7c7d50f1d3217bfbc75bc46259e212096855c5"
-  integrity sha512-OX3J+zVU7rvoJCikjrfW7qOUp7zlDeFBK2eA3SFbGSkDqo63Sl4Ss8A04kFP+fxHSxMDIS9jYVEZtU1FNCFuBA==
+"@rc-component/notification@~2.0.7":
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/@rc-component/notification/-/notification-2.0.7.tgz#f2450a482f87e4698285833c4a8efcac169acabb"
+  integrity sha512-nqZzpf6BPdaj+3ILx7si79LLmqPKyUmQoXa+/9gg0SkH0v1DbD66oJgRMSBEVnd/zUT3D4gwxWIHUKebYf2ZXQ==
   dependencies:
     "@rc-component/motion" "^1.1.4"
-    "@rc-component/util" "^1.2.1"
+    "@rc-component/util" "^1.11.0"
     clsx "^2.1.1"
 
 "@rc-component/overflow@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/overflow/-/overflow-1.0.0.tgz#ade1cc336c66b45eb1631fdfad59ef84c8f90a89"
-  integrity sha512-GSlBeoE0XTBi5cf3zl8Qh7Uqhn7v8RrlJ8ajeVpEkNe94HWy5l5BQ0Mwn2TVUq9gdgbfEMUmTX7tJFAg7mz0Rw==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/overflow/-/overflow-1.0.1.tgz#b9f1100b1531555b1d6a6ba2963e116fd2f96779"
+  integrity sha512-syfmgAABaHCnCDzPwHZ/2tuvIcpOO3jefYZMmfkN+pmo8HKTzsfhS57vxo4ksPdN0By+uWVJhJWNFozNBxi2eA==
   dependencies:
     "@babel/runtime" "^7.11.1"
     "@rc-component/resize-observer" "^1.0.1"
@@ -1920,10 +1947,10 @@
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/picker@~1.9.1":
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/@rc-component/picker/-/picker-1.9.1.tgz#7ffcb1e4d4655fe2f3d712773e1d3ab9cd5c2a5c"
-  integrity sha512-9FBYYsvH3HMLICaPDA/1Th5FLaDkFa7qAtangIdlhKb3ZALaR745e9PsOhheJb6asS4QXc12ffiAcjdkZ4C5/g==
+"@rc-component/picker@~1.10.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/picker/-/picker-1.10.0.tgz#6989f0ae67fca8db00e31f81a8217c8bc370cd34"
+  integrity sha512-vVOXP2RVWozwpERGUFAehVH1Jz6o/uRrAb9qSZm1LC+iJs8rvEwFo1bzz2jlOYV+uWwu0dIuG86tnDui14Ea0w==
   dependencies:
     "@rc-component/overflow" "^1.0.0"
     "@rc-component/resize-observer" "^1.0.0"
@@ -1962,10 +1989,10 @@
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/resize-observer@^1.0.0", "@rc-component/resize-observer@^1.0.1", "@rc-component/resize-observer@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@rc-component/resize-observer/-/resize-observer-1.1.1.tgz#216d7edb5259bb7d2a732735f0a103328ac8ad80"
-  integrity sha512-NfXXMmiR+SmUuKE1NwJESzEUYUFWIDUn2uXpxCTOLwiRUUakd62DRNFjRJArgzyFW8S5rsL4aX5XlyIXyC/vRA==
+"@rc-component/resize-observer@^1.0.0", "@rc-component/resize-observer@^1.0.1", "@rc-component/resize-observer@^1.1.1", "@rc-component/resize-observer@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@rc-component/resize-observer/-/resize-observer-1.1.2.tgz#5897e65d7fed5c6e768dcfd8bdec181a3309a98f"
+  integrity sha512-t/Bb0W8uvL4PYKAB3YcChC+DlHh0Wt5kM7q/J+0qpVEUMLe7Hk5zuvc9km0hMnTFPSx5Z7Wu/fzCLN6erVLE8Q==
   dependencies:
     "@rc-component/util" "^1.2.0"
 
@@ -1979,7 +2006,7 @@
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/select@~1.6.0", "@rc-component/select@~1.6.14":
+"@rc-component/select@~1.6.0", "@rc-component/select@~1.6.15":
   version "1.6.15"
   resolved "https://registry.yarnpkg.com/@rc-component/select/-/select-1.6.15.tgz#de2a3c8b020834cabd600b52de573a328c061eef"
   integrity sha512-SyVCWnqxCQZZcQvQJ/CxSjx2bGma6ds/HtnpkIfZVnt6RoEgbqUmHgD6vrzNarNXwbLXerwVzWwq8F3d1sst7g==
@@ -2014,10 +2041,10 @@
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/table@~1.9.1":
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/@rc-component/table/-/table-1.9.1.tgz#77a485f871c3a4b1abbb37f8fb9d25fb97efb481"
-  integrity sha512-FVI5ZS/GdB3BcgexfCYKi3iHhZS3Fr59EtsxORszYGrfpH1eWr33eDNSYkVfLI6tfJ7vftJDd9D5apfFWqkdJg==
+"@rc-component/table@~1.10.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/table/-/table-1.10.0.tgz#7a98d68176f23f50a762df464f4c9142e7db3942"
+  integrity sha512-SjtpcCf+rL7dDc62GKT3rXTdERjVuJvRiqjpU7g0Jc/ewCifXynHc7Nm3Em1XsD+WhGrgQtxNDScI/0+Lpfr0w==
   dependencies:
     "@rc-component/context" "^2.0.1"
     "@rc-component/resize-observer" "^1.0.0"
@@ -2025,28 +2052,18 @@
     "@rc-component/virtual-list" "^1.0.1"
     clsx "^2.1.1"
 
-"@rc-component/tabs@~1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/tabs/-/tabs-1.7.0.tgz#8e74ac1ce42c937a64e07fb91a7f7640560df09a"
-  integrity sha512-J48cs2iBi7Ho3nptBxxIqizEliUC+ExE23faspUQKGQ550vaBlv3aGF8Epv/UB1vFWeoJDTW/dNzgIU0Qj5i/w==
+"@rc-component/tabs@~1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/tabs/-/tabs-1.9.0.tgz#8f3e3755450e5a90d240d1ed3dc140d520b1fbef"
+  integrity sha512-tn1slmbbaTyt8mgwyWJcT8jo/qNiYUs6u1H7OgGQt9faYO06BJIkU5cTmMqORzIrNmSEeeUY6pD5i+JlqSHYhg==
   dependencies:
     "@rc-component/dropdown" "~1.0.0"
-    "@rc-component/menu" "~1.2.0"
+    "@rc-component/menu" "~1.3.0"
     "@rc-component/motion" "^1.1.3"
     "@rc-component/resize-observer" "^1.0.0"
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/textarea@~1.1.0", "@rc-component/textarea@~1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@rc-component/textarea/-/textarea-1.1.2.tgz#2daa5dcb997840040fb8892b0d601ef28d9d1f37"
-  integrity sha512-9rMUEODWZDMovfScIEHXWlVZuPljZ2pd1LKNjslJVitn4SldEzq5vO1CL3yy3Dnib6zZal2r2DPtjy84VVpF6A==
-  dependencies:
-    "@rc-component/input" "~1.1.0"
-    "@rc-component/resize-observer" "^1.0.0"
-    "@rc-component/util" "^1.3.0"
-    clsx "^2.1.1"
-
 "@rc-component/tooltip@~1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@rc-component/tooltip/-/tooltip-1.4.0.tgz#c8cf15c6773218a5a36271467f06e663f99c28e7"
@@ -2056,30 +2073,30 @@
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/tour@~2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/tour/-/tour-2.3.0.tgz#3c45ddcab02cd1846f707e8993beecd9dee23a8f"
-  integrity sha512-K04K9r32kUC+auBSQfr+Fss4SpSIS9JGe56oq/ALAX0p+i2ylYOI1MgR83yBY7v96eO6ZFXcM/igCQmubps0Ow==
+"@rc-component/tour@~2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/tour/-/tour-2.4.0.tgz#caf89cf8f2f9fb68f1fb0e0c867610015d01f432"
+  integrity sha512-aui4r4TqmTzwaBgcQxHYep8kM8PTjZFufjokObpy35KfFeZ0k9ArquWFZqegQlH24P14t+F0qO0mGTgzlav1yg==
   dependencies:
     "@rc-component/portal" "^2.2.0"
     "@rc-component/trigger" "^3.0.0"
     "@rc-component/util" "^1.7.0"
     clsx "^2.1.1"
 
-"@rc-component/tree-select@~1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/tree-select/-/tree-select-1.8.0.tgz#480e84221befbd1fa93ab2034423e2b064e41981"
-  integrity sha512-iYsPq3nuLYvGqdvFAW+l+I9ASRIOVbMXyA8FGZg2lGym/GwkaWeJGzI4eJ7c9IOEhRj0oyfIN4S92Fl3J05mjQ==
+"@rc-component/tree-select@~1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/tree-select/-/tree-select-1.9.0.tgz#13ea516478b6cb558e04181abb0a01ae6fbdd31f"
+  integrity sha512-GXcFe15a+trUl1/J3OHWQhsVWFpwFpGFK2cqYWZ1sK22Zs3KZTvMwDpzr75PIo1s6QVioVxpE/pRwRopkeDQ6w==
   dependencies:
     "@rc-component/select" "~1.6.0"
-    "@rc-component/tree" "~1.2.0"
+    "@rc-component/tree" "~1.3.0"
     "@rc-component/util" "^1.4.0"
     clsx "^2.1.1"
 
-"@rc-component/tree@~1.2.0", "@rc-component/tree@~1.2.4":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@rc-component/tree/-/tree-1.2.4.tgz#cb4f7d818118b3447763e74d3a82fba6454c7317"
-  integrity sha512-5Gli43+m4R7NhpYYz3Z61I6LOw9yI6CNChxgVtvrO6xB1qML7iE6QMLVMB3+FTjo2yF6uFdAHtqWPECz/zbX5w==
+"@rc-component/tree@~1.3.0", "@rc-component/tree@~1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/tree/-/tree-1.3.1.tgz#6983ca6bd9d5f6d04dd7258d00cb0fe71cdfe661"
+  integrity sha512-zlL0PW0bTFlveTtLcA01VD/yMWKK73EywItFMgIZUY5sb6tMOAw7zV6qGzqldufqrV93ZWQB4H3NBNoTMCueJA==
   dependencies:
     "@rc-component/motion" "^1.0.0"
     "@rc-component/util" "^1.8.1"
@@ -2105,18 +2122,18 @@
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/util@^1.1.0", "@rc-component/util@^1.2.0", "@rc-component/util@^1.2.1", "@rc-component/util@^1.3.0", "@rc-component/util@^1.4.0", "@rc-component/util@^1.6.2", "@rc-component/util@^1.7.0", "@rc-component/util@^1.8.1", "@rc-component/util@^1.9.0":
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/util/-/util-1.10.0.tgz#faeebbe0510f998b6d5cee9da9176b6d613cac2c"
-  integrity sha512-aY9GLBuiUdpyfIUpAWSYer4Tu3mVaZCo5A0q9NtXcazT3MRiI3/WNHCR+DUn5VAtR6iRRf0ynCqQUcHli5UdYw==
+"@rc-component/util@^1.1.0", "@rc-component/util@^1.10.1", "@rc-component/util@^1.11.0", "@rc-component/util@^1.2.0", "@rc-component/util@^1.2.1", "@rc-component/util@^1.3.0", "@rc-component/util@^1.4.0", "@rc-component/util@^1.6.2", "@rc-component/util@^1.7.0", "@rc-component/util@^1.8.1", "@rc-component/util@^1.9.0":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/util/-/util-1.11.1.tgz#07d698908339c55648e4f974afa739345e65b483"
+  integrity sha512-awVlI3ub2vqfqkYxOBc/uQ0efm3jw0wcrhtO/YWLyZfxiKXczKwNbVuhlnyxytDt7H9pbbVQiqr+O6MLATtRYg==
   dependencies:
     is-mobile "^5.0.0"
     react-is "^18.2.0"
 
 "@rc-component/virtual-list@^1.0.1":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@rc-component/virtual-list/-/virtual-list-1.0.2.tgz#356c465de522ae3834731827d9fb2311ed09b7e9"
-  integrity sha512-uvTol/mH74FYsn5loDGJxo+7kjkO4i+y4j87Re1pxJBs0FaeuMuLRzQRGaXwnMcV1CxpZLi2Z56Rerj2M00fjQ==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/virtual-list/-/virtual-list-1.1.0.tgz#94cdab75776a44a47cf1d4905c2828cf1cc62720"
+  integrity sha512-fSzVg8xFDCK+xKJJ9lljBpaGDmur4REZwXHJjsNFRi4UbfOXuH/FSbGC2oliCE5krFqM3lSZqB4Ly4vc3xQHOQ==
   dependencies:
     "@babel/runtime" "^7.20.0"
     "@rc-component/resize-observer" "^1.0.1"
@@ -2134,9 +2151,9 @@
   integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
 "@sinclair/typebox@^0.34.0":
-  version "0.34.48"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.34.48.tgz#75b0ead87e59e1adbd6dccdc42bad4fddee73b59"
-  integrity sha512-kKJTNuK3AQOrgjjotVxMrCn1sUJwM76wMszfq1kdU4uYVJjvEWuFQ6HgvLt4Xz3fSmZlTOxJ/Ie13KnIcWQXFA==
+  version "0.34.49"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.34.49.tgz#4f1369234f2ecf693866476c3b2e1b54d2a9d68e"
+  integrity sha512-brySQQs7Jtn0joV8Xh9ZV/hZb9Ozb0pmazDIASBkYKCjXrXU3mpcFahmK/z4YDhGkQvP9mWJbVyahdtU5wQA+A==
 
 "@sinonjs/commons@^3.0.1":
   version "3.0.1"
@@ -2145,10 +2162,10 @@
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@^15.0.0":
-  version "15.1.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-15.1.1.tgz#e1a6f7171941aadcc31d2cea1744264d58b8b34c"
-  integrity sha512-cO5W33JgAPbOh07tvZjUOJ7oWhtaqGHiZw+11DPbyqh2kHTBc3eF/CjJDeQ4205RLQsX6rxCuYOroFQwl7JDRw==
+"@sinonjs/fake-timers@^15.4.0":
+  version "15.4.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-15.4.0.tgz#5d40c151a9e66075fe4520bec40bccfe54931962"
+  integrity sha512-DsG+8/LscQIQg68J6Ef3dv10u6nVyetYn923s3/sus5eaGfTo1of5WMZSLf0UJc9KDuKPilPH0UDJCjvNbDNCA==
   dependencies:
     "@sinonjs/commons" "^3.0.1"
 
@@ -2179,10 +2196,10 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
   integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
 
-"@tybys/wasm-util@^0.10.0":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.1.tgz#ecddd3205cf1e2d5274649ff0eedd2991ed7f414"
-  integrity sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==
+"@tybys/wasm-util@^0.10.1":
+  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.2.tgz#12b3a1b33db1f9cad4ddff1f604ab7dd00bf464e"
+  integrity sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==
   dependencies:
     tslib "^2.4.0"
 
@@ -2225,11 +2242,11 @@
   integrity sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==
 
 "@types/estree@^1.0.6", "@types/estree@^1.0.8":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e"
-  integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.9.tgz#cf3f0e876d7bee15a93ab925b82bf570a3904a24"
+  integrity sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==
 
-"@types/hoist-non-react-statics@^3.3.6":
+"@types/hoist-non-react-statics@^3.3.7":
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.7.tgz#306e3a3a73828522efa1341159da4846e7573a6c"
   integrity sha512-PQTyIulDkIDro8P+IHbKCsw7U2xxBYflVzW/FgWdCAePD9xGSidgA76/GeJ6lBKoblyhf9pBY763gbrN+1dI8g==
@@ -2266,16 +2283,16 @@
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
 "@types/node@*":
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-25.5.0.tgz#5c99f37c443d9ccc4985866913f1ed364217da31"
-  integrity sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==
+  version "25.9.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-25.9.0.tgz#4823e66e0f486bfd8d9019fb445fbbb9e6f77348"
+  integrity sha512-AOQwYUNolgy3VosiRqXrACUXTN8nJUtPl7FJXMqZVyxiiCLhQuG3jXKvCS1ALr+Y2OmZhzzLVlYPEqJaiqkaJQ==
   dependencies:
-    undici-types "~7.18.0"
+    undici-types ">=7.24.0 <7.24.7"
 
 "@types/node@^24.10.1":
-  version "24.12.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.12.0.tgz#6222e028210e5322e4f4f6767f8d88e5ea3b33d2"
-  integrity sha512-GYDxsZi3ChgmckRT9HPU0WEhKLP08ev/Yfcq2AstjrDASOYCSXeyjDsHg4v5t4jOj7cyDX3vmprafKlWIG9MXQ==
+  version "24.12.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.12.4.tgz#2709745569811dcbdc57c097fafdd387c6330382"
+  integrity sha512-GUUEShf+PBCGW2KaXwcIt3Yk+e3pkKwWKb9GSyM9WQVE+ep2jzmHdGsHzu4wgcZy5fN9FBdVzjpBQsYlpfpgLA==
   dependencies:
     undici-types "~7.16.0"
 
@@ -2329,203 +2346,210 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.57.1.tgz#ddfdfb30f8b5ccee7f3c21798b377c51370edd55"
-  integrity sha512-Gn3aqnvNl4NGc6x3/Bqk1AOn0thyTU9bqDRhiRnUWezgvr2OnhYCWCgC8zXXRVqBsIL1pSDt7T9nJUe0oM0kDQ==
+"@typescript-eslint/eslint-plugin@8.59.4":
+  version "8.59.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.4.tgz#c67bfee32caae9cb587dce1ac59c3bf43b659707"
+  integrity sha512-PegsU+XfyJJNjd4+u/k6f9yTyp0lEXXiPopUNobZcIAUJFGICFLN+sP0Rb3JehVmiij1Ph0dFGYqODoRo/2+6A==
   dependencies:
     "@eslint-community/regexpp" "^4.12.2"
-    "@typescript-eslint/scope-manager" "8.57.1"
-    "@typescript-eslint/type-utils" "8.57.1"
-    "@typescript-eslint/utils" "8.57.1"
-    "@typescript-eslint/visitor-keys" "8.57.1"
+    "@typescript-eslint/scope-manager" "8.59.4"
+    "@typescript-eslint/type-utils" "8.59.4"
+    "@typescript-eslint/utils" "8.59.4"
+    "@typescript-eslint/visitor-keys" "8.59.4"
     ignore "^7.0.5"
     natural-compare "^1.4.0"
-    ts-api-utils "^2.4.0"
+    ts-api-utils "^2.5.0"
 
-"@typescript-eslint/parser@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.57.1.tgz#d523e559b148264055c0a49a29d5f50c7de659c2"
-  integrity sha512-k4eNDan0EIMTT/dUKc/g+rsJ6wcHYhNPdY19VoX/EOtaAG8DLtKCykhrUnuHPYvinn5jhAPgD2Qw9hXBwrahsw==
+"@typescript-eslint/parser@8.59.4":
+  version "8.59.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.59.4.tgz#77d99e3b27663e7a22cf12c3fb769db509e5e93c"
+  integrity sha512-zORHqO/tuhxY1zWuTvMUqddRxpiFJ72xVfcNoWpqdLjs6lfPbuQBJuW4pk+49/uBMy7Ssr4bzgjiKmmDB1UbZQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.57.1"
-    "@typescript-eslint/types" "8.57.1"
-    "@typescript-eslint/typescript-estree" "8.57.1"
-    "@typescript-eslint/visitor-keys" "8.57.1"
+    "@typescript-eslint/scope-manager" "8.59.4"
+    "@typescript-eslint/types" "8.59.4"
+    "@typescript-eslint/typescript-estree" "8.59.4"
+    "@typescript-eslint/visitor-keys" "8.59.4"
     debug "^4.4.3"
 
-"@typescript-eslint/project-service@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.57.1.tgz#16af9fe16eedbd7085e4fdc29baa73715c0c55c5"
-  integrity sha512-vx1F37BRO1OftsYlmG9xay1TqnjNVlqALymwWVuYTdo18XuKxtBpCj1QlzNIEHlvlB27osvXFWptYiEWsVdYsg==
+"@typescript-eslint/project-service@8.59.4":
+  version "8.59.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.59.4.tgz#5830535a0e7a3ae806e2669964f47a74c4bc6b0e"
+  integrity sha512-Ly00Vu4oAacfDeHp2Zg85ioNG6l8HG+tN1D7J+xTHSxu9y0awYKJ2zH1rFBn8ZSfuGK+7FxK3Cgl3uAz0aZZLg==
   dependencies:
-    "@typescript-eslint/tsconfig-utils" "^8.57.1"
-    "@typescript-eslint/types" "^8.57.1"
+    "@typescript-eslint/tsconfig-utils" "^8.59.4"
+    "@typescript-eslint/types" "^8.59.4"
     debug "^4.4.3"
 
-"@typescript-eslint/scope-manager@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.57.1.tgz#4524d7e7b420cb501807499684d435ae129aaf35"
-  integrity sha512-hs/QcpCwlwT2L5S+3fT6gp0PabyGk4Q0Rv2doJXA0435/OpnSR3VRgvrp8Xdoc3UAYSg9cyUjTeFXZEPg/3OKg==
+"@typescript-eslint/scope-manager@8.59.4":
+  version "8.59.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.59.4.tgz#507d1258c758147dac1adee9517a205a8ac1e046"
+  integrity sha512-mUeR/3H1WrTAddJrwut8OoPjfauaztMQmRwV5fQTUyNVJCLiUXXe4lGEyYIL2oFDpP7UtgbGJXCt72wT0z2S3Q==
   dependencies:
-    "@typescript-eslint/types" "8.57.1"
-    "@typescript-eslint/visitor-keys" "8.57.1"
+    "@typescript-eslint/types" "8.59.4"
+    "@typescript-eslint/visitor-keys" "8.59.4"
 
-"@typescript-eslint/tsconfig-utils@8.57.1", "@typescript-eslint/tsconfig-utils@^8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.57.1.tgz#9233443ec716882a6f9e240fd900a73f0235f3d7"
-  integrity sha512-0lgOZB8cl19fHO4eI46YUx2EceQqhgkPSuCGLlGi79L2jwYY1cxeYc1Nae8Aw1xjgW3PKVDLlr3YJ6Bxx8HkWg==
+"@typescript-eslint/tsconfig-utils@8.59.4", "@typescript-eslint/tsconfig-utils@^8.59.4":
+  version "8.59.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.4.tgz#218ba229d96dde35212e3a76a7d0a6bc831398be"
+  integrity sha512-DLCpnKgD4alVxTBSKulK+gU1KCqOgUXfDRDXh2mZgzokQKa/70ax93I2uVO3m/LLvIAtWZIFoiifudmIqAxpMA==
 
-"@typescript-eslint/type-utils@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.57.1.tgz#c49af1347b5869ca85155547a8f34f84ab386fd9"
-  integrity sha512-+Bwwm0ScukFdyoJsh2u6pp4S9ktegF98pYUU0hkphOOqdMB+1sNQhIz8y5E9+4pOioZijrkfNO/HUJVAFFfPKA==
+"@typescript-eslint/type-utils@8.59.4":
+  version "8.59.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.59.4.tgz#359fc53ba39a1f1860fddda40ebe5bfe0d87faed"
+  integrity sha512-uonTuPAAKr9XaBGqJ3LjYTh72zy5DyGesljO9gtmk/eFW0W1fRHjnwVYKB35Lm8d5Q5CluEW3gPHjTvZTmgrfA==
   dependencies:
-    "@typescript-eslint/types" "8.57.1"
-    "@typescript-eslint/typescript-estree" "8.57.1"
-    "@typescript-eslint/utils" "8.57.1"
+    "@typescript-eslint/types" "8.59.4"
+    "@typescript-eslint/typescript-estree" "8.59.4"
+    "@typescript-eslint/utils" "8.59.4"
     debug "^4.4.3"
-    ts-api-utils "^2.4.0"
-
-"@typescript-eslint/types@8.57.1", "@typescript-eslint/types@^8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.57.1.tgz#54b27a8a25a7b45b4f978c3f8e00c4c78f11142c"
-  integrity sha512-S29BOBPJSFUiblEl6RzPPjJt6w25A6XsBqRVDt53tA/tlL8q7ceQNZHTjPeONt/3S7KRI4quk+yP9jK2WjBiPQ==
-
-"@typescript-eslint/typescript-estree@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.57.1.tgz#a9fd28d4a0ec896aa9a9a7e0cead62ea24f99e76"
-  integrity sha512-ybe2hS9G6pXpqGtPli9Gx9quNV0TWLOmh58ADlmZe9DguLq0tiAKVjirSbtM1szG6+QH6rVXyU6GTLQbWnMY+g==
-  dependencies:
-    "@typescript-eslint/project-service" "8.57.1"
-    "@typescript-eslint/tsconfig-utils" "8.57.1"
-    "@typescript-eslint/types" "8.57.1"
-    "@typescript-eslint/visitor-keys" "8.57.1"
+    ts-api-utils "^2.5.0"
+
+"@typescript-eslint/types@8.59.4", "@typescript-eslint/types@^8.59.4":
+  version "8.59.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.59.4.tgz#c29d5c21bfbaa8347ddc677d3ac1fcd2db0f848e"
+  integrity sha512-F1o7WJcCq+bc8dwcO/YsSEOudAH8RDtaOhM6wcAQhcUsFhnWQl81JKy48q1hoxAU0qrzM89+31GYh1515Zde3Q==
+
+"@typescript-eslint/typescript-estree@8.59.4":
+  version "8.59.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.4.tgz#d005e5e1fb425526f39685594bed34a04ad755ea"
+  integrity sha512-F+RuOmcDXo4+TPdfd/TCLS3m2nw8gE9XXyZLrA3JBfaA5tz9TtdkyD3YJFmPxulyc2cKbEok/CvFE3MgSLWnag==
+  dependencies:
+    "@typescript-eslint/project-service" "8.59.4"
+    "@typescript-eslint/tsconfig-utils" "8.59.4"
+    "@typescript-eslint/types" "8.59.4"
+    "@typescript-eslint/visitor-keys" "8.59.4"
     debug "^4.4.3"
     minimatch "^10.2.2"
     semver "^7.7.3"
     tinyglobby "^0.2.15"
-    ts-api-utils "^2.4.0"
+    ts-api-utils "^2.5.0"
 
-"@typescript-eslint/utils@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.57.1.tgz#e40f5a7fcff02fd24092a7b52bd6ec029fb50465"
-  integrity sha512-XUNSJ/lEVFttPMMoDVA2r2bwrl8/oPx8cURtczkSEswY5T3AeLmCy+EKWQNdL4u0MmAHOjcWrqJp2cdvgjn8dQ==
+"@typescript-eslint/utils@8.59.4":
+  version "8.59.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.59.4.tgz#8ccd2b08aecc72c7efc0d7ac6695631d199d256e"
+  integrity sha512-cYXeNAUsG4lJo5dbc1FcKm+JwIWrj1/UpTORsC6tGMjEZ81DYcvIr9/ueikhMa/Y/gDQYGp+YX9/xQrXje5BJw==
   dependencies:
     "@eslint-community/eslint-utils" "^4.9.1"
-    "@typescript-eslint/scope-manager" "8.57.1"
-    "@typescript-eslint/types" "8.57.1"
-    "@typescript-eslint/typescript-estree" "8.57.1"
+    "@typescript-eslint/scope-manager" "8.59.4"
+    "@typescript-eslint/types" "8.59.4"
+    "@typescript-eslint/typescript-estree" "8.59.4"
 
-"@typescript-eslint/visitor-keys@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.57.1.tgz#3af4f88118924d3be983d4b8ae84803f11fe4563"
-  integrity sha512-YWnmJkXbofiz9KbnbbwuA2rpGkFPLbAIetcCNO6mJ8gdhdZ/v7WDXsoGFAJuM6ikUFKTlSQnjWnVO4ux+UzS6A==
+"@typescript-eslint/visitor-keys@8.59.4":
+  version "8.59.4"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.4.tgz#1ac23b747b011f5cbdb449da97769f6c5f3a9355"
+  integrity sha512-U3gxVaDVnuZKhSspW/MzMxE1kq7zOdc072FcSNoqA1I9p8HyKbBFfEHoWckBAMgNMph4MamwS5iTVzFmrnt8TQ==
   dependencies:
-    "@typescript-eslint/types" "8.57.1"
+    "@typescript-eslint/types" "8.59.4"
     eslint-visitor-keys "^5.0.0"
 
 "@ungap/structured-clone@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
-  integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==
-
-"@unrs/resolver-binding-android-arm-eabi@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz#9f5b04503088e6a354295e8ea8fe3cb99e43af81"
-  integrity sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==
-
-"@unrs/resolver-binding-android-arm64@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz#7414885431bd7178b989aedc4d25cccb3865bc9f"
-  integrity sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==
-
-"@unrs/resolver-binding-darwin-arm64@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz#b4a8556f42171fb9c9f7bac8235045e82aa0cbdf"
-  integrity sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==
-
-"@unrs/resolver-binding-darwin-x64@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz#fd4d81257b13f4d1a083890a6a17c00de571f0dc"
-  integrity sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==
-
-"@unrs/resolver-binding-freebsd-x64@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz#d2513084d0f37c407757e22f32bd924a78cfd99b"
-  integrity sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==
-
-"@unrs/resolver-binding-linux-arm-gnueabihf@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz#844d2605d057488d77fab09705f2866b86164e0a"
-  integrity sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==
-
-"@unrs/resolver-binding-linux-arm-musleabihf@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz#204892995cefb6bd1d017d52d097193bc61ddad3"
-  integrity sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==
-
-"@unrs/resolver-binding-linux-arm64-gnu@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz#023eb0c3aac46066a10be7a3f362e7b34f3bdf9d"
-  integrity sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==
-
-"@unrs/resolver-binding-linux-arm64-musl@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz#9e6f9abb06424e3140a60ac996139786f5d99be0"
-  integrity sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==
-
-"@unrs/resolver-binding-linux-ppc64-gnu@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz#b111417f17c9d1b02efbec8e08398f0c5527bb44"
-  integrity sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==
-
-"@unrs/resolver-binding-linux-riscv64-gnu@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz#92ffbf02748af3e99873945c9a8a5ead01d508a9"
-  integrity sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==
-
-"@unrs/resolver-binding-linux-riscv64-musl@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz#0bec6f1258fc390e6b305e9ff44256cb207de165"
-  integrity sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==
-
-"@unrs/resolver-binding-linux-s390x-gnu@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz#577843a084c5952f5906770633ccfb89dac9bc94"
-  integrity sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==
-
-"@unrs/resolver-binding-linux-x64-gnu@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz#36fb318eebdd690f6da32ac5e0499a76fa881935"
-  integrity sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==
-
-"@unrs/resolver-binding-linux-x64-musl@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz#bfb9af75f783f98f6a22c4244214efe4df1853d6"
-  integrity sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==
-
-"@unrs/resolver-binding-wasm32-wasi@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz#752c359dd875684b27429500d88226d7cc72f71d"
-  integrity sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==
-  dependencies:
-    "@napi-rs/wasm-runtime" "^0.2.11"
-
-"@unrs/resolver-binding-win32-arm64-msvc@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz#ce5735e600e4c2fbb409cd051b3b7da4a399af35"
-  integrity sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==
-
-"@unrs/resolver-binding-win32-ia32-msvc@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz#72fc57bc7c64ec5c3de0d64ee0d1810317bc60a6"
-  integrity sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==
-
-"@unrs/resolver-binding-win32-x64-msvc@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz#538b1e103bf8d9864e7b85cc96fa8d6fb6c40777"
-  integrity sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.1.tgz#0e8f34854df7966b09304a18e808b23997bb9fc1"
+  integrity sha512-mUFwbeTqrVgDQxFveS+df2yfap6iuP20NAKAsBt5jDEoOTDew+zwLAOilHCeQJOVSvmgCX4ogqIrA0mnyr08yQ==
+
+"@unrs/resolver-binding-android-arm-eabi@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.12.1.tgz#c2afb2c77092f87f0c30e81c0e5782f2a0bed686"
+  integrity sha512-diBxYrhKMJWZiQMFDgKVRDV4zSRyRTR6PBg+0p6/7zAWP6fqUfl0Be0RKvjLhzfRT0Ye5TCAP04gg4rZHSTvnA==
+
+"@unrs/resolver-binding-android-arm64@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.12.1.tgz#9096b470c59edd56c87f7140edafdfffaa0aa5e5"
+  integrity sha512-7VQXkWRrq3zFmL1byHilfy8YjCGxf9dKMYbLIGzR6ujAu4+FB3YD8IkesmpgB9vpiitYjMPs/Dk5Sh/P9aoHLQ==
+
+"@unrs/resolver-binding-darwin-arm64@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.12.1.tgz#b0711e982559c5d8a9b68ca93b0707c4917e9a09"
+  integrity sha512-SJbHelGnb7hZVLCEWSkbTOpmTC63ZUweZEIPNtRD1D+UkDqYHFynwGUTG1WAjQTdTTaiJ4xab3z5Vk334WeqbA==
+
+"@unrs/resolver-binding-darwin-x64@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.12.1.tgz#d35837ed0f9139ab8ba3f8255430e4f12161742c"
+  integrity sha512-sCCTeB7e2L49YhjPK7IkPfWfCR+NHSfbCbDOy3LqyfkrBpK9qXRRyS1ImCHqEE1LMJxmVN5bAvioI/zTFu48xw==
+
+"@unrs/resolver-binding-freebsd-x64@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.12.1.tgz#2625a7caf01947e2996d06856121483f1ead671b"
+  integrity sha512-rsKJJykPydB+lA/mdeMSYqsQpdRTAjhJiwdQ+jdihPDpbN1h7PaNAo6Fz8PxqWtKd+YC3uGjjW+m+1iPwRwJuA==
+
+"@unrs/resolver-binding-linux-arm-gnueabihf@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.12.1.tgz#6c987d2a497a38a104a39b740c27863e2e2d5478"
+  integrity sha512-D6Al5C6j9RdqjGI7Hqa/iVbh09xOEIyZScG60OJGRF0fvf9cy2FdSHG6qLG9Osv8aYe+syWId+PLRwR43soVkA==
+
+"@unrs/resolver-binding-linux-arm-musleabihf@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.12.1.tgz#5890caee4ebea2c925c13061879e367c0d449bdd"
+  integrity sha512-9+yQ/cnoapQ1G+HS6nXQ+4GZ/qKpieZuZxO8GWGJ+F2/1WC5eRzIU2BYUgT029A/y7n3qb0whuT6vvMzB9Zd0g==
+
+"@unrs/resolver-binding-linux-arm64-gnu@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.12.1.tgz#734f8d5aac5a235ba273d0702fdc9477472c8a3b"
+  integrity sha512-OY/REy8lJgrkZgUpiwhClBvSDLSJNxkvqV7il6I1iNBQFyIEZRpOm1ttV8iMjpcPN2Dl7kjGd7CoKoJUebn6Jw==
+
+"@unrs/resolver-binding-linux-arm64-musl@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.12.1.tgz#e8d3bf01a3ac116aadbd244324a2f12d5f0b7595"
+  integrity sha512-C0nRwuMNgiGU8M5ym7eFe1qOo4oJtZ4TH6g+qAMWIR0hXgMjMs0bsggIv7Sbeia1GI8ZQHzQwrhBEawFiHQIPQ==
+
+"@unrs/resolver-binding-linux-ppc64-gnu@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.12.1.tgz#549c150724bf927e64380107867e0d5401e5830a"
+  integrity sha512-1GrdTqRuLZMsLa9d6T1BM6WTPGMZxkDKLR4SSzWaUtWpBuOVb33DIShXadhDYrTRESEm7pRN8m7SOM2m8pPT8w==
+
+"@unrs/resolver-binding-linux-riscv64-gnu@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.12.1.tgz#9c2f8a04a2e1423d0631e06ce41c884230d86ad4"
+  integrity sha512-q9gc8/37+8jGc8RJahXtonvxgbUisjOHCaiDXrg4Nv8+pk9iKv97drJ61crkZJEms+bIr7lLc54SlZ08qVY9nA==
+
+"@unrs/resolver-binding-linux-riscv64-musl@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.12.1.tgz#cd546401ed773b32f3f31821fe98a3d272b497cb"
+  integrity sha512-kLFS/MfGFpeYUrnnsUnmZAxwXMPHZOIPHNp3d4zHnx7/etyX2SSQQ1Kj/Ycaxy4V5dN16YoXpnhrwANjywiJCg==
+
+"@unrs/resolver-binding-linux-s390x-gnu@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.12.1.tgz#5c83abd39925e2c32fe02e8fe7b6e066e3341224"
+  integrity sha512-vKlW4XOJUrpvMBgbIg97t6UEBsFsxGZS5Khi47XkNzC5T1obPhEYWfaGGv9oAe6xXzXib9xaH64CQV8AXN9GiA==
+
+"@unrs/resolver-binding-linux-x64-gnu@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.12.1.tgz#e295dbde890fcd99df943b5280ea5609148f7d29"
+  integrity sha512-e9gRaBDEraJLdeScpwBA+WqaJDXnmlHPC7aZTAp9N4BYiEs8BvDfjgeqSVygrc3NZbeMfiKygevINZ9QP271wA==
+
+"@unrs/resolver-binding-linux-x64-musl@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.12.1.tgz#86ac6d09e8b7f7f3eceb87c6d769bfb81c91996a"
+  integrity sha512-Z7813xEacoT+WRBm1O0wgIkXRgVyTctaRPkKx7T+WgeAfGzMfgWCxhRjAAJh/2LMDPlSXOnapr3vwI1TgDEtTA==
+
+"@unrs/resolver-binding-openharmony-arm64@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-openharmony-arm64/-/resolver-binding-openharmony-arm64-1.12.1.tgz#bea1857eb815b05acef119ae9d7bc17fba688597"
+  integrity sha512-GN5YjvnL5nGd5twW4KHWre6iOzLVsIgZwBin3jTT1Pef2Q3l0WgMYA5uo908wL+gsxSFzFXuxkO+AjpsLoOaYw==
+
+"@unrs/resolver-binding-wasm32-wasi@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.12.1.tgz#4b1ccb7cba84b15b04f24a2253206aa6918100d1"
+  integrity sha512-Gue4obXW5E2223qBWqW05S9m1uPcBIEu8cJWs3YqzVVf+h6lNRofgJlhGNxmuqu+C/fSlqaW4T1JHFZdoOgGGQ==
+  dependencies:
+    "@emnapi/core" "1.10.0"
+    "@emnapi/runtime" "1.10.0"
+    "@napi-rs/wasm-runtime" "^1.1.4"
+
+"@unrs/resolver-binding-win32-arm64-msvc@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.12.1.tgz#e0ce558c4cc93f7df135c595153a13af1cc1cdde"
+  integrity sha512-z09l7yiDIOLDTFkW+TEroFjidYAM6JriPqMMpXpM7/EnEe6tehrJZrghlvvPyI/W4JGWAJVDaOs4rl+snJlHwg==
+
+"@unrs/resolver-binding-win32-ia32-msvc@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.12.1.tgz#abbc925dfb8c3399e573e80624f766260f23b175"
+  integrity sha512-RZ9vu5nw+Lgf91LJIZXFx6OrbId+EN2x0HzpAdm0C9oywiPw5x7LBs4uNboZ2Taozo8SiX/7vEDWWyIpKqktgA==
+
+"@unrs/resolver-binding-win32-x64-msvc@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.12.1.tgz#32c441b69e54582ca0c5f51a0fa2bb69b45de24a"
+  integrity sha512-rXHMTryD4YT8wuGDhV8UevKiD02/wUrdKLyokgNQQf/AcO6BCUEkQu5WGQ9i41bA4tlSfKo02WmAcAgxuP6izA==
 
 "@whatwg-node/disposablestack@^0.0.6":
   version "0.0.6"
@@ -2611,9 +2635,9 @@ acorn@^8.11.0, acorn@^8.16.0, acorn@^8.4.1:
   integrity sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==
 
 ajv@^6.14.0:
-  version "6.14.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.14.0.tgz#fd067713e228210636ebb08c60bd3765d6dbe73a"
-  integrity sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.15.0.tgz#07e982c74626167aa7a2495c53817892d7139492"
+  integrity sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -2669,54 +2693,53 @@ ansi-styles@^6.1.0, ansi-styles@^6.2.1, ansi-styles@^6.2.3:
   integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
 
 antd@^6.3.3:
-  version "6.3.3"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-6.3.3.tgz#72f6857640e6d6b6b36da7f75a1d1eed506a39e9"
-  integrity sha512-T8FAQelw36zS96cZw2U/qEjpYny5yFc7hg+1W7DvVr8xMoSXWvyB8WvmiDVH0nS0LPYV4y2sxetsJoGZt7rhhw==
+  version "6.4.3"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-6.4.3.tgz#80a7aab9c13c35daa0e0e7eea80585ba57cb7203"
+  integrity sha512-6H2avkxCGfxcF67r3J2mwm9Ck50el1pks/73vfM1wDsPL/tPtj5vHuauMgJFnrqmq7CH3g8aoZ0VBQbt+jpAsw==
   dependencies:
     "@ant-design/colors" "^8.0.1"
     "@ant-design/cssinjs" "^2.1.2"
     "@ant-design/cssinjs-utils" "^2.1.2"
     "@ant-design/fast-color" "^3.0.1"
-    "@ant-design/icons" "^6.1.0"
+    "@ant-design/icons" "^6.2.3"
     "@ant-design/react-slick" "~2.0.0"
-    "@babel/runtime" "^7.28.4"
-    "@rc-component/cascader" "~1.14.0"
+    "@babel/runtime" "^7.29.2"
+    "@rc-component/cascader" "~1.15.0"
     "@rc-component/checkbox" "~2.0.0"
     "@rc-component/collapse" "~1.2.0"
     "@rc-component/color-picker" "~3.1.1"
-    "@rc-component/dialog" "~1.8.4"
+    "@rc-component/dialog" "~1.9.0"
     "@rc-component/drawer" "~1.4.2"
     "@rc-component/dropdown" "~1.0.2"
-    "@rc-component/form" "~1.7.2"
-    "@rc-component/image" "~1.6.0"
-    "@rc-component/input" "~1.1.2"
+    "@rc-component/form" "~1.8.1"
+    "@rc-component/image" "~1.9.0"
+    "@rc-component/input" "~1.3.0"
     "@rc-component/input-number" "~1.6.2"
-    "@rc-component/mentions" "~1.6.0"
-    "@rc-component/menu" "~1.2.0"
-    "@rc-component/motion" "^1.3.1"
+    "@rc-component/mentions" "~1.9.0"
+    "@rc-component/menu" "~1.3.0"
+    "@rc-component/motion" "^1.3.2"
     "@rc-component/mutate-observer" "^2.0.1"
-    "@rc-component/notification" "~1.2.0"
+    "@rc-component/notification" "~2.0.7"
     "@rc-component/pagination" "~1.2.0"
-    "@rc-component/picker" "~1.9.1"
+    "@rc-component/picker" "~1.10.0"
     "@rc-component/progress" "~1.0.2"
     "@rc-component/qrcode" "~1.1.1"
     "@rc-component/rate" "~1.0.1"
-    "@rc-component/resize-observer" "^1.1.1"
+    "@rc-component/resize-observer" "^1.1.2"
     "@rc-component/segmented" "~1.3.0"
-    "@rc-component/select" "~1.6.14"
+    "@rc-component/select" "~1.6.15"
     "@rc-component/slider" "~1.0.1"
     "@rc-component/steps" "~1.2.2"
     "@rc-component/switch" "~1.0.3"
-    "@rc-component/table" "~1.9.1"
-    "@rc-component/tabs" "~1.7.0"
-    "@rc-component/textarea" "~1.1.2"
+    "@rc-component/table" "~1.10.0"
+    "@rc-component/tabs" "~1.9.0"
     "@rc-component/tooltip" "~1.4.0"
-    "@rc-component/tour" "~2.3.0"
-    "@rc-component/tree" "~1.2.4"
-    "@rc-component/tree-select" "~1.8.0"
+    "@rc-component/tour" "~2.4.0"
+    "@rc-component/tree" "~1.3.1"
+    "@rc-component/tree-select" "~1.9.0"
     "@rc-component/trigger" "^3.9.0"
     "@rc-component/upload" "~1.1.0"
-    "@rc-component/util" "^1.9.0"
+    "@rc-component/util" "^1.11.0"
     clsx "^2.1.1"
     dayjs "^1.11.11"
     scroll-into-view-if-needed "^3.1.0"
@@ -2868,6 +2891,11 @@ async-function@^1.0.0:
   resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
   integrity sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==
 
+auto-bind@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-5.0.1.tgz#50d8e63ea5a1dddcb5e5e36451c1a8266ffbb2ae"
+  integrity sha512-ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg==
+
 auto-bind@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb"
@@ -2881,24 +2909,24 @@ available-typed-arrays@^1.0.7:
     possible-typed-array-names "^1.0.0"
 
 axe-core@^4.10.0:
-  version "4.11.1"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.11.1.tgz#052ff9b2cbf543f5595028b583e4763b40c78ea7"
-  integrity sha512-BASOg+YwO2C+346x3LZOeoovTIoTrRqEsqMa6fmfAV0P+U9mFr9NsyOEpiYvFjbc64NMrSswhV50WdXzdb/Z5A==
+  version "4.11.4"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.11.4.tgz#5b535e381ff1e61ffdd615e5483d16186d3b46a5"
+  integrity sha512-KunSNx+TVpkAw/6ULfhnx+HWRecjqZGTOyquAoWHYLRSdK1tB5Ihce1ZW+UY3fj33bYAFWPu7W/GRSmmrCGuxA==
 
 axobject-query@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.1.0.tgz#28768c76d0e3cff21bc62a9e2d0b6ac30042a1ee"
   integrity sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==
 
-babel-jest@30.3.0, babel-jest@^30.2.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-30.3.0.tgz#3ff5553fa3bcbb8738d2d7335a4dbdc3bd1a0eb5"
-  integrity sha512-gRpauEU2KRrCox5Z296aeVHR4jQ98BCnu0IO332D/xpHNOsIH/bgSRk9k6GbKIbBw8vFeN6ctuu6tV8WOyVfYQ==
+babel-jest@30.4.1, babel-jest@^30.2.0:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-30.4.1.tgz#63cba904438bbe64c4cf0acdea87b0a45cb809fc"
+  integrity sha512-fATAbM8piYxkiXQp3RBXmZHxZVNJZAVXXfyeyCN2Tida3+qJ8ea9UxhiJ2y4fLO90ZImKt6k9FlcH2+rLkJGhw==
   dependencies:
-    "@jest/transform" "30.3.0"
+    "@jest/transform" "30.4.1"
     "@types/babel__core" "^7.20.5"
     babel-plugin-istanbul "^7.0.1"
-    babel-preset-jest "30.3.0"
+    babel-preset-jest "30.4.0"
     chalk "^4.1.2"
     graceful-fs "^4.2.11"
     slash "^3.0.0"
@@ -2914,10 +2942,10 @@ babel-plugin-istanbul@^7.0.1:
     istanbul-lib-instrument "^6.0.2"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.3.0.tgz#235ad714a45c18b12566becf439e1c604e277015"
-  integrity sha512-+TRkByhsws6sfPjVaitzadk1I0F5sPvOVUH5tyTSzhePpsGIVrdeunHSw/C36QeocS95OOk8lunc4rlu5Anwsg==
+babel-plugin-jest-hoist@30.4.0:
+  version "30.4.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.4.0.tgz#f7d6a6d8f435808b56b45a81dc4b61a39e36794a"
+  integrity sha512-9EdtWM/sSfXLOGLwSn+GS6pIXyBnL07/8gyJlwFXjWy4DxMOyItqyUT29d4lQiS380EZwYlX7/At4PgBS+m2aA==
   dependencies:
     "@types/babel__core" "^7.20.5"
 
@@ -2942,12 +2970,12 @@ babel-preset-current-node-syntax@^1.2.0:
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
 
-babel-preset-jest@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-30.3.0.tgz#21cf3d19a6f5e9924426c879ee0b7f092636d043"
-  integrity sha512-6ZcUbWHC+dMz2vfzdNwi87Z1gQsLNK2uLuK1Q89R11xdvejcivlYYwDlEv0FHX3VwEXpbBQ9uufB/MUNpZGfhQ==
+babel-preset-jest@30.4.0:
+  version "30.4.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-30.4.0.tgz#295486c2ec1127b3dc7d0d2adaa72a1dcaaafccd"
+  integrity sha512-lBY4jxsNmCnSiu7kquw8ZC9F4+XLMOKypT3RnNHPvU2Kpd4W0xaPuLr5ZkRyOsvLYAY4yaW1ZwTW4xB7NIiZzg==
   dependencies:
-    babel-plugin-jest-hoist "30.3.0"
+    babel-plugin-jest-hoist "30.4.0"
     babel-preset-current-node-syntax "^1.2.0"
 
 balanced-match@^1.0.0:
@@ -2960,35 +2988,30 @@ balanced-match@^4.0.2:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-4.0.4.tgz#bfb10662feed8196a2c62e7c68e17720c274179a"
   integrity sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==
 
-baseline-browser-mapping@^2.10.31:
+baseline-browser-mapping@^2.10.12, baseline-browser-mapping@^2.10.31, baseline-browser-mapping@^2.9.19:
   version "2.10.31"
   resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.31.tgz#9c6825f052601ce6974a90dd49683b1726887b0b"
   integrity sha512-MujYO3eP72uvmSE0i4wltsodRfIpZATP3jvzRNRGGxgzId7aVocVJJV3nf01qnzzKFGxQVC9bpWxl5cjxTr/7Q==
 
-baseline-browser-mapping@^2.9.0, baseline-browser-mapping@^2.9.19:
-  version "2.10.10"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.10.tgz#e74bd066724c1d8d7d8ea75fc3be25389a7a5c56"
-  integrity sha512-sUoJ3IMxx4AyRqO4MLeHlnGDkyXRoUG0/AI9fjK+vS72ekpV0yWVY7O0BVjmBcRtkNcsAO2QDZ4tdKKGoI6YaQ==
-
 brace-expansion@^1.1.7:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
-  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.14.tgz#d9de602370d91347cd9ddad1224d4fd701eb348b"
+  integrity sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
 brace-expansion@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
-  integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.1.0.tgz#4f41a41190216ee36067ec381526fe9539c4f0ae"
+  integrity sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==
   dependencies:
     balanced-match "^1.0.0"
 
-brace-expansion@^5.0.2:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-5.0.4.tgz#614daaecd0a688f660bbbc909a8748c3d80d4336"
-  integrity sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==
+brace-expansion@^5.0.5:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-5.0.6.tgz#ec68fe0a641a29d8711579caf641d05bae1f2285"
+  integrity sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==
   dependencies:
     balanced-match "^4.0.2"
 
@@ -3000,15 +3023,15 @@ braces@^3.0.3:
     fill-range "^7.1.1"
 
 browserslist@^4.24.0:
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.1.tgz#7f534594628c53c63101079e27e40de490456a95"
-  integrity sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==
+  version "4.28.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.2.tgz#f50b65362ef48974ca9f50b3680566d786b811d2"
+  integrity sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==
   dependencies:
-    baseline-browser-mapping "^2.9.0"
-    caniuse-lite "^1.0.30001759"
-    electron-to-chromium "^1.5.263"
-    node-releases "^2.0.27"
-    update-browserslist-db "^1.2.0"
+    baseline-browser-mapping "^2.10.12"
+    caniuse-lite "^1.0.30001782"
+    electron-to-chromium "^1.5.328"
+    node-releases "^2.0.36"
+    update-browserslist-db "^1.2.3"
 
 bser@2.1.1:
   version "2.1.1"
@@ -3022,7 +3045,7 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
+call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
   integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
@@ -3030,14 +3053,14 @@ call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-
     es-errors "^1.3.0"
     function-bind "^1.1.2"
 
-call-bind@^1.0.7, call-bind@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
-  integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
+call-bind@^1.0.7, call-bind@^1.0.8, call-bind@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.9.tgz#39a644700c80bc7d0ca9102fc6d1d43b2fd7eee7"
+  integrity sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ==
   dependencies:
-    call-bind-apply-helpers "^1.0.0"
-    es-define-property "^1.0.0"
-    get-intrinsic "^1.2.4"
+    call-bind-apply-helpers "^1.0.2"
+    es-define-property "^1.0.1"
+    get-intrinsic "^1.3.0"
     set-function-length "^1.2.2"
 
 call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4:
@@ -3071,10 +3094,10 @@ camelcase@^6.3.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001759:
-  version "1.0.30001780"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001780.tgz#0e413de292808868a62ed9118822683fa120a110"
-  integrity sha512-llngX0E7nQci5BPJDqoZSbuZ5Bcs9F5db7EtgfwBerX9XGtkkiO4NwfDDIRzHTTwcYC8vC7bmeUEPGrKlR/TkQ==
+caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001782:
+  version "1.0.30001793"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz#238887ddf5fcfc8c36d872394d0a78a517312a72"
+  integrity sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -3085,7 +3108,7 @@ capital-case@^1.0.4:
     tslib "^2.0.3"
     upper-case-first "^2.0.2"
 
-chalk@4.1.2, chalk@^4.1.0, chalk@^4.1.2:
+chalk@4.1.2, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -3102,6 +3125,11 @@ chalk@^2.4.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^5.6.0:
+  version "5.6.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.6.2.tgz#b1238b6e23ea337af71c7f8a295db5af0c158aea"
+  integrity sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==
+
 change-case-all@1.0.15:
   version "1.0.15"
   resolved "https://registry.yarnpkg.com/change-case-all/-/change-case-all-1.0.15.tgz#de29393167fc101d646cd76b0ef23e27d09756ad"
@@ -3118,6 +3146,16 @@ change-case-all@1.0.15:
     upper-case "^2.0.2"
     upper-case-first "^2.0.2"
 
+change-case-all@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/change-case-all/-/change-case-all-2.1.0.tgz#c838988531bba9fa9e4db124f2d3f53a9607acc1"
+  integrity sha512-v6b0WWWkZUMHVuYk82l+WROgkUm4qEN2w5hKRNWtEOYwWqUGoi8C6xH0l1RLF1EoWqDFK6MFclmN3od6ws3/uw==
+  dependencies:
+    change-case "^5.2.0"
+    sponge-case "^2.0.2"
+    swap-case "^3.0.2"
+    title-case "^3.0.3"
+
 change-case@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/change-case/-/change-case-4.1.2.tgz#fedfc5f136045e2398c0410ee441f95704641e12"
@@ -3136,6 +3174,11 @@ change-case@^4.1.2:
     snake-case "^3.0.4"
     tslib "^2.0.3"
 
+change-case@^5.2.0:
+  version "5.4.4"
+  resolved "https://registry.yarnpkg.com/change-case/-/change-case-5.4.4.tgz#0d52b507d8fb8f204343432381d1a6d7bff97a02"
+  integrity sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==
+
 char-regex@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
@@ -3163,7 +3206,7 @@ cli-cursor@^5.0.0:
   dependencies:
     restore-cursor "^5.0.0"
 
-cli-truncate@^5.0.0:
+cli-truncate@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-5.2.0.tgz#c8e72aaca8339c773d128c36e0a17c6315b694eb"
   integrity sha512-xRwvIOMGrfOAnM1JYtqQImuaNtDEv9v6oIYAs4LIHwTiKee8uwvIi363igssOC0O5U04i4AlENs79LQLu9tEMw==
@@ -3190,6 +3233,15 @@ cliui@^8.0.1:
     strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
+cliui@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-9.0.1.tgz#6f7890f386f6f1f79953adc1f78dec46fcc2d291"
+  integrity sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==
+  dependencies:
+    string-width "^7.2.0"
+    strip-ansi "^7.1.0"
+    wrap-ansi "^9.0.0"
+
 clsx@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
@@ -3229,11 +3281,6 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colorette@^2.0.20:
-  version "2.0.20"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
-  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
-
 common-tags@1.8.2:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
@@ -3275,7 +3322,7 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-cookie@^1.0.2:
+cookie@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-1.1.1.tgz#3bb9bdfc82369db9c2f69c93c9c3ceb310c88b3c"
   integrity sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==
@@ -3378,10 +3425,10 @@ dayjs@^1.0, dayjs@^1.11.11:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.20.tgz#88d919fd639dc991415da5f4cb6f1b6650811938"
   integrity sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==
 
-debounce@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debounce/-/debounce-2.2.0.tgz#f895fa2fbdb579a0f0d3dcf5dde19657e50eaad5"
-  integrity sha512-Xks6RUDLZFdz8LIdR6q0MTH44k7FikOmnh5xkSjMig6ch45afc8sjTjRQf3P6ax8dMgcQrYO/AR2RGWURrruqw==
+debounce@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/debounce/-/debounce-3.0.0.tgz#7633adff3bcd92cdfe13370c2f46e87bdb946a1b"
+  integrity sha512-64byRbF0/AirwbuHqB3/ZpMG9/nckDa6ZA0yd6UnaQNwbbemCOwvz2sL5sjXLHhZHADyiwLm0M5qMhltUUx+TA==
 
 debug@^3.1.0, debug@^3.2.7:
   version "3.2.7"
@@ -3440,10 +3487,10 @@ dependency-graph@^1.0.0:
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-1.0.0.tgz#bb5e85aec1310bc13b22dbd76e3196c4ee4c10d2"
   integrity sha512-cW3gggJ28HZ/LExwxP2B++aiKxhJXMSIt9K48FOXQkm+vuG5gyatXnLsONRJdzO/7VfjDIiaOOa/bs4l464Lwg==
 
-detect-indent@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
-  integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
+detect-indent@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-7.0.2.tgz#16c516bf75d4b2f759f68214554996d467c8d648"
+  integrity sha512-y+8xyqdGLL+6sh0tVeHcfP/QDd8gUgbasolJJpY7NgeQGSZ739bDtSiaiDgtoicy+mtYB81dKLxO9xRhCyIB3A==
 
 detect-libc@^2.0.3, detect-libc@^2.1.2:
   version "2.1.2"
@@ -3504,10 +3551,10 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-electron-to-chromium@^1.5.263:
-  version "1.5.321"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.321.tgz#57a80554e2e7fd65e3689d320f52a64723472d5d"
-  integrity sha512-L2C7Q279W2D/J4PLZLk7sebOILDSWos7bMsMNN06rK482umHUrh/3lM8G7IlHFOYip2oAg5nha1rCMxr/rs6ZQ==
+electron-to-chromium@^1.5.328:
+  version "1.5.359"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.359.tgz#51d3f2dd176a357b3390759b552c74cd4b6abe8e"
+  integrity sha512-8lPELWuYZIWk7NDvCNthtmMw/7Q5Wu25NpM4djFMHBmk8DubPAtL4YTOp7ou0e7HyJtwkVlWv8XMLURnrtgJQw==
 
 emittery@^0.13.1:
   version "0.13.1"
@@ -3546,10 +3593,10 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23.5, es-abstract@^1.23.6, es-abstract@^1.23.9, es-abstract@^1.24.0, es-abstract@^1.24.1:
-  version "1.24.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.1.tgz#f0c131ed5ea1bb2411134a8dd94def09c46c7899"
-  integrity sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==
+es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23.5, es-abstract@^1.23.6, es-abstract@^1.23.9, es-abstract@^1.24.0, es-abstract@^1.24.2:
+  version "1.24.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.2.tgz#2dbd38c180735ee983f77585140a2706a963ed9a"
+  integrity sha512-2FpH9Q5i2RRwyEP1AylXe6nYLR5OhaJTZwmlcP0dL/+JCbgg7yyEo/sEK6HeGZRf3dFpWwThaRHVApXSkW3xeg==
   dependencies:
     array-buffer-byte-length "^1.0.2"
     arraybuffer.prototype.slice "^1.0.4"
@@ -3617,14 +3664,14 @@ es-errors@^1.3.0:
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
 es-iterator-helpers@^1.2.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.3.1.tgz#3be0f4e63438d6c5a1fb5f33b891aaad3f7dae06"
-  integrity sha512-zWwRvqWiuBPr0muUG/78cW3aHROFCNIQ3zpmYDpwdbnt2m+xlNyRWpHBpa2lJjSBit7BQ+RXA1iwbSmu5yJ/EQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.3.2.tgz#8f4ff1f3603cbd09fbdb72c747a679779a65cc7f"
+  integrity sha512-HVLACW1TppGYjJ8H6/jqH/pqOtKRw6wMlrB23xfExmFWxFquAIWCmwoLsOyN96K4a5KbmOf5At9ZUO3GZbetAw==
   dependencies:
-    call-bind "^1.0.8"
+    call-bind "^1.0.9"
     call-bound "^1.0.4"
     define-properties "^1.2.1"
-    es-abstract "^1.24.1"
+    es-abstract "^1.24.2"
     es-errors "^1.3.0"
     es-set-tostringtag "^2.1.0"
     function-bind "^1.1.2"
@@ -3637,7 +3684,6 @@ es-iterator-helpers@^1.2.1:
     internal-slot "^1.1.0"
     iterator.prototype "^1.1.5"
     math-intrinsics "^1.1.0"
-    safe-array-concat "^1.1.3"
 
 es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
   version "1.1.1"
@@ -3693,11 +3739,11 @@ escape-string-regexp@^4.0.0:
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 eslint-config-next@^16.0.8:
-  version "16.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-16.2.1.tgz#d3b6fe5076979285a2b607c70e469dc167b43237"
-  integrity sha512-qhabwjQZ1Mk53XzXvmogf8KQ0tG0CQXF0CZ56+2/lVhmObgmaqj7x5A1DSrWdZd3kwI7GTPGUjFne+krRxYmFg==
+  version "16.2.6"
+  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-16.2.6.tgz#1a04578efe6fde5cdb6265e98e88c9f61927e2c7"
+  integrity sha512-z2ELYSkyrrJ6cuunTU8vhsT/RpouPkjaSah06nVW6Rg2Hpg0Vs8s497/e5s8G8qtdp4ccsiovz5P1rv+5VSW2Q==
   dependencies:
-    "@next/eslint-plugin-next" "16.2.1"
+    "@next/eslint-plugin-next" "16.2.6"
     eslint-import-resolver-node "^0.3.6"
     eslint-import-resolver-typescript "^3.5.2"
     eslint-plugin-import "^2.32.0"
@@ -3708,13 +3754,13 @@ eslint-config-next@^16.0.8:
     typescript-eslint "^8.46.0"
 
 eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.9:
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
-  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.10.tgz#84ce3005abfc300588cf23bbac1aabec1fc6e8c1"
+  integrity sha512-tRrKqFyCaKict5hOd244sL6EQFNycnMQnBe+j8uqGNXYzsImGbGUU4ibtoaBmv5FLwJwcFJNeg1GeVjQfbMrDQ==
   dependencies:
     debug "^3.2.7"
-    is-core-module "^2.13.0"
-    resolve "^1.22.4"
+    is-core-module "^2.16.1"
+    resolve "^2.0.0-next.6"
 
 eslint-import-resolver-typescript@^3.5.2:
   version "3.10.1"
@@ -3783,9 +3829,9 @@ eslint-plugin-jsx-a11y@^6.10.0:
     string.prototype.includes "^2.0.1"
 
 eslint-plugin-react-hooks@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.0.1.tgz#66e258db58ece50723ef20cc159f8aa908219169"
-  integrity sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.1.1.tgz#e6742cad75d970c0a3f30d7d3fa80a4784f55927"
+  integrity sha512-f2I7Gw6JbvCexzIInuSbZpfdQ44D7iqdWX01FKLvrPgqxoE7oMj8clOfto8U6vYiz4yd5oKu39rRSVOe1zRu0g==
   dependencies:
     "@babel/core" "^7.24.4"
     "@babel/parser" "^7.24.4"
@@ -3838,16 +3884,16 @@ eslint-visitor-keys@^5.0.0, eslint-visitor-keys@^5.0.1:
   integrity sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==
 
 eslint@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-10.1.0.tgz#9ca98e654e642ab2e1af6d1e9d8613857ac341b4"
-  integrity sha512-S9jlY/ELKEUwwQnqWDO+f+m6sercqOPSqXM5Go94l7DOmxHVDgmSFGWEzeE/gwgTAr0W103BWt0QLe/7mabIvA==
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-10.4.0.tgz#d86b6c405de0f19f3318c47139b8cb6771b3f592"
+  integrity sha512-loXy6bWOoP3EP6JA7jo6p5jMpBJmHmsNZM5SFRHLdh1MGOPurMnNBj4ZlAbaqUAaQWbCr7jHV4P7gzAyryZWkQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.8.0"
     "@eslint-community/regexpp" "^4.12.2"
-    "@eslint/config-array" "^0.23.3"
-    "@eslint/config-helpers" "^0.5.3"
-    "@eslint/core" "^1.1.1"
-    "@eslint/plugin-kit" "^0.6.1"
+    "@eslint/config-array" "^0.23.5"
+    "@eslint/config-helpers" "^0.6.0"
+    "@eslint/core" "^1.2.1"
+    "@eslint/plugin-kit" "^0.7.1"
     "@humanfs/node" "^0.16.6"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@humanwhocodes/retry" "^0.4.2"
@@ -3911,7 +3957,7 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-eventemitter3@^5.0.1:
+eventemitter3@^5.0.4:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.4.tgz#a86d66170433712dde814707ac52b5271ceb1feb"
   integrity sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==
@@ -3936,17 +3982,17 @@ exit-x@^0.2.2:
   resolved "https://registry.yarnpkg.com/exit-x/-/exit-x-0.2.2.tgz#1f9052de3b8d99a696b10dad5bced9bdd5c3aa64"
   integrity sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==
 
-expect@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-30.3.0.tgz#1b82111517d1ab030f3db0cf1b4061c8aa644f61"
-  integrity sha512-1zQrciTiQfRdo7qJM1uG4navm8DayFa2TgCSRlzUyNkhcJ6XUZF3hjnpkyr3VhAqPH7i/9GkG7Tv5abz6fqz0Q==
+expect@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-30.4.1.tgz#897e0390a0b6c333dbcf3a24dee3ad49553577e0"
+  integrity sha512-PMARsyh/JtqC20HoGqlFcIlQAyqUtW4PlI1rup1uhYJtKuwAjbvWi3GQMAn+STdHum/dk8xrKfUM1+5SAwpolA==
   dependencies:
-    "@jest/expect-utils" "30.3.0"
+    "@jest/expect-utils" "30.4.1"
     "@jest/get-type" "30.1.0"
-    jest-matcher-utils "30.3.0"
-    jest-message-util "30.3.0"
-    jest-mock "30.3.0"
-    jest-util "30.3.0"
+    jest-matcher-utils "30.4.1"
+    jest-message-util "30.4.1"
+    jest-mock "30.4.1"
+    jest-util "30.4.1"
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
@@ -3985,6 +4031,25 @@ fast-levenshtein@^2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
+fast-string-truncated-width@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/fast-string-truncated-width/-/fast-string-truncated-width-3.0.3.tgz#23afe0da67d752ca0727538f1e6967759728ce49"
+  integrity sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==
+
+fast-string-width@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/fast-string-width/-/fast-string-width-3.0.2.tgz#16dbabb491ce5585b5ecb675b65c165d71688eeb"
+  integrity sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==
+  dependencies:
+    fast-string-truncated-width "^3.0.2"
+
+fast-wrap-ansi@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/fast-wrap-ansi/-/fast-wrap-ansi-0.2.0.tgz#c0ae3f3982d061c3d657ec927196fbb47e22fe64"
+  integrity sha512-rLV8JHxTyhVmFYhBJuMujcrHqOT2cnO5Zxj37qROj23CP39GXubJRBUFF0z8KFK77Uc0SukZUf7JZhsVEQ6n8w==
+  dependencies:
+    fast-string-width "^3.0.2"
+
 fastq@^1.6.0:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.20.1.tgz#ca750a10dc925bc8b18839fd203e3ef4b3ced675"
@@ -4125,9 +4190,9 @@ get-caller-file@^2.0.5:
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-east-asian-width@^1.0.0, get-east-asian-width@^1.3.1, get-east-asian-width@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.5.0.tgz#ce7008fe345edcf5497a6f557cfa54bc318a9ce7"
-  integrity sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz#216900f91df11a8b2c198c3e1d93d6c035a776b9"
+  integrity sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==
 
 get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.2.7, get-intrinsic@^1.3.0:
   version "1.3.0"
@@ -4173,9 +4238,9 @@ get-symbol-description@^1.1.0:
     get-intrinsic "^1.2.6"
 
 get-tsconfig@^4.10.0:
-  version "4.13.7"
-  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.13.7.tgz#b9d8b199b06033ceeea1a93df7ea5765415089bc"
-  integrity sha512-7tN6rFgBlMgpBML5j8typ92BKFi2sFQvIdpAqLA2beia5avZDrMs0FLZiM5etShWq5irVyGcGMEA1jcDaK7A/Q==
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.14.0.tgz#985d85c52a9903864280ccc2448d413fbf1efed8"
+  integrity sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==
   dependencies:
     resolve-pkg-maps "^1.0.0"
 
@@ -4277,14 +4342,14 @@ graphql-tag@^2.0, graphql-tag@^2.11.0, graphql-tag@^2.12.6:
     tslib "^2.1.0"
 
 graphql-ws@^6.0.6:
-  version "6.0.7"
-  resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-6.0.7.tgz#140307a513f0ba659ecec618d6cf15354a842f96"
-  integrity sha512-yoLRW+KRlDmnnROdAu7sX77VNLC0bsFoZyGQJLy1cF+X/SkLg/fWkRGrEEYQK8o2cafJ2wmEaMqMEZB3U3DYDg==
+  version "6.0.8"
+  resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-6.0.8.tgz#6712bb9da8462937e92343e3146726f89424df68"
+  integrity sha512-m3EOaNsUBXwAnkBWbzPfe0Nq8pXUfxsWnolC54sru3FzHvhTZL0Ouf/BoQsaGAXqM+YPerXOJ47BUnmgmoupCw==
 
 graphql@^16.12.0:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.13.1.tgz#38ae5c76fbc4a009e0004dca6c76c370a1da7b54"
-  integrity sha512-gGgrVCoDKlIZ8fIqXBBb0pPKqDgki0Z/FSKNiQzSGj2uEYHr1tq5wmBegGwJx6QB5S5cM0khSBpi/JFHMCvsmQ==
+  version "16.14.0"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.14.0.tgz#f1128a74b16a34d1245c8436bb07b488d87b83e1"
+  integrity sha512-BBvQ/406p+4CZbTpCbVPSxfzrZrbnuWSP1ELYgyS6B+hNeKzgrdB4JczCa5VZUBQrDa9hUngm0KnexY6pJRN5Q==
 
 has-bigints@^1.0.2:
   version "1.1.0"
@@ -4327,10 +4392,10 @@ has-tostringtag@^1.0.2:
   dependencies:
     has-symbols "^1.0.3"
 
-hasown@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
-  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+hasown@^2.0.2, hasown@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.3.tgz#5e5c2b15b60370a4c7930c383dfb76bf17bc403c"
+  integrity sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==
   dependencies:
     function-bind "^1.1.2"
 
@@ -4381,7 +4446,7 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-iconv-lite@^0.7.0:
+iconv-lite@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.7.2.tgz#d0bdeac3f12b4835b7359c2ad89c422a4d1cc72e"
   integrity sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==
@@ -4518,12 +4583,12 @@ is-callable@^1.2.7:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.13.0, is-core-module@^2.16.1:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
-  integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
+is-core-module@^2.16.1, is-core-module@^2.16.2:
+  version "2.16.2"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.2.tgz#3e07450a8080ebce3fbf0cac494f4d2ab324e082"
+  integrity sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==
   dependencies:
-    hasown "^2.0.2"
+    hasown "^2.0.3"
 
 is-data-view@^1.0.1, is-data-view@^1.0.2:
   version "1.0.2"
@@ -4689,10 +4754,10 @@ is-unc-path@^1.0.0:
   dependencies:
     unc-path-regex "^0.1.2"
 
-is-unicode-supported@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
-  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+is-unicode-supported@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz#09f0ab0de6d3744d48d265ebb98f65d11f2a9b3a"
+  integrity sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==
 
 is-upper-case@^2.0.2:
   version "2.0.2"
@@ -4814,365 +4879,366 @@ javascript-stringify@^2.0.1:
   resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz#27c76539be14d8bd128219a2d731b09337904e79"
   integrity sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==
 
-jest-changed-files@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-30.3.0.tgz#055849df695f9a9fcde0ae44024f815bbc627f3a"
-  integrity sha512-B/7Cny6cV5At6M25EWDgf9S617lHivamL8vl6KEpJqkStauzcG4e+WPfDgMMF+H4FVH4A2PLRyvgDJan4441QA==
+jest-changed-files@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-30.4.1.tgz#396fcf914165287f05960372a5d091f6f2275ec5"
+  integrity sha512-IuctmYrxi21iOSOaIXpJWalHyPAsVv0GeBHKDn8C1CA4W5htHn7INL+wdnL4Bo0+olEndvAFkmb++tIQJG+vvg==
   dependencies:
     execa "^5.1.1"
-    jest-util "30.3.0"
+    jest-util "30.4.1"
     p-limit "^3.1.0"
 
-jest-circus@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-30.3.0.tgz#153614c11ab35867f371bd93496ecb9690b92077"
-  integrity sha512-PyXq5szeSfR/4f1lYqCmmQjh0vqDkURUYi9N6whnHjlRz4IUQfMcXkGLeEoiJtxtyPqgUaUUfyQlApXWBSN1RA==
+jest-circus@30.4.2:
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-30.4.2.tgz#9a5b9b9c57bf51871f112ccf7a673d486c28f8e7"
+  integrity sha512-rvHH7VlY6LgbJXJTQ87GW62g1FntOtbhh0zT+v04kC+pgL6aBKyYINXxWukCpj3dcIBMw5/XUbtDS9dU9JTXeQ==
   dependencies:
-    "@jest/environment" "30.3.0"
-    "@jest/expect" "30.3.0"
-    "@jest/test-result" "30.3.0"
-    "@jest/types" "30.3.0"
+    "@jest/environment" "30.4.1"
+    "@jest/expect" "30.4.1"
+    "@jest/test-result" "30.4.1"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
     chalk "^4.1.2"
     co "^4.6.0"
     dedent "^1.6.0"
     is-generator-fn "^2.1.0"
-    jest-each "30.3.0"
-    jest-matcher-utils "30.3.0"
-    jest-message-util "30.3.0"
-    jest-runtime "30.3.0"
-    jest-snapshot "30.3.0"
-    jest-util "30.3.0"
+    jest-each "30.4.1"
+    jest-matcher-utils "30.4.1"
+    jest-message-util "30.4.1"
+    jest-runtime "30.4.2"
+    jest-snapshot "30.4.1"
+    jest-util "30.4.1"
     p-limit "^3.1.0"
-    pretty-format "30.3.0"
+    pretty-format "30.4.1"
     pure-rand "^7.0.0"
     slash "^3.0.0"
     stack-utils "^2.0.6"
 
-jest-cli@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-30.3.0.tgz#5ed75a337f486a1f1c5acbb2de8acddb106ead6c"
-  integrity sha512-l6Tqx+j1fDXJEW5bqYykDQQ7mQg+9mhWXtnj+tQZrTWYHyHoi6Be8HPumDSA+UiX2/2buEgjA58iJzdj146uCw==
+jest-cli@30.4.2:
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-30.4.2.tgz#e353ef54035c5ac97f200807c97b3d857f52bddc"
+  integrity sha512-jfA2ocvVHMXS2QijrJ0d31ektP+d/W0T5RpcTX2Pq+3sVqHlsXVCM2+FmwpL+bdY8OfHpIg9xMxLF17Zg0U49Q==
   dependencies:
-    "@jest/core" "30.3.0"
-    "@jest/test-result" "30.3.0"
-    "@jest/types" "30.3.0"
+    "@jest/core" "30.4.2"
+    "@jest/test-result" "30.4.1"
+    "@jest/types" "30.4.1"
     chalk "^4.1.2"
     exit-x "^0.2.2"
     import-local "^3.2.0"
-    jest-config "30.3.0"
-    jest-util "30.3.0"
-    jest-validate "30.3.0"
+    jest-config "30.4.2"
+    jest-util "30.4.1"
+    jest-validate "30.4.1"
     yargs "^17.7.2"
 
-jest-config@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-30.3.0.tgz#b969e0aaaf5964419e62953bb712c16d15972425"
-  integrity sha512-WPMAkMAtNDY9P/oKObtsRG/6KTrhtgPJoBTmk20uDn4Uy6/3EJnnaZJre/FMT1KVRx8cve1r7/FlMIOfRVWL4w==
+jest-config@30.4.2:
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-30.4.2.tgz#78f589b5410d2805518b8bdce517217fb96b5e61"
+  integrity sha512-rNHAShJQqQwFNoL0hbf3BphSBOWnpOUAKvidLS/AjNVLPfoj5mSf4jQMfW3cYOs6hXeZC7nF7mDHaBnbxELOzg==
   dependencies:
     "@babel/core" "^7.27.4"
     "@jest/get-type" "30.1.0"
-    "@jest/pattern" "30.0.1"
-    "@jest/test-sequencer" "30.3.0"
-    "@jest/types" "30.3.0"
-    babel-jest "30.3.0"
+    "@jest/pattern" "30.4.0"
+    "@jest/test-sequencer" "30.4.1"
+    "@jest/types" "30.4.1"
+    babel-jest "30.4.1"
     chalk "^4.1.2"
     ci-info "^4.2.0"
     deepmerge "^4.3.1"
     glob "^10.5.0"
     graceful-fs "^4.2.11"
-    jest-circus "30.3.0"
-    jest-docblock "30.2.0"
-    jest-environment-node "30.3.0"
-    jest-regex-util "30.0.1"
-    jest-resolve "30.3.0"
-    jest-runner "30.3.0"
-    jest-util "30.3.0"
-    jest-validate "30.3.0"
+    jest-circus "30.4.2"
+    jest-docblock "30.4.0"
+    jest-environment-node "30.4.1"
+    jest-regex-util "30.4.0"
+    jest-resolve "30.4.1"
+    jest-runner "30.4.2"
+    jest-util "30.4.1"
+    jest-validate "30.4.1"
     parse-json "^5.2.0"
-    pretty-format "30.3.0"
+    pretty-format "30.4.1"
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
-jest-diff@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.3.0.tgz#e0a4c84ef350ffd790ffd5b0016acabeecf5f759"
-  integrity sha512-n3q4PDQjS4LrKxfWB3Z5KNk1XjXtZTBwQp71OP0Jo03Z6V60x++K5L8k6ZrW8MY8pOFylZvHM0zsjS1RqlHJZQ==
+jest-diff@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.4.1.tgz#26691c73975768409af4a66b2754cea3182aa2dc"
+  integrity sha512-CRpFK0RtLriVDGcPPAnR6HMVI8bSR2jnUIgralhauzYQZIb4RH9AtEInTuQr65LmmGggGcRT6HIASxwqsVsmlA==
   dependencies:
-    "@jest/diff-sequences" "30.3.0"
+    "@jest/diff-sequences" "30.4.0"
     "@jest/get-type" "30.1.0"
     chalk "^4.1.2"
-    pretty-format "30.3.0"
+    pretty-format "30.4.1"
 
-jest-docblock@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-30.2.0.tgz#42cd98d69f887e531c7352309542b1ce4ee10256"
-  integrity sha512-tR/FFgZKS1CXluOQzZvNH3+0z9jXr3ldGSD8bhyuxvlVUwbeLOGynkunvlTMxchC5urrKndYiwCFC0DLVjpOCA==
+jest-docblock@30.4.0:
+  version "30.4.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-30.4.0.tgz#3ab779a027d1495ae21550accd4266bbe99af7a3"
+  integrity sha512-ZPMabUZCx5MpbZ2eBYSvZ0J8fvo3dR9oM+eeUpb3aKNQFuS2tu3Duw1TNlMoP8k3WQgKGJuhcMFvwcVuq6T7oA==
   dependencies:
     detect-newline "^3.1.0"
 
-jest-each@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-30.3.0.tgz#faa7229bf7a9fa6426dc604057a7d2a173493b1e"
-  integrity sha512-V8eMndg/aZ+3LnCJgSm13IxS5XSBM22QSZc9BtPK8Dek6pm+hfUNfwBdvsB3d342bo1q7wnSkC38zjX259qZNA==
+jest-each@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-30.4.1.tgz#b69e66da8e2b578c6140d357f6574044c2a40537"
+  integrity sha512-/8MJbH6fuj48TstjrMf+u/pd06Qezz5xOXvZA6442heNOWr8bdeoGZX2d9fCn028CoMgYmroH9//zky5GfyYmA==
   dependencies:
     "@jest/get-type" "30.1.0"
-    "@jest/types" "30.3.0"
+    "@jest/types" "30.4.1"
     chalk "^4.1.2"
-    jest-util "30.3.0"
-    pretty-format "30.3.0"
+    jest-util "30.4.1"
+    pretty-format "30.4.1"
 
-jest-environment-node@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-30.3.0.tgz#aa8a57c5d0c4af0f8b1f7403ba737fec6b3aabbe"
-  integrity sha512-4i6HItw/JSiJVsC5q0hnKIe/hbYfZLVG9YJ/0pU9Hz2n/9qZe3Rhn5s5CUZA5ORZlcdT/vmAXRMyONXJwPrmYQ==
+jest-environment-node@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-30.4.1.tgz#43bbbee903e17d874eb1817195c50ff8b90e2fe0"
+  integrity sha512-4FZYVOk85hz2AyT6BbarKy9u37g6DbrDyCdFhsnDdXqyrueYQvB+0zO4f/kqLCRD0BsPRXPMNJeQwihKZV8naw==
   dependencies:
-    "@jest/environment" "30.3.0"
-    "@jest/fake-timers" "30.3.0"
-    "@jest/types" "30.3.0"
+    "@jest/environment" "30.4.1"
+    "@jest/fake-timers" "30.4.1"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
-    jest-mock "30.3.0"
-    jest-util "30.3.0"
-    jest-validate "30.3.0"
+    jest-mock "30.4.1"
+    jest-util "30.4.1"
+    jest-validate "30.4.1"
 
-jest-haste-map@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-30.3.0.tgz#1ea6843e6e45c077d91270666a4fcba958c24cd5"
-  integrity sha512-mMi2oqG4KRU0R9QEtscl87JzMXfUhbKaFqOxmjb2CKcbHcUGFrJCBWHmnTiUqi6JcnzoBlO4rWfpdl2k/RfLCA==
+jest-haste-map@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-30.4.1.tgz#6d80d09d668c20bf3944977e50acac94fcd672fe"
+  integrity sha512-rFrcONd8jeFsyw+Z9CrScJgglRf2+NFmNam8dKu7n+SoHqNYT47mn0DdEcVUZJpvh7Iz6/si7f7yUH7GJHVgnw==
   dependencies:
-    "@jest/types" "30.3.0"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
     anymatch "^3.1.3"
     fb-watchman "^2.0.2"
     graceful-fs "^4.2.11"
-    jest-regex-util "30.0.1"
-    jest-util "30.3.0"
-    jest-worker "30.3.0"
+    jest-regex-util "30.4.0"
+    jest-util "30.4.1"
+    jest-worker "30.4.1"
     picomatch "^4.0.3"
     walker "^1.0.8"
   optionalDependencies:
     fsevents "^2.3.3"
 
-jest-leak-detector@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-30.3.0.tgz#a695a851e353f517a554a2f5c91c2742fc131c98"
-  integrity sha512-cuKmUUGIjfXZAiGJ7TbEMx0bcqNdPPI6P1V+7aF+m/FUJqFDxkFR4JqkTu8ZOiU5AaX/x0hZ20KaaIPXQzbMGQ==
+jest-leak-detector@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-30.4.1.tgz#96077059a68e5871fc8f53aa90647a6a33f916cd"
+  integrity sha512-IpmyiioeHxiWDhesHnUFmOxcTzwCwKpgACgWajtAP+nYQXiY7DakTxB6Bx9JFiRMljr0AX1PvnQdaU1KFoz6NQ==
   dependencies:
     "@jest/get-type" "30.1.0"
-    pretty-format "30.3.0"
+    pretty-format "30.4.1"
 
-jest-matcher-utils@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-30.3.0.tgz#d6c739fec1ecd33809f2d2b1348f6ab01d2f2493"
-  integrity sha512-HEtc9uFQgaUHkC7nLSlQL3Tph4Pjxt/yiPvkIrrDCt9jhoLIgxaubo1G+CFOnmHYMxHwwdaSN7mkIFs6ZK8OhA==
+jest-matcher-utils@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-30.4.1.tgz#3fee8c89dbd8fc6e60eb590def9897e18f110ec4"
+  integrity sha512-zvYfX5CaeEkFrrLS9suWe9rvJrm9J1Iv3ua8kIBv9GEPzcnsfBf0bob37la7s67fs0nlBC3EuvkOLnXQKxtx4A==
   dependencies:
     "@jest/get-type" "30.1.0"
     chalk "^4.1.2"
-    jest-diff "30.3.0"
-    pretty-format "30.3.0"
+    jest-diff "30.4.1"
+    pretty-format "30.4.1"
 
-jest-message-util@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-30.3.0.tgz#4d723544d36890ba862ac3961db52db5b0d1ba39"
-  integrity sha512-Z/j4Bo+4ySJ+JPJN3b2Qbl9hDq3VrXmnjjGEWD/x0BCXeOXPTV1iZYYzl2X8c1MaCOL+ewMyNBcm88sboE6YWw==
+jest-message-util@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-30.4.1.tgz#40f6bfa5f564363edcba7ce0ca64277fd2ad6af7"
+  integrity sha512-kwCKIvq0MCW1HzLoGola9Te6JUdzgV0loyKJ3Qghrkz9i5/RRIHsL95BMQc2HBBhlBKC4j22K9p11TGHH8RBpQ==
   dependencies:
     "@babel/code-frame" "^7.27.1"
-    "@jest/types" "30.3.0"
+    "@jest/types" "30.4.1"
     "@types/stack-utils" "^2.0.3"
     chalk "^4.1.2"
     graceful-fs "^4.2.11"
+    jest-util "30.4.1"
     picomatch "^4.0.3"
-    pretty-format "30.3.0"
+    pretty-format "30.4.1"
     slash "^3.0.0"
     stack-utils "^2.0.6"
 
-jest-mock@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-30.3.0.tgz#e0fa4184a596a6c4fdec53d4f412158418923747"
-  integrity sha512-OTzICK8CpE+t4ndhKrwlIdbM6Pn8j00lvmSmq5ejiO+KxukbLjgOflKWMn3KE34EZdQm5RqTuKj+5RIEniYhog==
+jest-mock@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-30.4.1.tgz#5e11a05d7719a1e3c7bba6348b70ff4e1bc5ea68"
+  integrity sha512-/i8SVb8/NSB7RfNi8gfqu8gxLV23KaL5EpAttyb9iz8qWRIqXRLflycz/32wXsYkOnaUlx8NAKnJYtpsmXUmfw==
   dependencies:
-    "@jest/types" "30.3.0"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
-    jest-util "30.3.0"
+    jest-util "30.4.1"
 
 jest-pnp-resolver@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
   integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
 
-jest-regex-util@30.0.1:
-  version "30.0.1"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-30.0.1.tgz#f17c1de3958b67dfe485354f5a10093298f2a49b"
-  integrity sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==
+jest-regex-util@30.4.0:
+  version "30.4.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-30.4.0.tgz#f75ccc43857633df2563a03588b5cb45c7c2941b"
+  integrity sha512-mWlvLviKIgIQ8VCuM1xRdD0TWp3zlzionlmDBjuXVBs+VkmXq6FgW9T4Emr7oGz/Rk6feDCGyiugolcQEyp3mg==
 
-jest-resolve-dependencies@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-30.3.0.tgz#4d638c9f0d93a62a6ed25dec874bfd7e756c8ce5"
-  integrity sha512-9ev8s3YN6Hsyz9LV75XUwkCVFlwPbaFn6Wp75qnI0wzAINYWY8Fb3+6y59Rwd3QaS3kKXffHXsZMziMavfz/nw==
+jest-resolve-dependencies@30.4.2:
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-30.4.2.tgz#152f8a4cb2dd351cedeb5ada53c89f9683a3ad92"
+  integrity sha512-gDiVh1I+GxYzz9oXlyw+1wv6VOYX1WYxMOfjsA3iGKePV2oxmbHhwxfkALxNxYy1ciw6APWwkW2zZONwP97aEQ==
   dependencies:
-    jest-regex-util "30.0.1"
-    jest-snapshot "30.3.0"
+    jest-regex-util "30.4.0"
+    jest-snapshot "30.4.1"
 
-jest-resolve@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-30.3.0.tgz#b7bee9927279805b1b50715d2170a545553b87ff"
-  integrity sha512-NRtTAHQlpd15F9rUR36jqwelbrDV/dY4vzNte3S2kxCKUJRYNd5/6nTSbYiak1VX5g8IoFF23Uj5TURkUW8O5g==
+jest-resolve@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-30.4.1.tgz#b9e432892dc0e2a470eb4826ef5f120a50b3205e"
+  integrity sha512-Zry8Yq/yJcNAZ7dJ5F2heic8AheXvbFZ7XI5V+h28nrYZ7Qoyy4dItq8OodjnYD270mvX+ZudmrNV9cysqhW5Q==
   dependencies:
     chalk "^4.1.2"
     graceful-fs "^4.2.11"
-    jest-haste-map "30.3.0"
+    jest-haste-map "30.4.1"
     jest-pnp-resolver "^1.2.3"
-    jest-util "30.3.0"
-    jest-validate "30.3.0"
+    jest-util "30.4.1"
+    jest-validate "30.4.1"
     slash "^3.0.0"
     unrs-resolver "^1.7.11"
 
-jest-runner@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-30.3.0.tgz#fa970fc4e45d418ad7e7d581b24cac7af5944cb7"
-  integrity sha512-gDv6C9LGKWDPLia9TSzZwf4h3kMQCqyTpq+95PODnTRDO0g9os48XIYYkS6D236vjpBir2fF63YmJFtqkS5Duw==
+jest-runner@30.4.2:
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-30.4.2.tgz#15debf3cb6d817538aa97427d5a79277cdff65fe"
+  integrity sha512-2dw0PslVYXxffXGpLo+Ejad+KcI1Qkjn7f4X4619gf21oCUmL+SPfjqIa/losUem3yEOvfNZe/F1HWUcNpODcg==
   dependencies:
-    "@jest/console" "30.3.0"
-    "@jest/environment" "30.3.0"
-    "@jest/test-result" "30.3.0"
-    "@jest/transform" "30.3.0"
-    "@jest/types" "30.3.0"
+    "@jest/console" "30.4.1"
+    "@jest/environment" "30.4.1"
+    "@jest/test-result" "30.4.1"
+    "@jest/transform" "30.4.1"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
     chalk "^4.1.2"
     emittery "^0.13.1"
     exit-x "^0.2.2"
     graceful-fs "^4.2.11"
-    jest-docblock "30.2.0"
-    jest-environment-node "30.3.0"
-    jest-haste-map "30.3.0"
-    jest-leak-detector "30.3.0"
-    jest-message-util "30.3.0"
-    jest-resolve "30.3.0"
-    jest-runtime "30.3.0"
-    jest-util "30.3.0"
-    jest-watcher "30.3.0"
-    jest-worker "30.3.0"
+    jest-docblock "30.4.0"
+    jest-environment-node "30.4.1"
+    jest-haste-map "30.4.1"
+    jest-leak-detector "30.4.1"
+    jest-message-util "30.4.1"
+    jest-resolve "30.4.1"
+    jest-runtime "30.4.2"
+    jest-util "30.4.1"
+    jest-watcher "30.4.1"
+    jest-worker "30.4.1"
     p-limit "^3.1.0"
     source-map-support "0.5.13"
 
-jest-runtime@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-30.3.0.tgz#1a9bec7a9b68db12dfe4136bbe41ab883ea2c996"
-  integrity sha512-CgC+hIBJbuh78HEffkhNKcbXAytQViplcl8xupqeIWyKQF50kCQA8J7GeJCkjisC6hpnC9Muf8jV5RdtdFbGng==
+jest-runtime@30.4.2:
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-30.4.2.tgz#03b5955003440975b12e76518ec85d091c25b84a"
+  integrity sha512-3/5e8iPz2k/VLqlr8DgTftYyLUv8Su3FkCAO2/Od81UsUTpSxOrS6O5x5KkoQwyUjmpYyDJKeyAvg2T2nvpNkQ==
   dependencies:
-    "@jest/environment" "30.3.0"
-    "@jest/fake-timers" "30.3.0"
-    "@jest/globals" "30.3.0"
+    "@jest/environment" "30.4.1"
+    "@jest/fake-timers" "30.4.1"
+    "@jest/globals" "30.4.1"
     "@jest/source-map" "30.0.1"
-    "@jest/test-result" "30.3.0"
-    "@jest/transform" "30.3.0"
-    "@jest/types" "30.3.0"
+    "@jest/test-result" "30.4.1"
+    "@jest/transform" "30.4.1"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
     chalk "^4.1.2"
     cjs-module-lexer "^2.1.0"
     collect-v8-coverage "^1.0.2"
     glob "^10.5.0"
     graceful-fs "^4.2.11"
-    jest-haste-map "30.3.0"
-    jest-message-util "30.3.0"
-    jest-mock "30.3.0"
-    jest-regex-util "30.0.1"
-    jest-resolve "30.3.0"
-    jest-snapshot "30.3.0"
-    jest-util "30.3.0"
+    jest-haste-map "30.4.1"
+    jest-message-util "30.4.1"
+    jest-mock "30.4.1"
+    jest-regex-util "30.4.0"
+    jest-resolve "30.4.1"
+    jest-snapshot "30.4.1"
+    jest-util "30.4.1"
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
-jest-snapshot@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-30.3.0.tgz#6e7ea75069dda86e36311a0f73189e830d4f51ad"
-  integrity sha512-f14c7atpb4O2DeNhwcvS810Y63wEn8O1HqK/luJ4F6M4NjvxmAKQwBUWjbExUtMxWJQ0wVgmCKymeJK6NZMnfQ==
+jest-snapshot@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-30.4.1.tgz#0380cbbaa9d53d32cf7e61af98459ac10a339842"
+  integrity sha512-tEOkkfOMppUyeiHwjZswOQ3lcnoTnws/q5FnGIaeIh/jmoU0ZlgMYRR8sTlTj+nNGCoJ0RDq6SfxGxCsyMTPmw==
   dependencies:
     "@babel/core" "^7.27.4"
     "@babel/generator" "^7.27.5"
     "@babel/plugin-syntax-jsx" "^7.27.1"
     "@babel/plugin-syntax-typescript" "^7.27.1"
     "@babel/types" "^7.27.3"
-    "@jest/expect-utils" "30.3.0"
+    "@jest/expect-utils" "30.4.1"
     "@jest/get-type" "30.1.0"
-    "@jest/snapshot-utils" "30.3.0"
-    "@jest/transform" "30.3.0"
-    "@jest/types" "30.3.0"
+    "@jest/snapshot-utils" "30.4.1"
+    "@jest/transform" "30.4.1"
+    "@jest/types" "30.4.1"
     babel-preset-current-node-syntax "^1.2.0"
     chalk "^4.1.2"
-    expect "30.3.0"
+    expect "30.4.1"
     graceful-fs "^4.2.11"
-    jest-diff "30.3.0"
-    jest-matcher-utils "30.3.0"
-    jest-message-util "30.3.0"
-    jest-util "30.3.0"
-    pretty-format "30.3.0"
+    jest-diff "30.4.1"
+    jest-matcher-utils "30.4.1"
+    jest-message-util "30.4.1"
+    jest-util "30.4.1"
+    pretty-format "30.4.1"
     semver "^7.7.2"
     synckit "^0.11.8"
 
-jest-util@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-30.3.0.tgz#95a4fbacf2dac20e768e2f1744b70519f2ba7980"
-  integrity sha512-/jZDa00a3Sz7rdyu55NLrQCIrbyIkbBxareejQI315f/i8HjYN+ZWsDLLpoQSiUIEIyZF/R8fDg3BmB8AtHttg==
+jest-util@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-30.4.1.tgz#979c9d014fdd12bb95d3dcde0192e1a9e0bc93d6"
+  integrity sha512-vjQb1sACEiv13DKJMDToJpzVW0joCsIQrmbg0fi7CyOOt+g9jTuQl2A216pWRBYhOVt53XbL/2LbMKg1BECWOw==
   dependencies:
-    "@jest/types" "30.3.0"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
     chalk "^4.1.2"
     ci-info "^4.2.0"
     graceful-fs "^4.2.11"
     picomatch "^4.0.3"
 
-jest-validate@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-30.3.0.tgz#215e11b8fcc5e2ca4b99ea5d730a5b4c969e4355"
-  integrity sha512-I/xzC8h5G+SHCb2P2gWkJYrNiTbeL47KvKeW5EzplkyxzBRBw1ssSHlI/jXec0ukH2q7x2zAWQm7015iusg62Q==
+jest-validate@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-30.4.1.tgz#dcc4784547bf644dca0226d3266fb1bde392c5a4"
+  integrity sha512-PDWi4SOwLnwqNDfHZjOcsEFyZ4fc/2W2gVL3DEoyqnB6jCQMLRtfBong8s6omIw3lI0HWOus12xfnFmQtjW3fw==
   dependencies:
     "@jest/get-type" "30.1.0"
-    "@jest/types" "30.3.0"
+    "@jest/types" "30.4.1"
     camelcase "^6.3.0"
     chalk "^4.1.2"
     leven "^3.1.0"
-    pretty-format "30.3.0"
+    pretty-format "30.4.1"
 
-jest-watcher@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-30.3.0.tgz#3afa1af355b9fe80f0261eb8a23981a315858596"
-  integrity sha512-PJ1d9ThtTR8aMiBWUdcownq9mDdLXsQzJayTk4kmaBRHKvwNQn+ANveuhEBUyNI2hR1TVhvQ8D5kHubbzBHR/w==
+jest-watcher@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-30.4.1.tgz#d2a78fd27553db9206947eeda6068d76bacfd276"
+  integrity sha512-/l9UonmvCwjHH7d2h3iAwIloLc1H0S8mJZ/LNK3i86hqwPAz8otUJjP9MfYtz9Tt77Su5FD2xGjZn8d31IZHlw==
   dependencies:
-    "@jest/test-result" "30.3.0"
-    "@jest/types" "30.3.0"
+    "@jest/test-result" "30.4.1"
+    "@jest/types" "30.4.1"
     "@types/node" "*"
     ansi-escapes "^4.3.2"
     chalk "^4.1.2"
     emittery "^0.13.1"
-    jest-util "30.3.0"
+    jest-util "30.4.1"
     string-length "^4.0.2"
 
-jest-worker@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-30.3.0.tgz#ae4dc1f1d93d0cba1415624fcedaec40ea764f14"
-  integrity sha512-DrCKkaQwHexjRUFTmPzs7sHQe0TSj9nvDALKGdwmK5mW9v7j90BudWirKAJHt3QQ9Dhrg1F7DogPzhChppkJpQ==
+jest-worker@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-30.4.1.tgz#ac010eb6c512425748a39e2d6bf05b2c4866ca4f"
+  integrity sha512-SHynN/q/QD++iNyvMdy+WMmbCGk8jIsNcRxycXbWubSOhvo6T+j2afcfUSl+3hYsiBebOTo0cT7c2H7CXugu1g==
   dependencies:
     "@types/node" "*"
     "@ungap/structured-clone" "^1.3.0"
-    jest-util "30.3.0"
+    jest-util "30.4.1"
     merge-stream "^2.0.0"
     supports-color "^8.1.1"
 
 jest@^30.2.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-30.3.0.tgz#6460b889dd805e9677400505f16f1d9b14c285a3"
-  integrity sha512-AkXIIFcaazymvey2i/+F94XRnM6TsVLZDhBMLsd1Sf/W0wzsvvpjeyUrCZD6HGG4SDYPgDJDBKeiJTBb10WzMg==
+  version "30.4.2"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-30.4.2.tgz#e9bdb00f4bf1126d781b0d98e23130db096bbd9a"
+  integrity sha512-Yi1jqNC/Oq0N4hBgNH/YvBpP1P57QqundgytzYqy3yqAa7NZPNjSoi4SGbRAXDMdBzNE6xBCi5U7RgfrvMEUVQ==
   dependencies:
-    "@jest/core" "30.3.0"
-    "@jest/types" "30.3.0"
+    "@jest/core" "30.4.2"
+    "@jest/types" "30.4.1"
     import-local "^3.2.0"
-    jest-cli "30.3.0"
+    jest-cli "30.4.2"
 
 jiti@^2.0.0, jiti@^2.3.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.6.1.tgz#178ef2fc9a1a594248c20627cd820187a4d78d92"
-  integrity sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.7.0.tgz#974228f2f4ca2bc21885a1797b45fea68e950c64"
+  integrity sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
@@ -5309,17 +5375,16 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-listr2@^9.0.0:
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-9.0.5.tgz#92df7c4416a6da630eb9ef46da469b70de97b316"
-  integrity sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==
+listr2@^10.2.1:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-10.2.1.tgz#fb44e1e9e5f8b15ab817296d45149d295c47bee9"
+  integrity sha512-7I5knELsJKTUjXG+A6BkKAiGkW1i25fNa/xlUl9hFtk15WbE9jndA89xu5FzQKrY5llajE1hfZZFMILXkDHk/Q==
   dependencies:
-    cli-truncate "^5.0.0"
-    colorette "^2.0.20"
-    eventemitter3 "^5.0.1"
+    cli-truncate "^5.2.0"
+    eventemitter3 "^5.0.4"
     log-update "^6.1.0"
     rfdc "^1.4.1"
-    wrap-ansi "^9.0.0"
+    wrap-ansi "^10.0.0"
 
 locate-path@^5.0.0:
   version "5.0.0"
@@ -5340,18 +5405,13 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
 
-lodash@~4.17.0:
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
-  integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
-
-log-symbols@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
-  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
+log-symbols@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-7.0.1.tgz#f52e68037d96f589fc572ff2193dc424d48c195b"
+  integrity sha512-ja1E3yCr9i/0hmBVaM0bfwDjnGy8I/s6PP4DFp+yP+a+mrHO4Rm7DtmnqROTUkHIkqffC84YY7AeqX6oFk0WFg==
   dependencies:
-    chalk "^4.1.0"
-    is-unicode-supported "^0.1.0"
+    is-unicode-supported "^2.0.0"
+    yoctocolors "^2.1.1"
 
 log-update@^6.1.0:
   version "6.1.0"
@@ -5465,11 +5525,11 @@ mimic-function@^5.0.0:
   integrity sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==
 
 minimatch@^10.0.0, minimatch@^10.2.2, minimatch@^10.2.4:
-  version "10.2.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.4.tgz#465b3accbd0218b8281f5301e27cedc697f96fde"
-  integrity sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==
+  version "10.2.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.5.tgz#bd48687a0be38ed2961399105600f832095861d1"
+  integrity sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==
   dependencies:
-    brace-expansion "^5.0.2"
+    brace-expansion "^5.0.5"
 
 minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.5"
@@ -5507,17 +5567,17 @@ ms@^2.1.1, ms@^2.1.3:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-mute-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-2.0.0.tgz#a5446fc0c512b71c83c44d908d5c7b7b4c493b2b"
-  integrity sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==
+mute-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-3.0.0.tgz#cd8014dd2acb72e1e91bb67c74f0019e620ba2d1"
+  integrity sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==
 
 nanoid@^3.3.6:
-  version "3.3.11"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
-  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
+  version "3.3.12"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.12.tgz#ab3d912e217a6d0a514f00a72a16543a28982c05"
+  integrity sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==
 
-napi-postinstall@^0.3.0:
+napi-postinstall@^0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/napi-postinstall/-/napi-postinstall-0.3.4.tgz#7af256d6588b5f8e952b9190965d6b019653bbb9"
   integrity sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==
@@ -5528,25 +5588,25 @@ natural-compare@^1.4.0:
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 next@^16.0.8:
-  version "16.2.1"
-  resolved "https://registry.yarnpkg.com/next/-/next-16.2.1.tgz#8e3ee1051f900e2a52e5978fc1cc3bbd7fe76cad"
-  integrity sha512-VaChzNL7o9rbfdt60HUj8tev4m6d7iC1igAy157526+cJlXOQu5LzsBXNT+xaJnTP/k+utSX5vMv7m0G+zKH+Q==
+  version "16.2.6"
+  resolved "https://registry.yarnpkg.com/next/-/next-16.2.6.tgz#4564833d2865efc598b7c63541b5771792d3d811"
+  integrity sha512-qOVgKJg1+At15NpeUP+eJgCHvTCgXsogweq87Ri/Ix7PkqQHg4sdaXmSFqKlgaIXE4kW0g25LE68W87UANlHtw==
   dependencies:
-    "@next/env" "16.2.1"
+    "@next/env" "16.2.6"
     "@swc/helpers" "0.5.15"
     baseline-browser-mapping "^2.9.19"
     caniuse-lite "^1.0.30001579"
     postcss "8.4.31"
     styled-jsx "5.1.6"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "16.2.1"
-    "@next/swc-darwin-x64" "16.2.1"
-    "@next/swc-linux-arm64-gnu" "16.2.1"
-    "@next/swc-linux-arm64-musl" "16.2.1"
-    "@next/swc-linux-x64-gnu" "16.2.1"
-    "@next/swc-linux-x64-musl" "16.2.1"
-    "@next/swc-win32-arm64-msvc" "16.2.1"
-    "@next/swc-win32-x64-msvc" "16.2.1"
+    "@next/swc-darwin-arm64" "16.2.6"
+    "@next/swc-darwin-x64" "16.2.6"
+    "@next/swc-linux-arm64-gnu" "16.2.6"
+    "@next/swc-linux-arm64-musl" "16.2.6"
+    "@next/swc-linux-x64-gnu" "16.2.6"
+    "@next/swc-linux-x64-musl" "16.2.6"
+    "@next/swc-win32-arm64-msvc" "16.2.6"
+    "@next/swc-win32-x64-msvc" "16.2.6"
     sharp "^0.34.5"
 
 no-case@^3.0.4:
@@ -5591,10 +5651,10 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
-node-releases@^2.0.27:
-  version "2.0.36"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.36.tgz#99fd6552aaeda9e17c4713b57a63964a2e325e9d"
-  integrity sha512-TdC8FSgHz8Mwtw9g5L4gR/Sh9XhSP/0DEkQxfEFXOpiul5IiHgHan2VhYYb6agDSfp4KuvltmGApc8HMgUrIkA==
+node-releases@^2.0.36:
+  version "2.0.44"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.44.tgz#212c9b983f5bb70d311dd68c27d55dd0e65d1ca7"
+  integrity sha512-5WUyunoPMsvvEhS8AxHtRzP+oA8UCkJ7YRxatWKjngndhDGLiqEVAQKWjFAiAiuL8zMRGzGSJxFnLetoa43qGQ==
 
 nopt@^4.0.1:
   version "4.0.3"
@@ -5913,14 +5973,14 @@ picocolors@^1.0.0, picocolors@^1.1.1:
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
 picomatch@^2.0.4, picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"
+  integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==
 
-picomatch@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.3.tgz#796c76136d1eead715db1e7bad785dedd695a042"
-  integrity sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==
+picomatch@^4.0.3, picomatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.4.tgz#fd6f5e00a143086e074dffe4c924b8fb293b0589"
+  integrity sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==
 
 pirates@^4.0.7:
   version "4.0.7"
@@ -5954,18 +6014,19 @@ prelude-ls@^1.2.1:
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
 prettier@^3.3.2:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.8.1.tgz#edf48977cf991558f4fcbd8a3ba6015ba2a3a173"
-  integrity sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.8.3.tgz#560f2de55bf01b4c0503bc629d5df99b9a1d09b0"
+  integrity sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==
 
-pretty-format@30.3.0:
-  version "30.3.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-30.3.0.tgz#e977eed4bcd1b6195faed418af8eac68b9ea1f29"
-  integrity sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==
+pretty-format@30.4.1:
+  version "30.4.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-30.4.1.tgz#0911652e92e1e91f475e3e6a16e628e50649ea69"
+  integrity sha512-K6KiKMHTL4jjX4u3Kir2EW07nRfcqVTXIImx50wbjHQTcZPgg+gjVeNTIT3l3L1Rd4UefxfogquC9J37SoFyyw==
   dependencies:
-    "@jest/schemas" "30.0.5"
+    "@jest/schemas" "30.4.1"
     ansi-styles "^5.2.0"
-    react-is "^18.3.1"
+    react-is-18 "npm:react-is@^18.3.1"
+    react-is-19 "npm:react-is@^19.2.5"
 
 prop-types@^15.8.1:
   version "15.8.1"
@@ -5992,18 +6053,18 @@ queue-microtask@^1.2.2:
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
 react-cookie@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/react-cookie/-/react-cookie-8.0.1.tgz#0d7f5112c9003b61c70d3d53f1f0a5b741e9f2e9"
-  integrity sha512-QNdAd0MLuAiDiLcDU/2s/eyKmmfMHtjPUKJ2dZ/5CcQ9QKUium4B3o61/haq6PQl/YWFqC5PO8GvxeHKhy3GFA==
+  version "8.1.2"
+  resolved "https://registry.yarnpkg.com/react-cookie/-/react-cookie-8.1.2.tgz#957db13f74876af047eb339af407a7eca262b9dd"
+  integrity sha512-S45Z1y1dHyYfLEI4bFKQICuP+SwJqTPWbdc2ZpE6aQSdjSVJAjUDfwTPq8B7BWieIsgyyEWMb/QOrudtwJMjXA==
   dependencies:
-    "@types/hoist-non-react-statics" "^3.3.6"
+    "@types/hoist-non-react-statics" "^3.3.7"
     hoist-non-react-statics "^3.3.2"
     universal-cookie "^8.0.0"
 
 react-dom@^19.2.0:
-  version "19.2.4"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.4.tgz#6fac6bd96f7db477d966c7ec17c1a2b1ad8e6591"
-  integrity sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==
+  version "19.2.6"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.6.tgz#44a81b0bcca22da814c00847d09d01c8615529b7"
+  integrity sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g==
   dependencies:
     scheduler "^0.27.0"
 
@@ -6022,33 +6083,43 @@ react-highlight-words@^0.21.0:
     highlight-words-core "^1.2.0"
     memoize-one "^4.0.0"
 
+"react-is-18@npm:react-is@^18.3.1":
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
+  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
+
+"react-is-19@npm:react-is@^19.2.5":
+  version "19.2.6"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-19.2.6.tgz#aeee6159b159eb7f520d672cffcc69e7052d288f"
+  integrity sha512-XjBR15BhXuylgWGuslhDKqlSayuqvqBX91BP8pauG8kd1zY8kotkNWbXksTCNRarse4kuGbe2kIY05ARtwNIvw==
+
 react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^18.2.0, react-is@^18.3.1:
+react-is@^18.2.0:
   version "18.3.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
   integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
 
-react-is@^19.2.4:
-  version "19.2.4"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-19.2.4.tgz#a080758243c572ccd4a63386537654298c99d135"
-  integrity sha512-W+EWGn2v0ApPKgKKCy/7s7WHXkboGcsrXE+2joLyVxkbyVQfO3MUEaUQDHoSmb8TFFrSKYa9mw64WZHNHSDzYA==
+react-is@^19.2.6:
+  version "19.2.6"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-19.2.6.tgz#aeee6159b159eb7f520d672cffcc69e7052d288f"
+  integrity sha512-XjBR15BhXuylgWGuslhDKqlSayuqvqBX91BP8pauG8kd1zY8kotkNWbXksTCNRarse4kuGbe2kIY05ARtwNIvw==
 
 react-test-renderer@^19.2.0:
-  version "19.2.4"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-19.2.4.tgz#c26f93fc8da5409472626cd873d005a1974df3ff"
-  integrity sha512-Ttl5D7Rnmi6JGMUpri4UjB4BAN0FPs4yRDnu2XSsigCWOLm11o8GwRlVsh27ER+4WFqsGtrBuuv5zumUaRCmKw==
+  version "19.2.6"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-19.2.6.tgz#42e9f9fcc4fe11d4bbf7acff536a2e5b8a8cfd45"
+  integrity sha512-GbS6V23YduFTPiWJ5xICbKEjRcqx1Z90js/V5miqhz7qp/d6xSe9Dd6NjSQODFRdzdsqRMPW82E/sFpPRbY5Mw==
   dependencies:
-    react-is "^19.2.4"
+    react-is "^19.2.6"
     scheduler "^0.27.0"
 
 react@^19.2.0:
-  version "19.2.4"
-  resolved "https://registry.yarnpkg.com/react/-/react-19.2.4.tgz#438e57baa19b77cb23aab516cf635cd0579ee09a"
-  integrity sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==
+  version "19.2.6"
+  resolved "https://registry.yarnpkg.com/react/-/react-19.2.6.tgz#3dadb8e12b2a7934c1d5317973e5dce1301f9a4d"
+  integrity sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==
 
 read-installed@~4.0.3:
   version "4.0.3"
@@ -6152,22 +6223,23 @@ resolve-pkg-maps@^1.0.0:
   resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f"
   integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==
 
-resolve@^1.10.0, resolve@^1.22.4:
-  version "1.22.11"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262"
-  integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==
+resolve@^1.10.0:
+  version "1.22.12"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.12.tgz#f5b2a680897c69c238a13cd16b15671f8b73549f"
+  integrity sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==
   dependencies:
+    es-errors "^1.3.0"
     is-core-module "^2.16.1"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^2.0.0-next.5:
-  version "2.0.0-next.6"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.6.tgz#b3961812be69ace7b3bc35d5bf259434681294af"
-  integrity sha512-3JmVl5hMGtJ3kMmB3zi3DL25KfkCEyy3Tw7Gmw7z5w8M9WlwoPFnIvwChzu1+cF3iaK3sp18hhPz8ANeimdJfA==
+resolve@^2.0.0-next.5, resolve@^2.0.0-next.6:
+  version "2.0.0-next.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.7.tgz#ba3b035d4b1ee7c522426eee73cabcb0fd5515dd"
+  integrity sha512-tqt+NBWwyaMgw3zDsnygx4CByWjQEJHOPMdslYhppaQSJUtL/D4JO9CcBBlhPoI8lz9oJIDXkwXfhF4aWqP8xQ==
   dependencies:
     es-errors "^1.3.0"
-    is-core-module "^2.16.1"
+    is-core-module "^2.16.2"
     node-exports-info "^1.6.0"
     object-keys "^1.1.1"
     path-parse "^1.0.7"
@@ -6206,13 +6278,13 @@ rxjs@7.8.2, rxjs@^7.8.2:
     tslib "^2.1.0"
 
 safe-array-concat@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3"
-  integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.4.tgz#a54cc9b61a57f33b42abad3cbdda3a2b38cc5719"
+  integrity sha512-wtZlHyOje6OZTGqAoaDKxFkgRtkF9CnHAVnCHKfuj200wAgL+bSJhdsCD2l0Qx/2ekEXjPWcyKkfGb5CPboslg==
   dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.2"
-    get-intrinsic "^1.2.6"
+    call-bind "^1.0.9"
+    call-bound "^1.0.4"
+    get-intrinsic "^1.3.0"
     has-symbols "^1.1.0"
     isarray "^2.0.5"
 
@@ -6261,9 +6333,9 @@ semver@^6.3.1:
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 semver@^7.5.3, semver@^7.5.4, semver@^7.7.1, semver@^7.7.2, semver@^7.7.3:
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.4.tgz#28464e36060e991fa7a11d0279d2d3f3b57a7e8a"
-  integrity sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.8.0.tgz#ed0661039fcbcda2ce71f01fa6adbefaa77040df"
+  integrity sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==
 
 sentence-case@^3.0.4:
   version "3.0.4"
@@ -6357,12 +6429,12 @@ shell-quote@1.8.3, shell-quote@^1.7.3:
   integrity sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==
 
 side-channel-list@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
-  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.1.tgz#c2e0b5a14a540aebee3bbc6c3f8666cc9b509127"
+  integrity sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==
   dependencies:
     es-errors "^1.3.0"
-    object-inspect "^1.13.3"
+    object-inspect "^1.13.4"
 
 side-channel-map@^1.0.1:
   version "1.0.1"
@@ -6514,6 +6586,11 @@ sponge-case@^1.0.1:
   dependencies:
     tslib "^2.0.3"
 
+sponge-case@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/sponge-case/-/sponge-case-2.0.3.tgz#9e004d04332c307e4895b79eeb6c1f3da86eb203"
+  integrity sha512-i4h9ZGRfxV6Xw3mpZSFOfbXjf0cQcYmssGWutgNIfFZ2VM+YIWfD71N/kjjwK6X/AAHzBr+rciEcn/L34S8TGw==
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -6584,7 +6661,7 @@ string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-string-width@^7.0.0:
+string-width@^7.0.0, string-width@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-7.2.0.tgz#b5bb8e2165ce275d4d43476dd2700ad9091db6dc"
   integrity sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==
@@ -6594,9 +6671,9 @@ string-width@^7.0.0:
     strip-ansi "^7.1.0"
 
 string-width@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-8.2.0.tgz#bdb6a9bd6d7800db635adae96cdb0443fec56c42"
-  integrity sha512-6hJPQ8N0V0P3SNmP6h2J99RLuzrWz2gvT7VnK5tKvrNqJoyS9W4/Fb8mo31UiPvy00z7DQXkP2hnKBVav76thw==
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-8.2.1.tgz#165089cfa527cc88fbc23dd73313f5e334af1ea1"
+  integrity sha512-IIaP0g3iy9Cyy18w3M9YcaDudujEAVHKt3a3QJg1+sr/oX96TbaGUubG0hJyCjCBThFH+tFpcIyoUHUn1ogaLA==
   dependencies:
     get-east-asian-width "^1.5.0"
     strip-ansi "^7.1.2"
@@ -6718,9 +6795,9 @@ styled-jsx@5.1.6:
     client-only "0.0.1"
 
 stylis@^4.3.4:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.6.tgz#7c7b97191cb4f195f03ecab7d52f7902ed378320"
-  integrity sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.4.0.tgz#c5846c9345f4bfc51bd0cbd7ca35a0744f485a5d"
+  integrity sha512-5Z9ZpRzfuH6l/UAvCPAPUo3665Nk2wLaZU3x+TLHKVzIz33+sbJqbtrYoC3KD4/uVOr2Zp+L0LySezP9OHV9yA==
 
 supports-color@8.1.1, supports-color@^8.1.1:
   version "8.1.1"
@@ -6755,6 +6832,11 @@ swap-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
+swap-case@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-3.0.3.tgz#363883b0e8a2837c24d2e0eccb6bdff92e32d711"
+  integrity sha512-6p4op8wE9CQv7uDFzulI6YXUw4lD9n4oQierdbFThEKVWVQcbQcUjdP27W8XE7V4QnWmnq9jueSHceyyQnqQVA==
+
 sync-fetch@0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/sync-fetch/-/sync-fetch-0.6.0.tgz#5759e775f3d5202e1b3d14821bc152fec32aa180"
@@ -6791,12 +6873,12 @@ timeout-signal@^2.0.0:
   integrity sha512-YBGpG4bWsHoPvofT6y/5iqulfXIiIErl5B0LdtHT1mGXDFTAhhRrbUpTvBgYbovr+3cKblya2WAOcpoy90XguA==
 
 tinyglobby@^0.2.13, tinyglobby@^0.2.15:
-  version "0.2.15"
-  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.15.tgz#e228dd1e638cea993d2fdb4fcd2d4602a79951c2"
-  integrity sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==
+  version "0.2.16"
+  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.16.tgz#1c3b7eb953fce42b226bc5a1ee06428281aff3d6"
+  integrity sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==
   dependencies:
     fdir "^6.5.0"
-    picomatch "^4.0.3"
+    picomatch "^4.0.4"
 
 title-case@^3.0.3:
   version "3.0.3"
@@ -6827,15 +6909,15 @@ treeify@^1.1.0:
   resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8"
   integrity sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==
 
-ts-api-utils@^2.4.0:
+ts-api-utils@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.5.0.tgz#4acd4a155e22734990a5ed1fe9e97f113bcb37c1"
   integrity sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==
 
-ts-log@^2.2.3:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.7.tgz#4f4512144898b77c9984e91587076fcb8518688e"
-  integrity sha512-320x5Ggei84AxzlXp91QkIGSw5wgaLT6GeAH0KsqDmRZdVWW2OiSeVvElVoatk3f7nicwXlElXsoFkARiGE2yg==
+ts-log@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-3.0.2.tgz#e37ebc147c63f1ad3de1bee903c26831fd35f9cb"
+  integrity sha512-esq6hx2lM66sQV1YcFkIYTqrWWabmqBqobKHyn1CswdI5FgfQhkmiKiRWVGBNlIbdjBxEIkNvMIwLKKPgRYZLQ==
 
 ts-node@^10.9.1:
   version "10.9.2"
@@ -6866,16 +6948,11 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.3, tslib@^2.8.0, tslib@^2.8.1:
+tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.3, tslib@^2.8.0, tslib@^2.8.1, tslib@~2.8.0:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
 
-tslib@~2.6.0:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
-  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -6939,19 +7016,19 @@ typed-array-length@^1.0.7:
     reflect.getprototypeof "^1.0.6"
 
 typescript-eslint@^8.46.0:
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.57.1.tgz#573f97d3e48bbb67290b47dde1b7cb3b5d01dc4f"
-  integrity sha512-fLvZWf+cAGw3tqMCYzGIU6yR8K+Y9NT2z23RwOjlNFF2HwSB3KhdEFI5lSBv8tNmFkkBShSjsCjzx1vahZfISA==
+  version "8.59.4"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.59.4.tgz#834e3b53f4d1a764a985ceb8592c4a95d6a8da7c"
+  integrity sha512-Rw6+44QNFaXtgHSjPy+Kw8hrJniMYzR85E9yLmOLcfZ91/rz+JXQbDTCmc6ccxMPY6K6PgAq26f0JCBfR7LIPQ==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "8.57.1"
-    "@typescript-eslint/parser" "8.57.1"
-    "@typescript-eslint/typescript-estree" "8.57.1"
-    "@typescript-eslint/utils" "8.57.1"
+    "@typescript-eslint/eslint-plugin" "8.59.4"
+    "@typescript-eslint/parser" "8.59.4"
+    "@typescript-eslint/typescript-estree" "8.59.4"
+    "@typescript-eslint/utils" "8.59.4"
 
-typescript@^5.0.4:
-  version "5.9.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
-  integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==
+typescript@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.3.tgz#90251dc007916e972786cb94d74d15b185577d21"
+  integrity sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==
 
 unbox-primitive@^1.1.0:
   version "1.1.0"
@@ -6968,22 +7045,22 @@ unc-path-regex@^0.1.2:
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
   integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
 
+"undici-types@>=7.24.0 <7.24.7":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.24.6.tgz#61275b485d7fd4e9d269c7cf04ec2873c9cc0f91"
+  integrity sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==
+
 undici-types@~7.16.0:
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46"
   integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==
 
-undici-types@~7.18.0:
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.18.2.tgz#29357a89e7b7ca4aef3bf0fd3fd0cd73884229e9"
-  integrity sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==
-
 universal-cookie@^8.0.0:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/universal-cookie/-/universal-cookie-8.0.1.tgz#19263fcda6889978a081c610a90fc395eeaeec64"
-  integrity sha512-B6ks9FLLnP1UbPPcveOidfvB9pHjP+wekP2uRYB9YDfKVpvcjKgy1W5Zj+cEXJ9KTPnqOKGfVDQBmn8/YCQfRg==
+  version "8.1.2"
+  resolved "https://registry.yarnpkg.com/universal-cookie/-/universal-cookie-8.1.2.tgz#2faf7fb206575e658d5bfb999021b7f5fed81cf5"
+  integrity sha512-kcKzTGNsxVytujrYOvQbvh//QyFrA53HrzCGyzh6i9ujCww5gfPrLK0tG+jJD40SIIldiEjBNPPSR8fBMS21GA==
   dependencies:
-    cookie "^1.0.2"
+    cookie "^1.1.1"
 
 unixify@^1.0.0:
   version "1.0.0"
@@ -6993,33 +7070,34 @@ unixify@^1.0.0:
     normalize-path "^2.1.1"
 
 unrs-resolver@^1.6.2, unrs-resolver@^1.7.11:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/unrs-resolver/-/unrs-resolver-1.11.1.tgz#be9cd8686c99ef53ecb96df2a473c64d304048a9"
-  integrity sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/unrs-resolver/-/unrs-resolver-1.12.1.tgz#a5322b37be7119528b9742ead43101b4f5c2d4e9"
+  integrity sha512-LmOTmcBbFqxu1rzubnqHT6EZeqDYpenlGYwyFhHj7oc1HdyZE+0cLQ+s9SDSK+KKQQKuoJhUbzHQ89Ubwg2Oxg==
   dependencies:
-    napi-postinstall "^0.3.0"
+    napi-postinstall "^0.3.4"
   optionalDependencies:
-    "@unrs/resolver-binding-android-arm-eabi" "1.11.1"
-    "@unrs/resolver-binding-android-arm64" "1.11.1"
-    "@unrs/resolver-binding-darwin-arm64" "1.11.1"
-    "@unrs/resolver-binding-darwin-x64" "1.11.1"
-    "@unrs/resolver-binding-freebsd-x64" "1.11.1"
-    "@unrs/resolver-binding-linux-arm-gnueabihf" "1.11.1"
-    "@unrs/resolver-binding-linux-arm-musleabihf" "1.11.1"
-    "@unrs/resolver-binding-linux-arm64-gnu" "1.11.1"
-    "@unrs/resolver-binding-linux-arm64-musl" "1.11.1"
-    "@unrs/resolver-binding-linux-ppc64-gnu" "1.11.1"
-    "@unrs/resolver-binding-linux-riscv64-gnu" "1.11.1"
-    "@unrs/resolver-binding-linux-riscv64-musl" "1.11.1"
-    "@unrs/resolver-binding-linux-s390x-gnu" "1.11.1"
-    "@unrs/resolver-binding-linux-x64-gnu" "1.11.1"
-    "@unrs/resolver-binding-linux-x64-musl" "1.11.1"
-    "@unrs/resolver-binding-wasm32-wasi" "1.11.1"
-    "@unrs/resolver-binding-win32-arm64-msvc" "1.11.1"
-    "@unrs/resolver-binding-win32-ia32-msvc" "1.11.1"
-    "@unrs/resolver-binding-win32-x64-msvc" "1.11.1"
-
-update-browserslist-db@^1.2.0:
+    "@unrs/resolver-binding-android-arm-eabi" "1.12.1"
+    "@unrs/resolver-binding-android-arm64" "1.12.1"
+    "@unrs/resolver-binding-darwin-arm64" "1.12.1"
+    "@unrs/resolver-binding-darwin-x64" "1.12.1"
+    "@unrs/resolver-binding-freebsd-x64" "1.12.1"
+    "@unrs/resolver-binding-linux-arm-gnueabihf" "1.12.1"
+    "@unrs/resolver-binding-linux-arm-musleabihf" "1.12.1"
+    "@unrs/resolver-binding-linux-arm64-gnu" "1.12.1"
+    "@unrs/resolver-binding-linux-arm64-musl" "1.12.1"
+    "@unrs/resolver-binding-linux-ppc64-gnu" "1.12.1"
+    "@unrs/resolver-binding-linux-riscv64-gnu" "1.12.1"
+    "@unrs/resolver-binding-linux-riscv64-musl" "1.12.1"
+    "@unrs/resolver-binding-linux-s390x-gnu" "1.12.1"
+    "@unrs/resolver-binding-linux-x64-gnu" "1.12.1"
+    "@unrs/resolver-binding-linux-x64-musl" "1.12.1"
+    "@unrs/resolver-binding-openharmony-arm64" "1.12.1"
+    "@unrs/resolver-binding-wasm32-wasi" "1.12.1"
+    "@unrs/resolver-binding-win32-arm64-msvc" "1.12.1"
+    "@unrs/resolver-binding-win32-ia32-msvc" "1.12.1"
+    "@unrs/resolver-binding-win32-x64-msvc" "1.12.1"
+
+update-browserslist-db@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz#64d76db58713136acbeb4c49114366cc6cc2e80d"
   integrity sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==
@@ -7171,14 +7249,14 @@ word-wrap@^1.2.5:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+wrap-ansi@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-10.0.0.tgz#b83ddcc14dbc5596f1b07e153bf6f863c1acbb57"
+  integrity sha512-SGcvg80f0wUy2/fXES19feHMz8E0JoXv2uNgHOu4Dgi2OrCy1lqwFYEJz1BLbDI0exjPMe/ZdzZ/YpGECBG/aQ==
   dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
+    ansi-styles "^6.2.3"
+    string-width "^8.2.0"
+    strip-ansi "^7.1.2"
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
@@ -7220,10 +7298,10 @@ write-file-atomic@^5.0.1:
     imurmurhash "^0.1.4"
     signal-exit "^4.0.1"
 
-ws@^8.18.3, ws@^8.19.0:
-  version "8.20.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.20.0.tgz#4cd9532358eba60bc863aad1623dfb045a4d4af8"
-  integrity sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==
+ws@^8.18.3, ws@^8.20.0:
+  version "8.20.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.20.1.tgz#91a9ae2b312ccf98e0a85ec499b48cef45ab0ddb"
+  integrity sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==
 
 y18n@^5.0.5:
   version "5.0.8"
@@ -7244,16 +7322,21 @@ yaml-loader@^0.9.0:
     yaml "^2.0.0"
 
 yaml@^2.0.0, yaml@^2.3.1:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.3.tgz#a0d6bd2efb3dd03c59370223701834e60409bd7d"
-  integrity sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.9.0.tgz#78274afd93598a1dfdd6130df6a566defcbf9aa4"
+  integrity sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==
 
 yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs@17.7.2, yargs@^17.0.0, yargs@^17.7.2:
+yargs-parser@^22.0.0:
+  version "22.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-22.0.0.tgz#87b82094051b0567717346ecd00fd14804b357c8"
+  integrity sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==
+
+yargs@17.7.2, yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -7266,6 +7349,18 @@ yargs@17.7.2, yargs@^17.0.0, yargs@^17.7.2:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
+yargs@^18.0.0:
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-18.0.0.tgz#6c84259806273a746b09f579087b68a3c2d25bd1"
+  integrity sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==
+  dependencies:
+    cliui "^9.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    string-width "^7.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^22.0.0"
+
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
@@ -7276,10 +7371,10 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
-yoctocolors-cjs@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/yoctocolors-cjs/-/yoctocolors-cjs-2.1.3.tgz#7e4964ea8ec422b7a40ac917d3a344cfd2304baa"
-  integrity sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw==
+yoctocolors@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yoctocolors/-/yoctocolors-2.1.2.tgz#d795f54d173494e7d8db93150cec0ed7f678c83a"
+  integrity sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==
 
 "zod-validation-error@^3.5.0 || ^4.0.0":
   version "4.0.2"
@@ -7287,6 +7382,6 @@ yoctocolors-cjs@^2.1.3:
   integrity sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==
 
 "zod@^3.25.0 || ^4.0.0":
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/zod/-/zod-4.3.6.tgz#89c56e0aa7d2b05107d894412227087885ab112a"
-  integrity sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-4.4.3.tgz#b680f172885d18bbebf21a834ea25e55a1bbf356"
+  integrity sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==

From beaad700fe85a606de7cb8a9f85a1c7f61dcf870 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 19 May 2026 14:56:28 +0200
Subject: [PATCH 048/145] Return to original page when logging in and show
 navigation items in single-sign-on layout depending on context

---
 .../Controllers/AuthenticationController.cs   |  16 +--
 frontend/components/CopyableBlock.tsx         |  11 +-
 frontend/components/Layout.tsx                |  29 +++--
 frontend/components/NavBar.tsx                | 111 +++++++++++++-----
 frontend/components/SingleSignOnLayout.tsx    |  11 +-
 frontend/components/UnauthenticatedResult.tsx |  11 +-
 frontend/pages/users/confirm-email-change.tsx |  11 +-
 frontend/paths.ts                             |   1 +
 8 files changed, 142 insertions(+), 59 deletions(-)

diff --git a/backend/src/Controllers/AuthenticationController.cs b/backend/src/Controllers/AuthenticationController.cs
index f61d69453..313ae9494 100644
--- a/backend/src/Controllers/AuthenticationController.cs
+++ b/backend/src/Controllers/AuthenticationController.cs
@@ -27,7 +27,7 @@ AppSettings appSettings
     private readonly Uri _issuer = appSettings.Uri;
 
     [HttpGet("~/connect/client/login")]
-    public ActionResult LogIn(string? returnUrl)
+    public ActionResult LogIn(string? returnTo)
     {
         // Ask the OpenIddict client middleware to redirect the user agent to the identity provider.
         return Challenge(
@@ -41,7 +41,7 @@ public ActionResult LogIn(string? returnUrl)
             )
             {
                 // Only allow local return URLs to prevent open redirect attacks.
-                RedirectUri = SanitizeReturnUrl(returnUrl)
+                RedirectUri = SanitizeReturnUrl(returnTo)
             },
             OpenIddictClientAspNetCoreDefaults.AuthenticationScheme
         );
@@ -50,7 +50,7 @@ public ActionResult LogIn(string? returnUrl)
     [HttpPost("~/connect/client/logout")]
     [Authorize(AuthenticationSchemes = AuthenticationConstants.IdentityAndCookieAndBearerTokenAuthenticationScheme)]
     [RequireAntiforgeryToken]
-    public async Task<ActionResult> LogOut(string? returnUrl)
+    public async Task<ActionResult> LogOut(string? returnTo)
     {
         // Retrieve the identity stored in the local authentication cookie. If it's not available,
         // this indicate that the user is already logged out locally (or has not logged in yet).
@@ -59,7 +59,7 @@ public async Task<ActionResult> LogOut(string? returnUrl)
         {
             // Only allow local return URLs to prevent open redirect attacks.
             // https://learn.microsoft.com/en-us/aspnet/core/security/preventing-open-redirects
-            return LocalRedirect(SanitizeReturnUrl(returnUrl));
+            return LocalRedirect(SanitizeReturnUrl(returnTo));
         }
 
         // Remove the local authentication cookie before triggering a redirection to the remote server.
@@ -79,7 +79,7 @@ public async Task<ActionResult> LogOut(string? returnUrl)
             )
             {
                 // Only allow local return URLs to prevent open redirect attacks.
-                RedirectUri = SanitizeReturnUrl(returnUrl)
+                RedirectUri = SanitizeReturnUrl(returnTo)
             },
             OpenIddictClientAspNetCoreDefaults.AuthenticationScheme
         );
@@ -239,11 +239,11 @@ public async Task<ActionResult> LogOutCallback(string provider)
         );
     }
 
-    private string SanitizeReturnUrl(string? returnUrl)
+    private string SanitizeReturnUrl(string? returnTo)
     {
         return
-            returnUrl is not null && Url.IsLocalUrl(returnUrl)
-                ? returnUrl
+            returnTo is not null && Url.IsLocalUrl(returnTo)
+                ? returnTo
                 : "/";
     }
 }
\ No newline at end of file
diff --git a/frontend/components/CopyableBlock.tsx b/frontend/components/CopyableBlock.tsx
index fabb29b5b..edc69062f 100644
--- a/frontend/components/CopyableBlock.tsx
+++ b/frontend/components/CopyableBlock.tsx
@@ -22,7 +22,16 @@ export default function CopyableBlock({
     >
       {children}
       <Button
-        style={{ position: "absolute", right: 0, bottom: 0, color: color }}
+        style={{
+          position: "absolute",
+          right: 0,
+          bottom: 0,
+          color: color,
+          backgroundColor:
+            color == "white"
+              ? "rgba(0, 0, 0, 0.7)"
+              : "rgba(255, 255, 255, 0.7)",
+        }}
         type="text"
         icon={
           copied ? (
diff --git a/frontend/components/Layout.tsx b/frontend/components/Layout.tsx
index f25f14bf4..e83468d00 100644
--- a/frontend/components/Layout.tsx
+++ b/frontend/components/Layout.tsx
@@ -75,7 +75,7 @@ const navItems = [
 
 interface LayoutProps {
   pageTitles?: string[];
-  hideNav?: boolean;
+  onlyUserOrLoginItems?: boolean;
   children?: ReactNode;
 }
 
@@ -84,7 +84,7 @@ const cookieConsentValue = "yes";
 
 export default function Layout({
   pageTitles = [],
-  hideNav = false,
+  onlyUserOrLoginItems = false,
   children,
 }: LayoutProps) {
   const appTitle = "Building Envelope Data";
@@ -120,19 +120,18 @@ export default function Layout({
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <meta charSet="utf-8" />
       </Head>
-      {!hideNav && (
-        <AntLayout.Header>
-          <Flex justify="center">
-            <NavBar
-              items={navItems}
-              style={{
-                width: "100%",
-                maxWidth: 1024,
-              }}
-            />
-          </Flex>
-        </AntLayout.Header>
-      )}
+      <AntLayout.Header>
+        <Flex justify="center">
+          <NavBar
+            items={navItems}
+            onlyUserOrLoginItems={onlyUserOrLoginItems}
+            style={{
+              width: onlyUserOrLoginItems ? "max-content" : "100%",
+              maxWidth: 1024,
+            }}
+          />
+        </Flex>
+      </AntLayout.Header>
       <AntLayout.Content
         style={{
           paddingTop: "24px",
diff --git a/frontend/components/NavBar.tsx b/frontend/components/NavBar.tsx
index 5be7e8baf..f93761616 100644
--- a/frontend/components/NavBar.tsx
+++ b/frontend/components/NavBar.tsx
@@ -13,27 +13,63 @@ import type { Route } from "next";
 import { isTruthy } from "../lib/array";
 import { CSSProperties, useMemo } from "react";
 
-const userLoadingItem = {
+const firstUserOrLoginItemStyle = (alignRight: boolean) =>
+  alignRight ? { marginLeft: "auto" } : undefined;
+
+const userLoadingItem = (alignRight: boolean) => ({
   key: paths.openIdConnect,
-  style: { marginLeft: "auto" },
+  style: firstUserOrLoginItemStyle(alignRight),
   label: (
     <Spin indicator={<LoadingOutlined style={{ color: "white" }} spin />} />
   ),
-};
+});
 
-const loginOrRegisterItems = [
+export const loginOrRegisterItems = (
+  returnTo: string | string[] | undefined,
+  alignRight: boolean,
+) => [
   {
     key: paths.openIdConnectClientLogin,
-    style: { marginLeft: "auto" },
-    label: <Link href={paths.openIdConnectClientLogin}>Login</Link>,
+    style: firstUserOrLoginItemStyle(alignRight),
+    label: (
+      <Link
+        href={{
+          pathname: paths.openIdConnectClientLogin,
+          query: returnTo
+            ? { returnTo: returnTo }
+            : window.location.pathname != paths.openIdConnectClientLogin &&
+                window.location.pathname != paths.userLogin
+              ? { returnTo: window.location.pathname }
+              : null,
+        }}
+      >
+        Login
+      </Link>
+    ),
   },
   {
     key: paths.userRegister,
-    label: <Link href={paths.userRegister}>Register</Link>,
+    label: (
+      <Link
+        href={{
+          pathname: paths.userRegister,
+          query: returnTo
+            ? { returnTo: returnTo }
+            : window.location.pathname != paths.userRegister
+              ? { returnTo: window.location.pathname }
+              : null,
+        }}
+      >
+        Register
+      </Link>
+    ),
   },
 ];
 
-const userItems = (currentUser: CurrentUserPartialFragment) =>
+const userItems = (
+  currentUser: CurrentUserPartialFragment,
+  alignRight: boolean,
+) =>
   [
     currentUser?.isAuthorizedToManageOpenIdConnect && {
       key: paths.openIdConnect,
@@ -43,7 +79,7 @@ const userItems = (currentUser: CurrentUserPartialFragment) =>
       key: paths.me.manage.home,
       label: currentUser.name,
       icon: <UserOutlined />,
-      style: { marginLeft: "auto" },
+      style: firstUserOrLoginItemStyle(alignRight),
       children: [
         {
           key: paths.user(currentUser.uuid),
@@ -70,6 +106,13 @@ const userItems = (currentUser: CurrentUserPartialFragment) =>
                     : ""
                 }
               />
+              <input
+                name="returnTo"
+                type="hidden"
+                value={
+                  typeof window !== "undefined" ? window.location.pathname : ""
+                }
+              />
               <Button type="primary" htmlType="submit">
                 Logout
               </Button>
@@ -90,42 +133,50 @@ type NavItemProps =
 
 interface NavBarProps {
   items: NavItemProps[];
+  onlyUserOrLoginItems?: boolean;
   style?: CSSProperties;
 }
 
-export default function NavBar({ items, style }: NavBarProps) {
+export default function NavBar({
+  items,
+  onlyUserOrLoginItems = false,
+  style,
+}: NavBarProps) {
   const router = useRouter();
+  const returnTo = router.query.returnTo;
   const { loading, data } = useQuery(CurrentUserDocument);
   const currentUser = data?.currentUser;
 
   const mainItems = useMemo(
     () =>
-      items.map((item) =>
-        item.subitems === null
-          ? {
-              key: item.path,
-              label: <Link href={item.path}>{item.label}</Link>,
-            }
-          : {
-              key: item.label,
-              label: item.label,
-              children: item.subitems.map((subitem) => ({
-                key: subitem.path,
-                label: <Link href={subitem.path}>{subitem.label}</Link>,
-              })),
-            },
-      ),
-    [items],
+      onlyUserOrLoginItems
+        ? []
+        : items.map((item) =>
+            item.subitems === null
+              ? {
+                  key: item.path,
+                  label: <Link href={item.path}>{item.label}</Link>,
+                }
+              : {
+                  key: item.label,
+                  label: item.label,
+                  children: item.subitems.map((subitem) => ({
+                    key: subitem.path,
+                    label: <Link href={subitem.path}>{subitem.label}</Link>,
+                  })),
+                },
+          ),
+    [items, onlyUserOrLoginItems],
   );
 
   const userOrLoginItems = useMemo(
     () =>
       loading
-        ? [userLoadingItem]
+        ? [userLoadingItem(!onlyUserOrLoginItems)]
         : currentUser
-          ? userItems(currentUser)
-          : loginOrRegisterItems,
-    [loading, userLoadingItem, currentUser, loginOrRegisterItems],
+          ? userItems(currentUser, !onlyUserOrLoginItems)
+          : loginOrRegisterItems(returnTo, !onlyUserOrLoginItems),
+    [loading, currentUser, onlyUserOrLoginItems],
   );
 
   return (
diff --git a/frontend/components/SingleSignOnLayout.tsx b/frontend/components/SingleSignOnLayout.tsx
index 76695b6ab..ce340dadf 100644
--- a/frontend/components/SingleSignOnLayout.tsx
+++ b/frontend/components/SingleSignOnLayout.tsx
@@ -1,6 +1,7 @@
 import { ReactNode } from "react";
 import Layout from "./Layout";
 import { Flex } from "antd";
+import { useRouter } from "next/router";
 
 interface SingleSignOnLayoutProps {
   children?: ReactNode;
@@ -9,8 +10,16 @@ interface SingleSignOnLayoutProps {
 export default function SingleSignOnLayout({
   children,
 }: SingleSignOnLayoutProps) {
+  const router = useRouter();
+  const returnTo = router.query.returnTo?.toString();
+  const clientIdMatch = returnTo?.match(/[?&]client_id=([^&]+)/);
+  const clientId = clientIdMatch?.[1];
+
   return (
-    <Layout hideNav pageTitles={["Single-Sign On"]}>
+    <Layout
+      onlyUserOrLoginItems={clientId != "metabase"}
+      pageTitles={["Single-Sign On"]}
+    >
       <Flex justify="center">{children}</Flex>
     </Layout>
   );
diff --git a/frontend/components/UnauthenticatedResult.tsx b/frontend/components/UnauthenticatedResult.tsx
index e3d596a7f..bbba97063 100644
--- a/frontend/components/UnauthenticatedResult.tsx
+++ b/frontend/components/UnauthenticatedResult.tsx
@@ -8,7 +8,16 @@ export default function UnauthenticatedResult() {
       status="403"
       title="401"
       subTitle="Sorry, you need to be logged in to access this page."
-      extra={<Link href={paths.openIdConnectClientLogin}>Login</Link>}
+      extra={
+        <Link
+          href={{
+            pathname: paths.openIdConnectClientLogin,
+            query: { returnTo: window.location.pathname },
+          }}
+        >
+          Login
+        </Link>
+      }
     />
   );
 }
diff --git a/frontend/pages/users/confirm-email-change.tsx b/frontend/pages/users/confirm-email-change.tsx
index e3534cfa5..712920010 100644
--- a/frontend/pages/users/confirm-email-change.tsx
+++ b/frontend/pages/users/confirm-email-change.tsx
@@ -12,7 +12,7 @@ import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 
 function Page() {
   const router = useRouter();
-  const { currentEmail, newEmail, confirmationCode } = router.query;
+  const { currentEmail, newEmail, confirmationCode, returnTo } = router.query;
   const { message } = App.useApp();
   const hasCalledMutation = useRef(false);
 
@@ -53,7 +53,10 @@ function Page() {
           onSuccess: () => {
             message.success("Email address change confirmed!");
             // TODO Only redirect to login page when user is currently logged out. Otherwise redirect to manage account page?
-            return router.push(paths.openIdConnectClientLogin);
+            return router.push({
+              pathname: paths.openIdConnectClientLogin,
+              query: returnTo ? { returnTo: returnTo } : null,
+            });
           },
           onError: messageErrors,
         },
@@ -73,7 +76,9 @@ function Page() {
 
   return (
     <Layout>
-      <Typography.Paragraph style={{ maxWidth: "75ch" }}>Confirming email change ...</Typography.Paragraph>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        Confirming email change ...
+      </Typography.Paragraph>
     </Layout>
   );
 }
diff --git a/frontend/paths.ts b/frontend/paths.ts
index fca0bf77e..6a74ea4b3 100644
--- a/frontend/paths.ts
+++ b/frontend/paths.ts
@@ -34,6 +34,7 @@ export default {
   personalUserData: "/personal-user-data" as Route,
   userRegister: "/users/register" as Route,
   userForgotPassword: "/users/forgot-password" as Route,
+  userLogin: "/users/login" as Route,
   userLoginWithTwoFactorCode: "/users/login/with-two-factor-code" as Route,
   userLoginWithRecoveryCode: "/users/login/with-recovery-code" as Route,
   userResendEmailConfirmation: "/users/resend-email-confirmation" as Route,

From d360527c59556f0374c9a8af8a354e7a8d037377 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 20 May 2026 17:09:54 +0200
Subject: [PATCH 049/145] Use `is 0` instead of `== 0`, use static were no
 instance data is used, add string extensions to encode and decode base64
 (yes, I know these should be separate commits ...)

---
 .../OpenIdConnectAuthorization.cs             |  4 ++--
 .../src/Configuration/AuthConfiguration.cs    |  6 +++--
 backend/src/Data/ApplicationDbContext.cs      |  5 ++++-
 backend/src/Extensions/StringExtensions.cs    | 22 +++++++++++++++++++
 .../GraphQl/Associations/AssociationType.cs   |  1 +
 backend/src/GraphQl/DataX/Data.cs             |  5 +----
 .../Entities/AuditableEntityFilterType.cs     |  1 +
 backend/src/GraphQl/Entities/EntityType.cs    |  1 +
 .../Extensions/ResolverContextExtensions.cs   |  1 -
 .../GraphQl/Filters/ScalarFilterInputTypes.cs |  1 +
 backend/src/GraphQl/Methods/MethodQueries.cs  |  1 -
 .../OpenIdConnectApplicationType.cs           |  3 ++-
 backend/src/GraphQl/PaginationHelpers.cs      | 14 +++---------
 backend/src/GraphQl/Requests/DataQueries.cs   | 11 ++--------
 backend/src/GraphQl/Scalars/MyUriType.cs      |  4 ++--
 .../src/GraphQl/Scalars/NonNegativeIntType.cs |  3 ++-
 backend/src/GraphQl/Users/UserMutations.cs    |  2 +-
 backend/src/GraphQl/Users/UserType.cs         |  7 +++---
 frontend/tsconfig.json                        | 18 +++++++++++----
 19 files changed, 66 insertions(+), 44 deletions(-)

diff --git a/backend/src/Authorization/OpenIdConnectAuthorization.cs b/backend/src/Authorization/OpenIdConnectAuthorization.cs
index c9509e330..806d56c3d 100644
--- a/backend/src/Authorization/OpenIdConnectAuthorization.cs
+++ b/backend/src/Authorization/OpenIdConnectAuthorization.cs
@@ -144,7 +144,7 @@ CancellationToken cancellationToken
             : [GraphQl.OpenIdConnect.Applications.OpenIdConnectConsentType.EXPLICIT];
     }
 
-    internal async Task<IReadOnlyList<GraphQl.OpenIdConnect.Applications.OpenIdConnectEndpoint>> AuthorizedEndpoints(
+    internal static async Task<IReadOnlyList<GraphQl.OpenIdConnect.Applications.OpenIdConnectEndpoint>> AuthorizedEndpoints(
         ClaimsPrincipal claimsPrincipal,
         CancellationToken cancellationToken
     )
@@ -167,7 +167,7 @@ CancellationToken cancellationToken
                 .AsReadOnly();
     }
 
-    internal async Task<IReadOnlyList<GraphQl.OpenIdConnect.Applications.OpenIdConnectResponseType>> AuthorizedResponseTypes(
+    internal static async Task<IReadOnlyList<GraphQl.OpenIdConnect.Applications.OpenIdConnectResponseType>> AuthorizedResponseTypes(
         ClaimsPrincipal claimsPrincipal,
         CancellationToken cancellationToken
     )
diff --git a/backend/src/Configuration/AuthConfiguration.cs b/backend/src/Configuration/AuthConfiguration.cs
index 2c1290a99..612bd408f 100644
--- a/backend/src/Configuration/AuthConfiguration.cs
+++ b/backend/src/Configuration/AuthConfiguration.cs
@@ -53,7 +53,7 @@ private static void BootstrapCertificates(IClock clock)
                     distinguishedName,
                     validOnly: true
                 );
-                if (certificates.Count == 0)
+                if (certificates.Count is 0)
                 {
                     store.Add(
                         JwtSigningAndEncryptionCertificateRotationJob.CreateSigningCertificate(
@@ -73,7 +73,7 @@ private static void BootstrapCertificates(IClock clock)
                     distinguishedName,
                     validOnly: true
                 );
-                if (certificates.Count == 0)
+                if (certificates.Count is 0)
                 {
                     store.Add(
                         JwtSigningAndEncryptionCertificateRotationJob.CreateEncryptionCertificate(
@@ -483,6 +483,8 @@ AppSettings appSettings
             // Register the OpenIddict validation components.
             .AddValidation(_ =>
             {
+                // The validation handler uses OpenID Connect discovery to
+                // retrieve the issuer signing keys used to validate tokens.
                 _.SetIssuer(appSettings.Uri);
                 // Configure the audience accepted by this resource server.
                 _.AddAudiences(OpenIdConnectConstants.Client.MetabaseClientId);
diff --git a/backend/src/Data/ApplicationDbContext.cs b/backend/src/Data/ApplicationDbContext.cs
index ab3866238..8d1211e61 100644
--- a/backend/src/Data/ApplicationDbContext.cs
+++ b/backend/src/Data/ApplicationDbContext.cs
@@ -147,7 +147,10 @@ private void UpdateTimestamps()
             switch (entry.State)
             {
                 case EntityState.Added:
-                    entry.Entity.CreatedAt = now;
+                    if (entry.Entity.CreatedAt == default)
+                    {
+                        entry.Entity.CreatedAt = now;
+                    }
                     entry.Entity.UpdatedAt = now;
                     break;
                 case EntityState.Modified:
diff --git a/backend/src/Extensions/StringExtensions.cs b/backend/src/Extensions/StringExtensions.cs
index 51cd17f58..c915ff80b 100644
--- a/backend/src/Extensions/StringExtensions.cs
+++ b/backend/src/Extensions/StringExtensions.cs
@@ -1,3 +1,6 @@
+using System;
+using System.Text;
+
 namespace Metabase.Extensions;
 
 public static class StringExtensions
@@ -16,4 +19,23 @@ public static string FirstCharToLower(this string value)
 
     public static string? NullIfWhitespace(this string value)
         => string.IsNullOrWhiteSpace(value) ? null : value;
+
+    public static string Base64Encode(this string plainText)
+    {
+        return Convert.ToBase64String(
+            Encoding.UTF8.GetBytes(plainText)
+        );
+    }
+
+    public static string Base64Decode(this string base64EncodedData)
+    {
+        return Encoding.UTF8.GetString(
+            Convert.FromBase64String(base64EncodedData)
+        );
+    }
+
+    public static string Enquote(this string str)
+    {
+        return "\"" + str + "\"";
+    }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Associations/AssociationType.cs b/backend/src/GraphQl/Associations/AssociationType.cs
index 206336393..dc28a194e 100644
--- a/backend/src/GraphQl/Associations/AssociationType.cs
+++ b/backend/src/GraphQl/Associations/AssociationType.cs
@@ -1,5 +1,6 @@
 using HotChocolate.Types;
 using Metabase.Data;
+using Metabase.GraphQl.Scalars;
 
 namespace Metabase.GraphQl.Associations;
 
diff --git a/backend/src/GraphQl/DataX/Data.cs b/backend/src/GraphQl/DataX/Data.cs
index 8e8beb5f6..fe0b9f8c1 100644
--- a/backend/src/GraphQl/DataX/Data.cs
+++ b/backend/src/GraphQl/DataX/Data.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -70,9 +69,7 @@ CancellationToken cancellationToken
     }
 
     [ID]
-    public string Id => Convert.ToBase64String(
-        Encoding.UTF8.GetBytes($"{DatabaseId}:{Uuid}:{Locale ?? ""}:{DataId}")
-    );
+    public string Id => $"{DatabaseId}:{Uuid}:{Locale ?? ""}:{DataId}".Base64Encode();
 
     public abstract DataKind Kind { get; }
 
diff --git a/backend/src/GraphQl/Entities/AuditableEntityFilterType.cs b/backend/src/GraphQl/Entities/AuditableEntityFilterType.cs
index 093748032..e6fbf4d46 100644
--- a/backend/src/GraphQl/Entities/AuditableEntityFilterType.cs
+++ b/backend/src/GraphQl/Entities/AuditableEntityFilterType.cs
@@ -15,5 +15,6 @@ IFilterInputTypeDescriptor<TEntity> descriptor
         descriptor.Field(x => x.Id);
         descriptor.Field(x => x.CreatedAt);
         descriptor.Field(x => x.UpdatedAt);
+        // TODO Do we want to filter by: descriptor.Field(x => x.Version);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Entities/EntityType.cs b/backend/src/GraphQl/Entities/EntityType.cs
index d87af8132..0afd3506c 100644
--- a/backend/src/GraphQl/Entities/EntityType.cs
+++ b/backend/src/GraphQl/Entities/EntityType.cs
@@ -2,6 +2,7 @@
 using GreenDonut;
 using HotChocolate.Types;
 using Metabase.Data;
+using Metabase.GraphQl.Scalars;
 
 namespace Metabase.GraphQl.Entities;
 
diff --git a/backend/src/GraphQl/Extensions/ResolverContextExtensions.cs b/backend/src/GraphQl/Extensions/ResolverContextExtensions.cs
index 49b2a5ba6..a373f2ae4 100644
--- a/backend/src/GraphQl/Extensions/ResolverContextExtensions.cs
+++ b/backend/src/GraphQl/Extensions/ResolverContextExtensions.cs
@@ -1,5 +1,4 @@
 using GreenDonut.Data;
-using HotChocolate;
 using HotChocolate.Data.Filters;
 using HotChocolate.Data.Sorting;
 using HotChocolate.Resolvers;
diff --git a/backend/src/GraphQl/Filters/ScalarFilterInputTypes.cs b/backend/src/GraphQl/Filters/ScalarFilterInputTypes.cs
index 587d362fc..13d45c12d 100644
--- a/backend/src/GraphQl/Filters/ScalarFilterInputTypes.cs
+++ b/backend/src/GraphQl/Filters/ScalarFilterInputTypes.cs
@@ -1,5 +1,6 @@
 using HotChocolate.Data.Filters;
 using HotChocolate.Types;
+using Metabase.GraphQl.Scalars;
 using DateTimeType = HotChocolate.Types.NodaTime.DateTimeType;
 using DurationType = HotChocolate.Types.NodaTime.DurationType;
 using LocalDateTimeType = HotChocolate.Types.NodaTime.LocalDateTimeType;
diff --git a/backend/src/GraphQl/Methods/MethodQueries.cs b/backend/src/GraphQl/Methods/MethodQueries.cs
index 0f22c3e4e..72a02d2e6 100644
--- a/backend/src/GraphQl/Methods/MethodQueries.cs
+++ b/backend/src/GraphQl/Methods/MethodQueries.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using GreenDonut.Data;
 using HotChocolate.Data;
-using HotChocolate.Data.Sorting;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
index d082427d3..5a1ef8cc0 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
@@ -10,6 +10,7 @@
 using Metabase.Data.OpenIdConnect;
 using Metabase.GraphQl.Users;
 using Metabase.GraphQl.Entities;
+using Metabase.GraphQl.Scalars;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
@@ -228,7 +229,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
         }
         var uris = JsonSerializer.Deserialize<List<string>>(urisJson)
             ?? throw new GraphQLException($"Could not deserialize `{urisJson}` into a list of strings.");
-        if (uris.Count == 0)
+        if (uris.Count is 0)
         {
             return null;
         }
diff --git a/backend/src/GraphQl/PaginationHelpers.cs b/backend/src/GraphQl/PaginationHelpers.cs
index 0d02b7dc5..708bfbb1e 100644
--- a/backend/src/GraphQl/PaginationHelpers.cs
+++ b/backend/src/GraphQl/PaginationHelpers.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Text;
+using Metabase.Extensions;
 
 namespace Metabase.GraphQl;
 
@@ -7,19 +7,11 @@ public static class PaginationHelpers
 {
     public static string ConstructCursor(Guid id)
     {
-        return Convert.ToBase64String(
-            Encoding.UTF8.GetBytes(
-                id.ToString("D")
-            )
-        );
+        return id.ToString("D").Base64Encode();
     }
 
     public static string ConstructCursor(Guid id1, Guid id2)
     {
-        return Convert.ToBase64String(
-            Encoding.UTF8.GetBytes(
-                $"{id1:D}:{id2:D}"
-            )
-        );
+        return $"{id1:D}:{id2:D}".Base64Encode();
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Requests/DataQueries.cs b/backend/src/GraphQl/Requests/DataQueries.cs
index bdc0990c6..91115b7cb 100644
--- a/backend/src/GraphQl/Requests/DataQueries.cs
+++ b/backend/src/GraphQl/Requests/DataQueries.cs
@@ -17,7 +17,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
-using System.Text;
 using System.Collections.Immutable;
 using System.Linq;
 using HotChocolate.Types.Pagination;
@@ -221,11 +220,7 @@ private sealed record CompoundCursor
 
     private static string SerializeCompoundCursor(CompoundCursor cursor)
     {
-        return Convert.ToBase64String(
-            Encoding.UTF8.GetBytes(
-                JsonSerializer.Serialize(cursor, JsonSerializerSettings.Compact)
-            )
-        );
+        return JsonSerializer.Serialize(cursor, JsonSerializerSettings.Compact).Base64Encode();
     }
 
     private static CompoundCursor? DeserializeCompoundCursor(string? cursors)
@@ -235,9 +230,7 @@ private static string SerializeCompoundCursor(CompoundCursor cursor)
             return null;
         }
         return JsonSerializer.Deserialize<CompoundCursor>(
-            Encoding.UTF8.GetString(
-                Convert.FromBase64String(cursors)
-            ),
+            cursors.Base64Decode(),
             JsonSerializerSettings.Compact
         );
     }
diff --git a/backend/src/GraphQl/Scalars/MyUriType.cs b/backend/src/GraphQl/Scalars/MyUriType.cs
index c2ae572d0..0633b6e86 100644
--- a/backend/src/GraphQl/Scalars/MyUriType.cs
+++ b/backend/src/GraphQl/Scalars/MyUriType.cs
@@ -3,10 +3,10 @@
 using HotChocolate.Features;
 using HotChocolate.Language;
 using HotChocolate.Text.Json;
-using Metabase.GraphQl;
+using HotChocolate.Types;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace HotChocolate.Types;
+namespace Metabase.GraphQl.Scalars;
 
 // Inspired by https://github.com/ChilliCream/graphql-platform/blob/main/src/HotChocolate/Core/src/Types/Types/Scalars/UriType.cs
 /// <summary>
diff --git a/backend/src/GraphQl/Scalars/NonNegativeIntType.cs b/backend/src/GraphQl/Scalars/NonNegativeIntType.cs
index 972a8d191..9bc42972c 100644
--- a/backend/src/GraphQl/Scalars/NonNegativeIntType.cs
+++ b/backend/src/GraphQl/Scalars/NonNegativeIntType.cs
@@ -1,9 +1,10 @@
 using System.Text.Json;
 using HotChocolate.Language;
 using HotChocolate.Text.Json;
+using HotChocolate.Types;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace HotChocolate.Types;
+namespace Metabase.GraphQl.Scalars;
 
 /// <summary>
 /// <para>
diff --git a/backend/src/GraphQl/Users/UserMutations.cs b/backend/src/GraphQl/Users/UserMutations.cs
index 0c0d86ad6..fbe9ebee7 100644
--- a/backend/src/GraphQl/Users/UserMutations.cs
+++ b/backend/src/GraphQl/Users/UserMutations.cs
@@ -1167,7 +1167,7 @@ await userManager.VerifyTwoFactorTokenAsync(
             };
         }
 
-        if (await userManager.CountRecoveryCodesAsync(user) == 0)
+        if (await userManager.CountRecoveryCodesAsync(user) is 0)
         {
             var recoveryCodes =
                 await userManager.GenerateNewTwoFactorRecoveryCodesAsync(user, 10);
diff --git a/backend/src/GraphQl/Users/UserType.cs b/backend/src/GraphQl/Users/UserType.cs
index 10e5a042d..b30fce68b 100644
--- a/backend/src/GraphQl/Users/UserType.cs
+++ b/backend/src/GraphQl/Users/UserType.cs
@@ -214,7 +214,7 @@ await Authorize(context, user => user.WebsiteLocator, Scopes.Profile)
             .Field("authorizedOpenIdConnectResponseTypes")
             .Cost(1)
             .ResolveWith<UserResolvers>(x =>
-                UserResolvers.GetAuthorizedOpenIdConnectResponseTypesAsync(default!, default!, default!))
+                UserResolvers.GetAuthorizedOpenIdConnectResponseTypesAsync(default!, default!))
             .UseUserManager();
         descriptor
             .Field("authorizedOpenIdConnectScopes")
@@ -418,7 +418,7 @@ public static Task<IReadOnlyList<OpenIdConnectEndpoint>> GetAuthorizedOpenIdConn
             CancellationToken cancellationToken
         )
         {
-            return authorization.AuthorizedEndpoints(claimsPrincipal, cancellationToken);
+            return Authorization.OpenIdConnectAuthorization.AuthorizedEndpoints(claimsPrincipal, cancellationToken);
         }
 
         public static Task<IReadOnlyList<OpenIdConnectGrantType>> GetAuthorizedOpenIdConnectGrantTypesAsync(
@@ -432,11 +432,10 @@ CancellationToken cancellationToken
 
         public static Task<IReadOnlyList<OpenIdConnectResponseType>> GetAuthorizedOpenIdConnectResponseTypesAsync(
             ClaimsPrincipal claimsPrincipal,
-            Authorization.OpenIdConnectAuthorization authorization,
             CancellationToken cancellationToken
         )
         {
-            return authorization.AuthorizedResponseTypes(claimsPrincipal, cancellationToken);
+            return Authorization.OpenIdConnectAuthorization.AuthorizedResponseTypes(claimsPrincipal, cancellationToken);
         }
 
         public static Task<IReadOnlyList<GraphQl.OpenIdConnect.OpenIdConnectScope>> GetAuthorizedOpenIdConnectScopesAsync(
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 79f39b3dc..26572294a 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -6,9 +6,12 @@
     "forceConsistentCasingInFileNames": true,
     "isolatedModules": true,
     "jsx": "react-jsx",
-    "lib": ["dom", "es2017"],
+    "lib": [
+      "dom",
+      "es2017"
+    ],
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "noEmit": true,
     "noFallthroughCasesInSwitch": true,
     "noUnusedLocals": true,
@@ -20,6 +23,13 @@
     "incremental": true
     // "verbatimModuleSyntax": true
   },
-  "include": ["next-env.d.ts", ".next/types/**/*.ts", "**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules"]
+  "include": [
+    "next-env.d.ts",
+    ".next/types/**/*.ts",
+    "**/*.ts",
+    "**/*.tsx"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
 }

From b6d89750dc94608220f661e81c3036ec34052a37 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 27 May 2026 15:22:26 +0200
Subject: [PATCH 050/145] Remove unused recaptcha plugin

---
 frontend/package.json | 3 +--
 frontend/yarn.lock    | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 372744ee1..228f39d34 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "v1.1.1",
+  "version": "v2.0.0",
   "private": true,
   "author": "Simon Wacker",
   "license": "MIT",
@@ -24,7 +24,6 @@
     "react": "^19.2.0",
     "react-cookie": "^8.0.1",
     "react-dom": "^19.2.0",
-    "react-google-recaptcha-v3": "^1.0",
     "react-highlight-words": "^0.21.0",
     "rxjs": "^7.8.2",
     "sharp": "^0.34.5"
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 60761e3c8..ee50798b0 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -6068,13 +6068,6 @@ react-dom@^19.2.0:
   dependencies:
     scheduler "^0.27.0"
 
-react-google-recaptcha-v3@^1.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/react-google-recaptcha-v3/-/react-google-recaptcha-v3-1.11.0.tgz#e65ab48f6f30398dd659c2b0f0f893933ac09aea"
-  integrity sha512-kLQqpz/77m8+trpBwzqcxNtvWZYoZ/YO6Vm2cVTHW8hs80BWUfDpC7RDwuAvpswwtSYApWfaSpIDFWAIBNIYxQ==
-  dependencies:
-    hoist-non-react-statics "^3.3.2"
-
 react-highlight-words@^0.21.0:
   version "0.21.0"
   resolved "https://registry.yarnpkg.com/react-highlight-words/-/react-highlight-words-0.21.0.tgz#a109acdf7dc6fac3ed7db82e9cba94e8d65c281c"

From fe38624a8ffc23b27fe0a1e516d372b2b944e6f3 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 27 May 2026 15:22:39 +0200
Subject: [PATCH 051/145] Correct `loading` key

---
 frontend/components/NavBar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/NavBar.tsx b/frontend/components/NavBar.tsx
index f93761616..e3f3a2547 100644
--- a/frontend/components/NavBar.tsx
+++ b/frontend/components/NavBar.tsx
@@ -17,7 +17,7 @@ const firstUserOrLoginItemStyle = (alignRight: boolean) =>
   alignRight ? { marginLeft: "auto" } : undefined;
 
 const userLoadingItem = (alignRight: boolean) => ({
-  key: paths.openIdConnect,
+  key: "userLoading",
   style: firstUserOrLoginItemStyle(alignRight),
   label: (
     <Spin indicator={<LoadingOutlined style={{ color: "white" }} spin />} />

From 2e0b3ccdfa9805739014f887ff365cd634d64cf7 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 27 May 2026 15:23:25 +0200
Subject: [PATCH 052/145] Correct links to pages of individual data entries

---
 frontend/components/data/DataSummary.tsx                  | 8 +++++++-
 .../data/calorimetric/CalorimetricDataSummary.tsx         | 5 ++++-
 .../components/data/geometric/GeometricDataSummary.tsx    | 5 ++++-
 .../data/hygrothermal/HygrothermalDataSummary.tsx         | 5 ++++-
 .../components/data/lifeCycle/LifeCycleDataSummary.tsx    | 5 ++++-
 frontend/components/data/optical/OpticalDataSummary.tsx   | 5 ++++-
 .../data/photovoltaic/PhotovoltaicDataSummary.tsx         | 5 ++++-
 7 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/frontend/components/data/DataSummary.tsx b/frontend/components/data/DataSummary.tsx
index ec84ca6c4..58ce95a75 100644
--- a/frontend/components/data/DataSummary.tsx
+++ b/frontend/components/data/DataSummary.tsx
@@ -26,6 +26,7 @@ import CodeViewer from "../CodeView";
 import AppliedMethodViewer from "../methods/AppliedMethodView";
 import GnuPgKeyLink from "../GnuPgKeyLink";
 import DateTimeX from "../DateTimeX";
+import { Route } from "next";
 
 interface ResourceTreeNode {
   key: string;
@@ -98,9 +99,14 @@ const nameFallback = (id: Scalars["Uuid"]["output"]) => ({
 
 export default function DataSummary({
   entity,
+  route,
   children,
 }: {
   entity: DataPartialFragment;
+  route: (
+    databaseId: Scalars["Uuid"]["output"],
+    id: Scalars["Uuid"]["output"],
+  ) => Route;
   children?: React.ReactNode;
 }) {
   const rootResource = useMemo(
@@ -116,7 +122,7 @@ export default function DataSummary({
   return (
     <EntitySummary
       entity={entity}
-      route={(id) => paths.opticalData(entity.database?.uuid, id)}
+      route={(id) => route(entity.database?.uuid, id)}
       tags={[
         <Tag key="updatedAt" style={{ fontWeight: "normal" }}>
           Updated At <DateTimeX value={entity.timestamp} />
diff --git a/frontend/components/data/calorimetric/CalorimetricDataSummary.tsx b/frontend/components/data/calorimetric/CalorimetricDataSummary.tsx
index 9d512482b..e4fa7a167 100644
--- a/frontend/components/data/calorimetric/CalorimetricDataSummary.tsx
+++ b/frontend/components/data/calorimetric/CalorimetricDataSummary.tsx
@@ -1,4 +1,5 @@
 import { isTruthy } from "../../../lib/array";
+import paths from "../../../paths";
 import { CalorimetricDataPartialFragment } from "../../../queries/data.generated";
 import Float, { Unit } from "../../Float";
 import InlineList from "../../InlineList";
@@ -39,6 +40,8 @@ export default function CalorimetricDataSummary({
   ].filter(isTruthy);
 
   return (
-    <DataSummary entity={entity}>{values.length > 0 && values}</DataSummary>
+    <DataSummary entity={entity} route={paths.calorimetricData}>
+      {values.length > 0 && values}
+    </DataSummary>
   );
 }
diff --git a/frontend/components/data/geometric/GeometricDataSummary.tsx b/frontend/components/data/geometric/GeometricDataSummary.tsx
index 813bee18f..ff7886904 100644
--- a/frontend/components/data/geometric/GeometricDataSummary.tsx
+++ b/frontend/components/data/geometric/GeometricDataSummary.tsx
@@ -1,4 +1,5 @@
 import { isTruthy } from "../../../lib/array";
+import paths from "../../../paths";
 import { GeometricDataPartialFragment } from "../../../queries/data.generated";
 import Float, { Unit } from "../../Float";
 import InlineList from "../../InlineList";
@@ -24,6 +25,8 @@ export default function GeometricDataSummary({
   ].filter(isTruthy);
 
   return (
-    <DataSummary entity={entity}>{values.length > 0 && values}</DataSummary>
+    <DataSummary entity={entity} route={paths.geometricData}>
+      {values.length > 0 && values}
+    </DataSummary>
   );
 }
diff --git a/frontend/components/data/hygrothermal/HygrothermalDataSummary.tsx b/frontend/components/data/hygrothermal/HygrothermalDataSummary.tsx
index ceb47444f..e324692d2 100644
--- a/frontend/components/data/hygrothermal/HygrothermalDataSummary.tsx
+++ b/frontend/components/data/hygrothermal/HygrothermalDataSummary.tsx
@@ -1,4 +1,5 @@
 import { HygrothermalDataPartialFragment } from "../../../queries/data.generated";
+import paths from "../../../paths";
 import DataSummary from "../DataSummary";
 
 export default function HygrothermalDataSummary({
@@ -6,5 +7,7 @@ export default function HygrothermalDataSummary({
 }: {
   entity: HygrothermalDataPartialFragment;
 }) {
-  return <DataSummary entity={entity}></DataSummary>;
+  return (
+    <DataSummary entity={entity} route={paths.hygrothermalData}></DataSummary>
+  );
 }
diff --git a/frontend/components/data/lifeCycle/LifeCycleDataSummary.tsx b/frontend/components/data/lifeCycle/LifeCycleDataSummary.tsx
index 745e15236..e3c975687 100644
--- a/frontend/components/data/lifeCycle/LifeCycleDataSummary.tsx
+++ b/frontend/components/data/lifeCycle/LifeCycleDataSummary.tsx
@@ -1,4 +1,5 @@
 import { LifeCycleDataPartialFragment } from "../../../queries/data.generated";
+import paths from "../../../paths";
 import DataSummary from "../DataSummary";
 
 export default function LifeCycleDataSummary({
@@ -6,5 +7,7 @@ export default function LifeCycleDataSummary({
 }: {
   entity: LifeCycleDataPartialFragment;
 }) {
-  return <DataSummary entity={entity}></DataSummary>;
+  return (
+    <DataSummary entity={entity} route={paths.lifeCycleData}></DataSummary>
+  );
 }
diff --git a/frontend/components/data/optical/OpticalDataSummary.tsx b/frontend/components/data/optical/OpticalDataSummary.tsx
index febf46901..c8abe2bbc 100644
--- a/frontend/components/data/optical/OpticalDataSummary.tsx
+++ b/frontend/components/data/optical/OpticalDataSummary.tsx
@@ -1,4 +1,5 @@
 import { OpticalDataPartialFragment } from "../../../queries/data.generated";
+import paths from "../../../paths";
 import Float, { Unit } from "../../Float";
 import InlineList from "../../InlineList";
 import DataSummary from "../DataSummary";
@@ -98,6 +99,8 @@ export default function OpticalDataSummary({
   ].filter(isTruthy);
 
   return (
-    <DataSummary entity={entity}>{values.length > 0 && values}</DataSummary>
+    <DataSummary entity={entity} route={paths.opticalData}>
+      {values.length > 0 && values}
+    </DataSummary>
   );
 }
diff --git a/frontend/components/data/photovoltaic/PhotovoltaicDataSummary.tsx b/frontend/components/data/photovoltaic/PhotovoltaicDataSummary.tsx
index a4d624ab7..9708a857d 100644
--- a/frontend/components/data/photovoltaic/PhotovoltaicDataSummary.tsx
+++ b/frontend/components/data/photovoltaic/PhotovoltaicDataSummary.tsx
@@ -1,4 +1,5 @@
 import { PhotovoltaicDataPartialFragment } from "../../../queries/data.generated";
+import paths from "../../../paths";
 import DataSummary from "../DataSummary";
 
 export default function PhotovoltaicDataSummary({
@@ -6,5 +7,7 @@ export default function PhotovoltaicDataSummary({
 }: {
   entity: PhotovoltaicDataPartialFragment;
 }) {
-  return <DataSummary entity={entity}></DataSummary>;
+  return (
+    <DataSummary entity={entity} route={paths.photovoltaicData}></DataSummary>
+  );
 }

From aa55401289fc462b8f9ccbdba08ad2229a59a95a Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 27 May 2026 18:14:58 +0200
Subject: [PATCH 053/145] Use mostly the same configuration to generate the
 GraphQL types and the GraphQL queries (in particular, use strict scalars and
 the same scalar mappings)

---
 frontend/codegen.ts | 83 +++++++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 37 deletions(-)

diff --git a/frontend/codegen.ts b/frontend/codegen.ts
index bd13804f5..adbb0ca1b 100644
--- a/frontend/codegen.ts
+++ b/frontend/codegen.ts
@@ -1,5 +1,48 @@
 import type { CodegenConfig } from "@graphql-codegen/cli";
 
+const scalars = {
+  ID: {
+    input: "string",
+    output: "string",
+  },
+  Any: "object",
+  Byte: "number",
+  DateTime: "string",
+  DateTimeZone: "string",
+  Decimal: "string",
+  Duration: "string",
+  LocalDate: "string",
+  LocalDateTime: "string",
+  LocalTime: "string",
+  Locale: "string",
+  Long: "number",
+  NonNegativeInt: "number",
+  Short: "number",
+  TimeSpan: "string",
+  UnsignedByte: "number",
+  Upload: "unknown",
+  Url: "string",
+  Uuid: "string",
+};
+
+// https://the-guild.dev/graphql/codegen/plugins/typescript/typescript
+const graphQlConfig = {
+  avoidOptionals: {
+    // Use `null` for nullable fields instead of optionals
+    field: true,
+    // Allow nullable input fields to remain unspecified
+    inputValue: false,
+  },
+  // Use `unknown` instead of `any` for unconfigured scalars
+  defaultScalarType: "unknown",
+  // ...
+  strictScalars: true,
+  scalars: scalars,
+  useTypeImports: true,
+  // immutableTypes: true,
+  // nullability: true,
+};
+
 const config: CodegenConfig = {
   overwrite: true,
   schema: "./type-defs.graphqls",
@@ -10,9 +53,11 @@ const config: CodegenConfig = {
     // Inspired by https://www.apollographql.com/docs/react/development-testing/graphql-codegen#generating-precompiled-graphql-documents-with-their-type-definitions
     "./__generated__/graphql.ts": {
       plugins: ["typescript"],
+      config: graphQlConfig,
     },
     "./queries/": {
       preset: "near-operation-file",
+      // https://the-guild.dev/graphql/codegen/docs/migration/apollo-tooling#per-operation-file-generation-with-near-operation-file
       presetConfig: {
         // This should be the file generated by the "typescript" plugin above,
         // relative to the directory specified for this configuration
@@ -20,48 +65,12 @@ const config: CodegenConfig = {
       },
       plugins: ["typescript-operations", "typed-document-node"],
       config: {
-        avoidOptionals: {
-          // Use `null` for nullable fields instead of optionals
-          field: true,
-          // Allow nullable input fields to remain unspecified
-          inputValue: false,
-        },
-        // Use `unknown` instead of `any` for unconfigured scalars
-        defaultScalarType: "unknown",
+        ...graphQlConfig,
         // Apollo Client always includes `__typename` fields
         nonOptionalTypename: true,
         // Apollo Client doesn't add the `__typename` field to root types so
         // don't generate a type for the `__typename` for root operation types.
         skipTypeNameForRoot: true,
-        // ...
-        strictScalars: true,
-        scalars: {
-          ID: {
-            input: "string",
-            output: "string",
-          },
-          Any: "object",
-          Byte: "number",
-          DateTime: "string",
-          DateTimeZone: "string",
-          Decimal: "string",
-          Duration: "string",
-          LocalDate: "string",
-          LocalDateTime: "string",
-          LocalTime: "string",
-          Locale: "string",
-          Long: "number",
-          NonNegativeInt: "number",
-          Short: "number",
-          TimeSpan: "string",
-          UnsignedByte: "string",
-          Upload: "unknown",
-          Url: "string",
-          Uuid: "string",
-        },
-        useTypeImports: true,
-        // immutableTypes: true,
-        // nullability: true,
       },
     },
     "./__generated__/fragmentMatcherTypes.ts": {

From 6ba88f6e1cce347451601ea42daadca445beba49 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 27 May 2026 18:37:32 +0200
Subject: [PATCH 054/145] Fix access to static authorization methods

---
 .../Applications/OpenIdConnectApplicationMutations.cs     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
index b7944b601..036e63014 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
@@ -89,7 +89,7 @@ CancellationToken cancellationToken
             );
         }
         var unauthorizedEndpoints = input.Endpoints
-            .Except(await authorization.AuthorizedEndpoints(claimsPrincipal, cancellationToken))
+            .Except(await Authorization.OpenIdConnectAuthorization.AuthorizedEndpoints(claimsPrincipal, cancellationToken))
             .ToList().AsReadOnly();
         if (unauthorizedEndpoints.Count > 0)
         {
@@ -115,7 +115,7 @@ CancellationToken cancellationToken
             );
         }
         var unauthorizedResponseTypes = input.ResponseTypes
-            .Except(await authorization.AuthorizedResponseTypes(claimsPrincipal, cancellationToken))
+            .Except(await Authorization.OpenIdConnectAuthorization.AuthorizedResponseTypes(claimsPrincipal, cancellationToken))
             .ToList().AsReadOnly();
         if (unauthorizedResponseTypes.Count > 0)
         {
@@ -268,7 +268,7 @@ CancellationToken cancellationToken
             );
         }
         var unauthorizedEndpoints = input.Endpoints
-            .Except(await authorization.AuthorizedEndpoints(claimsPrincipal, cancellationToken))
+            .Except(await Authorization.OpenIdConnectAuthorization.AuthorizedEndpoints(claimsPrincipal, cancellationToken))
             .ToList().AsReadOnly();
         if (unauthorizedEndpoints.Count > 0)
         {
@@ -294,7 +294,7 @@ CancellationToken cancellationToken
             );
         }
         var unauthorizedResponseTypes = input.ResponseTypes
-            .Except(await authorization.AuthorizedResponseTypes(claimsPrincipal, cancellationToken))
+            .Except(await Authorization.OpenIdConnectAuthorization.AuthorizedResponseTypes(claimsPrincipal, cancellationToken))
             .ToList().AsReadOnly();
         if (unauthorizedResponseTypes.Count > 0)
         {

From 987f4a079bf5e59dbc31e2504df0634ef035ffb4 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 27 May 2026 18:38:56 +0200
Subject: [PATCH 055/145] Handle undefined query parameter by showing a loading
 skeleton and convert dayjs values explicitly to ISO strings

---
 frontend/components/NavBar.tsx                        |  2 +-
 frontend/components/SingleSignOnLayout.tsx            |  4 ++--
 .../components/components/AddAssembledOfComponent.tsx |  2 +-
 frontend/components/components/AddPartOfComponent.tsx |  2 +-
 frontend/components/components/CreateComponent.tsx    |  4 ++--
 frontend/components/components/UpdateComponent.tsx    |  4 ++--
 .../components/components/UpdateComponentAssembly.tsx |  4 ++--
 frontend/components/data/DataSummary.tsx              |  2 +-
 frontend/components/methods/CreateMethod.tsx          |  8 ++++----
 frontend/components/methods/UpdateMethod.tsx          |  8 ++++----
 frontend/package.json                                 |  2 +-
 frontend/pages/components/[uuid].tsx                  | 11 ++++++++++-
 frontend/pages/data-formats/[uuid].tsx                | 11 ++++++++++-
 frontend/pages/databases/[uuid].tsx                   | 11 ++++++++++-
 .../databases/[uuid]/data/calorimetric/[dataId].tsx   | 11 ++++++++++-
 .../databases/[uuid]/data/geometric/[dataId].tsx      | 11 ++++++++++-
 .../databases/[uuid]/data/hygrothermal/[dataId].tsx   | 11 ++++++++++-
 .../databases/[uuid]/data/life-cycle/[dataId].tsx     | 11 ++++++++++-
 .../pages/databases/[uuid]/data/optical/[dataId].tsx  | 11 ++++++++++-
 .../databases/[uuid]/data/photovoltaic/[dataId].tsx   | 11 ++++++++++-
 frontend/pages/gnupg-keys/[fingerprint].tsx           |  9 +++++++++
 frontend/pages/institutions/[uuid].tsx                | 11 ++++++++++-
 frontend/pages/institutions/index.tsx                 |  4 ++--
 frontend/pages/methods/[uuid].tsx                     | 11 ++++++++++-
 frontend/pages/open-id-connect/application/[uuid].tsx | 11 ++++++++++-
 frontend/pages/users/[uuid].tsx                       | 11 ++++++++++-
 .../check-your-inbox-after-password-reset-request.tsx |  2 +-
 .../users/check-your-inbox-after-registration.tsx     |  2 +-
 ...-your-inbox-after-resending-email-confirmation.tsx |  2 +-
 frontend/pages/users/forgot-password.tsx              |  4 ++--
 frontend/pages/users/login/index.tsx                  |  2 +-
 frontend/pages/users/login/with-recovery-code.tsx     |  2 +-
 frontend/pages/users/login/with-two-factor-code.tsx   |  2 +-
 frontend/pages/users/register.tsx                     |  4 ++--
 frontend/yarn.lock                                    |  7 ++++++-
 35 files changed, 178 insertions(+), 47 deletions(-)

diff --git a/frontend/components/NavBar.tsx b/frontend/components/NavBar.tsx
index e3f3a2547..149085e7a 100644
--- a/frontend/components/NavBar.tsx
+++ b/frontend/components/NavBar.tsx
@@ -143,7 +143,7 @@ export default function NavBar({
   style,
 }: NavBarProps) {
   const router = useRouter();
-  const returnTo = router.query.returnTo;
+  const { returnTo } = router.query;
   const { loading, data } = useQuery(CurrentUserDocument);
   const currentUser = data?.currentUser;
 
diff --git a/frontend/components/SingleSignOnLayout.tsx b/frontend/components/SingleSignOnLayout.tsx
index ce340dadf..a4a5523a8 100644
--- a/frontend/components/SingleSignOnLayout.tsx
+++ b/frontend/components/SingleSignOnLayout.tsx
@@ -11,8 +11,8 @@ export default function SingleSignOnLayout({
   children,
 }: SingleSignOnLayoutProps) {
   const router = useRouter();
-  const returnTo = router.query.returnTo?.toString();
-  const clientIdMatch = returnTo?.match(/[?&]client_id=([^&]+)/);
+  const { returnTo } = router.query;
+  const clientIdMatch = returnTo?.toString()?.match(/[?&]client_id=([^&]+)/);
   const clientId = clientIdMatch?.[1];
 
   return (
diff --git a/frontend/components/components/AddAssembledOfComponent.tsx b/frontend/components/components/AddAssembledOfComponent.tsx
index f7a4e67a9..4ee07a683 100644
--- a/frontend/components/components/AddAssembledOfComponent.tsx
+++ b/frontend/components/components/AddAssembledOfComponent.tsx
@@ -13,7 +13,7 @@ import EnumSelect from "../EnumSelect";
 
 type FormValues = {
   assembledComponentId: Scalars["Uuid"]["input"];
-  index: Scalars["Byte"]["input"] | null | undefined;
+  index: Scalars["UnsignedByte"]["input"] | null | undefined;
   primeSurface: PrimeSurface | null | undefined;
 };
 
diff --git a/frontend/components/components/AddPartOfComponent.tsx b/frontend/components/components/AddPartOfComponent.tsx
index 46b03170c..32bcdc749 100644
--- a/frontend/components/components/AddPartOfComponent.tsx
+++ b/frontend/components/components/AddPartOfComponent.tsx
@@ -13,7 +13,7 @@ import EnumSelect from "../EnumSelect";
 
 type FormValues = {
   partComponentId: Scalars["Uuid"]["input"];
-  index: Scalars["Byte"]["input"] | null | undefined;
+  index: Scalars["UnsignedByte"]["input"] | null | undefined;
   primeSurface: PrimeSurface | null | undefined;
 };
 
diff --git a/frontend/components/components/CreateComponent.tsx b/frontend/components/components/CreateComponent.tsx
index befa23f46..212ac3886 100644
--- a/frontend/components/components/CreateComponent.tsx
+++ b/frontend/components/components/CreateComponent.tsx
@@ -100,8 +100,8 @@ export default function CreateComponent({
               abbreviation: values.abbreviation,
               description: values.description,
               availability: {
-                from: values.availability?.[0],
-                to: values.availability?.[1],
+                from: values.availability?.[0]?.toISOString(),
+                to: values.availability?.[1]?.toISOString(),
               },
               categories: values.categories || [],
               primeSurface: values.primeSurface,
diff --git a/frontend/components/components/UpdateComponent.tsx b/frontend/components/components/UpdateComponent.tsx
index cc75e7fbd..823ca68db 100644
--- a/frontend/components/components/UpdateComponent.tsx
+++ b/frontend/components/components/UpdateComponent.tsx
@@ -81,8 +81,8 @@ export default function UpdateComponent({ component }: UpdateComponentProps) {
               abbreviation: values.abbreviation,
               description: values.description,
               availability: {
-                from: values.availability?.[0],
-                to: values.availability?.[1],
+                from: values.availability?.[0]?.toISOString(),
+                to: values.availability?.[1]?.toISOString(),
               },
               categories: values.categories || [],
               primeSurface: values.primeSurface,
diff --git a/frontend/components/components/UpdateComponentAssembly.tsx b/frontend/components/components/UpdateComponentAssembly.tsx
index 5af7fd967..7f509a0b4 100644
--- a/frontend/components/components/UpdateComponentAssembly.tsx
+++ b/frontend/components/components/UpdateComponentAssembly.tsx
@@ -13,14 +13,14 @@ import EditButton from "../EditButton";
 import EnumSelect from "../EnumSelect";
 
 type FormValues = {
-  index: Scalars["Byte"]["input"] | null | undefined;
+  index: Scalars["UnsignedByte"]["input"] | null | undefined;
   primeSurface: PrimeSurface | null | undefined;
 };
 
 interface UpdateComponentAssemblyProps {
   assembledComponent: { uuid: Scalars["Uuid"]["input"]; name: string };
   partComponent: { uuid: Scalars["Uuid"]["input"]; name: string };
-  index: Scalars["Byte"]["input"] | null | undefined;
+  index: Scalars["UnsignedByte"]["input"] | null | undefined;
   primeSurface: PrimeSurface | null | undefined;
 }
 
diff --git a/frontend/components/data/DataSummary.tsx b/frontend/components/data/DataSummary.tsx
index 58ce95a75..ec9cc8bfa 100644
--- a/frontend/components/data/DataSummary.tsx
+++ b/frontend/components/data/DataSummary.tsx
@@ -122,7 +122,7 @@ export default function DataSummary({
   return (
     <EntitySummary
       entity={entity}
-      route={(id) => route(entity.database?.uuid, id)}
+      route={(id) => route(entity.databaseId, id)}
       tags={[
         <Tag key="updatedAt" style={{ fontWeight: "normal" }}>
           Updated At <DateTimeX value={entity.timestamp} />
diff --git a/frontend/components/methods/CreateMethod.tsx b/frontend/components/methods/CreateMethod.tsx
index 1d22e4d08..ba978d02d 100644
--- a/frontend/components/methods/CreateMethod.tsx
+++ b/frontend/components/methods/CreateMethod.tsx
@@ -113,12 +113,12 @@ export default function CreateMethod({
               name: values.name,
               description: values.description,
               validity: {
-                from: values.validity?.[0],
-                to: values.validity?.[1],
+                from: values.validity?.[0]?.toISOString(),
+                to: values.validity?.[1]?.toISOString(),
               },
               availability: {
-                from: values.availability?.[0],
-                to: values.availability?.[1],
+                from: values.availability?.[0]?.toISOString(),
+                to: values.availability?.[1]?.toISOString(),
               },
               reference: values.reference,
               calculationLocator: values.calculationLocator,
diff --git a/frontend/components/methods/UpdateMethod.tsx b/frontend/components/methods/UpdateMethod.tsx
index 477b35394..6cb77aa12 100644
--- a/frontend/components/methods/UpdateMethod.tsx
+++ b/frontend/components/methods/UpdateMethod.tsx
@@ -83,12 +83,12 @@ export default function UpdateMethod({ method }: UpdateMethodProps) {
               name: values.name,
               description: values.description,
               validity: {
-                from: values.validity?.[0],
-                to: values.validity?.[1],
+                from: values.validity?.[0]?.toISOString(),
+                to: values.validity?.[1]?.toISOString(),
               },
               availability: {
-                from: values.availability?.[0],
-                to: values.availability?.[1],
+                from: values.availability?.[0]?.toISOString(),
+                to: values.availability?.[1]?.toISOString(),
               },
               reference: values.reference,
               calculationLocator: values.calculationLocator,
diff --git a/frontend/package.json b/frontend/package.json
index 228f39d34..87ea1bc6c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -42,7 +42,7 @@
     "@types/react-highlight-words": "^0.20.0",
     "@types/react-test-renderer": "^19.1.0",
     "babel-jest": "^30.2.0",
-    "baseline-browser-mapping": "^2.10.31",
+    "baseline-browser-mapping": "^2.10.32",
     "concurrently": "^9.2.1",
     "deepmerge": "^4.0",
     "eslint": "^10.1.0",
diff --git a/frontend/pages/components/[uuid].tsx b/frontend/pages/components/[uuid].tsx
index 68ddee8cf..22db88054 100644
--- a/frontend/pages/components/[uuid].tsx
+++ b/frontend/pages/components/[uuid].tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import Component from "../../components/components/Component";
 import Layout from "../../components/Layout";
+import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
@@ -12,9 +13,17 @@ function Page() {
 
   const { uuid } = router.query;
 
+  if (!uuid) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
   return (
     <Layout>
-      <Component componentId={uuid} />
+      <Component componentId={String(uuid)} />
     </Layout>
   );
 }
diff --git a/frontend/pages/data-formats/[uuid].tsx b/frontend/pages/data-formats/[uuid].tsx
index 40ce924d8..087d72f98 100644
--- a/frontend/pages/data-formats/[uuid].tsx
+++ b/frontend/pages/data-formats/[uuid].tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import DataFormat from "../../components/dataFormats/DataFormat";
 import Layout from "../../components/Layout";
+import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
@@ -12,9 +13,17 @@ function Page() {
 
   const { uuid } = router.query;
 
+  if (!uuid) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
   return (
     <Layout>
-      <DataFormat dataFormatId={uuid} />
+      <DataFormat dataFormatId={String(uuid)} />
     </Layout>
   );
 }
diff --git a/frontend/pages/databases/[uuid].tsx b/frontend/pages/databases/[uuid].tsx
index f149ddf50..9ef77e925 100644
--- a/frontend/pages/databases/[uuid].tsx
+++ b/frontend/pages/databases/[uuid].tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import Database from "../../components/databases/Database";
 import Layout from "../../components/Layout";
+import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
@@ -12,9 +13,17 @@ function Page() {
 
   const { uuid } = router.query;
 
+  if (!uuid) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
   return (
     <Layout>
-      <Database databaseId={uuid} />
+      <Database databaseId={String(uuid)} />
     </Layout>
   );
 }
diff --git a/frontend/pages/databases/[uuid]/data/calorimetric/[dataId].tsx b/frontend/pages/databases/[uuid]/data/calorimetric/[dataId].tsx
index ff631c735..ed3cf7534 100644
--- a/frontend/pages/databases/[uuid]/data/calorimetric/[dataId].tsx
+++ b/frontend/pages/databases/[uuid]/data/calorimetric/[dataId].tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import Layout from "../../../../../components/Layout";
 import CalorimetricData from "../../../../../components/data/calorimetric/CalorimetricData";
+import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
@@ -12,9 +13,17 @@ function Page() {
 
   const { uuid, dataId } = router.query;
 
+  if (!uuid || !dataId) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
   return (
     <Layout>
-      <CalorimetricData databaseId={uuid} id={dataId} />
+      <CalorimetricData databaseId={String(uuid)} id={String(dataId)} />
     </Layout>
   );
 }
diff --git a/frontend/pages/databases/[uuid]/data/geometric/[dataId].tsx b/frontend/pages/databases/[uuid]/data/geometric/[dataId].tsx
index 412aae464..a3f72c054 100644
--- a/frontend/pages/databases/[uuid]/data/geometric/[dataId].tsx
+++ b/frontend/pages/databases/[uuid]/data/geometric/[dataId].tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import Layout from "../../../../../components/Layout";
 import GeometricData from "../../../../../components/data/geometric/GeometricData";
+import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
@@ -12,9 +13,17 @@ function Page() {
 
   const { uuid, dataId } = router.query;
 
+  if (!uuid || !dataId) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
   return (
     <Layout>
-      <GeometricData databaseId={uuid} id={dataId} />
+      <GeometricData databaseId={String(uuid)} id={String(dataId)} />
     </Layout>
   );
 }
diff --git a/frontend/pages/databases/[uuid]/data/hygrothermal/[dataId].tsx b/frontend/pages/databases/[uuid]/data/hygrothermal/[dataId].tsx
index a421fbc7c..c8d33b198 100644
--- a/frontend/pages/databases/[uuid]/data/hygrothermal/[dataId].tsx
+++ b/frontend/pages/databases/[uuid]/data/hygrothermal/[dataId].tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import Layout from "../../../../../components/Layout";
 import HygrothermalData from "../../../../../components/data/hygrothermal/HygrothermalData";
+import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
@@ -12,9 +13,17 @@ function Page() {
 
   const { uuid, dataId } = router.query;
 
+  if (!uuid || !dataId) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
   return (
     <Layout>
-      <HygrothermalData databaseId={uuid} id={dataId} />
+      <HygrothermalData databaseId={String(uuid)} id={String(dataId)} />
     </Layout>
   );
 }
diff --git a/frontend/pages/databases/[uuid]/data/life-cycle/[dataId].tsx b/frontend/pages/databases/[uuid]/data/life-cycle/[dataId].tsx
index 0d10894fc..cb761cc7e 100644
--- a/frontend/pages/databases/[uuid]/data/life-cycle/[dataId].tsx
+++ b/frontend/pages/databases/[uuid]/data/life-cycle/[dataId].tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import Layout from "../../../../../components/Layout";
 import LifeCycleData from "../../../../../components/data/lifeCycle/LifeCycleData";
+import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
@@ -12,9 +13,17 @@ function Page() {
 
   const { uuid, dataId } = router.query;
 
+  if (!uuid || !dataId) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
   return (
     <Layout>
-      <LifeCycleData databaseId={uuid} id={dataId} />
+      <LifeCycleData databaseId={String(uuid)} id={String(dataId)} />
     </Layout>
   );
 }
diff --git a/frontend/pages/databases/[uuid]/data/optical/[dataId].tsx b/frontend/pages/databases/[uuid]/data/optical/[dataId].tsx
index 7d23fa198..c6507860e 100644
--- a/frontend/pages/databases/[uuid]/data/optical/[dataId].tsx
+++ b/frontend/pages/databases/[uuid]/data/optical/[dataId].tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import Layout from "../../../../../components/Layout";
 import OpticalData from "../../../../../components/data/optical/OpticalData";
+import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
@@ -12,9 +13,17 @@ function Page() {
 
   const { uuid, dataId } = router.query;
 
+  if (!uuid || !dataId) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
   return (
     <Layout>
-      <OpticalData databaseId={uuid} id={dataId} />
+      <OpticalData databaseId={String(uuid)} id={String(dataId)} />
     </Layout>
   );
 }
diff --git a/frontend/pages/databases/[uuid]/data/photovoltaic/[dataId].tsx b/frontend/pages/databases/[uuid]/data/photovoltaic/[dataId].tsx
index a6b2925cf..9848952f5 100644
--- a/frontend/pages/databases/[uuid]/data/photovoltaic/[dataId].tsx
+++ b/frontend/pages/databases/[uuid]/data/photovoltaic/[dataId].tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import Layout from "../../../../../components/Layout";
 import PhotovoltaicData from "../../../../../components/data/photovoltaic/PhotovoltaicData";
+import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
@@ -12,9 +13,17 @@ function Page() {
 
   const { uuid, dataId } = router.query;
 
+  if (!uuid || !dataId) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
   return (
     <Layout>
-      <PhotovoltaicData databaseId={uuid} id={dataId} />
+      <PhotovoltaicData databaseId={String(uuid)} id={String(dataId)} />
     </Layout>
   );
 }
diff --git a/frontend/pages/gnupg-keys/[fingerprint].tsx b/frontend/pages/gnupg-keys/[fingerprint].tsx
index b456737f9..b2c522dec 100644
--- a/frontend/pages/gnupg-keys/[fingerprint].tsx
+++ b/frontend/pages/gnupg-keys/[fingerprint].tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import GnuPgKey from "../../components/gnuPgKeys/GnuPgKey";
 import Layout from "../../components/Layout";
+import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
@@ -12,6 +13,14 @@ function Page() {
 
   const { fingerprint } = router.query;
 
+  if (!fingerprint) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
   return (
     <Layout>
       <GnuPgKey fingerprint={String(fingerprint)} />
diff --git a/frontend/pages/institutions/[uuid].tsx b/frontend/pages/institutions/[uuid].tsx
index d7a9b443c..87ab3ca14 100644
--- a/frontend/pages/institutions/[uuid].tsx
+++ b/frontend/pages/institutions/[uuid].tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import Institution from "../../components/institutions/Institution";
 import Layout from "../../components/Layout";
+import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
@@ -12,9 +13,17 @@ function Page() {
 
   const { uuid } = router.query;
 
+  if (!uuid) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
   return (
     <Layout>
-      <Institution institutionId={uuid} />
+      <Institution institutionId={String(uuid)} />
     </Layout>
   );
 }
diff --git a/frontend/pages/institutions/index.tsx b/frontend/pages/institutions/index.tsx
index 783fc8f64..ef21c2172 100644
--- a/frontend/pages/institutions/index.tsx
+++ b/frontend/pages/institutions/index.tsx
@@ -31,8 +31,8 @@ export default function Page() {
         provides all information about institutions.
       </Typography.Paragraph>
       {currentUser?.roles?.includes(UserRole.Verifier) &&
-        currentUserData?.pendingInstitutions &&
-        currentUserData.pendingInstitutions.totalCount > 0 && (
+        currentUserData?.pendingInstitutionCount &&
+        currentUserData.pendingInstitutionCount.totalCount > 0 && (
           <div>
             <Divider />
             <Typography.Title level={4}>Pending Institutions</Typography.Title>
diff --git a/frontend/pages/methods/[uuid].tsx b/frontend/pages/methods/[uuid].tsx
index 642f2d707..20e981e8a 100644
--- a/frontend/pages/methods/[uuid].tsx
+++ b/frontend/pages/methods/[uuid].tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import Method from "../../components/methods/Method";
 import Layout from "../../components/Layout";
+import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
@@ -12,9 +13,17 @@ function Page() {
 
   const { uuid } = router.query;
 
+  if (!uuid) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
   return (
     <Layout>
-      <Method methodId={uuid} />
+      <Method methodId={String(uuid)} />
     </Layout>
   );
 }
diff --git a/frontend/pages/open-id-connect/application/[uuid].tsx b/frontend/pages/open-id-connect/application/[uuid].tsx
index dadff471a..1a33d0964 100644
--- a/frontend/pages/open-id-connect/application/[uuid].tsx
+++ b/frontend/pages/open-id-connect/application/[uuid].tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import Layout from "../../../components/Layout";
 import OpenIdConnectApplication from "../../../components/openIdConnect/applications/OpenIdConnectApplication";
+import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
@@ -12,9 +13,17 @@ function Page() {
 
   const { uuid } = router.query;
 
+  if (!uuid) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
   return (
     <Layout>
-      <OpenIdConnectApplication applicationId={uuid} />
+      <OpenIdConnectApplication applicationId={String(uuid)} />
     </Layout>
   );
 }
diff --git a/frontend/pages/users/[uuid].tsx b/frontend/pages/users/[uuid].tsx
index c4dc2e932..876527a31 100644
--- a/frontend/pages/users/[uuid].tsx
+++ b/frontend/pages/users/[uuid].tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import User from "../../components/users/User";
 import Layout from "../../components/Layout";
+import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
@@ -12,9 +13,17 @@ function Page() {
 
   const { uuid } = router.query;
 
+  if (!uuid) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
   return (
     <Layout>
-      <User userId={uuid} />
+      <User userId={String(uuid)} />
     </Layout>
   );
 }
diff --git a/frontend/pages/users/check-your-inbox-after-password-reset-request.tsx b/frontend/pages/users/check-your-inbox-after-password-reset-request.tsx
index 000599afb..1f2f1f465 100644
--- a/frontend/pages/users/check-your-inbox-after-password-reset-request.tsx
+++ b/frontend/pages/users/check-your-inbox-after-password-reset-request.tsx
@@ -6,7 +6,7 @@ import Link from "next/link";
 
 export default function Page() {
   const router = useRouter();
-  const returnTo = router.query.returnTo;
+  const { returnTo } = router.query;
 
   return (
     <SingleSignOnLayout>
diff --git a/frontend/pages/users/check-your-inbox-after-registration.tsx b/frontend/pages/users/check-your-inbox-after-registration.tsx
index efd9a59ce..650da554b 100644
--- a/frontend/pages/users/check-your-inbox-after-registration.tsx
+++ b/frontend/pages/users/check-your-inbox-after-registration.tsx
@@ -6,7 +6,7 @@ import Link from "next/link";
 
 export default function Page() {
   const router = useRouter();
-  const returnTo = router.query.returnTo;
+  const { returnTo } = router.query;
 
   return (
     <Layout>
diff --git a/frontend/pages/users/check-your-inbox-after-resending-email-confirmation.tsx b/frontend/pages/users/check-your-inbox-after-resending-email-confirmation.tsx
index efd9a59ce..650da554b 100644
--- a/frontend/pages/users/check-your-inbox-after-resending-email-confirmation.tsx
+++ b/frontend/pages/users/check-your-inbox-after-resending-email-confirmation.tsx
@@ -6,7 +6,7 @@ import Link from "next/link";
 
 export default function Page() {
   const router = useRouter();
-  const returnTo = router.query.returnTo;
+  const { returnTo } = router.query;
 
   return (
     <Layout>
diff --git a/frontend/pages/users/forgot-password.tsx b/frontend/pages/users/forgot-password.tsx
index 49915a338..f4b72166f 100644
--- a/frontend/pages/users/forgot-password.tsx
+++ b/frontend/pages/users/forgot-password.tsx
@@ -19,7 +19,7 @@ interface FormValues {
 
 function Page() {
   const router = useRouter();
-  const returnTo = router.query.returnTo;
+  const { returnTo } = router.query;
   const [requestUserPasswordResetMutation] = useMutation(
     RequestUserPasswordResetDocument,
   );
@@ -40,7 +40,7 @@ function Page() {
           variables: {
             input: {
               email: values.email,
-              returnTo: returnTo,
+              returnTo: returnTo?.toString(),
             },
           },
         }),
diff --git a/frontend/pages/users/login/index.tsx b/frontend/pages/users/login/index.tsx
index 263692b20..07417454e 100644
--- a/frontend/pages/users/login/index.tsx
+++ b/frontend/pages/users/login/index.tsx
@@ -22,7 +22,7 @@ type FormValues = {
 
 function Login() {
   const router = useRouter();
-  const returnTo = router.query.returnTo;
+  const { returnTo } = router.query;
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
   );
diff --git a/frontend/pages/users/login/with-recovery-code.tsx b/frontend/pages/users/login/with-recovery-code.tsx
index edd26858e..4730965ca 100644
--- a/frontend/pages/users/login/with-recovery-code.tsx
+++ b/frontend/pages/users/login/with-recovery-code.tsx
@@ -20,7 +20,7 @@ interface FormValues {
 
 function LoginWithRecoveryCode() {
   const router = useRouter();
-  const returnTo = router.query.returnTo;
+  const { returnTo } = router.query;
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
   );
diff --git a/frontend/pages/users/login/with-two-factor-code.tsx b/frontend/pages/users/login/with-two-factor-code.tsx
index 43751b90f..21b08bc1c 100644
--- a/frontend/pages/users/login/with-two-factor-code.tsx
+++ b/frontend/pages/users/login/with-two-factor-code.tsx
@@ -21,7 +21,7 @@ interface FormValues {
 
 function LoginWithTwoFactorCode() {
   const router = useRouter();
-  const returnTo = router.query.returnTo;
+  const { returnTo } = router.query;
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
   );
diff --git a/frontend/pages/users/register.tsx b/frontend/pages/users/register.tsx
index 4384fa6d8..937bc6f6c 100644
--- a/frontend/pages/users/register.tsx
+++ b/frontend/pages/users/register.tsx
@@ -23,7 +23,7 @@ interface FormValues {
 
 export default function Page() {
   const router = useRouter();
-  const returnTo = router.query.returnTo;
+  const { returnTo } = router.query;
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
   );
@@ -48,7 +48,7 @@ export default function Page() {
               email: values.email,
               password: values.password,
               passwordConfirmation: values.passwordConfirmation,
-              returnTo: returnTo,
+              returnTo: returnTo?.toString(),
             },
           },
         });
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index ee50798b0..09c27455a 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2988,11 +2988,16 @@ balanced-match@^4.0.2:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-4.0.4.tgz#bfb10662feed8196a2c62e7c68e17720c274179a"
   integrity sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==
 
-baseline-browser-mapping@^2.10.12, baseline-browser-mapping@^2.10.31, baseline-browser-mapping@^2.9.19:
+baseline-browser-mapping@^2.10.12, baseline-browser-mapping@^2.9.19:
   version "2.10.31"
   resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.31.tgz#9c6825f052601ce6974a90dd49683b1726887b0b"
   integrity sha512-MujYO3eP72uvmSE0i4wltsodRfIpZATP3jvzRNRGGxgzId7aVocVJJV3nf01qnzzKFGxQVC9bpWxl5cjxTr/7Q==
 
+baseline-browser-mapping@^2.10.32:
+  version "2.10.32"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.32.tgz#b6b553a4285fdd606327a617de36a5351e3aaa64"
+  integrity sha512-wbPvpyjJPC0zdfdKXxqEL3Ea+bOMD/87X4lftiJkkaBiuG6ALQy1SLmEd7BSmVCuwCQsBrCamgBoLyfFDD1EPg==
+
 brace-expansion@^1.1.7:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.14.tgz#d9de602370d91347cd9ddad1224d4fd701eb348b"

From b83682bc726b01db5371cf422a826df9d634e9c1 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 27 May 2026 18:55:26 +0200
Subject: [PATCH 056/145] Correct name of and link to database operator

---
 frontend/components/databases/DatabaseSummary.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/components/databases/DatabaseSummary.tsx b/frontend/components/databases/DatabaseSummary.tsx
index bb3f6ceca..a57aaf060 100644
--- a/frontend/components/databases/DatabaseSummary.tsx
+++ b/frontend/components/databases/DatabaseSummary.tsx
@@ -50,7 +50,8 @@ export default function DatabaseSummary({
       ].filter(isTruthy)}
     >
       <div>
-        Operated by <EntityLink entity={entity} route={paths.database} />
+        Operated by{" "}
+        <EntityLink entity={entity.operator.node} route={paths.institution} />
       </div>
       <div>
         <Typography.Link href={entity.locator}>

From 6ca3333065939cdd0edf73ebc6c00414146e1dfd Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 27 May 2026 19:34:10 +0200
Subject: [PATCH 057/145] Add count tag to pending databases and institutions

---
 frontend/pages/databases/index.tsx    | 10 ++++++++--
 frontend/pages/institutions/index.tsx | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/frontend/pages/databases/index.tsx b/frontend/pages/databases/index.tsx
index 85579582a..d828c699a 100644
--- a/frontend/pages/databases/index.tsx
+++ b/frontend/pages/databases/index.tsx
@@ -1,7 +1,7 @@
 import { useQuery } from "@apollo/client/react";
 import Layout from "../../components/Layout";
 import paths from "../../paths";
-import { Divider, Typography } from "antd";
+import { Badge, Divider, Typography } from "antd";
 import { CurrentUserDocument } from "../../queries/currentUser.generated";
 import PendingDatabaseList from "../../components/databases/PendingDatabaseList";
 import Link from "next/link";
@@ -30,7 +30,13 @@ export default function Page() {
         currentUserData.pendingDatabaseCount.totalCount > 0 && (
           <div>
             <Divider />
-            <Typography.Title level={4}>Pending Databases</Typography.Title>
+            <Typography.Title level={4}>
+              Pending Databases{" "}
+              <Badge
+                color="blue"
+                count={currentUserData.pendingDatabaseCount.totalCount}
+              />
+            </Typography.Title>
             <PendingDatabaseList />
           </div>
         )}
diff --git a/frontend/pages/institutions/index.tsx b/frontend/pages/institutions/index.tsx
index ef21c2172..88ced742a 100644
--- a/frontend/pages/institutions/index.tsx
+++ b/frontend/pages/institutions/index.tsx
@@ -2,7 +2,7 @@ import { useQuery } from "@apollo/client/react";
 import Layout from "../../components/Layout";
 import Link from "next/link";
 import paths from "../../paths";
-import { Typography, Divider } from "antd";
+import { Typography, Divider, Badge } from "antd";
 import { CurrentUserDocument } from "../../queries/currentUser.generated";
 import PendingInstitutionList from "../../components/institutions/PendingInstitutionList";
 import { UserRole } from "../../__generated__/graphql";
@@ -35,7 +35,13 @@ export default function Page() {
         currentUserData.pendingInstitutionCount.totalCount > 0 && (
           <div>
             <Divider />
-            <Typography.Title level={4}>Pending Institutions</Typography.Title>
+            <Typography.Title level={4}>
+              Pending Institutions{" "}
+              <Badge
+                color="blue"
+                count={currentUserData.pendingInstitutionCount.totalCount}
+              />
+            </Typography.Title>
             <PendingInstitutionList />
           </div>
         )}

From 0eed7f443ecc330860f8456386cfe95365c76eb5 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 27 May 2026 19:35:54 +0200
Subject: [PATCH 058/145] Increase max-allowed GraphQL costs

---
 backend/src/Configuration/GraphQlConfiguration.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/Configuration/GraphQlConfiguration.cs b/backend/src/Configuration/GraphQlConfiguration.cs
index ffaa7fc92..e1d60468c 100644
--- a/backend/src/Configuration/GraphQlConfiguration.cs
+++ b/backend/src/Configuration/GraphQlConfiguration.cs
@@ -129,8 +129,8 @@ IWebHostEnvironment environment
             )
             .ModifyCostOptions(_ =>
                 {
-                    _.MaxFieldCost = 10000;
-                    _.MaxTypeCost = 10000;
+                    _.MaxFieldCost = 12000;
+                    _.MaxTypeCost = 12000;
                 }
             )
             // Configure

From fd08d8d40ab2053defbd292540c8be84a60d20f8 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 28 May 2026 17:11:48 +0200
Subject: [PATCH 059/145] Install `knip` to check for unused dependencies,
 exports, and files; remove most of those; remove outdated frontend test
 setup; and add login link to `aunauthorized` page

---
 frontend/components/Highlight.tsx             |   21 -
 frontend/components/IdentifierItem.tsx        |    4 +-
 frontend/components/NavBar.tsx                |    2 +-
 frontend/jest.config.mjs                      |   13 -
 frontend/lib/connection.ts                    |    2 +-
 frontend/lib/hooks/usePaginatedQuery.ts       |    2 +-
 frontend/package.json                         |   30 +-
 frontend/pages/unauthorized.tsx               |   16 +-
 frontend/paths.ts                             |   82 +-
 .../test/__snapshots__/index.test.tsx.snap    |   33 -
 frontend/test/index.test.tsx                  |   36 -
 frontend/yarn.lock                            | 2038 ++++-------------
 12 files changed, 447 insertions(+), 1832 deletions(-)
 delete mode 100644 frontend/components/Highlight.tsx
 delete mode 100644 frontend/jest.config.mjs
 delete mode 100644 frontend/test/__snapshots__/index.test.tsx.snap
 delete mode 100644 frontend/test/index.test.tsx

diff --git a/frontend/components/Highlight.tsx b/frontend/components/Highlight.tsx
deleted file mode 100644
index 62a1b23e2..000000000
--- a/frontend/components/Highlight.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { forwardRef } from "react";
-import Highlighter from "react-highlight-words";
-
-interface HighlightProps {
-  text: string | null | undefined;
-  snippet: string | null | undefined;
-}
-
-const Highlight = forwardRef<Highlighter, HighlightProps>(
-  ({ text, snippet }, ref) => (
-    <Highlighter
-      ref={ref}
-      highlightStyle={{ backgroundColor: "#ffc069", padding: 0 }}
-      searchWords={snippet ? [snippet] : []}
-      autoEscape
-      textToHighlight={text || ""}
-    />
-  ),
-);
-
-export default Highlight;
diff --git a/frontend/components/IdentifierItem.tsx b/frontend/components/IdentifierItem.tsx
index 45ca2e9f8..526d8a8b8 100644
--- a/frontend/components/IdentifierItem.tsx
+++ b/frontend/components/IdentifierItem.tsx
@@ -17,10 +17,10 @@ const DoiSvg = () => (
   </svg>
 );
 
-export const ArXivIcon = (props: Partial<CustomIconComponentProps>) => (
+const ArXivIcon = (props: Partial<CustomIconComponentProps>) => (
   <Icon component={ArXivSvg} {...props} />
 );
-export const DoiIcon = (props: Partial<CustomIconComponentProps>) => (
+const DoiIcon = (props: Partial<CustomIconComponentProps>) => (
   <Icon component={DoiSvg} {...props} />
 );
 
diff --git a/frontend/components/NavBar.tsx b/frontend/components/NavBar.tsx
index 149085e7a..1ee386c42 100644
--- a/frontend/components/NavBar.tsx
+++ b/frontend/components/NavBar.tsx
@@ -24,7 +24,7 @@ const userLoadingItem = (alignRight: boolean) => ({
   ),
 });
 
-export const loginOrRegisterItems = (
+const loginOrRegisterItems = (
   returnTo: string | string[] | undefined,
   alignRight: boolean,
 ) => [
diff --git a/frontend/jest.config.mjs b/frontend/jest.config.mjs
deleted file mode 100644
index 3dee8c35a..000000000
--- a/frontend/jest.config.mjs
+++ /dev/null
@@ -1,13 +0,0 @@
-export default {
-  roots: ["<rootDir>"],
-  moduleFileExtensions: ["ts", "tsx", "js", "json", "jsx"],
-  testPathIgnorePatterns: ["<rootDir>[/\\\\](node_modules|.next)[/\\\\]"],
-  transformIgnorePatterns: ["[/\\\\]node_modules[/\\\\].+\\.(ts|tsx)$"],
-  // transform: {
-  //   "^.+\\.(ts|tsx)$": "babel-jest",
-  //   "\\.graphql$": [
-  //     "graphql-let/jestTransformer",
-  //     { subsequentTransformer: "babel-jest" },
-  //   ],
-  // },
-};
diff --git a/frontend/lib/connection.ts b/frontend/lib/connection.ts
index 64e9dd1b5..ee647f5f9 100644
--- a/frontend/lib/connection.ts
+++ b/frontend/lib/connection.ts
@@ -1,4 +1,4 @@
-export interface PageInfo {
+interface PageInfo {
   hasNextPage: boolean;
   hasPreviousPage?: boolean;
   startCursor?: string | null;
diff --git a/frontend/lib/hooks/usePaginatedQuery.ts b/frontend/lib/hooks/usePaginatedQuery.ts
index 4c173c93c..d71e78360 100644
--- a/frontend/lib/hooks/usePaginatedQuery.ts
+++ b/frontend/lib/hooks/usePaginatedQuery.ts
@@ -8,7 +8,7 @@ import {
   PaginationProps,
 } from "../../components/Pagination";
 
-export type QueryData<TNode> = {
+type QueryData<TNode> = {
   connection: Connection<TNode> | null;
 };
 
diff --git a/frontend/package.json b/frontend/package.json
index 87ea1bc6c..5b0cc1ee2 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -7,14 +7,16 @@
   "scripts": {
     "codegen": "graphql-codegen --config ./codegen.ts",
     "codegen:watch": "graphql-codegen --config ./codegen.ts --watch",
-    "dev": "yarn refresh-baseline-browser-mapping && concurrently --kill-others-on-fail 'yarn run codegen:watch' 'NODE_TLS_REJECT_UNAUTHORIZED=0 NEXT_WEBPACK_USEPOLLING=false next dev --port 8080'",
-    "build": "yarn refresh-baseline-browser-mapping && yarn codegen && NODE_ENV=production next build",
-    "test": "yarn codegen && NODE_TLS_REJECT_UNAUTHORIZED=0 jest",
+    "dev": "concurrently --kill-others-on-fail 'yarn run codegen:watch' 'NODE_TLS_REJECT_UNAUTHORIZED=0 NEXT_WEBPACK_USEPOLLING=false next dev --port 8080'",
+    "build": "yarn codegen && NODE_ENV=production next build",
     "start": "next start --port 8080",
-    "refresh-baseline-browser-mapping": "yarn upgrade baseline-browser-mapping@latest"
+    "declutter": "knip",
+    "browsers": "browserslist"
   },
   "dependencies": {
+    "@ant-design/icons": "^6.2.5",
     "@apollo/client": "^4.0.9",
+    "@graphql-codegen/typed-document-node": "^7.0.2",
     "@parcel/watcher": "^2.5.1",
     "antd": "^6.3.3",
     "crypto-hash": "^4.0.0",
@@ -24,12 +26,9 @@
     "react": "^19.2.0",
     "react-cookie": "^8.0.1",
     "react-dom": "^19.2.0",
-    "react-highlight-words": "^0.21.0",
-    "rxjs": "^7.8.2",
-    "sharp": "^0.34.5"
+    "rxjs": "^7.8.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.0",
     "@graphql-codegen/cli": "^7.0.0",
     "@graphql-codegen/fragment-matcher": "^7.0.0",
     "@graphql-codegen/near-operation-file-preset": "^5.0.0",
@@ -39,28 +38,19 @@
     "@types/node": "^24.10.1",
     "@types/react": "^19.2.5",
     "@types/react-dom": "^19.2.3",
-    "@types/react-highlight-words": "^0.20.0",
-    "@types/react-test-renderer": "^19.1.0",
-    "babel-jest": "^30.2.0",
-    "baseline-browser-mapping": "^2.10.32",
+    "browserslist": "^4.28.2",
     "concurrently": "^9.2.1",
-    "deepmerge": "^4.0",
     "eslint": "^10.1.0",
     "eslint-config-next": "^16.0.8",
-    "graphql-tag": "^2.0",
-    "jest": "^30.2.0",
+    "knip": "^6.14.2",
     "license-checker": "^25.0.1",
     "prettier": "^3.3.2",
-    "react-test-renderer": "^19.2.0",
-    "ts-node": "^10.9.1",
     "typescript": "^6.0.3",
     "yaml-loader": "^0.9.0"
   },
   "browserslist": {
     "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
+      "defaults"
     ],
     "development": [
       "last 1 chrome version",
diff --git a/frontend/pages/unauthorized.tsx b/frontend/pages/unauthorized.tsx
index 6dd3905dc..0e9b59e2b 100644
--- a/frontend/pages/unauthorized.tsx
+++ b/frontend/pages/unauthorized.tsx
@@ -1,16 +1,26 @@
 import { Result } from "antd";
 import Layout from "../components/Layout";
+import Link from "next/link";
+import paths from "../paths";
 
-function Page() {
+export default function Page() {
   return (
     <Layout>
       <Result
         status="403"
         title="403"
         subTitle="Sorry, you are not authorized to access this page."
+        extra={
+          <Link
+            href={{
+              pathname: paths.openIdConnectClientLogin,
+              query: { returnTo: window.location.pathname },
+            }}
+          >
+            Login
+          </Link>
+        }
       />
     </Layout>
   );
 }
-
-export default Page;
diff --git a/frontend/paths.ts b/frontend/paths.ts
index 6a74ea4b3..305f9fed2 100644
--- a/frontend/paths.ts
+++ b/frontend/paths.ts
@@ -7,17 +7,14 @@ export default {
   legalNotice: "/legal-notice" as Route,
   dataProtectionInformation: "/data-protection-information" as Route,
   databases: "/databases" as Route,
-  database(id: Scalars["Uuid"]["output"]) {
-    return `/databases/${encodeURIComponent(id)}` as Route;
-  },
+  database: (id: Scalars["Uuid"]["output"]) =>
+    `/databases/${encodeURIComponent(id)}` as Route,
   institutions: "/institutions" as Route,
-  institution(id: Scalars["Uuid"]["output"]) {
-    return `/institutions/${encodeURIComponent(id)}` as Route;
-  },
+  institution: (id: Scalars["Uuid"]["output"]) =>
+    `/institutions/${encodeURIComponent(id)}` as Route,
   users: "/users" as Route,
-  user(id: Scalars["Uuid"]["output"]) {
-    return `/users/${encodeURIComponent(id)}` as Route;
-  },
+  user: (id: Scalars["Uuid"]["output"]) =>
+    `/users/${encodeURIComponent(id)}` as Route,
   userCurrent: "me" as Route,
   me: {
     manage: {
@@ -45,21 +42,17 @@ export default {
   userCheckYourInboxAfterPasswordResetRequest:
     "/users/check-your-inbox-after-password-reset-request" as Route,
   dataFormats: "/data-formats" as Route,
-  dataFormat(id: Scalars["Uuid"]["output"]) {
-    return `/data-formats/${encodeURIComponent(id)}` as Route;
-  },
+  dataFormat: (id: Scalars["Uuid"]["output"]) =>
+    `/data-formats/${encodeURIComponent(id)}` as Route,
   methods: "/methods" as Route,
-  method(id: Scalars["Uuid"]["output"]) {
-    return `/methods/${encodeURIComponent(id)}` as Route;
-  },
+  method: (id: Scalars["Uuid"]["output"]) =>
+    `/methods/${encodeURIComponent(id)}` as Route,
   components: "/components" as Route,
-  component(id: Scalars["Uuid"]["output"]) {
-    return `/components/${encodeURIComponent(id)}` as Route;
-  },
+  component: (id: Scalars["Uuid"]["output"]) =>
+    `/components/${encodeURIComponent(id)}` as Route,
   gnuPgKeys: "/gnupg-keys" as Route,
-  gnuPgKey(fingerprint: string) {
-    return `/gnupg-keys/${encodeURIComponent(fingerprint)}` as Route;
-  },
+  gnuPgKey: (fingerprint: string) =>
+    `/gnupg-keys/${encodeURIComponent(fingerprint)}` as Route,
   allData: "/data" as Route,
   data(
     databaseId: Scalars["Uuid"]["output"],
@@ -84,50 +77,43 @@ export default {
     }
   },
   allCalorimetricData: "/data/calorimetric" as Route,
-  calorimetricData(
+  calorimetricData: (
     databaseId: Scalars["Uuid"]["output"],
     id: Scalars["Uuid"]["output"],
-  ) {
-    return `/databases/${encodeURIComponent(databaseId)}/data/calorimetric/${encodeURIComponent(id)}` as Route;
-  },
+  ) =>
+    `/databases/${encodeURIComponent(databaseId)}/data/calorimetric/${encodeURIComponent(id)}` as Route,
   allHygrothermalData: "/data/hygrothermal" as Route,
-  hygrothermalData(
+  hygrothermalData: (
     databaseId: Scalars["Uuid"]["output"],
     id: Scalars["Uuid"]["output"],
-  ) {
-    return `/databases/${encodeURIComponent(databaseId)}/data/hygrothermal/${encodeURIComponent(id)}` as Route;
-  },
+  ) =>
+    `/databases/${encodeURIComponent(databaseId)}/data/hygrothermal/${encodeURIComponent(id)}` as Route,
   allLifeCycleData: "/data/life-cycle" as Route,
-  lifeCycleData(
+  lifeCycleData: (
     databaseId: Scalars["Uuid"]["output"],
     id: Scalars["Uuid"]["output"],
-  ) {
-    return `/databases/${encodeURIComponent(databaseId)}/data/life-cycle/${encodeURIComponent(id)}` as Route;
-  },
+  ) =>
+    `/databases/${encodeURIComponent(databaseId)}/data/life-cycle/${encodeURIComponent(id)}` as Route,
   allOpticalData: "/data/optical" as Route,
-  opticalData(
+  opticalData: (
     databaseId: Scalars["Uuid"]["output"],
     id: Scalars["Uuid"]["output"],
-  ) {
-    return `/databases/${encodeURIComponent(databaseId)}/data/optical/${encodeURIComponent(id)}` as Route;
-  },
+  ) =>
+    `/databases/${encodeURIComponent(databaseId)}/data/optical/${encodeURIComponent(id)}` as Route,
   allPhotovoltaicData: "/data/photovoltaic" as Route,
-  photovoltaicData(
+  photovoltaicData: (
     databaseId: Scalars["Uuid"]["output"],
     id: Scalars["Uuid"]["output"],
-  ) {
-    return `/databases/${encodeURIComponent(databaseId)}/data/photovoltaic/${encodeURIComponent(id)}` as Route;
-  },
+  ) =>
+    `/databases/${encodeURIComponent(databaseId)}/data/photovoltaic/${encodeURIComponent(id)}` as Route,
   allGeometricData: "/data/geometric" as Route,
-  geometricData(
+  geometricData: (
     databaseId: Scalars["Uuid"]["output"],
     id: Scalars["Uuid"]["output"],
-  ) {
-    return `/databases/${encodeURIComponent(databaseId)}/data/geometric/${encodeURIComponent(id)}` as Route;
-  },
-  openIdConnectApplication(id: Scalars["Uuid"]["output"]) {
-    return `/open-id-connect/application/${encodeURIComponent(id)}` as Route;
-  },
+  ) =>
+    `/databases/${encodeURIComponent(databaseId)}/data/geometric/${encodeURIComponent(id)}` as Route,
+  openIdConnectApplication: (id: Scalars["Uuid"]["output"]) =>
+    `/open-id-connect/application/${encodeURIComponent(id)}` as Route,
   openIdConnect: "/open-id-connect" as Route,
   openIdConnectClientLogin: "/connect/client/login" as Route,
   openIdConnectClientLogout: "/connect/client/logout" as Route,
diff --git a/frontend/test/__snapshots__/index.test.tsx.snap b/frontend/test/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index c5fde5659..000000000
--- a/frontend/test/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,33 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Index renders the html we want 1`] = `
-<div>
-  You're signed in as 
-  Baa
-   and you're 
-  Healthy
-  . Go to the
-   
-  <a
-    href="/about"
-    onClick={[Function]}
-    onMouseEnter={[Function]}
-  >
-    about
-  </a>
-   
-  page.
-  <div>
-    <input
-      onChange={[Function]}
-      placeholder="your new name..."
-      type="text"
-    />
-    <input
-      onClick={[Function]}
-      type="button"
-      value="change"
-    />
-  </div>
-</div>
-`;
diff --git a/frontend/test/index.test.tsx b/frontend/test/index.test.tsx
deleted file mode 100644
index 2f8767c51..000000000
--- a/frontend/test/index.test.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-// import { InMemoryCache } from "@apollo/client";
-// import Index from "../pages";
-// import renderer from "react-test-renderer";
-// import { MockedProvider } from "@apollo/client/testing/react";
-
-// const cache = new InMemoryCache();
-// // cache.writeQuery({
-//   query: gql`
-//     query View {
-//       viewer {
-//         id
-//         name
-//         status
-//       }
-//     }
-//   `,
-//   data: {
-//     viewer: {
-//       __typename: "User",
-//       id: "Baa",
-//       name: "Baa",
-//       status: "Healthy",
-//     },
-//   },
-// });
-
-// describe("Index", () => {
-//   it("renders the html we want", async () => {
-//     const component = renderer.create(
-//       <MockedProvider cache={cache}>
-//         <Index />
-//       </MockedProvider>
-//     );
-//     expect(component.toJSON()).toMatchSnapshot();
-//   });
-// });
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 09c27455a..6c5b1b1db 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -51,6 +51,16 @@
     "@rc-component/util" "^1.10.1"
     clsx "^2.1.1"
 
+"@ant-design/icons@^6.2.5":
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-6.2.5.tgz#31c142aa6ce5eaf99598aaead222f4c459693512"
+  integrity sha512-0hKtoKqTjGFOndUyJLJmC9Cg6k4rEO7rLo6xmgbNJH+/ZX1C57RVals2v1j1knHl9n7Q+sBOveTvn931wLOCKw==
+  dependencies:
+    "@ant-design/colors" "^8.0.1"
+    "@ant-design/icons-svg" "^4.4.2"
+    "@rc-component/util" "^1.11.0"
+    clsx "^2.1.1"
+
 "@ant-design/react-slick@~2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-2.0.0.tgz#2d1dac45e7fc94060355f7cc233e92ca247133dc"
@@ -83,7 +93,7 @@
     immutable "^5.1.5"
     invariant "^2.2.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.27.1", "@babel/code-frame@^7.28.6", "@babel/code-frame@^7.29.0":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.28.6", "@babel/code-frame@^7.29.0":
   version "7.29.0"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.29.0.tgz#7cd7a59f15b3cc0dcd803038f7792712a7d0b15c"
   integrity sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==
@@ -97,7 +107,7 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.3.tgz#e3f5347f0589596c91d227ccb6a541d37fb1307b"
   integrity sha512-LIVqM46zQWZhj17qA8wb4nW/ixr2y1Nw+r1etiAWgRM6U1IqP+LNhL1yg440jYZR72jCWcWbLWzIosH+uP1fqg==
 
-"@babel/core@^7.0", "@babel/core@^7.23.9", "@babel/core@^7.24.4", "@babel/core@^7.27.4", "@babel/core@^7.28.6":
+"@babel/core@^7.24.4", "@babel/core@^7.28.6":
   version "7.29.0"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.29.0.tgz#5286ad785df7f79d656e88ce86e650d16ca5f322"
   integrity sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==
@@ -118,7 +128,7 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.18.13", "@babel/generator@^7.27.5", "@babel/generator@^7.29.0":
+"@babel/generator@^7.18.13", "@babel/generator@^7.29.0":
   version "7.29.1"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.29.1.tgz#d09876290111abbb00ef962a7b83a5307fba0d50"
   integrity sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==
@@ -162,7 +172,7 @@
     "@babel/helper-validator-identifier" "^7.28.5"
     "@babel/traverse" "^7.28.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.28.6", "@babel/helper-plugin-utils@^7.8.0":
+"@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.28.6":
   version "7.28.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz#6f13ea251b68c8532e985fd532f28741a8af9ac8"
   integrity sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==
@@ -190,41 +200,13 @@
     "@babel/template" "^7.28.6"
     "@babel/types" "^7.29.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.4", "@babel/parser@^7.28.6", "@babel/parser@^7.29.0", "@babel/parser@^7.29.2":
+"@babel/parser@^7.24.4", "@babel/parser@^7.28.6", "@babel/parser@^7.29.0", "@babel/parser@^7.29.2":
   version "7.29.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.3.tgz#116f70a77958307fceac27747573032f8a62f88e"
   integrity sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==
   dependencies:
     "@babel/types" "^7.29.0"
 
-"@babel/plugin-syntax-async-generators@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
-  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-bigint@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
-  integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-class-properties@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
-  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-syntax-class-static-block@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
-  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
 "@babel/plugin-syntax-import-assertions@^7.26.0":
   version "7.28.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.28.6.tgz#ae9bc1923a6ba527b70104dd2191b0cd872c8507"
@@ -232,97 +214,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.28.6"
 
-"@babel/plugin-syntax-import-attributes@^7.24.7":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.28.6.tgz#b71d5914665f60124e133696f17cd7669062c503"
-  integrity sha512-jiLC0ma9XkQT3TKJ9uYvlakm66Pamywo+qwL+oL8HJOvc6TWdZXVfhqJr8CCzbSGUAbDOzlGHJC1U+vRfLQDvw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.28.6"
-
-"@babel/plugin-syntax-import-meta@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
-  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
-  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-jsx@^7.27.1":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz#f8ca28bbd84883b5fea0e447c635b81ba73997ee"
-  integrity sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.28.6"
-
-"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
-  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
-  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-numeric-separator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
-  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-object-rest-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
-  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
-  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
-  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-private-property-in-object@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
-  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-syntax-top-level-await@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
-  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-syntax-typescript@^7.27.1":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.28.6.tgz#c7b2ddf1d0a811145b1de800d1abd146af92e3a2"
-  integrity sha512-+nDNmQye7nlnuuHDboPbGm00Vqg3oO8niRRL27/4LYHUsHYh0zJ1xWOz0uRwNFmM1Avzk8wZbc6rdiYhomzv/A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.28.6"
-
 "@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.18.0", "@babel/runtime@^7.20.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.24.4", "@babel/runtime@^7.24.7", "@babel/runtime@^7.28.4", "@babel/runtime@^7.29.2":
   version "7.29.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.29.2.tgz#9a6e2d05f4b6692e1801cd4fb176ad823930ed5e"
@@ -350,7 +241,7 @@
     "@babel/types" "^7.29.0"
     debug "^4.3.1"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.13", "@babel/types@^7.20.7", "@babel/types@^7.26.10", "@babel/types@^7.27.3", "@babel/types@^7.28.2", "@babel/types@^7.28.6", "@babel/types@^7.29.0":
+"@babel/types@^7.18.13", "@babel/types@^7.26.10", "@babel/types@^7.28.6", "@babel/types@^7.29.0":
   version "7.29.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.0.tgz#9f5b1e838c446e72cf3cd4b918152b8c605e37c7"
   integrity sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==
@@ -358,18 +249,6 @@
     "@babel/helper-string-parser" "^7.27.1"
     "@babel/helper-validator-identifier" "^7.28.5"
 
-"@bcoe/v8-coverage@^0.2.3":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
-  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
-
-"@cspotcode/source-map-support@^0.8.0":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
-  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
-  dependencies:
-    "@jridgewell/trace-mapping" "0.3.9"
-
 "@emnapi/core@1.10.0":
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.10.0.tgz#380ccc8f2412ea22d1d972df7f8ee23a3b9c7467"
@@ -601,7 +480,7 @@
     import-from "4.0.0"
     tslib "^2.8.0"
 
-"@graphql-codegen/plugin-helpers@^7.0.0":
+"@graphql-codegen/plugin-helpers@^7.0.0", "@graphql-codegen/plugin-helpers@^7.0.1":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-7.0.1.tgz#b806262faf5db4ce42e4d803a8f4bfd657574672"
   integrity sha512-S2X0YT3XQbP2haqhIeku8GOXo2j8QuBu7BrLsOEHz4UeMu78y3rja1Q4ri3oJ0jq4dMgaQlazoVHI/A+FAKMGw==
@@ -632,6 +511,17 @@
     change-case-all "^2.1.0"
     tslib "^2.8.0"
 
+"@graphql-codegen/typed-document-node@^7.0.2":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typed-document-node/-/typed-document-node-7.0.2.tgz#5589187a385ad13f71df3e0567e97ee1bebddc9d"
+  integrity sha512-vrjigzqpKsaQ2Ra4QBBuG9TcwG1O0pw9EOSFU0aj7mS2EK19vWs5N4rzwDDvHrQZW62wwqzUcqBoFitVBQqlmg==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^7.0.1"
+    "@graphql-codegen/visitor-plugin-common" "^7.0.4"
+    auto-bind "^5.0.0"
+    change-case-all "^2.1.0"
+    tslib "^2.8.0"
+
 "@graphql-codegen/typescript-apollo-client-helpers@^4.0.0":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-apollo-client-helpers/-/typescript-apollo-client-helpers-4.0.1.tgz#574eb57432102dd41411f285eac6ca978d6b90f6"
@@ -697,6 +587,22 @@
     parse-filepath "^1.0.2"
     tslib "^2.8.0"
 
+"@graphql-codegen/visitor-plugin-common@^7.0.4":
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-7.0.4.tgz#d0ab0f80dd2a29b1786a4a270ccf2f1ffaf1d5b9"
+  integrity sha512-IESwu40Gpl+9x5vRGLsaYAWM9KRobnN74h+SB4EtfDrt0V87Q74ZzWZGmuS2m6A/fq7E/bS6YgSEMVACjaRUVw==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^7.0.1"
+    "@graphql-tools/optimize" "^2.0.0"
+    "@graphql-tools/relay-operation-optimizer" "^7.1.1"
+    "@graphql-tools/utils" "^11.0.0"
+    auto-bind "^5.0.0"
+    change-case-all "^2.1.0"
+    dependency-graph "^1.0.0"
+    graphql-tag "^2.11.0"
+    parse-filepath "^1.0.2"
+    tslib "^2.8.0"
+
 "@graphql-hive/signal@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@graphql-hive/signal/-/signal-2.0.0.tgz#205805328b118e1ae556417ed364257234800464"
@@ -1286,253 +1192,6 @@
   resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-4.0.5.tgz#a02d90e5da8a36dce27ac8e7237a50c99a9003a3"
   integrity sha512-aetVUNeKNc/VriqXlw1NRSW0zhMBB0W4bNbWRJgzRl/3d0QNDQFfk0GO5SDdtjMZVg6o8ZKEiadd7SCCzoOn5Q==
 
-"@isaacs/cliui@^8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
-  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
-  dependencies:
-    string-width "^5.1.2"
-    string-width-cjs "npm:string-width@^4.2.0"
-    strip-ansi "^7.0.1"
-    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
-    wrap-ansi "^8.1.0"
-    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
-
-"@istanbuljs/load-nyc-config@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
-  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
-  dependencies:
-    camelcase "^5.3.1"
-    find-up "^4.1.0"
-    get-package-type "^0.1.0"
-    js-yaml "^3.13.1"
-    resolve-from "^5.0.0"
-
-"@istanbuljs/schema@^0.1.2", "@istanbuljs/schema@^0.1.3":
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.6.tgz#8dc9afa2ac1506cb1a58f89940f1c124446c8df3"
-  integrity sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==
-
-"@jest/console@30.4.1":
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-30.4.1.tgz#e57725678c3fcc9f7e5597e691e454fee4ce0939"
-  integrity sha512-v3bhyxUh9Hgmo5p6hAOXe14/R3ZxZDOsvHleh4B07z3m/x4/ngPUXEm9XwK4sF4u+f+P2ORb0Ge+MgpaqRMVDA==
-  dependencies:
-    "@jest/types" "30.4.1"
-    "@types/node" "*"
-    chalk "^4.1.2"
-    jest-message-util "30.4.1"
-    jest-util "30.4.1"
-    slash "^3.0.0"
-
-"@jest/core@30.4.2":
-  version "30.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-30.4.2.tgz#3d4081f894b7e2ff57d04a31842416bd07b76c32"
-  integrity sha512-TZJA6cPJUFxoWhxaLo8t0VX/MZX2wPWr0uIDvLSHIvN4gu9h02vSzqI2kBADG1ExqQlC+cY09xKMSreivvrChQ==
-  dependencies:
-    "@jest/console" "30.4.1"
-    "@jest/pattern" "30.4.0"
-    "@jest/reporters" "30.4.1"
-    "@jest/test-result" "30.4.1"
-    "@jest/transform" "30.4.1"
-    "@jest/types" "30.4.1"
-    "@types/node" "*"
-    ansi-escapes "^4.3.2"
-    chalk "^4.1.2"
-    ci-info "^4.2.0"
-    exit-x "^0.2.2"
-    fast-json-stable-stringify "^2.1.0"
-    graceful-fs "^4.2.11"
-    jest-changed-files "30.4.1"
-    jest-config "30.4.2"
-    jest-haste-map "30.4.1"
-    jest-message-util "30.4.1"
-    jest-regex-util "30.4.0"
-    jest-resolve "30.4.1"
-    jest-resolve-dependencies "30.4.2"
-    jest-runner "30.4.2"
-    jest-runtime "30.4.2"
-    jest-snapshot "30.4.1"
-    jest-util "30.4.1"
-    jest-validate "30.4.1"
-    jest-watcher "30.4.1"
-    pretty-format "30.4.1"
-    slash "^3.0.0"
-
-"@jest/diff-sequences@30.4.0":
-  version "30.4.0"
-  resolved "https://registry.yarnpkg.com/@jest/diff-sequences/-/diff-sequences-30.4.0.tgz#8be2d260e6241d6cddddd102c304fe13b4fc8e3e"
-  integrity sha512-zOpzlfUs45l6u7jm39qr87JCHUDsaeCtvL+kQe/Vn9jSnRB4/5IPXISm0h9I1vZW/o00Kn4UTJ2MOlhnUGwv3g==
-
-"@jest/environment@30.4.1":
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-30.4.1.tgz#1ab5b736e3ce6336d59e00765fa24019649f1a30"
-  integrity sha512-AK9yNRqgKxiabqMoe4oW+3/TSSeV8vkdC7BGaxZdU0AFXfOpofTLqdru2GXKZghP3sdgwE9XXpnVwfZ8JnFV4w==
-  dependencies:
-    "@jest/fake-timers" "30.4.1"
-    "@jest/types" "30.4.1"
-    "@types/node" "*"
-    jest-mock "30.4.1"
-
-"@jest/expect-utils@30.4.1":
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-30.4.1.tgz#e0c7436d52b08610de9027841912dc3734ae80b2"
-  integrity sha512-ZBn5CglH8fBsQsvs4VWNzD4aWfUYks+IdOOQU3MEK71ol/BcVm+P+rtb1KpiFBpSWSCE27uOahyyf1vfqOVbcQ==
-  dependencies:
-    "@jest/get-type" "30.1.0"
-
-"@jest/expect@30.4.1":
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-30.4.1.tgz#7fefc67f86c2cb2af3c86d9d41fe4a1d74862b8c"
-  integrity sha512-ginrj6TMgh2GshLUGCjO94Ptx9HhdZA/I6A9iUfyeLKFtdAjnKzHDgzgP9HYQgbxM1lbXScQ2eUBz2lGeVDPWA==
-  dependencies:
-    expect "30.4.1"
-    jest-snapshot "30.4.1"
-
-"@jest/fake-timers@30.4.1":
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-30.4.1.tgz#ad2d3412d5d005a3e45740bd4c8ee1ccae2f89e1"
-  integrity sha512-iW5umdmfPeWzehrVhugFQZqCchSCud5S1l2YT0O9ZhjRR0ExclANDZkiSBwzqtnlOn0J1JXvO+HZ6rkuyOVOgQ==
-  dependencies:
-    "@jest/types" "30.4.1"
-    "@sinonjs/fake-timers" "^15.4.0"
-    "@types/node" "*"
-    jest-message-util "30.4.1"
-    jest-mock "30.4.1"
-    jest-util "30.4.1"
-
-"@jest/get-type@30.1.0":
-  version "30.1.0"
-  resolved "https://registry.yarnpkg.com/@jest/get-type/-/get-type-30.1.0.tgz#4fcb4dc2ebcf0811be1c04fd1cb79c2dba431cbc"
-  integrity sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==
-
-"@jest/globals@30.4.1":
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-30.4.1.tgz#6376975e137ef87926349b5e75ccf230f491e843"
-  integrity sha512-ZbuY4cmXC8DkxYjfvT2DbcHWL2T6vmsMhXCDcmTB2T0y0gaezBI77ufq5ZAIdcRkYZ7NEQEDg1xFeKbxUJ5v5Q==
-  dependencies:
-    "@jest/environment" "30.4.1"
-    "@jest/expect" "30.4.1"
-    "@jest/types" "30.4.1"
-    jest-mock "30.4.1"
-
-"@jest/pattern@30.4.0":
-  version "30.4.0"
-  resolved "https://registry.yarnpkg.com/@jest/pattern/-/pattern-30.4.0.tgz#fcb519eeacc25caa3768f787595a27afa15302ae"
-  integrity sha512-RAWn3+f9u8BsHijKJ71uHcFp6vmyEt6VvoWXkl6hKF3qVIuWNmudVjg12DlBPGup/frIl5UcUlH5HfEuvHpEXg==
-  dependencies:
-    "@types/node" "*"
-    jest-regex-util "30.4.0"
-
-"@jest/reporters@30.4.1":
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-30.4.1.tgz#41d42533f199e737ae352a0a0b32ff300826efe2"
-  integrity sha512-/SnkPCzEQpUaBH81kjdEdDdo2WZl5hxw+BmLDGWjRkm8o7XlhjwsU36cqwe5PGBE5WYpBvDzRSdXx9rbGuJtNA==
-  dependencies:
-    "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "30.4.1"
-    "@jest/test-result" "30.4.1"
-    "@jest/transform" "30.4.1"
-    "@jest/types" "30.4.1"
-    "@jridgewell/trace-mapping" "^0.3.25"
-    "@types/node" "*"
-    chalk "^4.1.2"
-    collect-v8-coverage "^1.0.2"
-    exit-x "^0.2.2"
-    glob "^10.5.0"
-    graceful-fs "^4.2.11"
-    istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^6.0.0"
-    istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^5.0.0"
-    istanbul-reports "^3.1.3"
-    jest-message-util "30.4.1"
-    jest-util "30.4.1"
-    jest-worker "30.4.1"
-    slash "^3.0.0"
-    string-length "^4.0.2"
-    v8-to-istanbul "^9.0.1"
-
-"@jest/schemas@30.4.1":
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-30.4.1.tgz#c3703fdd71357e2c83aa59bd38469e60a11529c6"
-  integrity sha512-i6b4qw5qnP8c5FEeBJg/uZQ4ddrkN6Ca8qISJh0pr7a5hfn3h3v5x60BEbOC7OYAGZNMs1LfFLwnW2CuK8F57Q==
-  dependencies:
-    "@sinclair/typebox" "^0.34.0"
-
-"@jest/snapshot-utils@30.4.1":
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/snapshot-utils/-/snapshot-utils-30.4.1.tgz#0f829488b9d46b118854a16a56d509a3c6d9e064"
-  integrity sha512-ObY4ljvQ95mt6iwKtVLetR/4yXiAgl3H4nJxhztr0MTjrN97TwDYrnCp/kF60Ec9HdhkWTHSu+Hg05aXfngpOA==
-  dependencies:
-    "@jest/types" "30.4.1"
-    chalk "^4.1.2"
-    graceful-fs "^4.2.11"
-    natural-compare "^1.4.0"
-
-"@jest/source-map@30.0.1":
-  version "30.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-30.0.1.tgz#305ebec50468f13e658b3d5c26f85107a5620aaa"
-  integrity sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.25"
-    callsites "^3.1.0"
-    graceful-fs "^4.2.11"
-
-"@jest/test-result@30.4.1":
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-30.4.1.tgz#e21146ebbb3e1f7f76c3c49805d9f39ae45f8de1"
-  integrity sha512-/ZG7pgEiOmmWkN9TplKbOu4id2N5lh7FHwRwlkgBVAzGdRH+OkkQ8wX/kIxg4zmd3ZQvAL1RwL2yWsvNYYECTw==
-  dependencies:
-    "@jest/console" "30.4.1"
-    "@jest/types" "30.4.1"
-    "@types/istanbul-lib-coverage" "^2.0.6"
-    collect-v8-coverage "^1.0.2"
-
-"@jest/test-sequencer@30.4.1":
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-30.4.1.tgz#caf9a5e0924ed3b04957441edf9e8cef6a804391"
-  integrity sha512-PeYE+4td5rKjoRPxztObrXU+H8hsjZfxKMXOcmrr34JerSyB/ROOxbbicz8B7A5j9R9VayDnVPvBmedqCsFCdw==
-  dependencies:
-    "@jest/test-result" "30.4.1"
-    graceful-fs "^4.2.11"
-    jest-haste-map "30.4.1"
-    slash "^3.0.0"
-
-"@jest/transform@30.4.1":
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-30.4.1.tgz#1646cddb800d38d9c4e30fecfd4a6eba0fa8acfa"
-  integrity sha512-Wz0LyktlTvRefoymh+n64hQ84KNXsRGcwdoZ8CSa0Ea+fgYcHZlnk+hDP7v2MS7il2bQ5uTEIxf4/NNfhMN4KQ==
-  dependencies:
-    "@babel/core" "^7.27.4"
-    "@jest/types" "30.4.1"
-    "@jridgewell/trace-mapping" "^0.3.25"
-    babel-plugin-istanbul "^7.0.1"
-    chalk "^4.1.2"
-    convert-source-map "^2.0.0"
-    fast-json-stable-stringify "^2.1.0"
-    graceful-fs "^4.2.11"
-    jest-haste-map "30.4.1"
-    jest-regex-util "30.4.0"
-    jest-util "30.4.1"
-    pirates "^4.0.7"
-    slash "^3.0.0"
-    write-file-atomic "^5.0.1"
-
-"@jest/types@30.4.1":
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-30.4.1.tgz#f79b647a85cb2ff4a90cc55984b31dae820db1f7"
-  integrity sha512-f1x/vJXIfjOlEmejYpbkbgw1gOqpPECwMvMEtBqe47j7H2Hg8h8w3o3ikhSXq3MI15kg+oQ0exWO0uCtTNJLoQ==
-  dependencies:
-    "@jest/pattern" "30.4.0"
-    "@jest/schemas" "30.4.1"
-    "@types/istanbul-lib-coverage" "^2.0.6"
-    "@types/istanbul-reports" "^3.0.4"
-    "@types/node" "*"
-    "@types/yargs" "^17.0.33"
-    chalk "^4.1.2"
-
 "@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.5":
   version "0.3.13"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f"
@@ -1549,25 +1208,17 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0":
+"@jridgewell/resolve-uri@^3.1.0":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
   integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
 
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
+"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba"
   integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==
 
-"@jridgewell/trace-mapping@0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
-  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.23", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28":
+"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.28":
   version "0.3.31"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0"
   integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==
@@ -1660,6 +1311,214 @@
   resolved "https://registry.yarnpkg.com/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz#3dc35ba0f1e66b403c00b39344f870298ebb1c8e"
   integrity sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==
 
+"@oxc-parser/binding-android-arm-eabi@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-android-arm-eabi/-/binding-android-arm-eabi-0.130.0.tgz#55917e12ce2bf91f5d8f7af6fa337511b2ca6278"
+  integrity sha512-h/xYU8/7ADWzVSf5I+YalLpj33LOy9CI/zgbJNIZ5eunRBG+Czqa3lZsvuPHHf3rOt6z1c5+UzoxjbAzAvhwVw==
+
+"@oxc-parser/binding-android-arm64@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-android-arm64/-/binding-android-arm64-0.130.0.tgz#6a88c34fa1641bff439b4def7e4a86070239ac83"
+  integrity sha512-oFWFJrsGv9siFM4HjMqKNB7IuIZD/SMmZdCXl8xyx7lDplGvPKyewpOo272rSWgMXe2Wx7bWI0Yj+gkHv4qbeg==
+
+"@oxc-parser/binding-darwin-arm64@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-darwin-arm64/-/binding-darwin-arm64-0.130.0.tgz#d056a2b3a0100a5610e3014d75fe6d567fc49bd1"
+  integrity sha512-sGUzupdTplK9jQg7eJZ878HfEgQjJNBc6dAYVWJ9W5aU+J8rLfRJhTVsKThiu1pNwm6Y1qKCcbC6WhNWSXR3Ig==
+
+"@oxc-parser/binding-darwin-x64@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-darwin-x64/-/binding-darwin-x64-0.130.0.tgz#21340dd67fcdfec7b0be9d4fc6490f84b80cc641"
+  integrity sha512-PsB4cdCISbC00Uy8eiD8bc2AkGWjZqrSrJnkBFuG2ptrrf6mZ2F5gLFSjOAVMMgZPg8B1D7OydJwLWSfyI2Plg==
+
+"@oxc-parser/binding-freebsd-x64@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-freebsd-x64/-/binding-freebsd-x64-0.130.0.tgz#08db5e6dd718b4e7e7c98e5e2ca7bb538fd460a6"
+  integrity sha512-DgABp3l38hS77JbXCV4qk1+n6DPym5u8zzwuweokezm2tX194nDSJDENbDRECxVsiNbprKATLbk+Z5wlHT0OHw==
+
+"@oxc-parser/binding-linux-arm-gnueabihf@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.130.0.tgz#3ad94b6f0b763dec37ee0412905dad8e34c1a5a0"
+  integrity sha512-4Kn3CTEmwFrzhTSC/JuUW16qovmaMdX7jeSKbL8w0pLtLww7To1a2XJi9Z5uD8QWUkfUHhqfV+VD6dVzBnWzoA==
+
+"@oxc-parser/binding-linux-arm-musleabihf@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.130.0.tgz#f2604ea11032989d779a22c47b8a636f91d2dd44"
+  integrity sha512-D35KZM3F4rRu1uAFKyBlg3Gaf/ybCjyaPR1hfgvk5ex8NtcTmRgc0JgSighEyNg96TPrFhemFba68SZuxaha8w==
+
+"@oxc-parser/binding-linux-arm64-gnu@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.130.0.tgz#e3e3da7b98a5b8988893cba16cb81e0ee513ed1d"
+  integrity sha512-Q9o7oVlo955KHwS8l1u0bCzIx+JsZUA3XToLXC+MsMhye/9LeBQbt84nh120cl2XLy+TEzvugYDiHShg5yaX6Q==
+
+"@oxc-parser/binding-linux-arm64-musl@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.130.0.tgz#97ce15b046257465757e838ce173c09d540e840a"
+  integrity sha512-EiJ/gC0ljbcwVpycC8YWw6ggMbtsPX8XMOt0mPx0aqWeMsNR+L9m05Flbvd5T+GlivG+GkSWQL7tM9SRFpM/dw==
+
+"@oxc-parser/binding-linux-ppc64-gnu@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-0.130.0.tgz#8c364ef28a2a4f694cc58c4fd951e1710a3703ed"
+  integrity sha512-b+h/lsLLurp756dMGizNs5uPaJfyEdWrTcV5t8M609jWm1DEHB1StpRXCkyvwtkJx3m+qL5BNQ0dEKan/4yGFA==
+
+"@oxc-parser/binding-linux-riscv64-gnu@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.130.0.tgz#1085fd4fe2664d6c138463f42a36286e9e70c3f5"
+  integrity sha512-O19Cil83XAyjEFfo8WhkMwY58ALqZ7ckjGL+25mjMIuF84urWBeANH0FC8B8BsSSygWU3/1aY3ADdDbp+wlBnw==
+
+"@oxc-parser/binding-linux-riscv64-musl@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-0.130.0.tgz#de0ea9c5a5dcb1dd2a0db73baab73e2f4e1005cd"
+  integrity sha512-BgXRVC0+83n3YzCscLQjj6nbyeBIVeZYPTI4fFMAE4WNm2+4RXhWp03IVizL7esIz36kgmT48aebk1iM+cs8sw==
+
+"@oxc-parser/binding-linux-s390x-gnu@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.130.0.tgz#6e0837ab6b7d1f2462cef3a86953de0288327ac2"
+  integrity sha512-6tJz0xvnGhsokE7N1WlUSBXibpYmT9xSJFS1Ce41Km/+8gQvdlW8MLhRv8PD0L7ix8vRG0FDDepp3jdOFzdVdw==
+
+"@oxc-parser/binding-linux-x64-gnu@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.130.0.tgz#738e29a90190a0d97e91cb9ed4a94c0f8121a0e3"
+  integrity sha512-9aCWj83dp3heTQGmGnZGdIWgxjZrr/7VQ0TGFHH5PKByxJKF2Hcr4qvaSUHhhGEa3MSsDjTL1YDP8RAgdL5/Cg==
+
+"@oxc-parser/binding-linux-x64-musl@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-x64-musl/-/binding-linux-x64-musl-0.130.0.tgz#127c87488a0d23bc0990346c66ffa6e6f8f82fc8"
+  integrity sha512-afXt87aZBqrUVli8TB/I8H1G50RDWcwirjWtXGXYqJ2ZqWEiErH7V72j3LUSDZaivmtu2OLX0KQ/mbhP81mr7A==
+
+"@oxc-parser/binding-openharmony-arm64@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-openharmony-arm64/-/binding-openharmony-arm64-0.130.0.tgz#9313e4d25badec37d9c349ecab9692af3c1bf556"
+  integrity sha512-I0NCrZV/YZuCGWgqwNN/GO/iXlLF2z+Wgc7u+Aa9N4P51oYeIa0XT+zVBUne4csO9GqxskXgI4g8JzzWGRpfOw==
+
+"@oxc-parser/binding-wasm32-wasi@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-wasm32-wasi/-/binding-wasm32-wasi-0.130.0.tgz#9fb2d63b814bb7052774c50cd9b8c19047839a14"
+  integrity sha512-sJgQkGaBX0WJvPUDfwciex6IcTk5O5NLQ1bhEb6f3nBruh1GshKMRSMt2bxZlYrgBzjyBbJzsnO+InPG0bg+fA==
+  dependencies:
+    "@emnapi/core" "1.10.0"
+    "@emnapi/runtime" "1.10.0"
+    "@napi-rs/wasm-runtime" "^1.1.4"
+
+"@oxc-parser/binding-win32-arm64-msvc@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.130.0.tgz#939e48db2b47c93e7e3d4601c8eb6ff113ecc1db"
+  integrity sha512-bjcma99sQrNh6RY4mPO9yTkfxql6TDFoN3HWdK31RCKXwNhcDgJXW/l8PUtzKNiQ+9vpKJfJtQq+LklBuxSOBA==
+
+"@oxc-parser/binding-win32-ia32-msvc@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.130.0.tgz#ed50388593afc1b97f57d598edf4d51fe3e6d6fa"
+  integrity sha512-hRYbv6HhpSTzT4xTiIkadLI7upLQxuOdLPR/9nL1fTjwhgutBTPXrwaAPb/jTFVx6/8C7Jb5HcUKhmNwloTbFA==
+
+"@oxc-parser/binding-win32-x64-msvc@0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.130.0.tgz#e405110c0812d028c69775c35c6fb235f0fdff55"
+  integrity sha512-RBpA9TsRucJq6HNVNCFF1iKg+QeTkLdZf7hi4xaOGCPvMZWvDHjQgSOEZMUpuW4JNciHbxNhLEYmz5CVygjVGQ==
+
+"@oxc-project/types@^0.130.0":
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/@oxc-project/types/-/types-0.130.0.tgz#a7825148711dc28805c46cfc21d94b63a4d41e88"
+  integrity sha512-ibD2usx9JRu7f5pu2tMKMI4cpA4NgXJQoYRP4pQ7Pxmn1l6k/53qWtQWZayhYy3X4QZkt90Ot+mJEaeXouio6Q==
+
+"@oxc-resolver/binding-android-arm-eabi@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-android-arm-eabi/-/binding-android-arm-eabi-11.20.0.tgz#6040f744ee2350f1eee744ea7b16092653c6e221"
+  integrity sha512-IjfWOXRgJFNdORDl+Uf1aibNgZY2guOD3zmOhx1BGVb/MIiqlFTdmjpQNplSN58lhWehnX4UNqC3QwpUo8pjJg==
+
+"@oxc-resolver/binding-android-arm64@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-android-arm64/-/binding-android-arm64-11.20.0.tgz#6bf3c61f1245c84a13602f18d6326f42306e69b0"
+  integrity sha512-QqslZAuFQG8Q9xm7JuIn8JUbvywhSBMVhuQHtYW+auirZJloS41oxUUaBXk7uUhZJgp44c5zQLeVvmFaDQB+2Q==
+
+"@oxc-resolver/binding-darwin-arm64@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-11.20.0.tgz#b6fdb43ac0b67bf89c09e2865b848759bc1bcbb6"
+  integrity sha512-MUcavykj2ewlR+kc5arpg4tC2RvzJkUxWtNv74pf7lcNk00GpIpN43vXMj+j6r4eMmfZhlb8hueKoIb8e9kAGQ==
+
+"@oxc-resolver/binding-darwin-x64@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-11.20.0.tgz#fc065954554eca454fa50ce3e7643f33ebd14977"
+  integrity sha512-BGB16nRUK5Etiv//ihPyzj8Lj1px0mhh4YIfe0FDf045ywknfSm0GEbiRESpr6Q4K82AvnyaRIhhluHByvS4bg==
+
+"@oxc-resolver/binding-freebsd-x64@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-11.20.0.tgz#79d9c0262d959fb8eff09dfb2079184132607482"
+  integrity sha512-JZgtePaqj3qmD5XFHJaSLWzHRxQu0LaPkdoM1KJXYADvAaa83ijXHclV3ej3CueeW0wxfIAbGCZVP45J0CA7uQ==
+
+"@oxc-resolver/binding-linux-arm-gnueabihf@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-11.20.0.tgz#67d47c22f31f98d42597b258b9daf6acab441bf3"
+  integrity sha512-hOQ/p3ry3v3SchUBXicrrnszaI/UmYzM4wtS4RGfwgVUX7a+HbyQSzJ5aOzu+o6XZkFkS3ZXN4PZAzhOb77OSg==
+
+"@oxc-resolver/binding-linux-arm-musleabihf@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-11.20.0.tgz#da835d77174c74c49a371a0409c8a6b802bf814e"
+  integrity sha512-2ArPksaw0AqeuGBfoS715VF+JvJQAhD2niWgjE5hVO+L+nAfikVQopvngCMX9x4BD8itWoQ3dnikrQyl5Ho5Jg==
+
+"@oxc-resolver/binding-linux-arm64-gnu@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-11.20.0.tgz#06123d54159307a9731e70f898e9b751c9670560"
+  integrity sha512-0bJnmYFp62JdZ4nVMDUZ/C58BCZOCcqgKtnUlp7L9Ojf/czIN+3j72YlLPeWLkzlr6SlYvIQA4SGV/HyO0d+qg==
+
+"@oxc-resolver/binding-linux-arm64-musl@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-11.20.0.tgz#a9df55e94243526e92a1c646f11e844d243aa2a3"
+  integrity sha512-wKHHzPKZo7Ufhv/Bt6yxT7FOgnIgW4gwXcJUipkShGp68W3wGVqvr1Sr0fY65lN0Oy6y41+g2kIDvkgZaMMUkw==
+
+"@oxc-resolver/binding-linux-ppc64-gnu@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-11.20.0.tgz#45559c56a6c8cb9ea8cafffca03c79d2a04097e1"
+  integrity sha512-RN8goF7Ie0B79L4i4G6OeBocTgSC56vJbQ65VJje+oXnldVpLnOU7j/AQ/dP94TcCS+Yh6WG8u3Qt4ETteXFNQ==
+
+"@oxc-resolver/binding-linux-riscv64-gnu@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-11.20.0.tgz#8687b6e6cf3592e3cd76a316580d7fcd146e3f1d"
+  integrity sha512-5l1yU6/xQEqLZRzxqmMxJfWPslpwCmBsdDGaBvABPehxquCXDC7dd7oraNdKSJUMDXSM7VvVj8H2D2FTjU7oWw==
+
+"@oxc-resolver/binding-linux-riscv64-musl@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-11.20.0.tgz#90ee1c47c2e0cf2c7ed6f542544e4c528d82f978"
+  integrity sha512-xHEvkbgz6UC+A3JOyDQy76LkUaxsNSfIr3/GV8slwZsnuooJiIB34gzJfsyvR4JdCYNUUPsRJc/w/oWkODu+hg==
+
+"@oxc-resolver/binding-linux-s390x-gnu@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-11.20.0.tgz#3fe4d600f79978e766a746405bfa54fe05f27a5c"
+  integrity sha512-aWPDUUmSeyHvlW+SoEUd+JIJsQhVhu6a5tBpDRMu058naPAchTgAVGCFy35zjbnFlt0i8hLWziff6HX0D3LU4g==
+
+"@oxc-resolver/binding-linux-x64-gnu@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-11.20.0.tgz#bda339de35865aa54f28862e55829607c8d4e923"
+  integrity sha512-x2YeSimvhJjKLVD8KSu8f/rqU1potcdEMkApIPJqjZWN7c2Fpt4g2X32WDg1p+XDAmyT7nuQGe0vnhvXeLbH+g==
+
+"@oxc-resolver/binding-linux-x64-musl@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-11.20.0.tgz#c0d5c660faee13a916162f8d83be50015cb72bb5"
+  integrity sha512-kcRLEIxpZefeYfLChjpgFf3ilBzRDZ+yobMrpRsQlSrxuFGtm3U6PMU7AaEpMqo3NfDGVyJJseAjnRLzMFHjwQ==
+
+"@oxc-resolver/binding-openharmony-arm64@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-openharmony-arm64/-/binding-openharmony-arm64-11.20.0.tgz#f4fe37c4c5cf0804be3af07a53684780d5f9d582"
+  integrity sha512-HHcfnApSZGtKhTiHqe8OZruOZe5XuFQH5/E0Yhj3u8fnFvzkM4/k6WjacUf4SvA0SPEAbfbgYmVPuo0VX/fIBQ==
+
+"@oxc-resolver/binding-wasm32-wasi@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-11.20.0.tgz#3fbbaf065df34b44d45d8391250aeabf220acf5e"
+  integrity sha512-Tn0y1XOFYHNfK1wp1Z5QK8Rcld/bsOwRISQXfqAZ5IBpv8Gz1IvV39fUWNprqNdRizgcvFhOzWwFun2zkJsyBg==
+  dependencies:
+    "@emnapi/core" "1.10.0"
+    "@emnapi/runtime" "1.10.0"
+    "@napi-rs/wasm-runtime" "^1.1.4"
+
+"@oxc-resolver/binding-win32-arm64-msvc@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.20.0.tgz#00e204aac6dddd1fa909d80aa53be6bee10e6b91"
+  integrity sha512-qPi25YNPe4YenS8MgsQU2+bIFHxxpLx1LVna2444cEHqNPhNjvWf9zqj4aWE43H9LpAsTmkkAlA3eL5ElBU3mA==
+
+"@oxc-resolver/binding-win32-x64-msvc@11.20.0":
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-11.20.0.tgz#56d62047fa2ae7c2695bc901ff16303c8b6429c7"
+  integrity sha512-Wb14jWEW8huH6It9F6sXd9vrYmIS7pMrgkU6sxpLxkP+9z+wRgs71hUEhRpcn8FOXAFa27FVWfY2tRpbfTzfLw==
+
 "@parcel/watcher-android-arm64@2.5.6":
   version "2.5.6"
   resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz#5f32e0dba356f4ac9a11068d2a5c134ca3ba6564"
@@ -1749,16 +1608,6 @@
     "@parcel/watcher-win32-ia32" "2.5.6"
     "@parcel/watcher-win32-x64" "2.5.6"
 
-"@pkgjs/parseargs@^0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
-  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
-
-"@pkgr/core@^0.2.9":
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.2.9.tgz#d229a7b7f9dac167a156992ef23c7f023653f53b"
-  integrity sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==
-
 "@rc-component/async-validator@^5.1.0":
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@rc-component/async-validator/-/async-validator-5.1.0.tgz#e81f31e676d9cadc71e4310bbf1749c7a5882291"
@@ -2150,25 +1999,6 @@
   resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
   integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
-"@sinclair/typebox@^0.34.0":
-  version "0.34.49"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.34.49.tgz#4f1369234f2ecf693866476c3b2e1b54d2a9d68e"
-  integrity sha512-brySQQs7Jtn0joV8Xh9ZV/hZb9Ozb0pmazDIASBkYKCjXrXU3mpcFahmK/z4YDhGkQvP9mWJbVyahdtU5wQA+A==
-
-"@sinonjs/commons@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd"
-  integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==
-  dependencies:
-    type-detect "4.0.8"
-
-"@sinonjs/fake-timers@^15.4.0":
-  version "15.4.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-15.4.0.tgz#5d40c151a9e66075fe4520bec40bccfe54931962"
-  integrity sha512-DsG+8/LscQIQg68J6Ef3dv10u6nVyetYn923s3/sus5eaGfTo1of5WMZSLf0UJc9KDuKPilPH0UDJCjvNbDNCA==
-  dependencies:
-    "@sinonjs/commons" "^3.0.1"
-
 "@swc/helpers@0.5.15":
   version "0.5.15"
   resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.15.tgz#79efab344c5819ecf83a43f3f9f811fc84b516d7"
@@ -2176,26 +2006,6 @@
   dependencies:
     tslib "^2.8.0"
 
-"@tsconfig/node10@^1.0.7":
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.12.tgz#be57ceac1e4692b41be9de6be8c32a106636dba4"
-  integrity sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ==
-
-"@tsconfig/node12@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
-  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
-
-"@tsconfig/node14@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
-  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
-
-"@tsconfig/node16@^1.0.2":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
-  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
-
 "@tybys/wasm-util@^0.10.1":
   version "0.10.2"
   resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.2.tgz#12b3a1b33db1f9cad4ddff1f604ab7dd00bf464e"
@@ -2203,39 +2013,6 @@
   dependencies:
     tslib "^2.4.0"
 
-"@types/babel__core@^7.20.5":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
-  integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
-  dependencies:
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
-"@types/babel__generator@*":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.27.0.tgz#b5819294c51179957afaec341442f9341e4108a9"
-  integrity sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@types/babel__template@*":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.4.tgz#5672513701c1b2199bc6dad636a9d7491586766f"
-  integrity sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@types/babel__traverse@*":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.28.0.tgz#07d713d6cce0d265c9849db0cbe62d3f61f36f74"
-  integrity sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==
-  dependencies:
-    "@babel/types" "^7.28.2"
-
 "@types/esrecurse@^4.3.1":
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/@types/esrecurse/-/esrecurse-4.3.1.tgz#6f636af962fbe6191b830bd676ba5986926bccec"
@@ -2253,25 +2030,6 @@
   dependencies:
     hoist-non-react-statics "^3.3.0"
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.1", "@types/istanbul-lib-coverage@^2.0.6":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
-  integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
-
-"@types/istanbul-lib-report@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz#53047614ae72e19fc0401d872de3ae2b4ce350bf"
-  integrity sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-
-"@types/istanbul-reports@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54"
-  integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==
-  dependencies:
-    "@types/istanbul-lib-report" "*"
-
 "@types/json-schema@^7.0.15":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
@@ -2301,32 +2059,13 @@
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.2.3.tgz#c1e305d15a52a3e508d54dca770d202cb63abf2c"
   integrity sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==
 
-"@types/react-highlight-words@^0.20.0":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@types/react-highlight-words/-/react-highlight-words-0.20.1.tgz#f84a47b36d5e571afc7da47f273aaabf366b71a0"
-  integrity sha512-EgF6RaoibBurIhxk3X3d5xL0uMqjD7KtShvZ8S+d7/o6xZ+mQ4rct1a2E49vWA9r63OzrHCIyghqvQHASb/ERw==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react-test-renderer@^19.1.0":
-  version "19.1.0"
-  resolved "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-19.1.0.tgz#1d0af8f2e1b5931e245b8b5b234d1502b854dc10"
-  integrity sha512-XD0WZrHqjNrxA/MaR9O22w/RNidWR9YZmBdRGI7wcnWGrv/3dA8wKCJ8m63Sn+tLJhcjmuhOi629N66W6kgWzQ==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react@*", "@types/react@^19.2.5":
+"@types/react@^19.2.5":
   version "19.2.14"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-19.2.14.tgz#39604929b5e3957e3a6fa0001dafb17c7af70bad"
   integrity sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==
   dependencies:
     csstype "^3.2.2"
 
-"@types/stack-utils@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
-  integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
-
 "@types/ws@^8.0.0":
   version "8.18.1"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.18.1.tgz#48464e4bf2ddfd17db13d845467f6070ffea4aa9"
@@ -2334,18 +2073,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/yargs-parser@*":
-  version "21.0.3"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
-  integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
-
-"@types/yargs@^17.0.33":
-  version "17.0.35"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.35.tgz#07013e46aa4d7d7d50a49e15604c1c5340d4eb24"
-  integrity sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==
-  dependencies:
-    "@types/yargs-parser" "*"
-
 "@typescript-eslint/eslint-plugin@8.59.4":
   version "8.59.4"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.4.tgz#c67bfee32caae9cb587dce1ac59c3bf43b659707"
@@ -2442,11 +2169,6 @@
     "@typescript-eslint/types" "8.59.4"
     eslint-visitor-keys "^5.0.0"
 
-"@ungap/structured-clone@^1.3.0":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.1.tgz#0e8f34854df7966b09304a18e808b23997bb9fc1"
-  integrity sha512-mUFwbeTqrVgDQxFveS+df2yfap6iuP20NAKAsBt5jDEoOTDew+zwLAOilHCeQJOVSvmgCX4ogqIrA0mnyr08yQ==
-
 "@unrs/resolver-binding-android-arm-eabi@1.12.1":
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.12.1.tgz#c2afb2c77092f87f0c30e81c0e5782f2a0bed686"
@@ -2622,14 +2344,7 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^8.1.1:
-  version "8.3.5"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.5.tgz#8a6b8ca8fc5b34685af15dabb44118663c296496"
-  integrity sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==
-  dependencies:
-    acorn "^8.11.0"
-
-acorn@^8.11.0, acorn@^8.16.0, acorn@^8.4.1:
+acorn@^8.16.0:
   version "8.16.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.16.0.tgz#4ce79c89be40afe7afe8f3adb902a1f1ce9ac08a"
   integrity sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==
@@ -2644,13 +2359,6 @@ ajv@^6.14.0:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ansi-escapes@^4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  dependencies:
-    type-fest "^0.21.3"
-
 ansi-escapes@^7.0.0:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-7.3.0.tgz#5395bb74b2150a4a1d6e3c2565f4aeca78d28627"
@@ -2682,12 +2390,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-ansi-styles@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
-  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
-
-ansi-styles@^6.1.0, ansi-styles@^6.2.1, ansi-styles@^6.2.3:
+ansi-styles@^6.2.1, ansi-styles@^6.2.3:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041"
   integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
@@ -2745,26 +2448,6 @@ antd@^6.3.3:
     scroll-into-view-if-needed "^3.1.0"
     throttle-debounce "^5.0.2"
 
-anymatch@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
-  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -2918,66 +2601,6 @@ axobject-query@^4.1.0:
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.1.0.tgz#28768c76d0e3cff21bc62a9e2d0b6ac30042a1ee"
   integrity sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==
 
-babel-jest@30.4.1, babel-jest@^30.2.0:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-30.4.1.tgz#63cba904438bbe64c4cf0acdea87b0a45cb809fc"
-  integrity sha512-fATAbM8piYxkiXQp3RBXmZHxZVNJZAVXXfyeyCN2Tida3+qJ8ea9UxhiJ2y4fLO90ZImKt6k9FlcH2+rLkJGhw==
-  dependencies:
-    "@jest/transform" "30.4.1"
-    "@types/babel__core" "^7.20.5"
-    babel-plugin-istanbul "^7.0.1"
-    babel-preset-jest "30.4.0"
-    chalk "^4.1.2"
-    graceful-fs "^4.2.11"
-    slash "^3.0.0"
-
-babel-plugin-istanbul@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.1.tgz#d8b518c8ea199364cf84ccc82de89740236daf92"
-  integrity sha512-D8Z6Qm8jCvVXtIRkBnqNHX0zJ37rQcFJ9u8WOS6tkYOsRdHBzypCstaxWiu5ZIlqQtviRYbgnRLSoCEvjqcqbA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@istanbuljs/load-nyc-config" "^1.0.0"
-    "@istanbuljs/schema" "^0.1.3"
-    istanbul-lib-instrument "^6.0.2"
-    test-exclude "^6.0.0"
-
-babel-plugin-jest-hoist@30.4.0:
-  version "30.4.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.4.0.tgz#f7d6a6d8f435808b56b45a81dc4b61a39e36794a"
-  integrity sha512-9EdtWM/sSfXLOGLwSn+GS6pIXyBnL07/8gyJlwFXjWy4DxMOyItqyUT29d4lQiS380EZwYlX7/At4PgBS+m2aA==
-  dependencies:
-    "@types/babel__core" "^7.20.5"
-
-babel-preset-current-node-syntax@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz#20730d6cdc7dda5d89401cab10ac6a32067acde6"
-  integrity sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==
-  dependencies:
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-bigint" "^7.8.3"
-    "@babel/plugin-syntax-class-properties" "^7.12.13"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-    "@babel/plugin-syntax-import-attributes" "^7.24.7"
-    "@babel/plugin-syntax-import-meta" "^7.10.4"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-    "@babel/plugin-syntax-top-level-await" "^7.14.5"
-
-babel-preset-jest@30.4.0:
-  version "30.4.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-30.4.0.tgz#295486c2ec1127b3dc7d0d2adaa72a1dcaaafccd"
-  integrity sha512-lBY4jxsNmCnSiu7kquw8ZC9F4+XLMOKypT3RnNHPvU2Kpd4W0xaPuLr5ZkRyOsvLYAY4yaW1ZwTW4xB7NIiZzg==
-  dependencies:
-    babel-plugin-jest-hoist "30.4.0"
-    babel-preset-current-node-syntax "^1.2.0"
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -2993,11 +2616,6 @@ baseline-browser-mapping@^2.10.12, baseline-browser-mapping@^2.9.19:
   resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.31.tgz#9c6825f052601ce6974a90dd49683b1726887b0b"
   integrity sha512-MujYO3eP72uvmSE0i4wltsodRfIpZATP3jvzRNRGGxgzId7aVocVJJV3nf01qnzzKFGxQVC9bpWxl5cjxTr/7Q==
 
-baseline-browser-mapping@^2.10.32:
-  version "2.10.32"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.32.tgz#b6b553a4285fdd606327a617de36a5351e3aaa64"
-  integrity sha512-wbPvpyjJPC0zdfdKXxqEL3Ea+bOMD/87X4lftiJkkaBiuG6ALQy1SLmEd7BSmVCuwCQsBrCamgBoLyfFDD1EPg==
-
 brace-expansion@^1.1.7:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.14.tgz#d9de602370d91347cd9ddad1224d4fd701eb348b"
@@ -3006,13 +2624,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-brace-expansion@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.1.0.tgz#4f41a41190216ee36067ec381526fe9539c4f0ae"
-  integrity sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==
-  dependencies:
-    balanced-match "^1.0.0"
-
 brace-expansion@^5.0.5:
   version "5.0.6"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-5.0.6.tgz#ec68fe0a641a29d8711579caf641d05bae1f2285"
@@ -3027,7 +2638,7 @@ braces@^3.0.3:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.24.0:
+browserslist@^4.24.0, browserslist@^4.28.2:
   version "4.28.2"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.2.tgz#f50b65362ef48974ca9f50b3680566d786b811d2"
   integrity sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==
@@ -3038,18 +2649,6 @@ browserslist@^4.24.0:
     node-releases "^2.0.36"
     update-browserslist-db "^1.2.3"
 
-bser@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
-  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
-  dependencies:
-    node-int64 "^0.4.0"
-
-buffer-from@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
-  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
-
 call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
@@ -3076,7 +2675,7 @@ call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4:
     call-bind-apply-helpers "^1.0.2"
     get-intrinsic "^1.3.0"
 
-callsites@^3.0.0, callsites@^3.1.0:
+callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
@@ -3089,16 +2688,6 @@ camel-case@^4.1.2:
     pascal-case "^3.1.2"
     tslib "^2.0.3"
 
-camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-camelcase@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
-  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
-
 caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001782:
   version "1.0.30001793"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz#238887ddf5fcfc8c36d872394d0a78a517312a72"
@@ -3113,7 +2702,7 @@ capital-case@^1.0.4:
     tslib "^2.0.3"
     upper-case-first "^2.0.2"
 
-chalk@4.1.2, chalk@^4.1.2:
+chalk@4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -3184,26 +2773,11 @@ change-case@^5.2.0:
   resolved "https://registry.yarnpkg.com/change-case/-/change-case-5.4.4.tgz#0d52b507d8fb8f204343432381d1a6d7bff97a02"
   integrity sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==
 
-char-regex@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
-  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
-
 chardet@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-2.1.1.tgz#5c75593704a642f71ee53717df234031e65373c8"
   integrity sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ==
 
-ci-info@^4.2.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.4.0.tgz#7d54eff9f54b45b62401c26032696eb59c8bd18c"
-  integrity sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==
-
-cjs-module-lexer@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-2.2.0.tgz#b3ca5101843389259ade7d88c77bd06ce55849ca"
-  integrity sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==
-
 cli-cursor@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-5.0.0.tgz#24a4831ecf5a6b01ddeb32fb71a4b2088b0dce38"
@@ -3252,16 +2826,6 @@ clsx@^2.1.1:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
   integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
-
-collect-v8-coverage@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.3.tgz#cc1f01eb8d02298cbc9a437c74c70ab4e5210b80"
-  integrity sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==
-
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -3352,11 +2916,6 @@ cosmiconfig@^9.0.0:
     js-yaml "^4.1.0"
     parse-json "^5.2.0"
 
-create-require@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
-  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
-
 cross-inspect@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cross-inspect/-/cross-inspect-1.0.1.tgz#15f6f65e4ca963cf4cc1a2b5fef18f6ca328712b"
@@ -3364,7 +2923,7 @@ cross-inspect@1.0.1:
   dependencies:
     tslib "^2.4.0"
 
-cross-spawn@^7.0.3, cross-spawn@^7.0.6:
+cross-spawn@^7.0.6:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
   integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
@@ -3442,7 +3001,7 @@ debug@^3.1.0, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.4.0, debug@^4.4.3:
+debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.4.0, debug@^4.4.3:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
   integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
@@ -3454,21 +3013,11 @@ debuglog@^1.0.1:
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==
 
-dedent@^1.6.0:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.7.2.tgz#34e2264ab538301e27cf7b07bf2369c19baa8dd9"
-  integrity sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==
-
 deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@^4.0, deepmerge@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
-  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
-
 define-data-property@^1.0.1, define-data-property@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
@@ -3502,11 +3051,6 @@ detect-libc@^2.0.3, detect-libc@^2.1.2:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
   integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
 
-detect-newline@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
-  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
-
 dezalgo@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81"
@@ -3515,11 +3059,6 @@ dezalgo@^1.0.0:
     asap "^2.0.0"
     wrappy "1"
 
-diff@^4.0.1:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.4.tgz#7a6dbfda325f25f07517e9b518f897c08332e07d"
-  integrity sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==
-
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -3551,21 +3090,11 @@ dunder-proto@^1.0.0, dunder-proto@^1.0.1:
     es-errors "^1.3.0"
     gopd "^1.2.0"
 
-eastasianwidth@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
-  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
-
 electron-to-chromium@^1.5.328:
   version "1.5.359"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.359.tgz#51d3f2dd176a357b3390759b552c74cd4b6abe8e"
   integrity sha512-8lPELWuYZIWk7NDvCNthtmMw/7Q5Wu25NpM4djFMHBmk8DubPAtL4YTOp7ou0e7HyJtwkVlWv8XMLURnrtgJQw==
 
-emittery@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
-  integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
-
 emoji-regex@^10.3.0:
   version "10.6.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.6.0.tgz#bf3d6e8f7f8fd22a65d9703475bc0147357a6b0d"
@@ -3733,11 +3262,6 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
-escape-string-regexp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
-  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
-
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
@@ -3933,11 +3457,6 @@ espree@^11.2.0:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^5.0.1"
 
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
 esquery@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.7.0.tgz#08d048f261f0ddedb5bae95f46809463d9c9496d"
@@ -3967,38 +3486,6 @@ eventemitter3@^5.0.4:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.4.tgz#a86d66170433712dde814707ac52b5271ceb1feb"
   integrity sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==
 
-execa@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
-  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^6.0.0"
-    human-signals "^2.1.0"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.1"
-    onetime "^5.1.2"
-    signal-exit "^3.0.3"
-    strip-final-newline "^2.0.0"
-
-exit-x@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/exit-x/-/exit-x-0.2.2.tgz#1f9052de3b8d99a696b10dad5bced9bdd5c3aa64"
-  integrity sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==
-
-expect@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-30.4.1.tgz#897e0390a0b6c333dbcf3a24dee3ad49553577e0"
-  integrity sha512-PMARsyh/JtqC20HoGqlFcIlQAyqUtW4PlI1rup1uhYJtKuwAjbvWi3GQMAn+STdHum/dk8xrKfUM1+5SAwpolA==
-  dependencies:
-    "@jest/expect-utils" "30.4.1"
-    "@jest/get-type" "30.1.0"
-    jest-matcher-utils "30.4.1"
-    jest-message-util "30.4.1"
-    jest-mock "30.4.1"
-    jest-util "30.4.1"
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -4026,7 +3513,7 @@ fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.8"
 
-fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
+fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
@@ -4062,12 +3549,12 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-fb-watchman@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
-  integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
+fd-package-json@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fd-package-json/-/fd-package-json-2.0.0.tgz#03f53ce5a0af552c2f4faf703a24e526310a2411"
+  integrity sha512-jKmm9YtsNXN789RS/0mSzOC1NUq9mkVd65vbSSVsKdjGvYXBuE4oWe2QOEoFeRmJg+lPuZxpmrfFclNhoRMneQ==
   dependencies:
-    bser "2.1.1"
+    walk-up-path "^4.0.0"
 
 fdir@^6.5.0:
   version "6.5.0"
@@ -4096,14 +3583,6 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-find-up@^4.0.0, find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
 find-up@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
@@ -4132,13 +3611,12 @@ for-each@^0.3.3, for-each@^0.3.5:
   dependencies:
     is-callable "^1.2.7"
 
-foreground-child@^3.1.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
-  integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
+formatly@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/formatly/-/formatly-0.3.0.tgz#5bb3b4e692f5a8c74ad8fe26154dd0a74aac6819"
+  integrity sha512-9XNj/o4wrRFyhSMJOvsuyMwy8aUfBaZ1VrqHVfohyXf0Sw0e+yfKG+xZaY3arGCOMdwFsqObtzVOc1gU9KiT9w==
   dependencies:
-    cross-spawn "^7.0.6"
-    signal-exit "^4.0.1"
+    fd-package-json "^2.0.0"
 
 formdata-polyfill@^4.0.10:
   version "4.0.10"
@@ -4152,11 +3630,6 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
 function-bind@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
@@ -4215,11 +3688,6 @@ get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@
     hasown "^2.0.2"
     math-intrinsics "^1.1.0"
 
-get-package-type@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
-  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
-
 get-proto@^1.0.0, get-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
@@ -4228,11 +3696,6 @@ get-proto@^1.0.0, get-proto@^1.0.1:
     dunder-proto "^1.0.1"
     es-object-atoms "^1.0.0"
 
-get-stream@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
-  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
-
 get-symbol-description@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz#7bdd54e0befe8ffc9f3b4e203220d9f1e881b6ee"
@@ -4242,7 +3705,7 @@ get-symbol-description@^1.1.0:
     es-errors "^1.3.0"
     get-intrinsic "^1.2.6"
 
-get-tsconfig@^4.10.0:
+get-tsconfig@4.14.0, get-tsconfig@^4.10.0:
   version "4.14.0"
   resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.14.0.tgz#985d85c52a9903864280ccc2448d413fbf1efed8"
   integrity sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==
@@ -4263,19 +3726,7 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob@^10.5.0:
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz#8ec0355919cd3338c28428a23d4f24ecc5fe738c"
-  integrity sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==
-  dependencies:
-    foreground-child "^3.1.0"
-    jackspeak "^3.1.2"
-    minimatch "^9.0.4"
-    minipass "^7.1.2"
-    package-json-from-dist "^1.0.0"
-    path-scurry "^1.11.1"
-
-glob@^7.1.1, glob@^7.1.4:
+glob@^7.1.1:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4317,7 +3768,7 @@ gopd@^1.0.1, gopd@^1.2.0:
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
   integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
 
-graceful-fs@^4.1.2, graceful-fs@^4.2.11:
+graceful-fs@^4.1.2:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -4339,7 +3790,7 @@ graphql-config@^5.1.6:
     string-env-interpolation "^1.0.1"
     tslib "^2.4.0"
 
-graphql-tag@^2.0, graphql-tag@^2.11.0, graphql-tag@^2.12.6:
+graphql-tag@^2.11.0, graphql-tag@^2.12.6:
   version "2.12.6"
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
   integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==
@@ -4424,11 +3875,6 @@ hermes-parser@^0.25.1:
   dependencies:
     hermes-estree "0.25.1"
 
-highlight-words-core@^1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/highlight-words-core/-/highlight-words-core-1.2.3.tgz#781f37b2a220bf998114e4ef8c8cb6c7a4802ea8"
-  integrity sha512-m1O9HW3/GNHxzSIXWw1wCNXXsgLlxrP0OI6+ycGUhiUHkikqW3OrwVHz+lxeNBe5yqLESdIcj8PowHQ2zLvUvQ==
-
 hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
@@ -4441,16 +3887,6 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
-html-escaper@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
-  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
-
-human-signals@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
-  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
-
 iconv-lite@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.7.2.tgz#d0bdeac3f12b4835b7359c2ad89c422a4d1cc72e"
@@ -4486,14 +3922,6 @@ import-from@4.0.0:
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-4.0.0.tgz#2710b8d66817d232e16f4166e319248d3d5492e2"
   integrity sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==
 
-import-local@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.2.0.tgz#c3d5c745798c02a6f8b897726aba5100186ee260"
-  integrity sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==
-  dependencies:
-    pkg-dir "^4.2.0"
-    resolve-cwd "^3.0.0"
-
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -4636,11 +4064,6 @@ is-fullwidth-code-point@^5.0.0, is-fullwidth-code-point@^5.1.0:
   dependencies:
     get-east-asian-width "^1.3.1"
 
-is-generator-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
-  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
-
 is-generator-function@^1.0.10:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.2.tgz#ae3b61e3d5ea4e4839b90bad22b02335051a17d5"
@@ -4723,11 +4146,6 @@ is-shared-array-buffer@^1.0.4:
   dependencies:
     call-bound "^1.0.3"
 
-is-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-
 is-string@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9"
@@ -4816,48 +4234,6 @@ isows@^1.0.7:
   resolved "https://registry.yarnpkg.com/isows/-/isows-1.0.7.tgz#1c06400b7eed216fbba3bcbd68f12490fc342915"
   integrity sha512-I1fSfDCZL5P0v33sVqeTDSpcstAg/N+wF5HS033mogOVIp4B+oHC7oOCsA3axAbBSGTJ8QubbNmnIRN/h8U7hg==
 
-istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
-  integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
-
-istanbul-lib-instrument@^6.0.0, istanbul-lib-instrument@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz#fa15401df6c15874bcb2105f773325d78c666765"
-  integrity sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==
-  dependencies:
-    "@babel/core" "^7.23.9"
-    "@babel/parser" "^7.23.9"
-    "@istanbuljs/schema" "^0.1.3"
-    istanbul-lib-coverage "^3.2.0"
-    semver "^7.5.4"
-
-istanbul-lib-report@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
-  integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
-  dependencies:
-    istanbul-lib-coverage "^3.0.0"
-    make-dir "^4.0.0"
-    supports-color "^7.1.0"
-
-istanbul-lib-source-maps@^5.0.0:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz#acaef948df7747c8eb5fbf1265cb980f6353a441"
-  integrity sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.23"
-    debug "^4.1.1"
-    istanbul-lib-coverage "^3.0.0"
-
-istanbul-reports@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.2.0.tgz#cb4535162b5784aa623cee21a7252cf2c807ac93"
-  integrity sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==
-  dependencies:
-    html-escaper "^2.0.0"
-    istanbul-lib-report "^3.0.0"
-
 iterator.prototype@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.5.tgz#12c959a29de32de0aa3bbbb801f4d777066dae39"
@@ -4870,377 +4246,12 @@ iterator.prototype@^1.1.5:
     has-symbols "^1.1.0"
     set-function-name "^2.0.2"
 
-jackspeak@^3.1.2:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
-  integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
-  dependencies:
-    "@isaacs/cliui" "^8.0.2"
-  optionalDependencies:
-    "@pkgjs/parseargs" "^0.11.0"
-
 javascript-stringify@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz#27c76539be14d8bd128219a2d731b09337904e79"
   integrity sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==
 
-jest-changed-files@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-30.4.1.tgz#396fcf914165287f05960372a5d091f6f2275ec5"
-  integrity sha512-IuctmYrxi21iOSOaIXpJWalHyPAsVv0GeBHKDn8C1CA4W5htHn7INL+wdnL4Bo0+olEndvAFkmb++tIQJG+vvg==
-  dependencies:
-    execa "^5.1.1"
-    jest-util "30.4.1"
-    p-limit "^3.1.0"
-
-jest-circus@30.4.2:
-  version "30.4.2"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-30.4.2.tgz#9a5b9b9c57bf51871f112ccf7a673d486c28f8e7"
-  integrity sha512-rvHH7VlY6LgbJXJTQ87GW62g1FntOtbhh0zT+v04kC+pgL6aBKyYINXxWukCpj3dcIBMw5/XUbtDS9dU9JTXeQ==
-  dependencies:
-    "@jest/environment" "30.4.1"
-    "@jest/expect" "30.4.1"
-    "@jest/test-result" "30.4.1"
-    "@jest/types" "30.4.1"
-    "@types/node" "*"
-    chalk "^4.1.2"
-    co "^4.6.0"
-    dedent "^1.6.0"
-    is-generator-fn "^2.1.0"
-    jest-each "30.4.1"
-    jest-matcher-utils "30.4.1"
-    jest-message-util "30.4.1"
-    jest-runtime "30.4.2"
-    jest-snapshot "30.4.1"
-    jest-util "30.4.1"
-    p-limit "^3.1.0"
-    pretty-format "30.4.1"
-    pure-rand "^7.0.0"
-    slash "^3.0.0"
-    stack-utils "^2.0.6"
-
-jest-cli@30.4.2:
-  version "30.4.2"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-30.4.2.tgz#e353ef54035c5ac97f200807c97b3d857f52bddc"
-  integrity sha512-jfA2ocvVHMXS2QijrJ0d31ektP+d/W0T5RpcTX2Pq+3sVqHlsXVCM2+FmwpL+bdY8OfHpIg9xMxLF17Zg0U49Q==
-  dependencies:
-    "@jest/core" "30.4.2"
-    "@jest/test-result" "30.4.1"
-    "@jest/types" "30.4.1"
-    chalk "^4.1.2"
-    exit-x "^0.2.2"
-    import-local "^3.2.0"
-    jest-config "30.4.2"
-    jest-util "30.4.1"
-    jest-validate "30.4.1"
-    yargs "^17.7.2"
-
-jest-config@30.4.2:
-  version "30.4.2"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-30.4.2.tgz#78f589b5410d2805518b8bdce517217fb96b5e61"
-  integrity sha512-rNHAShJQqQwFNoL0hbf3BphSBOWnpOUAKvidLS/AjNVLPfoj5mSf4jQMfW3cYOs6hXeZC7nF7mDHaBnbxELOzg==
-  dependencies:
-    "@babel/core" "^7.27.4"
-    "@jest/get-type" "30.1.0"
-    "@jest/pattern" "30.4.0"
-    "@jest/test-sequencer" "30.4.1"
-    "@jest/types" "30.4.1"
-    babel-jest "30.4.1"
-    chalk "^4.1.2"
-    ci-info "^4.2.0"
-    deepmerge "^4.3.1"
-    glob "^10.5.0"
-    graceful-fs "^4.2.11"
-    jest-circus "30.4.2"
-    jest-docblock "30.4.0"
-    jest-environment-node "30.4.1"
-    jest-regex-util "30.4.0"
-    jest-resolve "30.4.1"
-    jest-runner "30.4.2"
-    jest-util "30.4.1"
-    jest-validate "30.4.1"
-    parse-json "^5.2.0"
-    pretty-format "30.4.1"
-    slash "^3.0.0"
-    strip-json-comments "^3.1.1"
-
-jest-diff@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.4.1.tgz#26691c73975768409af4a66b2754cea3182aa2dc"
-  integrity sha512-CRpFK0RtLriVDGcPPAnR6HMVI8bSR2jnUIgralhauzYQZIb4RH9AtEInTuQr65LmmGggGcRT6HIASxwqsVsmlA==
-  dependencies:
-    "@jest/diff-sequences" "30.4.0"
-    "@jest/get-type" "30.1.0"
-    chalk "^4.1.2"
-    pretty-format "30.4.1"
-
-jest-docblock@30.4.0:
-  version "30.4.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-30.4.0.tgz#3ab779a027d1495ae21550accd4266bbe99af7a3"
-  integrity sha512-ZPMabUZCx5MpbZ2eBYSvZ0J8fvo3dR9oM+eeUpb3aKNQFuS2tu3Duw1TNlMoP8k3WQgKGJuhcMFvwcVuq6T7oA==
-  dependencies:
-    detect-newline "^3.1.0"
-
-jest-each@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-30.4.1.tgz#b69e66da8e2b578c6140d357f6574044c2a40537"
-  integrity sha512-/8MJbH6fuj48TstjrMf+u/pd06Qezz5xOXvZA6442heNOWr8bdeoGZX2d9fCn028CoMgYmroH9//zky5GfyYmA==
-  dependencies:
-    "@jest/get-type" "30.1.0"
-    "@jest/types" "30.4.1"
-    chalk "^4.1.2"
-    jest-util "30.4.1"
-    pretty-format "30.4.1"
-
-jest-environment-node@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-30.4.1.tgz#43bbbee903e17d874eb1817195c50ff8b90e2fe0"
-  integrity sha512-4FZYVOk85hz2AyT6BbarKy9u37g6DbrDyCdFhsnDdXqyrueYQvB+0zO4f/kqLCRD0BsPRXPMNJeQwihKZV8naw==
-  dependencies:
-    "@jest/environment" "30.4.1"
-    "@jest/fake-timers" "30.4.1"
-    "@jest/types" "30.4.1"
-    "@types/node" "*"
-    jest-mock "30.4.1"
-    jest-util "30.4.1"
-    jest-validate "30.4.1"
-
-jest-haste-map@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-30.4.1.tgz#6d80d09d668c20bf3944977e50acac94fcd672fe"
-  integrity sha512-rFrcONd8jeFsyw+Z9CrScJgglRf2+NFmNam8dKu7n+SoHqNYT47mn0DdEcVUZJpvh7Iz6/si7f7yUH7GJHVgnw==
-  dependencies:
-    "@jest/types" "30.4.1"
-    "@types/node" "*"
-    anymatch "^3.1.3"
-    fb-watchman "^2.0.2"
-    graceful-fs "^4.2.11"
-    jest-regex-util "30.4.0"
-    jest-util "30.4.1"
-    jest-worker "30.4.1"
-    picomatch "^4.0.3"
-    walker "^1.0.8"
-  optionalDependencies:
-    fsevents "^2.3.3"
-
-jest-leak-detector@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-30.4.1.tgz#96077059a68e5871fc8f53aa90647a6a33f916cd"
-  integrity sha512-IpmyiioeHxiWDhesHnUFmOxcTzwCwKpgACgWajtAP+nYQXiY7DakTxB6Bx9JFiRMljr0AX1PvnQdaU1KFoz6NQ==
-  dependencies:
-    "@jest/get-type" "30.1.0"
-    pretty-format "30.4.1"
-
-jest-matcher-utils@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-30.4.1.tgz#3fee8c89dbd8fc6e60eb590def9897e18f110ec4"
-  integrity sha512-zvYfX5CaeEkFrrLS9suWe9rvJrm9J1Iv3ua8kIBv9GEPzcnsfBf0bob37la7s67fs0nlBC3EuvkOLnXQKxtx4A==
-  dependencies:
-    "@jest/get-type" "30.1.0"
-    chalk "^4.1.2"
-    jest-diff "30.4.1"
-    pretty-format "30.4.1"
-
-jest-message-util@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-30.4.1.tgz#40f6bfa5f564363edcba7ce0ca64277fd2ad6af7"
-  integrity sha512-kwCKIvq0MCW1HzLoGola9Te6JUdzgV0loyKJ3Qghrkz9i5/RRIHsL95BMQc2HBBhlBKC4j22K9p11TGHH8RBpQ==
-  dependencies:
-    "@babel/code-frame" "^7.27.1"
-    "@jest/types" "30.4.1"
-    "@types/stack-utils" "^2.0.3"
-    chalk "^4.1.2"
-    graceful-fs "^4.2.11"
-    jest-util "30.4.1"
-    picomatch "^4.0.3"
-    pretty-format "30.4.1"
-    slash "^3.0.0"
-    stack-utils "^2.0.6"
-
-jest-mock@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-30.4.1.tgz#5e11a05d7719a1e3c7bba6348b70ff4e1bc5ea68"
-  integrity sha512-/i8SVb8/NSB7RfNi8gfqu8gxLV23KaL5EpAttyb9iz8qWRIqXRLflycz/32wXsYkOnaUlx8NAKnJYtpsmXUmfw==
-  dependencies:
-    "@jest/types" "30.4.1"
-    "@types/node" "*"
-    jest-util "30.4.1"
-
-jest-pnp-resolver@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
-  integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
-
-jest-regex-util@30.4.0:
-  version "30.4.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-30.4.0.tgz#f75ccc43857633df2563a03588b5cb45c7c2941b"
-  integrity sha512-mWlvLviKIgIQ8VCuM1xRdD0TWp3zlzionlmDBjuXVBs+VkmXq6FgW9T4Emr7oGz/Rk6feDCGyiugolcQEyp3mg==
-
-jest-resolve-dependencies@30.4.2:
-  version "30.4.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-30.4.2.tgz#152f8a4cb2dd351cedeb5ada53c89f9683a3ad92"
-  integrity sha512-gDiVh1I+GxYzz9oXlyw+1wv6VOYX1WYxMOfjsA3iGKePV2oxmbHhwxfkALxNxYy1ciw6APWwkW2zZONwP97aEQ==
-  dependencies:
-    jest-regex-util "30.4.0"
-    jest-snapshot "30.4.1"
-
-jest-resolve@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-30.4.1.tgz#b9e432892dc0e2a470eb4826ef5f120a50b3205e"
-  integrity sha512-Zry8Yq/yJcNAZ7dJ5F2heic8AheXvbFZ7XI5V+h28nrYZ7Qoyy4dItq8OodjnYD270mvX+ZudmrNV9cysqhW5Q==
-  dependencies:
-    chalk "^4.1.2"
-    graceful-fs "^4.2.11"
-    jest-haste-map "30.4.1"
-    jest-pnp-resolver "^1.2.3"
-    jest-util "30.4.1"
-    jest-validate "30.4.1"
-    slash "^3.0.0"
-    unrs-resolver "^1.7.11"
-
-jest-runner@30.4.2:
-  version "30.4.2"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-30.4.2.tgz#15debf3cb6d817538aa97427d5a79277cdff65fe"
-  integrity sha512-2dw0PslVYXxffXGpLo+Ejad+KcI1Qkjn7f4X4619gf21oCUmL+SPfjqIa/losUem3yEOvfNZe/F1HWUcNpODcg==
-  dependencies:
-    "@jest/console" "30.4.1"
-    "@jest/environment" "30.4.1"
-    "@jest/test-result" "30.4.1"
-    "@jest/transform" "30.4.1"
-    "@jest/types" "30.4.1"
-    "@types/node" "*"
-    chalk "^4.1.2"
-    emittery "^0.13.1"
-    exit-x "^0.2.2"
-    graceful-fs "^4.2.11"
-    jest-docblock "30.4.0"
-    jest-environment-node "30.4.1"
-    jest-haste-map "30.4.1"
-    jest-leak-detector "30.4.1"
-    jest-message-util "30.4.1"
-    jest-resolve "30.4.1"
-    jest-runtime "30.4.2"
-    jest-util "30.4.1"
-    jest-watcher "30.4.1"
-    jest-worker "30.4.1"
-    p-limit "^3.1.0"
-    source-map-support "0.5.13"
-
-jest-runtime@30.4.2:
-  version "30.4.2"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-30.4.2.tgz#03b5955003440975b12e76518ec85d091c25b84a"
-  integrity sha512-3/5e8iPz2k/VLqlr8DgTftYyLUv8Su3FkCAO2/Od81UsUTpSxOrS6O5x5KkoQwyUjmpYyDJKeyAvg2T2nvpNkQ==
-  dependencies:
-    "@jest/environment" "30.4.1"
-    "@jest/fake-timers" "30.4.1"
-    "@jest/globals" "30.4.1"
-    "@jest/source-map" "30.0.1"
-    "@jest/test-result" "30.4.1"
-    "@jest/transform" "30.4.1"
-    "@jest/types" "30.4.1"
-    "@types/node" "*"
-    chalk "^4.1.2"
-    cjs-module-lexer "^2.1.0"
-    collect-v8-coverage "^1.0.2"
-    glob "^10.5.0"
-    graceful-fs "^4.2.11"
-    jest-haste-map "30.4.1"
-    jest-message-util "30.4.1"
-    jest-mock "30.4.1"
-    jest-regex-util "30.4.0"
-    jest-resolve "30.4.1"
-    jest-snapshot "30.4.1"
-    jest-util "30.4.1"
-    slash "^3.0.0"
-    strip-bom "^4.0.0"
-
-jest-snapshot@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-30.4.1.tgz#0380cbbaa9d53d32cf7e61af98459ac10a339842"
-  integrity sha512-tEOkkfOMppUyeiHwjZswOQ3lcnoTnws/q5FnGIaeIh/jmoU0ZlgMYRR8sTlTj+nNGCoJ0RDq6SfxGxCsyMTPmw==
-  dependencies:
-    "@babel/core" "^7.27.4"
-    "@babel/generator" "^7.27.5"
-    "@babel/plugin-syntax-jsx" "^7.27.1"
-    "@babel/plugin-syntax-typescript" "^7.27.1"
-    "@babel/types" "^7.27.3"
-    "@jest/expect-utils" "30.4.1"
-    "@jest/get-type" "30.1.0"
-    "@jest/snapshot-utils" "30.4.1"
-    "@jest/transform" "30.4.1"
-    "@jest/types" "30.4.1"
-    babel-preset-current-node-syntax "^1.2.0"
-    chalk "^4.1.2"
-    expect "30.4.1"
-    graceful-fs "^4.2.11"
-    jest-diff "30.4.1"
-    jest-matcher-utils "30.4.1"
-    jest-message-util "30.4.1"
-    jest-util "30.4.1"
-    pretty-format "30.4.1"
-    semver "^7.7.2"
-    synckit "^0.11.8"
-
-jest-util@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-30.4.1.tgz#979c9d014fdd12bb95d3dcde0192e1a9e0bc93d6"
-  integrity sha512-vjQb1sACEiv13DKJMDToJpzVW0joCsIQrmbg0fi7CyOOt+g9jTuQl2A216pWRBYhOVt53XbL/2LbMKg1BECWOw==
-  dependencies:
-    "@jest/types" "30.4.1"
-    "@types/node" "*"
-    chalk "^4.1.2"
-    ci-info "^4.2.0"
-    graceful-fs "^4.2.11"
-    picomatch "^4.0.3"
-
-jest-validate@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-30.4.1.tgz#dcc4784547bf644dca0226d3266fb1bde392c5a4"
-  integrity sha512-PDWi4SOwLnwqNDfHZjOcsEFyZ4fc/2W2gVL3DEoyqnB6jCQMLRtfBong8s6omIw3lI0HWOus12xfnFmQtjW3fw==
-  dependencies:
-    "@jest/get-type" "30.1.0"
-    "@jest/types" "30.4.1"
-    camelcase "^6.3.0"
-    chalk "^4.1.2"
-    leven "^3.1.0"
-    pretty-format "30.4.1"
-
-jest-watcher@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-30.4.1.tgz#d2a78fd27553db9206947eeda6068d76bacfd276"
-  integrity sha512-/l9UonmvCwjHH7d2h3iAwIloLc1H0S8mJZ/LNK3i86hqwPAz8otUJjP9MfYtz9Tt77Su5FD2xGjZn8d31IZHlw==
-  dependencies:
-    "@jest/test-result" "30.4.1"
-    "@jest/types" "30.4.1"
-    "@types/node" "*"
-    ansi-escapes "^4.3.2"
-    chalk "^4.1.2"
-    emittery "^0.13.1"
-    jest-util "30.4.1"
-    string-length "^4.0.2"
-
-jest-worker@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-30.4.1.tgz#ac010eb6c512425748a39e2d6bf05b2c4866ca4f"
-  integrity sha512-SHynN/q/QD++iNyvMdy+WMmbCGk8jIsNcRxycXbWubSOhvo6T+j2afcfUSl+3hYsiBebOTo0cT7c2H7CXugu1g==
-  dependencies:
-    "@types/node" "*"
-    "@ungap/structured-clone" "^1.3.0"
-    jest-util "30.4.1"
-    merge-stream "^2.0.0"
-    supports-color "^8.1.1"
-
-jest@^30.2.0:
-  version "30.4.2"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-30.4.2.tgz#e9bdb00f4bf1126d781b0d98e23130db096bbd9a"
-  integrity sha512-Yi1jqNC/Oq0N4hBgNH/YvBpP1P57QqundgytzYqy3yqAa7NZPNjSoi4SGbRAXDMdBzNE6xBCi5U7RgfrvMEUVQ==
-  dependencies:
-    "@jest/core" "30.4.2"
-    "@jest/types" "30.4.1"
-    import-local "^3.2.0"
-    jest-cli "30.4.2"
-
-jiti@^2.0.0, jiti@^2.3.0:
+jiti@^2.0.0, jiti@^2.3.0, jiti@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.7.0.tgz#974228f2f4ca2bc21885a1797b45fea68e950c64"
   integrity sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==
@@ -5250,14 +4261,6 @@ jiti@^2.0.0, jiti@^2.3.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
-  version "3.14.2"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.2.tgz#77485ce1dd7f33c061fd1b16ecea23b55fcb04b0"
-  integrity sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 js-yaml@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"
@@ -5334,6 +4337,26 @@ keyv@^4.5.4:
   dependencies:
     json-buffer "3.0.1"
 
+knip@^6.14.2:
+  version "6.14.2"
+  resolved "https://registry.yarnpkg.com/knip/-/knip-6.14.2.tgz#264f725dd2bf2104e70561b0fee7432d2c77fd76"
+  integrity sha512-Vg3JhIINjZew1I7qAFI4UHemW1mc4azP/BxJvsq9eGDfxpGO7oVCuD/bsWkog9TO/ZwwJeAeOMFZ1kd9jnY9+Q==
+  dependencies:
+    fdir "^6.5.0"
+    formatly "^0.3.0"
+    get-tsconfig "4.14.0"
+    jiti "^2.7.0"
+    minimist "^1.2.8"
+    oxc-parser "^0.130.0"
+    oxc-resolver "^11.19.1"
+    picomatch "^4.0.4"
+    smol-toml "^1.6.1"
+    strip-json-comments "5.0.3"
+    tinyglobby "^0.2.16"
+    unbash "^3.0.0"
+    yaml "^2.9.0"
+    zod "^4.1.11"
+
 language-subtag-registry@^0.3.20:
   version "0.3.23"
   resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz#23529e04d9e3b74679d70142df3fd2eb6ec572e7"
@@ -5346,11 +4369,6 @@ language-tags@^1.0.9:
   dependencies:
     language-subtag-registry "^0.3.20"
 
-leven@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
-  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
-
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -5391,13 +4409,6 @@ listr2@^10.2.1:
     rfdc "^1.4.1"
     wrap-ansi "^10.0.0"
 
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
 locate-path@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
@@ -5450,11 +4461,6 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-lru-cache@^10.2.0:
-  version "10.4.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
-  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
-
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -5462,25 +4468,6 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-make-dir@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
-  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
-  dependencies:
-    semver "^7.5.3"
-
-make-error@^1.1.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
-makeerror@1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
-  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
-  dependencies:
-    tmpl "1.0.5"
-
 map-cache@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -5491,16 +4478,6 @@ math-intrinsics@^1.1.0:
   resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
   integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
 
-memoize-one@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-4.1.0.tgz#a2387c58c03fff27ca390c31b764a79addf3f906"
-  integrity sha512-2GApq0yI/b22J2j9rhbrAlsHb0Qcz+7yWxeLG8h+95sl1XPUgeLimQSOdur4Vw7cUhrBHwaUZxWFZueojqNRzA==
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
 merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
@@ -5519,11 +4496,6 @@ micromatch@^4.0.4, micromatch@^4.0.5, micromatch@^4.0.8:
     braces "^3.0.3"
     picomatch "^2.3.1"
 
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
 mimic-function@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/mimic-function/-/mimic-function-5.0.1.tgz#acbe2b3349f99b9deaca7fb70e48b83e94e67076"
@@ -5536,30 +4508,18 @@ minimatch@^10.0.0, minimatch@^10.2.2, minimatch@^10.2.4:
   dependencies:
     brace-expansion "^5.0.5"
 
-minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.5.tgz#580c88f8d5445f2bd6aa8f3cadefa0de79fbd69e"
   integrity sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^9.0.4:
-  version "9.0.9"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.9.tgz#9b0cb9fcb78087f6fd7eababe2511c4d3d60574e"
-  integrity sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==
-  dependencies:
-    brace-expansion "^2.0.2"
-
-minimist@^1.2.0, minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.3.tgz#79389b4eb1bb2d003a9bba87d492f2bd37bdc65b"
-  integrity sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==
-
 mkdirp@^0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -5651,11 +4611,6 @@ node-fetch@^3.3.2:
     fetch-blob "^3.1.4"
     formdata-polyfill "^4.0.10"
 
-node-int64@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
-  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
-
 node-releases@^2.0.36:
   version "2.0.44"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.44.tgz#212c9b983f5bb70d311dd68c27d55dd0e65d1ca7"
@@ -5686,23 +4641,11 @@ normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
 npm-normalize-package-bin@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-npm-run-path@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
 object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -5776,13 +4719,6 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
 onetime@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-7.0.0.tgz#9f16c92d8c9ef5120e3acd9dd9957cceecc1ab60"
@@ -5839,27 +4775,66 @@ own-keys@^1.0.1:
     object-keys "^1.1.1"
     safe-push-apply "^1.0.0"
 
-p-limit@3.1.0, p-limit@^3.0.2, p-limit@^3.1.0:
+oxc-parser@^0.130.0:
+  version "0.130.0"
+  resolved "https://registry.yarnpkg.com/oxc-parser/-/oxc-parser-0.130.0.tgz#b8f03385db908d9fdfff49c8f37b1748b1f41596"
+  integrity sha512-X0PJ+NmOok8qP3vK9uaW431ngkdM9UPEK7KG466urtIL2+EYTEgbZK2yqe2MWKJKBjRlFweP/pJPx0x9muMEVw==
+  dependencies:
+    "@oxc-project/types" "^0.130.0"
+  optionalDependencies:
+    "@oxc-parser/binding-android-arm-eabi" "0.130.0"
+    "@oxc-parser/binding-android-arm64" "0.130.0"
+    "@oxc-parser/binding-darwin-arm64" "0.130.0"
+    "@oxc-parser/binding-darwin-x64" "0.130.0"
+    "@oxc-parser/binding-freebsd-x64" "0.130.0"
+    "@oxc-parser/binding-linux-arm-gnueabihf" "0.130.0"
+    "@oxc-parser/binding-linux-arm-musleabihf" "0.130.0"
+    "@oxc-parser/binding-linux-arm64-gnu" "0.130.0"
+    "@oxc-parser/binding-linux-arm64-musl" "0.130.0"
+    "@oxc-parser/binding-linux-ppc64-gnu" "0.130.0"
+    "@oxc-parser/binding-linux-riscv64-gnu" "0.130.0"
+    "@oxc-parser/binding-linux-riscv64-musl" "0.130.0"
+    "@oxc-parser/binding-linux-s390x-gnu" "0.130.0"
+    "@oxc-parser/binding-linux-x64-gnu" "0.130.0"
+    "@oxc-parser/binding-linux-x64-musl" "0.130.0"
+    "@oxc-parser/binding-openharmony-arm64" "0.130.0"
+    "@oxc-parser/binding-wasm32-wasi" "0.130.0"
+    "@oxc-parser/binding-win32-arm64-msvc" "0.130.0"
+    "@oxc-parser/binding-win32-ia32-msvc" "0.130.0"
+    "@oxc-parser/binding-win32-x64-msvc" "0.130.0"
+
+oxc-resolver@^11.19.1:
+  version "11.20.0"
+  resolved "https://registry.yarnpkg.com/oxc-resolver/-/oxc-resolver-11.20.0.tgz#2b2a7a76de753b34be1d6031da1604c8cb580b08"
+  integrity sha512-CblytBiV/a/ZXY34dsVU2NxhIOxMXst8CvDCtyBelVITgd7PLrKzbEbA6oKLdPjvDKDzCiW48qzmzZ+mYaqn+g==
+  optionalDependencies:
+    "@oxc-resolver/binding-android-arm-eabi" "11.20.0"
+    "@oxc-resolver/binding-android-arm64" "11.20.0"
+    "@oxc-resolver/binding-darwin-arm64" "11.20.0"
+    "@oxc-resolver/binding-darwin-x64" "11.20.0"
+    "@oxc-resolver/binding-freebsd-x64" "11.20.0"
+    "@oxc-resolver/binding-linux-arm-gnueabihf" "11.20.0"
+    "@oxc-resolver/binding-linux-arm-musleabihf" "11.20.0"
+    "@oxc-resolver/binding-linux-arm64-gnu" "11.20.0"
+    "@oxc-resolver/binding-linux-arm64-musl" "11.20.0"
+    "@oxc-resolver/binding-linux-ppc64-gnu" "11.20.0"
+    "@oxc-resolver/binding-linux-riscv64-gnu" "11.20.0"
+    "@oxc-resolver/binding-linux-riscv64-musl" "11.20.0"
+    "@oxc-resolver/binding-linux-s390x-gnu" "11.20.0"
+    "@oxc-resolver/binding-linux-x64-gnu" "11.20.0"
+    "@oxc-resolver/binding-linux-x64-musl" "11.20.0"
+    "@oxc-resolver/binding-openharmony-arm64" "11.20.0"
+    "@oxc-resolver/binding-wasm32-wasi" "11.20.0"
+    "@oxc-resolver/binding-win32-arm64-msvc" "11.20.0"
+    "@oxc-resolver/binding-win32-x64-msvc" "11.20.0"
+
+p-limit@3.1.0, p-limit@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
     yocto-queue "^0.1.0"
 
-p-limit@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
 p-locate@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
@@ -5867,16 +4842,6 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-package-json-from-dist@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
-  integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
-
 param-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
@@ -5937,7 +4902,7 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-path-key@^3.0.0, path-key@^3.1.0:
+path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
@@ -5959,14 +4924,6 @@ path-root@^0.1.1:
   dependencies:
     path-root-regex "^0.1.0"
 
-path-scurry@^1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
-  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
-  dependencies:
-    lru-cache "^10.2.0"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -5977,7 +4934,7 @@ picocolors@^1.0.0, picocolors@^1.1.1:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
-picomatch@^2.0.4, picomatch@^2.3.1:
+picomatch@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"
   integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==
@@ -5987,18 +4944,6 @@ picomatch@^4.0.3, picomatch@^4.0.4:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.4.tgz#fd6f5e00a143086e074dffe4c924b8fb293b0589"
   integrity sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==
 
-pirates@^4.0.7:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.7.tgz#643b4a18c4257c8a65104b73f3049ce9a0a15e22"
-  integrity sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==
-
-pkg-dir@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
-  dependencies:
-    find-up "^4.0.0"
-
 possible-typed-array-names@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
@@ -6023,16 +4968,6 @@ prettier@^3.3.2:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.8.3.tgz#560f2de55bf01b4c0503bc629d5df99b9a1d09b0"
   integrity sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==
 
-pretty-format@30.4.1:
-  version "30.4.1"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-30.4.1.tgz#0911652e92e1e91f475e3e6a16e628e50649ea69"
-  integrity sha512-K6KiKMHTL4jjX4u3Kir2EW07nRfcqVTXIImx50wbjHQTcZPgg+gjVeNTIT3l3L1Rd4UefxfogquC9J37SoFyyw==
-  dependencies:
-    "@jest/schemas" "30.4.1"
-    ansi-styles "^5.2.0"
-    react-is-18 "npm:react-is@^18.3.1"
-    react-is-19 "npm:react-is@^19.2.5"
-
 prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
@@ -6047,11 +4982,6 @@ punycode@^2.1.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
-pure-rand@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-7.0.1.tgz#6f53a5a9e3e4a47445822af96821ca509ed37566"
-  integrity sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -6073,24 +5003,6 @@ react-dom@^19.2.0:
   dependencies:
     scheduler "^0.27.0"
 
-react-highlight-words@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/react-highlight-words/-/react-highlight-words-0.21.0.tgz#a109acdf7dc6fac3ed7db82e9cba94e8d65c281c"
-  integrity sha512-SdWEeU9fIINArEPO1rO5OxPyuhdEKZQhHzZZP1ie6UeXQf+CjycT1kWaB+9bwGcVbR0NowuHK3RqgqNg6bgBDQ==
-  dependencies:
-    highlight-words-core "^1.2.0"
-    memoize-one "^4.0.0"
-
-"react-is-18@npm:react-is@^18.3.1":
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
-  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
-
-"react-is-19@npm:react-is@^19.2.5":
-  version "19.2.6"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-19.2.6.tgz#aeee6159b159eb7f520d672cffcc69e7052d288f"
-  integrity sha512-XjBR15BhXuylgWGuslhDKqlSayuqvqBX91BP8pauG8kd1zY8kotkNWbXksTCNRarse4kuGbe2kIY05ARtwNIvw==
-
 react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
@@ -6101,19 +5013,6 @@ react-is@^18.2.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
   integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
 
-react-is@^19.2.6:
-  version "19.2.6"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-19.2.6.tgz#aeee6159b159eb7f520d672cffcc69e7052d288f"
-  integrity sha512-XjBR15BhXuylgWGuslhDKqlSayuqvqBX91BP8pauG8kd1zY8kotkNWbXksTCNRarse4kuGbe2kIY05ARtwNIvw==
-
-react-test-renderer@^19.2.0:
-  version "19.2.6"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-19.2.6.tgz#42e9f9fcc4fe11d4bbf7acff536a2e5b8a8cfd45"
-  integrity sha512-GbS6V23YduFTPiWJ5xICbKEjRcqx1Z90js/V5miqhz7qp/d6xSe9Dd6NjSQODFRdzdsqRMPW82E/sFpPRbY5Mw==
-  dependencies:
-    react-is "^19.2.6"
-    scheduler "^0.27.0"
-
 react@^19.2.0:
   version "19.2.6"
   resolved "https://registry.yarnpkg.com/react/-/react-19.2.6.tgz#3dadb8e12b2a7934c1d5317973e5dce1301f9a4d"
@@ -6199,14 +5098,7 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
-resolve-cwd@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
-  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
-  dependencies:
-    resolve-from "^5.0.0"
-
-resolve-from@5.0.0, resolve-from@^5.0.0:
+resolve-from@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
@@ -6330,7 +5222,7 @@ semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.5.3, semver@^7.5.4, semver@^7.7.1, semver@^7.7.2, semver@^7.7.3:
+semver@^7.7.1, semver@^7.7.3:
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.8.0.tgz#ed0661039fcbcda2ce71f01fa6adbefaa77040df"
   integrity sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==
@@ -6466,12 +5358,7 @@ side-channel@^1.1.0:
     side-channel-map "^1.0.1"
     side-channel-weakmap "^1.0.2"
 
-signal-exit@^3.0.3:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
-signal-exit@^4.0.1, signal-exit@^4.1.0:
+signal-exit@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
@@ -6502,6 +5389,11 @@ slide@~1.1.3:
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
   integrity sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==
 
+smol-toml@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/smol-toml/-/smol-toml-1.6.1.tgz#4fceb5f7c4b86c2544024ef686e12ff0983465be"
+  integrity sha512-dWUG8F5sIIARXih1DTaQAX4SsiTXhInKf1buxdY9DIg4ZYPZK5nGM1VRIYmEbDbsHt7USo99xSLFu5Q1IqTmsg==
+
 snake-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
@@ -6515,19 +5407,6 @@ source-map-js@^1.0.2:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
   integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
 
-source-map-support@0.5.13:
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
-  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
 spdx-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/spdx-compare/-/spdx-compare-1.0.0.tgz#2c55f117362078d7409e6d7b08ce70a857cd3ed7"
@@ -6589,23 +5468,11 @@ sponge-case@^2.0.2:
   resolved "https://registry.yarnpkg.com/sponge-case/-/sponge-case-2.0.3.tgz#9e004d04332c307e4895b79eeb6c1f3da86eb203"
   integrity sha512-i4h9ZGRfxV6Xw3mpZSFOfbXjf0cQcYmssGWutgNIfFZ2VM+YIWfD71N/kjjwK6X/AAHzBr+rciEcn/L34S8TGw==
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
-
 stable-hash@^0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stable-hash/-/stable-hash-0.0.5.tgz#94e8837aaeac5b4d0f631d2972adef2924b40269"
   integrity sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==
 
-stack-utils@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
-  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
-  dependencies:
-    escape-string-regexp "^2.0.0"
-
 stop-iteration-iterator@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz#f481ff70a548f6124d0312c3aa14cbfa7aa542ad"
@@ -6624,23 +5491,6 @@ string-env-interpolation@^1.0.1:
   resolved "https://registry.yarnpkg.com/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz#ad4397ae4ac53fe6c91d1402ad6f6a52862c7152"
   integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg==
 
-string-length@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
-  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
-  dependencies:
-    char-regex "^1.0.2"
-    strip-ansi "^6.0.0"
-
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -6650,15 +5500,6 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^5.0.1, string-width@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
-  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
-  dependencies:
-    eastasianwidth "^0.2.0"
-    emoji-regex "^9.2.2"
-    strip-ansi "^7.0.1"
-
 string-width@^7.0.0, string-width@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-7.2.0.tgz#b5bb8e2165ce275d4d43476dd2700ad9091db6dc"
@@ -6744,13 +5585,6 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -6758,7 +5592,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-ansi@^7.0.1, strip-ansi@^7.1.0, strip-ansi@^7.1.2:
+strip-ansi@^7.1.0, strip-ansi@^7.1.2:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.2.0.tgz#d22a269522836a627af8d04b5c3fd2c7fa3e32e3"
   integrity sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==
@@ -6770,20 +5604,10 @@ strip-bom@^3.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
-strip-bom@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
-  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
-
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-
-strip-json-comments@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+strip-json-comments@5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-5.0.3.tgz#b7304249dd402ee67fd518ada993ab3593458bcf"
+  integrity sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==
 
 styled-jsx@5.1.6:
   version "5.1.6"
@@ -6797,7 +5621,7 @@ stylis@^4.3.4:
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.4.0.tgz#c5846c9345f4bfc51bd0cbd7ca35a0744f485a5d"
   integrity sha512-5Z9ZpRzfuH6l/UAvCPAPUo3665Nk2wLaZU3x+TLHKVzIz33+sbJqbtrYoC3KD4/uVOr2Zp+L0LySezP9OHV9yA==
 
-supports-color@8.1.1, supports-color@^8.1.1:
+supports-color@8.1.1:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -6844,22 +5668,6 @@ sync-fetch@0.6.0:
     timeout-signal "^2.0.0"
     whatwg-mimetype "^4.0.0"
 
-synckit@^0.11.8:
-  version "0.11.12"
-  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.12.tgz#abe74124264fbc00a48011b0d98bdc1cffb64a7b"
-  integrity sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==
-  dependencies:
-    "@pkgr/core" "^0.2.9"
-
-test-exclude@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
-  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
-  dependencies:
-    "@istanbuljs/schema" "^0.1.2"
-    glob "^7.1.4"
-    minimatch "^3.0.4"
-
 throttle-debounce@^5.0.0, throttle-debounce@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-5.0.2.tgz#ec5549d84e053f043c9fd0f2a6dd892ff84456b1"
@@ -6870,7 +5678,7 @@ timeout-signal@^2.0.0:
   resolved "https://registry.yarnpkg.com/timeout-signal/-/timeout-signal-2.0.0.tgz#23207ea448d50258bb0defe3beea4a467643abba"
   integrity sha512-YBGpG4bWsHoPvofT6y/5iqulfXIiIErl5B0LdtHT1mGXDFTAhhRrbUpTvBgYbovr+3cKblya2WAOcpoy90XguA==
 
-tinyglobby@^0.2.13, tinyglobby@^0.2.15:
+tinyglobby@^0.2.13, tinyglobby@^0.2.15, tinyglobby@^0.2.16:
   version "0.2.16"
   resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.16.tgz#1c3b7eb953fce42b226bc5a1ee06428281aff3d6"
   integrity sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==
@@ -6885,11 +5693,6 @@ title-case@^3.0.3:
   dependencies:
     tslib "^2.0.3"
 
-tmpl@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
-  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
-
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -6917,25 +5720,6 @@ ts-log@^3.0.0:
   resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-3.0.2.tgz#e37ebc147c63f1ad3de1bee903c26831fd35f9cb"
   integrity sha512-esq6hx2lM66sQV1YcFkIYTqrWWabmqBqobKHyn1CswdI5FgfQhkmiKiRWVGBNlIbdjBxEIkNvMIwLKKPgRYZLQ==
 
-ts-node@^10.9.1:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
-  integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
-  dependencies:
-    "@cspotcode/source-map-support" "^0.8.0"
-    "@tsconfig/node10" "^1.0.7"
-    "@tsconfig/node12" "^1.0.7"
-    "@tsconfig/node14" "^1.0.0"
-    "@tsconfig/node16" "^1.0.2"
-    acorn "^8.4.1"
-    acorn-walk "^8.1.1"
-    arg "^4.1.0"
-    create-require "^1.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    v8-compile-cache-lib "^3.0.1"
-    yn "3.1.1"
-
 tsconfig-paths@^3.15.0:
   version "3.15.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
@@ -6958,16 +5742,6 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-detect@4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
-
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
 typed-array-buffer@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536"
@@ -7028,6 +5802,11 @@ typescript@^6.0.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.3.tgz#90251dc007916e972786cb94d74d15b185577d21"
   integrity sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==
 
+unbash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unbash/-/unbash-3.0.0.tgz#57efd0217212ee4abcb820372c87b64ad3af687d"
+  integrity sha512-FeFPZ/WFT0mbRCuydiZzpPFlrYN8ZUpphQKoq4EeElVIYjYyGzPMxQR/simUwCOJIyVhpFk4RbtyO7RuMpMnHA==
+
 unbox-primitive@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz#8d9d2c9edeea8460c7f35033a88867944934d1e2"
@@ -7067,7 +5846,7 @@ unixify@^1.0.0:
   dependencies:
     normalize-path "^2.1.1"
 
-unrs-resolver@^1.6.2, unrs-resolver@^1.7.11:
+unrs-resolver@^1.6.2:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/unrs-resolver/-/unrs-resolver-1.12.1.tgz#a5322b37be7119528b9742ead43101b4f5c2d4e9"
   integrity sha512-LmOTmcBbFqxu1rzubnqHT6EZeqDYpenlGYwyFhHj7oc1HdyZE+0cLQ+s9SDSK+KKQQKuoJhUbzHQ89Ubwg2Oxg==
@@ -7134,20 +5913,6 @@ util-extend@^1.0.1:
   resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
   integrity sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==
 
-v8-compile-cache-lib@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
-  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
-
-v8-to-istanbul@^9.0.1:
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz#b9572abfa62bd556c16d75fdebc1a411d5ff3175"
-  integrity sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.12"
-    "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^2.0.0"
-
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -7156,12 +5921,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-walker@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
-  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
-  dependencies:
-    makeerror "1.0.12"
+walk-up-path@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-4.0.0.tgz#590666dcf8146e2d72318164f1f2ac6ef51d4198"
+  integrity sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A==
 
 web-streams-polyfill@^3.0.3:
   version "3.3.3"
@@ -7238,15 +6001,6 @@ word-wrap@^1.2.5:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-10.0.0.tgz#b83ddcc14dbc5596f1b07e153bf6f863c1acbb57"
@@ -7265,15 +6019,6 @@ wrap-ansi@^7.0.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
-  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
-  dependencies:
-    ansi-styles "^6.1.0"
-    string-width "^5.0.1"
-    strip-ansi "^7.0.1"
-
 wrap-ansi@^9.0.0:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-9.0.2.tgz#956832dea9494306e6d209eb871643bb873d7c98"
@@ -7288,14 +6033,6 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7"
-  integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^4.0.1"
-
 ws@^8.18.3, ws@^8.20.0:
   version "8.20.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.20.1.tgz#91a9ae2b312ccf98e0a85ec499b48cef45ab0ddb"
@@ -7319,7 +6056,7 @@ yaml-loader@^0.9.0:
     javascript-stringify "^2.0.1"
     yaml "^2.0.0"
 
-yaml@^2.0.0, yaml@^2.3.1:
+yaml@^2.0.0, yaml@^2.3.1, yaml@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.9.0.tgz#78274afd93598a1dfdd6130df6a566defcbf9aa4"
   integrity sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==
@@ -7334,7 +6071,7 @@ yargs-parser@^22.0.0:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-22.0.0.tgz#87b82094051b0567717346ecd00fd14804b357c8"
   integrity sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==
 
-yargs@17.7.2, yargs@^17.7.2:
+yargs@17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -7359,11 +6096,6 @@ yargs@^18.0.0:
     y18n "^5.0.5"
     yargs-parser "^22.0.0"
 
-yn@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
@@ -7379,7 +6111,7 @@ yoctocolors@^2.1.1:
   resolved "https://registry.yarnpkg.com/zod-validation-error/-/zod-validation-error-4.0.2.tgz#bc605eba49ce0fcd598c127fee1c236be3f22918"
   integrity sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==
 
-"zod@^3.25.0 || ^4.0.0":
+"zod@^3.25.0 || ^4.0.0", zod@^4.1.11:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/zod/-/zod-4.4.3.tgz#b680f172885d18bbebf21a834ea25e55a1bbf356"
   integrity sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==

From 4be96ebd64ec1be310bb42545f893a261b82481a Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 28 May 2026 17:12:11 +0200
Subject: [PATCH 060/145] Upgrade Docker images

---
 backend/Dockerfile.development  |  2 +-
 backend/Dockerfile.production   |  2 +-
 docker-compose.development.yaml |  2 +-
 docker-compose.production.yaml  |  2 +-
 frontend/Dockerfile.development | 24 ++++++++++++------------
 frontend/Dockerfile.production  | 16 ++++++++--------
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/backend/Dockerfile.development b/backend/Dockerfile.development
index f0c306079..31d4c0572 100644
--- a/backend/Dockerfile.development
+++ b/backend/Dockerfile.development
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.21
+# syntax=docker/dockerfile:1.23
 # check=error=true;skip=SecretsUsedInArgOrEnv
 # Available versions are listed on https://hub.docker.com/r/docker/dockerfile
 
diff --git a/backend/Dockerfile.production b/backend/Dockerfile.production
index 1eb05b61e..787aede3e 100644
--- a/backend/Dockerfile.production
+++ b/backend/Dockerfile.production
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.21
+# syntax=docker/dockerfile:1.23
 # check=error=true
 # Available versions are listed on https://hub.docker.com/r/docker/dockerfile
 
diff --git a/docker-compose.development.yaml b/docker-compose.development.yaml
index 5efa61628..999995c29 100644
--- a/docker-compose.development.yaml
+++ b/docker-compose.development.yaml
@@ -226,7 +226,7 @@ services:
     pull_policy: "never"
 
   reverse_proxy:
-    image: "nginx:1.29-trixie-otel"
+    image: "nginx:1.31-trixie-otel"
     depends_on:
       backend:
         condition: "service_started"
diff --git a/docker-compose.production.yaml b/docker-compose.production.yaml
index bbcf6b1b4..fcc5fb66b 100644
--- a/docker-compose.production.yaml
+++ b/docker-compose.production.yaml
@@ -181,7 +181,7 @@ services:
     pull_policy: "never"
 
   reverse_proxy:
-    image: "nginx:1.29-trixie-otel"
+    image: "nginx:1.31-trixie-otel"
     depends_on:
       backend:
         condition: "service_started"
diff --git a/frontend/Dockerfile.development b/frontend/Dockerfile.development
index 96ee81553..be4450434 100644
--- a/frontend/Dockerfile.development
+++ b/frontend/Dockerfile.development
@@ -1,11 +1,11 @@
-# syntax=docker/dockerfile:1.21
+# syntax=docker/dockerfile:1.23
 # check=error=true
 # Available versions are listed on https://hub.docker.com/r/docker/dockerfile
 
 # Inspired by https://mherman.org/blog/dockerizing-a-react-app/
 
 # https://hub.docker.com/_/node
-FROM node:24.11-trixie-slim
+FROM node:24.16-trixie-slim
 SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 
 #############
@@ -16,21 +16,21 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run
 RUN apt-get update \
   && apt-get install \
-    --assume-yes \
-    --no-install-recommends \
-    make \
-    tini \
-    wget \
+  --assume-yes \
+  --no-install-recommends \
+  make \
+  tini \
+  wget \
   && rm \
-    --recursive \
-    --force \
-    /var/lib/apt/lists/*
+  --recursive \
+  --force \
+  /var/lib/apt/lists/*
 
 ENV HOME=/home/node
 RUN mkdir --parents ${HOME}/app \
   && chown \
-    node:node \
-    ${HOME}/app \
+  node:node \
+  ${HOME}/app \
   && ln --symbolic ${HOME}/app /app
 
 #############
diff --git a/frontend/Dockerfile.production b/frontend/Dockerfile.production
index 056def371..791074429 100644
--- a/frontend/Dockerfile.production
+++ b/frontend/Dockerfile.production
@@ -1,11 +1,11 @@
-# syntax=docker/dockerfile:1.21
+# syntax=docker/dockerfile:1.23
 # check=error=true
 # Available versions are listed on https://hub.docker.com/r/docker/dockerfile
 
 # Inspired by https://github.com/vercel/next.js/blob/canary/examples/with-docker-multi-env/docker/production/Dockerfile
 # linked to in https://nextjs.org/docs/deployment
 
-FROM node:24.11-trixie-slim AS base
+FROM node:24.16-trixie-slim AS base
 
 FROM base AS dependencies
 SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
@@ -29,13 +29,13 @@ RUN addgroup --system --gid 1001 nodejs \
 RUN apt-get update \
   && apt-get upgrade --assume-yes \
   && apt-get install \
-    --assume-yes \
-    --no-install-recommends \
-    wget \
+  --assume-yes \
+  --no-install-recommends \
+  wget \
   && rm \
-    --recursive \
-    --force \
-    /var/lib/apt/lists/*
+  --recursive \
+  --force \
+  /var/lib/apt/lists/*
 COPY --from=build --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=build --chown=nextjs:nodejs /app/public ./public
 COPY --from=build --chown=nextjs:nodejs /app/.next/static ./.next/static

From 7abaa6bbfcec0abbbc47f113b3596ba0532097aa Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 28 May 2026 17:28:06 +0200
Subject: [PATCH 061/145] Upgrade dependency `concurrently`

---
 frontend/package.json |   2 +-
 frontend/yarn.lock    | 154 +++++++-----------------------------------
 2 files changed, 24 insertions(+), 132 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 5b0cc1ee2..ec406bf66 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -39,7 +39,7 @@
     "@types/react": "^19.2.5",
     "@types/react-dom": "^19.2.3",
     "browserslist": "^4.28.2",
-    "concurrently": "^9.2.1",
+    "concurrently": "^10.0.0",
     "eslint": "^10.1.0",
     "eslint-config-next": "^16.0.8",
     "knip": "^6.14.2",
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 6c5b1b1db..93550ce38 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2366,11 +2366,6 @@ ansi-escapes@^7.0.0:
   dependencies:
     environment "^1.0.0"
 
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
 ansi-regex@^6.2.2:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
@@ -2383,13 +2378,6 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
 ansi-styles@^6.2.1, ansi-styles@^6.2.3:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041"
@@ -2702,13 +2690,10 @@ capital-case@^1.0.4:
     tslib "^2.0.3"
     upper-case-first "^2.0.2"
 
-chalk@4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
+chalk@5.6.2, chalk@^5.6.0:
+  version "5.6.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.6.2.tgz#b1238b6e23ea337af71c7f8a295db5af0c158aea"
+  integrity sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==
 
 chalk@^2.4.1:
   version "2.4.2"
@@ -2719,11 +2704,6 @@ chalk@^2.4.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^5.6.0:
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.6.2.tgz#b1238b6e23ea337af71c7f8a295db5af0c158aea"
-  integrity sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==
-
 change-case-all@1.0.15:
   version "1.0.15"
   resolved "https://registry.yarnpkg.com/change-case-all/-/change-case-all-1.0.15.tgz#de29393167fc101d646cd76b0ef23e27d09756ad"
@@ -2803,15 +2783,6 @@ client-only@0.0.1:
   resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1"
   integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==
 
-cliui@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
-  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.1"
-    wrap-ansi "^7.0.0"
-
 cliui@^9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-9.0.1.tgz#6f7890f386f6f1f79953adc1f78dec46fcc2d291"
@@ -2833,23 +2804,11 @@ color-convert@^1.9.0:
   dependencies:
     color-name "1.1.3"
 
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
 common-tags@1.8.2:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
@@ -2865,17 +2824,17 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-concurrently@^9.2.1:
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-9.2.1.tgz#248ea21b95754947be2dad9c3e4b60f18ca4e44f"
-  integrity sha512-fsfrO0MxV64Znoy8/l1vVIjjHa29SZyyqPgQBwhiDcaW8wJc2W3XWVOGx4M3oJBnv/zdUZIIp1gDeS98GzP8Ng==
+concurrently@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-10.0.0.tgz#ceb3782d36a620ae7c05ff8085076c0d96323479"
+  integrity sha512-DRrk10z3sVPpguNe8od2cGNqZGqbT15rwAnxD4dG3b78mdNNb/gJyr8T834Oj518WcBmTktrt4FhdwZn09ZWSg==
   dependencies:
-    chalk "4.1.2"
+    chalk "5.6.2"
     rxjs "7.8.2"
-    shell-quote "1.8.3"
-    supports-color "8.1.1"
+    shell-quote "1.8.4"
+    supports-color "10.2.2"
     tree-kill "1.2.2"
-    yargs "17.7.2"
+    yargs "18.0.0"
 
 constant-case@^3.0.4:
   version "3.0.4"
@@ -3100,11 +3059,6 @@ emoji-regex@^10.3.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.6.0.tgz#bf3d6e8f7f8fd22a65d9703475bc0147357a6b0d"
   integrity sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==
 
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
 emoji-regex@^9.2.2:
   version "9.2.2"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
@@ -3817,11 +3771,6 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
 has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
@@ -4052,11 +4001,6 @@ is-finalizationregistry@^1.1.0:
   dependencies:
     call-bound "^1.0.3"
 
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
 is-fullwidth-code-point@^5.0.0, is-fullwidth-code-point@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz#046b2a6d4f6b156b2233d3207d4b5a9783999b98"
@@ -5093,11 +5037,6 @@ remove-trailing-spaces@^1.0.6:
   resolved "https://registry.yarnpkg.com/remove-trailing-spaces/-/remove-trailing-spaces-1.0.9.tgz#39c270a309ea16fda84253ffbdeb1b5afa0aa271"
   integrity sha512-xzG7w5IRijvIkHIjDk65URsJJ7k4J95wmcArY5PRcmjldIOl7oTvG8+X2Ag690R7SfwiOcHrWZKVc1Pp5WIOzA==
 
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
-
 resolve-from@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
@@ -5313,7 +5252,12 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@1.8.3, shell-quote@^1.7.3:
+shell-quote@1.8.4:
+  version "1.8.4"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.4.tgz#2edd9a4dcefc96649e2e2cb12f637b1f1d92a190"
+  integrity sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==
+
+shell-quote@^1.7.3:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.3.tgz#55e40ef33cf5c689902353a3d8cd1a6725f08b4b"
   integrity sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==
@@ -5491,15 +5435,6 @@ string-env-interpolation@^1.0.1:
   resolved "https://registry.yarnpkg.com/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz#ad4397ae4ac53fe6c91d1402ad6f6a52862c7152"
   integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg==
 
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
 string-width@^7.0.0, string-width@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-7.2.0.tgz#b5bb8e2165ce275d4d43476dd2700ad9091db6dc"
@@ -5585,13 +5520,6 @@ string.prototype.trimstart@^1.0.8:
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^7.1.0, strip-ansi@^7.1.2:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.2.0.tgz#d22a269522836a627af8d04b5c3fd2c7fa3e32e3"
@@ -5621,12 +5549,10 @@ stylis@^4.3.4:
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.4.0.tgz#c5846c9345f4bfc51bd0cbd7ca35a0744f485a5d"
   integrity sha512-5Z9ZpRzfuH6l/UAvCPAPUo3665Nk2wLaZU3x+TLHKVzIz33+sbJqbtrYoC3KD4/uVOr2Zp+L0LySezP9OHV9yA==
 
-supports-color@8.1.1:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
+supports-color@10.2.2:
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-10.2.2.tgz#466c2978cc5cd0052d542a0b576461c2b802ebb4"
+  integrity sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g==
 
 supports-color@^5.3.0:
   version "5.5.0"
@@ -5635,13 +5561,6 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
@@ -6010,15 +5929,6 @@ wrap-ansi@^10.0.0:
     string-width "^8.2.0"
     strip-ansi "^7.1.2"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^9.0.0:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-9.0.2.tgz#956832dea9494306e6d209eb871643bb873d7c98"
@@ -6061,30 +5971,12 @@ yaml@^2.0.0, yaml@^2.3.1, yaml@^2.9.0:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.9.0.tgz#78274afd93598a1dfdd6130df6a566defcbf9aa4"
   integrity sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==
 
-yargs-parser@^21.1.1:
-  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
-  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-
 yargs-parser@^22.0.0:
   version "22.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-22.0.0.tgz#87b82094051b0567717346ecd00fd14804b357c8"
   integrity sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==
 
-yargs@17.7.2:
-  version "17.7.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
-  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
-yargs@^18.0.0:
+yargs@18.0.0, yargs@^18.0.0:
   version "18.0.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-18.0.0.tgz#6c84259806273a746b09f579087b68a3c2d25bd1"
   integrity sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==

From c5a83df3033d830f9b1609e5dc5d4f48bc280bbe Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 28 May 2026 18:46:34 +0200
Subject: [PATCH 062/145] Upgrade PostgreSQL to the latest major version, that
 is, 18 (and add automatic upgrade service)

---
 backend/src/Startup.cs          |  2 +-
 docker-compose.development.yaml | 24 +++++++++++++++++++++---
 docker-compose.production.yaml  | 24 +++++++++++++++++++++---
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/backend/src/Startup.cs b/backend/src/Startup.cs
index cc60dda5a..a21156a19 100644
--- a/backend/src/Startup.cs
+++ b/backend/src/Startup.cs
@@ -219,7 +219,7 @@ DbContextOptionsBuilder options
                 connectionStringBuilder.ConnectionString,
                 _ => _
                     // Keep version in sync with the one in ./docker-compose.*.yaml
-                    .SetPostgresVersion(13, 23)
+                    .SetPostgresVersion(18, 4)
                     .UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery) // https://learn.microsoft.com/en-us/ef/core/querying/single-split-queries#enabling-split-queries-globally
                     .UseNodaTime()
                     // https://www.npgsql.org/efcore/mapping/enum.html
diff --git a/docker-compose.development.yaml b/docker-compose.development.yaml
index 999995c29..1c70f5084 100644
--- a/docker-compose.development.yaml
+++ b/docker-compose.development.yaml
@@ -2,11 +2,29 @@
 name: "${NAME:?required}_${ENVIRONMENT:?required}"
 
 services:
+  # Upgrade PostgreSQL major version if necessary
+  # https://hub.docker.com/r/pgautoupgrade/pgautoupgrade#one-shot-mode
+  upgrade_postgres:
+    # Keep major version in sync with the one in the service `database`
+    image: "pgautoupgrade/pgautoupgrade:18-trixie"
+    volumes:
+      - data:/var/lib/postgresql
+    environment:
+      PGAUTO_ONESHOT: "yes"
+      POSTGRES_USER: "${POSTGRES_USER:?required}"
+      POSTGRES_PASSWORD: "${POSTGRES_PASSWORD:?required}"
+    network_mode: "none"
+    restart: "no"
+
   database:
-    # Keep version in sync with the one in `Startup.cs`
-    image: "postgres:13.23-trixie"
+    # Keep version in sync with the one in in the service `upgrade_postgres`
+    # and with the one in `Startup.cs`
+    image: "postgres:18.4-trixie"
+    depends_on:
+      upgrade_postgres:
+        condition: "service_completed_successfully"
     volumes:
-      - data:/var/lib/postgresql/data
+      - data:/var/lib/postgresql
       - ./.psqlrc:/etc/postgresql-common/psqlrc:ro
     environment:
       POSTGRES_USER: "${POSTGRES_USER:?required}"
diff --git a/docker-compose.production.yaml b/docker-compose.production.yaml
index fcc5fb66b..3e491f0a4 100644
--- a/docker-compose.production.yaml
+++ b/docker-compose.production.yaml
@@ -2,11 +2,29 @@
 name: "${NAME:?required}_${ENVIRONMENT:?required}"
 
 services:
+  # Upgrade PostgreSQL major version if necessary
+  # https://hub.docker.com/r/pgautoupgrade/pgautoupgrade#one-shot-mode
+  upgrade_postgres:
+    # Keep major version in sync with the one in the service `database`
+    image: "pgautoupgrade/pgautoupgrade:18-trixie"
+    volumes:
+      - data:/var/lib/postgresql
+    environment:
+      PGAUTO_ONESHOT: "yes"
+      POSTGRES_USER: "${POSTGRES_USER:?required}"
+      POSTGRES_PASSWORD: "${POSTGRES_PASSWORD:?required}"
+    network_mode: "none"
+    restart: "no"
+
   database:
-    # Keep version in sync with the one in `Startup.cs`
-    image: "postgres:13.23-trixie"
+    # Keep version in sync with the one in in the service `upgrade_postgres`
+    # and with the one in `Startup.cs`
+    image: "postgres:18.4-trixie"
+    depends_on:
+      upgrade_postgres:
+        condition: "service_completed_successfully"
     volumes:
-      - data:/var/lib/postgresql/data
+      - data:/var/lib/postgresql
       - ./.psqlrc:/etc/postgresql-common/psqlrc:ro
     environment:
       POSTGRES_USER: "${POSTGRES_USER:?required}"

From 409a5ee80df68fd990caae1d5d9288dd3441f74b Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 28 May 2026 18:51:05 +0200
Subject: [PATCH 063/145] Align placeholders

---
 frontend/components/JumpToId.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/JumpToId.tsx b/frontend/components/JumpToId.tsx
index 5356e671d..ea0f2c019 100644
--- a/frontend/components/JumpToId.tsx
+++ b/frontend/components/JumpToId.tsx
@@ -33,7 +33,7 @@ export default function JumpToId({ query, route, style }: JumpToIdProps) {
         />
       ) : (
         <Input
-          placeholder="ID"
+          placeholder="Paste ID..."
           style={{ fontFamily: "monospace", minWidth: "66ch", ...style }}
           maxLength={36}
           onChange={(e) => setId(e.target.value)}

From 4fdfbc70c9ba0302f2150f84e84d58b35692e740 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Mon, 1 Jun 2026 18:27:31 +0200
Subject: [PATCH 064/145] Add pull policy to PostgreSQL upgrade service

---
 docker-compose.development.yaml | 1 +
 docker-compose.production.yaml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docker-compose.development.yaml b/docker-compose.development.yaml
index 1c70f5084..8a8072687 100644
--- a/docker-compose.development.yaml
+++ b/docker-compose.development.yaml
@@ -15,6 +15,7 @@ services:
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD:?required}"
     network_mode: "none"
     restart: "no"
+    pull_policy: "always"
 
   database:
     # Keep version in sync with the one in in the service `upgrade_postgres`
diff --git a/docker-compose.production.yaml b/docker-compose.production.yaml
index 3e491f0a4..3ea64d71f 100644
--- a/docker-compose.production.yaml
+++ b/docker-compose.production.yaml
@@ -15,6 +15,7 @@ services:
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD:?required}"
     network_mode: "none"
     restart: "no"
+    pull_policy: "always"
 
   database:
     # Keep version in sync with the one in in the service `upgrade_postgres`

From 8af368396ddb2a9feef583513e29d892f087f66c Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 2 Jun 2026 18:40:16 +0200
Subject: [PATCH 065/145] Redirect users to dedicated error page when an .NET
 Core error occurs and add query to get OIDC application by client ID

---
 .../src/Configuration/AuthConfiguration.cs    |   1 +
 .../Controllers/AuthorizationController.cs    |   7 +-
 backend/src/Controllers/ErrorController.cs    |  24 ++
 backend/src/GraphQl/DataLoaders.cs            |   2 +-
 .../GnuPgKeyFingerprintDataLoaders.cs         |   2 +-
 .../Institutions/InstitutionMutations.cs      |   6 +-
 .../OpenIdConnectApplicationDataLoaders.cs    |  18 +
 .../OpenIdConnectApplicationQueries.cs        |  33 +-
 backend/src/GraphQl/Sorting.cs                |   2 +-
 backend/src/Startup.cs                        |   2 +-
 .../GraphQlSchemaTests.IsUnchanged.snap       | 326 +++++++++---------
 11 files changed, 242 insertions(+), 181 deletions(-)
 create mode 100644 backend/src/Controllers/ErrorController.cs

diff --git a/backend/src/Configuration/AuthConfiguration.cs b/backend/src/Configuration/AuthConfiguration.cs
index 612bd408f..6af58dea6 100644
--- a/backend/src/Configuration/AuthConfiguration.cs
+++ b/backend/src/Configuration/AuthConfiguration.cs
@@ -531,6 +531,7 @@ AppSettings appSettings
                  .EnableStatusCodePagesIntegration() // https://documentation.openiddict.com/integrations/aspnet-core#status-code-pages-middleware-integration
                  .EnableRedirectionEndpointPassthrough() // https://documentation.openiddict.com/integrations/aspnet-core#pass-through-mode
                  .EnablePostLogoutRedirectionEndpointPassthrough();
+
                 // .DisableTransportSecurityRequirement(); // https://documentation.openiddict.com/integrations/aspnet-core#transport-security-requirement
 
                 // Register the System.Net.Http integration and use the identity of the current
diff --git a/backend/src/Controllers/AuthorizationController.cs b/backend/src/Controllers/AuthorizationController.cs
index d9492d79f..9bd26766f 100644
--- a/backend/src/Controllers/AuthorizationController.cs
+++ b/backend/src/Controllers/AuthorizationController.cs
@@ -421,7 +421,12 @@ public async Task<IActionResult> Deny()
         // Remove the `AuthenticationConstants.IdentityApplicationScheme`
         // cookie as it was only needed to authenticate the user.
         await signInManager.SignOutAsync();
-        return Forbid(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
+        var properties = new AuthenticationProperties(new Dictionary<string, string?>
+        {
+            [OpenIddictServerAspNetCoreConstants.Properties.Error] = Errors.AccessDenied,
+            [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] = "The user denied the authorization request."
+        });
+        return Forbid(properties, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
     }
 
     #endregion
diff --git a/backend/src/Controllers/ErrorController.cs b/backend/src/Controllers/ErrorController.cs
new file mode 100644
index 000000000..8e19c32a9
--- /dev/null
+++ b/backend/src/Controllers/ErrorController.cs
@@ -0,0 +1,24 @@
+using Metabase.ViewModels.Common;
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Metabase.Controllers;
+
+public class ErrorController : Controller
+{
+    [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+    [Route("~/error")]
+    public IActionResult Error()
+    {
+        var response = HttpContext.GetOpenIddictServerResponse() ?? HttpContext.GetOpenIddictClientResponse();
+        if (response is not null)
+        {
+            return View(new ErrorViewModel
+            {
+                Error = response.Error,
+                ErrorDescription = response.ErrorDescription
+            });
+        }
+        return View(new ErrorViewModel());
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataLoaders.cs b/backend/src/GraphQl/DataLoaders.cs
index 4659b1614..91b83b6ac 100644
--- a/backend/src/GraphQl/DataLoaders.cs
+++ b/backend/src/GraphQl/DataLoaders.cs
@@ -123,4 +123,4 @@ await getAssociations(databaseContext)
             .With(queryContext, _ => _.AddDescending(getOneId).AddDescending(getOtherId))
             .ToBatchPageAsync(getOneId, pagingArguments, cancellationToken);
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintDataLoaders.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintDataLoaders.cs
index 69ca3178a..b445a5fd5 100644
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintDataLoaders.cs
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintDataLoaders.cs
@@ -46,4 +46,4 @@ CancellationToken cancellationToken
             .With(queryContext, Sorting.DefaultEntityOrder)
             .ToDictionaryAsync(_ => _.Fingerprint, cancellationToken);
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Institutions/InstitutionMutations.cs b/backend/src/GraphQl/Institutions/InstitutionMutations.cs
index 89d7e7bd7..7ce521e7d 100644
--- a/backend/src/GraphQl/Institutions/InstitutionMutations.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionMutations.cs
@@ -172,9 +172,9 @@ input.InstitutionId is null
         if (institution.State == InstitutionState.PENDING)
         {
             var verifiers = await authorization.GetUsersInRoleAsync(UserRole.VERIFIER);
-            var institutionsUri = new UriBuilder(appSettings.Uri)
+            var institutionUri = new UriBuilder(appSettings.Uri)
             {
-                Path = "/institutions"
+                Path = $"/institutions/{institution.Id:D}"
             }.Uri;
             await Task.WhenAll(
                 verifiers.Select(verifier =>
@@ -183,7 +183,7 @@ verifier.Email is null
                         : emailSender.SendAsync(
                             (verifier.Name, verifier.Email),
                             $"New institution `{institution.Name}` in metabase awaits verification",
-                            $"Dear {verifier.Name}, please verify institution '{institution.Name}' with UUID {institution.Id:D} on {institutionsUri.AbsoluteUri} Have a nice day! :-)"
+                            $"Dear {verifier.Name}, please verify institution '{institution.Name}' with UUID '{institution.Id:D}' on {institutionUri.AbsoluteUri} Have a nice day! :-)"
                         )
                 )
             );
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationDataLoaders.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationDataLoaders.cs
index 6d0b3ed8f..9e973ca89 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationDataLoaders.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationDataLoaders.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut;
@@ -29,4 +30,21 @@ CancellationToken cancellationToken
             cancellationToken
         );
     }
+
+    [DataLoader]
+    public static async ValueTask<IReadOnlyDictionary<string, OpenIdConnectApplication>> GetOpenIdConnectApplicationByClientIdAsync(
+        IReadOnlyList<string> clientIds,
+        QueryContext<OpenIdConnectApplication> queryContext,
+        IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        CancellationToken cancellationToken
+    )
+    {
+        await using var databaseContext =
+            databaseContextFactory.CreateDbContext();
+        return await databaseContext.OpenIdConnectApplications
+            .AsNoTrackingWithIdentityResolution()
+            .Where(_ => clientIds.Contains(_.ClientId ?? ""))
+            .With(queryContext, Sorting.DefaultEntityOrder)
+            .ToDictionaryAsync(_ => _.ClientId ?? "", cancellationToken);
+    }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
index f2c0841ac..628d5f3b0 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
@@ -55,9 +55,8 @@ CancellationToken cancellationToken
     // These checks should be possible even if the application cannot be
     // managed. From a security perspective it may be better to provide a way
     // to just check existence without getting any other information.
-    // TODO [Authorize(Policy = AuthorizationPolicies.ManageOpenIdConnectScopePolicy)]
     [Authorize(Policy = AuthorizationPolicies.WriteScopePolicy)]
-    public async ValueTask<HotChocolate.Types.Pagination.Connection<OpenIdConnectApplication>> GetOpenIdConnectApplicationsAsync(
+    public ValueTask<HotChocolate.Types.Pagination.Connection<OpenIdConnectApplication>> GetOpenIdConnectApplicationsAsync(
         IResolverContext resolverContext,
         ApplicationDbContext databaseContext,
         ClaimsPrincipal claimsPrincipal,
@@ -65,12 +64,11 @@ CancellationToken cancellationToken
         CancellationToken cancellationToken
     )
     {
-        // TODO See comment and todo above
         // if (!await authorization.IsAuthorizedToManageOpenIdConnect(claimsPrincipal, cancellationToken))
         // {
         //     return HotChocolate.Types.Pagination.Connection.Empty<OpenIdConnectApplication>();
         // }
-        return await databaseContext.OpenIdConnectApplications
+        return databaseContext.OpenIdConnectApplications
             .AsNoTracking()
             .With(resolverContext.GetQueryContext<OpenIdConnectApplication>(), Sorting.DefaultEntityOrder)
             .ToPageAsync(resolverContext.GetPagingArguments(), cancellationToken)
@@ -78,8 +76,8 @@ CancellationToken cancellationToken
     }
 
     [UseUserManager]
-    [Authorize(Policy = AuthorizationPolicies.ManageOpenIdConnectScopePolicy)]
-    public async Task<OpenIdConnectApplication?> GetOpenIdConnectApplicationAsync(
+    [Authorize(Policy = AuthorizationPolicies.WriteScopePolicy)]
+    public Task<OpenIdConnectApplication?> GetOpenIdConnectApplicationAsync(
         Guid id,
         IOpenIdConnectApplicationByIdDataLoader byId,
         ClaimsPrincipal claimsPrincipal,
@@ -87,10 +85,23 @@ CancellationToken cancellationToken
         CancellationToken cancellationToken
     )
     {
-        if (!await authorization.IsAuthorizedToManageApplication(claimsPrincipal, id, cancellationToken))
-        {
-            return null;
-        }
-        return await byId.LoadAsync(id, cancellationToken);
+        // if (!await authorization.IsAuthorizedToManageApplication(claimsPrincipal, id, cancellationToken))
+        // {
+        //     return null;
+        // }
+        return byId.LoadAsync(id, cancellationToken);
+    }
+
+    [UseUserManager]
+    [Authorize(Policy = AuthorizationPolicies.WriteScopePolicy)]
+    public Task<OpenIdConnectApplication?> GetOpenIdConnectApplicationByClientIdAsync(
+        string clientId,
+        IOpenIdConnectApplicationByClientIdDataLoader byId,
+        ClaimsPrincipal claimsPrincipal,
+        Authorization.OpenIdConnectAuthorization authorization,
+        CancellationToken cancellationToken
+    )
+    {
+        return byId.LoadAsync(clientId, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Sorting.cs b/backend/src/GraphQl/Sorting.cs
index 75c68bb46..b7fe329bd 100644
--- a/backend/src/GraphQl/Sorting.cs
+++ b/backend/src/GraphQl/Sorting.cs
@@ -8,7 +8,7 @@ public static class Sorting
     public static SortDefinition<TEntity> DefaultEntityOrder<TEntity>(
         SortDefinition<TEntity> sort
     )
-    where TEntity : class, IEntity//, IAuditable
+        where TEntity : class, IEntity//, IAuditable
     {
         // always sort by primary key to make pagination cursors unique
         return sort
diff --git a/backend/src/Startup.cs b/backend/src/Startup.cs
index a21156a19..a06058805 100644
--- a/backend/src/Startup.cs
+++ b/backend/src/Startup.cs
@@ -315,7 +315,7 @@ public void Configure(WebApplication app)
             // app.UseHsts(); // Done by the reverse proxy, see https://www.nginx.com/blog/http-strict-transport-security-hsts-and-nginx/
         }
 
-        app.UseStatusCodePages(); // [UseStatusCodePages](https://learn.microsoft.com/en-us/aspnet/core/fundamentals/error-handling?view=aspnetcore-9.0#usestatuscodepages)
+        app.UseStatusCodePagesWithReExecute("/error"); //[UseStatusCodePages](https://learn.microsoft.com/en-us/aspnet/core/fundamentals/error-handling?view=aspnetcore-9.0#usestatuscodepages)
         // app.UseHttpsRedirection(); // Done by the reverse proxy
         app.UseSerilogRequestLogging();
         app.UseStaticFiles();
diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index 68e620d85..12e8f52e1 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -228,6 +228,8 @@ type Query {
   nodes("The list of node IDs." ids: [ID!]!): [Node]! @cost(weight: "10")
   openIdConnectApplication(id: Uuid!): OpenIdConnectApplication
     @cost(weight: "10")
+  openIdConnectApplicationByClientId(clientId: String!): OpenIdConnectApplication
+    @cost(weight: "10")
   openIdConnectApplications(
     "Returns the elements in the list that come after the specified cursor."
     after: String
@@ -4499,108 +4501,110 @@ input VerifyInstitutionInput {
 }
 
 enum AddComponentAssemblyErrorCode {
-  DUPLICATE
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ASSEMBLED_COMPONENT
   UNKNOWN_PART_COMPONENT
+  DUPLICATE
+  UNAUTHORIZED
 }
 
 enum AddComponentGeneralizationErrorCode {
-  DUPLICATE
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_CONCRETE_COMPONENT
   UNKNOWN_GENERAL_COMPONENT
+  UNKNOWN_CONCRETE_COMPONENT
+  DUPLICATE
+  UNAUTHORIZED
 }
 
 enum AddComponentManufacturerErrorCode {
-  DUPLICATE
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_COMPONENT
   UNKNOWN_INSTITUTION
+  UNAUTHORIZED
+  DUPLICATE
 }
 
 enum AddComponentVariantErrorCode {
-  DUPLICATE
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ONE_COMPONENT
   UNKNOWN_OTHER_COMPONENT
+  DUPLICATE
+  UNAUTHORIZED
 }
 
 enum AddGnuPgKeyFingerprintErrorCode {
-  DUPLICATE_FINGERPRINT
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_INSTITUTION
+  DUPLICATE_FINGERPRINT
   UNKNOWN_KEY
 }
 
 enum AddInstitutionMethodDeveloperErrorCode {
-  DUPLICATE
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_INSTITUTION
   UNKNOWN_METHOD
+  UNKNOWN_INSTITUTION
+  UNAUTHORIZED
+  DUPLICATE
 }
 
 enum AddInstitutionRepresentativeErrorCode {
-  DUPLICATE
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
   UNKNOWN_USER
+  DUPLICATE
+  UNAUTHORIZED
 }
 
 enum AddUserMethodDeveloperErrorCode {
-  DUPLICATE
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_METHOD
   UNKNOWN_USER
+  UNAUTHORIZED
+  DUPLICATE
 }
 
 enum AddUserRoleErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_USER
+  UNAUTHORIZED
 }
 
 enum AllowGnuPgKeyFingerprintErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_FINGERPRINT
 }
 
 "Defines when a policy shall be executed."
 enum ApplyPolicy {
-  "After the resolver was executed."
-  AFTER_RESOLVER
   "Before the resolver was executed."
   BEFORE_RESOLVER
+  "After the resolver was executed."
+  AFTER_RESOLVER
   "The policy is applied in the validation step before the execution."
   VALIDATION
 }
 
 enum ChangeInstitutionRepresentativeRoleErrorCode {
-  LAST_OWNER
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
-  UNKNOWN_REPRESENTATIVE
   UNKNOWN_USER
+  UNAUTHORIZED
+  UNKNOWN_REPRESENTATIVE
+  LAST_OWNER
 }
 
 enum ChangeUserEmailErrorCode {
-  UNCHANGED_EMAIL
   UNKNOWN
-  UNKNOWN_CURRENT_EMAIL
   UNKNOWN_USER
+  UNCHANGED_EMAIL
+  UNKNOWN_CURRENT_EMAIL
 }
 
 enum ChangeUserPasswordErrorCode {
+  UNKNOWN
+  UNKNOWN_USER
   NO_PASSWORD
   PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
@@ -4608,120 +4612,118 @@ enum ChangeUserPasswordErrorCode {
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
-  UNKNOWN
-  UNKNOWN_USER
 }
 
 enum CoatedSide {
+  PRIME
+  NON_PRIME
   BOTH
   NEITHER
-  NON_PRIME
-  NOT_APPLICABLE
-  PRIME
   UNKNOWN
+  NOT_APPLICABLE
 }
 
 enum ComponentCategory {
-  LAYER
   MATERIAL
+  LAYER
   UNIT
 }
 
 enum ConfirmComponentManufacturerErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_COMPONENT
   UNKNOWN_INSTITUTION
+  UNAUTHORIZED
   UNKNOWN_MANUFACTURER
 }
 
 enum ConfirmInstitutionMethodDeveloperErrorCode {
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_DEVELOPER
-  UNKNOWN_INSTITUTION
   UNKNOWN_METHOD
+  UNKNOWN_INSTITUTION
+  UNAUTHORIZED
+  UNKNOWN_DEVELOPER
 }
 
 enum ConfirmInstitutionRepresentativeErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
-  UNKNOWN_REPRESENTATIVE
   UNKNOWN_USER
+  UNAUTHORIZED
+  UNKNOWN_REPRESENTATIVE
 }
 
 enum ConfirmUserEmailChangeErrorCode {
+  UNKNOWN
   DUPLICATE_EMAIL
   INVALID_CONFIRMATION_CODE
-  UNKNOWN
   UNKNOWN_USER
 }
 
 enum ConfirmUserEmailErrorCode {
-  INVALID_CONFIRMATION_CODE
   UNKNOWN
   UNKNOWN_USER
+  INVALID_CONFIRMATION_CODE
 }
 
 enum ConfirmUserMethodDeveloperErrorCode {
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_DEVELOPER
   UNKNOWN_METHOD
   UNKNOWN_USER
+  UNAUTHORIZED
+  UNKNOWN_DEVELOPER
 }
 
 enum CreateComponentErrorCode {
-  AMBIGUOUS_REFERENCE
-  DUPLICATE_COMPONENT_ID
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_MANAGER
   UNKNOWN_MANUFACTURER
+  UNAUTHORIZED
+  AMBIGUOUS_REFERENCE
+  DUPLICATE_COMPONENT_ID
 }
 
 enum CreateDatabaseErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_OPERATOR
 }
 
 enum CreateDataFormatErrorCode {
-  TWO_REFERENCES
-  UNAUTHORIZED
   UNKNOWN
+  TWO_REFERENCES
   UNKNOWN_MANAGER
+  UNAUTHORIZED
 }
 
 enum CreateInstitutionErrorCode {
-  DUPLICATE_INSTITUTION_ID
-  NEITHER_OWNER_NOR_MANAGER
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_MANAGER
+  NEITHER_OWNER_NOR_MANAGER
   UNKNOWN_OWNERS
+  UNKNOWN_MANAGER
+  UNAUTHORIZED
+  DUPLICATE_INSTITUTION_ID
 }
 
 enum CreateMethodErrorCode {
-  TWO_REFERENCES
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_INSTITUTION_DEVELOPERS
+  TWO_REFERENCES
   UNKNOWN_MANAGER
+  UNKNOWN_INSTITUTION_DEVELOPERS
   UNKNOWN_USER_DEVELOPERS
+  UNAUTHORIZED
 }
 
 enum CreateOpenIdConnectApplicationErrorCode {
+  UNKNOWN
+  UNAUTHORIZED
+  UNKNOWN_INSTITUTION
   DUPLICATE_CLIENT_ID
   ILLEGAL_CONSENT_TYPE
-  ILLEGAL_ENDPOINT
+  ILLEGAL_SCOPE
   ILLEGAL_GRANT_TYPE
+  ILLEGAL_ENDPOINT
   ILLEGAL_RESPONSE_TYPE
-  ILLEGAL_SCOPE
-  UNAUTHORIZED
-  UNKNOWN
-  UNKNOWN_INSTITUTION
 }
 
 enum DatabaseVerificationState {
@@ -4739,35 +4741,35 @@ enum DataKind {
 }
 
 enum DeleteInstitutionErrorCode {
-  MANAGING
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
+  UNAUTHORIZED
+  MANAGING
 }
 
 enum DeleteOpenIdConnectApplicationErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_APPLICATION
 }
 
 enum DeleteOpenIdConnectAuthorizationErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_AUTHORIZATION
 }
 
 enum DeletePersonalUserDataErrorCode {
-  INCORRECT_PASSWORD
-  MISSING_PASSWORD
   UNKNOWN
   UNKNOWN_USER
+  MISSING_PASSWORD
+  INCORRECT_PASSWORD
 }
 
 enum DeleteUserErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_USER
+  UNAUTHORIZED
 }
 
 enum DisableUserTwoFactorAuthenticationErrorCode {
@@ -4776,15 +4778,15 @@ enum DisableUserTwoFactorAuthenticationErrorCode {
 }
 
 enum EnableUserTwoFactorAuthenticatorErrorCode {
-  ENABLING_FAILED
-  INVALID_VERIFICATION_CODE
   UNKNOWN
   UNKNOWN_USER
+  ENABLING_FAILED
+  INVALID_VERIFICATION_CODE
 }
 
 enum ForbidGnuPgKeyFingerprintErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_FINGERPRINT
 }
 
@@ -4794,28 +4796,28 @@ enum ForgetUserTwoFactorAuthenticationClientErrorCode {
 }
 
 enum GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUriErrorCode {
-  GETTING_AUTHENTICATOR_KEY_FAILED
-  GETTING_EMAIL_FAILED
-  RESETTING_AUTHENTICATOR_KEY_FAILED
   UNKNOWN
   UNKNOWN_USER
+  RESETTING_AUTHENTICATOR_KEY_FAILED
+  GETTING_AUTHENTICATOR_KEY_FAILED
+  GETTING_EMAIL_FAILED
 }
 
 enum GenerateUserTwoFactorRecoveryCodesErrorCode {
-  CODE_GENERATION_FAILED
-  TWO_FACTOR_AUTHENTICATION_DISABLED
   UNKNOWN
   UNKNOWN_USER
+  TWO_FACTOR_AUTHENTICATION_DISABLED
+  CODE_GENERATION_FAILED
 }
 
 enum InstitutionOperatingState {
-  NOT_OPERATING
   OPERATING
+  NOT_OPERATING
 }
 
 enum InstitutionRepresentativeRole {
-  ASSISTANT
   OWNER
+  ASSISTANT
 }
 
 enum InstitutionState {
@@ -4824,14 +4826,14 @@ enum InstitutionState {
 }
 
 enum JsonValueKind {
-  ARRAY
-  FALSE
-  NULL
-  NUMBER
+  UNDEFINED
   OBJECT
+  ARRAY
   STRING
+  NUMBER
   TRUE
-  UNDEFINED
+  FALSE
+  NULL
 }
 
 enum LoginUserErrorCode {
@@ -4842,19 +4844,19 @@ enum LoginUserErrorCode {
 }
 
 enum LoginUserWithRecoveryCodeErrorCode {
-  INVALID_RECOVERY_CODE
-  LOCKED_OUT
-  NOT_ALLOWED
   UNKNOWN
   UNKNOWN_USER
+  NOT_ALLOWED
+  LOCKED_OUT
+  INVALID_RECOVERY_CODE
 }
 
 enum LoginUserWithTwoFactorCodeErrorCode {
-  INVALID_AUTHENTICATOR_CODE
-  LOCKED_OUT
-  NOT_ALLOWED
   UNKNOWN
   UNKNOWN_USER
+  NOT_ALLOWED
+  LOCKED_OUT
+  INVALID_AUTHENTICATOR_CODE
 }
 
 enum LogoutUserErrorCode {
@@ -4862,8 +4864,8 @@ enum LogoutUserErrorCode {
 }
 
 enum MethodCategory {
-  CALCULATION
   MEASUREMENT
+  CALCULATION
 }
 
 enum OpenIdConnectConsentType {
@@ -4902,45 +4904,45 @@ enum OpenIdConnectResponseType {
 
 enum OpenIdConnectScope {
   ADDRESS
-  ADMINISTRATE_API
   EMAIL
+  PHONE
+  PROFILE
+  ROLES
+  READ_API
+  WRITE_API
+  ADMINISTRATE_API
+  VERIFY_API
+  SUPPORT_API
   MANAGE_DATABASE_API
   MANAGE_GNU_PG_API
   MANAGE_INSTITUTION_REPRESENTATIVE_API
   MANAGE_OPEN_ID_CONNECT_API
   MANAGE_USER_API
-  PHONE
-  PROFILE
-  READ_API
-  ROLES
-  SUPPORT_API
-  VERIFY_API
-  WRITE_API
 }
 
 enum OpticalComponentSubtype {
-  ACID_ETCHED_GLASS
-  APPLIED_FILM
-  CELLULAR_SHADE
-  CHROMOGENIC
+  MONOLITHIC
+  LAMINATE
+  INTERLAYER
+  EMBEDDED_COATING
   COATED
   COATING
-  DIFFUSING_SHADE
-  EMBEDDED_COATING
+  APPLIED_FILM
   FILM
-  FRITTED_GLASS
-  INTERLAYER
-  LAMINATE
-  MONOLITHIC
+  VENETIAN_BLIND
+  DIFFUSING_SHADE
+  ROLLER_SHADE
+  WOVEN_SHADE
+  VERTICAL_LOUVER
   PERFORATED_SCREEN
+  CELLULAR_SHADE
   PLEATED_SHADE
-  ROLLER_SHADE
   ROMAN_SHADE
-  SANDBLASTED_GLASS
   SHADE_MATERIAL
-  VENETIAN_BLIND
-  VERTICAL_LOUVER
-  WOVEN_SHADE
+  FRITTED_GLASS
+  ACID_ETCHED_GLASS
+  SANDBLASTED_GLASS
+  CHROMOGENIC
 }
 
 enum OpticalComponentType {
@@ -4954,81 +4956,81 @@ enum PrimeSurface {
 }
 
 enum RegisterUserErrorCode {
+  UNKNOWN
+  PASSWORD_CONFIRMATION_MISMATCH
   DUPLICATE_EMAIL
   INVALID_EMAIL
-  NULL_OR_EMPTY_EMAIL
-  PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
   PASSWORD_REQUIRES_LOWER
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
-  UNKNOWN
+  NULL_OR_EMPTY_EMAIL
 }
 
 enum RemoveComponentAssemblyErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ASSEMBLED_COMPONENT
-  UNKNOWN_ASSEMBLY
   UNKNOWN_PART_COMPONENT
+  UNKNOWN_ASSEMBLY
+  UNAUTHORIZED
 }
 
 enum RemoveComponentGeneralizationErrorCode {
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_CONCRETE_COMPONENT
   UNKNOWN_GENERAL_COMPONENT
+  UNKNOWN_CONCRETE_COMPONENT
   UNKNOWN_GENERALIZATION
+  UNAUTHORIZED
 }
 
 enum RemoveComponentManufacturerErrorCode {
-  LAST_MANUFACTURER
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_COMPONENT
   UNKNOWN_INSTITUTION
+  UNAUTHORIZED
   UNKNOWN_MANUFACTURER
+  LAST_MANUFACTURER
 }
 
 enum RemoveComponentVariantErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ONE_COMPONENT
   UNKNOWN_OTHER_COMPONENT
   UNKNOWN_VARIANT
+  UNAUTHORIZED
 }
 
 enum RemoveInstitutionMethodDeveloperErrorCode {
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_DEVELOPER
-  UNKNOWN_INSTITUTION
   UNKNOWN_METHOD
+  UNKNOWN_INSTITUTION
+  UNAUTHORIZED
+  UNKNOWN_DEVELOPER
 }
 
 enum RemoveInstitutionRepresentativeErrorCode {
+  UNKNOWN
   LAST_OWNER
   UNAUTHORIZED
-  UNKNOWN
   UNKNOWN_INSTITUTION
   UNKNOWN_REPRESENTATIVE
   UNKNOWN_USER
 }
 
 enum RemoveUserMethodDeveloperErrorCode {
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_DEVELOPER
   UNKNOWN_METHOD
   UNKNOWN_USER
+  UNAUTHORIZED
+  UNKNOWN_DEVELOPER
 }
 
 enum RemoveUserRoleErrorCode {
-  LAST_USER
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_USER
+  LAST_USER
+  UNAUTHORIZED
 }
 
 enum RequestUserPasswordResetErrorCode {
@@ -5041,17 +5043,18 @@ enum ResendUserEmailConfirmationErrorCode {
 
 enum ResendUserEmailVerificationErrorCode {
   UNKNOWN
-  UNKNOWN_EMAIL
   UNKNOWN_USER
+  UNKNOWN_EMAIL
 }
 
 enum ResetOpenIdConnectApplicationClientSecretErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_APPLICATION
 }
 
 enum ResetUserPasswordErrorCode {
+  UNKNOWN
   INVALID_RESET_CODE
   PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
@@ -5059,36 +5062,37 @@ enum ResetUserPasswordErrorCode {
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
-  UNKNOWN
 }
 
 enum ResetUserTwoFactorAuthenticatorErrorCode {
-  DISABLING_FAILED
-  RESETTING_FAILED
   UNKNOWN
   UNKNOWN_USER
+  DISABLING_FAILED
+  RESETTING_FAILED
 }
 
 enum RevokeOpenIdConnectTokenErrorCode {
-  FAILED
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_TOKEN
+  FAILED
 }
 
 enum SetComponentExtrasErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_COMPONENT
 }
 
 enum SetInstitutionExtrasErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_INSTITUTION
 }
 
 enum SetUserPasswordErrorCode {
+  UNKNOWN
+  UNKNOWN_USER
   EXISTING_PASSWORD
   PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
@@ -5096,14 +5100,12 @@ enum SetUserPasswordErrorCode {
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
-  UNKNOWN
-  UNKNOWN_USER
 }
 
 enum SetUserPhoneNumberErrorCode {
-  UNCHANGED_PHONE_NUMBER
   UNKNOWN
   UNKNOWN_USER
+  UNCHANGED_PHONE_NUMBER
 }
 
 enum SortEnumType {
@@ -5139,83 +5141,83 @@ enum Standardizer {
 }
 
 enum SwitchInstitutionOperatingStateErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
+  UNAUTHORIZED
 }
 
 enum UpdateComponentAssemblyErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ASSEMBLED_COMPONENT
-  UNKNOWN_ASSEMBLY
   UNKNOWN_PART_COMPONENT
+  UNKNOWN_ASSEMBLY
+  UNAUTHORIZED
 }
 
 enum UpdateComponentErrorCode {
-  AMBIGUOUS_REFERENCE
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_COMPONENT
   UNKNOWN_MANUFACTURER
+  AMBIGUOUS_REFERENCE
 }
 
 enum UpdateDatabaseErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_DATABASE
 }
 
 enum UpdateDataFormatErrorCode {
+  UNKNOWN
   TWO_REFERENCES
   UNAUTHORIZED
-  UNKNOWN
   UNKNOWN_DATA_FORMAT
 }
 
 enum UpdateInstitutionErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_INSTITUTION
 }
 
 enum UpdateMethodErrorCode {
+  UNKNOWN
   TWO_REFERENCES
   UNAUTHORIZED
-  UNKNOWN
   UNKNOWN_METHOD
 }
 
 enum UpdateOpenIdConnectApplicationErrorCode {
+  UNKNOWN
+  UNAUTHORIZED
+  UNKNOWN_APPLICATION
   ILLEGAL_CONSENT_TYPE
-  ILLEGAL_ENDPOINT
   ILLEGAL_GRANT_TYPE
-  ILLEGAL_RESPONSE_TYPE
   ILLEGAL_SCOPE
-  UNAUTHORIZED
-  UNKNOWN
-  UNKNOWN_APPLICATION
+  ILLEGAL_RESPONSE_TYPE
+  ILLEGAL_ENDPOINT
 }
 
 enum UserRole {
   ADMINISTRATOR
-  SUPPORTER
   VERIFIER
+  SUPPORTER
 }
 
 enum VerifyDatabaseErrorCode {
-  DESERIALIZATION_FAILED
-  REQUEST_FAILED
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_DATABASE
   WRONG_VERIFICATION_CODE
+  REQUEST_FAILED
+  DESERIALIZATION_FAILED
 }
 
 enum VerifyInstitutionErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
+  UNAUTHORIZED
 }
 
 scalar Any @specifiedBy(url: "https://scalars.graphql.org/chillicream/any.html")

From 1dd937f2421fd9fded76034a6f1184e00c7952eb Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 2 Jun 2026 18:42:38 +0200
Subject: [PATCH 066/145] Remove unnecessary checks for whether outer is ready,
 use single-sign-on layout on all sign-in/register pages, and add an abort
 button to the layout

---
 frontend/components/Layout.tsx                |  13 +-
 frontend/components/NavBar.tsx                |  79 ++---
 frontend/components/SingleSignOnLayout.tsx    |  48 ++-
 frontend/components/components/Component.tsx  |   2 +-
 .../components/dataFormats/DataFormat.tsx     |   2 +-
 frontend/components/databases/Database.tsx    |   2 +-
 .../components/institutions/Institution.tsx   |   2 +-
 frontend/components/methods/Method.tsx        |   2 +-
 .../applications/OpenIdConnectApplication.tsx |   2 +-
 frontend/components/users/User.tsx            |   2 +-
 frontend/pages/components/[uuid].tsx          |   6 -
 frontend/pages/data-formats/[uuid].tsx        |   6 -
 frontend/pages/databases/[uuid].tsx           |   6 -
 .../[uuid]/data/calorimetric/[dataId].tsx     |   6 -
 .../[uuid]/data/geometric/[dataId].tsx        |   6 -
 .../[uuid]/data/hygrothermal/[dataId].tsx     |   6 -
 .../[uuid]/data/life-cycle/[dataId].tsx       |   6 -
 .../[uuid]/data/optical/[dataId].tsx          |   6 -
 .../[uuid]/data/photovoltaic/[dataId].tsx     |   6 -
 frontend/pages/gnupg-keys/[fingerprint].tsx   |   6 -
 frontend/pages/institutions/[uuid].tsx        |   6 -
 frontend/pages/methods/[uuid].tsx             |   6 -
 .../open-id-connect/application/[uuid].tsx    |   6 -
 frontend/pages/users/[uuid].tsx               |   6 -
 .../check-your-inbox-after-registration.tsx   |   6 +-
 ...box-after-resending-email-confirmation.tsx |   6 +-
 frontend/pages/users/confirm-email.tsx        |  10 +-
 frontend/pages/users/register.tsx             |   6 +-
 .../pages/users/resend-email-confirmation.tsx |   6 +-
 frontend/paths.ts                             |   1 +
 frontend/queries/components.graphql           |   4 +-
 frontend/queries/dataFormats.graphql          |   4 +-
 frontend/queries/databases.graphql            |   4 +-
 frontend/queries/institutions.graphql         |   4 +-
 frontend/queries/methods.graphql              |   4 +-
 frontend/queries/openIdConnect.graphql        |  10 +-
 frontend/queries/users.graphql                |   4 +-
 frontend/type-defs.graphqls                   | 326 +++++++++---------
 38 files changed, 292 insertions(+), 341 deletions(-)

diff --git a/frontend/components/Layout.tsx b/frontend/components/Layout.tsx
index e83468d00..b14427283 100644
--- a/frontend/components/Layout.tsx
+++ b/frontend/components/Layout.tsx
@@ -1,12 +1,12 @@
 import Head from "next/head";
 import { ReactNode, useEffect } from "react";
 import Footer from "./Footer";
-import NavBar from "./NavBar";
+import NavBar, { NavItemProps } from "./NavBar";
 import { Layout as AntLayout, App, Divider, Flex, Typography } from "antd";
 import paths from "../paths";
 import { useCookies } from "react-cookie";
 
-const navItems = [
+const navItems: NavItemProps[] = [
   {
     path: paths.home,
     label: "Home",
@@ -75,7 +75,7 @@ const navItems = [
 
 interface LayoutProps {
   pageTitles?: string[];
-  onlyUserOrLoginItems?: boolean;
+  items?: NavItemProps[];
   children?: ReactNode;
 }
 
@@ -84,7 +84,7 @@ const cookieConsentValue = "yes";
 
 export default function Layout({
   pageTitles = [],
-  onlyUserOrLoginItems = false,
+  items = navItems,
   children,
 }: LayoutProps) {
   const appTitle = "Building Envelope Data";
@@ -123,10 +123,9 @@ export default function Layout({
       <AntLayout.Header>
         <Flex justify="center">
           <NavBar
-            items={navItems}
-            onlyUserOrLoginItems={onlyUserOrLoginItems}
+            items={items}
             style={{
-              width: onlyUserOrLoginItems ? "max-content" : "100%",
+              width: items.length <= 3 ? "100%" : "100%",
               maxWidth: 1024,
             }}
           />
diff --git a/frontend/components/NavBar.tsx b/frontend/components/NavBar.tsx
index 1ee386c42..37dd60abb 100644
--- a/frontend/components/NavBar.tsx
+++ b/frontend/components/NavBar.tsx
@@ -12,25 +12,22 @@ import { UserOutlined, LoadingOutlined } from "@ant-design/icons";
 import type { Route } from "next";
 import { isTruthy } from "../lib/array";
 import { CSSProperties, useMemo } from "react";
+import { MenuItemType } from "antd/lib/menu/interface";
 
-const firstUserOrLoginItemStyle = (alignRight: boolean) =>
-  alignRight ? { marginLeft: "auto" } : undefined;
+const firstUserOrLoginItemStyle = { marginLeft: "auto" };
 
-const userLoadingItem = (alignRight: boolean) => ({
+const userLoadingItem = {
   key: "userLoading",
-  style: firstUserOrLoginItemStyle(alignRight),
+  style: firstUserOrLoginItemStyle,
   label: (
     <Spin indicator={<LoadingOutlined style={{ color: "white" }} spin />} />
   ),
-});
+};
 
-const loginOrRegisterItems = (
-  returnTo: string | string[] | undefined,
-  alignRight: boolean,
-) => [
+const loginOrRegisterItems = (returnTo: string | string[] | undefined) => [
   {
     key: paths.openIdConnectClientLogin,
-    style: firstUserOrLoginItemStyle(alignRight),
+    style: firstUserOrLoginItemStyle,
     label: (
       <Link
         href={{
@@ -66,10 +63,7 @@ const loginOrRegisterItems = (
   },
 ];
 
-const userItems = (
-  currentUser: CurrentUserPartialFragment,
-  alignRight: boolean,
-) =>
+const userItems = (currentUser: CurrentUserPartialFragment) =>
   [
     currentUser?.isAuthorizedToManageOpenIdConnect && {
       key: paths.openIdConnect,
@@ -79,7 +73,7 @@ const userItems = (
       key: paths.me.manage.home,
       label: currentUser.name,
       icon: <UserOutlined />,
-      style: firstUserOrLoginItemStyle(alignRight),
+      style: firstUserOrLoginItemStyle,
       children: [
         {
           key: paths.user(currentUser.uuid),
@@ -123,13 +117,14 @@ const userItems = (
     },
   ].filter(isTruthy);
 
-type NavItemProps =
+export type NavItemProps =
   | {
       path: Route;
       label: string;
       subitems: null;
     }
-  | { label: string; subitems: { path: Route; label: string }[] };
+  | { label: string; subitems: { path: Route; label: string }[] }
+  | MenuItemType;
 
 interface NavBarProps {
   items: NavItemProps[];
@@ -137,11 +132,7 @@ interface NavBarProps {
   style?: CSSProperties;
 }
 
-export default function NavBar({
-  items,
-  onlyUserOrLoginItems = false,
-  style,
-}: NavBarProps) {
+export default function NavBar({ items, style }: NavBarProps) {
   const router = useRouter();
   const { returnTo } = router.query;
   const { loading, data } = useQuery(CurrentUserDocument);
@@ -149,34 +140,34 @@ export default function NavBar({
 
   const mainItems = useMemo(
     () =>
-      onlyUserOrLoginItems
-        ? []
-        : items.map((item) =>
-            item.subitems === null
-              ? {
-                  key: item.path,
-                  label: <Link href={item.path}>{item.label}</Link>,
-                }
-              : {
-                  key: item.label,
-                  label: item.label,
-                  children: item.subitems.map((subitem) => ({
-                    key: subitem.path,
-                    label: <Link href={subitem.path}>{subitem.label}</Link>,
-                  })),
-                },
-          ),
-    [items, onlyUserOrLoginItems],
+      items.map((item) =>
+        "subitems" in item
+          ? item.subitems === null
+            ? {
+                key: item.path,
+                label: <Link href={item.path}>{item.label}</Link>,
+              }
+            : {
+                key: item.label,
+                label: item.label,
+                children: item.subitems.map((subitem) => ({
+                  key: subitem.path,
+                  label: <Link href={subitem.path}>{subitem.label}</Link>,
+                })),
+              }
+          : item,
+      ),
+    [items],
   );
 
   const userOrLoginItems = useMemo(
     () =>
       loading
-        ? [userLoadingItem(!onlyUserOrLoginItems)]
+        ? [userLoadingItem]
         : currentUser
-          ? userItems(currentUser, !onlyUserOrLoginItems)
-          : loginOrRegisterItems(returnTo, !onlyUserOrLoginItems),
-    [loading, currentUser, onlyUserOrLoginItems],
+          ? userItems(currentUser)
+          : loginOrRegisterItems(returnTo),
+    [loading, currentUser],
   );
 
   return (
diff --git a/frontend/components/SingleSignOnLayout.tsx b/frontend/components/SingleSignOnLayout.tsx
index a4a5523a8..9f9ecf6ac 100644
--- a/frontend/components/SingleSignOnLayout.tsx
+++ b/frontend/components/SingleSignOnLayout.tsx
@@ -1,7 +1,10 @@
 import { ReactNode } from "react";
 import Layout from "./Layout";
-import { Flex } from "antd";
+import { Button, Flex, Skeleton } from "antd";
 import { useRouter } from "next/router";
+import { isLocalUrl } from "../lib/url";
+import paths from "../paths";
+import { extractAntiforgeryTokenFromCookie } from "../lib/apollo";
 
 interface SingleSignOnLayoutProps {
   children?: ReactNode;
@@ -12,14 +15,45 @@ export default function SingleSignOnLayout({
 }: SingleSignOnLayoutProps) {
   const router = useRouter();
   const { returnTo } = router.query;
-  const clientIdMatch = returnTo?.toString()?.match(/[?&]client_id=([^&]+)/);
-  const clientId = clientIdMatch?.[1];
+  // const clientIdMatch = returnTo?.toString()?.match(/[?&]client_id=([^&]+)/);
+  // const clientId = clientIdMatch?.[1];
+
+  if (!router.isReady) {
+    return (
+      <Layout>
+        <Skeleton active avatar title />
+      </Layout>
+    );
+  }
+
+  const navItems =
+    returnTo && !isLocalUrl(String(returnTo))
+      ? [
+          {
+            key: "deny",
+            label: (
+              <form action={paths.openIdConnectAuthorize} method="post">
+                <input
+                  name="__RequestVerificationToken"
+                  type="hidden"
+                  value={
+                    typeof window !== "undefined"
+                      ? (extractAntiforgeryTokenFromCookie() ?? "")
+                      : ""
+                  }
+                />
+                <input name="submit.Deny" type="hidden" value="No" />
+                <Button type="default" htmlType="submit">
+                  Abort
+                </Button>
+              </form>
+            ),
+          },
+        ]
+      : undefined;
 
   return (
-    <Layout
-      onlyUserOrLoginItems={clientId != "metabase"}
-      pageTitles={["Single-Sign On"]}
-    >
+    <Layout items={navItems} pageTitles={["Single-Sign On"]}>
       <Flex justify="center">{children}</Flex>
     </Layout>
   );
diff --git a/frontend/components/components/Component.tsx b/frontend/components/components/Component.tsx
index a1ccba1c6..b5e7ff0e7 100644
--- a/frontend/components/components/Component.tsx
+++ b/frontend/components/components/Component.tsx
@@ -12,7 +12,7 @@ interface ComponentProps {
 
 export default function Component({ componentId }: ComponentProps) {
   const queryVariables = {
-    uuid: componentId,
+    id: componentId,
   };
   const { loading, error, data } = useQuery(ComponentDocument, {
     variables: queryVariables,
diff --git a/frontend/components/dataFormats/DataFormat.tsx b/frontend/components/dataFormats/DataFormat.tsx
index 19960a6f8..81565084b 100644
--- a/frontend/components/dataFormats/DataFormat.tsx
+++ b/frontend/components/dataFormats/DataFormat.tsx
@@ -12,7 +12,7 @@ interface DataFormatProps {
 
 export default function DataFormat({ dataFormatId }: DataFormatProps) {
   const queryVariables = {
-    uuid: dataFormatId,
+    id: dataFormatId,
   };
   const { loading, error, data } = useQuery(DataFormatDocument, {
     variables: queryVariables,
diff --git a/frontend/components/databases/Database.tsx b/frontend/components/databases/Database.tsx
index 94b51c3a3..317488ca3 100644
--- a/frontend/components/databases/Database.tsx
+++ b/frontend/components/databases/Database.tsx
@@ -12,7 +12,7 @@ interface DatabaseProps {
 
 export default function Database({ databaseId }: DatabaseProps) {
   const queryVariables = {
-    uuid: databaseId,
+    id: databaseId,
   };
   const { loading, error, data } = useQuery(DatabaseDocument, {
     variables: queryVariables,
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index a13e1d7e1..aa79c358a 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -307,7 +307,7 @@ interface Props {
 
 export default function Institution({ institutionId }: Props) {
   const queryVariables = {
-    uuid: institutionId,
+    id: institutionId,
   };
   const { loading, error, data } = useQuery(InstitutionDocument, {
     variables: queryVariables,
diff --git a/frontend/components/methods/Method.tsx b/frontend/components/methods/Method.tsx
index 18d1b175a..7519ea3b7 100644
--- a/frontend/components/methods/Method.tsx
+++ b/frontend/components/methods/Method.tsx
@@ -12,7 +12,7 @@ interface MethodProps {
 
 export default function Method({ methodId }: MethodProps) {
   const queryVariables = {
-    uuid: methodId,
+    id: methodId,
   };
   const { loading, error, data } = useQuery(MethodDocument, {
     variables: queryVariables,
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
index a490d0150..71d9d73e7 100644
--- a/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
@@ -15,7 +15,7 @@ interface Props {
 
 export default function OpenIdConnectApplication({ applicationId }: Props) {
   const queryVariables = {
-    uuid: applicationId,
+    id: applicationId,
   };
   const { loading, error, data } = useQuery(ApplicationDocument, {
     variables: queryVariables,
diff --git a/frontend/components/users/User.tsx b/frontend/components/users/User.tsx
index adbd15a17..f71bb29a8 100644
--- a/frontend/components/users/User.tsx
+++ b/frontend/components/users/User.tsx
@@ -50,7 +50,7 @@ export default function User({ userId }: UserProps) {
   const currentUser = currentUserData?.currentUser;
 
   const queryVariables = {
-    uuid: userId,
+    id: userId,
   };
   const { loading, error, data } = useQuery(UserDocument, {
     variables: queryVariables,
diff --git a/frontend/pages/components/[uuid].tsx b/frontend/pages/components/[uuid].tsx
index 22db88054..a97f1059e 100644
--- a/frontend/pages/components/[uuid].tsx
+++ b/frontend/pages/components/[uuid].tsx
@@ -5,12 +5,6 @@ import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
-
-  if (!router.isReady) {
-    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
-    return null;
-  }
-
   const { uuid } = router.query;
 
   if (!uuid) {
diff --git a/frontend/pages/data-formats/[uuid].tsx b/frontend/pages/data-formats/[uuid].tsx
index 087d72f98..3fd138e3f 100644
--- a/frontend/pages/data-formats/[uuid].tsx
+++ b/frontend/pages/data-formats/[uuid].tsx
@@ -5,12 +5,6 @@ import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
-
-  if (!router.isReady) {
-    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
-    return null;
-  }
-
   const { uuid } = router.query;
 
   if (!uuid) {
diff --git a/frontend/pages/databases/[uuid].tsx b/frontend/pages/databases/[uuid].tsx
index 9ef77e925..2ee8295aa 100644
--- a/frontend/pages/databases/[uuid].tsx
+++ b/frontend/pages/databases/[uuid].tsx
@@ -5,12 +5,6 @@ import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
-
-  if (!router.isReady) {
-    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
-    return null;
-  }
-
   const { uuid } = router.query;
 
   if (!uuid) {
diff --git a/frontend/pages/databases/[uuid]/data/calorimetric/[dataId].tsx b/frontend/pages/databases/[uuid]/data/calorimetric/[dataId].tsx
index ed3cf7534..0c643bc5e 100644
--- a/frontend/pages/databases/[uuid]/data/calorimetric/[dataId].tsx
+++ b/frontend/pages/databases/[uuid]/data/calorimetric/[dataId].tsx
@@ -5,12 +5,6 @@ import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
-
-  if (!router.isReady) {
-    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
-    return null;
-  }
-
   const { uuid, dataId } = router.query;
 
   if (!uuid || !dataId) {
diff --git a/frontend/pages/databases/[uuid]/data/geometric/[dataId].tsx b/frontend/pages/databases/[uuid]/data/geometric/[dataId].tsx
index a3f72c054..45bb419be 100644
--- a/frontend/pages/databases/[uuid]/data/geometric/[dataId].tsx
+++ b/frontend/pages/databases/[uuid]/data/geometric/[dataId].tsx
@@ -5,12 +5,6 @@ import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
-
-  if (!router.isReady) {
-    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
-    return null;
-  }
-
   const { uuid, dataId } = router.query;
 
   if (!uuid || !dataId) {
diff --git a/frontend/pages/databases/[uuid]/data/hygrothermal/[dataId].tsx b/frontend/pages/databases/[uuid]/data/hygrothermal/[dataId].tsx
index c8d33b198..29d2b943e 100644
--- a/frontend/pages/databases/[uuid]/data/hygrothermal/[dataId].tsx
+++ b/frontend/pages/databases/[uuid]/data/hygrothermal/[dataId].tsx
@@ -5,12 +5,6 @@ import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
-
-  if (!router.isReady) {
-    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
-    return null;
-  }
-
   const { uuid, dataId } = router.query;
 
   if (!uuid || !dataId) {
diff --git a/frontend/pages/databases/[uuid]/data/life-cycle/[dataId].tsx b/frontend/pages/databases/[uuid]/data/life-cycle/[dataId].tsx
index cb761cc7e..f3555c5c3 100644
--- a/frontend/pages/databases/[uuid]/data/life-cycle/[dataId].tsx
+++ b/frontend/pages/databases/[uuid]/data/life-cycle/[dataId].tsx
@@ -5,12 +5,6 @@ import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
-
-  if (!router.isReady) {
-    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
-    return null;
-  }
-
   const { uuid, dataId } = router.query;
 
   if (!uuid || !dataId) {
diff --git a/frontend/pages/databases/[uuid]/data/optical/[dataId].tsx b/frontend/pages/databases/[uuid]/data/optical/[dataId].tsx
index c6507860e..522e0d65f 100644
--- a/frontend/pages/databases/[uuid]/data/optical/[dataId].tsx
+++ b/frontend/pages/databases/[uuid]/data/optical/[dataId].tsx
@@ -5,12 +5,6 @@ import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
-
-  if (!router.isReady) {
-    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
-    return null;
-  }
-
   const { uuid, dataId } = router.query;
 
   if (!uuid || !dataId) {
diff --git a/frontend/pages/databases/[uuid]/data/photovoltaic/[dataId].tsx b/frontend/pages/databases/[uuid]/data/photovoltaic/[dataId].tsx
index 9848952f5..de67f824c 100644
--- a/frontend/pages/databases/[uuid]/data/photovoltaic/[dataId].tsx
+++ b/frontend/pages/databases/[uuid]/data/photovoltaic/[dataId].tsx
@@ -5,12 +5,6 @@ import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
-
-  if (!router.isReady) {
-    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
-    return null;
-  }
-
   const { uuid, dataId } = router.query;
 
   if (!uuid || !dataId) {
diff --git a/frontend/pages/gnupg-keys/[fingerprint].tsx b/frontend/pages/gnupg-keys/[fingerprint].tsx
index b2c522dec..b66bbb728 100644
--- a/frontend/pages/gnupg-keys/[fingerprint].tsx
+++ b/frontend/pages/gnupg-keys/[fingerprint].tsx
@@ -5,12 +5,6 @@ import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
-
-  if (!router.isReady) {
-    // Otherwise `fingerprint`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
-    return null;
-  }
-
   const { fingerprint } = router.query;
 
   if (!fingerprint) {
diff --git a/frontend/pages/institutions/[uuid].tsx b/frontend/pages/institutions/[uuid].tsx
index 87ab3ca14..a48162d48 100644
--- a/frontend/pages/institutions/[uuid].tsx
+++ b/frontend/pages/institutions/[uuid].tsx
@@ -5,12 +5,6 @@ import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
-
-  if (!router.isReady) {
-    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
-    return null;
-  }
-
   const { uuid } = router.query;
 
   if (!uuid) {
diff --git a/frontend/pages/methods/[uuid].tsx b/frontend/pages/methods/[uuid].tsx
index 20e981e8a..f0ab83b45 100644
--- a/frontend/pages/methods/[uuid].tsx
+++ b/frontend/pages/methods/[uuid].tsx
@@ -5,12 +5,6 @@ import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
-
-  if (!router.isReady) {
-    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
-    return null;
-  }
-
   const { uuid } = router.query;
 
   if (!uuid) {
diff --git a/frontend/pages/open-id-connect/application/[uuid].tsx b/frontend/pages/open-id-connect/application/[uuid].tsx
index 1a33d0964..ad76892e7 100644
--- a/frontend/pages/open-id-connect/application/[uuid].tsx
+++ b/frontend/pages/open-id-connect/application/[uuid].tsx
@@ -5,12 +5,6 @@ import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
-
-  if (!router.isReady) {
-    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
-    return null;
-  }
-
   const { uuid } = router.query;
 
   if (!uuid) {
diff --git a/frontend/pages/users/[uuid].tsx b/frontend/pages/users/[uuid].tsx
index 876527a31..c3f34421a 100644
--- a/frontend/pages/users/[uuid].tsx
+++ b/frontend/pages/users/[uuid].tsx
@@ -5,12 +5,6 @@ import { Skeleton } from "antd";
 
 function Page() {
   const router = useRouter();
-
-  if (!router.isReady) {
-    // Otherwise `uuid`, aka, `router.query`, is null on first render, see https://github.com/vercel/next.js/discussions/11484
-    return null;
-  }
-
   const { uuid } = router.query;
 
   if (!uuid) {
diff --git a/frontend/pages/users/check-your-inbox-after-registration.tsx b/frontend/pages/users/check-your-inbox-after-registration.tsx
index 650da554b..88a340103 100644
--- a/frontend/pages/users/check-your-inbox-after-registration.tsx
+++ b/frontend/pages/users/check-your-inbox-after-registration.tsx
@@ -1,15 +1,15 @@
 import { useRouter } from "next/router";
-import Layout from "../../components/Layout";
 import { Card, Typography } from "antd";
 import paths from "../../paths";
 import Link from "next/link";
+import SingleSignOnLayout from "../../components/SingleSignOnLayout";
 
 export default function Page() {
   const router = useRouter();
   const { returnTo } = router.query;
 
   return (
-    <Layout>
+    <SingleSignOnLayout>
       <Card title="Check your inbox!">
         <Typography.Paragraph style={{ maxWidth: "75ch" }}>
           Confirm your email address by following the confirmation link in your
@@ -25,6 +25,6 @@ export default function Page() {
           .
         </Typography.Paragraph>
       </Card>
-    </Layout>
+    </SingleSignOnLayout>
   );
 }
diff --git a/frontend/pages/users/check-your-inbox-after-resending-email-confirmation.tsx b/frontend/pages/users/check-your-inbox-after-resending-email-confirmation.tsx
index 650da554b..88a340103 100644
--- a/frontend/pages/users/check-your-inbox-after-resending-email-confirmation.tsx
+++ b/frontend/pages/users/check-your-inbox-after-resending-email-confirmation.tsx
@@ -1,15 +1,15 @@
 import { useRouter } from "next/router";
-import Layout from "../../components/Layout";
 import { Card, Typography } from "antd";
 import paths from "../../paths";
 import Link from "next/link";
+import SingleSignOnLayout from "../../components/SingleSignOnLayout";
 
 export default function Page() {
   const router = useRouter();
   const { returnTo } = router.query;
 
   return (
-    <Layout>
+    <SingleSignOnLayout>
       <Card title="Check your inbox!">
         <Typography.Paragraph style={{ maxWidth: "75ch" }}>
           Confirm your email address by following the confirmation link in your
@@ -25,6 +25,6 @@ export default function Page() {
           .
         </Typography.Paragraph>
       </Card>
-    </Layout>
+    </SingleSignOnLayout>
   );
 }
diff --git a/frontend/pages/users/confirm-email.tsx b/frontend/pages/users/confirm-email.tsx
index c60f6751b..c13daf282 100644
--- a/frontend/pages/users/confirm-email.tsx
+++ b/frontend/pages/users/confirm-email.tsx
@@ -5,10 +5,10 @@ import {
   ConfirmUserEmailDocument,
   ConfirmUserEmailMutation,
 } from "../../queries/users.generated";
-import Layout from "../../components/Layout";
 import paths from "../../paths";
 import { App, Typography } from "antd";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
+import SingleSignOnLayout from "../../components/SingleSignOnLayout";
 
 function ConfirmUserEmail() {
   const router = useRouter();
@@ -67,9 +67,11 @@ function ConfirmUserEmail() {
   ]);
 
   return (
-    <Layout>
-      <Typography.Paragraph style={{ maxWidth: "75ch" }}>Confirming email ...</Typography.Paragraph>
-    </Layout>
+    <SingleSignOnLayout>
+      <Typography.Paragraph style={{ maxWidth: "75ch" }}>
+        Confirming email ...
+      </Typography.Paragraph>
+    </SingleSignOnLayout>
   );
 }
 
diff --git a/frontend/pages/users/register.tsx b/frontend/pages/users/register.tsx
index 937bc6f6c..adeaabd0c 100644
--- a/frontend/pages/users/register.tsx
+++ b/frontend/pages/users/register.tsx
@@ -6,7 +6,7 @@ import {
   RegisterUserMutation,
 } from "../../queries/users.generated";
 import { Form, Input, Button, Card, Typography, Divider } from "antd";
-import Layout from "../../components/Layout";
+import SingleSignOnLayout from "../../components/SingleSignOnLayout";
 import paths from "../../paths";
 import { useState } from "react";
 import Link from "next/link";
@@ -72,7 +72,7 @@ export default function Page() {
   };
 
   return (
-    <Layout>
+    <SingleSignOnLayout>
       <Card title="Register">
         <Typography.Paragraph style={{ maxWidth: "75ch" }}>
           No account is needed to query the{" "}
@@ -176,6 +176,6 @@ export default function Page() {
           </Link>
         </div>
       </Card>
-    </Layout>
+    </SingleSignOnLayout>
   );
 }
diff --git a/frontend/pages/users/resend-email-confirmation.tsx b/frontend/pages/users/resend-email-confirmation.tsx
index 25f561e9a..30bd21ddd 100644
--- a/frontend/pages/users/resend-email-confirmation.tsx
+++ b/frontend/pages/users/resend-email-confirmation.tsx
@@ -10,7 +10,7 @@ import { useState } from "react";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../../components/ErrorAlert";
-import Layout from "../../components/Layout";
+import SingleSignOnLayout from "../../components/SingleSignOnLayout";
 
 interface FormValues {
   email: string;
@@ -64,7 +64,7 @@ export default function Page() {
   };
 
   return (
-    <Layout>
+    <SingleSignOnLayout>
       <Card title="Resend Email Confirmation">
         <ErrorAlert messages={globalErrorMessages} />
         <Form
@@ -97,6 +97,6 @@ export default function Page() {
           </Form.Item>
         </Form>
       </Card>
-    </Layout>
+    </SingleSignOnLayout>
   );
 }
diff --git a/frontend/paths.ts b/frontend/paths.ts
index 305f9fed2..5f03daf61 100644
--- a/frontend/paths.ts
+++ b/frontend/paths.ts
@@ -117,4 +117,5 @@ export default {
   openIdConnect: "/open-id-connect" as Route,
   openIdConnectClientLogin: "/connect/client/login" as Route,
   openIdConnectClientLogout: "/connect/client/logout" as Route,
+  openIdConnectAuthorize: "/connect/authorize" as Route,
 };
diff --git a/frontend/queries/components.graphql b/frontend/queries/components.graphql
index ee105ea5b..8913ae0a0 100644
--- a/frontend/queries/components.graphql
+++ b/frontend/queries/components.graphql
@@ -194,8 +194,8 @@ query Components(
   }
 }
 
-query Component($uuid: Uuid!) {
-  component(id: $uuid) {
+query Component($id: Uuid!) {
+  component(id: $id) {
     ...ComponentPartial
   }
 }
diff --git a/frontend/queries/dataFormats.graphql b/frontend/queries/dataFormats.graphql
index dc361b3a1..9677fecfd 100644
--- a/frontend/queries/dataFormats.graphql
+++ b/frontend/queries/dataFormats.graphql
@@ -78,8 +78,8 @@ query DataFormats(
   }
 }
 
-query DataFormat($uuid: Uuid!) {
-  dataFormat(id: $uuid) {
+query DataFormat($id: Uuid!) {
+  dataFormat(id: $id) {
     ...DataFormatPartial
   }
 }
diff --git a/frontend/queries/databases.graphql b/frontend/queries/databases.graphql
index 60a5cc978..4d66461a6 100644
--- a/frontend/queries/databases.graphql
+++ b/frontend/queries/databases.graphql
@@ -115,8 +115,8 @@ query PendingDatabases {
   }
 }
 
-query Database($uuid: Uuid!) {
-  database(id: $uuid) {
+query Database($id: Uuid!) {
+  database(id: $id) {
     ...DatabasePartial
   }
 }
diff --git a/frontend/queries/institutions.graphql b/frontend/queries/institutions.graphql
index f89f004a1..34c4b35bb 100644
--- a/frontend/queries/institutions.graphql
+++ b/frontend/queries/institutions.graphql
@@ -196,8 +196,8 @@ query PendingInstitutions {
   }
 }
 
-query Institution($uuid: Uuid!) {
-  institution(id: $uuid) {
+query Institution($id: Uuid!) {
+  institution(id: $id) {
     ...InstitutionPartial
   }
 }
diff --git a/frontend/queries/methods.graphql b/frontend/queries/methods.graphql
index 54a5b0831..4d9cfbc6e 100644
--- a/frontend/queries/methods.graphql
+++ b/frontend/queries/methods.graphql
@@ -144,8 +144,8 @@ query Methods(
   }
 }
 
-query Method($uuid: Uuid!) {
-  method(id: $uuid) {
+query Method($id: Uuid!) {
+  method(id: $id) {
     ...MethodPartial
   }
 }
diff --git a/frontend/queries/openIdConnect.graphql b/frontend/queries/openIdConnect.graphql
index ee34a0ddf..04d40e123 100644
--- a/frontend/queries/openIdConnect.graphql
+++ b/frontend/queries/openIdConnect.graphql
@@ -148,12 +148,18 @@ query Applications(
   }
 }
 
-query Application($uuid: Uuid!) {
-  openIdConnectApplication(id: $uuid) {
+query Application($id: Uuid!) {
+  openIdConnectApplication(id: $id) {
     ...OpenIdConnectApplicationPartial
   }
 }
 
+# query ApplicationByClientId($clientId: String!) {
+#   openIdConnectApplicationByClientId(clientId: $clientId) {
+#     ...OpenIdConnectApplicationPartial
+#   }
+# }
+
 mutation CreateApplication($input: CreateOpenIdConnectApplicationInput!) {
   createOpenIdConnectApplication(input: $input) {
     application {
diff --git a/frontend/queries/users.graphql b/frontend/queries/users.graphql
index 1262f557d..ea75862a4 100644
--- a/frontend/queries/users.graphql
+++ b/frontend/queries/users.graphql
@@ -153,8 +153,8 @@ query Users(
   }
 }
 
-query User($uuid: Uuid!) {
-  user(id: $uuid) {
+query User($id: Uuid!) {
+  user(id: $id) {
     ...UserPartial
   }
 }
diff --git a/frontend/type-defs.graphqls b/frontend/type-defs.graphqls
index 68e620d85..12e8f52e1 100644
--- a/frontend/type-defs.graphqls
+++ b/frontend/type-defs.graphqls
@@ -228,6 +228,8 @@ type Query {
   nodes("The list of node IDs." ids: [ID!]!): [Node]! @cost(weight: "10")
   openIdConnectApplication(id: Uuid!): OpenIdConnectApplication
     @cost(weight: "10")
+  openIdConnectApplicationByClientId(clientId: String!): OpenIdConnectApplication
+    @cost(weight: "10")
   openIdConnectApplications(
     "Returns the elements in the list that come after the specified cursor."
     after: String
@@ -4499,108 +4501,110 @@ input VerifyInstitutionInput {
 }
 
 enum AddComponentAssemblyErrorCode {
-  DUPLICATE
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ASSEMBLED_COMPONENT
   UNKNOWN_PART_COMPONENT
+  DUPLICATE
+  UNAUTHORIZED
 }
 
 enum AddComponentGeneralizationErrorCode {
-  DUPLICATE
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_CONCRETE_COMPONENT
   UNKNOWN_GENERAL_COMPONENT
+  UNKNOWN_CONCRETE_COMPONENT
+  DUPLICATE
+  UNAUTHORIZED
 }
 
 enum AddComponentManufacturerErrorCode {
-  DUPLICATE
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_COMPONENT
   UNKNOWN_INSTITUTION
+  UNAUTHORIZED
+  DUPLICATE
 }
 
 enum AddComponentVariantErrorCode {
-  DUPLICATE
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ONE_COMPONENT
   UNKNOWN_OTHER_COMPONENT
+  DUPLICATE
+  UNAUTHORIZED
 }
 
 enum AddGnuPgKeyFingerprintErrorCode {
-  DUPLICATE_FINGERPRINT
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_INSTITUTION
+  DUPLICATE_FINGERPRINT
   UNKNOWN_KEY
 }
 
 enum AddInstitutionMethodDeveloperErrorCode {
-  DUPLICATE
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_INSTITUTION
   UNKNOWN_METHOD
+  UNKNOWN_INSTITUTION
+  UNAUTHORIZED
+  DUPLICATE
 }
 
 enum AddInstitutionRepresentativeErrorCode {
-  DUPLICATE
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
   UNKNOWN_USER
+  DUPLICATE
+  UNAUTHORIZED
 }
 
 enum AddUserMethodDeveloperErrorCode {
-  DUPLICATE
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_METHOD
   UNKNOWN_USER
+  UNAUTHORIZED
+  DUPLICATE
 }
 
 enum AddUserRoleErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_USER
+  UNAUTHORIZED
 }
 
 enum AllowGnuPgKeyFingerprintErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_FINGERPRINT
 }
 
 "Defines when a policy shall be executed."
 enum ApplyPolicy {
-  "After the resolver was executed."
-  AFTER_RESOLVER
   "Before the resolver was executed."
   BEFORE_RESOLVER
+  "After the resolver was executed."
+  AFTER_RESOLVER
   "The policy is applied in the validation step before the execution."
   VALIDATION
 }
 
 enum ChangeInstitutionRepresentativeRoleErrorCode {
-  LAST_OWNER
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
-  UNKNOWN_REPRESENTATIVE
   UNKNOWN_USER
+  UNAUTHORIZED
+  UNKNOWN_REPRESENTATIVE
+  LAST_OWNER
 }
 
 enum ChangeUserEmailErrorCode {
-  UNCHANGED_EMAIL
   UNKNOWN
-  UNKNOWN_CURRENT_EMAIL
   UNKNOWN_USER
+  UNCHANGED_EMAIL
+  UNKNOWN_CURRENT_EMAIL
 }
 
 enum ChangeUserPasswordErrorCode {
+  UNKNOWN
+  UNKNOWN_USER
   NO_PASSWORD
   PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
@@ -4608,120 +4612,118 @@ enum ChangeUserPasswordErrorCode {
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
-  UNKNOWN
-  UNKNOWN_USER
 }
 
 enum CoatedSide {
+  PRIME
+  NON_PRIME
   BOTH
   NEITHER
-  NON_PRIME
-  NOT_APPLICABLE
-  PRIME
   UNKNOWN
+  NOT_APPLICABLE
 }
 
 enum ComponentCategory {
-  LAYER
   MATERIAL
+  LAYER
   UNIT
 }
 
 enum ConfirmComponentManufacturerErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_COMPONENT
   UNKNOWN_INSTITUTION
+  UNAUTHORIZED
   UNKNOWN_MANUFACTURER
 }
 
 enum ConfirmInstitutionMethodDeveloperErrorCode {
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_DEVELOPER
-  UNKNOWN_INSTITUTION
   UNKNOWN_METHOD
+  UNKNOWN_INSTITUTION
+  UNAUTHORIZED
+  UNKNOWN_DEVELOPER
 }
 
 enum ConfirmInstitutionRepresentativeErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
-  UNKNOWN_REPRESENTATIVE
   UNKNOWN_USER
+  UNAUTHORIZED
+  UNKNOWN_REPRESENTATIVE
 }
 
 enum ConfirmUserEmailChangeErrorCode {
+  UNKNOWN
   DUPLICATE_EMAIL
   INVALID_CONFIRMATION_CODE
-  UNKNOWN
   UNKNOWN_USER
 }
 
 enum ConfirmUserEmailErrorCode {
-  INVALID_CONFIRMATION_CODE
   UNKNOWN
   UNKNOWN_USER
+  INVALID_CONFIRMATION_CODE
 }
 
 enum ConfirmUserMethodDeveloperErrorCode {
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_DEVELOPER
   UNKNOWN_METHOD
   UNKNOWN_USER
+  UNAUTHORIZED
+  UNKNOWN_DEVELOPER
 }
 
 enum CreateComponentErrorCode {
-  AMBIGUOUS_REFERENCE
-  DUPLICATE_COMPONENT_ID
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_MANAGER
   UNKNOWN_MANUFACTURER
+  UNAUTHORIZED
+  AMBIGUOUS_REFERENCE
+  DUPLICATE_COMPONENT_ID
 }
 
 enum CreateDatabaseErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_OPERATOR
 }
 
 enum CreateDataFormatErrorCode {
-  TWO_REFERENCES
-  UNAUTHORIZED
   UNKNOWN
+  TWO_REFERENCES
   UNKNOWN_MANAGER
+  UNAUTHORIZED
 }
 
 enum CreateInstitutionErrorCode {
-  DUPLICATE_INSTITUTION_ID
-  NEITHER_OWNER_NOR_MANAGER
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_MANAGER
+  NEITHER_OWNER_NOR_MANAGER
   UNKNOWN_OWNERS
+  UNKNOWN_MANAGER
+  UNAUTHORIZED
+  DUPLICATE_INSTITUTION_ID
 }
 
 enum CreateMethodErrorCode {
-  TWO_REFERENCES
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_INSTITUTION_DEVELOPERS
+  TWO_REFERENCES
   UNKNOWN_MANAGER
+  UNKNOWN_INSTITUTION_DEVELOPERS
   UNKNOWN_USER_DEVELOPERS
+  UNAUTHORIZED
 }
 
 enum CreateOpenIdConnectApplicationErrorCode {
+  UNKNOWN
+  UNAUTHORIZED
+  UNKNOWN_INSTITUTION
   DUPLICATE_CLIENT_ID
   ILLEGAL_CONSENT_TYPE
-  ILLEGAL_ENDPOINT
+  ILLEGAL_SCOPE
   ILLEGAL_GRANT_TYPE
+  ILLEGAL_ENDPOINT
   ILLEGAL_RESPONSE_TYPE
-  ILLEGAL_SCOPE
-  UNAUTHORIZED
-  UNKNOWN
-  UNKNOWN_INSTITUTION
 }
 
 enum DatabaseVerificationState {
@@ -4739,35 +4741,35 @@ enum DataKind {
 }
 
 enum DeleteInstitutionErrorCode {
-  MANAGING
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
+  UNAUTHORIZED
+  MANAGING
 }
 
 enum DeleteOpenIdConnectApplicationErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_APPLICATION
 }
 
 enum DeleteOpenIdConnectAuthorizationErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_AUTHORIZATION
 }
 
 enum DeletePersonalUserDataErrorCode {
-  INCORRECT_PASSWORD
-  MISSING_PASSWORD
   UNKNOWN
   UNKNOWN_USER
+  MISSING_PASSWORD
+  INCORRECT_PASSWORD
 }
 
 enum DeleteUserErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_USER
+  UNAUTHORIZED
 }
 
 enum DisableUserTwoFactorAuthenticationErrorCode {
@@ -4776,15 +4778,15 @@ enum DisableUserTwoFactorAuthenticationErrorCode {
 }
 
 enum EnableUserTwoFactorAuthenticatorErrorCode {
-  ENABLING_FAILED
-  INVALID_VERIFICATION_CODE
   UNKNOWN
   UNKNOWN_USER
+  ENABLING_FAILED
+  INVALID_VERIFICATION_CODE
 }
 
 enum ForbidGnuPgKeyFingerprintErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_FINGERPRINT
 }
 
@@ -4794,28 +4796,28 @@ enum ForgetUserTwoFactorAuthenticationClientErrorCode {
 }
 
 enum GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUriErrorCode {
-  GETTING_AUTHENTICATOR_KEY_FAILED
-  GETTING_EMAIL_FAILED
-  RESETTING_AUTHENTICATOR_KEY_FAILED
   UNKNOWN
   UNKNOWN_USER
+  RESETTING_AUTHENTICATOR_KEY_FAILED
+  GETTING_AUTHENTICATOR_KEY_FAILED
+  GETTING_EMAIL_FAILED
 }
 
 enum GenerateUserTwoFactorRecoveryCodesErrorCode {
-  CODE_GENERATION_FAILED
-  TWO_FACTOR_AUTHENTICATION_DISABLED
   UNKNOWN
   UNKNOWN_USER
+  TWO_FACTOR_AUTHENTICATION_DISABLED
+  CODE_GENERATION_FAILED
 }
 
 enum InstitutionOperatingState {
-  NOT_OPERATING
   OPERATING
+  NOT_OPERATING
 }
 
 enum InstitutionRepresentativeRole {
-  ASSISTANT
   OWNER
+  ASSISTANT
 }
 
 enum InstitutionState {
@@ -4824,14 +4826,14 @@ enum InstitutionState {
 }
 
 enum JsonValueKind {
-  ARRAY
-  FALSE
-  NULL
-  NUMBER
+  UNDEFINED
   OBJECT
+  ARRAY
   STRING
+  NUMBER
   TRUE
-  UNDEFINED
+  FALSE
+  NULL
 }
 
 enum LoginUserErrorCode {
@@ -4842,19 +4844,19 @@ enum LoginUserErrorCode {
 }
 
 enum LoginUserWithRecoveryCodeErrorCode {
-  INVALID_RECOVERY_CODE
-  LOCKED_OUT
-  NOT_ALLOWED
   UNKNOWN
   UNKNOWN_USER
+  NOT_ALLOWED
+  LOCKED_OUT
+  INVALID_RECOVERY_CODE
 }
 
 enum LoginUserWithTwoFactorCodeErrorCode {
-  INVALID_AUTHENTICATOR_CODE
-  LOCKED_OUT
-  NOT_ALLOWED
   UNKNOWN
   UNKNOWN_USER
+  NOT_ALLOWED
+  LOCKED_OUT
+  INVALID_AUTHENTICATOR_CODE
 }
 
 enum LogoutUserErrorCode {
@@ -4862,8 +4864,8 @@ enum LogoutUserErrorCode {
 }
 
 enum MethodCategory {
-  CALCULATION
   MEASUREMENT
+  CALCULATION
 }
 
 enum OpenIdConnectConsentType {
@@ -4902,45 +4904,45 @@ enum OpenIdConnectResponseType {
 
 enum OpenIdConnectScope {
   ADDRESS
-  ADMINISTRATE_API
   EMAIL
+  PHONE
+  PROFILE
+  ROLES
+  READ_API
+  WRITE_API
+  ADMINISTRATE_API
+  VERIFY_API
+  SUPPORT_API
   MANAGE_DATABASE_API
   MANAGE_GNU_PG_API
   MANAGE_INSTITUTION_REPRESENTATIVE_API
   MANAGE_OPEN_ID_CONNECT_API
   MANAGE_USER_API
-  PHONE
-  PROFILE
-  READ_API
-  ROLES
-  SUPPORT_API
-  VERIFY_API
-  WRITE_API
 }
 
 enum OpticalComponentSubtype {
-  ACID_ETCHED_GLASS
-  APPLIED_FILM
-  CELLULAR_SHADE
-  CHROMOGENIC
+  MONOLITHIC
+  LAMINATE
+  INTERLAYER
+  EMBEDDED_COATING
   COATED
   COATING
-  DIFFUSING_SHADE
-  EMBEDDED_COATING
+  APPLIED_FILM
   FILM
-  FRITTED_GLASS
-  INTERLAYER
-  LAMINATE
-  MONOLITHIC
+  VENETIAN_BLIND
+  DIFFUSING_SHADE
+  ROLLER_SHADE
+  WOVEN_SHADE
+  VERTICAL_LOUVER
   PERFORATED_SCREEN
+  CELLULAR_SHADE
   PLEATED_SHADE
-  ROLLER_SHADE
   ROMAN_SHADE
-  SANDBLASTED_GLASS
   SHADE_MATERIAL
-  VENETIAN_BLIND
-  VERTICAL_LOUVER
-  WOVEN_SHADE
+  FRITTED_GLASS
+  ACID_ETCHED_GLASS
+  SANDBLASTED_GLASS
+  CHROMOGENIC
 }
 
 enum OpticalComponentType {
@@ -4954,81 +4956,81 @@ enum PrimeSurface {
 }
 
 enum RegisterUserErrorCode {
+  UNKNOWN
+  PASSWORD_CONFIRMATION_MISMATCH
   DUPLICATE_EMAIL
   INVALID_EMAIL
-  NULL_OR_EMPTY_EMAIL
-  PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
   PASSWORD_REQUIRES_LOWER
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
-  UNKNOWN
+  NULL_OR_EMPTY_EMAIL
 }
 
 enum RemoveComponentAssemblyErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ASSEMBLED_COMPONENT
-  UNKNOWN_ASSEMBLY
   UNKNOWN_PART_COMPONENT
+  UNKNOWN_ASSEMBLY
+  UNAUTHORIZED
 }
 
 enum RemoveComponentGeneralizationErrorCode {
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_CONCRETE_COMPONENT
   UNKNOWN_GENERAL_COMPONENT
+  UNKNOWN_CONCRETE_COMPONENT
   UNKNOWN_GENERALIZATION
+  UNAUTHORIZED
 }
 
 enum RemoveComponentManufacturerErrorCode {
-  LAST_MANUFACTURER
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_COMPONENT
   UNKNOWN_INSTITUTION
+  UNAUTHORIZED
   UNKNOWN_MANUFACTURER
+  LAST_MANUFACTURER
 }
 
 enum RemoveComponentVariantErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ONE_COMPONENT
   UNKNOWN_OTHER_COMPONENT
   UNKNOWN_VARIANT
+  UNAUTHORIZED
 }
 
 enum RemoveInstitutionMethodDeveloperErrorCode {
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_DEVELOPER
-  UNKNOWN_INSTITUTION
   UNKNOWN_METHOD
+  UNKNOWN_INSTITUTION
+  UNAUTHORIZED
+  UNKNOWN_DEVELOPER
 }
 
 enum RemoveInstitutionRepresentativeErrorCode {
+  UNKNOWN
   LAST_OWNER
   UNAUTHORIZED
-  UNKNOWN
   UNKNOWN_INSTITUTION
   UNKNOWN_REPRESENTATIVE
   UNKNOWN_USER
 }
 
 enum RemoveUserMethodDeveloperErrorCode {
-  UNAUTHORIZED
   UNKNOWN
-  UNKNOWN_DEVELOPER
   UNKNOWN_METHOD
   UNKNOWN_USER
+  UNAUTHORIZED
+  UNKNOWN_DEVELOPER
 }
 
 enum RemoveUserRoleErrorCode {
-  LAST_USER
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_USER
+  LAST_USER
+  UNAUTHORIZED
 }
 
 enum RequestUserPasswordResetErrorCode {
@@ -5041,17 +5043,18 @@ enum ResendUserEmailConfirmationErrorCode {
 
 enum ResendUserEmailVerificationErrorCode {
   UNKNOWN
-  UNKNOWN_EMAIL
   UNKNOWN_USER
+  UNKNOWN_EMAIL
 }
 
 enum ResetOpenIdConnectApplicationClientSecretErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_APPLICATION
 }
 
 enum ResetUserPasswordErrorCode {
+  UNKNOWN
   INVALID_RESET_CODE
   PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
@@ -5059,36 +5062,37 @@ enum ResetUserPasswordErrorCode {
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
-  UNKNOWN
 }
 
 enum ResetUserTwoFactorAuthenticatorErrorCode {
-  DISABLING_FAILED
-  RESETTING_FAILED
   UNKNOWN
   UNKNOWN_USER
+  DISABLING_FAILED
+  RESETTING_FAILED
 }
 
 enum RevokeOpenIdConnectTokenErrorCode {
-  FAILED
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_TOKEN
+  FAILED
 }
 
 enum SetComponentExtrasErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_COMPONENT
 }
 
 enum SetInstitutionExtrasErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_INSTITUTION
 }
 
 enum SetUserPasswordErrorCode {
+  UNKNOWN
+  UNKNOWN_USER
   EXISTING_PASSWORD
   PASSWORD_CONFIRMATION_MISMATCH
   PASSWORD_REQUIRES_DIGIT
@@ -5096,14 +5100,12 @@ enum SetUserPasswordErrorCode {
   PASSWORD_REQUIRES_NON_ALPHANUMERIC
   PASSWORD_REQUIRES_UPPER
   PASSWORD_TOO_SHORT
-  UNKNOWN
-  UNKNOWN_USER
 }
 
 enum SetUserPhoneNumberErrorCode {
-  UNCHANGED_PHONE_NUMBER
   UNKNOWN
   UNKNOWN_USER
+  UNCHANGED_PHONE_NUMBER
 }
 
 enum SortEnumType {
@@ -5139,83 +5141,83 @@ enum Standardizer {
 }
 
 enum SwitchInstitutionOperatingStateErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
+  UNAUTHORIZED
 }
 
 enum UpdateComponentAssemblyErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_ASSEMBLED_COMPONENT
-  UNKNOWN_ASSEMBLY
   UNKNOWN_PART_COMPONENT
+  UNKNOWN_ASSEMBLY
+  UNAUTHORIZED
 }
 
 enum UpdateComponentErrorCode {
-  AMBIGUOUS_REFERENCE
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_COMPONENT
   UNKNOWN_MANUFACTURER
+  AMBIGUOUS_REFERENCE
 }
 
 enum UpdateDatabaseErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_DATABASE
 }
 
 enum UpdateDataFormatErrorCode {
+  UNKNOWN
   TWO_REFERENCES
   UNAUTHORIZED
-  UNKNOWN
   UNKNOWN_DATA_FORMAT
 }
 
 enum UpdateInstitutionErrorCode {
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_INSTITUTION
 }
 
 enum UpdateMethodErrorCode {
+  UNKNOWN
   TWO_REFERENCES
   UNAUTHORIZED
-  UNKNOWN
   UNKNOWN_METHOD
 }
 
 enum UpdateOpenIdConnectApplicationErrorCode {
+  UNKNOWN
+  UNAUTHORIZED
+  UNKNOWN_APPLICATION
   ILLEGAL_CONSENT_TYPE
-  ILLEGAL_ENDPOINT
   ILLEGAL_GRANT_TYPE
-  ILLEGAL_RESPONSE_TYPE
   ILLEGAL_SCOPE
-  UNAUTHORIZED
-  UNKNOWN
-  UNKNOWN_APPLICATION
+  ILLEGAL_RESPONSE_TYPE
+  ILLEGAL_ENDPOINT
 }
 
 enum UserRole {
   ADMINISTRATOR
-  SUPPORTER
   VERIFIER
+  SUPPORTER
 }
 
 enum VerifyDatabaseErrorCode {
-  DESERIALIZATION_FAILED
-  REQUEST_FAILED
-  UNAUTHORIZED
   UNKNOWN
+  UNAUTHORIZED
   UNKNOWN_DATABASE
   WRONG_VERIFICATION_CODE
+  REQUEST_FAILED
+  DESERIALIZATION_FAILED
 }
 
 enum VerifyInstitutionErrorCode {
-  UNAUTHORIZED
   UNKNOWN
   UNKNOWN_INSTITUTION
+  UNAUTHORIZED
 }
 
 scalar Any @specifiedBy(url: "https://scalars.graphql.org/chillicream/any.html")

From 210526c5ed0813febd62e3f3b5a8a4e77097336c Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 3 Jun 2026 20:01:31 +0200
Subject: [PATCH 067/145] Prefer `> 0` over `>= 1` and prefer `_` as
 placeholder for unimportant parameters

---
 .../Authentication/AuthenticationHandler.cs   |  4 +-
 .../Authorization/ApprovalAuthorization.cs    |  4 +-
 .../CommonComponentAuthorization.cs           |  4 +-
 .../CommonMethodAuthorization.cs              |  4 +-
 .../Authorization/DataFormatAuthorization.cs  |  4 +-
 .../Controllers/AuthenticationController.cs   |  4 +-
 backend/src/Data/DbSeeder.cs                  | 18 ++---
 .../src/Extensions/HttpContextExtensions.cs   |  4 +-
 .../AuditableAssociationFilterType.cs         |  6 +-
 .../AuditableAssociationSortType.cs           |  6 +-
 .../ComponentAssemblyFilterType.cs            | 14 ++--
 .../ComponentAssemblySortType.cs              |  6 +-
 ...ncretizationAndGeneralizationFilterType.cs | 10 +--
 .../ComponentManufacturerFilterType.cs        | 10 +--
 .../ComponentVariantFilterType.cs             | 10 +--
 .../ComponentAssembledOfFilterType.cs         |  4 +-
 .../ComponentConcretizationOfFilterType.cs    |  4 +-
 .../GraphQl/Components/ComponentFilterType.cs | 38 +++++-----
 .../ComponentGeneralizationOfFilterType.cs    |  4 +-
 .../ComponentManufacturerFilterType.cs        |  4 +-
 .../GraphQl/Components/ComponentMutations.cs  | 10 +--
 .../Components/ComponentPartOfFilterType.cs   |  4 +-
 .../GraphQl/Components/ComponentSortType.cs   |  8 +--
 .../ComponentVariantOfFilterType.cs           |  4 +-
 .../DataFormats/DataFormatFilterType.cs       | 20 +++---
 .../DataFormats/DataFormatMutations.cs        |  4 +-
 .../GraphQl/DataFormats/DataFormatSortType.cs | 12 ++--
 .../GraphQl/Databases/DatabaseFilterType.cs   | 16 ++---
 .../GraphQl/Databases/DatabaseMutations.cs    |  4 +-
 .../src/GraphQl/Databases/DatabaseSortType.cs |  8 +--
 .../DescriptionOrReferenceFilterType.cs       |  4 +-
 .../DescriptionOrReferenceSortType.cs         |  4 +-
 .../Entities/AuditableEntityFilterType.cs     | 10 +--
 .../Entities/AuditableEntitySortType.cs       |  8 +--
 .../GnuPgKeyFingerprintFilterType.cs          | 20 +++---
 .../GnuPgKeyFingerprintSortType.cs            |  8 +--
 .../InstitutionMethodDeveloperFilterType.cs   | 10 +--
 .../InstitutionRepresentativeFilterType.cs    | 12 ++--
 .../InstitutionRepresentativeSortType.cs      |  4 +-
 .../InstitutionDevelopedMethodFilterType.cs   |  4 +-
 .../Institutions/InstitutionFilterType.cs     |  8 +--
 ...nstitutionGnuPgKeyFingerprintFilterType.cs |  4 +-
 .../InstitutionManagedComponentFilterType.cs  |  4 +-
 .../InstitutionManagedDataFormatFilterType.cs |  4 +-
 ...InstitutionManagedInstitutionFilterType.cs |  4 +-
 .../InstitutionManagedMethodFilterType.cs     |  4 +-
 ...titutionManufacturedComponentFilterType.cs |  4 +-
 .../Institutions/InstitutionMutations.cs      |  6 +-
 .../InstitutionOperatedDatabaseFilterType.cs  |  4 +-
 ...OwnedOpenIdConnectApplicationFilterType.cs |  4 +-
 .../InstitutionRepresentativeFilterType.cs    |  4 +-
 .../Methods/MethodDeveloperFilterType.cs      |  6 +-
 .../src/GraphQl/Methods/MethodFilterType.cs   | 26 +++----
 .../src/GraphQl/Methods/MethodMutations.cs    |  6 +-
 backend/src/GraphQl/Methods/MethodSortType.cs |  8 +--
 .../OpenIdConnectApplicationFilterType.cs     | 24 +++----
 .../OpenIdConnectApplicationMutations.cs      | 20 +++---
 .../OpenIdConnectApplicationSortType.cs       | 14 ++--
 .../OpenIdConnectAuthorizationFilterType.cs   | 20 +++---
 .../OpenIdConnectAuthorizationSortType.cs     | 10 +--
 .../Tokens/OpenIdConnectTokenFilterType.cs    | 24 +++----
 .../Tokens/OpenIdConnectTokenSortType.cs      | 14 ++--
 backend/src/GraphQl/Requests/DataQueries.cs   |  4 +-
 .../UserMethodDeveloperFilterType.cs          | 10 +--
 .../Users/UserDevelopedMethodFilterType.cs    |  4 +-
 backend/src/GraphQl/Users/UserFilterType.cs   | 24 +++----
 .../UserGnuPgKeyFingerprintFilterType.cs      |  4 +-
 backend/src/GraphQl/Users/UserMutations.cs    |  6 +-
 .../UserRepresentedInstitutionFilterType.cs   |  4 +-
 backend/src/GraphQl/Users/UserSortType.cs     | 10 +--
 .../20210414155531_InitialCreate.cs           | 70 +++++++++----------
 ...448_AddReflexiveAssociationsToComponent.cs | 10 +--
 .../20230210135411_AddDataProtectionKeys.cs   |  4 +-
 ...103_AddRelationInstitutionToApplication.cs |  6 +-
 ...plicationsBelongToExactlyOneInstitution.cs |  6 +-
 ...140321_MakeGnuPgFingerprintItsOwnEntity.cs |  8 +--
 ...175152_AddParametersAndSourcesToMethods.cs |  6 +-
 77 files changed, 367 insertions(+), 367 deletions(-)

diff --git a/backend/src/Authentication/AuthenticationHandler.cs b/backend/src/Authentication/AuthenticationHandler.cs
index db9e1766e..c4ee8d384 100644
--- a/backend/src/Authentication/AuthenticationHandler.cs
+++ b/backend/src/Authentication/AuthenticationHandler.cs
@@ -216,7 +216,7 @@ CancellationToken cancellationToken
                     RefreshToken: refreshTokenAuthenticationResult.RefreshToken
                 )
             );
-            if (errors.Count >= 1)
+            if (errors.Count > 0)
             {
                 logger.FailedToSetAuthenticationTokens(
                     string.Join(
@@ -280,4 +280,4 @@ CancellationToken cancellationToken
         // `OpenIddictBuilder#AddValidation`.
         return await httpContext.AuthenticateAsync(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/Authorization/ApprovalAuthorization.cs b/backend/src/Authorization/ApprovalAuthorization.cs
index f0935f850..aaa9bb86b 100644
--- a/backend/src/Authorization/ApprovalAuthorization.cs
+++ b/backend/src/Authorization/ApprovalAuthorization.cs
@@ -24,11 +24,11 @@ CancellationToken cancellationToken
             claimsPrincipal,
             async user => (await Context.InstitutionRepresentatives.AsQueryable()
                     .SingleOrDefaultAsync(
-                        x => x.UserId == user.Id,
+                        _ => _.UserId == user.Id,
                         cancellationToken
                     )) is not null,
             application => Task.FromResult(false),
             cancellationToken
         );
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/Authorization/CommonComponentAuthorization.cs b/backend/src/Authorization/CommonComponentAuthorization.cs
index ecc9b95b4..3daf27e4a 100644
--- a/backend/src/Authorization/CommonComponentAuthorization.cs
+++ b/backend/src/Authorization/CommonComponentAuthorization.cs
@@ -25,7 +25,7 @@ CancellationToken cancellationToken
     {
         var wrappedManagerId =
             await Context.Components.AsNoTracking()
-                .Where(x => x.Id == componentId)
+                .Where(_ => _.Id == componentId)
                 .Select(x => new { x.ManagerId })
                 .SingleOrDefaultAsync(cancellationToken);
         if (wrappedManagerId is null)
@@ -53,4 +53,4 @@ CancellationToken cancellationToken
             ))
             .AnyAsync(cancellationToken);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/Authorization/CommonMethodAuthorization.cs b/backend/src/Authorization/CommonMethodAuthorization.cs
index facc7b0b7..b7db289af 100644
--- a/backend/src/Authorization/CommonMethodAuthorization.cs
+++ b/backend/src/Authorization/CommonMethodAuthorization.cs
@@ -25,7 +25,7 @@ CancellationToken cancellationToken
     {
         var wrappedManagerId =
             await Context.Methods.AsNoTracking()
-                .Where(x => x.Id == methodId)
+                .Where(_ => _.Id == methodId)
                 .Select(x => new { x.ManagerId })
                 .SingleOrDefaultAsync(cancellationToken);
         if (wrappedManagerId is null)
@@ -53,4 +53,4 @@ CancellationToken cancellationToken
             ))
             .AnyAsync(cancellationToken);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/Authorization/DataFormatAuthorization.cs b/backend/src/Authorization/DataFormatAuthorization.cs
index 8c73411bb..728b1ee83 100644
--- a/backend/src/Authorization/DataFormatAuthorization.cs
+++ b/backend/src/Authorization/DataFormatAuthorization.cs
@@ -77,7 +77,7 @@ CancellationToken cancellationToken
     {
         return (
             await Context.DataFormats.AsNoTracking()
-                .Where(x => x.Id == dataFormatId)
+                .Where(_ => _.Id == dataFormatId)
                 .Select(x => new { x.ManagerId })
                 .SingleOrDefaultAsync(cancellationToken)
         )?.ManagerId;
@@ -99,4 +99,4 @@ CancellationToken cancellationToken
             ))
             .AnyAsync(cancellationToken);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/Controllers/AuthenticationController.cs b/backend/src/Controllers/AuthenticationController.cs
index 313ae9494..22a5ab3e8 100644
--- a/backend/src/Controllers/AuthenticationController.cs
+++ b/backend/src/Controllers/AuthenticationController.cs
@@ -198,7 +198,7 @@ public async Task<ActionResult> LogInCallback(string provider)
             provider,
             AuthenticationTokens.From(accessToken, result)
         );
-        if (errors.Count >= 1)
+        if (errors.Count > 0)
         {
             throw new InvalidOperationException(
                 string.Join(
@@ -246,4 +246,4 @@ private string SanitizeReturnUrl(string? returnTo)
                 ? returnTo
                 : "/";
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/Data/DbSeeder.cs b/backend/src/Data/DbSeeder.cs
index ae0c0c40f..a89c69142 100644
--- a/backend/src/Data/DbSeeder.cs
+++ b/backend/src/Data/DbSeeder.cs
@@ -69,15 +69,15 @@ public sealed class DbSeeder
 
     public static readonly (string Name, string EmailAddress, Enumerations.UserRole Role)
         AdministratorUser =
-            Users.First(x => x.Role == Enumerations.UserRole.ADMINISTRATOR);
+            Users.First(_ => _.Role == Enumerations.UserRole.ADMINISTRATOR);
 
     public static readonly (string Name, string EmailAddress, Enumerations.UserRole Role)
         VerifierUser =
-            Users.First(x => x.Role == Enumerations.UserRole.VERIFIER);
+            Users.First(_ => _.Role == Enumerations.UserRole.VERIFIER);
 
     public static readonly (string Name, string EmailAddress, Enumerations.UserRole Role)
         SupporterUser =
-            Users.First(x => x.Role == Enumerations.UserRole.SUPPORTER);
+            Users.First(_ => _.Role == Enumerations.UserRole.SUPPORTER);
 
     public static async Task DoAsync(
         IServiceProvider services
@@ -195,7 +195,7 @@ IWebHostEnvironment environment
             iseInstitution.RepresentativeEdges.Add(
                 new InstitutionRepresentative
                 {
-                    UserId = (await context.Users.Where(x => x.Email == AdministratorUser.EmailAddress).SingleAsync()).Id,
+                    UserId = (await context.Users.Where(_ => _.Email == AdministratorUser.EmailAddress).SingleAsync()).Id,
                     Role = InstitutionRepresentativeRole.OWNER,
                     Pending = false
                 }
@@ -208,7 +208,7 @@ IWebHostEnvironment environment
             context.Institutions.Add(iseInstitution);
             await context.SaveChangesAsync();
         }
-        if (!await context.Institutions.Where(x => x.Id == new Guid(DataConstants.TestlabInstitutionUuid)).AnyAsync())
+        if (!await context.Institutions.Where(_ => _.Id == new Guid(DataConstants.TestlabInstitutionUuid)).AnyAsync())
         {
             var institution = new Institution(
                 new Guid(DataConstants.TestlabInstitutionUuid),
@@ -238,7 +238,7 @@ IWebHostEnvironment environment
             context.Institutions.Add(institution);
             await context.SaveChangesAsync();
         }
-        if (!await context.Institutions.Where(x => x.Id == new Guid(DataConstants.LbnlInstitutionUuid)).AnyAsync())
+        if (!await context.Institutions.Where(_ => _.Id == new Guid(DataConstants.LbnlInstitutionUuid)).AnyAsync())
         {
             var institution = new Institution(
                 new Guid(DataConstants.LbnlInstitutionUuid),
@@ -272,7 +272,7 @@ AppSettings appSettings
     )
     {
         var context = services.GetRequiredService<ApplicationDbContext>();
-        if (!await context.Databases.Where(x => x.Id == new Guid(DataConstants.TestlabDatabaseUuid)).AnyAsync())
+        if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.TestlabDatabaseUuid)).AnyAsync())
         {
             var uriBuilder = new UriBuilder(appSettings.TestlabSolarFacades.Uri)
             {
@@ -291,7 +291,7 @@ AppSettings appSettings
             context.Databases.Add(database);
             await context.SaveChangesAsync();
         }
-        if (!await context.Databases.Where(x => x.Id == new Guid(DataConstants.IgsdbDatabaseUuid)).AnyAsync())
+        if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.IgsdbDatabaseUuid)).AnyAsync())
         {
             var uriBuilder = new UriBuilder(new Uri("https://igsdb-v2-staging.herokuapp.com", UriKind.Absolute))
             {
@@ -641,4 +641,4 @@ AppSettings appSettings
             await manager.CreateAsync(application, appSettings.Igsdb.OpenIdConnectClientSecret);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/Extensions/HttpContextExtensions.cs b/backend/src/Extensions/HttpContextExtensions.cs
index 19806daa4..79ea0ddb0 100644
--- a/backend/src/Extensions/HttpContextExtensions.cs
+++ b/backend/src/Extensions/HttpContextExtensions.cs
@@ -15,8 +15,8 @@ public static void SetBearerToken(this HttpContext httpContext, string accessTok
         var bearerTokenPrefix = $"{OpenIdConnectConstants.AuthorizationHeaderBearer} ";
         return httpContext.Request?.Headers?.Authorization
             .FirstOrDefault(
-                x => x is not null
-                     && x.TrimStart().StartsWith(bearerTokenPrefix, StringComparison.Ordinal)
+                _ => _ is not null
+                     && _.TrimStart().StartsWith(bearerTokenPrefix, StringComparison.Ordinal)
             )
             ?.TrimStart()
             ?[bearerTokenPrefix.Length..]
diff --git a/backend/src/GraphQl/Associations/AuditableAssociationFilterType.cs b/backend/src/GraphQl/Associations/AuditableAssociationFilterType.cs
index 60fb2f752..943a82343 100644
--- a/backend/src/GraphQl/Associations/AuditableAssociationFilterType.cs
+++ b/backend/src/GraphQl/Associations/AuditableAssociationFilterType.cs
@@ -13,7 +13,7 @@ IFilterInputTypeDescriptor<TAssociation> descriptor
     {
         base.Configure(descriptor);
         descriptor.BindFieldsExplicitly();
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Associations/AuditableAssociationSortType.cs b/backend/src/GraphQl/Associations/AuditableAssociationSortType.cs
index 3cd30dcb6..79972bfd0 100644
--- a/backend/src/GraphQl/Associations/AuditableAssociationSortType.cs
+++ b/backend/src/GraphQl/Associations/AuditableAssociationSortType.cs
@@ -13,7 +13,7 @@ ISortInputTypeDescriptor<TAssociation> descriptor
     {
         base.Configure(descriptor);
         descriptor.BindFieldsExplicitly();
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblyFilterType.cs b/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblyFilterType.cs
index ea7bee0f9..394a3ad97 100644
--- a/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblyFilterType.cs
+++ b/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblyFilterType.cs
@@ -13,11 +13,11 @@ IFilterInputTypeDescriptor<ComponentAssembly> descriptor
     {
         base.Configure(descriptor);
         // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.AssembledComponent);
-        descriptor.Field(x => x.PartComponent);
-        descriptor.Field(x => x.Index);
-        descriptor.Field(x => x.PrimeSurface);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.AssembledComponent);
+        descriptor.Field(_ => _.PartComponent);
+        descriptor.Field(_ => _.Index);
+        descriptor.Field(_ => _.PrimeSurface);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblySortType.cs b/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblySortType.cs
index d7e4cfc4b..28afee34e 100644
--- a/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblySortType.cs
+++ b/backend/src/GraphQl/ComponentAssemblies/ComponentAssemblySortType.cs
@@ -12,7 +12,7 @@ ISortInputTypeDescriptor<ComponentAssembly> descriptor
     )
     {
         base.Configure(descriptor);
-        descriptor.Field(x => x.Index);
-        descriptor.Field(x => x.PrimeSurface);
+        descriptor.Field(_ => _.Index);
+        descriptor.Field(_ => _.PrimeSurface);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/ComponentGeneralizations/ComponentConcretizationAndGeneralizationFilterType.cs b/backend/src/GraphQl/ComponentGeneralizations/ComponentConcretizationAndGeneralizationFilterType.cs
index fa4202087..9346588dc 100644
--- a/backend/src/GraphQl/ComponentGeneralizations/ComponentConcretizationAndGeneralizationFilterType.cs
+++ b/backend/src/GraphQl/ComponentGeneralizations/ComponentConcretizationAndGeneralizationFilterType.cs
@@ -13,9 +13,9 @@ IFilterInputTypeDescriptor<ComponentConcretizationAndGeneralization> descriptor
     {
         base.Configure(descriptor);
         // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.ConcreteComponent);
-        descriptor.Field(x => x.GeneralComponent);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.ConcreteComponent);
+        descriptor.Field(_ => _.GeneralComponent);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerFilterType.cs b/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerFilterType.cs
index e3332786b..aeccc8065 100644
--- a/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerFilterType.cs
+++ b/backend/src/GraphQl/ComponentManufacturers/ComponentManufacturerFilterType.cs
@@ -13,9 +13,9 @@ IFilterInputTypeDescriptor<ComponentManufacturer> descriptor
     {
         base.Configure(descriptor);
         // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.Component);
-        descriptor.Field(x => x.Institution);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.Component);
+        descriptor.Field(_ => _.Institution);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/ComponentVariants/ComponentVariantFilterType.cs b/backend/src/GraphQl/ComponentVariants/ComponentVariantFilterType.cs
index 544aadd15..d5d102a36 100644
--- a/backend/src/GraphQl/ComponentVariants/ComponentVariantFilterType.cs
+++ b/backend/src/GraphQl/ComponentVariants/ComponentVariantFilterType.cs
@@ -13,9 +13,9 @@ IFilterInputTypeDescriptor<ComponentVariant> descriptor
     {
         base.Configure(descriptor);
         // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.OfComponent);
-        descriptor.Field(x => x.ToComponent);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.OfComponent);
+        descriptor.Field(_ => _.ToComponent);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Components/ComponentAssembledOfFilterType.cs b/backend/src/GraphQl/Components/ComponentAssembledOfFilterType.cs
index eb0b9eba4..18176f4a3 100644
--- a/backend/src/GraphQl/Components/ComponentAssembledOfFilterType.cs
+++ b/backend/src/GraphQl/Components/ComponentAssembledOfFilterType.cs
@@ -12,6 +12,6 @@ IFilterInputTypeDescriptor<ComponentAssembly> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(ComponentAssembledOfFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.AssembledComponent).Ignore();
+        descriptor.Field(_ => _.AssembledComponent).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Components/ComponentConcretizationOfFilterType.cs b/backend/src/GraphQl/Components/ComponentConcretizationOfFilterType.cs
index 449fc9c61..9cfe2444a 100644
--- a/backend/src/GraphQl/Components/ComponentConcretizationOfFilterType.cs
+++ b/backend/src/GraphQl/Components/ComponentConcretizationOfFilterType.cs
@@ -12,6 +12,6 @@ IFilterInputTypeDescriptor<ComponentConcretizationAndGeneralization> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(ComponentConcretizationOfFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.ConcreteComponent).Ignore();
+        descriptor.Field(_ => _.ConcreteComponent).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Components/ComponentFilterType.cs b/backend/src/GraphQl/Components/ComponentFilterType.cs
index 489209d7a..66ed839a4 100644
--- a/backend/src/GraphQl/Components/ComponentFilterType.cs
+++ b/backend/src/GraphQl/Components/ComponentFilterType.cs
@@ -13,24 +13,24 @@ IFilterInputTypeDescriptor<Component> descriptor
     {
         base.Configure(descriptor);
         // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.Id);
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.Name);
-        descriptor.Field(x => x.Abbreviation);
-        descriptor.Field(x => x.Description);
-        descriptor.Field(x => x.Categories);
-        descriptor.Field(x => x.Extras);
-        descriptor.Field(x => x.PartOf);
-        descriptor.Field(x => x.Parts);
-        descriptor.Field(x => x.PartOfEdges);
-        descriptor.Field(x => x.PartEdges);
-        descriptor.Field(x => x.Concretizations);
-        descriptor.Field(x => x.Generalizations);
-        descriptor.Field(x => x.Variants);
-        descriptor.Field(x => x.Manager);
-        descriptor.Field(x => x.Manufacturers);
-        descriptor.Field(x => x.ManufacturerEdges);
+        descriptor.Field(_ => _.Id);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.Name);
+        descriptor.Field(_ => _.Abbreviation);
+        descriptor.Field(_ => _.Description);
+        descriptor.Field(_ => _.Categories);
+        descriptor.Field(_ => _.Extras);
+        descriptor.Field(_ => _.PartOf);
+        descriptor.Field(_ => _.Parts);
+        descriptor.Field(_ => _.PartOfEdges);
+        descriptor.Field(_ => _.PartEdges);
+        descriptor.Field(_ => _.Concretizations);
+        descriptor.Field(_ => _.Generalizations);
+        descriptor.Field(_ => _.Variants);
+        descriptor.Field(_ => _.Manager);
+        descriptor.Field(_ => _.Manufacturers);
+        descriptor.Field(_ => _.ManufacturerEdges);
         // TODO Allow filtering by Availability. How? See https://chillicream.com/docs/hotchocolate/fetching-data/filtering/#customization
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Components/ComponentGeneralizationOfFilterType.cs b/backend/src/GraphQl/Components/ComponentGeneralizationOfFilterType.cs
index b8793c388..e71b9e3b1 100644
--- a/backend/src/GraphQl/Components/ComponentGeneralizationOfFilterType.cs
+++ b/backend/src/GraphQl/Components/ComponentGeneralizationOfFilterType.cs
@@ -12,6 +12,6 @@ IFilterInputTypeDescriptor<ComponentConcretizationAndGeneralization> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(ComponentGeneralizationOfFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.GeneralComponent).Ignore();
+        descriptor.Field(_ => _.GeneralComponent).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Components/ComponentManufacturerFilterType.cs b/backend/src/GraphQl/Components/ComponentManufacturerFilterType.cs
index 6c7404b7b..accaee89b 100644
--- a/backend/src/GraphQl/Components/ComponentManufacturerFilterType.cs
+++ b/backend/src/GraphQl/Components/ComponentManufacturerFilterType.cs
@@ -12,6 +12,6 @@ IFilterInputTypeDescriptor<ComponentManufacturer> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(ComponentManufacturerFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.Component).Ignore();
+        descriptor.Field(_ => _.Component).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Components/ComponentMutations.cs b/backend/src/GraphQl/Components/ComponentMutations.cs
index 530db5dfe..46023c5ad 100644
--- a/backend/src/GraphQl/Components/ComponentMutations.cs
+++ b/backend/src/GraphQl/Components/ComponentMutations.cs
@@ -56,7 +56,7 @@ CancellationToken cancellationToken
         if (input.ComponentId is not null
             && await context.Components.AsQueryable()
                 .AnyAsync(
-                    x => x.Id == input.ComponentId,
+                    _ => _.Id == input.ComponentId,
                     cancellationToken
                 )
            )
@@ -72,7 +72,7 @@ CancellationToken cancellationToken
         if (input.ManagerId is not null &&
             !await context.Institutions.AsQueryable()
                 .AnyAsync(
-                    x => x.Id == input.ManagerId,
+                    _ => _.Id == input.ManagerId,
                     cancellationToken
                 )
            )
@@ -87,7 +87,7 @@ CancellationToken cancellationToken
         }
         if (!await context.Institutions.AsQueryable()
                 .AnyAsync(
-                    x => x.Id == input.ManufacturerId,
+                    _ => _.Id == input.ManufacturerId,
                     cancellationToken
                 )
            )
@@ -268,7 +268,7 @@ await context.Components.AsQueryable()
         if (input.ManufacturerId is not null
                 && !await context.Institutions.AsQueryable()
                     .AnyAsync(
-                        x => x.Id == input.ManufacturerId,
+                        _ => _.Id == input.ManufacturerId,
                         cancellationToken
                 )
             )
@@ -391,4 +391,4 @@ await context.Components.AsQueryable()
         await context.SaveChangesAsync(cancellationToken);
         return new SetComponentExtrasPayload(component);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Components/ComponentPartOfFilterType.cs b/backend/src/GraphQl/Components/ComponentPartOfFilterType.cs
index 663f40c5c..e2819010a 100644
--- a/backend/src/GraphQl/Components/ComponentPartOfFilterType.cs
+++ b/backend/src/GraphQl/Components/ComponentPartOfFilterType.cs
@@ -12,6 +12,6 @@ IFilterInputTypeDescriptor<ComponentAssembly> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(ComponentPartOfFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.PartComponent).Ignore();
+        descriptor.Field(_ => _.PartComponent).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Components/ComponentSortType.cs b/backend/src/GraphQl/Components/ComponentSortType.cs
index 15da7d0d8..9eb88247b 100644
--- a/backend/src/GraphQl/Components/ComponentSortType.cs
+++ b/backend/src/GraphQl/Components/ComponentSortType.cs
@@ -12,9 +12,9 @@ ISortInputTypeDescriptor<Component> descriptor
     )
     {
         base.Configure(descriptor);
-        descriptor.Field(x => x.Name);
-        descriptor.Field(x => x.Abbreviation);
-        descriptor.Field(x => x.Description);
+        descriptor.Field(_ => _.Name);
+        descriptor.Field(_ => _.Abbreviation);
+        descriptor.Field(_ => _.Description);
         // TODO Allow sorting by Availability. How? See https://chillicream.com/docs/hotchocolate/fetching-data/sorting/#customization
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Components/ComponentVariantOfFilterType.cs b/backend/src/GraphQl/Components/ComponentVariantOfFilterType.cs
index 41a9e5ef4..1db5f2d46 100644
--- a/backend/src/GraphQl/Components/ComponentVariantOfFilterType.cs
+++ b/backend/src/GraphQl/Components/ComponentVariantOfFilterType.cs
@@ -12,6 +12,6 @@ IFilterInputTypeDescriptor<ComponentVariant> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(ComponentVariantOfFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.ToComponent).Ignore();
+        descriptor.Field(_ => _.ToComponent).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/DataFormats/DataFormatFilterType.cs b/backend/src/GraphQl/DataFormats/DataFormatFilterType.cs
index 6e54baf76..c62905026 100644
--- a/backend/src/GraphQl/DataFormats/DataFormatFilterType.cs
+++ b/backend/src/GraphQl/DataFormats/DataFormatFilterType.cs
@@ -13,14 +13,14 @@ IFilterInputTypeDescriptor<DataFormat> descriptor
     {
         base.Configure(descriptor);
         // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.Id);
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.Name);
-        descriptor.Field(x => x.Extension);
-        descriptor.Field(x => x.Description);
-        descriptor.Field(x => x.MediaType);
-        descriptor.Field(x => x.SchemaLocator);
-        descriptor.Field(x => x.Manager);
+        descriptor.Field(_ => _.Id);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.Name);
+        descriptor.Field(_ => _.Extension);
+        descriptor.Field(_ => _.Description);
+        descriptor.Field(_ => _.MediaType);
+        descriptor.Field(_ => _.SchemaLocator);
+        descriptor.Field(_ => _.Manager);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/DataFormats/DataFormatMutations.cs b/backend/src/GraphQl/DataFormats/DataFormatMutations.cs
index cef89ac35..06071e0a1 100644
--- a/backend/src/GraphQl/DataFormats/DataFormatMutations.cs
+++ b/backend/src/GraphQl/DataFormats/DataFormatMutations.cs
@@ -43,7 +43,7 @@ CancellationToken cancellationToken
 
         if (!await context.Institutions.AsQueryable()
                 .AnyAsync(
-                    x => x.Id == input.ManagerId,
+                    _ => _.Id == input.ManagerId,
                     cancellationToken
                 )
            )
@@ -151,4 +151,4 @@ await context.DataFormats.AsQueryable()
         await context.SaveChangesAsync(cancellationToken);
         return new UpdateDataFormatPayload(dataFormat);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/DataFormats/DataFormatSortType.cs b/backend/src/GraphQl/DataFormats/DataFormatSortType.cs
index 4284db9a4..71723cdb8 100644
--- a/backend/src/GraphQl/DataFormats/DataFormatSortType.cs
+++ b/backend/src/GraphQl/DataFormats/DataFormatSortType.cs
@@ -12,10 +12,10 @@ ISortInputTypeDescriptor<DataFormat> descriptor
     )
     {
         base.Configure(descriptor);
-        descriptor.Field(x => x.Name);
-        descriptor.Field(x => x.Extension);
-        descriptor.Field(x => x.Description);
-        descriptor.Field(x => x.MediaType);
-        descriptor.Field(x => x.SchemaLocator);
+        descriptor.Field(_ => _.Name);
+        descriptor.Field(_ => _.Extension);
+        descriptor.Field(_ => _.Description);
+        descriptor.Field(_ => _.MediaType);
+        descriptor.Field(_ => _.SchemaLocator);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Databases/DatabaseFilterType.cs b/backend/src/GraphQl/Databases/DatabaseFilterType.cs
index c11999870..3869f2924 100644
--- a/backend/src/GraphQl/Databases/DatabaseFilterType.cs
+++ b/backend/src/GraphQl/Databases/DatabaseFilterType.cs
@@ -13,12 +13,12 @@ IFilterInputTypeDescriptor<Database> descriptor
     {
         base.Configure(descriptor);
         // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.Id);
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.Name);
-        descriptor.Field(x => x.Description);
-        descriptor.Field(x => x.Locator);
-        descriptor.Field(x => x.Operator);
+        descriptor.Field(_ => _.Id);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.Name);
+        descriptor.Field(_ => _.Description);
+        descriptor.Field(_ => _.Locator);
+        descriptor.Field(_ => _.Operator);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Databases/DatabaseMutations.cs b/backend/src/GraphQl/Databases/DatabaseMutations.cs
index d8c52dd67..8ccef1ca1 100644
--- a/backend/src/GraphQl/Databases/DatabaseMutations.cs
+++ b/backend/src/GraphQl/Databases/DatabaseMutations.cs
@@ -52,7 +52,7 @@ CancellationToken cancellationToken
 
         if (!await context.Institutions
                 .AnyAsync(
-                    x => x.Id == input.OperatorId,
+                    _ => _.Id == input.OperatorId,
                     cancellationToken
                 )
            )
@@ -237,4 +237,4 @@ await QueryingDatabases.ConstructQuery(
     }
 
     private sealed record VerificationCodeData(string VerificationCode);
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Databases/DatabaseSortType.cs b/backend/src/GraphQl/Databases/DatabaseSortType.cs
index be860564f..cdf28db4f 100644
--- a/backend/src/GraphQl/Databases/DatabaseSortType.cs
+++ b/backend/src/GraphQl/Databases/DatabaseSortType.cs
@@ -12,8 +12,8 @@ ISortInputTypeDescriptor<Database> descriptor
     )
     {
         base.Configure(descriptor);
-        descriptor.Field(x => x.Name);
-        descriptor.Field(x => x.Description);
-        descriptor.Field(x => x.Locator);
+        descriptor.Field(_ => _.Name);
+        descriptor.Field(_ => _.Description);
+        descriptor.Field(_ => _.Locator);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceFilterType.cs b/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceFilterType.cs
index 7e70be1da..1ae7324a7 100644
--- a/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceFilterType.cs
+++ b/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceFilterType.cs
@@ -13,6 +13,6 @@ IFilterInputTypeDescriptor<DescriptionOrReference> descriptor
         base.Configure(descriptor);
         descriptor.Name(nameof(DescriptionOrReferenceFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
         descriptor.BindFieldsExplicitly();
-        descriptor.Field(x => x.Description);
+        descriptor.Field(_ => _.Description);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceSortType.cs b/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceSortType.cs
index 396a1678e..d2b5be123 100644
--- a/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceSortType.cs
+++ b/backend/src/GraphQl/DescriptionOrReferences/DescriptionOrReferenceSortType.cs
@@ -13,6 +13,6 @@ ISortInputTypeDescriptor<DescriptionOrReference> descriptor
         base.Configure(descriptor);
         descriptor.Name(nameof(DescriptionOrReferenceSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
         descriptor.BindFieldsExplicitly();
-        descriptor.Field(x => x.Description);
+        descriptor.Field(_ => _.Description);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Entities/AuditableEntityFilterType.cs b/backend/src/GraphQl/Entities/AuditableEntityFilterType.cs
index e6fbf4d46..08a56dc4d 100644
--- a/backend/src/GraphQl/Entities/AuditableEntityFilterType.cs
+++ b/backend/src/GraphQl/Entities/AuditableEntityFilterType.cs
@@ -12,9 +12,9 @@ IFilterInputTypeDescriptor<TEntity> descriptor
     )
     {
         descriptor.BindFieldsExplicitly();
-        descriptor.Field(x => x.Id);
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        // TODO Do we want to filter by: descriptor.Field(x => x.Version);
+        descriptor.Field(_ => _.Id);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        // TODO Do we want to filter by: descriptor.Field(_ => _.Version);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Entities/AuditableEntitySortType.cs b/backend/src/GraphQl/Entities/AuditableEntitySortType.cs
index 643e90695..af1b2742a 100644
--- a/backend/src/GraphQl/Entities/AuditableEntitySortType.cs
+++ b/backend/src/GraphQl/Entities/AuditableEntitySortType.cs
@@ -13,8 +13,8 @@ ISortInputTypeDescriptor<TEntity> descriptor
     {
         base.Configure(descriptor);
         descriptor.BindFieldsExplicitly();
-        descriptor.Field(x => x.Id);
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
+        descriptor.Field(_ => _.Id);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintFilterType.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintFilterType.cs
index 112cc252b..f5a1d35c6 100644
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintFilterType.cs
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintFilterType.cs
@@ -13,14 +13,14 @@ IFilterInputTypeDescriptor<GnuPgKeyFingerprint> descriptor
     {
         base.Configure(descriptor);
         // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.Id);
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.Fingerprint);
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.AllowedAt);
-        descriptor.Field(x => x.ForbiddenAt);
-        descriptor.Field(x => x.User);
-        descriptor.Field(x => x.Institution);
+        descriptor.Field(_ => _.Id);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.Fingerprint);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.AllowedAt);
+        descriptor.Field(_ => _.ForbiddenAt);
+        descriptor.Field(_ => _.User);
+        descriptor.Field(_ => _.Institution);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintSortType.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintSortType.cs
index 9dbbd76bd..34cd54898 100644
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintSortType.cs
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintSortType.cs
@@ -13,8 +13,8 @@ ISortInputTypeDescriptor<GnuPgKeyFingerprint> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(GnuPgKeyFingerprintSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
-        descriptor.Field(x => x.Fingerprint);
-        descriptor.Field(x => x.AllowedAt);
-        descriptor.Field(x => x.ForbiddenAt);
+        descriptor.Field(_ => _.Fingerprint);
+        descriptor.Field(_ => _.AllowedAt);
+        descriptor.Field(_ => _.ForbiddenAt);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/InstitutionMethodDevelopers/InstitutionMethodDeveloperFilterType.cs b/backend/src/GraphQl/InstitutionMethodDevelopers/InstitutionMethodDeveloperFilterType.cs
index e66bb230c..90d8181cf 100644
--- a/backend/src/GraphQl/InstitutionMethodDevelopers/InstitutionMethodDeveloperFilterType.cs
+++ b/backend/src/GraphQl/InstitutionMethodDevelopers/InstitutionMethodDeveloperFilterType.cs
@@ -13,9 +13,9 @@ IFilterInputTypeDescriptor<InstitutionMethodDeveloper> descriptor
     {
         base.Configure(descriptor);
         // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.Method);
-        descriptor.Field(x => x.Institution);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.Method);
+        descriptor.Field(_ => _.Institution);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeFilterType.cs b/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeFilterType.cs
index 14c1139a1..5a39e9c7e 100644
--- a/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeFilterType.cs
+++ b/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeFilterType.cs
@@ -13,10 +13,10 @@ IFilterInputTypeDescriptor<InstitutionRepresentative> descriptor
     {
         base.Configure(descriptor);
         // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.Institution);
-        descriptor.Field(x => x.User);
-        descriptor.Field(x => x.Role);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.Institution);
+        descriptor.Field(_ => _.User);
+        descriptor.Field(_ => _.Role);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeSortType.cs b/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeSortType.cs
index c325aba29..685e19c81 100644
--- a/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeSortType.cs
+++ b/backend/src/GraphQl/InstitutionRepresentatives/InstitutionRepresentativeSortType.cs
@@ -12,6 +12,6 @@ ISortInputTypeDescriptor<InstitutionRepresentative> descriptor
     )
     {
         base.Configure(descriptor);
-        descriptor.Field(x => x.Role);
+        descriptor.Field(_ => _.Role);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodFilterType.cs
index 7a8f1b429..01ce8cd0e 100644
--- a/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionDevelopedMethodFilterType.cs
@@ -13,6 +13,6 @@ IFilterInputTypeDescriptor<InstitutionMethodDeveloper> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(InstitutionDevelopedMethodFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.Institution).Ignore();
+        descriptor.Field(_ => _.Institution).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Institutions/InstitutionFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionFilterType.cs
index 5be294271..4342223e4 100644
--- a/backend/src/GraphQl/Institutions/InstitutionFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionFilterType.cs
@@ -13,9 +13,9 @@ IFilterInputTypeDescriptor<Institution> descriptor
     {
         base.Configure(descriptor);
         // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.Id);
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
+        descriptor.Field(_ => _.Id);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
         descriptor.Field(_ => _.Name);
         descriptor.Field(_ => _.Abbreviation);
         descriptor.Field(_ => _.Description);
@@ -35,4 +35,4 @@ IFilterInputTypeDescriptor<Institution> descriptor
         descriptor.Field(_ => _.RepresentativeEdges);
         descriptor.Field(_ => _.GnuPgKeyFingerprints);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintFilterType.cs
index ea50eae6e..c60c8e4c1 100644
--- a/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionGnuPgKeyFingerprintFilterType.cs
@@ -13,6 +13,6 @@ IFilterInputTypeDescriptor<GnuPgKeyFingerprint> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(InstitutionGnuPgKeyFingerprintFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.Institution).Ignore();
+        descriptor.Field(_ => _.Institution).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedComponentFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionManagedComponentFilterType.cs
index 5e3c41b69..661e6a749 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagedComponentFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedComponentFilterType.cs
@@ -12,6 +12,6 @@ IFilterInputTypeDescriptor<Component> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(InstitutionManagedComponentFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.Manager).Ignore();
+        descriptor.Field(_ => _.Manager).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatFilterType.cs
index 07a5f842a..ec7d55056 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedDataFormatFilterType.cs
@@ -12,6 +12,6 @@ IFilterInputTypeDescriptor<DataFormat> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(InstitutionManagedDataFormatFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.Manager).Ignore();
+        descriptor.Field(_ => _.Manager).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionFilterType.cs
index ec5bc9af4..35da52aa7 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedInstitutionFilterType.cs
@@ -12,6 +12,6 @@ IFilterInputTypeDescriptor<Institution> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(InstitutionManagedInstitutionFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.Manager).Ignore();
+        descriptor.Field(_ => _.Manager).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Institutions/InstitutionManagedMethodFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionManagedMethodFilterType.cs
index fd215c188..f2529d6e6 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManagedMethodFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManagedMethodFilterType.cs
@@ -13,6 +13,6 @@ IFilterInputTypeDescriptor<Method> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(InstitutionManagedMethodFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.Manager).Ignore();
+        descriptor.Field(_ => _.Manager).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentFilterType.cs
index bb9e9666b..d44753928 100644
--- a/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionManufacturedComponentFilterType.cs
@@ -13,6 +13,6 @@ IFilterInputTypeDescriptor<ComponentManufacturer> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(InstitutionManufacturedComponentFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.Institution).Ignore();
+        descriptor.Field(_ => _.Institution).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Institutions/InstitutionMutations.cs b/backend/src/GraphQl/Institutions/InstitutionMutations.cs
index 7ce521e7d..de4e92c9f 100644
--- a/backend/src/GraphQl/Institutions/InstitutionMutations.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionMutations.cs
@@ -67,7 +67,7 @@ CancellationToken cancellationToken
         if (input.InstitutionId is not null
             && await context.Institutions.AsQueryable()
                 .AnyAsync(
-                    x => x.Id == input.InstitutionId,
+                    _ => _.Id == input.InstitutionId,
                     cancellationToken
                 )
            )
@@ -113,7 +113,7 @@ await context.Users.AsQueryable()
         if (input.ManagerId is not null &&
             !await context.Institutions.AsQueryable()
                 .AnyAsync(
-                    x => x.Id == input.ManagerId,
+                    _ => _.Id == input.ManagerId,
                     cancellationToken
                 )
            )
@@ -499,4 +499,4 @@ await context.Institutions.AsQueryable()
         await context.SaveChangesAsync(cancellationToken);
         return new SetInstitutionExtrasPayload(institution);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseFilterType.cs
index 037a31c85..a0751074f 100644
--- a/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionOperatedDatabaseFilterType.cs
@@ -13,6 +13,6 @@ IFilterInputTypeDescriptor<Database> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(InstitutionOperatedDatabaseFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.Operator).Ignore();
+        descriptor.Field(_ => _.Operator).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationFilterType.cs
index 118e3f50a..501a82847 100644
--- a/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionOwnedOpenIdConnectApplicationFilterType.cs
@@ -13,6 +13,6 @@ IFilterInputTypeDescriptor<OpenIdConnectApplication> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(InstitutionOwnedOpenIdConnectApplicationFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.Owner).Ignore();
+        descriptor.Field(_ => _.Owner).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Institutions/InstitutionRepresentativeFilterType.cs b/backend/src/GraphQl/Institutions/InstitutionRepresentativeFilterType.cs
index 39a2a57f2..1c65374f4 100644
--- a/backend/src/GraphQl/Institutions/InstitutionRepresentativeFilterType.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionRepresentativeFilterType.cs
@@ -12,6 +12,6 @@ IFilterInputTypeDescriptor<InstitutionRepresentative> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(InstitutionRepresentativeFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.Institution).Ignore();
+        descriptor.Field(_ => _.Institution).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Methods/MethodDeveloperFilterType.cs b/backend/src/GraphQl/Methods/MethodDeveloperFilterType.cs
index 0c1d39490..85fb65888 100644
--- a/backend/src/GraphQl/Methods/MethodDeveloperFilterType.cs
+++ b/backend/src/GraphQl/Methods/MethodDeveloperFilterType.cs
@@ -14,8 +14,8 @@ IFilterInputTypeDescriptor<IMethodDeveloper> descriptor
         base.Configure(descriptor);
         descriptor.Name(nameof(MethodDeveloperFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
         // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
         // Disjunctively compose the filters following filters taking into
         // account the "lifting" done in `MethodDeveloperConnection`.
         // descriptor
@@ -25,4 +25,4 @@ IFilterInputTypeDescriptor<IMethodDeveloper> descriptor
         //     .Field(nameof(UserMethodDeveloper.User))
         //     .Type<UserFilterType>();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Methods/MethodFilterType.cs b/backend/src/GraphQl/Methods/MethodFilterType.cs
index c24e584da..ded971f07 100644
--- a/backend/src/GraphQl/Methods/MethodFilterType.cs
+++ b/backend/src/GraphQl/Methods/MethodFilterType.cs
@@ -13,17 +13,17 @@ IFilterInputTypeDescriptor<Method> descriptor
     {
         base.Configure(descriptor);
         // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.Id);
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.Name);
-        descriptor.Field(x => x.Description);
-        descriptor.Field(x => x.CalculationLocator);
-        descriptor.Field(x => x.Categories);
-        descriptor.Field(x => x.InstitutionDevelopers);
-        descriptor.Field(x => x.InstitutionDeveloperEdges);
-        descriptor.Field(x => x.UserDevelopers);
-        descriptor.Field(x => x.UserDeveloperEdges);
-        descriptor.Field(x => x.Manager);
+        descriptor.Field(_ => _.Id);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.Name);
+        descriptor.Field(_ => _.Description);
+        descriptor.Field(_ => _.CalculationLocator);
+        descriptor.Field(_ => _.Categories);
+        descriptor.Field(_ => _.InstitutionDevelopers);
+        descriptor.Field(_ => _.InstitutionDeveloperEdges);
+        descriptor.Field(_ => _.UserDevelopers);
+        descriptor.Field(_ => _.UserDeveloperEdges);
+        descriptor.Field(_ => _.Manager);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Methods/MethodMutations.cs b/backend/src/GraphQl/Methods/MethodMutations.cs
index c881e5d68..6cd8cdcd7 100644
--- a/backend/src/GraphQl/Methods/MethodMutations.cs
+++ b/backend/src/GraphQl/Methods/MethodMutations.cs
@@ -46,7 +46,7 @@ CancellationToken cancellationToken
 
         if (!await context.Institutions.AsQueryable()
                 .AnyAsync(
-                    x => x.Id == input.ManagerId,
+                    _ => _.Id == input.ManagerId,
                     cancellationToken
                 )
            )
@@ -64,7 +64,7 @@ CancellationToken cancellationToken
             input.InstitutionDeveloperIds.Except(
                 await context.Institutions.AsQueryable()
                     .Where(x => input.InstitutionDeveloperIds.Contains(x.Id))
-                    .Select(x => x.Id)
+                    .Select(_ => _.Id)
                     .ToListAsync(cancellationToken)
             );
         if (unknownInstitutionDeveloperIds.Any())
@@ -218,4 +218,4 @@ await context.Methods.AsQueryable()
         await context.SaveChangesAsync(cancellationToken);
         return new UpdateMethodPayload(method);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Methods/MethodSortType.cs b/backend/src/GraphQl/Methods/MethodSortType.cs
index ba43b3c84..cb59b2521 100644
--- a/backend/src/GraphQl/Methods/MethodSortType.cs
+++ b/backend/src/GraphQl/Methods/MethodSortType.cs
@@ -12,8 +12,8 @@ ISortInputTypeDescriptor<Method> descriptor
     )
     {
         base.Configure(descriptor);
-        descriptor.Field(x => x.Name);
-        descriptor.Field(x => x.Description);
-        descriptor.Field(x => x.CalculationLocator);
+        descriptor.Field(_ => _.Name);
+        descriptor.Field(_ => _.Description);
+        descriptor.Field(_ => _.CalculationLocator);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationFilterType.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationFilterType.cs
index 9e8b26d53..506586c26 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationFilterType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationFilterType.cs
@@ -13,16 +13,16 @@ IFilterInputTypeDescriptor<OpenIdConnectApplication> descriptor
     {
         base.Configure(descriptor);
         // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.Id);
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.ApplicationType);
-        descriptor.Field(x => x.ClientId);
-        descriptor.Field(x => x.ConsentType);
-        descriptor.Field(x => x.DisplayName);
-        // descriptor.Field(x => x.PostLogoutRedirectUris);
-        // descriptor.Field(x => x.RedirectUris);
-        // descriptor.Field(x => x.Requirements);
-        descriptor.Field(x => x.Owner);
+        descriptor.Field(_ => _.Id);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.ApplicationType);
+        descriptor.Field(_ => _.ClientId);
+        descriptor.Field(_ => _.ConsentType);
+        descriptor.Field(_ => _.DisplayName);
+        // descriptor.Field(_ => _.PostLogoutRedirectUris);
+        // descriptor.Field(_ => _.RedirectUris);
+        // descriptor.Field(_ => _.Requirements);
+        descriptor.Field(_ => _.Owner);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
index 036e63014..abb821e5d 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
@@ -54,7 +54,7 @@ CancellationToken cancellationToken
         var errors = new List<CreateOpenIdConnectApplicationError>();
         if (!await context.Institutions.AsQueryable()
                 .AnyAsync(
-                    x => x.Id == input.InstitutionId,
+                    _ => _.Id == input.InstitutionId,
                     cancellationToken
                 )
            )
@@ -158,10 +158,10 @@ CancellationToken cancellationToken
             }
         };
         descriptor.Permissions.UnionWith(
-            input.Endpoints.Select(x => x.ToPermissionString())
-            .Concat(input.GrantTypes.Select(x => x.ToPermissionString()))
-            .Concat(input.ResponseTypes.Select(x => x.ToPermissionString()))
-            .Concat(input.Scopes.Select(x => x.ToPermissionString()))
+            input.Endpoints.Select(_ => _.ToPermissionString())
+            .Concat(input.GrantTypes.Select(_ => _.ToPermissionString()))
+            .Concat(input.ResponseTypes.Select(_ => _.ToPermissionString()))
+            .Concat(input.Scopes.Select(_ => _.ToPermissionString()))
         );
         if (input.RedirectUri is not null)
         {
@@ -436,10 +436,10 @@ OpenIddictApplicationDescriptor descriptor
             }
         });
         descriptor.Permissions.UnionWith(
-            input.Endpoints.Select(x => x.ToPermissionString())
-            .Concat(input.GrantTypes.Select(x => x.ToPermissionString()))
-            .Concat(input.ResponseTypes.Select(x => x.ToPermissionString()))
-            .Concat(input.Scopes.Select(x => x.ToPermissionString()))
+            input.Endpoints.Select(_ => _.ToPermissionString())
+            .Concat(input.GrantTypes.Select(_ => _.ToPermissionString()))
+            .Concat(input.ResponseTypes.Select(_ => _.ToPermissionString()))
+            .Concat(input.Scopes.Select(_ => _.ToPermissionString()))
         );
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationSortType.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationSortType.cs
index a95ca6155..43290cd62 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationSortType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationSortType.cs
@@ -12,11 +12,11 @@ ISortInputTypeDescriptor<OpenIdConnectApplication> descriptor
     )
     {
         base.Configure(descriptor);
-        descriptor.Field(x => x.ApplicationType);
-        descriptor.Field(x => x.ClientId);
-        descriptor.Field(x => x.ConsentType);
-        descriptor.Field(x => x.DisplayName);
-        // descriptor.Field(x => x.PostLogoutRedirectUris);
-        // descriptor.Field(x => x.RedirectUris);
+        descriptor.Field(_ => _.ApplicationType);
+        descriptor.Field(_ => _.ClientId);
+        descriptor.Field(_ => _.ConsentType);
+        descriptor.Field(_ => _.DisplayName);
+        // descriptor.Field(_ => _.PostLogoutRedirectUris);
+        // descriptor.Field(_ => _.RedirectUris);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationFilterType.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationFilterType.cs
index e6d92b81c..4ff55557d 100644
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationFilterType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationFilterType.cs
@@ -14,14 +14,14 @@ IFilterInputTypeDescriptor<OpenIdConnectAuthorization> descriptor
         base.Configure(descriptor);
         descriptor.Name(nameof(OpenIdConnectAuthorizationFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
         // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.Id);
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.CreationDate).Ignore();
-        descriptor.Field(x => x.Status);
-        descriptor.Field(x => x.Subject);
-        descriptor.Field(x => x.Tokens);
-        descriptor.Field(x => x.Type);
-        descriptor.Field(x => x.Application);
+        descriptor.Field(_ => _.Id);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.CreationDate).Ignore();
+        descriptor.Field(_ => _.Status);
+        descriptor.Field(_ => _.Subject);
+        descriptor.Field(_ => _.Tokens);
+        descriptor.Field(_ => _.Type);
+        descriptor.Field(_ => _.Application);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationSortType.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationSortType.cs
index 8fb567d9c..940eddce1 100644
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationSortType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationSortType.cs
@@ -13,9 +13,9 @@ ISortInputTypeDescriptor<OpenIdConnectAuthorization> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(OpenIdConnectAuthorizationSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
-        descriptor.Field(x => x.CreationDate).Ignore();
-        descriptor.Field(x => x.Status);
-        descriptor.Field(x => x.Subject);
-        descriptor.Field(x => x.Type);
+        descriptor.Field(_ => _.CreationDate).Ignore();
+        descriptor.Field(_ => _.Status);
+        descriptor.Field(_ => _.Subject);
+        descriptor.Field(_ => _.Type);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenFilterType.cs b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenFilterType.cs
index 21bd2fdff..d3c45fb59 100644
--- a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenFilterType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenFilterType.cs
@@ -14,16 +14,16 @@ IFilterInputTypeDescriptor<OpenIdConnectToken> descriptor
         base.Configure(descriptor);
         descriptor.Name(nameof(OpenIdConnectTokenFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
         // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.Id);
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.CreationDate).Ignore();
-        descriptor.Field(x => x.ExpirationDate).Name(OpenIdConnectTokenType.ExpiredAtName);
-        descriptor.Field(x => x.RedemptionDate).Name(OpenIdConnectTokenType.RedeemedAtName);
-        descriptor.Field(x => x.Status);
-        descriptor.Field(x => x.Subject);
-        descriptor.Field(x => x.Type);
-        descriptor.Field(x => x.Authorization);
-        descriptor.Field(x => x.Application);
+        descriptor.Field(_ => _.Id);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.CreationDate).Ignore();
+        descriptor.Field(_ => _.ExpirationDate).Name(OpenIdConnectTokenType.ExpiredAtName);
+        descriptor.Field(_ => _.RedemptionDate).Name(OpenIdConnectTokenType.RedeemedAtName);
+        descriptor.Field(_ => _.Status);
+        descriptor.Field(_ => _.Subject);
+        descriptor.Field(_ => _.Type);
+        descriptor.Field(_ => _.Authorization);
+        descriptor.Field(_ => _.Application);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenSortType.cs b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenSortType.cs
index bc5abfcda..adf058e9b 100644
--- a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenSortType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenSortType.cs
@@ -13,11 +13,11 @@ ISortInputTypeDescriptor<OpenIdConnectToken> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(OpenIdConnectTokenSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
-        descriptor.Field(x => x.CreationDate).Ignore();
-        descriptor.Field(x => x.ExpirationDate).Name(OpenIdConnectTokenType.ExpiredAtName);
-        descriptor.Field(x => x.RedemptionDate).Name(OpenIdConnectTokenType.RedeemedAtName);
-        descriptor.Field(x => x.Status);
-        descriptor.Field(x => x.Subject);
-        descriptor.Field(x => x.Type);
+        descriptor.Field(_ => _.CreationDate).Ignore();
+        descriptor.Field(_ => _.ExpirationDate).Name(OpenIdConnectTokenType.ExpiredAtName);
+        descriptor.Field(_ => _.RedemptionDate).Name(OpenIdConnectTokenType.RedeemedAtName);
+        descriptor.Field(_ => _.Status);
+        descriptor.Field(_ => _.Subject);
+        descriptor.Field(_ => _.Type);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Requests/DataQueries.cs b/backend/src/GraphQl/Requests/DataQueries.cs
index 91115b7cb..7e385dfce 100644
--- a/backend/src/GraphQl/Requests/DataQueries.cs
+++ b/backend/src/GraphQl/Requests/DataQueries.cs
@@ -1066,7 +1066,7 @@ await queryingDatabases.QueryDatabase<TGraphQlResponse>(
                         cancellationToken,
                         IsIgsdbDatabase(database) ? appSettings.Igsdb.ApiToken : null
                     );
-                if (deserializedGraphQlResponse.Errors?.Length >= 1)
+                if (deserializedGraphQlResponse.Errors?.Length > 0)
                 {
                     logger.FailedWithErrors(
                         JsonSerializer.Serialize(deserializedGraphQlResponse.Errors),
@@ -1117,4 +1117,4 @@ private sealed record HasGeometricDataData(bool HasGeometricData);
     private sealed record HasHygrothermalDataData(bool HasHygrothermalData);
     private sealed record HasLifeCycleDataData(bool HasLifeCycleData);
     private sealed record HasPhotovoltaicDataData(bool HasPhotovoltaicData);
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/UserMethodDevelopers/UserMethodDeveloperFilterType.cs b/backend/src/GraphQl/UserMethodDevelopers/UserMethodDeveloperFilterType.cs
index 99aa9556c..aed0b81e7 100644
--- a/backend/src/GraphQl/UserMethodDevelopers/UserMethodDeveloperFilterType.cs
+++ b/backend/src/GraphQl/UserMethodDevelopers/UserMethodDeveloperFilterType.cs
@@ -13,9 +13,9 @@ IFilterInputTypeDescriptor<UserMethodDeveloper> descriptor
     {
         base.Configure(descriptor);
         // TODO Remove CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
-        descriptor.Field(x => x.Method);
-        descriptor.Field(x => x.User);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
+        descriptor.Field(_ => _.Method);
+        descriptor.Field(_ => _.User);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Users/UserDevelopedMethodFilterType.cs b/backend/src/GraphQl/Users/UserDevelopedMethodFilterType.cs
index ca47a4d4c..7ecc2fcc5 100644
--- a/backend/src/GraphQl/Users/UserDevelopedMethodFilterType.cs
+++ b/backend/src/GraphQl/Users/UserDevelopedMethodFilterType.cs
@@ -13,6 +13,6 @@ IFilterInputTypeDescriptor<UserMethodDeveloper> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(UserDevelopedMethodFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.User).Ignore();
+        descriptor.Field(_ => _.User).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Users/UserFilterType.cs b/backend/src/GraphQl/Users/UserFilterType.cs
index 21093af32..c46e31deb 100644
--- a/backend/src/GraphQl/Users/UserFilterType.cs
+++ b/backend/src/GraphQl/Users/UserFilterType.cs
@@ -14,17 +14,17 @@ IFilterInputTypeDescriptor<User> descriptor
         base.Configure(descriptor);
         descriptor.Name(nameof(UserFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
         // TODO Remove Id, CreatedAt, and UpdatedAt once the base.Configure is respected.
-        descriptor.Field(x => x.Id);
-        descriptor.Field(x => x.CreatedAt);
-        descriptor.Field(x => x.UpdatedAt);
+        descriptor.Field(_ => _.Id);
+        descriptor.Field(_ => _.CreatedAt);
+        descriptor.Field(_ => _.UpdatedAt);
         // TODO The commented fields below should be filterable by OpenId Connect Clients and application users with the proper scopes and rights. If they are filterable in general, it is a way to figure out that information even if it is not returned by GraphQL.
-        descriptor.Field(x => x.Name);
-        // descriptor.Field(x => x.Email);
-        // descriptor.Field(x => x.PostalAddress);
-        // descriptor.Field(x => x.WebsiteLocator);
-        descriptor.Field(x => x.DevelopedMethods);
-        descriptor.Field(x => x.DevelopedMethodEdges);
-        descriptor.Field(x => x.RepresentedInstitutions);
-        descriptor.Field(x => x.RepresentedInstitutionEdges);
+        descriptor.Field(_ => _.Name);
+        // descriptor.Field(_ => _.Email);
+        // descriptor.Field(_ => _.PostalAddress);
+        // descriptor.Field(_ => _.WebsiteLocator);
+        descriptor.Field(_ => _.DevelopedMethods);
+        descriptor.Field(_ => _.DevelopedMethodEdges);
+        descriptor.Field(_ => _.RepresentedInstitutions);
+        descriptor.Field(_ => _.RepresentedInstitutionEdges);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintFilterType.cs b/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintFilterType.cs
index 2eb025658..036ae3d1b 100644
--- a/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintFilterType.cs
+++ b/backend/src/GraphQl/Users/UserGnuPgKeyFingerprintFilterType.cs
@@ -13,6 +13,6 @@ IFilterInputTypeDescriptor<GnuPgKeyFingerprint> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(UserGnuPgKeyFingerprintFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.User).Ignore();
+        descriptor.Field(_ => _.User).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Users/UserMutations.cs b/backend/src/GraphQl/Users/UserMutations.cs
index fbe9ebee7..5b0de32f2 100644
--- a/backend/src/GraphQl/Users/UserMutations.cs
+++ b/backend/src/GraphQl/Users/UserMutations.cs
@@ -1644,7 +1644,7 @@ CancellationToken cancellationToken
 
         var user = await context.Users.AsQueryable()
             .SingleOrDefaultAsync(
-                x => x.Id == input.UserId,
+                _ => _.Id == input.UserId,
                 cancellationToken
             );
         if (user is null)
@@ -1709,7 +1709,7 @@ CancellationToken cancellationToken
 
         var user = await context.Users.AsQueryable()
             .SingleOrDefaultAsync(
-                x => x.Id == input.UserId,
+                _ => _.Id == input.UserId,
                 cancellationToken
             );
         if (user is null)
@@ -1844,4 +1844,4 @@ public sealed record GettingAuthenticatorKeyFailure : LoadSharedKeyAndQrCodeUriP
 
         public sealed record GettingEmailFailure : LoadSharedKeyAndQrCodeUriPayload;
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Users/UserRepresentedInstitutionFilterType.cs b/backend/src/GraphQl/Users/UserRepresentedInstitutionFilterType.cs
index d4c84e9d3..5807c6c65 100644
--- a/backend/src/GraphQl/Users/UserRepresentedInstitutionFilterType.cs
+++ b/backend/src/GraphQl/Users/UserRepresentedInstitutionFilterType.cs
@@ -13,6 +13,6 @@ IFilterInputTypeDescriptor<InstitutionRepresentative> descriptor
     {
         base.Configure(descriptor);
         descriptor.Name(nameof(UserRepresentedInstitutionFilterType)[..^"FilterType".Length] + GraphQlConstants.FilterInputSuffix);
-        descriptor.Field(x => x.User).Ignore();
+        descriptor.Field(_ => _.User).Ignore();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Users/UserSortType.cs b/backend/src/GraphQl/Users/UserSortType.cs
index 0aae5beee..359d9425c 100644
--- a/backend/src/GraphQl/Users/UserSortType.cs
+++ b/backend/src/GraphQl/Users/UserSortType.cs
@@ -14,9 +14,9 @@ ISortInputTypeDescriptor<User> descriptor
         base.Configure(descriptor);
         descriptor.Name(nameof(UserSortType)[..^"SortType".Length] + GraphQlConstants.SortInputSuffix);
         // TODO The commented fiels below should be sortable by OpenId Connect Clients and application users with the proper scopes and rights. If they are sortable in general, it is a way to figure out that information even if it is not returned by GraphQL.
-        descriptor.Field(x => x.Name);
-        // descriptor.Field(x => x.Email);
-        // descriptor.Field(x => x.PostalAddress);
-        // descriptor.Field(x => x.WebsiteLocator);
+        descriptor.Field(_ => _.Name);
+        // descriptor.Field(_ => _.Email);
+        // descriptor.Field(_ => _.PostalAddress);
+        // descriptor.Field(_ => _.WebsiteLocator);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/Migrations/20210414155531_InitialCreate.cs b/backend/src/Migrations/20210414155531_InitialCreate.cs
index dc7fe6f7d..47c95dd52 100644
--- a/backend/src/Migrations/20210414155531_InitialCreate.cs
+++ b/backend/src/Migrations/20210414155531_InitialCreate.cs
@@ -39,7 +39,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
             },
             constraints: table =>
             {
-                table.PrimaryKey("PK_component", x => x.Id);
+                table.PrimaryKey("PK_component", _ => _.Id);
             });
 
         migrationBuilder.CreateTable(
@@ -58,7 +58,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
             },
             constraints: table =>
             {
-                table.PrimaryKey("PK_institution", x => x.Id);
+                table.PrimaryKey("PK_institution", _ => _.Id);
             });
 
         migrationBuilder.CreateTable(
@@ -94,7 +94,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
             },
             constraints: table =>
             {
-                table.PrimaryKey("PK_method", x => x.Id);
+                table.PrimaryKey("PK_method", _ => _.Id);
             });
 
         migrationBuilder.CreateTable(
@@ -118,7 +118,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
             },
             constraints: table =>
             {
-                table.PrimaryKey("PK_OpenIddictApplications", x => x.Id);
+                table.PrimaryKey("PK_OpenIddictApplications", _ => _.Id);
             });
 
         migrationBuilder.CreateTable(
@@ -138,7 +138,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
             },
             constraints: table =>
             {
-                table.PrimaryKey("PK_OpenIddictScopes", x => x.Id);
+                table.PrimaryKey("PK_OpenIddictScopes", _ => _.Id);
             });
 
         migrationBuilder.CreateTable(
@@ -153,7 +153,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
             },
             constraints: table =>
             {
-                table.PrimaryKey("PK_role", x => x.Id);
+                table.PrimaryKey("PK_role", _ => _.Id);
             });
 
         migrationBuilder.CreateTable(
@@ -183,7 +183,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
             },
             constraints: table =>
             {
-                table.PrimaryKey("PK_user", x => x.Id);
+                table.PrimaryKey("PK_user", _ => _.Id);
             });
 
         migrationBuilder.CreateTable(
@@ -201,14 +201,14 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table.PrimaryKey("PK_component_concretization_and_generalization", x => new { x.GeneralComponentId, x.ConcreteComponentId });
                 table.ForeignKey(
                     name: "FK_component_concretization_and_generalization_component_Concr~",
-                    column: x => x.ConcreteComponentId,
+                    column: _ => _.ConcreteComponentId,
                     principalSchema: "metabase",
                     principalTable: "component",
                     principalColumn: "Id",
                     onDelete: ReferentialAction.Cascade);
                 table.ForeignKey(
                     name: "FK_component_concretization_and_generalization_component_Gener~",
-                    column: x => x.GeneralComponentId,
+                    column: _ => _.GeneralComponentId,
                     principalSchema: "metabase",
                     principalTable: "component",
                     principalColumn: "Id",
@@ -228,14 +228,14 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table.PrimaryKey("PK_component_manufacturer", x => new { x.ComponentId, x.InstitutionId });
                 table.ForeignKey(
                     name: "FK_component_manufacturer_component_ComponentId",
-                    column: x => x.ComponentId,
+                    column: _ => _.ComponentId,
                     principalSchema: "metabase",
                     principalTable: "component",
                     principalColumn: "Id",
                     onDelete: ReferentialAction.Cascade);
                 table.ForeignKey(
                     name: "FK_component_manufacturer_institution_InstitutionId",
-                    column: x => x.InstitutionId,
+                    column: _ => _.InstitutionId,
                     principalSchema: "metabase",
                     principalTable: "institution",
                     principalColumn: "Id",
@@ -256,10 +256,10 @@ protected override void Up(MigrationBuilder migrationBuilder)
             },
             constraints: table =>
             {
-                table.PrimaryKey("PK_database", x => x.Id);
+                table.PrimaryKey("PK_database", _ => _.Id);
                 table.ForeignKey(
                     name: "FK_database_institution_OperatorId",
-                    column: x => x.OperatorId,
+                    column: _ => _.OperatorId,
                     principalSchema: "metabase",
                     principalTable: "institution",
                     principalColumn: "Id",
@@ -299,10 +299,10 @@ protected override void Up(MigrationBuilder migrationBuilder)
             },
             constraints: table =>
             {
-                table.PrimaryKey("PK_DataFormats", x => x.Id);
+                table.PrimaryKey("PK_DataFormats", _ => _.Id);
                 table.ForeignKey(
                     name: "FK_DataFormats_institution_ManagerId",
-                    column: x => x.ManagerId,
+                    column: _ => _.ManagerId,
                     principalSchema: "metabase",
                     principalTable: "institution",
                     principalColumn: "Id",
@@ -324,14 +324,14 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table.PrimaryKey("PK_institution_method_developer", x => new { x.InstitutionId, x.MethodId });
                 table.ForeignKey(
                     name: "FK_institution_method_developer_institution_InstitutionId",
-                    column: x => x.InstitutionId,
+                    column: _ => _.InstitutionId,
                     principalSchema: "metabase",
                     principalTable: "institution",
                     principalColumn: "Id",
                     onDelete: ReferentialAction.Cascade);
                 table.ForeignKey(
                     name: "FK_institution_method_developer_method_MethodId",
-                    column: x => x.MethodId,
+                    column: _ => _.MethodId,
                     principalSchema: "metabase",
                     principalTable: "method",
                     principalColumn: "Id",
@@ -355,10 +355,10 @@ protected override void Up(MigrationBuilder migrationBuilder)
             },
             constraints: table =>
             {
-                table.PrimaryKey("PK_OpenIddictAuthorizations", x => x.Id);
+                table.PrimaryKey("PK_OpenIddictAuthorizations", _ => _.Id);
                 table.ForeignKey(
                     name: "FK_OpenIddictAuthorizations_OpenIddictApplications_Application~",
-                    column: x => x.ApplicationId,
+                    column: _ => _.ApplicationId,
                     principalSchema: "metabase",
                     principalTable: "OpenIddictApplications",
                     principalColumn: "Id",
@@ -378,10 +378,10 @@ protected override void Up(MigrationBuilder migrationBuilder)
             },
             constraints: table =>
             {
-                table.PrimaryKey("PK_role_claim", x => x.Id);
+                table.PrimaryKey("PK_role_claim", _ => _.Id);
                 table.ForeignKey(
                     name: "FK_role_claim_role_RoleId",
-                    column: x => x.RoleId,
+                    column: _ => _.RoleId,
                     principalSchema: "metabase",
                     principalTable: "role",
                     principalColumn: "Id",
@@ -402,14 +402,14 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table.PrimaryKey("PK_institution_representative", x => new { x.InstitutionId, x.UserId });
                 table.ForeignKey(
                     name: "FK_institution_representative_institution_InstitutionId",
-                    column: x => x.InstitutionId,
+                    column: _ => _.InstitutionId,
                     principalSchema: "metabase",
                     principalTable: "institution",
                     principalColumn: "Id",
                     onDelete: ReferentialAction.Cascade);
                 table.ForeignKey(
                     name: "FK_institution_representative_user_UserId",
-                    column: x => x.UserId,
+                    column: _ => _.UserId,
                     principalSchema: "metabase",
                     principalTable: "user",
                     principalColumn: "Id",
@@ -429,10 +429,10 @@ protected override void Up(MigrationBuilder migrationBuilder)
             },
             constraints: table =>
             {
-                table.PrimaryKey("PK_user_claim", x => x.Id);
+                table.PrimaryKey("PK_user_claim", _ => _.Id);
                 table.ForeignKey(
                     name: "FK_user_claim_user_UserId",
-                    column: x => x.UserId,
+                    column: _ => _.UserId,
                     principalSchema: "metabase",
                     principalTable: "user",
                     principalColumn: "Id",
@@ -454,7 +454,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table.PrimaryKey("PK_user_login", x => new { x.LoginProvider, x.ProviderKey });
                 table.ForeignKey(
                     name: "FK_user_login_user_UserId",
-                    column: x => x.UserId,
+                    column: _ => _.UserId,
                     principalSchema: "metabase",
                     principalTable: "user",
                     principalColumn: "Id",
@@ -476,14 +476,14 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table.PrimaryKey("PK_user_method_developer", x => new { x.UserId, x.MethodId });
                 table.ForeignKey(
                     name: "FK_user_method_developer_method_MethodId",
-                    column: x => x.MethodId,
+                    column: _ => _.MethodId,
                     principalSchema: "metabase",
                     principalTable: "method",
                     principalColumn: "Id",
                     onDelete: ReferentialAction.Cascade);
                 table.ForeignKey(
                     name: "FK_user_method_developer_user_UserId",
-                    column: x => x.UserId,
+                    column: _ => _.UserId,
                     principalSchema: "metabase",
                     principalTable: "user",
                     principalColumn: "Id",
@@ -503,14 +503,14 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table.PrimaryKey("PK_user_role", x => new { x.UserId, x.RoleId });
                 table.ForeignKey(
                     name: "FK_user_role_role_RoleId",
-                    column: x => x.RoleId,
+                    column: _ => _.RoleId,
                     principalSchema: "metabase",
                     principalTable: "role",
                     principalColumn: "Id",
                     onDelete: ReferentialAction.Cascade);
                 table.ForeignKey(
                     name: "FK_user_role_user_UserId",
-                    column: x => x.UserId,
+                    column: _ => _.UserId,
                     principalSchema: "metabase",
                     principalTable: "user",
                     principalColumn: "Id",
@@ -532,7 +532,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table.PrimaryKey("PK_user_token", x => new { x.UserId, x.LoginProvider, x.Name });
                 table.ForeignKey(
                     name: "FK_user_token_user_UserId",
-                    column: x => x.UserId,
+                    column: _ => _.UserId,
                     principalSchema: "metabase",
                     principalTable: "user",
                     principalColumn: "Id",
@@ -560,17 +560,17 @@ protected override void Up(MigrationBuilder migrationBuilder)
             },
             constraints: table =>
             {
-                table.PrimaryKey("PK_OpenIddictTokens", x => x.Id);
+                table.PrimaryKey("PK_OpenIddictTokens", _ => _.Id);
                 table.ForeignKey(
                     name: "FK_OpenIddictTokens_OpenIddictApplications_ApplicationId",
-                    column: x => x.ApplicationId,
+                    column: _ => _.ApplicationId,
                     principalSchema: "metabase",
                     principalTable: "OpenIddictApplications",
                     principalColumn: "Id",
                     onDelete: ReferentialAction.Restrict);
                 table.ForeignKey(
                     name: "FK_OpenIddictTokens_OpenIddictAuthorizations_AuthorizationId",
-                    column: x => x.AuthorizationId,
+                    column: _ => _.AuthorizationId,
                     principalSchema: "metabase",
                     principalTable: "OpenIddictAuthorizations",
                     principalColumn: "Id",
@@ -797,4 +797,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
             .OldAnnotation("Npgsql:Enum:public.standardizer", "aerc,agi,ashrae,breeam,bs,bsi,cen,cie,dgnb,din,dvwg,iec,ies,ift,iso,jis,leed,nfrc,riba,ul,unece,vdi,vff,well")
             .OldAnnotation("Npgsql:PostgresExtension:pgcrypto", ",,");
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/Migrations/20211110161448_AddReflexiveAssociationsToComponent.cs b/backend/src/Migrations/20211110161448_AddReflexiveAssociationsToComponent.cs
index 811b881a9..00bfa4c71 100644
--- a/backend/src/Migrations/20211110161448_AddReflexiveAssociationsToComponent.cs
+++ b/backend/src/Migrations/20211110161448_AddReflexiveAssociationsToComponent.cs
@@ -30,14 +30,14 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table.PrimaryKey("PK_component_assembly", x => new { x.AssembledComponentId, x.PartComponentId });
                 table.ForeignKey(
                     name: "FK_component_assembly_component_AssembledComponentId",
-                    column: x => x.AssembledComponentId,
+                    column: _ => _.AssembledComponentId,
                     principalSchema: "metabase",
                     principalTable: "component",
                     principalColumn: "Id",
                     onDelete: ReferentialAction.Cascade);
                 table.ForeignKey(
                     name: "FK_component_assembly_component_PartComponentId",
-                    column: x => x.PartComponentId,
+                    column: _ => _.PartComponentId,
                     principalSchema: "metabase",
                     principalTable: "component",
                     principalColumn: "Id",
@@ -57,14 +57,14 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table.PrimaryKey("PK_component_variant", x => new { x.OfComponentId, x.ToComponentId });
                 table.ForeignKey(
                     name: "FK_component_variant_component_OfComponentId",
-                    column: x => x.OfComponentId,
+                    column: _ => _.OfComponentId,
                     principalSchema: "metabase",
                     principalTable: "component",
                     principalColumn: "Id",
                     onDelete: ReferentialAction.Cascade);
                 table.ForeignKey(
                     name: "FK_component_variant_component_ToComponentId",
-                    column: x => x.ToComponentId,
+                    column: _ => _.ToComponentId,
                     principalSchema: "metabase",
                     principalTable: "component",
                     principalColumn: "Id",
@@ -110,4 +110,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
             nullable: false,
             defaultValue: 0L);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/Migrations/20230210135411_AddDataProtectionKeys.cs b/backend/src/Migrations/20230210135411_AddDataProtectionKeys.cs
index 7776aba20..7170305bd 100644
--- a/backend/src/Migrations/20230210135411_AddDataProtectionKeys.cs
+++ b/backend/src/Migrations/20230210135411_AddDataProtectionKeys.cs
@@ -23,7 +23,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
             },
             constraints: table =>
             {
-                table.PrimaryKey("PK_DataProtectionKeys", x => x.Id);
+                table.PrimaryKey("PK_DataProtectionKeys", _ => _.Id);
             });
     }
 
@@ -34,4 +34,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
             name: "DataProtectionKeys",
             schema: "metabase");
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/Migrations/20241213072103_AddRelationInstitutionToApplication.cs b/backend/src/Migrations/20241213072103_AddRelationInstitutionToApplication.cs
index 558a395f5..0a77a6556 100644
--- a/backend/src/Migrations/20241213072103_AddRelationInstitutionToApplication.cs
+++ b/backend/src/Migrations/20241213072103_AddRelationInstitutionToApplication.cs
@@ -90,14 +90,14 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 table.PrimaryKey("PK_institution_application", x => new { x.InstitutionId, x.ApplicationId });
                 table.ForeignKey(
                     name: "FK_institution_application_OpenIddictApplications_ApplicationId",
-                    column: x => x.ApplicationId,
+                    column: _ => _.ApplicationId,
                     principalSchema: "metabase",
                     principalTable: "OpenIddictApplications",
                     principalColumn: "Id",
                     onDelete: ReferentialAction.Cascade);
                 table.ForeignKey(
                     name: "FK_institution_application_institution_InstitutionId",
-                    column: x => x.InstitutionId,
+                    column: _ => _.InstitutionId,
                     principalSchema: "metabase",
                     principalTable: "institution",
                     principalColumn: "Id",
@@ -184,4 +184,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
             oldClrType: typeof(Guid),
             oldType: "uuid");
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/Migrations/20250815155558_MakeOpenIddictApplicationsBelongToExactlyOneInstitution.cs b/backend/src/Migrations/20250815155558_MakeOpenIddictApplicationsBelongToExactlyOneInstitution.cs
index 80d6253e3..889719e21 100644
--- a/backend/src/Migrations/20250815155558_MakeOpenIddictApplicationsBelongToExactlyOneInstitution.cs
+++ b/backend/src/Migrations/20250815155558_MakeOpenIddictApplicationsBelongToExactlyOneInstitution.cs
@@ -127,14 +127,14 @@ protected override void Down(MigrationBuilder migrationBuilder)
                     table.PrimaryKey("PK_institution_open_id_connect_application", x => new { x.InstitutionId, x.ApplicationId });
                     table.ForeignKey(
                         name: "FK_institution_open_id_connect_application_OpenIddictApplicati~",
-                        column: x => x.ApplicationId,
+                        column: _ => _.ApplicationId,
                         principalSchema: "metabase",
                         principalTable: "OpenIddictApplications",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
                     table.ForeignKey(
                         name: "FK_institution_open_id_connect_application_institution_Institu~",
-                        column: x => x.InstitutionId,
+                        column: _ => _.InstitutionId,
                         principalSchema: "metabase",
                         principalTable: "institution",
                         principalColumn: "Id",
@@ -148,4 +148,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
                 column: "ApplicationId");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/Migrations/20250826140321_MakeGnuPgFingerprintItsOwnEntity.cs b/backend/src/Migrations/20250826140321_MakeGnuPgFingerprintItsOwnEntity.cs
index b96072547..c634e4885 100644
--- a/backend/src/Migrations/20250826140321_MakeGnuPgFingerprintItsOwnEntity.cs
+++ b/backend/src/Migrations/20250826140321_MakeGnuPgFingerprintItsOwnEntity.cs
@@ -39,17 +39,17 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_gnu_pg_fingerprint", x => x.Id);
+                    table.PrimaryKey("PK_gnu_pg_fingerprint", _ => _.Id);
                     table.ForeignKey(
                         name: "FK_gnu_pg_fingerprint_institution_InstitutionId",
-                        column: x => x.InstitutionId,
+                        column: _ => _.InstitutionId,
                         principalSchema: "metabase",
                         principalTable: "institution",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
                     table.ForeignKey(
                         name: "FK_gnu_pg_fingerprint_user_UserId",
-                        column: x => x.UserId,
+                        column: _ => _.UserId,
                         principalSchema: "metabase",
                         principalTable: "user",
                         principalColumn: "Id",
@@ -103,4 +103,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
                 defaultValue: Array.Empty<string>());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/Migrations/20251128175152_AddParametersAndSourcesToMethods.cs b/backend/src/Migrations/20251128175152_AddParametersAndSourcesToMethods.cs
index b855f12de..012881abb 100644
--- a/backend/src/Migrations/20251128175152_AddParametersAndSourcesToMethods.cs
+++ b/backend/src/Migrations/20251128175152_AddParametersAndSourcesToMethods.cs
@@ -247,7 +247,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     table.PrimaryKey("PK_MethodParameter", x => new { x.MethodId, x.Id });
                     table.ForeignKey(
                         name: "FK_MethodParameter_method_MethodId",
-                        column: x => x.MethodId,
+                        column: _ => _.MethodId,
                         principalSchema: "metabase",
                         principalTable: "method",
                         principalColumn: "Id",
@@ -270,7 +270,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     table.PrimaryKey("PK_MethodSource", x => new { x.MethodId, x.Id });
                     table.ForeignKey(
                         name: "FK_MethodSource_method_MethodId",
-                        column: x => x.MethodId,
+                        column: _ => _.MethodId,
                         principalSchema: "metabase",
                         principalTable: "method",
                         principalColumn: "Id",
@@ -504,4 +504,4 @@ protected override void Down(MigrationBuilder migrationBuilder)
                 newName: "Publication_Abstract");
         }
     }
-}
\ No newline at end of file
+}

From dd981248de1431e11f3bdd92bba746ebe00fc0b9 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Mon, 8 Jun 2026 20:14:11 +0200
Subject: [PATCH 068/145] Use sequential UUID generator for primary keys (for
 improved performance with PostgreSQL b-trees)

---
 backend/src/Data/ApplicationDbContext.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/Data/ApplicationDbContext.cs b/backend/src/Data/ApplicationDbContext.cs
index 8d1211e61..f8f73a97d 100644
--- a/backend/src/Data/ApplicationDbContext.cs
+++ b/backend/src/Data/ApplicationDbContext.cs
@@ -10,6 +10,7 @@
 using System.Linq;
 using SchemaNameOptionsExtension = Metabase.Data.Extensions.SchemaNameOptionsExtension;
 using Metabase.Extensions;
+using Npgsql.EntityFrameworkCore.PostgreSQL.ValueGeneration;
 
 namespace Metabase.Data;
 
@@ -459,10 +460,12 @@ protected override void OnModelCreating(ModelBuilder builder)
             if (typeof(IEntity).IsAssignableFrom(entityType.ClrType))
             {
                 var entity = builder.Entity(entityType.ClrType);
+                entity.HasKey(nameof(IEntity.Id));
                 // https://www.npgsql.org/efcore/modeling/generated-properties.html#guiduuid-generation
                 entity
                     .Property(nameof(IEntity.Id))
-                    .HasDefaultValueSql("gen_random_uuid()");
+                    .HasDefaultValueSql("uuidv7()")
+                    .HasValueGenerator<NpgsqlSequentialGuidValueGenerator>();
                 // https://www.npgsql.org/efcore/modeling/concurrency.html#the-postgresql-xmin-system-column
                 entity
                     .Property(nameof(IEntity.Version))

From 99f41544a2fbb4bb15f000de91bbcea05f46be66 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 11 Jun 2026 14:34:16 +0200
Subject: [PATCH 069/145] Only pull when missing in development

---
 docker-compose.development.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.development.yaml b/docker-compose.development.yaml
index 8a8072687..77b187868 100644
--- a/docker-compose.development.yaml
+++ b/docker-compose.development.yaml
@@ -15,7 +15,7 @@ services:
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD:?required}"
     network_mode: "none"
     restart: "no"
-    pull_policy: "always"
+    pull_policy: "missing"
 
   database:
     # Keep version in sync with the one in in the service `upgrade_postgres`
@@ -57,7 +57,7 @@ services:
       start_interval: "5s"
     labels:
       autoheal: "true"
-    pull_policy: "always"
+    pull_policy: "missing"
 
   email:
     image: "rnwood/smtp4dev:v3.10"
@@ -94,7 +94,7 @@ services:
       start_interval: "5s"
     labels:
       autoheal: "true"
-    pull_policy: "always"
+    pull_policy: "missing"
 
   backend:
     build:
@@ -276,7 +276,7 @@ services:
       start_interval: "5s"
     labels:
       autoheal: "true"
-    pull_policy: "always"
+    pull_policy: "missing"
 
 volumes:
   data:

From 4127329a15afd793dea5e5f094d2adc5d0081f1f Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 12 Jun 2026 11:15:03 +0200
Subject: [PATCH 070/145] Mark pure extensions

---
 backend/src/Extensions/EnumExtensions.cs                   | 2 ++
 backend/src/Extensions/HttpContextExtensions.cs            | 2 ++
 backend/src/Extensions/NodaTimeExtensions.cs               | 5 +++++
 backend/src/Extensions/StringExtensions.cs                 | 7 +++++++
 backend/src/GraphQl/Extensions/PageExtensions.cs           | 5 +++++
 .../src/GraphQl/Extensions/ResolverContextExtensions.cs    | 3 +++
 backend/src/GraphQl/Institutions/InstitutionQueries.cs     | 1 -
 .../Applications/OpenIdConnectConsentTypeExtensions.cs     | 3 +++
 .../Applications/OpenIdConnectEndpointExtensions.cs        | 3 +++
 .../Applications/OpenIdConnectGrantTypeExtensions.cs       | 3 +++
 .../Applications/OpenIdConnectRequirementExtensions.cs     | 3 +++
 .../Applications/OpenIdConnectResponseTypeExtensions.cs    | 3 +++
 .../GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs  | 4 ++++
 13 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/backend/src/Extensions/EnumExtensions.cs b/backend/src/Extensions/EnumExtensions.cs
index fa1cf3898..c568bb1ab 100644
--- a/backend/src/Extensions/EnumExtensions.cs
+++ b/backend/src/Extensions/EnumExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Reflection;
 
@@ -7,6 +8,7 @@ namespace Metabase.Extensions;
 
 public static class EnumExtensions
 {
+    [Pure]
     public static string GetDescription(this Enum value)
     {
         return value.GetType()
diff --git a/backend/src/Extensions/HttpContextExtensions.cs b/backend/src/Extensions/HttpContextExtensions.cs
index 79ea0ddb0..a44280384 100644
--- a/backend/src/Extensions/HttpContextExtensions.cs
+++ b/backend/src/Extensions/HttpContextExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Diagnostics.Contracts;
 using Metabase.Authentication;
 using Microsoft.AspNetCore.Http;
 
@@ -10,6 +11,7 @@ public static class HttpContextExtensions
     public static void SetBearerToken(this HttpContext httpContext, string accessToken) =>
         httpContext.Request.Headers.Authorization = $"{OpenIdConnectConstants.AuthorizationHeaderBearer} {accessToken}";
 
+    [Pure]
     public static string? ExtractBearerToken(this HttpContext httpContext)
     {
         var bearerTokenPrefix = $"{OpenIdConnectConstants.AuthorizationHeaderBearer} ";
diff --git a/backend/src/Extensions/NodaTimeExtensions.cs b/backend/src/Extensions/NodaTimeExtensions.cs
index 471653d19..6fae7cb24 100644
--- a/backend/src/Extensions/NodaTimeExtensions.cs
+++ b/backend/src/Extensions/NodaTimeExtensions.cs
@@ -1,14 +1,17 @@
+using System.Diagnostics.Contracts;
 using NodaTime;
 
 namespace Metabase.Extensions;
 
 public static class NodaTimeExtensions
 {
+    [Pure]
     public static OffsetDateTime GetUtcNow(this IClock clock)
     {
         return clock.GetCurrentInstant().WithOffset(Offset.Zero);
     }
 
+    [Pure]
     public static int CompareTo(this OffsetDateTime current, OffsetDateTime other)
     {
         return OffsetDateTime.Comparer.Instant.Compare(current, other);
@@ -16,11 +19,13 @@ public static int CompareTo(this OffsetDateTime current, OffsetDateTime other)
 
     extension(OffsetDateTime)
     {
+        [Pure]
         public static bool operator >(OffsetDateTime x, OffsetDateTime y)
         {
             return OffsetDateTime.Comparer.Instant.Compare(x, y) > 0;
         }
 
+        [Pure]
         public static bool operator <(OffsetDateTime x, OffsetDateTime y)
         {
             return OffsetDateTime.Comparer.Instant.Compare(x, y) < 0;
diff --git a/backend/src/Extensions/StringExtensions.cs b/backend/src/Extensions/StringExtensions.cs
index c915ff80b..736499685 100644
--- a/backend/src/Extensions/StringExtensions.cs
+++ b/backend/src/Extensions/StringExtensions.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Text;
+using System.Diagnostics.Contracts;
 
 namespace Metabase.Extensions;
 
 public static class StringExtensions
 {
+    [Pure]
     public static string FirstCharToLower(this string value)
     {
         return string.IsNullOrEmpty(value)
@@ -14,12 +16,15 @@ public static string FirstCharToLower(this string value)
             : char.ToLowerInvariant(value[0]) + value[1..];
     }
 
+    [Pure]
     public static string? NullIfEmpty(this string value)
         => string.IsNullOrEmpty(value) ? null : value;
 
+    [Pure]
     public static string? NullIfWhitespace(this string value)
         => string.IsNullOrWhiteSpace(value) ? null : value;
 
+    [Pure]
     public static string Base64Encode(this string plainText)
     {
         return Convert.ToBase64String(
@@ -27,6 +32,7 @@ public static string Base64Encode(this string plainText)
         );
     }
 
+    [Pure]
     public static string Base64Decode(this string base64EncodedData)
     {
         return Encoding.UTF8.GetString(
@@ -34,6 +40,7 @@ public static string Base64Decode(this string base64EncodedData)
         );
     }
 
+    [Pure]
     public static string Enquote(this string str)
     {
         return "\"" + str + "\"";
diff --git a/backend/src/GraphQl/Extensions/PageExtensions.cs b/backend/src/GraphQl/Extensions/PageExtensions.cs
index dd1840af0..28d4c9e61 100644
--- a/backend/src/GraphQl/Extensions/PageExtensions.cs
+++ b/backend/src/GraphQl/Extensions/PageExtensions.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using System.Diagnostics.Contracts;
 using GreenDonut.Data;
 using HotChocolate.Types.Pagination;
 
@@ -7,6 +8,7 @@ namespace Metabase.GraphQl.Extensions;
 // Inspired by https://github.com/ChilliCream/graphql-platform/blob/main/src/HotChocolate/Data/src/Data/Extensions/HotChocolatePaginationResultExtensions.cs
 public static class PageExtensions
 {
+    [Pure]
     public static async ValueTask<int> GetTotalCountAsync<TSource>(
         this Task<Page<TSource>?> pagePromise
     )
@@ -14,6 +16,7 @@ this Task<Page<TSource>?> pagePromise
         return (await pagePromise)?.TotalCount ?? 0;
     }
 
+    [Pure]
     public static async ValueTask<ConnectionPageInfo> GetPageInfoAsync<TSource>(
         this Task<Page<TSource>?> pagePromise
     )
@@ -27,6 +30,7 @@ this Task<Page<TSource>?> pagePromise
         );
     }
 
+    // [Pure]
     // public static async Task<Connection<TTarget>> ToConnectionAsync<TSource, TTarget>(
     //     this Task<Page<TSource>> pagePromise,
     //     Func<Page<TSource>, PageEntry<TSource>, Task<IEdge<TTarget>>> createEdgeAsync,
@@ -38,6 +42,7 @@ this Task<Page<TSource>?> pagePromise
     //     return await CreateConnectionAsync(await pagePromise, createEdgeAsync, createConnection);
     // }
 
+    // [Pure]
     // private static async Task<Connection<TTarget>> CreateConnectionAsync<TSource, TTarget>(
     //     Page<TSource>? page,
     //     Func<Page<TSource>, PageEntry<TSource>, Task<IEdge<TTarget>>> createEdgeAsync,
diff --git a/backend/src/GraphQl/Extensions/ResolverContextExtensions.cs b/backend/src/GraphQl/Extensions/ResolverContextExtensions.cs
index a373f2ae4..a5054d3b8 100644
--- a/backend/src/GraphQl/Extensions/ResolverContextExtensions.cs
+++ b/backend/src/GraphQl/Extensions/ResolverContextExtensions.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.Contracts;
 using GreenDonut.Data;
 using HotChocolate.Data.Filters;
 using HotChocolate.Data.Sorting;
@@ -9,6 +10,7 @@ public static class ResolverContextExtensions
 {
     // Inspired by https://github.com/ChilliCream/graphql-platform/blob/9ae7220205412203d0a941a6b0cc779e70b02b09/src/HotChocolate/Data/src/Data/QueryContextParameterExpressionBuilder.cs#L76-L86
     // Using `QueryContext<Component> queryContext,` in resolvers starts up the projection engine producing many problems
+    [Pure]
     public static QueryContext<T> GetQueryContext<T>(this IResolverContext context)
     {
         var selection = context.Selection;
@@ -22,6 +24,7 @@ public static QueryContext<T> GetQueryContext<T>(this IResolverContext context)
     }
 
     // Using `PagingArguments pagingArguments,` in resolvers results in the parameter `pagingArguments: PagingArgumentsInput` in the GraphQL schema
+    [Pure]
     public static PagingArguments GetPagingArguments(this IResolverContext context)
     {
         return new(
diff --git a/backend/src/GraphQl/Institutions/InstitutionQueries.cs b/backend/src/GraphQl/Institutions/InstitutionQueries.cs
index 0fc6bd964..aacf944e7 100644
--- a/backend/src/GraphQl/Institutions/InstitutionQueries.cs
+++ b/backend/src/GraphQl/Institutions/InstitutionQueries.cs
@@ -6,7 +6,6 @@
 using GreenDonut.Data;
 using HotChocolate.Authorization;
 using HotChocolate.Data;
-using HotChocolate.Data.Sorting;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Authorization;
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectConsentTypeExtensions.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectConsentTypeExtensions.cs
index b6fc94b00..429e1fd26 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectConsentTypeExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectConsentTypeExtensions.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Diagnostics.Contracts;
 using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
 public static class OpenIdConnectConsentTypeExtensions
 {
+    [Pure]
     public static OpenIdConnectConsentType ToOpenIdConnectConsentType(this string consentType)
     {
         return consentType switch
@@ -17,6 +19,7 @@ public static OpenIdConnectConsentType ToOpenIdConnectConsentType(this string co
         };
     }
 
+    [Pure]
     public static string ToStringConsentType(this OpenIdConnectConsentType consentType)
     {
         return consentType switch
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectEndpointExtensions.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectEndpointExtensions.cs
index e44a91112..1482c74df 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectEndpointExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectEndpointExtensions.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Diagnostics.Contracts;
 using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
 public static class OpenIdConnectEndpointExtensions
 {
+    [Pure]
     public static OpenIdConnectEndpoint PermissionToOpenIdConnectEndpoint(this string endpointPermission)
     {
         return endpointPermission switch
@@ -19,6 +21,7 @@ public static OpenIdConnectEndpoint PermissionToOpenIdConnectEndpoint(this strin
         };
     }
 
+    [Pure]
     public static string ToPermissionString(this OpenIdConnectEndpoint endpoint)
     {
         return endpoint switch
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectGrantTypeExtensions.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectGrantTypeExtensions.cs
index b7708007c..220f317d2 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectGrantTypeExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectGrantTypeExtensions.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Diagnostics.Contracts;
 using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
 public static class OpenIdConnectGrantTypeExtensions
 {
+    [Pure]
     public static OpenIdConnectGrantType PermissionToOpenIdConnectGrantType(this string grantTypePermission)
     {
         return grantTypePermission switch
@@ -17,6 +19,7 @@ public static OpenIdConnectGrantType PermissionToOpenIdConnectGrantType(this str
         };
     }
 
+    [Pure]
     public static string ToPermissionString(this OpenIdConnectGrantType grantType)
     {
         return grantType switch
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectRequirementExtensions.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectRequirementExtensions.cs
index 0ea5271f4..4de4501cd 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectRequirementExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectRequirementExtensions.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Diagnostics.Contracts;
 using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
 public static class OpenIdConnectRequirementExtensions
 {
+    [Pure]
     public static OpenIdConnectRequirement ToOpenIdConnectRequirement(this string requirement)
     {
         return requirement switch
@@ -15,6 +17,7 @@ public static OpenIdConnectRequirement ToOpenIdConnectRequirement(this string re
         };
     }
 
+    [Pure]
     public static string ToStringRequirement(this OpenIdConnectRequirement requirement)
     {
         return requirement switch
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectResponseTypeExtensions.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectResponseTypeExtensions.cs
index fd1fcfbc8..40eba8a59 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectResponseTypeExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectResponseTypeExtensions.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Diagnostics.Contracts;
 using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
 public static class OpenIdConnectResponseTypeExtensions
 {
+    [Pure]
     public static OpenIdConnectResponseType PermissionToOpenIdConnectResponseType(this string responseTypePermission)
     {
         return responseTypePermission switch
@@ -16,6 +18,7 @@ public static OpenIdConnectResponseType PermissionToOpenIdConnectResponseType(th
         };
     }
 
+    [Pure]
     public static string ToPermissionString(this OpenIdConnectResponseType responseType)
     {
         return responseType switch
diff --git a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
index f82d7d042..f14dabc9f 100644
--- a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Diagnostics.Contracts;
 using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect;
 
 public static class OpenIdConnectScopeExtensions
 {
+    [Pure]
     public static OpenIdConnectScope ToOpenIdConnectScope(this string scope)
     {
         return scope switch
@@ -28,6 +30,7 @@ public static OpenIdConnectScope ToOpenIdConnectScope(this string scope)
         };
     }
 
+    [Pure]
     public static OpenIdConnectScope PermissionToOpenIdConnectScope(this string scopePermission)
     {
         return scopePermission switch
@@ -51,6 +54,7 @@ public static OpenIdConnectScope PermissionToOpenIdConnectScope(this string scop
         };
     }
 
+    [Pure]
     public static string ToPermissionString(this OpenIdConnectScope scope)
     {
         return scope switch

From 6a46fefcdc1ead6f5edb9cadde131b61653f9bbb Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 12 Jun 2026 12:03:12 +0200
Subject: [PATCH 071/145] Make uint filterable via GraphQL

---
 backend/src/Configuration/GraphQlConfiguration.cs     |  2 ++
 backend/src/GraphQl/Filters/ScalarFilterInputTypes.cs | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/backend/src/Configuration/GraphQlConfiguration.cs b/backend/src/Configuration/GraphQlConfiguration.cs
index e1d60468c..197f60cbb 100644
--- a/backend/src/Configuration/GraphQlConfiguration.cs
+++ b/backend/src/Configuration/GraphQlConfiguration.cs
@@ -393,6 +393,8 @@ this IFilterConventionDescriptor descriptor
             .BindRuntimeType<short?, ShortFilterInputType>()
             .BindRuntimeType<int, IntFilterInputType>()
             .BindRuntimeType<int?, IntFilterInputType>()
+            .BindRuntimeType<uint, NonNegativeIntFilterInputType>()
+            .BindRuntimeType<uint?, NonNegativeIntFilterInputType>()
             .BindRuntimeType<long, LongFilterInputType>()
             .BindRuntimeType<long?, LongFilterInputType>()
             .BindRuntimeType<float, FloatFilterInputType>()
diff --git a/backend/src/GraphQl/Filters/ScalarFilterInputTypes.cs b/backend/src/GraphQl/Filters/ScalarFilterInputTypes.cs
index 13d45c12d..eba7c072a 100644
--- a/backend/src/GraphQl/Filters/ScalarFilterInputTypes.cs
+++ b/backend/src/GraphQl/Filters/ScalarFilterInputTypes.cs
@@ -154,6 +154,16 @@ protected override void Configure(IFilterInputTypeDescriptor descriptor)
     }
 }
 
+public sealed class NonNegativeIntFilterInputType
+    : ExtendedComparableOperationFilterInputType<NonNegativeIntType>
+{
+    protected override void Configure(IFilterInputTypeDescriptor descriptor)
+    {
+        descriptor.Name($"NonNegativeInt{GraphQlConstants.FilterInputSuffix}");
+        base.Configure(descriptor);
+    }
+}
+
 public sealed class DecimalFilterInputType
     : ExtendedComparableOperationFilterInputType<DecimalType>
 {

From e080eb969c35964ba8c55b0c82d2b5e4607ccc9a Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 12 Jun 2026 12:03:28 +0200
Subject: [PATCH 072/145] Add link to key on the OpenPGP key server

---
 frontend/components/gnuPgKeys/GnuPgKeySummary.tsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx b/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
index 9c51e9bca..5460c1cba 100644
--- a/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
+++ b/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
@@ -6,6 +6,7 @@ import ForbidGnuPgKeyFingerprint from "./ForbidGnuPgKeyFingerprint";
 import EntityLink from "../entities/EntityLink";
 import EntitySummary from "../entities/EntitySummary";
 import { isTruthy } from "../../lib/array";
+import Link from "next/link";
 
 type Status = "pending" | "allowed" | "forbidden";
 
@@ -72,6 +73,14 @@ export default function GnuPgKeySummary({
             route={paths.institution}
           />
         </div>
+        <div>
+          Published on the{" "}
+          <Link href="https://keys.openpgp.org">OpenPGP Key Server</Link> at{" "}
+          <Link
+            href={`https://keys.openpgp.org/vks/v1/by-fingerprint/${entity.fingerprint}`}
+          ></Link>
+          .
+        </div>
         <div>
           Owned by <EntityLink entity={entity.user.node} route={paths.user} />
         </div>

From 0dd7c44fe13472d0efa9a6c611a1ffe6d59a92e7 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 12 Jun 2026 12:11:58 +0200
Subject: [PATCH 073/145] Allow anonymous users to view meta information about
 GnuPG keys used by institutions to sign data approvals

---
 .../GnuPgKeyFingerprints/GnuPgKeyFingerprintQueries.cs       | 4 ----
 frontend/components/gnuPgKeys/GnuPgKeySummary.tsx            | 5 +++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintQueries.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintQueries.cs
index 8a26aa128..77b0991bd 100644
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintQueries.cs
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintQueries.cs
@@ -2,11 +2,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut.Data;
-using HotChocolate.Authorization;
 using HotChocolate.Data;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
-using Metabase.Authorization;
 using Metabase.Data;
 using Metabase.GraphQl.Extensions;
 using Microsoft.EntityFrameworkCore;
@@ -19,7 +17,6 @@ public sealed class GnuPgKeyFingerprintQueries
     [UsePaging]
     [UseFiltering<GnuPgKeyFingerprintFilterType>]
     [UseSorting<GnuPgKeyFingerprintSortType>]
-    [Authorize(Policy = AuthorizationPolicies.ManageGnuPgScopePolicy)]
     public ValueTask<HotChocolate.Types.Pagination.Connection<GnuPgKeyFingerprint>> GetGnuPgKeyFingerprintsAsync(
         IResolverContext resolverContext,
         ApplicationDbContext databaseContext,
@@ -33,7 +30,6 @@ CancellationToken cancellationToken
             .ToConnectionAsync();
     }
 
-    [Authorize(Policy = AuthorizationPolicies.ManageGnuPgScopePolicy)]
     public Task<GnuPgKeyFingerprint?> GetGnuPgKeyFingerprintAsync(
         string fingerprint,
         IGnuPgKeyFingerprintByFingerprintDataLoader byFingerprint,
diff --git a/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx b/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
index 5460c1cba..84019dedc 100644
--- a/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
+++ b/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
@@ -78,8 +78,9 @@ export default function GnuPgKeySummary({
           <Link href="https://keys.openpgp.org">OpenPGP Key Server</Link> at{" "}
           <Link
             href={`https://keys.openpgp.org/vks/v1/by-fingerprint/${entity.fingerprint}`}
-          ></Link>
-          .
+          >
+            <code>{entity.fingerprint}</code>
+          </Link>
         </div>
         <div>
           Owned by <EntityLink entity={entity.user.node} route={paths.user} />

From a875d1dc34e74c2746a1066eb9e8acbbf389b985 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 12 Jun 2026 20:05:48 +0200
Subject: [PATCH 074/145] Spread approvals vertically

---
 frontend/components/data/DataSummary.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/components/data/DataSummary.tsx b/frontend/components/data/DataSummary.tsx
index ec9cc8bfa..6ee302327 100644
--- a/frontend/components/data/DataSummary.tsx
+++ b/frontend/components/data/DataSummary.tsx
@@ -261,9 +261,9 @@ export default function DataSummary({
         <>
           <Divider style={{ margin: 0 }} />
           <div>
-            <Flex gap="small">
-              {entity.approvals.map((approval) => (
-                <div>
+            <Flex vertical gap="small">
+              {entity.approvals.map((approval, index) => (
+                <div key={index}>
                   The institution{" "}
                   <EntityLink
                     entity={

From fc17a027b41f3b212fef9f9a44203ee4be382b7e Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 12 Jun 2026 20:06:34 +0200
Subject: [PATCH 075/145] Wrap tags to the next line if they do not fit anymore
 (in particular for small displays)

---
 frontend/components/entities/EntitySummary.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/entities/EntitySummary.tsx b/frontend/components/entities/EntitySummary.tsx
index e4bc37f91..a0247b2b9 100644
--- a/frontend/components/entities/EntitySummary.tsx
+++ b/frontend/components/entities/EntitySummary.tsx
@@ -77,7 +77,7 @@ export default function EntitySummary({
                   Copy Permalink
                 </CopyButton>
               </div>
-              <Space align="center">
+              <Space wrap align="center">
                 <Typography.Title level={4} style={{ margin: 0 }}>
                   {route ? (
                     <Link href={route(entity.uuid)}>

From 0a04585fdcb68b6fdf8907b559ef061fc73f569b Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 12 Jun 2026 20:11:03 +0200
Subject: [PATCH 076/145] Pass context in filter state reducers correctly

---
 .../components/ActiveFilterAndSortBar.tsx     | 22 +++---
 frontend/lib/filter.ts                        | 71 ++++++++++++-------
 2 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/frontend/components/ActiveFilterAndSortBar.tsx b/frontend/components/ActiveFilterAndSortBar.tsx
index 8b0af10b2..dd9ac5fdf 100644
--- a/frontend/components/ActiveFilterAndSortBar.tsx
+++ b/frontend/components/ActiveFilterAndSortBar.tsx
@@ -4,7 +4,7 @@ import {
   getFilterOperatorLabel,
   createFilterStateReducer,
   FilterDefinition,
-  FilterStateReducerContext,
+  AnyFilterDefinition,
 } from "../lib/filter";
 import { formatSortDirection, SortState, SortDefinition } from "../lib/sort";
 import DeleteButton from "./DeleteButton";
@@ -33,11 +33,11 @@ const stringifyFilter = <TFilterInput,>(
   createFilterStateReducer<string>(
     (scalar) =>
       `${getFilterOperatorLabel(scalar.operator)}|${JSON.stringify(scalar.value)}`,
-    (list, stringify) =>
-      `${getFilterOperatorLabel(list.operator)}|${stringify(list.value)}`,
-    (object, context, stringify) =>
-      `${String(context[object.index].field)}|${stringify(object.value)}`,
-  )(filter, definitions as FilterStateReducerContext);
+    (list, _, stringifyValue) =>
+      `${getFilterOperatorLabel(list.operator)}|${stringifyValue()}`,
+    (object, context, stringifyValue) =>
+      `${String(context.items[object.index].field)}|${stringifyValue()}`,
+  )(filter, definitions as AnyFilterDefinition[]);
 
 const renderFilter = <TFilterInput,>(
   value: ObjectFilterState,
@@ -52,17 +52,17 @@ const renderFilter = <TFilterInput,>(
           : scalar.value}
       </>
     ),
-    (list, render) => (
+    (list, _, renderValue) => (
       <>
-        {getFilterOperatorLabel(list.operator)} {render(list.value)}
+        {getFilterOperatorLabel(list.operator)} {renderValue()}
       </>
     ),
-    (object, context, render) => (
+    (object, context, renderValue) => (
       <>
-        {getLabel(context[object.index], "none-upper")} {render(object.value)}
+        {getLabel(context.items[object.index], "none-upper")} {renderValue()}
       </>
     ),
-  )(value, definitions as FilterStateReducerContext);
+  )(value, definitions as AnyFilterDefinition[]);
 
 export default function ActiveFilterAndSortBar<TFilterInput, TSortInput>({
   values,
diff --git a/frontend/lib/filter.ts b/frontend/lib/filter.ts
index 18488394b..7546b9d0d 100644
--- a/frontend/lib/filter.ts
+++ b/frontend/lib/filter.ts
@@ -284,7 +284,9 @@ type ScalarFilterDefinition<
 > = ScalarFilterDefinitionMap<TFilterInput, TKey>[ScalarFilterType];
 
 type ListItemFilterDefinition<TFilterInput, TKey extends keyof TFilterInput> =
-  NonNullable<TFilterInput[TKey]> extends { all?: infer TItemFilterInput }
+  NonNullable<TFilterInput[TKey]> extends {
+    all?: infer TItemFilterInput;
+  }
     ? DistributiveOmit<FilterDefinition<NonNullable<TItemFilterInput>>, "field">
     : never;
 
@@ -310,7 +312,7 @@ type FieldFilterDefinition<TFilterInput, TKey extends keyof TFilterInput> =
   | ListFilterDefinition<TFilterInput, TKey>
   | ObjectFilterDefinition<TFilterInput, TKey>;
 
-type AnyFilterDefinition = FieldFilterDefinition<any, any>;
+export type AnyFilterDefinition = FieldFilterDefinition<any, any>;
 
 export type FilterDefinition<TFilterInput> = {
   [TKey in keyof TFilterInput]: FieldFilterDefinition<TFilterInput, TKey>;
@@ -346,47 +348,64 @@ const isObjectFilterState = (
   return value.operator === undefined;
 };
 
-export type FilterStateReducerContext = readonly AnyFilterDefinition[];
-
 export const createFilterStateReducer = <TOutput>(
   reduceScalar: (
     scalar: ScalarFilterState,
-    context: FilterStateReducerContext,
+    context: ScalarFilterDefinition<any, any>,
   ) => TOutput,
   reduceList: (
     list: ListFilterState,
-    reduce: (filter: FilterState) => TOutput,
+    context: ListFilterDefinition<any, any>,
+    reduce: () => TOutput,
   ) => TOutput,
   reduceObject: (
     object: ObjectFilterState,
-    context: FilterStateReducerContext,
-    reduce: (filter: FilterState) => TOutput,
+    context: ObjectFilterDefinition<any, any>,
+    reduce: () => TOutput,
   ) => TOutput,
 ) => {
   return (
     root: ObjectFilterState,
-    initialContext: FilterStateReducerContext,
+    rootFilterDefinitions: readonly AnyFilterDefinition[],
   ): TOutput => {
     const reduce = (
       filter: FilterState,
-      context: FilterStateReducerContext,
+      context: AnyFilterDefinition,
     ): TOutput => {
       if (isScalarFilterState(filter)) {
+        if (context.type == "list" || context.type == "object") {
+          console.error("Filter: ", filter, "Context: ", context);
+          throw Error(`Expected scalar filter definition, got ${context.type}`);
+        }
         return reduceScalar(filter, context);
       }
       if (isListFilterState(filter)) {
-        return reduceList(filter, (x) => reduce(x, context));
+        if (context.type != "list") {
+          console.error("Filter: ", filter, "Context: ", context);
+          throw Error(`Expected list filter definition, got ${context.type}`);
+        }
+        return reduceList(filter, context, () =>
+          reduce(filter.value, context.item),
+        );
       }
       if (isObjectFilterState(filter)) {
-        const subContext = (
-          context[filter.index] as ObjectFilterDefinition<any, keyof any>
-        ).items;
-        return reduceObject(filter, context, (x) => reduce(x, subContext));
+        if (context.type != "object") {
+          console.error("Filter: ", filter, "Context: ", context);
+          throw Error(`Expected object filter definition, got ${context.type}`);
+        }
+        return reduceObject(filter, context, () =>
+          reduce(filter.value, context.items[filter.index]),
+        );
       }
       return assertNever(filter);
     };
-    return reduceObject(root, initialContext, (object) =>
-      reduce(object, initialContext),
+    const rootFilterDefinition: ObjectFilterDefinition<any, any> = {
+      type: "object",
+      field: "root",
+      items: rootFilterDefinitions as FilterDefinition<any>[],
+    };
+    return reduceObject(root, rootFilterDefinition, () =>
+      reduce(root.value, rootFilterDefinition.items[root.index]),
     );
   };
 };
@@ -399,13 +418,13 @@ export const createFilterDefinitionReducer = <
   reduceScalar: (scalar: ScalarFilterDefinition<any, any>) => TScalarOutput,
   reduceList: (
     list: ListFilterDefinition<any, any>,
-    reduce: (
+    reduceValue: (
       filter: AnyFilterDefinition,
     ) => TScalarOutput | TListOutput | TObjectOutput,
   ) => TListOutput,
   reduceObject: (
     object: ObjectFilterDefinition<any, any>,
-    reduce: (
+    reduceValue: (
       filter: AnyFilterDefinition,
     ) => TScalarOutput | TListOutput | TObjectOutput,
   ) => TObjectOutput,
@@ -434,8 +453,8 @@ export const createFilterDefinitionReducer = <
 
 // to GraphQL filter input, for example, to `{ name: { contains: "Simon" } }`
 export const toWhereClause = <TFilterInput>(
-  filter: ObjectFilterState,
-  configs: readonly FilterDefinition<TFilterInput>[],
+  root: ObjectFilterState,
+  rootFilterDefinitions: readonly FilterDefinition<TFilterInput>[],
 ): TFilterInput =>
   // the initial context type is `readonly FilterDefinition<TFilterInput>[]` and subsequent
   // types are of the form `readonly FilterDefinition<TFilterInput[keyof TFilterInput]>[]`
@@ -443,13 +462,13 @@ export const toWhereClause = <TFilterInput>(
     (scalar, _) => ({
       [scalar.operator]: scalar.value,
     }),
-    (list, reduce) => ({
-      [list.operator]: reduce(list.value),
+    (list, _, reduceValue) => ({
+      [list.operator]: reduceValue(),
     }),
-    (object, context, reduce) => ({
-      [context[object.index].field]: reduce(object.value),
+    (object, context, reduceValue) => ({
+      [context.items[object.index].field]: reduceValue(),
     }),
-  )(filter, configs as FilterStateReducerContext) as TFilterInput;
+  )(root, rootFilterDefinitions as AnyFilterDefinition[]) as TFilterInput;
 
 export const getInitialFilterSubformValues = (
   filterDefinition: AnyFilterDefinition,

From 9e36bb9787393c831340b991342874c1d0d879fa Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 12 Jun 2026 20:16:29 +0200
Subject: [PATCH 077/145] Use antd `Link` component for external links (instead
 of the one from Next.JS)

---
 frontend/components/databases/DatabaseSummary.tsx |  1 +
 frontend/components/gnuPgKeys/GnuPgKeySummary.tsx | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/frontend/components/databases/DatabaseSummary.tsx b/frontend/components/databases/DatabaseSummary.tsx
index a57aaf060..514501c2a 100644
--- a/frontend/components/databases/DatabaseSummary.tsx
+++ b/frontend/components/databases/DatabaseSummary.tsx
@@ -54,6 +54,7 @@ export default function DatabaseSummary({
         <EntityLink entity={entity.operator.node} route={paths.institution} />
       </div>
       <div>
+        GraphQL endpoint located at
         <Typography.Link href={entity.locator}>
           {entity.locator}
         </Typography.Link>
diff --git a/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx b/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
index 84019dedc..738af7a30 100644
--- a/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
+++ b/frontend/components/gnuPgKeys/GnuPgKeySummary.tsx
@@ -1,12 +1,11 @@
 import { GnuPgKeyFingerprintsPartialFragment } from "../../queries/gnuPgKeyFingerprints.generated";
 import paths from "../../paths";
-import { Tag } from "antd";
+import { Tag, Typography } from "antd";
 import AllowGnuPgKeyFingerprint from "./AllowGnuPgKeyFingerprint";
 import ForbidGnuPgKeyFingerprint from "./ForbidGnuPgKeyFingerprint";
 import EntityLink from "../entities/EntityLink";
 import EntitySummary from "../entities/EntitySummary";
 import { isTruthy } from "../../lib/array";
-import Link from "next/link";
 
 type Status = "pending" | "allowed" | "forbidden";
 
@@ -75,12 +74,15 @@ export default function GnuPgKeySummary({
         </div>
         <div>
           Published on the{" "}
-          <Link href="https://keys.openpgp.org">OpenPGP Key Server</Link> at{" "}
-          <Link
+          <Typography.Link href="https://keys.openpgp.org">
+            OpenPGP Key Server
+          </Typography.Link>{" "}
+          at{" "}
+          <Typography.Link
             href={`https://keys.openpgp.org/vks/v1/by-fingerprint/${entity.fingerprint}`}
           >
             <code>{entity.fingerprint}</code>
-          </Link>
+          </Typography.Link>
         </div>
         <div>
           Owned by <EntityLink entity={entity.user.node} route={paths.user} />

From b3d341b3a8158b7915bc99caebe9d52e4a89132c Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 12 Jun 2026 21:05:20 +0200
Subject: [PATCH 078/145] Add missing space ...

---
 frontend/components/databases/DatabaseSummary.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/databases/DatabaseSummary.tsx b/frontend/components/databases/DatabaseSummary.tsx
index 514501c2a..1c1afc293 100644
--- a/frontend/components/databases/DatabaseSummary.tsx
+++ b/frontend/components/databases/DatabaseSummary.tsx
@@ -54,7 +54,7 @@ export default function DatabaseSummary({
         <EntityLink entity={entity.operator.node} route={paths.institution} />
       </div>
       <div>
-        GraphQL endpoint located at
+        GraphQL endpoint located at{" "}
         <Typography.Link href={entity.locator}>
           {entity.locator}
         </Typography.Link>

From acbb68c31c26169d3c4646927db675a2b3b20985 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 12 Jun 2026 22:50:59 +0200
Subject: [PATCH 079/145] Use GraphQL scalar types `EmailAddress` and
 `PhoneNumber`

---
 .../ContactInformationInput.cs                |   6 +-
 .../ContactInformationType.cs                 |   6 +
 .../src/GraphQl/Users/ChangeUserEmailInput.cs |   5 +-
 .../Users/ConfirmUserEmailChangeInput.cs      |   9 +-
 .../GraphQl/Users/ConfirmUserEmailInput.cs    |   7 +-
 backend/src/GraphQl/Users/LoginUserInput.cs   |   7 +-
 .../src/GraphQl/Users/RegisterUserInput.cs    |   6 +-
 .../Users/RequestUserPasswordResetInput.cs    |   6 +-
 .../Users/ResendUserEmailConfirmationInput.cs |   7 +-
 .../GraphQl/Users/ResetUserPasswordInput.cs   |   7 +-
 .../GraphQl/Users/SetUserPhoneNumberInput.cs  |   5 +-
 .../GraphQlSchemaTests.IsUnchanged.snap       |  41 ++-
 frontend/codegen.ts                           |   2 +
 .../institutions/CreateInstitution.tsx        |   4 +-
 .../institutions/UpdateInstitution.tsx        |   5 +-
 frontend/components/me/ChangeUserEmail.tsx    |   3 +-
 frontend/components/me/SetUserPhoneNumber.tsx |   5 +-
 frontend/pages/users/forgot-password.tsx      |   3 +-
 frontend/pages/users/login/index.tsx          |   3 +-
 frontend/pages/users/register.tsx             |   3 +-
 .../pages/users/resend-email-confirmation.tsx |   3 +-
 frontend/pages/users/reset-password.tsx       |   3 +-
 frontend/type-defs.graphqls                   | 329 +++++++++++-------
 23 files changed, 312 insertions(+), 163 deletions(-)

diff --git a/backend/src/GraphQl/ContactInformations/ContactInformationInput.cs b/backend/src/GraphQl/ContactInformations/ContactInformationInput.cs
index e69fa62d3..0ff9ae37a 100644
--- a/backend/src/GraphQl/ContactInformations/ContactInformationInput.cs
+++ b/backend/src/GraphQl/ContactInformations/ContactInformationInput.cs
@@ -1,12 +1,14 @@
 using System;
+using HotChocolate;
+using HotChocolate.Types;
 using Metabase.Data;
 
 namespace Metabase.GraphQl.ContactInformations;
 
 public sealed record ContactInformationInput(
-    string? PhoneNumber,
+    [property: GraphQLType<PhoneNumberType>] string? PhoneNumber,
     string? PostalAddress,
-    string? EmailAddress,
+    [property: GraphQLType<EmailAddressType>] string? EmailAddress,
     Uri? WebsiteLocator
 )
 {
diff --git a/backend/src/GraphQl/ContactInformations/ContactInformationType.cs b/backend/src/GraphQl/ContactInformations/ContactInformationType.cs
index 3ac53b46b..ac3472c6d 100644
--- a/backend/src/GraphQl/ContactInformations/ContactInformationType.cs
+++ b/backend/src/GraphQl/ContactInformations/ContactInformationType.cs
@@ -10,5 +10,11 @@ protected override void Configure(
         IObjectTypeDescriptor<ContactInformation> descriptor
     )
     {
+        descriptor
+            .Field(_ => _.EmailAddress)
+            .Type<EmailAddressType>();
+        descriptor
+            .Field(_ => _.PhoneNumber)
+            .Type<PhoneNumberType>();
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/ChangeUserEmailInput.cs b/backend/src/GraphQl/Users/ChangeUserEmailInput.cs
index a5a1625f1..57e66b900 100644
--- a/backend/src/GraphQl/Users/ChangeUserEmailInput.cs
+++ b/backend/src/GraphQl/Users/ChangeUserEmailInput.cs
@@ -1,5 +1,8 @@
+using HotChocolate;
+using HotChocolate.Types;
+
 namespace Metabase.GraphQl.Users;
 
 public sealed record ChangeUserEmailInput(
-    string NewEmail
+    [property: GraphQLType<NonNullType<EmailAddressType>>] string NewEmail
 );
\ No newline at end of file
diff --git a/backend/src/GraphQl/Users/ConfirmUserEmailChangeInput.cs b/backend/src/GraphQl/Users/ConfirmUserEmailChangeInput.cs
index fd7c4ae82..bec2e74f4 100644
--- a/backend/src/GraphQl/Users/ConfirmUserEmailChangeInput.cs
+++ b/backend/src/GraphQl/Users/ConfirmUserEmailChangeInput.cs
@@ -1,7 +1,10 @@
+using HotChocolate;
+using HotChocolate.Types;
+
 namespace Metabase.GraphQl.Users;
 
 public sealed record ConfirmUserEmailChangeInput(
-    string CurrentEmail,
-    string NewEmail,
+    [property: GraphQLType<NonNullType<EmailAddressType>>] string CurrentEmail,
+    [property: GraphQLType<NonNullType<EmailAddressType>>] string NewEmail,
     string ConfirmationCode
-);
\ No newline at end of file
+);
diff --git a/backend/src/GraphQl/Users/ConfirmUserEmailInput.cs b/backend/src/GraphQl/Users/ConfirmUserEmailInput.cs
index 7057bc03e..053aa534c 100644
--- a/backend/src/GraphQl/Users/ConfirmUserEmailInput.cs
+++ b/backend/src/GraphQl/Users/ConfirmUserEmailInput.cs
@@ -1,6 +1,9 @@
+using HotChocolate;
+using HotChocolate.Types;
+
 namespace Metabase.GraphQl.Users;
 
 public sealed record ConfirmUserEmailInput(
-    string Email,
+    [property: GraphQLType<NonNullType<EmailAddressType>>] string Email,
     string ConfirmationCode
-);
\ No newline at end of file
+);
diff --git a/backend/src/GraphQl/Users/LoginUserInput.cs b/backend/src/GraphQl/Users/LoginUserInput.cs
index e3f2a0801..77c4937e9 100644
--- a/backend/src/GraphQl/Users/LoginUserInput.cs
+++ b/backend/src/GraphQl/Users/LoginUserInput.cs
@@ -1,6 +1,9 @@
+using HotChocolate;
+using HotChocolate.Types;
+
 namespace Metabase.GraphQl.Users;
 
 public sealed record LoginUserInput(
-    string Email,
+    [property: GraphQLType<NonNullType<EmailAddressType>>] string Email,
     string Password
-);
\ No newline at end of file
+);
diff --git a/backend/src/GraphQl/Users/RegisterUserInput.cs b/backend/src/GraphQl/Users/RegisterUserInput.cs
index 1e449371a..94c4c8f97 100644
--- a/backend/src/GraphQl/Users/RegisterUserInput.cs
+++ b/backend/src/GraphQl/Users/RegisterUserInput.cs
@@ -1,11 +1,13 @@
 using System;
+using HotChocolate;
+using HotChocolate.Types;
 
 namespace Metabase.GraphQl.Users;
 
 public sealed record RegisterUserInput(
     string Name,
-    string Email,
+    [property: GraphQLType<NonNullType<EmailAddressType>>] string Email,
     string Password,
     string PasswordConfirmation,
     Uri? ReturnTo
-);
\ No newline at end of file
+);
diff --git a/backend/src/GraphQl/Users/RequestUserPasswordResetInput.cs b/backend/src/GraphQl/Users/RequestUserPasswordResetInput.cs
index 150fe7407..24e1de474 100644
--- a/backend/src/GraphQl/Users/RequestUserPasswordResetInput.cs
+++ b/backend/src/GraphQl/Users/RequestUserPasswordResetInput.cs
@@ -1,8 +1,10 @@
 using System;
+using HotChocolate;
+using HotChocolate.Types;
 
 namespace Metabase.GraphQl.Users;
 
 public sealed record RequestUserPasswordResetInput(
-    string Email,
+    [property: GraphQLType<NonNullType<EmailAddressType>>] string Email,
     Uri? ReturnTo
-);
\ No newline at end of file
+);
diff --git a/backend/src/GraphQl/Users/ResendUserEmailConfirmationInput.cs b/backend/src/GraphQl/Users/ResendUserEmailConfirmationInput.cs
index 9dd08e69b..a09bc2ef4 100644
--- a/backend/src/GraphQl/Users/ResendUserEmailConfirmationInput.cs
+++ b/backend/src/GraphQl/Users/ResendUserEmailConfirmationInput.cs
@@ -1,5 +1,8 @@
+using HotChocolate;
+using HotChocolate.Types;
+
 namespace Metabase.GraphQl.Users;
 
 public sealed record ResendUserEmailConfirmationInput(
-    string Email
-);
\ No newline at end of file
+    [property: GraphQLType<NonNullType<EmailAddressType>>] string Email
+);
diff --git a/backend/src/GraphQl/Users/ResetUserPasswordInput.cs b/backend/src/GraphQl/Users/ResetUserPasswordInput.cs
index 26081f7fe..58c7eb7d2 100644
--- a/backend/src/GraphQl/Users/ResetUserPasswordInput.cs
+++ b/backend/src/GraphQl/Users/ResetUserPasswordInput.cs
@@ -1,8 +1,11 @@
+using HotChocolate;
+using HotChocolate.Types;
+
 namespace Metabase.GraphQl.Users;
 
 public sealed record ResetUserPasswordInput(
-    string Email,
+    [property: GraphQLType<NonNullType<EmailAddressType>>] string Email,
     string Password,
     string PasswordConfirmation,
     string ResetCode
-);
\ No newline at end of file
+);
diff --git a/backend/src/GraphQl/Users/SetUserPhoneNumberInput.cs b/backend/src/GraphQl/Users/SetUserPhoneNumberInput.cs
index 3c992d145..766f3ac29 100644
--- a/backend/src/GraphQl/Users/SetUserPhoneNumberInput.cs
+++ b/backend/src/GraphQl/Users/SetUserPhoneNumberInput.cs
@@ -1,5 +1,8 @@
+using HotChocolate;
+using HotChocolate.Types;
+
 namespace Metabase.GraphQl.Users;
 
 public sealed record SetUserPhoneNumberInput(
-    string PhoneNumber
+    [property: GraphQLType<NonNullType<PhoneNumberType>>] string PhoneNumber
 );
\ No newline at end of file
diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index 12e8f52e1..3a88bde51 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -2947,7 +2947,7 @@ input ChangeInstitutionRepresentativeRoleInput {
 }
 
 input ChangeUserEmailInput {
-  newEmail: String!
+  newEmail: EmailAddress!
 }
 
 input ChangeUserPasswordInput {
@@ -3134,13 +3134,13 @@ input ConfirmInstitutionRepresentativeInput {
 
 input ConfirmUserEmailChangeInput {
   confirmationCode: String!
-  currentEmail: String!
-  newEmail: String!
+  currentEmail: EmailAddress!
+  newEmail: EmailAddress!
 }
 
 input ConfirmUserEmailInput {
   confirmationCode: String!
-  email: String!
+  email: EmailAddress!
 }
 
 input ConfirmUserMethodDeveloperInput {
@@ -3919,7 +3919,7 @@ input LocalTimeFilterInput {
 }
 
 input LoginUserInput {
-  email: String!
+  email: EmailAddress!
   password: String!
 }
 
@@ -4010,6 +4010,21 @@ input MethodSourceInput {
   name: String!
 }
 
+input NonNegativeIntFilterInput {
+  equalTo: NonNegativeInt @cost(weight: "10")
+  greaterThan: NonNegativeInt @cost(weight: "10")
+  greaterThanOrEqualTo: NonNegativeInt @cost(weight: "10")
+  in: [NonNegativeInt] @cost(weight: "10")
+  lessThan: NonNegativeInt @cost(weight: "10")
+  lessThanOrEqualTo: NonNegativeInt @cost(weight: "10")
+  notEqualTo: NonNegativeInt @cost(weight: "10")
+  notGreaterThan: NonNegativeInt @cost(weight: "10")
+  notGreaterThanOrEqualTo: NonNegativeInt @cost(weight: "10")
+  notIn: [NonNegativeInt] @cost(weight: "10")
+  notLessThan: NonNegativeInt @cost(weight: "10")
+  notLessThanOrEqualTo: NonNegativeInt @cost(weight: "10")
+}
+
 input NullableOfPrimeSurfaceFilterInput {
   equalTo: PrimeSurface @cost(weight: "10")
   in: [PrimeSurface] @cost(weight: "10")
@@ -4156,7 +4171,7 @@ input ReferenceInput {
 }
 
 input RegisterUserInput {
-  email: String!
+  email: EmailAddress!
   name: String!
   password: String!
   passwordConfirmation: String!
@@ -4204,12 +4219,12 @@ input RemoveUserRoleInput {
 }
 
 input RequestUserPasswordResetInput {
-  email: String!
+  email: EmailAddress!
   returnTo: Url
 }
 
 input ResendUserEmailConfirmationInput {
-  email: String!
+  email: EmailAddress!
 }
 
 input ResetOpenIdConnectApplicationClientSecretInput {
@@ -4217,7 +4232,7 @@ input ResetOpenIdConnectApplicationClientSecretInput {
 }
 
 input ResetUserPasswordInput {
-  email: String!
+  email: EmailAddress!
   password: String!
   passwordConfirmation: String!
   resetCode: String!
@@ -4243,7 +4258,7 @@ input SetUserPasswordInput {
 }
 
 input SetUserPhoneNumberInput {
-  phoneNumber: String!
+  phoneNumber: PhoneNumber!
 }
 
 input ShortFilterInput {
@@ -5238,6 +5253,9 @@ scalar Decimal
 scalar Duration
   @specifiedBy(url: "https://scalars.graphql.org/chillicream/duration.html")
 
+"The EmailAddress scalar type constitutes a valid email address, represented as a UTF-8 character sequence. The scalar follows the specification defined by the HTML Spec https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address."
+scalar EmailAddress
+
 "The `LocalDate` scalar type represents a date without time or time zone information."
 scalar LocalDate
   @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-date.html")
@@ -5262,6 +5280,9 @@ scalar Long
 "The `NonNegativeInt` scalar type represents an unsigned 32-bit numeric non-fractional value."
 scalar NonNegativeInt
 
+"The PhoneNumber scalar type represents a value that conforms to the standard E.164 format."
+scalar PhoneNumber
+
 "The `Short` scalar type represents a signed 16-bit integer."
 scalar Short
   @specifiedBy(url: "https://scalars.graphql.org/chillicream/short.html")
diff --git a/frontend/codegen.ts b/frontend/codegen.ts
index adbb0ca1b..550e6b6eb 100644
--- a/frontend/codegen.ts
+++ b/frontend/codegen.ts
@@ -11,12 +11,14 @@ const scalars = {
   DateTimeZone: "string",
   Decimal: "string",
   Duration: "string",
+  EmailAddress: "string",
   LocalDate: "string",
   LocalDateTime: "string",
   LocalTime: "string",
   Locale: "string",
   Long: "number",
   NonNegativeInt: "number",
+  PhoneNumber: "string",
   Short: "number",
   TimeSpan: "string",
   UnsignedByte: "number",
diff --git a/frontend/components/institutions/CreateInstitution.tsx b/frontend/components/institutions/CreateInstitution.tsx
index 278aeda57..24f638cdd 100644
--- a/frontend/components/institutions/CreateInstitution.tsx
+++ b/frontend/components/institutions/CreateInstitution.tsx
@@ -18,9 +18,9 @@ import UserIdSelect from "../users/UserIdSelect";
 import { createPaginatedIdSelectOption } from "../PaginatedIdSelect";
 
 type ContactFormValues = {
-  phoneNumber: string | null | undefined;
+  phoneNumber: Scalars["PhoneNumber"]["input"] | null | undefined;
   postalAddress: string | null | undefined;
-  emailAddress: string | null | undefined;
+  emailAddress: Scalars["EmailAddress"]["input"] | null | undefined;
   websiteLocator: string | null | undefined;
 };
 
diff --git a/frontend/components/institutions/UpdateInstitution.tsx b/frontend/components/institutions/UpdateInstitution.tsx
index b6b6d38b1..532d82bb8 100644
--- a/frontend/components/institutions/UpdateInstitution.tsx
+++ b/frontend/components/institutions/UpdateInstitution.tsx
@@ -10,11 +10,12 @@ import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 import EditButton from "../EditButton";
+import { Scalars } from "../../__generated__/graphql";
 
 type ContactFormValues = {
-  phoneNumber: string | null | undefined;
+  phoneNumber: Scalars["PhoneNumber"]["input"] | null | undefined;
   postalAddress: string | null | undefined;
-  emailAddress: string | null | undefined;
+  emailAddress: Scalars["EmailAddress"]["input"] | null | undefined;
   websiteLocator: string | null | undefined;
 };
 
diff --git a/frontend/components/me/ChangeUserEmail.tsx b/frontend/components/me/ChangeUserEmail.tsx
index 7b9df8e20..ac81759ca 100644
--- a/frontend/components/me/ChangeUserEmail.tsx
+++ b/frontend/components/me/ChangeUserEmail.tsx
@@ -8,9 +8,10 @@ import {
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../../components/ErrorAlert";
+import { Scalars } from "../../__generated__/graphql";
 
 interface FormValues {
-  newEmail: string;
+  newEmail: Scalars["EmailAddress"]["input"];
 }
 
 export default function ChangeUserEmail() {
diff --git a/frontend/components/me/SetUserPhoneNumber.tsx b/frontend/components/me/SetUserPhoneNumber.tsx
index 7a493f2d8..12678d4fe 100644
--- a/frontend/components/me/SetUserPhoneNumber.tsx
+++ b/frontend/components/me/SetUserPhoneNumber.tsx
@@ -8,13 +8,14 @@ import {
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
+import { Scalars } from "../../__generated__/graphql";
 
 interface FormValues {
-  phoneNumber: string;
+  phoneNumber: Scalars["PhoneNumber"]["input"];
 }
 
 interface SetUserPhoneNumberProps {
-  phoneNumber: string | null | undefined;
+  phoneNumber: Scalars["PhoneNumber"]["input"] | null | undefined;
 }
 
 export default function SetUserPhoneNumber({
diff --git a/frontend/pages/users/forgot-password.tsx b/frontend/pages/users/forgot-password.tsx
index f4b72166f..fec864d97 100644
--- a/frontend/pages/users/forgot-password.tsx
+++ b/frontend/pages/users/forgot-password.tsx
@@ -12,9 +12,10 @@ import paths from "../../paths";
 import { useRouter } from "next/router";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../../components/ErrorAlert";
+import { Scalars } from "../../__generated__/graphql";
 
 interface FormValues {
-  email: string;
+  email: Scalars["EmailAddress"]["input"];
 }
 
 function Page() {
diff --git a/frontend/pages/users/login/index.tsx b/frontend/pages/users/login/index.tsx
index 07417454e..0ada78969 100644
--- a/frontend/pages/users/login/index.tsx
+++ b/frontend/pages/users/login/index.tsx
@@ -14,9 +14,10 @@ import { isLocalUrl } from "../../../lib/url";
 import { useMutationHandler } from "../../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../../../components/ErrorAlert";
 import { useState } from "react";
+import { Scalars } from "../../../__generated__/graphql";
 
 type FormValues = {
-  email: string;
+  email: Scalars["EmailAddress"]["input"];
   password: string;
 };
 
diff --git a/frontend/pages/users/register.tsx b/frontend/pages/users/register.tsx
index adeaabd0c..98d061006 100644
--- a/frontend/pages/users/register.tsx
+++ b/frontend/pages/users/register.tsx
@@ -13,10 +13,11 @@ import Link from "next/link";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../../components/ErrorAlert";
+import { Scalars } from "../../__generated__/graphql";
 
 interface FormValues {
   name: string;
-  email: string;
+  email: Scalars["EmailAddress"]["input"];
   password: string;
   passwordConfirmation: string;
 }
diff --git a/frontend/pages/users/resend-email-confirmation.tsx b/frontend/pages/users/resend-email-confirmation.tsx
index 30bd21ddd..8b73a9271 100644
--- a/frontend/pages/users/resend-email-confirmation.tsx
+++ b/frontend/pages/users/resend-email-confirmation.tsx
@@ -11,9 +11,10 @@ import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../../components/ErrorAlert";
 import SingleSignOnLayout from "../../components/SingleSignOnLayout";
+import { Scalars } from "../../__generated__/graphql";
 
 interface FormValues {
-  email: string;
+  email: Scalars["EmailAddress"]["input"];
 }
 
 export default function Page() {
diff --git a/frontend/pages/users/reset-password.tsx b/frontend/pages/users/reset-password.tsx
index e54975969..aa6c5cb46 100644
--- a/frontend/pages/users/reset-password.tsx
+++ b/frontend/pages/users/reset-password.tsx
@@ -11,9 +11,10 @@ import { useState } from "react";
 import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../../components/ErrorAlert";
+import { Scalars } from "../../__generated__/graphql";
 
 interface FormValues {
-  email: string;
+  email: Scalars["EmailAddress"]["input"];
   password: string;
   passwordConfirmation: string;
 }
diff --git a/frontend/type-defs.graphqls b/frontend/type-defs.graphqls
index 12e8f52e1..1c70d702e 100644
--- a/frontend/type-defs.graphqls
+++ b/frontend/type-defs.graphqls
@@ -72,8 +72,11 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  calorimetricData(databaseId: Uuid!, id: Uuid!, locale: String): CalorimetricData
-    @cost(weight: "10")
+  calorimetricData(
+    databaseId: Uuid!
+    id: Uuid!
+    locale: String
+  ): CalorimetricData @cost(weight: "10")
   component(id: Uuid!): Component @cost(weight: "10")
   components(
     "Returns the elements in the list that come after the specified cursor."
@@ -164,20 +167,33 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  hasCalorimetricData(locale: String, where: CalorimetricDataPropositionInput): Boolean!
-    @cost(weight: "10")
-  hasGeometricData(locale: String, where: GeometricDataPropositionInput): Boolean!
-    @cost(weight: "10")
-  hasHygrothermalData(locale: String, where: HygrothermalDataPropositionInput): Boolean!
-    @cost(weight: "10")
-  hasLifeCycleData(locale: String, where: LifeCycleDataPropositionInput): Boolean!
-    @cost(weight: "10")
+  hasCalorimetricData(
+    locale: String
+    where: CalorimetricDataPropositionInput
+  ): Boolean! @cost(weight: "10")
+  hasGeometricData(
+    locale: String
+    where: GeometricDataPropositionInput
+  ): Boolean! @cost(weight: "10")
+  hasHygrothermalData(
+    locale: String
+    where: HygrothermalDataPropositionInput
+  ): Boolean! @cost(weight: "10")
+  hasLifeCycleData(
+    locale: String
+    where: LifeCycleDataPropositionInput
+  ): Boolean! @cost(weight: "10")
   hasOpticalData(locale: String, where: OpticalDataPropositionInput): Boolean!
     @cost(weight: "10")
-  hasPhotovoltaicData(locale: String, where: PhotovoltaicDataPropositionInput): Boolean!
-    @cost(weight: "10")
-  hygrothermalData(databaseId: Uuid!, id: Uuid!, locale: String): HygrothermalData
-    @cost(weight: "10")
+  hasPhotovoltaicData(
+    locale: String
+    where: PhotovoltaicDataPropositionInput
+  ): Boolean! @cost(weight: "10")
+  hygrothermalData(
+    databaseId: Uuid!
+    id: Uuid!
+    locale: String
+  ): HygrothermalData @cost(weight: "10")
   institution(id: Uuid!): Institution @cost(weight: "10")
   institutions(
     "Returns the elements in the list that come after the specified cursor."
@@ -228,8 +244,9 @@ type Query {
   nodes("The list of node IDs." ids: [ID!]!): [Node]! @cost(weight: "10")
   openIdConnectApplication(id: Uuid!): OpenIdConnectApplication
     @cost(weight: "10")
-  openIdConnectApplicationByClientId(clientId: String!): OpenIdConnectApplication
-    @cost(weight: "10")
+  openIdConnectApplicationByClientId(
+    clientId: String!
+  ): OpenIdConnectApplication @cost(weight: "10")
   openIdConnectApplications(
     "Returns the elements in the list that come after the specified cursor."
     after: String
@@ -335,8 +352,11 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  photovoltaicData(databaseId: Uuid!, id: Uuid!, locale: String): PhotovoltaicData
-    @cost(weight: "10")
+  photovoltaicData(
+    databaseId: Uuid!
+    id: Uuid!
+    locale: String
+  ): PhotovoltaicData @cost(weight: "10")
   user(id: Uuid!): User @cost(weight: "10")
   users(
     "Returns the elements in the list that come after the specified cursor."
@@ -361,34 +381,45 @@ type Query {
 }
 
 type Mutation {
-  addComponentAssembly(input: AddComponentAssemblyInput!): AddComponentAssemblyPayload!
-    @cost(weight: "10")
-  addComponentGeneralization(input: AddComponentGeneralizationInput!): AddComponentGeneralizationPayload!
-    @cost(weight: "10")
-  addComponentManufacturer(input: AddComponentManufacturerInput!): AddComponentManufacturerPayload!
-    @cost(weight: "10")
-  addComponentVariant(input: AddComponentVariantInput!): AddComponentVariantPayload!
-    @cost(weight: "10")
-  addGnuPgKeyFingerprint(input: AddGnuPgKeyFingerprintInput!): AddGnuPgKeyFingerprintPayload!
-    @cost(weight: "10")
-  addInstitutionMethodDeveloper(input: AddInstitutionMethodDeveloperInput!): AddInstitutionMethodDeveloperPayload!
-    @cost(weight: "10")
-  addInstitutionRepresentative(input: AddInstitutionRepresentativeInput!): AddInstitutionRepresentativePayload!
-    @cost(weight: "10")
-  addUserMethodDeveloper(input: AddUserMethodDeveloperInput!): AddUserMethodDeveloperPayload!
-    @cost(weight: "10")
+  addComponentAssembly(
+    input: AddComponentAssemblyInput!
+  ): AddComponentAssemblyPayload! @cost(weight: "10")
+  addComponentGeneralization(
+    input: AddComponentGeneralizationInput!
+  ): AddComponentGeneralizationPayload! @cost(weight: "10")
+  addComponentManufacturer(
+    input: AddComponentManufacturerInput!
+  ): AddComponentManufacturerPayload! @cost(weight: "10")
+  addComponentVariant(
+    input: AddComponentVariantInput!
+  ): AddComponentVariantPayload! @cost(weight: "10")
+  addGnuPgKeyFingerprint(
+    input: AddGnuPgKeyFingerprintInput!
+  ): AddGnuPgKeyFingerprintPayload! @cost(weight: "10")
+  addInstitutionMethodDeveloper(
+    input: AddInstitutionMethodDeveloperInput!
+  ): AddInstitutionMethodDeveloperPayload! @cost(weight: "10")
+  addInstitutionRepresentative(
+    input: AddInstitutionRepresentativeInput!
+  ): AddInstitutionRepresentativePayload! @cost(weight: "10")
+  addUserMethodDeveloper(
+    input: AddUserMethodDeveloperInput!
+  ): AddUserMethodDeveloperPayload! @cost(weight: "10")
   addUserRole(input: AddUserRoleInput!): AddUserRolePayload! @cost(weight: "10")
-  allowGnuPgKeyFingerprint(input: AllowGnuPgKeyFingerprintInput!): AllowGnuPgKeyFingerprintPayload!
-    @cost(weight: "10")
+  allowGnuPgKeyFingerprint(
+    input: AllowGnuPgKeyFingerprintInput!
+  ): AllowGnuPgKeyFingerprintPayload! @cost(weight: "10")
   changeInstitutionRepresentativeRole(
     input: ChangeInstitutionRepresentativeRoleInput!
   ): ChangeInstitutionRepresentativeRolePayload! @cost(weight: "10")
   changeUserEmail(input: ChangeUserEmailInput!): ChangeUserEmailPayload!
     @cost(weight: "10")
-  changeUserPassword(input: ChangeUserPasswordInput!): ChangeUserPasswordPayload!
-    @cost(weight: "10")
-  confirmComponentManufacturer(input: ConfirmComponentManufacturerInput!): ConfirmComponentManufacturerPayload!
-    @cost(weight: "10")
+  changeUserPassword(
+    input: ChangeUserPasswordInput!
+  ): ChangeUserPasswordPayload! @cost(weight: "10")
+  confirmComponentManufacturer(
+    input: ConfirmComponentManufacturerInput!
+  ): ConfirmComponentManufacturerPayload! @cost(weight: "10")
   confirmInstitutionMethodDeveloper(
     input: ConfirmInstitutionMethodDeveloperInput!
   ): ConfirmInstitutionMethodDeveloperPayload! @cost(weight: "10")
@@ -397,10 +428,12 @@ type Mutation {
   ): ConfirmInstitutionRepresentativePayload! @cost(weight: "10")
   confirmUserEmail(input: ConfirmUserEmailInput!): ConfirmUserEmailPayload!
     @cost(weight: "10")
-  confirmUserEmailChange(input: ConfirmUserEmailChangeInput!): ConfirmUserEmailChangePayload!
-    @cost(weight: "10")
-  confirmUserMethodDeveloper(input: ConfirmUserMethodDeveloperInput!): ConfirmUserMethodDeveloperPayload!
-    @cost(weight: "10")
+  confirmUserEmailChange(
+    input: ConfirmUserEmailChangeInput!
+  ): ConfirmUserEmailChangePayload! @cost(weight: "10")
+  confirmUserMethodDeveloper(
+    input: ConfirmUserMethodDeveloperInput!
+  ): ConfirmUserMethodDeveloperPayload! @cost(weight: "10")
   createComponent(input: CreateComponentInput!): CreateComponentPayload!
     @cost(weight: "10")
   createDatabase(input: CreateDatabaseInput!): CreateDatabasePayload!
@@ -411,25 +444,29 @@ type Mutation {
     @cost(weight: "10")
   createMethod(input: CreateMethodInput!): CreateMethodPayload!
     @cost(weight: "10")
-  createOpenIdConnectApplication(input: CreateOpenIdConnectApplicationInput!): CreateOpenIdConnectApplicationPayload!
-    @cost(weight: "10")
+  createOpenIdConnectApplication(
+    input: CreateOpenIdConnectApplicationInput!
+  ): CreateOpenIdConnectApplicationPayload! @cost(weight: "10")
   deleteInstitution(input: DeleteInstitutionInput!): DeleteInstitutionPayload!
     @cost(weight: "10")
-  deleteOpenIdConnectApplication(input: DeleteOpenIdConnectApplicationInput!): DeleteOpenIdConnectApplicationPayload!
-    @cost(weight: "10")
+  deleteOpenIdConnectApplication(
+    input: DeleteOpenIdConnectApplicationInput!
+  ): DeleteOpenIdConnectApplicationPayload! @cost(weight: "10")
   deleteOpenIdConnectAuthorization(
     input: DeleteOpenIdConnectAuthorizationInput!
   ): DeleteOpenIdConnectAuthorizationPayload! @cost(weight: "10")
-  deletePersonalUserData(input: DeletePersonalUserDataInput!): DeletePersonalUserDataPayload!
-    @cost(weight: "10")
+  deletePersonalUserData(
+    input: DeletePersonalUserDataInput!
+  ): DeletePersonalUserDataPayload! @cost(weight: "10")
   deleteUser(input: DeleteUserInput!): DeleteUserPayload! @cost(weight: "10")
   disableUserTwoFactorAuthentication: DisableUserTwoFactorAuthenticationPayload!
     @cost(weight: "10")
   enableUserTwoFactorAuthenticator(
     input: EnableUserTwoFactorAuthenticatorInput!
   ): EnableUserTwoFactorAuthenticatorPayload! @cost(weight: "10")
-  forbidGnuPgKeyFingerprint(input: ForbidGnuPgKeyFingerprintInput!): ForbidGnuPgKeyFingerprintPayload!
-    @cost(weight: "10")
+  forbidGnuPgKeyFingerprint(
+    input: ForbidGnuPgKeyFingerprintInput!
+  ): ForbidGnuPgKeyFingerprintPayload! @cost(weight: "10")
   forgetUserTwoFactorAuthenticationClient: ForgetUserTwoFactorAuthenticationClientPayload!
     @cost(weight: "10")
   generateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri: GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUriPayload!
@@ -437,34 +474,44 @@ type Mutation {
   generateUserTwoFactorRecoveryCodes: GenerateUserTwoFactorRecoveryCodesPayload!
     @cost(weight: "10")
   loginUser(input: LoginUserInput!): LoginUserPayload! @cost(weight: "10")
-  loginUserWithRecoveryCode(input: LoginUserWithRecoveryCodeInput!): LoginUserWithRecoveryCodePayload!
-    @cost(weight: "10")
-  loginUserWithTwoFactorCode(input: LoginUserWithTwoFactorCodeInput!): LoginUserWithTwoFactorCodePayload!
-    @cost(weight: "10")
+  loginUserWithRecoveryCode(
+    input: LoginUserWithRecoveryCodeInput!
+  ): LoginUserWithRecoveryCodePayload! @cost(weight: "10")
+  loginUserWithTwoFactorCode(
+    input: LoginUserWithTwoFactorCodeInput!
+  ): LoginUserWithTwoFactorCodePayload! @cost(weight: "10")
   logoutUser: LogoutUserPayload! @cost(weight: "10")
   registerUser(input: RegisterUserInput!): RegisterUserPayload!
     @cost(weight: "10")
-  removeComponentAssembly(input: RemoveComponentAssemblyInput!): RemoveComponentAssemblyPayload!
-    @cost(weight: "10")
-  removeComponentGeneralization(input: RemoveComponentGeneralizationInput!): RemoveComponentGeneralizationPayload!
-    @cost(weight: "10")
-  removeComponentManufacturer(input: RemoveComponentManufacturerInput!): RemoveComponentManufacturerPayload!
-    @cost(weight: "10")
-  removeComponentVariant(input: RemoveComponentVariantInput!): RemoveComponentVariantPayload!
-    @cost(weight: "10")
+  removeComponentAssembly(
+    input: RemoveComponentAssemblyInput!
+  ): RemoveComponentAssemblyPayload! @cost(weight: "10")
+  removeComponentGeneralization(
+    input: RemoveComponentGeneralizationInput!
+  ): RemoveComponentGeneralizationPayload! @cost(weight: "10")
+  removeComponentManufacturer(
+    input: RemoveComponentManufacturerInput!
+  ): RemoveComponentManufacturerPayload! @cost(weight: "10")
+  removeComponentVariant(
+    input: RemoveComponentVariantInput!
+  ): RemoveComponentVariantPayload! @cost(weight: "10")
   removeInstitutionMethodDeveloper(
     input: RemoveInstitutionMethodDeveloperInput!
   ): RemoveInstitutionMethodDeveloperPayload! @cost(weight: "10")
-  removeInstitutionRepresentative(input: RemoveInstitutionRepresentativeInput!): RemoveInstitutionRepresentativePayload!
-    @cost(weight: "10")
-  removeUserMethodDeveloper(input: RemoveUserMethodDeveloperInput!): RemoveUserMethodDeveloperPayload!
-    @cost(weight: "10")
+  removeInstitutionRepresentative(
+    input: RemoveInstitutionRepresentativeInput!
+  ): RemoveInstitutionRepresentativePayload! @cost(weight: "10")
+  removeUserMethodDeveloper(
+    input: RemoveUserMethodDeveloperInput!
+  ): RemoveUserMethodDeveloperPayload! @cost(weight: "10")
   removeUserRole(input: RemoveUserRoleInput!): RemoveUserRolePayload!
     @cost(weight: "10")
-  requestUserPasswordReset(input: RequestUserPasswordResetInput!): RequestUserPasswordResetPayload!
-    @cost(weight: "10")
-  resendUserEmailConfirmation(input: ResendUserEmailConfirmationInput!): ResendUserEmailConfirmationPayload!
-    @cost(weight: "10")
+  requestUserPasswordReset(
+    input: RequestUserPasswordResetInput!
+  ): RequestUserPasswordResetPayload! @cost(weight: "10")
+  resendUserEmailConfirmation(
+    input: ResendUserEmailConfirmationInput!
+  ): ResendUserEmailConfirmationPayload! @cost(weight: "10")
   resendUserEmailVerification: ResendUserEmailVerificationPayload!
     @cost(weight: "10")
   resetOpenIdConnectApplicationClientSecret(
@@ -474,22 +521,28 @@ type Mutation {
     @cost(weight: "10")
   resetUserTwoFactorAuthenticator: ResetUserTwoFactorAuthenticatorPayload!
     @cost(weight: "10")
-  revokeOpenIdConnectToken(input: RevokeOpenIdConnectTokenInput!): RevokeOpenIdConnectTokenPayload!
-    @cost(weight: "10")
-  setComponentExtras(input: SetComponentExtrasInput!): SetComponentExtrasPayload!
-    @cost(weight: "10")
-  setInstitutionExtras(input: SetInstitutionExtrasInput!): SetInstitutionExtrasPayload!
-    @cost(weight: "10")
+  revokeOpenIdConnectToken(
+    input: RevokeOpenIdConnectTokenInput!
+  ): RevokeOpenIdConnectTokenPayload! @cost(weight: "10")
+  setComponentExtras(
+    input: SetComponentExtrasInput!
+  ): SetComponentExtrasPayload! @cost(weight: "10")
+  setInstitutionExtras(
+    input: SetInstitutionExtrasInput!
+  ): SetInstitutionExtrasPayload! @cost(weight: "10")
   setUserPassword(input: SetUserPasswordInput!): SetUserPasswordPayload!
     @cost(weight: "10")
-  setUserPhoneNumber(input: SetUserPhoneNumberInput!): SetUserPhoneNumberPayload!
-    @cost(weight: "10")
-  switchInstitutionOperatingState(input: SwitchInstitutionOperatingStateInput!): SwitchInstitutionOperatingStatePayload!
-    @cost(weight: "10")
+  setUserPhoneNumber(
+    input: SetUserPhoneNumberInput!
+  ): SetUserPhoneNumberPayload! @cost(weight: "10")
+  switchInstitutionOperatingState(
+    input: SwitchInstitutionOperatingStateInput!
+  ): SwitchInstitutionOperatingStatePayload! @cost(weight: "10")
   updateComponent(input: UpdateComponentInput!): UpdateComponentPayload!
     @cost(weight: "10")
-  updateComponentAssembly(input: UpdateComponentAssemblyInput!): UpdateComponentAssemblyPayload!
-    @cost(weight: "10")
+  updateComponentAssembly(
+    input: UpdateComponentAssemblyInput!
+  ): UpdateComponentAssemblyPayload! @cost(weight: "10")
   updateDatabase(input: UpdateDatabaseInput!): UpdateDatabasePayload!
     @cost(weight: "10")
   updateDataFormat(input: UpdateDataFormatInput!): UpdateDataFormatPayload!
@@ -498,8 +551,9 @@ type Mutation {
     @cost(weight: "10")
   updateMethod(input: UpdateMethodInput!): UpdateMethodPayload!
     @cost(weight: "10")
-  updateOpenIdConnectApplication(input: UpdateOpenIdConnectApplicationInput!): UpdateOpenIdConnectApplicationPayload!
-    @cost(weight: "10")
+  updateOpenIdConnectApplication(
+    input: UpdateOpenIdConnectApplicationInput!
+  ): UpdateOpenIdConnectApplicationPayload! @cost(weight: "10")
   verifyDatabase(input: VerifyDatabaseInput!): VerifyDatabasePayload!
     @cost(weight: "10")
   verifyInstitution(input: VerifyInstitutionInput!): VerifyInstitutionPayload!
@@ -953,10 +1007,10 @@ type ConfirmUserMethodDeveloperPayload {
 }
 
 type ContactInformation {
-  emailAddress: String
+  emailAddress: EmailAddress
   isEmailAddressConfirmed: Boolean!
   isPhoneNumberConfirmed: Boolean!
-  phoneNumber: String
+  phoneNumber: PhoneNumber
   postalAddress: String
   websiteLocator: Url
 }
@@ -1109,20 +1163,33 @@ type Database implements Node {
   data(id: Uuid!, kind: DataKind!, locale: Locale): Data @cost(weight: "10")
   description: String!
   geometricData(id: Uuid!, locale: Locale): GeometricData @cost(weight: "10")
-  hasCalorimetricData(locale: Locale, where: CalorimetricDataPropositionInput): Boolean
-    @cost(weight: "10")
-  hasData(kind: DataKind!, locale: Locale, where: DataPropositionInput): Boolean
-    @cost(weight: "10")
-  hasGeometricData(locale: Locale, where: GeometricDataPropositionInput): Boolean
-    @cost(weight: "10")
-  hasHygrothermalData(locale: Locale, where: HygrothermalDataPropositionInput): Boolean
-    @cost(weight: "10")
-  hasLifeCycleData(locale: Locale, where: LifeCycleDataPropositionInput): Boolean
-    @cost(weight: "10")
+  hasCalorimetricData(
+    locale: Locale
+    where: CalorimetricDataPropositionInput
+  ): Boolean @cost(weight: "10")
+  hasData(
+    kind: DataKind!
+    locale: Locale
+    where: DataPropositionInput
+  ): Boolean @cost(weight: "10")
+  hasGeometricData(
+    locale: Locale
+    where: GeometricDataPropositionInput
+  ): Boolean @cost(weight: "10")
+  hasHygrothermalData(
+    locale: Locale
+    where: HygrothermalDataPropositionInput
+  ): Boolean @cost(weight: "10")
+  hasLifeCycleData(
+    locale: Locale
+    where: LifeCycleDataPropositionInput
+  ): Boolean @cost(weight: "10")
   hasOpticalData(locale: Locale, where: OpticalDataPropositionInput): Boolean
     @cost(weight: "10")
-  hasPhotovoltaicData(locale: Locale, where: PhotovoltaicDataPropositionInput): Boolean
-    @cost(weight: "10")
+  hasPhotovoltaicData(
+    locale: Locale
+    where: PhotovoltaicDataPropositionInput
+  ): Boolean @cost(weight: "10")
   hygrothermalData(id: Uuid!, locale: Locale): HygrothermalData
     @cost(weight: "10")
   id: ID!
@@ -1585,8 +1652,10 @@ type Institution implements Node {
   ): InstitutionManufacturedComponentConnection! @cost(weight: "10")
   name: String!
   openIdConnectApplications(
-    order: [InstitutionOwnedOpenIdConnectApplicationSortInput!] @cost(weight: "10")
-    where: InstitutionOwnedOpenIdConnectApplicationFilterInput @cost(weight: "10")
+    order: [InstitutionOwnedOpenIdConnectApplicationSortInput!]
+      @cost(weight: "10")
+    where: InstitutionOwnedOpenIdConnectApplicationFilterInput
+      @cost(weight: "10")
   ): InstitutionOwnedOpenIdConnectApplicationConnection! @cost(weight: "10")
   operatedDatabases(
     order: [InstitutionOperatedDatabaseSortInput!] @cost(weight: "10")
@@ -2947,7 +3016,7 @@ input ChangeInstitutionRepresentativeRoleInput {
 }
 
 input ChangeUserEmailInput {
-  newEmail: String!
+  newEmail: EmailAddress!
 }
 
 input ChangeUserPasswordInput {
@@ -3134,13 +3203,13 @@ input ConfirmInstitutionRepresentativeInput {
 
 input ConfirmUserEmailChangeInput {
   confirmationCode: String!
-  currentEmail: String!
-  newEmail: String!
+  currentEmail: EmailAddress!
+  newEmail: EmailAddress!
 }
 
 input ConfirmUserEmailInput {
   confirmationCode: String!
-  email: String!
+  email: EmailAddress!
 }
 
 input ConfirmUserMethodDeveloperInput {
@@ -3160,8 +3229,8 @@ input ContactInformationFilterInput {
 }
 
 input ContactInformationInput {
-  emailAddress: String
-  phoneNumber: String
+  emailAddress: EmailAddress
+  phoneNumber: PhoneNumber
   postalAddress: String
   websiteLocator: Url
 }
@@ -3919,7 +3988,7 @@ input LocalTimeFilterInput {
 }
 
 input LoginUserInput {
-  email: String!
+  email: EmailAddress!
   password: String!
 }
 
@@ -4010,6 +4079,21 @@ input MethodSourceInput {
   name: String!
 }
 
+input NonNegativeIntFilterInput {
+  equalTo: NonNegativeInt @cost(weight: "10")
+  greaterThan: NonNegativeInt @cost(weight: "10")
+  greaterThanOrEqualTo: NonNegativeInt @cost(weight: "10")
+  in: [NonNegativeInt] @cost(weight: "10")
+  lessThan: NonNegativeInt @cost(weight: "10")
+  lessThanOrEqualTo: NonNegativeInt @cost(weight: "10")
+  notEqualTo: NonNegativeInt @cost(weight: "10")
+  notGreaterThan: NonNegativeInt @cost(weight: "10")
+  notGreaterThanOrEqualTo: NonNegativeInt @cost(weight: "10")
+  notIn: [NonNegativeInt] @cost(weight: "10")
+  notLessThan: NonNegativeInt @cost(weight: "10")
+  notLessThanOrEqualTo: NonNegativeInt @cost(weight: "10")
+}
+
 input NullableOfPrimeSurfaceFilterInput {
   equalTo: PrimeSurface @cost(weight: "10")
   in: [PrimeSurface] @cost(weight: "10")
@@ -4156,7 +4240,7 @@ input ReferenceInput {
 }
 
 input RegisterUserInput {
-  email: String!
+  email: EmailAddress!
   name: String!
   password: String!
   passwordConfirmation: String!
@@ -4204,12 +4288,12 @@ input RemoveUserRoleInput {
 }
 
 input RequestUserPasswordResetInput {
-  email: String!
+  email: EmailAddress!
   returnTo: Url
 }
 
 input ResendUserEmailConfirmationInput {
-  email: String!
+  email: EmailAddress!
 }
 
 input ResetOpenIdConnectApplicationClientSecretInput {
@@ -4217,7 +4301,7 @@ input ResetOpenIdConnectApplicationClientSecretInput {
 }
 
 input ResetUserPasswordInput {
-  email: String!
+  email: EmailAddress!
   password: String!
   passwordConfirmation: String!
   resetCode: String!
@@ -4243,7 +4327,7 @@ input SetUserPasswordInput {
 }
 
 input SetUserPhoneNumberInput {
-  phoneNumber: String!
+  phoneNumber: PhoneNumber!
 }
 
 input ShortFilterInput {
@@ -5238,6 +5322,9 @@ scalar Decimal
 scalar Duration
   @specifiedBy(url: "https://scalars.graphql.org/chillicream/duration.html")
 
+"The EmailAddress scalar type constitutes a valid email address, represented as a UTF-8 character sequence. The scalar follows the specification defined by the HTML Spec https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address."
+scalar EmailAddress
+
 "The `LocalDate` scalar type represents a date without time or time zone information."
 scalar LocalDate
   @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-date.html")
@@ -5262,6 +5349,9 @@ scalar Long
 "The `NonNegativeInt` scalar type represents an unsigned 32-bit numeric non-fractional value."
 scalar NonNegativeInt
 
+"The PhoneNumber scalar type represents a value that conforms to the standard E.164 format."
+scalar PhoneNumber
+
 "The `Short` scalar type represents a signed 16-bit integer."
 scalar Short
   @specifiedBy(url: "https://scalars.graphql.org/chillicream/short.html")
@@ -5282,13 +5372,7 @@ scalar Uuid
 directive @cost(
   "The `weight` argument defines what value to add to the overall cost for every appearance, or possible appearance, of a type, field, argument, etc."
   weight: String!
-) on
-  | SCALAR
-  | OBJECT
-  | FIELD_DEFINITION
-  | ARGUMENT_DEFINITION
-  | ENUM
-  | INPUT_FIELD_DEFINITION
+) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM | INPUT_FIELD_DEFINITION
 
 "The purpose of the `@listSize` directive is to either inform the static analysis about the size of returned lists (if that information is statically available), or to point the analysis to where to find that information."
 directive @listSize(
@@ -5302,4 +5386,5 @@ directive @listSize(
   slicingArgumentDefaultValue: Int
   "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments."
   slicingArguments: [String!]
-) on FIELD_DEFINITION
\ No newline at end of file
+) on FIELD_DEFINITION
+

From 8775f575525df84dd9935a51de254f679ec6fede Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 12 Jun 2026 23:40:34 +0200
Subject: [PATCH 080/145] Fail validation if string inputs contain only
 whitespace characters

---
 frontend/components/ReferenceSubform.tsx           |  6 ++++++
 frontend/components/components/CreateComponent.tsx |  6 ++++++
 frontend/components/components/UpdateComponent.tsx |  6 ++++++
 .../components/dataFormats/CreateDataFormat.tsx    |  9 +++++++++
 .../components/dataFormats/UpdateDataFormat.tsx    |  9 +++++++++
 frontend/components/databases/CreateDatabase.tsx   |  6 ++++++
 frontend/components/databases/UpdateDatabase.tsx   |  6 ++++++
 .../gnuPgKeys/AddGnuPgKeyFingerprint.tsx           |  3 +++
 .../components/institutions/CreateInstitution.tsx  |  6 ++++++
 .../components/institutions/UpdateInstitution.tsx  |  6 ++++++
 .../me/EnableUserTwoFactorAuthenticator.tsx        |  3 +++
 frontend/components/me/SetUserPhoneNumber.tsx      |  3 +++
 frontend/components/methods/CreateMethod.tsx       |  6 ++++++
 .../components/methods/MethodParametersSubform.tsx |  3 +++
 .../components/methods/MethodSourcesSubform.tsx    |  3 +++
 frontend/components/methods/UpdateMethod.tsx       |  6 ++++++
 .../CreateOpenIdConnectApplication.tsx             | 14 ++++++++++++--
 .../UpdateOpenIdConnectApplication.tsx             | 14 ++++++++++++--
 frontend/pages/users/login/with-recovery-code.tsx  |  3 +++
 .../pages/users/login/with-two-factor-code.tsx     |  3 +++
 frontend/pages/users/register.tsx                  |  3 +++
 21 files changed, 120 insertions(+), 4 deletions(-)

diff --git a/frontend/components/ReferenceSubform.tsx b/frontend/components/ReferenceSubform.tsx
index f07a0a697..9352924d4 100644
--- a/frontend/components/ReferenceSubform.tsx
+++ b/frontend/components/ReferenceSubform.tsx
@@ -224,6 +224,9 @@ export default function ReferenceSubform({
                           {
                             required: true,
                           },
+                          {
+                            whitespace: true,
+                          },
                         ]}
                       >
                         <Input style={{ width: "100%" }} />
@@ -296,6 +299,9 @@ export default function ReferenceSubform({
                   {
                     required: true,
                   },
+                  {
+                    whitespace: true,
+                  },
                 ]}
               >
                 <Input placeholder="Main Number" />
diff --git a/frontend/components/components/CreateComponent.tsx b/frontend/components/components/CreateComponent.tsx
index 212ac3886..aabaccfef 100644
--- a/frontend/components/components/CreateComponent.tsx
+++ b/frontend/components/components/CreateComponent.tsx
@@ -175,6 +175,9 @@ export default function CreateComponent({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input />
@@ -189,6 +192,9 @@ export default function CreateComponent({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input />
diff --git a/frontend/components/components/UpdateComponent.tsx b/frontend/components/components/UpdateComponent.tsx
index 823ca68db..24bea0763 100644
--- a/frontend/components/components/UpdateComponent.tsx
+++ b/frontend/components/components/UpdateComponent.tsx
@@ -138,6 +138,9 @@ export default function UpdateComponent({ component }: UpdateComponentProps) {
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
             initialValue={component.name}
           >
@@ -157,6 +160,9 @@ export default function UpdateComponent({ component }: UpdateComponentProps) {
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
             initialValue={component.description}
           >
diff --git a/frontend/components/dataFormats/CreateDataFormat.tsx b/frontend/components/dataFormats/CreateDataFormat.tsx
index 38b65fd4e..64f6b3d6a 100644
--- a/frontend/components/dataFormats/CreateDataFormat.tsx
+++ b/frontend/components/dataFormats/CreateDataFormat.tsx
@@ -144,6 +144,9 @@ export default function CreateDataFormat({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input />
@@ -166,6 +169,9 @@ export default function CreateDataFormat({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input />
@@ -177,6 +183,9 @@ export default function CreateDataFormat({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input />
diff --git a/frontend/components/dataFormats/UpdateDataFormat.tsx b/frontend/components/dataFormats/UpdateDataFormat.tsx
index 658070efd..d27fee169 100644
--- a/frontend/components/dataFormats/UpdateDataFormat.tsx
+++ b/frontend/components/dataFormats/UpdateDataFormat.tsx
@@ -113,6 +113,9 @@ export default function UpdateDataFormat({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
             initialValue={dataFormat.name}
           >
@@ -137,6 +140,9 @@ export default function UpdateDataFormat({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
             initialValue={dataFormat.description}
           >
@@ -149,6 +155,9 @@ export default function UpdateDataFormat({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
             initialValue={dataFormat.mediaType}
           >
diff --git a/frontend/components/databases/CreateDatabase.tsx b/frontend/components/databases/CreateDatabase.tsx
index cb49f18cc..f929b9813 100644
--- a/frontend/components/databases/CreateDatabase.tsx
+++ b/frontend/components/databases/CreateDatabase.tsx
@@ -127,6 +127,9 @@ export default function CreateDatabase({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input />
@@ -138,6 +141,9 @@ export default function CreateDatabase({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input />
diff --git a/frontend/components/databases/UpdateDatabase.tsx b/frontend/components/databases/UpdateDatabase.tsx
index 9417ea6d5..8d0c07f85 100644
--- a/frontend/components/databases/UpdateDatabase.tsx
+++ b/frontend/components/databases/UpdateDatabase.tsx
@@ -95,6 +95,9 @@ export default function UpdateDatabase({ database }: UpdateDatabaseProps) {
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
             initialValue={database.name}
           >
@@ -107,6 +110,9 @@ export default function UpdateDatabase({ database }: UpdateDatabaseProps) {
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
             initialValue={database.description}
           >
diff --git a/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx b/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
index 1b1964587..18c3020c9 100644
--- a/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
+++ b/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
@@ -147,6 +147,9 @@ export default function AddGnuPgKeyFingerprint({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input />
diff --git a/frontend/components/institutions/CreateInstitution.tsx b/frontend/components/institutions/CreateInstitution.tsx
index 24f638cdd..77352c4be 100644
--- a/frontend/components/institutions/CreateInstitution.tsx
+++ b/frontend/components/institutions/CreateInstitution.tsx
@@ -149,6 +149,9 @@ export default function CreateInstitution(props: CreateInstitutionProps) {
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input />
@@ -163,6 +166,9 @@ export default function CreateInstitution(props: CreateInstitutionProps) {
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input />
diff --git a/frontend/components/institutions/UpdateInstitution.tsx b/frontend/components/institutions/UpdateInstitution.tsx
index 532d82bb8..e8ae07e13 100644
--- a/frontend/components/institutions/UpdateInstitution.tsx
+++ b/frontend/components/institutions/UpdateInstitution.tsx
@@ -112,6 +112,9 @@ export default function UpdateInstitution({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
             initialValue={institution.name}
           >
@@ -131,6 +134,9 @@ export default function UpdateInstitution({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
             initialValue={institution.description}
           >
diff --git a/frontend/components/me/EnableUserTwoFactorAuthenticator.tsx b/frontend/components/me/EnableUserTwoFactorAuthenticator.tsx
index 80ecb8ca9..940bcf627 100644
--- a/frontend/components/me/EnableUserTwoFactorAuthenticator.tsx
+++ b/frontend/components/me/EnableUserTwoFactorAuthenticator.tsx
@@ -95,6 +95,9 @@ export default function EnableUserTwoFactorAuthenticator({
             {
               required: true,
             },
+            {
+              whitespace: true,
+            },
           ]}
         >
           <Input />
diff --git a/frontend/components/me/SetUserPhoneNumber.tsx b/frontend/components/me/SetUserPhoneNumber.tsx
index 12678d4fe..fd302221e 100644
--- a/frontend/components/me/SetUserPhoneNumber.tsx
+++ b/frontend/components/me/SetUserPhoneNumber.tsx
@@ -81,6 +81,9 @@ export default function SetUserPhoneNumber({
             {
               required: true,
             },
+            {
+              whitespace: true,
+            },
           ]}
         >
           <Input />
diff --git a/frontend/components/methods/CreateMethod.tsx b/frontend/components/methods/CreateMethod.tsx
index ba978d02d..5ef238e68 100644
--- a/frontend/components/methods/CreateMethod.tsx
+++ b/frontend/components/methods/CreateMethod.tsx
@@ -198,6 +198,9 @@ export default function CreateMethod({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input />
@@ -209,6 +212,9 @@ export default function CreateMethod({
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input />
diff --git a/frontend/components/methods/MethodParametersSubform.tsx b/frontend/components/methods/MethodParametersSubform.tsx
index 62fd2567e..164b8e6ab 100644
--- a/frontend/components/methods/MethodParametersSubform.tsx
+++ b/frontend/components/methods/MethodParametersSubform.tsx
@@ -30,6 +30,9 @@ export default function MethodParametersSubform({
                     {
                       required: true,
                     },
+                    {
+                      whitespace: true,
+                    },
                   ]}
                 >
                   <Input placeholder="Name" style={{ width: "100%" }} />
diff --git a/frontend/components/methods/MethodSourcesSubform.tsx b/frontend/components/methods/MethodSourcesSubform.tsx
index 387c89378..dbca23017 100644
--- a/frontend/components/methods/MethodSourcesSubform.tsx
+++ b/frontend/components/methods/MethodSourcesSubform.tsx
@@ -30,6 +30,9 @@ export default function MethodSourcesSubform({
                     {
                       required: true,
                     },
+                    {
+                      whitespace: true,
+                    },
                   ]}
                 >
                   <Input placeholder="Name" style={{ width: "100%" }} />
diff --git a/frontend/components/methods/UpdateMethod.tsx b/frontend/components/methods/UpdateMethod.tsx
index 6cb77aa12..b7b1374dd 100644
--- a/frontend/components/methods/UpdateMethod.tsx
+++ b/frontend/components/methods/UpdateMethod.tsx
@@ -145,6 +145,9 @@ export default function UpdateMethod({ method }: UpdateMethodProps) {
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
             initialValue={method.name}
           >
@@ -157,6 +160,9 @@ export default function UpdateMethod({ method }: UpdateMethodProps) {
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
             initialValue={method.description}
           >
diff --git a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
index afee76bc5..1c8b1b3cd 100644
--- a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
@@ -177,14 +177,24 @@ export default function CreateOpenIdConnectApplication({
           <Form.Item
             label="Client ID"
             name="clientId"
-            rules={[{ required: true }]}
+            rules={[
+              { required: true },
+              {
+                whitespace: true,
+              },
+            ]}
           >
             <Input />
           </Form.Item>
           <Form.Item
             label="Display Name"
             name="displayName"
-            rules={[{ required: true }]}
+            rules={[
+              { required: true },
+              {
+                whitespace: true,
+              },
+            ]}
           >
             <Input />
           </Form.Item>
diff --git a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
index 87dddecdf..123ca8c24 100644
--- a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
@@ -120,7 +120,12 @@ export default function UpdateOpenIdConnectApplication({
           <Form.Item
             label="Client ID"
             name="clientId"
-            rules={[{ required: true }]}
+            rules={[
+              { required: true },
+              {
+                whitespace: true,
+              },
+            ]}
             initialValue={application.name}
           >
             <Input />
@@ -128,7 +133,12 @@ export default function UpdateOpenIdConnectApplication({
           <Form.Item
             label="Display Name"
             name="displayName"
-            rules={[{ required: true }]}
+            rules={[
+              { required: true },
+              {
+                whitespace: true,
+              },
+            ]}
             initialValue={application.displayName}
           >
             <Input />
diff --git a/frontend/pages/users/login/with-recovery-code.tsx b/frontend/pages/users/login/with-recovery-code.tsx
index 4730965ca..0827f364c 100644
--- a/frontend/pages/users/login/with-recovery-code.tsx
+++ b/frontend/pages/users/login/with-recovery-code.tsx
@@ -89,6 +89,9 @@ function LoginWithRecoveryCode() {
                 required: true,
                 message: "Please input your recovery code!",
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input placeholder="Recovery Code" />
diff --git a/frontend/pages/users/login/with-two-factor-code.tsx b/frontend/pages/users/login/with-two-factor-code.tsx
index 21b08bc1c..5d510027c 100644
--- a/frontend/pages/users/login/with-two-factor-code.tsx
+++ b/frontend/pages/users/login/with-two-factor-code.tsx
@@ -91,6 +91,9 @@ function LoginWithTwoFactorCode() {
                 required: true,
                 message: "Please input your authenticator code!",
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input placeholder="Authenticator Code" />
diff --git a/frontend/pages/users/register.tsx b/frontend/pages/users/register.tsx
index 98d061006..65056590f 100644
--- a/frontend/pages/users/register.tsx
+++ b/frontend/pages/users/register.tsx
@@ -100,6 +100,9 @@ export default function Page() {
               {
                 required: true,
               },
+              {
+                whitespace: true,
+              },
             ]}
           >
             <Input />

From 906062eccbcd799f7cfde51cc5fae2294dc96f3f Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sat, 13 Jun 2026 00:22:21 +0200
Subject: [PATCH 081/145] Add `noopener` explictly such that ant.design does
 not add noreferrer

---
 frontend/components/data/DataSummary.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/components/data/DataSummary.tsx b/frontend/components/data/DataSummary.tsx
index 6ee302327..646e16db5 100644
--- a/frontend/components/data/DataSummary.tsx
+++ b/frontend/components/data/DataSummary.tsx
@@ -197,6 +197,7 @@ export default function DataSummary({
                 <Typography.Link
                   href={selectedResource.value.locator}
                   target="_blank"
+                  rel="noopener" // do not add `noreferrer` because it is used by same origin or referrer checks in authentication handlers
                 >
                   {selectedResource.value.locator}
                 </Typography.Link>

From 29adffc1e44d1385c4fd917f08043aa773dc251e Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 16 Jun 2026 13:35:38 +0200
Subject: [PATCH 082/145] Add data format to resource tree view

---
 frontend/components/data/DataSummary.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/components/data/DataSummary.tsx b/frontend/components/data/DataSummary.tsx
index 646e16db5..60d0ae701 100644
--- a/frontend/components/data/DataSummary.tsx
+++ b/frontend/components/data/DataSummary.tsx
@@ -60,7 +60,7 @@ const transformToTree = (resourceTree: DataPartialFragment["resourceTree"]) => {
     return {
       ...node,
       key: node.vertexId,
-      title: node.vertexId,
+      title: `${node.value.dataFormat?.name ?? node.value.dataFormatId} (vertex ${node.vertexId})`,
       // node.value.locator || node.value.description || `ID: ${node.vertexId}`,
       children: children.map((child) => buildBranch(child)),
     };
@@ -81,7 +81,7 @@ const getBreadcrumbItems = (
     const node = flatNodes.find((node) => node.vertexId === currentId);
     if (!node) break;
     path.unshift({
-      title: `${node.value.dataFormat?.name ?? node.value.dataFormatId} (${node.vertexId})`,
+      title: `${node.value.dataFormat?.name ?? node.value.dataFormatId} (vertex ${node.vertexId})`,
     });
     if (node.__typename === "GetHttpsResourceTreeNonRootVertex") {
       currentId = node.parentId;

From c8d1dcc74375e952037ba93b36aa318bddb77fd9 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 16 Jun 2026 15:07:18 +0200
Subject: [PATCH 083/145] Start dependencies when necessary

---
 database.mk | 6 ------
 deploy.mk   | 1 -
 docker.mk   | 2 --
 3 files changed, 9 deletions(-)

diff --git a/database.mk b/database.mk
index f1b5f4d9a..fd2b5ead1 100755
--- a/database.mk
+++ b/database.mk
@@ -22,7 +22,6 @@ help : ## Print this help
 psql : ## Enter PostgreSQL interactive terminal in the `database` container
 	docker compose up \
 		--no-build \
-		--no-deps \
 		--no-recreate \
 		--wait \
 		database
@@ -41,7 +40,6 @@ remove-volume : ## Remove data volume
 create : ## Create database with name `${POSTGRES_DATABASE_NAME}`
 	docker compose up \
 		--no-build \
-		--no-deps \
 		--no-recreate \
 		--wait \
 		database
@@ -56,7 +54,6 @@ create : ## Create database with name `${POSTGRES_DATABASE_NAME}`
 drop : ## Drop database with name `${POSTGRES_DATABASE_NAME}`
 	docker compose up \
 		--no-build \
-		--no-deps \
 		--no-recreate \
 		--wait \
 		database
@@ -71,7 +68,6 @@ drop : ## Drop database with name `${POSTGRES_DATABASE_NAME}`
 sql : ## Run the SQL script in the file `${SCRIPT}` in the database service, for example, `make sql SCRIPT=./my.sql ` (note that after database schema changes it is necessary to restart the backend service for the object-relational mapper Npgsql to work seamlessly, for example, by restarting the backend service with `./docker.mk restart SERVICE=backend`)
 	docker compose up \
 		--no-build \
-		--no-deps \
 		--no-recreate \
 		--wait \
 		database
@@ -103,7 +99,6 @@ backup : ## Backup database and related data to directory with absolute path `${
 	mkdir --parents "${DIR}"
 	docker compose up \
 		--no-build \
-		--no-deps \
 		--no-recreate \
 		--wait \
 		database
@@ -125,7 +120,6 @@ restore : ## Restore database and related data from directory with absolute path
 		backend
 	docker compose up \
 		--no-build \
-		--no-deps \
 		--no-recreate \
 		--wait \
 		database
diff --git a/deploy.mk b/deploy.mk
index e4bcb5475..f3772492e 100755
--- a/deploy.mk
+++ b/deploy.mk
@@ -96,7 +96,6 @@ dotenv : ## Assert that all variables in ./.env.${ENVIRONMENT}.sample are availa
 services : ## Recreate services
 	docker compose up \
 		--no-build \
-		--no-deps \
 		--force-recreate \
 		--renew-anon-volumes \
 		--remove-orphans \
diff --git a/docker.mk b/docker.mk
index 94643d4ba..85664436b 100755
--- a/docker.mk
+++ b/docker.mk
@@ -89,7 +89,6 @@ remove : ## Remove stopped services
 up : symlink dotenv ## (Re)create and start services
 	docker compose up \
 		--no-build \
-		--no-deps \
 		--no-recreate \
 		--remove-orphans \
 		--wait ${SERVICE}
@@ -133,7 +132,6 @@ logs : ## Follow logs
 exec : ## Execute the one-time command `${COMMAND}` against the `${SERVICE}` service
 	docker compose up \
 		--no-build \
-		--no-deps \
 		--no-recreate \
 		--wait \
 		${SERVICE}

From 675de8814e2939b7f0423f004838eb480ad543f8 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 16 Jun 2026 16:16:48 +0200
Subject: [PATCH 084/145] Assign result of calls to pure method to variable
 (even though it is called because of the exception that may or may not be
 thrown)

---
 backend/src/Controllers/AuthorizationController.cs     |  2 +-
 .../Applications/OpenIdConnectApplicationMutations.cs  | 10 +++++-----
 .../Applications/OpenIdConnectApplicationType.cs       |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/backend/src/Controllers/AuthorizationController.cs b/backend/src/Controllers/AuthorizationController.cs
index 9bd26766f..7503d7a6b 100644
--- a/backend/src/Controllers/AuthorizationController.cs
+++ b/backend/src/Controllers/AuthorizationController.cs
@@ -325,7 +325,7 @@ await applicationManager.GetLocalizedDisplayNameAsync(application) ?? applicatio
                     {
                         try
                         {
-                            _.ToOpenIdConnectScope();
+                            var ignore = _.ToOpenIdConnectScope();
                             return true;
                         }
                         catch (ArgumentOutOfRangeException)
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
index abb821e5d..bcd0fdf60 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
@@ -391,7 +391,7 @@ OpenIddictApplicationDescriptor descriptor
         {
             try
             {
-                permission.PermissionToOpenIdConnectEndpoint();
+                var ignore = permission.PermissionToOpenIdConnectEndpoint();
                 return true;
             }
             catch (ArgumentOutOfRangeException)
@@ -403,7 +403,7 @@ OpenIddictApplicationDescriptor descriptor
         {
             try
             {
-                permission.PermissionToOpenIdConnectGrantType();
+                var ignore = permission.PermissionToOpenIdConnectGrantType();
                 return true;
             }
             catch (ArgumentOutOfRangeException)
@@ -415,7 +415,7 @@ OpenIddictApplicationDescriptor descriptor
         {
             try
             {
-                permission.PermissionToOpenIdConnectResponseType();
+                var ignore = permission.PermissionToOpenIdConnectResponseType();
                 return true;
             }
             catch (ArgumentOutOfRangeException)
@@ -427,7 +427,7 @@ OpenIddictApplicationDescriptor descriptor
         {
             try
             {
-                permission.PermissionToOpenIdConnectScope();
+                var ignore = permission.PermissionToOpenIdConnectScope();
                 return true;
             }
             catch (ArgumentOutOfRangeException)
@@ -442,4 +442,4 @@ OpenIddictApplicationDescriptor descriptor
             .Concat(input.Scopes.Select(_ => _.ToPermissionString()))
         );
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
index 5a1ef8cc0..36869857b 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
@@ -64,7 +64,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
                 {
                     try
                     {
-                        permission.PermissionToOpenIdConnectEndpoint();
+                        var ignore = permission.PermissionToOpenIdConnectEndpoint();
                         return true;
                     }
                     catch (ArgumentOutOfRangeException)
@@ -91,7 +91,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
                 {
                     try
                     {
-                        permission.PermissionToOpenIdConnectGrantType();
+                        var ignore = permission.PermissionToOpenIdConnectGrantType();
                         return true;
                     }
                     catch (ArgumentOutOfRangeException)
@@ -118,7 +118,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
                 {
                     try
                     {
-                        permission.PermissionToOpenIdConnectResponseType();
+                        var ignore = permission.PermissionToOpenIdConnectResponseType();
                         return true;
                     }
                     catch (ArgumentOutOfRangeException)
@@ -145,7 +145,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
                 {
                     try
                     {
-                        permission.PermissionToOpenIdConnectScope();
+                        var ignore = permission.PermissionToOpenIdConnectScope();
                         return true;
                     }
                     catch (ArgumentOutOfRangeException)

From 9fad198b964ada1b66fa7bc7c4e8ae06082f2a86 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 16 Jun 2026 16:17:01 +0200
Subject: [PATCH 085/145] Upgrade dependencies to latest compatible versions

---
 backend/dotnet-tools.json          |    8 +-
 backend/src/Metabase.csproj        |   58 +-
 backend/test/Metabase.Tests.csproj |   10 +-
 frontend/package.json              |    2 +-
 frontend/yarn.lock                 | 2019 ++++++++++++++--------------
 5 files changed, 1048 insertions(+), 1049 deletions(-)

diff --git a/backend/dotnet-tools.json b/backend/dotnet-tools.json
index 972eb2a49..1cf679f35 100644
--- a/backend/dotnet-tools.json
+++ b/backend/dotnet-tools.json
@@ -24,14 +24,14 @@
       "rollForward": false
     },
     "dotnet-ef": {
-      "version": "10.0.8",
+      "version": "10.0.9",
       "commands": [
         "dotnet-ef"
       ],
       "rollForward": false
     },
     "dotnet-script": {
-      "version": "2.0.0",
+      "version": "2.0.1",
       "commands": [
         "dotnet-script"
       ],
@@ -66,7 +66,7 @@
       "rollForward": false
     },
     "jetbrains.resharper.globaltools": {
-      "version": "2026.1.1",
+      "version": "2026.1.3",
       "commands": [
         "jb"
       ],
@@ -87,7 +87,7 @@
       "rollForward": false
     },
     "dotnet-outdated-tool": {
-      "version": "4.7.1",
+      "version": "4.8.1",
       "commands": [
         "dotnet-outdated"
       ],
diff --git a/backend/src/Metabase.csproj b/backend/src/Metabase.csproj
index 331ef67e2..4d4d53c0c 100644
--- a/backend/src/Metabase.csproj
+++ b/backend/src/Metabase.csproj
@@ -17,35 +17,35 @@
     <PackageReference Include="AspNetCore.HealthChecks.OpenIdConnectServer" Version="9.0.0" />
     <PackageReference Include="GraphQL.Client" Version="6.1.0" />
     <PackageReference Include="GraphQL.Client.Serializer.SystemTextJson" Version="6.1.0" />
-    <PackageReference Include="HotChocolate" Version="16.0.4" />
-    <PackageReference Include="HotChocolate.AspNetCore" Version="16.0.4" />
-    <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="16.0.4" />
-    <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="16.0.4" />
-    <PackageReference Include="HotChocolate.Data" Version="16.0.4" />
-    <PackageReference Include="HotChocolate.Data.EntityFramework" Version="16.0.4" />
-    <PackageReference Include="HotChocolate.Diagnostics" Version="16.0.4" />
-    <PackageReference Include="HotChocolate.PersistedOperations.InMemory" Version="16.0.4" />
-    <PackageReference Include="HotChocolate.Types.Analyzers" Version="16.0.4" />
-    <PackageReference Include="HotChocolate.Types.NodaTime" Version="16.0.4" />
-    <PackageReference Include="HotChocolate.Types.Scalars" Version="16.0.4" />
+    <PackageReference Include="HotChocolate" Version="16.1.4" />
+    <PackageReference Include="HotChocolate.AspNetCore" Version="16.1.4" />
+    <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="16.1.4" />
+    <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="16.1.4" />
+    <PackageReference Include="HotChocolate.Data" Version="16.1.4" />
+    <PackageReference Include="HotChocolate.Data.EntityFramework" Version="16.1.4" />
+    <PackageReference Include="HotChocolate.Diagnostics" Version="16.1.4" />
+    <PackageReference Include="HotChocolate.PersistedOperations.InMemory" Version="16.1.4" />
+    <PackageReference Include="HotChocolate.Types.Analyzers" Version="16.1.4" />
+    <PackageReference Include="HotChocolate.Types.NodaTime" Version="16.1.4" />
+    <PackageReference Include="HotChocolate.Types.Scalars" Version="16.1.4" />
     <PackageReference Include="IdentityModel" Version="7.0.0" />
     <PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="10.0.11" />
-    <PackageReference Include="MailKit" Version="4.16.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8">
+    <PackageReference Include="MailKit" Version="4.17.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Common" Version="10.6.0" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Telemetry.Abstractions" Version="10.6.0" />
-    <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.3.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="10.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Common" Version="10.7.0" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Telemetry.Abstractions" Version="10.7.0" />
+    <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.4.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.2" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="10.0.2" />
     <!-- <PackageReference Include="StyleCop.Analyzers" Version="1.1.118"> -->
     <!--   <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> -->
     <!--   <PrivateAssets>all</PrivateAssets> -->
@@ -53,15 +53,15 @@
     <PackageReference Include="OpenIddict.AspNetCore" Version="7.5.0" />
     <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="7.5.0" />
     <PackageReference Include="OpenIddict.Quartz" Version="7.5.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.16.0" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.16.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.16.0" />
     <PackageReference Include="Quartz" Version="3.18.1" />
     <PackageReference Include="Quartz.AspNetCore" Version="3.18.1" />
-    <PackageReference Include="Scalar.AspNetCore" Version="2.14.14" />
-    <PackageReference Include="Scalar.AspNetCore.Microsoft" Version="2.14.14" />
+    <PackageReference Include="Scalar.AspNetCore" Version="2.16.3" />
+    <PackageReference Include="Scalar.AspNetCore.Microsoft" Version="2.16.3" />
     <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
     <PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
diff --git a/backend/test/Metabase.Tests.csproj b/backend/test/Metabase.Tests.csproj
index b7b746844..5a3861ee4 100644
--- a/backend/test/Metabase.Tests.csproj
+++ b/backend/test/Metabase.Tests.csproj
@@ -12,20 +12,20 @@
     <PackageReference Include="FluentAssertions" Version="8.10.0" />
     <PackageReference Include="IdentityModel" Version="7.0.0" />
     <PackageReference Include="JsonPath.Net" Version="3.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.9" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
     <PackageReference Include="NodaTime.Testing" Version="3.3.2" />
     <PackageReference Include="NUnit" Version="4.6.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.13.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.14.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
     <PackageReference Include="Serilog.Sinks.NUnit" Version="1.0.3" />
     <PackageReference Include="Snapshooter.NUnit" Version="1.3.1" />
-    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.7.0" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.8.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/frontend/package.json b/frontend/package.json
index ec406bf66..15067262e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,7 +21,7 @@
     "antd": "^6.3.3",
     "crypto-hash": "^4.0.0",
     "dayjs": "^1.0",
-    "graphql": "^16.12.0",
+    "graphql": "^17.0.0",
     "next": "^16.0.8",
     "react": "^19.2.0",
     "react-cookie": "^8.0.1",
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 93550ce38..6a47209d8 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -41,16 +41,6 @@
   resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz#ed2be7fb4d82ac7e1d45a54a5b06d6cecf8be6f6"
   integrity sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==
 
-"@ant-design/icons@^6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-6.2.3.tgz#66e1c7fdea009b9c3fab6964062bedc76f308ad8"
-  integrity sha512-Pl3aoAtxQeKryYnt6VvDJtOxMOtA8wrRSACe/pTjOAIG3fdHrWm6Ivb4ku9tsFjYroSXBKirvuxG4QkwBXD9gg==
-  dependencies:
-    "@ant-design/colors" "^8.0.1"
-    "@ant-design/icons-svg" "^4.4.2"
-    "@rc-component/util" "^1.10.1"
-    clsx "^2.1.1"
-
 "@ant-design/icons@^6.2.5":
   version "6.2.5"
   resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-6.2.5.tgz#31c142aa6ce5eaf99598aaead222f4c459693512"
@@ -72,9 +62,9 @@
     throttle-debounce "^5.0.0"
 
 "@apollo/client@^4.0.9":
-  version "4.1.9"
-  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-4.1.9.tgz#797186c27ad98f728e40a7e33b7539675d1509b7"
-  integrity sha512-qfpkQD51tdU/7iAR6aLb4w9o/L7I475DluWHRb61U/3Q0AH29nNOxOBHjBbWDdf16ncPOoQuxne1sEs2NjqBFw==
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-4.2.3.tgz#04177a6a170e3733346f9ae15103161abd50cdce"
+  integrity sha512-+auRYBXow2v7cT+wKzvjyMyyEojq+G7Sf80vIR57rtEPcxRFuMXuU9IKjwxZ3muclUgdGKwZXNeuki+g0GabgQ==
   dependencies:
     "@graphql-typed-document-node/core" "^3.1.1"
     "@wry/caches" "^1.0.0"
@@ -93,34 +83,34 @@
     immutable "^5.1.5"
     invariant "^2.2.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.28.6", "@babel/code-frame@^7.29.0":
-  version "7.29.0"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.29.0.tgz#7cd7a59f15b3cc0dcd803038f7792712a7d0b15c"
-  integrity sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.29.7.tgz#f2fbbfea87c44a21590ec515b778b2c26d8866e7"
+  integrity sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.28.5"
+    "@babel/helper-validator-identifier" "^7.29.7"
     js-tokens "^4.0.0"
     picocolors "^1.1.1"
 
-"@babel/compat-data@^7.28.6":
-  version "7.29.3"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.3.tgz#e3f5347f0589596c91d227ccb6a541d37fb1307b"
-  integrity sha512-LIVqM46zQWZhj17qA8wb4nW/ixr2y1Nw+r1etiAWgRM6U1IqP+LNhL1yg440jYZR72jCWcWbLWzIosH+uP1fqg==
+"@babel/compat-data@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.7.tgz#6f0237f0f36d2e51c0570a636faed9d2d0efe629"
+  integrity sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==
 
 "@babel/core@^7.24.4", "@babel/core@^7.28.6":
-  version "7.29.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.29.0.tgz#5286ad785df7f79d656e88ce86e650d16ca5f322"
-  integrity sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==
-  dependencies:
-    "@babel/code-frame" "^7.29.0"
-    "@babel/generator" "^7.29.0"
-    "@babel/helper-compilation-targets" "^7.28.6"
-    "@babel/helper-module-transforms" "^7.28.6"
-    "@babel/helpers" "^7.28.6"
-    "@babel/parser" "^7.29.0"
-    "@babel/template" "^7.28.6"
-    "@babel/traverse" "^7.29.0"
-    "@babel/types" "^7.29.0"
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.29.7.tgz#80c10b17248082968b57a857b91640971f2070f7"
+  integrity sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==
+  dependencies:
+    "@babel/code-frame" "^7.29.7"
+    "@babel/generator" "^7.29.7"
+    "@babel/helper-compilation-targets" "^7.29.7"
+    "@babel/helper-module-transforms" "^7.29.7"
+    "@babel/helpers" "^7.29.7"
+    "@babel/parser" "^7.29.7"
+    "@babel/template" "^7.29.7"
+    "@babel/traverse" "^7.29.7"
+    "@babel/types" "^7.29.7"
     "@jridgewell/remapping" "^2.3.5"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
@@ -128,126 +118,126 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.18.13", "@babel/generator@^7.29.0":
-  version "7.29.1"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.29.1.tgz#d09876290111abbb00ef962a7b83a5307fba0d50"
-  integrity sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==
+"@babel/generator@^7.18.13", "@babel/generator@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.29.7.tgz#cca0b8827e6bcf3ba176788e7f3b180ad6db2fa3"
+  integrity sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==
   dependencies:
-    "@babel/parser" "^7.29.0"
-    "@babel/types" "^7.29.0"
+    "@babel/parser" "^7.29.7"
+    "@babel/types" "^7.29.7"
     "@jridgewell/gen-mapping" "^0.3.12"
     "@jridgewell/trace-mapping" "^0.3.28"
     jsesc "^3.0.2"
 
-"@babel/helper-compilation-targets@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz#32c4a3f41f12ed1532179b108a4d746e105c2b25"
-  integrity sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==
+"@babel/helper-compilation-targets@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz#7a1def704302401c47f64fa85589e974ae217042"
+  integrity sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==
   dependencies:
-    "@babel/compat-data" "^7.28.6"
-    "@babel/helper-validator-option" "^7.27.1"
+    "@babel/compat-data" "^7.29.7"
+    "@babel/helper-validator-option" "^7.29.7"
     browserslist "^4.24.0"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-globals@^7.28.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz#b9430df2aa4e17bc28665eadeae8aa1d985e6674"
-  integrity sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==
+"@babel/helper-globals@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.29.7.tgz#f04a96fbd8473241b1079243f5b3f03a3010ab7b"
+  integrity sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==
 
-"@babel/helper-module-imports@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz#60632cbd6ffb70b22823187201116762a03e2d5c"
-  integrity sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==
+"@babel/helper-module-imports@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz#ef25048a518e828d7393fac5882ddd73921d7396"
+  integrity sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==
   dependencies:
-    "@babel/traverse" "^7.28.6"
-    "@babel/types" "^7.28.6"
+    "@babel/traverse" "^7.29.7"
+    "@babel/types" "^7.29.7"
 
-"@babel/helper-module-transforms@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz#9312d9d9e56edc35aeb6e95c25d4106b50b9eb1e"
-  integrity sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==
+"@babel/helper-module-transforms@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz#b062747a5997ba138637201328bbff77960574ae"
+  integrity sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==
   dependencies:
-    "@babel/helper-module-imports" "^7.28.6"
-    "@babel/helper-validator-identifier" "^7.28.5"
-    "@babel/traverse" "^7.28.6"
+    "@babel/helper-module-imports" "^7.29.7"
+    "@babel/helper-validator-identifier" "^7.29.7"
+    "@babel/traverse" "^7.29.7"
 
-"@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz#6f13ea251b68c8532e985fd532f28741a8af9ac8"
-  integrity sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==
+"@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz#c0a0766f1a13617d8a17407d7ab8f9d486225ea4"
+  integrity sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==
 
-"@babel/helper-string-parser@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
-  integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
+"@babel/helper-string-parser@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz#7f0871d99824d23137d60f86fcf6130fd5a1b51f"
+  integrity sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==
 
-"@babel/helper-validator-identifier@^7.28.5":
-  version "7.28.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4"
-  integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==
+"@babel/helper-validator-identifier@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz#bd87084ced0c796ec46bda492de6e83d29e89fc2"
+  integrity sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==
 
-"@babel/helper-validator-option@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz#fa52f5b1e7db1ab049445b421c4471303897702f"
-  integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==
+"@babel/helper-validator-option@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz#cf315be940213b354eb4abcc0bd01ebe3f73bc2a"
+  integrity sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==
 
-"@babel/helpers@^7.28.6":
-  version "7.29.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.29.2.tgz#9cfbccb02b8e229892c0b07038052cc1a8709c49"
-  integrity sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==
+"@babel/helpers@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.29.7.tgz#45abfde7548997e34376c3e69feb475cffb4a607"
+  integrity sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==
   dependencies:
-    "@babel/template" "^7.28.6"
-    "@babel/types" "^7.29.0"
+    "@babel/template" "^7.29.7"
+    "@babel/types" "^7.29.7"
 
-"@babel/parser@^7.24.4", "@babel/parser@^7.28.6", "@babel/parser@^7.29.0", "@babel/parser@^7.29.2":
-  version "7.29.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.3.tgz#116f70a77958307fceac27747573032f8a62f88e"
-  integrity sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==
+"@babel/parser@^7.24.4", "@babel/parser@^7.29.2", "@babel/parser@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.7.tgz#837b87387cbf5ec5530cb634b3c622f68edb9334"
+  integrity sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==
   dependencies:
-    "@babel/types" "^7.29.0"
+    "@babel/types" "^7.29.7"
 
 "@babel/plugin-syntax-import-assertions@^7.26.0":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.28.6.tgz#ae9bc1923a6ba527b70104dd2191b0cd872c8507"
-  integrity sha512-pSJUpFHdx9z5nqTSirOCMtYVP2wFgoWhP0p3g8ONK/4IHhLIBd0B9NYqAvIUAhq+OkhO4VM1tENCt0cjlsNShw==
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.29.7.tgz#c5cd868505269126cc18882e1f01f7b0e0e24b4e"
+  integrity sha512-/An1OCBN93thpBAGyfsK2pcf0jvju1SAtKkL2Ny++B5Sy6sqgzXDQH1cZxWbF96Wuk+bn41MDA9bLd4VVAw6rw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.28.6"
+    "@babel/helper-plugin-utils" "^7.29.7"
 
 "@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.18.0", "@babel/runtime@^7.20.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.24.4", "@babel/runtime@^7.24.7", "@babel/runtime@^7.28.4", "@babel/runtime@^7.29.2":
-  version "7.29.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.29.2.tgz#9a6e2d05f4b6692e1801cd4fb176ad823930ed5e"
-  integrity sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==
-
-"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.28.6.tgz#0e7e56ecedb78aeef66ce7972b082fce76a23e57"
-  integrity sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==
-  dependencies:
-    "@babel/code-frame" "^7.28.6"
-    "@babel/parser" "^7.28.6"
-    "@babel/types" "^7.28.6"
-
-"@babel/traverse@^7.26.10", "@babel/traverse@^7.28.6", "@babel/traverse@^7.29.0":
-  version "7.29.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.29.0.tgz#f323d05001440253eead3c9c858adbe00b90310a"
-  integrity sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==
-  dependencies:
-    "@babel/code-frame" "^7.29.0"
-    "@babel/generator" "^7.29.0"
-    "@babel/helper-globals" "^7.28.0"
-    "@babel/parser" "^7.29.0"
-    "@babel/template" "^7.28.6"
-    "@babel/types" "^7.29.0"
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.29.7.tgz#12022450c45a4da6d8d8287b18a4ff2ddb23f768"
+  integrity sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==
+
+"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.29.7.tgz#4d9d4004f645cdd304de958c725162784ecac700"
+  integrity sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==
+  dependencies:
+    "@babel/code-frame" "^7.29.7"
+    "@babel/parser" "^7.29.7"
+    "@babel/types" "^7.29.7"
+
+"@babel/traverse@^7.26.10", "@babel/traverse@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.29.7.tgz#c47b07a41b95da0907d026b5dd894d98de7d2f2d"
+  integrity sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==
+  dependencies:
+    "@babel/code-frame" "^7.29.7"
+    "@babel/generator" "^7.29.7"
+    "@babel/helper-globals" "^7.29.7"
+    "@babel/parser" "^7.29.7"
+    "@babel/template" "^7.29.7"
+    "@babel/types" "^7.29.7"
     debug "^4.3.1"
 
-"@babel/types@^7.18.13", "@babel/types@^7.26.10", "@babel/types@^7.28.6", "@babel/types@^7.29.0":
-  version "7.29.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.0.tgz#9f5b1e838c446e72cf3cd4b918152b8c605e37c7"
-  integrity sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==
+"@babel/types@^7.18.13", "@babel/types@^7.26.10", "@babel/types@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.7.tgz#8005e31d82712ee7adaef6e23c63b71a62770a92"
+  integrity sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==
   dependencies:
-    "@babel/helper-string-parser" "^7.27.1"
-    "@babel/helper-validator-identifier" "^7.28.5"
+    "@babel/helper-string-parser" "^7.29.7"
+    "@babel/helper-validator-identifier" "^7.29.7"
 
 "@emnapi/core@1.10.0":
   version "1.10.0"
@@ -257,13 +247,20 @@
     "@emnapi/wasi-threads" "1.2.1"
     tslib "^2.4.0"
 
-"@emnapi/runtime@1.10.0", "@emnapi/runtime@^1.7.0":
+"@emnapi/runtime@1.10.0":
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.10.0.tgz#4b260c0d3534204e98c6110b8db1a987d26ec87c"
   integrity sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==
   dependencies:
     tslib "^2.4.0"
 
+"@emnapi/runtime@^1.7.0":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.11.1.tgz#58f1f3d5d81a9b12f793ab688c96371901027c24"
+  integrity sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==
+  dependencies:
+    tslib "^2.4.0"
+
 "@emnapi/wasi-threads@1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz#28fed21a1ba1ce797c44a070abc94d42f3ae8548"
@@ -347,10 +344,10 @@
   resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-3.0.5.tgz#88e9bf4d11d2b19c082e78ebe7ce88724a5eb091"
   integrity sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==
 
-"@eslint/plugin-kit@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.7.1.tgz#c4125fd015eceeb09b793109fdbcd4dd0a02d346"
-  integrity sha512-rZAP3aVgB9ds9KOeUSL+zZ21hPmo8dh6fnIFwRQj5EAZl9gzR7wxYbYXYysAM8CTqGmUGyp2S4kUdV17MnGuWQ==
+"@eslint/plugin-kit@^0.7.2":
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.7.2.tgz#4b0962f3f2c7ce8bc98b3ecfe34525c09d2cb729"
+  integrity sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A==
   dependencies:
     "@eslint/core" "^1.2.1"
     levn "^0.4.1"
@@ -360,25 +357,25 @@
   resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-3.2.0.tgz#13ed8212f3b9ba697611529d15347f8528058cea"
   integrity sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==
 
-"@graphql-codegen/add@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-7.0.0.tgz#ec4854030d2e091dd2f8abf8ede7fd1f73364b19"
-  integrity sha512-fQGlUQd0BpoevCTOKi3b7M+kuXCI13udXmJrIh1QMtTCLXUTYGgsubNVcPLr0cVjVwyBK/ZRgwtxdCmkVXqTwQ==
+"@graphql-codegen/add@^7.0.0", "@graphql-codegen/add@^7.0.1":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-7.0.1.tgz#9972c7944fced5fa2223474fb481308c20ec9f2c"
+  integrity sha512-kWw6RMu9ysBw1wcgcgf9mOnswc5M3ekOApDTiaJC/UZNTEYins01srZHYTP7z3P/WlGGC844BRtjwh3U2kNd/A==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    "@graphql-codegen/plugin-helpers" "^7.0.1"
     tslib "^2.8.0"
 
 "@graphql-codegen/cli@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-7.0.0.tgz#58c5d6a877a7bfe82c40185d9835027ffc5fae6d"
-  integrity sha512-SNgTiFU/jB3VJLr8koJjmXAwl60wG/9r5iQBiOmlf0m9KRaiCNmfDG6+VbeejJPkDIGJKQd0SwqV5i+fxdnjqA==
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-7.1.3.tgz#3e373c4e3180e4a390ac1021a517231939fe8f6c"
+  integrity sha512-mMYwpvpqJjjHoA/c6HBjdlbT8JqFC6W85RB80tpHACapufBnLlyNtYHYeOYAoUuU1n3cGQi1if1pKHnjLgS/eQ==
   dependencies:
     "@babel/generator" "^7.18.13"
     "@babel/template" "^7.18.10"
     "@babel/types" "^7.18.13"
-    "@graphql-codegen/client-preset" "^6.0.0"
-    "@graphql-codegen/core" "^6.0.0"
-    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    "@graphql-codegen/client-preset" "^6.0.1"
+    "@graphql-codegen/core" "^6.1.0"
+    "@graphql-codegen/plugin-helpers" "^7.0.1"
     "@graphql-tools/apollo-engine-loader" "^8.0.28"
     "@graphql-tools/code-file-loader" "^8.1.28"
     "@graphql-tools/git-loader" "^8.0.32"
@@ -409,50 +406,50 @@
     yaml "^2.3.1"
     yargs "^18.0.0"
 
-"@graphql-codegen/client-preset@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/client-preset/-/client-preset-6.0.0.tgz#bc95bb9abbebe7d1c96245af787022c488fcd442"
-  integrity sha512-nqidNH4rrulv0E2ZVkYcIWz5Jon+hLBKkx/Xp8KyRJ8WnNRD0kJO1ra8ECLU/JS8LuZehSJyCfoQh555TT5TEw==
+"@graphql-codegen/client-preset@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/client-preset/-/client-preset-6.0.1.tgz#bd164ed1dcef39ba3c818582e6c76c5029497bff"
+  integrity sha512-6wh0ZHG9WzBD6bE4AVOO6VCCMXK2orxHuXxaNKj+sj1w0qZ3Y3WIjZnqZLg6JZrHCIs/e+gy3T15Dc2pH8IbHA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/template" "^7.20.7"
-    "@graphql-codegen/add" "^7.0.0"
-    "@graphql-codegen/gql-tag-operations" "6.0.0"
-    "@graphql-codegen/plugin-helpers" "^7.0.0"
-    "@graphql-codegen/typed-document-node" "^7.0.0"
-    "@graphql-codegen/typescript" "^6.0.0"
-    "@graphql-codegen/typescript-operations" "^6.0.0"
-    "@graphql-codegen/visitor-plugin-common" "^7.0.0"
+    "@graphql-codegen/add" "^7.0.1"
+    "@graphql-codegen/gql-tag-operations" "^6.0.1"
+    "@graphql-codegen/plugin-helpers" "^7.0.1"
+    "@graphql-codegen/typed-document-node" "^7.0.1"
+    "@graphql-codegen/typescript" "^6.0.2"
+    "@graphql-codegen/typescript-operations" "^6.0.3"
+    "@graphql-codegen/visitor-plugin-common" "^7.0.3"
     "@graphql-tools/documents" "^1.0.0"
     "@graphql-tools/utils" "^11.0.0"
     "@graphql-typed-document-node/core" "3.2.0"
     tslib "^2.8.0"
 
-"@graphql-codegen/core@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-6.0.0.tgz#4cffc9d52abcd6e32ca818924f6c34548987c2b1"
-  integrity sha512-/UDolbUC6q6MTHNvEUDq+vC3ugycxAQ71S62WB3RDXzbBVIG5MG5Kw89WFOh+dt/s+mRuX+tx+Vz/si81sZ0aw==
+"@graphql-codegen/core@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-6.1.0.tgz#2e09987ec37e5cbc4e37be51e1f9e83c7028382b"
+  integrity sha512-jReAzuCYlrSBJHW2bfBpDl/vMRCw0yQEoTvGi9K+3OTsazDXEQGOpCVfj8p/xO2h7ynu5Yrvzo0sUylVv0CnwA==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    "@graphql-codegen/plugin-helpers" "^7.0.1"
     "@graphql-tools/schema" "^10.0.0"
     "@graphql-tools/utils" "^11.0.0"
     tslib "^2.8.0"
 
 "@graphql-codegen/fragment-matcher@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/fragment-matcher/-/fragment-matcher-7.0.0.tgz#87bee8fab80ae90ea9af70fc1bc5070525c9235b"
-  integrity sha512-XvKb4SYcyNXbQuaKU1nu7+1R51+vOsrDgkOAPKpI83its2l9qQRfV2Q7yK0O2s+i0/jnGJJqlvQfytqXXIrxCA==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/fragment-matcher/-/fragment-matcher-7.0.1.tgz#68235854c91d477a8e927a9f08e1b2189d707391"
+  integrity sha512-/RlUMGEoGpt82GHvl2vnLokWjYpiRATdnTcV5hMUhWN+evn6j+i+W76QuRhT5V90qUwDr79ojEOIsPm5eUHcFw==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    "@graphql-codegen/plugin-helpers" "^7.0.1"
     tslib "^2.8.0"
 
-"@graphql-codegen/gql-tag-operations@6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-6.0.0.tgz#1957ede9a5b6bd6962913adbce5f9ca7385b4f3d"
-  integrity sha512-IBwQ/jYx5Z4yMV78oVGU3hhNu/I7xFiQpFXavZujwCvoyH611M/JAoZ/RTExjr9stzcKMmNxJV/1Pknv+5M9Fg==
+"@graphql-codegen/gql-tag-operations@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-6.0.1.tgz#2aa916dd01002955425e450de0f0242e35493d07"
+  integrity sha512-eHYUIchZLG6G+kafeKnUByL2Nkmb8Uj2vg33UVLFj8XJ2coC4b1iRDWxCdTXbupZrN0FaM0QRRBLs3zBEAzcJg==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^7.0.0"
-    "@graphql-codegen/visitor-plugin-common" "^7.0.0"
+    "@graphql-codegen/plugin-helpers" "^7.0.1"
+    "@graphql-codegen/visitor-plugin-common" "^7.0.3"
     "@graphql-tools/utils" "^11.0.0"
     auto-bind "^5.0.0"
     tslib "^2.8.0"
@@ -491,33 +488,22 @@
     import-from "4.0.0"
     tslib "^2.8.0"
 
-"@graphql-codegen/schema-ast@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-6.0.0.tgz#dcb943c917a740d82146faa16e427055bf35b210"
-  integrity sha512-ww6lfCZYBZk8SbnOKp76FLvBrMD6oqFhAGj8Ov8f+bsrNh0SG1M6mxLWh4nl9hWIu/iwsZgrJcuIrTfyBeF6jQ==
+"@graphql-codegen/schema-ast@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-6.0.1.tgz#5144bce74200d328aa46f7515e48b6ec2ebd6ca0"
+  integrity sha512-P16b6XCWXfcrA4fkuAyqoy883USAULifv8YWgEOrNKDAnr2DR+Kr85jSomknIUTY39wiuvisv4/lrdXobwK6sA==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^7.0.0"
+    "@graphql-codegen/plugin-helpers" "^7.0.1"
     "@graphql-tools/utils" "^11.0.0"
     tslib "^2.8.0"
 
-"@graphql-codegen/typed-document-node@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typed-document-node/-/typed-document-node-7.0.0.tgz#9e7488e3bc3eeaf86af9176fd13c5aaffd6855dc"
-  integrity sha512-gSsMEKe1QV5QmF+TsijSyhLYGYRYGD2fe7rGIJwca4s1gZK+aD3qjNFq3C0yFUsb92bsCxiOJTWeiPPfdPSMTg==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^7.0.0"
-    "@graphql-codegen/visitor-plugin-common" "^7.0.0"
-    auto-bind "^5.0.0"
-    change-case-all "^2.1.0"
-    tslib "^2.8.0"
-
-"@graphql-codegen/typed-document-node@^7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typed-document-node/-/typed-document-node-7.0.2.tgz#5589187a385ad13f71df3e0567e97ee1bebddc9d"
-  integrity sha512-vrjigzqpKsaQ2Ra4QBBuG9TcwG1O0pw9EOSFU0aj7mS2EK19vWs5N4rzwDDvHrQZW62wwqzUcqBoFitVBQqlmg==
+"@graphql-codegen/typed-document-node@^7.0.1", "@graphql-codegen/typed-document-node@^7.0.2":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typed-document-node/-/typed-document-node-7.0.3.tgz#98df3887322e1ba945d13391f3815f79b4e64742"
+  integrity sha512-l/4KenYJG5D8Aj6Aa2KPeS0fdMIIi04Qx28d4SLwMWuyFU9WXspU5mR9YMNDRZzaTgBtGR8aMIl9RzyiWf5uUw==
   dependencies:
     "@graphql-codegen/plugin-helpers" "^7.0.1"
-    "@graphql-codegen/visitor-plugin-common" "^7.0.4"
+    "@graphql-codegen/visitor-plugin-common" "^7.1.0"
     auto-bind "^5.0.0"
     change-case-all "^2.1.0"
     tslib "^2.8.0"
@@ -533,25 +519,25 @@
     change-case-all "1.0.15"
     tslib "^2.8.1"
 
-"@graphql-codegen/typescript-operations@^6.0.0", "@graphql-codegen/typescript-operations@^6.0.2":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-6.0.2.tgz#afd94cf6dc6f77ac7f579b3b82043b75e37861f7"
-  integrity sha512-QYs8eQIOXsGKiWBlx4ZtIwYALa5RlLwznJELcnKayGubuEbglOsapJBswERXoogf3SMDrU21L58c1CYkYlyKIA==
+"@graphql-codegen/typescript-operations@^6.0.2", "@graphql-codegen/typescript-operations@^6.0.3":
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-6.0.4.tgz#98a176d755372488c400ff4e49988eddfaa007bb"
+  integrity sha512-YUmnmZcJ6wMcC2VmTE7gw18zoG4S1VF1aJmaupDrBnwfKGA5BmdKrA6k2Wj6ZkUDOduHI60l/cmZBRtqel4VtQ==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^7.0.0"
-    "@graphql-codegen/schema-ast" "^6.0.0"
-    "@graphql-codegen/visitor-plugin-common" "^7.0.1"
+    "@graphql-codegen/plugin-helpers" "^7.0.1"
+    "@graphql-codegen/schema-ast" "^6.0.1"
+    "@graphql-codegen/visitor-plugin-common" "^7.1.0"
     auto-bind "^5.0.0"
     tslib "^2.8.0"
 
-"@graphql-codegen/typescript@^6.0.0", "@graphql-codegen/typescript@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-6.0.1.tgz#c45576b0c1702ae4edb6d90cb32951efdcc7a12d"
-  integrity sha512-UmHKlOBqnmGs0ioZsfi7INIb6+YCXVMi3KSp/INO359fT3RJxWPLPiE7T30UaWXtLeO6fBNZcvhy3EGBI9UCvw==
+"@graphql-codegen/typescript@^6.0.1", "@graphql-codegen/typescript@^6.0.2":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-6.0.2.tgz#5a076dc38b9727970aef0df9fa0b33d95ed39939"
+  integrity sha512-zyLfKsFJ7TRkQ0PyaUVuiAek9TSbtVJwwBoOuaE9RAWr45+9Y5W1LYldpiSTcyfxKVSIniE7Gj0V87qzrpdyYw==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^7.0.0"
-    "@graphql-codegen/schema-ast" "^6.0.0"
-    "@graphql-codegen/visitor-plugin-common" "^7.0.1"
+    "@graphql-codegen/plugin-helpers" "^7.0.1"
+    "@graphql-codegen/schema-ast" "^6.0.1"
+    "@graphql-codegen/visitor-plugin-common" "^7.0.3"
     auto-bind "^5.0.0"
     tslib "~2.8.0"
 
@@ -571,26 +557,10 @@
     parse-filepath "^1.0.2"
     tslib "^2.8.0"
 
-"@graphql-codegen/visitor-plugin-common@^7.0.0", "@graphql-codegen/visitor-plugin-common@^7.0.1":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-7.0.2.tgz#3df94980fff51dd0dd140d1a6428d55ea24c2f75"
-  integrity sha512-3v1dPjkSiAIsqwZ/6btSZ6BCYlYYpr3FdLhsBZ/JoPP2hYgN6AlGKdUyhYm5FsgDKU04L7al3+rfnTOCxqM0gw==
-  dependencies:
-    "@graphql-codegen/plugin-helpers" "^7.0.0"
-    "@graphql-tools/optimize" "^2.0.0"
-    "@graphql-tools/relay-operation-optimizer" "^7.1.1"
-    "@graphql-tools/utils" "^11.0.0"
-    auto-bind "^5.0.0"
-    change-case-all "^2.1.0"
-    dependency-graph "^1.0.0"
-    graphql-tag "^2.11.0"
-    parse-filepath "^1.0.2"
-    tslib "^2.8.0"
-
-"@graphql-codegen/visitor-plugin-common@^7.0.4":
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-7.0.4.tgz#d0ab0f80dd2a29b1786a4a270ccf2f1ffaf1d5b9"
-  integrity sha512-IESwu40Gpl+9x5vRGLsaYAWM9KRobnN74h+SB4EtfDrt0V87Q74ZzWZGmuS2m6A/fq7E/bS6YgSEMVACjaRUVw==
+"@graphql-codegen/visitor-plugin-common@^7.0.0", "@graphql-codegen/visitor-plugin-common@^7.0.3", "@graphql-codegen/visitor-plugin-common@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-7.1.0.tgz#73aaf4aa2ce72255e687348d311f8aa26749dfb1"
+  integrity sha512-CO4fJyflbYBuAwbQD16bAuWBIXkz9il3JwyC+pQzXh8NJ+BZZDXmYjmVeGeJuoMUIQDb+CNo2thCU0bFFamAkg==
   dependencies:
     "@graphql-codegen/plugin-helpers" "^7.0.1"
     "@graphql-tools/optimize" "^2.0.0"
@@ -639,10 +609,10 @@
     tslib "^2.4.0"
     unixify "^1.0.0"
 
-"@graphql-tools/delegate@^12.0.16":
-  version "12.0.16"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-12.0.16.tgz#2f6636abadcf0c57ac1356431d70cf4ac1be1e2d"
-  integrity sha512-WEJaFwWG82a0VzhfE4sRsaOPjxgCVfn4fOe3ho+r3uIbPYpc7qHpFdu1PLg6meikq6fuW9NJ1J88fEgnWuXDVg==
+"@graphql-tools/delegate@^12.0.17":
+  version "12.0.17"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-12.0.17.tgz#eb0d712907c60c9675964285b929fc580b39c581"
+  integrity sha512-pIVszWEm69rF+bkM0jUyM1KdIxGzygQbIp1GtV1CuEGRB8lN1uFY1eeTzM2nudHXg8cj+XSVO8cnRpph+o8Dmg==
   dependencies:
     "@graphql-tools/batch-execute" "^10.0.8"
     "@graphql-tools/executor" "^1.4.13"
@@ -860,11 +830,11 @@
     tslib "^2.4.0"
 
 "@graphql-tools/wrap@^11.1.1":
-  version "11.1.15"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-11.1.15.tgz#d0e19db5d4075e3768ffcd0f5249f9856141a792"
-  integrity sha512-GCMx6l0MPwHVaBMHf29oG8eIrsJ8PBXq9y5DNX9/r9oCpCBfqxfWzcejx4CpO4chA3+yylGOKcAyEbOUgxfI1Q==
+  version "11.1.16"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-11.1.16.tgz#125ec29dfb3b726f91d9042ef2410407f546f83a"
+  integrity sha512-JW1XGFTmltXa537J2bAr8dN/n6EWwiBuM9q8V8mWqZ0eWrf++/TT3/mlV3c0M8B8nrS/lqSsotIwPAtVZR8sWQ==
   dependencies:
-    "@graphql-tools/delegate" "^12.0.16"
+    "@graphql-tools/delegate" "^12.0.17"
     "@graphql-tools/schema" "^10.0.29"
     "@graphql-tools/utils" "^11.0.0"
     "@whatwg-node/promise-helpers" "^1.3.2"
@@ -1053,144 +1023,144 @@
   resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.5.tgz#a81ffb00e69267cd0a1d626eaedb8a8430b2b2f8"
   integrity sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==
 
-"@inquirer/ansi@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@inquirer/ansi/-/ansi-2.0.5.tgz#7b7e121f6a0c40128711daf20325e6ff2cdff8b7"
-  integrity sha512-doc2sWgJpbFQ64UflSVd17ibMGDuxO1yKgOgLMwavzESnXjFWJqUeG8saYosqKpHp4kWiM5x1nXvEjbpx90gzw==
-
-"@inquirer/checkbox@^5.1.5":
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/@inquirer/checkbox/-/checkbox-5.1.5.tgz#362472b9dbf8ddee869b61e4ccc6b198b975c955"
-  integrity sha512-Jmf9tgBHIEK5SAOB7swYfStqmtkZb00xOTpSQmkoGEpdxOTpJi9RS0A8bkfDPHTTItZRJrRdZrEMu25wyj0VfQ==
-  dependencies:
-    "@inquirer/ansi" "^2.0.5"
-    "@inquirer/core" "^11.1.10"
-    "@inquirer/figures" "^2.0.5"
-    "@inquirer/type" "^4.0.5"
-
-"@inquirer/confirm@^6.0.13":
-  version "6.0.13"
-  resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-6.0.13.tgz#8a698ca38baab64ae468fb9f04e7e8800ef4367c"
-  integrity sha512-wkGPC7yJ5WJk1DJ5SX7fzk+gfj4BM8cf5dDDi71B/551xHrdsZVRJOC0WyikXd0pEsb/9cLniuE4atbsMqmFkw==
-  dependencies:
-    "@inquirer/core" "^11.1.10"
-    "@inquirer/type" "^4.0.5"
-
-"@inquirer/core@^11.1.10":
-  version "11.1.10"
-  resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-11.1.10.tgz#bab578cb1b908dd72fab79ee75d51231270cb7ad"
-  integrity sha512-a4Q5BXHQAHa9eO202sTaFCHFYVB3x5fauDuThEAdZ9gfn76pSxiKU7wWcEH0N1O0XmQvNfQNU6QXpiRxmYQx+A==
-  dependencies:
-    "@inquirer/ansi" "^2.0.5"
-    "@inquirer/figures" "^2.0.5"
-    "@inquirer/type" "^4.0.5"
+"@inquirer/ansi@^2.0.7":
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/@inquirer/ansi/-/ansi-2.0.7.tgz#86de22810cac3ed406ec10f8d66016815b8226b4"
+  integrity sha512-3eTuUO1vH2cZm2ZKHeQxnOqlTi9EfZDGgIe3BL3I4u+rJHocr9Fz86M4fjYABPvFnQG/gGK551HqDiIcETwU6Q==
+
+"@inquirer/checkbox@^5.2.1":
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/@inquirer/checkbox/-/checkbox-5.2.1.tgz#7f148b3153a776cee202015b10f9a985068d188d"
+  integrity sha512-b6xmA/VlTe0ZgDQHDui+Nav470u7u49nRd8/iuhOcQPO9Ch7lGuogydhi2VOmNlZ+zXcM8IcPuNSwQcdJaF/kw==
+  dependencies:
+    "@inquirer/ansi" "^2.0.7"
+    "@inquirer/core" "^11.2.1"
+    "@inquirer/figures" "^2.0.7"
+    "@inquirer/type" "^4.0.7"
+
+"@inquirer/confirm@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-6.1.1.tgz#9c6a7d79c6132b2af57fdb75747f056204e55356"
+  integrity sha512-eb8DBZcz/2qHWQda4rk2JiQk5h9QV/cVHi1yjt0f69WFZMRFn0sJTye3EAP8icut8UDMjQPsaH5KbcOogefrFQ==
+  dependencies:
+    "@inquirer/core" "^11.2.1"
+    "@inquirer/type" "^4.0.7"
+
+"@inquirer/core@^11.2.1":
+  version "11.2.1"
+  resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-11.2.1.tgz#54ccd8f7d47852140b6066cbd77d63b2c2b168fd"
+  integrity sha512-Qd6GJT1yVyrZZCfN8W2qKF5ApmqryXRhRKCuip8h01x2w/esJQ2XIYc6f9abMIHgKQdBfFTSOdbHRLAhuM09UA==
+  dependencies:
+    "@inquirer/ansi" "^2.0.7"
+    "@inquirer/figures" "^2.0.7"
+    "@inquirer/type" "^4.0.7"
     cli-width "^4.1.0"
     fast-wrap-ansi "^0.2.0"
     mute-stream "^3.0.0"
     signal-exit "^4.1.0"
 
-"@inquirer/editor@^5.1.2":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@inquirer/editor/-/editor-5.1.2.tgz#35d3c378ca2b442c45ad38687f1ffd051a368d77"
-  integrity sha512-Y3Nor7S/DhIPo+8Ym/dSY4efwKI4BsflKDwXh0jNeXJsSF3dteS/3Yf+z4wkibVZDvYMyCgknSTQlNahfunGHg==
+"@inquirer/editor@^5.2.2":
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/@inquirer/editor/-/editor-5.2.2.tgz#7c73e2fc0e7bd4c40cfd38a180ae5bbd24d32b90"
+  integrity sha512-ZRVd/oD+sYsUd5zVm0NflqEzlqfYCyHNsqkHl2oWXEUHs12tCbcSFi+wVFEvD8+LGRaMUsVrE7qeo6lSG/S1Vg==
   dependencies:
-    "@inquirer/core" "^11.1.10"
-    "@inquirer/external-editor" "^3.0.0"
-    "@inquirer/type" "^4.0.5"
+    "@inquirer/core" "^11.2.1"
+    "@inquirer/external-editor" "^3.0.3"
+    "@inquirer/type" "^4.0.7"
 
-"@inquirer/expand@^5.0.14":
-  version "5.0.14"
-  resolved "https://registry.yarnpkg.com/@inquirer/expand/-/expand-5.0.14.tgz#978abf072bd1270484a6d324c08e49e9e0a58ea9"
-  integrity sha512-qyY9zcIX2eKYwaAUiQo9zORd61Lc3sXeM72fVbeHkYnDkqfr8/armcRbmVAIrExeJhI2puk+uomeKtWrpUVUmQ==
+"@inquirer/expand@^5.1.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@inquirer/expand/-/expand-5.1.1.tgz#e2afeac247d97dd64ee18aa81e902bdd1fe0ea70"
+  integrity sha512-YmQpenjbFSHAK3sOd44puHh3V1KXXr+JiNpUztoSQ4drLh2rTVzTap/YtlAVu/5xavifIlBfNEzJ/neZJ1a/1g==
   dependencies:
-    "@inquirer/core" "^11.1.10"
-    "@inquirer/type" "^4.0.5"
+    "@inquirer/core" "^11.2.1"
+    "@inquirer/type" "^4.0.7"
 
-"@inquirer/external-editor@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@inquirer/external-editor/-/external-editor-3.0.0.tgz#915e7d3f808e3d2213c4fe0f525dcd7ea890e78a"
-  integrity sha512-lDSwMgg+M5rq6JKBYaJwSX6T9e/HK2qqZ1oxmOwn4AQoJE5D+7TumsxLGC02PWS//rkIVqbZv3XA3ejsc9FYvg==
+"@inquirer/external-editor@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@inquirer/external-editor/-/external-editor-3.0.3.tgz#d79e772542cf8d340642e9dabd3a1ea7f5a30104"
+  integrity sha512-6thf5I8q7lZwzGLAxPaaGEREEkZ3nyePPDQ1oyobblxmEE8mqTLguScP7pDjUTAibiyb4hfXl+qjUEJ+di/aNA==
   dependencies:
     chardet "^2.1.1"
     iconv-lite "^0.7.2"
 
-"@inquirer/figures@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@inquirer/figures/-/figures-2.0.5.tgz#d12f4889ac6ea7731ebc52bd9c066ca51d8fdee7"
-  integrity sha512-NsSs4kzfm12lNetHwAn3GEuH317IzpwrMCbOuMIVytpjnJ90YYHNwdRgYGuKmVxwuIqSgqk3M5qqQt1cDk0tGQ==
+"@inquirer/figures@^2.0.7":
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/@inquirer/figures/-/figures-2.0.7.tgz#f5cc5843732a81304d06a0db4b53cc7dbda15541"
+  integrity sha512-aJ8TBPOGB6f/2qziPfElISTCEd5XOYTFckA2SGjhNmiKzfK/u4ot3v0DUzGVdUnKjN10EqnnEPck36BkyfLnJw==
 
-"@inquirer/input@^5.0.13":
-  version "5.0.13"
-  resolved "https://registry.yarnpkg.com/@inquirer/input/-/input-5.0.13.tgz#e55cbd66ff7dee6d958c52bbe75675e65d664707"
-  integrity sha512-0l0jCHlJnXIV8CTxwQC0C+5Ziq8WP22edWgmciW2xYvoeoSck4v5FvCS1ctKdqLLR0dUo93uAHgWHywgBSoRyw==
+"@inquirer/input@^5.1.2":
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@inquirer/input/-/input-5.1.2.tgz#9305cb170dfc3a5323e5eac885a945e7cddd5c4b"
+  integrity sha512-9K/DDBSQpOyZSkt6sOVP9Vo0TR7atX2kuILsUu0x3wVcVbe97lJwIJKMLdMw25tDYuXl/qp6erT0Xs1rfmcfZg==
   dependencies:
-    "@inquirer/core" "^11.1.10"
-    "@inquirer/type" "^4.0.5"
+    "@inquirer/core" "^11.2.1"
+    "@inquirer/type" "^4.0.7"
 
-"@inquirer/number@^4.0.13":
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/@inquirer/number/-/number-4.0.13.tgz#34e9e4a256fd2c666251e082dc6e2cfa01048d65"
-  integrity sha512-WHmkYnnJAou5gx7RgcvAfUggnHNM1zWfoh0dFPl3dxVssuqt+dK5rIbaOYQXNyOegvFnopbKupjnhw2O8gANNg==
+"@inquirer/number@^4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@inquirer/number/-/number-4.1.1.tgz#b133668d8e0e099b4133abb915221501e0ff75d7"
+  integrity sha512-XF4IXAbPnGPgw0wsbC/i2tPcyfdZgDpUlhsqU0SfT4IRIGWha6Xm9VRgN5yYxJq+jnyXlfXI/nQ3ulfk0iEICA==
   dependencies:
-    "@inquirer/core" "^11.1.10"
-    "@inquirer/type" "^4.0.5"
+    "@inquirer/core" "^11.2.1"
+    "@inquirer/type" "^4.0.7"
 
-"@inquirer/password@^5.0.13":
-  version "5.0.13"
-  resolved "https://registry.yarnpkg.com/@inquirer/password/-/password-5.0.13.tgz#7271099c1214814147bde615c0382abc0bbec8d1"
-  integrity sha512-XDGu64ROHZjOOXLAANvJN7iIxWKhOSCG5VakrZ5kaScVR+snVJCFglD/hL3/677awtWcu4pXoWa280CDIYcBeg==
+"@inquirer/password@^5.1.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@inquirer/password/-/password-5.1.1.tgz#f21efb614da9c905095262f51781fd2a721fceac"
+  integrity sha512-3XBfF7DAsp5qeDsvN5Rd1HmbNokVvEQoUM0QLrRcybC9nX96w3Pbmu7qUsb3IT3J3jBvs2+mTXaKHOUsgHMLzg==
   dependencies:
-    "@inquirer/ansi" "^2.0.5"
-    "@inquirer/core" "^11.1.10"
-    "@inquirer/type" "^4.0.5"
+    "@inquirer/ansi" "^2.0.7"
+    "@inquirer/core" "^11.2.1"
+    "@inquirer/type" "^4.0.7"
 
 "@inquirer/prompts@^8.3.2":
-  version "8.4.3"
-  resolved "https://registry.yarnpkg.com/@inquirer/prompts/-/prompts-8.4.3.tgz#8387cd6c2b9a0c01895566e73564ef8e7e864c5f"
-  integrity sha512-ai5LseTw9HhegupIgmo4cn7RpnCGznjjXu4OI+7jMR8vu7T1ZCCNMzFFAovUCjL1fl0cceksIN1++yQE59SmZw==
-  dependencies:
-    "@inquirer/checkbox" "^5.1.5"
-    "@inquirer/confirm" "^6.0.13"
-    "@inquirer/editor" "^5.1.2"
-    "@inquirer/expand" "^5.0.14"
-    "@inquirer/input" "^5.0.13"
-    "@inquirer/number" "^4.0.13"
-    "@inquirer/password" "^5.0.13"
-    "@inquirer/rawlist" "^5.2.9"
-    "@inquirer/search" "^4.1.9"
-    "@inquirer/select" "^5.1.5"
-
-"@inquirer/rawlist@^5.2.9":
-  version "5.2.9"
-  resolved "https://registry.yarnpkg.com/@inquirer/rawlist/-/rawlist-5.2.9.tgz#f0e37240810c1dd3d8e6a0f7e1e04acca8e84085"
-  integrity sha512-a1ErXEfgjfPYpyQ89dp+7n2IISjH9oQg3ygvF5adz8B7aHn4n2PjEgu1wpVTp69K3bj3lVLxP0qJ2b1clk1Whw==
-  dependencies:
-    "@inquirer/core" "^11.1.10"
-    "@inquirer/type" "^4.0.5"
-
-"@inquirer/search@^4.1.9":
-  version "4.1.9"
-  resolved "https://registry.yarnpkg.com/@inquirer/search/-/search-4.1.9.tgz#1a8072812f5244b787c63f9388a6d7ac26d57e4a"
-  integrity sha512-ZlbM28Q9lmLkFPNAIv+ZuY530n5Km8U1WW48oYEvDhe9yc2uL3m3t+JSdRUkQlk5fuIuskgiIVjcb7czFzQpuA==
-  dependencies:
-    "@inquirer/core" "^11.1.10"
-    "@inquirer/figures" "^2.0.5"
-    "@inquirer/type" "^4.0.5"
-
-"@inquirer/select@^5.1.5":
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/@inquirer/select/-/select-5.1.5.tgz#3f0b4c5add402e6cb958a135a2a853ae4d42d323"
-  integrity sha512-6SRg6kHfK/sjLXOsuqNebuir+sjwrf/iWuRUnXgB2slzEewppI1WfzeS16XxDcOQmXBruMmmB9Cgrz7wsAxqMg==
-  dependencies:
-    "@inquirer/ansi" "^2.0.5"
-    "@inquirer/core" "^11.1.10"
-    "@inquirer/figures" "^2.0.5"
-    "@inquirer/type" "^4.0.5"
-
-"@inquirer/type@^4.0.5":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-4.0.5.tgz#a02d90e5da8a36dce27ac8e7237a50c99a9003a3"
-  integrity sha512-aetVUNeKNc/VriqXlw1NRSW0zhMBB0W4bNbWRJgzRl/3d0QNDQFfk0GO5SDdtjMZVg6o8ZKEiadd7SCCzoOn5Q==
+  version "8.5.2"
+  resolved "https://registry.yarnpkg.com/@inquirer/prompts/-/prompts-8.5.2.tgz#09c0132ada2bbba94c91d341115e1e41cb3f1525"
+  integrity sha512-IYR/3C/paEVVQYQvdDlFZVjRCJVYHHON0XXMH91KO9GSxs0TdKYWlUdvfQl2EfAHDxUaN3IBffkE/BDTh5nJ6g==
+  dependencies:
+    "@inquirer/checkbox" "^5.2.1"
+    "@inquirer/confirm" "^6.1.1"
+    "@inquirer/editor" "^5.2.2"
+    "@inquirer/expand" "^5.1.1"
+    "@inquirer/input" "^5.1.2"
+    "@inquirer/number" "^4.1.1"
+    "@inquirer/password" "^5.1.1"
+    "@inquirer/rawlist" "^5.3.1"
+    "@inquirer/search" "^4.2.1"
+    "@inquirer/select" "^5.2.1"
+
+"@inquirer/rawlist@^5.3.1":
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/@inquirer/rawlist/-/rawlist-5.3.1.tgz#66f6b8e6aa82d47399c433b8262128e7c1a4f9ce"
+  integrity sha512-QqdTqQddL3qPX/PPrjobpsO25NZ4dWXgTLenrR445L2ptLEYE6Z+PD5c5CNDJNx4ugRgELAIpSIJxZaO2jJ2Og==
+  dependencies:
+    "@inquirer/core" "^11.2.1"
+    "@inquirer/type" "^4.0.7"
+
+"@inquirer/search@^4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@inquirer/search/-/search-4.2.1.tgz#c8f4b78ab3f866fdf0503fac0cd08c4a6661c11e"
+  integrity sha512-xJj8QWKRSrfKoBIITLZK61dD3zwo0Rz11fgDImku30/Oe81zMdIdGgrLY2h6RkJ+KZ/GhNYIRMKnH/62qBTA5g==
+  dependencies:
+    "@inquirer/core" "^11.2.1"
+    "@inquirer/figures" "^2.0.7"
+    "@inquirer/type" "^4.0.7"
+
+"@inquirer/select@^5.2.1":
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/@inquirer/select/-/select-5.2.1.tgz#3a05e76e58d9e1bb095e912c3e7093aa04cd4604"
+  integrity sha512-FlDndEUww8m7BfukO2nJa25vhD+H5jxxCv4oGioKqzyWz3nPHhhw4LKdYRSlXuAx7DsdWia7iyaBPKKS95Evfw==
+  dependencies:
+    "@inquirer/ansi" "^2.0.7"
+    "@inquirer/core" "^11.2.1"
+    "@inquirer/figures" "^2.0.7"
+    "@inquirer/type" "^4.0.7"
+
+"@inquirer/type@^4.0.7":
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-4.0.7.tgz#9c6f0d857fe6ad549a3a932343b64e76acb34b10"
+  integrity sha512-t28inv14nMQ1PhKpsJPY+kEs/c00qzeCOS2gTNRyTjG5d6qsVA2fItxW4hkvGZ5lvanGLdtCzVIx5dwdRpN1+g==
 
 "@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.5":
   version "0.3.13"
@@ -1227,63 +1197,63 @@
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
 "@napi-rs/wasm-runtime@^1.1.4":
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz#a46bbfedc29751b7170c5d23bc1d8ee8c7e3c1e1"
-  integrity sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.5.tgz#cccd6ebc40b991dea6936f9126b1b8155b6c4c95"
+  integrity sha512-AWPoBRJ9tsnVhor4sjO7rkni+7p+2IAEFj6cx06UgP10jkQHqay/36uRV/bFkgrh18D9vb4cr8Q0Pthskgzy+Q==
   dependencies:
-    "@tybys/wasm-util" "^0.10.1"
+    "@tybys/wasm-util" "^0.10.2"
 
-"@next/env@16.2.6":
-  version "16.2.6"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-16.2.6.tgz#93a173801cb088463070cc6a113c68e26c1838ea"
-  integrity sha512-gd8HoHN4ufj73WmR3JmVolrpJR47ILK6LouP5xElPglaVxir6e1a7VzvTvDWkOoPXT9rkkTzyCxBu4yeZfZwcw==
+"@next/env@16.2.9":
+  version "16.2.9"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-16.2.9.tgz#c2bbcb1647503cae0f11e6a326799acd1ea29e9e"
+  integrity sha512-ki5VxxXfzD/9TDe13wyeTKIjQTAwBVpnr8KhRDUr8ltMUq1/NBpWNT5tiPoxiGl+PHM4X2ahSOiPk6iAimIzPg==
 
-"@next/eslint-plugin-next@16.2.6":
-  version "16.2.6"
-  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-16.2.6.tgz#24f3b2945b2856a5559af5ad630b7cddf1f65329"
-  integrity sha512-Z8l6o4JWKUl755x4R+wogD86KPeU+Ckw4K+SYG4kHeOJtRenDeK+OSbGcqZpDtbwn9DsJVdir2UxmwXuinUbUw==
+"@next/eslint-plugin-next@16.2.9":
+  version "16.2.9"
+  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-16.2.9.tgz#0d788da191971636def239cdf3b42458796df6ff"
+  integrity sha512-UZi8+YT/MLgTC9nrrn2Xd4lBYv1B7lVmtWHfPcthAI5Tt/C1LuDe6DfmtCtJ+WQod3ksY4VrKSvk3oMVAnL7qw==
   dependencies:
     fast-glob "3.3.1"
 
-"@next/swc-darwin-arm64@16.2.6":
-  version "16.2.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.2.6.tgz#0e19055594fbd2d198ce95cf5842bdbe57235d4e"
-  integrity sha512-ZJGkkcNfYgrrMkqOdZ7zoLa1TOy0qpcMfk/z4Mh/FKUz40gVO+HNQWqmLxf67Z5WB64DRp0dhEbyHfel+6sJUg==
-
-"@next/swc-darwin-x64@16.2.6":
-  version "16.2.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-16.2.6.tgz#487086280b56017bb547f5975ef1a3d6235a070f"
-  integrity sha512-v/YLBHIY132Ced3puBJ7YJKw1lqsCrgcNo2aRJlCEyQrrCeRJlvGlnmxhPxNQI3KE3N1DN5r9TPNPvka3nq5RQ==
-
-"@next/swc-linux-arm64-gnu@16.2.6":
-  version "16.2.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.2.6.tgz#b28ffbc31ee527a3ad48f29c2fd7b7f75bbdf180"
-  integrity sha512-RPOvqlYBbcQjkz9VQQDZ2T2bARIjXZV1KFlt+V2Mr6SW/e4I9fcKsaA0hdyf2FHoTlsV2xnBd5Y912rP/1Ce6w==
-
-"@next/swc-linux-arm64-musl@16.2.6":
-  version "16.2.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.2.6.tgz#d2eac5600e7083527669fa8cb8758efbbf9c8210"
-  integrity sha512-URUTu1+dMkxJsPFgm+OeEvq9wf5sujw0EvgYy80TDGHTSLTnIHeqb0Eu8A3sC95IRgjejQL+kC4mw+4yPxiAXA==
-
-"@next/swc-linux-x64-gnu@16.2.6":
-  version "16.2.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.2.6.tgz#e70dc3469bf9bfef16da2ba240c07ef6cfe8ad55"
-  integrity sha512-DOj182mPV8G3UkrayLoREM5YEYI+Dk5wv7Ox9xl1fFibAELEsFD0lDPfHIeILlutMMfdyhlzYPELG3peuKaurw==
-
-"@next/swc-linux-x64-musl@16.2.6":
-  version "16.2.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.2.6.tgz#49ecd2f622d0f3741654c59411f604dbbe1a38de"
-  integrity sha512-HKQ5SP/V/ub73UvF7n/zeJlxk2kLmtL7Wzrg4WfmkjmNos5onJ2tKu7yZOPdL18A6Svfn3max29ym+ry7NkK4g==
-
-"@next/swc-win32-arm64-msvc@16.2.6":
-  version "16.2.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.2.6.tgz#8a6dfec005364e1cf4fa1724c3d7fa0093660406"
-  integrity sha512-LZXpTlPyS5v7HhSmnvsLGP3iIYgYOBnc8r8ArlT55sGHV89bR2HlDdBjWQ+PY6SJMmk8TuVGFuxalnP3k/0Dwg==
-
-"@next/swc-win32-x64-msvc@16.2.6":
-  version "16.2.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.2.6.tgz#4fb656ccfcf60cbf8ffedb40fc1b625987c82742"
-  integrity sha512-F0+4i0h9J6C4eE3EAPWsoCk7UW/dbzOjyzxY0qnDUOYFu6FFmdZ6l97/XdV3/Nz3VYyO7UWjyEJUXkGqcoXfMA==
+"@next/swc-darwin-arm64@16.2.9":
+  version "16.2.9"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.2.9.tgz#b67a7e67466e39be621553b7a32520bc73ca4fa4"
+  integrity sha512-HkfxNYUCmcct0Xsqib5KxqMSHV4AHJq857BNRchyBDs4YS19aHzVfn1kDuBYKqLLQBjXgnkIsjV2Kd4d2wzYhw==
+
+"@next/swc-darwin-x64@16.2.9":
+  version "16.2.9"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-16.2.9.tgz#817f3609c231b07d6910c074eeaf7c41ae781f2d"
+  integrity sha512-7IAtK4MeybpqRV9GRABWEhJ62mOS+rzWOzOTFie4cSEtm12xsoOMJRcECoZx3FHPzFAqN/IJtHqWAFOLfl152w==
+
+"@next/swc-linux-arm64-gnu@16.2.9":
+  version "16.2.9"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.2.9.tgz#f7314d5c268a6c440208c46da92ab8d914c02d36"
+  integrity sha512-hBD75iWpUtkL9SmQmcRhmLomn9jgkPzCEkbOcLgHymPEKzv+6ONy13RRiIEz/iEObjkS2Jlb5gYS2XGoS3X4rw==
+
+"@next/swc-linux-arm64-musl@16.2.9":
+  version "16.2.9"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.2.9.tgz#9258cf7a3f2f10a605ef85fb76601123f3b1d5ab"
+  integrity sha512-qZTI3pf9SGc/obr8NkQAekBxmp1QK+kVm+VAf3BALLfFAj+1kUhkTxmrWpVos9R/UYIA8AWX2p6cGI5WdwzVUA==
+
+"@next/swc-linux-x64-gnu@16.2.9":
+  version "16.2.9"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.2.9.tgz#a6db6095f6495c6d55c48ba946b1578f5e75a359"
+  integrity sha512-xm0HfRNX+UkH4R3c18ynswjj5o5uEj/7iI9p9omdtTSIsRCzQqkGMA+10nzJ4EHnYC3as65IMhbbl5fWRUWHYg==
+
+"@next/swc-linux-x64-musl@16.2.9":
+  version "16.2.9"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.2.9.tgz#d7f857879886c3a378285fea438ba4636fcc3a9a"
+  integrity sha512-QumimHkGEG6vM3PfEDWKyKen03NcqLOkeKB1EfcPe7VxzmEiCa4jNnMyBn/US5zcd/VE1CI+O8Ovb3lfjVHfGw==
+
+"@next/swc-win32-arm64-msvc@16.2.9":
+  version "16.2.9"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.2.9.tgz#d6d67c8e803b2c44b76b16495b5eda47165faf43"
+  integrity sha512-hzQpKZvw8rAwI6A2uQh6SacCSvNAXaIkPNsWwzqqfRiIMiXMfH936skDhz1OO6KpvdKkJrgHHtqQOq5PIXOvdQ==
+
+"@next/swc-win32-x64-msvc@16.2.9":
+  version "16.2.9"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.2.9.tgz#6e36f17dd615c52761691b7f5be1d9d161abed2a"
+  integrity sha512-qr2VL3Ce5QrwgO2yh1ujSBawrimjVKX8FGF/cOynmdYKJY0BdHpGVNIRK1tqONB10Vkm25Ub1BD2bkjWs4+96w==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -1311,114 +1281,114 @@
   resolved "https://registry.yarnpkg.com/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz#3dc35ba0f1e66b403c00b39344f870298ebb1c8e"
   integrity sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==
 
-"@oxc-parser/binding-android-arm-eabi@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-android-arm-eabi/-/binding-android-arm-eabi-0.130.0.tgz#55917e12ce2bf91f5d8f7af6fa337511b2ca6278"
-  integrity sha512-h/xYU8/7ADWzVSf5I+YalLpj33LOy9CI/zgbJNIZ5eunRBG+Czqa3lZsvuPHHf3rOt6z1c5+UzoxjbAzAvhwVw==
-
-"@oxc-parser/binding-android-arm64@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-android-arm64/-/binding-android-arm64-0.130.0.tgz#6a88c34fa1641bff439b4def7e4a86070239ac83"
-  integrity sha512-oFWFJrsGv9siFM4HjMqKNB7IuIZD/SMmZdCXl8xyx7lDplGvPKyewpOo272rSWgMXe2Wx7bWI0Yj+gkHv4qbeg==
-
-"@oxc-parser/binding-darwin-arm64@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-darwin-arm64/-/binding-darwin-arm64-0.130.0.tgz#d056a2b3a0100a5610e3014d75fe6d567fc49bd1"
-  integrity sha512-sGUzupdTplK9jQg7eJZ878HfEgQjJNBc6dAYVWJ9W5aU+J8rLfRJhTVsKThiu1pNwm6Y1qKCcbC6WhNWSXR3Ig==
-
-"@oxc-parser/binding-darwin-x64@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-darwin-x64/-/binding-darwin-x64-0.130.0.tgz#21340dd67fcdfec7b0be9d4fc6490f84b80cc641"
-  integrity sha512-PsB4cdCISbC00Uy8eiD8bc2AkGWjZqrSrJnkBFuG2ptrrf6mZ2F5gLFSjOAVMMgZPg8B1D7OydJwLWSfyI2Plg==
-
-"@oxc-parser/binding-freebsd-x64@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-freebsd-x64/-/binding-freebsd-x64-0.130.0.tgz#08db5e6dd718b4e7e7c98e5e2ca7bb538fd460a6"
-  integrity sha512-DgABp3l38hS77JbXCV4qk1+n6DPym5u8zzwuweokezm2tX194nDSJDENbDRECxVsiNbprKATLbk+Z5wlHT0OHw==
-
-"@oxc-parser/binding-linux-arm-gnueabihf@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.130.0.tgz#3ad94b6f0b763dec37ee0412905dad8e34c1a5a0"
-  integrity sha512-4Kn3CTEmwFrzhTSC/JuUW16qovmaMdX7jeSKbL8w0pLtLww7To1a2XJi9Z5uD8QWUkfUHhqfV+VD6dVzBnWzoA==
-
-"@oxc-parser/binding-linux-arm-musleabihf@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.130.0.tgz#f2604ea11032989d779a22c47b8a636f91d2dd44"
-  integrity sha512-D35KZM3F4rRu1uAFKyBlg3Gaf/ybCjyaPR1hfgvk5ex8NtcTmRgc0JgSighEyNg96TPrFhemFba68SZuxaha8w==
-
-"@oxc-parser/binding-linux-arm64-gnu@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.130.0.tgz#e3e3da7b98a5b8988893cba16cb81e0ee513ed1d"
-  integrity sha512-Q9o7oVlo955KHwS8l1u0bCzIx+JsZUA3XToLXC+MsMhye/9LeBQbt84nh120cl2XLy+TEzvugYDiHShg5yaX6Q==
-
-"@oxc-parser/binding-linux-arm64-musl@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.130.0.tgz#97ce15b046257465757e838ce173c09d540e840a"
-  integrity sha512-EiJ/gC0ljbcwVpycC8YWw6ggMbtsPX8XMOt0mPx0aqWeMsNR+L9m05Flbvd5T+GlivG+GkSWQL7tM9SRFpM/dw==
-
-"@oxc-parser/binding-linux-ppc64-gnu@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-0.130.0.tgz#8c364ef28a2a4f694cc58c4fd951e1710a3703ed"
-  integrity sha512-b+h/lsLLurp756dMGizNs5uPaJfyEdWrTcV5t8M609jWm1DEHB1StpRXCkyvwtkJx3m+qL5BNQ0dEKan/4yGFA==
-
-"@oxc-parser/binding-linux-riscv64-gnu@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.130.0.tgz#1085fd4fe2664d6c138463f42a36286e9e70c3f5"
-  integrity sha512-O19Cil83XAyjEFfo8WhkMwY58ALqZ7ckjGL+25mjMIuF84urWBeANH0FC8B8BsSSygWU3/1aY3ADdDbp+wlBnw==
-
-"@oxc-parser/binding-linux-riscv64-musl@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-0.130.0.tgz#de0ea9c5a5dcb1dd2a0db73baab73e2f4e1005cd"
-  integrity sha512-BgXRVC0+83n3YzCscLQjj6nbyeBIVeZYPTI4fFMAE4WNm2+4RXhWp03IVizL7esIz36kgmT48aebk1iM+cs8sw==
-
-"@oxc-parser/binding-linux-s390x-gnu@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.130.0.tgz#6e0837ab6b7d1f2462cef3a86953de0288327ac2"
-  integrity sha512-6tJz0xvnGhsokE7N1WlUSBXibpYmT9xSJFS1Ce41Km/+8gQvdlW8MLhRv8PD0L7ix8vRG0FDDepp3jdOFzdVdw==
-
-"@oxc-parser/binding-linux-x64-gnu@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.130.0.tgz#738e29a90190a0d97e91cb9ed4a94c0f8121a0e3"
-  integrity sha512-9aCWj83dp3heTQGmGnZGdIWgxjZrr/7VQ0TGFHH5PKByxJKF2Hcr4qvaSUHhhGEa3MSsDjTL1YDP8RAgdL5/Cg==
-
-"@oxc-parser/binding-linux-x64-musl@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-x64-musl/-/binding-linux-x64-musl-0.130.0.tgz#127c87488a0d23bc0990346c66ffa6e6f8f82fc8"
-  integrity sha512-afXt87aZBqrUVli8TB/I8H1G50RDWcwirjWtXGXYqJ2ZqWEiErH7V72j3LUSDZaivmtu2OLX0KQ/mbhP81mr7A==
-
-"@oxc-parser/binding-openharmony-arm64@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-openharmony-arm64/-/binding-openharmony-arm64-0.130.0.tgz#9313e4d25badec37d9c349ecab9692af3c1bf556"
-  integrity sha512-I0NCrZV/YZuCGWgqwNN/GO/iXlLF2z+Wgc7u+Aa9N4P51oYeIa0XT+zVBUne4csO9GqxskXgI4g8JzzWGRpfOw==
-
-"@oxc-parser/binding-wasm32-wasi@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-wasm32-wasi/-/binding-wasm32-wasi-0.130.0.tgz#9fb2d63b814bb7052774c50cd9b8c19047839a14"
-  integrity sha512-sJgQkGaBX0WJvPUDfwciex6IcTk5O5NLQ1bhEb6f3nBruh1GshKMRSMt2bxZlYrgBzjyBbJzsnO+InPG0bg+fA==
+"@oxc-parser/binding-android-arm-eabi@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-android-arm-eabi/-/binding-android-arm-eabi-0.135.0.tgz#2c9d8eb7ebeb532c6de7cdbf477a443520c65afb"
+  integrity sha512-sHeZItACNcA5WRAWqF6ixriR4GkZDyY10gVgnZU7pXku1DjHFATSqnwZM809jl0gXPHxb6fKzYQCK7bNK5cACQ==
+
+"@oxc-parser/binding-android-arm64@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-android-arm64/-/binding-android-arm64-0.135.0.tgz#29c22038921726520e3dba33e159c2188b80ca23"
+  integrity sha512-wPte+SzgzWWFgMSF8YZDNM+tBXtJg0AXBi7+tU3yS2z1f2Af9kRLZLKuJojADmuD/cZexmnMHHC3SDItTW77Iw==
+
+"@oxc-parser/binding-darwin-arm64@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-darwin-arm64/-/binding-darwin-arm64-0.135.0.tgz#938661183cf8364061c0ff361c6ce5e1fd2c6f3d"
+  integrity sha512-BmKz3lHIsqVos+9aPcdYCT9MG3APoUyM43KlEFhJMWNVDOGG8FKyiFz81Bc+mGz2o0hpuQ3PfXLfVWJrKXjo2g==
+
+"@oxc-parser/binding-darwin-x64@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-darwin-x64/-/binding-darwin-x64-0.135.0.tgz#3c3ba820f23be26b2b4e51107d1dbd248833cffe"
+  integrity sha512-dM8BS+8+Br1fNvmh2QZbGiHaYttwLebRa6J4Uz9vuFzMNmvsdRYwf7993ptOaV0JTrR63AaoVLjX7nhWbijxjQ==
+
+"@oxc-parser/binding-freebsd-x64@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-freebsd-x64/-/binding-freebsd-x64-0.135.0.tgz#c8e3a43c52c5fe6b4daf9d0da1c1998d677d0f52"
+  integrity sha512-xlZnvvJdR9bGu2pOhvR5hMuKPHCE6Sa9owK5A484mzjHdm75VRV5nCs5w/jkmGODMMTFc+KN7EnZqEieM813kw==
+
+"@oxc-parser/binding-linux-arm-gnueabihf@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.135.0.tgz#9be1173702b296be51353c4a64cd734633bad406"
+  integrity sha512-PSR8LmBK/H/PQRiN8g7RebQgZX/ntVCrdT/JBfNxE5ezdHG1s2i4rbazsRJYD83TTI1MmgTpC0MGL42PLtskQQ==
+
+"@oxc-parser/binding-linux-arm-musleabihf@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.135.0.tgz#c42cbeaa92be8d0121c210a11e05b833295561f4"
+  integrity sha512-I85GJXzfUsigkkk7Ngdz95C217M4FdUi1Z2HrX5UyPmURobwQZ7m2bbUvwFkz4VGZd+lymFGKHvDZ3RQC9qOzA==
+
+"@oxc-parser/binding-linux-arm64-gnu@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.135.0.tgz#e603b2f2bf8e85c4a29bf1c55fe39f924bff7faa"
+  integrity sha512-zqEY0npz0g0aGZj/8a5BclunjVDytsBQHYtIC10Gd26HcrLwbVF6YDbqRQjunMGYdSo97u6xOBl05aTDI2diDQ==
+
+"@oxc-parser/binding-linux-arm64-musl@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.135.0.tgz#22de895f90bed56d28ad4dd5cd5a64a335ecf3f3"
+  integrity sha512-mWAfprP819gQ2qYst1RxgTI8b/z0b29OpoKfRflIXLHde2dZLihQD4g47Onuvtpo5GPIkMYPRlX9QoeZfs/GnQ==
+
+"@oxc-parser/binding-linux-ppc64-gnu@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-0.135.0.tgz#23554f1e8af45bbd06149f2bcb787eb91ab6290e"
+  integrity sha512-gri8c2AOmJKJwOux2KTHFBfUaXoJURuVMKhmKEi/2hTF55cQteTDV2XNfTiE5oCC+Tnem1Y4/MWzcyDadtsSag==
+
+"@oxc-parser/binding-linux-riscv64-gnu@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.135.0.tgz#b90a2358f2e83fc828ba0bd1cbc9ba029786fa5d"
+  integrity sha512-Y2tkupCG5wo0SxH2rMLG4d4Kmv6DaM3sBp+GuM5lox0S8Za6VxKgQrY2Mut088QQxKkEE89n/4CCCgmw2o0e3Q==
+
+"@oxc-parser/binding-linux-riscv64-musl@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-0.135.0.tgz#6dde3858aadfd46516e5e31d98add34f0d482fb8"
+  integrity sha512-xDRJq6i6WTynjeP+ISbDpyH4p9BaJ0wuQcL0lCSDkt9qOXC9dmwpOu1VG/TlwmPI3KpYntmO9nJCuc3TMTsNBA==
+
+"@oxc-parser/binding-linux-s390x-gnu@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.135.0.tgz#f272bb57f746275b7960df5b2fc85ff4e1b32542"
+  integrity sha512-V4MoUuiCRNvihxhIufRxvK+ka013V4joTSK0FAGA1KEjLuNprfH6N/Qw2uxQEVIFuNYMhD/hV6xJ/ptbzlKdHg==
+
+"@oxc-parser/binding-linux-x64-gnu@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.135.0.tgz#90bc1fff2dbcca59f270f081c5c6fb21afef31ce"
+  integrity sha512-JCFZ7zM7KXOKoPAbK/ZB4wY0M1jxRECiem2UQuiXLjzGqS9+hno7mtX+qyK2F7HWK2xPhyJb+frpcOtk5DKOtg==
+
+"@oxc-parser/binding-linux-x64-musl@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-linux-x64-musl/-/binding-linux-x64-musl-0.135.0.tgz#adc1e6c8e700d40ecb9a9a8fc2080565854f01b1"
+  integrity sha512-9jSVS1b3hOV7sdKH4aA2DFfnTz0RgQd0v2BefR+LYbH8yIlmSM22JJZbAAjVeVXmFgUAk3zJQ1tpE/Nd+Vi2YQ==
+
+"@oxc-parser/binding-openharmony-arm64@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-openharmony-arm64/-/binding-openharmony-arm64-0.135.0.tgz#3225195a159166fa6dad7d8f1db328923295c810"
+  integrity sha512-M857ZLBSdn1Uy/SJJz5zh0qGu67B4P9omCgXGBU2LLqTzraX6ZjVNaKq5yW1PDw/LgJXDXR/dbZfgmB310f11Q==
+
+"@oxc-parser/binding-wasm32-wasi@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-wasm32-wasi/-/binding-wasm32-wasi-0.135.0.tgz#03be9f6a6ee3cc88348835842d31f62654ce0253"
+  integrity sha512-2w6DVcntQZX9U5RhXtgiWb3FLWFB5EcwI1U8yr3htOCJUJjagN4BFUHz/Y/d9ZsumndZ6ByxxWEtbUZNE1bfFw==
   dependencies:
     "@emnapi/core" "1.10.0"
     "@emnapi/runtime" "1.10.0"
     "@napi-rs/wasm-runtime" "^1.1.4"
 
-"@oxc-parser/binding-win32-arm64-msvc@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.130.0.tgz#939e48db2b47c93e7e3d4601c8eb6ff113ecc1db"
-  integrity sha512-bjcma99sQrNh6RY4mPO9yTkfxql6TDFoN3HWdK31RCKXwNhcDgJXW/l8PUtzKNiQ+9vpKJfJtQq+LklBuxSOBA==
+"@oxc-parser/binding-win32-arm64-msvc@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.135.0.tgz#8ec307640f1ee3d34b5059c7489f59ea858a452c"
+  integrity sha512-rX1U8+IH2Z37EJjDXKa1iifvUQAdba+vZ4Ewj1iaG5eA/QaSybzclCOwtWa0/5BuUQnnK/T2JHUEFrwhL6Ck2Q==
 
-"@oxc-parser/binding-win32-ia32-msvc@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.130.0.tgz#ed50388593afc1b97f57d598edf4d51fe3e6d6fa"
-  integrity sha512-hRYbv6HhpSTzT4xTiIkadLI7upLQxuOdLPR/9nL1fTjwhgutBTPXrwaAPb/jTFVx6/8C7Jb5HcUKhmNwloTbFA==
+"@oxc-parser/binding-win32-ia32-msvc@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.135.0.tgz#5cb34346b7fb33e7bf85aae9908739fb55bf7673"
+  integrity sha512-9FAisBbH1QICGAjlJobiuKGd/jOuVmyqniWdQMwTa5SkCl6hhuotBCJf1n46B0flYbSOR5TzfV9HZCWSyb3c/Q==
 
-"@oxc-parser/binding-win32-x64-msvc@0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.130.0.tgz#e405110c0812d028c69775c35c6fb235f0fdff55"
-  integrity sha512-RBpA9TsRucJq6HNVNCFF1iKg+QeTkLdZf7hi4xaOGCPvMZWvDHjQgSOEZMUpuW4JNciHbxNhLEYmz5CVygjVGQ==
+"@oxc-parser/binding-win32-x64-msvc@0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-parser/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.135.0.tgz#cd72eec60d628e315361e18bda31af7bdf0cd648"
+  integrity sha512-wYF+A2AzJ2n7ul6q+Z2G/ia0S2+8cUp0AgWZzoFvF4WmUcl1P7p+o6se1Gdr5wGnWuF0iAMIkGddrjCarNr2yA==
 
-"@oxc-project/types@^0.130.0":
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/@oxc-project/types/-/types-0.130.0.tgz#a7825148711dc28805c46cfc21d94b63a4d41e88"
-  integrity sha512-ibD2usx9JRu7f5pu2tMKMI4cpA4NgXJQoYRP4pQ7Pxmn1l6k/53qWtQWZayhYy3X4QZkt90Ot+mJEaeXouio6Q==
+"@oxc-project/types@^0.135.0":
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/@oxc-project/types/-/types-0.135.0.tgz#b41e53f6e42461dfb9588b1e3e113dac988ef1cb"
+  integrity sha512-wR+xRdFkUBMvcAjBJ2q2kcZM6d+DKu2NgoOyxZgYwZdLhmiv6+rnO8PZ/P68kMiZtIKm+pW7zyEJ4kSOs0vo+Q==
 
 "@oxc-resolver/binding-android-arm-eabi@11.20.0":
   version "11.20.0"
@@ -1608,21 +1578,21 @@
     "@parcel/watcher-win32-ia32" "2.5.6"
     "@parcel/watcher-win32-x64" "2.5.6"
 
-"@rc-component/async-validator@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/async-validator/-/async-validator-5.1.0.tgz#e81f31e676d9cadc71e4310bbf1749c7a5882291"
-  integrity sha512-n4HcR5siNUXRX23nDizbZBQPO0ZM/5oTtmKZ6/eqL0L2bo747cklFdZGRN2f+c9qWGICwDzrhW0H7tE9PptdcA==
+"@rc-component/async-validator@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/async-validator/-/async-validator-6.0.0.tgz#1c20b8864f69bac63b7876b1321697c2ea71c68d"
+  integrity sha512-D3AGQwdyE58gmvx6waVSXJ80JGO+IY5L2O8HDnSOex7JNlzB3GuN/4hyHNTdhy2qtOhkpbIjmeAN3tL993wKbA==
   dependencies:
     "@babel/runtime" "^7.24.4"
 
-"@rc-component/cascader@~1.15.0":
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/cascader/-/cascader-1.15.0.tgz#554cba8e01e94a1288547cec96422b2cfc73ff40"
-  integrity sha512-ZzpMtwFCRo3fbXHuDnncARJMZQjdqA2w7aDuPofNQt+aDx39st1hgfIpEwTBLhe2Hqsvs/zOr8RTtgxTkCPySw==
+"@rc-component/cascader@~1.16.1":
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/cascader/-/cascader-1.16.1.tgz#94193ee55009219999a46e005a0f8589c8c021a2"
+  integrity sha512-wxLopwM+EBed0zNNGdnGE4coYoqcO+XD42fHgn+pDvO+XzhNFbdgSlSNXdKocIYqccvqgWvoxDPNb0OVRdi59A==
   dependencies:
-    "@rc-component/select" "~1.6.0"
-    "@rc-component/tree" "~1.3.0"
-    "@rc-component/util" "^1.4.0"
+    "@rc-component/select" "~1.7.1"
+    "@rc-component/tree" "~1.3.2"
+    "@rc-component/util" "^1.11.1"
     clsx "^2.1.1"
 
 "@rc-component/checkbox@~2.0.0":
@@ -1653,11 +1623,11 @@
     clsx "^2.1.1"
 
 "@rc-component/context@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@rc-component/context/-/context-2.0.1.tgz#88c7a565ae92c34a7f02f33c34b145e4039deed0"
-  integrity sha512-HyZbYm47s/YqtP6pKXNMjPEMaukyg7P0qVfgMLzr7YiFNMHbK2fKTAGzms9ykfGHSfyf75nBbgWw+hHkp+VImw==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@rc-component/context/-/context-2.0.2.tgz#b1047ad96501630d33f046892c8121f29629f38c"
+  integrity sha512-uiGpAlblCNlziHPwj4S4Iy/oemeuz/hR03mbiEjTCXwsqOIN3BOzsRMyDwpyO5Fm0vIEEJRUf9ZtbRLbhksuTA==
   dependencies:
-    "@rc-component/util" "^1.3.0"
+    "@rc-component/util" "^1.11.0"
 
 "@rc-component/dialog@~1.9.0":
   version "1.9.0"
@@ -1688,13 +1658,13 @@
     "@rc-component/util" "^1.2.1"
     clsx "^2.1.1"
 
-"@rc-component/form@~1.8.1":
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/@rc-component/form/-/form-1.8.1.tgz#d811fb52df41bf72297938ebfe5cf4a4774588d4"
-  integrity sha512-8O7TB55Fi2mWIGvSnwZjk8jFqVNYyKDAswglwGShcbndxqzKz4cHwNtNaLjZlAeRge9wcB0LL8IWsC/Bl18raQ==
+"@rc-component/form@~1.8.3":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@rc-component/form/-/form-1.8.5.tgz#20571cfd401dc38c74c38cdf4722ddc6c23a9806"
+  integrity sha512-d24EYtvUOBhxEtSd/EqIu9DaMuqrWF2IRIvAFCTM6NQ/GJIYNr8DvEpUSUlv2uPxEJ0ZPwYQ+wwlGIAaiHvdrw==
   dependencies:
-    "@rc-component/async-validator" "^5.1.0"
-    "@rc-component/util" "^1.6.2"
+    "@rc-component/async-validator" "^6.0.0"
+    "@rc-component/util" "^1.11.1"
     clsx "^2.1.1"
 
 "@rc-component/image@~1.9.0":
@@ -1716,13 +1686,13 @@
     "@rc-component/util" "^1.4.0"
     clsx "^2.1.1"
 
-"@rc-component/input@~1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/input/-/input-1.3.0.tgz#a8c113000bbc39089cf75337bec68120115b9e05"
-  integrity sha512-IUUNOdAuWuEvDEFFgfmwQl818tiDbvXwLgon4HL1q2hJeYkqrRrYwYhJN0zfPHGTDxs3gvyVC/C02D4hWFoIcA==
+"@rc-component/input@~1.3.0", "@rc-component/input@~1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/input/-/input-1.3.1.tgz#230b8b59cdde8521d50f0eede63ddacb61cc0cd3"
+  integrity sha512-iFvTUT9W+JC/MSin2aGAk8NqsVlTzcExNC9DZariON1IWirju9NoNeEk47an4Q8iHazkoVI/y1LnDi88+CPcig==
   dependencies:
     "@rc-component/resize-observer" "^1.1.1"
-    "@rc-component/util" "^1.4.0"
+    "@rc-component/util" "^1.11.1"
     clsx "^2.1.1"
 
 "@rc-component/mentions@~1.9.0":
@@ -1736,30 +1706,30 @@
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/menu@~1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/menu/-/menu-1.3.0.tgz#fc70d81ca76ae6013b0d7955f20a2393adef04b3"
-  integrity sha512-u3NfiwpiEgT177qa5Yxm5QsI8i/93EBGpWj8HYZQDnh2pCZ2xtQCe/+w3pSR2NlwKOZDTCKzEhEyD09mGphssA==
+"@rc-component/menu@~1.3.0", "@rc-component/menu@~1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/menu/-/menu-1.3.1.tgz#16cae71a01080914e8bac08359fccdda7bfce540"
+  integrity sha512-pSZl9nBPgKgxN0aaW7NilIBEwWsc+43S+ulGdWAg9afak96dNOGWsGx0DLLBB1VQsAJvo6bQMTDzXoPlEHsBEw==
   dependencies:
     "@rc-component/motion" "^1.1.4"
     "@rc-component/overflow" "^1.0.0"
     "@rc-component/trigger" "^3.0.0"
-    "@rc-component/util" "^1.3.0"
+    "@rc-component/util" "^1.11.1"
     clsx "^2.1.1"
 
 "@rc-component/mini-decimal@^1.0.1":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@rc-component/mini-decimal/-/mini-decimal-1.1.3.tgz#461d0cd2a91efd3c92503763d8c00625552d211f"
-  integrity sha512-bk/FJ09fLf+NLODMAFll6CfYrHPBioTedhW6lxDBuuWucJEqFUd4l/D/5JgIi3dina6sYahB8iuPAZTNz2pMxw==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@rc-component/mini-decimal/-/mini-decimal-1.1.4.tgz#36bccedbffb54662ba314a26f63910414f48bc44"
+  integrity sha512-xiuXcaCwyOWpD8a8scdExFl+bntNphAW8XeenL1ig2en0AAZY0Pcp4pC0dI22qJ+NvxKn9RoNIoRdqYU3BLH4w==
   dependencies:
     "@babel/runtime" "^7.18.0"
 
-"@rc-component/motion@^1.0.0", "@rc-component/motion@^1.1.3", "@rc-component/motion@^1.1.4", "@rc-component/motion@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@rc-component/motion/-/motion-1.3.2.tgz#bd96e0fd16ee9d98c1d9be14198f003e367d8feb"
-  integrity sha512-itfd+GztzJYAb04Z4RkEub1TbJAfZc2Iuy8p44U44xD1F5+fNYFKI3897ijlbIyfvXkTmMm+KGcjkQQGMHywEQ==
+"@rc-component/motion@^1.0.0", "@rc-component/motion@^1.1.3", "@rc-component/motion@^1.1.4", "@rc-component/motion@^1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@rc-component/motion/-/motion-1.3.3.tgz#6a7bbe0a9f070bd11642168f741d40e78bb28565"
+  integrity sha512-Xh3IszxvlSv3/PLYFyC2UZi9LNB83yOnkB/LNmRzaypZLvkhqUIPS7MQpGZcCMWrNsXV2p6YTSWbSGvFpEle9A==
   dependencies:
-    "@rc-component/util" "^1.2.0"
+    "@rc-component/util" "^1.11.0"
     clsx "^2.1.1"
 
 "@rc-component/mutate-observer@^2.0.1":
@@ -1788,12 +1758,12 @@
     "@rc-component/util" "^1.4.0"
     clsx "^2.1.1"
 
-"@rc-component/pagination@~1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/pagination/-/pagination-1.2.0.tgz#3a97abda8f1077f514e03a74b3b9c77f9e68499a"
-  integrity sha512-YcpUFE8dMLfSo6OARJlK6DbHHvrxz7pMGPGmC/caZSJJz6HRKHC1RPP001PRHCvG9Z/veD039uOQmazVuLJzlw==
+"@rc-component/pagination@~1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/pagination/-/pagination-1.3.0.tgz#ee66301e37a03974826fb3028a91a1aeacdcd0ac"
+  integrity sha512-12ahTY+HPITg1L2bjWKXUqBJe/oOnpA2QsChdCjthqLVf/e19StiCsv8OLKpWoHbc+8PFEkNjRqRqrLoRBHjFw==
   dependencies:
-    "@rc-component/util" "^1.3.0"
+    "@rc-component/util" "^1.11.1"
     clsx "^2.1.1"
 
 "@rc-component/picker@~1.10.0":
@@ -1808,11 +1778,11 @@
     clsx "^2.1.1"
 
 "@rc-component/portal@^2.1.0", "@rc-component/portal@^2.1.2", "@rc-component/portal@^2.1.3", "@rc-component/portal@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/portal/-/portal-2.2.0.tgz#ec4c6c3de2cd09fa3ce545f2439a7eb84852a7b9"
-  integrity sha512-oc6FlA+uXCMiwArHsJyHcIkX4q6uKyndrPol2eWX8YPkAnztHOPsFIRtmWG4BMlGE5h7YIRE3NiaJ5VS8Lb1QQ==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/portal/-/portal-2.2.1.tgz#37c34b4c8cd73f53cc7072c96dd0e9ac332669ec"
+  integrity sha512-ck+r1kW/JSv0wxPji3KN2ss9K6Z0qqwusw/mf/0JobXhZ8hC2ejZwCJObW/SvDi0uhA0VzmCnx0CaCci95tcmA==
   dependencies:
-    "@rc-component/util" "^1.2.1"
+    "@rc-component/util" "^1.11.0"
     clsx "^2.1.1"
 
 "@rc-component/progress@~1.0.2":
@@ -1823,10 +1793,10 @@
     "@rc-component/util" "^1.2.1"
     clsx "^2.1.1"
 
-"@rc-component/qrcode@~1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@rc-component/qrcode/-/qrcode-1.1.1.tgz#909f181bb9a7469d32a6e96c7f35476d4bd92008"
-  integrity sha512-LfLGNymzKdUPjXUbRP+xOhIWY4jQ+YMj5MmWAcgcAq1Ij8XP7tRmAXqyuv96XvLUBE/5cA8hLFl9eO1JQMujrA==
+"@rc-component/qrcode@~2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/qrcode/-/qrcode-2.0.0.tgz#ef4134c213002e7a43edbe609b24248914de4974"
+  integrity sha512-aAv3QhPP1xyafuTZOxub6a54pCeBnN3IwQkpETrBtthq4BL5IgxnCbuoBWPDpdLw1y1j6BgBUCAKV92+yX06Dw==
   dependencies:
     "@babel/runtime" "^7.24.7"
 
@@ -1855,15 +1825,15 @@
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/select@~1.6.0", "@rc-component/select@~1.6.15":
-  version "1.6.15"
-  resolved "https://registry.yarnpkg.com/@rc-component/select/-/select-1.6.15.tgz#de2a3c8b020834cabd600b52de573a328c061eef"
-  integrity sha512-SyVCWnqxCQZZcQvQJ/CxSjx2bGma6ds/HtnpkIfZVnt6RoEgbqUmHgD6vrzNarNXwbLXerwVzWwq8F3d1sst7g==
+"@rc-component/select@~1.7.0", "@rc-component/select@~1.7.1":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/select/-/select-1.7.1.tgz#cdda0ac185f00ebed1c85e7809ae1f7855a9f7ab"
+  integrity sha512-GZ1cMJk2xQh0VHyOQjjG8drYL4iu24NcbkXioUcReQOCUr+ub/3fmRonZe6cRPEZhWMbJdeHsqnEltogDaZ5Tg==
   dependencies:
     "@rc-component/overflow" "^1.0.0"
     "@rc-component/trigger" "^3.0.0"
-    "@rc-component/util" "^1.3.0"
-    "@rc-component/virtual-list" "^1.0.1"
+    "@rc-component/util" "^1.11.1"
+    "@rc-component/virtual-list" "^1.2.0"
     clsx "^2.1.1"
 
 "@rc-component/slider@~1.0.1":
@@ -1890,27 +1860,27 @@
     "@rc-component/util" "^1.3.0"
     clsx "^2.1.1"
 
-"@rc-component/table@~1.10.0":
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/table/-/table-1.10.0.tgz#7a98d68176f23f50a762df464f4c9142e7db3942"
-  integrity sha512-SjtpcCf+rL7dDc62GKT3rXTdERjVuJvRiqjpU7g0Jc/ewCifXynHc7Nm3Em1XsD+WhGrgQtxNDScI/0+Lpfr0w==
+"@rc-component/table@~1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@rc-component/table/-/table-1.10.2.tgz#7b052fd5eb2ccf6996a93eebeb7af7036a262c8b"
+  integrity sha512-b3PjqB9Gp25p5t/zq+9QrbXbodkptT8/zvLmwgd2FNPUUtaYyDnQqfxeD5a7ao8E8lpinLHsi2u2vdfPhyNvAw==
   dependencies:
     "@rc-component/context" "^2.0.1"
     "@rc-component/resize-observer" "^1.0.0"
-    "@rc-component/util" "^1.1.0"
+    "@rc-component/util" "^1.11.1"
     "@rc-component/virtual-list" "^1.0.1"
     clsx "^2.1.1"
 
-"@rc-component/tabs@~1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/tabs/-/tabs-1.9.0.tgz#8f3e3755450e5a90d240d1ed3dc140d520b1fbef"
-  integrity sha512-tn1slmbbaTyt8mgwyWJcT8jo/qNiYUs6u1H7OgGQt9faYO06BJIkU5cTmMqORzIrNmSEeeUY6pD5i+JlqSHYhg==
+"@rc-component/tabs@~1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/tabs/-/tabs-1.9.1.tgz#52b9cb0392c718fba43e7d558f46f6c910d19acb"
+  integrity sha512-6mY08Fce6aNOHuGsxbzT+f2ekgL9mg1cGGHkittMlVGymjGg+kGupu5v90sRxcUd/paRU9jclLLXtF/PkK1FUA==
   dependencies:
     "@rc-component/dropdown" "~1.0.0"
     "@rc-component/menu" "~1.3.0"
     "@rc-component/motion" "^1.1.3"
     "@rc-component/resize-observer" "^1.0.0"
-    "@rc-component/util" "^1.3.0"
+    "@rc-component/util" "^1.11.1"
     clsx "^2.1.1"
 
 "@rc-component/tooltip@~1.4.0":
@@ -1932,30 +1902,30 @@
     "@rc-component/util" "^1.7.0"
     clsx "^2.1.1"
 
-"@rc-component/tree-select@~1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/tree-select/-/tree-select-1.9.0.tgz#13ea516478b6cb558e04181abb0a01ae6fbdd31f"
-  integrity sha512-GXcFe15a+trUl1/J3OHWQhsVWFpwFpGFK2cqYWZ1sK22Zs3KZTvMwDpzr75PIo1s6QVioVxpE/pRwRopkeDQ6w==
+"@rc-component/tree-select@~1.10.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/tree-select/-/tree-select-1.10.0.tgz#72e337fd58591f677404189cb3e9d3f718cd3332"
+  integrity sha512-E1U4pn2LAbXEhLJdzIzid7WYbIuFbkTIctuFoeC6weppf8UbPR3+YYB6/ay0c0ksand4gXMRQpa1Z60Auo7VJA==
   dependencies:
-    "@rc-component/select" "~1.6.0"
+    "@rc-component/select" "~1.7.0"
     "@rc-component/tree" "~1.3.0"
     "@rc-component/util" "^1.4.0"
     clsx "^2.1.1"
 
-"@rc-component/tree@~1.3.0", "@rc-component/tree@~1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@rc-component/tree/-/tree-1.3.1.tgz#6983ca6bd9d5f6d04dd7258d00cb0fe71cdfe661"
-  integrity sha512-zlL0PW0bTFlveTtLcA01VD/yMWKK73EywItFMgIZUY5sb6tMOAw7zV6qGzqldufqrV93ZWQB4H3NBNoTMCueJA==
+"@rc-component/tree@~1.3.0", "@rc-component/tree@~1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@rc-component/tree/-/tree-1.3.2.tgz#4b0c13564314eff61ca948c18ef923b87c9d7e44"
+  integrity sha512-bJFj46wEkpBPnWyTm18XmgAgNQ/4YvprxMOPPY2a6rmhGJYxLuNKEFiL5Qej4Qctu9wHJm8WW+v2SYskafE0kA==
   dependencies:
     "@rc-component/motion" "^1.0.0"
-    "@rc-component/util" "^1.8.1"
-    "@rc-component/virtual-list" "^1.0.1"
+    "@rc-component/util" "^1.11.1"
+    "@rc-component/virtual-list" "^1.2.0"
     clsx "^2.1.1"
 
-"@rc-component/trigger@^3.0.0", "@rc-component/trigger@^3.6.15", "@rc-component/trigger@^3.7.1", "@rc-component/trigger@^3.9.0":
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/trigger/-/trigger-3.9.0.tgz#d4d2df167e9aced1bf17672d9104a3297663f766"
-  integrity sha512-X8btpwfrT27AgrZVOz4swclhEHTZcqaHeQMXXBgveagOiakTa36uObXbdwerXffgV8G9dH1fAAE0DHtVQs8EHg==
+"@rc-component/trigger@^3.0.0", "@rc-component/trigger@^3.6.15", "@rc-component/trigger@^3.7.1", "@rc-component/trigger@^3.9.1":
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/trigger/-/trigger-3.9.1.tgz#3f730315c558bc392921a563ac9109a1d094ef23"
+  integrity sha512-LNsYvz60mrLJ/kRvKcHE7boUvcQfVMCfRqZ71x3Fo9AOiZ1KKIEqkzMA8DNvz2V3Bcvir/vwQNn7JF1NPODQ7Q==
   dependencies:
     "@rc-component/motion" "^1.1.4"
     "@rc-component/portal" "^2.2.0"
@@ -1963,15 +1933,15 @@
     "@rc-component/util" "^1.2.1"
     clsx "^2.1.1"
 
-"@rc-component/upload@~1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/upload/-/upload-1.1.0.tgz#cb634587ffdf8a8a4a26a279fac06989fb47f593"
-  integrity sha512-LIBV90mAnUE6VK5N4QvForoxZc4XqEYZimcp7fk+lkE4XwHHyJWxpIXQQwMU8hJM+YwBbsoZkGksL1sISWHQxw==
+"@rc-component/upload@~1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/upload/-/upload-1.1.1.tgz#90d16edcdaeb104ffa9111fd0b428061de7c21ac"
+  integrity sha512-GvYWSKeaJTOxxC5p6+nOSadzfvXA1h8C/iHFPFZX+szH3JUXrvs+DLiW8YUTBgvMh8m63mJeHrlYlJzAlg+pDA==
   dependencies:
-    "@rc-component/util" "^1.3.0"
+    "@rc-component/util" "^1.11.1"
     clsx "^2.1.1"
 
-"@rc-component/util@^1.1.0", "@rc-component/util@^1.10.1", "@rc-component/util@^1.11.0", "@rc-component/util@^1.2.0", "@rc-component/util@^1.2.1", "@rc-component/util@^1.3.0", "@rc-component/util@^1.4.0", "@rc-component/util@^1.6.2", "@rc-component/util@^1.7.0", "@rc-component/util@^1.8.1", "@rc-component/util@^1.9.0":
+"@rc-component/util@^1.10.1", "@rc-component/util@^1.11.0", "@rc-component/util@^1.11.1", "@rc-component/util@^1.2.0", "@rc-component/util@^1.2.1", "@rc-component/util@^1.3.0", "@rc-component/util@^1.4.0", "@rc-component/util@^1.7.0", "@rc-component/util@^1.9.0":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@rc-component/util/-/util-1.11.1.tgz#07d698908339c55648e4f974afa739345e65b483"
   integrity sha512-awVlI3ub2vqfqkYxOBc/uQ0efm3jw0wcrhtO/YWLyZfxiKXczKwNbVuhlnyxytDt7H9pbbVQiqr+O6MLATtRYg==
@@ -1979,10 +1949,10 @@
     is-mobile "^5.0.0"
     react-is "^18.2.0"
 
-"@rc-component/virtual-list@^1.0.1":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/virtual-list/-/virtual-list-1.1.0.tgz#94cdab75776a44a47cf1d4905c2828cf1cc62720"
-  integrity sha512-fSzVg8xFDCK+xKJJ9lljBpaGDmur4REZwXHJjsNFRi4UbfOXuH/FSbGC2oliCE5krFqM3lSZqB4Ly4vc3xQHOQ==
+"@rc-component/virtual-list@^1.0.1", "@rc-component/virtual-list@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/virtual-list/-/virtual-list-1.2.0.tgz#3c9ee8cd7d10da334a2a06ad86ca234e2792a381"
+  integrity sha512-iavRm1Jo4GDbASQwdGa7jFyk93RvSOo9xHyBT4QL1pgFJj/Fdf1G+3RErH7/7BmAMvx2AkF62mjGYxDbXsK9TQ==
   dependencies:
     "@babel/runtime" "^7.20.0"
     "@rc-component/resize-observer" "^1.0.1"
@@ -1990,9 +1960,9 @@
     clsx "^2.1.1"
 
 "@repeaterjs/repeater@^3.0.4", "@repeaterjs/repeater@^3.0.6":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.0.6.tgz#be23df0143ceec3c69f8b6c2517971a5578fdaa2"
-  integrity sha512-Javneu5lsuhwNCryN+pXH93VPQ8g0dBX7wItHFgYiwQmzE1sVdg5tWHiOgHywzL2W21XQopa7IwIEnNbmeUJYA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.1.0.tgz#312b20a655e5b3ebfe8b1e04ec7df567bcb48d87"
+  integrity sha512-TaoVksZRSx2KWYYpyLQtMQXXeS98VsgZImzW65xmiVgbYhXLk+aEsmzPLirqVuE4/XuUapH2iMtxUzaBNDzdSQ==
 
 "@rtsao/scc@^1.1.0":
   version "1.1.0"
@@ -2006,7 +1976,7 @@
   dependencies:
     tslib "^2.8.0"
 
-"@tybys/wasm-util@^0.10.1":
+"@tybys/wasm-util@^0.10.2":
   version "0.10.2"
   resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.2.tgz#12b3a1b33db1f9cad4ddff1f604ab7dd00bf464e"
   integrity sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==
@@ -2041,18 +2011,18 @@
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
 "@types/node@*":
-  version "25.9.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-25.9.0.tgz#4823e66e0f486bfd8d9019fb445fbbb9e6f77348"
-  integrity sha512-AOQwYUNolgy3VosiRqXrACUXTN8nJUtPl7FJXMqZVyxiiCLhQuG3jXKvCS1ALr+Y2OmZhzzLVlYPEqJaiqkaJQ==
+  version "25.9.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-25.9.3.tgz#11dfe7a33e68fa5c560f0aa76cc5595621ef26b9"
+  integrity sha512-603BddQMv3pUcr4U2dhujk83N2tTDVr/34wII2B6bJy6g+8WD6yUb11jszNs0gdi4PesVWl7ABt8nYMVpnLUcg==
   dependencies:
     undici-types ">=7.24.0 <7.24.7"
 
 "@types/node@^24.10.1":
-  version "24.12.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.12.4.tgz#2709745569811dcbdc57c097fafdd387c6330382"
-  integrity sha512-GUUEShf+PBCGW2KaXwcIt3Yk+e3pkKwWKb9GSyM9WQVE+ep2jzmHdGsHzu4wgcZy5fN9FBdVzjpBQsYlpfpgLA==
+  version "24.13.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.13.2.tgz#3b9b280a7055128359f125eb1067d9a190f39854"
+  integrity sha512-fRa09kZTgu8o71KFcDjUFuc7F+dEbZYZmkI0mg5YBTRs0yMKjYHsq/c0urDKeDb+D5qVgXOdFcuu+DZPKOITwA==
   dependencies:
-    undici-types "~7.16.0"
+    undici-types "~7.18.0"
 
 "@types/react-dom@^19.2.3":
   version "19.2.3"
@@ -2060,9 +2030,9 @@
   integrity sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==
 
 "@types/react@^19.2.5":
-  version "19.2.14"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.2.14.tgz#39604929b5e3957e3a6fa0001dafb17c7af70bad"
-  integrity sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==
+  version "19.2.17"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.2.17.tgz#dccac365baa0f1734ec270ff4b51c89465e8dc7f"
+  integrity sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==
   dependencies:
     csstype "^3.2.2"
 
@@ -2073,205 +2043,215 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.4.tgz#c67bfee32caae9cb587dce1ac59c3bf43b659707"
-  integrity sha512-PegsU+XfyJJNjd4+u/k6f9yTyp0lEXXiPopUNobZcIAUJFGICFLN+sP0Rb3JehVmiij1Ph0dFGYqODoRo/2+6A==
+"@typescript-eslint/eslint-plugin@8.61.1":
+  version "8.61.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.61.1.tgz#6e4b7fee21f1983308e9e9b634ecbaf702c86006"
+  integrity sha512-ZPlVl3PB3et/59Ne0fv/sci6ZXz4T4Hp4nTJ56i/Y0gR89ARb+KphojTq6j+56E5PIezmOIOOWyY+aWQFd+IkQ==
   dependencies:
     "@eslint-community/regexpp" "^4.12.2"
-    "@typescript-eslint/scope-manager" "8.59.4"
-    "@typescript-eslint/type-utils" "8.59.4"
-    "@typescript-eslint/utils" "8.59.4"
-    "@typescript-eslint/visitor-keys" "8.59.4"
+    "@typescript-eslint/scope-manager" "8.61.1"
+    "@typescript-eslint/type-utils" "8.61.1"
+    "@typescript-eslint/utils" "8.61.1"
+    "@typescript-eslint/visitor-keys" "8.61.1"
     ignore "^7.0.5"
     natural-compare "^1.4.0"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/parser@8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.59.4.tgz#77d99e3b27663e7a22cf12c3fb769db509e5e93c"
-  integrity sha512-zORHqO/tuhxY1zWuTvMUqddRxpiFJ72xVfcNoWpqdLjs6lfPbuQBJuW4pk+49/uBMy7Ssr4bzgjiKmmDB1UbZQ==
+"@typescript-eslint/parser@8.61.1":
+  version "8.61.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.61.1.tgz#881fba60b50636249cdeea2e547bf75715254c72"
+  integrity sha512-PJ5vePq5/ognBbrIcoC5+SHO5dfpeLPzP9FpLkzWrguoYQEeeSjlJpVwOpo1JRSTEi7dRcwNy4h4dzV70PqHcg==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.59.4"
-    "@typescript-eslint/types" "8.59.4"
-    "@typescript-eslint/typescript-estree" "8.59.4"
-    "@typescript-eslint/visitor-keys" "8.59.4"
+    "@typescript-eslint/scope-manager" "8.61.1"
+    "@typescript-eslint/types" "8.61.1"
+    "@typescript-eslint/typescript-estree" "8.61.1"
+    "@typescript-eslint/visitor-keys" "8.61.1"
     debug "^4.4.3"
 
-"@typescript-eslint/project-service@8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.59.4.tgz#5830535a0e7a3ae806e2669964f47a74c4bc6b0e"
-  integrity sha512-Ly00Vu4oAacfDeHp2Zg85ioNG6l8HG+tN1D7J+xTHSxu9y0awYKJ2zH1rFBn8ZSfuGK+7FxK3Cgl3uAz0aZZLg==
+"@typescript-eslint/project-service@8.61.1":
+  version "8.61.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.61.1.tgz#fcd9739964a40867eed55f1ac318d3909f24b4af"
+  integrity sha512-PrC4JYGmR241lYnfhmKGTXkFqv8+ymbTFgSAY0fVXpY82/QkMw5TZPl+vGzuDDU2QYJk9fIDOBTntF+yDv9LEA==
   dependencies:
-    "@typescript-eslint/tsconfig-utils" "^8.59.4"
-    "@typescript-eslint/types" "^8.59.4"
+    "@typescript-eslint/tsconfig-utils" "^8.61.1"
+    "@typescript-eslint/types" "^8.61.1"
     debug "^4.4.3"
 
-"@typescript-eslint/scope-manager@8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.59.4.tgz#507d1258c758147dac1adee9517a205a8ac1e046"
-  integrity sha512-mUeR/3H1WrTAddJrwut8OoPjfauaztMQmRwV5fQTUyNVJCLiUXXe4lGEyYIL2oFDpP7UtgbGJXCt72wT0z2S3Q==
+"@typescript-eslint/scope-manager@8.61.1":
+  version "8.61.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.61.1.tgz#2479921a40fdb0afa18f5838fae6167264b417b2"
+  integrity sha512-L2bdIeoQS8FlKAvONAr20w6OcLXeB+qiDKbAooS9A0Ben+iSIkBef0FxqwKWYqt5sa0i4KJtxVyVmhMylKzF5w==
   dependencies:
-    "@typescript-eslint/types" "8.59.4"
-    "@typescript-eslint/visitor-keys" "8.59.4"
+    "@typescript-eslint/types" "8.61.1"
+    "@typescript-eslint/visitor-keys" "8.61.1"
 
-"@typescript-eslint/tsconfig-utils@8.59.4", "@typescript-eslint/tsconfig-utils@^8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.4.tgz#218ba229d96dde35212e3a76a7d0a6bc831398be"
-  integrity sha512-DLCpnKgD4alVxTBSKulK+gU1KCqOgUXfDRDXh2mZgzokQKa/70ax93I2uVO3m/LLvIAtWZIFoiifudmIqAxpMA==
+"@typescript-eslint/tsconfig-utils@8.61.1", "@typescript-eslint/tsconfig-utils@^8.61.1":
+  version "8.61.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.61.1.tgz#ca88080e0cf191d49516d7f300b67aa090d2254f"
+  integrity sha512-UN/H4di+OO7EWx2ovME+8t31YO+KVnK0RRKEHR3kOt21/Ay8BOq3M1OMvWs5vNiqcFCYGYoxK3MXPZzmMUE+yg==
 
-"@typescript-eslint/type-utils@8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.59.4.tgz#359fc53ba39a1f1860fddda40ebe5bfe0d87faed"
-  integrity sha512-uonTuPAAKr9XaBGqJ3LjYTh72zy5DyGesljO9gtmk/eFW0W1fRHjnwVYKB35Lm8d5Q5CluEW3gPHjTvZTmgrfA==
+"@typescript-eslint/type-utils@8.61.1":
+  version "8.61.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.61.1.tgz#8fa18f453ee140893b47d339d1a6b64cac9b08a1"
+  integrity sha512-GYRicKmVK0C4fsKgaACaknOUAq9Oa2kwsjnpFhFcS/5p4Ht5IP9OVLbgIgcK4SRk92nVHFluurg1lumD9dBcLw==
   dependencies:
-    "@typescript-eslint/types" "8.59.4"
-    "@typescript-eslint/typescript-estree" "8.59.4"
-    "@typescript-eslint/utils" "8.59.4"
+    "@typescript-eslint/types" "8.61.1"
+    "@typescript-eslint/typescript-estree" "8.61.1"
+    "@typescript-eslint/utils" "8.61.1"
     debug "^4.4.3"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/types@8.59.4", "@typescript-eslint/types@^8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.59.4.tgz#c29d5c21bfbaa8347ddc677d3ac1fcd2db0f848e"
-  integrity sha512-F1o7WJcCq+bc8dwcO/YsSEOudAH8RDtaOhM6wcAQhcUsFhnWQl81JKy48q1hoxAU0qrzM89+31GYh1515Zde3Q==
+"@typescript-eslint/types@8.61.1", "@typescript-eslint/types@^8.61.1":
+  version "8.61.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.61.1.tgz#0c51f518e4e6848371a1c988e859d59eb7522d5a"
+  integrity sha512-G+CRlPqLv7Bz1IZVs03x5K59F1veqL0EJUROAdGhKsEq8qOiRiZbI+HUojPq5l0fEGOKModD9br6lObhB8zkoA==
 
-"@typescript-eslint/typescript-estree@8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.4.tgz#d005e5e1fb425526f39685594bed34a04ad755ea"
-  integrity sha512-F+RuOmcDXo4+TPdfd/TCLS3m2nw8gE9XXyZLrA3JBfaA5tz9TtdkyD3YJFmPxulyc2cKbEok/CvFE3MgSLWnag==
+"@typescript-eslint/typescript-estree@8.61.1":
+  version "8.61.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.61.1.tgz#febbe70365ac0bf7611262b61b338fc8797965c7"
+  integrity sha512-u+oQD3BqYWPc8YV9Zab4vaJElJuwOLPRc10Jm1o/qS+6Qwen14HCWwx0Seo4LnSn2wxea2Ik8DxPt2/FHmuhrg==
   dependencies:
-    "@typescript-eslint/project-service" "8.59.4"
-    "@typescript-eslint/tsconfig-utils" "8.59.4"
-    "@typescript-eslint/types" "8.59.4"
-    "@typescript-eslint/visitor-keys" "8.59.4"
+    "@typescript-eslint/project-service" "8.61.1"
+    "@typescript-eslint/tsconfig-utils" "8.61.1"
+    "@typescript-eslint/types" "8.61.1"
+    "@typescript-eslint/visitor-keys" "8.61.1"
     debug "^4.4.3"
     minimatch "^10.2.2"
     semver "^7.7.3"
     tinyglobby "^0.2.15"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/utils@8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.59.4.tgz#8ccd2b08aecc72c7efc0d7ac6695631d199d256e"
-  integrity sha512-cYXeNAUsG4lJo5dbc1FcKm+JwIWrj1/UpTORsC6tGMjEZ81DYcvIr9/ueikhMa/Y/gDQYGp+YX9/xQrXje5BJw==
+"@typescript-eslint/utils@8.61.1":
+  version "8.61.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.61.1.tgz#ffd1054de7dd33b7873cd6c6713ec6b0366316d3"
+  integrity sha512-1+P/3Dj6jvtybE1q0HQ6yBt/gq+oKJyLdEv4HdnqasaEXRSYCAsD59mXEVQnM/ULNdQxbX77tdG4jPRjIS6knA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.9.1"
-    "@typescript-eslint/scope-manager" "8.59.4"
-    "@typescript-eslint/types" "8.59.4"
-    "@typescript-eslint/typescript-estree" "8.59.4"
+    "@typescript-eslint/scope-manager" "8.61.1"
+    "@typescript-eslint/types" "8.61.1"
+    "@typescript-eslint/typescript-estree" "8.61.1"
 
-"@typescript-eslint/visitor-keys@8.59.4":
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.4.tgz#1ac23b747b011f5cbdb449da97769f6c5f3a9355"
-  integrity sha512-U3gxVaDVnuZKhSspW/MzMxE1kq7zOdc072FcSNoqA1I9p8HyKbBFfEHoWckBAMgNMph4MamwS5iTVzFmrnt8TQ==
+"@typescript-eslint/visitor-keys@8.61.1":
+  version "8.61.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.61.1.tgz#546cf102b4efdb72a9a08e63a1b0d7d745eb66eb"
+  integrity sha512-6fJ9MHWtK14C1DSkiMlHUSOmrVebL7150xZJBlJiL62jjhIA4JmOq6flwBgDxIdBKKdoiZRel+dfPD5MLfny3w==
   dependencies:
-    "@typescript-eslint/types" "8.59.4"
+    "@typescript-eslint/types" "8.61.1"
     eslint-visitor-keys "^5.0.0"
 
-"@unrs/resolver-binding-android-arm-eabi@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.12.1.tgz#c2afb2c77092f87f0c30e81c0e5782f2a0bed686"
-  integrity sha512-diBxYrhKMJWZiQMFDgKVRDV4zSRyRTR6PBg+0p6/7zAWP6fqUfl0Be0RKvjLhzfRT0Ye5TCAP04gg4rZHSTvnA==
-
-"@unrs/resolver-binding-android-arm64@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.12.1.tgz#9096b470c59edd56c87f7140edafdfffaa0aa5e5"
-  integrity sha512-7VQXkWRrq3zFmL1byHilfy8YjCGxf9dKMYbLIGzR6ujAu4+FB3YD8IkesmpgB9vpiitYjMPs/Dk5Sh/P9aoHLQ==
-
-"@unrs/resolver-binding-darwin-arm64@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.12.1.tgz#b0711e982559c5d8a9b68ca93b0707c4917e9a09"
-  integrity sha512-SJbHelGnb7hZVLCEWSkbTOpmTC63ZUweZEIPNtRD1D+UkDqYHFynwGUTG1WAjQTdTTaiJ4xab3z5Vk334WeqbA==
-
-"@unrs/resolver-binding-darwin-x64@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.12.1.tgz#d35837ed0f9139ab8ba3f8255430e4f12161742c"
-  integrity sha512-sCCTeB7e2L49YhjPK7IkPfWfCR+NHSfbCbDOy3LqyfkrBpK9qXRRyS1ImCHqEE1LMJxmVN5bAvioI/zTFu48xw==
-
-"@unrs/resolver-binding-freebsd-x64@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.12.1.tgz#2625a7caf01947e2996d06856121483f1ead671b"
-  integrity sha512-rsKJJykPydB+lA/mdeMSYqsQpdRTAjhJiwdQ+jdihPDpbN1h7PaNAo6Fz8PxqWtKd+YC3uGjjW+m+1iPwRwJuA==
-
-"@unrs/resolver-binding-linux-arm-gnueabihf@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.12.1.tgz#6c987d2a497a38a104a39b740c27863e2e2d5478"
-  integrity sha512-D6Al5C6j9RdqjGI7Hqa/iVbh09xOEIyZScG60OJGRF0fvf9cy2FdSHG6qLG9Osv8aYe+syWId+PLRwR43soVkA==
-
-"@unrs/resolver-binding-linux-arm-musleabihf@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.12.1.tgz#5890caee4ebea2c925c13061879e367c0d449bdd"
-  integrity sha512-9+yQ/cnoapQ1G+HS6nXQ+4GZ/qKpieZuZxO8GWGJ+F2/1WC5eRzIU2BYUgT029A/y7n3qb0whuT6vvMzB9Zd0g==
-
-"@unrs/resolver-binding-linux-arm64-gnu@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.12.1.tgz#734f8d5aac5a235ba273d0702fdc9477472c8a3b"
-  integrity sha512-OY/REy8lJgrkZgUpiwhClBvSDLSJNxkvqV7il6I1iNBQFyIEZRpOm1ttV8iMjpcPN2Dl7kjGd7CoKoJUebn6Jw==
-
-"@unrs/resolver-binding-linux-arm64-musl@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.12.1.tgz#e8d3bf01a3ac116aadbd244324a2f12d5f0b7595"
-  integrity sha512-C0nRwuMNgiGU8M5ym7eFe1qOo4oJtZ4TH6g+qAMWIR0hXgMjMs0bsggIv7Sbeia1GI8ZQHzQwrhBEawFiHQIPQ==
-
-"@unrs/resolver-binding-linux-ppc64-gnu@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.12.1.tgz#549c150724bf927e64380107867e0d5401e5830a"
-  integrity sha512-1GrdTqRuLZMsLa9d6T1BM6WTPGMZxkDKLR4SSzWaUtWpBuOVb33DIShXadhDYrTRESEm7pRN8m7SOM2m8pPT8w==
-
-"@unrs/resolver-binding-linux-riscv64-gnu@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.12.1.tgz#9c2f8a04a2e1423d0631e06ce41c884230d86ad4"
-  integrity sha512-q9gc8/37+8jGc8RJahXtonvxgbUisjOHCaiDXrg4Nv8+pk9iKv97drJ61crkZJEms+bIr7lLc54SlZ08qVY9nA==
-
-"@unrs/resolver-binding-linux-riscv64-musl@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.12.1.tgz#cd546401ed773b32f3f31821fe98a3d272b497cb"
-  integrity sha512-kLFS/MfGFpeYUrnnsUnmZAxwXMPHZOIPHNp3d4zHnx7/etyX2SSQQ1Kj/Ycaxy4V5dN16YoXpnhrwANjywiJCg==
-
-"@unrs/resolver-binding-linux-s390x-gnu@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.12.1.tgz#5c83abd39925e2c32fe02e8fe7b6e066e3341224"
-  integrity sha512-vKlW4XOJUrpvMBgbIg97t6UEBsFsxGZS5Khi47XkNzC5T1obPhEYWfaGGv9oAe6xXzXib9xaH64CQV8AXN9GiA==
-
-"@unrs/resolver-binding-linux-x64-gnu@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.12.1.tgz#e295dbde890fcd99df943b5280ea5609148f7d29"
-  integrity sha512-e9gRaBDEraJLdeScpwBA+WqaJDXnmlHPC7aZTAp9N4BYiEs8BvDfjgeqSVygrc3NZbeMfiKygevINZ9QP271wA==
-
-"@unrs/resolver-binding-linux-x64-musl@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.12.1.tgz#86ac6d09e8b7f7f3eceb87c6d769bfb81c91996a"
-  integrity sha512-Z7813xEacoT+WRBm1O0wgIkXRgVyTctaRPkKx7T+WgeAfGzMfgWCxhRjAAJh/2LMDPlSXOnapr3vwI1TgDEtTA==
-
-"@unrs/resolver-binding-openharmony-arm64@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-openharmony-arm64/-/resolver-binding-openharmony-arm64-1.12.1.tgz#bea1857eb815b05acef119ae9d7bc17fba688597"
-  integrity sha512-GN5YjvnL5nGd5twW4KHWre6iOzLVsIgZwBin3jTT1Pef2Q3l0WgMYA5uo908wL+gsxSFzFXuxkO+AjpsLoOaYw==
-
-"@unrs/resolver-binding-wasm32-wasi@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.12.1.tgz#4b1ccb7cba84b15b04f24a2253206aa6918100d1"
-  integrity sha512-Gue4obXW5E2223qBWqW05S9m1uPcBIEu8cJWs3YqzVVf+h6lNRofgJlhGNxmuqu+C/fSlqaW4T1JHFZdoOgGGQ==
+"@unrs/resolver-binding-android-arm-eabi@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.12.2.tgz#98a9fee62c01f209747a4ab5855f1ced38a6d03a"
+  integrity sha512-g5T90pqg1bo/7mytQx6F4iBNC0Wsh9cu+z9veDbFjc7HjpesJFWD7QMS0NGStXM075+7dJPPVvBbpZlnrdpi/w==
+
+"@unrs/resolver-binding-android-arm64@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.12.2.tgz#46b7e8a1393f907462324f1576e8883529acf066"
+  integrity sha512-YGCRZv/9GLhwmz6mYDeTsm/92BAyR28l6c2ReweVW5pWgfsitWLY8upvfRlGdoyD8HjeTHSYJWyZGD4KJA/nFQ==
+
+"@unrs/resolver-binding-darwin-arm64@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.12.2.tgz#0ea07b00e2583ab004b853d4c02ec5f0745d490c"
+  integrity sha512-u9DiNT1auQMO20A9SyTuG3wUgQWB9Z7KjAg0uFuCDR1FsAY8A0CG2S6JpHS1xwm/w1G08bjXZDcyOCjv1WAm2w==
+
+"@unrs/resolver-binding-darwin-x64@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.12.2.tgz#a2a6901ed58449b91b4438e582f6890cba956049"
+  integrity sha512-f7rPLi/T1HVKZu/u6t87lroib16n8vrSzcyxI7lg4BGO9UF26KhQL44sd9eOUgrTYhvRXtWOIZT5PejdPyJfUA==
+
+"@unrs/resolver-binding-freebsd-x64@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.12.2.tgz#ebe6fe7f6706b7378ea4a48a024602e9c2f48f89"
+  integrity sha512-BpcOjWCJub6nRZUS2zA20pmLvjtqAtGejETaIyRLiZiQf++cbrjltLA5NN/xaXfqeOBOSlMFbemIl5/S5tljmg==
+
+"@unrs/resolver-binding-linux-arm-gnueabihf@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.12.2.tgz#e6040fedaa240124419d35b25b69c5fa15ddb499"
+  integrity sha512-vZTDvdSISZjJx66OzJqtsOhzifbqRjbmI1Mnu49fQDwog5GtDI4QidRiEAYbZCRj9C8YZEW+3ZjqsyS9GR4k2A==
+
+"@unrs/resolver-binding-linux-arm-musleabihf@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.12.2.tgz#d217a8fb59f659c131539326c140e7b62e3e3c6a"
+  integrity sha512-BiPI+IrIlwcW4nLLMM21+B1dFPzd55yAVgVGrdgDjNef+ch03GdxrcyaIz8X9SsQirh/kCQ7mviyWlMxdh2D7g==
+
+"@unrs/resolver-binding-linux-arm64-gnu@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.12.2.tgz#edab13c46a45783a7e01351e113825c04f352e24"
+  integrity sha512-zJc0H99FEPoFfSrNpa91HYfxzfAJCr502oxNK1cfdC9hlaFI43RT+JFCann9JUgZmLzzntChHyn13Sgn9ljHNg==
+
+"@unrs/resolver-binding-linux-arm64-musl@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.12.2.tgz#e5e195db1130f7d3b6aa2fd67b3c9fe1ea4859a0"
+  integrity sha512-KQ3Lki6l+Pz1k/eBipN41ES+YUK30beLGb9YqcB1O542cyLCNE6GaxrfcY3T6EezmGGk84wb5XyO9loTM9tkcA==
+
+"@unrs/resolver-binding-linux-loong64-gnu@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-loong64-gnu/-/resolver-binding-linux-loong64-gnu-1.12.2.tgz#f01d22e091bae13016f4636698d9dcbbda775c3e"
+  integrity sha512-3SJGEh1DborhG6pyxvhPzCT4bbSIVihsvgJc13P1bHG7KLdNDaF9T3gsTwFc7Jw/5Y5/iWOjkEx7Zy0NvCGX3Q==
+
+"@unrs/resolver-binding-linux-loong64-musl@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-loong64-musl/-/resolver-binding-linux-loong64-musl-1.12.2.tgz#7d23efcb98adf076bfbcecc27b4212c36aa6697d"
+  integrity sha512-jiuG/Obbel7uw1PwHNFfrkiKhLAF6mnyZ6aWlOAVN9WqKm8v0OFGnciJIHu8+CMvXLQ8AD51LPzAoUfT21D5Ew==
+
+"@unrs/resolver-binding-linux-ppc64-gnu@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.12.2.tgz#1f35f1eaa322f33cf2d96dac27f0626a93ffe2f6"
+  integrity sha512-q7xRvVpmcfeL+LlZg8Pbbo6QaTZwDU5BaGZbwfhkEsXJn3Was8xYfE0RBH266xZt0rM6B7i8xAYIvjthuUIWHg==
+
+"@unrs/resolver-binding-linux-riscv64-gnu@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.12.2.tgz#674faa696f5ce96f214873946a1e2d6ca96723dd"
+  integrity sha512-0CVdx6lcnT3Q9inOH8tsMIOJ6ImndllMjqJHg8RLVdB7Vq4SfkEXl9mCSsVNuNA4MCYycRicCUxPCabVHJRr6A==
+
+"@unrs/resolver-binding-linux-riscv64-musl@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.12.2.tgz#37835fdd0b472ecdcffccd4288f19018454b138c"
+  integrity sha512-iOwlRo9vnp6R6ohHQS11n0NnfdXx/omhkocmIfaPRpQhKZ+3BDMkkdRVh53qjkFkpPddf+FETA28NwGN7l5l+w==
+
+"@unrs/resolver-binding-linux-s390x-gnu@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.12.2.tgz#b6edf13db4bb0accdcd1ad482a4eea0301de9224"
+  integrity sha512-HYJtLfXq94q8iZNFT1lknx258wlkkWhZeUXJRqzKBBUJ00CvZ+N33zgbCqimLjsyw5Va6uUxhVa12mI+kaveEw==
+
+"@unrs/resolver-binding-linux-x64-gnu@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.12.2.tgz#daddad00bf65a405202284da1eb1db8eb83b218f"
+  integrity sha512-mPsUhunKKDih5O96Y6enDQyHc1SqBPlY1E/SfMWDM3EdJ95Z9CArPeCVwCCqbP45ljvivdEk8Fxn+SIb1rDAJQ==
+
+"@unrs/resolver-binding-linux-x64-musl@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.12.2.tgz#dfdff1e0c2bad25420b41c76a746011c3983b9bb"
+  integrity sha512-azrt6+5ydLd8Vt210AAFis/lZevSfPw93EJRIJG+xPu4WCJ8K0kppCTpMyLPcKT7H15M4Jnt2tMp5bOvCkRC6A==
+
+"@unrs/resolver-binding-openharmony-arm64@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-openharmony-arm64/-/resolver-binding-openharmony-arm64-1.12.2.tgz#ce07c4f5e7b42f7bfce45e7629b8659063aefefe"
+  integrity sha512-YZ9hP4O0X9PQb8eO980qmLNGH4zT3I9+SZTdt0Pr0YyuGQhYKoOZkV02VzrzyOZJ5xIJ3UFIenKkUkGg8GjgWQ==
+
+"@unrs/resolver-binding-wasm32-wasi@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.12.2.tgz#82514f0506cfaf65f17fe16095f92d450e487183"
+  integrity sha512-tYFDIkMxSflfEc/h92ZWNsZlHSwgimbNHSO3PL2JWQHfCuC2q316jMyYU9TIWZsFK2bQwyK5VAdYgn8ygPj69A==
   dependencies:
     "@emnapi/core" "1.10.0"
     "@emnapi/runtime" "1.10.0"
     "@napi-rs/wasm-runtime" "^1.1.4"
 
-"@unrs/resolver-binding-win32-arm64-msvc@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.12.1.tgz#e0ce558c4cc93f7df135c595153a13af1cc1cdde"
-  integrity sha512-z09l7yiDIOLDTFkW+TEroFjidYAM6JriPqMMpXpM7/EnEe6tehrJZrghlvvPyI/W4JGWAJVDaOs4rl+snJlHwg==
+"@unrs/resolver-binding-win32-arm64-msvc@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.12.2.tgz#521427dd59a8f4740ddd1dc7c3bc6af1aa1d260d"
+  integrity sha512-qzNyg3xL0VPQmCaUh+N5jSitce6k+uCBfMDesWRnlULOZaqUkaJ0ybdT+UqlAWJoQjuqfIU/0Ptx9bteN4D82g==
 
-"@unrs/resolver-binding-win32-ia32-msvc@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.12.1.tgz#abbc925dfb8c3399e573e80624f766260f23b175"
-  integrity sha512-RZ9vu5nw+Lgf91LJIZXFx6OrbId+EN2x0HzpAdm0C9oywiPw5x7LBs4uNboZ2Taozo8SiX/7vEDWWyIpKqktgA==
+"@unrs/resolver-binding-win32-ia32-msvc@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.12.2.tgz#05b63286ff2da37e0ce3083b8390884385efff62"
+  integrity sha512-WD9sY00OfpHVGfsnHZoA8jVT+esS/Bg8z8jzxp5BnDCjjwsuKsPQrzswwpFy4J1AUJbXPRfkpcX0mXrzeXW79g==
 
-"@unrs/resolver-binding-win32-x64-msvc@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.12.1.tgz#32c441b69e54582ca0c5f51a0fa2bb69b45de24a"
-  integrity sha512-rXHMTryD4YT8wuGDhV8UevKiD02/wUrdKLyokgNQQf/AcO6BCUEkQu5WGQ9i41bA4tlSfKo02WmAcAgxuP6izA==
+"@unrs/resolver-binding-win32-x64-msvc@1.12.2":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.12.2.tgz#72da0da48d72b1e87831b9c0308931d3f4669027"
+  integrity sha512-nAB74NfSNKknqQ1RrYj6uz8FcXEomu/MATJZxh/x+BArzN2U3JbOYC0APYzUIGhVY3m5hRxA8VPNdPBoG8txlA==
 
 "@whatwg-node/disposablestack@^0.0.6":
   version "0.0.6"
@@ -2290,9 +2270,9 @@
     urlpattern-polyfill "^10.0.0"
 
 "@whatwg-node/node-fetch@^0.8.3":
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/@whatwg-node/node-fetch/-/node-fetch-0.8.5.tgz#5ab2226866ae10a9d0403f9d44bd684178963781"
-  integrity sha512-4xzCl/zphPqlp9tASLVeUhB5+WJHbuWGYpfoC2q1qh5dw0AqZBW7L27V5roxYWijPxj4sspRAAoOH3d2ztaHUQ==
+  version "0.8.6"
+  resolved "https://registry.yarnpkg.com/@whatwg-node/node-fetch/-/node-fetch-0.8.6.tgz#22c5235f49c69c6b2cfc63d4a759de407a8fc664"
+  integrity sha512-BDMdYFcerLQkwA2RTldxOqRCs6ZQD1S7UgP3pUdGUkcbgTrP/V5ko77ZkCww9DHmC4lpoYuwigGfQYj285gMvA==
   dependencies:
     "@fastify/busboy" "^3.1.1"
     "@whatwg-node/disposablestack" "^0.0.6"
@@ -2345,9 +2325,9 @@ acorn-jsx@^5.3.2:
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn@^8.16.0:
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.16.0.tgz#4ce79c89be40afe7afe8f3adb902a1f1ce9ac08a"
-  integrity sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.17.0.tgz#1785adb84faf8d8add10369b93826fc2bd08f1fe"
+  integrity sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==
 
 ajv@^6.14.0:
   version "6.15.0"
@@ -2384,53 +2364,53 @@ ansi-styles@^6.2.1, ansi-styles@^6.2.3:
   integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
 
 antd@^6.3.3:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-6.4.3.tgz#80a7aab9c13c35daa0e0e7eea80585ba57cb7203"
-  integrity sha512-6H2avkxCGfxcF67r3J2mwm9Ck50el1pks/73vfM1wDsPL/tPtj5vHuauMgJFnrqmq7CH3g8aoZ0VBQbt+jpAsw==
+  version "6.4.4"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-6.4.4.tgz#a422610959b37ac4d4b766dbaac67ea2d8fd0785"
+  integrity sha512-lgPz4KhfhiYddV/qPYo0ieqWimCVgV2OQF72mbeGNixE753JWNnmEc7UNGy08wBS/zZ7hxrmX0pc5aX7EUaIIg==
   dependencies:
     "@ant-design/colors" "^8.0.1"
     "@ant-design/cssinjs" "^2.1.2"
     "@ant-design/cssinjs-utils" "^2.1.2"
     "@ant-design/fast-color" "^3.0.1"
-    "@ant-design/icons" "^6.2.3"
+    "@ant-design/icons" "^6.2.5"
     "@ant-design/react-slick" "~2.0.0"
     "@babel/runtime" "^7.29.2"
-    "@rc-component/cascader" "~1.15.0"
+    "@rc-component/cascader" "~1.16.1"
     "@rc-component/checkbox" "~2.0.0"
     "@rc-component/collapse" "~1.2.0"
     "@rc-component/color-picker" "~3.1.1"
     "@rc-component/dialog" "~1.9.0"
     "@rc-component/drawer" "~1.4.2"
     "@rc-component/dropdown" "~1.0.2"
-    "@rc-component/form" "~1.8.1"
+    "@rc-component/form" "~1.8.3"
     "@rc-component/image" "~1.9.0"
-    "@rc-component/input" "~1.3.0"
+    "@rc-component/input" "~1.3.1"
     "@rc-component/input-number" "~1.6.2"
     "@rc-component/mentions" "~1.9.0"
-    "@rc-component/menu" "~1.3.0"
-    "@rc-component/motion" "^1.3.2"
+    "@rc-component/menu" "~1.3.1"
+    "@rc-component/motion" "^1.3.3"
     "@rc-component/mutate-observer" "^2.0.1"
     "@rc-component/notification" "~2.0.7"
-    "@rc-component/pagination" "~1.2.0"
+    "@rc-component/pagination" "~1.3.0"
     "@rc-component/picker" "~1.10.0"
     "@rc-component/progress" "~1.0.2"
-    "@rc-component/qrcode" "~1.1.1"
+    "@rc-component/qrcode" "~2.0.0"
     "@rc-component/rate" "~1.0.1"
     "@rc-component/resize-observer" "^1.1.2"
     "@rc-component/segmented" "~1.3.0"
-    "@rc-component/select" "~1.6.15"
+    "@rc-component/select" "~1.7.1"
     "@rc-component/slider" "~1.0.1"
     "@rc-component/steps" "~1.2.2"
     "@rc-component/switch" "~1.0.3"
-    "@rc-component/table" "~1.10.0"
-    "@rc-component/tabs" "~1.9.0"
+    "@rc-component/table" "~1.10.2"
+    "@rc-component/tabs" "~1.9.1"
     "@rc-component/tooltip" "~1.4.0"
     "@rc-component/tour" "~2.4.0"
-    "@rc-component/tree" "~1.3.1"
-    "@rc-component/tree-select" "~1.9.0"
-    "@rc-component/trigger" "^3.9.0"
-    "@rc-component/upload" "~1.1.0"
-    "@rc-component/util" "^1.11.0"
+    "@rc-component/tree" "~1.3.2"
+    "@rc-component/tree-select" "~1.10.0"
+    "@rc-component/trigger" "^3.9.1"
+    "@rc-component/upload" "~1.1.1"
+    "@rc-component/util" "^1.11.1"
     clsx "^2.1.1"
     dayjs "^1.11.11"
     scroll-into-view-if-needed "^3.1.0"
@@ -2580,9 +2560,9 @@ available-typed-arrays@^1.0.7:
     possible-typed-array-names "^1.0.0"
 
 axe-core@^4.10.0:
-  version "4.11.4"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.11.4.tgz#5b535e381ff1e61ffdd615e5483d16186d3b46a5"
-  integrity sha512-KunSNx+TVpkAw/6ULfhnx+HWRecjqZGTOyquAoWHYLRSdK1tB5Ihce1ZW+UY3fj33bYAFWPu7W/GRSmmrCGuxA==
+  version "4.12.1"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.12.1.tgz#69fe2bf6dfc0b24973af91b1d8e945f79e1b7c44"
+  integrity sha512-s7iGf5GaVMxEG0ENN9x+xTr7GFZCb1ZP/1uATUpCEK2X78nDB3RwbtFCo9pGAf9ru+VwoQ464DkaLEeRM08wJA==
 
 axobject-query@^4.1.0:
   version "4.1.0"
@@ -2600,14 +2580,14 @@ balanced-match@^4.0.2:
   integrity sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==
 
 baseline-browser-mapping@^2.10.12, baseline-browser-mapping@^2.9.19:
-  version "2.10.31"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.31.tgz#9c6825f052601ce6974a90dd49683b1726887b0b"
-  integrity sha512-MujYO3eP72uvmSE0i4wltsodRfIpZATP3jvzRNRGGxgzId7aVocVJJV3nf01qnzzKFGxQVC9bpWxl5cjxTr/7Q==
+  version "2.10.37"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.37.tgz#3e636475b6b293244e2b23e2c71a2ab9d9e6ba7d"
+  integrity sha512-girxaJ7WZssDOFhzCGZTDKoTa1gk6A1TbflaYTpykLJ4UU9Fz9kx1aREM8JCuoVHbL8X8T/mJg7w2oYSq72Oig==
 
 brace-expansion@^1.1.7:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.14.tgz#d9de602370d91347cd9ddad1224d4fd701eb348b"
-  integrity sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.15.tgz#a6d90d54067236e5f42570a3b7378d594d9b7738"
+  integrity sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -2677,9 +2657,9 @@ camel-case@^4.1.2:
     tslib "^2.0.3"
 
 caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001782:
-  version "1.0.30001793"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz#238887ddf5fcfc8c36d872394d0a78a517312a72"
-  integrity sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==
+  version "1.0.30001799"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001799.tgz#5c909138c27f1a61219d3e092071c1cc7d32dc55"
+  integrity sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw==
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -2825,9 +2805,9 @@ concat-map@0.0.1:
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 concurrently@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-10.0.0.tgz#ceb3782d36a620ae7c05ff8085076c0d96323479"
-  integrity sha512-DRrk10z3sVPpguNe8od2cGNqZGqbT15rwAnxD4dG3b78mdNNb/gJyr8T834Oj518WcBmTktrt4FhdwZn09ZWSg==
+  version "10.0.3"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-10.0.3.tgz#0ae4bf732e958b1a607b47896dcaa836b72514e8"
+  integrity sha512-hc3LH4UaKWd/bbyDK/IGVa4RB6PtQ3CUYwtrkzqHn+wIG3Hr5fhpRlk0L/gCa8ZE1L/Ufj50Zho69cI5w8SQBA==
   dependencies:
     chalk "5.6.2"
     rxjs "7.8.2"
@@ -2866,9 +2846,9 @@ cosmiconfig@^8.1.0:
     path-type "^4.0.0"
 
 cosmiconfig@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-9.0.1.tgz#df110631a8547b5d1a98915271986f06e3011379"
-  integrity sha512-hr4ihw+DBqcvrsEDioRO31Z17x71pUYoNe/4h6Z0wB72p7MU7/9gH8Q3s12NFhHPfYBBOV3qyfUxmr/Yn3shnQ==
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-9.0.2.tgz#9e5615163becf6a82211fb33d2f68947c25d0c5e"
+  integrity sha512-gtTZxTDau1wL7Y7zifc2dd8jHSK/k6BTx/2Xp/BpdlAdnlYWFVt7qhJqgwi7637yRwRQ3qL4ZidbB4I8tA5VOg==
   dependencies:
     env-paths "^2.2.1"
     import-fresh "^3.3.0"
@@ -2944,9 +2924,9 @@ dataloader@^2.2.3:
   integrity sha512-y2krtASINtPFS1rSDjacrFgn1dcUuoREVabwlOGOe4SdxenREqwjwjElAdwvbGM7kgZz9a3KVicWR7vcz8rnzA==
 
 dayjs@^1.0, dayjs@^1.11.11:
-  version "1.11.20"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.20.tgz#88d919fd639dc991415da5f4cb6f1b6650811938"
-  integrity sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==
+  version "1.11.21"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.21.tgz#57f87562e62de76f3c704bd2b8d522fc33068eb2"
+  integrity sha512-98IT+HOahAisibz/yjKbzuOBwYcjJ7BCLPzARyHiyEBmRz4fatF+KPJszEHXsGYjUG234aH/cOjW1wwTbKUZlA==
 
 debounce@^3.0.0:
   version "3.0.0"
@@ -3050,9 +3030,9 @@ dunder-proto@^1.0.0, dunder-proto@^1.0.1:
     gopd "^1.2.0"
 
 electron-to-chromium@^1.5.328:
-  version "1.5.359"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.359.tgz#51d3f2dd176a357b3390759b552c74cd4b6abe8e"
-  integrity sha512-8lPELWuYZIWk7NDvCNthtmMw/7Q5Wu25NpM4djFMHBmk8DubPAtL4YTOp7ou0e7HyJtwkVlWv8XMLURnrtgJQw==
+  version "1.5.373"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.373.tgz#7a29b55c79bd9a8f47d0cd501985c4da2bad2f9e"
+  integrity sha512-G2Hym8JIf/QreuseqkDibgH8Ci8KfJzqGDKdakbhSx9UltwRBH2cBLAWU/lBX0sCdv0TlhyxQyDCnSfxgMWsjA==
 
 emoji-regex@^10.3.0:
   version "10.6.0"
@@ -3081,6 +3061,16 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
+es-abstract-get@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-abstract-get/-/es-abstract-get-1.0.0.tgz#1eae87101f42bedeb6a740e8c5051271aef89088"
+  integrity sha512-6PMWXpdhshVvFp+FoWYs1EvG1Nj0tvk0dZM+XcK0xMEM1czRVcP6ohqPWHy6qPagSpC8j4+p89WXlT+xXJs/fg==
+  dependencies:
+    es-errors "^1.3.0"
+    es-object-atoms "^1.1.2"
+    is-callable "^1.2.7"
+    object-inspect "^1.13.4"
+
 es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23.5, es-abstract@^1.23.6, es-abstract@^1.23.9, es-abstract@^1.24.0, es-abstract@^1.24.2:
   version "1.24.2"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.2.tgz#2dbd38c180735ee983f77585140a2706a963ed9a"
@@ -3152,9 +3142,9 @@ es-errors@^1.3.0:
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
 es-iterator-helpers@^1.2.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.3.2.tgz#8f4ff1f3603cbd09fbdb72c747a679779a65cc7f"
-  integrity sha512-HVLACW1TppGYjJ8H6/jqH/pqOtKRw6wMlrB23xfExmFWxFquAIWCmwoLsOyN96K4a5KbmOf5At9ZUO3GZbetAw==
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.3.3.tgz#0a229dc38ada0450b8cfaa85809fd73dbb34113c"
+  integrity sha512-0PuBxFi+4uPanB97iDxCLWuHeYud2FALrw5HFZGtAF38UpJDbDC8frwp2cnDyae692CQ0dou60UwWfhgsa4U/g==
   dependencies:
     call-bind "^1.0.9"
     call-bound "^1.0.4"
@@ -3173,10 +3163,10 @@ es-iterator-helpers@^1.2.1:
     iterator.prototype "^1.1.5"
     math-intrinsics "^1.1.0"
 
-es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
-  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
+es-object-atoms@^1.0.0, es-object-atoms@^1.1.1, es-object-atoms@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.2.tgz#a2d0b373205724dfa525d23b0c3e1b1ca582c99b"
+  integrity sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==
   dependencies:
     es-errors "^1.3.0"
 
@@ -3198,13 +3188,15 @@ es-shim-unscopables@^1.0.2, es-shim-unscopables@^1.1.0:
     hasown "^2.0.2"
 
 es-to-primitive@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz#96c89c82cc49fd8794a24835ba3e1ff87f214e18"
-  integrity sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.1.tgz#abd6ef5b12d7c25bcd9eb3a7ef63e568b451ba4a"
+  integrity sha512-CxN9N56HYfd2m/acc/NOFrZQsN9kU4eh+2kk6A707Kz1krH8tKmfrs5RnftB8WNX80T0NS7vSQsDOlg23diR2g==
   dependencies:
+    es-abstract-get "^1.0.0"
+    es-errors "^1.3.0"
     is-callable "^1.2.7"
-    is-date-object "^1.0.5"
-    is-symbol "^1.0.4"
+    is-date-object "^1.1.0"
+    is-symbol "^1.1.1"
 
 escalade@^3.1.1, escalade@^3.2.0:
   version "3.2.0"
@@ -3222,11 +3214,11 @@ escape-string-regexp@^4.0.0:
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 eslint-config-next@^16.0.8:
-  version "16.2.6"
-  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-16.2.6.tgz#1a04578efe6fde5cdb6265e98e88c9f61927e2c7"
-  integrity sha512-z2ELYSkyrrJ6cuunTU8vhsT/RpouPkjaSah06nVW6Rg2Hpg0Vs8s497/e5s8G8qtdp4ccsiovz5P1rv+5VSW2Q==
+  version "16.2.9"
+  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-16.2.9.tgz#cc3f63fe657cdb980078835f85f1f518cd549276"
+  integrity sha512-olGtBrs07bQchpaJWeqbk9GaMoU0oGmN/pYNEBXSbfgKngb5uHnPe37X6tVeh6DJfaWFQildvinGEOrolo5fmw==
   dependencies:
-    "@next/eslint-plugin-next" "16.2.6"
+    "@next/eslint-plugin-next" "16.2.9"
     eslint-import-resolver-node "^0.3.6"
     eslint-import-resolver-typescript "^3.5.2"
     eslint-plugin-import "^2.32.0"
@@ -3259,9 +3251,9 @@ eslint-import-resolver-typescript@^3.5.2:
     unrs-resolver "^1.6.2"
 
 eslint-module-utils@^2.12.1:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz#f76d3220bfb83c057651359295ab5854eaad75ff"
-  integrity sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.13.0.tgz#882beaf64927567358816bf4dc0f050fd52e0fb9"
+  integrity sha512-bLohSkT6469rRs8czj0tLTD8vaeIS/whvPRJVjDr7IuoTT1k5DYDERlNycjDj/HkOlvQdYurmfZ/g3fG5bgeLQ==
   dependencies:
     debug "^3.2.7"
 
@@ -3367,16 +3359,16 @@ eslint-visitor-keys@^5.0.0, eslint-visitor-keys@^5.0.1:
   integrity sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==
 
 eslint@^10.1.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-10.4.0.tgz#d86b6c405de0f19f3318c47139b8cb6771b3f592"
-  integrity sha512-loXy6bWOoP3EP6JA7jo6p5jMpBJmHmsNZM5SFRHLdh1MGOPurMnNBj4ZlAbaqUAaQWbCr7jHV4P7gzAyryZWkQ==
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-10.5.0.tgz#5fca69d6b41fe7e00ba22d4100b2e44efe439ad5"
+  integrity sha512-1y+7C+vi12bUK1IpZeaV3gsH9fHLBmPvYmPx42pvT/E9yG0IC8g3PUZZgp0+JLJl7ZDK0flc2gc+Aw9dpCvIsQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.8.0"
     "@eslint-community/regexpp" "^4.12.2"
     "@eslint/config-array" "^0.23.5"
     "@eslint/config-helpers" "^0.6.0"
     "@eslint/core" "^1.2.1"
-    "@eslint/plugin-kit" "^0.7.1"
+    "@eslint/plugin-kit" "^0.7.2"
     "@humanfs/node" "^0.16.6"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@humanwhocodes/retry" "^0.4.2"
@@ -3490,9 +3482,9 @@ fast-string-width@^3.0.2:
     fast-string-truncated-width "^3.0.2"
 
 fast-wrap-ansi@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/fast-wrap-ansi/-/fast-wrap-ansi-0.2.0.tgz#c0ae3f3982d061c3d657ec927196fbb47e22fe64"
-  integrity sha512-rLV8JHxTyhVmFYhBJuMujcrHqOT2cnO5Zxj37qROj23CP39GXubJRBUFF0z8KFK77Uc0SukZUf7JZhsVEQ6n8w==
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/fast-wrap-ansi/-/fast-wrap-ansi-0.2.2.tgz#95e952a0145bce3f59ad56e179f84c48d4072935"
+  integrity sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==
   dependencies:
     fast-string-width "^3.0.2"
 
@@ -3590,16 +3582,19 @@ function-bind@^1.1.2:
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
 function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz#e68e1df7b259a5c949eeef95cdbde53edffabb78"
-  integrity sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.2.0.tgz#758f3e84fa542672454bd5e14cb081a5ce07f70c"
+  integrity sha512-jObKIik1P2QjPHP5nz5BaOtUlfgS0fWo8IUByNXkM+o+02sJOi94em77GwJKQSJ3gfPHdgzLNrHc1uokV4P/ew==
   dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.3"
-    define-properties "^1.2.1"
+    call-bind "^1.0.9"
+    call-bound "^1.0.4"
+    es-define-property "^1.0.1"
+    es-errors "^1.3.0"
     functions-have-names "^1.2.3"
-    hasown "^2.0.2"
+    has-property-descriptors "^1.0.2"
+    hasown "^2.0.4"
     is-callable "^1.2.7"
+    is-document.all "^1.0.0"
 
 functions-have-names@^1.2.3:
   version "1.2.3"
@@ -3756,10 +3751,10 @@ graphql-ws@^6.0.6:
   resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-6.0.8.tgz#6712bb9da8462937e92343e3146726f89424df68"
   integrity sha512-m3EOaNsUBXwAnkBWbzPfe0Nq8pXUfxsWnolC54sru3FzHvhTZL0Ouf/BoQsaGAXqM+YPerXOJ47BUnmgmoupCw==
 
-graphql@^16.12.0:
-  version "16.14.0"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.14.0.tgz#f1128a74b16a34d1245c8436bb07b488d87b83e1"
-  integrity sha512-BBvQ/406p+4CZbTpCbVPSxfzrZrbnuWSP1ELYgyS6B+hNeKzgrdB4JczCa5VZUBQrDa9hUngm0KnexY6pJRN5Q==
+graphql@^17.0.0:
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-17.0.0.tgz#6fb4df705269438c96f504621b792d224f217391"
+  integrity sha512-RSEgqrRNqHVGa46w2pmL9uTFkYPJiJbD5kksOvOaPLrKvBIidX/ttQVlWsR3+Ee8l+mNroC6darpcPIZeElbNg==
 
 has-bigints@^1.0.2:
   version "1.1.0"
@@ -3797,10 +3792,10 @@ has-tostringtag@^1.0.2:
   dependencies:
     has-symbols "^1.0.3"
 
-hasown@^2.0.2, hasown@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.3.tgz#5e5c2b15b60370a4c7930c383dfb76bf17bc403c"
-  integrity sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==
+hasown@^2.0.2, hasown@^2.0.3, hasown@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.4.tgz#8c62d8cb90beb2aad5d0a5b67581ad9854c3f003"
+  integrity sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==
   dependencies:
     function-bind "^1.1.2"
 
@@ -3854,9 +3849,9 @@ ignore@^7.0.5:
   integrity sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==
 
 immutable@^5.1.5:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.1.5.tgz#93ee4db5c2a9ab42a4a783069f3c5d8847d40165"
-  integrity sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.1.6.tgz#21639bc80f9a0713e141a5f5a154ef9fdabf36dd"
+  integrity sha512-q1swsS8K7L8usSHuOqF2TAoCCkonYz0SG38wLAggaa4Wml70zixIvt2ql4coQ2C2B3hTjltJry4r6bULwgAXLQ==
 
 import-fresh@^3.3.0:
   version "3.3.1"
@@ -3981,7 +3976,7 @@ is-data-view@^1.0.1, is-data-view@^1.0.2:
     get-intrinsic "^1.2.6"
     is-typed-array "^1.1.13"
 
-is-date-object@^1.0.5, is-date-object@^1.1.0:
+is-date-object@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.1.0.tgz#ad85541996fc7aa8b2729701d27b7319f95d82f7"
   integrity sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==
@@ -3989,6 +3984,13 @@ is-date-object@^1.0.5, is-date-object@^1.1.0:
     call-bound "^1.0.2"
     has-tostringtag "^1.0.2"
 
+is-document.all@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-document.all/-/is-document.all-1.0.0.tgz#163a4bfb362c6ed7b118ce46cdecc4e37dee3195"
+  integrity sha512-+XSoyS05OdBbhFuELhgTCpFNHkpBOJqtsZfUFFpe5QTw+9Sjbh8zitxhQkYAo6wV7e1Vb8cAPvpCk9jGam/82g==
+  dependencies:
+    call-bound "^1.0.4"
+
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -4098,7 +4100,7 @@ is-string@^1.1.1:
     call-bound "^1.0.3"
     has-tostringtag "^1.0.2"
 
-is-symbol@^1.0.4, is-symbol@^1.1.1:
+is-symbol@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.1.tgz#f47761279f532e2b05a7024a7506dbbedacd0634"
   integrity sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==
@@ -4206,9 +4208,9 @@ jiti@^2.0.0, jiti@^2.3.0, jiti@^2.7.0:
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"
-  integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.2.0.tgz#2bd9e85682dd91bd469afb809d816043b3d49524"
+  integrity sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==
   dependencies:
     argparse "^2.0.1"
 
@@ -4282,22 +4284,21 @@ keyv@^4.5.4:
     json-buffer "3.0.1"
 
 knip@^6.14.2:
-  version "6.14.2"
-  resolved "https://registry.yarnpkg.com/knip/-/knip-6.14.2.tgz#264f725dd2bf2104e70561b0fee7432d2c77fd76"
-  integrity sha512-Vg3JhIINjZew1I7qAFI4UHemW1mc4azP/BxJvsq9eGDfxpGO7oVCuD/bsWkog9TO/ZwwJeAeOMFZ1kd9jnY9+Q==
+  version "6.17.1"
+  resolved "https://registry.yarnpkg.com/knip/-/knip-6.17.1.tgz#5210aba651030cd1b1f8b29e7050de4a4d9b09c3"
+  integrity sha512-HcQsZSQ4Ymhuay4BVzJtM5pFZNDSomYYqcNCZOSITPQh9g18a09DqziWAxSt2G+BH9wGlG+0ZjWpEnaFlnKseQ==
   dependencies:
     fdir "^6.5.0"
     formatly "^0.3.0"
     get-tsconfig "4.14.0"
     jiti "^2.7.0"
-    minimist "^1.2.8"
-    oxc-parser "^0.130.0"
-    oxc-resolver "^11.19.1"
+    oxc-parser "^0.135.0"
+    oxc-resolver "^11.20.0"
     picomatch "^4.0.4"
     smol-toml "^1.6.1"
     strip-json-comments "5.0.3"
-    tinyglobby "^0.2.16"
-    unbash "^3.0.0"
+    tinyglobby "^0.2.17"
+    unbash "^4.0.1"
     yaml "^2.9.0"
     zod "^4.1.11"
 
@@ -4459,7 +4460,7 @@ minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.8:
+minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -4497,25 +4498,25 @@ natural-compare@^1.4.0:
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 next@^16.0.8:
-  version "16.2.6"
-  resolved "https://registry.yarnpkg.com/next/-/next-16.2.6.tgz#4564833d2865efc598b7c63541b5771792d3d811"
-  integrity sha512-qOVgKJg1+At15NpeUP+eJgCHvTCgXsogweq87Ri/Ix7PkqQHg4sdaXmSFqKlgaIXE4kW0g25LE68W87UANlHtw==
+  version "16.2.9"
+  resolved "https://registry.yarnpkg.com/next/-/next-16.2.9.tgz#320c5b5701deeb18c0b596d137ca5dccf976682c"
+  integrity sha512-MEOJiq/UvuezAdqVSceHbqDgZt1kDw2tpGVOlsdIoJsQdbN2JY2hpVG4xnXGkbdJUOEWhnRfiu/O4Hpc9Juwww==
   dependencies:
-    "@next/env" "16.2.6"
+    "@next/env" "16.2.9"
     "@swc/helpers" "0.5.15"
     baseline-browser-mapping "^2.9.19"
     caniuse-lite "^1.0.30001579"
     postcss "8.4.31"
     styled-jsx "5.1.6"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "16.2.6"
-    "@next/swc-darwin-x64" "16.2.6"
-    "@next/swc-linux-arm64-gnu" "16.2.6"
-    "@next/swc-linux-arm64-musl" "16.2.6"
-    "@next/swc-linux-x64-gnu" "16.2.6"
-    "@next/swc-linux-x64-musl" "16.2.6"
-    "@next/swc-win32-arm64-msvc" "16.2.6"
-    "@next/swc-win32-x64-msvc" "16.2.6"
+    "@next/swc-darwin-arm64" "16.2.9"
+    "@next/swc-darwin-x64" "16.2.9"
+    "@next/swc-linux-arm64-gnu" "16.2.9"
+    "@next/swc-linux-arm64-musl" "16.2.9"
+    "@next/swc-linux-x64-gnu" "16.2.9"
+    "@next/swc-linux-x64-musl" "16.2.9"
+    "@next/swc-win32-arm64-msvc" "16.2.9"
+    "@next/swc-win32-x64-msvc" "16.2.9"
     sharp "^0.34.5"
 
 no-case@^3.0.4:
@@ -4556,9 +4557,9 @@ node-fetch@^3.3.2:
     formdata-polyfill "^4.0.10"
 
 node-releases@^2.0.36:
-  version "2.0.44"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.44.tgz#212c9b983f5bb70d311dd68c27d55dd0e65d1ca7"
-  integrity sha512-5WUyunoPMsvvEhS8AxHtRzP+oA8UCkJ7YRxatWKjngndhDGLiqEVAQKWjFAiAiuL8zMRGzGSJxFnLetoa43qGQ==
+  version "2.0.47"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.47.tgz#521bb2786da8eb140b748841c0b3b3a75334ffc4"
+  integrity sha512-Uzmd6LXpouKo8EUK68IjH4+E01w/hXyV3R3g/geCJo+rXLNfh1xucB+LOzYEOQPSiUK3h/xZf0cQGcSsmyL2Og==
 
 nopt@^4.0.1:
   version "4.0.3"
@@ -4719,35 +4720,35 @@ own-keys@^1.0.1:
     object-keys "^1.1.1"
     safe-push-apply "^1.0.0"
 
-oxc-parser@^0.130.0:
-  version "0.130.0"
-  resolved "https://registry.yarnpkg.com/oxc-parser/-/oxc-parser-0.130.0.tgz#b8f03385db908d9fdfff49c8f37b1748b1f41596"
-  integrity sha512-X0PJ+NmOok8qP3vK9uaW431ngkdM9UPEK7KG466urtIL2+EYTEgbZK2yqe2MWKJKBjRlFweP/pJPx0x9muMEVw==
+oxc-parser@^0.135.0:
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/oxc-parser/-/oxc-parser-0.135.0.tgz#ccd3d046bac747540ce6a57072ce0bc05733d84a"
+  integrity sha512-/DaPStu0s2zzNSRRniKyTPM6Z/o+DapOp2JYNKDL8AsgaBGPK2IdZyB87SQjVH+xeQPz+Qr9mrjglfkYgtbVRA==
   dependencies:
-    "@oxc-project/types" "^0.130.0"
+    "@oxc-project/types" "^0.135.0"
   optionalDependencies:
-    "@oxc-parser/binding-android-arm-eabi" "0.130.0"
-    "@oxc-parser/binding-android-arm64" "0.130.0"
-    "@oxc-parser/binding-darwin-arm64" "0.130.0"
-    "@oxc-parser/binding-darwin-x64" "0.130.0"
-    "@oxc-parser/binding-freebsd-x64" "0.130.0"
-    "@oxc-parser/binding-linux-arm-gnueabihf" "0.130.0"
-    "@oxc-parser/binding-linux-arm-musleabihf" "0.130.0"
-    "@oxc-parser/binding-linux-arm64-gnu" "0.130.0"
-    "@oxc-parser/binding-linux-arm64-musl" "0.130.0"
-    "@oxc-parser/binding-linux-ppc64-gnu" "0.130.0"
-    "@oxc-parser/binding-linux-riscv64-gnu" "0.130.0"
-    "@oxc-parser/binding-linux-riscv64-musl" "0.130.0"
-    "@oxc-parser/binding-linux-s390x-gnu" "0.130.0"
-    "@oxc-parser/binding-linux-x64-gnu" "0.130.0"
-    "@oxc-parser/binding-linux-x64-musl" "0.130.0"
-    "@oxc-parser/binding-openharmony-arm64" "0.130.0"
-    "@oxc-parser/binding-wasm32-wasi" "0.130.0"
-    "@oxc-parser/binding-win32-arm64-msvc" "0.130.0"
-    "@oxc-parser/binding-win32-ia32-msvc" "0.130.0"
-    "@oxc-parser/binding-win32-x64-msvc" "0.130.0"
-
-oxc-resolver@^11.19.1:
+    "@oxc-parser/binding-android-arm-eabi" "0.135.0"
+    "@oxc-parser/binding-android-arm64" "0.135.0"
+    "@oxc-parser/binding-darwin-arm64" "0.135.0"
+    "@oxc-parser/binding-darwin-x64" "0.135.0"
+    "@oxc-parser/binding-freebsd-x64" "0.135.0"
+    "@oxc-parser/binding-linux-arm-gnueabihf" "0.135.0"
+    "@oxc-parser/binding-linux-arm-musleabihf" "0.135.0"
+    "@oxc-parser/binding-linux-arm64-gnu" "0.135.0"
+    "@oxc-parser/binding-linux-arm64-musl" "0.135.0"
+    "@oxc-parser/binding-linux-ppc64-gnu" "0.135.0"
+    "@oxc-parser/binding-linux-riscv64-gnu" "0.135.0"
+    "@oxc-parser/binding-linux-riscv64-musl" "0.135.0"
+    "@oxc-parser/binding-linux-s390x-gnu" "0.135.0"
+    "@oxc-parser/binding-linux-x64-gnu" "0.135.0"
+    "@oxc-parser/binding-linux-x64-musl" "0.135.0"
+    "@oxc-parser/binding-openharmony-arm64" "0.135.0"
+    "@oxc-parser/binding-wasm32-wasi" "0.135.0"
+    "@oxc-parser/binding-win32-arm64-msvc" "0.135.0"
+    "@oxc-parser/binding-win32-ia32-msvc" "0.135.0"
+    "@oxc-parser/binding-win32-x64-msvc" "0.135.0"
+
+oxc-resolver@^11.20.0:
   version "11.20.0"
   resolved "https://registry.yarnpkg.com/oxc-resolver/-/oxc-resolver-11.20.0.tgz#2b2a7a76de753b34be1d6031da1604c8cb580b08"
   integrity sha512-CblytBiV/a/ZXY34dsVU2NxhIOxMXst8CvDCtyBelVITgd7PLrKzbEbA6oKLdPjvDKDzCiW48qzmzZ+mYaqn+g==
@@ -4888,7 +4889,7 @@ picomatch@^4.0.3, picomatch@^4.0.4:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.4.tgz#fd6f5e00a143086e074dffe4c924b8fb293b0589"
   integrity sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==
 
-possible-typed-array-names@^1.0.0:
+possible-typed-array-names@^1.0.0, possible-typed-array-names@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
   integrity sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==
@@ -4908,9 +4909,9 @@ prelude-ls@^1.2.1:
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
 prettier@^3.3.2:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.8.3.tgz#560f2de55bf01b4c0503bc629d5df99b9a1d09b0"
-  integrity sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==
+  version "3.8.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.8.4.tgz#f334f013ac04a96676f24dabc23c1c4ae1bae411"
+  integrity sha512-N2MylSdi48+5N/6S5j+maeHbUSIzzZ5uOcX5Hm4QpV8Dkb1HFjfAKTKX6yNPJQD9AhcT3ifHNB66tWTTJDi11Q==
 
 prop-types@^15.8.1:
   version "15.8.1"
@@ -4941,9 +4942,9 @@ react-cookie@^8.0.1:
     universal-cookie "^8.0.0"
 
 react-dom@^19.2.0:
-  version "19.2.6"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.6.tgz#44a81b0bcca22da814c00847d09d01c8615529b7"
-  integrity sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g==
+  version "19.2.7"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.7.tgz#0450dc9ae9ddbff76ef196401cd8b8c7fb466ccc"
+  integrity sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==
   dependencies:
     scheduler "^0.27.0"
 
@@ -4958,9 +4959,9 @@ react-is@^18.2.0:
   integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
 
 react@^19.2.0:
-  version "19.2.6"
-  resolved "https://registry.yarnpkg.com/react/-/react-19.2.6.tgz#3dadb8e12b2a7934c1d5317973e5dce1301f9a4d"
-  integrity sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==
+  version "19.2.7"
+  resolved "https://registry.yarnpkg.com/react/-/react-19.2.7.tgz#1f47a1bfc06f8ec885752c6f4af14369a9f8260b"
+  integrity sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==
 
 read-installed@~4.0.3:
   version "4.0.3"
@@ -4996,7 +4997,7 @@ readdir-scoped-modules@^1.0.0:
     graceful-fs "^4.1.2"
     once "^1.3.0"
 
-reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:
+reflect.getprototypeof@^1.0.10, reflect.getprototypeof@^1.0.9:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz#c629219e78a3316d8b604c765ef68996964e7bf9"
   integrity sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==
@@ -5162,9 +5163,9 @@ semver@^6.3.1:
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 semver@^7.7.1, semver@^7.7.3:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.8.0.tgz#ed0661039fcbcda2ce71f01fa6adbefaa77040df"
-  integrity sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.8.4.tgz#c73eceebae0616934be8dff28a7fd70757c8e696"
+  integrity sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==
 
 sentence-case@^3.0.4:
   version "3.0.4"
@@ -5252,17 +5253,12 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@1.8.4:
+shell-quote@1.8.4, shell-quote@^1.7.3:
   version "1.8.4"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.4.tgz#2edd9a4dcefc96649e2e2cb12f637b1f1d92a190"
   integrity sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==
 
-shell-quote@^1.7.3:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.3.tgz#55e40ef33cf5c689902353a3d8cd1a6725f08b4b"
-  integrity sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==
-
-side-channel-list@^1.0.0:
+side-channel-list@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.1.tgz#c2e0b5a14a540aebee3bbc6c3f8666cc9b509127"
   integrity sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==
@@ -5292,13 +5288,13 @@ side-channel-weakmap@^1.0.2:
     side-channel-map "^1.0.1"
 
 side-channel@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
-  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.1.tgz#ea02c62e05dc4bea67d4442f0fb71ee192f8e0ab"
+  integrity sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==
   dependencies:
     es-errors "^1.3.0"
-    object-inspect "^1.13.3"
-    side-channel-list "^1.0.0"
+    object-inspect "^1.13.4"
+    side-channel-list "^1.0.1"
     side-channel-map "^1.0.1"
     side-channel-weakmap "^1.0.2"
 
@@ -5489,27 +5485,28 @@ string.prototype.repeat@^1.0.0:
     es-abstract "^1.17.5"
 
 string.prototype.trim@^1.2.10:
-  version "1.2.10"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz#40b2dd5ee94c959b4dcfb1d65ce72e90da480c81"
-  integrity sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.11.tgz#e6bd19cda3985d05a42dda31f3ddf4d35d3430e3"
+  integrity sha512-PwvK7BU+CMTJGYQCTZb5RWXIML92lftJLhQz1tBzgKiqGxJaMlBAa48POXaNAC2s4y8jr3EFqrkF9+44neS46w==
   dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.2"
+    call-bind "^1.0.9"
+    call-bound "^1.0.4"
     define-data-property "^1.1.4"
     define-properties "^1.2.1"
-    es-abstract "^1.23.5"
-    es-object-atoms "^1.0.0"
+    es-abstract "^1.24.2"
+    es-object-atoms "^1.1.2"
     has-property-descriptors "^1.0.2"
+    safe-regex-test "^1.1.0"
 
 string.prototype.trimend@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz#62e2731272cd285041b36596054e9f66569b6942"
-  integrity sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.10.tgz#be6bcf4f3fe0460bdeccdb2cf4f971b310f8346e"
+  integrity sha512-2+3aDAOmPTmuFwjDnmJG2ctEkQKVki7vOSqaxkv42Mowj1V6PnvuwFCRrR5lChUux1TBskPjfkeTOhqczDMxTw==
   dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.2"
+    call-bind "^1.0.9"
+    call-bound "^1.0.4"
     define-properties "^1.2.1"
-    es-object-atoms "^1.0.0"
+    es-object-atoms "^1.1.2"
 
 string.prototype.trimstart@^1.0.8:
   version "1.0.8"
@@ -5597,10 +5594,10 @@ timeout-signal@^2.0.0:
   resolved "https://registry.yarnpkg.com/timeout-signal/-/timeout-signal-2.0.0.tgz#23207ea448d50258bb0defe3beea4a467643abba"
   integrity sha512-YBGpG4bWsHoPvofT6y/5iqulfXIiIErl5B0LdtHT1mGXDFTAhhRrbUpTvBgYbovr+3cKblya2WAOcpoy90XguA==
 
-tinyglobby@^0.2.13, tinyglobby@^0.2.15, tinyglobby@^0.2.16:
-  version "0.2.16"
-  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.16.tgz#1c3b7eb953fce42b226bc5a1ee06428281aff3d6"
-  integrity sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==
+tinyglobby@^0.2.13, tinyglobby@^0.2.15, tinyglobby@^0.2.17:
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.17.tgz#562a9a6c9eb2b3b123d39719f9af5bb44fcd7631"
+  integrity sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==
   dependencies:
     fdir "^6.5.0"
     picomatch "^4.0.4"
@@ -5695,36 +5692,36 @@ typed-array-byte-offset@^1.0.4:
     reflect.getprototypeof "^1.0.9"
 
 typed-array-length@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.7.tgz#ee4deff984b64be1e118b0de8c9c877d5ce73d3d"
-  integrity sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.8.tgz#0b70e982c9e9dafe2def6d6458ff4b3f2d2b6d70"
+  integrity sha512-phPGCwqr2+Qo0fwniCE8e4pKnGu/yFb5nD5Y8bf0EEeiI5GklnACYA9GFy/DrAeRrKHXvHn+1SUsOWgJp6RO+g==
   dependencies:
-    call-bind "^1.0.7"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    is-typed-array "^1.1.13"
-    possible-typed-array-names "^1.0.0"
-    reflect.getprototypeof "^1.0.6"
+    call-bind "^1.0.9"
+    for-each "^0.3.5"
+    gopd "^1.2.0"
+    is-typed-array "^1.1.15"
+    possible-typed-array-names "^1.1.0"
+    reflect.getprototypeof "^1.0.10"
 
 typescript-eslint@^8.46.0:
-  version "8.59.4"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.59.4.tgz#834e3b53f4d1a764a985ceb8592c4a95d6a8da7c"
-  integrity sha512-Rw6+44QNFaXtgHSjPy+Kw8hrJniMYzR85E9yLmOLcfZ91/rz+JXQbDTCmc6ccxMPY6K6PgAq26f0JCBfR7LIPQ==
+  version "8.61.1"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.61.1.tgz#7c224a9a643b7f42d295c67a75c1e30fee8c3eaa"
+  integrity sha512-V7PayAfJokV3pEHgN7/v03D1SpujhRfQtYLbLIiBfDDncdg4PAiRBfoS4cnCANK4jmAPncczi59QO3afiXUlNw==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "8.59.4"
-    "@typescript-eslint/parser" "8.59.4"
-    "@typescript-eslint/typescript-estree" "8.59.4"
-    "@typescript-eslint/utils" "8.59.4"
+    "@typescript-eslint/eslint-plugin" "8.61.1"
+    "@typescript-eslint/parser" "8.61.1"
+    "@typescript-eslint/typescript-estree" "8.61.1"
+    "@typescript-eslint/utils" "8.61.1"
 
 typescript@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.3.tgz#90251dc007916e972786cb94d74d15b185577d21"
   integrity sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==
 
-unbash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unbash/-/unbash-3.0.0.tgz#57efd0217212ee4abcb820372c87b64ad3af687d"
-  integrity sha512-FeFPZ/WFT0mbRCuydiZzpPFlrYN8ZUpphQKoq4EeElVIYjYyGzPMxQR/simUwCOJIyVhpFk4RbtyO7RuMpMnHA==
+unbash@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/unbash/-/unbash-4.0.1.tgz#efa4876b0f95ab86931546aa1e699e7e353de7ad"
+  integrity sha512-1ajSo3813sDoVIHx4inJdUS4l5L2ic5cFiddemPiyjb/PZEoBAhFwHtbaEdRDFxbAKy7FCG7s5ww3/uCFawuIA==
 
 unbox-primitive@^1.1.0:
   version "1.1.0"
@@ -5746,10 +5743,10 @@ unc-path-regex@^0.1.2:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.24.6.tgz#61275b485d7fd4e9d269c7cf04ec2873c9cc0f91"
   integrity sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==
 
-undici-types@~7.16.0:
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46"
-  integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==
+undici-types@~7.18.0:
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.18.2.tgz#29357a89e7b7ca4aef3bf0fd3fd0cd73884229e9"
+  integrity sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==
 
 universal-cookie@^8.0.0:
   version "8.1.2"
@@ -5766,32 +5763,34 @@ unixify@^1.0.0:
     normalize-path "^2.1.1"
 
 unrs-resolver@^1.6.2:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/unrs-resolver/-/unrs-resolver-1.12.1.tgz#a5322b37be7119528b9742ead43101b4f5c2d4e9"
-  integrity sha512-LmOTmcBbFqxu1rzubnqHT6EZeqDYpenlGYwyFhHj7oc1HdyZE+0cLQ+s9SDSK+KKQQKuoJhUbzHQ89Ubwg2Oxg==
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/unrs-resolver/-/unrs-resolver-1.12.2.tgz#a6c6888396abba5adaac4cab6587df866f1d7afd"
+  integrity sha512-dmlRxBJJayXjqTwC+JtF1HhJmgf3ftQ3YejFcZrf4+KKtJv0qDsK1pjqaaVjG7wJ5NJ6UVP1OqRMQ71Z4C3rxQ==
   dependencies:
     napi-postinstall "^0.3.4"
   optionalDependencies:
-    "@unrs/resolver-binding-android-arm-eabi" "1.12.1"
-    "@unrs/resolver-binding-android-arm64" "1.12.1"
-    "@unrs/resolver-binding-darwin-arm64" "1.12.1"
-    "@unrs/resolver-binding-darwin-x64" "1.12.1"
-    "@unrs/resolver-binding-freebsd-x64" "1.12.1"
-    "@unrs/resolver-binding-linux-arm-gnueabihf" "1.12.1"
-    "@unrs/resolver-binding-linux-arm-musleabihf" "1.12.1"
-    "@unrs/resolver-binding-linux-arm64-gnu" "1.12.1"
-    "@unrs/resolver-binding-linux-arm64-musl" "1.12.1"
-    "@unrs/resolver-binding-linux-ppc64-gnu" "1.12.1"
-    "@unrs/resolver-binding-linux-riscv64-gnu" "1.12.1"
-    "@unrs/resolver-binding-linux-riscv64-musl" "1.12.1"
-    "@unrs/resolver-binding-linux-s390x-gnu" "1.12.1"
-    "@unrs/resolver-binding-linux-x64-gnu" "1.12.1"
-    "@unrs/resolver-binding-linux-x64-musl" "1.12.1"
-    "@unrs/resolver-binding-openharmony-arm64" "1.12.1"
-    "@unrs/resolver-binding-wasm32-wasi" "1.12.1"
-    "@unrs/resolver-binding-win32-arm64-msvc" "1.12.1"
-    "@unrs/resolver-binding-win32-ia32-msvc" "1.12.1"
-    "@unrs/resolver-binding-win32-x64-msvc" "1.12.1"
+    "@unrs/resolver-binding-android-arm-eabi" "1.12.2"
+    "@unrs/resolver-binding-android-arm64" "1.12.2"
+    "@unrs/resolver-binding-darwin-arm64" "1.12.2"
+    "@unrs/resolver-binding-darwin-x64" "1.12.2"
+    "@unrs/resolver-binding-freebsd-x64" "1.12.2"
+    "@unrs/resolver-binding-linux-arm-gnueabihf" "1.12.2"
+    "@unrs/resolver-binding-linux-arm-musleabihf" "1.12.2"
+    "@unrs/resolver-binding-linux-arm64-gnu" "1.12.2"
+    "@unrs/resolver-binding-linux-arm64-musl" "1.12.2"
+    "@unrs/resolver-binding-linux-loong64-gnu" "1.12.2"
+    "@unrs/resolver-binding-linux-loong64-musl" "1.12.2"
+    "@unrs/resolver-binding-linux-ppc64-gnu" "1.12.2"
+    "@unrs/resolver-binding-linux-riscv64-gnu" "1.12.2"
+    "@unrs/resolver-binding-linux-riscv64-musl" "1.12.2"
+    "@unrs/resolver-binding-linux-s390x-gnu" "1.12.2"
+    "@unrs/resolver-binding-linux-x64-gnu" "1.12.2"
+    "@unrs/resolver-binding-linux-x64-musl" "1.12.2"
+    "@unrs/resolver-binding-openharmony-arm64" "1.12.2"
+    "@unrs/resolver-binding-wasm32-wasi" "1.12.2"
+    "@unrs/resolver-binding-win32-arm64-msvc" "1.12.2"
+    "@unrs/resolver-binding-win32-ia32-msvc" "1.12.2"
+    "@unrs/resolver-binding-win32-x64-msvc" "1.12.2"
 
 update-browserslist-db@^1.2.3:
   version "1.2.3"
@@ -5896,12 +5895,12 @@ which-collection@^1.0.2:
     is-weakset "^2.0.3"
 
 which-typed-array@^1.1.16, which-typed-array@^1.1.19:
-  version "1.1.20"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.20.tgz#3fdb7adfafe0ea69157b1509f3a1cd892bd1d122"
-  integrity sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==
+  version "1.1.22"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.22.tgz#8f3cc78aefb40b437346dd40a1dbfa5d1da43fe9"
+  integrity sha512-fvO4ExWMFsqyhG3AiPAObMuY1lxaqgYcxbc49CNdWDDECOJNgQyvsOWVwbZc+qf3rzRtxojBK+CMEv0Ld5CYpw==
   dependencies:
     available-typed-arrays "^1.0.7"
-    call-bind "^1.0.8"
+    call-bind "^1.0.9"
     call-bound "^1.0.4"
     for-each "^0.3.5"
     get-proto "^1.0.1"
@@ -5944,9 +5943,9 @@ wrappy@1:
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 ws@^8.18.3, ws@^8.20.0:
-  version "8.20.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.20.1.tgz#91a9ae2b312ccf98e0a85ec499b48cef45ab0ddb"
-  integrity sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==
+  version "8.21.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.21.0.tgz#012e413fc07429945121b0c153158c4343086951"
+  integrity sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==
 
 y18n@^5.0.5:
   version "5.0.8"

From 3ff499b397728b28de5c4e9336d5e5a52e8749d7 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 16 Jun 2026 17:31:22 +0200
Subject: [PATCH 086/145] Downgrade the graphql package

---
 frontend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/package.json b/frontend/package.json
index 15067262e..ec406bf66 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,7 +21,7 @@
     "antd": "^6.3.3",
     "crypto-hash": "^4.0.0",
     "dayjs": "^1.0",
-    "graphql": "^17.0.0",
+    "graphql": "^16.12.0",
     "next": "^16.0.8",
     "react": "^19.2.0",
     "react-cookie": "^8.0.1",

From 6d4ba837d1a770ff91087a3e999beeac22f440aa Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 16 Jun 2026 18:21:27 +0200
Subject: [PATCH 087/145] Fix apollo configuration and usage

---
 .../components/ActiveFilterAndSortBar.tsx     |  3 +-
 frontend/components/PaginatedIdSelect.tsx     |  3 +-
 frontend/lib/hooks/useInfiniteScrollQuery.ts  | 66 -------------------
 frontend/tsconfig.json                        | 10 +--
 frontend/typings/apollo.d.ts                  | 21 ++++++
 frontend/{ => typings}/environment.d.ts       |  3 +-
 frontend/typings/image.d.ts                   | 19 ++++++
 frontend/yarn.lock                            |  8 +--
 8 files changed, 52 insertions(+), 81 deletions(-)
 delete mode 100644 frontend/lib/hooks/useInfiniteScrollQuery.ts
 create mode 100644 frontend/typings/apollo.d.ts
 rename frontend/{ => typings}/environment.d.ts (70%)
 create mode 100644 frontend/typings/image.d.ts

diff --git a/frontend/components/ActiveFilterAndSortBar.tsx b/frontend/components/ActiveFilterAndSortBar.tsx
index dd9ac5fdf..239f5ff1b 100644
--- a/frontend/components/ActiveFilterAndSortBar.tsx
+++ b/frontend/components/ActiveFilterAndSortBar.tsx
@@ -8,7 +8,6 @@ import {
 } from "../lib/filter";
 import { formatSortDirection, SortState, SortDefinition } from "../lib/sort";
 import DeleteButton from "./DeleteButton";
-import { Key } from "react";
 import { getLabel } from "../lib/string";
 
 const stringifySort = <TSortInput,>(
@@ -29,7 +28,7 @@ const renderSort = <TSortInput,>(
 const stringifyFilter = <TFilterInput,>(
   filter: ObjectFilterState,
   definitions: readonly FilterDefinition<TFilterInput>[],
-): Key =>
+): string =>
   createFilterStateReducer<string>(
     (scalar) =>
       `${getFilterOperatorLabel(scalar.operator)}|${JSON.stringify(scalar.value)}`,
diff --git a/frontend/components/PaginatedIdSelect.tsx b/frontend/components/PaginatedIdSelect.tsx
index f15146a50..d2c6036a0 100644
--- a/frontend/components/PaginatedIdSelect.tsx
+++ b/frontend/components/PaginatedIdSelect.tsx
@@ -83,7 +83,8 @@ export default function PaginatedIdSelect({
 
   const { data, loading, fetchMore, refetch } = useQuery<
     ItemsData,
-    ItemsVariables
+    ItemsVariables,
+    any
   >(query, {
     variables: {
       first: pageSize,
diff --git a/frontend/lib/hooks/useInfiniteScrollQuery.ts b/frontend/lib/hooks/useInfiniteScrollQuery.ts
deleted file mode 100644
index 2f3ecda48..000000000
--- a/frontend/lib/hooks/useInfiniteScrollQuery.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { TypedDocumentNode } from "@apollo/client";
-import { useQuery } from "@apollo/client/react";
-import { Connection } from "../connection";
-
-// ensure `relayStylePagination(["first", "after", ...])` is set in `InMemoryCache` for the field `fieldName`
-export function useRelayInfiniteScroll<
-  TNode,
-  TData extends Record<TFieldName, Connection<TNode>>,
-  TVariables extends {
-    first?: number | null;
-    after?: string | null;
-    where?: any;
-    order?: any;
-  },
-  TFieldName extends keyof TData,
->(
-  queryDocument: TypedDocumentNode<TData, TVariables>,
-  {
-    pageSize,
-    fieldName,
-    where,
-    order,
-  }: {
-    pageSize: number;
-    fieldName: TFieldName;
-    where: TVariables["where"];
-    order: TVariables["order"];
-  },
-) {
-  const { data, loading, fetchMore } = useQuery<TData, TVariables>(
-    queryDocument,
-    {
-      variables: {
-        first: pageSize,
-        after: null,
-        where: where,
-        order: order, // HotChocolate naming convention
-      } as TVariables,
-      notifyOnNetworkStatusChange: true,
-    },
-  );
-
-  const connection = data?.[fieldName];
-  const hasMore = !!connection?.pageInfo.hasNextPage;
-
-  const loadMore = () => {
-    if (hasMore && !loading) {
-      fetchMore({
-        variables: { after: connection.pageInfo.endCursor } as TVariables,
-      });
-    }
-  };
-
-  return {
-    edges: connection?.edges || [],
-    nodes: connection?.edges?.map((e: any) => e.node) || [],
-    loading,
-    hasMore,
-    loadMore,
-    loadMoreButtonProps: {
-      loading,
-      onClick: loadMore,
-      disabled: !hasMore,
-    },
-  };
-}
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 26572294a..26e009f44 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -6,10 +6,7 @@
     "forceConsistentCasingInFileNames": true,
     "isolatedModules": true,
     "jsx": "react-jsx",
-    "lib": [
-      "dom",
-      "es2017"
-    ],
+    "lib": ["dom", "es2017"],
     "module": "esnext",
     "moduleResolution": "bundler",
     "noEmit": true,
@@ -24,12 +21,11 @@
     // "verbatimModuleSyntax": true
   },
   "include": [
+    "typings/**/*.d.ts",
     "next-env.d.ts",
     ".next/types/**/*.ts",
     "**/*.ts",
     "**/*.tsx"
   ],
-  "exclude": [
-    "node_modules"
-  ]
+  "exclude": ["node_modules"]
 }
diff --git a/frontend/typings/apollo.d.ts b/frontend/typings/apollo.d.ts
new file mode 100644
index 000000000..faeddc279
--- /dev/null
+++ b/frontend/typings/apollo.d.ts
@@ -0,0 +1,21 @@
+import "@apollo/client";
+
+// Inspired by https://www.apollographql.com/docs/react/data/typescript#how-to-declare-default-options
+declare module "@apollo/client" {
+  namespace ApolloClient {
+    namespace DeclareDefaultOptions {
+      // Affects client.watchQuery() and React hooks (useQuery, useSuspenseQuery, etc.)
+      interface WatchQuery {
+        errorPolicy: "all";
+      }
+      // Affects client.query()
+      interface Query {
+        errorPolicy: "all";
+      }
+      // Affects client.mutate()
+      interface Mutate {
+        errorPolicy: "all";
+      }
+    }
+  }
+}
diff --git a/frontend/environment.d.ts b/frontend/typings/environment.d.ts
similarity index 70%
rename from frontend/environment.d.ts
rename to frontend/typings/environment.d.ts
index 03537938b..489fe7721 100644
--- a/frontend/environment.d.ts
+++ b/frontend/typings/environment.d.ts
@@ -1,8 +1,9 @@
 declare global {
   namespace NodeJS {
     interface ProcessEnv {
-      NODE_ENV: "development" | "production";
       HOST: string | undefined;
     }
   }
 }
+
+export {};
diff --git a/frontend/typings/image.d.ts b/frontend/typings/image.d.ts
new file mode 100644
index 000000000..5069030a3
--- /dev/null
+++ b/frontend/typings/image.d.ts
@@ -0,0 +1,19 @@
+declare module "*.png" {
+  const value: string;
+  export default value;
+}
+
+declare module "*.jpg" {
+  const value: string;
+  export default value;
+}
+
+declare module "*.jpeg" {
+  const value: string;
+  export default value;
+}
+
+declare module "*.svg" {
+  const value: string;
+  export default value;
+}
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 6a47209d8..f14a4af53 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -3751,10 +3751,10 @@ graphql-ws@^6.0.6:
   resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-6.0.8.tgz#6712bb9da8462937e92343e3146726f89424df68"
   integrity sha512-m3EOaNsUBXwAnkBWbzPfe0Nq8pXUfxsWnolC54sru3FzHvhTZL0Ouf/BoQsaGAXqM+YPerXOJ47BUnmgmoupCw==
 
-graphql@^17.0.0:
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-17.0.0.tgz#6fb4df705269438c96f504621b792d224f217391"
-  integrity sha512-RSEgqrRNqHVGa46w2pmL9uTFkYPJiJbD5kksOvOaPLrKvBIidX/ttQVlWsR3+Ee8l+mNroC6darpcPIZeElbNg==
+graphql@^16.12.0:
+  version "16.14.2"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.14.2.tgz#83faf25869e3df727cc855161db5da85b0e5b2c0"
+  integrity sha512-Chq1s4CY7jmh8gO2qvLIJyfCDIN+EHLFW/9iShnp1z8FjBQMoodWP1kDC36VAMXXIvAjj4ARa7ntfAV2BrjsbA==
 
 has-bigints@^1.0.2:
   version "1.1.0"

From ed7f987dc7c08b0f98cbe69934fc3095a0685b27 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 16 Jun 2026 18:36:53 +0200
Subject: [PATCH 088/145] Treat C# `TimeSpan`s like NodaTime `Duration`s

---
 backend/src/Configuration/GraphQlConfiguration.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/src/Configuration/GraphQlConfiguration.cs b/backend/src/Configuration/GraphQlConfiguration.cs
index 197f60cbb..9b74990f8 100644
--- a/backend/src/Configuration/GraphQlConfiguration.cs
+++ b/backend/src/Configuration/GraphQlConfiguration.cs
@@ -23,6 +23,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using NodaTime;
+using DurationType = HotChocolate.Types.NodaTime.DurationType;
 
 namespace Metabase.Configuration;
 
@@ -54,6 +55,9 @@ IWebHostEnvironment environment
             .AddMutationConventions(new MutationConventionOptions { ApplyToAllMutations = false })
             // Extensions
             .AddNodaTime()
+            .BindRuntimeType<TimeSpan, DurationType>()
+            .AddTypeConverter<Duration, TimeSpan>(_ => _.ToTimeSpan())
+            .AddTypeConverter<TimeSpan, Duration>(_ => Duration.FromTimeSpan(_))
             // .AddTypeConverter<OffsetDateTime, DateTimeOffset>(
             //     _ => _.ToDateTimeOffset()
             // )

From 6002a23b7e8808f0d83e5ae26baeb18af52e3b90 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 16 Jun 2026 20:09:43 +0200
Subject: [PATCH 089/145] Pass user ID and API key to EPEA database

---
 .env.development.sample                       |  4 ++
 .env.production.sample                        |  4 ++
 .env.staging.sample                           |  4 ++
 backend/src/AppSettings.cs                    |  8 +++
 backend/src/Data/DataCopnstants.cs            |  4 +-
 backend/src/Data/DbSeeder.cs                  | 59 +++++++++++++++----
 backend/src/GraphQl/Requests/DataQueries.cs   | 11 +---
 .../src/GraphQl/Requests/QueryingDatabases.cs | 46 ++++++++-------
 docker-compose.development.yaml               |  3 +
 docker-compose.production.yaml                |  3 +
 10 files changed, 105 insertions(+), 41 deletions(-)

diff --git a/.env.development.sample b/.env.development.sample
index 906214f0a..b41b53694 100644
--- a/.env.development.sample
+++ b/.env.development.sample
@@ -19,6 +19,10 @@ TESTLAB_SOLAR_FACADES_OPEN_ID_CONNECT_CLIENT_SECRET=secret
 IGSDB_API_TOKEN=secret
 IGSDB_OPEN_ID_CONNECT_CLIENT_SECRET=secret
 
+EPEA_USER_ID=christoph.maurer@ise.fraunhofer.de
+EPEA_API_KEY=secret
+EPEA_OPEN_ID_CONNECT_CLIENT_SECRET=secret
+
 OPEN_TELEMETRY_HOST=host.docker.internal
 OPEN_TELEMETRY_GRPC_PORT=4017
 
diff --git a/.env.production.sample b/.env.production.sample
index 1dbda821f..c2e30f140 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -18,6 +18,10 @@ TESTLAB_SOLAR_FACADES_OPEN_ID_CONNECT_CLIENT_SECRET=
 IGSDB_API_TOKEN=
 IGSDB_OPEN_ID_CONNECT_CLIENT_SECRET=
 
+EPEA_USER_ID=christoph.maurer@ise.fraunhofer.de
+EPEA_API_KEY=
+EPEA_OPEN_ID_CONNECT_CLIENT_SECRET=
+
 OPEN_TELEMETRY_HOST=host.docker.internal
 OPEN_TELEMETRY_GRPC_PORT=4317
 
diff --git a/.env.staging.sample b/.env.staging.sample
index 749bbed18..cfb07d415 100644
--- a/.env.staging.sample
+++ b/.env.staging.sample
@@ -18,6 +18,10 @@ TESTLAB_SOLAR_FACADES_OPEN_ID_CONNECT_CLIENT_SECRET=
 IGSDB_API_TOKEN=
 IGSDB_OPEN_ID_CONNECT_CLIENT_SECRET=
 
+EPEA_USER_ID=christoph.maurer@ise.fraunhofer.de
+EPEA_API_KEY=
+EPEA_OPEN_ID_CONNECT_CLIENT_SECRET=
+
 OPEN_TELEMETRY_HOST=host.docker.internal
 OPEN_TELEMETRY_GRPC_PORT=4317
 
diff --git a/backend/src/AppSettings.cs b/backend/src/AppSettings.cs
index 7882ee829..c475c03d1 100644
--- a/backend/src/AppSettings.cs
+++ b/backend/src/AppSettings.cs
@@ -20,6 +20,7 @@ public sealed record AppSettings
 
     public TestlabSolarFacadesSettings TestlabSolarFacades { get; init; } = new();
     public IgsdbSettings Igsdb { get; init; } = new();
+    public EpeaSettings Epea { get; init; } = new();
     public LoggingSettings Logging { get; init; } = new();
     public EmailSettings Email { get; init; } = new();
     public DatabaseSettings Database { get; init; } = new();
@@ -38,6 +39,13 @@ public sealed record IgsdbSettings
         public string ApiToken { get; init; } = "";
     };
 
+    public sealed record EpeaSettings
+    {
+        public string OpenIdConnectClientSecret { get; init; } = "";
+        public string UserId { get; init; } = "";
+        public string ApiKey { get; init; } = "";
+    };
+
     public sealed record LoggingSettings
     {
         public bool EnableSensitiveDataLogging { get; init; }
diff --git a/backend/src/Data/DataCopnstants.cs b/backend/src/Data/DataCopnstants.cs
index 7d2870ef9..d8950aa06 100644
--- a/backend/src/Data/DataCopnstants.cs
+++ b/backend/src/Data/DataCopnstants.cs
@@ -2,13 +2,15 @@ namespace Metabase.Data;
 
 public static class DataConstants
 {
-    public const string TestlabSolarFacadesOpenIdConnectClientId = "testlab-solar-facades";
+    public const string TestlabOpenIdConnectClientId = "testlab-solar-facades";
     public const string IgsdbOpenIdConnectClientId = "igsdb";
 
     public const string IseInstitutionUuid = "5320d6fb-b96d-4aeb-a24c-eb7036d3437a";
     public const string TestlabInstitutionUuid = "82b9f95c-3261-463a-90fe-0e9da707af17";
     public const string LbnlInstitutionUuid = "c17af5ef-2f1d-4c73-bcc9-fcfb722420f3";
+    public const string EpeaInstitutionUuid = "84580047-d1db-4275-bd29-4222c907cabe";
 
     public const string TestlabDatabaseUuid = "8a27aa0d-6026-4124-b185-4efd5cead953";
     public const string IgsdbDatabaseUuid = "48994b60-670d-488d-aaf7-53333a64f1d6";
+    public const string EpeaDatabaseUuid = "82490800-1712-48d0-8b4a-2ca821487c8d";
 }
\ No newline at end of file
diff --git a/backend/src/Data/DbSeeder.cs b/backend/src/Data/DbSeeder.cs
index a89c69142..2129e031a 100644
--- a/backend/src/Data/DbSeeder.cs
+++ b/backend/src/Data/DbSeeder.cs
@@ -206,7 +206,6 @@ IWebHostEnvironment environment
                 iseInstitution.OpenIdConnectApplications.Add(application);
             }
             context.Institutions.Add(iseInstitution);
-            await context.SaveChangesAsync();
         }
         if (!await context.Institutions.Where(_ => _.Id == new Guid(DataConstants.TestlabInstitutionUuid)).AnyAsync())
         {
@@ -230,13 +229,12 @@ IWebHostEnvironment environment
             {
                 ManagerId = iseInstitution.Id
             };
-            var application = await manager.FindByClientIdAsync(DataConstants.TestlabSolarFacadesOpenIdConnectClientId).AsTask();
+            var application = await manager.FindByClientIdAsync(DataConstants.TestlabOpenIdConnectClientId).AsTask();
             if (application is not null)
             {
                 institution.OpenIdConnectApplications.Add(application);
             }
             context.Institutions.Add(institution);
-            await context.SaveChangesAsync();
         }
         if (!await context.Institutions.Where(_ => _.Id == new Guid(DataConstants.LbnlInstitutionUuid)).AnyAsync())
         {
@@ -261,8 +259,32 @@ IWebHostEnvironment environment
                 ManagerId = iseInstitution.Id
             };
             context.Institutions.Add(institution);
-            await context.SaveChangesAsync();
         }
+        if (!await context.Institutions.Where(_ => _.Id == new Guid(DataConstants.EpeaInstitutionUuid)).AnyAsync())
+        {
+            var institution = new Institution(
+                new Guid(DataConstants.EpeaInstitutionUuid),
+                "EPEA - Part of Drees & Sommer",
+                "EPEA",
+                "Sustainability",
+                new ContactInformation(
+                    phoneNumber: null,
+                    isPhoneNumberConfirmed: true,
+                    postalAddress: null,
+                    emailAddress: null,
+                    isEmailAddressConfirmed: false,
+                    websiteLocator: null
+                ),
+                InstitutionState.VERIFIED,
+                InstitutionOperatingState.OPERATING,
+                null
+            )
+            {
+                ManagerId = iseInstitution.Id
+            };
+            context.Institutions.Add(institution);
+        }
+        await context.SaveChangesAsync();
     }
 
     private static async Task CreateDatabasesAsync(
@@ -289,7 +311,6 @@ AppSettings appSettings
             };
             database.Verify();
             context.Databases.Add(database);
-            await context.SaveChangesAsync();
         }
         if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.IgsdbDatabaseUuid)).AnyAsync())
         {
@@ -308,8 +329,26 @@ AppSettings appSettings
             };
             database.Verify();
             context.Databases.Add(database);
-            await context.SaveChangesAsync();
         }
+        if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.EpeaDatabaseUuid)).AnyAsync())
+        {
+            var uriBuilder = new UriBuilder(new Uri("https://app.conpli.eu/GraphQL", UriKind.Absolute))
+            {
+                Path = "/graphql/"
+            };
+            var database = new Database(
+                new Guid(DataConstants.EpeaDatabaseUuid),
+                "ProCA Database",
+                "Database for Life-Cycle data of components",
+                uriBuilder.Uri
+            )
+            {
+                OperatorId = new Guid(DataConstants.EpeaInstitutionUuid)
+            };
+            database.Verify();
+            context.Databases.Add(database);
+        }
+        await context.SaveChangesAsync();
     }
 
     private static async Task CreateOpenIdConnectScopes(
@@ -544,13 +583,13 @@ AppSettings appSettings
             // the metabase client, see `OPEN_ID_CONNECT_CLIENT_SECRET` in `.env.*`.
             await manager.CreateAsync(application, appSettings.OpenIdConnectClientSecret);
         }
-        if (await manager.FindByClientIdAsync(DataConstants.TestlabSolarFacadesOpenIdConnectClientId) is null)
+        if (await manager.FindByClientIdAsync(DataConstants.TestlabOpenIdConnectClientId) is null)
         {
-            logger.CreatingApplicationClient(DataConstants.TestlabSolarFacadesOpenIdConnectClientId);
+            logger.CreatingApplicationClient(DataConstants.TestlabOpenIdConnectClientId);
             var host = appSettings.TestlabSolarFacades.Uri;
             var descriptor = new OpenIddictApplicationDescriptor
             {
-                ClientId = DataConstants.TestlabSolarFacadesOpenIdConnectClientId,
+                ClientId = DataConstants.TestlabOpenIdConnectClientId,
                 ClientSecret = null,
                 ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
                 DisplayName = "TestLab Solar Façades",
@@ -641,4 +680,4 @@ AppSettings appSettings
             await manager.CreateAsync(application, appSettings.Igsdb.OpenIdConnectClientSecret);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Requests/DataQueries.cs b/backend/src/GraphQl/Requests/DataQueries.cs
index 7e385dfce..51096dc89 100644
--- a/backend/src/GraphQl/Requests/DataQueries.cs
+++ b/backend/src/GraphQl/Requests/DataQueries.cs
@@ -42,7 +42,6 @@ public sealed class DataQueries(
     ApplicationDbContext databaseContext,
     QueryingDatabases queryingDatabases,
     GraphQlRequestHelper graphQlRequestHelper,
-    AppSettings appSettings,
     ILogger<DataQueries> logger
 )
 {
@@ -166,11 +165,6 @@ ILogger<DataQueries> logger
         "HasPhotovoltaicData.graphql"
     ];
 
-    private static bool IsIgsdbDatabase(Database database)
-    {
-        return database.Id == new Guid(DataConstants.IgsdbDatabaseUuid);
-    }
-
     private sealed record NeighboringCursors(
         [property: JsonPropertyName("l")] string? Before,
         [property: JsonPropertyName("r")] string? After
@@ -1063,8 +1057,7 @@ CancellationToken cancellationToken
                     await queryingDatabases.QueryDatabase<TGraphQlResponse>(
                         database,
                         request,
-                        cancellationToken,
-                        IsIgsdbDatabase(database) ? appSettings.Igsdb.ApiToken : null
+                        cancellationToken
                     );
                 if (deserializedGraphQlResponse.Errors?.Length > 0)
                 {
@@ -1117,4 +1110,4 @@ private sealed record HasGeometricDataData(bool HasGeometricData);
     private sealed record HasHygrothermalDataData(bool HasHygrothermalData);
     private sealed record HasLifeCycleDataData(bool HasLifeCycleData);
     private sealed record HasPhotovoltaicDataData(bool HasPhotovoltaicData);
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Requests/QueryingDatabases.cs b/backend/src/GraphQl/Requests/QueryingDatabases.cs
index e6294c9e9..553b6c966 100644
--- a/backend/src/GraphQl/Requests/QueryingDatabases.cs
+++ b/backend/src/GraphQl/Requests/QueryingDatabases.cs
@@ -147,30 +147,34 @@ public async
         //    )
         //   .AsGraphQLHttpResponse();
         using var httpClient = httpClientFactory.CreateClient(DatabaseHttpClient);
-        // Set the authorization header to a given API token or the bearer token
-        // from the original HTTP request. Note that we cannot pass the API
-        // token as well as the bearer token in one request, neither with
-        // multiple HTTP authorization headers nor with one header with
-        // a comma-separated list of authentication scheme and value pairs.
-        // Both go against RFC 7230/7235, even though some web servers accept
-        // multiple schemes. For details see
-        // https://stackoverflow.com/questions/29282578/multiple-http-authorization-headers
-        if (apiToken is not null)
+        // Set the authorization header to a restricted bearer token from the
+        // original HTTP request. The restricted token can be used to identify
+        // the authenticated user.
+        var accessToken = await CreateRestrictedAccessTokenForDatabaseAsync(
+            database,
+            cancellationToken
+        );
+        if (accessToken is not null)
         {
-            httpClient.SetToken("Token", apiToken);
+            httpClient.SetBearerToken(accessToken);
         }
-        else
+        switch (database.Id)
         {
-            // Create and set restricted access token that can be used to
-            // identify the authenticated user.
-            var accessToken = await CreateRestrictedAccessTokenForDatabaseAsync(
-                database,
-                cancellationToken
-            );
-            if (accessToken is not null)
-            {
-                httpClient.SetBearerToken(accessToken);
-            }
+            case var id when id == new Guid(DataConstants.IgsdbDatabaseUuid):
+                // Pass the API token instead of the access token. Note that we
+                // cannot pass the API token as well as the bearer token in one
+                // request, neither with multiple HTTP authorization headers
+                // nor with one header with a comma-separated list of
+                // authentication scheme and value pairs. Both go against RFC
+                // 7230/7235, even though some web servers accept multiple
+                // schemes. For details see
+                // https://stackoverflow.com/questions/29282578/multiple-http-authorization-headers
+                httpClient.SetToken("Token", appSettings.Igsdb.ApiToken);
+                break;
+            case var id when id == new Guid(DataConstants.EpeaDatabaseUuid):
+                httpClient.DefaultRequestHeaders.Add("x-user-id", appSettings.Epea.UserId);
+                httpClient.DefaultRequestHeaders.Add("x-api-key", appSettings.Epea.ApiKey);
+                break;
         }
         // For some reason `httpClient.PostAsJsonAsync` without `MakeJsonHttpContent` but with `SerializerOptions` results in `BadRequest` status code. It has to do with `JsonContent.Create` used within `PostAsJsonAsync` --- we also cannot use `JsonContent.Create` in `MakeJsonHttpContent`. What is happening here?
         using var jsonHttpContent = MakeJsonHttpContent(request);
diff --git a/docker-compose.development.yaml b/docker-compose.development.yaml
index 77b187868..90f7bfd60 100644
--- a/docker-compose.development.yaml
+++ b/docker-compose.development.yaml
@@ -149,6 +149,9 @@ services:
       XBASE_TestlabSolarFacades__OpenIdConnectClientSecret: "${TESTLAB_SOLAR_FACADES_OPEN_ID_CONNECT_CLIENT_SECRET:?required}"
       XBASE_Igsdb__ApiToken: "${IGSDB_API_TOKEN:?required}"
       XBASE_Igsdb__OpenIdConnectClientSecret: "${IGSDB_OPEN_ID_CONNECT_CLIENT_SECRET:?required}"
+      XBASE_Epea__UserId: "${EPEA_USER_ID:?required}"
+      XBASE_Epea__ApiKey: "${EPEA_API_KEY:?required}"
+      XBASE_Epea__OpenIdConnectClientSecret: "${EPEA_OPEN_ID_CONNECT_CLIENT_SECRET:?required}"
       XBASE_OpenTelemetry__Host: "${OPEN_TELEMETRY_HOST:?required}"
       XBASE_OpenTelemetry__GrpcPort: "${OPEN_TELEMETRY_GRPC_PORT:?required}"
       # https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-watch#environment-variables
diff --git a/docker-compose.production.yaml b/docker-compose.production.yaml
index 3ea64d71f..11bce5417 100644
--- a/docker-compose.production.yaml
+++ b/docker-compose.production.yaml
@@ -134,6 +134,9 @@ services:
       XBASE_TestlabSolarFacades__OpenIdConnectClientSecret: "${TESTLAB_SOLAR_FACADES_OPEN_ID_CONNECT_CLIENT_SECRET:?required}"
       XBASE_Igsdb__ApiToken: "${IGSDB_API_TOKEN:?required}"
       XBASE_Igsdb__OpenIdConnectClientSecret: "${IGSDB_OPEN_ID_CONNECT_CLIENT_SECRET:?required}"
+      XBASE_Epea__UserId: "${EPEA_USER_ID:?required}"
+      XBASE_Epea__ApiKey: "${EPEA_API_KEY:?required}"
+      XBASE_Epea__OpenIdConnectClientSecret: "${EPEA_OPEN_ID_CONNECT_CLIENT_SECRET:?required}"
       XBASE_OpenTelemetry__Host: "${OPEN_TELEMETRY_HOST:?required}"
       XBASE_OpenTelemetry__GrpcPort: "${OPEN_TELEMETRY_GRPC_PORT:?required}"
       # The value `/dev/pts/0` is the output of running `tty` within `shellb`

From d76a8b9af4dc83f2c5121521beea3573752a2397 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 16 Jun 2026 20:27:22 +0200
Subject: [PATCH 090/145] Show only the icon for copying a GnuPG link

---
 frontend/components/GnuPgKeyLink.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/components/GnuPgKeyLink.tsx b/frontend/components/GnuPgKeyLink.tsx
index 2e23e18fd..485431af8 100644
--- a/frontend/components/GnuPgKeyLink.tsx
+++ b/frontend/components/GnuPgKeyLink.tsx
@@ -19,6 +19,8 @@ export default function GnuPgKeyLink({
   return block ? (
     <CopyableBlock text={fingerprint}>{link}</CopyableBlock>
   ) : (
-    <Copyable text={fingerprint}>{link}</Copyable>
+    <Copyable onlyIcon text={fingerprint}>
+      {link}
+    </Copyable>
   );
 }

From 516ca000fc82d7a8eb3699374a1c1897baeecd29 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 17 Jun 2026 12:57:40 +0200
Subject: [PATCH 091/145] Fix permalink for entity summaries used on index
 pages

---
 frontend/components/entities/EntitySummary.tsx | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/frontend/components/entities/EntitySummary.tsx b/frontend/components/entities/EntitySummary.tsx
index a0247b2b9..a69546286 100644
--- a/frontend/components/entities/EntitySummary.tsx
+++ b/frontend/components/entities/EntitySummary.tsx
@@ -31,6 +31,10 @@ export default function EntitySummary({
   breadcrumb,
   children,
 }: Props) {
+  const absoluteRoute = route
+    ? new URL(route(entity.uuid), new URL(window.location.href).origin)
+    : null;
+
   return (
     <div>
       {breadcrumb && (
@@ -71,7 +75,14 @@ export default function EntitySummary({
                 }}
               >
                 <CopyButton
-                  getText={() => window.location.href}
+                  getText={
+                    () =>
+                      absoluteRoute &&
+                      absoluteRoute.pathname !==
+                        new URL(window.location.href).pathname
+                        ? absoluteRoute.toString() // use route if summary is not displayed on the entity page
+                        : window.location.href // use URL (with URL parameters and all) if summary is displayed on the entity page
+                  }
                   copyIcon={<PushpinOutlined />}
                 >
                   Copy Permalink

From b986051a8a736bb848710b99cb7ede03345744d3 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 17 Jun 2026 12:59:26 +0200
Subject: [PATCH 092/145] Seed less aggressively --- only seed users,
 databases, and OpenID Connect applications if there are none yet (the reason
 is that application client IDs can change and databases can be deleted)

---
 backend/src/Data/DbSeeder.cs | 299 ++++++++++++++++++-----------------
 1 file changed, 154 insertions(+), 145 deletions(-)

diff --git a/backend/src/Data/DbSeeder.cs b/backend/src/Data/DbSeeder.cs
index 2129e031a..32b065842 100644
--- a/backend/src/Data/DbSeeder.cs
+++ b/backend/src/Data/DbSeeder.cs
@@ -120,17 +120,20 @@ private static async Task CreateUsersAsync(
         ILogger<DbSeeder> logger
     )
     {
+        var context = services.GetRequiredService<ApplicationDbContext>();
         var manager = services.GetRequiredService<UserManager<User>>();
         if (environment.IsProduction())
         {
-            if ((await manager.GetUsersInRoleAsync(Role.Administrator)).Count is 0)
+            if (!await context.Users.AnyAsync())
             {
-                await CreateUserAsync(manager, AdministratorUser, appSettings.BootstrapUserPassword, logger);
+                if ((await manager.GetUsersInRoleAsync(Role.Administrator)).Count is 0)
+                {
+                    await CreateUserAsync(manager, AdministratorUser, appSettings.BootstrapUserPassword, logger);
+                }
             }
         }
         else
         {
-            var context = services.GetRequiredService<ApplicationDbContext>();
             foreach (var userInfo in Users)
             {
                 if (await manager.FindByEmailAsync(userInfo.EmailAddress) is null)
@@ -294,61 +297,64 @@ AppSettings appSettings
     )
     {
         var context = services.GetRequiredService<ApplicationDbContext>();
-        if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.TestlabDatabaseUuid)).AnyAsync())
-        {
-            var uriBuilder = new UriBuilder(appSettings.TestlabSolarFacades.Uri)
-            {
-                Path = "/graphql/"
-            };
-            var database = new Database(
-                new Guid(DataConstants.TestlabDatabaseUuid),
-                "TestLab DB",
-                "The database of the TestLab Solar Facades of Fraunhofer ISE",
-                uriBuilder.Uri
-            )
-            {
-                OperatorId = new Guid(DataConstants.TestlabInstitutionUuid)
-            };
-            database.Verify();
-            context.Databases.Add(database);
-        }
-        if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.IgsdbDatabaseUuid)).AnyAsync())
+        if (!await context.Databases.AnyAsync())
         {
-            var uriBuilder = new UriBuilder(new Uri("https://igsdb-v2-staging.herokuapp.com", UriKind.Absolute))
+            if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.TestlabDatabaseUuid)).AnyAsync())
             {
-                Path = "/graphql/"
-            };
-            var database = new Database(
-                new Guid(DataConstants.IgsdbDatabaseUuid),
-                "IGSDB",
-                "The International Glazing and Shading Database (IGSDB)",
-                uriBuilder.Uri
-            )
-            {
-                OperatorId = new Guid(DataConstants.LbnlInstitutionUuid)
-            };
-            database.Verify();
-            context.Databases.Add(database);
-        }
-        if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.EpeaDatabaseUuid)).AnyAsync())
-        {
-            var uriBuilder = new UriBuilder(new Uri("https://app.conpli.eu/GraphQL", UriKind.Absolute))
+                var uriBuilder = new UriBuilder(appSettings.TestlabSolarFacades.Uri)
+                {
+                    Path = "/graphql/"
+                };
+                var database = new Database(
+                    new Guid(DataConstants.TestlabDatabaseUuid),
+                    "TestLab DB",
+                    "The database of the TestLab Solar Facades of Fraunhofer ISE",
+                    uriBuilder.Uri
+                )
+                {
+                    OperatorId = new Guid(DataConstants.TestlabInstitutionUuid)
+                };
+                database.Verify();
+                context.Databases.Add(database);
+            }
+            if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.IgsdbDatabaseUuid)).AnyAsync())
             {
-                Path = "/graphql/"
-            };
-            var database = new Database(
-                new Guid(DataConstants.EpeaDatabaseUuid),
-                "ProCA Database",
-                "Database for Life-Cycle data of components",
-                uriBuilder.Uri
-            )
+                var uriBuilder = new UriBuilder(new Uri("https://igsdb-v2-staging.herokuapp.com", UriKind.Absolute))
+                {
+                    Path = "/graphql/"
+                };
+                var database = new Database(
+                    new Guid(DataConstants.IgsdbDatabaseUuid),
+                    "IGSDB",
+                    "The International Glazing and Shading Database (IGSDB)",
+                    uriBuilder.Uri
+                )
+                {
+                    OperatorId = new Guid(DataConstants.LbnlInstitutionUuid)
+                };
+                database.Verify();
+                context.Databases.Add(database);
+            }
+            if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.EpeaDatabaseUuid)).AnyAsync())
             {
-                OperatorId = new Guid(DataConstants.EpeaInstitutionUuid)
-            };
-            database.Verify();
-            context.Databases.Add(database);
+                var uriBuilder = new UriBuilder(new Uri("https://app.conpli.eu/GraphQL", UriKind.Absolute))
+                {
+                    Path = "/graphql/"
+                };
+                var database = new Database(
+                    new Guid(DataConstants.EpeaDatabaseUuid),
+                    "ProCA Database",
+                    "Database for Life-Cycle data of components",
+                    uriBuilder.Uri
+                )
+                {
+                    OperatorId = new Guid(DataConstants.EpeaInstitutionUuid)
+                };
+                database.Verify();
+                context.Databases.Add(database);
+            }
+            await context.SaveChangesAsync();
         }
-        await context.SaveChangesAsync();
     }
 
     private static async Task CreateOpenIdConnectScopes(
@@ -527,25 +533,27 @@ AppSettings appSettings
     {
         var context = services.GetRequiredService<ApplicationDbContext>();
         var manager = services.GetRequiredService<OpenIddictApplicationManager<OpenIdConnectApplication>>();
-        if (await manager.FindByClientIdAsync(OpenIdConnectConstants.Client.MetabaseClientId) is null)
+        if (!await context.OpenIdConnectApplications.AnyAsync())
         {
-            logger.CreatingApplicationClient(OpenIdConnectConstants.Client.MetabaseClientId);
-            var host = appSettings.Uri;
-            var descriptor = new OpenIddictApplicationDescriptor
+            if (await manager.FindByClientIdAsync(OpenIdConnectConstants.Client.MetabaseClientId) is null)
             {
-                ClientId = OpenIdConnectConstants.Client.MetabaseClientId,
-                ClientSecret = null,
-                ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
-                DisplayName = "Metabase",
-                RedirectUris =
+                logger.CreatingApplicationClient(OpenIdConnectConstants.Client.MetabaseClientId);
+                var host = appSettings.Uri;
+                var descriptor = new OpenIddictApplicationDescriptor
+                {
+                    ClientId = OpenIdConnectConstants.Client.MetabaseClientId,
+                    ClientSecret = null,
+                    ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
+                    DisplayName = "Metabase",
+                    RedirectUris =
                 {
                     new UriBuilder(host) { Path = "/connect/callback/login/metabase" }.Uri
                 },
-                PostLogoutRedirectUris =
+                    PostLogoutRedirectUris =
                 {
                     new UriBuilder(host) { Path = "/connect/callback/logout/metabase" }.Uri
                 },
-                Permissions =
+                    Permissions =
                 {
                     OpenIddictConstants.Permissions.Endpoints.Authorization,
                     OpenIddictConstants.Permissions.Endpoints.EndSession,
@@ -557,51 +565,51 @@ AppSettings appSettings
                     OpenIddictConstants.Permissions.ResponseTypes.IdToken,
                     OpenIddictConstants.Permissions.ResponseTypes.Token,
                 },
-                Requirements =
+                    Requirements =
                 {
                     OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange,
                     OpenIddictConstants.Requirements.Features.PushedAuthorizationRequests,
                 }
+                }
+                .AddGrantTypePermissions(
+                    environment.IsEnvironment(Program.TestEnvironment)
+                    ? OpenIddictConstants.GrantTypes.Password
+                    : OpenIddictConstants.GrantTypes.AuthorizationCode,
+                    OpenIddictConstants.GrantTypes.ClientCredentials,
+                    OpenIddictConstants.GrantTypes.RefreshToken,
+                    OpenIddictConstants.GrantTypes.TokenExchange
+                )
+                .AddScopePermissions(OpenIdConnectScope.Scopes)
+                .AddAudiencePermissions(OpenIdConnectConstants.Client.MetabaseClientId)
+                .AddResourcePermissions(appSettings.GraphQlEndpoint.AbsoluteUri);
+                var application = new OpenIdConnectApplication
+                {
+                    OwnerId = new Guid(DataConstants.IseInstitutionUuid)
+                };
+                await manager.PopulateAsync(application, descriptor);
+                // The secret is used in tests, see `IntegrationTests#RequestAuthToken` and in
+                // the metabase client, see `OPEN_ID_CONNECT_CLIENT_SECRET` in `.env.*`.
+                await manager.CreateAsync(application, appSettings.OpenIdConnectClientSecret);
             }
-            .AddGrantTypePermissions(
-                environment.IsEnvironment(Program.TestEnvironment)
-                ? OpenIddictConstants.GrantTypes.Password
-                : OpenIddictConstants.GrantTypes.AuthorizationCode,
-                OpenIddictConstants.GrantTypes.ClientCredentials,
-                OpenIddictConstants.GrantTypes.RefreshToken,
-                OpenIddictConstants.GrantTypes.TokenExchange
-            )
-            .AddScopePermissions(OpenIdConnectScope.Scopes)
-            .AddAudiencePermissions(OpenIdConnectConstants.Client.MetabaseClientId)
-            .AddResourcePermissions(appSettings.GraphQlEndpoint.AbsoluteUri);
-            var application = new OpenIdConnectApplication
+            if (await manager.FindByClientIdAsync(DataConstants.TestlabOpenIdConnectClientId) is null)
             {
-                OwnerId = new Guid(DataConstants.IseInstitutionUuid)
-            };
-            await manager.PopulateAsync(application, descriptor);
-            // The secret is used in tests, see `IntegrationTests#RequestAuthToken` and in
-            // the metabase client, see `OPEN_ID_CONNECT_CLIENT_SECRET` in `.env.*`.
-            await manager.CreateAsync(application, appSettings.OpenIdConnectClientSecret);
-        }
-        if (await manager.FindByClientIdAsync(DataConstants.TestlabOpenIdConnectClientId) is null)
-        {
-            logger.CreatingApplicationClient(DataConstants.TestlabOpenIdConnectClientId);
-            var host = appSettings.TestlabSolarFacades.Uri;
-            var descriptor = new OpenIddictApplicationDescriptor
-            {
-                ClientId = DataConstants.TestlabOpenIdConnectClientId,
-                ClientSecret = null,
-                ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
-                DisplayName = "TestLab Solar Façades",
-                RedirectUris =
+                logger.CreatingApplicationClient(DataConstants.TestlabOpenIdConnectClientId);
+                var host = appSettings.TestlabSolarFacades.Uri;
+                var descriptor = new OpenIddictApplicationDescriptor
+                {
+                    ClientId = DataConstants.TestlabOpenIdConnectClientId,
+                    ClientSecret = null,
+                    ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
+                    DisplayName = "TestLab Solar Façades",
+                    RedirectUris =
                     {
                         new UriBuilder(host) { Path = "/connect/callback/login/metabase" }.Uri
                     },
-                PostLogoutRedirectUris =
+                    PostLogoutRedirectUris =
                     {
                         new UriBuilder(host) { Path = "/connect/callback/logout/metabase" }.Uri
                     },
-                Permissions =
+                    Permissions =
                     {
                         OpenIddictConstants.Permissions.Endpoints.Authorization,
                         OpenIddictConstants.Permissions.Endpoints.EndSession,
@@ -612,44 +620,44 @@ AppSettings appSettings
                         OpenIddictConstants.Permissions.ResponseTypes.Code,
                         OpenIddictConstants.Permissions.ResponseTypes.Token,
                     },
-                Requirements =
+                    Requirements =
                     {
                         OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange,
                         OpenIddictConstants.Requirements.Features.PushedAuthorizationRequests
                     }
+                }
+                .AddGrantTypePermissions(
+                    OpenIddictConstants.GrantTypes.AuthorizationCode,
+                    OpenIddictConstants.GrantTypes.RefreshToken
+                )
+                .AddScopePermissions(
+                    OpenIddictConstants.Scopes.Profile,
+                    OpenIdConnectScope.ReadApiScope,
+                    OpenIdConnectScope.WriteApiScope,
+                    OpenIdConnectScope.ManageDatabaseApiScope
+                )
+                .AddAudiencePermissions(OpenIdConnectConstants.Client.MetabaseClientId);
+                var application = new OpenIdConnectApplication
+                {
+                    OwnerId = new Guid(DataConstants.TestlabInstitutionUuid)
+                };
+                await manager.PopulateAsync(application, descriptor);
+                // The secret is used in the database client, see
+                // `OPEN_ID_CONNECT_CLIENT_SECRET` in `.env.*`.
+                await manager.CreateAsync(application, appSettings.TestlabSolarFacades.OpenIdConnectClientSecret);
             }
-            .AddGrantTypePermissions(
-                OpenIddictConstants.GrantTypes.AuthorizationCode,
-                OpenIddictConstants.GrantTypes.RefreshToken
-            )
-            .AddScopePermissions(
-                OpenIddictConstants.Scopes.Profile,
-                OpenIdConnectScope.ReadApiScope,
-                OpenIdConnectScope.WriteApiScope,
-                OpenIdConnectScope.ManageDatabaseApiScope
-            )
-            .AddAudiencePermissions(OpenIdConnectConstants.Client.MetabaseClientId);
-            var application = new OpenIdConnectApplication
+            if (await manager.FindByClientIdAsync(DataConstants.IgsdbOpenIdConnectClientId) is null)
             {
-                OwnerId = new Guid(DataConstants.TestlabInstitutionUuid)
-            };
-            await manager.PopulateAsync(application, descriptor);
-            // The secret is used in the database client, see
-            // `OPEN_ID_CONNECT_CLIENT_SECRET` in `.env.*`.
-            await manager.CreateAsync(application, appSettings.TestlabSolarFacades.OpenIdConnectClientSecret);
-        }
-        if (await manager.FindByClientIdAsync(DataConstants.IgsdbOpenIdConnectClientId) is null)
-        {
-            logger.CreatingApplicationClient(DataConstants.IgsdbOpenIdConnectClientId);
-            var descriptor = new OpenIddictApplicationDescriptor
-            {
-                ClientId = DataConstants.IgsdbOpenIdConnectClientId,
-                ClientSecret = null,
-                ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
-                DisplayName = "IGSDB",
-                RedirectUris = { },
-                PostLogoutRedirectUris = { },
-                Permissions =
+                logger.CreatingApplicationClient(DataConstants.IgsdbOpenIdConnectClientId);
+                var descriptor = new OpenIddictApplicationDescriptor
+                {
+                    ClientId = DataConstants.IgsdbOpenIdConnectClientId,
+                    ClientSecret = null,
+                    ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
+                    DisplayName = "IGSDB",
+                    RedirectUris = { },
+                    PostLogoutRedirectUris = { },
+                    Permissions =
                     {
                         OpenIddictConstants.Permissions.Endpoints.EndSession,
                         OpenIddictConstants.Permissions.Endpoints.Introspection,
@@ -657,27 +665,28 @@ AppSettings appSettings
                         OpenIddictConstants.Permissions.Endpoints.Token,
                         OpenIddictConstants.Permissions.ResponseTypes.Token,
                     },
-                Requirements =
+                    Requirements =
                     {
                         OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange,
                         OpenIddictConstants.Requirements.Features.PushedAuthorizationRequests
                     }
+                }
+                .AddGrantTypePermissions(
+                    OpenIddictConstants.GrantTypes.ClientCredentials,
+                    OpenIddictConstants.GrantTypes.RefreshToken
+                )
+                .AddScopePermissions(
+                    OpenIdConnectScope.ReadApiScope,
+                    OpenIdConnectScope.WriteApiScope
+                )
+                .AddAudiencePermissions(OpenIdConnectConstants.Client.MetabaseClientId);
+                var application = new OpenIdConnectApplication
+                {
+                    OwnerId = new Guid(DataConstants.LbnlInstitutionUuid)
+                };
+                await manager.PopulateAsync(application, descriptor);
+                await manager.CreateAsync(application, appSettings.Igsdb.OpenIdConnectClientSecret);
             }
-            .AddGrantTypePermissions(
-                OpenIddictConstants.GrantTypes.ClientCredentials,
-                OpenIddictConstants.GrantTypes.RefreshToken
-            )
-            .AddScopePermissions(
-                OpenIdConnectScope.ReadApiScope,
-                OpenIdConnectScope.WriteApiScope
-            )
-            .AddAudiencePermissions(OpenIdConnectConstants.Client.MetabaseClientId);
-            var application = new OpenIdConnectApplication
-            {
-                OwnerId = new Guid(DataConstants.LbnlInstitutionUuid)
-            };
-            await manager.PopulateAsync(application, descriptor);
-            await manager.CreateAsync(application, appSettings.Igsdb.OpenIdConnectClientSecret);
         }
     }
 }
\ No newline at end of file

From 6418d49bed063241990d09f1ad9efc44267791e3 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 17 Jun 2026 13:00:24 +0200
Subject: [PATCH 093/145] Use the database operator to decide which additional
 HTTP headers to attach

---
 backend/src/GraphQl/Requests/QueryingDatabases.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/GraphQl/Requests/QueryingDatabases.cs b/backend/src/GraphQl/Requests/QueryingDatabases.cs
index 553b6c966..72936d640 100644
--- a/backend/src/GraphQl/Requests/QueryingDatabases.cs
+++ b/backend/src/GraphQl/Requests/QueryingDatabases.cs
@@ -158,9 +158,9 @@ public async
         {
             httpClient.SetBearerToken(accessToken);
         }
-        switch (database.Id)
+        switch (database.OperatorId)
         {
-            case var id when id == new Guid(DataConstants.IgsdbDatabaseUuid):
+            case var id when id == new Guid(DataConstants.LbnlInstitutionUuid):
                 // Pass the API token instead of the access token. Note that we
                 // cannot pass the API token as well as the bearer token in one
                 // request, neither with multiple HTTP authorization headers
@@ -171,7 +171,7 @@ public async
                 // https://stackoverflow.com/questions/29282578/multiple-http-authorization-headers
                 httpClient.SetToken("Token", appSettings.Igsdb.ApiToken);
                 break;
-            case var id when id == new Guid(DataConstants.EpeaDatabaseUuid):
+            case var id when id == new Guid(DataConstants.EpeaInstitutionUuid):
                 httpClient.DefaultRequestHeaders.Add("x-user-id", appSettings.Epea.UserId);
                 httpClient.DefaultRequestHeaders.Add("x-api-key", appSettings.Epea.ApiKey);
                 break;

From 5e444cab8391a77ba891a1ea53a6f7a5c4779c22 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 17 Jun 2026 13:59:03 +0200
Subject: [PATCH 094/145] Add reload button to pagination and on empty results
 (to reload paginated entities if the user suspects a caching issue)

---
 frontend/components/Pagination.tsx            | 28 ++++++++++++++----
 .../components/components/ComponentList.tsx   |  3 ++
 .../calorimetric/CalorimetricDataList.tsx     |  3 ++
 .../data/geometric/GeometricDataList.tsx      |  3 ++
 .../hygrothermal/HygrothermalDataList.tsx     |  3 ++
 .../data/lifeCycle/LifeCycleDataList.tsx      |  3 ++
 .../data/optical/OpticalDataList.tsx          |  3 ++
 .../photovoltaic/PhotovoltaicDataList.tsx     |  3 ++
 .../components/dataFormats/DataFormatList.tsx |  3 ++
 .../components/databases/DatabaseList.tsx     |  3 ++
 .../databases/PendingDatabaseList.tsx         |  3 +-
 frontend/components/entities/EntityList.tsx   | 14 +++++++--
 .../components/entities/PaginatedEntities.tsx | 12 ++++++--
 .../components/gnuPgKeys/GnuPgKeyList.tsx     |  3 ++
 .../components/institutions/Institution.tsx   |  5 ++--
 .../institutions/InstitutionList.tsx          |  3 ++
 .../institutions/PendingInstitutionList.tsx   | 12 +++++---
 frontend/components/methods/MethodList.tsx    |  3 ++
 .../OpenIdConnectApplicationList.tsx          |  3 ++
 .../OpenIdConnectAuthorizationList.tsx        |  3 ++
 .../tokens/OpenIdConnectTokenList.tsx         |  3 ++
 frontend/components/users/UserList.tsx        |  3 ++
 frontend/lib/hooks/usePaginatedQuery.ts       | 29 +++++++++++++++++--
 23 files changed, 131 insertions(+), 20 deletions(-)

diff --git a/frontend/components/Pagination.tsx b/frontend/components/Pagination.tsx
index f6dbacfde..ee60d5649 100644
--- a/frontend/components/Pagination.tsx
+++ b/frontend/components/Pagination.tsx
@@ -3,6 +3,7 @@ import {
   LeftOutlined,
   RightOutlined,
   LoadingOutlined,
+  ReloadOutlined,
 } from "@ant-design/icons";
 
 export const initialPageSize = 10;
@@ -27,6 +28,7 @@ export interface PaginationProps {
   pageSize: number;
   hasPrevious: boolean;
   hasNext: boolean;
+  onReload: () => void;
   onPrevious: () => void;
   onNext: () => void;
   onPageSizeChange: (size: number) => void;
@@ -37,10 +39,11 @@ export default function Pagination({
   current,
   total,
   pageSize,
-  onPrevious,
   hasPrevious,
-  onNext,
   hasNext,
+  onReload,
+  onPrevious,
+  onNext,
   onPageSizeChange,
 }: PaginationProps) {
   return (
@@ -51,13 +54,12 @@ export default function Pagination({
           disabled={fetching != null || !hasPrevious}
           type="text"
           icon={
-            fetching == Fetching.PREVIOUS ? loadingIndicator : <LeftOutlined />
+            fetching === Fetching.PREVIOUS ? loadingIndicator : <LeftOutlined />
           }
         />
       </Tooltip>
       <span>
-        Page {current} of{" "}
-        {fetching == Fetching.INITIAL ? loadingIndicator : total}
+        Page {current} of {fetching === Fetching.INITIAL ? "∞" : total}
       </span>
       <Tooltip title="Next">
         <Button
@@ -65,7 +67,7 @@ export default function Pagination({
           disabled={fetching != null || !hasNext}
           type="text"
           icon={
-            fetching == Fetching.NEXT ? loadingIndicator : <RightOutlined />
+            fetching === Fetching.NEXT ? loadingIndicator : <RightOutlined />
           }
         />
       </Tooltip>
@@ -77,6 +79,20 @@ export default function Pagination({
         disabled={fetching != null}
         style={{ width: "max-content" }}
       />
+      <Tooltip title="Reload">
+        <Button
+          onClick={onReload}
+          disabled={fetching != null}
+          type="text"
+          icon={
+            fetching === Fetching.INITIAL ? (
+              loadingIndicator
+            ) : (
+              <ReloadOutlined />
+            )
+          }
+        />
+      </Tooltip>
     </Flex>
   );
 }
diff --git a/frontend/components/components/ComponentList.tsx b/frontend/components/components/ComponentList.tsx
index 88b027877..3e7e00cd4 100644
--- a/frontend/components/components/ComponentList.tsx
+++ b/frontend/components/components/ComponentList.tsx
@@ -6,14 +6,17 @@ import ComponentSummary from "./ComponentSummary";
 export default function ComponentList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: ComponentsPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <EntityItem>
           <ComponentSummary entity={node} />
diff --git a/frontend/components/data/calorimetric/CalorimetricDataList.tsx b/frontend/components/data/calorimetric/CalorimetricDataList.tsx
index 68e90fe42..2a93ad67e 100644
--- a/frontend/components/data/calorimetric/CalorimetricDataList.tsx
+++ b/frontend/components/data/calorimetric/CalorimetricDataList.tsx
@@ -6,14 +6,17 @@ import EntityItem from "../../entities/EntityItem";
 export default function CalorimetricDataList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: CalorimetricDataPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <EntityItem>
           <CalorimetricDataSummary entity={node} />
diff --git a/frontend/components/data/geometric/GeometricDataList.tsx b/frontend/components/data/geometric/GeometricDataList.tsx
index 721bebe0f..1dabca919 100644
--- a/frontend/components/data/geometric/GeometricDataList.tsx
+++ b/frontend/components/data/geometric/GeometricDataList.tsx
@@ -6,14 +6,17 @@ import EntityItem from "../../entities/EntityItem";
 export default function GeometricDataList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: GeometricDataPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <EntityItem>
           <GeometricDataSummary entity={node} />
diff --git a/frontend/components/data/hygrothermal/HygrothermalDataList.tsx b/frontend/components/data/hygrothermal/HygrothermalDataList.tsx
index b54175707..f3e4ec941 100644
--- a/frontend/components/data/hygrothermal/HygrothermalDataList.tsx
+++ b/frontend/components/data/hygrothermal/HygrothermalDataList.tsx
@@ -6,14 +6,17 @@ import EntityItem from "../../entities/EntityItem";
 export default function HygrothermalDataList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: HygrothermalDataPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <EntityItem>
           <HygrothermalDataSummary entity={node} />
diff --git a/frontend/components/data/lifeCycle/LifeCycleDataList.tsx b/frontend/components/data/lifeCycle/LifeCycleDataList.tsx
index 1453e0301..769555946 100644
--- a/frontend/components/data/lifeCycle/LifeCycleDataList.tsx
+++ b/frontend/components/data/lifeCycle/LifeCycleDataList.tsx
@@ -6,14 +6,17 @@ import EntityItem from "../../entities/EntityItem";
 export default function LifeCycleDataList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: LifeCycleDataPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <EntityItem>
           <LifeCycleDataSummary entity={node} />
diff --git a/frontend/components/data/optical/OpticalDataList.tsx b/frontend/components/data/optical/OpticalDataList.tsx
index 076856120..0e6deffe2 100644
--- a/frontend/components/data/optical/OpticalDataList.tsx
+++ b/frontend/components/data/optical/OpticalDataList.tsx
@@ -7,14 +7,17 @@ import OpticalDataRibbon from "./OpticalDataRibbon";
 export default function OpticalDataList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: OpticalDataPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <OpticalDataRibbon {...node}>
           <EntityItem>
diff --git a/frontend/components/data/photovoltaic/PhotovoltaicDataList.tsx b/frontend/components/data/photovoltaic/PhotovoltaicDataList.tsx
index 01a71e6d9..03cc3cd39 100644
--- a/frontend/components/data/photovoltaic/PhotovoltaicDataList.tsx
+++ b/frontend/components/data/photovoltaic/PhotovoltaicDataList.tsx
@@ -6,14 +6,17 @@ import EntityItem from "../../entities/EntityItem";
 export default function PhotovoltaicDataList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: PhotovoltaicDataPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <EntityItem>
           <PhotovoltaicDataSummary entity={node} />
diff --git a/frontend/components/dataFormats/DataFormatList.tsx b/frontend/components/dataFormats/DataFormatList.tsx
index 4a6035223..d4e5c50e8 100644
--- a/frontend/components/dataFormats/DataFormatList.tsx
+++ b/frontend/components/dataFormats/DataFormatList.tsx
@@ -6,14 +6,17 @@ import EntityItem from "../entities/EntityItem";
 export default function DataFormatList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: DataFormatsPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <EntityItem>
           <DataFormatSummary entity={node} />
diff --git a/frontend/components/databases/DatabaseList.tsx b/frontend/components/databases/DatabaseList.tsx
index ed8e652af..975abe7ef 100644
--- a/frontend/components/databases/DatabaseList.tsx
+++ b/frontend/components/databases/DatabaseList.tsx
@@ -6,14 +6,17 @@ import EntityItem from "../entities/EntityItem";
 export default function DatabaseList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: DatabasesPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <EntityItem>
           <DatabaseSummary entity={node} />
diff --git a/frontend/components/databases/PendingDatabaseList.tsx b/frontend/components/databases/PendingDatabaseList.tsx
index 3a59cc14a..90da481b3 100644
--- a/frontend/components/databases/PendingDatabaseList.tsx
+++ b/frontend/components/databases/PendingDatabaseList.tsx
@@ -6,7 +6,7 @@ import EntityItem from "../entities/EntityItem";
 import DatabaseSummary from "./DatabaseSummary";
 
 export default function PendingDatabaseList() {
-  const { data, loading, error } = useQuery(PendingDatabasesDocument, {
+  const { data, loading, error, refetch } = useQuery(PendingDatabasesDocument, {
     // always fetch instead of erroneously using the cached pending databases that contain only the total count coming from `query CurrentUser`
     fetchPolicy: "network-only",
   });
@@ -17,6 +17,7 @@ export default function PendingDatabaseList() {
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={refetch}
       renderItem={(node) => (
         <EntityItem>
           <DatabaseSummary hideInputControls showVerifyAnyway entity={node} />
diff --git a/frontend/components/entities/EntityList.tsx b/frontend/components/entities/EntityList.tsx
index 21818776c..35d79149b 100644
--- a/frontend/components/entities/EntityList.tsx
+++ b/frontend/components/entities/EntityList.tsx
@@ -1,4 +1,4 @@
-import { Card, Empty, Flex, Skeleton } from "antd";
+import { Button, Card, Empty, Flex, Skeleton } from "antd";
 import { Scalars } from "../../__generated__/graphql";
 import { useState } from "react";
 import { initialPageSize } from "../Pagination";
@@ -11,10 +11,12 @@ export default function EntityList<
   loading,
   dataSource,
   renderItem,
+  onReload,
 }: {
   loading: boolean;
   dataSource: TEntity[] | null;
   renderItem: (entity: TEntity) => React.ReactNode;
+  onReload: () => void;
 }) {
   const [hasLoadedOnce, setHasLoadedOnce] = useState(false);
   const previousDataSource = usePreviousNonNull(dataSource);
@@ -36,8 +38,14 @@ export default function EntityList<
     );
   }
 
-  if (!loading && currentOrPreviousDataSource.length === 0) {
-    return <Empty description="No data found" />;
+  if (currentOrPreviousDataSource.length === 0) {
+    return (
+      <Empty description="No data found">
+        <Button loading={loading} onClick={onReload}>
+          Reload
+        </Button>
+      </Empty>
+    );
   }
 
   return (
diff --git a/frontend/components/entities/PaginatedEntities.tsx b/frontend/components/entities/PaginatedEntities.tsx
index 519379718..fa0122eb2 100644
--- a/frontend/components/entities/PaginatedEntities.tsx
+++ b/frontend/components/entities/PaginatedEntities.tsx
@@ -65,7 +65,11 @@ type BaseProps<
 > = {
   entitiesQuery: QueryDocument<TNode, TFilterInput, TSortInput>;
   extra?: React.ReactNode;
-  list: (props: { loading: boolean; nodes: TNode[] | null }) => React.ReactNode;
+  list: (props: {
+    loading: boolean;
+    nodes: TNode[] | null;
+    onReload: () => void;
+  }) => React.ReactNode;
   filterDefinitions: readonly FilterDefinition<TFilterInput>[];
   sortDefinitions: readonly SortDefinition<TSortInput>[];
   baseWhere?: TFilterInput | null;
@@ -365,7 +369,11 @@ export default function PaginatedEntities<
             onRemoveAll={removeAllFiltersAndSorts}
           />
         )}
-        {props.list({ loading: props.loading || loading, nodes })}
+        {props.list({
+          loading: props.loading || loading,
+          nodes,
+          onReload: paginationProps.onReload,
+        })}
         <Flex justify="space-between" align="baseline">
           <QueryToolbar
             query={props.entitiesQuery}
diff --git a/frontend/components/gnuPgKeys/GnuPgKeyList.tsx b/frontend/components/gnuPgKeys/GnuPgKeyList.tsx
index 699256858..257958c6d 100644
--- a/frontend/components/gnuPgKeys/GnuPgKeyList.tsx
+++ b/frontend/components/gnuPgKeys/GnuPgKeyList.tsx
@@ -6,14 +6,17 @@ import EntityItem from "../entities/EntityItem";
 export default function GnuPgKeyList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: GnuPgKeyFingerprintsPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <EntityItem>
           <GnuPgKeySummary entity={node} />
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index aa79c358a..bf3f60a98 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -102,8 +102,7 @@ const getMainTabs = (
         />
       ),
     },
-    (institution.gnuPgKeyFingerprints.edges.length > 0 ||
-      institution.gnuPgKeyFingerprints.isAuthorizedToAddEdge) && {
+    {
       key: "gnuPgKeyFingerprints",
       count: institution.gnuPgKeyFingerprints.totalCount,
       label: "GnuPG Key Fingerprints",
@@ -254,6 +253,7 @@ export const getPendingTabsOfInstitution = (
             dataSource={institution.pendingManufacturedComponents.edges.map(
               (edge) => edge.node,
             )}
+            onReload={() => {}}
             renderItem={(node) => (
               <EntityItem>
                 <ComponentSummary
@@ -282,6 +282,7 @@ export const getPendingTabsOfInstitution = (
             dataSource={institution.pendingInstitutionDevelopedMethods.edges.map(
               (edge) => edge.node,
             )}
+            onReload={() => {}}
             renderItem={(node) => (
               <EntityItem>
                 <MethodSummary
diff --git a/frontend/components/institutions/InstitutionList.tsx b/frontend/components/institutions/InstitutionList.tsx
index 892c8f512..cb59324f5 100644
--- a/frontend/components/institutions/InstitutionList.tsx
+++ b/frontend/components/institutions/InstitutionList.tsx
@@ -6,14 +6,17 @@ import EntityItem from "../entities/EntityItem";
 export default function InstitutionList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: InstitutionsPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <EntityItem>
           <InstitutionSummary entity={node} />
diff --git a/frontend/components/institutions/PendingInstitutionList.tsx b/frontend/components/institutions/PendingInstitutionList.tsx
index b5c62fe55..10831cd81 100644
--- a/frontend/components/institutions/PendingInstitutionList.tsx
+++ b/frontend/components/institutions/PendingInstitutionList.tsx
@@ -6,10 +6,13 @@ import EntityItem from "../entities/EntityItem";
 import InstitutionSummary from "./InstitutionSummary";
 
 export default function PendingInstitutionList() {
-  const { data, loading, error } = useQuery(PendingInstitutionsDocument, {
-    // always fetch instead of erroneously using the cached pending institutions that contain only the total count coming from `query CurrentUser`
-    fetchPolicy: "network-only",
-  });
+  const { data, loading, error, refetch } = useQuery(
+    PendingInstitutionsDocument,
+    {
+      // always fetch instead of erroneously using the cached pending institutions that contain only the total count coming from `query CurrentUser`
+      fetchPolicy: "network-only",
+    },
+  );
   useQueryHandler({ error });
   const nodes = data?.pendingInstitutions?.edges?.map((e) => e.node) || [];
 
@@ -17,6 +20,7 @@ export default function PendingInstitutionList() {
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={refetch}
       renderItem={(node) => (
         <EntityItem>
           <InstitutionSummary
diff --git a/frontend/components/methods/MethodList.tsx b/frontend/components/methods/MethodList.tsx
index 11d940ccb..dfdf2de51 100644
--- a/frontend/components/methods/MethodList.tsx
+++ b/frontend/components/methods/MethodList.tsx
@@ -6,14 +6,17 @@ import MethodSummary from "./MethodSummary";
 export default function MethodList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: MethodsPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <EntityItem>
           <MethodSummary entity={node} />
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationList.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationList.tsx
index 6626f84db..2f1c4e19f 100644
--- a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationList.tsx
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationList.tsx
@@ -6,14 +6,17 @@ import EntityItem from "../../entities/EntityItem";
 export default function OpenIdConnectApplicationList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: OpenIdConnectApplicationsPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <EntityItem>
           <OpenIdConnectApplicationSummary entity={node} />
diff --git a/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationList.tsx b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationList.tsx
index 73d2b71fa..2678a4ab6 100644
--- a/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationList.tsx
+++ b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationList.tsx
@@ -6,14 +6,17 @@ import EntityItem from "../../entities/EntityItem";
 export default function OpenIdConnectAuthorizationList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: OpenIdConnectAuthorizationsPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <EntityItem>
           <OpenIdConnectAuthorizationSummary entity={node} />
diff --git a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx
index c41c06b43..15d23c09f 100644
--- a/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx
+++ b/frontend/components/openIdConnect/tokens/OpenIdConnectTokenList.tsx
@@ -7,14 +7,17 @@ import OpenIdConnectTokenRibbon from "./OpenIdConnectTokenRibbon";
 export default function OpenIdConnectTokenList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: OpenIdConnectTokensPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <OpenIdConnectTokenRibbon {...node}>
           <EntityItem>
diff --git a/frontend/components/users/UserList.tsx b/frontend/components/users/UserList.tsx
index 3a84cede3..75bb25cb7 100644
--- a/frontend/components/users/UserList.tsx
+++ b/frontend/components/users/UserList.tsx
@@ -6,14 +6,17 @@ import EntityItem from "../entities/EntityItem";
 export default function UserList({
   loading,
   nodes,
+  onReload,
 }: {
   loading: boolean;
   nodes: UsersPartialFragment[] | null;
+  onReload: () => void;
 }) {
   return (
     <EntityList
       loading={loading}
       dataSource={nodes}
+      onReload={onReload}
       renderItem={(node) => (
         <EntityItem>
           <UserSummary entity={node} />
diff --git a/frontend/lib/hooks/usePaginatedQuery.ts b/frontend/lib/hooks/usePaginatedQuery.ts
index d71e78360..b2bcc70c8 100644
--- a/frontend/lib/hooks/usePaginatedQuery.ts
+++ b/frontend/lib/hooks/usePaginatedQuery.ts
@@ -54,7 +54,7 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
 
   const variables = {
     first: pageSize,
-    after: null,
+    after: afterCursors[currentPage - 1],
     where: where,
     order: order,
   };
@@ -88,6 +88,29 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
     return edges?.slice(start, start + pageSize).map((e) => e.node);
   }, [edges, currentPage, pageSize]);
 
+  const handleReload = () => {
+    if (loading) return;
+    const variables = {
+      first: pageSize,
+      after: null,
+      where: where,
+      order: order,
+    };
+    setFetching(Fetching.INITIAL);
+    refetch(variables)
+      .then(() => {
+        // note that `currentPage` or `afterCursors` may have changed when this
+        // callback fires
+        setCurrentPage(1);
+        setAfterCursors([null]);
+        onQueryVariablesChange(variables);
+      })
+      .catch((error) => {
+        console.error("Reloading current page failed", error);
+      })
+      .finally(() => setFetching(null));
+  };
+
   const handlePrevious = () => {
     if (loading) return;
     if (currentPage <= 1) return;
@@ -133,6 +156,7 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
   };
 
   const handlePageSizeChange = (pageSize: number) => {
+    if (loading) return;
     setPageSize(pageSize);
     const variables = {
       first: pageSize,
@@ -140,9 +164,9 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
       where: where,
       order: order,
     };
+    setFetching(Fetching.INITIAL);
     refetch(variables)
       .then(() => {
-        setFetching(Fetching.INITIAL);
         // note that `currentPage` or `afterCursors` may have changed when this
         // callback fires
         setCurrentPage(1);
@@ -167,6 +191,7 @@ export function usePaginatedQuery<TNode, TFilterInput, TSortInput>(
         !!connection?.pageInfo.hasNextPage ||
         currentPage * pageSize < (edges?.length ?? 0),
       hasPrevious: currentPage > 1,
+      onReload: handleReload,
       onNext: handleNext,
       onPrevious: handlePrevious,
       onPageSizeChange: handlePageSizeChange,

From 0d32e2c9e914d81e568a5deea49cc4c8d515a19c Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 17 Jun 2026 15:06:11 +0200
Subject: [PATCH 095/145] Show formal signature of data approval only on demand

---
 frontend/components/CodeView.tsx              |  7 +-
 frontend/components/Copyable.tsx              |  8 +-
 frontend/components/CopyableBlock.tsx         |  5 +-
 frontend/components/JsonView.tsx              |  7 +-
 .../components/data/DataApprovalSummary.tsx   | 89 +++++++++++++++++++
 frontend/components/data/DataSummary.tsx      | 50 ++---------
 frontend/queries/data.graphql                 | 32 ++++---
 7 files changed, 133 insertions(+), 65 deletions(-)
 create mode 100644 frontend/components/data/DataApprovalSummary.tsx

diff --git a/frontend/components/CodeView.tsx b/frontend/components/CodeView.tsx
index fb828e3d7..614fed5b8 100644
--- a/frontend/components/CodeView.tsx
+++ b/frontend/components/CodeView.tsx
@@ -1,22 +1,25 @@
+import { CSSProperties } from "react";
 import Copyable from "./Copyable";
 import CopyableBlock from "./CopyableBlock";
 
 export default function CodeView({
   code,
   inline = false,
+  style,
 }: {
   code: string;
   inline?: boolean;
+  style?: CSSProperties;
 }) {
   if (inline) {
     return (
-      <Copyable onlyIcon text={code}>
+      <Copyable onlyIcon text={code} style={style}>
         <code>{code}</code>
       </Copyable>
     );
   } else {
     return (
-      <CopyableBlock text={code}>
+      <CopyableBlock text={code} style={style}>
         <pre
           style={{
             overflow: "auto",
diff --git a/frontend/components/Copyable.tsx b/frontend/components/Copyable.tsx
index 29d321a15..b97f82dc7 100644
--- a/frontend/components/Copyable.tsx
+++ b/frontend/components/Copyable.tsx
@@ -1,16 +1,18 @@
 import { Space } from "antd";
-import { ReactNode } from "react";
+import { CSSProperties, ReactNode } from "react";
 import CopyButton from "./CopyButton";
 
 export default function Copyable({
   text,
   onlyIcon,
   color,
+  style,
   children,
 }: {
   text: string;
   onlyIcon?: boolean;
   color?: "white";
+  style?: CSSProperties;
   children?: ReactNode;
 }) {
   const content = (
@@ -22,5 +24,7 @@ export default function Copyable({
     </>
   );
 
-  return <span>{onlyIcon ? content : <Space>{content}</Space>}</span>;
+  return (
+    <span style={style}>{onlyIcon ? content : <Space>{content}</Space>}</span>
+  );
 }
diff --git a/frontend/components/CopyableBlock.tsx b/frontend/components/CopyableBlock.tsx
index edc69062f..c1dd917ff 100644
--- a/frontend/components/CopyableBlock.tsx
+++ b/frontend/components/CopyableBlock.tsx
@@ -1,14 +1,16 @@
 import { Button } from "antd";
 import { CheckOutlined, CopyOutlined } from "@ant-design/icons";
-import { ReactNode, useState } from "react";
+import { CSSProperties, ReactNode, useState } from "react";
 
 export default function CopyableBlock({
   text,
   color,
+  style,
   children,
 }: {
   text: string;
   color?: "white";
+  style?: CSSProperties;
   children: ReactNode;
 }) {
   const [copied, setCopied] = useState(false);
@@ -16,6 +18,7 @@ export default function CopyableBlock({
   return (
     <div
       style={{
+        ...style,
         position: "relative",
         minWidth: "16ch",
       }}
diff --git a/frontend/components/JsonView.tsx b/frontend/components/JsonView.tsx
index dc53cfb31..eed97db8d 100644
--- a/frontend/components/JsonView.tsx
+++ b/frontend/components/JsonView.tsx
@@ -1,26 +1,29 @@
 import { Tooltip } from "antd";
 import CopyableBlock from "./CopyableBlock";
+import { CSSProperties } from "react";
 
 export default function JsonView({
   data,
   inline = false,
   color,
+  style,
 }: {
   data: object;
   inline?: boolean;
   color?: "white";
+  style?: CSSProperties;
 }) {
   if (inline) {
     const jsonString = JSON.stringify(data);
     return (
       <Tooltip title={<JsonView data={data} color="white" />}>
-        <code>{jsonString}</code>
+        <code style={style}>{jsonString}</code>
       </Tooltip>
     );
   } else {
     const jsonString = JSON.stringify(data, null, 2);
     return (
-      <CopyableBlock text={jsonString} color={color}>
+      <CopyableBlock text={jsonString} color={color} style={style}>
         <pre
           style={{
             overflow: "auto",
diff --git a/frontend/components/data/DataApprovalSummary.tsx b/frontend/components/data/DataApprovalSummary.tsx
new file mode 100644
index 000000000..10c461a18
--- /dev/null
+++ b/frontend/components/data/DataApprovalSummary.tsx
@@ -0,0 +1,89 @@
+import * as graphql from "graphql";
+import { Button, Drawer, Typography } from "antd";
+import paths from "../../paths";
+import {
+  DataApprovalPartialFragment,
+  DataPartialFragment,
+} from "../../queries/data.generated";
+import DateTimeX from "../DateTimeX";
+import EntityLink from "../entities/EntityLink";
+import GnuPgKeyLink from "../GnuPgKeyLink";
+import Reference from "../Reference";
+import CodeView from "../CodeView";
+import JsonView from "../JsonView";
+import { Scalars } from "../../__generated__/graphql";
+import { useState } from "react";
+import { SignatureOutlined } from "@ant-design/icons";
+
+const nameFallback = (id: Scalars["Uuid"]["output"]) => ({
+  uuid: id,
+  name: id,
+});
+
+export default function DataApprovalSummary({
+  approval,
+  data,
+}: {
+  approval: DataApprovalPartialFragment;
+  data: DataPartialFragment;
+}) {
+  const [isProofOpen, setIsProofOpen] = useState(false);
+
+  return (
+    <div>
+      <Button
+        style={{ float: "right" }}
+        size="small"
+        icon={
+          <SignatureOutlined /> /* <AuditOutlined /> <VerifiedOutlined /> */
+        }
+        onClick={() => setIsProofOpen(true)}
+      >
+        Show Formal Signature
+      </Button>
+      The institution{" "}
+      <EntityLink
+        entity={approval.approver ?? nameFallback(approval.approverId)}
+        route={paths.institution}
+      />{" "}
+      approved on <DateTimeX value={approval.timestamp} /> that the data
+      satisfies the statement given by the reference
+      <Reference data={approval.statement} />
+      <Drawer
+        title="Formal Signature"
+        placement="right"
+        onClose={() => setIsProofOpen(false)}
+        size="large"
+        open={isProofOpen}
+      >
+        This is proven by the GnuPG signature
+        <CodeView code={approval.signature} style={{ marginTop: "1em" }} />
+        generated with the institution's GnuPG key{" "}
+        <GnuPgKeyLink fingerprint={approval.keyFingerprint} /> of the message
+        <CodeView code={approval.message} style={{ marginTop: "1em" }} />
+        The message contains the statement and the response of the query
+        <CodeView
+          code={graphql.print(graphql.parse(approval.query))}
+          style={{ marginTop: "1em" }}
+        />
+        with the variables
+        <JsonView data={approval.variables} style={{ marginTop: "1em" }} />
+        against the GraphQL endpoint of the database{" "}
+        <EntityLink
+          entity={data.database ?? nameFallback(data.databaseId)}
+          route={paths.database}
+        />
+        {data.database?.locator && (
+          <>
+            {" "}
+            located at{" "}
+            <Typography.Link href={data.database.locator}>
+              {data.database.locator}
+            </Typography.Link>
+          </>
+        )}
+        .
+      </Drawer>
+    </div>
+  );
+}
diff --git a/frontend/components/data/DataSummary.tsx b/frontend/components/data/DataSummary.tsx
index 60d0ae701..29ace5355 100644
--- a/frontend/components/data/DataSummary.tsx
+++ b/frontend/components/data/DataSummary.tsx
@@ -1,4 +1,3 @@
-import * as graphql from "graphql";
 import {
   Breadcrumb,
   Divider,
@@ -18,15 +17,13 @@ import {
 import InlineList from "../InlineList";
 import EntityLink from "../entities/EntityLink";
 import { Scalars } from "../../__generated__/graphql";
-import JsonViewer from "../JsonView";
 import { useMemo, useState } from "react";
 import Copyable from "../Copyable";
-import Reference from "../Reference";
 import CodeViewer from "../CodeView";
 import AppliedMethodViewer from "../methods/AppliedMethodView";
-import GnuPgKeyLink from "../GnuPgKeyLink";
 import DateTimeX from "../DateTimeX";
 import { Route } from "next";
+import DataApprovalSummary from "./DataApprovalSummary";
 
 interface ResourceTreeNode {
   key: string;
@@ -264,46 +261,11 @@ export default function DataSummary({
           <div>
             <Flex vertical gap="small">
               {entity.approvals.map((approval, index) => (
-                <div key={index}>
-                  The institution{" "}
-                  <EntityLink
-                    entity={
-                      approval.approver ?? nameFallback(approval.approverId)
-                    }
-                    route={paths.institution}
-                  />{" "}
-                  approved on <DateTimeX value={approval.timestamp} /> that the
-                  data satisfies the statement given by the reference
-                  <Reference data={approval.statement} />
-                  This is proven by the GnuPG signature
-                  <CodeViewer code={approval.signature} />
-                  generated with the institution's GnuPG key{" "}
-                  <GnuPgKeyLink fingerprint={approval.keyFingerprint} /> of the
-                  message
-                  <CodeViewer code={approval.message} />
-                  The message contains the statement and the response of the
-                  query
-                  <CodeViewer
-                    code={graphql.print(graphql.parse(approval.query))}
-                  />
-                  with the variables
-                  <JsonViewer data={approval.variables} />
-                  against the GraphQL endpoint of the database{" "}
-                  <EntityLink
-                    entity={entity.database ?? nameFallback(entity.databaseId)}
-                    route={paths.database}
-                  />
-                  {entity.database?.locator && (
-                    <>
-                      {" "}
-                      located at{" "}
-                      <Typography.Link href={entity.database.locator}>
-                        {entity.database.locator}
-                      </Typography.Link>
-                    </>
-                  )}
-                  .
-                </div>
+                <DataApprovalSummary
+                  key={index}
+                  approval={approval}
+                  data={entity}
+                />
               ))}
             </Flex>
           </div>
diff --git a/frontend/queries/data.graphql b/frontend/queries/data.graphql
index a91322d43..bc07c769f 100644
--- a/frontend/queries/data.graphql
+++ b/frontend/queries/data.graphql
@@ -43,6 +43,23 @@ fragment AppliedMethodPartial on AppliedMethod {
   }
 }
 
+fragment DataApprovalPartial on DataApproval {
+  approverId
+  approver {
+    uuid
+    name
+  }
+  keyFingerprint
+  message
+  query
+  signature
+  statement {
+    ...ReferencePartial
+  }
+  timestamp
+  variables
+}
+
 fragment ToTreeVertexAppliedConversionMethodPartial on ToTreeVertexAppliedConversionMethod {
   methodId
   method {
@@ -82,20 +99,7 @@ fragment DataPartial on Data {
     locator
   }
   approvals {
-    approverId
-    approver {
-      uuid
-      name
-    }
-    keyFingerprint
-    message
-    query
-    signature
-    statement {
-      ...ReferencePartial
-    }
-    timestamp
-    variables
+    ...DataApprovalPartial
   }
   appliedMethod {
     ...AppliedMethodPartial

From 318ef1a2fc109593925ce3ac4dbea78339d4c32f Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 17 Jun 2026 16:06:20 +0200
Subject: [PATCH 096/145] Display scopes of authorization in frontend

---
 .../OpenIdConnect/OpenIdConnectScope.cs       |  6 +++++
 .../OpenIdConnectScopeExtensions.cs           |  2 ++
 .../OpenIdConnectAuthorizationSummary.tsx     | 24 +++++++++++++------
 frontend/queries/openIdConnect.graphql        |  1 +
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs
index ec787cb78..105a7e549 100644
--- a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs
+++ b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScope.cs
@@ -20,6 +20,12 @@ public enum OpenIdConnectScope
     [Display(Description = "Access to your basic profile, for example, name, gender, picture, and so forth.")]
     PROFILE,
 
+    [Display(Description = "Request a long-lived refresh token so the application can continue interacting with APIs after the original access token expired.")]
+    OFFLINE_ACCESS,
+
+    [Display(Description = "Request an identity token so the application can know who you are.")]
+    OPEN_ID,
+
     [Display(Description = "Access to your user roles.")]
     ROLES,
 
diff --git a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
index f14dabc9f..1fe6f2414 100644
--- a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
@@ -16,6 +16,8 @@ public static OpenIdConnectScope ToOpenIdConnectScope(this string scope)
             OpenIddictConstants.Scopes.Phone => OpenIdConnectScope.PHONE,
             OpenIddictConstants.Scopes.Profile => OpenIdConnectScope.PROFILE,
             OpenIddictConstants.Scopes.Roles => OpenIdConnectScope.ROLES,
+            OpenIddictConstants.Scopes.OfflineAccess => OpenIdConnectScope.OFFLINE_ACCESS,
+            OpenIddictConstants.Scopes.OpenId => OpenIdConnectScope.OPEN_ID,
             Data.OpenIdConnect.OpenIdConnectScope.ReadApiScope => OpenIdConnectScope.READ_API,
             Data.OpenIdConnect.OpenIdConnectScope.WriteApiScope => OpenIdConnectScope.WRITE_API,
             Data.OpenIdConnect.OpenIdConnectScope.AdministrateApiScope => OpenIdConnectScope.ADMINISTRATE_API,
diff --git a/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx
index 08a70f6a2..b100e1057 100644
--- a/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx
+++ b/frontend/components/openIdConnect/authorizations/OpenIdConnectAuthorizationSummary.tsx
@@ -7,6 +7,7 @@ import { humanize } from "../../../lib/string";
 import DateTimeX from "../../DateTimeX";
 import paths from "../../../paths";
 import EntityLink from "../../entities/EntityLink";
+import InlineList from "../../InlineList";
 
 export default function OpenIdConnectAuthorizationSummary({
   entity,
@@ -43,15 +44,24 @@ export default function OpenIdConnectAuthorizationSummary({
           Subject <EntityLink entity={entity.subject} route={paths.user} />
         </div>
       )}
-      {dateTimes.length > 0 && (
+      <div>
         <div>
-          {dateTimes.map((x) => (
-            <div key={x.key}>
-              {humanize(x.key, "all-upper")} <DateTimeX value={x.value} />
-            </div>
-          ))}
+          Scopes{" "}
+          <InlineList
+            items={entity.scopes}
+            renderItem={(item) => <code key={item}>{item}</code>}
+          />
         </div>
-      )}
+        {dateTimes.length > 0 && (
+          <div>
+            {dateTimes.map((x) => (
+              <div key={x.key}>
+                {humanize(x.key, "all-upper")} <DateTimeX value={x.value} />
+              </div>
+            ))}
+          </div>
+        )}
+      </div>
     </EntitySummary>
   );
 }
diff --git a/frontend/queries/openIdConnect.graphql b/frontend/queries/openIdConnect.graphql
index 04d40e123..caa3ca400 100644
--- a/frontend/queries/openIdConnect.graphql
+++ b/frontend/queries/openIdConnect.graphql
@@ -30,6 +30,7 @@ fragment OpenIdConnectAuthorizationsPartial on OpenIdConnectAuthorization {
   uuid
   name: uuid
   createdAt
+  scopes
   status
   subject {
     id

From af710ba8e090dd78685e48509fced240c5cb6cb8 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 17 Jun 2026 16:36:24 +0200
Subject: [PATCH 097/145] Indent with 4 spaces per level

---
 nginx/templates/default.conf.template | 334 +++++++++++++-------------
 1 file changed, 167 insertions(+), 167 deletions(-)

diff --git a/nginx/templates/default.conf.template b/nginx/templates/default.conf.template
index 1ebfaf11c..34e355d0a 100644
--- a/nginx/templates/default.conf.template
+++ b/nginx/templates/default.conf.template
@@ -9,8 +9,8 @@ resolver 127.0.0.11 valid=5s ipv6=off;
 resolver_timeout 5s;
 
 map $http_upgrade $connection_upgrade {
-  default upgrade;
-  ''      keep-alive;
+    default upgrade;
+    ''      keep-alive;
 }
 
 proxy_redirect          off;
@@ -58,184 +58,184 @@ send_timeout          10s;
 add_header X-Proxy-Layer "inner" always;
 
 types {
-  application/javascript js mjs;
+    application/javascript js mjs;
 }
 
 map $http_accept $error_type {
-  default           "text/html";
-  ~application/json "application/json";
+    default           "text/html";
+    ~application/json "application/json";
 }
 
 upstream backend {
-  zone upstream_dynamic 64k;
-  server backend:8080 max_fails=0 resolve;
+    zone upstream_dynamic 64k;
+    server backend:8080 max_fails=0 resolve;
 }
 
 upstream frontend {
-  zone upstream_dynamic 64k;
-  server frontend:8080 max_fails=0 resolve;
+    zone upstream_dynamic 64k;
+    server frontend:8080 max_fails=0 resolve;
 }
 
 upstream email {
-  zone upstream_dynamic;
-  server email:80 max_fails=0 resolve;
+    zone upstream_dynamic;
+    server email:80 max_fails=0 resolve;
 }
 
 server {
-  listen                    *:80;
-
-  set $maintenance 0;
-  if (-f $document_root/maintenance.html) {
-    set $maintenance 1;
-  }
-  if ($internal != 1) {
-    set $maintenance "${maintenance}1";
-  }
-  if ($maintenance = 11) {
-    return 503;
-  }
-
-  limit_req zone=general burst=10 nodelay;
-
-  location / {
-    proxy_pass http://frontend;
-    limit_req zone=general burst=100 nodelay;
-  }
-
-  location /_next/static {
-    proxy_pass http://frontend;
-    expires 365d;
-    access_log off;
-    limit_req zone=general burst=100 nodelay;
-  }
-
-  location /_next/webpack-hmr {
-    proxy_pass http://frontend;
-    proxy_read_timeout 86400s;
-    proxy_send_timeout 86400s;
-    limit_req zone=general burst=100 nodelay;
-  }
-
-  location ~ /_next/static/.*/_clientMiddlewareManifest\.js$ {
-    proxy_pass http://frontend;
-    proxy_hide_header Content-Type;
-    add_header Content-Type application/javascript;
-    limit_req zone=general burst=100 nodelay;
-  }
-
-  location /graphql {
-    proxy_pass http://backend;
-    limit_req  zone=sensitive burst=12 delay=6;
-  }
-
-  location /connect {
-    proxy_pass http://backend;
-    limit_req  zone=sensitive burst=6 nodelay;
-  }
-
-  location /antiforgery {
-    proxy_pass http://backend;
-    limit_req  zone=sensitive burst=2 nodelay;
-  }
-
-  location /.well-known {
-    proxy_pass http://backend;
-    limit_req  zone=general burst=2 nodelay;
-  }
-
-  location /personal-user-data {
-    proxy_pass http://backend;
-    limit_req  zone=sensitive burst=2 nodelay;
-  }
-
-  location /openapi {
-    proxy_pass http://backend;
-    limit_req  zone=general burst=10 nodelay;
-  }
-
-  location /health {
-    proxy_pass http://backend;
-    limit_req  zone=general burst=2 nodelay;
-  }
-
-  location /email {
-    proxy_pass http://email;
-    limit_req  zone=general burst=20 nodelay;
-  }
-
-  location /email/hubs {
-    proxy_pass http://email;
-    limit_req zone=general burst=20 nodelay;
-  }
-
-  error_page 404 @not_found;
-  location @not_found {
-    internal;
-    add_header Content-Type application/json always;
-    return 404 '{"errors": [{"code": "NOT_FOUND", "message": "The requested resource could not be found.", "path": []}]}';
-  }
-
-  error_page 408 @request_timeout;
-  location @request_timeout {
-    internal;
-    add_header Content-Type application/json always;
-    return 408 '{"errors": [{"code": "REQUEST_TIMEOUT", "message": "The server timed out waiting for the request. Please check your network connection and try again.", "path": []}]}';
-  }
-
-  error_page 413 @content_too_large;
-  location @content_too_large {
-    internal;
-    add_header Content-Type application/json always;
-    return 413 '{"errors": [{"code": "CONTENT_TOO_LARGE", "message": "The uploaded file is too large. Please reduce the size and try again.", "path": []}]}';
-  }
-
-  error_page 429 @too_many_requests;
-  location @too_many_requests {
-    internal;
-    add_header Retry-After 60 always;
-    add_header Content-Type application/json always;
-    return 429 '{"errors": [{"code": "TOO_MANY_REQUESTS", "message": "Rate limit exceeded. Please slow down and try again later.", "path": []}]}';
-  }
-
-  error_page 501 @not_implemented;
-  location @not_implemented {
-    internal;
-    add_header Content-Type application/json always;
-    return 501 '{"errors": [{"code": "NOT_IMPLEMENTED", "message": "The HTTP method used is not supported.", "path": []}]}';
-  }
-
-  error_page 502 @bad_gateway;
-  location @bad_gateway {
-    internal;
-    add_header Retry-After 120 always;
-    add_header Content-Type application/json always;
-    return 502 '{"errors": [{"code": "BAD_GATEWAY", "message": "The upstream server is temporarily unable to handle the request. Please try again in 2 minutes.", "path": []}]}';
-  }
-
-  error_page 504 @gateway_timeout;
-  location @gateway_timeout {
-    internal;
-    add_header Retry-After 120 always;
-    add_header Content-Type application/json always;
-    return 504 '{"errors": [{"code": "GATEWAY_TIMEOUT", "message": "The upstream server took too long to respond. This may be due to high load. Please try again in 2 minutes.", "path": []}]}';
-  }
-
-  error_page 503 @maintenance;
-  location @maintenance {
-    internal;
-    if ($error_type = "application/json") {
-      error_page 503 @service_unavailable;
-      return 503;
-    }
-    add_header Retry-After 120 always;
-    root /etc/nginx/html;
-    try_files /maintenance.html @service_unavailable;
-  }
-
-  location @service_unavailable {
-    internal;
-    add_header Retry-After 120 always;
-    add_header Content-Type application/json always;
-    return 503 '{"errors": [{"code": "SERVICE_UNAVAILABLE", "message": "The system is under maintenance. Please try again in 2 minutes.", "path": []}]}';
-  }
+    listen *:80;
+
+    set $maintenance 0;
+    if (-f $document_root/maintenance.html) {
+        set $maintenance 1;
+    }
+    if ($internal != 1) {
+        set $maintenance "${maintenance}1";
+    }
+    if ($maintenance = 11) {
+        return 503;
+    }
+
+    limit_req zone=general burst=10 nodelay;
+
+    location / {
+        proxy_pass http://frontend;
+        limit_req zone=general burst=100 nodelay;
+    }
+
+    location /_next/static {
+        proxy_pass http://frontend;
+        expires 365d;
+        access_log off;
+        limit_req zone=general burst=100 nodelay;
+    }
+
+    location /_next/webpack-hmr {
+        proxy_pass http://frontend;
+        proxy_read_timeout 86400s;
+        proxy_send_timeout 86400s;
+        limit_req zone=general burst=100 nodelay;
+    }
+
+    location ~ /_next/static/.*/_clientMiddlewareManifest\.js$ {
+        proxy_pass http://frontend;
+        proxy_hide_header Content-Type;
+        add_header Content-Type application/javascript;
+        limit_req zone=general burst=100 nodelay;
+    }
+
+    location /graphql {
+        proxy_pass http://backend;
+        limit_req  zone=sensitive burst=12 delay=6;
+    }
+
+    location /connect {
+        proxy_pass http://backend;
+        limit_req  zone=sensitive burst=6 nodelay;
+    }
+
+    location /antiforgery {
+        proxy_pass http://backend;
+        limit_req  zone=sensitive burst=2 nodelay;
+    }
+
+    location /.well-known {
+        proxy_pass http://backend;
+        limit_req  zone=general burst=2 nodelay;
+    }
+
+    location /personal-user-data {
+        proxy_pass http://backend;
+        limit_req  zone=sensitive burst=2 nodelay;
+    }
+
+    location /openapi {
+        proxy_pass http://backend;
+        limit_req  zone=general burst=10 nodelay;
+    }
+
+    location /health {
+        proxy_pass http://backend;
+        limit_req  zone=general burst=2 nodelay;
+    }
+
+    location /email {
+        proxy_pass http://email;
+        limit_req  zone=general burst=20 nodelay;
+    }
+
+    location /email/hubs {
+        proxy_pass http://email;
+        limit_req zone=general burst=20 nodelay;
+    }
+
+    error_page 404 @not_found;
+    location @not_found {
+        internal;
+        add_header Content-Type application/json always;
+        return 404 '{"errors": [{"code": "NOT_FOUND", "message": "The requested resource could not be found.", "path": []}]}';
+    }
+
+    error_page 408 @request_timeout;
+    location @request_timeout {
+        internal;
+        add_header Content-Type application/json always;
+        return 408 '{"errors": [{"code": "REQUEST_TIMEOUT", "message": "The server timed out waiting for the request. Please check your network connection and try again.", "path": []}]}';
+    }
+
+    error_page 413 @content_too_large;
+    location @content_too_large {
+        internal;
+        add_header Content-Type application/json always;
+        return 413 '{"errors": [{"code": "CONTENT_TOO_LARGE", "message": "The uploaded file is too large. Please reduce the size and try again.", "path": []}]}';
+    }
+
+    error_page 429 @too_many_requests;
+    location @too_many_requests {
+        internal;
+        add_header Retry-After 60 always;
+        add_header Content-Type application/json always;
+        return 429 '{"errors": [{"code": "TOO_MANY_REQUESTS", "message": "Rate limit exceeded. Please slow down and try again later.", "path": []}]}';
+    }
+
+    error_page 501 @not_implemented;
+    location @not_implemented {
+        internal;
+        add_header Content-Type application/json always;
+        return 501 '{"errors": [{"code": "NOT_IMPLEMENTED", "message": "The HTTP method used is not supported.", "path": []}]}';
+    }
+
+    error_page 502 @bad_gateway;
+    location @bad_gateway {
+        internal;
+        add_header Retry-After 120 always;
+        add_header Content-Type application/json always;
+        return 502 '{"errors": [{"code": "BAD_GATEWAY", "message": "The upstream server is temporarily unable to handle the request. Please try again in 2 minutes.", "path": []}]}';
+    }
+
+    error_page 504 @gateway_timeout;
+    location @gateway_timeout {
+        internal;
+        add_header Retry-After 120 always;
+        add_header Content-Type application/json always;
+        return 504 '{"errors": [{"code": "GATEWAY_TIMEOUT", "message": "The upstream server took too long to respond. This may be due to high load. Please try again in 2 minutes.", "path": []}]}';
+    }
+
+    error_page 503 @maintenance;
+    location @maintenance {
+        internal;
+        if ($error_type = "application/json") {
+            error_page 503 @service_unavailable;
+            return 503;
+        }
+        add_header Retry-After 120 always;
+        root /etc/nginx/html;
+        try_files /maintenance.html @service_unavailable;
+    }
+
+    location @service_unavailable {
+        internal;
+        add_header Retry-After 120 always;
+        add_header Content-Type application/json always;
+        return 503 '{"errors": [{"code": "SERVICE_UNAVAILABLE", "message": "The system is under maintenance. Please try again in 2 minutes.", "path": []}]}';
+    }
 }

From eb250c85274fac03e119209bb3064234c2f9c990 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 18 Jun 2026 17:20:53 +0200
Subject: [PATCH 098/145] Exclude the offline access and openid scopes from
 conversion to OpenIddict permission strings --- they are special-cased and do
 not support explicit permissions according to
 https://documentation.openiddict.com/configuration/application-permissions#scope-permissions

---
 .../OpenIdConnectAuthorization.cs             |   8 +-
 .../Controllers/AuthorizationController.cs    |  16 +-
 .../OpenIdConnectApplicationMutations.cs      |   4 +-
 .../OpenIdConnectApplicationType.cs           |  90 +-----
 .../OpenIdConnectEndpointExtensions.cs        |  21 ++
 .../OpenIdConnectGrantTypeExtensions.cs       |  21 ++
 .../OpenIdConnectResponseTypeExtensions.cs    |  21 ++
 .../OpenIdConnectScopeExtensions.cs           |  54 +++-
 .../GraphQlSchemaTests.IsUnchanged.snap       |  10 +-
 .../CreateOpenIdConnectApplication.tsx        |  10 +-
 .../UpdateOpenIdConnectApplication.tsx        |   2 +
 frontend/type-defs.graphqls                   | 282 +++++++-----------
 12 files changed, 263 insertions(+), 276 deletions(-)

diff --git a/backend/src/Authorization/OpenIdConnectAuthorization.cs b/backend/src/Authorization/OpenIdConnectAuthorization.cs
index 806d56c3d..03afaa43c 100644
--- a/backend/src/Authorization/OpenIdConnectAuthorization.cs
+++ b/backend/src/Authorization/OpenIdConnectAuthorization.cs
@@ -161,7 +161,7 @@ CancellationToken cancellationToken
             ? Enum.GetValues<GraphQl.OpenIdConnect.Applications.OpenIdConnectGrantType>().ToList().AsReadOnly()
             : Enum.GetValues<GraphQl.OpenIdConnect.Applications.OpenIdConnectGrantType>()
                 .Where(_ =>
-                    _ != GraphQl.OpenIdConnect.Applications.OpenIdConnectGrantType.TOKEN_EXCHANGE
+                    _ is not GraphQl.OpenIdConnect.Applications.OpenIdConnectGrantType.TOKEN_EXCHANGE
                 )
                 .ToList()
                 .AsReadOnly();
@@ -184,9 +184,9 @@ CancellationToken cancellationToken
             ? Enum.GetValues<GraphQl.OpenIdConnect.OpenIdConnectScope>().ToList().AsReadOnly()
             : Enum.GetValues<GraphQl.OpenIdConnect.OpenIdConnectScope>()
                 .Where(_ =>
-                    _ != GraphQl.OpenIdConnect.OpenIdConnectScope.ADMINISTRATE_API
-                    && _ != GraphQl.OpenIdConnect.OpenIdConnectScope.SUPPORT_API
-                    && _ != GraphQl.OpenIdConnect.OpenIdConnectScope.MANAGE_USER_API
+                    _ is not GraphQl.OpenIdConnect.OpenIdConnectScope.ADMINISTRATE_API
+                    && _ is not GraphQl.OpenIdConnect.OpenIdConnectScope.SUPPORT_API
+                    && _ is not GraphQl.OpenIdConnect.OpenIdConnectScope.MANAGE_USER_API
                 )
                 .ToList()
                 .AsReadOnly();
diff --git a/backend/src/Controllers/AuthorizationController.cs b/backend/src/Controllers/AuthorizationController.cs
index 7503d7a6b..e57f95f63 100644
--- a/backend/src/Controllers/AuthorizationController.cs
+++ b/backend/src/Controllers/AuthorizationController.cs
@@ -321,20 +321,8 @@ await CreatePermanentAuthorization(
                 return View(new AuthorizeViewModel(
                     await applicationManager.GetLocalizedDisplayNameAsync(application) ?? application.ClientId ?? "Unknown",
                     request.GetScopes()
-                    .Where(_ =>
-                    {
-                        try
-                        {
-                            var ignore = _.ToOpenIdConnectScope();
-                            return true;
-                        }
-                        catch (ArgumentOutOfRangeException)
-                        {
-                            return false;
-                        }
-                    })
-                    .Select(_ => _.ToOpenIdConnectScope())
-                    .ToArray()
+                        .Select(_ => _.ToOpenIdConnectScope())
+                        .ToArray()
                 ));
         }
     }
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
index bcd0fdf60..155bbeab3 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationMutations.cs
@@ -161,7 +161,7 @@ CancellationToken cancellationToken
             input.Endpoints.Select(_ => _.ToPermissionString())
             .Concat(input.GrantTypes.Select(_ => _.ToPermissionString()))
             .Concat(input.ResponseTypes.Select(_ => _.ToPermissionString()))
-            .Concat(input.Scopes.Select(_ => _.ToPermissionString()))
+            .Concat(input.Scopes.ToPermissionStrings())
         );
         if (input.RedirectUri is not null)
         {
@@ -439,7 +439,7 @@ OpenIddictApplicationDescriptor descriptor
             input.Endpoints.Select(_ => _.ToPermissionString())
             .Concat(input.GrantTypes.Select(_ => _.ToPermissionString()))
             .Concat(input.ResponseTypes.Select(_ => _.ToPermissionString()))
-            .Concat(input.Scopes.Select(_ => _.ToPermissionString()))
+            .Concat(input.Scopes.ToPermissionStrings())
         );
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
index 36869857b..34d87318e 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
@@ -55,25 +55,9 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
             .Resolve(context =>
         {
             var application = context.Parent<OpenIdConnectApplication>();
-            if (application.Permissions is null)
-            {
-                return [];
-            }
-            return JsonSerializer.Deserialize<List<string>>(application.Permissions)
-                ?.FindAll(permission =>
-                {
-                    try
-                    {
-                        var ignore = permission.PermissionToOpenIdConnectEndpoint();
-                        return true;
-                    }
-                    catch (ArgumentOutOfRangeException)
-                    {
-                        return false;
-                    }
-                })
-                ?.Select(endpointPermission => endpointPermission.PermissionToOpenIdConnectEndpoint())
-                .ToList() ?? [];
+            return (application.Permissions is null ? [] : JsonSerializer.Deserialize<List<string>>(application.Permissions))
+                ?.PermissionsToOpenIdConnectEndpoints()
+                ?? [];
         });
         descriptor
             .Field("grantTypes")
@@ -82,25 +66,9 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
             .Resolve(context =>
         {
             var application = context.Parent<OpenIdConnectApplication>();
-            if (application.Permissions is null)
-            {
-                return [];
-            }
-            return JsonSerializer.Deserialize<List<string>>(application.Permissions)
-                ?.FindAll(permission =>
-                {
-                    try
-                    {
-                        var ignore = permission.PermissionToOpenIdConnectGrantType();
-                        return true;
-                    }
-                    catch (ArgumentOutOfRangeException)
-                    {
-                        return false;
-                    }
-                })
-                ?.Select(grantTypePermission => grantTypePermission.PermissionToOpenIdConnectGrantType())
-                .ToList() ?? [];
+            return (application.Permissions is null ? [] : JsonSerializer.Deserialize<List<string>>(application.Permissions))
+                ?.PermissionsToOpenIdConnectGrantTypes()
+                ?? [];
         });
         descriptor
             .Field("responseTypes")
@@ -109,25 +77,9 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
             .Resolve(context =>
         {
             var application = context.Parent<OpenIdConnectApplication>();
-            if (application.Permissions is null)
-            {
-                return [];
-            }
-            return JsonSerializer.Deserialize<List<string>>(application.Permissions)
-                ?.FindAll(permission =>
-                {
-                    try
-                    {
-                        var ignore = permission.PermissionToOpenIdConnectResponseType();
-                        return true;
-                    }
-                    catch (ArgumentOutOfRangeException)
-                    {
-                        return false;
-                    }
-                })
-                ?.Select(responseTypePermission => responseTypePermission.PermissionToOpenIdConnectResponseType())
-                .ToList() ?? [];
+            return (application.Permissions is null ? [] : JsonSerializer.Deserialize<List<string>>(application.Permissions))
+                ?.PermissionsToOpenIdConnectResponseTypes()
+                ?? [];
         });
         descriptor
             .Field("scopes")
@@ -136,25 +88,9 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
             .Resolve(context =>
         {
             var application = context.Parent<OpenIdConnectApplication>();
-            if (application.Permissions is null)
-            {
-                return [];
-            }
-            return JsonSerializer.Deserialize<List<string>>(application.Permissions)
-                ?.FindAll(permission =>
-                {
-                    try
-                    {
-                        var ignore = permission.PermissionToOpenIdConnectScope();
-                        return true;
-                    }
-                    catch (ArgumentOutOfRangeException)
-                    {
-                        return false;
-                    }
-                })
-                ?.Select(scopePermission => scopePermission.PermissionToOpenIdConnectScope())
-                .ToList() ?? [];
+            return (application.Permissions is null ? [] : JsonSerializer.Deserialize<List<string>>(application.Permissions))
+                ?.PermissionsToOpenIdConnectScopes()
+                ?? [];
         });
         descriptor
             .Field(application => application.Requirements)
@@ -169,7 +105,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
             }
             return JsonSerializer.Deserialize<List<string>>(application.Requirements)
                 ?.Select(requirement => requirement.ToOpenIdConnectRequirement())
-                .ToList() ?? [];
+                .ToArray() ?? [];
         });
         descriptor
             .Field(application => application.RedirectUris)
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectEndpointExtensions.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectEndpointExtensions.cs
index 1482c74df..fdace1011 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectEndpointExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectEndpointExtensions.cs
@@ -1,11 +1,32 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Linq;
 using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
 public static class OpenIdConnectEndpointExtensions
 {
+    [Pure]
+    public static OpenIdConnectEndpoint[] PermissionsToOpenIdConnectEndpoints(this List<string> permissions)
+    {
+        return permissions.FindAll(permission =>
+        {
+            try
+            {
+                var ignore = permission.PermissionToOpenIdConnectEndpoint();
+                return true;
+            }
+            catch (ArgumentOutOfRangeException)
+            {
+                return false;
+            }
+        })
+        .Select(endpointPermission => endpointPermission.PermissionToOpenIdConnectEndpoint())
+        .ToArray();
+    }
+
     [Pure]
     public static OpenIdConnectEndpoint PermissionToOpenIdConnectEndpoint(this string endpointPermission)
     {
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectGrantTypeExtensions.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectGrantTypeExtensions.cs
index 220f317d2..1efe700a9 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectGrantTypeExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectGrantTypeExtensions.cs
@@ -1,11 +1,32 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Linq;
 using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
 public static class OpenIdConnectGrantTypeExtensions
 {
+    [Pure]
+    public static OpenIdConnectGrantType[] PermissionsToOpenIdConnectGrantTypes(this List<string> permissions)
+    {
+        return permissions.FindAll(permission =>
+        {
+            try
+            {
+                var ignore = permission.PermissionToOpenIdConnectGrantType();
+                return true;
+            }
+            catch (ArgumentOutOfRangeException)
+            {
+                return false;
+            }
+        })
+        .Select(grantTypePermission => grantTypePermission.PermissionToOpenIdConnectGrantType())
+        .ToArray();
+    }
+
     [Pure]
     public static OpenIdConnectGrantType PermissionToOpenIdConnectGrantType(this string grantTypePermission)
     {
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectResponseTypeExtensions.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectResponseTypeExtensions.cs
index 40eba8a59..d3973f2a6 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectResponseTypeExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectResponseTypeExtensions.cs
@@ -1,11 +1,32 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Linq;
 using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
 public static class OpenIdConnectResponseTypeExtensions
 {
+    [Pure]
+    public static OpenIdConnectResponseType[] PermissionsToOpenIdConnectResponseTypes(this List<string> permissions)
+    {
+        return permissions.FindAll(permission =>
+        {
+            try
+            {
+                var ignore = permission.PermissionToOpenIdConnectResponseType();
+                return true;
+            }
+            catch (ArgumentOutOfRangeException)
+            {
+                return false;
+            }
+        })
+        .Select(responseTypePermission => responseTypePermission.PermissionToOpenIdConnectResponseType())
+        .ToArray();
+    }
+
     [Pure]
     public static OpenIdConnectResponseType PermissionToOpenIdConnectResponseType(this string responseTypePermission)
     {
diff --git a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
index 1fe6f2414..887a649b7 100644
--- a/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
+++ b/backend/src/GraphQl/OpenIdConnect/OpenIdConnectScopeExtensions.cs
@@ -1,5 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using System.Linq;
+using Metabase.Extensions;
+using Metabase.GraphQl.OpenIdConnect.Applications;
 using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect;
@@ -15,9 +19,9 @@ public static OpenIdConnectScope ToOpenIdConnectScope(this string scope)
             OpenIddictConstants.Scopes.Email => OpenIdConnectScope.EMAIL,
             OpenIddictConstants.Scopes.Phone => OpenIdConnectScope.PHONE,
             OpenIddictConstants.Scopes.Profile => OpenIdConnectScope.PROFILE,
-            OpenIddictConstants.Scopes.Roles => OpenIdConnectScope.ROLES,
             OpenIddictConstants.Scopes.OfflineAccess => OpenIdConnectScope.OFFLINE_ACCESS,
             OpenIddictConstants.Scopes.OpenId => OpenIdConnectScope.OPEN_ID,
+            OpenIddictConstants.Scopes.Roles => OpenIdConnectScope.ROLES,
             Data.OpenIdConnect.OpenIdConnectScope.ReadApiScope => OpenIdConnectScope.READ_API,
             Data.OpenIdConnect.OpenIdConnectScope.WriteApiScope => OpenIdConnectScope.WRITE_API,
             Data.OpenIdConnect.OpenIdConnectScope.AdministrateApiScope => OpenIdConnectScope.ADMINISTRATE_API,
@@ -32,6 +36,31 @@ public static OpenIdConnectScope ToOpenIdConnectScope(this string scope)
         };
     }
 
+    [Pure]
+    public static OpenIdConnectScope[] PermissionsToOpenIdConnectScopes(this List<string> permissions)
+    {
+        var grantTypes = permissions.PermissionsToOpenIdConnectGrantTypes();
+        return permissions.FindAll(permission =>
+        {
+            try
+            {
+                var ignore = permission.PermissionToOpenIdConnectScope();
+                return true;
+            }
+            catch (ArgumentOutOfRangeException)
+            {
+                return false;
+            }
+        })
+        .Select(scopePermission => scopePermission.PermissionToOpenIdConnectScope())
+        .If(
+            grantTypes.Contains(OpenIdConnectGrantType.REFRESH_TOKEN),
+            _ => _.Prepend(OpenIdConnectScope.OFFLINE_ACCESS)
+        )
+        .Prepend(OpenIdConnectScope.OPEN_ID)
+        .ToArray();
+    }
+
     [Pure]
     public static OpenIdConnectScope PermissionToOpenIdConnectScope(this string scopePermission)
     {
@@ -41,6 +70,11 @@ public static OpenIdConnectScope PermissionToOpenIdConnectScope(this string scop
             OpenIddictConstants.Permissions.Scopes.Email => OpenIdConnectScope.EMAIL,
             OpenIddictConstants.Permissions.Scopes.Phone => OpenIdConnectScope.PHONE,
             OpenIddictConstants.Permissions.Scopes.Profile => OpenIdConnectScope.PROFILE,
+            // The openid and offline_access scopes are special-cased by
+            // OpenIddict and don't require explicit permissions according to
+            // https://documentation.openiddict.com/configuration/application-permissions#scope-permissions
+            // ... => OpenIdConnectScope.OFFLINE_ACCESS,
+            // ... => OpenIdConnectScope.OPEN_ID,
             OpenIddictConstants.Permissions.Scopes.Roles => OpenIdConnectScope.ROLES,
             OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.ReadApiScope => OpenIdConnectScope.READ_API,
             OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.WriteApiScope => OpenIdConnectScope.WRITE_API,
@@ -57,7 +91,18 @@ public static OpenIdConnectScope PermissionToOpenIdConnectScope(this string scop
     }
 
     [Pure]
-    public static string ToPermissionString(this OpenIdConnectScope scope)
+    public static IEnumerable<string> ToPermissionStrings(this IEnumerable<OpenIdConnectScope> scopes)
+    {
+        return scopes
+            // The openid and offline_access scopes are special-cased by
+            // OpenIddict and don't require explicit permissions according to
+            // https://documentation.openiddict.com/configuration/application-permissions#scope-permissions
+            .Where(_ => _ is not OpenIdConnectScope.OFFLINE_ACCESS && _ is not OpenIdConnectScope.OPEN_ID)
+            .Select(_ => _.ToPermissionString());
+    }
+
+    [Pure]
+    private static string ToPermissionString(this OpenIdConnectScope scope)
     {
         return scope switch
         {
@@ -65,6 +110,11 @@ public static string ToPermissionString(this OpenIdConnectScope scope)
             OpenIdConnectScope.EMAIL => OpenIddictConstants.Permissions.Scopes.Email,
             OpenIdConnectScope.PHONE => OpenIddictConstants.Permissions.Scopes.Phone,
             OpenIdConnectScope.PROFILE => OpenIddictConstants.Permissions.Scopes.Profile,
+            // The openid and offline_access scopes are special-cased by
+            // OpenIddict and don't require explicit permissions according to
+            // https://documentation.openiddict.com/configuration/application-permissions#scope-permissions
+            // OpenIdConnectScope.OFFLINE_ACCESS => ...,
+            // OpenIdConnectScope.OPEN_ID => ...,
             OpenIdConnectScope.ROLES => OpenIddictConstants.Permissions.Scopes.Roles,
             OpenIdConnectScope.READ_API => OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.ReadApiScope,
             OpenIdConnectScope.WRITE_API => OpenIddictConstants.Permissions.Prefixes.Scope + Data.OpenIdConnect.OpenIdConnectScope.WriteApiScope,
diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index 3a88bde51..47e41bb12 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -953,10 +953,10 @@ type ConfirmUserMethodDeveloperPayload {
 }
 
 type ContactInformation {
-  emailAddress: String
+  emailAddress: EmailAddress
   isEmailAddressConfirmed: Boolean!
   isPhoneNumberConfirmed: Boolean!
-  phoneNumber: String
+  phoneNumber: PhoneNumber
   postalAddress: String
   websiteLocator: Url
 }
@@ -3160,8 +3160,8 @@ input ContactInformationFilterInput {
 }
 
 input ContactInformationInput {
-  emailAddress: String
-  phoneNumber: String
+  emailAddress: EmailAddress
+  phoneNumber: PhoneNumber
   postalAddress: String
   websiteLocator: Url
 }
@@ -4922,6 +4922,8 @@ enum OpenIdConnectScope {
   EMAIL
   PHONE
   PROFILE
+  OFFLINE_ACCESS
+  OPEN_ID
   ROLES
   READ_API
   WRITE_API
diff --git a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
index 1c8b1b3cd..da15070b6 100644
--- a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
@@ -30,6 +30,9 @@ import EnumSelect, {
 } from "../../EnumSelect";
 import { createPaginatedIdSelectOption } from "../../PaginatedIdSelect";
 import { CurrentUserDocument } from "../../../queries/currentUser.generated";
+import { humanize } from "../../../lib/string";
+
+export const scopesFormItemExtra = `The scope '${humanize(String(OpenIdConnectScope.OpenId), "all-upper")}' is added on submission if it is missing here and the scope '${humanize(String(OpenIdConnectScope.OfflineAccess), "all-upper")}' is added on submission if the grant type '${humanize(String(OpenIdConnectGrantType.RefreshToken))}' is included above.`;
 
 type FormValues = {
   clientId: string;
@@ -259,7 +262,12 @@ export default function CreateOpenIdConnectApplication({
               placeholder="Please select"
             />
           </Form.Item>
-          <Form.Item label="Scopes" name="scopes" rules={[{ required: true }]}>
+          <Form.Item
+            label="Scopes"
+            name="scopes"
+            rules={[{ required: true }]}
+            extra={scopesFormItemExtra}
+          >
             <EnumSelect
               values={currentUser?.authorizedOpenIdConnectScopes ?? []}
               mode="multiple"
diff --git a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
index 123ca8c24..383427c44 100644
--- a/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/UpdateOpenIdConnectApplication.tsx
@@ -24,6 +24,7 @@ import EnumSelect, {
   allEnumValues,
 } from "../../EnumSelect";
 import { CurrentUserDocument } from "../../../queries/currentUser.generated";
+import { scopesFormItemExtra } from "./CreateOpenIdConnectApplication";
 
 interface UpdateApplicationProps {
   application: OpenIdConnectApplicationPartialFragment;
@@ -217,6 +218,7 @@ export default function UpdateOpenIdConnectApplication({
             label="Scopes"
             name="scopes"
             rules={[{ required: true }]}
+            extra={scopesFormItemExtra}
             initialValue={application.scopes}
           >
             <EnumSelect
diff --git a/frontend/type-defs.graphqls b/frontend/type-defs.graphqls
index 1c70d702e..47e41bb12 100644
--- a/frontend/type-defs.graphqls
+++ b/frontend/type-defs.graphqls
@@ -72,11 +72,8 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  calorimetricData(
-    databaseId: Uuid!
-    id: Uuid!
-    locale: String
-  ): CalorimetricData @cost(weight: "10")
+  calorimetricData(databaseId: Uuid!, id: Uuid!, locale: String): CalorimetricData
+    @cost(weight: "10")
   component(id: Uuid!): Component @cost(weight: "10")
   components(
     "Returns the elements in the list that come after the specified cursor."
@@ -167,33 +164,20 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  hasCalorimetricData(
-    locale: String
-    where: CalorimetricDataPropositionInput
-  ): Boolean! @cost(weight: "10")
-  hasGeometricData(
-    locale: String
-    where: GeometricDataPropositionInput
-  ): Boolean! @cost(weight: "10")
-  hasHygrothermalData(
-    locale: String
-    where: HygrothermalDataPropositionInput
-  ): Boolean! @cost(weight: "10")
-  hasLifeCycleData(
-    locale: String
-    where: LifeCycleDataPropositionInput
-  ): Boolean! @cost(weight: "10")
+  hasCalorimetricData(locale: String, where: CalorimetricDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasGeometricData(locale: String, where: GeometricDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasHygrothermalData(locale: String, where: HygrothermalDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasLifeCycleData(locale: String, where: LifeCycleDataPropositionInput): Boolean!
+    @cost(weight: "10")
   hasOpticalData(locale: String, where: OpticalDataPropositionInput): Boolean!
     @cost(weight: "10")
-  hasPhotovoltaicData(
-    locale: String
-    where: PhotovoltaicDataPropositionInput
-  ): Boolean! @cost(weight: "10")
-  hygrothermalData(
-    databaseId: Uuid!
-    id: Uuid!
-    locale: String
-  ): HygrothermalData @cost(weight: "10")
+  hasPhotovoltaicData(locale: String, where: PhotovoltaicDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hygrothermalData(databaseId: Uuid!, id: Uuid!, locale: String): HygrothermalData
+    @cost(weight: "10")
   institution(id: Uuid!): Institution @cost(weight: "10")
   institutions(
     "Returns the elements in the list that come after the specified cursor."
@@ -244,9 +228,8 @@ type Query {
   nodes("The list of node IDs." ids: [ID!]!): [Node]! @cost(weight: "10")
   openIdConnectApplication(id: Uuid!): OpenIdConnectApplication
     @cost(weight: "10")
-  openIdConnectApplicationByClientId(
-    clientId: String!
-  ): OpenIdConnectApplication @cost(weight: "10")
+  openIdConnectApplicationByClientId(clientId: String!): OpenIdConnectApplication
+    @cost(weight: "10")
   openIdConnectApplications(
     "Returns the elements in the list that come after the specified cursor."
     after: String
@@ -352,11 +335,8 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  photovoltaicData(
-    databaseId: Uuid!
-    id: Uuid!
-    locale: String
-  ): PhotovoltaicData @cost(weight: "10")
+  photovoltaicData(databaseId: Uuid!, id: Uuid!, locale: String): PhotovoltaicData
+    @cost(weight: "10")
   user(id: Uuid!): User @cost(weight: "10")
   users(
     "Returns the elements in the list that come after the specified cursor."
@@ -381,45 +361,34 @@ type Query {
 }
 
 type Mutation {
-  addComponentAssembly(
-    input: AddComponentAssemblyInput!
-  ): AddComponentAssemblyPayload! @cost(weight: "10")
-  addComponentGeneralization(
-    input: AddComponentGeneralizationInput!
-  ): AddComponentGeneralizationPayload! @cost(weight: "10")
-  addComponentManufacturer(
-    input: AddComponentManufacturerInput!
-  ): AddComponentManufacturerPayload! @cost(weight: "10")
-  addComponentVariant(
-    input: AddComponentVariantInput!
-  ): AddComponentVariantPayload! @cost(weight: "10")
-  addGnuPgKeyFingerprint(
-    input: AddGnuPgKeyFingerprintInput!
-  ): AddGnuPgKeyFingerprintPayload! @cost(weight: "10")
-  addInstitutionMethodDeveloper(
-    input: AddInstitutionMethodDeveloperInput!
-  ): AddInstitutionMethodDeveloperPayload! @cost(weight: "10")
-  addInstitutionRepresentative(
-    input: AddInstitutionRepresentativeInput!
-  ): AddInstitutionRepresentativePayload! @cost(weight: "10")
-  addUserMethodDeveloper(
-    input: AddUserMethodDeveloperInput!
-  ): AddUserMethodDeveloperPayload! @cost(weight: "10")
+  addComponentAssembly(input: AddComponentAssemblyInput!): AddComponentAssemblyPayload!
+    @cost(weight: "10")
+  addComponentGeneralization(input: AddComponentGeneralizationInput!): AddComponentGeneralizationPayload!
+    @cost(weight: "10")
+  addComponentManufacturer(input: AddComponentManufacturerInput!): AddComponentManufacturerPayload!
+    @cost(weight: "10")
+  addComponentVariant(input: AddComponentVariantInput!): AddComponentVariantPayload!
+    @cost(weight: "10")
+  addGnuPgKeyFingerprint(input: AddGnuPgKeyFingerprintInput!): AddGnuPgKeyFingerprintPayload!
+    @cost(weight: "10")
+  addInstitutionMethodDeveloper(input: AddInstitutionMethodDeveloperInput!): AddInstitutionMethodDeveloperPayload!
+    @cost(weight: "10")
+  addInstitutionRepresentative(input: AddInstitutionRepresentativeInput!): AddInstitutionRepresentativePayload!
+    @cost(weight: "10")
+  addUserMethodDeveloper(input: AddUserMethodDeveloperInput!): AddUserMethodDeveloperPayload!
+    @cost(weight: "10")
   addUserRole(input: AddUserRoleInput!): AddUserRolePayload! @cost(weight: "10")
-  allowGnuPgKeyFingerprint(
-    input: AllowGnuPgKeyFingerprintInput!
-  ): AllowGnuPgKeyFingerprintPayload! @cost(weight: "10")
+  allowGnuPgKeyFingerprint(input: AllowGnuPgKeyFingerprintInput!): AllowGnuPgKeyFingerprintPayload!
+    @cost(weight: "10")
   changeInstitutionRepresentativeRole(
     input: ChangeInstitutionRepresentativeRoleInput!
   ): ChangeInstitutionRepresentativeRolePayload! @cost(weight: "10")
   changeUserEmail(input: ChangeUserEmailInput!): ChangeUserEmailPayload!
     @cost(weight: "10")
-  changeUserPassword(
-    input: ChangeUserPasswordInput!
-  ): ChangeUserPasswordPayload! @cost(weight: "10")
-  confirmComponentManufacturer(
-    input: ConfirmComponentManufacturerInput!
-  ): ConfirmComponentManufacturerPayload! @cost(weight: "10")
+  changeUserPassword(input: ChangeUserPasswordInput!): ChangeUserPasswordPayload!
+    @cost(weight: "10")
+  confirmComponentManufacturer(input: ConfirmComponentManufacturerInput!): ConfirmComponentManufacturerPayload!
+    @cost(weight: "10")
   confirmInstitutionMethodDeveloper(
     input: ConfirmInstitutionMethodDeveloperInput!
   ): ConfirmInstitutionMethodDeveloperPayload! @cost(weight: "10")
@@ -428,12 +397,10 @@ type Mutation {
   ): ConfirmInstitutionRepresentativePayload! @cost(weight: "10")
   confirmUserEmail(input: ConfirmUserEmailInput!): ConfirmUserEmailPayload!
     @cost(weight: "10")
-  confirmUserEmailChange(
-    input: ConfirmUserEmailChangeInput!
-  ): ConfirmUserEmailChangePayload! @cost(weight: "10")
-  confirmUserMethodDeveloper(
-    input: ConfirmUserMethodDeveloperInput!
-  ): ConfirmUserMethodDeveloperPayload! @cost(weight: "10")
+  confirmUserEmailChange(input: ConfirmUserEmailChangeInput!): ConfirmUserEmailChangePayload!
+    @cost(weight: "10")
+  confirmUserMethodDeveloper(input: ConfirmUserMethodDeveloperInput!): ConfirmUserMethodDeveloperPayload!
+    @cost(weight: "10")
   createComponent(input: CreateComponentInput!): CreateComponentPayload!
     @cost(weight: "10")
   createDatabase(input: CreateDatabaseInput!): CreateDatabasePayload!
@@ -444,29 +411,25 @@ type Mutation {
     @cost(weight: "10")
   createMethod(input: CreateMethodInput!): CreateMethodPayload!
     @cost(weight: "10")
-  createOpenIdConnectApplication(
-    input: CreateOpenIdConnectApplicationInput!
-  ): CreateOpenIdConnectApplicationPayload! @cost(weight: "10")
+  createOpenIdConnectApplication(input: CreateOpenIdConnectApplicationInput!): CreateOpenIdConnectApplicationPayload!
+    @cost(weight: "10")
   deleteInstitution(input: DeleteInstitutionInput!): DeleteInstitutionPayload!
     @cost(weight: "10")
-  deleteOpenIdConnectApplication(
-    input: DeleteOpenIdConnectApplicationInput!
-  ): DeleteOpenIdConnectApplicationPayload! @cost(weight: "10")
+  deleteOpenIdConnectApplication(input: DeleteOpenIdConnectApplicationInput!): DeleteOpenIdConnectApplicationPayload!
+    @cost(weight: "10")
   deleteOpenIdConnectAuthorization(
     input: DeleteOpenIdConnectAuthorizationInput!
   ): DeleteOpenIdConnectAuthorizationPayload! @cost(weight: "10")
-  deletePersonalUserData(
-    input: DeletePersonalUserDataInput!
-  ): DeletePersonalUserDataPayload! @cost(weight: "10")
+  deletePersonalUserData(input: DeletePersonalUserDataInput!): DeletePersonalUserDataPayload!
+    @cost(weight: "10")
   deleteUser(input: DeleteUserInput!): DeleteUserPayload! @cost(weight: "10")
   disableUserTwoFactorAuthentication: DisableUserTwoFactorAuthenticationPayload!
     @cost(weight: "10")
   enableUserTwoFactorAuthenticator(
     input: EnableUserTwoFactorAuthenticatorInput!
   ): EnableUserTwoFactorAuthenticatorPayload! @cost(weight: "10")
-  forbidGnuPgKeyFingerprint(
-    input: ForbidGnuPgKeyFingerprintInput!
-  ): ForbidGnuPgKeyFingerprintPayload! @cost(weight: "10")
+  forbidGnuPgKeyFingerprint(input: ForbidGnuPgKeyFingerprintInput!): ForbidGnuPgKeyFingerprintPayload!
+    @cost(weight: "10")
   forgetUserTwoFactorAuthenticationClient: ForgetUserTwoFactorAuthenticationClientPayload!
     @cost(weight: "10")
   generateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri: GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUriPayload!
@@ -474,44 +437,34 @@ type Mutation {
   generateUserTwoFactorRecoveryCodes: GenerateUserTwoFactorRecoveryCodesPayload!
     @cost(weight: "10")
   loginUser(input: LoginUserInput!): LoginUserPayload! @cost(weight: "10")
-  loginUserWithRecoveryCode(
-    input: LoginUserWithRecoveryCodeInput!
-  ): LoginUserWithRecoveryCodePayload! @cost(weight: "10")
-  loginUserWithTwoFactorCode(
-    input: LoginUserWithTwoFactorCodeInput!
-  ): LoginUserWithTwoFactorCodePayload! @cost(weight: "10")
+  loginUserWithRecoveryCode(input: LoginUserWithRecoveryCodeInput!): LoginUserWithRecoveryCodePayload!
+    @cost(weight: "10")
+  loginUserWithTwoFactorCode(input: LoginUserWithTwoFactorCodeInput!): LoginUserWithTwoFactorCodePayload!
+    @cost(weight: "10")
   logoutUser: LogoutUserPayload! @cost(weight: "10")
   registerUser(input: RegisterUserInput!): RegisterUserPayload!
     @cost(weight: "10")
-  removeComponentAssembly(
-    input: RemoveComponentAssemblyInput!
-  ): RemoveComponentAssemblyPayload! @cost(weight: "10")
-  removeComponentGeneralization(
-    input: RemoveComponentGeneralizationInput!
-  ): RemoveComponentGeneralizationPayload! @cost(weight: "10")
-  removeComponentManufacturer(
-    input: RemoveComponentManufacturerInput!
-  ): RemoveComponentManufacturerPayload! @cost(weight: "10")
-  removeComponentVariant(
-    input: RemoveComponentVariantInput!
-  ): RemoveComponentVariantPayload! @cost(weight: "10")
+  removeComponentAssembly(input: RemoveComponentAssemblyInput!): RemoveComponentAssemblyPayload!
+    @cost(weight: "10")
+  removeComponentGeneralization(input: RemoveComponentGeneralizationInput!): RemoveComponentGeneralizationPayload!
+    @cost(weight: "10")
+  removeComponentManufacturer(input: RemoveComponentManufacturerInput!): RemoveComponentManufacturerPayload!
+    @cost(weight: "10")
+  removeComponentVariant(input: RemoveComponentVariantInput!): RemoveComponentVariantPayload!
+    @cost(weight: "10")
   removeInstitutionMethodDeveloper(
     input: RemoveInstitutionMethodDeveloperInput!
   ): RemoveInstitutionMethodDeveloperPayload! @cost(weight: "10")
-  removeInstitutionRepresentative(
-    input: RemoveInstitutionRepresentativeInput!
-  ): RemoveInstitutionRepresentativePayload! @cost(weight: "10")
-  removeUserMethodDeveloper(
-    input: RemoveUserMethodDeveloperInput!
-  ): RemoveUserMethodDeveloperPayload! @cost(weight: "10")
+  removeInstitutionRepresentative(input: RemoveInstitutionRepresentativeInput!): RemoveInstitutionRepresentativePayload!
+    @cost(weight: "10")
+  removeUserMethodDeveloper(input: RemoveUserMethodDeveloperInput!): RemoveUserMethodDeveloperPayload!
+    @cost(weight: "10")
   removeUserRole(input: RemoveUserRoleInput!): RemoveUserRolePayload!
     @cost(weight: "10")
-  requestUserPasswordReset(
-    input: RequestUserPasswordResetInput!
-  ): RequestUserPasswordResetPayload! @cost(weight: "10")
-  resendUserEmailConfirmation(
-    input: ResendUserEmailConfirmationInput!
-  ): ResendUserEmailConfirmationPayload! @cost(weight: "10")
+  requestUserPasswordReset(input: RequestUserPasswordResetInput!): RequestUserPasswordResetPayload!
+    @cost(weight: "10")
+  resendUserEmailConfirmation(input: ResendUserEmailConfirmationInput!): ResendUserEmailConfirmationPayload!
+    @cost(weight: "10")
   resendUserEmailVerification: ResendUserEmailVerificationPayload!
     @cost(weight: "10")
   resetOpenIdConnectApplicationClientSecret(
@@ -521,28 +474,22 @@ type Mutation {
     @cost(weight: "10")
   resetUserTwoFactorAuthenticator: ResetUserTwoFactorAuthenticatorPayload!
     @cost(weight: "10")
-  revokeOpenIdConnectToken(
-    input: RevokeOpenIdConnectTokenInput!
-  ): RevokeOpenIdConnectTokenPayload! @cost(weight: "10")
-  setComponentExtras(
-    input: SetComponentExtrasInput!
-  ): SetComponentExtrasPayload! @cost(weight: "10")
-  setInstitutionExtras(
-    input: SetInstitutionExtrasInput!
-  ): SetInstitutionExtrasPayload! @cost(weight: "10")
+  revokeOpenIdConnectToken(input: RevokeOpenIdConnectTokenInput!): RevokeOpenIdConnectTokenPayload!
+    @cost(weight: "10")
+  setComponentExtras(input: SetComponentExtrasInput!): SetComponentExtrasPayload!
+    @cost(weight: "10")
+  setInstitutionExtras(input: SetInstitutionExtrasInput!): SetInstitutionExtrasPayload!
+    @cost(weight: "10")
   setUserPassword(input: SetUserPasswordInput!): SetUserPasswordPayload!
     @cost(weight: "10")
-  setUserPhoneNumber(
-    input: SetUserPhoneNumberInput!
-  ): SetUserPhoneNumberPayload! @cost(weight: "10")
-  switchInstitutionOperatingState(
-    input: SwitchInstitutionOperatingStateInput!
-  ): SwitchInstitutionOperatingStatePayload! @cost(weight: "10")
+  setUserPhoneNumber(input: SetUserPhoneNumberInput!): SetUserPhoneNumberPayload!
+    @cost(weight: "10")
+  switchInstitutionOperatingState(input: SwitchInstitutionOperatingStateInput!): SwitchInstitutionOperatingStatePayload!
+    @cost(weight: "10")
   updateComponent(input: UpdateComponentInput!): UpdateComponentPayload!
     @cost(weight: "10")
-  updateComponentAssembly(
-    input: UpdateComponentAssemblyInput!
-  ): UpdateComponentAssemblyPayload! @cost(weight: "10")
+  updateComponentAssembly(input: UpdateComponentAssemblyInput!): UpdateComponentAssemblyPayload!
+    @cost(weight: "10")
   updateDatabase(input: UpdateDatabaseInput!): UpdateDatabasePayload!
     @cost(weight: "10")
   updateDataFormat(input: UpdateDataFormatInput!): UpdateDataFormatPayload!
@@ -551,9 +498,8 @@ type Mutation {
     @cost(weight: "10")
   updateMethod(input: UpdateMethodInput!): UpdateMethodPayload!
     @cost(weight: "10")
-  updateOpenIdConnectApplication(
-    input: UpdateOpenIdConnectApplicationInput!
-  ): UpdateOpenIdConnectApplicationPayload! @cost(weight: "10")
+  updateOpenIdConnectApplication(input: UpdateOpenIdConnectApplicationInput!): UpdateOpenIdConnectApplicationPayload!
+    @cost(weight: "10")
   verifyDatabase(input: VerifyDatabaseInput!): VerifyDatabasePayload!
     @cost(weight: "10")
   verifyInstitution(input: VerifyInstitutionInput!): VerifyInstitutionPayload!
@@ -1163,33 +1109,20 @@ type Database implements Node {
   data(id: Uuid!, kind: DataKind!, locale: Locale): Data @cost(weight: "10")
   description: String!
   geometricData(id: Uuid!, locale: Locale): GeometricData @cost(weight: "10")
-  hasCalorimetricData(
-    locale: Locale
-    where: CalorimetricDataPropositionInput
-  ): Boolean @cost(weight: "10")
-  hasData(
-    kind: DataKind!
-    locale: Locale
-    where: DataPropositionInput
-  ): Boolean @cost(weight: "10")
-  hasGeometricData(
-    locale: Locale
-    where: GeometricDataPropositionInput
-  ): Boolean @cost(weight: "10")
-  hasHygrothermalData(
-    locale: Locale
-    where: HygrothermalDataPropositionInput
-  ): Boolean @cost(weight: "10")
-  hasLifeCycleData(
-    locale: Locale
-    where: LifeCycleDataPropositionInput
-  ): Boolean @cost(weight: "10")
+  hasCalorimetricData(locale: Locale, where: CalorimetricDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasData(kind: DataKind!, locale: Locale, where: DataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasGeometricData(locale: Locale, where: GeometricDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasHygrothermalData(locale: Locale, where: HygrothermalDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasLifeCycleData(locale: Locale, where: LifeCycleDataPropositionInput): Boolean
+    @cost(weight: "10")
   hasOpticalData(locale: Locale, where: OpticalDataPropositionInput): Boolean
     @cost(weight: "10")
-  hasPhotovoltaicData(
-    locale: Locale
-    where: PhotovoltaicDataPropositionInput
-  ): Boolean @cost(weight: "10")
+  hasPhotovoltaicData(locale: Locale, where: PhotovoltaicDataPropositionInput): Boolean
+    @cost(weight: "10")
   hygrothermalData(id: Uuid!, locale: Locale): HygrothermalData
     @cost(weight: "10")
   id: ID!
@@ -1652,10 +1585,8 @@ type Institution implements Node {
   ): InstitutionManufacturedComponentConnection! @cost(weight: "10")
   name: String!
   openIdConnectApplications(
-    order: [InstitutionOwnedOpenIdConnectApplicationSortInput!]
-      @cost(weight: "10")
-    where: InstitutionOwnedOpenIdConnectApplicationFilterInput
-      @cost(weight: "10")
+    order: [InstitutionOwnedOpenIdConnectApplicationSortInput!] @cost(weight: "10")
+    where: InstitutionOwnedOpenIdConnectApplicationFilterInput @cost(weight: "10")
   ): InstitutionOwnedOpenIdConnectApplicationConnection! @cost(weight: "10")
   operatedDatabases(
     order: [InstitutionOperatedDatabaseSortInput!] @cost(weight: "10")
@@ -4991,6 +4922,8 @@ enum OpenIdConnectScope {
   EMAIL
   PHONE
   PROFILE
+  OFFLINE_ACCESS
+  OPEN_ID
   ROLES
   READ_API
   WRITE_API
@@ -5372,7 +5305,13 @@ scalar Uuid
 directive @cost(
   "The `weight` argument defines what value to add to the overall cost for every appearance, or possible appearance, of a type, field, argument, etc."
   weight: String!
-) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM | INPUT_FIELD_DEFINITION
+) on
+  | SCALAR
+  | OBJECT
+  | FIELD_DEFINITION
+  | ARGUMENT_DEFINITION
+  | ENUM
+  | INPUT_FIELD_DEFINITION
 
 "The purpose of the `@listSize` directive is to either inform the static analysis about the size of returned lists (if that information is statically available), or to point the analysis to where to find that information."
 directive @listSize(
@@ -5386,5 +5325,4 @@ directive @listSize(
   slicingArgumentDefaultValue: Int
   "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments."
   slicingArguments: [String!]
-) on FIELD_DEFINITION
-
+) on FIELD_DEFINITION
\ No newline at end of file

From 4e809417b396c19daab99af533a397a76c447eed Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 18 Jun 2026 19:16:19 +0200
Subject: [PATCH 099/145] Make phone number standard conform

---
 backend/src/Data/DbSeeder.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/Data/DbSeeder.cs b/backend/src/Data/DbSeeder.cs
index 32b065842..35ebc9980 100644
--- a/backend/src/Data/DbSeeder.cs
+++ b/backend/src/Data/DbSeeder.cs
@@ -184,7 +184,7 @@ IWebHostEnvironment environment
                 "ISE",
                 "Fraunhofer Institute for Solar Energy Systems (ISE)",
                 new ContactInformation(
-                    phoneNumber: "+49 761 45880",
+                    phoneNumber: "+4976145880",
                     isPhoneNumberConfirmed: true,
                     postalAddress: "Heidenhofstraße 2, 79110 Freiburg im Breisgau",
                     emailAddress: null,
@@ -218,7 +218,7 @@ IWebHostEnvironment environment
                 "TLSF",
                 "This institution represents the TestLab Solar Facades of Fraunhofer ISE",
                 new ContactInformation(
-                    phoneNumber: "+49 761 4588-5673",
+                    phoneNumber: "+4976145885673",
                     isPhoneNumberConfirmed: true,
                     postalAddress: "Heidenhofstraße 2, 79110 Freiburg im Breisgau",
                     emailAddress: null,
@@ -247,7 +247,7 @@ IWebHostEnvironment environment
                 "LBNL",
                 "Lawrence Berkeley National Laboratory",
                 new ContactInformation(
-                    phoneNumber: "(510) 486-4000",
+                    phoneNumber: "+5104864000",
                     isPhoneNumberConfirmed: true,
                     postalAddress: "1 Cyclotron Road, Berkeley, CA 94720",
                     emailAddress: null,
@@ -272,7 +272,7 @@ IWebHostEnvironment environment
                 "Sustainability",
                 new ContactInformation(
                     phoneNumber: null,
-                    isPhoneNumberConfirmed: true,
+                    isPhoneNumberConfirmed: false,
                     postalAddress: null,
                     emailAddress: null,
                     isEmailAddressConfirmed: false,

From 136efb5efb910dc210e189934c91ea5770602bc0 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 18 Jun 2026 19:17:18 +0200
Subject: [PATCH 100/145] Display creation success in a modal (notifications
 cannot fit to the content width easily)

---
 frontend/components/ContactInformation.tsx      |  6 +++---
 .../components/components/CreateComponent.tsx   | 13 ++++---------
 .../components/dataFormats/CreateDataFormat.tsx | 17 ++++-------------
 .../components/databases/CreateDatabase.tsx     | 15 ++++-----------
 .../gnuPgKeys/AddGnuPgKeyFingerprint.tsx        | 15 ++++-----------
 .../institutions/CreateInstitution.tsx          | 17 ++++-------------
 frontend/components/methods/CreateMethod.tsx    | 15 ++++-----------
 .../CreateOpenIdConnectApplication.tsx          | 15 ++++-----------
 8 files changed, 31 insertions(+), 82 deletions(-)

diff --git a/frontend/components/ContactInformation.tsx b/frontend/components/ContactInformation.tsx
index 7ceeaa3c4..b403c4ac5 100644
--- a/frontend/components/ContactInformation.tsx
+++ b/frontend/components/ContactInformation.tsx
@@ -13,10 +13,10 @@ export default function ContactInformation({
   contact: ContactInformationPartialFragment | null;
 }) {
   const hasContact =
-    contact?.phoneNumber ||
     contact?.emailAddress ||
-    contact?.postalAddress ||
-    contact?.websiteLocator;
+    contact?.phoneNumber ||
+    contact?.websiteLocator ||
+    contact?.postalAddress;
 
   if (!hasContact) {
     return <></>;
diff --git a/frontend/components/components/CreateComponent.tsx b/frontend/components/components/CreateComponent.tsx
index aabaccfef..e6ab924f7 100644
--- a/frontend/components/components/CreateComponent.tsx
+++ b/frontend/components/components/CreateComponent.tsx
@@ -52,7 +52,7 @@ export default function CreateComponent({
   const [globalErrorMessages, setGlobalErrorMessages] = useState(
     new Array<string>(),
   );
-  const { notification } = App.useApp();
+  const { modal } = App.useApp();
   const [form] = Form.useForm<FormValues>();
 
   const [createComponentMutation] = useMutation(CreateComponentDocument, {
@@ -122,15 +122,10 @@ export default function CreateComponent({
             setGlobalErrorMessages([]);
             form.resetFields();
             setOpen(false);
-            notification.success({
+            modal.success({
               title: "Created Component",
-              placement: "top",
-              showProgress: true,
-              pauseOnHover: true,
-              duration: 0,
-              description: (
-                <ComponentSummary hideInputControls entity={model} />
-              ),
+              width: "fit-content",
+              content: <ComponentSummary hideInputControls entity={model} />,
             });
           }
         },
diff --git a/frontend/components/dataFormats/CreateDataFormat.tsx b/frontend/components/dataFormats/CreateDataFormat.tsx
index 64f6b3d6a..72025af86 100644
--- a/frontend/components/dataFormats/CreateDataFormat.tsx
+++ b/frontend/components/dataFormats/CreateDataFormat.tsx
@@ -38,7 +38,7 @@ export default function CreateDataFormat({
     new Array<string>(),
   );
   const [form] = Form.useForm<FormValues>();
-  const { notification } = App.useApp();
+  const { modal } = App.useApp();
 
   const [createDataFormatMutation] = useMutation(CreateDataFormatDocument, {
     refetchQueries: [DataFormatsDocument],
@@ -87,19 +87,10 @@ export default function CreateDataFormat({
             setGlobalErrorMessages([]);
             form.resetFields();
             setOpen(false);
-            notification.success({
+            modal.success({
               title: "Created Data Format",
-              placement: "top",
-              showProgress: true,
-              pauseOnHover: true,
-              duration: 0,
-              style: {
-                width: "max-content",
-                minWidth: "384px",
-              },
-              description: (
-                <DataFormatSummary hideInputControls entity={model} />
-              ),
+              width: "fit-content",
+              content: <DataFormatSummary hideInputControls entity={model} />,
             });
           }
         },
diff --git a/frontend/components/databases/CreateDatabase.tsx b/frontend/components/databases/CreateDatabase.tsx
index f929b9813..6a22e2f6b 100644
--- a/frontend/components/databases/CreateDatabase.tsx
+++ b/frontend/components/databases/CreateDatabase.tsx
@@ -35,7 +35,7 @@ export default function CreateDatabase({
     new Array<string>(),
   );
   const [form] = Form.useForm<FormValues>();
-  const { notification } = App.useApp();
+  const { modal } = App.useApp();
 
   const [createDatabaseMutation] = useMutation(CreateDatabaseDocument, {
     refetchQueries: [DatabasesDocument, AnyDatabasesDocument],
@@ -72,17 +72,10 @@ export default function CreateDatabase({
             setGlobalErrorMessages([]);
             form.resetFields();
             setOpen(false);
-            notification.success({
+            modal.success({
               title: "Created Database",
-              placement: "top",
-              showProgress: true,
-              pauseOnHover: true,
-              duration: 0,
-              style: {
-                width: "max-content",
-                minWidth: "384px",
-              },
-              description: <DatabaseSummary hideInputControls entity={model} />,
+              width: "fit-content",
+              content: <DatabaseSummary hideInputControls entity={model} />,
             });
           }
         },
diff --git a/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx b/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
index 18c3020c9..96b25a10a 100644
--- a/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
+++ b/frontend/components/gnuPgKeys/AddGnuPgKeyFingerprint.tsx
@@ -29,7 +29,7 @@ export default function AddGnuPgKeyFingerprint({
     new Array<string>(),
   );
   const [form] = Form.useForm<FormValues>();
-  const { notification } = App.useApp();
+  const { modal } = App.useApp();
 
   const [addGnuPgKeyFingerprintMutation] = useMutation(
     AddGnuPgKeyFingerprintDocument,
@@ -65,17 +65,10 @@ export default function AddGnuPgKeyFingerprint({
             setGlobalErrorMessages([]);
             form.resetFields();
             setOpen(false);
-            notification.success({
+            modal.success({
               title: "Added GnuPG Key Fingerprint",
-              placement: "top",
-              showProgress: true,
-              pauseOnHover: true,
-              duration: 0,
-              style: {
-                width: "max-content",
-                minWidth: "384px",
-              },
-              description: <GnuPgKeySummary hideInputControls entity={model} />,
+              width: "fit-content",
+              content: <GnuPgKeySummary hideInputControls entity={model} />,
             });
           }
         },
diff --git a/frontend/components/institutions/CreateInstitution.tsx b/frontend/components/institutions/CreateInstitution.tsx
index 77352c4be..df4ce8ed1 100644
--- a/frontend/components/institutions/CreateInstitution.tsx
+++ b/frontend/components/institutions/CreateInstitution.tsx
@@ -47,7 +47,7 @@ export default function CreateInstitution(props: CreateInstitutionProps) {
   const [open, setOpen] = useState(false);
   const [globalErrorMessages, setGlobalErrorMessages] = useState<string[]>([]);
   const [form] = Form.useForm<FormValues>();
-  const { notification } = App.useApp();
+  const { modal } = App.useApp();
 
   const [createInstitutionMutation] = useMutation(CreateInstitutionDocument, {
     refetchQueries: [InstitutionsDocument],
@@ -92,19 +92,10 @@ export default function CreateInstitution(props: CreateInstitutionProps) {
             setGlobalErrorMessages([]);
             form.resetFields();
             setOpen(false);
-            notification.success({
+            modal.success({
               title: "Created Institution",
-              placement: "top",
-              showProgress: true,
-              pauseOnHover: true,
-              duration: 0,
-              style: {
-                width: "max-content",
-                minWidth: "384px",
-              },
-              description: (
-                <InstitutionSummary hideInputControls entity={model} />
-              ),
+              width: "fit-content",
+              content: <InstitutionSummary hideInputControls entity={model} />,
             });
           }
         },
diff --git a/frontend/components/methods/CreateMethod.tsx b/frontend/components/methods/CreateMethod.tsx
index 5ef238e68..542ab1a18 100644
--- a/frontend/components/methods/CreateMethod.tsx
+++ b/frontend/components/methods/CreateMethod.tsx
@@ -73,7 +73,7 @@ export default function CreateMethod({
     new Array<string>(),
   );
   const [form] = Form.useForm<FormValues>();
-  const { notification } = App.useApp();
+  const { modal } = App.useApp();
 
   const [createMethodMutation] = useMutation(CreateMethodDocument, {
     // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
@@ -143,17 +143,10 @@ export default function CreateMethod({
             setGlobalErrorMessages([]);
             form.resetFields();
             setOpen(false);
-            notification.success({
+            modal.success({
               title: "Created Method",
-              placement: "top",
-              showProgress: true,
-              pauseOnHover: true,
-              duration: 0,
-              style: {
-                width: "max-content",
-                minWidth: "384px",
-              },
-              description: <MethodSummary hideInputControls entity={model} />,
+              width: "fit-content",
+              content: <MethodSummary hideInputControls entity={model} />,
             });
           }
         },
diff --git a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
index da15070b6..f384300d8 100644
--- a/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/CreateOpenIdConnectApplication.tsx
@@ -61,7 +61,7 @@ export default function CreateOpenIdConnectApplication({
   );
   const [open, setOpen] = useState(false);
   const [form] = Form.useForm<FormValues>();
-  const { notification } = App.useApp();
+  const { modal } = App.useApp();
 
   const [createApplicationMutation] = useMutation(CreateApplicationDocument, {
     // TODO Update the cache more efficiently as explained on https://www.apollographql.com/docs/react/caching/cache-interaction/ and https://www.apollographql.com/docs/react/data/mutations/#making-all-other-cache-updates
@@ -106,17 +106,10 @@ export default function CreateOpenIdConnectApplication({
             setGlobalErrorMessages([]);
             form.resetFields();
             setOpen(false);
-            notification.success({
+            modal.success({
               title: "Created OpenID-Connect Application",
-              placement: "top",
-              showProgress: true,
-              pauseOnHover: true,
-              duration: 0,
-              style: {
-                width: "max-content",
-                minWidth: "384px",
-              },
-              description: (
+              width: "fit-content",
+              content: (
                 <div>
                   <Typography.Paragraph style={{ maxWidth: "75ch" }}>
                     Please copy and save the following client secret now, you

From 4223a11d0dbadb3ca60c3606e5f97fa8e2f301ea Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 18 Jun 2026 19:50:41 +0200
Subject: [PATCH 101/145] Describe how to format phone numbers

---
 frontend/components/ContactInformation.tsx    | 33 +++++++++++++++++++
 .../institutions/CreateInstitution.tsx        |  9 +++--
 .../institutions/UpdateInstitution.tsx        |  4 ++-
 frontend/components/me/SetUserPhoneNumber.tsx |  3 +-
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/frontend/components/ContactInformation.tsx b/frontend/components/ContactInformation.tsx
index b403c4ac5..fc7c87854 100644
--- a/frontend/components/ContactInformation.tsx
+++ b/frontend/components/ContactInformation.tsx
@@ -7,6 +7,39 @@ import {
 } from "@ant-design/icons";
 import { ContactInformationPartialFragment } from "../queries/common.generated";
 
+export const phoneNumberFormInput = {
+  placeholder: "[+][Country Code][Local Area Code][Local Phone Number]",
+  extra: (
+    <span>
+      in the format{" "}
+      <code>[+][Country Code][Local Area Code][Local Phone Number]</code> as
+      standardized in{" "}
+      <Typography.Link
+        href="https://www.itu.int/rec/t-rec-e.164/en"
+        target="_blank"
+      >
+        E.164
+      </Typography.Link>
+      . For example, <code>(510) 486-4000</code> in the standard local format of
+      the United States becomes <code>+15104864000</code> in E.164 format,{" "}
+      <code>02 313 99 44</code> in Belgium becomes <code>+3223139944</code>, and{" "}
+      <code>0761 4588-0</code> in Germany becomes <code>+4976145880</code>. See
+      also{" "}
+      <Typography.Link href="https://countrycode.org" target="_blank">
+        Country Codes
+      </Typography.Link>{" "}
+      and{" "}
+      <Typography.Link
+        href="https://help.twilio.com/articles/223183008-Formatting-International-Phone-Numbers"
+        target="_blank"
+      >
+        Formatting International Phone Numbers
+      </Typography.Link>
+      .
+    </span>
+  ),
+};
+
 export default function ContactInformation({
   contact,
 }: {
diff --git a/frontend/components/institutions/CreateInstitution.tsx b/frontend/components/institutions/CreateInstitution.tsx
index df4ce8ed1..271fa3b25 100644
--- a/frontend/components/institutions/CreateInstitution.tsx
+++ b/frontend/components/institutions/CreateInstitution.tsx
@@ -16,6 +16,7 @@ import RepresentedInstitutionIdSelect from "./RepresentedInstitutionIdSelect";
 import { notEmpty } from "../../lib/array";
 import UserIdSelect from "../users/UserIdSelect";
 import { createPaginatedIdSelectOption } from "../PaginatedIdSelect";
+import { phoneNumberFormInput } from "../ContactInformation";
 
 type ContactFormValues = {
   phoneNumber: Scalars["PhoneNumber"]["input"] | null | undefined;
@@ -164,8 +165,12 @@ export default function CreateInstitution(props: CreateInstitutionProps) {
           >
             <Input />
           </Form.Item>
-          <Form.Item label="Phone Number" name={["contact", "phoneNumber"]}>
-            <Input />
+          <Form.Item
+            label="Phone Number"
+            name={["contact", "phoneNumber"]}
+            extra={phoneNumberFormInput.extra}
+          >
+            <Input placeholder={phoneNumberFormInput.placeholder} />
           </Form.Item>
           <Form.Item label="Postal Address" name={["contact", "postalAddress"]}>
             <Input />
diff --git a/frontend/components/institutions/UpdateInstitution.tsx b/frontend/components/institutions/UpdateInstitution.tsx
index e8ae07e13..b7638d69e 100644
--- a/frontend/components/institutions/UpdateInstitution.tsx
+++ b/frontend/components/institutions/UpdateInstitution.tsx
@@ -11,6 +11,7 @@ import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 import EditButton from "../EditButton";
 import { Scalars } from "../../__generated__/graphql";
+import { phoneNumberFormInput } from "../ContactInformation";
 
 type ContactFormValues = {
   phoneNumber: Scalars["PhoneNumber"]["input"] | null | undefined;
@@ -145,9 +146,10 @@ export default function UpdateInstitution({
           <Form.Item
             label="Phone Number"
             name={["contact", "phoneNumber"]}
+            extra={phoneNumberFormInput.extra}
             initialValue={institution.contact?.phoneNumber}
           >
-            <Input />
+            <Input placeholder={phoneNumberFormInput.placeholder} />
           </Form.Item>
           <Form.Item
             label="Postal Address"
diff --git a/frontend/components/me/SetUserPhoneNumber.tsx b/frontend/components/me/SetUserPhoneNumber.tsx
index fd302221e..5cdd2091a 100644
--- a/frontend/components/me/SetUserPhoneNumber.tsx
+++ b/frontend/components/me/SetUserPhoneNumber.tsx
@@ -9,6 +9,7 @@ import { layout, tailLayout } from "../../lib/form";
 import { useMutationHandler } from "../../lib/hooks/useMutationHandler";
 import ErrorAlert from "../ErrorAlert";
 import { Scalars } from "../../__generated__/graphql";
+import { phoneNumberFormInput } from "../ContactInformation";
 
 interface FormValues {
   phoneNumber: Scalars["PhoneNumber"]["input"];
@@ -86,7 +87,7 @@ export default function SetUserPhoneNumber({
             },
           ]}
         >
-          <Input />
+          <Input placeholder={phoneNumberFormInput.placeholder} />
         </Form.Item>
         <Form.Item {...tailLayout}>
           <Button type="primary" htmlType="submit" loading={mutating}>

From a88c44690c45f2dbb030d0e7ac0df4c5f552ec48 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 19 Jun 2026 18:09:36 +0200
Subject: [PATCH 102/145] Add scalars `ArXiv`, `Doi`, and `GraphQlQuery`, and
 use `String` for cursors, `Int` for `first` and `last` parameters to conform
 to the Relay connection specification, and simplify GraphQL type and input
 names

---
 .../src/Configuration/GraphQlConfiguration.cs |  79 +--
 backend/src/Data/Publication.cs               |   8 +-
 .../CalorimetricDataConnection.cs             |   4 +-
 .../CalorimetricDataX/CalorimetricDataEdge.cs |   2 +-
 .../CalorimetricDataQueries.cs                |   4 +-
 backend/src/GraphQl/Connection.cs             |  16 +-
 .../src/GraphQl/DataFormats/DataFormatType.cs |   1 -
 backend/src/GraphQl/DataX/DataApproval.cs     |   5 +-
 backend/src/GraphQl/DataX/DataConnection.cs   |  15 +-
 .../src/GraphQl/DataX/DataConnectionBase.cs   |  11 -
 backend/src/GraphQl/DataX/DataEdge.cs         |  11 +-
 backend/src/GraphQl/DataX/DataEdgeBase.cs     |   8 -
 backend/src/GraphQl/DataX/IApproval.cs        |   4 +-
 backend/src/GraphQl/DataX/ResponseApproval.cs |   5 +-
 .../GraphQl/Databases/DatabaseResolvers.cs    |  26 +-
 backend/src/GraphQl/Databases/DatabaseType.cs |   4 +-
 .../GeometricDataX/GeometricDataConnection.cs |   4 +-
 .../GeometricDataX/GeometricDataEdge.cs       |   2 +-
 .../GeometricDataX/GeometricDataQueries.cs    |   6 +-
 .../HygrothermalDataConnection.cs             |   4 +-
 .../HygrothermalDataX/HygrothermalDataEdge.cs |   2 +-
 .../HygrothermalDataQueries.cs                |   6 +-
 .../LifeCycleDataX/LifeCycleDataConnection.cs |   4 +-
 .../LifeCycleDataX/LifeCycleDataEdge.cs       |   2 +-
 .../LifeCycleDataX/LifeCycleDataQueries.cs    |   6 +-
 .../Methods/MethodDeveloperConnection.cs      |   4 +-
 ...plicationGrantedAuthorizationConnection.cs |   4 +-
 ...ConnectApplicationIssuedTokenConnection.cs |   4 +-
 ...nnectAuthorizationIssuedTokenConnection.cs |   4 +-
 .../OpticalDataX/OpticalDataConnection.cs     |   6 +-
 .../GraphQl/OpticalDataX/OpticalDataEdge.cs   |   2 +-
 .../OpticalDataX/OpticalDataQueries.cs        |   6 +-
 .../PhotovoltaicDataConnection.cs             |   5 +-
 .../PhotovoltaicDataX/PhotovoltaicDataEdge.cs |   2 +-
 .../PhotovoltaicDataQueries.cs                |   6 +-
 .../GraphQl/Publications/PublicationInput.cs  |   8 +-
 .../src/GraphQl/References/ReferenceInput.cs  |   2 +
 backend/src/GraphQl/Requests/DataQueries.cs   |  42 +-
 backend/src/GraphQl/Scalars/ArXivType.cs      |  31 ++
 backend/src/GraphQl/Scalars/DoiType.cs        |  40 ++
 .../src/GraphQl/Scalars/GraphQlQueryType.cs   |  30 ++
 backend/src/GraphQl/Scalars/LocaleType.cs     |  55 +-
 .../GraphQlSchemaTests.IsUnchanged.snap       | 487 ++++++++++--------
 frontend/codegen.ts                           |   3 +
 frontend/queries/data.graphql                 |  12 +-
 frontend/type-defs.graphqls                   | 487 ++++++++++--------
 46 files changed, 822 insertions(+), 657 deletions(-)
 delete mode 100644 backend/src/GraphQl/DataX/DataConnectionBase.cs
 delete mode 100644 backend/src/GraphQl/DataX/DataEdgeBase.cs
 create mode 100644 backend/src/GraphQl/Scalars/ArXivType.cs
 create mode 100644 backend/src/GraphQl/Scalars/DoiType.cs
 create mode 100644 backend/src/GraphQl/Scalars/GraphQlQueryType.cs

diff --git a/backend/src/Configuration/GraphQlConfiguration.cs b/backend/src/Configuration/GraphQlConfiguration.cs
index 9b74990f8..a8bfef93c 100644
--- a/backend/src/Configuration/GraphQlConfiguration.cs
+++ b/backend/src/Configuration/GraphQlConfiguration.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Text.RegularExpressions;
 using HotChocolate.AspNetCore;
 using HotChocolate.Configuration;
 using HotChocolate.Data;
@@ -163,10 +164,11 @@ await httpContext.RequestServices
             .AddType(new UuidType("Uuid", defaultFormat: 'D')) // https://chillicream.com/docs/hotchocolate/defining-a-schema/scalars#uuid-type
             .AddType(new MyUriType())
             .AddType(new AnyType("Any"))
+            .AddType<ArXivType>()
+            .AddType<DoiType>()
+            .AddType<GraphQlQueryType>()
             .AddType<LocaleType>()
             .BindRuntimeType<uint, NonNegativeIntType>()
-            // Object Types
-            .AddType<DataConnection>()
             // Query, Mutation, Subscription, Object, and Input Types
             .AddQueryType(_ => _.Name(nameof(Query)))
             .AddMutationType(_ => _.Name(nameof(Mutation)))
@@ -231,14 +233,30 @@ public override void OnAfterCompleteType(ITypeCompletionContext completionContex
     }
 }
 
-public sealed class CustomNamingConventions
+public sealed partial class CustomNamingConventions
 : DefaultNamingConventions
 {
+    public static string CorrectPlural(string name) => name
+        .Replace("Assemblys", "Assemblies")
+        .Replace($"{nameof(FileMetaInformation)}s", "FilesMetaInformation");
+
+    // `(?!...)` is a negative lookahead. It is a zero-width assertion, meaning
+    // that it does not move the regex engine's cursor (nor consume text).
+    [GeneratedRegex(@$"^({nameof(FilterInputType)}Of|{nameof(Nullable)}Of(?!{nameof(DataKind)}))")]
+    private static partial Regex PrefixesToRemoveRegex();
+
+    public override string GetTypeName(Type type) =>
+        PrefixesToRemoveRegex().Replace(
+            base.GetTypeName(type),
+            string.Empty
+        );
 }
 
 // See https://chillicream.com/docs/hotchocolate/fetching-data/filtering/#filter-conventions
 public partial class CustomFilterConvention : FilterConvention
 {
+    [GeneratedRegex(@$"({nameof(FilterInputType)}|{GraphQlConstants.FilterInputSuffix}|FilterType|FilterInput)$")]
+    private static partial Regex FilterInputSuffixesToReplaceRegex();
 
     private const string InputPostFix = "FilterInput";
     private const string InputTypePostFix = "FilterInputType";
@@ -272,61 +290,48 @@ protected override void Configure(IFilterConventionDescriptor descriptor)
         );
     }
 
-    // For the base implementation see https://github.com/ChilliCream/hotchocolate/blob/f0dff93a14cb7ddecc7b3a0530a687a5bc4bad71/src/HotChocolate/Data/src/Data/Filters/Convention/FilterConvention.cs#L129
-    public override string GetTypeName(Type runtimeType)
-    {
-        // return base.GetTypeName(runtimeType);
-        return GetTypeName(runtimeType, plural: false);
-    }
+    // For the base implementation see https://github.com/ChilliCream/graphql-platform/blob/develop/src/HotChocolate/Data/src/Data/Filters/Convention/FilterConvention.cs#L129
+    public override string GetTypeName(Type runtimeType) =>
+        CustomNamingConventions.CorrectPlural(
+            GetTypeName(runtimeType, plural: false)
+        );
 
-    public string GetTypeName(Type runtimeType, bool plural)
+    private string GetTypeName(Type runtimeType, bool plural)
     {
         ArgumentNullException.ThrowIfNull(runtimeType);
         var pluralSuffix = plural ? "s" : "";
         if (typeof(IEnumOperationFilterInputType).IsAssignableFrom(runtimeType)
             && runtimeType.GenericTypeArguments.Length == 1
-            && runtimeType.GetGenericTypeDefinition() == typeof(EnumOperationFilterInputType<>))
+            && runtimeType.GetGenericTypeDefinition() == typeof(EnumOperationFilterInputType<>)
+        )
         {
             var genericName = _namingConventions.GetTypeName(runtimeType.GenericTypeArguments[0]);
-            return $"{genericName}{pluralSuffix}{GraphQlConstants.FilterInputSuffix}"; ;
-            // return genericName + "OperationFilterInput";
+            return $"{genericName}{pluralSuffix}{GraphQlConstants.FilterInputSuffix}";
         }
         if (typeof(IComparableOperationFilterInputType).IsAssignableFrom(runtimeType)
             && runtimeType.GenericTypeArguments.Length == 1
             && runtimeType.GetGenericTypeDefinition()
-            == typeof(ComparableOperationFilterInputType<>))
+            == typeof(ComparableOperationFilterInputType<>)
+        )
         {
             var genericName = _namingConventions.GetTypeName(runtimeType.GenericTypeArguments[0]);
             return $"Comparable{genericName}{pluralSuffix}{GraphQlConstants.FilterInputSuffix}";
-            // return $"Comparable{genericName}OperationFilterInput";
         }
         if (typeof(IListFilterInputType).IsAssignableFrom(runtimeType)
-            && runtimeType.GenericTypeArguments.Length == 1)
+            && runtimeType.GenericTypeArguments.Length == 1
+        )
         {
             var genericType = runtimeType.GenericTypeArguments[0];
-            var genericName = typeof(FilterInputType).IsAssignableFrom(genericType)
+            return typeof(FilterInputType).IsAssignableFrom(genericType)
                 ? GetTypeName(genericType, plural: true)
-                : "List" + _namingConventions.GetTypeName(genericType);
-            return $"{genericName}";
-            // return "List" + genericName;
+                : $"{_namingConventions.GetTypeName(genericType)}{pluralSuffix}";
         }
         var name = _namingConventions.GetTypeName(runtimeType);
-        var isInputObjectType = typeof(FilterInputType).IsAssignableFrom(runtimeType);
-        var isEndingInput = name.EndsWith(InputPostFix, StringComparison.Ordinal);
-        var isEndingInputType = name.EndsWith(InputTypePostFix, StringComparison.Ordinal);
-        if (isInputObjectType && isEndingInputType)
+        if (typeof(FilterInputType).IsAssignableFrom(runtimeType) || !name.EndsWith("FilterInput", StringComparison.InvariantCulture))
         {
-            return $"{name[..^"FilterInputType".Length]}{pluralSuffix}{GraphQlConstants.FilterInputSuffix}";
+            return $"{FilterInputSuffixesToReplaceRegex().Replace(name, string.Empty)}{pluralSuffix}{GraphQlConstants.FilterInputSuffix}";
         }
-        if (isInputObjectType && !isEndingInput && !isEndingInputType)
-        {
-            return $"{name}{pluralSuffix}{GraphQlConstants.FilterInputSuffix}";
-        }
-        if (!isInputObjectType && !isEndingInput)
-        {
-            return $"{name}{pluralSuffix}{GraphQlConstants.FilterInputSuffix}";
-        }
-        return name;
+        return $"{name}{pluralSuffix}";
     }
 }
 
@@ -439,4 +444,10 @@ protected override void Configure(ISortConventionDescriptor descriptor)
     {
         descriptor.AddDefaults();
     }
+
+    // For the base implementation see https://github.com/ChilliCream/graphql-platform/blob/develop/src/HotChocolate/Data/src/Data/Sorting/Convention/SortConvention.cs#L134C5
+    public override string GetTypeName(Type runtimeType) =>
+        CustomNamingConventions.CorrectPlural(
+            base.GetTypeName(runtimeType)
+        );
 }
\ No newline at end of file
diff --git a/backend/src/Data/Publication.cs b/backend/src/Data/Publication.cs
index 886c9d430..be6a0de5d 100644
--- a/backend/src/Data/Publication.cs
+++ b/backend/src/Data/Publication.cs
@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using HotChocolate;
+using Metabase.GraphQl.Scalars;
 using Microsoft.EntityFrameworkCore;
 
 namespace Metabase.Data;
@@ -23,20 +24,23 @@ public sealed class Publication(
     [MinLength(1)]
     [RegularExpression("^(10[.][0-z/.]*)$")]
     [GraphQLDescription("The Digital Object Identifier (DOI) is a very important persistent identifier for publications. It MUST be defined here if it is available for a publication.")]
+    [GraphQLType<DoiType>]
     public string? Doi { get; private set; } = doi;
 
     [MinLength(1)]
     [RegularExpression("^(arXiv:)[0-z./]*$")]
     [GraphQLDescription("The website arXiv.org is a free and open-access archive for publications. The arXiv identifier can be used to define a publication.")]
+    [GraphQLType<ArXivType>]
     public string? ArXiv { get; private set; } = arXiv;
 
     [MinLength(1)]
     [RegularExpression("^(urn:)[0-z:./-]*$")]
-    [GraphQLDescription("A Uniform Resource Name (URN) can be used to define a publication. TODO: Improve the regex pattern to further restrict the string.")]
+    [GraphQLDescription("A Uniform Resource Name (URN) can be used to define a publication.")]
+    [GraphQLType<MyUriType>]
     public string? Urn { get; private set; } = urn;
 
     [Url]
-    [GraphQLDescription("If a persistent identifier like DOI is defined above, this webAdress can define a convenient web address to access the publication. However, if no persistent identifier exist, this web address is the only identifier of this publication. In this case, it is important to choose a web address with a high probability to persist long.")]
+    [GraphQLDescription("If a persistent identifier like DOI is defined above, this web address can define a convenient web address to access the publication. However, if no persistent identifier exist, this web address is the only identifier of this publication. In this case, it is important to choose a web address with a high probability to persist long.")]
     public Uri? WebAddress { get; private set; } = webAddress;
 
     [MinLength(1)] public string? Title { get; private set; } = title;
diff --git a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataConnection.cs b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataConnection.cs
index 422ac856a..067e1f73f 100644
--- a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataConnection.cs
+++ b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataConnection.cs
@@ -6,9 +6,9 @@ namespace Metabase.GraphQl.CalorimetricDataX;
 
 public sealed record CalorimetricDataConnection(
     IReadOnlyList<CalorimetricDataEdge> Edges,
-    uint TotalCount,
+    int TotalCount,
     ConnectionPageInfo PageInfo
-) : DataConnectionBase<CalorimetricDataEdge>(
+) : DataConnection<CalorimetricDataEdge>(
     Edges,
     TotalCount,
     PageInfo
diff --git a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataEdge.cs b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataEdge.cs
index ceee36e33..7e4b8b454 100644
--- a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataEdge.cs
+++ b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataEdge.cs
@@ -5,7 +5,7 @@ namespace Metabase.GraphQl.CalorimetricDataX;
 public sealed record CalorimetricDataEdge(
     string Cursor,
     CalorimetricData Node
-) : DataEdgeBase<CalorimetricData>(
+) : DataEdge<CalorimetricData>(
     Cursor,
     Node
 );
\ No newline at end of file
diff --git a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs
index aa7b5be03..268d45ac9 100644
--- a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs
+++ b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs
@@ -42,9 +42,9 @@ CancellationToken cancellationToken
     public Task<CalorimetricDataConnection> GetAllCalorimetricDataAsync(
         CalorimetricDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         DataQueries dataQueries,
         IResolverContext resolverContext,
diff --git a/backend/src/GraphQl/Connection.cs b/backend/src/GraphQl/Connection.cs
index c2606a0fb..e0380963c 100644
--- a/backend/src/GraphQl/Connection.cs
+++ b/backend/src/GraphQl/Connection.cs
@@ -22,19 +22,17 @@ QueryContext<TAssociation> queryContext
     protected TSubject Subject { get; } = subject;
 
     [Cost(0)]
-    public async Task<uint> GetTotalCountAsync(
+    public async Task<int> GetTotalCountAsync(
         TAssociationsByOneIdDataLoader dataLoader,
         CancellationToken cancellationToken
     )
     {
-        return (uint)(
-            (
-                await dataLoader
-                .With(queryContext)
-                .LoadAsync(Subject.Id, cancellationToken)
-            )
-            ?.Length ?? 0
-        );
+        return (
+            await dataLoader
+            .With(queryContext)
+            .LoadAsync(Subject.Id, cancellationToken)
+        )
+        ?.Length ?? 0;
     }
 
     [Cost(0)]
diff --git a/backend/src/GraphQl/DataFormats/DataFormatType.cs b/backend/src/GraphQl/DataFormats/DataFormatType.cs
index 6359b97eb..baab33be5 100644
--- a/backend/src/GraphQl/DataFormats/DataFormatType.cs
+++ b/backend/src/GraphQl/DataFormats/DataFormatType.cs
@@ -8,7 +8,6 @@
 using Metabase.GraphQl.Entities;
 using Metabase.GraphQl.References;
 using Metabase.GraphQl.Users;
-using Microsoft.AspNetCore.Identity;
 
 namespace Metabase.GraphQl.DataFormats;
 
diff --git a/backend/src/GraphQl/DataX/DataApproval.cs b/backend/src/GraphQl/DataX/DataApproval.cs
index 3aef4aeb5..9e8be5735 100644
--- a/backend/src/GraphQl/DataX/DataApproval.cs
+++ b/backend/src/GraphQl/DataX/DataApproval.cs
@@ -2,8 +2,11 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate;
+using HotChocolate.Types;
 using Metabase.Data;
 using Metabase.GraphQl.Institutions;
+using Metabase.GraphQl.Scalars;
 using NodaTime;
 
 namespace Metabase.GraphQl.DataX;
@@ -12,7 +15,7 @@ public sealed record DataApproval(
     OffsetDateTime Timestamp,
     string Signature,
     string KeyFingerprint,
-    string Query,
+    [property: GraphQLType<NonNullType<GraphQlQueryType>>] string Query,
     JsonElement Variables,
     string Message,
     Guid ApproverId,
diff --git a/backend/src/GraphQl/DataX/DataConnection.cs b/backend/src/GraphQl/DataX/DataConnection.cs
index 95bca54a8..6772cdd07 100644
--- a/backend/src/GraphQl/DataX/DataConnection.cs
+++ b/backend/src/GraphQl/DataX/DataConnection.cs
@@ -1,16 +1,11 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
+using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Types.Pagination;
 
 namespace Metabase.GraphQl.DataX;
 
-public sealed record DataConnection(
-    IReadOnlyList<DataEdge> Edges,
-    uint TotalCount,
-    ConnectionPageInfo PageInfo
-) : DataConnectionBase<DataEdge>(
-    Edges,
-    TotalCount,
-    PageInfo
+public abstract record DataConnection<TDataEdge>(
+    [property: Cost(0)] IReadOnlyList<TDataEdge> Edges,
+    [property: Cost(0)] int TotalCount,
+    [property: Cost(0)] ConnectionPageInfo PageInfo
 );
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/DataConnectionBase.cs b/backend/src/GraphQl/DataX/DataConnectionBase.cs
deleted file mode 100644
index ac51995af..000000000
--- a/backend/src/GraphQl/DataX/DataConnectionBase.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-using HotChocolate.CostAnalysis.Types;
-using HotChocolate.Types.Pagination;
-
-namespace Metabase.GraphQl.DataX;
-
-public abstract record DataConnectionBase<TDataEdge>(
-    [property: Cost(0)] IReadOnlyList<TDataEdge> Edges,
-    [property: Cost(0)] uint TotalCount,
-    [property: Cost(0)] ConnectionPageInfo PageInfo
-);
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/DataEdge.cs b/backend/src/GraphQl/DataX/DataEdge.cs
index de2709cc6..33ecf20d3 100644
--- a/backend/src/GraphQl/DataX/DataEdge.cs
+++ b/backend/src/GraphQl/DataX/DataEdge.cs
@@ -1,9 +1,8 @@
+using HotChocolate.CostAnalysis.Types;
+
 namespace Metabase.GraphQl.DataX;
 
-public sealed record DataEdge(
-    string Cursor,
-    IData Node
-) : DataEdgeBase<IData>(
-        Cursor,
-        Node
+public abstract record DataEdge<TData>(
+    [property: Cost(0)] string Cursor,
+    [property: Cost(0)] TData Node
 );
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/DataEdgeBase.cs b/backend/src/GraphQl/DataX/DataEdgeBase.cs
deleted file mode 100644
index 0d538bbc8..000000000
--- a/backend/src/GraphQl/DataX/DataEdgeBase.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using HotChocolate.CostAnalysis.Types;
-
-namespace Metabase.GraphQl.DataX;
-
-public abstract record DataEdgeBase<TData>(
-    [property: Cost(0)] string Cursor,
-    [property: Cost(0)] TData Node
-);
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/IApproval.cs b/backend/src/GraphQl/DataX/IApproval.cs
index ed0a292fa..897dfafb6 100644
--- a/backend/src/GraphQl/DataX/IApproval.cs
+++ b/backend/src/GraphQl/DataX/IApproval.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Text.Json;
+using HotChocolate;
 using HotChocolate.Types;
+using Metabase.GraphQl.Scalars;
 using NodaTime;
 
 namespace Metabase.GraphQl.DataX;
@@ -11,7 +13,7 @@ public interface IApproval
     OffsetDateTime Timestamp { get; }
     string Signature { get; }
     string KeyFingerprint { get; }
-    string Query { get; }
+    [GraphQLType<NonNullType<GraphQlQueryType>>] string Query { get; }
     JsonElement Variables { get; }
     string Message { get; }
     Guid ApproverId { get; }
diff --git a/backend/src/GraphQl/DataX/ResponseApproval.cs b/backend/src/GraphQl/DataX/ResponseApproval.cs
index f1059e5fa..1436ab314 100644
--- a/backend/src/GraphQl/DataX/ResponseApproval.cs
+++ b/backend/src/GraphQl/DataX/ResponseApproval.cs
@@ -1,5 +1,8 @@
 using System;
 using System.Text.Json;
+using HotChocolate;
+using HotChocolate.Types;
+using Metabase.GraphQl.Scalars;
 using NodaTime;
 
 namespace Metabase.GraphQl.DataX;
@@ -8,7 +11,7 @@ public sealed record ResponseApproval(
     OffsetDateTime Timestamp,
     string Signature,
     string KeyFingerprint,
-    string Query,
+    [property: GraphQLType<NonNullType<GraphQlQueryType>>] string Query,
     JsonElement Variables,
     string Message,
     Guid ApproverId
diff --git a/backend/src/GraphQl/Databases/DatabaseResolvers.cs b/backend/src/GraphQl/Databases/DatabaseResolvers.cs
index 3e7e51e2d..a8382ef75 100644
--- a/backend/src/GraphQl/Databases/DatabaseResolvers.cs
+++ b/backend/src/GraphQl/Databases/DatabaseResolvers.cs
@@ -135,9 +135,9 @@ CancellationToken cancellationToken
         [Parent] Database database,
         CalorimetricDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
@@ -150,9 +150,9 @@ CancellationToken cancellationToken
         [Parent] Database database,
         GeometricDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
@@ -165,9 +165,9 @@ CancellationToken cancellationToken
         [Parent] Database database,
         HygrothermalDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
@@ -180,9 +180,9 @@ CancellationToken cancellationToken
         [Parent] Database database,
         LifeCycleDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
@@ -195,9 +195,9 @@ CancellationToken cancellationToken
         [Parent] Database database,
         OpticalDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
@@ -210,9 +210,9 @@ CancellationToken cancellationToken
         [Parent] Database database,
         PhotovoltaicDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
@@ -286,4 +286,4 @@ CancellationToken cancellationToken
     {
         return dataQueries.HasPhotovoltaicDataAsync(database, where, locale, resolverContext, cancellationToken);
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Databases/DatabaseType.cs b/backend/src/GraphQl/Databases/DatabaseType.cs
index e9a8fe89e..7fe95d5c0 100644
--- a/backend/src/GraphQl/Databases/DatabaseType.cs
+++ b/backend/src/GraphQl/Databases/DatabaseType.cs
@@ -174,9 +174,9 @@ private static void ConfigureAllDataField<TDataPropositionInput>(
             .Field(fieldName)
             .Argument("where", _ => _.Type<InputObjectType<TDataPropositionInput>>())
             .Argument("locale", _ => _.Type<LocaleType>())
-            .Argument("first", _ => _.Type<NonNegativeIntType>())
+            .Argument("first", _ => _.Type<IntType>())
             .Argument("after", _ => _.Type<StringType>())
-            .Argument("last", _ => _.Type<NonNegativeIntType>())
+            .Argument("last", _ => _.Type<IntType>())
             .Argument("before", _ => _.Type<StringType>())
             .ResolveWith(resolverMethod);
     }
diff --git a/backend/src/GraphQl/GeometricDataX/GeometricDataConnection.cs b/backend/src/GraphQl/GeometricDataX/GeometricDataConnection.cs
index 5b8bb265f..3c2d13fe7 100644
--- a/backend/src/GraphQl/GeometricDataX/GeometricDataConnection.cs
+++ b/backend/src/GraphQl/GeometricDataX/GeometricDataConnection.cs
@@ -6,9 +6,9 @@ namespace Metabase.GraphQl.GeometricDataX;
 
 public sealed record GeometricDataConnection(
     IReadOnlyList<GeometricDataEdge> Edges,
-    uint TotalCount,
+    int TotalCount,
     ConnectionPageInfo PageInfo
-) : DataConnectionBase<GeometricDataEdge>(
+) : DataConnection<GeometricDataEdge>(
     Edges,
     TotalCount,
     PageInfo
diff --git a/backend/src/GraphQl/GeometricDataX/GeometricDataEdge.cs b/backend/src/GraphQl/GeometricDataX/GeometricDataEdge.cs
index 18c93f19e..5c740c036 100644
--- a/backend/src/GraphQl/GeometricDataX/GeometricDataEdge.cs
+++ b/backend/src/GraphQl/GeometricDataX/GeometricDataEdge.cs
@@ -6,7 +6,7 @@ namespace Metabase.GraphQl.GeometricDataX;
 public sealed record GeometricDataEdge(
     string Cursor,
     GeometricData Node
-) : DataEdgeBase<GeometricData>(
+) : DataEdge<GeometricData>(
     Cursor,
     Node
 );
\ No newline at end of file
diff --git a/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs b/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs
index 5a2a091e4..fc880de72 100644
--- a/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs
+++ b/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs
@@ -42,9 +42,9 @@ CancellationToken cancellationToken
     public Task<GeometricDataConnection> GetAllGeometricDataAsync(
         GeometricDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         DataQueries dataQueries,
         IResolverContext resolverContext,
@@ -92,4 +92,4 @@ CancellationToken cancellationToken
             cancellationToken
         );
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataConnection.cs b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataConnection.cs
index 9515fef03..86e379064 100644
--- a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataConnection.cs
+++ b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataConnection.cs
@@ -6,9 +6,9 @@ namespace Metabase.GraphQl.HygrothermalDataX;
 
 public sealed record HygrothermalDataConnection(
     IReadOnlyList<HygrothermalDataEdge> Edges,
-    uint TotalCount,
+    int TotalCount,
     ConnectionPageInfo PageInfo
-) : DataConnectionBase<HygrothermalDataEdge>(
+) : DataConnection<HygrothermalDataEdge>(
     Edges,
     TotalCount,
     PageInfo
diff --git a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataEdge.cs b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataEdge.cs
index 8133577a2..50ddea579 100644
--- a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataEdge.cs
+++ b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataEdge.cs
@@ -5,7 +5,7 @@ namespace Metabase.GraphQl.HygrothermalDataX;
 public sealed record HygrothermalDataEdge(
     string Cursor,
     HygrothermalData Node
-) : DataEdgeBase<HygrothermalData>(
+) : DataEdge<HygrothermalData>(
     Cursor,
     Node
 );
\ No newline at end of file
diff --git a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs
index 0363cb3dc..de47e47bb 100644
--- a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs
+++ b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs
@@ -42,9 +42,9 @@ CancellationToken cancellationToken
     public Task<HygrothermalDataConnection> GetAllHygrothermalDataAsync(
         HygrothermalDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         DataQueries dataQueries,
         IResolverContext resolverContext,
@@ -92,4 +92,4 @@ CancellationToken cancellationToken
             cancellationToken
         );
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataConnection.cs b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataConnection.cs
index 91828fb9e..d57f2fc68 100644
--- a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataConnection.cs
+++ b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataConnection.cs
@@ -6,9 +6,9 @@ namespace Metabase.GraphQl.LifeCycleDataX;
 
 public sealed record LifeCycleDataConnection(
     IReadOnlyList<LifeCycleDataEdge> Edges,
-    uint TotalCount,
+    int TotalCount,
     ConnectionPageInfo PageInfo
-) : DataConnectionBase<LifeCycleDataEdge>(
+) : DataConnection<LifeCycleDataEdge>(
     Edges,
     TotalCount,
     PageInfo
diff --git a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataEdge.cs b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataEdge.cs
index 40da02411..f6238d23d 100644
--- a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataEdge.cs
+++ b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataEdge.cs
@@ -5,7 +5,7 @@ namespace Metabase.GraphQl.LifeCycleDataX;
 public sealed record LifeCycleDataEdge(
     string Cursor,
     LifeCycleData Node
-) : DataEdgeBase<LifeCycleData>(
+) : DataEdge<LifeCycleData>(
     Cursor,
     Node
 );
\ No newline at end of file
diff --git a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs
index 411e60af1..9378917c1 100644
--- a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs
+++ b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs
@@ -42,9 +42,9 @@ CancellationToken cancellationToken
     public Task<LifeCycleDataConnection> GetAllLifeCycleDataAsync(
         LifeCycleDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         DataQueries dataQueries,
         IResolverContext resolverContext,
@@ -92,4 +92,4 @@ CancellationToken cancellationToken
             cancellationToken
         );
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Methods/MethodDeveloperConnection.cs b/backend/src/GraphQl/Methods/MethodDeveloperConnection.cs
index 495e3c4ea..a9f2cbbb8 100644
--- a/backend/src/GraphQl/Methods/MethodDeveloperConnection.cs
+++ b/backend/src/GraphQl/Methods/MethodDeveloperConnection.cs
@@ -20,7 +20,7 @@ public sealed class MethodDeveloperConnection(
     QueryContext<IMethodDeveloper> queryContext
     )
 {
-    public async Task<uint> GetTotalCountAsync(
+    public async Task<int> GetTotalCountAsync(
         IInstitutionMethodDevelopersByMethodIdDataLoader institutionMethodDevelopersDataLoader,
         IUserMethodDevelopersByMethodIdDataLoader userMethodDevelopersDataLoader,
         CancellationToken cancellationToken
@@ -137,7 +137,7 @@ public sealed class PendingMethodDeveloperConnection(
     QueryContext<IMethodDeveloper> queryContext
     )
 {
-    public async Task<uint> GetTotalCountAsync(
+    public async Task<int> GetTotalCountAsync(
         IPendingInstitutionMethodDevelopersByMethodIdDataLoader pendingInstitutionMethodDevelopersDataLoader,
         IPendingUserMethodDevelopersByMethodIdDataLoader pendingUserMethodDevelopersDataLoader,
         CancellationToken cancellationToken
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationGrantedAuthorizationConnection.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationGrantedAuthorizationConnection.cs
index 5ae3f4f2b..aa3b4c0cf 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationGrantedAuthorizationConnection.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationGrantedAuthorizationConnection.cs
@@ -15,7 +15,7 @@ OpenIdConnectApplication application
 )
 {
     [Cost(0)]
-    public async Task<uint> GetTotalCountAsync(
+    public async Task<int> GetTotalCountAsync(
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
         OpenIddictAuthorizationManager<OpenIdConnectAuthorization> authorizationManager,
@@ -26,7 +26,7 @@ CancellationToken cancellationToken
         {
             return 0;
         }
-        return (uint)await authorizationManager.FindByApplicationIdAsync(application.Id.ToString(), cancellationToken).CountAsync(cancellationToken);
+        return await authorizationManager.FindByApplicationIdAsync(application.Id.ToString(), cancellationToken).CountAsync(cancellationToken);
     }
 
     [Cost(0)]
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationIssuedTokenConnection.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationIssuedTokenConnection.cs
index 433594589..fe5dcb2fa 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationIssuedTokenConnection.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationIssuedTokenConnection.cs
@@ -15,7 +15,7 @@ OpenIdConnectApplication application
 )
 {
     [Cost(0)]
-    public async Task<uint> GetTotalCountAsync(
+    public async Task<int> GetTotalCountAsync(
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
         OpenIddictTokenManager<OpenIdConnectToken> tokenManager,
@@ -26,7 +26,7 @@ CancellationToken cancellationToken
         {
             return 0;
         }
-        return (uint)await tokenManager.FindByApplicationIdAsync(application.Id.ToString(), cancellationToken).CountAsync(cancellationToken);
+        return await tokenManager.FindByApplicationIdAsync(application.Id.ToString(), cancellationToken).CountAsync(cancellationToken);
     }
 
     [Cost(0)]
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationIssuedTokenConnection.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationIssuedTokenConnection.cs
index 8eb94e58b..03fb2d5ac 100644
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationIssuedTokenConnection.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationIssuedTokenConnection.cs
@@ -15,7 +15,7 @@ OpenIdConnectAuthorization authorization
 )
 {
     [Cost(0)]
-    public async Task<uint> GetTotalCountAsync(
+    public async Task<int> GetTotalCountAsync(
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization auth,
         OpenIddictTokenManager<OpenIdConnectToken> tokenManager,
@@ -26,7 +26,7 @@ CancellationToken cancellationToken
         {
             return 0;
         }
-        return (uint)await tokenManager.FindByAuthorizationIdAsync(authorization.Id.ToString(), cancellationToken).CountAsync(cancellationToken);
+        return await tokenManager.FindByAuthorizationIdAsync(authorization.Id.ToString(), cancellationToken).CountAsync(cancellationToken);
     }
 
     [Cost(0)]
diff --git a/backend/src/GraphQl/OpticalDataX/OpticalDataConnection.cs b/backend/src/GraphQl/OpticalDataX/OpticalDataConnection.cs
index 374158af6..ef8ca44fd 100644
--- a/backend/src/GraphQl/OpticalDataX/OpticalDataConnection.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalDataConnection.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using HotChocolate.Types.Pagination;
 using Metabase.GraphQl.DataX;
 
@@ -8,9 +6,9 @@ namespace Metabase.GraphQl.OpticalDataX;
 
 public sealed record OpticalDataConnection(
     IReadOnlyList<OpticalDataEdge> Edges,
-    uint TotalCount,
+    int TotalCount,
     ConnectionPageInfo PageInfo
-) : DataConnectionBase<OpticalDataEdge>(
+) : DataConnection<OpticalDataEdge>(
     Edges,
     TotalCount,
     PageInfo
diff --git a/backend/src/GraphQl/OpticalDataX/OpticalDataEdge.cs b/backend/src/GraphQl/OpticalDataX/OpticalDataEdge.cs
index cab889744..2e52fa12c 100644
--- a/backend/src/GraphQl/OpticalDataX/OpticalDataEdge.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalDataEdge.cs
@@ -5,7 +5,7 @@ namespace Metabase.GraphQl.OpticalDataX;
 public sealed record OpticalDataEdge(
     string Cursor,
     OpticalData Node
-) : DataEdgeBase<OpticalData>(
+) : DataEdge<OpticalData>(
     Cursor,
     Node
 );
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs b/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs
index 78bb125b6..5ae79a7ef 100644
--- a/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs
@@ -42,9 +42,9 @@ CancellationToken cancellationToken
     public Task<OpticalDataConnection> GetAllOpticalDataAsync(
         OpticalDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         DataQueries dataQueries,
         IResolverContext resolverContext,
@@ -92,4 +92,4 @@ CancellationToken cancellationToken
             cancellationToken
         );
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataConnection.cs b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataConnection.cs
index fcaaf3cce..53fef3f12 100644
--- a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataConnection.cs
+++ b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataConnection.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using HotChocolate.Types.Pagination;
 using Metabase.GraphQl.DataX;
@@ -7,9 +6,9 @@ namespace Metabase.GraphQl.PhotovoltaicDataX;
 
 public sealed record PhotovoltaicDataConnection(
     IReadOnlyList<PhotovoltaicDataEdge> Edges,
-    uint TotalCount,
+    int TotalCount,
     ConnectionPageInfo PageInfo
-) : DataConnectionBase<PhotovoltaicDataEdge>(
+) : DataConnection<PhotovoltaicDataEdge>(
     Edges,
     TotalCount,
     PageInfo
diff --git a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataEdge.cs b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataEdge.cs
index 25316e7e8..07f40eb67 100644
--- a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataEdge.cs
+++ b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataEdge.cs
@@ -5,7 +5,7 @@ namespace Metabase.GraphQl.PhotovoltaicDataX;
 public sealed record PhotovoltaicDataEdge(
     string Cursor,
     PhotovoltaicData Node
-) : DataEdgeBase<PhotovoltaicData>(
+) : DataEdge<PhotovoltaicData>(
     Cursor,
     Node
 );
\ No newline at end of file
diff --git a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs
index 9dd93fb23..cb326d8ab 100644
--- a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs
+++ b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs
@@ -42,9 +42,9 @@ CancellationToken cancellationToken
     public Task<PhotovoltaicDataConnection> GetAllPhotovoltaicDataAsync(
         PhotovoltaicDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         DataQueries dataQueries,
         IResolverContext resolverContext,
@@ -92,4 +92,4 @@ CancellationToken cancellationToken
             cancellationToken
         );
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/GraphQl/Publications/PublicationInput.cs b/backend/src/GraphQl/Publications/PublicationInput.cs
index 1afbb6db5..f34037aae 100644
--- a/backend/src/GraphQl/Publications/PublicationInput.cs
+++ b/backend/src/GraphQl/Publications/PublicationInput.cs
@@ -1,5 +1,7 @@
 using System;
+using HotChocolate;
 using Metabase.Data;
+using Metabase.GraphQl.Scalars;
 
 namespace Metabase.GraphQl.Publications;
 
@@ -8,9 +10,9 @@ public sealed record PublicationInput(
     string? Abstract,
     string? Section,
     string[]? Authors,
-    string? Doi,
-    string? ArXiv,
-    string? Urn,
+    [property: GraphQLType<DoiType>] string? Doi,
+    [property: GraphQLType<ArXivType>] string? ArXiv,
+    [property: GraphQLType<MyUriType>] string? Urn,
     Uri? WebAddress
 )
 {
diff --git a/backend/src/GraphQl/References/ReferenceInput.cs b/backend/src/GraphQl/References/ReferenceInput.cs
index d85564671..710dc8f09 100644
--- a/backend/src/GraphQl/References/ReferenceInput.cs
+++ b/backend/src/GraphQl/References/ReferenceInput.cs
@@ -1,10 +1,12 @@
 using System;
+using HotChocolate.Types;
 using Metabase.Data;
 using Metabase.GraphQl.Publications;
 using Metabase.GraphQl.Standards;
 
 namespace Metabase.GraphQl.References;
 
+[OneOf]
 public sealed record ReferenceInput(
     StandardInput? Standard,
     PublicationInput? Publication
diff --git a/backend/src/GraphQl/Requests/DataQueries.cs b/backend/src/GraphQl/Requests/DataQueries.cs
index 51096dc89..decea8816 100644
--- a/backend/src/GraphQl/Requests/DataQueries.cs
+++ b/backend/src/GraphQl/Requests/DataQueries.cs
@@ -236,17 +236,17 @@ private enum PaginationDirection
     }
 
     public async Task<TDataConnection> GetAllDataAsync<TDataConnection, TDataEdge, TDataNode>(
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
-        Func<IReadOnlyList<TDataEdge>, uint, ConnectionPageInfo, TDataConnection> createDataConnection,
+        Func<IReadOnlyList<TDataEdge>, int, ConnectionPageInfo, TDataConnection> createDataConnection,
         Func<TDataNode, string, TDataEdge> createDataEdge,
-        Func<Database, uint?, string?, uint?, string?, Task<TDataConnection?>> getAllDataAsync,
+        Func<Database, int?, string?, int?, string?, Task<TDataConnection?>> getAllDataAsync,
         CancellationToken cancellationToken
     )
-        where TDataConnection : DataConnectionBase<TDataEdge>
-        where TDataEdge : DataEdgeBase<TDataNode>
+        where TDataConnection : DataConnection<TDataEdge>
+        where TDataEdge : DataEdge<TDataNode>
     {
         var paginationDirection = (first, last) switch
         {
@@ -429,8 +429,8 @@ paginationDirection is PaginationDirection.FORWARD
                 .Reverse()
                 .ToList();
         // clamp the edges taking only the first `first` and the last `last` (or the maximum page size)
-        var cappedFirst = (int)Math.Min(first ?? GraphQlConstants.MaximumPageSize, GraphQlConstants.MaximumPageSize);
-        var cappedLast = (int)Math.Min(last ?? GraphQlConstants.MaximumPageSize, GraphQlConstants.MaximumPageSize);
+        var cappedFirst = (int)Math.Min(first ?? (int)GraphQlConstants.MaximumPageSize, GraphQlConstants.MaximumPageSize);
+        var cappedLast = (int)Math.Min(last ?? (int)GraphQlConstants.MaximumPageSize, GraphQlConstants.MaximumPageSize);
         var clampedEdges =
             ((first, last) switch
             {
@@ -450,7 +450,7 @@ paginationDirection is PaginationDirection.FORWARD
             startCursor: clampedEdges.Count is 0 ? null : clampedEdges[0].Cursor,
             endCursor: clampedEdges.Count is 0 ? null : clampedEdges[^1].Cursor
         );
-        return createDataConnection(clampedEdges, (uint)totalCount, pageInfo);
+        return createDataConnection(clampedEdges, totalCount, pageInfo);
     }
 
     public async Task<bool> HasDataAsync(
@@ -676,9 +676,9 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         CalorimetricDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
@@ -711,9 +711,9 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         GeometricDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
@@ -745,9 +745,9 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         HygrothermalDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
@@ -780,9 +780,9 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         LifeCycleDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
@@ -815,9 +815,9 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         OpticalDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
@@ -849,9 +849,9 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         PhotovoltaicDataPropositionInput? where,
         string? locale,
-        uint? first,
+        int? first,
         string? after,
-        uint? last,
+        int? last,
         string? before,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
diff --git a/backend/src/GraphQl/Scalars/ArXivType.cs b/backend/src/GraphQl/Scalars/ArXivType.cs
new file mode 100644
index 000000000..987bdcc04
--- /dev/null
+++ b/backend/src/GraphQl/Scalars/ArXivType.cs
@@ -0,0 +1,31 @@
+using System.Text.RegularExpressions;
+using HotChocolate.Types;
+
+namespace Metabase.GraphQl.Scalars;
+
+public sealed class ArXivType(
+    string name,
+    string? description = null,
+    BindingBehavior bind = BindingBehavior.Explicit
+)
+: RegexType(
+    name,
+    ValidationPattern,
+    description,
+    RegexOptions.Compiled | RegexOptions.IgnoreCase,
+    bind
+)
+{
+    private const string ValidationPattern = "^(arXiv:)[0-z./]*$";
+
+    public ArXivType()
+        : this(
+            nameof(ArXivType)[..^"Type".Length],
+            """
+            arXiv identifier, that is, a string of the format
+            [Understanding the arXiv identifier](https://info.arxiv.org/help/arxiv_identifier.html).
+            """
+        )
+    {
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Scalars/DoiType.cs b/backend/src/GraphQl/Scalars/DoiType.cs
new file mode 100644
index 000000000..8e8620258
--- /dev/null
+++ b/backend/src/GraphQl/Scalars/DoiType.cs
@@ -0,0 +1,40 @@
+using System.Text.RegularExpressions;
+using HotChocolate.Types;
+
+namespace Metabase.GraphQl.Scalars;
+
+public sealed class DoiType(
+    string name,
+    string? description = null,
+    BindingBehavior bind = BindingBehavior.Explicit
+)
+: RegexType(
+    name,
+    ValidationPattern,
+    description,
+    RegexOptions.Compiled | RegexOptions.IgnoreCase,
+    bind
+)
+{
+    private const string ValidationPattern = "^(10[.][0-z/.]*)$";
+
+    public DoiType()
+        : this(
+            nameof(DoiType)[..^"Type".Length],
+            """
+            Digital Object Identifier (DOI) name, that is, a string compliant with [ISO
+            26324:2025](https://www.iso.org/standard/88862.html).
+            
+            See also
+            [What is a DOI?](https://www.doi.org/the-identifier/what-is-a-doi/). In short,
+            a DOI name is a digital identifier of an object, any object — physical,
+            digital, or abstract. DOIs solve a common problem: keeping track of things.
+            Things can be matter, material, content, or activities. Designed to be used by
+            humans as well as machines, DOIs identify objects persistently. They allow
+            things to be uniquely identified and accessed reliably. You know what you have,
+            where it is, and others can track it too.
+            """
+        )
+    {
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Scalars/GraphQlQueryType.cs b/backend/src/GraphQl/Scalars/GraphQlQueryType.cs
new file mode 100644
index 000000000..b47aa7b25
--- /dev/null
+++ b/backend/src/GraphQl/Scalars/GraphQlQueryType.cs
@@ -0,0 +1,30 @@
+using HotChocolate.Types;
+
+namespace Metabase.GraphQl.Scalars;
+
+public sealed class GraphQlQueryType(
+    string name,
+    string? description = null,
+    BindingBehavior bind = BindingBehavior.Explicit
+)
+: StringType(
+    name,
+    description,
+    bind
+)
+{
+    public GraphQlQueryType()
+        : this(
+            nameof(GraphQlQueryType)[..^"Type".Length],
+            """
+            [September 2025 GraphQL](https://spec.graphql.org/September2025/)
+            compliant
+            [query](https://spec.graphql.org/September2025/#sec-Language.Operations)
+            string without
+            [variables](http://spec.graphql.org/September2025/#sec-Language.Variables)
+            and without unnecessary white-space for the present schema.
+            """
+        )
+    {
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Scalars/LocaleType.cs b/backend/src/GraphQl/Scalars/LocaleType.cs
index 02297c5cc..794770edf 100644
--- a/backend/src/GraphQl/Scalars/LocaleType.cs
+++ b/backend/src/GraphQl/Scalars/LocaleType.cs
@@ -4,46 +4,41 @@
 // TODO Maybe use an enumeration as runtime type instead of string (and fallback to english when the given one does not exist).namespace Database.GraphQl
 namespace Metabase.GraphQl.Scalars;
 
-/// <summary>
-///     [BCP 47](https://tools.ietf.org/html/bcp47)
-///     compliant
-///     [Language Tag](https://tools.ietf.org/html/bcp47#section-2)
-///     string like `"de-AT"`, `"sr-Latn-RS"`, `"en-US"`, or `"en-GB"`, where the language
-///     part is essentially an
-///     [ISO 639 Language Code](https://www.iso.org/iso-639-language-codes.html),
-///     the script an
-///     [ISO 15924:2004 Script Code](https://www.iso.org/standard/29546.html),
-///     and the region an
-///     [ISO 3166-1 Country Code](https://www.iso.org/iso-3166-country-codes.html).
-///     Note that the
-///     [Internet Assigned Numbers Authority (IANA)](https://www.iana.org)
-///     maintains the
-///     [Language Subtag Registry](https://www.iana.org/assignments/lang-subtags-templates/lang-subtags-templates.xhtml).
-/// </summary>
-/// <remarks>
-///     Initializes a new instance of the <see cref="LocaleType" /> class.
-/// </remarks>
 public sealed class LocaleType(
     string name,
     string? description = null,
-    BindingBehavior bind = BindingBehavior.Explicit)
-        : RegexType(
-        name,
-        ValidationPattern,
-        description,
-        RegexOptions.Compiled | RegexOptions.IgnoreCase,
-        bind)
+    BindingBehavior bind = BindingBehavior.Explicit
+)
+: RegexType(
+    name,
+    ValidationPattern,
+    description,
+    RegexOptions.Compiled | RegexOptions.IgnoreCase,
+    bind
+)
 {
     private const string ValidationPattern =
         "^[a-zA-Z0-9]+(-[a-zA-Z0-9]+)?(-[a-zA-Z0-9]+)?$";
 
-    /// <summary>
-    ///     Initializes a new instance of the <see cref="LocaleType" /> class.
-    /// </summary>
     public LocaleType()
         : this(
             nameof(LocaleType)[..^"Type".Length],
-            "BCP 47 compliant Language Tag string"
+            """
+            [BCP 47](https://tools.ietf.org/html/bcp47)
+            compliant
+            [Language Tag](https://tools.ietf.org/html/bcp47#section-2)
+            string like `"de-AT"`, `"sr-Latn-RS"`, `"en-US"`, or `"en-GB"`, where the language
+            part is essentially an
+            [ISO 639 Language Code](https://www.iso.org/iso-639-language-codes.html),
+            the script an
+            [ISO 15924:2004 Script Code](https://www.iso.org/standard/29546.html),
+            and the region an
+            [ISO 3166-1 Country Code](https://www.iso.org/iso-3166-country-codes.html).
+            Note that the
+            [Internet Assigned Numbers Authority (IANA)](https://www.iana.org)
+            maintains the
+            [Language Subtag Registry](https://www.iana.org/assignments/lang-subtags-templates/lang-subtags-templates.xhtml).
+            """
         )
     {
     }
diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index 47e41bb12..fa86431e8 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -7,48 +7,48 @@ type Query {
   allCalorimetricData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: String
     where: CalorimetricDataPropositionInput
   ): CalorimetricDataConnection! @cost(weight: "10")
   allGeometricData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: String
     where: GeometricDataPropositionInput
   ): GeometricDataConnection! @cost(weight: "10")
   allHygrothermalData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: String
     where: HygrothermalDataPropositionInput
   ): HygrothermalDataConnection! @cost(weight: "10")
   allLifeCycleData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: String
     where: LifeCycleDataPropositionInput
   ): LifeCycleDataConnection! @cost(weight: "10")
   allOpticalData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: String
     where: OpticalDataPropositionInput
   ): OpticalDataConnection! @cost(weight: "10")
   allPhotovoltaicData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: String
     where: PhotovoltaicDataPropositionInput
   ): PhotovoltaicDataConnection! @cost(weight: "10")
@@ -685,7 +685,7 @@ type CalorimetricData implements Node & Data {
 type CalorimetricDataConnection {
   edges: [CalorimetricDataEdge!]! @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type CalorimetricDataEdge {
@@ -784,7 +784,7 @@ type Component implements Node {
 type ComponentAssembledOfConnection {
   edges: [ComponentAssembledOfEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type ComponentAssembledOfEdge {
@@ -798,7 +798,7 @@ type ComponentAssembledOfEdge {
 type ComponentConcretizationOfConnection {
   edges: [ComponentConcretizationOfEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type ComponentConcretizationOfEdge {
@@ -809,7 +809,7 @@ type ComponentConcretizationOfEdge {
 type ComponentGeneralizationOfConnection {
   edges: [ComponentGeneralizationOfEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type ComponentGeneralizationOfEdge {
@@ -824,7 +824,7 @@ type ComponentManagerEdge {
 type ComponentManufacturerConnection {
   edges: [ComponentManufacturerEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type ComponentManufacturerEdge {
@@ -836,7 +836,7 @@ type ComponentManufacturerEdge {
 type ComponentPartOfConnection {
   edges: [ComponentPartOfEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type ComponentPartOfEdge {
@@ -868,7 +868,7 @@ type ComponentsEdge {
 type ComponentVariantOfConnection {
   edges: [ComponentVariantOfEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type ComponentVariantOfEdge {
@@ -1047,7 +1047,7 @@ type DataApproval implements Approval {
   approverId: Uuid!
   keyFingerprint: String!
   message: String!
-  query: String!
+  query: GraphQlQuery!
   signature: String!
   statement: Reference!
   timestamp: DateTime!
@@ -1058,48 +1058,48 @@ type Database implements Node {
   allCalorimetricData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: Locale
     where: CalorimetricDataPropositionInput
   ): CalorimetricDataConnection @cost(weight: "10")
   allGeometricData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: Locale
     where: GeometricDataPropositionInput
   ): GeometricDataConnection @cost(weight: "10")
   allHygrothermalData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: Locale
     where: HygrothermalDataPropositionInput
   ): HygrothermalDataConnection @cost(weight: "10")
   allLifeCycleData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: Locale
     where: LifeCycleDataPropositionInput
   ): LifeCycleDataConnection @cost(weight: "10")
   allOpticalData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: Locale
     where: OpticalDataPropositionInput
   ): OpticalDataConnection @cost(weight: "10")
   allPhotovoltaicData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: Locale
     where: PhotovoltaicDataPropositionInput
   ): PhotovoltaicDataConnection @cost(weight: "10")
@@ -1163,17 +1163,6 @@ type DatabasesEdge {
   node: Database!
 }
 
-type DataConnection {
-  edges: [DataEdge!]! @cost(weight: "0")
-  pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
-}
-
-type DataEdge {
-  cursor: String!
-  node: Data! @cost(weight: "0")
-}
-
 type DataFormat implements Node {
   createdAt: DateTime!
   description: String!
@@ -1384,7 +1373,7 @@ type GeometricData implements Node & Data {
 type GeometricDataConnection {
   edges: [GeometricDataEdge!]! @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type GeometricDataEdge {
@@ -1483,7 +1472,7 @@ type HygrothermalData implements Node & Data {
 type HygrothermalDataConnection {
   edges: [HygrothermalDataEdge!]! @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type HygrothermalDataEdge {
@@ -1646,7 +1635,7 @@ type InstitutionDevelopedMethodEdge {
 type InstitutionGnuPgKeyFingerprintConnection {
   edges: [InstitutionGnuPgKeyFingerprintEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type InstitutionGnuPgKeyFingerprintEdge {
@@ -1725,7 +1714,7 @@ type InstitutionMethodDeveloperEdge {
 type InstitutionOperatedDatabaseConnection {
   edges: [InstitutionOperatedDatabaseEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type InstitutionOperatedDatabaseEdge {
@@ -1736,7 +1725,7 @@ type InstitutionOwnedOpenIdConnectApplicationConnection {
   edges: [InstitutionOwnedOpenIdConnectApplicationEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
   isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type InstitutionOwnedOpenIdConnectApplicationEdge {
@@ -1747,7 +1736,7 @@ type InstitutionOwnedOpenIdConnectApplicationEdge {
 type InstitutionRepresentativeConnection {
   edges: [InstitutionRepresentativeEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type InstitutionRepresentativeEdge {
@@ -1799,7 +1788,7 @@ type LifeCycleData implements Node & Data {
 type LifeCycleDataConnection {
   edges: [LifeCycleDataEdge!]! @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type LifeCycleDataEdge {
@@ -1886,7 +1875,7 @@ type MethodDeveloperConnection {
   edges: [MethodDeveloperEdge!]! @cost(weight: "10")
   isAuthorizedToAddInstitutionEdge: Boolean! @cost(weight: "1")
   isAuthorizedToAddUserEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  totalCount: Int! @cost(weight: "10")
 }
 
 type MethodDeveloperEdge {
@@ -1980,7 +1969,7 @@ type OpenIdConnectApplication implements Node {
 
 type OpenIdConnectApplicationGrantedAuthorizationConnection {
   edges: [OpenIdConnectApplicationGrantedAuthorizationEdge!]! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type OpenIdConnectApplicationGrantedAuthorizationEdge {
@@ -1989,7 +1978,7 @@ type OpenIdConnectApplicationGrantedAuthorizationEdge {
 
 type OpenIdConnectApplicationIssuedTokenConnection {
   edges: [OpenIdConnectApplicationIssuedTokenEdge!]! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type OpenIdConnectApplicationIssuedTokenEdge {
@@ -2038,7 +2027,7 @@ type OpenIdConnectAuthorizationApplicationEdge {
 
 type OpenIdConnectAuthorizationIssuedTokenConnection {
   edges: [OpenIdConnectAuthorizationIssuedTokenEdge!]! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type OpenIdConnectAuthorizationIssuedTokenEdge {
@@ -2139,7 +2128,7 @@ type OpticalData implements Node & Data {
 type OpticalDataConnection {
   edges: [OpticalDataEdge!]! @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type OpticalDataEdge {
@@ -2162,7 +2151,7 @@ type PageInfo {
 type PendingComponentManufacturerConnection {
   edges: [ComponentManufacturerEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 "A connection to a list of items."
@@ -2200,7 +2189,7 @@ type PendingInstitutionManufacturedComponentConnection {
 type PendingInstitutionRepresentativeConnection {
   edges: [InstitutionRepresentativeEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 "A connection to a list of items."
@@ -2225,7 +2214,7 @@ type PendingMethodDeveloperConnection {
   edges: [MethodDeveloperEdge!]! @cost(weight: "10")
   isAuthorizedToAddInstitutionEdge: Boolean! @cost(weight: "1")
   isAuthorizedToAddUserEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  totalCount: Int! @cost(weight: "10")
 }
 
 type PendingUserDevelopedMethodConnection {
@@ -2238,7 +2227,7 @@ type PendingUserDevelopedMethodConnection {
 type PendingUserRepresentedInstitutionConnection {
   edges: [UserRepresentedInstitutionEdge!]! @cost(weight: "0")
   isAuthorizedToConfirmEdges: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type PhotovoltaicData implements Node & Data {
@@ -2266,7 +2255,7 @@ type PhotovoltaicData implements Node & Data {
 type PhotovoltaicDataConnection {
   edges: [PhotovoltaicDataEdge!]! @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type PhotovoltaicDataEdge {
@@ -2282,16 +2271,16 @@ type PrimeSurfaceOrDirection {
 type Publication {
   abstract: String
   "The website arXiv.org is a free and open-access archive for publications. The arXiv identifier can be used to define a publication."
-  arXiv: String
+  arXiv: ArXiv
   authors: [String!]
   "The Digital Object Identifier (DOI) is a very important persistent identifier for publications. It MUST be defined here if it is available for a publication."
-  doi: String
+  doi: Doi
   "Referenced section"
   section: String
   title: String
-  "A Uniform Resource Name (URN) can be used to define a publication. TODO: Improve the regex pattern to further restrict the string."
-  urn: String
-  "If a persistent identifier like DOI is defined above, this webAdress can define a convenient web address to access the publication. However, if no persistent identifier exist, this web address is the only identifier of this publication. In this case, it is important to choose a web address with a high probability to persist long."
+  "A Uniform Resource Name (URN) can be used to define a publication."
+  urn: Url
+  "If a persistent identifier like DOI is defined above, this web address can define a convenient web address to access the publication. However, if no persistent identifier exist, this web address is the only identifier of this publication. In this case, it is important to choose a web address with a high probability to persist long."
   webAddress: Url
 }
 
@@ -2740,7 +2729,7 @@ type UserDevelopedMethodEdge {
 
 type UserGnuPgKeyFingerprintConnection {
   edges: [UserGnuPgKeyFingerprintEdge!]! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type UserGnuPgKeyFingerprintEdge {
@@ -2755,7 +2744,7 @@ type UserMethodDeveloperEdge {
 
 type UserRepresentedInstitutionConnection {
   edges: [UserRepresentedInstitutionEdge!]! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type UserRepresentedInstitutionEdge {
@@ -2810,7 +2799,7 @@ interface Approval {
   approverId: Uuid!
   keyFingerprint: String!
   message: String!
-  query: String!
+  query: GraphQlQuery!
   signature: String!
   timestamp: DateTime!
   variables: Any!
@@ -2991,7 +2980,7 @@ input ComponentAssembledOfFilterInput {
   index: ByteFilterInput
   or: [ComponentAssembledOfFilterInput!]
   partComponent: ComponentFilterInput
-  primeSurface: NullableOfPrimeSurfaceFilterInput
+  primeSurface: PrimeSurfaceFilterInput
   updatedAt: DateTimeFilterInput
 }
 
@@ -3002,6 +2991,13 @@ input ComponentAssembledOfSortInput {
   updatedAt: SortEnumType @cost(weight: "10")
 }
 
+input ComponentAssembliesFilterInput {
+  all: ComponentAssembledOfFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: ComponentAssembledOfFilterInput @cost(weight: "10")
+  some: ComponentAssembledOfFilterInput @cost(weight: "10")
+}
+
 input ComponentCategoryFilterInput {
   equalTo: ComponentCategory @cost(weight: "10")
   in: [ComponentCategory!] @cost(weight: "10")
@@ -3033,23 +3029,23 @@ input ComponentFilterInput {
   abbreviation: StringFilterInput
   and: [ComponentFilterInput!]
   categories: ComponentCategorysFilterInput
-  concretizations: FilterInputTypeOfComponentsFilterInput
+  concretizations: ComponentsFilterInput
   createdAt: DateTimeFilterInput
   description: StringFilterInput
   extras: JsonElementFilterInput
-  generalizations: FilterInputTypeOfComponentsFilterInput
+  generalizations: ComponentsFilterInput
   id: UuidFilterInput
   manager: InstitutionFilterInput
-  manufacturerEdges: FilterInputTypeOfComponentManufacturersFilterInput
-  manufacturers: FilterInputTypeOfInstitutionsFilterInput
+  manufacturerEdges: ComponentManufacturersFilterInput
+  manufacturers: InstitutionsFilterInput
   name: StringFilterInput
   or: [ComponentFilterInput!]
-  partEdges: FilterInputTypeOfComponentAssemblysFilterInput
-  partOf: FilterInputTypeOfComponentsFilterInput
-  partOfEdges: FilterInputTypeOfComponentAssemblysFilterInput
-  parts: FilterInputTypeOfComponentsFilterInput
+  partEdges: ComponentAssembliesFilterInput
+  partOf: ComponentsFilterInput
+  partOfEdges: ComponentAssembliesFilterInput
+  parts: ComponentsFilterInput
   updatedAt: DateTimeFilterInput
-  variants: FilterInputTypeOfComponentsFilterInput
+  variants: ComponentsFilterInput
 }
 
 input ComponentGeneralizationOfFilterInput {
@@ -3073,6 +3069,13 @@ input ComponentManufacturerFilterInput {
   updatedAt: DateTimeFilterInput
 }
 
+input ComponentManufacturersFilterInput {
+  all: ComponentManufacturerFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: ComponentManufacturerFilterInput @cost(weight: "10")
+  some: ComponentManufacturerFilterInput @cost(weight: "10")
+}
+
 input ComponentManufacturerSortInput {
   createdAt: SortEnumType @cost(weight: "10")
   updatedAt: SortEnumType @cost(weight: "10")
@@ -3084,7 +3087,7 @@ input ComponentPartOfFilterInput {
   createdAt: DateTimeFilterInput
   index: ByteFilterInput
   or: [ComponentPartOfFilterInput!]
-  primeSurface: NullableOfPrimeSurfaceFilterInput
+  primeSurface: PrimeSurfaceFilterInput
   updatedAt: DateTimeFilterInput
 }
 
@@ -3095,6 +3098,13 @@ input ComponentPartOfSortInput {
   updatedAt: SortEnumType @cost(weight: "10")
 }
 
+input ComponentsFilterInput {
+  all: ComponentFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: ComponentFilterInput @cost(weight: "10")
+  some: ComponentFilterInput @cost(weight: "10")
+}
+
 input ComponentSortInput {
   abbreviation: SortEnumType @cost(weight: "10")
   createdAt: SortEnumType @cost(weight: "10")
@@ -3256,6 +3266,13 @@ input DatabaseFilterInput {
   updatedAt: DateTimeFilterInput
 }
 
+input DatabasesFilterInput {
+  all: DatabaseFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: DatabaseFilterInput @cost(weight: "10")
+  some: DatabaseFilterInput @cost(weight: "10")
+}
+
 input DatabaseSortInput {
   createdAt: SortEnumType @cost(weight: "10")
   description: SortEnumType @cost(weight: "10")
@@ -3279,6 +3296,13 @@ input DataFormatFilterInput {
   updatedAt: DateTimeFilterInput
 }
 
+input DataFormatsFilterInput {
+  all: DataFormatFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: DataFormatFilterInput @cost(weight: "10")
+  some: DataFormatFilterInput @cost(weight: "10")
+}
+
 input DataFormatSortInput {
   createdAt: SortEnumType @cost(weight: "10")
   description: SortEnumType @cost(weight: "10")
@@ -3392,97 +3416,6 @@ input FilesMetaInformationPropositionInput {
   some: FileMetaInformationPropositionInput
 }
 
-input FilterInputTypeOfComponentAssemblysFilterInput {
-  all: ComponentAssembledOfFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: ComponentAssembledOfFilterInput @cost(weight: "10")
-  some: ComponentAssembledOfFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfComponentManufacturersFilterInput {
-  all: ComponentManufacturerFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: ComponentManufacturerFilterInput @cost(weight: "10")
-  some: ComponentManufacturerFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfComponentsFilterInput {
-  all: ComponentFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: ComponentFilterInput @cost(weight: "10")
-  some: ComponentFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfDatabasesFilterInput {
-  all: DatabaseFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: DatabaseFilterInput @cost(weight: "10")
-  some: DatabaseFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfDataFormatsFilterInput {
-  all: DataFormatFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: DataFormatFilterInput @cost(weight: "10")
-  some: DataFormatFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfGnuPgKeyFingerprintsFilterInput {
-  all: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
-  some: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfInstitutionMethodDevelopersFilterInput {
-  all: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
-  some: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfInstitutionRepresentativesFilterInput {
-  all: InstitutionRepresentativeFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: InstitutionRepresentativeFilterInput @cost(weight: "10")
-  some: InstitutionRepresentativeFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfInstitutionsFilterInput {
-  all: InstitutionFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: InstitutionFilterInput @cost(weight: "10")
-  some: InstitutionFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfMethodsFilterInput {
-  all: InstitutionManagedMethodFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: InstitutionManagedMethodFilterInput @cost(weight: "10")
-  some: InstitutionManagedMethodFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfOpenIdConnectTokensFilterInput {
-  all: OpenIdConnectTokenFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: OpenIdConnectTokenFilterInput @cost(weight: "10")
-  some: OpenIdConnectTokenFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfUserMethodDevelopersFilterInput {
-  all: UserDevelopedMethodFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: UserDevelopedMethodFilterInput @cost(weight: "10")
-  some: UserDevelopedMethodFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfUsersFilterInput {
-  all: UserFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: UserFilterInput @cost(weight: "10")
-  some: UserFilterInput @cost(weight: "10")
-}
-
 input FloatFilterInput {
   equalTo: Float @cost(weight: "10")
   greaterThan: Float @cost(weight: "10")
@@ -3549,6 +3482,13 @@ input GnuPgKeyFingerprintFilterInput {
   user: UserFilterInput
 }
 
+input GnuPgKeyFingerprintsFilterInput {
+  all: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  some: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
+}
+
 input GnuPgKeyFingerprintSortInput {
   allowedAt: SortEnumType @cost(weight: "10")
   createdAt: SortEnumType @cost(weight: "10")
@@ -3585,22 +3525,22 @@ input InstitutionFilterInput {
   contact: ContactInformationFilterInput
   createdAt: DateTimeFilterInput
   description: StringFilterInput
-  developedMethodEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  developedMethods: FilterInputTypeOfMethodsFilterInput
+  developedMethodEdges: InstitutionMethodDevelopersFilterInput
+  developedMethods: MethodsFilterInput
   extras: JsonElementFilterInput
-  gnuPgKeyFingerprints: FilterInputTypeOfGnuPgKeyFingerprintsFilterInput
+  gnuPgKeyFingerprints: GnuPgKeyFingerprintsFilterInput
   id: UuidFilterInput
-  managedDataFormats: FilterInputTypeOfDataFormatsFilterInput
-  managedInstitutions: FilterInputTypeOfInstitutionsFilterInput
-  managedMethods: FilterInputTypeOfMethodsFilterInput
+  managedDataFormats: DataFormatsFilterInput
+  managedInstitutions: InstitutionsFilterInput
+  managedMethods: MethodsFilterInput
   manager: InstitutionFilterInput
-  manufacturedComponentEdges: FilterInputTypeOfComponentManufacturersFilterInput
-  manufacturedComponents: FilterInputTypeOfComponentsFilterInput
+  manufacturedComponentEdges: ComponentManufacturersFilterInput
+  manufacturedComponents: ComponentsFilterInput
   name: StringFilterInput
-  operatedDatabases: FilterInputTypeOfDatabasesFilterInput
+  operatedDatabases: DatabasesFilterInput
   or: [InstitutionFilterInput!]
-  representativeEdges: FilterInputTypeOfInstitutionRepresentativesFilterInput
-  representatives: FilterInputTypeOfUsersFilterInput
+  representativeEdges: InstitutionRepresentativesFilterInput
+  representatives: UsersFilterInput
   state: InstitutionStateFilterInput
   updatedAt: DateTimeFilterInput
 }
@@ -3630,22 +3570,22 @@ input InstitutionManagedComponentFilterInput {
   abbreviation: StringFilterInput
   and: [InstitutionManagedComponentFilterInput!]
   categories: ComponentCategorysFilterInput
-  concretizations: FilterInputTypeOfComponentsFilterInput
+  concretizations: ComponentsFilterInput
   createdAt: DateTimeFilterInput
   description: StringFilterInput
   extras: JsonElementFilterInput
-  generalizations: FilterInputTypeOfComponentsFilterInput
+  generalizations: ComponentsFilterInput
   id: UuidFilterInput
-  manufacturerEdges: FilterInputTypeOfComponentManufacturersFilterInput
-  manufacturers: FilterInputTypeOfInstitutionsFilterInput
+  manufacturerEdges: ComponentManufacturersFilterInput
+  manufacturers: InstitutionsFilterInput
   name: StringFilterInput
   or: [InstitutionManagedComponentFilterInput!]
-  partEdges: FilterInputTypeOfComponentAssemblysFilterInput
-  partOf: FilterInputTypeOfComponentsFilterInput
-  partOfEdges: FilterInputTypeOfComponentAssemblysFilterInput
-  parts: FilterInputTypeOfComponentsFilterInput
+  partEdges: ComponentAssembliesFilterInput
+  partOf: ComponentsFilterInput
+  partOfEdges: ComponentAssembliesFilterInput
+  parts: ComponentsFilterInput
   updatedAt: DateTimeFilterInput
-  variants: FilterInputTypeOfComponentsFilterInput
+  variants: ComponentsFilterInput
 }
 
 input InstitutionManagedComponentSortInput {
@@ -3687,21 +3627,21 @@ input InstitutionManagedInstitutionFilterInput {
   contact: ContactInformationFilterInput
   createdAt: DateTimeFilterInput
   description: StringFilterInput
-  developedMethodEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  developedMethods: FilterInputTypeOfMethodsFilterInput
+  developedMethodEdges: InstitutionMethodDevelopersFilterInput
+  developedMethods: MethodsFilterInput
   extras: JsonElementFilterInput
-  gnuPgKeyFingerprints: FilterInputTypeOfGnuPgKeyFingerprintsFilterInput
+  gnuPgKeyFingerprints: GnuPgKeyFingerprintsFilterInput
   id: UuidFilterInput
-  managedDataFormats: FilterInputTypeOfDataFormatsFilterInput
-  managedInstitutions: FilterInputTypeOfInstitutionsFilterInput
-  managedMethods: FilterInputTypeOfMethodsFilterInput
-  manufacturedComponentEdges: FilterInputTypeOfComponentManufacturersFilterInput
-  manufacturedComponents: FilterInputTypeOfComponentsFilterInput
+  managedDataFormats: DataFormatsFilterInput
+  managedInstitutions: InstitutionsFilterInput
+  managedMethods: MethodsFilterInput
+  manufacturedComponentEdges: ComponentManufacturersFilterInput
+  manufacturedComponents: ComponentsFilterInput
   name: StringFilterInput
-  operatedDatabases: FilterInputTypeOfDatabasesFilterInput
+  operatedDatabases: DatabasesFilterInput
   or: [InstitutionManagedInstitutionFilterInput!]
-  representativeEdges: FilterInputTypeOfInstitutionRepresentativesFilterInput
-  representatives: FilterInputTypeOfUsersFilterInput
+  representativeEdges: InstitutionRepresentativesFilterInput
+  representatives: UsersFilterInput
   state: InstitutionStateFilterInput
   updatedAt: DateTimeFilterInput
 }
@@ -3724,13 +3664,13 @@ input InstitutionManagedMethodFilterInput {
   createdAt: DateTimeFilterInput
   description: StringFilterInput
   id: UuidFilterInput
-  institutionDeveloperEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  institutionDevelopers: FilterInputTypeOfInstitutionsFilterInput
+  institutionDeveloperEdges: InstitutionMethodDevelopersFilterInput
+  institutionDevelopers: InstitutionsFilterInput
   name: StringFilterInput
   or: [InstitutionManagedMethodFilterInput!]
   updatedAt: DateTimeFilterInput
-  userDeveloperEdges: FilterInputTypeOfUserMethodDevelopersFilterInput
-  userDevelopers: FilterInputTypeOfUsersFilterInput
+  userDeveloperEdges: UserMethodDevelopersFilterInput
+  userDevelopers: UsersFilterInput
 }
 
 input InstitutionManagedMethodSortInput {
@@ -3755,6 +3695,13 @@ input InstitutionManufacturedComponentSortInput {
   updatedAt: SortEnumType @cost(weight: "10")
 }
 
+input InstitutionMethodDevelopersFilterInput {
+  all: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
+  some: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
+}
+
 input InstitutionOperatedDatabaseFilterInput {
   and: [InstitutionOperatedDatabaseFilterInput!]
   createdAt: DateTimeFilterInput
@@ -3813,12 +3760,26 @@ input InstitutionRepresentativeRoleFilterInput {
   notIn: [InstitutionRepresentativeRole!] @cost(weight: "10")
 }
 
+input InstitutionRepresentativesFilterInput {
+  all: InstitutionRepresentativeFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: InstitutionRepresentativeFilterInput @cost(weight: "10")
+  some: InstitutionRepresentativeFilterInput @cost(weight: "10")
+}
+
 input InstitutionRepresentativeSortInput {
   createdAt: SortEnumType @cost(weight: "10")
   role: SortEnumType @cost(weight: "10")
   updatedAt: SortEnumType @cost(weight: "10")
 }
 
+input InstitutionsFilterInput {
+  all: InstitutionFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: InstitutionFilterInput @cost(weight: "10")
+  some: InstitutionFilterInput @cost(weight: "10")
+}
+
 input InstitutionSortInput {
   abbreviation: SortEnumType @cost(weight: "10")
   contact: ContactInformationSortInput @cost(weight: "10")
@@ -3980,14 +3941,14 @@ input MethodFilterInput {
   createdAt: DateTimeFilterInput
   description: StringFilterInput
   id: UuidFilterInput
-  institutionDeveloperEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  institutionDevelopers: FilterInputTypeOfInstitutionsFilterInput
+  institutionDeveloperEdges: InstitutionMethodDevelopersFilterInput
+  institutionDevelopers: InstitutionsFilterInput
   manager: InstitutionFilterInput
   name: StringFilterInput
   or: [MethodFilterInput!]
   updatedAt: DateTimeFilterInput
-  userDeveloperEdges: FilterInputTypeOfUserMethodDevelopersFilterInput
-  userDevelopers: FilterInputTypeOfUsersFilterInput
+  userDeveloperEdges: UserMethodDevelopersFilterInput
+  userDevelopers: UsersFilterInput
 }
 
 input MethodParameterInput {
@@ -3995,6 +3956,13 @@ input MethodParameterInput {
   type: Any!
 }
 
+input MethodsFilterInput {
+  all: InstitutionManagedMethodFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: InstitutionManagedMethodFilterInput @cost(weight: "10")
+  some: InstitutionManagedMethodFilterInput @cost(weight: "10")
+}
+
 input MethodSortInput {
   calculationLocator: UriSortInput @cost(weight: "10")
   createdAt: SortEnumType @cost(weight: "10")
@@ -4025,13 +3993,6 @@ input NonNegativeIntFilterInput {
   notLessThanOrEqualTo: NonNegativeInt @cost(weight: "10")
 }
 
-input NullableOfPrimeSurfaceFilterInput {
-  equalTo: PrimeSurface @cost(weight: "10")
-  in: [PrimeSurface] @cost(weight: "10")
-  notEqualTo: PrimeSurface @cost(weight: "10")
-  notIn: [PrimeSurface] @cost(weight: "10")
-}
-
 input NumerationInput {
   mainNumber: String!
   prefix: String
@@ -4074,7 +4035,7 @@ input OpenIdConnectAuthorizationFilterInput {
   or: [OpenIdConnectAuthorizationFilterInput!]
   status: StringFilterInput
   subject: StringFilterInput
-  tokens: FilterInputTypeOfOpenIdConnectTokensFilterInput
+  tokens: OpenIdConnectTokensFilterInput
   type: StringFilterInput
   updatedAt: DateTimeFilterInput
 }
@@ -4103,6 +4064,13 @@ input OpenIdConnectTokenFilterInput {
   updatedAt: DateTimeFilterInput
 }
 
+input OpenIdConnectTokensFilterInput {
+  all: OpenIdConnectTokenFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: OpenIdConnectTokenFilterInput @cost(weight: "10")
+  some: OpenIdConnectTokenFilterInput @cost(weight: "10")
+}
+
 input OpenIdConnectTokenSortInput {
   createdAt: SortEnumType @cost(weight: "10")
   expiredAt: SortEnumType @cost(weight: "10")
@@ -4154,18 +4122,25 @@ input PhotovoltaicDataPropositionInput {
   resources: GetHttpsResourcesPropositionInput
 }
 
+input PrimeSurfaceFilterInput {
+  equalTo: PrimeSurface @cost(weight: "10")
+  in: [PrimeSurface] @cost(weight: "10")
+  notEqualTo: PrimeSurface @cost(weight: "10")
+  notIn: [PrimeSurface] @cost(weight: "10")
+}
+
 input PublicationInput {
   abstract: String
-  arXiv: String
+  arXiv: ArXiv
   authors: [String!]
-  doi: String
+  doi: Doi
   section: String
   title: String
-  urn: String
+  urn: Url
   webAddress: Url
 }
 
-input ReferenceInput {
+input ReferenceInput @oneOf {
   publication: PublicationInput
   standard: StandardInput
 }
@@ -4433,14 +4408,14 @@ input UserDevelopedMethodSortInput {
 input UserFilterInput {
   and: [UserFilterInput!]
   createdAt: DateTimeFilterInput
-  developedMethodEdges: FilterInputTypeOfUserMethodDevelopersFilterInput
-  developedMethods: FilterInputTypeOfMethodsFilterInput
+  developedMethodEdges: UserMethodDevelopersFilterInput
+  developedMethods: MethodsFilterInput
   id: UuidFilterInput
   "Full name"
   name: StringFilterInput
   or: [UserFilterInput!]
-  representedInstitutionEdges: FilterInputTypeOfInstitutionRepresentativesFilterInput
-  representedInstitutions: FilterInputTypeOfInstitutionsFilterInput
+  representedInstitutionEdges: InstitutionRepresentativesFilterInput
+  representedInstitutions: InstitutionsFilterInput
   updatedAt: DateTimeFilterInput
 }
 
@@ -4465,6 +4440,13 @@ input UserGnuPgKeyFingerprintSortInput {
   updatedAt: SortEnumType @cost(weight: "10")
 }
 
+input UserMethodDevelopersFilterInput {
+  all: UserDevelopedMethodFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: UserDevelopedMethodFilterInput @cost(weight: "10")
+  some: UserDevelopedMethodFilterInput @cost(weight: "10")
+}
+
 input UserRepresentedInstitutionFilterInput {
   and: [UserRepresentedInstitutionFilterInput!]
   createdAt: DateTimeFilterInput
@@ -4480,6 +4462,13 @@ input UserRepresentedInstitutionSortInput {
   updatedAt: SortEnumType @cost(weight: "10")
 }
 
+input UsersFilterInput {
+  all: UserFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: UserFilterInput @cost(weight: "10")
+  some: UserFilterInput @cost(weight: "10")
+}
+
 input UserSortInput {
   createdAt: SortEnumType @cost(weight: "10")
   id: SortEnumType @cost(weight: "10")
@@ -5239,6 +5228,12 @@ enum VerifyInstitutionErrorCode {
 
 scalar Any @specifiedBy(url: "https://scalars.graphql.org/chillicream/any.html")
 
+"""
+arXiv identifier, that is, a string of the format
+[Understanding the arXiv identifier](https://info.arxiv.org/help/arxiv_identifier.html).
+"""
+scalar ArXiv
+
 "The `Byte` scalar type represents a signed 8-bit integer."
 scalar Byte
   @specifiedBy(url: "https://scalars.graphql.org/chillicream/byte.html")
@@ -5251,6 +5246,21 @@ scalar DateTime
 scalar Decimal
   @specifiedBy(url: "https://scalars.graphql.org/chillicream/decimal.html")
 
+"""
+Digital Object Identifier (DOI) name, that is, a string compliant with [ISO
+26324:2025](https://www.iso.org/standard/88862.html).
+
+See also
+[What is a DOI?](https://www.doi.org/the-identifier/what-is-a-doi/). In short,
+a DOI name is a digital identifier of an object, any object — physical,
+digital, or abstract. DOIs solve a common problem: keeping track of things.
+Things can be matter, material, content, or activities. Designed to be used by
+humans as well as machines, DOIs identify objects persistently. They allow
+things to be uniquely identified and accessed reliably. You know what you have,
+where it is, and others can track it too.
+"""
+scalar Doi
+
 "The `Duration` scalar type represents a duration of time."
 scalar Duration
   @specifiedBy(url: "https://scalars.graphql.org/chillicream/duration.html")
@@ -5258,6 +5268,16 @@ scalar Duration
 "The EmailAddress scalar type constitutes a valid email address, represented as a UTF-8 character sequence. The scalar follows the specification defined by the HTML Spec https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address."
 scalar EmailAddress
 
+"""
+[September 2025 GraphQL](https://spec.graphql.org/September2025/)
+compliant
+[query](https://spec.graphql.org/September2025/#sec-Language.Operations)
+string without
+[variables](http://spec.graphql.org/September2025/#sec-Language.Variables)
+and without unnecessary white-space for the present schema.
+"""
+scalar GraphQlQuery
+
 "The `LocalDate` scalar type represents a date without time or time zone information."
 scalar LocalDate
   @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-date.html")
@@ -5268,7 +5288,22 @@ scalar LocalDateTime
     url: "https://scalars.graphql.org/chillicream/local-date-time.html"
   )
 
-"BCP 47 compliant Language Tag string"
+"""
+[BCP 47](https://tools.ietf.org/html/bcp47)
+compliant
+[Language Tag](https://tools.ietf.org/html/bcp47#section-2)
+string like `"de-AT"`, `"sr-Latn-RS"`, `"en-US"`, or `"en-GB"`, where the language
+part is essentially an
+[ISO 639 Language Code](https://www.iso.org/iso-639-language-codes.html),
+the script an
+[ISO 15924:2004 Script Code](https://www.iso.org/standard/29546.html),
+and the region an
+[ISO 3166-1 Country Code](https://www.iso.org/iso-3166-country-codes.html).
+Note that the
+[Internet Assigned Numbers Authority (IANA)](https://www.iana.org)
+maintains the
+[Language Subtag Registry](https://www.iana.org/assignments/lang-subtags-templates/lang-subtags-templates.xhtml).
+"""
 scalar Locale
 
 "The `LocalTime` scalar type represents a time of day without date or time zone information."
diff --git a/frontend/codegen.ts b/frontend/codegen.ts
index 550e6b6eb..3271a109a 100644
--- a/frontend/codegen.ts
+++ b/frontend/codegen.ts
@@ -6,12 +6,15 @@ const scalars = {
     output: "string",
   },
   Any: "object",
+  ArXiv: "string",
   Byte: "number",
   DateTime: "string",
   DateTimeZone: "string",
   Decimal: "string",
+  Doi: "string",
   Duration: "string",
   EmailAddress: "string",
+  GraphQlQuery: "string",
   LocalDate: "string",
   LocalDateTime: "string",
   LocalTime: "string",
diff --git a/frontend/queries/data.graphql b/frontend/queries/data.graphql
index bc07c769f..c23f7bad4 100644
--- a/frontend/queries/data.graphql
+++ b/frontend/queries/data.graphql
@@ -137,7 +137,7 @@ query CalorimetricData($databaseId: Uuid!, $id: Uuid!) {
 }
 
 query AllCalorimetricData(
-  $first: NonNegativeInt!
+  $first: Int!
   $after: String
   $where: CalorimetricDataPropositionInput
 ) {
@@ -171,7 +171,7 @@ query GeometricData($databaseId: Uuid!, $id: Uuid!) {
 }
 
 query AllGeometricData(
-  $first: NonNegativeInt!
+  $first: Int!
   $after: String
   $where: GeometricDataPropositionInput
 ) {
@@ -204,7 +204,7 @@ query HygrothermalData($databaseId: Uuid!, $id: Uuid!) {
 }
 
 query AllHygrothermalData(
-  $first: NonNegativeInt!
+  $first: Int!
   $after: String
   $where: HygrothermalDataPropositionInput
 ) {
@@ -237,7 +237,7 @@ query LifeCycleData($databaseId: Uuid!, $id: Uuid!) {
 }
 
 query AllLifeCycleData(
-  $first: NonNegativeInt!
+  $first: Int!
   $after: String
   $where: LifeCycleDataPropositionInput
 ) {
@@ -284,7 +284,7 @@ query OpticalData($databaseId: Uuid!, $id: Uuid!) {
 }
 
 query AllOpticalData(
-  $first: NonNegativeInt!
+  $first: Int!
   $after: String
   $where: OpticalDataPropositionInput
 ) {
@@ -317,7 +317,7 @@ query PhotovoltaicData($databaseId: Uuid!, $id: Uuid!) {
 }
 
 query AllPhotovoltaicData(
-  $first: NonNegativeInt!
+  $first: Int!
   $after: String
   $where: PhotovoltaicDataPropositionInput
 ) {
diff --git a/frontend/type-defs.graphqls b/frontend/type-defs.graphqls
index 47e41bb12..fa86431e8 100644
--- a/frontend/type-defs.graphqls
+++ b/frontend/type-defs.graphqls
@@ -7,48 +7,48 @@ type Query {
   allCalorimetricData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: String
     where: CalorimetricDataPropositionInput
   ): CalorimetricDataConnection! @cost(weight: "10")
   allGeometricData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: String
     where: GeometricDataPropositionInput
   ): GeometricDataConnection! @cost(weight: "10")
   allHygrothermalData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: String
     where: HygrothermalDataPropositionInput
   ): HygrothermalDataConnection! @cost(weight: "10")
   allLifeCycleData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: String
     where: LifeCycleDataPropositionInput
   ): LifeCycleDataConnection! @cost(weight: "10")
   allOpticalData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: String
     where: OpticalDataPropositionInput
   ): OpticalDataConnection! @cost(weight: "10")
   allPhotovoltaicData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: String
     where: PhotovoltaicDataPropositionInput
   ): PhotovoltaicDataConnection! @cost(weight: "10")
@@ -685,7 +685,7 @@ type CalorimetricData implements Node & Data {
 type CalorimetricDataConnection {
   edges: [CalorimetricDataEdge!]! @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type CalorimetricDataEdge {
@@ -784,7 +784,7 @@ type Component implements Node {
 type ComponentAssembledOfConnection {
   edges: [ComponentAssembledOfEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type ComponentAssembledOfEdge {
@@ -798,7 +798,7 @@ type ComponentAssembledOfEdge {
 type ComponentConcretizationOfConnection {
   edges: [ComponentConcretizationOfEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type ComponentConcretizationOfEdge {
@@ -809,7 +809,7 @@ type ComponentConcretizationOfEdge {
 type ComponentGeneralizationOfConnection {
   edges: [ComponentGeneralizationOfEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type ComponentGeneralizationOfEdge {
@@ -824,7 +824,7 @@ type ComponentManagerEdge {
 type ComponentManufacturerConnection {
   edges: [ComponentManufacturerEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type ComponentManufacturerEdge {
@@ -836,7 +836,7 @@ type ComponentManufacturerEdge {
 type ComponentPartOfConnection {
   edges: [ComponentPartOfEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type ComponentPartOfEdge {
@@ -868,7 +868,7 @@ type ComponentsEdge {
 type ComponentVariantOfConnection {
   edges: [ComponentVariantOfEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type ComponentVariantOfEdge {
@@ -1047,7 +1047,7 @@ type DataApproval implements Approval {
   approverId: Uuid!
   keyFingerprint: String!
   message: String!
-  query: String!
+  query: GraphQlQuery!
   signature: String!
   statement: Reference!
   timestamp: DateTime!
@@ -1058,48 +1058,48 @@ type Database implements Node {
   allCalorimetricData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: Locale
     where: CalorimetricDataPropositionInput
   ): CalorimetricDataConnection @cost(weight: "10")
   allGeometricData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: Locale
     where: GeometricDataPropositionInput
   ): GeometricDataConnection @cost(weight: "10")
   allHygrothermalData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: Locale
     where: HygrothermalDataPropositionInput
   ): HygrothermalDataConnection @cost(weight: "10")
   allLifeCycleData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: Locale
     where: LifeCycleDataPropositionInput
   ): LifeCycleDataConnection @cost(weight: "10")
   allOpticalData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: Locale
     where: OpticalDataPropositionInput
   ): OpticalDataConnection @cost(weight: "10")
   allPhotovoltaicData(
     after: String
     before: String
-    first: NonNegativeInt
-    last: NonNegativeInt
+    first: Int
+    last: Int
     locale: Locale
     where: PhotovoltaicDataPropositionInput
   ): PhotovoltaicDataConnection @cost(weight: "10")
@@ -1163,17 +1163,6 @@ type DatabasesEdge {
   node: Database!
 }
 
-type DataConnection {
-  edges: [DataEdge!]! @cost(weight: "0")
-  pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
-}
-
-type DataEdge {
-  cursor: String!
-  node: Data! @cost(weight: "0")
-}
-
 type DataFormat implements Node {
   createdAt: DateTime!
   description: String!
@@ -1384,7 +1373,7 @@ type GeometricData implements Node & Data {
 type GeometricDataConnection {
   edges: [GeometricDataEdge!]! @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type GeometricDataEdge {
@@ -1483,7 +1472,7 @@ type HygrothermalData implements Node & Data {
 type HygrothermalDataConnection {
   edges: [HygrothermalDataEdge!]! @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type HygrothermalDataEdge {
@@ -1646,7 +1635,7 @@ type InstitutionDevelopedMethodEdge {
 type InstitutionGnuPgKeyFingerprintConnection {
   edges: [InstitutionGnuPgKeyFingerprintEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type InstitutionGnuPgKeyFingerprintEdge {
@@ -1725,7 +1714,7 @@ type InstitutionMethodDeveloperEdge {
 type InstitutionOperatedDatabaseConnection {
   edges: [InstitutionOperatedDatabaseEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type InstitutionOperatedDatabaseEdge {
@@ -1736,7 +1725,7 @@ type InstitutionOwnedOpenIdConnectApplicationConnection {
   edges: [InstitutionOwnedOpenIdConnectApplicationEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
   isAuthorizedToRemoveEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type InstitutionOwnedOpenIdConnectApplicationEdge {
@@ -1747,7 +1736,7 @@ type InstitutionOwnedOpenIdConnectApplicationEdge {
 type InstitutionRepresentativeConnection {
   edges: [InstitutionRepresentativeEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type InstitutionRepresentativeEdge {
@@ -1799,7 +1788,7 @@ type LifeCycleData implements Node & Data {
 type LifeCycleDataConnection {
   edges: [LifeCycleDataEdge!]! @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type LifeCycleDataEdge {
@@ -1886,7 +1875,7 @@ type MethodDeveloperConnection {
   edges: [MethodDeveloperEdge!]! @cost(weight: "10")
   isAuthorizedToAddInstitutionEdge: Boolean! @cost(weight: "1")
   isAuthorizedToAddUserEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  totalCount: Int! @cost(weight: "10")
 }
 
 type MethodDeveloperEdge {
@@ -1980,7 +1969,7 @@ type OpenIdConnectApplication implements Node {
 
 type OpenIdConnectApplicationGrantedAuthorizationConnection {
   edges: [OpenIdConnectApplicationGrantedAuthorizationEdge!]! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type OpenIdConnectApplicationGrantedAuthorizationEdge {
@@ -1989,7 +1978,7 @@ type OpenIdConnectApplicationGrantedAuthorizationEdge {
 
 type OpenIdConnectApplicationIssuedTokenConnection {
   edges: [OpenIdConnectApplicationIssuedTokenEdge!]! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type OpenIdConnectApplicationIssuedTokenEdge {
@@ -2038,7 +2027,7 @@ type OpenIdConnectAuthorizationApplicationEdge {
 
 type OpenIdConnectAuthorizationIssuedTokenConnection {
   edges: [OpenIdConnectAuthorizationIssuedTokenEdge!]! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type OpenIdConnectAuthorizationIssuedTokenEdge {
@@ -2139,7 +2128,7 @@ type OpticalData implements Node & Data {
 type OpticalDataConnection {
   edges: [OpticalDataEdge!]! @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type OpticalDataEdge {
@@ -2162,7 +2151,7 @@ type PageInfo {
 type PendingComponentManufacturerConnection {
   edges: [ComponentManufacturerEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 "A connection to a list of items."
@@ -2200,7 +2189,7 @@ type PendingInstitutionManufacturedComponentConnection {
 type PendingInstitutionRepresentativeConnection {
   edges: [InstitutionRepresentativeEdge!]! @cost(weight: "0")
   isAuthorizedToAddEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 "A connection to a list of items."
@@ -2225,7 +2214,7 @@ type PendingMethodDeveloperConnection {
   edges: [MethodDeveloperEdge!]! @cost(weight: "10")
   isAuthorizedToAddInstitutionEdge: Boolean! @cost(weight: "1")
   isAuthorizedToAddUserEdge: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt! @cost(weight: "10")
+  totalCount: Int! @cost(weight: "10")
 }
 
 type PendingUserDevelopedMethodConnection {
@@ -2238,7 +2227,7 @@ type PendingUserDevelopedMethodConnection {
 type PendingUserRepresentedInstitutionConnection {
   edges: [UserRepresentedInstitutionEdge!]! @cost(weight: "0")
   isAuthorizedToConfirmEdges: Boolean! @cost(weight: "1")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type PhotovoltaicData implements Node & Data {
@@ -2266,7 +2255,7 @@ type PhotovoltaicData implements Node & Data {
 type PhotovoltaicDataConnection {
   edges: [PhotovoltaicDataEdge!]! @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type PhotovoltaicDataEdge {
@@ -2282,16 +2271,16 @@ type PrimeSurfaceOrDirection {
 type Publication {
   abstract: String
   "The website arXiv.org is a free and open-access archive for publications. The arXiv identifier can be used to define a publication."
-  arXiv: String
+  arXiv: ArXiv
   authors: [String!]
   "The Digital Object Identifier (DOI) is a very important persistent identifier for publications. It MUST be defined here if it is available for a publication."
-  doi: String
+  doi: Doi
   "Referenced section"
   section: String
   title: String
-  "A Uniform Resource Name (URN) can be used to define a publication. TODO: Improve the regex pattern to further restrict the string."
-  urn: String
-  "If a persistent identifier like DOI is defined above, this webAdress can define a convenient web address to access the publication. However, if no persistent identifier exist, this web address is the only identifier of this publication. In this case, it is important to choose a web address with a high probability to persist long."
+  "A Uniform Resource Name (URN) can be used to define a publication."
+  urn: Url
+  "If a persistent identifier like DOI is defined above, this web address can define a convenient web address to access the publication. However, if no persistent identifier exist, this web address is the only identifier of this publication. In this case, it is important to choose a web address with a high probability to persist long."
   webAddress: Url
 }
 
@@ -2740,7 +2729,7 @@ type UserDevelopedMethodEdge {
 
 type UserGnuPgKeyFingerprintConnection {
   edges: [UserGnuPgKeyFingerprintEdge!]! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type UserGnuPgKeyFingerprintEdge {
@@ -2755,7 +2744,7 @@ type UserMethodDeveloperEdge {
 
 type UserRepresentedInstitutionConnection {
   edges: [UserRepresentedInstitutionEdge!]! @cost(weight: "0")
-  totalCount: NonNegativeInt!
+  totalCount: Int!
 }
 
 type UserRepresentedInstitutionEdge {
@@ -2810,7 +2799,7 @@ interface Approval {
   approverId: Uuid!
   keyFingerprint: String!
   message: String!
-  query: String!
+  query: GraphQlQuery!
   signature: String!
   timestamp: DateTime!
   variables: Any!
@@ -2991,7 +2980,7 @@ input ComponentAssembledOfFilterInput {
   index: ByteFilterInput
   or: [ComponentAssembledOfFilterInput!]
   partComponent: ComponentFilterInput
-  primeSurface: NullableOfPrimeSurfaceFilterInput
+  primeSurface: PrimeSurfaceFilterInput
   updatedAt: DateTimeFilterInput
 }
 
@@ -3002,6 +2991,13 @@ input ComponentAssembledOfSortInput {
   updatedAt: SortEnumType @cost(weight: "10")
 }
 
+input ComponentAssembliesFilterInput {
+  all: ComponentAssembledOfFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: ComponentAssembledOfFilterInput @cost(weight: "10")
+  some: ComponentAssembledOfFilterInput @cost(weight: "10")
+}
+
 input ComponentCategoryFilterInput {
   equalTo: ComponentCategory @cost(weight: "10")
   in: [ComponentCategory!] @cost(weight: "10")
@@ -3033,23 +3029,23 @@ input ComponentFilterInput {
   abbreviation: StringFilterInput
   and: [ComponentFilterInput!]
   categories: ComponentCategorysFilterInput
-  concretizations: FilterInputTypeOfComponentsFilterInput
+  concretizations: ComponentsFilterInput
   createdAt: DateTimeFilterInput
   description: StringFilterInput
   extras: JsonElementFilterInput
-  generalizations: FilterInputTypeOfComponentsFilterInput
+  generalizations: ComponentsFilterInput
   id: UuidFilterInput
   manager: InstitutionFilterInput
-  manufacturerEdges: FilterInputTypeOfComponentManufacturersFilterInput
-  manufacturers: FilterInputTypeOfInstitutionsFilterInput
+  manufacturerEdges: ComponentManufacturersFilterInput
+  manufacturers: InstitutionsFilterInput
   name: StringFilterInput
   or: [ComponentFilterInput!]
-  partEdges: FilterInputTypeOfComponentAssemblysFilterInput
-  partOf: FilterInputTypeOfComponentsFilterInput
-  partOfEdges: FilterInputTypeOfComponentAssemblysFilterInput
-  parts: FilterInputTypeOfComponentsFilterInput
+  partEdges: ComponentAssembliesFilterInput
+  partOf: ComponentsFilterInput
+  partOfEdges: ComponentAssembliesFilterInput
+  parts: ComponentsFilterInput
   updatedAt: DateTimeFilterInput
-  variants: FilterInputTypeOfComponentsFilterInput
+  variants: ComponentsFilterInput
 }
 
 input ComponentGeneralizationOfFilterInput {
@@ -3073,6 +3069,13 @@ input ComponentManufacturerFilterInput {
   updatedAt: DateTimeFilterInput
 }
 
+input ComponentManufacturersFilterInput {
+  all: ComponentManufacturerFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: ComponentManufacturerFilterInput @cost(weight: "10")
+  some: ComponentManufacturerFilterInput @cost(weight: "10")
+}
+
 input ComponentManufacturerSortInput {
   createdAt: SortEnumType @cost(weight: "10")
   updatedAt: SortEnumType @cost(weight: "10")
@@ -3084,7 +3087,7 @@ input ComponentPartOfFilterInput {
   createdAt: DateTimeFilterInput
   index: ByteFilterInput
   or: [ComponentPartOfFilterInput!]
-  primeSurface: NullableOfPrimeSurfaceFilterInput
+  primeSurface: PrimeSurfaceFilterInput
   updatedAt: DateTimeFilterInput
 }
 
@@ -3095,6 +3098,13 @@ input ComponentPartOfSortInput {
   updatedAt: SortEnumType @cost(weight: "10")
 }
 
+input ComponentsFilterInput {
+  all: ComponentFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: ComponentFilterInput @cost(weight: "10")
+  some: ComponentFilterInput @cost(weight: "10")
+}
+
 input ComponentSortInput {
   abbreviation: SortEnumType @cost(weight: "10")
   createdAt: SortEnumType @cost(weight: "10")
@@ -3256,6 +3266,13 @@ input DatabaseFilterInput {
   updatedAt: DateTimeFilterInput
 }
 
+input DatabasesFilterInput {
+  all: DatabaseFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: DatabaseFilterInput @cost(weight: "10")
+  some: DatabaseFilterInput @cost(weight: "10")
+}
+
 input DatabaseSortInput {
   createdAt: SortEnumType @cost(weight: "10")
   description: SortEnumType @cost(weight: "10")
@@ -3279,6 +3296,13 @@ input DataFormatFilterInput {
   updatedAt: DateTimeFilterInput
 }
 
+input DataFormatsFilterInput {
+  all: DataFormatFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: DataFormatFilterInput @cost(weight: "10")
+  some: DataFormatFilterInput @cost(weight: "10")
+}
+
 input DataFormatSortInput {
   createdAt: SortEnumType @cost(weight: "10")
   description: SortEnumType @cost(weight: "10")
@@ -3392,97 +3416,6 @@ input FilesMetaInformationPropositionInput {
   some: FileMetaInformationPropositionInput
 }
 
-input FilterInputTypeOfComponentAssemblysFilterInput {
-  all: ComponentAssembledOfFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: ComponentAssembledOfFilterInput @cost(weight: "10")
-  some: ComponentAssembledOfFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfComponentManufacturersFilterInput {
-  all: ComponentManufacturerFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: ComponentManufacturerFilterInput @cost(weight: "10")
-  some: ComponentManufacturerFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfComponentsFilterInput {
-  all: ComponentFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: ComponentFilterInput @cost(weight: "10")
-  some: ComponentFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfDatabasesFilterInput {
-  all: DatabaseFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: DatabaseFilterInput @cost(weight: "10")
-  some: DatabaseFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfDataFormatsFilterInput {
-  all: DataFormatFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: DataFormatFilterInput @cost(weight: "10")
-  some: DataFormatFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfGnuPgKeyFingerprintsFilterInput {
-  all: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
-  some: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfInstitutionMethodDevelopersFilterInput {
-  all: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
-  some: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfInstitutionRepresentativesFilterInput {
-  all: InstitutionRepresentativeFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: InstitutionRepresentativeFilterInput @cost(weight: "10")
-  some: InstitutionRepresentativeFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfInstitutionsFilterInput {
-  all: InstitutionFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: InstitutionFilterInput @cost(weight: "10")
-  some: InstitutionFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfMethodsFilterInput {
-  all: InstitutionManagedMethodFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: InstitutionManagedMethodFilterInput @cost(weight: "10")
-  some: InstitutionManagedMethodFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfOpenIdConnectTokensFilterInput {
-  all: OpenIdConnectTokenFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: OpenIdConnectTokenFilterInput @cost(weight: "10")
-  some: OpenIdConnectTokenFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfUserMethodDevelopersFilterInput {
-  all: UserDevelopedMethodFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: UserDevelopedMethodFilterInput @cost(weight: "10")
-  some: UserDevelopedMethodFilterInput @cost(weight: "10")
-}
-
-input FilterInputTypeOfUsersFilterInput {
-  all: UserFilterInput @cost(weight: "10")
-  any: Boolean @cost(weight: "10")
-  none: UserFilterInput @cost(weight: "10")
-  some: UserFilterInput @cost(weight: "10")
-}
-
 input FloatFilterInput {
   equalTo: Float @cost(weight: "10")
   greaterThan: Float @cost(weight: "10")
@@ -3549,6 +3482,13 @@ input GnuPgKeyFingerprintFilterInput {
   user: UserFilterInput
 }
 
+input GnuPgKeyFingerprintsFilterInput {
+  all: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
+  some: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
+}
+
 input GnuPgKeyFingerprintSortInput {
   allowedAt: SortEnumType @cost(weight: "10")
   createdAt: SortEnumType @cost(weight: "10")
@@ -3585,22 +3525,22 @@ input InstitutionFilterInput {
   contact: ContactInformationFilterInput
   createdAt: DateTimeFilterInput
   description: StringFilterInput
-  developedMethodEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  developedMethods: FilterInputTypeOfMethodsFilterInput
+  developedMethodEdges: InstitutionMethodDevelopersFilterInput
+  developedMethods: MethodsFilterInput
   extras: JsonElementFilterInput
-  gnuPgKeyFingerprints: FilterInputTypeOfGnuPgKeyFingerprintsFilterInput
+  gnuPgKeyFingerprints: GnuPgKeyFingerprintsFilterInput
   id: UuidFilterInput
-  managedDataFormats: FilterInputTypeOfDataFormatsFilterInput
-  managedInstitutions: FilterInputTypeOfInstitutionsFilterInput
-  managedMethods: FilterInputTypeOfMethodsFilterInput
+  managedDataFormats: DataFormatsFilterInput
+  managedInstitutions: InstitutionsFilterInput
+  managedMethods: MethodsFilterInput
   manager: InstitutionFilterInput
-  manufacturedComponentEdges: FilterInputTypeOfComponentManufacturersFilterInput
-  manufacturedComponents: FilterInputTypeOfComponentsFilterInput
+  manufacturedComponentEdges: ComponentManufacturersFilterInput
+  manufacturedComponents: ComponentsFilterInput
   name: StringFilterInput
-  operatedDatabases: FilterInputTypeOfDatabasesFilterInput
+  operatedDatabases: DatabasesFilterInput
   or: [InstitutionFilterInput!]
-  representativeEdges: FilterInputTypeOfInstitutionRepresentativesFilterInput
-  representatives: FilterInputTypeOfUsersFilterInput
+  representativeEdges: InstitutionRepresentativesFilterInput
+  representatives: UsersFilterInput
   state: InstitutionStateFilterInput
   updatedAt: DateTimeFilterInput
 }
@@ -3630,22 +3570,22 @@ input InstitutionManagedComponentFilterInput {
   abbreviation: StringFilterInput
   and: [InstitutionManagedComponentFilterInput!]
   categories: ComponentCategorysFilterInput
-  concretizations: FilterInputTypeOfComponentsFilterInput
+  concretizations: ComponentsFilterInput
   createdAt: DateTimeFilterInput
   description: StringFilterInput
   extras: JsonElementFilterInput
-  generalizations: FilterInputTypeOfComponentsFilterInput
+  generalizations: ComponentsFilterInput
   id: UuidFilterInput
-  manufacturerEdges: FilterInputTypeOfComponentManufacturersFilterInput
-  manufacturers: FilterInputTypeOfInstitutionsFilterInput
+  manufacturerEdges: ComponentManufacturersFilterInput
+  manufacturers: InstitutionsFilterInput
   name: StringFilterInput
   or: [InstitutionManagedComponentFilterInput!]
-  partEdges: FilterInputTypeOfComponentAssemblysFilterInput
-  partOf: FilterInputTypeOfComponentsFilterInput
-  partOfEdges: FilterInputTypeOfComponentAssemblysFilterInput
-  parts: FilterInputTypeOfComponentsFilterInput
+  partEdges: ComponentAssembliesFilterInput
+  partOf: ComponentsFilterInput
+  partOfEdges: ComponentAssembliesFilterInput
+  parts: ComponentsFilterInput
   updatedAt: DateTimeFilterInput
-  variants: FilterInputTypeOfComponentsFilterInput
+  variants: ComponentsFilterInput
 }
 
 input InstitutionManagedComponentSortInput {
@@ -3687,21 +3627,21 @@ input InstitutionManagedInstitutionFilterInput {
   contact: ContactInformationFilterInput
   createdAt: DateTimeFilterInput
   description: StringFilterInput
-  developedMethodEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  developedMethods: FilterInputTypeOfMethodsFilterInput
+  developedMethodEdges: InstitutionMethodDevelopersFilterInput
+  developedMethods: MethodsFilterInput
   extras: JsonElementFilterInput
-  gnuPgKeyFingerprints: FilterInputTypeOfGnuPgKeyFingerprintsFilterInput
+  gnuPgKeyFingerprints: GnuPgKeyFingerprintsFilterInput
   id: UuidFilterInput
-  managedDataFormats: FilterInputTypeOfDataFormatsFilterInput
-  managedInstitutions: FilterInputTypeOfInstitutionsFilterInput
-  managedMethods: FilterInputTypeOfMethodsFilterInput
-  manufacturedComponentEdges: FilterInputTypeOfComponentManufacturersFilterInput
-  manufacturedComponents: FilterInputTypeOfComponentsFilterInput
+  managedDataFormats: DataFormatsFilterInput
+  managedInstitutions: InstitutionsFilterInput
+  managedMethods: MethodsFilterInput
+  manufacturedComponentEdges: ComponentManufacturersFilterInput
+  manufacturedComponents: ComponentsFilterInput
   name: StringFilterInput
-  operatedDatabases: FilterInputTypeOfDatabasesFilterInput
+  operatedDatabases: DatabasesFilterInput
   or: [InstitutionManagedInstitutionFilterInput!]
-  representativeEdges: FilterInputTypeOfInstitutionRepresentativesFilterInput
-  representatives: FilterInputTypeOfUsersFilterInput
+  representativeEdges: InstitutionRepresentativesFilterInput
+  representatives: UsersFilterInput
   state: InstitutionStateFilterInput
   updatedAt: DateTimeFilterInput
 }
@@ -3724,13 +3664,13 @@ input InstitutionManagedMethodFilterInput {
   createdAt: DateTimeFilterInput
   description: StringFilterInput
   id: UuidFilterInput
-  institutionDeveloperEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  institutionDevelopers: FilterInputTypeOfInstitutionsFilterInput
+  institutionDeveloperEdges: InstitutionMethodDevelopersFilterInput
+  institutionDevelopers: InstitutionsFilterInput
   name: StringFilterInput
   or: [InstitutionManagedMethodFilterInput!]
   updatedAt: DateTimeFilterInput
-  userDeveloperEdges: FilterInputTypeOfUserMethodDevelopersFilterInput
-  userDevelopers: FilterInputTypeOfUsersFilterInput
+  userDeveloperEdges: UserMethodDevelopersFilterInput
+  userDevelopers: UsersFilterInput
 }
 
 input InstitutionManagedMethodSortInput {
@@ -3755,6 +3695,13 @@ input InstitutionManufacturedComponentSortInput {
   updatedAt: SortEnumType @cost(weight: "10")
 }
 
+input InstitutionMethodDevelopersFilterInput {
+  all: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
+  some: InstitutionDevelopedMethodFilterInput @cost(weight: "10")
+}
+
 input InstitutionOperatedDatabaseFilterInput {
   and: [InstitutionOperatedDatabaseFilterInput!]
   createdAt: DateTimeFilterInput
@@ -3813,12 +3760,26 @@ input InstitutionRepresentativeRoleFilterInput {
   notIn: [InstitutionRepresentativeRole!] @cost(weight: "10")
 }
 
+input InstitutionRepresentativesFilterInput {
+  all: InstitutionRepresentativeFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: InstitutionRepresentativeFilterInput @cost(weight: "10")
+  some: InstitutionRepresentativeFilterInput @cost(weight: "10")
+}
+
 input InstitutionRepresentativeSortInput {
   createdAt: SortEnumType @cost(weight: "10")
   role: SortEnumType @cost(weight: "10")
   updatedAt: SortEnumType @cost(weight: "10")
 }
 
+input InstitutionsFilterInput {
+  all: InstitutionFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: InstitutionFilterInput @cost(weight: "10")
+  some: InstitutionFilterInput @cost(weight: "10")
+}
+
 input InstitutionSortInput {
   abbreviation: SortEnumType @cost(weight: "10")
   contact: ContactInformationSortInput @cost(weight: "10")
@@ -3980,14 +3941,14 @@ input MethodFilterInput {
   createdAt: DateTimeFilterInput
   description: StringFilterInput
   id: UuidFilterInput
-  institutionDeveloperEdges: FilterInputTypeOfInstitutionMethodDevelopersFilterInput
-  institutionDevelopers: FilterInputTypeOfInstitutionsFilterInput
+  institutionDeveloperEdges: InstitutionMethodDevelopersFilterInput
+  institutionDevelopers: InstitutionsFilterInput
   manager: InstitutionFilterInput
   name: StringFilterInput
   or: [MethodFilterInput!]
   updatedAt: DateTimeFilterInput
-  userDeveloperEdges: FilterInputTypeOfUserMethodDevelopersFilterInput
-  userDevelopers: FilterInputTypeOfUsersFilterInput
+  userDeveloperEdges: UserMethodDevelopersFilterInput
+  userDevelopers: UsersFilterInput
 }
 
 input MethodParameterInput {
@@ -3995,6 +3956,13 @@ input MethodParameterInput {
   type: Any!
 }
 
+input MethodsFilterInput {
+  all: InstitutionManagedMethodFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: InstitutionManagedMethodFilterInput @cost(weight: "10")
+  some: InstitutionManagedMethodFilterInput @cost(weight: "10")
+}
+
 input MethodSortInput {
   calculationLocator: UriSortInput @cost(weight: "10")
   createdAt: SortEnumType @cost(weight: "10")
@@ -4025,13 +3993,6 @@ input NonNegativeIntFilterInput {
   notLessThanOrEqualTo: NonNegativeInt @cost(weight: "10")
 }
 
-input NullableOfPrimeSurfaceFilterInput {
-  equalTo: PrimeSurface @cost(weight: "10")
-  in: [PrimeSurface] @cost(weight: "10")
-  notEqualTo: PrimeSurface @cost(weight: "10")
-  notIn: [PrimeSurface] @cost(weight: "10")
-}
-
 input NumerationInput {
   mainNumber: String!
   prefix: String
@@ -4074,7 +4035,7 @@ input OpenIdConnectAuthorizationFilterInput {
   or: [OpenIdConnectAuthorizationFilterInput!]
   status: StringFilterInput
   subject: StringFilterInput
-  tokens: FilterInputTypeOfOpenIdConnectTokensFilterInput
+  tokens: OpenIdConnectTokensFilterInput
   type: StringFilterInput
   updatedAt: DateTimeFilterInput
 }
@@ -4103,6 +4064,13 @@ input OpenIdConnectTokenFilterInput {
   updatedAt: DateTimeFilterInput
 }
 
+input OpenIdConnectTokensFilterInput {
+  all: OpenIdConnectTokenFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: OpenIdConnectTokenFilterInput @cost(weight: "10")
+  some: OpenIdConnectTokenFilterInput @cost(weight: "10")
+}
+
 input OpenIdConnectTokenSortInput {
   createdAt: SortEnumType @cost(weight: "10")
   expiredAt: SortEnumType @cost(weight: "10")
@@ -4154,18 +4122,25 @@ input PhotovoltaicDataPropositionInput {
   resources: GetHttpsResourcesPropositionInput
 }
 
+input PrimeSurfaceFilterInput {
+  equalTo: PrimeSurface @cost(weight: "10")
+  in: [PrimeSurface] @cost(weight: "10")
+  notEqualTo: PrimeSurface @cost(weight: "10")
+  notIn: [PrimeSurface] @cost(weight: "10")
+}
+
 input PublicationInput {
   abstract: String
-  arXiv: String
+  arXiv: ArXiv
   authors: [String!]
-  doi: String
+  doi: Doi
   section: String
   title: String
-  urn: String
+  urn: Url
   webAddress: Url
 }
 
-input ReferenceInput {
+input ReferenceInput @oneOf {
   publication: PublicationInput
   standard: StandardInput
 }
@@ -4433,14 +4408,14 @@ input UserDevelopedMethodSortInput {
 input UserFilterInput {
   and: [UserFilterInput!]
   createdAt: DateTimeFilterInput
-  developedMethodEdges: FilterInputTypeOfUserMethodDevelopersFilterInput
-  developedMethods: FilterInputTypeOfMethodsFilterInput
+  developedMethodEdges: UserMethodDevelopersFilterInput
+  developedMethods: MethodsFilterInput
   id: UuidFilterInput
   "Full name"
   name: StringFilterInput
   or: [UserFilterInput!]
-  representedInstitutionEdges: FilterInputTypeOfInstitutionRepresentativesFilterInput
-  representedInstitutions: FilterInputTypeOfInstitutionsFilterInput
+  representedInstitutionEdges: InstitutionRepresentativesFilterInput
+  representedInstitutions: InstitutionsFilterInput
   updatedAt: DateTimeFilterInput
 }
 
@@ -4465,6 +4440,13 @@ input UserGnuPgKeyFingerprintSortInput {
   updatedAt: SortEnumType @cost(weight: "10")
 }
 
+input UserMethodDevelopersFilterInput {
+  all: UserDevelopedMethodFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: UserDevelopedMethodFilterInput @cost(weight: "10")
+  some: UserDevelopedMethodFilterInput @cost(weight: "10")
+}
+
 input UserRepresentedInstitutionFilterInput {
   and: [UserRepresentedInstitutionFilterInput!]
   createdAt: DateTimeFilterInput
@@ -4480,6 +4462,13 @@ input UserRepresentedInstitutionSortInput {
   updatedAt: SortEnumType @cost(weight: "10")
 }
 
+input UsersFilterInput {
+  all: UserFilterInput @cost(weight: "10")
+  any: Boolean @cost(weight: "10")
+  none: UserFilterInput @cost(weight: "10")
+  some: UserFilterInput @cost(weight: "10")
+}
+
 input UserSortInput {
   createdAt: SortEnumType @cost(weight: "10")
   id: SortEnumType @cost(weight: "10")
@@ -5239,6 +5228,12 @@ enum VerifyInstitutionErrorCode {
 
 scalar Any @specifiedBy(url: "https://scalars.graphql.org/chillicream/any.html")
 
+"""
+arXiv identifier, that is, a string of the format
+[Understanding the arXiv identifier](https://info.arxiv.org/help/arxiv_identifier.html).
+"""
+scalar ArXiv
+
 "The `Byte` scalar type represents a signed 8-bit integer."
 scalar Byte
   @specifiedBy(url: "https://scalars.graphql.org/chillicream/byte.html")
@@ -5251,6 +5246,21 @@ scalar DateTime
 scalar Decimal
   @specifiedBy(url: "https://scalars.graphql.org/chillicream/decimal.html")
 
+"""
+Digital Object Identifier (DOI) name, that is, a string compliant with [ISO
+26324:2025](https://www.iso.org/standard/88862.html).
+
+See also
+[What is a DOI?](https://www.doi.org/the-identifier/what-is-a-doi/). In short,
+a DOI name is a digital identifier of an object, any object — physical,
+digital, or abstract. DOIs solve a common problem: keeping track of things.
+Things can be matter, material, content, or activities. Designed to be used by
+humans as well as machines, DOIs identify objects persistently. They allow
+things to be uniquely identified and accessed reliably. You know what you have,
+where it is, and others can track it too.
+"""
+scalar Doi
+
 "The `Duration` scalar type represents a duration of time."
 scalar Duration
   @specifiedBy(url: "https://scalars.graphql.org/chillicream/duration.html")
@@ -5258,6 +5268,16 @@ scalar Duration
 "The EmailAddress scalar type constitutes a valid email address, represented as a UTF-8 character sequence. The scalar follows the specification defined by the HTML Spec https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address."
 scalar EmailAddress
 
+"""
+[September 2025 GraphQL](https://spec.graphql.org/September2025/)
+compliant
+[query](https://spec.graphql.org/September2025/#sec-Language.Operations)
+string without
+[variables](http://spec.graphql.org/September2025/#sec-Language.Variables)
+and without unnecessary white-space for the present schema.
+"""
+scalar GraphQlQuery
+
 "The `LocalDate` scalar type represents a date without time or time zone information."
 scalar LocalDate
   @specifiedBy(url: "https://scalars.graphql.org/chillicream/local-date.html")
@@ -5268,7 +5288,22 @@ scalar LocalDateTime
     url: "https://scalars.graphql.org/chillicream/local-date-time.html"
   )
 
-"BCP 47 compliant Language Tag string"
+"""
+[BCP 47](https://tools.ietf.org/html/bcp47)
+compliant
+[Language Tag](https://tools.ietf.org/html/bcp47#section-2)
+string like `"de-AT"`, `"sr-Latn-RS"`, `"en-US"`, or `"en-GB"`, where the language
+part is essentially an
+[ISO 639 Language Code](https://www.iso.org/iso-639-language-codes.html),
+the script an
+[ISO 15924:2004 Script Code](https://www.iso.org/standard/29546.html),
+and the region an
+[ISO 3166-1 Country Code](https://www.iso.org/iso-3166-country-codes.html).
+Note that the
+[Internet Assigned Numbers Authority (IANA)](https://www.iana.org)
+maintains the
+[Language Subtag Registry](https://www.iana.org/assignments/lang-subtags-templates/lang-subtags-templates.xhtml).
+"""
 scalar Locale
 
 "The `LocalTime` scalar type represents a time of day without date or time zone information."

From 10f7fcc3c52514e8b6127f5d849992675fac2e1f Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sat, 20 Jun 2026 13:26:26 +0200
Subject: [PATCH 103/145] Mention breaking changes from
 https://github.com/building-envelope-data/metabase/pull/274 in changelog

---
 CHANGELOG.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13a1503c2..c0ff11e40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,7 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
--
+- **BREAKING**: Use `String` for cursors and `Int` for `first` and `last` parameters to conform to the Relay connection specification, simplify GraphQL filter input type names, and correct plural names ending before in `ys` and now in `ies` [#274](https://github.com/building-envelope-data/metabase/pull/274)
 -
 -
 -
@@ -155,9 +155,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [v1.0.0] - 2022-02-28
 
 [Unreleased]: https://github.com/building-envelope-data/metabase/compare/v1.1.1...HEAD
-
 [v1.1.1]: https://github.com/building-envelope-data/metabase/compare/v1.1.0...v1.1.1
-
 [v1.1.0]: https://github.com/building-envelope-data/metabase/compare/v1.0.0...v1.1.0
-
 [v1.0.0]: https://github.com/building-envelope-data/metabase/compare/5e4c6579bc7b596502c0bc9318cf24435bed2c80...v1.0.0

From b6706e6823c4ec37f10154392d2e867bf1aed149 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sat, 20 Jun 2026 20:32:11 +0200
Subject: [PATCH 104/145] Add migration for switch to sequential UUIDs that was
 done in `ApplicationDbContext`

---
 ...60620182947_UseSequentialUuids.Designer.cs | 2298 +++++++++++++++++
 .../20260620182947_UseSequentialUuids.cs      |  261 ++
 .../ApplicationDbContextModelSnapshot.cs      |   24 +-
 backend/src/Migrations/migrate.sql            |   88 +
 ...t_to_20260620182947_UseSequentialUuids.sql |   88 +
 ...fMetabaseOpenIdConnectClientToImplicit.sql |   76 +
 6 files changed, 2823 insertions(+), 12 deletions(-)
 create mode 100644 backend/src/Migrations/20260620182947_UseSequentialUuids.Designer.cs
 create mode 100644 backend/src/Migrations/20260620182947_UseSequentialUuids.cs
 create mode 100644 backend/src/Migrations/migrate_from_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit_to_20260620182947_UseSequentialUuids.sql
 create mode 100644 backend/src/Migrations/rollback_from_20260620182947_UseSequentialUuids_to_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.sql

diff --git a/backend/src/Migrations/20260620182947_UseSequentialUuids.Designer.cs b/backend/src/Migrations/20260620182947_UseSequentialUuids.Designer.cs
new file mode 100644
index 000000000..593bec3a2
--- /dev/null
+++ b/backend/src/Migrations/20260620182947_UseSequentialUuids.Designer.cs
@@ -0,0 +1,2298 @@
+// <auto-generated />
+using System;
+using System.Text.Json;
+using Metabase.Data;
+using Metabase.Enumerations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Metabase.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20260620182947_UseSequentialUuids")]
+    partial class UseSequentialUuids
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("metabase")
+                .HasAnnotation("ProductVersion", "10.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "component_category", new[] { "layer", "material", "unit" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "database_verification_state", new[] { "pending", "verified" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_operating_state", new[] { "not_operating", "operating" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_representative_role", new[] { "assistant", "owner" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_state", new[] { "pending", "verified" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "method_category", new[] { "calculation", "measurement" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "prime_surface", new[] { "inside", "outside" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "standardizer", new[] { "aerc", "agi", "ashrae", "breeam", "bs", "bsi", "cen", "cie", "dgnb", "din", "dvwg", "iec", "ies", "ift", "iso", "jis", "leed", "nfrc", "riba", "ul", "unece", "vdi", "vff", "well" });
+            NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "pgcrypto");
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<string>("Abbreviation")
+                        .HasColumnType("text");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
+                        .HasColumnType("tstzrange");
+
+                    b.PrimitiveCollection<ComponentCategory[]>("Categories")
+                        .IsRequired()
+                        .HasColumnType("metabase.component_category[]");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<JsonElement?>("Extras")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("component", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentAssembly", b =>
+                {
+                    b.Property<Guid>("AssembledComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("PartComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<byte?>("Index")
+                        .HasColumnType("smallint");
+
+                    b.Property<PrimeSurface?>("PrimeSurface")
+                        .HasColumnType("metabase.prime_surface");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("AssembledComponentId", "PartComponentId");
+
+                    b.HasIndex("PartComponentId");
+
+                    b.ToTable("component_assembly", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentConcretizationAndGeneralization", b =>
+                {
+                    b.Property<Guid>("GeneralComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ConcreteComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("GeneralComponentId", "ConcreteComponentId");
+
+                    b.HasIndex("ConcreteComponentId");
+
+                    b.ToTable("component_concretization_and_generalization", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentManufacturer", b =>
+                {
+                    b.Property<Guid>("ComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("ComponentId", "InstitutionId");
+
+                    b.HasIndex("InstitutionId");
+
+                    b.ToTable("component_manufacturer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentVariant", b =>
+                {
+                    b.Property<Guid>("OfComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ToComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("OfComponentId", "ToComponentId");
+
+                    b.HasIndex("ToComponentId");
+
+                    b.ToTable("component_variant", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.DataFormat", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Extension")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("MediaType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SchemaLocator")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("data_format", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Database", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Locator")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OperatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("VerificationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DatabaseVerificationState>("VerificationState")
+                        .HasColumnType("metabase.database_verification_state");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OperatorId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("database", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.GnuPgKeyFingerprint", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<OffsetDateTime?>("AllowedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Fingerprint")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<OffsetDateTime?>("ForbiddenAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Fingerprint")
+                        .IsUnique();
+
+                    b.HasIndex("InstitutionId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("gnu_pg_fingerprint", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<string>("Abbreviation")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<JsonElement?>("Extras")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<InstitutionOperatingState>("OperatingState")
+                        .HasColumnType("metabase.institution_operating_state");
+
+                    b.Property<InstitutionState>("State")
+                        .HasColumnType("metabase.institution_state");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("institution", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionMethodDeveloper", b =>
+                {
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MethodId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("InstitutionId", "MethodId");
+
+                    b.HasIndex("MethodId");
+
+                    b.ToTable("institution_method_developer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionRepresentative", b =>
+                {
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<InstitutionRepresentativeRole>("Role")
+                        .HasColumnType("metabase.institution_representative_role");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("InstitutionId", "UserId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("institution_representative", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
+                        .HasColumnType("tstzrange");
+
+                    b.Property<string>("CalculationLocator")
+                        .HasColumnType("text");
+
+                    b.PrimitiveCollection<MethodCategory[]>("Categories")
+                        .IsRequired()
+                        .HasColumnType("metabase.method_category[]");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Validity")
+                        .HasColumnType("tstzrange");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("method", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<string>("ApplicationType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("ClientSecret")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClientType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ConsentType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayNames")
+                        .HasColumnType("text");
+
+                    b.Property<string>("JsonWebKeySet")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Permissions")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostLogoutRedirectUris")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RedirectUris")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Requirements")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Settings")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId")
+                        .IsUnique();
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("OpenIddictApplications", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTime?>("CreationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Scopes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Subject")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                    b.ToTable("OpenIddictAuthorizations", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectScope", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Descriptions")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayNames")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Resources")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("OpenIddictScopes", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AuthorizationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTime?>("CreationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("ExpirationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("RedemptionDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ReferenceId")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Status")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Subject")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuthorizationId");
+
+                    b.HasIndex("ReferenceId")
+                        .IsUnique();
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                    b.ToTable("OpenIddictTokens", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Role", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("role", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.RoleClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("role_claim", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PostalAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.Property<string>("WebsiteLocator")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("user", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("user_claim", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserLogin", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("user_login", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserMethodDeveloper", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MethodId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("UserId", "MethodId");
+
+                    b.HasIndex("MethodId");
+
+                    b.ToTable("user_method_developer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserRole", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("user_role", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserToken", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("user_token", "metabase");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedComponents")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "PrimeDirection", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "PrimeSurface", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "SwitchableLayers", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("PrimeDirection");
+
+                    b.Navigation("PrimeSurface");
+
+                    b.Navigation("SwitchableLayers");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentAssembly", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "AssembledComponent")
+                        .WithMany("PartEdges")
+                        .HasForeignKey("AssembledComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "PartComponent")
+                        .WithMany("PartOfEdges")
+                        .HasForeignKey("PartComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("AssembledComponent");
+
+                    b.Navigation("PartComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentConcretizationAndGeneralization", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "ConcreteComponent")
+                        .WithMany("GeneralizationEdges")
+                        .HasForeignKey("ConcreteComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "GeneralComponent")
+                        .WithMany("ConcretizationEdges")
+                        .HasForeignKey("GeneralComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ConcreteComponent");
+
+                    b.Navigation("GeneralComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentManufacturer", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "Component")
+                        .WithMany("ManufacturerEdges")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("ManufacturedComponentEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Institution");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentVariant", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "OfComponent")
+                        .WithMany("VariantEdges")
+                        .HasForeignKey("OfComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "ToComponent")
+                        .WithMany("VariantOfEdges")
+                        .HasForeignKey("ToComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("OfComponent");
+
+                    b.Navigation("ToComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.DataFormat", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedDataFormats")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.Reference", "Reference", b1 =>
+                        {
+                            b1.Property<Guid>("DataFormatId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("DataFormatId");
+
+                            b1.ToTable("data_format", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("DataFormatId");
+
+                            b1.OwnsOne("Metabase.Data.Publication", "Publication", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceDataFormatId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("ArXiv")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<string[]>("Authors")
+                                        .HasColumnType("text[]");
+
+                                    b2.Property<string>("Doi")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Urn")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("WebAddress")
+                                        .HasColumnType("text");
+
+                                    b2.HasKey("ReferenceDataFormatId");
+
+                                    b2.ToTable("data_format", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceDataFormatId");
+                                });
+
+                            b1.OwnsOne("Metabase.Data.Standard", "Standard", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceDataFormatId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Locator")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                        .IsRequired()
+                                        .HasColumnType("metabase.standardizer[]");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<int?>("Year")
+                                        .HasColumnType("integer");
+
+                                    b2.HasKey("ReferenceDataFormatId");
+
+                                    b2.ToTable("data_format", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceDataFormatId");
+
+                                    b2.OwnsOne("Metabase.Data.Numeration", "Numeration", b3 =>
+                                        {
+                                            b3.Property<Guid>("StandardReferenceDataFormatId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("MainNumber")
+                                                .IsRequired()
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Prefix")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Suffix")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("StandardReferenceDataFormatId");
+
+                                            b3.ToTable("data_format", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("StandardReferenceDataFormatId");
+                                        });
+
+                                    b2.Navigation("Numeration")
+                                        .IsRequired();
+                                });
+
+                            b1.Navigation("Publication");
+
+                            b1.Navigation("Standard");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("Reference");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Database", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Operator")
+                        .WithMany("OperatedDatabases")
+                        .HasForeignKey("OperatorId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Operator");
+                });
+
+            modelBuilder.Entity("Metabase.Data.GnuPgKeyFingerprint", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("GnuPgKeyFingerprints")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("GnuPgKeyFingerprints")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedInstitutions")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.OwnsOne("Metabase.Data.ContactInformation", "Contact", b1 =>
+                        {
+                            b1.Property<Guid>("InstitutionId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("EmailAddress")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("IsEmailAddressConfirmed")
+                                .HasColumnType("boolean");
+
+                            b1.Property<bool>("IsPhoneNumberConfirmed")
+                                .HasColumnType("boolean");
+
+                            b1.Property<string>("PhoneNumber")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("PostalAddress")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("WebsiteLocator")
+                                .HasColumnType("text");
+
+                            b1.HasKey("InstitutionId");
+
+                            b1.ToTable("institution", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("InstitutionId");
+                        });
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Manager");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionMethodDeveloper", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("DevelopedMethodEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Method", "Method")
+                        .WithMany("InstitutionDeveloperEdges")
+                        .HasForeignKey("MethodId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("Method");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionRepresentative", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("RepresentativeEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("RepresentedInstitutionEdges")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedMethods")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.Reference", "Reference", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("MethodId");
+
+                            b1.ToTable("method", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+
+                            b1.OwnsOne("Metabase.Data.Publication", "Publication", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceMethodId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("ArXiv")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<string[]>("Authors")
+                                        .HasColumnType("text[]");
+
+                                    b2.Property<string>("Doi")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Urn")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("WebAddress")
+                                        .HasColumnType("text");
+
+                                    b2.HasKey("ReferenceMethodId");
+
+                                    b2.ToTable("method", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceMethodId");
+                                });
+
+                            b1.OwnsOne("Metabase.Data.Standard", "Standard", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceMethodId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Locator")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                        .IsRequired()
+                                        .HasColumnType("metabase.standardizer[]");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<int?>("Year")
+                                        .HasColumnType("integer");
+
+                                    b2.HasKey("ReferenceMethodId");
+
+                                    b2.ToTable("method", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceMethodId");
+
+                                    b2.OwnsOne("Metabase.Data.Numeration", "Numeration", b3 =>
+                                        {
+                                            b3.Property<Guid>("StandardReferenceMethodId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("MainNumber")
+                                                .IsRequired()
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Prefix")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Suffix")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("StandardReferenceMethodId");
+
+                                            b3.ToTable("method", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("StandardReferenceMethodId");
+                                        });
+
+                                    b2.Navigation("Numeration")
+                                        .IsRequired();
+                                });
+
+                            b1.Navigation("Publication");
+
+                            b1.Navigation("Standard");
+                        });
+
+                    b.OwnsMany("Metabase.Data.MethodParameter", "Parameters", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<JsonElement>("Type")
+                                .HasColumnType("jsonb");
+
+                            b1.HasKey("MethodId", "Id");
+
+                            b1.ToTable("MethodParameter", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+                        });
+
+                    b.OwnsMany("Metabase.Data.MethodSource", "Sources", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Description")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.HasKey("MethodId", "Id");
+
+                            b1.ToTable("MethodSource", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("Parameters");
+
+                    b.Navigation("Reference");
+
+                    b.Navigation("Sources");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Owner")
+                        .WithMany("OpenIdConnectApplications")
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", "Application")
+                        .WithMany("Authorizations")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectToken", b =>
+                {
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", "Application")
+                        .WithMany("Tokens")
+                        .HasForeignKey("ApplicationId");
+
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", "Authorization")
+                        .WithMany("Tokens")
+                        .HasForeignKey("AuthorizationId");
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Authorization");
+                });
+
+            modelBuilder.Entity("Metabase.Data.RoleClaim", b =>
+                {
+                    b.HasOne("Metabase.Data.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserClaim", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserLogin", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserMethodDeveloper", b =>
+                {
+                    b.HasOne("Metabase.Data.Method", "Method")
+                        .WithMany("UserDeveloperEdges")
+                        .HasForeignKey("MethodId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("DevelopedMethodEdges")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Method");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserRole", b =>
+                {
+                    b.HasOne("Metabase.Data.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserToken", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.Navigation("ConcretizationEdges");
+
+                    b.Navigation("GeneralizationEdges");
+
+                    b.Navigation("ManufacturerEdges");
+
+                    b.Navigation("PartEdges");
+
+                    b.Navigation("PartOfEdges");
+
+                    b.Navigation("VariantEdges");
+
+                    b.Navigation("VariantOfEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.Navigation("DevelopedMethodEdges");
+
+                    b.Navigation("GnuPgKeyFingerprints");
+
+                    b.Navigation("ManagedComponents");
+
+                    b.Navigation("ManagedDataFormats");
+
+                    b.Navigation("ManagedInstitutions");
+
+                    b.Navigation("ManagedMethods");
+
+                    b.Navigation("ManufacturedComponentEdges");
+
+                    b.Navigation("OpenIdConnectApplications");
+
+                    b.Navigation("OperatedDatabases");
+
+                    b.Navigation("RepresentativeEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.Navigation("InstitutionDeveloperEdges");
+
+                    b.Navigation("UserDeveloperEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.Navigation("Authorizations");
+
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Metabase.Data.User", b =>
+                {
+                    b.Navigation("DevelopedMethodEdges");
+
+                    b.Navigation("GnuPgKeyFingerprints");
+
+                    b.Navigation("RepresentedInstitutionEdges");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/backend/src/Migrations/20260620182947_UseSequentialUuids.cs b/backend/src/Migrations/20260620182947_UseSequentialUuids.cs
new file mode 100644
index 000000000..b1ecd832d
--- /dev/null
+++ b/backend/src/Migrations/20260620182947_UseSequentialUuids.cs
@@ -0,0 +1,261 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Metabase.Migrations
+{
+    /// <inheritdoc />
+    public partial class UseSequentialUuids : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "user",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "uuidv7()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictTokens",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "uuidv7()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictScopes",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "uuidv7()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictAuthorizations",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "uuidv7()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictApplications",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "uuidv7()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "method",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "uuidv7()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "institution",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "uuidv7()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "gnu_pg_fingerprint",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "uuidv7()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "database",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "uuidv7()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "data_format",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "uuidv7()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "component",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "uuidv7()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "gen_random_uuid()");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "user",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "uuidv7()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictTokens",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "uuidv7()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictScopes",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "uuidv7()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictAuthorizations",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "uuidv7()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "OpenIddictApplications",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "uuidv7()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "method",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "uuidv7()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "institution",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "uuidv7()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "gnu_pg_fingerprint",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "uuidv7()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "database",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "uuidv7()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "data_format",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "uuidv7()");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                schema: "metabase",
+                table: "component",
+                type: "uuid",
+                nullable: false,
+                defaultValueSql: "gen_random_uuid()",
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldDefaultValueSql: "uuidv7()");
+        }
+    }
+}
diff --git a/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs b/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
index a46612ca3..795fcbaca 100644
--- a/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/backend/src/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -22,7 +22,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 #pragma warning disable 612, 618
             modelBuilder
                 .HasDefaultSchema("metabase")
-                .HasAnnotation("ProductVersion", "10.0.8")
+                .HasAnnotation("ProductVersion", "10.0.9")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "component_category", new[] { "layer", "material", "unit" });
@@ -41,7 +41,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasDefaultValueSql("gen_random_uuid()");
+                        .HasDefaultValueSql("uuidv7()");
 
                     b.Property<string>("Abbreviation")
                         .HasColumnType("text");
@@ -234,7 +234,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasDefaultValueSql("gen_random_uuid()");
+                        .HasDefaultValueSql("uuidv7()");
 
                     b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
@@ -291,7 +291,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasDefaultValueSql("gen_random_uuid()");
+                        .HasDefaultValueSql("uuidv7()");
 
                     b.Property<DateTimeOffset>("CreatedAt")
                         .ValueGeneratedOnAdd()
@@ -349,7 +349,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasDefaultValueSql("gen_random_uuid()");
+                        .HasDefaultValueSql("uuidv7()");
 
                     b.Property<OffsetDateTime?>("AllowedAt")
                         .HasColumnType("timestamp with time zone");
@@ -403,7 +403,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasDefaultValueSql("gen_random_uuid()");
+                        .HasDefaultValueSql("uuidv7()");
 
                     b.Property<string>("Abbreviation")
                         .HasColumnType("text");
@@ -533,7 +533,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasDefaultValueSql("gen_random_uuid()");
+                        .HasDefaultValueSql("uuidv7()");
 
                     b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
                         .HasColumnType("tstzrange");
@@ -593,7 +593,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasDefaultValueSql("gen_random_uuid()");
+                        .HasDefaultValueSql("uuidv7()");
 
                     b.Property<string>("ApplicationType")
                         .HasMaxLength(50)
@@ -683,7 +683,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasDefaultValueSql("gen_random_uuid()");
+                        .HasDefaultValueSql("uuidv7()");
 
                     b.Property<Guid?>("ApplicationId")
                         .HasColumnType("uuid");
@@ -745,7 +745,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasDefaultValueSql("gen_random_uuid()");
+                        .HasDefaultValueSql("uuidv7()");
 
                     b.Property<string>("ConcurrencyToken")
                         .IsConcurrencyToken()
@@ -806,7 +806,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasDefaultValueSql("gen_random_uuid()");
+                        .HasDefaultValueSql("uuidv7()");
 
                     b.Property<Guid?>("ApplicationId")
                         .HasColumnType("uuid");
@@ -937,7 +937,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
-                        .HasDefaultValueSql("gen_random_uuid()");
+                        .HasDefaultValueSql("uuidv7()");
 
                     b.Property<int>("AccessFailedCount")
                         .HasColumnType("integer");
diff --git a/backend/src/Migrations/migrate.sql b/backend/src/Migrations/migrate.sql
index ea045d533..c505d3216 100644
--- a/backend/src/Migrations/migrate.sql
+++ b/backend/src/Migrations/migrate.sql
@@ -2777,3 +2777,91 @@ END $EF$;
 
 COMMIT;
 
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."user" ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."OpenIddictTokens" ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."OpenIddictAuthorizations" ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."OpenIddictApplications" ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.method ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.institution ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.gnu_pg_fingerprint ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.database ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.data_format ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.component ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+    VALUES ('20260620182947_UseSequentialUuids', '10.0.9');
+    END IF;
+END $EF$;
+COMMIT;
+
diff --git a/backend/src/Migrations/migrate_from_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit_to_20260620182947_UseSequentialUuids.sql b/backend/src/Migrations/migrate_from_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit_to_20260620182947_UseSequentialUuids.sql
new file mode 100644
index 000000000..a3ea354e8
--- /dev/null
+++ b/backend/src/Migrations/migrate_from_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit_to_20260620182947_UseSequentialUuids.sql
@@ -0,0 +1,88 @@
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."user" ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."OpenIddictTokens" ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."OpenIddictAuthorizations" ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."OpenIddictApplications" ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.method ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.institution ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.gnu_pg_fingerprint ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.database ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.data_format ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.component ALTER COLUMN "Id" SET DEFAULT (uuidv7());
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+    VALUES ('20260620182947_UseSequentialUuids', '10.0.9');
+    END IF;
+END $EF$;
+COMMIT;
+
diff --git a/backend/src/Migrations/rollback_from_20260620182947_UseSequentialUuids_to_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.sql b/backend/src/Migrations/rollback_from_20260620182947_UseSequentialUuids_to_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.sql
new file mode 100644
index 000000000..74d1d8394
--- /dev/null
+++ b/backend/src/Migrations/rollback_from_20260620182947_UseSequentialUuids_to_20260513180044_SetConsentTypeOfMetabaseOpenIdConnectClientToImplicit.sql
@@ -0,0 +1,76 @@
+START TRANSACTION;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."user" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."OpenIddictTokens" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."OpenIddictScopes" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."OpenIddictAuthorizations" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase."OpenIddictApplications" ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.method ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.institution ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.gnu_pg_fingerprint ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.database ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.data_format ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    ALTER TABLE metabase.component ALTER COLUMN "Id" SET DEFAULT (gen_random_uuid());
+    END IF;
+END $EF$;
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260620182947_UseSequentialUuids') THEN
+    DELETE FROM "__EFMigrationsHistory"
+    WHERE "MigrationId" = '20260620182947_UseSequentialUuids';
+    END IF;
+END $EF$;
+COMMIT;
+

From 8b34e8455032204f6b70edbe93b332cb0b73eee9 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sat, 20 Jun 2026 22:30:20 +0200
Subject: [PATCH 105/145] Add test that checks whether the C# domain model
 matches the PostgreSQL database schema --- for a list of limitations see
 https://github.com/JonPSmith/EfCore.SchemaCompare#List-of-limitations

---
 backend/Makefile                              | 13 +--
 backend/src/Data/ApplicationDbContext.cs      |  2 +-
 backend/src/Program.cs                        |  7 +-
 backend/src/Startup.cs                        |  2 +-
 .../CustomWebApplicationFactory.cs            | 33 +++----
 .../test/Integration/DatabaseSchemaTests.cs   | 92 +++++++++++++++++++
 backend/test/Integration/IntegrationTests.cs  |  1 -
 backend/test/Metabase.Tests.csproj            |  5 +
 8 files changed, 119 insertions(+), 36 deletions(-)
 create mode 100644 backend/test/Integration/DatabaseSchemaTests.cs

diff --git a/backend/Makefile b/backend/Makefile
index 106017b0e..6ded57355 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -88,7 +88,7 @@ analyze : ## Analyze with Roslynator
 
 # https://www.jetbrains.com/help/resharper/ReSharper_Command_Line_Tools.html#install-and-use-resharper-command-line-tools-as-net-core-tools
 inspect : ## Inspect with ReSharper, for example, `make inspect OUTPUT=./inspection.xml`
-	dotnet tool run jb inspectcode --build ./*.sln -o ${OUTPUT}
+	dotnet tool run jb inspectcode --build --output "${OUTPUT}" ./*.sln
 .PHONY : inspect
 
 editorconfig : ## Debug editorconfig
@@ -171,13 +171,10 @@ dedup : ## Dedeuplicate code lines matching the pattern `${PATTERN}`, for exampl
 					}"
 .PHONY : dedup
 
-# See https://github.com/hasura/graphqurl#export-schema
-schema : ## Fetch GraphQL schema using `hasura/graphqurl`
-	gq \
-		http://backend:8080/graphql/ \
-		--introspect \
-		> ./schema.graphql
-.PHONY : schema
+check-database : ## Check whether there have been any model changes made since the last migration was added and whether the C# domain model matches the PostgreSQL database schema
+	$(MAKE) test ARGS='--filter "FullyQualifiedName~EnsureMigrationsAreUpToDate"'
+	$(MAKE) test ARGS='--filter "FullyQualifiedName~EnsureDomainModelMatchesDatabaseSchema"'
+.PHONY : check-database
 
 has-pending-model-changes : ## Check whether there have been any model changes made since the last migration was added
 	dotnet ef \
diff --git a/backend/src/Data/ApplicationDbContext.cs b/backend/src/Data/ApplicationDbContext.cs
index f8f73a97d..b636e5ba8 100644
--- a/backend/src/Data/ApplicationDbContext.cs
+++ b/backend/src/Data/ApplicationDbContext.cs
@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Linq;
-using SchemaNameOptionsExtension = Metabase.Data.Extensions.SchemaNameOptionsExtension;
+using Metabase.Data.Extensions;
 using Metabase.Extensions;
 using Npgsql.EntityFrameworkCore.PostgreSQL.ValueGeneration;
 
diff --git a/backend/src/Program.cs b/backend/src/Program.cs
index 9b4b55592..b132de95b 100644
--- a/backend/src/Program.cs
+++ b/backend/src/Program.cs
@@ -45,7 +45,9 @@ Exception exception
 public sealed class Program
 {
     public const string TestEnvironment = "test";
+    public const string DevelopmentEnvironment = "development";
     private const string ProductionEnvironment = "production";
+
     private const string LogsPath = "./logs/serilog.json";
 
     public static async Task<int> Main(
@@ -240,7 +242,7 @@ Uri openTelemetryHost
         return builder;
     }
 
-    public static void ConfigureAppConfiguration(
+    private static void ConfigureAppConfiguration(
         IConfigurationBuilder configuration,
         IHostEnvironment environment,
         string[] commandLineArguments
@@ -260,8 +262,7 @@ string[] commandLineArguments
                 !environment.IsEnvironment(TestEnvironment)
             )
             .AddEnvironmentVariables()
-            .AddEnvironmentVariables(
-                "XBASE_") // https://docs.microsoft.com/en-us/aspnet/core/fundamentals/configuration/?view=aspnetcore-3.1#environment-variables
+            .AddEnvironmentVariables("XBASE_") // https://docs.microsoft.com/en-us/aspnet/core/fundamentals/configuration/?view=aspnetcore-3.1#environment-variables
             .AddCommandLine(commandLineArguments);
     }
 }
\ No newline at end of file
diff --git a/backend/src/Startup.cs b/backend/src/Startup.cs
index a06058805..3a24154bc 100644
--- a/backend/src/Startup.cs
+++ b/backend/src/Startup.cs
@@ -42,7 +42,7 @@ namespace Metabase;
 public sealed class Startup(
     IWebHostEnvironment environment,
     IConfiguration configuration
-    )
+)
 {
     private readonly AppSettings _appSettings =
         configuration.Get<AppSettings>(_ =>
diff --git a/backend/test/Integration/CustomWebApplicationFactory.cs b/backend/test/Integration/CustomWebApplicationFactory.cs
index 011da73e1..f67b72885 100644
--- a/backend/test/Integration/CustomWebApplicationFactory.cs
+++ b/backend/test/Integration/CustomWebApplicationFactory.cs
@@ -70,34 +70,12 @@ public AppSettings AppSettings
         }
     }
 
-    protected override IHost CreateHost(IHostBuilder builder)
-    {
-        builder.UseEnvironment(Metabase.Program.TestEnvironment);
-        builder.UseSerilog((context, services, configuration) =>
-        {
-            configuration
-                .ReadFrom.Configuration(context.Configuration) // appsettings.test.json
-                .WriteTo.NUnitOutput(formatProvider: CultureInfo.InvariantCulture);
-        });
-        return base.CreateHost(builder);
-    }
-
     protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
         var databaseName = Guid.NewGuid().ToString().Replace("-", "");
         // var schemaName = $"metabase_{Guid.NewGuid().ToString().Replace("-", "")}";
         // builder.ConfigureAppConfiguration(_ => _.AddInMemoryCollection([new KeyValuePair<string, string?>("Database__Name", databaseName)])); // "Database__SchemaName"
         builder.UseEnvironment(Metabase.Program.TestEnvironment);
-        builder.ConfigureAppConfiguration((webHostBuilderContext, configurationBuilder) =>
-            {
-                configurationBuilder.Sources.Clear();
-                Metabase.Program.ConfigureAppConfiguration(
-                    configurationBuilder,
-                    webHostBuilderContext.HostingEnvironment,
-                    []
-                );
-            }
-        );
         builder.ConfigureServices(serviceCollection =>
             {
                 using var scope = serviceCollection.BuildServiceProvider().CreateScope();
@@ -143,6 +121,17 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
         );
     }
 
+    protected override IHost CreateHost(IHostBuilder builder)
+    {
+        builder.UseSerilog((context, services, configuration) =>
+        {
+            configuration
+                .ReadFrom.Configuration(context.Configuration) // appsettings.test.json
+                .WriteTo.NUnitOutput(formatProvider: CultureInfo.InvariantCulture);
+        });
+        return base.CreateHost(builder);
+    }
+
     // https://docs.microsoft.com/en-us/dotnet/standard/managed-code
     // https://docs.microsoft.com/en-us/dotnet/standard/garbage-collection/implementing-dispose
     ~CustomWebApplicationFactory()
diff --git a/backend/test/Integration/DatabaseSchemaTests.cs b/backend/test/Integration/DatabaseSchemaTests.cs
new file mode 100644
index 000000000..1d5c637cb
--- /dev/null
+++ b/backend/test/Integration/DatabaseSchemaTests.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Globalization;
+using EfSchemaCompare;
+using FluentAssertions;
+using Metabase.Data;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using NUnit.Framework;
+using Serilog;
+
+namespace Metabase.Tests.Integration;
+
+[TestFixture]
+public sealed class DatabaseSchemaTests
+    : IDisposable
+{
+    private sealed class CustomWebApplicationFactory
+        : WebApplicationFactory<Metabase.Program>
+    {
+        protected override void ConfigureWebHost(IWebHostBuilder builder)
+        {
+            builder.UseEnvironment(Metabase.Program.DevelopmentEnvironment);
+        }
+
+        protected override IHost CreateHost(IHostBuilder builder)
+        {
+            builder.UseSerilog((context, services, configuration) =>
+            {
+                configuration
+                    .ReadFrom.Configuration(context.Configuration) // appsettings.test.json
+                    .WriteTo.NUnitOutput(formatProvider: CultureInfo.InvariantCulture);
+            });
+            return base.CreateHost(builder);
+        }
+    }
+
+    private bool _disposed;
+    private CustomWebApplicationFactory Factory { get; }
+
+    public DatabaseSchemaTests()
+    {
+        Factory = new CustomWebApplicationFactory();
+    }
+
+    public void Dispose()
+    {
+        // Dispose of unmanaged resources.
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    // https://docs.microsoft.com/en-us/dotnet/standard/managed-code
+    // https://docs.microsoft.com/en-us/dotnet/standard/garbage-collection/implementing-dispose
+    ~DatabaseSchemaTests()
+    {
+        Dispose(false);
+    }
+
+    public void Dispose(bool disposing)
+    {
+        if (!_disposed)
+        {
+            if (disposing)
+            {
+                Factory.Dispose();
+            }
+            _disposed = true;
+        }
+    }
+
+    // For a list of limitations see https://github.com/JonPSmith/EfCore.SchemaCompare#List-of-limitations
+    [Test]
+    public void EnsureDomainModelMatchesDatabaseSchema()
+    {
+        // Arrange
+        using var scope = Factory.Services.CreateScope();
+        var appSettings = scope.ServiceProvider.GetRequiredService<AppSettings>();
+        var databaseContext = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
+        var connectionString = databaseContext.Database.GetConnectionString() + $";Password={appSettings.Database.Password}";
+        var comparer = new CompareEfSql();
+        // Act
+        // Compare C# domain model with PostgreSQL database schema, that is,
+        // compare EntityFramework Core model of the database with the database
+        // that the database context's connection points to.
+        var hasErrors = comparer.CompareEfWithDb(connectionString, databaseContext);
+        // Assert
+        hasErrors.Should().BeFalse(comparer.GetAllErrors);
+    }
+}
\ No newline at end of file
diff --git a/backend/test/Integration/IntegrationTests.cs b/backend/test/Integration/IntegrationTests.cs
index a7ac2bc1b..a735d4132 100644
--- a/backend/test/Integration/IntegrationTests.cs
+++ b/backend/test/Integration/IntegrationTests.cs
@@ -56,7 +56,6 @@ public void Dispose()
     {
         // Dispose of unmanaged resources.
         Dispose(true);
-        // Suppress finalization.
         GC.SuppressFinalize(this);
     }
 
diff --git a/backend/test/Metabase.Tests.csproj b/backend/test/Metabase.Tests.csproj
index 5a3861ee4..04587fd72 100644
--- a/backend/test/Metabase.Tests.csproj
+++ b/backend/test/Metabase.Tests.csproj
@@ -9,10 +9,15 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="EfCore.SchemaCompare" Version="10.0.0" />
     <PackageReference Include="FluentAssertions" Version="8.10.0" />
     <PackageReference Include="IdentityModel" Version="7.0.0" />
     <PackageReference Include="JsonPath.Net" Version="3.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.9" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
     <PackageReference Include="NodaTime.Testing" Version="3.3.2" />

From 08ab24233632f1aca97249665fa232f75675ecc4 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 23 Jun 2026 16:28:25 +0200
Subject: [PATCH 106/145] Use scalar `EmailAddress` for email addresses and use
 E.164 format compliant phone numbers

---
 .../GraphQl/Institutions/InstitutionIntegrationTests.cs         | 2 +-
 ...eInstitutionTests.AnonymousUser_CannotCreateInstitution.snap | 2 +-
 ...LoggedInUser_CreatesInstitution_PendingInstitutionInput.snap | 2 +-
 ...ionTests.LoggedInUser_IsSuccess_PendingInstitutionInput.snap | 2 +-
 backend/test/Integration/GraphQl/Users/ChangeUserEmail.graphql  | 2 +-
 backend/test/Integration/GraphQl/Users/ConfirmUserEmail.graphql | 2 +-
 .../Integration/GraphQl/Users/ConfirmUserEmailChange.graphql    | 2 +-
 backend/test/Integration/GraphQl/Users/LoginUser.graphql        | 2 +-
 backend/test/Integration/GraphQl/Users/RegisterUser.graphql     | 2 +-
 .../Integration/GraphQl/Users/RequestUserPasswordReset.graphql  | 2 +-
 .../GraphQl/Users/ResendUserEmailConfirmation.graphql           | 2 +-
 .../test/Integration/GraphQl/Users/ResetUserPassword.graphql    | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/backend/test/Integration/GraphQl/Institutions/InstitutionIntegrationTests.cs b/backend/test/Integration/GraphQl/Institutions/InstitutionIntegrationTests.cs
index 238d932ca..205ccccd5 100644
--- a/backend/test/Integration/GraphQl/Institutions/InstitutionIntegrationTests.cs
+++ b/backend/test/Integration/GraphQl/Institutions/InstitutionIntegrationTests.cs
@@ -17,7 +17,7 @@ public abstract class InstitutionIntegrationTests
         "I!A",
         "Best institution ever!",
         new ContactInformationInput(
-            PhoneNumber: "(999) 9999-9999",
+            PhoneNumber: "+99999999999",
             PostalAddress: "Street 9, 7777 Town",
             EmailAddress: "aaa@institution.com",
             WebsiteLocator: new Uri("https://institution-a.com", UriKind.Absolute)
diff --git a/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.AnonymousUser_CannotCreateInstitution.snap b/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.AnonymousUser_CannotCreateInstitution.snap
index 20d442303..2e39af242 100644
--- a/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.AnonymousUser_CannotCreateInstitution.snap
+++ b/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.AnonymousUser_CannotCreateInstitution.snap
@@ -1 +1 @@
-{"data":{"institutions":{"edges":[{"node":{"id":"SW5zdGl0dXRpb2467/V6wR0vc0y8yfz7ciQg8w==","uuid":"c17af5ef-2f1d-4c73-bcc9-fcfb722420f3","name":"LBNL","abbreviation":"LBNL","description":"Lawrence Berkeley National Laboratory","contact":{"phoneNumber":"(510) 486-4000","postalAddress":"1 Cyclotron Road, Berkeley, CA 94720","emailAddress":null,"websiteLocator":"https://www.lbl.gov/"},"state":"VERIFIED"}},{"node":{"id":"SW5zdGl0dXRpb246XPm5gmEyOkaQ/g6dpwevFw==","uuid":"82b9f95c-3261-463a-90fe-0e9da707af17","name":"TestLab Solar Facades","abbreviation":"TLSF","description":"This institution represents the TestLab Solar Facades of Fraunhofer ISE","contact":{"phoneNumber":"+49 761 4588-5673","postalAddress":"Heidenhofstraße 2, 79110 Freiburg im Breisgau","emailAddress":null,"websiteLocator":"https://www.ise.fraunhofer.de/en/rd-infrastructure/accredited-labs/testlab-solar-facades.html"},"state":"VERIFIED"}},{"node":{"id":"SW5zdGl0dXRpb246+9YgU22560qiTOtwNtNDeg==","uuid":"5320d6fb-b96d-4aeb-a24c-eb7036d3437a","name":"Fraunhofer ISE","abbreviation":"ISE","description":"Fraunhofer Institute for Solar Energy Systems (ISE)","contact":{"phoneNumber":"+49 761 45880","postalAddress":"Heidenhofstraße 2, 79110 Freiburg im Breisgau","emailAddress":null,"websiteLocator":"https://www.ise.fraunhofer.de/"},"state":"VERIFIED"}}]}}}
+{"data":{"institutions":{"edges":[{"node":{"id":"SW5zdGl0dXRpb2467/V6wR0vc0y8yfz7ciQg8w==","uuid":"c17af5ef-2f1d-4c73-bcc9-fcfb722420f3","name":"LBNL","abbreviation":"LBNL","description":"Lawrence Berkeley National Laboratory","contact":{"phoneNumber":"+5104864000","postalAddress":"1 Cyclotron Road, Berkeley, CA 94720","emailAddress":null,"websiteLocator":"https://www.lbl.gov/"},"state":"VERIFIED"}},{"node":{"id":"SW5zdGl0dXRpb246RwBYhNvRdUK9KUIiyQfKvg==","uuid":"84580047-d1db-4275-bd29-4222c907cabe","name":"EPEA - Part of Drees & Sommer","abbreviation":"EPEA","description":"Sustainability","contact":{"phoneNumber":null,"postalAddress":null,"emailAddress":null,"websiteLocator":null},"state":"VERIFIED"}},{"node":{"id":"SW5zdGl0dXRpb246XPm5gmEyOkaQ/g6dpwevFw==","uuid":"82b9f95c-3261-463a-90fe-0e9da707af17","name":"TestLab Solar Facades","abbreviation":"TLSF","description":"This institution represents the TestLab Solar Facades of Fraunhofer ISE","contact":{"phoneNumber":"+4976145885673","postalAddress":"Heidenhofstraße 2, 79110 Freiburg im Breisgau","emailAddress":null,"websiteLocator":"https://www.ise.fraunhofer.de/en/rd-infrastructure/accredited-labs/testlab-solar-facades.html"},"state":"VERIFIED"}},{"node":{"id":"SW5zdGl0dXRpb246+9YgU22560qiTOtwNtNDeg==","uuid":"5320d6fb-b96d-4aeb-a24c-eb7036d3437a","name":"Fraunhofer ISE","abbreviation":"ISE","description":"Fraunhofer Institute for Solar Energy Systems (ISE)","contact":{"phoneNumber":"+4976145880","postalAddress":"Heidenhofstraße 2, 79110 Freiburg im Breisgau","emailAddress":null,"websiteLocator":"https://www.ise.fraunhofer.de/"},"state":"VERIFIED"}}]}}}
diff --git a/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.LoggedInUser_CreatesInstitution_PendingInstitutionInput.snap b/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.LoggedInUser_CreatesInstitution_PendingInstitutionInput.snap
index 77614da29..9d5472d8a 100644
--- a/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.LoggedInUser_CreatesInstitution_PendingInstitutionInput.snap
+++ b/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.LoggedInUser_CreatesInstitution_PendingInstitutionInput.snap
@@ -1 +1 @@
-{"data":{"pendingInstitutions":{"edges":[{"node":{"id":"SW5zdGl0dXRpb246D6120A8JYk+AlOlveA/B9g==","uuid":"d076ad0f-090f-4f62-8094-e96f780fc1f6","name":"Institution A","abbreviation":"I!A","description":"Best institution ever!","contact":{"phoneNumber":"(999) 9999-9999","postalAddress":"Street 9, 7777 Town","emailAddress":"aaa@institution.com","websiteLocator":"https://institution-a.com/"},"state":"PENDING"}}]}}}
+{"data":{"pendingInstitutions":{"edges":[{"node":{"id":"SW5zdGl0dXRpb246D6120A8JYk+AlOlveA/B9g==","uuid":"d076ad0f-090f-4f62-8094-e96f780fc1f6","name":"Institution A","abbreviation":"I!A","description":"Best institution ever!","contact":{"phoneNumber":"+99999999999","postalAddress":"Street 9, 7777 Town","emailAddress":"aaa@institution.com","websiteLocator":"https://institution-a.com/"},"state":"PENDING"}}]}}}
diff --git a/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.LoggedInUser_IsSuccess_PendingInstitutionInput.snap b/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.LoggedInUser_IsSuccess_PendingInstitutionInput.snap
index ad2bf5370..03bedd3a2 100644
--- a/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.LoggedInUser_IsSuccess_PendingInstitutionInput.snap
+++ b/backend/test/Integration/GraphQl/Institutions/__snapshots__/CreateInstitutionTests.LoggedInUser_IsSuccess_PendingInstitutionInput.snap
@@ -1 +1 @@
-{"data":{"createInstitution":{"institution":{"id":"SW5zdGl0dXRpb246LDGUD8ervECBGlVtMnnXFg==","uuid":"0f94312c-abc7-40bc-811a-556d3279d716","name":"Institution A","abbreviation":"I!A","description":"Best institution ever!","contact":{"phoneNumber":"(999) 9999-9999","postalAddress":"Street 9, 7777 Town","emailAddress":"aaa@institution.com","websiteLocator":"https://institution-a.com/"}},"errors":null}}}
+{"data":{"createInstitution":{"institution":{"id":"SW5zdGl0dXRpb246LDGUD8ervECBGlVtMnnXFg==","uuid":"0f94312c-abc7-40bc-811a-556d3279d716","name":"Institution A","abbreviation":"I!A","description":"Best institution ever!","contact":{"phoneNumber":"+99999999999","postalAddress":"Street 9, 7777 Town","emailAddress":"aaa@institution.com","websiteLocator":"https://institution-a.com/"}},"errors":null}}}
diff --git a/backend/test/Integration/GraphQl/Users/ChangeUserEmail.graphql b/backend/test/Integration/GraphQl/Users/ChangeUserEmail.graphql
index 58fbc2786..af46436d6 100644
--- a/backend/test/Integration/GraphQl/Users/ChangeUserEmail.graphql
+++ b/backend/test/Integration/GraphQl/Users/ChangeUserEmail.graphql
@@ -1,5 +1,5 @@
 mutation ChangeUserEmail(
-    $newEmail: String!
+    $newEmail: EmailAddress!
 ) {
   changeUserEmail(input: {
     newEmail: $newEmail
diff --git a/backend/test/Integration/GraphQl/Users/ConfirmUserEmail.graphql b/backend/test/Integration/GraphQl/Users/ConfirmUserEmail.graphql
index 43f75b814..bfdee5dd9 100644
--- a/backend/test/Integration/GraphQl/Users/ConfirmUserEmail.graphql
+++ b/backend/test/Integration/GraphQl/Users/ConfirmUserEmail.graphql
@@ -1,5 +1,5 @@
 mutation ConfirmUserEmail(
-  $email: String!,
+  $email: EmailAddress!,
   $confirmationCode: String!
   ) {
   confirmUserEmail(input: {
diff --git a/backend/test/Integration/GraphQl/Users/ConfirmUserEmailChange.graphql b/backend/test/Integration/GraphQl/Users/ConfirmUserEmailChange.graphql
index e363698e2..f32626c09 100644
--- a/backend/test/Integration/GraphQl/Users/ConfirmUserEmailChange.graphql
+++ b/backend/test/Integration/GraphQl/Users/ConfirmUserEmailChange.graphql
@@ -1,6 +1,6 @@
 mutation ConfirmUserEmailChange(
   $currentEmail: String!,
-  $newEmail: String!,
+  $newEmail: EmailAddress!,
   $confirmationCode: String!
   ) {
   confirmUserEmailChange(input: {
diff --git a/backend/test/Integration/GraphQl/Users/LoginUser.graphql b/backend/test/Integration/GraphQl/Users/LoginUser.graphql
index 5442eb982..a2c9b9dfc 100644
--- a/backend/test/Integration/GraphQl/Users/LoginUser.graphql
+++ b/backend/test/Integration/GraphQl/Users/LoginUser.graphql
@@ -1,4 +1,4 @@
-mutation LoginUser($email: String!, $password: String!) {
+mutation LoginUser($email: EmailAddress!, $password: String!) {
   loginUser(
     input: { email: $email, password: $password }
   ) {
diff --git a/backend/test/Integration/GraphQl/Users/RegisterUser.graphql b/backend/test/Integration/GraphQl/Users/RegisterUser.graphql
index d6dae7bfd..be03c8a41 100644
--- a/backend/test/Integration/GraphQl/Users/RegisterUser.graphql
+++ b/backend/test/Integration/GraphQl/Users/RegisterUser.graphql
@@ -1,6 +1,6 @@
 mutation RegisterUser(
   $name: String!
-  $email: String!
+  $email: EmailAddress!
   $password: String!
   $passwordConfirmation: String!
 ) {
diff --git a/backend/test/Integration/GraphQl/Users/RequestUserPasswordReset.graphql b/backend/test/Integration/GraphQl/Users/RequestUserPasswordReset.graphql
index f8a5132e4..cf6e63c89 100644
--- a/backend/test/Integration/GraphQl/Users/RequestUserPasswordReset.graphql
+++ b/backend/test/Integration/GraphQl/Users/RequestUserPasswordReset.graphql
@@ -1,5 +1,5 @@
 mutation RequestUserPasswordReset(
-  $email: String!
+  $email: EmailAddress!
   ) {
   requestUserPasswordReset(input: {
     email: $email
diff --git a/backend/test/Integration/GraphQl/Users/ResendUserEmailConfirmation.graphql b/backend/test/Integration/GraphQl/Users/ResendUserEmailConfirmation.graphql
index a67a95e66..f26f1881f 100644
--- a/backend/test/Integration/GraphQl/Users/ResendUserEmailConfirmation.graphql
+++ b/backend/test/Integration/GraphQl/Users/ResendUserEmailConfirmation.graphql
@@ -1,5 +1,5 @@
 mutation ResendUserEmailConfirmation(
-  $email: String!
+  $email: EmailAddress!
   ) {
   resendUserEmailConfirmation(input: {
     email: $email
diff --git a/backend/test/Integration/GraphQl/Users/ResetUserPassword.graphql b/backend/test/Integration/GraphQl/Users/ResetUserPassword.graphql
index b4a97f89b..42418d308 100644
--- a/backend/test/Integration/GraphQl/Users/ResetUserPassword.graphql
+++ b/backend/test/Integration/GraphQl/Users/ResetUserPassword.graphql
@@ -1,5 +1,5 @@
 mutation ResetUserPassword(
-    $email: String!,
+    $email: EmailAddress!,
     $password: String!,
     $passwordConfirmation: String!,
     $resetCode: String!

From 9f229a3dce4ea78c500d74a355b9c47798e662a0 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 23 Jun 2026 17:06:35 +0200
Subject: [PATCH 107/145] Fix check whether OpenID Connect application belongs
 to verified component manager

---
 backend/src/Authorization/CommonComponentAuthorization.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/Authorization/CommonComponentAuthorization.cs b/backend/src/Authorization/CommonComponentAuthorization.cs
index 3daf27e4a..6b67add05 100644
--- a/backend/src/Authorization/CommonComponentAuthorization.cs
+++ b/backend/src/Authorization/CommonComponentAuthorization.cs
@@ -43,7 +43,7 @@ protected Task<bool> BelongsToVerifiedComponentManager(
         CancellationToken cancellationToken
     )
     {
-        return Context.Methods.AsNoTracking()
+        return Context.Components.AsNoTracking()
             .Where(component => component.Id == componentId)
             .Where(component => component.Manager != null && component.Manager.State == InstitutionState.VERIFIED)
             .Where(component => component.Manager != null && (
@@ -53,4 +53,4 @@ CancellationToken cancellationToken
             ))
             .AnyAsync(cancellationToken);
     }
-}
+}
\ No newline at end of file

From 92ae552d09ccb73e58b104e7ee36c2499a69aea1 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 23 Jun 2026 17:37:55 +0200
Subject: [PATCH 108/145] Add tabs with data from product-data databases to
 components

---
 frontend/components/components/Component.tsx | 69 +++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/frontend/components/components/Component.tsx b/frontend/components/components/Component.tsx
index b5e7ff0e7..8ae407eaf 100644
--- a/frontend/components/components/Component.tsx
+++ b/frontend/components/components/Component.tsx
@@ -1,10 +1,73 @@
 import { useQuery } from "@apollo/client/react";
 import { Scalars } from "../../__generated__/graphql";
 import { ComponentDocument } from "../../queries/components.generated";
-import { Skeleton, Result, Card } from "antd";
+import { Skeleton, Result, Card, Divider } from "antd";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import ComponentSummary from "./ComponentSummary";
 import QueryToolbar from "../QueryToolbar";
+import PaginatedOpticalData from "../data/optical/PaginatedOpticalData";
+import { useMemo } from "react";
+import LazyTabs from "../LazyTabs";
+import PaginatedCalorimetricData from "../data/calorimetric/PaginatedCalorimetricData";
+import PaginatedGeometricData from "../data/geometric/PaginatedGeometricData";
+import PaginatedHygrothermalData from "../data/hygrothermal/PaginatedHygrothermalData";
+import PaginatedPhotovoltaicData from "../data/photovoltaic/PaginatedPhotovoltaicData";
+import PaginatedLifeCycleData from "../data/lifeCycle/PaginatedLifeCycleData";
+
+const getDataTabs = (componentId: Scalars["Uuid"]["output"]) => [
+  {
+    key: "calorimetric",
+    label: "Calorimetric Data",
+    children: (
+      <PaginatedCalorimetricData
+        where={{ componentId: { equalTo: componentId } }}
+      />
+    ),
+  },
+  {
+    key: "geometric",
+    label: "Geometric Data",
+    children: (
+      <PaginatedGeometricData
+        where={{ componentId: { equalTo: componentId } }}
+      />
+    ),
+  },
+  {
+    key: "hygrothermal",
+    label: "Hygrothermal Data",
+    children: (
+      <PaginatedHygrothermalData
+        where={{ componentId: { equalTo: componentId } }}
+      />
+    ),
+  },
+  {
+    key: "lifeCycle",
+    label: "Life-Cycle Data",
+    children: (
+      <PaginatedLifeCycleData
+        where={{ componentId: { equalTo: componentId } }}
+      />
+    ),
+  },
+  {
+    key: "optical",
+    label: "Optical Data",
+    children: (
+      <PaginatedOpticalData where={{ componentId: { equalTo: componentId } }} />
+    ),
+  },
+  {
+    key: "photovoltaic",
+    label: "Photovoltaic Data",
+    children: (
+      <PaginatedPhotovoltaicData
+        where={{ componentId: { equalTo: componentId } }}
+      />
+    ),
+  },
+];
 
 interface ComponentProps {
   componentId: Scalars["Uuid"]["input"];
@@ -20,6 +83,8 @@ export default function Component({ componentId }: ComponentProps) {
   useQueryHandler({ error });
   const component = data?.component;
 
+  const dataTabs = useMemo(() => getDataTabs(componentId), [componentId]);
+
   if (loading) {
     return <Skeleton active avatar title />;
   }
@@ -40,6 +105,8 @@ export default function Component({ componentId }: ComponentProps) {
         <ComponentSummary entity={component} />
       </Card>
       <QueryToolbar query={ComponentDocument} variables={queryVariables} />
+      <Divider />
+      <LazyTabs items={dataTabs} />
     </div>
   );
 }

From f4d0344bbc4946605b466a325916586e634f0831 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 23 Jun 2026 18:04:55 +0200
Subject: [PATCH 109/145] Fall back to the component ID if for some reason the
 component itself could not be fetched from the metabase

---
 frontend/components/data/DataSummary.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontend/components/data/DataSummary.tsx b/frontend/components/data/DataSummary.tsx
index 29ace5355..12a968427 100644
--- a/frontend/components/data/DataSummary.tsx
+++ b/frontend/components/data/DataSummary.tsx
@@ -135,12 +135,10 @@ export default function DataSummary({
       <div>
         <div>
           Data for component{" "}
-          {entity.component && (
-            <EntityLink
-              entity={entity.component ?? nameFallback(entity.componentId)}
-              route={paths.component}
-            />
-          )}{" "}
+          <EntityLink
+            entity={entity.component ?? nameFallback(entity.componentId)}
+            route={paths.component}
+          />{" "}
           created by{" "}
           <EntityLink
             entity={entity.creator ?? nameFallback(entity.creatorId)}

From 1673e2a455e6bf81d4d18f49318c747212181f86 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 23 Jun 2026 19:03:43 +0200
Subject: [PATCH 110/145] Name tests `IsSyntaxError` instead of `IsUserError`
 when the GraphQL server stumples upon an email address syntax error (and
 assert that the response is a bad request)

---
 .../GraphQl/Users/ChangeUserEmailTests.cs           | 11 +++--------
 .../GraphQl/Users/ConfirmUserEmailChange.graphql    |  2 +-
 .../Integration/GraphQl/Users/RegisterUserTests.cs  |  8 ++++----
 ...angeUserEmailTests.InvalidEmail_IsUserError.snap |  1 -
 ...egisterUserTests.InvalidEmail_IsSyntaxError.snap |  1 +
 .../RegisterUserTests.InvalidEmail_IsUserError.snap |  1 -
 ...terUserTests.NullOrEmptyEmail_IsSyntaxError.snap |  1 +
 ...isterUserTests.NullOrEmptyEmail_IsUserError.snap |  1 -
 backend/test/Integration/IntegrationTests.cs        | 13 +++++++++++++
 9 files changed, 23 insertions(+), 16 deletions(-)
 delete mode 100644 backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserEmailTests.InvalidEmail_IsUserError.snap
 create mode 100644 backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.InvalidEmail_IsSyntaxError.snap
 delete mode 100644 backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.InvalidEmail_IsUserError.snap
 create mode 100644 backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.NullOrEmptyEmail_IsSyntaxError.snap
 delete mode 100644 backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.NullOrEmptyEmail_IsUserError.snap

diff --git a/backend/test/Integration/GraphQl/Users/ChangeUserEmailTests.cs b/backend/test/Integration/GraphQl/Users/ChangeUserEmailTests.cs
index 0cfa41961..c9037b465 100644
--- a/backend/test/Integration/GraphQl/Users/ChangeUserEmailTests.cs
+++ b/backend/test/Integration/GraphQl/Users/ChangeUserEmailTests.cs
@@ -103,7 +103,7 @@ await RegisterAndConfirmAndLoginUser(
 
     [Test]
     [SuppressMessage("Naming", "CA1707")]
-    public async Task InvalidEmail_IsUserError()
+    public async Task InvalidEmail_IsSyntaxError()
     {
         // Arrange
         const string email = "john.doe@ise.fraunhofer.de";
@@ -115,18 +115,13 @@ await RegisterAndConfirmAndLoginUser(
         const string newEmail = "@invalid@" + email;
         // Act
         var response = await ChangeUserEmail(
-            AssertHttpSuccess,
+            AssertHttpBadRequest,
             ReadAsString,
             AssertNothing,
             newEmail
         );
         // Assert
-        Snapshot.Match(
-            response,
-            matchOptions => matchOptions.Assert(fieldOptions =>
-                fieldOptions.Field<string>("data.changeUserEmail.user.id").Should().NotBeNullOrWhiteSpace()
-            )
-        );
+        Snapshot.Match(response);
         await LoginUser();
     }
 }
\ No newline at end of file
diff --git a/backend/test/Integration/GraphQl/Users/ConfirmUserEmailChange.graphql b/backend/test/Integration/GraphQl/Users/ConfirmUserEmailChange.graphql
index f32626c09..f5a9ad16e 100644
--- a/backend/test/Integration/GraphQl/Users/ConfirmUserEmailChange.graphql
+++ b/backend/test/Integration/GraphQl/Users/ConfirmUserEmailChange.graphql
@@ -1,5 +1,5 @@
 mutation ConfirmUserEmailChange(
-  $currentEmail: String!,
+  $currentEmail: EmailAddress!,
   $newEmail: EmailAddress!,
   $confirmationCode: String!
   ) {
diff --git a/backend/test/Integration/GraphQl/Users/RegisterUserTests.cs b/backend/test/Integration/GraphQl/Users/RegisterUserTests.cs
index 093a77688..1fb0175d9 100644
--- a/backend/test/Integration/GraphQl/Users/RegisterUserTests.cs
+++ b/backend/test/Integration/GraphQl/Users/RegisterUserTests.cs
@@ -91,11 +91,11 @@ await RegisterUser(
 
     [Test]
     [SuppressMessage("Naming", "CA1707")]
-    public async Task InvalidEmail_IsUserError()
+    public async Task InvalidEmail_IsSyntaxError()
     {
         // Act
         var response = await RegisterUser(
-            AssertHttpSuccess,
+            AssertHttpBadRequest,
             ReadAsString,
             AssertNothing,
             email: "john.doeise.fraunhofer.de",
@@ -193,11 +193,11 @@ public async Task PasswordTooShort_IsUserError()
 
     [Test]
     [SuppressMessage("Naming", "CA1707")]
-    public async Task NullOrEmptyEmail_IsUserError()
+    public async Task NullOrEmptyEmail_IsSyntaxError()
     {
         // Act
         var response = await RegisterUser(
-            AssertHttpSuccess,
+            AssertHttpBadRequest,
             ReadAsString,
             AssertNothing,
             email: "",
diff --git a/backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserEmailTests.InvalidEmail_IsUserError.snap b/backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserEmailTests.InvalidEmail_IsUserError.snap
deleted file mode 100644
index efdf60e71..000000000
--- a/backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserEmailTests.InvalidEmail_IsUserError.snap
+++ /dev/null
@@ -1 +0,0 @@
-{"data":{"changeUserEmail":{"user":{"id":"VXNlcjpv6poBsoOieYEHv2iSs1yM","contact":{"emailAddress":"john.doe@ise.fraunhofer.de"}},"errors":null}}}
diff --git a/backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.InvalidEmail_IsSyntaxError.snap b/backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.InvalidEmail_IsSyntaxError.snap
new file mode 100644
index 000000000..b7695ec6d
--- /dev/null
+++ b/backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.InvalidEmail_IsSyntaxError.snap
@@ -0,0 +1 @@
+{"errors":[{"message":"EmailAddressType cannot parse the provided value. The provided value does not meet the RFC 5322 specification.","path":["email"],"extensions":{"code":"HC0002","actualType":"EmailAddress"}}]}
diff --git a/backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.InvalidEmail_IsUserError.snap b/backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.InvalidEmail_IsUserError.snap
deleted file mode 100644
index 9a2429bd1..000000000
--- a/backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.InvalidEmail_IsUserError.snap
+++ /dev/null
@@ -1 +0,0 @@
-{"data":{"registerUser":{"user":null,"errors":[{"code":"INVALID_EMAIL","message":"Email \u0027john.doeise.fraunhofer.de\u0027 is invalid.","path":["input","email"]}]}}}
diff --git a/backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.NullOrEmptyEmail_IsSyntaxError.snap b/backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.NullOrEmptyEmail_IsSyntaxError.snap
new file mode 100644
index 000000000..b7695ec6d
--- /dev/null
+++ b/backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.NullOrEmptyEmail_IsSyntaxError.snap
@@ -0,0 +1 @@
+{"errors":[{"message":"EmailAddressType cannot parse the provided value. The provided value does not meet the RFC 5322 specification.","path":["email"],"extensions":{"code":"HC0002","actualType":"EmailAddress"}}]}
diff --git a/backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.NullOrEmptyEmail_IsUserError.snap b/backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.NullOrEmptyEmail_IsUserError.snap
deleted file mode 100644
index 817eff74d..000000000
--- a/backend/test/Integration/GraphQl/Users/__snapshots__/RegisterUserTests.NullOrEmptyEmail_IsUserError.snap
+++ /dev/null
@@ -1 +0,0 @@
-{"data":{"registerUser":{"user":null,"errors":[{"code":"INVALID_EMAIL","message":"Email \u0027\u0027 is invalid.","path":["input","email"]}]}}}
diff --git a/backend/test/Integration/IntegrationTests.cs b/backend/test/Integration/IntegrationTests.cs
index a735d4132..f9219d2cf 100644
--- a/backend/test/Integration/IntegrationTests.cs
+++ b/backend/test/Integration/IntegrationTests.cs
@@ -475,6 +475,19 @@ await message.Content.ReadAsStringAsync()
         }
     }
 
+    protected static async Task AssertHttpBadRequest(HttpResponseMessage message)
+    {
+        if (message.StatusCode != HttpStatusCode.BadRequest)
+        {
+            // We wrap this check in an if-condition such that the message
+            // content is only read when the status code is not 200.
+            message.StatusCode.Should().Be(
+                HttpStatusCode.BadRequest,
+                await message.Content.ReadAsStringAsync()
+            );
+        }
+    }
+
     protected static async Task AssertHttpFailure(HttpResponseMessage message)
     {
         if (message.StatusCode == HttpStatusCode.OK)

From 5a220112b28a2c7a8b3f0c4558063934221838c3 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 24 Jun 2026 16:58:10 +0200
Subject: [PATCH 111/145] Add navigations from components to `all*Data` and add
 counts to data tabs on component page

---
 .../CalorimetricDataPropositionInput.cs       |   6 +-
 .../GraphQl/Components/ComponentQueries.cs    |   2 +-
 .../src/GraphQl/Components/ComponentType.cs   | 308 +++++++++++++++++-
 backend/src/GraphQl/DataLoaders.cs            |  15 +-
 .../src/GraphQl/DataX/UuidPropositionInput.cs |   5 +-
 .../GraphQl/Databases/DatabaseResolvers.cs    |  43 +--
 backend/src/GraphQl/Databases/DatabaseType.cs | 216 ++++--------
 .../GeometricDataPropositionInput.cs          |   6 +-
 .../GnuPgKeyFingerprintDataLoaders.cs         |   3 +-
 .../HygrothermalDataPropositionInput.cs       |   6 +-
 .../LifeCycleDataPropositionInput.cs          |   6 +-
 .../OpenIdConnectApplicationDataLoaders.cs    |   3 +-
 .../OpticalDataPropositionInput.cs            |   6 +-
 .../PhotovoltaicDataPropositionInput.cs       |   6 +-
 backend/src/GraphQl/Requests/DataQueries.cs   |   4 +-
 .../src/GraphQl/Requests/QueryingDatabases.cs |   2 +-
 .../GraphQlSchemaTests.IsUnchanged.snap       |  48 +++
 frontend/components/components/Component.tsx  |  40 ++-
 frontend/queries/components.graphql           |  27 ++
 frontend/type-defs.graphqls                   |  48 +++
 20 files changed, 593 insertions(+), 207 deletions(-)

diff --git a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataPropositionInput.cs b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataPropositionInput.cs
index aae0a7629..45d9b24f8 100644
--- a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataPropositionInput.cs
+++ b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataPropositionInput.cs
@@ -11,4 +11,8 @@ public sealed record CalorimetricDataPropositionInput(
     GetHttpsResourcesPropositionInput? Resources,
     FloatsPropositionInput? GValues,
     FloatsPropositionInput? UValues
-);
\ No newline at end of file
+)
+{
+    public static readonly CalorimetricDataPropositionInput Empty =
+        new(null, null, null, null, null, null, null);
+};
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentQueries.cs b/backend/src/GraphQl/Components/ComponentQueries.cs
index fbc8d53cb..0d6da95d1 100644
--- a/backend/src/GraphQl/Components/ComponentQueries.cs
+++ b/backend/src/GraphQl/Components/ComponentQueries.cs
@@ -44,4 +44,4 @@ CancellationToken cancellationToken
             // .With(queryContext)
             .LoadAsync(id, cancellationToken);
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Components/ComponentType.cs b/backend/src/GraphQl/Components/ComponentType.cs
index 65b61e017..ff112c958 100644
--- a/backend/src/GraphQl/Components/ComponentType.cs
+++ b/backend/src/GraphQl/Components/ComponentType.cs
@@ -3,13 +3,21 @@
 using System.Threading.Tasks;
 using GreenDonut.Data;
 using HotChocolate;
+using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Authorization;
 using Metabase.Data;
-using Metabase.Extensions;
+using Metabase.GraphQl.CalorimetricDataX;
+using Metabase.GraphQl.GeometricDataX;
+using Metabase.GraphQl.HygrothermalDataX;
+using Metabase.GraphQl.LifeCycleDataX;
+using Metabase.GraphQl.OpticalDataX;
+using Metabase.GraphQl.PhotovoltaicDataX;
 using Metabase.GraphQl.Entities;
 using Metabase.GraphQl.Extensions;
+using Metabase.GraphQl.Scalars;
 using Metabase.GraphQl.Users;
+using Metabase.GraphQl.Requests;
 
 namespace Metabase.GraphQl.Components;
 
@@ -152,6 +160,24 @@ IObjectTypeDescriptor<Component> descriptor
             );
         descriptor
             .Field(t => t.VariantOfEdges).Ignore();
+        descriptor
+            .Field("allCalorimetricData")
+            .ResolveWith<ComponentResolvers>(_ => _.GetAllCalorimetricDataAsync(default!, default, default, default, default, default, default!, default!, default));
+        descriptor
+            .Field("allGeometricData")
+            .ResolveWith<ComponentResolvers>(_ => _.GetAllGeometricDataAsync(default!, default, default, default, default, default, default!, default!, default));
+        descriptor
+            .Field("allHygrothermalData")
+            .ResolveWith<ComponentResolvers>(_ => _.GetAllHygrothermalDataAsync(default!, default, default, default, default, default, default!, default!, default));
+        descriptor
+            .Field("allLifeCycleData")
+            .ResolveWith<ComponentResolvers>(_ => _.GetAllLifeCycleDataAsync(default!, default, default, default, default, default, default!, default!, default));
+        descriptor
+            .Field("allOpticalData")
+            .ResolveWith<ComponentResolvers>(_ => _.GetAllOpticalDataAsync(default!, default, default, default, default, default, default!, default!, default));
+        descriptor
+            .Field("allPhotovoltaicData")
+            .ResolveWith<ComponentResolvers>(_ => _.GetAllPhotovoltaicDataAsync(default!, default, default, default, default, default, default!, default!, default));
         descriptor
             .Field("isAuthorizedToUpdateNode")
             .Cost(1)
@@ -160,8 +186,286 @@ IObjectTypeDescriptor<Component> descriptor
             .UseUserManager();
     }
 
-    private sealed class ComponentResolvers
+    private sealed class ComponentResolvers(
+        DataQueries dataQueries
+    )
     {
+        public Task<CalorimetricDataConnection> GetAllCalorimetricDataAsync(
+            [Parent] Component component,
+            CalorimetricDataPropositionInput? where,
+            [GraphQLType<LocaleType>] string? locale,
+            int? first,
+            string? after,
+            int? last,
+            string? before,
+            IResolverContext resolverContext,
+            CancellationToken cancellationToken
+        )
+        {
+            var componentIdPropositionInput = CalorimetricDataPropositionInput.Empty with
+            {
+                ComponentId = DataX.UuidPropositionInput.Empty with
+                {
+                    EqualTo = component.Id
+                }
+            };
+            return dataQueries.GetAllDataAsync<CalorimetricDataConnection, CalorimetricDataEdge, CalorimetricData>(
+                first,
+                after,
+                last,
+                before,
+                (edges, totalCount, pageInfo) => new CalorimetricDataConnection(edges, totalCount, pageInfo),
+                (node, cursor) => new CalorimetricDataEdge(cursor, node),
+                (database, first, after, last, before) => dataQueries.GetAllCalorimetricDataAsync(
+                    database,
+                    CalorimetricDataPropositionInput.Empty with
+                    {
+                        And = where is null
+                            ? [componentIdPropositionInput]
+                            : [componentIdPropositionInput, where]
+                    },
+                    locale,
+                    first,
+                    after,
+                    last,
+                    before,
+                    resolverContext,
+                    cancellationToken
+                ),
+                cancellationToken
+            );
+        }
+
+        public Task<GeometricDataConnection> GetAllGeometricDataAsync(
+            [Parent] Component component,
+            GeometricDataPropositionInput? where,
+            [GraphQLType<LocaleType>] string? locale,
+            int? first,
+            string? after,
+            int? last,
+            string? before,
+            IResolverContext resolverContext,
+            CancellationToken cancellationToken
+        )
+        {
+            var componentIdPropositionInput = GeometricDataPropositionInput.Empty with
+            {
+                ComponentId = DataX.UuidPropositionInput.Empty with
+                {
+                    EqualTo = component.Id
+                }
+            };
+            return dataQueries.GetAllDataAsync<GeometricDataConnection, GeometricDataEdge, GeometricData>(
+                first,
+                after,
+                last,
+                before,
+                (edges, totalCount, pageInfo) => new GeometricDataConnection(edges, totalCount, pageInfo),
+                (node, cursor) => new GeometricDataEdge(cursor, node),
+                (database, first, after, last, before) => dataQueries.GetAllGeometricDataAsync(
+                    database,
+                    GeometricDataPropositionInput.Empty with
+                    {
+                        And = where is null
+                            ? [componentIdPropositionInput]
+                            : [componentIdPropositionInput, where]
+                    },
+                    locale,
+                    first,
+                    after,
+                    last,
+                    before,
+                    resolverContext,
+                    cancellationToken
+                ),
+                cancellationToken
+            );
+        }
+
+        public Task<HygrothermalDataConnection> GetAllHygrothermalDataAsync(
+            [Parent] Component component,
+            HygrothermalDataPropositionInput? where,
+            [GraphQLType<LocaleType>] string? locale,
+            int? first,
+            string? after,
+            int? last,
+            string? before,
+            IResolverContext resolverContext,
+            CancellationToken cancellationToken
+        )
+        {
+            var componentIdPropositionInput = HygrothermalDataPropositionInput.Empty with
+            {
+                ComponentId = DataX.UuidPropositionInput.Empty with
+                {
+                    EqualTo = component.Id
+                }
+            };
+            return dataQueries.GetAllDataAsync<HygrothermalDataConnection, HygrothermalDataEdge, HygrothermalData>(
+                first,
+                after,
+                last,
+                before,
+                (edges, totalCount, pageInfo) => new HygrothermalDataConnection(edges, totalCount, pageInfo),
+                (node, cursor) => new HygrothermalDataEdge(cursor, node),
+                (database, first, after, last, before) => dataQueries.GetAllHygrothermalDataAsync(
+                    database,
+                    HygrothermalDataPropositionInput.Empty with
+                    {
+                        And = where is null
+                            ? [componentIdPropositionInput]
+                            : [componentIdPropositionInput, where]
+                    },
+                    locale,
+                    first,
+                    after,
+                    last,
+                    before,
+                    resolverContext,
+                    cancellationToken
+                ),
+                cancellationToken
+            );
+        }
+
+        public Task<LifeCycleDataConnection> GetAllLifeCycleDataAsync(
+            [Parent] Component component,
+            LifeCycleDataPropositionInput? where,
+            [GraphQLType<LocaleType>] string? locale,
+            int? first,
+            string? after,
+            int? last,
+            string? before,
+            IResolverContext resolverContext,
+            CancellationToken cancellationToken
+        )
+        {
+            var componentIdPropositionInput = LifeCycleDataPropositionInput.Empty with
+            {
+                ComponentId = DataX.UuidPropositionInput.Empty with
+                {
+                    EqualTo = component.Id
+                }
+            };
+            return dataQueries.GetAllDataAsync<LifeCycleDataConnection, LifeCycleDataEdge, LifeCycleData>(
+                first,
+                after,
+                last,
+                before,
+                (edges, totalCount, pageInfo) => new LifeCycleDataConnection(edges, totalCount, pageInfo),
+                (node, cursor) => new LifeCycleDataEdge(cursor, node),
+                (database, first, after, last, before) => dataQueries.GetAllLifeCycleDataAsync(
+                    database,
+                    LifeCycleDataPropositionInput.Empty with
+                    {
+                        And = where is null
+                            ? [componentIdPropositionInput]
+                            : [componentIdPropositionInput, where]
+                    },
+                    locale,
+                    first,
+                    after,
+                    last,
+                    before,
+                    resolverContext,
+                    cancellationToken
+                ),
+                cancellationToken
+            );
+        }
+
+        public Task<OpticalDataConnection> GetAllOpticalDataAsync(
+            [Parent] Component component,
+            OpticalDataPropositionInput? where,
+            [GraphQLType<LocaleType>] string? locale,
+            int? first,
+            string? after,
+            int? last,
+            string? before,
+            IResolverContext resolverContext,
+            CancellationToken cancellationToken
+        )
+        {
+            var componentIdPropositionInput = OpticalDataPropositionInput.Empty with
+            {
+                ComponentId = DataX.UuidPropositionInput.Empty with
+                {
+                    EqualTo = component.Id
+                }
+            };
+            return dataQueries.GetAllDataAsync<OpticalDataConnection, OpticalDataEdge, OpticalData>(
+                first,
+                after,
+                last,
+                before,
+                (edges, totalCount, pageInfo) => new OpticalDataConnection(edges, totalCount, pageInfo),
+                (node, cursor) => new OpticalDataEdge(cursor, node),
+                (database, first, after, last, before) => dataQueries.GetAllOpticalDataAsync(
+                    database,
+                    OpticalDataPropositionInput.Empty with
+                    {
+                        And = where is null
+                            ? [componentIdPropositionInput]
+                            : [componentIdPropositionInput, where]
+                    },
+                    locale,
+                    first,
+                    after,
+                    last,
+                    before,
+                    resolverContext,
+                    cancellationToken
+                ),
+                cancellationToken
+            );
+        }
+
+        public Task<PhotovoltaicDataConnection> GetAllPhotovoltaicDataAsync(
+            [Parent] Component component,
+            PhotovoltaicDataPropositionInput? where,
+            [GraphQLType<LocaleType>] string? locale,
+            int? first,
+            string? after,
+            int? last,
+            string? before,
+            IResolverContext resolverContext,
+            CancellationToken cancellationToken
+        )
+        {
+            var componentIdPropositionInput = PhotovoltaicDataPropositionInput.Empty with
+            {
+                ComponentId = DataX.UuidPropositionInput.Empty with
+                {
+                    EqualTo = component.Id
+                }
+            };
+            return dataQueries.GetAllDataAsync<PhotovoltaicDataConnection, PhotovoltaicDataEdge, PhotovoltaicData>(
+                first,
+                after,
+                last,
+                before,
+                (edges, totalCount, pageInfo) => new PhotovoltaicDataConnection(edges, totalCount, pageInfo),
+                (node, cursor) => new PhotovoltaicDataEdge(cursor, node),
+                (database, first, after, last, before) => dataQueries.GetAllPhotovoltaicDataAsync(
+                    database,
+                    PhotovoltaicDataPropositionInput.Empty with
+                    {
+                        And = where is null
+                            ? [componentIdPropositionInput]
+                            : [componentIdPropositionInput, where]
+                    },
+                    locale,
+                    first,
+                    after,
+                    last,
+                    before,
+                    resolverContext,
+                    cancellationToken
+                ),
+                cancellationToken
+            );
+        }
+
         internal static Task<bool> IsAuthorizedToUpdateNodeAsync(
             [Parent] Component component,
             ClaimsPrincipal claimsPrincipal,
diff --git a/backend/src/GraphQl/DataLoaders.cs b/backend/src/GraphQl/DataLoaders.cs
index 91b83b6ac..cece1343a 100644
--- a/backend/src/GraphQl/DataLoaders.cs
+++ b/backend/src/GraphQl/DataLoaders.cs
@@ -23,8 +23,7 @@ CancellationToken cancellationToken
     )
         where TEntity : class, IEntity, IAuditable
     {
-        await using var databaseContext =
-            databaseContextFactory.CreateDbContext();
+        await using var databaseContext = await databaseContextFactory.CreateDbContextAsync(cancellationToken);
         return await getEntities(databaseContext)
             .AsNoTrackingWithIdentityResolution()
             .Where(_ => ids.Contains(_.Id))
@@ -42,8 +41,7 @@ CancellationToken cancellationToken
     )
         where TMany : class, IEntity, IAuditable
     {
-        await using var databaseContext =
-            databaseContextFactory.CreateDbContext();
+        await using var databaseContext = await databaseContextFactory.CreateDbContextAsync(cancellationToken);
         return
             await getMany(databaseContext)
             .AsExpandable()
@@ -66,8 +64,7 @@ CancellationToken cancellationToken
     )
         where TMany : class, IEntity, IAuditable
     {
-        await using var databaseContext =
-            databaseContextFactory.CreateDbContext();
+        await using var databaseContext = await databaseContextFactory.CreateDbContextAsync(cancellationToken);
         return
             await getMany(databaseContext)
             .AsExpandable()
@@ -88,8 +85,7 @@ CancellationToken cancellationToken
     )
         where TAssociation : class, IAssociation, IAuditable
     {
-        await using var databaseContext =
-            databaseContextFactory.CreateDbContext();
+        await using var databaseContext = await databaseContextFactory.CreateDbContextAsync(cancellationToken);
         return
             await getAssociations(databaseContext)
             .AsExpandable()
@@ -113,8 +109,7 @@ CancellationToken cancellationToken
     )
         where TAssociation : class, IAssociation, IAuditable
     {
-        await using var databaseContext =
-            databaseContextFactory.CreateDbContext();
+        await using var databaseContext = await databaseContextFactory.CreateDbContextAsync(cancellationToken);
         return
             await getAssociations(databaseContext)
             .AsExpandable()
diff --git a/backend/src/GraphQl/DataX/UuidPropositionInput.cs b/backend/src/GraphQl/DataX/UuidPropositionInput.cs
index 1d0c294c8..b5996089e 100644
--- a/backend/src/GraphQl/DataX/UuidPropositionInput.cs
+++ b/backend/src/GraphQl/DataX/UuidPropositionInput.cs
@@ -4,4 +4,7 @@ namespace Metabase.GraphQl.DataX;
 
 public sealed record UuidPropositionInput(
     Guid? EqualTo
-);
\ No newline at end of file
+)
+{
+    public static readonly UuidPropositionInput Empty = new(EqualTo: null);
+};
\ No newline at end of file
diff --git a/backend/src/GraphQl/Databases/DatabaseResolvers.cs b/backend/src/GraphQl/Databases/DatabaseResolvers.cs
index a8382ef75..f23daf4ad 100644
--- a/backend/src/GraphQl/Databases/DatabaseResolvers.cs
+++ b/backend/src/GraphQl/Databases/DatabaseResolvers.cs
@@ -14,6 +14,7 @@
 using Metabase.GraphQl.OpticalDataX;
 using Metabase.GraphQl.PhotovoltaicDataX;
 using Metabase.GraphQl.Requests;
+using Metabase.GraphQl.Scalars;
 
 namespace Metabase.GraphQl.Databases;
 
@@ -45,7 +46,7 @@ CancellationToken cancellationToken
         [Parent] Database database,
         Guid id,
         DataKind kind,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
@@ -57,7 +58,7 @@ CancellationToken cancellationToken
         [Parent] Database database,
         DataKind kind,
         DataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
@@ -68,7 +69,7 @@ CancellationToken cancellationToken
     public Task<CalorimetricData?> GetCalorimetricDataAsync(
         [Parent] Database database,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
@@ -79,7 +80,7 @@ CancellationToken cancellationToken
     public Task<GeometricData?> GetGeometricDataAsync(
         [Parent] Database database,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
@@ -90,7 +91,7 @@ CancellationToken cancellationToken
     public Task<HygrothermalData?> GetHygrothermalDataAsync(
         [Parent] Database database,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
@@ -101,7 +102,7 @@ CancellationToken cancellationToken
     public Task<LifeCycleData?> GetLifeCycleDataAsync(
         [Parent] Database database,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
@@ -112,7 +113,7 @@ CancellationToken cancellationToken
     public Task<OpticalData?> GetOpticalDataAsync(
         [Parent] Database database,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
@@ -123,7 +124,7 @@ CancellationToken cancellationToken
     public Task<PhotovoltaicData?> GetPhotovoltaicDataAsync(
         [Parent] Database database,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
@@ -134,7 +135,7 @@ CancellationToken cancellationToken
     public Task<CalorimetricDataConnection?> GetAllCalorimetricDataAsync(
         [Parent] Database database,
         CalorimetricDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -149,7 +150,7 @@ CancellationToken cancellationToken
     public Task<GeometricDataConnection?> GetAllGeometricDataAsync(
         [Parent] Database database,
         GeometricDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -164,7 +165,7 @@ CancellationToken cancellationToken
     public Task<HygrothermalDataConnection?> GetAllHygrothermalDataAsync(
         [Parent] Database database,
         HygrothermalDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -179,7 +180,7 @@ CancellationToken cancellationToken
     public Task<LifeCycleDataConnection?> GetAllLifeCycleDataAsync(
         [Parent] Database database,
         LifeCycleDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -194,7 +195,7 @@ CancellationToken cancellationToken
     public Task<OpticalDataConnection?> GetAllOpticalDataAsync(
         [Parent] Database database,
         OpticalDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -209,7 +210,7 @@ CancellationToken cancellationToken
     public Task<PhotovoltaicDataConnection?> GetAllPhotovoltaicDataAsync(
         [Parent] Database database,
         PhotovoltaicDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -224,7 +225,7 @@ CancellationToken cancellationToken
     public Task<bool?> HasCalorimetricDataAsync(
         [Parent] Database database,
         CalorimetricDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
@@ -235,7 +236,7 @@ CancellationToken cancellationToken
     public Task<bool?> HasGeometricDataAsync(
         [Parent] Database database,
         GeometricDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
@@ -246,7 +247,7 @@ CancellationToken cancellationToken
     public Task<bool?> HasHygrothermalDataAsync(
         [Parent] Database database,
         HygrothermalDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
@@ -257,7 +258,7 @@ CancellationToken cancellationToken
     public Task<bool?> HasLifeCycleDataAsync(
         [Parent] Database database,
         LifeCycleDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
@@ -268,7 +269,7 @@ CancellationToken cancellationToken
     public Task<bool?> HasOpticalDataAsync(
         [Parent] Database database,
         OpticalDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
@@ -279,11 +280,11 @@ CancellationToken cancellationToken
     public Task<bool?> HasPhotovoltaicDataAsync(
         [Parent] Database database,
         PhotovoltaicDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
         return dataQueries.HasPhotovoltaicDataAsync(database, where, locale, resolverContext, cancellationToken);
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Databases/DatabaseType.cs b/backend/src/GraphQl/Databases/DatabaseType.cs
index 7fe95d5c0..4f9256347 100644
--- a/backend/src/GraphQl/Databases/DatabaseType.cs
+++ b/backend/src/GraphQl/Databases/DatabaseType.cs
@@ -1,16 +1,6 @@
-using System;
-using System.Linq.Expressions;
 using HotChocolate.Types;
 using Metabase.Data;
-using Metabase.GraphQl.DataX;
-using Metabase.GraphQl.CalorimetricDataX;
-using Metabase.GraphQl.GeometricDataX;
-using Metabase.GraphQl.HygrothermalDataX;
-using Metabase.GraphQl.LifeCycleDataX;
-using Metabase.GraphQl.OpticalDataX;
-using Metabase.GraphQl.PhotovoltaicDataX;
 using Metabase.GraphQl.Entities;
-using Metabase.GraphQl.Scalars;
 using Metabase.GraphQl.Users;
 
 namespace Metabase.GraphQl.Databases;
@@ -34,109 +24,66 @@ IObjectTypeDescriptor<Database> descriptor
         descriptor
             .Field(t => t.OperatorId)
             .Ignore();
-        ConfigureDataField(
-            descriptor,
-            "data",
-            _ => _.GetDataAsync(default!, default!, default, default!, default!, default)
-        )
-            .Argument("kind", _ => _.Type<NonNullType<EnumType<DataKind>>>());
-        ConfigureHasDataField<DataPropositionInput>(
-            descriptor,
-            "hasData",
-            _ => _.HasDataAsync(default!, default!, default!, default!, default!, default)
-        )
-            .Argument("kind", _ => _.Type<NonNullType<EnumType<DataKind>>>());
-        ConfigureDataField(
-            descriptor,
-            "calorimetricData",
-            _ => _.GetCalorimetricDataAsync(default!, default, default!, default!, default)
-        );
-        ConfigureAllDataField<CalorimetricDataPropositionInput>(
-            descriptor,
-            "allCalorimetricData",
-            _ => _.GetAllCalorimetricDataAsync(default!, default, default, default, default, default, default!, default!, default)
-        );
-        ConfigureHasDataField<CalorimetricDataPropositionInput>(
-            descriptor,
-            "hasCalorimetricData",
-            _ => _.HasCalorimetricDataAsync(default!, default, default!, default!, default)
-        );
-        ConfigureDataField(
-            descriptor,
-            "geometricData",
-            _ => _.GetGeometricDataAsync(default!, default, default!, default!, default)
-        );
-        ConfigureAllDataField<GeometricDataPropositionInput>(
-            descriptor,
-            "allGeometricData",
-            _ => _.GetAllGeometricDataAsync(default!, default, default, default, default, default, default!, default!, default)
-        );
-        ConfigureHasDataField<GeometricDataPropositionInput>(
-            descriptor,
-            "hasGeometricData",
-            _ => _.HasGeometricDataAsync(default!, default, default!, default!, default)
-        );
-        ConfigureDataField(
-            descriptor,
-            "hygrothermalData",
-            _ => _.GetHygrothermalDataAsync(default!, default, default!, default!, default)
-        );
-        ConfigureAllDataField<HygrothermalDataPropositionInput>(
-            descriptor,
-            "allHygrothermalData",
-            _ => _.GetAllHygrothermalDataAsync(default!, default, default, default, default, default, default!, default!, default)
-        );
-        ConfigureHasDataField<HygrothermalDataPropositionInput>(
-            descriptor,
-            "hasHygrothermalData",
-            _ => _.HasHygrothermalDataAsync(default!, default, default!, default!, default)
-        );
-        ConfigureDataField(
-            descriptor,
-            "lifeCycleData",
-            _ => _.GetLifeCycleDataAsync(default!, default, default!, default!, default)
-        );
-        ConfigureAllDataField<LifeCycleDataPropositionInput>(
-            descriptor,
-            "allLifeCycleData",
-            _ => _.GetAllLifeCycleDataAsync(default!, default, default, default, default, default, default!, default!, default)
-        );
-        ConfigureHasDataField<LifeCycleDataPropositionInput>(
-            descriptor,
-            "hasLifeCycleData",
-            _ => _.HasLifeCycleDataAsync(default!, default, default!, default!, default)
-        );
-        ConfigureDataField(
-            descriptor,
-            "opticalData",
-            _ => _.GetOpticalDataAsync(default!, default, default!, default!, default)
-        );
-        ConfigureAllDataField<OpticalDataPropositionInput>(
-            descriptor,
-            "allOpticalData",
-            _ => _.GetAllOpticalDataAsync(default!, default, default, default, default, default,
-                default!, default!, default)
-        );
-        ConfigureHasDataField<OpticalDataPropositionInput>(
-            descriptor,
-            "hasOpticalData",
-            _ => _.HasOpticalDataAsync(default!, default, default!, default!, default)
-        );
-        ConfigureDataField(
-            descriptor,
-            "photovoltaicData",
-            _ => _.GetPhotovoltaicDataAsync(default!, default, default!, default!, default)
-        );
-        ConfigureAllDataField<PhotovoltaicDataPropositionInput>(
-            descriptor,
-            "allPhotovoltaicData",
-            _ => _.GetAllPhotovoltaicDataAsync(default!, default, default, default, default, default, default!, default!, default)
-        );
-        ConfigureHasDataField<PhotovoltaicDataPropositionInput>(
-            descriptor,
-            "hasPhotovoltaicData",
-            _ => _.HasPhotovoltaicDataAsync(default!, default, default!, default!, default)
-        );
+        descriptor
+            .Field("data")
+            .ResolveWith<DatabaseResolvers>(_ => _.GetDataAsync(default!, default!, default, default!, default!, default));
+        descriptor
+            .Field("hasData")
+            .ResolveWith<DatabaseResolvers>(_ => _.HasDataAsync(default!, default!, default!, default!, default!, default));
+        descriptor
+            .Field("calorimetricData")
+            .ResolveWith<DatabaseResolvers>(_ => _.GetCalorimetricDataAsync(default!, default, default!, default!, default));
+        descriptor
+            .Field("allCalorimetricData")
+            .ResolveWith<DatabaseResolvers>(_ => _.GetAllCalorimetricDataAsync(default!, default, default, default, default, default, default!, default!, default));
+        descriptor
+            .Field("hasCalorimetricData")
+            .ResolveWith<DatabaseResolvers>(_ => _.HasCalorimetricDataAsync(default!, default, default!, default!, default));
+        descriptor
+            .Field("geometricData")
+            .ResolveWith<DatabaseResolvers>(_ => _.GetGeometricDataAsync(default!, default, default!, default!, default));
+        descriptor
+            .Field("allGeometricData")
+            .ResolveWith<DatabaseResolvers>(_ => _.GetAllGeometricDataAsync(default!, default, default, default, default, default, default!, default!, default));
+        descriptor
+            .Field("hasGeometricData")
+            .ResolveWith<DatabaseResolvers>(_ => _.HasGeometricDataAsync(default!, default, default!, default!, default));
+        descriptor
+            .Field("hygrothermalData")
+            .ResolveWith<DatabaseResolvers>(_ => _.GetHygrothermalDataAsync(default!, default, default!, default!, default));
+        descriptor
+            .Field("allHygrothermalData")
+            .ResolveWith<DatabaseResolvers>(_ => _.GetAllHygrothermalDataAsync(default!, default, default, default, default, default, default!, default!, default));
+        descriptor
+            .Field("hasHygrothermalData")
+            .ResolveWith<DatabaseResolvers>(_ => _.HasHygrothermalDataAsync(default!, default, default!, default!, default));
+        descriptor
+            .Field("lifeCycleData")
+            .ResolveWith<DatabaseResolvers>(_ => _.GetLifeCycleDataAsync(default!, default, default!, default!, default));
+        descriptor
+            .Field("allLifeCycleData")
+            .ResolveWith<DatabaseResolvers>(_ => _.GetAllLifeCycleDataAsync(default!, default, default, default, default, default, default!, default!, default));
+        descriptor
+            .Field("hasLifeCycleData")
+            .ResolveWith<DatabaseResolvers>(_ => _.HasLifeCycleDataAsync(default!, default, default!, default!, default));
+        descriptor
+            .Field("opticalData")
+            .ResolveWith<DatabaseResolvers>(_ => _.GetOpticalDataAsync(default!, default, default!, default!, default));
+        descriptor
+            .Field("allOpticalData")
+            .ResolveWith<DatabaseResolvers>(_ => _.GetAllOpticalDataAsync(default!, default, default, default, default, default, default!, default!, default));
+        descriptor
+            .Field("hasOpticalData")
+            .ResolveWith<DatabaseResolvers>(_ => _.HasOpticalDataAsync(default!, default, default!, default!, default));
+        descriptor
+            .Field("photovoltaicData")
+            .ResolveWith<DatabaseResolvers>(_ => _.GetPhotovoltaicDataAsync(default!, default, default!, default!, default));
+        descriptor
+            .Field("allPhotovoltaicData")
+            .ResolveWith<DatabaseResolvers>(_ => _.GetAllPhotovoltaicDataAsync(default!, default, default, default, default, default, default!, default!, default));
+        descriptor
+            .Field("hasPhotovoltaicData")
+            .ResolveWith<DatabaseResolvers>(_ => _.HasPhotovoltaicDataAsync(default!, default, default!, default!, default));
         descriptor
             .Field("isAuthorizedToUpdateNode")
             .Cost(1)
@@ -150,47 +97,4 @@ IObjectTypeDescriptor<Database> descriptor
                 x.IsAuthorizedToVerifyNodeAsync(default!, default!, default!, default!))
             .UseUserManager();
     }
-
-    private static IObjectFieldDescriptor ConfigureDataField(
-        IObjectTypeDescriptor<Database> descriptor,
-        string fieldName,
-        Expression<Func<DatabaseResolvers, object?>> resolverMethod
-    )
-    {
-        return descriptor
-            .Field(fieldName)
-            .Argument("id", _ => _.Type<NonNullType<UuidType>>())
-            .Argument("locale", _ => _.Type<LocaleType>())
-            .ResolveWith(resolverMethod);
-    }
-
-    private static void ConfigureAllDataField<TDataPropositionInput>(
-        IObjectTypeDescriptor<Database> descriptor,
-        string fieldName,
-        Expression<Func<DatabaseResolvers, object?>> resolverMethod
-    )
-    {
-        descriptor
-            .Field(fieldName)
-            .Argument("where", _ => _.Type<InputObjectType<TDataPropositionInput>>())
-            .Argument("locale", _ => _.Type<LocaleType>())
-            .Argument("first", _ => _.Type<IntType>())
-            .Argument("after", _ => _.Type<StringType>())
-            .Argument("last", _ => _.Type<IntType>())
-            .Argument("before", _ => _.Type<StringType>())
-            .ResolveWith(resolverMethod);
-    }
-
-    private static IObjectFieldDescriptor ConfigureHasDataField<TDataPropositionInput>(
-        IObjectTypeDescriptor<Database> descriptor,
-        string fieldName,
-        Expression<Func<DatabaseResolvers, object?>> resolverMethod
-    )
-    {
-        return descriptor
-            .Field(fieldName)
-            .Argument("where", _ => _.Type<InputObjectType<TDataPropositionInput>>())
-            .Argument("locale", _ => _.Type<LocaleType>())
-            .ResolveWith(resolverMethod);
-    }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/GeometricDataX/GeometricDataPropositionInput.cs b/backend/src/GraphQl/GeometricDataX/GeometricDataPropositionInput.cs
index f14091bf3..0d7f3eba7 100644
--- a/backend/src/GraphQl/GeometricDataX/GeometricDataPropositionInput.cs
+++ b/backend/src/GraphQl/GeometricDataX/GeometricDataPropositionInput.cs
@@ -10,4 +10,8 @@ public sealed record GeometricDataPropositionInput(
     IReadOnlyList<GeometricDataPropositionInput>? Or,
     GetHttpsResourcesPropositionInput? Resources,
     FloatsPropositionInput? Thicknesses
-);
\ No newline at end of file
+)
+{
+    public static readonly GeometricDataPropositionInput Empty =
+        new(null, null, null, null, null, null);
+};
\ No newline at end of file
diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintDataLoaders.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintDataLoaders.cs
index b445a5fd5..86a32da6c 100644
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintDataLoaders.cs
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintDataLoaders.cs
@@ -38,8 +38,7 @@ public static async ValueTask<IReadOnlyDictionary<string, GnuPgKeyFingerprint>>
         CancellationToken cancellationToken
     )
     {
-        await using var databaseContext =
-            databaseContextFactory.CreateDbContext();
+        await using var databaseContext = await databaseContextFactory.CreateDbContextAsync(cancellationToken);
         return await databaseContext.GnuPgKeyFingerprints
             .AsNoTrackingWithIdentityResolution()
             .Where(_ => fingerprints.Contains(_.Fingerprint))
diff --git a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataPropositionInput.cs b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataPropositionInput.cs
index b52f9f332..9d85ab6cd 100644
--- a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataPropositionInput.cs
+++ b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataPropositionInput.cs
@@ -9,4 +9,8 @@ public sealed record HygrothermalDataPropositionInput(
     HygrothermalDataPropositionInput? Not,
     IReadOnlyList<HygrothermalDataPropositionInput>? Or,
     GetHttpsResourcesPropositionInput? Resources
-);
\ No newline at end of file
+)
+{
+    public static readonly HygrothermalDataPropositionInput Empty =
+        new(null, null, null, null, null);
+};
\ No newline at end of file
diff --git a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataPropositionInput.cs b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataPropositionInput.cs
index 66c6d0292..bc7341d80 100644
--- a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataPropositionInput.cs
+++ b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataPropositionInput.cs
@@ -9,4 +9,8 @@ public sealed record LifeCycleDataPropositionInput(
     LifeCycleDataPropositionInput? Not,
     IReadOnlyList<LifeCycleDataPropositionInput>? Or,
     GetHttpsResourcesPropositionInput? Resources
-);
\ No newline at end of file
+)
+{
+    public static readonly LifeCycleDataPropositionInput Empty =
+        new(null, null, null, null, null);
+};
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationDataLoaders.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationDataLoaders.cs
index 9e973ca89..85fc1f330 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationDataLoaders.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationDataLoaders.cs
@@ -39,8 +39,7 @@ public static async ValueTask<IReadOnlyDictionary<string, OpenIdConnectApplicati
         CancellationToken cancellationToken
     )
     {
-        await using var databaseContext =
-            databaseContextFactory.CreateDbContext();
+        await using var databaseContext = await databaseContextFactory.CreateDbContextAsync(cancellationToken);
         return await databaseContext.OpenIdConnectApplications
             .AsNoTrackingWithIdentityResolution()
             .Where(_ => clientIds.Contains(_.ClientId ?? ""))
diff --git a/backend/src/GraphQl/OpticalDataX/OpticalDataPropositionInput.cs b/backend/src/GraphQl/OpticalDataX/OpticalDataPropositionInput.cs
index 3a642faac..9a3d2154c 100644
--- a/backend/src/GraphQl/OpticalDataX/OpticalDataPropositionInput.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalDataPropositionInput.cs
@@ -19,4 +19,8 @@ public sealed record OpticalDataPropositionInput(
     FloatsPropositionInput? InfraredEmittances,
     FloatsPropositionInput? ColorRenderingIndices,
     CielabColorsPropositionInput? CielabColors
-);
\ No newline at end of file
+)
+{
+    public static readonly OpticalDataPropositionInput Empty =
+        new(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+};
\ No newline at end of file
diff --git a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataPropositionInput.cs b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataPropositionInput.cs
index 891ce3e0f..cf2ee7017 100644
--- a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataPropositionInput.cs
+++ b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataPropositionInput.cs
@@ -9,4 +9,8 @@ public sealed record PhotovoltaicDataPropositionInput(
     PhotovoltaicDataPropositionInput? Not,
     IReadOnlyList<PhotovoltaicDataPropositionInput>? Or,
     GetHttpsResourcesPropositionInput? Resources
-);
\ No newline at end of file
+)
+{
+    public static readonly PhotovoltaicDataPropositionInput Empty =
+        new(null, null, null, null, null);
+};
\ No newline at end of file
diff --git a/backend/src/GraphQl/Requests/DataQueries.cs b/backend/src/GraphQl/Requests/DataQueries.cs
index decea8816..ec53dfaee 100644
--- a/backend/src/GraphQl/Requests/DataQueries.cs
+++ b/backend/src/GraphQl/Requests/DataQueries.cs
@@ -39,7 +39,7 @@ string Request
 }
 
 public sealed class DataQueries(
-    ApplicationDbContext databaseContext,
+    IDbContextFactory<ApplicationDbContext> databaseContextFactory,
     QueryingDatabases queryingDatabases,
     GraphQlRequestHelper graphQlRequestHelper,
     ILogger<DataQueries> logger
@@ -248,6 +248,7 @@ CancellationToken cancellationToken
         where TDataConnection : DataConnection<TDataEdge>
         where TDataEdge : DataEdge<TDataNode>
     {
+        await using var databaseContext = await databaseContextFactory.CreateDbContextAsync(cancellationToken);
         var paginationDirection = (first, last) switch
         {
             (_, null) => PaginationDirection.FORWARD,
@@ -458,6 +459,7 @@ public async Task<bool> HasDataAsync(
         CancellationToken cancellationToken
     )
     {
+        await using var databaseContext = await databaseContextFactory.CreateDbContextAsync(cancellationToken);
         var databases = await databaseContext.Databases.AsNoTracking().ToListAsync(cancellationToken);
         var hasData = await Task.WhenAll(
             databases.Select((database) =>
diff --git a/backend/src/GraphQl/Requests/QueryingDatabases.cs b/backend/src/GraphQl/Requests/QueryingDatabases.cs
index 72936d640..8bdb39319 100644
--- a/backend/src/GraphQl/Requests/QueryingDatabases.cs
+++ b/backend/src/GraphQl/Requests/QueryingDatabases.cs
@@ -195,7 +195,7 @@ await httpClient.PostAsync(
                 httpResponseMessage.StatusCode);
         }
         // We could use `httpResponseMessage.Content.ReadFromJsonAsync<GraphQL.GraphQLResponse<TGraphQlResponse>>` which would make debugging more difficult though, https://docs.microsoft.com/en-us/dotnet/api/system.net.http.json.httpcontentjsonextensions.readfromjsonasync?view=net-5.0#System_Net_Http_Json_HttpContentJsonExtensions_ReadFromJsonAsync__1_System_Net_Http_HttpContent_System_Text_Json_JsonSerializerOptions_System_Threading_CancellationToken_
-        using var graphQlResponseStream =
+        await using var graphQlResponseStream =
             await httpResponseMessage.Content
                 .ReadAsStreamAsync(cancellationToken);
         // For debugging, the following lines of code write the response to standard output.
diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index fa86431e8..a336451c9 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -738,6 +738,54 @@ type CielabColor {
 
 type Component implements Node {
   abbreviation: String
+  allCalorimetricData(
+    after: String
+    before: String
+    first: Int
+    last: Int
+    locale: Locale
+    where: CalorimetricDataPropositionInput
+  ): CalorimetricDataConnection! @cost(weight: "10")
+  allGeometricData(
+    after: String
+    before: String
+    first: Int
+    last: Int
+    locale: Locale
+    where: GeometricDataPropositionInput
+  ): GeometricDataConnection! @cost(weight: "10")
+  allHygrothermalData(
+    after: String
+    before: String
+    first: Int
+    last: Int
+    locale: Locale
+    where: HygrothermalDataPropositionInput
+  ): HygrothermalDataConnection! @cost(weight: "10")
+  allLifeCycleData(
+    after: String
+    before: String
+    first: Int
+    last: Int
+    locale: Locale
+    where: LifeCycleDataPropositionInput
+  ): LifeCycleDataConnection! @cost(weight: "10")
+  allOpticalData(
+    after: String
+    before: String
+    first: Int
+    last: Int
+    locale: Locale
+    where: OpticalDataPropositionInput
+  ): OpticalDataConnection! @cost(weight: "10")
+  allPhotovoltaicData(
+    after: String
+    before: String
+    first: Int
+    last: Int
+    locale: Locale
+    where: PhotovoltaicDataPropositionInput
+  ): PhotovoltaicDataConnection! @cost(weight: "10")
   assembledOf(
     order: [ComponentAssembledOfSortInput!] @cost(weight: "10")
     where: ComponentAssembledOfFilterInput @cost(weight: "10")
diff --git a/frontend/components/components/Component.tsx b/frontend/components/components/Component.tsx
index 8ae407eaf..f947a9d83 100644
--- a/frontend/components/components/Component.tsx
+++ b/frontend/components/components/Component.tsx
@@ -1,6 +1,10 @@
 import { useQuery } from "@apollo/client/react";
 import { Scalars } from "../../__generated__/graphql";
-import { ComponentDocument } from "../../queries/components.generated";
+import {
+  ComponentDataTotalCountsDocument,
+  ComponentDataTotalCountsPartialFragment,
+  ComponentDocument,
+} from "../../queries/components.generated";
 import { Skeleton, Result, Card, Divider } from "antd";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import ComponentSummary from "./ComponentSummary";
@@ -14,9 +18,13 @@ import PaginatedHygrothermalData from "../data/hygrothermal/PaginatedHygrotherma
 import PaginatedPhotovoltaicData from "../data/photovoltaic/PaginatedPhotovoltaicData";
 import PaginatedLifeCycleData from "../data/lifeCycle/PaginatedLifeCycleData";
 
-const getDataTabs = (componentId: Scalars["Uuid"]["output"]) => [
+const getDataTabs = (
+  componentId: Scalars["Uuid"]["output"],
+  dataTotalCounts: ComponentDataTotalCountsPartialFragment,
+) => [
   {
     key: "calorimetric",
+    count: dataTotalCounts?.allCalorimetricData.totalCount,
     label: "Calorimetric Data",
     children: (
       <PaginatedCalorimetricData
@@ -26,6 +34,7 @@ const getDataTabs = (componentId: Scalars["Uuid"]["output"]) => [
   },
   {
     key: "geometric",
+    count: dataTotalCounts?.allGeometricData.totalCount,
     label: "Geometric Data",
     children: (
       <PaginatedGeometricData
@@ -35,6 +44,7 @@ const getDataTabs = (componentId: Scalars["Uuid"]["output"]) => [
   },
   {
     key: "hygrothermal",
+    count: dataTotalCounts?.allHygrothermalData.totalCount,
     label: "Hygrothermal Data",
     children: (
       <PaginatedHygrothermalData
@@ -44,6 +54,7 @@ const getDataTabs = (componentId: Scalars["Uuid"]["output"]) => [
   },
   {
     key: "lifeCycle",
+    count: dataTotalCounts?.allLifeCycleData.totalCount,
     label: "Life-Cycle Data",
     children: (
       <PaginatedLifeCycleData
@@ -53,6 +64,7 @@ const getDataTabs = (componentId: Scalars["Uuid"]["output"]) => [
   },
   {
     key: "optical",
+    count: dataTotalCounts?.allOpticalData.totalCount,
     label: "Optical Data",
     children: (
       <PaginatedOpticalData where={{ componentId: { equalTo: componentId } }} />
@@ -60,6 +72,7 @@ const getDataTabs = (componentId: Scalars["Uuid"]["output"]) => [
   },
   {
     key: "photovoltaic",
+    count: dataTotalCounts?.allPhotovoltaicData.totalCount,
     label: "Photovoltaic Data",
     children: (
       <PaginatedPhotovoltaicData
@@ -81,9 +94,24 @@ export default function Component({ componentId }: ComponentProps) {
     variables: queryVariables,
   });
   useQueryHandler({ error });
+
+  const { data: dataTotalCountsData } = useQuery(
+    ComponentDataTotalCountsDocument,
+    {
+      variables: queryVariables,
+    },
+  );
+
   const component = data?.component;
+  const dataTotalCounts = dataTotalCountsData?.component;
 
-  const dataTabs = useMemo(() => getDataTabs(componentId), [componentId]);
+  const dataTabs = useMemo(
+    () =>
+      dataTotalCounts == null
+        ? null
+        : getDataTabs(componentId, dataTotalCounts),
+    [componentId, dataTotalCounts],
+  );
 
   if (loading) {
     return <Skeleton active avatar title />;
@@ -106,7 +134,11 @@ export default function Component({ componentId }: ComponentProps) {
       </Card>
       <QueryToolbar query={ComponentDocument} variables={queryVariables} />
       <Divider />
-      <LazyTabs items={dataTabs} />
+      {dataTabs == null ? (
+        <Skeleton active avatar title />
+      ) : (
+        <LazyTabs items={dataTabs} />
+      )}
     </div>
   );
 }
diff --git a/frontend/queries/components.graphql b/frontend/queries/components.graphql
index 8913ae0a0..1b30c7b5e 100644
--- a/frontend/queries/components.graphql
+++ b/frontend/queries/components.graphql
@@ -142,6 +142,27 @@ fragment ComponentPartial on Component {
   isAuthorizedToUpdateNode
 }
 
+fragment ComponentDataTotalCountsPartial on Component {
+  allCalorimetricData {
+    totalCount
+  }
+  allGeometricData {
+    totalCount
+  }
+  allHygrothermalData {
+    totalCount
+  }
+  allLifeCycleData {
+    totalCount
+  }
+  allOpticalData {
+    totalCount
+  }
+  allPhotovoltaicData {
+    totalCount
+  }
+}
+
 query ComponentNames(
   $first: Int!
   $after: String
@@ -200,6 +221,12 @@ query Component($id: Uuid!) {
   }
 }
 
+query ComponentDataTotalCounts($id: Uuid!) {
+  component(id: $id) {
+    ...ComponentDataTotalCountsPartial
+  }
+}
+
 mutation CreateComponent($input: CreateComponentInput!) {
   createComponent(input: $input) {
     component {
diff --git a/frontend/type-defs.graphqls b/frontend/type-defs.graphqls
index fa86431e8..a336451c9 100644
--- a/frontend/type-defs.graphqls
+++ b/frontend/type-defs.graphqls
@@ -738,6 +738,54 @@ type CielabColor {
 
 type Component implements Node {
   abbreviation: String
+  allCalorimetricData(
+    after: String
+    before: String
+    first: Int
+    last: Int
+    locale: Locale
+    where: CalorimetricDataPropositionInput
+  ): CalorimetricDataConnection! @cost(weight: "10")
+  allGeometricData(
+    after: String
+    before: String
+    first: Int
+    last: Int
+    locale: Locale
+    where: GeometricDataPropositionInput
+  ): GeometricDataConnection! @cost(weight: "10")
+  allHygrothermalData(
+    after: String
+    before: String
+    first: Int
+    last: Int
+    locale: Locale
+    where: HygrothermalDataPropositionInput
+  ): HygrothermalDataConnection! @cost(weight: "10")
+  allLifeCycleData(
+    after: String
+    before: String
+    first: Int
+    last: Int
+    locale: Locale
+    where: LifeCycleDataPropositionInput
+  ): LifeCycleDataConnection! @cost(weight: "10")
+  allOpticalData(
+    after: String
+    before: String
+    first: Int
+    last: Int
+    locale: Locale
+    where: OpticalDataPropositionInput
+  ): OpticalDataConnection! @cost(weight: "10")
+  allPhotovoltaicData(
+    after: String
+    before: String
+    first: Int
+    last: Int
+    locale: Locale
+    where: PhotovoltaicDataPropositionInput
+  ): PhotovoltaicDataConnection! @cost(weight: "10")
   assembledOf(
     order: [ComponentAssembledOfSortInput!] @cost(weight: "10")
     where: ComponentAssembledOfFilterInput @cost(weight: "10")

From 34b4c2592676ae979c339af67b271efcdb38a416 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 24 Jun 2026 17:04:48 +0200
Subject: [PATCH 112/145] Make database setup asynchronous and cancelable

---
 backend/src/Data/DbSeeder.cs | 127 ++++++++++++++++++++---------------
 backend/src/Program.cs       |  48 +++++++------
 2 files changed, 101 insertions(+), 74 deletions(-)

diff --git a/backend/src/Data/DbSeeder.cs b/backend/src/Data/DbSeeder.cs
index 35ebc9980..4a1bc9e0b 100644
--- a/backend/src/Data/DbSeeder.cs
+++ b/backend/src/Data/DbSeeder.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Metabase.Authentication;
 using Metabase.Data.OpenIdConnect;
@@ -80,7 +81,8 @@ public static readonly (string Name, string EmailAddress, Enumerations.UserRole
             Users.First(_ => _.Role == Enumerations.UserRole.SUPPORTER);
 
     public static async Task DoAsync(
-        IServiceProvider services
+        IServiceProvider services,
+        CancellationToken cancellationToken
     )
     {
         var logger = services.GetRequiredService<ILogger<DbSeeder>>();
@@ -88,11 +90,11 @@ IServiceProvider services
         var environment = services.GetRequiredService<IWebHostEnvironment>();
         var appSettings = services.GetRequiredService<AppSettings>();
         await CreateRolesAsync(services, logger);
-        await CreateUsersAsync(services, environment, appSettings, logger);
-        await CreateInstitutionsAsync(services, environment);
-        await CreateDatabasesAsync(services, environment, appSettings);
-        await CreateOpenIdConnectScopes(services, logger);
-        await CreateOpenIdConnectApplications(services, logger, environment, appSettings);
+        await CreateUsersAsync(services, environment, appSettings, logger, cancellationToken);
+        await CreateInstitutionsAsync(services, environment, cancellationToken);
+        await CreateDatabasesAsync(services, environment, appSettings, cancellationToken);
+        await CreateOpenIdConnectScopes(services, logger, cancellationToken);
+        await CreateOpenIdConnectApplications(services, logger, environment, appSettings, cancellationToken);
     }
 
     private static async Task CreateRolesAsync(
@@ -117,14 +119,15 @@ private static async Task CreateUsersAsync(
         IServiceProvider services,
         IWebHostEnvironment environment,
         AppSettings appSettings,
-        ILogger<DbSeeder> logger
+        ILogger<DbSeeder> logger,
+        CancellationToken cancellationToken
     )
     {
         var context = services.GetRequiredService<ApplicationDbContext>();
         var manager = services.GetRequiredService<UserManager<User>>();
         if (environment.IsProduction())
         {
-            if (!await context.Users.AnyAsync())
+            if (!await context.Users.AnyAsync(cancellationToken))
             {
                 if ((await manager.GetUsersInRoleAsync(Role.Administrator)).Count is 0)
                 {
@@ -170,12 +173,13 @@ await manager.CreateAsync(
 
     private static async Task CreateInstitutionsAsync(
         IServiceProvider services,
-        IWebHostEnvironment environment
+        IWebHostEnvironment environment,
+        CancellationToken cancellationToken
     )
     {
         var manager = services.GetRequiredService<OpenIddictApplicationManager<OpenIdConnectApplication>>();
         var context = services.GetRequiredService<ApplicationDbContext>();
-        var iseInstitution = await context.Institutions.Where(_ => _.Id == new Guid(DataConstants.IseInstitutionUuid)).SingleOrDefaultAsync();
+        var iseInstitution = await context.Institutions.Where(_ => _.Id == new Guid(DataConstants.IseInstitutionUuid)).SingleOrDefaultAsync(cancellationToken);
         if (iseInstitution is null)
         {
             iseInstitution = new Institution(
@@ -198,19 +202,19 @@ IWebHostEnvironment environment
             iseInstitution.RepresentativeEdges.Add(
                 new InstitutionRepresentative
                 {
-                    UserId = (await context.Users.Where(_ => _.Email == AdministratorUser.EmailAddress).SingleAsync()).Id,
+                    UserId = (await context.Users.Where(_ => _.Email == AdministratorUser.EmailAddress).SingleAsync(cancellationToken)).Id,
                     Role = InstitutionRepresentativeRole.OWNER,
                     Pending = false
                 }
             );
-            var application = await manager.FindByClientIdAsync(OpenIdConnectConstants.Client.MetabaseClientId).AsTask();
+            var application = await manager.FindByClientIdAsync(OpenIdConnectConstants.Client.MetabaseClientId, cancellationToken).AsTask();
             if (application is not null)
             {
                 iseInstitution.OpenIdConnectApplications.Add(application);
             }
             context.Institutions.Add(iseInstitution);
         }
-        if (!await context.Institutions.Where(_ => _.Id == new Guid(DataConstants.TestlabInstitutionUuid)).AnyAsync())
+        if (!await context.Institutions.Where(_ => _.Id == new Guid(DataConstants.TestlabInstitutionUuid)).AnyAsync(cancellationToken))
         {
             var institution = new Institution(
                 new Guid(DataConstants.TestlabInstitutionUuid),
@@ -232,14 +236,14 @@ IWebHostEnvironment environment
             {
                 ManagerId = iseInstitution.Id
             };
-            var application = await manager.FindByClientIdAsync(DataConstants.TestlabOpenIdConnectClientId).AsTask();
+            var application = await manager.FindByClientIdAsync(DataConstants.TestlabOpenIdConnectClientId, cancellationToken).AsTask();
             if (application is not null)
             {
                 institution.OpenIdConnectApplications.Add(application);
             }
             context.Institutions.Add(institution);
         }
-        if (!await context.Institutions.Where(_ => _.Id == new Guid(DataConstants.LbnlInstitutionUuid)).AnyAsync())
+        if (!await context.Institutions.Where(_ => _.Id == new Guid(DataConstants.LbnlInstitutionUuid)).AnyAsync(cancellationToken))
         {
             var institution = new Institution(
                 new Guid(DataConstants.LbnlInstitutionUuid),
@@ -263,7 +267,7 @@ IWebHostEnvironment environment
             };
             context.Institutions.Add(institution);
         }
-        if (!await context.Institutions.Where(_ => _.Id == new Guid(DataConstants.EpeaInstitutionUuid)).AnyAsync())
+        if (!await context.Institutions.Where(_ => _.Id == new Guid(DataConstants.EpeaInstitutionUuid)).AnyAsync(cancellationToken))
         {
             var institution = new Institution(
                 new Guid(DataConstants.EpeaInstitutionUuid),
@@ -287,19 +291,20 @@ IWebHostEnvironment environment
             };
             context.Institutions.Add(institution);
         }
-        await context.SaveChangesAsync();
+        await context.SaveChangesAsync(cancellationToken);
     }
 
     private static async Task CreateDatabasesAsync(
         IServiceProvider services,
         IWebHostEnvironment environment,
-        AppSettings appSettings
+        AppSettings appSettings,
+        CancellationToken cancellationToken
     )
     {
         var context = services.GetRequiredService<ApplicationDbContext>();
-        if (!await context.Databases.AnyAsync())
+        if (!await context.Databases.AnyAsync(cancellationToken))
         {
-            if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.TestlabDatabaseUuid)).AnyAsync())
+            if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.TestlabDatabaseUuid)).AnyAsync(cancellationToken))
             {
                 var uriBuilder = new UriBuilder(appSettings.TestlabSolarFacades.Uri)
                 {
@@ -317,7 +322,7 @@ AppSettings appSettings
                 database.Verify();
                 context.Databases.Add(database);
             }
-            if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.IgsdbDatabaseUuid)).AnyAsync())
+            if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.IgsdbDatabaseUuid)).AnyAsync(cancellationToken))
             {
                 var uriBuilder = new UriBuilder(new Uri("https://igsdb-v2-staging.herokuapp.com", UriKind.Absolute))
                 {
@@ -335,7 +340,7 @@ AppSettings appSettings
                 database.Verify();
                 context.Databases.Add(database);
             }
-            if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.EpeaDatabaseUuid)).AnyAsync())
+            if (!await context.Databases.Where(_ => _.Id == new Guid(DataConstants.EpeaDatabaseUuid)).AnyAsync(cancellationToken))
             {
                 var uriBuilder = new UriBuilder(new Uri("https://app.conpli.eu/GraphQL", UriKind.Absolute))
                 {
@@ -353,17 +358,18 @@ AppSettings appSettings
                 database.Verify();
                 context.Databases.Add(database);
             }
-            await context.SaveChangesAsync();
+            await context.SaveChangesAsync(cancellationToken);
         }
     }
 
     private static async Task CreateOpenIdConnectScopes(
         IServiceProvider services,
-        ILogger<DbSeeder> logger
+        ILogger<DbSeeder> logger,
+        CancellationToken cancellationToken
     )
     {
         var manager = services.GetRequiredService<OpenIddictScopeManager<OpenIdConnectScope>>();
-        if (await manager.FindByNameAsync(OpenIdConnectScope.ReadApiScope) is null)
+        if (await manager.FindByNameAsync(OpenIdConnectScope.ReadApiScope, cancellationToken) is null)
         {
             logger.CreatingScope(OpenIdConnectScope.ReadApiScope);
             await manager.CreateAsync(
@@ -375,11 +381,12 @@ await manager.CreateAsync(
                     {
                         OpenIdConnectConstants.Client.MetabaseClientId
                     }
-                }
+                },
+                cancellationToken
             );
         }
 
-        if (await manager.FindByNameAsync(OpenIdConnectScope.WriteApiScope) is null)
+        if (await manager.FindByNameAsync(OpenIdConnectScope.WriteApiScope, cancellationToken) is null)
         {
             logger.CreatingScope(OpenIdConnectScope.WriteApiScope);
             await manager.CreateAsync(
@@ -391,11 +398,12 @@ await manager.CreateAsync(
                     {
                         OpenIdConnectConstants.Client.MetabaseClientId
                     }
-                }
+                },
+                cancellationToken
             );
         }
 
-        if (await manager.FindByNameAsync(OpenIdConnectScope.AdministrateApiScope) is null)
+        if (await manager.FindByNameAsync(OpenIdConnectScope.AdministrateApiScope, cancellationToken) is null)
         {
             logger.CreatingScope(OpenIdConnectScope.AdministrateApiScope);
             await manager.CreateAsync(
@@ -407,11 +415,12 @@ await manager.CreateAsync(
                     {
                         OpenIdConnectConstants.Client.MetabaseClientId
                     }
-                }
+                },
+                cancellationToken
             );
         }
 
-        if (await manager.FindByNameAsync(OpenIdConnectScope.VerifyApiScope) is null)
+        if (await manager.FindByNameAsync(OpenIdConnectScope.VerifyApiScope, cancellationToken) is null)
         {
             logger.CreatingScope(OpenIdConnectScope.VerifyApiScope);
             await manager.CreateAsync(
@@ -423,11 +432,12 @@ await manager.CreateAsync(
                     {
                         OpenIdConnectConstants.Client.MetabaseClientId
                     }
-                }
+                },
+                cancellationToken
             );
         }
 
-        if (await manager.FindByNameAsync(OpenIdConnectScope.SupportApiScope) is null)
+        if (await manager.FindByNameAsync(OpenIdConnectScope.SupportApiScope, cancellationToken) is null)
         {
             logger.CreatingScope(OpenIdConnectScope.SupportApiScope);
             await manager.CreateAsync(
@@ -439,11 +449,12 @@ await manager.CreateAsync(
                     {
                         OpenIdConnectConstants.Client.MetabaseClientId
                     }
-                }
+                },
+                cancellationToken
             );
         }
 
-        if (await manager.FindByNameAsync(OpenIdConnectScope.ManageUserApiScope) is null)
+        if (await manager.FindByNameAsync(OpenIdConnectScope.ManageUserApiScope, cancellationToken) is null)
         {
             logger.CreatingScope(OpenIdConnectScope.ManageUserApiScope);
             await manager.CreateAsync(
@@ -455,11 +466,12 @@ await manager.CreateAsync(
                     {
                         OpenIdConnectConstants.Client.MetabaseClientId
                     }
-                }
+                },
+                cancellationToken
             );
         }
 
-        if (await manager.FindByNameAsync(OpenIdConnectScope.ManageOpenIdConnectApiScope) is null)
+        if (await manager.FindByNameAsync(OpenIdConnectScope.ManageOpenIdConnectApiScope, cancellationToken) is null)
         {
             logger.CreatingScope(OpenIdConnectScope.ManageOpenIdConnectApiScope);
             await manager.CreateAsync(
@@ -471,11 +483,12 @@ await manager.CreateAsync(
                     {
                         OpenIdConnectConstants.Client.MetabaseClientId
                     }
-                }
+                },
+                cancellationToken
             );
         }
 
-        if (await manager.FindByNameAsync(OpenIdConnectScope.ManageInstitutionRepresentativeApiScope) is null)
+        if (await manager.FindByNameAsync(OpenIdConnectScope.ManageInstitutionRepresentativeApiScope, cancellationToken) is null)
         {
             logger.CreatingScope(OpenIdConnectScope.ManageInstitutionRepresentativeApiScope);
             await manager.CreateAsync(
@@ -487,11 +500,12 @@ await manager.CreateAsync(
                     {
                         OpenIdConnectConstants.Client.MetabaseClientId
                     }
-                }
+                },
+                cancellationToken
             );
         }
 
-        if (await manager.FindByNameAsync(OpenIdConnectScope.ManageGnuPgApiScope) is null)
+        if (await manager.FindByNameAsync(OpenIdConnectScope.ManageGnuPgApiScope, cancellationToken) is null)
         {
             logger.CreatingScope(OpenIdConnectScope.ManageGnuPgApiScope);
             await manager.CreateAsync(
@@ -503,11 +517,12 @@ await manager.CreateAsync(
                     {
                         OpenIdConnectConstants.Client.MetabaseClientId
                     }
-                }
+                },
+                cancellationToken
             );
         }
 
-        if (await manager.FindByNameAsync(OpenIdConnectScope.ManageDatabaseApiScope) is null)
+        if (await manager.FindByNameAsync(OpenIdConnectScope.ManageDatabaseApiScope, cancellationToken) is null)
         {
             logger.CreatingScope(OpenIdConnectScope.ManageDatabaseApiScope);
             await manager.CreateAsync(
@@ -519,7 +534,8 @@ await manager.CreateAsync(
                     {
                         OpenIdConnectConstants.Client.MetabaseClientId
                     }
-                }
+                },
+                cancellationToken
             );
         }
     }
@@ -528,14 +544,15 @@ private static async Task CreateOpenIdConnectApplications(
         IServiceProvider services,
         ILogger<DbSeeder> logger,
         IWebHostEnvironment environment,
-        AppSettings appSettings
+        AppSettings appSettings,
+        CancellationToken cancellationToken
     )
     {
         var context = services.GetRequiredService<ApplicationDbContext>();
         var manager = services.GetRequiredService<OpenIddictApplicationManager<OpenIdConnectApplication>>();
-        if (!await context.OpenIdConnectApplications.AnyAsync())
+        if (!await context.OpenIdConnectApplications.AnyAsync(cancellationToken))
         {
-            if (await manager.FindByClientIdAsync(OpenIdConnectConstants.Client.MetabaseClientId) is null)
+            if (await manager.FindByClientIdAsync(OpenIdConnectConstants.Client.MetabaseClientId, cancellationToken) is null)
             {
                 logger.CreatingApplicationClient(OpenIdConnectConstants.Client.MetabaseClientId);
                 var host = appSettings.Uri;
@@ -586,12 +603,12 @@ AppSettings appSettings
                 {
                     OwnerId = new Guid(DataConstants.IseInstitutionUuid)
                 };
-                await manager.PopulateAsync(application, descriptor);
+                await manager.PopulateAsync(application, descriptor, cancellationToken);
                 // The secret is used in tests, see `IntegrationTests#RequestAuthToken` and in
                 // the metabase client, see `OPEN_ID_CONNECT_CLIENT_SECRET` in `.env.*`.
-                await manager.CreateAsync(application, appSettings.OpenIdConnectClientSecret);
+                await manager.CreateAsync(application, appSettings.OpenIdConnectClientSecret, cancellationToken);
             }
-            if (await manager.FindByClientIdAsync(DataConstants.TestlabOpenIdConnectClientId) is null)
+            if (await manager.FindByClientIdAsync(DataConstants.TestlabOpenIdConnectClientId, cancellationToken) is null)
             {
                 logger.CreatingApplicationClient(DataConstants.TestlabOpenIdConnectClientId);
                 var host = appSettings.TestlabSolarFacades.Uri;
@@ -641,12 +658,12 @@ AppSettings appSettings
                 {
                     OwnerId = new Guid(DataConstants.TestlabInstitutionUuid)
                 };
-                await manager.PopulateAsync(application, descriptor);
+                await manager.PopulateAsync(application, descriptor, cancellationToken);
                 // The secret is used in the database client, see
                 // `OPEN_ID_CONNECT_CLIENT_SECRET` in `.env.*`.
-                await manager.CreateAsync(application, appSettings.TestlabSolarFacades.OpenIdConnectClientSecret);
+                await manager.CreateAsync(application, appSettings.TestlabSolarFacades.OpenIdConnectClientSecret, cancellationToken);
             }
-            if (await manager.FindByClientIdAsync(DataConstants.IgsdbOpenIdConnectClientId) is null)
+            if (await manager.FindByClientIdAsync(DataConstants.IgsdbOpenIdConnectClientId, cancellationToken) is null)
             {
                 logger.CreatingApplicationClient(DataConstants.IgsdbOpenIdConnectClientId);
                 var descriptor = new OpenIddictApplicationDescriptor
@@ -684,8 +701,8 @@ AppSettings appSettings
                 {
                     OwnerId = new Guid(DataConstants.LbnlInstitutionUuid)
                 };
-                await manager.PopulateAsync(application, descriptor);
-                await manager.CreateAsync(application, appSettings.Igsdb.OpenIdConnectClientSecret);
+                await manager.PopulateAsync(application, descriptor, cancellationToken);
+                await manager.CreateAsync(application, appSettings.Igsdb.OpenIdConnectClientSecret, cancellationToken);
             }
         }
     }
diff --git a/backend/src/Program.cs b/backend/src/Program.cs
index b132de95b..1e30caa1c 100644
--- a/backend/src/Program.cs
+++ b/backend/src/Program.cs
@@ -3,6 +3,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Metabase.Data;
 using Microsoft.AspNetCore.Builder;
@@ -81,20 +82,26 @@ string[] commandLineArguments
             startup.Configure(application);
             using (var scope = application.Services.CreateScope())
             {
+                var lifetime = scope.ServiceProvider.GetRequiredService<IHostApplicationLifetime>();
                 if (!builder.Environment.IsEnvironment(TestEnvironment))
                 {
-                    EnsureDatabaseIsUpToDate(scope.ServiceProvider);
+                    await EnsureDatabaseIsUpToDateAsync(scope.ServiceProvider, lifetime.ApplicationStopping);
                     // Inspired by https://docs.microsoft.com/en-us/aspnet/core/data/ef-mvc/intro#initialize-db-with-test-data
                 }
                 if (builder.Environment.IsEnvironment(TestEnvironment))
                 {
-                    await CreateDatabase(scope.ServiceProvider);
+                    await CreateDatabaseAsync(scope.ServiceProvider, lifetime.ApplicationStopping);
                 }
-                await SeedDatabase(scope.ServiceProvider);
+                await SeedDatabaseAsync(scope.ServiceProvider, lifetime.ApplicationStopping);
             }
             // dotnet run -- schema export --output ./schema.graphql
             return await application.RunWithGraphQLCommandsAsync(commandLineArguments);
         }
+        catch (OperationCanceledException exception)
+        {
+            Serilog.Log.Information(exception, "[System] App execution cancelled cleanly.");
+            return 1;
+        }
         catch (Exception exception) when (exception is not HostAbortedException && exception.Source != "Microsoft.EntityFrameworkCore.Design") // see https://github.com/dotnet/efcore/issues/29923
         {
             Serilog.Log.Fatal(exception, "Host terminated unexpectedly");
@@ -155,30 +162,32 @@ Uri openTelemetryHost
         }
     }
 
-    private static void EnsureDatabaseIsUpToDate(
-        IServiceProvider services
+    private static async Task EnsureDatabaseIsUpToDateAsync(
+        IServiceProvider services,
+        CancellationToken cancellationToken
     )
     {
-        using var dbContext =
-            services.GetRequiredService<IDbContextFactory<ApplicationDbContext>>()
-                .CreateDbContext();
-        var pendingMigrations = dbContext.Database.GetPendingMigrations();
+        await using var databaseContext =
+            await services.GetRequiredService<IDbContextFactory<ApplicationDbContext>>()
+                .CreateDbContextAsync(cancellationToken);
+        var pendingMigrations = await databaseContext.Database.GetPendingMigrationsAsync(cancellationToken);
         if (pendingMigrations.Any())
         {
             throw new InvalidOperationException($"The database is not up to date. The pending migrations are: {string.Join(", ", pendingMigrations)}. Apply them by running `./database.mk migrate`.");
         }
     }
 
-    private static async Task CreateDatabase(
-        IServiceProvider services
+    private static async Task CreateDatabaseAsync(
+        IServiceProvider services,
+        CancellationToken cancellationToken
     )
     {
         try
         {
-            using var dbContext =
-                services.GetRequiredService<IDbContextFactory<ApplicationDbContext>>()
-                    .CreateDbContext();
-            await dbContext.Database.EnsureCreatedAsync();
+            await using var databaseContext =
+                await services.GetRequiredService<IDbContextFactory<ApplicationDbContext>>()
+                    .CreateDbContextAsync(cancellationToken);
+            await databaseContext.Database.EnsureCreatedAsync(cancellationToken);
         }
         catch (Exception exception)
         {
@@ -187,13 +196,14 @@ IServiceProvider services
         }
     }
 
-    private static async Task SeedDatabase(
-        IServiceProvider services
+    private static async Task SeedDatabaseAsync(
+        IServiceProvider services,
+        CancellationToken cancellationToken
     )
     {
         try
         {
-            await DbSeeder.DoAsync(services);
+            await DbSeeder.DoAsync(services, cancellationToken);
         }
         catch (Exception exception)
         {
@@ -243,7 +253,7 @@ Uri openTelemetryHost
     }
 
     private static void ConfigureAppConfiguration(
-        IConfigurationBuilder configuration,
+        ConfigurationManager configuration,
         IHostEnvironment environment,
         string[] commandLineArguments
     )

From c55b1ad057e8db670bf8834dc0b323f462e7dfbc Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 24 Jun 2026 17:21:23 +0200
Subject: [PATCH 113/145] Correct nullability of connection and edges

---
 backend/src/GraphQl/Requests/DataQueries.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/GraphQl/Requests/DataQueries.cs b/backend/src/GraphQl/Requests/DataQueries.cs
index ec53dfaee..26d7e2ef1 100644
--- a/backend/src/GraphQl/Requests/DataQueries.cs
+++ b/backend/src/GraphQl/Requests/DataQueries.cs
@@ -1100,12 +1100,12 @@ private sealed record LifeCycleDataData(LifeCycleData LifeCycleData);
     private sealed record CalorimetricDataData(CalorimetricData CalorimetricData);
     private sealed record PhotovoltaicDataData(PhotovoltaicData PhotovoltaicData);
     private sealed record GeometricDataData(GeometricData GeometricData);
-    private sealed record AllOpticalDataData(OpticalDataConnection AllOpticalData);
-    private sealed record AllHygrothermalDataData(HygrothermalDataConnection AllHygrothermalData);
-    private sealed record AllLifeCycleDataData(LifeCycleDataConnection AllLifeCycleData);
-    private sealed record AllCalorimetricDataData(CalorimetricDataConnection AllCalorimetricData);
-    private sealed record AllGeometricDataData(GeometricDataConnection AllGeometricData);
-    private sealed record AllPhotovoltaicDataData(PhotovoltaicDataConnection AllPhotovoltaicData);
+    private sealed record AllOpticalDataData(OpticalDataConnection? AllOpticalData);
+    private sealed record AllHygrothermalDataData(HygrothermalDataConnection? AllHygrothermalData);
+    private sealed record AllLifeCycleDataData(LifeCycleDataConnection? AllLifeCycleData);
+    private sealed record AllCalorimetricDataData(CalorimetricDataConnection? AllCalorimetricData);
+    private sealed record AllGeometricDataData(GeometricDataConnection? AllGeometricData);
+    private sealed record AllPhotovoltaicDataData(PhotovoltaicDataConnection? AllPhotovoltaicData);
     private sealed record HasOpticalDataData(bool HasOpticalData);
     private sealed record HasCalorimetricDataData(bool HasCalorimetricData);
     private sealed record HasGeometricDataData(bool HasGeometricData);

From 5be73e2a59d46e47898716140e1d2c3d2e411a9d Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 24 Jun 2026 17:28:04 +0200
Subject: [PATCH 114/145] Use fibonacci numbers for page sizes and reduce
 maximum page size to 99 (we cannot use 100 as page size when asking for
 all*Data because it would ask the product-data databases for 101 entries,
 which would exceed their maximum 100)

---
 backend/src/GraphQl/GraphQlConstants.cs | 2 +-
 frontend/components/Pagination.tsx      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/GraphQl/GraphQlConstants.cs b/backend/src/GraphQl/GraphQlConstants.cs
index 77b41e2cf..653b5c512 100644
--- a/backend/src/GraphQl/GraphQlConstants.cs
+++ b/backend/src/GraphQl/GraphQlConstants.cs
@@ -2,7 +2,7 @@ namespace Metabase.GraphQl;
 
 internal static class GraphQlConstants
 {
-    internal const uint MaximumPageSize = 100;
+    internal const uint MaximumPageSize = 99;
     internal const string EndpointPath = "/graphql";
     internal const string CorsPolicy = "GraphQlCorsPolicy";
     internal const string TypeDiscriminatorPropertyName = "__typename";
diff --git a/frontend/components/Pagination.tsx b/frontend/components/Pagination.tsx
index ee60d5649..5db785710 100644
--- a/frontend/components/Pagination.tsx
+++ b/frontend/components/Pagination.tsx
@@ -6,7 +6,7 @@ import {
   ReloadOutlined,
 } from "@ant-design/icons";
 
-export const initialPageSize = 10;
+export const initialPageSize = 8;
 
 export enum Fetching {
   INITIAL,
@@ -16,7 +16,7 @@ export enum Fetching {
 
 const loadingIndicator = <Spin indicator={<LoadingOutlined spin />} />;
 
-const pageSizeOptions = [3, initialPageSize, 20, 50, 100].map((size) => ({
+const pageSizeOptions = [3, initialPageSize, 21, 55, 89].map((size) => ({
   label: `${size} per page`,
   value: size,
 }));

From 6d77a4397babc01512081bcbfb9285999ce15219 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 24 Jun 2026 17:31:56 +0200
Subject: [PATCH 115/145] Correct nullability of connection and edges
 (follow-up)

---
 .../src/GraphQl/CalorimetricDataX/CalorimetricDataConnection.cs | 2 +-
 backend/src/GraphQl/DataX/DataConnection.cs                     | 2 +-
 backend/src/GraphQl/GeometricDataX/GeometricDataConnection.cs   | 2 +-
 .../src/GraphQl/HygrothermalDataX/HygrothermalDataConnection.cs | 2 +-
 backend/src/GraphQl/LifeCycleDataX/LifeCycleDataConnection.cs   | 2 +-
 backend/src/GraphQl/OpticalDataX/OpticalDataConnection.cs       | 2 +-
 .../src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataConnection.cs | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataConnection.cs b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataConnection.cs
index 067e1f73f..fb95f4a14 100644
--- a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataConnection.cs
+++ b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataConnection.cs
@@ -5,7 +5,7 @@
 namespace Metabase.GraphQl.CalorimetricDataX;
 
 public sealed record CalorimetricDataConnection(
-    IReadOnlyList<CalorimetricDataEdge> Edges,
+    IReadOnlyList<CalorimetricDataEdge>? Edges,
     int TotalCount,
     ConnectionPageInfo PageInfo
 ) : DataConnection<CalorimetricDataEdge>(
diff --git a/backend/src/GraphQl/DataX/DataConnection.cs b/backend/src/GraphQl/DataX/DataConnection.cs
index 6772cdd07..952d276fd 100644
--- a/backend/src/GraphQl/DataX/DataConnection.cs
+++ b/backend/src/GraphQl/DataX/DataConnection.cs
@@ -5,7 +5,7 @@
 namespace Metabase.GraphQl.DataX;
 
 public abstract record DataConnection<TDataEdge>(
-    [property: Cost(0)] IReadOnlyList<TDataEdge> Edges,
+    [property: Cost(0)] IReadOnlyList<TDataEdge>? Edges,
     [property: Cost(0)] int TotalCount,
     [property: Cost(0)] ConnectionPageInfo PageInfo
 );
\ No newline at end of file
diff --git a/backend/src/GraphQl/GeometricDataX/GeometricDataConnection.cs b/backend/src/GraphQl/GeometricDataX/GeometricDataConnection.cs
index 3c2d13fe7..92608283f 100644
--- a/backend/src/GraphQl/GeometricDataX/GeometricDataConnection.cs
+++ b/backend/src/GraphQl/GeometricDataX/GeometricDataConnection.cs
@@ -5,7 +5,7 @@
 namespace Metabase.GraphQl.GeometricDataX;
 
 public sealed record GeometricDataConnection(
-    IReadOnlyList<GeometricDataEdge> Edges,
+    IReadOnlyList<GeometricDataEdge>? Edges,
     int TotalCount,
     ConnectionPageInfo PageInfo
 ) : DataConnection<GeometricDataEdge>(
diff --git a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataConnection.cs b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataConnection.cs
index 86e379064..81ad0d4da 100644
--- a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataConnection.cs
+++ b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataConnection.cs
@@ -5,7 +5,7 @@
 namespace Metabase.GraphQl.HygrothermalDataX;
 
 public sealed record HygrothermalDataConnection(
-    IReadOnlyList<HygrothermalDataEdge> Edges,
+    IReadOnlyList<HygrothermalDataEdge>? Edges,
     int TotalCount,
     ConnectionPageInfo PageInfo
 ) : DataConnection<HygrothermalDataEdge>(
diff --git a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataConnection.cs b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataConnection.cs
index d57f2fc68..1fdc401ed 100644
--- a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataConnection.cs
+++ b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataConnection.cs
@@ -5,7 +5,7 @@
 namespace Metabase.GraphQl.LifeCycleDataX;
 
 public sealed record LifeCycleDataConnection(
-    IReadOnlyList<LifeCycleDataEdge> Edges,
+    IReadOnlyList<LifeCycleDataEdge>? Edges,
     int TotalCount,
     ConnectionPageInfo PageInfo
 ) : DataConnection<LifeCycleDataEdge>(
diff --git a/backend/src/GraphQl/OpticalDataX/OpticalDataConnection.cs b/backend/src/GraphQl/OpticalDataX/OpticalDataConnection.cs
index ef8ca44fd..d5c72a13e 100644
--- a/backend/src/GraphQl/OpticalDataX/OpticalDataConnection.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalDataConnection.cs
@@ -5,7 +5,7 @@
 namespace Metabase.GraphQl.OpticalDataX;
 
 public sealed record OpticalDataConnection(
-    IReadOnlyList<OpticalDataEdge> Edges,
+    IReadOnlyList<OpticalDataEdge>? Edges,
     int TotalCount,
     ConnectionPageInfo PageInfo
 ) : DataConnection<OpticalDataEdge>(
diff --git a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataConnection.cs b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataConnection.cs
index 53fef3f12..2504310f4 100644
--- a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataConnection.cs
+++ b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataConnection.cs
@@ -5,7 +5,7 @@
 namespace Metabase.GraphQl.PhotovoltaicDataX;
 
 public sealed record PhotovoltaicDataConnection(
-    IReadOnlyList<PhotovoltaicDataEdge> Edges,
+    IReadOnlyList<PhotovoltaicDataEdge>? Edges,
     int TotalCount,
     ConnectionPageInfo PageInfo
 ) : DataConnection<PhotovoltaicDataEdge>(

From bc3e7a0961e42ca9176dcdbf544d3749af8f9ab1 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 24 Jun 2026 19:43:22 +0200
Subject: [PATCH 116/145] Make GET HTTPS resources of product-data databases
 available through the metabase (to be used by the frontend when the current
 user is needed to be granted access)

---
 .../Authentication/AuthenticationConstants.cs |   2 -
 .../Controllers/GetHttpsResourceController.cs | 139 ++++++++++++++++++
 backend/src/GraphQl/Requests/DataQueries.cs   |  63 ++++----
 .../GraphQl/Requests/GraphQlRequestHelper.cs  |  38 +++--
 .../src/GraphQl/Requests/QueryingDatabases.cs |  78 +++++-----
 frontend/components/data/DataSummary.tsx      |  15 ++
 frontend/paths.ts                             |  12 ++
 frontend/queries/data.graphql                 |   1 +
 nginx/templates/default.conf.template         |  15 ++
 9 files changed, 286 insertions(+), 77 deletions(-)
 create mode 100644 backend/src/Controllers/GetHttpsResourceController.cs

diff --git a/backend/src/Authentication/AuthenticationConstants.cs b/backend/src/Authentication/AuthenticationConstants.cs
index 64e85fa6a..6f956803e 100644
--- a/backend/src/Authentication/AuthenticationConstants.cs
+++ b/backend/src/Authentication/AuthenticationConstants.cs
@@ -1,5 +1,3 @@
-using System.Collections.Immutable;
-
 namespace Metabase.Authentication;
 
 internal static class AuthenticationConstants
diff --git a/backend/src/Controllers/GetHttpsResourceController.cs b/backend/src/Controllers/GetHttpsResourceController.cs
new file mode 100644
index 000000000..edfed6cb5
--- /dev/null
+++ b/backend/src/Controllers/GetHttpsResourceController.cs
@@ -0,0 +1,139 @@
+using System;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Mime;
+using System.Threading;
+using System.Threading.Tasks;
+using Metabase.Authentication;
+using Metabase.Data;
+using Metabase.GraphQl.DataX;
+using Metabase.GraphQl.Requests;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+
+namespace Metabase.Controllers;
+
+// Inspired by https://docs.microsoft.com/en-us/aspnet/core/mvc/models/file-uploads?view=aspnetcore-5.0#upload-large-files-with-streaming
+// and https://github.com/dotnet/AspNetCore.Docs/blob/b4599432690b8753fc2eac23d52957f47e01997a/aspnetcore/mvc/models/file-uploads/samples/3.x/SampleApp/
+[ApiController]
+public sealed class GetHttpsResourcesController : Controller
+{
+    private bool _disposed;
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!_disposed)
+        {
+            // Dispose of resources held by this instance.
+            _disposed = true;
+        }
+    }
+
+    // Disposable types implement a finalizer.
+    ~GetHttpsResourcesController()
+    {
+        Dispose(false);
+    }
+
+    private const string GetByVertexIdRouteName = "GetResourceByVertexId";
+
+    [HttpGet("~/api/resources/{vertexId}", Name = GetByVertexIdRouteName)]
+    [Authorize(AuthenticationSchemes = AuthenticationConstants.IdentityAndCookieAndBearerTokenAuthenticationScheme)]
+    [AllowAnonymous]
+    [EndpointDescription("Get an HTTP resource in the media type of its data format from a database passing along an access token that identifies the logged-in user.")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<IActionResult> Get(
+        [FromRoute] string vertexId,
+        [FromQuery] Guid dataId,
+        [FromQuery] DataKind dataKind,
+        [FromQuery] Guid databaseId,
+        [FromServices] IDbContextFactory<ApplicationDbContext> databaseContextFactory,
+        [FromServices] QueryingDatabases queryingDatabases,
+        [FromServices] DataQueries dataQueries,
+        CancellationToken cancellationToken
+    )
+    {
+        await using var databaseContext = await databaseContextFactory.CreateDbContextAsync(cancellationToken);
+        var database = await databaseContext.Databases.AsNoTracking()
+            .Where(_ => _.Id == databaseId)
+            .SingleOrDefaultAsync(cancellationToken);
+        if (database is null)
+        {
+            return Problem(
+                title: "Database Not Found",
+                detail: $"There is no database with ID '{databaseId:D}'.",
+                statusCode: StatusCodes.Status404NotFound,
+                instance: HttpContext.Request.Path
+            );
+        }
+        var data = await dataQueries.GetDataAsync(database, dataId, dataKind, null, null, cancellationToken);
+        if (data is null)
+        {
+            return Problem(
+                title: "Data Not Found",
+                detail: $"There is no data with ID '{dataId:D}' of kind '{dataKind}' in the database with ID '{databaseId:D}'.",
+                statusCode: StatusCodes.Status404NotFound,
+                instance: HttpContext.Request.Path
+            );
+        }
+        var getHttpsResource =
+            data.ResourceTree.Root.VertexId == vertexId
+            ? data.ResourceTree.Root.Value
+            : data.ResourceTree.NonRootVertices.FirstOrDefault(_ => _.VertexId == vertexId)?.Value;
+        if (getHttpsResource is null)
+        {
+            return Problem(
+                title: "Resource Not Found",
+                detail: $"There is no GET HTTPS resource with vertex ID '{vertexId}' in the data with ID '{dataId:D}' of kind '{dataKind}' in the database with ID '{databaseId:D}'.",
+                statusCode: StatusCodes.Status404NotFound,
+                instance: HttpContext.Request.Path
+            );
+        }
+        var dataFormat = await databaseContext.DataFormats.AsNoTracking()
+            .Where(_ => _.Id == getHttpsResource.DataFormatId)
+            .SingleOrDefaultAsync(cancellationToken);
+        if (database is null)
+        {
+            return Problem(
+                title: "Database Not Found",
+                detail: $"There is no database with ID '{databaseId:D}'.",
+                statusCode: StatusCodes.Status404NotFound,
+                instance: HttpContext.Request.Path
+            );
+        }
+        // Do not use `using var ...` below to not dispose objects when the associated response stream is still in use
+        var httpClient = await queryingDatabases.CreateHttpClientAsync(database, cancellationToken);
+        var httpResponseMessage =
+            await httpClient.GetAsync(
+                getHttpsResource.Locator,
+                HttpCompletionOption.ResponseHeadersRead, // do not buffer in memory before returning
+                cancellationToken
+            );
+        if (httpResponseMessage.StatusCode is not HttpStatusCode.OK)
+        {
+            return Problem(
+                title: "Fetch Failure",
+                detail: $"Failed to fetch the GET HTTPS resource from '{getHttpsResource.Locator}'.",
+                statusCode: (int)httpResponseMessage.StatusCode,
+                instance: HttpContext.Request.Path
+            );
+        }
+        var contentType = httpResponseMessage.Content.Headers.ContentType;
+        var responseStream =
+            await httpResponseMessage.Content
+                .ReadAsStreamAsync(cancellationToken);
+        var fileExtension = dataFormat?.Extension is null ? "unknown" : dataFormat.Extension;
+        return File(
+            responseStream,
+            contentType?.ToString() ?? MediaTypeNames.Application.Octet,
+            $"{getHttpsResource.HashValue}.{fileExtension}",
+            enableRangeProcessing: true
+        );
+    }
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Requests/DataQueries.cs b/backend/src/GraphQl/Requests/DataQueries.cs
index 26d7e2ef1..360534d9c 100644
--- a/backend/src/GraphQl/Requests/DataQueries.cs
+++ b/backend/src/GraphQl/Requests/DataQueries.cs
@@ -300,10 +300,10 @@ paginationDirection is PaginationDirection.FORWARD
         // adapt the after and before cursors such that they can serve as seed for the next or previous edge
         compoundAfter?.Cursors[compoundAfter.DatabaseId] = new(
             compoundAfter.Cursors.GetValueOrDefault(compoundAfter.DatabaseId)?.Before,
-            databaseToConnection.GetValueOrDefault(compoundAfter.DatabaseId)?.Edges.GetFirstOrDefault()?.Cursor
+            databaseToConnection.GetValueOrDefault(compoundAfter.DatabaseId)?.Edges?.GetFirstOrDefault()?.Cursor
         );
         compoundBefore?.Cursors[compoundBefore.DatabaseId] = new(
-            databaseToConnection.GetValueOrDefault(compoundBefore.DatabaseId)?.Edges.GetLastOrDefault()?.Cursor,
+            databaseToConnection.GetValueOrDefault(compoundBefore.DatabaseId)?.Edges?.GetLastOrDefault()?.Cursor,
             compoundBefore.Cursors.GetValueOrDefault(compoundBefore.DatabaseId)?.After
         );
         // interleave edges and replace their cursors with compound cursors (see `CompoundCursor`)
@@ -314,11 +314,12 @@ paginationDirection is PaginationDirection.FORWARD
                     // end, where the first entry in each tuple is the edge and
                     // the second its right neighbor `(edge, neighbor)`. For
                     // example [1, 2, 3] becomes [(1, 2), (2, 3), (3, null)]
-                    _.Value.Edges.Zip(
+                    _.Value.Edges?.Zip(
                         _.Value.Edges.Skip(1).Append(null),
                         (current, after) => new { current, after }
                     )
                     .Select((neighboringEdges) => (neighboringEdges, databaseId: _.Key))
+                    ?? []
                 )
                 // interleave edges of various databases (from the left or
                 // left-aligned or padded right with `null`s)
@@ -349,7 +350,7 @@ paginationDirection is PaginationDirection.FORWARD
                             _ => _.Id,
                             _ => new NeighboringCursors(
                                 null,
-                                databaseToConnection.GetValueOrDefault(_.Id)?.Edges.GetFirstOrDefault()?.Cursor
+                                databaseToConnection.GetValueOrDefault(_.Id)?.Edges?.GetFirstOrDefault()?.Cursor
                             )
                         ),
                         DatabaseId = rotatedDatabases[^1].Id
@@ -375,12 +376,14 @@ paginationDirection is PaginationDirection.FORWARD
                     // By reversing it before interleaving and scanning it with
                     // the edges of other databases, the edges are iterated in
                     // reverse, that is, from the end to the beginning.
-                    _.Value.Edges.Prepend(null).SkipLast(1).Zip(
+                    _.Value.Edges?.Prepend(null).SkipLast(1).Zip(
                         _.Value.Edges,
                         (before, current) => new { before, current }
                     )
                     .Reverse()
-                    .Select((neighboringEdges) => (neighboringEdges, databaseId: _.Key)))
+                    .Select((neighboringEdges) => (neighboringEdges, databaseId: _.Key))
+                    ?? []
+                )
                 // interleave edges of various databases (from the right or
                 // right-aligned or padded left with `null`s)
                 // Database X:           [1, 2, 3, 4, 5]               (local cursors)
@@ -409,7 +412,7 @@ paginationDirection is PaginationDirection.FORWARD
                         Cursors = databases.ToDictionary(
                             _ => _.Id,
                             _ => new NeighboringCursors(
-                                databaseToConnection.GetValueOrDefault(_.Id)?.Edges.GetFirstOrDefault()?.Cursor,
+                                databaseToConnection.GetValueOrDefault(_.Id)?.Edges?.GetFirstOrDefault()?.Cursor,
                                 null
                             )
                         ),
@@ -474,7 +477,7 @@ CancellationToken cancellationToken
         Guid id,
         DataKind kind,
         string? locale,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -495,7 +498,7 @@ CancellationToken cancellationToken
         DataKind kind,
         DataPropositionInput? where,
         string? locale,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -515,7 +518,7 @@ CancellationToken cancellationToken
         Database database,
         Guid id,
         string? locale,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -542,7 +545,7 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         Guid id,
         string? locale,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -569,7 +572,7 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         Guid id,
         string? locale,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -596,7 +599,7 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         Guid id,
         string? locale,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -624,7 +627,7 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         Guid id,
         string? locale,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -651,7 +654,7 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         Guid id,
         string? locale,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -682,7 +685,7 @@ await QueryingDatabases.ConstructQuery(
         string? after,
         int? last,
         string? before,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -717,7 +720,7 @@ await QueryingDatabases.ConstructQuery(
         string? after,
         int? last,
         string? before,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -751,7 +754,7 @@ await QueryingDatabases.ConstructQuery(
         string? after,
         int? last,
         string? before,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -786,7 +789,7 @@ await QueryingDatabases.ConstructQuery(
         string? after,
         int? last,
         string? before,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -821,7 +824,7 @@ await QueryingDatabases.ConstructQuery(
         string? after,
         int? last,
         string? before,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -855,7 +858,7 @@ await QueryingDatabases.ConstructQuery(
         string? after,
         int? last,
         string? before,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -886,7 +889,7 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         CalorimetricDataPropositionInput? where,
         string? locale,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -913,7 +916,7 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         GeometricDataPropositionInput? where,
         string? locale,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -940,7 +943,7 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         HygrothermalDataPropositionInput? where,
         string? locale,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -967,7 +970,7 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         LifeCycleDataPropositionInput? where,
         string? locale,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -994,7 +997,7 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         OpticalDataPropositionInput? where,
         string? locale,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -1021,7 +1024,7 @@ await QueryingDatabases.ConstructQuery(
         Database database,
         PhotovoltaicDataPropositionInput? where,
         string? locale,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     {
@@ -1047,7 +1050,7 @@ await QueryingDatabases.ConstructQuery(
     private Task<TGraphQlResponse?> QueryDatabase<TGraphQlResponse>(
         Database database,
         GraphQLRequest request,
-        IResolverContext resolverContext,
+        IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
     where TGraphQlResponse : class
@@ -1083,6 +1086,10 @@ await queryingDatabases.QueryDatabase<TGraphQlResponse>(
                             }
                         }
                         // TODO Add `error.Locations` to `errorBuilder`.
+                        if (resolverContext is null)
+                        {
+                            throw new GraphQLException(errorBuilder.Build());
+                        }
                         resolverContext.ReportError(errorBuilder.Build());
                     }
                 }
diff --git a/backend/src/GraphQl/Requests/GraphQlRequestHelper.cs b/backend/src/GraphQl/Requests/GraphQlRequestHelper.cs
index 5eeeb3e4c..ca1dedd52 100644
--- a/backend/src/GraphQl/Requests/GraphQlRequestHelper.cs
+++ b/backend/src/GraphQl/Requests/GraphQlRequestHelper.cs
@@ -57,7 +57,7 @@ ILogger<GraphQlRequestHelper> logger
         Func<Task<T>> action,
         Uri databaseLocator,
         GraphQLRequest request,
-        IResolverContext resolverContext
+        IResolverContext? resolverContext
     )
     where T : class
     {
@@ -73,14 +73,18 @@ IResolverContext resolverContext
                 databaseLocator,
                 JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)
             );
-            resolverContext.ReportError(
+            var error =
                 ErrorBuilder.New()
                     .SetCode("EXTERNAL_GRAPHQL_REQUEST_FAILED")
-                    .SetPath(resolverContext.Path)
+                    .SetPath(resolverContext?.Path)
                     .SetMessage($"Failed with status code '{exception.StatusCode}' to request the endpoint '{databaseLocator}' for {JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)}.")
                     .SetException(exception)
-                    .Build()
-            );
+                    .Build();
+            if (resolverContext is null)
+            {
+                throw new GraphQLException(error);
+            }
+            resolverContext.ReportError(error);
             return null;
         }
         catch (JsonException exception)
@@ -94,14 +98,18 @@ IResolverContext resolverContext
                 exception.Message,
                 exception.Path
             );
-            resolverContext.ReportError(
+            var error =
                 ErrorBuilder.New()
                     .SetCode("JSON_DESERIALIZATION_FAILED")
-                    .SetPath(resolverContext.Path) // TODO Add the error path. I would do it as follows as a workaround, however splitting the path at '.' is wrong in general: .SetPath(resolverContext.Path.ToList().Concat(e.Path?.Split('.') ?? []).ToList())
+                    .SetPath(resolverContext?.Path) // TODO Add the error path. I would do it as follows as a workaround, however splitting the path at '.' is wrong in general: .SetPath(resolverContext.Path.ToList().Concat(e.Path?.Split('.') ?? []).ToList())
                     .SetMessage($"Failed to deserialize the GraphQL response of the request to the endpoint '{databaseLocator}' for {JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)}. The details given are: Zero-based number of bytes read within the current line before the exception are '{exception.BytePositionInLine}', zero-based number of lines read before the exception are '{exception.LineNumber}', message that describes the current exception is \"{exception.Message}\", path within the JSON where the exception was encountered is '{exception.Path}'.")
                     .SetException(exception)
-                    .Build()
-            );
+                    .Build();
+            if (resolverContext is null)
+            {
+                throw new GraphQLException(error);
+            }
+            resolverContext.ReportError(error);
             return null;
         }
         catch (Exception exception)
@@ -111,14 +119,18 @@ IResolverContext resolverContext
                 databaseLocator,
                 JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)
             );
-            resolverContext.ReportError(
+            var error =
                 ErrorBuilder.New()
                     .SetCode("DATABASE_REQUEST_FAILED")
-                    .SetPath(resolverContext.Path)
+                    .SetPath(resolverContext?.Path)
                     .SetMessage($"Failed to request {databaseLocator} for {JsonSerializer.Serialize(request, JsonSerializerSettings.GraphQl)} or failed to deserialize the response.")
                     .SetException(exception)
-                    .Build()
-            );
+                    .Build();
+            if (resolverContext is null)
+            {
+                throw new GraphQLException(error);
+            }
+            resolverContext.ReportError(error);
             return null;
         }
     }
diff --git a/backend/src/GraphQl/Requests/QueryingDatabases.cs b/backend/src/GraphQl/Requests/QueryingDatabases.cs
index 8bdb39319..6d6f9b3c2 100644
--- a/backend/src/GraphQl/Requests/QueryingDatabases.cs
+++ b/backend/src/GraphQl/Requests/QueryingDatabases.cs
@@ -130,8 +130,7 @@ public async
         QueryDatabase<TGraphQlResponse>(
             Database database,
             GraphQLRequest request,
-            CancellationToken cancellationToken,
-            string? apiToken = null
+            CancellationToken cancellationToken
         )
         where TGraphQlResponse : class
     {
@@ -146,7 +145,48 @@ public async
         //
         //    )
         //   .AsGraphQLHttpResponse();
-        using var httpClient = httpClientFactory.CreateClient(DatabaseHttpClient);
+        using var httpClient = await CreateHttpClientAsync(database, cancellationToken);
+        // For some reason `httpClient.PostAsJsonAsync` without `MakeJsonHttpContent` but with `SerializerOptions` results in `BadRequest` status code. It has to do with `JsonContent.Create` used within `PostAsJsonAsync` --- we also cannot use `JsonContent.Create` in `MakeJsonHttpContent`. What is happening here?
+        using var jsonHttpContent = MakeJsonHttpContent(request);
+        using var httpResponseMessage =
+            await httpClient.PostAsync(
+                database.Locator,
+                jsonHttpContent,
+                cancellationToken
+            );
+        if (httpResponseMessage.StatusCode is not HttpStatusCode.OK)
+        {
+            throw new HttpRequestException(
+                $"The status code is not {HttpStatusCode.OK} but {httpResponseMessage.StatusCode}.", null,
+                httpResponseMessage.StatusCode
+            );
+        }
+        // We could use `httpResponseMessage.Content.ReadFromJsonAsync<GraphQL.GraphQLResponse<TGraphQlResponse>>` which would make debugging more difficult though, https://docs.microsoft.com/en-us/dotnet/api/system.net.http.json.httpcontentjsonextensions.readfromjsonasync?view=net-5.0#System_Net_Http_Json_HttpContentJsonExtensions_ReadFromJsonAsync__1_System_Net_Http_HttpContent_System_Text_Json_JsonSerializerOptions_System_Threading_CancellationToken_
+        await using var graphQlResponseStream =
+            await httpResponseMessage.Content
+                .ReadAsStreamAsync(cancellationToken);
+        // For debugging, the following lines of code write the response to standard output.
+        // Console.WriteLine(new StreamReader(graphQlResponseStream).ReadToEnd());
+        var deserializedGraphQlResponse =
+            await JsonSerializer.DeserializeAsync<GraphQLResponse<TGraphQlResponse>>(
+                graphQlResponseStream,
+                JsonSerializerSettings.GraphQl,
+                cancellationToken
+            )
+            ?? throw new JsonException("Failed to deserialize the GraphQL response.");
+        return deserializedGraphQlResponse;
+    }
+
+    internal async Task<HttpClient> CreateHttpClientAsync(
+        Database database,
+        CancellationToken cancellationToken
+    )
+    {
+        var httpClient = httpClientFactory.CreateClient(QueryingDatabases.DatabaseHttpClient);
+        httpClient.DefaultRequestHeaders.Add(
+            HeaderNames.Origin,
+            appSettings.Uri.AbsoluteUri
+        );
         // Set the authorization header to a restricted bearer token from the
         // original HTTP request. The restricted token can be used to identify
         // the authenticated user.
@@ -176,37 +216,7 @@ public async
                 httpClient.DefaultRequestHeaders.Add("x-api-key", appSettings.Epea.ApiKey);
                 break;
         }
-        // For some reason `httpClient.PostAsJsonAsync` without `MakeJsonHttpContent` but with `SerializerOptions` results in `BadRequest` status code. It has to do with `JsonContent.Create` used within `PostAsJsonAsync` --- we also cannot use `JsonContent.Create` in `MakeJsonHttpContent`. What is happening here?
-        using var jsonHttpContent = MakeJsonHttpContent(request);
-        jsonHttpContent.Headers.Add(
-            HeaderNames.Origin,
-            appSettings.Uri.AbsoluteUri
-        );
-        using var httpResponseMessage =
-            await httpClient.PostAsync(
-                database.Locator,
-                jsonHttpContent,
-                cancellationToken
-            );
-        if (httpResponseMessage.StatusCode != HttpStatusCode.OK)
-        {
-            throw new HttpRequestException(
-                $"The status code is not {HttpStatusCode.OK} but {httpResponseMessage.StatusCode}.", null,
-                httpResponseMessage.StatusCode);
-        }
-        // We could use `httpResponseMessage.Content.ReadFromJsonAsync<GraphQL.GraphQLResponse<TGraphQlResponse>>` which would make debugging more difficult though, https://docs.microsoft.com/en-us/dotnet/api/system.net.http.json.httpcontentjsonextensions.readfromjsonasync?view=net-5.0#System_Net_Http_Json_HttpContentJsonExtensions_ReadFromJsonAsync__1_System_Net_Http_HttpContent_System_Text_Json_JsonSerializerOptions_System_Threading_CancellationToken_
-        await using var graphQlResponseStream =
-            await httpResponseMessage.Content
-                .ReadAsStreamAsync(cancellationToken);
-        // For debugging, the following lines of code write the response to standard output.
-        // Console.WriteLine(new StreamReader(graphQlResponseStream).ReadToEnd());
-        var deserializedGraphQlResponse =
-            await JsonSerializer.DeserializeAsync<GraphQLResponse<TGraphQlResponse>>(
-                graphQlResponseStream,
-                JsonSerializerSettings.GraphQl,
-                cancellationToken
-            ) ?? throw new JsonException("Failed to deserialize the GraphQL response.");
-        return deserializedGraphQlResponse;
+        return httpClient;
     }
 
     // private GraphQLHttpClient CreateGraphQlClient(
diff --git a/frontend/components/data/DataSummary.tsx b/frontend/components/data/DataSummary.tsx
index 12a968427..313612930 100644
--- a/frontend/components/data/DataSummary.tsx
+++ b/frontend/components/data/DataSummary.tsx
@@ -197,6 +197,21 @@ export default function DataSummary({
                   {selectedResource.value.locator}
                 </Typography.Link>
               </Copyable>
+              If the resource is protected, for example, only accessable through
+              the metabase and/or by the currently logged-in user, then{" "}
+              <Typography.Link
+                href={paths.getHttpsResource({
+                  vertexId: selectedResource.vertexId,
+                  dataId: entity.uuid,
+                  dataKind: entity.kind,
+                  databaseId: entity.databaseId,
+                })}
+                target="_blank"
+                rel="noopener" // do not add `noreferrer` because it is used by same origin or referrer checks in authentication handlers
+              >
+                access it through the metabase
+              </Typography.Link>
+              .
             </div>
             <div>
               Having the{" "}
diff --git a/frontend/paths.ts b/frontend/paths.ts
index 5f03daf61..8feca6e61 100644
--- a/frontend/paths.ts
+++ b/frontend/paths.ts
@@ -112,6 +112,18 @@ export default {
     id: Scalars["Uuid"]["output"],
   ) =>
     `/databases/${encodeURIComponent(databaseId)}/data/geometric/${encodeURIComponent(id)}` as Route,
+  getHttpsResource: ({
+    vertexId,
+    dataId,
+    dataKind,
+    databaseId,
+  }: {
+    vertexId: Scalars["ID"]["output"];
+    dataId: Scalars["Uuid"]["output"];
+    dataKind: DataKind;
+    databaseId: Scalars["Uuid"]["output"];
+  }) =>
+    `/api/resources/${encodeURIComponent(vertexId)}?dataId=${encodeURIComponent(dataId)}&dataKind=${encodeURIComponent(dataKind)}&databaseId=${encodeURIComponent(databaseId)}`,
   openIdConnectApplication: (id: Scalars["Uuid"]["output"]) =>
     `/open-id-connect/application/${encodeURIComponent(id)}` as Route,
   openIdConnect: "/open-id-connect" as Route,
diff --git a/frontend/queries/data.graphql b/frontend/queries/data.graphql
index c23f7bad4..983918dd5 100644
--- a/frontend/queries/data.graphql
+++ b/frontend/queries/data.graphql
@@ -80,6 +80,7 @@ fragment DataPartial on Data {
   timestamp
   name
   description
+  kind
   warnings
   createdAt
   componentId
diff --git a/nginx/templates/default.conf.template b/nginx/templates/default.conf.template
index 34e355d0a..c755fb734 100644
--- a/nginx/templates/default.conf.template
+++ b/nginx/templates/default.conf.template
@@ -143,6 +143,21 @@ server {
         limit_req  zone=general burst=2 nodelay;
     }
 
+    location /api {
+        proxy_pass http://backend;
+        limit_req  zone=sensitive burst=6 nodelay;
+    }
+
+    location /api/resources/ {
+        # Accept up to 12 minute requests (for slow and/or huge downloads)
+        proxy_read_timeout 1200s;
+        proxy_send_timeout 1200s;
+        proxy_request_buffering off;
+        proxy_buffering off;
+        proxy_cache off;
+        proxy_pass http://backend;
+    }
+
     location /personal-user-data {
         proxy_pass http://backend;
         limit_req  zone=sensitive burst=2 nodelay;

From 206efc4930819c491a9fc463deba62fdc88c41d2 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 24 Jun 2026 20:37:12 +0200
Subject: [PATCH 117/145] Jump directly on select

---
 frontend/components/JumpToId.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/components/JumpToId.tsx b/frontend/components/JumpToId.tsx
index ea0f2c019..0e7d2fc94 100644
--- a/frontend/components/JumpToId.tsx
+++ b/frontend/components/JumpToId.tsx
@@ -16,7 +16,7 @@ export default function JumpToId({ query, route, style }: JumpToIdProps) {
   const router = useRouter();
   const [id, setId] = useState<string | undefined>(undefined);
 
-  const handleJump = () => {
+  const jump = (id: string | undefined) => {
     if (id && isUuid(id)) {
       router.push(route(id));
     }
@@ -29,7 +29,7 @@ export default function JumpToId({ query, route, style }: JumpToIdProps) {
         <PaginatedIdSelect
           query={query}
           style={{ minWidth: "66ch", ...style }}
-          onChange={setId}
+          onChange={jump}
         />
       ) : (
         <Input
@@ -39,7 +39,7 @@ export default function JumpToId({ query, route, style }: JumpToIdProps) {
           onChange={(e) => setId(e.target.value)}
         />
       )}
-      <Button type="primary" onClick={handleJump}>
+      <Button type="primary" onClick={() => jump(id)}>
         Jump to Page
       </Button>
     </Space.Compact>

From d1d15a3d6a450a66aded6d3cb0a8e537d804393f Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 24 Jun 2026 20:59:21 +0200
Subject: [PATCH 118/145] Make audiences and resources of an OpenID Connect
 application accessible via GraphQL and show both in the frontend

---
 .../OpenIdConnectApplicationType.cs           | 25 +++++++
 .../GraphQlSchemaTests.IsUnchanged.snap       | 66 ++++++++++---------
 .../OpenIdConnectApplicationSummary.tsx       | 28 ++++++--
 frontend/queries/openIdConnect.graphql        |  2 +
 frontend/type-defs.graphqls                   | 66 ++++++++++---------
 5 files changed, 118 insertions(+), 69 deletions(-)

diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
index 34d87318e..047304b2c 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
@@ -11,6 +11,7 @@
 using Metabase.GraphQl.Users;
 using Metabase.GraphQl.Entities;
 using Metabase.GraphQl.Scalars;
+using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect.Applications;
 
@@ -92,6 +93,30 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
                 ?.PermissionsToOpenIdConnectScopes()
                 ?? [];
         });
+        descriptor
+            .Field("audiences")
+            .Type<NonNullType<ListType<NonNullType<StringType>>>>()
+            .Cost(0)
+            .Resolve(context =>
+        {
+            var application = context.Parent<OpenIdConnectApplication>();
+            return (application.Permissions is null ? [] : JsonSerializer.Deserialize<List<string>>(application.Permissions))
+                ?.Where(_ => _.StartsWith(OpenIddictConstants.Permissions.Prefixes.Audience))
+                .Select(_ => _[OpenIddictConstants.Permissions.Prefixes.Audience.Length..])
+                ?? [];
+        });
+        descriptor
+            .Field("resources")
+            .Type<NonNullType<ListType<NonNullType<StringType>>>>()
+            .Cost(0)
+            .Resolve(context =>
+        {
+            var application = context.Parent<OpenIdConnectApplication>();
+            return (application.Permissions is null ? [] : JsonSerializer.Deserialize<List<string>>(application.Permissions))
+                ?.Where(_ => _.StartsWith(OpenIddictConstants.Permissions.Prefixes.Resource))
+                .Select(_ => _[OpenIddictConstants.Permissions.Prefixes.Resource.Length..])
+                ?? [];
+        });
         descriptor
             .Field(application => application.Requirements)
             .Type<NonNullType<ListType<NonNullType<EnumType<OpenIdConnectRequirement>>>>>()
diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index a336451c9..8a68a5f22 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -65,9 +65,9 @@ type Query {
     where: DatabaseFilterInput @cost(weight: "10")
   ): AnyDatabasesConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -88,9 +88,9 @@ type Query {
     where: ComponentFilterInput @cost(weight: "10")
   ): ComponentsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -112,9 +112,9 @@ type Query {
     where: DatabaseFilterInput @cost(weight: "10")
   ): DatabasesConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -133,9 +133,9 @@ type Query {
     where: DataFormatFilterInput @cost(weight: "10")
   ): DataFormatsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -157,9 +157,9 @@ type Query {
     where: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
   ): GnuPgKeyFingerprintsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -192,9 +192,9 @@ type Query {
     where: InstitutionFilterInput @cost(weight: "10")
   ): InstitutionsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -215,9 +215,9 @@ type Query {
     where: MethodFilterInput @cost(weight: "10")
   ): MethodsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -243,9 +243,9 @@ type Query {
     where: OpenIdConnectApplicationFilterInput @cost(weight: "10")
   ): OpenIdConnectApplicationsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -265,9 +265,9 @@ type Query {
     where: OpenIdConnectAuthorizationFilterInput @cost(weight: "10")
   ): OpenIdConnectAuthorizationsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -286,9 +286,9 @@ type Query {
     where: OpenIdConnectTokenFilterInput @cost(weight: "10")
   ): OpenIdConnectTokensConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -308,9 +308,9 @@ type Query {
     where: DatabaseFilterInput @cost(weight: "10")
   ): PendingDatabasesConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -328,9 +328,9 @@ type Query {
     where: InstitutionFilterInput @cost(weight: "10")
   ): PendingInstitutionsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -351,9 +351,9 @@ type Query {
     where: UserFilterInput @cost(weight: "10")
   ): UsersConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -683,7 +683,7 @@ type CalorimetricData implements Node & Data {
 }
 
 type CalorimetricDataConnection {
-  edges: [CalorimetricDataEdge!]! @cost(weight: "0")
+  edges: [CalorimetricDataEdge!] @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
   totalCount: Int!
 }
@@ -1419,7 +1419,7 @@ type GeometricData implements Node & Data {
 }
 
 type GeometricDataConnection {
-  edges: [GeometricDataEdge!]! @cost(weight: "0")
+  edges: [GeometricDataEdge!] @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
   totalCount: Int!
 }
@@ -1518,7 +1518,7 @@ type HygrothermalData implements Node & Data {
 }
 
 type HygrothermalDataConnection {
-  edges: [HygrothermalDataEdge!]! @cost(weight: "0")
+  edges: [HygrothermalDataEdge!] @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
   totalCount: Int!
 }
@@ -1834,7 +1834,7 @@ type LifeCycleData implements Node & Data {
 }
 
 type LifeCycleDataConnection {
-  edges: [LifeCycleDataEdge!]! @cost(weight: "0")
+  edges: [LifeCycleDataEdge!] @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
   totalCount: Int!
 }
@@ -1993,6 +1993,7 @@ type OpenEndedDateTimeRange {
 
 type OpenIdConnectApplication implements Node {
   applicationType: String
+  audiences: [String!]! @cost(weight: "0")
   authorizations: OpenIdConnectApplicationGrantedAuthorizationConnection!
     @cost(weight: "0")
   clientId: String!
@@ -2008,6 +2009,7 @@ type OpenIdConnectApplication implements Node {
   postLogoutRedirectUri: Url
   redirectUri: Url
   requirements: [OpenIdConnectRequirement!]! @cost(weight: "0")
+  resources: [String!]! @cost(weight: "0")
   responseTypes: [OpenIdConnectResponseType!]! @cost(weight: "0")
   scopes: [OpenIdConnectScope!]! @cost(weight: "0")
   tokens: OpenIdConnectApplicationIssuedTokenConnection! @cost(weight: "10")
@@ -2174,7 +2176,7 @@ type OpticalData implements Node & Data {
 }
 
 type OpticalDataConnection {
-  edges: [OpticalDataEdge!]! @cost(weight: "0")
+  edges: [OpticalDataEdge!] @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
   totalCount: Int!
 }
@@ -2301,7 +2303,7 @@ type PhotovoltaicData implements Node & Data {
 }
 
 type PhotovoltaicDataConnection {
-  edges: [PhotovoltaicDataEdge!]! @cost(weight: "0")
+  edges: [PhotovoltaicDataEdge!] @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
   totalCount: Int!
 }
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
index 0ba271eb6..ec9fdc075 100644
--- a/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplicationSummary.tsx
@@ -81,35 +81,53 @@ export default function OpenIdConnectApplicationSummary({
       )}
       <div>
         <div>
-          Endpoints{" "}
+          Endpoints:{" "}
           <InlineList
             items={entity.endpoints}
             renderItem={(item) => <code key={item}>{item}</code>}
           />
         </div>
         <div>
-          Grant Types{" "}
+          Grant Types:{" "}
           <InlineList
             items={entity.grantTypes}
             renderItem={(item) => <code key={item}>{item}</code>}
           />
         </div>
         <div>
-          Response Types{" "}
+          Response Types:{" "}
           <InlineList
             items={entity.responseTypes}
             renderItem={(item) => <code key={item}>{item}</code>}
           />
         </div>
         <div>
-          Scopes{" "}
+          Scopes:{" "}
           <InlineList
             items={entity.scopes}
             renderItem={(item) => <code key={item}>{item}</code>}
           />
         </div>
+        {entity.audiences.length > 0 && (
+          <div>
+            Audiences:{" "}
+            <InlineList
+              items={entity.audiences}
+              renderItem={(item) => <span key={item}>{item}</span>}
+            />
+          </div>
+        )}
+        {entity.resources.length > 0 && (
+          <div>
+            Resources:{" "}
+            <InlineList
+              items={entity.resources}
+              renderItem={(item) => <span key={item}>{item}</span>}
+            />
+          </div>
+        )}
         <div>
-          Requirements{" "}
+          Requirements:{" "}
           <InlineList
             items={entity.requirements}
             renderItem={(item) => <code key={item}>{item}</code>}
diff --git a/frontend/queries/openIdConnect.graphql b/frontend/queries/openIdConnect.graphql
index caa3ca400..f07caee96 100644
--- a/frontend/queries/openIdConnect.graphql
+++ b/frontend/queries/openIdConnect.graphql
@@ -15,6 +15,8 @@ fragment OpenIdConnectApplicationsPartial on OpenIdConnectApplication {
   grantTypes
   responseTypes
   scopes
+  audiences
+  resources
   requirements
   owner {
     node {
diff --git a/frontend/type-defs.graphqls b/frontend/type-defs.graphqls
index a336451c9..8a68a5f22 100644
--- a/frontend/type-defs.graphqls
+++ b/frontend/type-defs.graphqls
@@ -65,9 +65,9 @@ type Query {
     where: DatabaseFilterInput @cost(weight: "10")
   ): AnyDatabasesConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -88,9 +88,9 @@ type Query {
     where: ComponentFilterInput @cost(weight: "10")
   ): ComponentsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -112,9 +112,9 @@ type Query {
     where: DatabaseFilterInput @cost(weight: "10")
   ): DatabasesConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -133,9 +133,9 @@ type Query {
     where: DataFormatFilterInput @cost(weight: "10")
   ): DataFormatsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -157,9 +157,9 @@ type Query {
     where: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
   ): GnuPgKeyFingerprintsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -192,9 +192,9 @@ type Query {
     where: InstitutionFilterInput @cost(weight: "10")
   ): InstitutionsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -215,9 +215,9 @@ type Query {
     where: MethodFilterInput @cost(weight: "10")
   ): MethodsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -243,9 +243,9 @@ type Query {
     where: OpenIdConnectApplicationFilterInput @cost(weight: "10")
   ): OpenIdConnectApplicationsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -265,9 +265,9 @@ type Query {
     where: OpenIdConnectAuthorizationFilterInput @cost(weight: "10")
   ): OpenIdConnectAuthorizationsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -286,9 +286,9 @@ type Query {
     where: OpenIdConnectTokenFilterInput @cost(weight: "10")
   ): OpenIdConnectTokensConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -308,9 +308,9 @@ type Query {
     where: DatabaseFilterInput @cost(weight: "10")
   ): PendingDatabasesConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -328,9 +328,9 @@ type Query {
     where: InstitutionFilterInput @cost(weight: "10")
   ): PendingInstitutionsConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -351,9 +351,9 @@ type Query {
     where: UserFilterInput @cost(weight: "10")
   ): UsersConnection
     @listSize(
-      assumedSize: 100
+      assumedSize: 99
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 100
+      slicingArgumentDefaultValue: 99
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -683,7 +683,7 @@ type CalorimetricData implements Node & Data {
 }
 
 type CalorimetricDataConnection {
-  edges: [CalorimetricDataEdge!]! @cost(weight: "0")
+  edges: [CalorimetricDataEdge!] @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
   totalCount: Int!
 }
@@ -1419,7 +1419,7 @@ type GeometricData implements Node & Data {
 }
 
 type GeometricDataConnection {
-  edges: [GeometricDataEdge!]! @cost(weight: "0")
+  edges: [GeometricDataEdge!] @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
   totalCount: Int!
 }
@@ -1518,7 +1518,7 @@ type HygrothermalData implements Node & Data {
 }
 
 type HygrothermalDataConnection {
-  edges: [HygrothermalDataEdge!]! @cost(weight: "0")
+  edges: [HygrothermalDataEdge!] @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
   totalCount: Int!
 }
@@ -1834,7 +1834,7 @@ type LifeCycleData implements Node & Data {
 }
 
 type LifeCycleDataConnection {
-  edges: [LifeCycleDataEdge!]! @cost(weight: "0")
+  edges: [LifeCycleDataEdge!] @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
   totalCount: Int!
 }
@@ -1993,6 +1993,7 @@ type OpenEndedDateTimeRange {
 
 type OpenIdConnectApplication implements Node {
   applicationType: String
+  audiences: [String!]! @cost(weight: "0")
   authorizations: OpenIdConnectApplicationGrantedAuthorizationConnection!
     @cost(weight: "0")
   clientId: String!
@@ -2008,6 +2009,7 @@ type OpenIdConnectApplication implements Node {
   postLogoutRedirectUri: Url
   redirectUri: Url
   requirements: [OpenIdConnectRequirement!]! @cost(weight: "0")
+  resources: [String!]! @cost(weight: "0")
   responseTypes: [OpenIdConnectResponseType!]! @cost(weight: "0")
   scopes: [OpenIdConnectScope!]! @cost(weight: "0")
   tokens: OpenIdConnectApplicationIssuedTokenConnection! @cost(weight: "10")
@@ -2174,7 +2176,7 @@ type OpticalData implements Node & Data {
 }
 
 type OpticalDataConnection {
-  edges: [OpticalDataEdge!]! @cost(weight: "0")
+  edges: [OpticalDataEdge!] @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
   totalCount: Int!
 }
@@ -2301,7 +2303,7 @@ type PhotovoltaicData implements Node & Data {
 }
 
 type PhotovoltaicDataConnection {
-  edges: [PhotovoltaicDataEdge!]! @cost(weight: "0")
+  edges: [PhotovoltaicDataEdge!] @cost(weight: "0")
   pageInfo: PageInfo! @cost(weight: "0")
   totalCount: Int!
 }

From 69f3ad6ad43721ad636a1ad24cc6aff901ac6fa1 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Wed, 24 Jun 2026 22:07:20 +0200
Subject: [PATCH 119/145] Allow an application authenticated via client
 credentials to access its meta information

---
 .../Applications/OpenIdConnectApplicationQueries.cs | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
index 628d5f3b0..59a0dbf57 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
@@ -21,7 +21,7 @@ namespace Metabase.GraphQl.OpenIdConnect.Applications;
 public sealed class OpenIdConnectApplicationQueries
 {
     [UseUserManager]
-    [Authorize(Policy = AuthorizationPolicies.ManageOpenIdConnectScopePolicy)]
+    [Authorize(Policy = AuthorizationPolicies.AuthenticatedPolicy)]
     public Task<OpenIdConnectApplication?> GetCurrentOpenIdConnectApplicationAsync(
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
@@ -31,16 +31,7 @@ CancellationToken cancellationToken
         return authorization.SwitchUserOrApplicationAsync(
             claimsPrincipal,
             user => Task.FromResult<OpenIdConnectApplication?>(null),
-            async application =>
-            {
-                if (application is not null
-                    && !await authorization.IsAuthorizedToManageApplication(claimsPrincipal, application.Id, cancellationToken)
-                )
-                {
-                    return null;
-                }
-                return application;
-            },
+            application => Task.FromResult<OpenIdConnectApplication?>(application),
             cancellationToken
         );
     }

From 73f4146dae1e1b92fa9e77be537d453dee1a7859 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 25 Jun 2026 15:07:05 +0200
Subject: [PATCH 120/145] Drop the as-of-now not-needed column `Contact_Exists`
 from `institution` if it should still exist for some reason

---
 ...actExistsColumnFromInstitution.Designer.cs | 2298 +++++++++++++++++
 ..._DropContactExistsColumnFromInstitution.cs |   30 +
 backend/src/Migrations/migrate.sql            |   19 +
 ...DropContactExistsColumnFromInstitution.sql |   19 +
 ...n_to_20260620182947_UseSequentialUuids.sql |   19 +
 5 files changed, 2385 insertions(+)
 create mode 100644 backend/src/Migrations/20260625115427_DropContactExistsColumnFromInstitution.Designer.cs
 create mode 100644 backend/src/Migrations/20260625115427_DropContactExistsColumnFromInstitution.cs
 create mode 100644 backend/src/Migrations/migrate_from_20260620182947_UseSequentialUuids_to_20260625115427_DropContactExistsColumnFromInstitution.sql
 create mode 100644 backend/src/Migrations/rollback_from_20260625115427_DropContactExistsColumnFromInstitution_to_20260620182947_UseSequentialUuids.sql

diff --git a/backend/src/Migrations/20260625115427_DropContactExistsColumnFromInstitution.Designer.cs b/backend/src/Migrations/20260625115427_DropContactExistsColumnFromInstitution.Designer.cs
new file mode 100644
index 000000000..3b9d54f63
--- /dev/null
+++ b/backend/src/Migrations/20260625115427_DropContactExistsColumnFromInstitution.Designer.cs
@@ -0,0 +1,2298 @@
+// <auto-generated />
+using System;
+using System.Text.Json;
+using Metabase.Data;
+using Metabase.Enumerations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Metabase.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20260625115427_DropContactExistsColumnFromInstitution")]
+    partial class DropContactExistsColumnFromInstitution
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("metabase")
+                .HasAnnotation("ProductVersion", "10.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "component_category", new[] { "layer", "material", "unit" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "database_verification_state", new[] { "pending", "verified" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_operating_state", new[] { "not_operating", "operating" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_representative_role", new[] { "assistant", "owner" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "institution_state", new[] { "pending", "verified" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "method_category", new[] { "calculation", "measurement" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "prime_surface", new[] { "inside", "outside" });
+            NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "metabase", "standardizer", new[] { "aerc", "agi", "ashrae", "breeam", "bs", "bsi", "cen", "cie", "dgnb", "din", "dvwg", "iec", "ies", "ift", "iso", "jis", "leed", "nfrc", "riba", "ul", "unece", "vdi", "vff", "well" });
+            NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "pgcrypto");
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<string>("Abbreviation")
+                        .HasColumnType("text");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
+                        .HasColumnType("tstzrange");
+
+                    b.PrimitiveCollection<ComponentCategory[]>("Categories")
+                        .IsRequired()
+                        .HasColumnType("metabase.component_category[]");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<JsonElement?>("Extras")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("component", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentAssembly", b =>
+                {
+                    b.Property<Guid>("AssembledComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("PartComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<byte?>("Index")
+                        .HasColumnType("smallint");
+
+                    b.Property<PrimeSurface?>("PrimeSurface")
+                        .HasColumnType("metabase.prime_surface");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("AssembledComponentId", "PartComponentId");
+
+                    b.HasIndex("PartComponentId");
+
+                    b.ToTable("component_assembly", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentConcretizationAndGeneralization", b =>
+                {
+                    b.Property<Guid>("GeneralComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ConcreteComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("GeneralComponentId", "ConcreteComponentId");
+
+                    b.HasIndex("ConcreteComponentId");
+
+                    b.ToTable("component_concretization_and_generalization", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentManufacturer", b =>
+                {
+                    b.Property<Guid>("ComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("ComponentId", "InstitutionId");
+
+                    b.HasIndex("InstitutionId");
+
+                    b.ToTable("component_manufacturer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentVariant", b =>
+                {
+                    b.Property<Guid>("OfComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ToComponentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("OfComponentId", "ToComponentId");
+
+                    b.HasIndex("ToComponentId");
+
+                    b.ToTable("component_variant", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.DataFormat", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Extension")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("MediaType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SchemaLocator")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("data_format", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Database", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Locator")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OperatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("VerificationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DatabaseVerificationState>("VerificationState")
+                        .HasColumnType("metabase.database_verification_state");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OperatorId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("database", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.GnuPgKeyFingerprint", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<OffsetDateTime?>("AllowedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Fingerprint")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<OffsetDateTime?>("ForbiddenAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Fingerprint")
+                        .IsUnique();
+
+                    b.HasIndex("InstitutionId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("gnu_pg_fingerprint", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<string>("Abbreviation")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<JsonElement?>("Extras")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<InstitutionOperatingState>("OperatingState")
+                        .HasColumnType("metabase.institution_operating_state");
+
+                    b.Property<InstitutionState>("State")
+                        .HasColumnType("metabase.institution_state");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("institution", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionMethodDeveloper", b =>
+                {
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MethodId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("InstitutionId", "MethodId");
+
+                    b.HasIndex("MethodId");
+
+                    b.ToTable("institution_method_developer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionRepresentative", b =>
+                {
+                    b.Property<Guid>("InstitutionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<InstitutionRepresentativeRole>("Role")
+                        .HasColumnType("metabase.institution_representative_role");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("InstitutionId", "UserId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("institution_representative", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Availability")
+                        .HasColumnType("tstzrange");
+
+                    b.Property<string>("CalculationLocator")
+                        .HasColumnType("text");
+
+                    b.PrimitiveCollection<MethodCategory[]>("Categories")
+                        .IsRequired()
+                        .HasColumnType("metabase.method_category[]");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ManagerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<NpgsqlRange<OffsetDateTime>?>("Validity")
+                        .HasColumnType("tstzrange");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ManagerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("method", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<string>("ApplicationType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("ClientSecret")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClientType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("ConsentType")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayNames")
+                        .HasColumnType("text");
+
+                    b.Property<string>("JsonWebKeySet")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Permissions")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostLogoutRedirectUris")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RedirectUris")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Requirements")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Settings")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId")
+                        .IsUnique();
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("OpenIddictApplications", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTime?>("CreationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Scopes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Subject")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                    b.ToTable("OpenIddictAuthorizations", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectScope", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Descriptions")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayNames")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Resources")
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.ToTable("OpenIddictScopes", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AuthorizationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyToken")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<DateTime?>("CreationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("ExpirationDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Properties")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("RedemptionDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ReferenceId")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Status")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Subject")
+                        .HasMaxLength(400)
+                        .HasColumnType("character varying(400)");
+
+                    b.Property<string>("Type")
+                        .HasMaxLength(150)
+                        .HasColumnType("character varying(150)");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuthorizationId");
+
+                    b.HasIndex("ReferenceId")
+                        .IsUnique();
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                    b.ToTable("OpenIddictTokens", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Role", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("role", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.RoleClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("role_claim", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasDefaultValueSql("uuidv7()");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PostalAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.Property<string>("WebsiteLocator")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.HasIndex("CreatedAt", "Id")
+                        .IsUnique();
+
+                    b.HasIndex("Name", "Id")
+                        .IsUnique();
+
+                    b.ToTable("user", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserClaim", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("user_claim", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserLogin", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("user_login", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserMethodDeveloper", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("MethodId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<bool>("Pending")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("UserId", "MethodId");
+
+                    b.HasIndex("MethodId");
+
+                    b.ToTable("user_method_developer", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserRole", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("user_role", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserToken", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("user_token", "metabase");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys", "metabase");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedComponents")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "PrimeDirection", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "PrimeSurface", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.OwnsOne("Metabase.Data.DescriptionOrReference", "SwitchableLayers", b1 =>
+                        {
+                            b1.Property<Guid>("ComponentId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("ComponentId");
+
+                            b1.ToTable("component", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("ComponentId");
+
+                            b1.OwnsOne("Metabase.Data.Reference", "Reference", b2 =>
+                                {
+                                    b2.Property<Guid>("DescriptionOrReferenceComponentId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.HasKey("DescriptionOrReferenceComponentId");
+
+                                    b2.ToTable("component", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("DescriptionOrReferenceComponentId");
+
+                                    b2.OwnsOne("Metabase.Data.Publication", "Publication", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("ArXiv")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<string[]>("Authors")
+                                                .HasColumnType("text[]");
+
+                                            b3.Property<string>("Doi")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Urn")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("WebAddress")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+                                        });
+
+                                    b2.OwnsOne("Metabase.Data.Standard", "Standard", b3 =>
+                                        {
+                                            b3.Property<Guid>("ReferenceDescriptionOrReferenceComponentId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("Abstract")
+                                                .HasColumnType("text");
+
+                                            b3.Property<bool>("Exists")
+                                                .HasColumnType("boolean");
+
+                                            b3.Property<string>("Locator")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Section")
+                                                .HasColumnType("text");
+
+                                            b3.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                                .IsRequired()
+                                                .HasColumnType("metabase.standardizer[]");
+
+                                            b3.Property<string>("Title")
+                                                .HasColumnType("text");
+
+                                            b3.Property<int?>("Year")
+                                                .HasColumnType("integer");
+
+                                            b3.HasKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.ToTable("component", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("ReferenceDescriptionOrReferenceComponentId");
+
+                                            b3.OwnsOne("Metabase.Data.Numeration", "Numeration", b4 =>
+                                                {
+                                                    b4.Property<Guid>("StandardReferenceDescriptionOrReferenceComponentId")
+                                                        .HasColumnType("uuid");
+
+                                                    b4.Property<string>("MainNumber")
+                                                        .IsRequired()
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Prefix")
+                                                        .HasColumnType("text");
+
+                                                    b4.Property<string>("Suffix")
+                                                        .HasColumnType("text");
+
+                                                    b4.HasKey("StandardReferenceDescriptionOrReferenceComponentId");
+
+                                                    b4.ToTable("component", "metabase");
+
+                                                    b4.WithOwner()
+                                                        .HasForeignKey("StandardReferenceDescriptionOrReferenceComponentId");
+                                                });
+
+                                            b3.Navigation("Numeration")
+                                                .IsRequired();
+                                        });
+
+                                    b2.Navigation("Publication");
+
+                                    b2.Navigation("Standard");
+                                });
+
+                            b1.Navigation("Reference");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("PrimeDirection");
+
+                    b.Navigation("PrimeSurface");
+
+                    b.Navigation("SwitchableLayers");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentAssembly", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "AssembledComponent")
+                        .WithMany("PartEdges")
+                        .HasForeignKey("AssembledComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "PartComponent")
+                        .WithMany("PartOfEdges")
+                        .HasForeignKey("PartComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("AssembledComponent");
+
+                    b.Navigation("PartComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentConcretizationAndGeneralization", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "ConcreteComponent")
+                        .WithMany("GeneralizationEdges")
+                        .HasForeignKey("ConcreteComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "GeneralComponent")
+                        .WithMany("ConcretizationEdges")
+                        .HasForeignKey("GeneralComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ConcreteComponent");
+
+                    b.Navigation("GeneralComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentManufacturer", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "Component")
+                        .WithMany("ManufacturerEdges")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("ManufacturedComponentEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Institution");
+                });
+
+            modelBuilder.Entity("Metabase.Data.ComponentVariant", b =>
+                {
+                    b.HasOne("Metabase.Data.Component", "OfComponent")
+                        .WithMany("VariantEdges")
+                        .HasForeignKey("OfComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Component", "ToComponent")
+                        .WithMany("VariantOfEdges")
+                        .HasForeignKey("ToComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("OfComponent");
+
+                    b.Navigation("ToComponent");
+                });
+
+            modelBuilder.Entity("Metabase.Data.DataFormat", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedDataFormats")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.Reference", "Reference", b1 =>
+                        {
+                            b1.Property<Guid>("DataFormatId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("DataFormatId");
+
+                            b1.ToTable("data_format", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("DataFormatId");
+
+                            b1.OwnsOne("Metabase.Data.Publication", "Publication", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceDataFormatId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("ArXiv")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<string[]>("Authors")
+                                        .HasColumnType("text[]");
+
+                                    b2.Property<string>("Doi")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Urn")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("WebAddress")
+                                        .HasColumnType("text");
+
+                                    b2.HasKey("ReferenceDataFormatId");
+
+                                    b2.ToTable("data_format", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceDataFormatId");
+                                });
+
+                            b1.OwnsOne("Metabase.Data.Standard", "Standard", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceDataFormatId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Locator")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                        .IsRequired()
+                                        .HasColumnType("metabase.standardizer[]");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<int?>("Year")
+                                        .HasColumnType("integer");
+
+                                    b2.HasKey("ReferenceDataFormatId");
+
+                                    b2.ToTable("data_format", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceDataFormatId");
+
+                                    b2.OwnsOne("Metabase.Data.Numeration", "Numeration", b3 =>
+                                        {
+                                            b3.Property<Guid>("StandardReferenceDataFormatId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("MainNumber")
+                                                .IsRequired()
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Prefix")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Suffix")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("StandardReferenceDataFormatId");
+
+                                            b3.ToTable("data_format", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("StandardReferenceDataFormatId");
+                                        });
+
+                                    b2.Navigation("Numeration")
+                                        .IsRequired();
+                                });
+
+                            b1.Navigation("Publication");
+
+                            b1.Navigation("Standard");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("Reference");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Database", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Operator")
+                        .WithMany("OperatedDatabases")
+                        .HasForeignKey("OperatorId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Operator");
+                });
+
+            modelBuilder.Entity("Metabase.Data.GnuPgKeyFingerprint", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("GnuPgKeyFingerprints")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("GnuPgKeyFingerprints")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedInstitutions")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.OwnsOne("Metabase.Data.ContactInformation", "Contact", b1 =>
+                        {
+                            b1.Property<Guid>("InstitutionId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<string>("EmailAddress")
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("IsEmailAddressConfirmed")
+                                .HasColumnType("boolean");
+
+                            b1.Property<bool>("IsPhoneNumberConfirmed")
+                                .HasColumnType("boolean");
+
+                            b1.Property<string>("PhoneNumber")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("PostalAddress")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("WebsiteLocator")
+                                .HasColumnType("text");
+
+                            b1.HasKey("InstitutionId");
+
+                            b1.ToTable("institution", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("InstitutionId");
+                        });
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Manager");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionMethodDeveloper", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("DevelopedMethodEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.Method", "Method")
+                        .WithMany("InstitutionDeveloperEdges")
+                        .HasForeignKey("MethodId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("Method");
+                });
+
+            modelBuilder.Entity("Metabase.Data.InstitutionRepresentative", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Institution")
+                        .WithMany("RepresentativeEdges")
+                        .HasForeignKey("InstitutionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("RepresentedInstitutionEdges")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Institution");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Manager")
+                        .WithMany("ManagedMethods")
+                        .HasForeignKey("ManagerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Metabase.Data.Reference", "Reference", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<bool>("Exists")
+                                .HasColumnType("boolean");
+
+                            b1.HasKey("MethodId");
+
+                            b1.ToTable("method", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+
+                            b1.OwnsOne("Metabase.Data.Publication", "Publication", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceMethodId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("ArXiv")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<string[]>("Authors")
+                                        .HasColumnType("text[]");
+
+                                    b2.Property<string>("Doi")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Urn")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("WebAddress")
+                                        .HasColumnType("text");
+
+                                    b2.HasKey("ReferenceMethodId");
+
+                                    b2.ToTable("method", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceMethodId");
+                                });
+
+                            b1.OwnsOne("Metabase.Data.Standard", "Standard", b2 =>
+                                {
+                                    b2.Property<Guid>("ReferenceMethodId")
+                                        .HasColumnType("uuid");
+
+                                    b2.Property<string>("Abstract")
+                                        .HasColumnType("text");
+
+                                    b2.Property<bool>("Exists")
+                                        .HasColumnType("boolean");
+
+                                    b2.Property<string>("Locator")
+                                        .HasColumnType("text");
+
+                                    b2.Property<string>("Section")
+                                        .HasColumnType("text");
+
+                                    b2.PrimitiveCollection<Standardizer[]>("Standardizers")
+                                        .IsRequired()
+                                        .HasColumnType("metabase.standardizer[]");
+
+                                    b2.Property<string>("Title")
+                                        .HasColumnType("text");
+
+                                    b2.Property<int?>("Year")
+                                        .HasColumnType("integer");
+
+                                    b2.HasKey("ReferenceMethodId");
+
+                                    b2.ToTable("method", "metabase");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("ReferenceMethodId");
+
+                                    b2.OwnsOne("Metabase.Data.Numeration", "Numeration", b3 =>
+                                        {
+                                            b3.Property<Guid>("StandardReferenceMethodId")
+                                                .HasColumnType("uuid");
+
+                                            b3.Property<string>("MainNumber")
+                                                .IsRequired()
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Prefix")
+                                                .HasColumnType("text");
+
+                                            b3.Property<string>("Suffix")
+                                                .HasColumnType("text");
+
+                                            b3.HasKey("StandardReferenceMethodId");
+
+                                            b3.ToTable("method", "metabase");
+
+                                            b3.WithOwner()
+                                                .HasForeignKey("StandardReferenceMethodId");
+                                        });
+
+                                    b2.Navigation("Numeration")
+                                        .IsRequired();
+                                });
+
+                            b1.Navigation("Publication");
+
+                            b1.Navigation("Standard");
+                        });
+
+                    b.OwnsMany("Metabase.Data.MethodParameter", "Parameters", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<JsonElement>("Type")
+                                .HasColumnType("jsonb");
+
+                            b1.HasKey("MethodId", "Id");
+
+                            b1.ToTable("MethodParameter", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+                        });
+
+                    b.OwnsMany("Metabase.Data.MethodSource", "Sources", b1 =>
+                        {
+                            b1.Property<Guid>("MethodId")
+                                .HasColumnType("uuid");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("integer");
+
+                            NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Description")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.HasKey("MethodId", "Id");
+
+                            b1.ToTable("MethodSource", "metabase");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MethodId");
+                        });
+
+                    b.Navigation("Manager");
+
+                    b.Navigation("Parameters");
+
+                    b.Navigation("Reference");
+
+                    b.Navigation("Sources");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.HasOne("Metabase.Data.Institution", "Owner")
+                        .WithMany("OpenIdConnectApplications")
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", "Application")
+                        .WithMany("Authorizations")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectToken", b =>
+                {
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", "Application")
+                        .WithMany("Tokens")
+                        .HasForeignKey("ApplicationId");
+
+                    b.HasOne("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", "Authorization")
+                        .WithMany("Tokens")
+                        .HasForeignKey("AuthorizationId");
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Authorization");
+                });
+
+            modelBuilder.Entity("Metabase.Data.RoleClaim", b =>
+                {
+                    b.HasOne("Metabase.Data.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserClaim", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserLogin", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserMethodDeveloper", b =>
+                {
+                    b.HasOne("Metabase.Data.Method", "Method")
+                        .WithMany("UserDeveloperEdges")
+                        .HasForeignKey("MethodId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", "User")
+                        .WithMany("DevelopedMethodEdges")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Method");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserRole", b =>
+                {
+                    b.HasOne("Metabase.Data.Role", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.UserToken", b =>
+                {
+                    b.HasOne("Metabase.Data.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Metabase.Data.Component", b =>
+                {
+                    b.Navigation("ConcretizationEdges");
+
+                    b.Navigation("GeneralizationEdges");
+
+                    b.Navigation("ManufacturerEdges");
+
+                    b.Navigation("PartEdges");
+
+                    b.Navigation("PartOfEdges");
+
+                    b.Navigation("VariantEdges");
+
+                    b.Navigation("VariantOfEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Institution", b =>
+                {
+                    b.Navigation("DevelopedMethodEdges");
+
+                    b.Navigation("GnuPgKeyFingerprints");
+
+                    b.Navigation("ManagedComponents");
+
+                    b.Navigation("ManagedDataFormats");
+
+                    b.Navigation("ManagedInstitutions");
+
+                    b.Navigation("ManagedMethods");
+
+                    b.Navigation("ManufacturedComponentEdges");
+
+                    b.Navigation("OpenIdConnectApplications");
+
+                    b.Navigation("OperatedDatabases");
+
+                    b.Navigation("RepresentativeEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.Method", b =>
+                {
+                    b.Navigation("InstitutionDeveloperEdges");
+
+                    b.Navigation("UserDeveloperEdges");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectApplication", b =>
+                {
+                    b.Navigation("Authorizations");
+
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Metabase.Data.OpenIdConnect.OpenIdConnectAuthorization", b =>
+                {
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Metabase.Data.User", b =>
+                {
+                    b.Navigation("DevelopedMethodEdges");
+
+                    b.Navigation("GnuPgKeyFingerprints");
+
+                    b.Navigation("RepresentedInstitutionEdges");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/backend/src/Migrations/20260625115427_DropContactExistsColumnFromInstitution.cs b/backend/src/Migrations/20260625115427_DropContactExistsColumnFromInstitution.cs
new file mode 100644
index 000000000..656be1909
--- /dev/null
+++ b/backend/src/Migrations/20260625115427_DropContactExistsColumnFromInstitution.cs
@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Metabase.Migrations
+{
+    /// <inheritdoc />
+    public partial class DropContactExistsColumnFromInstitution : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Contact_Exists",
+                schema: "metabase",
+                table: "institution");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "Contact_Exists",
+                schema: "metabase",
+                table: "institution",
+                type: "boolean",
+                nullable: true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/src/Migrations/migrate.sql b/backend/src/Migrations/migrate.sql
index c505d3216..14a519c9c 100644
--- a/backend/src/Migrations/migrate.sql
+++ b/backend/src/Migrations/migrate.sql
@@ -2865,3 +2865,22 @@ BEGIN
 END $EF$;
 COMMIT;
 
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260625115427_DropContactExistsColumnFromInstitution') THEN
+    ALTER TABLE metabase.institution DROP COLUMN IF EXISTS "Contact_Exists";
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260625115427_DropContactExistsColumnFromInstitution') THEN
+    INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+    VALUES ('20260625115427_DropContactExistsColumnFromInstitution', '10.0.9');
+    END IF;
+END $EF$;
+
+COMMIT;
+
diff --git a/backend/src/Migrations/migrate_from_20260620182947_UseSequentialUuids_to_20260625115427_DropContactExistsColumnFromInstitution.sql b/backend/src/Migrations/migrate_from_20260620182947_UseSequentialUuids_to_20260625115427_DropContactExistsColumnFromInstitution.sql
new file mode 100644
index 000000000..0a29c53b8
--- /dev/null
+++ b/backend/src/Migrations/migrate_from_20260620182947_UseSequentialUuids_to_20260625115427_DropContactExistsColumnFromInstitution.sql
@@ -0,0 +1,19 @@
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260625115427_DropContactExistsColumnFromInstitution') THEN
+    ALTER TABLE metabase.institution DROP COLUMN IF EXISTS "Contact_Exists";
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260625115427_DropContactExistsColumnFromInstitution') THEN
+    INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
+    VALUES ('20260625115427_DropContactExistsColumnFromInstitution', '10.0.9');
+    END IF;
+END $EF$;
+
+COMMIT;
+
diff --git a/backend/src/Migrations/rollback_from_20260625115427_DropContactExistsColumnFromInstitution_to_20260620182947_UseSequentialUuids.sql b/backend/src/Migrations/rollback_from_20260625115427_DropContactExistsColumnFromInstitution_to_20260620182947_UseSequentialUuids.sql
new file mode 100644
index 000000000..adb801aa7
--- /dev/null
+++ b/backend/src/Migrations/rollback_from_20260625115427_DropContactExistsColumnFromInstitution_to_20260620182947_UseSequentialUuids.sql
@@ -0,0 +1,19 @@
+START TRANSACTION;
+
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260625115427_DropContactExistsColumnFromInstitution') THEN
+    ALTER TABLE metabase.institution ADD "Contact_Exists" boolean;
+    END IF;
+END $EF$;
+
+DO $EF$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "__EFMigrationsHistory" WHERE "MigrationId" = '20260625115427_DropContactExistsColumnFromInstitution') THEN
+    DELETE FROM "__EFMigrationsHistory"
+    WHERE "MigrationId" = '20260625115427_DropContactExistsColumnFromInstitution';
+    END IF;
+END $EF$;
+
+COMMIT;
+

From 3176d06f65cf83728e4f51e9dad9394c3b49f1ab Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 25 Jun 2026 17:52:41 +0200
Subject: [PATCH 121/145] Make GnuPG key verification cancellable

---
 .../GnuPgKeyFingerprintMutations.cs           |  5 ++--
 .../OpenIdConnectApplicationType.cs           |  4 +--
 backend/src/Services/GnuPgService.cs          | 29 +++++++++++--------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintMutations.cs b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintMutations.cs
index 959bb31e2..169403ad6 100644
--- a/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintMutations.cs
+++ b/backend/src/GraphQl/GnuPgKeyFingerprints/GnuPgKeyFingerprintMutations.cs
@@ -80,9 +80,10 @@ CancellationToken cancellationToken
             );
         }
 
-        var gnuPgKeyVerificationResult = await gnuPgService.VerifyGnuPgKey(
+        var gnuPgKeyVerificationResult = await gnuPgService.VerifyGnuPgKeyAsync(
             normalizedFingerprint,
-            user.Email ?? ""
+            user.Email ?? "",
+            cancellationToken
         );
         if (gnuPgKeyVerificationResult is not GnuPgKeyVerificationResult.SUCCESS)
         {
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
index 047304b2c..513df715f 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationType.cs
@@ -101,7 +101,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
         {
             var application = context.Parent<OpenIdConnectApplication>();
             return (application.Permissions is null ? [] : JsonSerializer.Deserialize<List<string>>(application.Permissions))
-                ?.Where(_ => _.StartsWith(OpenIddictConstants.Permissions.Prefixes.Audience))
+                ?.Where(_ => _.StartsWith(OpenIddictConstants.Permissions.Prefixes.Audience, StringComparison.InvariantCulture))
                 .Select(_ => _[OpenIddictConstants.Permissions.Prefixes.Audience.Length..])
                 ?? [];
         });
@@ -113,7 +113,7 @@ IObjectTypeDescriptor<OpenIdConnectApplication> descriptor
         {
             var application = context.Parent<OpenIdConnectApplication>();
             return (application.Permissions is null ? [] : JsonSerializer.Deserialize<List<string>>(application.Permissions))
-                ?.Where(_ => _.StartsWith(OpenIddictConstants.Permissions.Prefixes.Resource))
+                ?.Where(_ => _.StartsWith(OpenIddictConstants.Permissions.Prefixes.Resource, StringComparison.InvariantCulture))
                 .Select(_ => _[OpenIddictConstants.Permissions.Prefixes.Resource.Length..])
                 ?? [];
         });
diff --git a/backend/src/Services/GnuPgService.cs b/backend/src/Services/GnuPgService.cs
index 9fc38b819..da4d6733c 100644
--- a/backend/src/Services/GnuPgService.cs
+++ b/backend/src/Services/GnuPgService.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Quartz.Util;
@@ -62,17 +63,20 @@ ILogger<GnuPgService> logger
     [GeneratedRegex(@"<([^>]+)>")]
     private static partial Regex ExtractEmailAddressRegex();
 
-    public async Task<GnuPgKeyVerificationResult> VerifyGnuPgKey(
+    public async Task<GnuPgKeyVerificationResult> VerifyGnuPgKeyAsync(
         string fingerprint,
-        string emailAddress
+        string emailAddress,
+        CancellationToken cancellationToken
     )
     {
         if (fingerprint.IsNullOrWhiteSpace())
         {
             return GnuPgKeyVerificationResult.MALFORMED_FINGERPRINT;
         }
-        var (exitCode, output, diagnostics) = await ExecuteCommand(
-            $"gpg --batch --with-colons --keyserver '{KeyServerUrl}' --search-keys '{fingerprint}'"
+        var (exitCode, output, diagnostics) = await ExecuteCommandAsync(
+            $"gpg --batch --with-colons --keyserver '{KeyServerUrl}' --search-keys '{fingerprint}'",
+            null,
+            cancellationToken
         );
         if (exitCode is 2)
         {
@@ -119,9 +123,10 @@ string output
         return match.Groups[1].Value;
     }
 
-    private async Task<(int ExitCode, string Output, string Diagnostics)> ExecuteCommand(
+    private async Task<(int ExitCode, string Output, string Diagnostics)> ExecuteCommandAsync(
         string command,
-        string? input = null
+        string? input,
+        CancellationToken cancellationToken
     )
     {
         logger.ExecuteCommand(command);
@@ -143,16 +148,16 @@ string output
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,
             }
-        ) ?? throw new InvalidOperationException($"The process for command '${command}' with the input '${input}' failed to start.");
+        ) ?? throw new InvalidOperationException($"The process for command '{command}' with the input '{input}' failed to start.");
         if (input is not null)
         {
-            await process.StandardInput.WriteLineAsync(input);
-            await process.StandardInput.FlushAsync();
+            await process.StandardInput.WriteLineAsync(input.AsMemory(), cancellationToken);
+            await process.StandardInput.FlushAsync(cancellationToken);
         }
         process.StandardInput.Close();
-        var output = process.StandardOutput.ReadToEnd();
-        var diagnostics = process.StandardError.ReadToEnd();
-        await process.WaitForExitAsync();
+        var output = await process.StandardOutput.ReadToEndAsync(cancellationToken);
+        var diagnostics = await process.StandardError.ReadToEndAsync(cancellationToken);
+        await process.WaitForExitAsync(cancellationToken);
         logger.ExecuteCommandOutput(output);
         logger.ExecuteCommandDiagnostics(diagnostics);
         logger.ExecuteCommandExitCode(process.ExitCode);

From 3eee8eedef9d7763db8e4158602ec7ca6912fdb7 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 25 Jun 2026 17:54:27 +0200
Subject: [PATCH 122/145] Use pg-schema-diff to compare the domain-model
 derived PostgreSQL schema with the migrate.sql derived one

---
 backend/Dockerfile.development                |  24 +++
 backend/src/AppSettings.cs                    |  15 +-
 backend/src/Migrations/migrate.sql            |   2 -
 backend/src/Startup.cs                        |   9 +-
 .../test/Integration/DatabaseSchemaTests.cs   | 193 ++++++++++++------
 backend/test/Integration/MigrationTests.cs    |   9 +-
 database.mk                                   |   2 +-
 .../components/methods/AppliedMethodView.tsx  |   3 +-
 8 files changed, 174 insertions(+), 83 deletions(-)

diff --git a/backend/Dockerfile.development b/backend/Dockerfile.development
index 31d4c0572..3d668f18c 100644
--- a/backend/Dockerfile.development
+++ b/backend/Dockerfile.development
@@ -144,6 +144,30 @@ RUN \
   --force \
   /var/lib/apt/lists/*
 
+# for available versions see the tags on https://github.com/stripe/pg-schema-diff
+ENV PG_SCHEMA_DIFF_VERSION=v1.0.5
+RUN \
+  apt-get update && \
+  apt-get install \
+  --assume-yes \
+  --no-install-recommends \
+  golang-go && \
+  go install \
+  github.com/stripe/pg-schema-diff/cmd/pg-schema-diff@${PG_SCHEMA_DIFF_VERSION} && \
+  cp /root/go/bin/pg-schema-diff /usr/local/bin/ && \
+  rm --recursive --force \
+  /root/go \
+  /root/.cache && \
+  apt-get purge \
+  --assume-yes \
+  golang-go && \
+  apt-get autoremove \
+  --assume-yes && \
+  rm \
+  --recursive \
+  --force \
+  /var/lib/apt/lists/*
+
 ENV HOME=/home/me
 RUN mkdir --parents ${HOME}/app \
   && chown \
diff --git a/backend/src/AppSettings.cs b/backend/src/AppSettings.cs
index c475c03d1..920878b25 100644
--- a/backend/src/AppSettings.cs
+++ b/backend/src/AppSettings.cs
@@ -1,6 +1,7 @@
 // Inspired by https://weblog.west-wind.com/posts/2017/dec/12/easy-configuration-binding-in-aspnet-core-revisited
 
 using System;
+using Npgsql;
 
 namespace Metabase;
 
@@ -65,7 +66,19 @@ public sealed record DatabaseSettings
         public string UserName { get; init; } = "";
         public string Password { get; init; } = "";
         public string SchemaName { get; init; } = "";
-    };
+
+        public string ConnectionString(string? customDatabaseName = null)
+        {
+            var connectionStringBuilder = new NpgsqlConnectionStringBuilder();
+            connectionStringBuilder.Host = Host;
+            connectionStringBuilder.Port = Port;
+            connectionStringBuilder.Database = customDatabaseName ?? Name;
+            connectionStringBuilder.Username = UserName;
+            connectionStringBuilder.Password = Password;
+            connectionStringBuilder.MaxPoolSize = 90;
+            return connectionStringBuilder.ConnectionString;
+        }
+    }
 
     public sealed record OpenTelemetrySettings
     {
diff --git a/backend/src/Migrations/migrate.sql b/backend/src/Migrations/migrate.sql
index 14a519c9c..35187c4c0 100644
--- a/backend/src/Migrations/migrate.sql
+++ b/backend/src/Migrations/migrate.sql
@@ -1,5 +1,3 @@
-\set ON_ERROR_STOP on
-
 CREATE TABLE IF NOT EXISTS "__EFMigrationsHistory" (
     "MigrationId" character varying(150) NOT NULL,
     "ProductVersion" character varying(32) NOT NULL,
diff --git a/backend/src/Startup.cs b/backend/src/Startup.cs
index 3a24154bc..a28ace327 100644
--- a/backend/src/Startup.cs
+++ b/backend/src/Startup.cs
@@ -207,16 +207,9 @@ private void ConfigureDatabaseContext(
         DbContextOptionsBuilder options
         )
     {
-        var connectionStringBuilder = new NpgsqlConnectionStringBuilder();
-        connectionStringBuilder.Host = _appSettings.Database.Host;
-        connectionStringBuilder.Port = _appSettings.Database.Port;
-        connectionStringBuilder.Database = _appSettings.Database.Name;
-        connectionStringBuilder.Username = _appSettings.Database.UserName;
-        connectionStringBuilder.Password = _appSettings.Database.Password;
-        connectionStringBuilder.MaxPoolSize = 90;
         options
             .UseNpgsql(
-                connectionStringBuilder.ConnectionString,
+                _appSettings.Database.ConnectionString(),
                 _ => _
                     // Keep version in sync with the one in ./docker-compose.*.yaml
                     .SetPostgresVersion(18, 4)
diff --git a/backend/test/Integration/DatabaseSchemaTests.cs b/backend/test/Integration/DatabaseSchemaTests.cs
index 1d5c637cb..a913c5e3a 100644
--- a/backend/test/Integration/DatabaseSchemaTests.cs
+++ b/backend/test/Integration/DatabaseSchemaTests.cs
@@ -1,92 +1,149 @@
 using System;
-using System.Globalization;
-using EfSchemaCompare;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 using FluentAssertions;
-using Metabase.Data;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
+using Npgsql;
 using NUnit.Framework;
-using Serilog;
 
 namespace Metabase.Tests.Integration;
 
 [TestFixture]
 public sealed class DatabaseSchemaTests
-    : IDisposable
+    : IntegrationTests
 {
-    private sealed class CustomWebApplicationFactory
-        : WebApplicationFactory<Metabase.Program>
-    {
-        protected override void ConfigureWebHost(IWebHostBuilder builder)
-        {
-            builder.UseEnvironment(Metabase.Program.DevelopmentEnvironment);
-        }
-
-        protected override IHost CreateHost(IHostBuilder builder)
-        {
-            builder.UseSerilog((context, services, configuration) =>
-            {
-                configuration
-                    .ReadFrom.Configuration(context.Configuration) // appsettings.test.json
-                    .WriteTo.NUnitOutput(formatProvider: CultureInfo.InvariantCulture);
-            });
-            return base.CreateHost(builder);
-        }
-    }
-
-    private bool _disposed;
-    private CustomWebApplicationFactory Factory { get; }
-
-    public DatabaseSchemaTests()
+    /// <summary>
+    /// Compare the database schema wanted by `ApplicationDbContext` to the
+    /// database schema constructed by `./database.mk create migrate`. The
+    /// former is the database schema that matches the domain model and the
+    /// latter is the actual database schema being used. They can get
+    /// out-of-sync if manual changes to `migrate.sql` introduce
+    /// inconsistencies or if changes to the domain model were made but no
+    /// `make migration NAME=...` run yet.
+    ///
+    /// Do not use
+    /// [`EfCore.SchemaCompare`](https://github.com/JonPSmith/EfCore.SchemaCompare)
+    /// to reverse-engineer the domain model from the PostgreSQL database schema
+    /// and compare it with the actual one because of its
+    /// [limitations](https://github.com/JonPSmith/EfCore.SchemaCompare#List-of-limitations).
+    /// An alternative to
+    /// [`pg-schema-diff`](https://github.com/stripe/pg-schema-diff)
+    /// it
+    /// [`liquibase diff`](https://docs.liquibase.com/community/reference-guide-5-0-3/database-inspection-change-tracking-and-utility-commands/diff)
+    /// which can be used as follows
+    /// ```
+    /// liquibase diff \
+    ///    --url="jdbc:postgresql://database:5432/xbase" --username="postgres" --password="postgres" --default-schema-name="metabase" \
+    ///    --reference-url="jdbc:postgresql://database:5432/test" --reference-username="postgres" --reference-password="postgres" --reference-default-schema-name="metabase"
+    /// ```
+    /// and installed as explained on
+    /// [Install Liquibase on Linux with Debian or Ubuntu](https://docs.liquibase.com/community/get-started-5-0-3/install-liquibase-on-linux-with-debian-or-ubuntu)
+    /// </summary>
+    [Test]
+    public async Task EnsureDomainModelMatchesDatabaseSchema()
     {
-        Factory = new CustomWebApplicationFactory();
+        // Arrange
+        var cancellationToken = TestContext.CurrentContext.CancellationToken;
+        var migrateSqlBasedDatabaseName = Guid.NewGuid().ToString().Replace("-", "");
+        await ExecuteSqlScriptAsync(
+            AppSettings.Database.ConnectionString(),
+            $"""CREATE DATABASE "{migrateSqlBasedDatabaseName}";""",
+            cancellationToken
+        );
+        await ExecuteSqlScriptAsync(
+            AppSettings.Database.ConnectionString(migrateSqlBasedDatabaseName),
+            // the current directory, that is, `./`, is `/home/me/app/test/bin/Debug/net*.0/`
+            await ReadSqlScriptAsync(Path.Combine("..", "..", "..", "..", "src", "Migrations", "migrate.sql"), cancellationToken),
+            cancellationToken
+        );
+        // Act
+        var differenceResponse = await ExecuteCommandAsync(
+            $"""
+            pg-schema-diff plan \
+                --from-dsn "postgres://{AppSettings.Database.UserName}:{AppSettings.Database.Password}@database/{AppSettings.Database.Name}?search_path={AppSettings.Database.SchemaName}" \
+                --to-dsn "postgres://{AppSettings.Database.UserName}:{AppSettings.Database.Password}@database/{migrateSqlBasedDatabaseName}?search_path={AppSettings.Database.SchemaName}"
+            """,
+            null,
+            cancellationToken
+        );
+        // Assert
+        differenceResponse.ExitCode.Should().Be(
+            0,
+            because: differenceResponse.Output + "\n" + differenceResponse.Diagnostics + "\nIf the test `EnsureMigrationsAreUpToDate` also fails, then run `make migration NAME='...' in the shell `./docker.mk shell SERVICE=backend`. Otherwise, most probably, manual changes to ./migrate.sql introduced inconsistencies: Resolve them by creating an empty migration with `make migration NAME='...' in the shell `./docker.mk shell SERVICE=backend` and adapting the 4 files in ./backend/src/Migrations as needed."
+        );
     }
 
-    public void Dispose()
+    private static Task<string> ReadSqlScriptAsync(
+        string scriptPath,
+        CancellationToken cancellationToken
+    )
     {
-        // Dispose of unmanaged resources.
-        Dispose(true);
-        GC.SuppressFinalize(this);
+        var absoluteScriptPath = Path.GetFullPath(scriptPath);
+        if (!File.Exists(absoluteScriptPath))
+        {
+            throw new FileNotFoundException($"The script file was not found at: {absoluteScriptPath}");
+        }
+        return File.ReadAllTextAsync(absoluteScriptPath, cancellationToken);
     }
 
-    // https://docs.microsoft.com/en-us/dotnet/standard/managed-code
-    // https://docs.microsoft.com/en-us/dotnet/standard/garbage-collection/implementing-dispose
-    ~DatabaseSchemaTests()
+    private static async Task ExecuteSqlScriptAsync(
+        string connectionString,
+        string script,
+        CancellationToken cancellationToken
+    )
     {
-        Dispose(false);
+        await using var connection = new NpgsqlConnection(connectionString);
+        await connection.OpenAsync(cancellationToken);
+        // If necessary, the transactions can be started and committed within the script.
+        // await using var transaction = await connection.BeginTransactionAsync(cancellationToken);
+        try
+        {
+            await using var command = new NpgsqlCommand(script, connection); // , transaction
+            await command.ExecuteNonQueryAsync(cancellationToken);
+            // await transaction.CommitAsync(cancellationToken);
+        }
+        catch
+        {
+            // await transaction.RollbackAsync(cancellationToken);
+            throw;
+        }
     }
 
-    public void Dispose(bool disposing)
+    private static async Task<(int ExitCode, string Output, string Diagnostics)> ExecuteCommandAsync(
+        string command,
+        string? input,
+        CancellationToken cancellationToken
+    )
     {
-        if (!_disposed)
-        {
-            if (disposing)
+        var process = Process.Start(
+            new ProcessStartInfo()
             {
-                Factory.Dispose();
+                FileName = "bash",
+                ArgumentList = {
+                    "-o", "errexit",
+                    "-o", "errtrace",
+                    "-o", "nounset",
+                    "-o", "pipefail",
+                    "-c", command
+                },
+                ErrorDialog = false,
+                UseShellExecute = false,
+                CreateNoWindow = true,
+                RedirectStandardInput = true,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
             }
-            _disposed = true;
+        ) ?? throw new InvalidOperationException($"The process for command '{command}' with the input '{input}' failed to start.");
+        if (input is not null)
+        {
+            await process.StandardInput.WriteLineAsync(input.AsMemory(), cancellationToken);
+            await process.StandardInput.FlushAsync(cancellationToken);
         }
-    }
-
-    // For a list of limitations see https://github.com/JonPSmith/EfCore.SchemaCompare#List-of-limitations
-    [Test]
-    public void EnsureDomainModelMatchesDatabaseSchema()
-    {
-        // Arrange
-        using var scope = Factory.Services.CreateScope();
-        var appSettings = scope.ServiceProvider.GetRequiredService<AppSettings>();
-        var databaseContext = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
-        var connectionString = databaseContext.Database.GetConnectionString() + $";Password={appSettings.Database.Password}";
-        var comparer = new CompareEfSql();
-        // Act
-        // Compare C# domain model with PostgreSQL database schema, that is,
-        // compare EntityFramework Core model of the database with the database
-        // that the database context's connection points to.
-        var hasErrors = comparer.CompareEfWithDb(connectionString, databaseContext);
-        // Assert
-        hasErrors.Should().BeFalse(comparer.GetAllErrors);
+        process.StandardInput.Close();
+        var output = await process.StandardOutput.ReadToEndAsync(cancellationToken);
+        var diagnostics = await process.StandardError.ReadToEndAsync(cancellationToken);
+        await process.WaitForExitAsync(cancellationToken);
+        return (process.ExitCode, output, diagnostics);
     }
 }
\ No newline at end of file
diff --git a/backend/test/Integration/MigrationTests.cs b/backend/test/Integration/MigrationTests.cs
index feb28a1c9..f41d02a2b 100644
--- a/backend/test/Integration/MigrationTests.cs
+++ b/backend/test/Integration/MigrationTests.cs
@@ -14,7 +14,14 @@ namespace Metabase.Tests.Integration;
 public sealed class MigrationTests
     : IntegrationTests
 {
-    // Inspired by https://www.meziantou.net/detect-missing-migrations-in-entity-framework-core.htm
+    /// <summary>
+    /// Compare the database snapshot `ApplicationDbContextModelSnapshot.cs`
+    /// with the database schema wanted by `ApplicationDbContext`. If they are
+    /// out-of-sync, then `make migration NAME=...` creates a migration and
+    /// updates the snapshot.
+    ///
+    /// Inspired by https://www.meziantou.net/detect-missing-migrations-in-entity-framework-core.htm
+    /// </summary>
     [Test]
     public Task EnsureMigrationsAreUpToDate()
     {
diff --git a/database.mk b/database.mk
index fd2b5ead1..23ec8cb04 100755
--- a/database.mk
+++ b/database.mk
@@ -85,7 +85,7 @@ sql : ## Run the SQL script in the file `${SCRIPT}` in the database service, for
 .PHONY : sql
 
 migrate : SCRIPT = ./backend/src/Migrations/migrate.sql
-migrate : ## Migrate database  by running the idempotent SQL script ./backend/src/Migrations/migrate.sql
+migrate : ## Migrate database by running the idempotent SQL script ./backend/src/Migrations/migrate.sql
 	$(MAKE) --file="${SELF}" sql SCRIPT="${SCRIPT}"
 	docker compose restart \
 		--no-deps \
diff --git a/frontend/components/methods/AppliedMethodView.tsx b/frontend/components/methods/AppliedMethodView.tsx
index 3fc46adfb..895b3be7e 100644
--- a/frontend/components/methods/AppliedMethodView.tsx
+++ b/frontend/components/methods/AppliedMethodView.tsx
@@ -7,7 +7,6 @@ import {
   AppliedMethodPartialFragment,
   ToTreeVertexAppliedConversionMethodPartialFragment,
 } from "../../queries/data.generated";
-import DateTimeX from "../DateTimeX";
 
 const nameFallback = (id: Scalars["Uuid"]["output"]) => ({
   uuid: id,
@@ -55,7 +54,7 @@ export default function AppliedMethodView({
                 <EntityLink
                   entity={{
                     uuid: item.value.dataId,
-                    name: `data ${item.value.dataId} in database ${item.value.database?.name ?? item.value.databaseId} at timestamp ${(<DateTimeX value={item.value.dataTimestamp} />)}`,
+                    name: `data ${item.value.dataId} in database ${item.value.database?.name ?? item.value.databaseId} at timestamp ${item.value.dataTimestamp}`,
                   }}
                   route={(id) =>
                     paths.data(item.value.databaseId, item.value.dataKind, id)

From 7fc8f4eca9c85bd807c221c6fb8a7589e63d563a Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Thu, 25 Jun 2026 18:44:46 +0200
Subject: [PATCH 123/145] Do not let apt autoremove (because it removes GnuPG)

---
 backend/Dockerfile.development | 2 --
 backend/Makefile               | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/backend/Dockerfile.development b/backend/Dockerfile.development
index 3d668f18c..1f0628a7f 100644
--- a/backend/Dockerfile.development
+++ b/backend/Dockerfile.development
@@ -161,8 +161,6 @@ RUN \
   apt-get purge \
   --assume-yes \
   golang-go && \
-  apt-get autoremove \
-  --assume-yes && \
   rm \
   --recursive \
   --force \
diff --git a/backend/Makefile b/backend/Makefile
index 6ded57355..fc0f80c78 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -172,8 +172,7 @@ dedup : ## Dedeuplicate code lines matching the pattern `${PATTERN}`, for exampl
 .PHONY : dedup
 
 check-database : ## Check whether there have been any model changes made since the last migration was added and whether the C# domain model matches the PostgreSQL database schema
-	$(MAKE) test ARGS='--filter "FullyQualifiedName~EnsureMigrationsAreUpToDate"'
-	$(MAKE) test ARGS='--filter "FullyQualifiedName~EnsureDomainModelMatchesDatabaseSchema"'
+	$(MAKE) test ARGS='--filter "FullyQualifiedName~EnsureMigrationsAreUpToDate|FullyQualifiedName~EnsureDomainModelMatchesDatabaseSchema"'
 .PHONY : check-database
 
 has-pending-model-changes : ## Check whether there have been any model changes made since the last migration was added

From c21407babc8e73df0d73c4454bb51146bf17eed9 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 26 Jun 2026 13:51:20 +0200
Subject: [PATCH 124/145] Use 100 as default and max page size and use 99 only
 for the default and max page size over data from multiple databases (see the
 comments in `GetAllDataAsync.GetAllDataAsync` for details)

---
 .../CalorimetricDataQueries.cs                |  8 ++++
 .../src/GraphQl/Components/ComponentType.cs   | 43 +++++++++++++++++++
 .../GraphQl/Databases/DatabaseResolvers.cs    | 43 +++++++++++++++++++
 .../GeometricDataX/GeometricDataQueries.cs    | 10 ++++-
 backend/src/GraphQl/GraphQlConstants.cs       |  2 +-
 .../HygrothermalDataQueries.cs                | 10 ++++-
 .../LifeCycleDataX/LifeCycleDataQueries.cs    | 10 ++++-
 .../OpticalDataX/OpticalComponentSubtype.cs   | 31 ++++++-------
 .../OpticalDataX/OpticalDataQueries.cs        | 10 ++++-
 .../PhotovoltaicDataQueries.cs                | 10 ++++-
 backend/src/GraphQl/Requests/DataQueries.cs   | 26 ++++++++---
 11 files changed, 176 insertions(+), 27 deletions(-)

diff --git a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs
index 268d45ac9..f1c2df27f 100644
--- a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs
+++ b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
@@ -39,6 +40,13 @@ CancellationToken cancellationToken
         );
     }
 
+    [ListSize(
+        AssumedSize = (int)GraphQlConstants.MaximumPageSize - 1,
+        SlicingArguments = ["first", "last"],
+        SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize - 1,
+        SizedFields = ["edges", "nodes"],
+        RequireOneSlicingArgument = false
+    )]
     public Task<CalorimetricDataConnection> GetAllCalorimetricDataAsync(
         CalorimetricDataPropositionInput? where,
         string? locale,
diff --git a/backend/src/GraphQl/Components/ComponentType.cs b/backend/src/GraphQl/Components/ComponentType.cs
index ff112c958..9e8146f6e 100644
--- a/backend/src/GraphQl/Components/ComponentType.cs
+++ b/backend/src/GraphQl/Components/ComponentType.cs
@@ -18,6 +18,7 @@
 using Metabase.GraphQl.Scalars;
 using Metabase.GraphQl.Users;
 using Metabase.GraphQl.Requests;
+using HotChocolate.CostAnalysis.Types;
 
 namespace Metabase.GraphQl.Components;
 
@@ -190,6 +191,13 @@ private sealed class ComponentResolvers(
         DataQueries dataQueries
     )
     {
+        [ListSize(
+            AssumedSize = (int)GraphQlConstants.MaximumPageSize - 1,
+            SlicingArguments = ["first", "last"],
+            SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize - 1,
+            SizedFields = ["edges", "nodes"],
+            RequireOneSlicingArgument = false
+        )]
         public Task<CalorimetricDataConnection> GetAllCalorimetricDataAsync(
             [Parent] Component component,
             CalorimetricDataPropositionInput? where,
@@ -236,6 +244,13 @@ CalorimetricDataPropositionInput.Empty with
             );
         }
 
+        [ListSize(
+            AssumedSize = (int)GraphQlConstants.MaximumPageSize - 1,
+            SlicingArguments = ["first", "last"],
+            SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize - 1,
+            SizedFields = ["edges", "nodes"],
+            RequireOneSlicingArgument = false
+        )]
         public Task<GeometricDataConnection> GetAllGeometricDataAsync(
             [Parent] Component component,
             GeometricDataPropositionInput? where,
@@ -282,6 +297,13 @@ GeometricDataPropositionInput.Empty with
             );
         }
 
+        [ListSize(
+            AssumedSize = (int)GraphQlConstants.MaximumPageSize - 1,
+            SlicingArguments = ["first", "last"],
+            SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize - 1,
+            SizedFields = ["edges", "nodes"],
+            RequireOneSlicingArgument = false
+        )]
         public Task<HygrothermalDataConnection> GetAllHygrothermalDataAsync(
             [Parent] Component component,
             HygrothermalDataPropositionInput? where,
@@ -328,6 +350,13 @@ HygrothermalDataPropositionInput.Empty with
             );
         }
 
+        [ListSize(
+            AssumedSize = (int)GraphQlConstants.MaximumPageSize - 1,
+            SlicingArguments = ["first", "last"],
+            SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize - 1,
+            SizedFields = ["edges", "nodes"],
+            RequireOneSlicingArgument = false
+        )]
         public Task<LifeCycleDataConnection> GetAllLifeCycleDataAsync(
             [Parent] Component component,
             LifeCycleDataPropositionInput? where,
@@ -374,6 +403,13 @@ LifeCycleDataPropositionInput.Empty with
             );
         }
 
+        [ListSize(
+            AssumedSize = (int)GraphQlConstants.MaximumPageSize - 1,
+            SlicingArguments = ["first", "last"],
+            SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize - 1,
+            SizedFields = ["edges", "nodes"],
+            RequireOneSlicingArgument = false
+        )]
         public Task<OpticalDataConnection> GetAllOpticalDataAsync(
             [Parent] Component component,
             OpticalDataPropositionInput? where,
@@ -420,6 +456,13 @@ OpticalDataPropositionInput.Empty with
             );
         }
 
+        [ListSize(
+            AssumedSize = (int)GraphQlConstants.MaximumPageSize - 1,
+            SlicingArguments = ["first", "last"],
+            SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize - 1,
+            SizedFields = ["edges", "nodes"],
+            RequireOneSlicingArgument = false
+        )]
         public Task<PhotovoltaicDataConnection> GetAllPhotovoltaicDataAsync(
             [Parent] Component component,
             PhotovoltaicDataPropositionInput? where,
diff --git a/backend/src/GraphQl/Databases/DatabaseResolvers.cs b/backend/src/GraphQl/Databases/DatabaseResolvers.cs
index f23daf4ad..a9e2e4288 100644
--- a/backend/src/GraphQl/Databases/DatabaseResolvers.cs
+++ b/backend/src/GraphQl/Databases/DatabaseResolvers.cs
@@ -3,6 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using HotChocolate;
+using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Resolvers;
 using Metabase.Authorization;
 using Metabase.Data;
@@ -132,6 +133,13 @@ CancellationToken cancellationToken
         return dataQueries.GetPhotovoltaicDataAsync(database, id, locale, resolverContext, cancellationToken);
     }
 
+    [ListSize(
+        AssumedSize = (int)GraphQlConstants.MaximumPageSize,
+        SlicingArguments = ["first", "last"],
+        SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize,
+        SizedFields = ["edges", "nodes"],
+        RequireOneSlicingArgument = false
+    )]
     public Task<CalorimetricDataConnection?> GetAllCalorimetricDataAsync(
         [Parent] Database database,
         CalorimetricDataPropositionInput? where,
@@ -147,6 +155,13 @@ CancellationToken cancellationToken
         return dataQueries.GetAllCalorimetricDataAsync(database, where, locale, first, after, last, before, resolverContext, cancellationToken);
     }
 
+    [ListSize(
+        AssumedSize = (int)GraphQlConstants.MaximumPageSize,
+        SlicingArguments = ["first", "last"],
+        SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize,
+        SizedFields = ["edges", "nodes"],
+        RequireOneSlicingArgument = false
+    )]
     public Task<GeometricDataConnection?> GetAllGeometricDataAsync(
         [Parent] Database database,
         GeometricDataPropositionInput? where,
@@ -162,6 +177,13 @@ CancellationToken cancellationToken
         return dataQueries.GetAllGeometricDataAsync(database, where, locale, first, after, last, before, resolverContext, cancellationToken);
     }
 
+    [ListSize(
+        AssumedSize = (int)GraphQlConstants.MaximumPageSize,
+        SlicingArguments = ["first", "last"],
+        SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize,
+        SizedFields = ["edges", "nodes"],
+        RequireOneSlicingArgument = false
+    )]
     public Task<HygrothermalDataConnection?> GetAllHygrothermalDataAsync(
         [Parent] Database database,
         HygrothermalDataPropositionInput? where,
@@ -177,6 +199,13 @@ CancellationToken cancellationToken
         return dataQueries.GetAllHygrothermalDataAsync(database, where, locale, first, after, last, before, resolverContext, cancellationToken);
     }
 
+    [ListSize(
+        AssumedSize = (int)GraphQlConstants.MaximumPageSize,
+        SlicingArguments = ["first", "last"],
+        SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize,
+        SizedFields = ["edges", "nodes"],
+        RequireOneSlicingArgument = false
+    )]
     public Task<LifeCycleDataConnection?> GetAllLifeCycleDataAsync(
         [Parent] Database database,
         LifeCycleDataPropositionInput? where,
@@ -192,6 +221,13 @@ CancellationToken cancellationToken
         return dataQueries.GetAllLifeCycleDataAsync(database, where, locale, first, after, last, before, resolverContext, cancellationToken);
     }
 
+    [ListSize(
+        AssumedSize = (int)GraphQlConstants.MaximumPageSize,
+        SlicingArguments = ["first", "last"],
+        SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize,
+        SizedFields = ["edges", "nodes"],
+        RequireOneSlicingArgument = false
+    )]
     public Task<OpticalDataConnection?> GetAllOpticalDataAsync(
         [Parent] Database database,
         OpticalDataPropositionInput? where,
@@ -207,6 +243,13 @@ CancellationToken cancellationToken
         return dataQueries.GetAllOpticalDataAsync(database, where, locale, first, after, last, before, resolverContext, cancellationToken);
     }
 
+    [ListSize(
+        AssumedSize = (int)GraphQlConstants.MaximumPageSize,
+        SlicingArguments = ["first", "last"],
+        SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize,
+        SizedFields = ["edges", "nodes"],
+        RequireOneSlicingArgument = false
+    )]
     public Task<PhotovoltaicDataConnection?> GetAllPhotovoltaicDataAsync(
         [Parent] Database database,
         PhotovoltaicDataPropositionInput? where,
diff --git a/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs b/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs
index fc880de72..30f0a8e8f 100644
--- a/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs
+++ b/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
@@ -39,6 +40,13 @@ CancellationToken cancellationToken
         );
     }
 
+    [ListSize(
+        AssumedSize = (int)GraphQlConstants.MaximumPageSize - 1,
+        SlicingArguments = ["first", "last"],
+        SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize - 1,
+        SizedFields = ["edges", "nodes"],
+        RequireOneSlicingArgument = false
+    )]
     public Task<GeometricDataConnection> GetAllGeometricDataAsync(
         GeometricDataPropositionInput? where,
         string? locale,
@@ -92,4 +100,4 @@ CancellationToken cancellationToken
             cancellationToken
         );
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/GraphQlConstants.cs b/backend/src/GraphQl/GraphQlConstants.cs
index 653b5c512..77b41e2cf 100644
--- a/backend/src/GraphQl/GraphQlConstants.cs
+++ b/backend/src/GraphQl/GraphQlConstants.cs
@@ -2,7 +2,7 @@ namespace Metabase.GraphQl;
 
 internal static class GraphQlConstants
 {
-    internal const uint MaximumPageSize = 99;
+    internal const uint MaximumPageSize = 100;
     internal const string EndpointPath = "/graphql";
     internal const string CorsPolicy = "GraphQlCorsPolicy";
     internal const string TypeDiscriminatorPropertyName = "__typename";
diff --git a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs
index de47e47bb..d661d7c26 100644
--- a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs
+++ b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
@@ -39,6 +40,13 @@ CancellationToken cancellationToken
         );
     }
 
+    [ListSize(
+        AssumedSize = (int)GraphQlConstants.MaximumPageSize - 1,
+        SlicingArguments = ["first", "last"],
+        SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize - 1,
+        SizedFields = ["edges", "nodes"],
+        RequireOneSlicingArgument = false
+    )]
     public Task<HygrothermalDataConnection> GetAllHygrothermalDataAsync(
         HygrothermalDataPropositionInput? where,
         string? locale,
@@ -92,4 +100,4 @@ CancellationToken cancellationToken
             cancellationToken
         );
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs
index 9378917c1..e91b21ab3 100644
--- a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs
+++ b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
@@ -39,6 +40,13 @@ CancellationToken cancellationToken
         );
     }
 
+    [ListSize(
+        AssumedSize = (int)GraphQlConstants.MaximumPageSize - 1,
+        SlicingArguments = ["first", "last"],
+        SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize - 1,
+        SizedFields = ["edges", "nodes"],
+        RequireOneSlicingArgument = false
+    )]
     public Task<LifeCycleDataConnection> GetAllLifeCycleDataAsync(
         LifeCycleDataPropositionInput? where,
         string? locale,
@@ -92,4 +100,4 @@ CancellationToken cancellationToken
             cancellationToken
         );
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtype.cs b/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtype.cs
index 05bc892ea..1c3a5457f 100644
--- a/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtype.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtype.cs
@@ -5,26 +5,27 @@ namespace Metabase.GraphQl.OpticalDataX;
 [SuppressMessage("Naming", "CA1707")]
 public enum OpticalComponentSubtype
 {
-    MONOLITHIC,
-    LAMINATE,
-    INTERLAYER,
-    EMBEDDED_COATING,
+    ACID_ETCHED_GLASS,
+    APPLIED_FILM,
+    CELLULAR_SHADE,
+    CHROMOGENIC,
     COATED,
     COATING,
-    APPLIED_FILM,
-    FILM,
-    VENETIAN_BLIND,
     DIFFUSING_SHADE,
-    ROLLER_SHADE,
-    WOVEN_SHADE,
-    VERTICAL_LOUVER,
+    EMBEDDED_COATING,
+    FILM,
+    FRITTED_GLASS,
+    INTERLAYER,
+    LAMINATE,
+    MONOLITHIC,
     PERFORATED_SCREEN,
-    CELLULAR_SHADE,
     PLEATED_SHADE,
+    ROLLER_SHADE,
     ROMAN_SHADE,
-    SHADE_MATERIAL,
-    FRITTED_GLASS,
-    ACID_ETCHED_GLASS,
     SANDBLASTED_GLASS,
-    CHROMOGENIC
+    SHADE_MATERIAL,
+    SOLAR_SCREEN,
+    VENETIAN_BLIND,
+    VERTICAL_LOUVER,
+    WOVEN_SHADE
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs b/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs
index 5ae79a7ef..b5916dc3f 100644
--- a/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
@@ -39,6 +40,13 @@ CancellationToken cancellationToken
         );
     }
 
+    [ListSize(
+        AssumedSize = (int)GraphQlConstants.MaximumPageSize - 1,
+        SlicingArguments = ["first", "last"],
+        SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize - 1,
+        SizedFields = ["edges", "nodes"],
+        RequireOneSlicingArgument = false
+    )]
     public Task<OpticalDataConnection> GetAllOpticalDataAsync(
         OpticalDataPropositionInput? where,
         string? locale,
@@ -92,4 +100,4 @@ CancellationToken cancellationToken
             cancellationToken
         );
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs
index cb326d8ab..927dddfb1 100644
--- a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs
+++ b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
@@ -39,6 +40,13 @@ CancellationToken cancellationToken
         );
     }
 
+    [ListSize(
+        AssumedSize = (int)GraphQlConstants.MaximumPageSize - 1,
+        SlicingArguments = ["first", "last"],
+        SlicingArgumentDefaultValue = (int)GraphQlConstants.MaximumPageSize - 1,
+        SizedFields = ["edges", "nodes"],
+        RequireOneSlicingArgument = false
+    )]
     public Task<PhotovoltaicDataConnection> GetAllPhotovoltaicDataAsync(
         PhotovoltaicDataPropositionInput? where,
         string? locale,
@@ -92,4 +100,4 @@ CancellationToken cancellationToken
             cancellationToken
         );
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/Requests/DataQueries.cs b/backend/src/GraphQl/Requests/DataQueries.cs
index 360534d9c..b93be9bdd 100644
--- a/backend/src/GraphQl/Requests/DataQueries.cs
+++ b/backend/src/GraphQl/Requests/DataQueries.cs
@@ -235,6 +235,10 @@ private enum PaginationDirection
         BACKWARD
     }
 
+    /// <summary>
+    /// The maximum and default page size is 99, that is 1 less than the
+    /// maximum page size of product-data databases.
+    /// </summary>
     public async Task<TDataConnection> GetAllDataAsync<TDataConnection, TDataEdge, TDataNode>(
         int? first,
         string? after,
@@ -281,14 +285,18 @@ paginationDirection is PaginationDirection.FORWARD
         var rotatedDatabases = databases
             .IfList(paginationDirection is PaginationDirection.BACKWARD, _ => _.ToReversed())
             .IfList(beginAfterDatabaseId is not null, _ => _.Rotate(_ => _.Id == beginAfterDatabaseId!));
-        // fetch data from the databases concurrently leaving the order intact
+        // fetch data from the databases concurrently leaving the order intact.
+        // Ask for 1 more node after and/or before the last or first requested
+        // node; it/they is/are needed to construct the compound cursor of the
+        // last or first node. Do not ask for more nodes though than the
+        // maximum page size of the databases.
         var connections = await Task.WhenAll(
             rotatedDatabases.Select((database) =>
                 getAllDataAsync(
                     database,
-                    first is null ? null : first + 1,
+                    first is null ? null : Math.Min((int)first + 1, (int)GraphQlConstants.MaximumPageSize),
                     compoundAfter?.Cursors.GetValueOrDefault(database.Id)?.Before,
-                    last is null ? null : last + 1,
+                    last is null ? null : Math.Min((int)last + 1, (int)GraphQlConstants.MaximumPageSize),
                     compoundBefore?.Cursors.GetValueOrDefault(database.Id)?.After
                 )
             )
@@ -432,9 +440,15 @@ paginationDirection is PaginationDirection.FORWARD
                 // undo the reversal of the edges above
                 .Reverse()
                 .ToList();
-        // clamp the edges taking only the first `first` and the last `last` (or the maximum page size)
-        var cappedFirst = (int)Math.Min(first ?? (int)GraphQlConstants.MaximumPageSize, GraphQlConstants.MaximumPageSize);
-        var cappedLast = (int)Math.Min(last ?? (int)GraphQlConstants.MaximumPageSize, GraphQlConstants.MaximumPageSize);
+        // clamp the edges taking only the first `first` and the last `last`
+        // (or the maximum page size minus 1). Before we fetched 1 more than
+        // `first` and/or `last` (for compound cursor construction) and at most
+        // `GraphQlConstants.MaximumPageSize` (to not exceed the max allowed)
+        // nodes from databases. The additional node(s) do(es) not have a
+        // usable compound cursor and must not be included in the final result.
+        // Therefore, we cap at max minus 1, which is 99, instead of at 100.
+        var cappedFirst = Math.Min(first ?? (int)GraphQlConstants.MaximumPageSize - 1, (int)GraphQlConstants.MaximumPageSize - 1);
+        var cappedLast = Math.Min(last ?? (int)GraphQlConstants.MaximumPageSize - 1, (int)GraphQlConstants.MaximumPageSize - 1);
         var clampedEdges =
             ((first, last) switch
             {

From 299aa36442af7efee7d885ab4b0e17e01653de18 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 26 Jun 2026 14:16:01 +0200
Subject: [PATCH 125/145] Show error information when data loading failed with
 refetch possibility

---
 frontend/components/components/Component.tsx | 38 +++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/frontend/components/components/Component.tsx b/frontend/components/components/Component.tsx
index f947a9d83..dc688a121 100644
--- a/frontend/components/components/Component.tsx
+++ b/frontend/components/components/Component.tsx
@@ -5,7 +5,7 @@ import {
   ComponentDataTotalCountsPartialFragment,
   ComponentDocument,
 } from "../../queries/components.generated";
-import { Skeleton, Result, Card, Divider } from "antd";
+import { Skeleton, Result, Card, Divider, Button } from "antd";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import ComponentSummary from "./ComponentSummary";
 import QueryToolbar from "../QueryToolbar";
@@ -90,17 +90,18 @@ export default function Component({ componentId }: ComponentProps) {
   const queryVariables = {
     id: componentId,
   };
-  const { loading, error, data } = useQuery(ComponentDocument, {
+  const { loading, error, data, refetch } = useQuery(ComponentDocument, {
     variables: queryVariables,
   });
   useQueryHandler({ error });
 
-  const { data: dataTotalCountsData } = useQuery(
-    ComponentDataTotalCountsDocument,
-    {
-      variables: queryVariables,
-    },
-  );
+  const {
+    loading: totalCountsLoading,
+    data: dataTotalCountsData,
+    refetch: totalCountsRefetch,
+  } = useQuery(ComponentDataTotalCountsDocument, {
+    variables: queryVariables,
+  });
 
   const component = data?.component;
   const dataTotalCounts = dataTotalCountsData?.component;
@@ -123,6 +124,11 @@ export default function Component({ componentId }: ComponentProps) {
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
@@ -134,8 +140,22 @@ export default function Component({ componentId }: ComponentProps) {
       </Card>
       <QueryToolbar query={ComponentDocument} variables={queryVariables} />
       <Divider />
-      {dataTabs == null ? (
+      {totalCountsLoading ? (
         <Skeleton active avatar title />
+      ) : dataTabs == null ? (
+        <Result
+          status="error"
+          title="Data Loading Failed"
+          subTitle="Could not load associated data from databases."
+          extra={
+            <Button
+              loading={totalCountsLoading}
+              onClick={() => totalCountsRefetch()}
+            >
+              Reload
+            </Button>
+          }
+        />
       ) : (
         <LazyTabs items={dataTabs} />
       )}

From a7cf3e91656f857b84dbb10c145f0a32e3e9835a Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 26 Jun 2026 14:16:17 +0200
Subject: [PATCH 126/145] Add reload button to error result

---
 .../data/calorimetric/CalorimetricData.tsx       |  9 +++++++--
 .../components/data/geometric/GeometricData.tsx  |  9 +++++++--
 .../data/hygrothermal/HygrothermalData.tsx       |  9 +++++++--
 .../components/data/lifeCycle/LifeCycleData.tsx  |  9 +++++++--
 frontend/components/data/optical/OpticalData.tsx |  9 +++++++--
 .../data/photovoltaic/PhotovoltaicData.tsx       |  9 +++++++--
 frontend/components/dataFormats/DataFormat.tsx   |  9 +++++++--
 frontend/components/databases/Database.tsx       |  9 +++++++--
 frontend/components/gnuPgKeys/GnuPgKey.tsx       | 16 ++++++++++++----
 frontend/components/institutions/Institution.tsx |  9 +++++++--
 frontend/components/methods/Method.tsx           |  9 +++++++--
 .../applications/OpenIdConnectApplication.tsx    |  9 +++++++--
 frontend/components/users/User.tsx               |  9 +++++++--
 .../me/manage/two-factor-authentication.tsx      | 11 +++++++++--
 frontend/queries/components.graphql              |  1 +
 15 files changed, 106 insertions(+), 30 deletions(-)

diff --git a/frontend/components/data/calorimetric/CalorimetricData.tsx b/frontend/components/data/calorimetric/CalorimetricData.tsx
index 744a4bdc5..1e1e65f64 100644
--- a/frontend/components/data/calorimetric/CalorimetricData.tsx
+++ b/frontend/components/data/calorimetric/CalorimetricData.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../../__generated__/graphql";
 import { CalorimetricDataDocument } from "../../../queries/data.generated";
-import { Skeleton, Result, Card } from "antd";
+import { Skeleton, Result, Card, Button } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
 import CalorimetricDataSummary from "./CalorimetricDataSummary";
@@ -19,7 +19,7 @@ export default function CalorimetricData({
     databaseId: databaseId,
     id: id,
   };
-  const { loading, error, data } = useQuery(CalorimetricDataDocument, {
+  const { loading, error, data, refetch } = useQuery(CalorimetricDataDocument, {
     variables: queryVariables,
   });
   useQueryHandler({ error });
@@ -35,6 +35,11 @@ export default function CalorimetricData({
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
diff --git a/frontend/components/data/geometric/GeometricData.tsx b/frontend/components/data/geometric/GeometricData.tsx
index 60eaec772..6f51f5261 100644
--- a/frontend/components/data/geometric/GeometricData.tsx
+++ b/frontend/components/data/geometric/GeometricData.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../../__generated__/graphql";
 import { GeometricDataDocument } from "../../../queries/data.generated";
-import { Skeleton, Result, Card } from "antd";
+import { Skeleton, Result, Card, Button } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
 import GeometricDataSummary from "./GeometricDataSummary";
@@ -16,7 +16,7 @@ export default function GeometricData({ databaseId, id }: GeometricDataProps) {
     databaseId: databaseId,
     id: id,
   };
-  const { loading, error, data } = useQuery(GeometricDataDocument, {
+  const { loading, error, data, refetch } = useQuery(GeometricDataDocument, {
     variables: queryVariables,
   });
   useQueryHandler({ error });
@@ -32,6 +32,11 @@ export default function GeometricData({ databaseId, id }: GeometricDataProps) {
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
diff --git a/frontend/components/data/hygrothermal/HygrothermalData.tsx b/frontend/components/data/hygrothermal/HygrothermalData.tsx
index aaaf43335..8b865d1d1 100644
--- a/frontend/components/data/hygrothermal/HygrothermalData.tsx
+++ b/frontend/components/data/hygrothermal/HygrothermalData.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../../__generated__/graphql";
 import { HygrothermalDataDocument } from "../../../queries/data.generated";
-import { Skeleton, Result, Card } from "antd";
+import { Skeleton, Result, Card, Button } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
 import HygrothermalDataSummary from "./HygrothermalDataSummary";
@@ -19,7 +19,7 @@ export default function HygrothermalData({
     databaseId: databaseId,
     id: id,
   };
-  const { loading, error, data } = useQuery(HygrothermalDataDocument, {
+  const { loading, error, data, refetch } = useQuery(HygrothermalDataDocument, {
     variables: queryVariables,
   });
   useQueryHandler({ error });
@@ -35,6 +35,11 @@ export default function HygrothermalData({
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
diff --git a/frontend/components/data/lifeCycle/LifeCycleData.tsx b/frontend/components/data/lifeCycle/LifeCycleData.tsx
index fda1d4fd1..49fdc0526 100644
--- a/frontend/components/data/lifeCycle/LifeCycleData.tsx
+++ b/frontend/components/data/lifeCycle/LifeCycleData.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../../__generated__/graphql";
 import { LifeCycleDataDocument } from "../../../queries/data.generated";
-import { Skeleton, Result, Card } from "antd";
+import { Skeleton, Result, Card, Button } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
 import LifeCycleDataSummary from "./LifeCycleDataSummary";
@@ -16,7 +16,7 @@ export default function LifeCycleData({ databaseId, id }: LifeCycleDataProps) {
     databaseId: databaseId,
     id: id,
   };
-  const { loading, error, data } = useQuery(LifeCycleDataDocument, {
+  const { loading, error, data, refetch } = useQuery(LifeCycleDataDocument, {
     variables: queryVariables,
   });
   useQueryHandler({ error });
@@ -32,6 +32,11 @@ export default function LifeCycleData({ databaseId, id }: LifeCycleDataProps) {
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
diff --git a/frontend/components/data/optical/OpticalData.tsx b/frontend/components/data/optical/OpticalData.tsx
index 10b922fd1..0b8998c89 100644
--- a/frontend/components/data/optical/OpticalData.tsx
+++ b/frontend/components/data/optical/OpticalData.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../../__generated__/graphql";
 import { OpticalDataDocument } from "../../../queries/data.generated";
-import { Skeleton, Result, Card } from "antd";
+import { Skeleton, Result, Card, Button } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
 import OpticalDataSummary from "./OpticalDataSummary";
@@ -17,7 +17,7 @@ export default function OpticalData({ databaseId, id }: OpticalDataProps) {
     databaseId: databaseId,
     id: id,
   };
-  const { loading, error, data } = useQuery(OpticalDataDocument, {
+  const { loading, error, data, refetch } = useQuery(OpticalDataDocument, {
     variables: queryVariables,
   });
   useQueryHandler({ error });
@@ -33,6 +33,11 @@ export default function OpticalData({ databaseId, id }: OpticalDataProps) {
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
diff --git a/frontend/components/data/photovoltaic/PhotovoltaicData.tsx b/frontend/components/data/photovoltaic/PhotovoltaicData.tsx
index 980b59850..a9af8d3e5 100644
--- a/frontend/components/data/photovoltaic/PhotovoltaicData.tsx
+++ b/frontend/components/data/photovoltaic/PhotovoltaicData.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../../__generated__/graphql";
 import { PhotovoltaicDataDocument } from "../../../queries/data.generated";
-import { Skeleton, Result, Card } from "antd";
+import { Skeleton, Result, Card, Button } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
 import PhotovoltaicDataSummary from "./PhotovoltaicDataSummary";
@@ -19,7 +19,7 @@ export default function PhotovoltaicData({
     databaseId: databaseId,
     id: id,
   };
-  const { loading, error, data } = useQuery(PhotovoltaicDataDocument, {
+  const { loading, error, data, refetch } = useQuery(PhotovoltaicDataDocument, {
     variables: queryVariables,
   });
   useQueryHandler({ error });
@@ -35,6 +35,11 @@ export default function PhotovoltaicData({
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
diff --git a/frontend/components/dataFormats/DataFormat.tsx b/frontend/components/dataFormats/DataFormat.tsx
index 81565084b..aefb7c4c7 100644
--- a/frontend/components/dataFormats/DataFormat.tsx
+++ b/frontend/components/dataFormats/DataFormat.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../__generated__/graphql";
 import { DataFormatDocument } from "../../queries/dataFormats.generated";
-import { Skeleton, Result, Card } from "antd";
+import { Skeleton, Result, Card, Button } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import DataFormatSummary from "./DataFormatSummary";
@@ -14,7 +14,7 @@ export default function DataFormat({ dataFormatId }: DataFormatProps) {
   const queryVariables = {
     id: dataFormatId,
   };
-  const { loading, error, data } = useQuery(DataFormatDocument, {
+  const { loading, error, data, refetch } = useQuery(DataFormatDocument, {
     variables: queryVariables,
   });
   useQueryHandler({ error });
@@ -30,6 +30,11 @@ export default function DataFormat({ dataFormatId }: DataFormatProps) {
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
diff --git a/frontend/components/databases/Database.tsx b/frontend/components/databases/Database.tsx
index 317488ca3..e5bcfa634 100644
--- a/frontend/components/databases/Database.tsx
+++ b/frontend/components/databases/Database.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../__generated__/graphql";
 import { DatabaseDocument } from "../../queries/databases.generated";
-import { Skeleton, Result, Card } from "antd";
+import { Skeleton, Result, Card, Button } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import DatabaseSummary from "./DatabaseSummary";
@@ -14,7 +14,7 @@ export default function Database({ databaseId }: DatabaseProps) {
   const queryVariables = {
     id: databaseId,
   };
-  const { loading, error, data } = useQuery(DatabaseDocument, {
+  const { loading, error, data, refetch } = useQuery(DatabaseDocument, {
     variables: queryVariables,
   });
   useQueryHandler({ error });
@@ -30,6 +30,11 @@ export default function Database({ databaseId }: DatabaseProps) {
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
diff --git a/frontend/components/gnuPgKeys/GnuPgKey.tsx b/frontend/components/gnuPgKeys/GnuPgKey.tsx
index d48d64bf3..146440524 100644
--- a/frontend/components/gnuPgKeys/GnuPgKey.tsx
+++ b/frontend/components/gnuPgKeys/GnuPgKey.tsx
@@ -1,6 +1,6 @@
 import { Scalars } from "../../__generated__/graphql";
 import { GnuPgKeyFingerprintDocument } from "../../queries/gnuPgKeyFingerprints.generated";
-import { Skeleton, Result, Card } from "antd";
+import { Skeleton, Result, Card, Button } from "antd";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import GnuPgKeySummary from "./GnuPgKeySummary";
@@ -14,9 +14,12 @@ export default function GnuPgKey({ fingerprint }: GnuPgKeyProps) {
   const queryVariables = {
     fingerprint: fingerprint,
   };
-  const { loading, error, data } = useQuery(GnuPgKeyFingerprintDocument, {
-    variables: queryVariables,
-  });
+  const { loading, error, data, refetch } = useQuery(
+    GnuPgKeyFingerprintDocument,
+    {
+      variables: queryVariables,
+    },
+  );
   useQueryHandler({ error });
   const gnuPgKey = data?.gnuPgKeyFingerprint;
 
@@ -30,6 +33,11 @@ export default function GnuPgKey({ fingerprint }: GnuPgKeyProps) {
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index bf3f60a98..fa08c9588 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client/react";
-import { Divider, Typography, Skeleton, Result, Card } from "antd";
+import { Divider, Typography, Skeleton, Result, Card, Button } from "antd";
 import {
   InstitutionDocument,
   InstitutionPartialFragment,
@@ -310,7 +310,7 @@ export default function Institution({ institutionId }: Props) {
   const queryVariables = {
     id: institutionId,
   };
-  const { loading, error, data } = useQuery(InstitutionDocument, {
+  const { loading, error, data, refetch } = useQuery(InstitutionDocument, {
     variables: queryVariables,
   });
   useQueryHandler({ error });
@@ -335,6 +335,11 @@ export default function Institution({ institutionId }: Props) {
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
diff --git a/frontend/components/methods/Method.tsx b/frontend/components/methods/Method.tsx
index 7519ea3b7..b2d69c3ca 100644
--- a/frontend/components/methods/Method.tsx
+++ b/frontend/components/methods/Method.tsx
@@ -1,7 +1,7 @@
 import { useQuery } from "@apollo/client/react";
 import { Scalars } from "../../__generated__/graphql";
 import { MethodDocument } from "../../queries/methods.generated";
-import { Skeleton, Result, Card } from "antd";
+import { Skeleton, Result, Card, Button } from "antd";
 import { useQueryHandler } from "../../lib/hooks/useQueryHandler";
 import MethodSummary from "./MethodSummary";
 import QueryToolbar from "../QueryToolbar";
@@ -14,7 +14,7 @@ export default function Method({ methodId }: MethodProps) {
   const queryVariables = {
     id: methodId,
   };
-  const { loading, error, data } = useQuery(MethodDocument, {
+  const { loading, error, data, refetch } = useQuery(MethodDocument, {
     variables: queryVariables,
   });
   useQueryHandler({ error });
@@ -30,6 +30,11 @@ export default function Method({ methodId }: MethodProps) {
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
diff --git a/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx b/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
index 71d9d73e7..a4069b01d 100644
--- a/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
+++ b/frontend/components/openIdConnect/applications/OpenIdConnectApplication.tsx
@@ -1,5 +1,5 @@
 import { Scalars, SortEnumType } from "../../../__generated__/graphql";
-import { Card, Divider, Result, Skeleton } from "antd";
+import { Card, Divider, Result, Skeleton, Button } from "antd";
 import { ApplicationDocument } from "../../../queries/openIdConnect.generated";
 import { useQuery } from "@apollo/client/react";
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
@@ -17,7 +17,7 @@ export default function OpenIdConnectApplication({ applicationId }: Props) {
   const queryVariables = {
     id: applicationId,
   };
-  const { loading, error, data } = useQuery(ApplicationDocument, {
+  const { loading, error, data, refetch } = useQuery(ApplicationDocument, {
     variables: queryVariables,
   });
   useQueryHandler({ error });
@@ -33,6 +33,11 @@ export default function OpenIdConnectApplication({ applicationId }: Props) {
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
diff --git a/frontend/components/users/User.tsx b/frontend/components/users/User.tsx
index f71bb29a8..8871e3e2e 100644
--- a/frontend/components/users/User.tsx
+++ b/frontend/components/users/User.tsx
@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client/react";
-import { Skeleton, Result, Card, Typography, Divider } from "antd";
+import { Skeleton, Result, Card, Typography, Divider, Button } from "antd";
 import {
   UserDocument,
   UserPartialFragment,
@@ -52,7 +52,7 @@ export default function User({ userId }: UserProps) {
   const queryVariables = {
     id: userId,
   };
-  const { loading, error, data } = useQuery(UserDocument, {
+  const { loading, error, data, refetch } = useQuery(UserDocument, {
     variables: queryVariables,
   });
   useQueryHandler({ error });
@@ -81,6 +81,11 @@ export default function User({ userId }: UserProps) {
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
diff --git a/frontend/pages/me/manage/two-factor-authentication.tsx b/frontend/pages/me/manage/two-factor-authentication.tsx
index 706662b3e..cee895ffc 100644
--- a/frontend/pages/me/manage/two-factor-authentication.tsx
+++ b/frontend/pages/me/manage/two-factor-authentication.tsx
@@ -1,7 +1,7 @@
 import { useQuery } from "@apollo/client/react";
 import ManageLayout from "../../../components/me/ManageLayout";
 import { TwoFactorAuthenticationDocument } from "../../../queries/currentUser.generated";
-import { Alert, Result, Skeleton, Typography } from "antd";
+import { Alert, Result, Skeleton, Typography, Button } from "antd";
 import Link from "next/link";
 import paths from "../../../paths";
 import GenerateUserTwoFactorRecoveryCodes from "../../../components/me/GenerateUserTwoFactorRecoveryCodes";
@@ -11,7 +11,9 @@ import ForgetUserTwoFactorAuthenticationClient from "../../../components/me/Forg
 import { useQueryHandler } from "../../../lib/hooks/useQueryHandler";
 
 function Page() {
-  const { loading, error, data } = useQuery(TwoFactorAuthenticationDocument);
+  const { loading, error, data, refetch } = useQuery(
+    TwoFactorAuthenticationDocument,
+  );
   useQueryHandler({ error });
   const twoFactorAuthentication = data?.currentUser?.twoFactorAuthentication;
 
@@ -29,6 +31,11 @@ function Page() {
         status="500"
         title="500"
         subTitle="Sorry, something went wrong."
+        extra={
+          <Button loading={loading} onClick={() => refetch()}>
+            Reload
+          </Button>
+        }
       />
     );
   }
diff --git a/frontend/queries/components.graphql b/frontend/queries/components.graphql
index 1b30c7b5e..64f10f8a1 100644
--- a/frontend/queries/components.graphql
+++ b/frontend/queries/components.graphql
@@ -143,6 +143,7 @@ fragment ComponentPartial on Component {
 }
 
 fragment ComponentDataTotalCountsPartial on Component {
+  id
   allCalorimetricData {
     totalCount
   }

From 58585beabab4f0a161f81af8de4f71b033847f30 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 26 Jun 2026 14:39:36 +0200
Subject: [PATCH 127/145] Adapt the help target such that it does not choke on
 the character `:` when used within a target description

---
 backend/Makefile  | 2 +-
 database.mk       | 2 +-
 deploy.mk         | 2 +-
 docker.mk         | 2 +-
 forge.mk          | 2 +-
 frontend/Makefile | 2 +-
 tools.mk          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/Makefile b/backend/Makefile
index fc0f80c78..88a177e4f 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -7,7 +7,7 @@ MAKEFLAGS += --warn-undefined-variables
 
 # Taken from https://www.client9.com/self-documenting-makefiles/
 help : ## Print this help
-	@awk -F ':|##' '/^[^\t].+?:.*?##/ {\
+	@awk -F ':.*?## ' '/^[^\t].+?:.*?##/ {\
 		printf "\033[36m%-30s\033[0m %s\n", $$1, $$NF \
 	}' $(MAKEFILE_LIST)
 .PHONY : help
diff --git a/database.mk b/database.mk
index 23ec8cb04..3cdc00759 100755
--- a/database.mk
+++ b/database.mk
@@ -13,7 +13,7 @@ dump_archive_name = postgresql_dumpall.gz
 
 # Taken from https://www.client9.com/self-documenting-makefiles/
 help : ## Print this help
-	@awk -F ':|##' '/^[^\t].+?:.*?##/ {\
+	@awk -F ':.*?## ' '/^[^\t].+?:.*?##/ {\
 		printf "\033[36m%-30s\033[0m %s\n", $$1, $$NF \
 	}' $(MAKEFILE_LIST)
 .PHONY : help
diff --git a/deploy.mk b/deploy.mk
index f3772492e..9c51cf0a6 100755
--- a/deploy.mk
+++ b/deploy.mk
@@ -20,7 +20,7 @@ dotenv_linter = \
 
 # Taken from https://www.client9.com/self-documenting-makefiles/
 help : ## Print this help
-	@awk -F ':|##' '/^[^\t].+?:.*?##/ {\
+	@awk -F ':.*?## ' '/^[^\t].+?:.*?##/ {\
 		printf "\033[36m%-30s\033[0m %s\n", $$1, $$NF \
 	}' $(MAKEFILE_LIST)
 .PHONY : help
diff --git a/docker.mk b/docker.mk
index 85664436b..c7d31011c 100755
--- a/docker.mk
+++ b/docker.mk
@@ -20,7 +20,7 @@ dotenv_linter = \
 
 # Taken from https://www.client9.com/self-documenting-makefiles/
 help : ## Print this help
-	@awk -F ':|##' '/^[^\t].+?:.*?##/ {\
+	@awk -F ':.*?## ' '/^[^\t].+?:.*?##/ {\
 		printf "\033[36m%-30s\033[0m %s\n", $$1, $$NF \
 	}' $(MAKEFILE_LIST)
 .PHONY : help
diff --git a/forge.mk b/forge.mk
index f68bf0bc3..d11bb0128 100755
--- a/forge.mk
+++ b/forge.mk
@@ -10,7 +10,7 @@ TARGET = $(shell git rev-parse --verify HEAD)
 
 # Taken from https://www.client9.com/self-documenting-makefiles/
 help : ## Print this help
-	@awk -F ':|##' '/^[^\t].+?:.*?##/ {\
+	@awk -F ':.*?## ' '/^[^\t].+?:.*?##/ {\
 		printf "\033[36m%-30s\033[0m %s\n", $$1, $$NF \
 	}' $(MAKEFILE_LIST)
 .PHONY : help
diff --git a/frontend/Makefile b/frontend/Makefile
index dc30d3ac6..fda168a08 100644
--- a/frontend/Makefile
+++ b/frontend/Makefile
@@ -7,7 +7,7 @@ MAKEFLAGS += --warn-undefined-variables
 
 # Taken from https://www.client9.com/self-documenting-makefiles/
 help : ## Print this help
-	@awk -F ':|##' '/^[^\t].+?:.*?##/ {\
+	@awk -F ':.*?## ' '/^[^\t].+?:.*?##/ {\
 		printf "\033[36m%-30s\033[0m %s\n", $$1, $$NF \
 	}' $(MAKEFILE_LIST)
 .PHONY : help
diff --git a/tools.mk b/tools.mk
index c9cf16306..4a63c6257 100755
--- a/tools.mk
+++ b/tools.mk
@@ -19,7 +19,7 @@ dotenv_linter = \
 
 # Taken from https://www.client9.com/self-documenting-makefiles/
 help : ## Print this help
-	@awk -F ':|##' '/^[^\t].+?:.*?##/ {\
+	@awk -F ':.*?## ' '/^[^\t].+?:.*?##/ {\
 		printf "\033[36m%-30s\033[0m %s\n", $$1, $$NF \
 	}' $(MAKEFILE_LIST)
 .PHONY : help

From db2f2f0492780af0c83d06211f24049c3c8baba3 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 26 Jun 2026 18:55:08 +0200
Subject: [PATCH 128/145] Correct error message when Makefile is improperly
 linked

---
 deploy.mk | 2 +-
 docker.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy.mk b/deploy.mk
index 9c51cf0a6..dd74e59af 100755
--- a/deploy.mk
+++ b/deploy.mk
@@ -116,7 +116,7 @@ restart : ## Restart service `${SERVICE}` and await its health
 
 symlink : ## Confirm that ./Makefile links to ./docker.mk and that ./docker-compose.yaml links to the correct ./docker-compose.*.yaml
 	if [[ ! -L "./Makefile" ]] || [[ ! "./Makefile" -ef "./docker.mk" ]]; then \
-		echo "./docker-compose.yaml does not link to $${file}" >&2 ; \
+		echo "./Makefile does not link to ./docker.mk" >&2 ; \
 		exit 1 ; \
 	fi
 	if [[ "${ENVIRONMENT}" == "staging" ]]; then \
diff --git a/docker.mk b/docker.mk
index c7d31011c..ccdf1ee89 100755
--- a/docker.mk
+++ b/docker.mk
@@ -32,7 +32,7 @@ environment : ## Print value of variable `ENVIRONMENT`
 
 symlink : ## Confirm that ./Makefile links to ./docker.mk and that ./docker-compose.yaml links to the correct ./docker-compose.*.yaml
 	if [[ ! -L "./Makefile" ]] || [[ ! "./Makefile" -ef "./docker.mk" ]]; then \
-		echo "./docker-compose.yaml does not link to $${file}" >&2 ; \
+		echo "./Makefile does not link to ./docker.mk" >&2 ; \
 		exit 1 ; \
 	fi
 	if [[ "${ENVIRONMENT}" == "staging" ]]; then \

From 9cd7355388a907b4448abf50af1da64852bee601 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 26 Jun 2026 19:16:46 +0200
Subject: [PATCH 129/145] Report unauthorized errors and add query
 `currentOpenIdConnectTokenClientId` to resolve the client ID (or authorized
 party) of the current access token (to be used by databases for applying
 access policies)

---
 .../src/Authorization/CommonAuthorization.cs  |  18 ++
 .../src/Configuration/AuthConfiguration.cs    |  25 +-
 .../src/Configuration/GraphQlConfiguration.cs |   4 +-
 .../OpenIdConnectApplicationQueries.cs        |  10 +-
 .../OpenIdConnectAuthorizationQueries.cs      |   4 +-
 .../Tokens/OpenIdConnectTokenQueries.cs       |  14 +-
 .../GraphQlSchemaTests.IsUnchanged.snap       | 264 ++++++++++++++----
 frontend/type-defs.graphqls                   | 264 ++++++++++++++----
 8 files changed, 466 insertions(+), 137 deletions(-)

diff --git a/backend/src/Authorization/CommonAuthorization.cs b/backend/src/Authorization/CommonAuthorization.cs
index add0f7333..571e80518 100644
--- a/backend/src/Authorization/CommonAuthorization.cs
+++ b/backend/src/Authorization/CommonAuthorization.cs
@@ -4,6 +4,8 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate;
+using HotChocolate.Resolvers;
 using Metabase.Data;
 using Metabase.Data.OpenIdConnect;
 using Metabase.Enumerations;
@@ -23,6 +25,9 @@ OpenIddictApplicationManager<OpenIdConnectApplication> applicationManager
 )
 : IDisposable, IAsyncDisposable
 {
+    // This is the same code that HotChocolate returns when autheorization via the attribute `[Authorize(Policy = ...)]` fails.
+    private const string UNAUTHORIZED_CODE = "AUTH_NOT_AUTHENTICATED";
+
     protected ApplicationDbContext Context { get; } = dbContextFactory.CreateDbContext();
     protected UserManager<User> UserManager { get; } = userManager;
     protected OpenIddictApplicationManager<OpenIdConnectApplication> ApplicationManager { get; } = applicationManager;
@@ -335,4 +340,17 @@ await context.InstitutionRepresentatives.AsNoTracking()
                 .SingleOrDefaultAsync(cancellationToken);
         return wrappedManagerRole?.Role;
     }
+
+    public void ReportUnauthorizedError(
+        IResolverContext resolverContext
+    )
+    {
+        resolverContext.ReportError(
+            ErrorBuilder.New()
+                .SetCode(UNAUTHORIZED_CODE)
+                .SetPath(resolverContext.Path)
+                .SetMessage($"The current user is not authorized to access this resource.")
+                .Build()
+        );
+    }
 }
\ No newline at end of file
diff --git a/backend/src/Configuration/AuthConfiguration.cs b/backend/src/Configuration/AuthConfiguration.cs
index 6af58dea6..8f933decd 100644
--- a/backend/src/Configuration/AuthConfiguration.cs
+++ b/backend/src/Configuration/AuthConfiguration.cs
@@ -464,20 +464,17 @@ AppSettings appSettings
                     // Note: when issuing access tokens used by third-party APIs you don't own, you
                     // can disable access token encryption: _.DisableAccessTokenEncryption();
                     // Note: To decrypt a JWT token, like an application code or an access token,
-                    // you can execute ``` var jwt =
-                    // "eyJhbGciOiJBMjU2S1ciLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIiwidHlwIjoiYXQrand0In0.tn0jqCR5-01c_SDRwex6sPBNl1Vl1KSRA5Zs2UoXri9F4tG4v9B6qbLmxzsfkd0rLe55BozRV8VCChsZAt_mCZfoVGOYewwP.ogGZQ5Q2p7Yue7D6zPJlSQ.uNX1Qs9R30vZxAPj-LuJSwWnisoKHQ5qNC_K9WvA0JDSCS_orw6TsboSVCe5b_aUg3JvrkJX_Ir0c-bFMf0HVhOVNy1UJwxo9zegJOsm7MybPzK58H4ubt_PRnrSueLgnQX8aDcjbM38Imy3RN6a3r3aKawdWGcyA23sIH8XnVmGk0lDB_PqFrFE7x2MmG4fyVJINoki441UI-7x0sLFUi4o98Z-2vTFuCd9cLRY5LAeb0ZIuWwOI7dv2Q54w7uV765kHS3VIPtupzSSXgQmfPBJOzDeV_-sCZGwUuC0jL8x1vJw573fejPwpPmXj3EKgzXgbGfAHmjoIzkNvcfr--Dy7O8WxLjSERoBgW45Tq0xcCLL9Vx4JGWehOw1jY-KaKIzfjUW9CTSwLgWdhqonetAULZFRJAYOEJ8PtP49jXlvkdjmavRXaX2UD8FD5TUx30TkGQ_xyuo6HvokURQqIYILZiL6R_kVqh7kwUnj4dgBqni-56M1GYFuX2UzynagL6c6t4OlO7RhQJpgz1pzmGNdEb5nvZplXru8KVEt_e9bQOy54EWudAemEVAyX-4P6FdWWazU5vMaRnDg53Y8gy4rt6LCwXK9WHNRbhkdAmTNNsfiuUd588lzMJVSVPeqzbl70yW8IH7hbwfscLjSf2-gP9evwDKoLMKjqyBtbsqGx-qtBE47y_-LKyP3TOJug0SBtiHIMb3xzN2rJaykAMRRz4kMaMF4_TZRV8kqZQqzF_xBoMJQD3nLYaN-G0qJYIse1JhVu4yHuH7vSvXdHA0x5dnBwwq4P3g35W5zv-cw4-b1cXnLq7TYUvHNVe6DcMAJogxW5ovA7wtEjF4yKxSbvlRaO065Jed5siLrIL17RahoHqew34kMzqXL0OUHvxId0A7myvLFy0YqhLnKg.1jfT6-IVamiQbS84hfX4lLtmoTiAmf0Ea0rpLPgYEek";
-                    // var handler = new JwtSecurityTokenHandler(); var claimsPrincipal =
-                    // handler.ValidateToken( jwt, new TokenValidationParameters { IssuerSigningKey
-                    // = signingKey, TokenDecryptionKey = encryptionKey, // ValidIssuer =
-                    // environment.IsEnvironment(Program.TestEnvironment) ? "http://localhost/" :
-                    // appSettings.Host, ValidateActor = false, ValidateAudience = false,
-                    // ValidateIssuer = false, ValidateIssuerSigningKey = false, ValidateLifetime =
-                    // false, ValidateTokenReplay = false, }, out var validatedToken );
-                    // Console.WriteLine(validatedToken.ToString()); ``` which as of this writing
-                    // outputs ```
-                    // {"alg":"A256KW","enc":"A256CBC-HS512","typ":"at+jwt"}.{"sub":"075561fa-98c0-40db-ad3d-9dc8abf240fd","name":"sw@ise.de","http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress":"sw@ise.de","oi_prst":"metabase","iss":"https://localhost:4041/","oi_au_id":"5dc00347-30fa-4ddb-91c1-471c505e7842","client_id":"metabase","oi_tkn_id":"e7430a26-4e13-4c21-8e6d-0f07dca66ff6","aud":"metabase","scope":"openid
-                    // email profile roles api:read api:write
-                    // offline_access","exp":1615405869,"iat":1615402269} ```
+                    // you can execute
+                    // ```
+                    // var jwt = "eyJhbGciOiJBMjU2S1ciLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIiwidHlwIjoiYXQrand0In0.tn0jqCR5-01c_SDRwex6sPBNl1Vl1KSRA5Zs2UoXri9F4tG4v9B6qbLmxzsfkd0rLe55BozRV8VCChsZAt_mCZfoVGOYewwP.ogGZQ5Q2p7Yue7D6zPJlSQ.uNX1Qs9R30vZxAPj-LuJSwWnisoKHQ5qNC_K9WvA0JDSCS_orw6TsboSVCe5b_aUg3JvrkJX_Ir0c-bFMf0HVhOVNy1UJwxo9zegJOsm7MybPzK58H4ubt_PRnrSueLgnQX8aDcjbM38Imy3RN6a3r3aKawdWGcyA23sIH8XnVmGk0lDB_PqFrFE7x2MmG4fyVJINoki441UI-7x0sLFUi4o98Z-2vTFuCd9cLRY5LAeb0ZIuWwOI7dv2Q54w7uV765kHS3VIPtupzSSXgQmfPBJOzDeV_-sCZGwUuC0jL8x1vJw573fejPwpPmXj3EKgzXgbGfAHmjoIzkNvcfr--Dy7O8WxLjSERoBgW45Tq0xcCLL9Vx4JGWehOw1jY-KaKIzfjUW9CTSwLgWdhqonetAULZFRJAYOEJ8PtP49jXlvkdjmavRXaX2UD8FD5TUx30TkGQ_xyuo6HvokURQqIYILZiL6R_kVqh7kwUnj4dgBqni-56M1GYFuX2UzynagL6c6t4OlO7RhQJpgz1pzmGNdEb5nvZplXru8KVEt_e9bQOy54EWudAemEVAyX-4P6FdWWazU5vMaRnDg53Y8gy4rt6LCwXK9WHNRbhkdAmTNNsfiuUd588lzMJVSVPeqzbl70yW8IH7hbwfscLjSf2-gP9evwDKoLMKjqyBtbsqGx-qtBE47y_-LKyP3TOJug0SBtiHIMb3xzN2rJaykAMRRz4kMaMF4_TZRV8kqZQqzF_xBoMJQD3nLYaN-G0qJYIse1JhVu4yHuH7vSvXdHA0x5dnBwwq4P3g35W5zv-cw4-b1cXnLq7TYUvHNVe6DcMAJogxW5ovA7wtEjF4yKxSbvlRaO065Jed5siLrIL17RahoHqew34kMzqXL0OUHvxId0A7myvLFy0YqhLnKg.1jfT6-IVamiQbS84hfX4lLtmoTiAmf0Ea0rpLPgYEek";
+                    // var handler = new JwtSecurityTokenHandler();
+                    // var claimsPrincipal = handler.ValidateToken( jwt, new TokenValidationParameters { IssuerSigningKey = signingKey, TokenDecryptionKey = encryptionKey, ValidIssuer = environment.IsEnvironment(Program.TestEnvironment) ? "http://localhost/" : appSettings.Host, ValidateActor = false, ValidateAudience = false, ValidateIssuer = false, ValidateIssuerSigningKey = false, ValidateLifetime = false, ValidateTokenReplay = false, }, out var validatedToken );
+                    // Console.WriteLine(validatedToken.ToString());
+                    // ``` which as of this writing
+                    // outputs
+                    // ```
+                    // {"alg":"A256KW","enc":"A256CBC-HS512","typ":"at+jwt"}.{"sub":"075561fa-98c0-40db-ad3d-9dc8abf240fd","name":"sw@ise.de","http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress":"sw@ise.de","oi_prst":"metabase","iss":"https://localhost:4041/","oi_au_id":"5dc00347-30fa-4ddb-91c1-471c505e7842","client_id":"metabase","oi_tkn_id":"e7430a26-4e13-4c21-8e6d-0f07dca66ff6","aud":"metabase","scope":"openid email profile roles api:read api:write offline_access","exp":1615405869,"iat":1615402269}
+                    // ```
                 }
             )
             // Register the OpenIddict validation components.
diff --git a/backend/src/Configuration/GraphQlConfiguration.cs b/backend/src/Configuration/GraphQlConfiguration.cs
index a8bfef93c..64c46e31c 100644
--- a/backend/src/Configuration/GraphQlConfiguration.cs
+++ b/backend/src/Configuration/GraphQlConfiguration.cs
@@ -134,8 +134,8 @@ IWebHostEnvironment environment
             )
             .ModifyCostOptions(_ =>
                 {
-                    _.MaxFieldCost = 12000;
-                    _.MaxTypeCost = 12000;
+                    _.MaxFieldCost = 20000;
+                    _.MaxTypeCost = 20000;
                 }
             )
             // Configure
diff --git a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
index 59a0dbf57..1e039dd47 100644
--- a/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Applications/OpenIdConnectApplicationQueries.cs
@@ -36,7 +36,6 @@ CancellationToken cancellationToken
         );
     }
 
-    // TODO In all queries, instead of returning nothing, report as authentication error to client.
     [UsePaging]
     [UseFiltering<OpenIdConnectApplicationFilterType>]
     [UseSorting<OpenIdConnectApplicationSortType>]
@@ -57,6 +56,7 @@ CancellationToken cancellationToken
     {
         // if (!await authorization.IsAuthorizedToManageOpenIdConnect(claimsPrincipal, cancellationToken))
         // {
+        //     authorization.ReportUnauthorizedError(resolverContext);
         //     return HotChocolate.Types.Pagination.Connection.Empty<OpenIdConnectApplication>();
         // }
         return databaseContext.OpenIdConnectApplications
@@ -73,11 +73,13 @@ CancellationToken cancellationToken
         IOpenIdConnectApplicationByIdDataLoader byId,
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
+        // IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
         // if (!await authorization.IsAuthorizedToManageApplication(claimsPrincipal, id, cancellationToken))
         // {
+        //     authorization.ReportUnauthorizedError(resolverContext);
         //     return null;
         // }
         return byId.LoadAsync(id, cancellationToken);
@@ -90,9 +92,15 @@ CancellationToken cancellationToken
         IOpenIdConnectApplicationByClientIdDataLoader byId,
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
+        // IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
+        // if (!await authorization.IsAuthorizedToManageApplication(claimsPrincipal, clientId, cancellationToken))
+        // {
+        //     authorization.ReportUnauthorizedError(resolverContext);
+        //     return null;
+        // }
         return byId.LoadAsync(clientId, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationQueries.cs b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationQueries.cs
index 7b2f40408..86f2c77ed 100644
--- a/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationQueries.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Authorizations/OpenIdConnectAuthorizationQueries.cs
@@ -19,7 +19,6 @@ namespace Metabase.GraphQl.OpenIdConnect.Authorizations;
 [ExtendObjectType(nameof(Query))]
 public sealed class OpenIdConnectAuthorizationQueries
 {
-    // TODO In all queries, instead of returning nothing, report as authentication error to client.
     [UsePaging]
     [UseFiltering<OpenIdConnectAuthorizationFilterType>]
     [UseSorting<OpenIdConnectAuthorizationSortType>]
@@ -35,6 +34,7 @@ CancellationToken cancellationToken
     {
         if (!await authorization.IsAuthorizedToManageOpenIdConnect(claimsPrincipal, cancellationToken))
         {
+            authorization.ReportUnauthorizedError(resolverContext);
             return HotChocolate.Types.Pagination.Connection.Empty<OpenIdConnectAuthorization>();
         }
         return await databaseContext.OpenIdConnectAuthorizations
@@ -51,11 +51,13 @@ CancellationToken cancellationToken
         IOpenIdConnectAuthorizationByIdDataLoader byId,
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
+        IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
         if (!await authorization.IsAuthorizedToManageAuthorization(claimsPrincipal, id, cancellationToken))
         {
+            authorization.ReportUnauthorizedError(resolverContext);
             return null;
         }
         return await byId.LoadAsync(id, cancellationToken);
diff --git a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenQueries.cs b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenQueries.cs
index 59bdfd2bf..293f37299 100644
--- a/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenQueries.cs
+++ b/backend/src/GraphQl/OpenIdConnect/Tokens/OpenIdConnectTokenQueries.cs
@@ -14,13 +14,22 @@
 using Metabase.GraphQl.Extensions;
 using Metabase.GraphQl.Users;
 using Microsoft.EntityFrameworkCore;
+using OpenIddict.Abstractions;
 
 namespace Metabase.GraphQl.OpenIdConnect.Tokens;
 
 [ExtendObjectType(nameof(Query))]
 public sealed class OpenIdConnectTokenQueries
 {
-    // TODO In all queries, instead of returning nothing, report as authentication error to client.
+    [Authorize(Policy = AuthorizationPolicies.AuthenticatedPolicy)]
+    public string? GetCurrentOpenIdConnectTokenClientId(
+        ClaimsPrincipal claimsPrincipal
+    )
+    {
+        return claimsPrincipal.GetClaim(OpenIddictConstants.Claims.ClientId)
+            ?? claimsPrincipal.GetClaim(OpenIddictConstants.Claims.AuthorizedParty);
+    }
+
     [UsePaging]
     [UseFiltering<OpenIdConnectTokenFilterType>]
     [UseSorting<OpenIdConnectTokenSortType>]
@@ -36,6 +45,7 @@ CancellationToken cancellationToken
     {
         if (!await authorization.IsAuthorizedToManageOpenIdConnect(claimsPrincipal, cancellationToken))
         {
+            authorization.ReportUnauthorizedError(resolverContext);
             return HotChocolate.Types.Pagination.Connection.Empty<OpenIdConnectToken>();
         }
         return await databaseContext.OpenIdConnectTokens
@@ -52,11 +62,13 @@ CancellationToken cancellationToken
         IOpenIdConnectTokenByIdDataLoader byId,
         ClaimsPrincipal claimsPrincipal,
         Authorization.OpenIdConnectAuthorization authorization,
+        IResolverContext resolverContext,
         CancellationToken cancellationToken
     )
     {
         if (!await authorization.IsAuthorizedToManageToken(claimsPrincipal, id, cancellationToken))
         {
+            authorization.ReportUnauthorizedError(resolverContext);
             return null;
         }
         return await byId.LoadAsync(id, cancellationToken);
diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index 8a68a5f22..b540d77e0 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -11,7 +11,15 @@ type Query {
     last: Int
     locale: String
     where: CalorimetricDataPropositionInput
-  ): CalorimetricDataConnection! @cost(weight: "10")
+  ): CalorimetricDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allGeometricData(
     after: String
     before: String
@@ -19,7 +27,15 @@ type Query {
     last: Int
     locale: String
     where: GeometricDataPropositionInput
-  ): GeometricDataConnection! @cost(weight: "10")
+  ): GeometricDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allHygrothermalData(
     after: String
     before: String
@@ -27,7 +43,15 @@ type Query {
     last: Int
     locale: String
     where: HygrothermalDataPropositionInput
-  ): HygrothermalDataConnection! @cost(weight: "10")
+  ): HygrothermalDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allLifeCycleData(
     after: String
     before: String
@@ -35,7 +59,15 @@ type Query {
     last: Int
     locale: String
     where: LifeCycleDataPropositionInput
-  ): LifeCycleDataConnection! @cost(weight: "10")
+  ): LifeCycleDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allOpticalData(
     after: String
     before: String
@@ -43,7 +75,15 @@ type Query {
     last: Int
     locale: String
     where: OpticalDataPropositionInput
-  ): OpticalDataConnection! @cost(weight: "10")
+  ): OpticalDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allPhotovoltaicData(
     after: String
     before: String
@@ -51,7 +91,15 @@ type Query {
     last: Int
     locale: String
     where: PhotovoltaicDataPropositionInput
-  ): PhotovoltaicDataConnection! @cost(weight: "10")
+  ): PhotovoltaicDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   anyDatabases(
     "Returns the elements in the list that come after the specified cursor."
     after: String
@@ -65,9 +113,9 @@ type Query {
     where: DatabaseFilterInput @cost(weight: "10")
   ): AnyDatabasesConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -88,15 +136,16 @@ type Query {
     where: ComponentFilterInput @cost(weight: "10")
   ): ComponentsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
   currentInstitution: Institution @cost(weight: "10")
   currentOpenIdConnectApplication: OpenIdConnectApplication @cost(weight: "10")
+  currentOpenIdConnectTokenClientId: String
   currentUser: User @cost(weight: "10")
   database(id: Uuid!): Database @cost(weight: "10")
   databases(
@@ -112,9 +161,9 @@ type Query {
     where: DatabaseFilterInput @cost(weight: "10")
   ): DatabasesConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -133,9 +182,9 @@ type Query {
     where: DataFormatFilterInput @cost(weight: "10")
   ): DataFormatsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -157,9 +206,9 @@ type Query {
     where: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
   ): GnuPgKeyFingerprintsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -192,9 +241,9 @@ type Query {
     where: InstitutionFilterInput @cost(weight: "10")
   ): InstitutionsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -215,9 +264,9 @@ type Query {
     where: MethodFilterInput @cost(weight: "10")
   ): MethodsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -243,9 +292,9 @@ type Query {
     where: OpenIdConnectApplicationFilterInput @cost(weight: "10")
   ): OpenIdConnectApplicationsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -265,9 +314,9 @@ type Query {
     where: OpenIdConnectAuthorizationFilterInput @cost(weight: "10")
   ): OpenIdConnectAuthorizationsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -286,9 +335,9 @@ type Query {
     where: OpenIdConnectTokenFilterInput @cost(weight: "10")
   ): OpenIdConnectTokensConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -308,9 +357,9 @@ type Query {
     where: DatabaseFilterInput @cost(weight: "10")
   ): PendingDatabasesConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -328,9 +377,9 @@ type Query {
     where: InstitutionFilterInput @cost(weight: "10")
   ): PendingInstitutionsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -351,9 +400,9 @@ type Query {
     where: UserFilterInput @cost(weight: "10")
   ): UsersConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -745,7 +794,15 @@ type Component implements Node {
     last: Int
     locale: Locale
     where: CalorimetricDataPropositionInput
-  ): CalorimetricDataConnection! @cost(weight: "10")
+  ): CalorimetricDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allGeometricData(
     after: String
     before: String
@@ -753,7 +810,15 @@ type Component implements Node {
     last: Int
     locale: Locale
     where: GeometricDataPropositionInput
-  ): GeometricDataConnection! @cost(weight: "10")
+  ): GeometricDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allHygrothermalData(
     after: String
     before: String
@@ -761,7 +826,15 @@ type Component implements Node {
     last: Int
     locale: Locale
     where: HygrothermalDataPropositionInput
-  ): HygrothermalDataConnection! @cost(weight: "10")
+  ): HygrothermalDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allLifeCycleData(
     after: String
     before: String
@@ -769,7 +842,15 @@ type Component implements Node {
     last: Int
     locale: Locale
     where: LifeCycleDataPropositionInput
-  ): LifeCycleDataConnection! @cost(weight: "10")
+  ): LifeCycleDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allOpticalData(
     after: String
     before: String
@@ -777,7 +858,15 @@ type Component implements Node {
     last: Int
     locale: Locale
     where: OpticalDataPropositionInput
-  ): OpticalDataConnection! @cost(weight: "10")
+  ): OpticalDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allPhotovoltaicData(
     after: String
     before: String
@@ -785,7 +874,15 @@ type Component implements Node {
     last: Int
     locale: Locale
     where: PhotovoltaicDataPropositionInput
-  ): PhotovoltaicDataConnection! @cost(weight: "10")
+  ): PhotovoltaicDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   assembledOf(
     order: [ComponentAssembledOfSortInput!] @cost(weight: "10")
     where: ComponentAssembledOfFilterInput @cost(weight: "10")
@@ -1110,7 +1207,15 @@ type Database implements Node {
     last: Int
     locale: Locale
     where: CalorimetricDataPropositionInput
-  ): CalorimetricDataConnection @cost(weight: "10")
+  ): CalorimetricDataConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allGeometricData(
     after: String
     before: String
@@ -1118,7 +1223,15 @@ type Database implements Node {
     last: Int
     locale: Locale
     where: GeometricDataPropositionInput
-  ): GeometricDataConnection @cost(weight: "10")
+  ): GeometricDataConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allHygrothermalData(
     after: String
     before: String
@@ -1126,7 +1239,15 @@ type Database implements Node {
     last: Int
     locale: Locale
     where: HygrothermalDataPropositionInput
-  ): HygrothermalDataConnection @cost(weight: "10")
+  ): HygrothermalDataConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allLifeCycleData(
     after: String
     before: String
@@ -1134,7 +1255,15 @@ type Database implements Node {
     last: Int
     locale: Locale
     where: LifeCycleDataPropositionInput
-  ): LifeCycleDataConnection @cost(weight: "10")
+  ): LifeCycleDataConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allOpticalData(
     after: String
     before: String
@@ -1142,7 +1271,15 @@ type Database implements Node {
     last: Int
     locale: Locale
     where: OpticalDataPropositionInput
-  ): OpticalDataConnection @cost(weight: "10")
+  ): OpticalDataConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allPhotovoltaicData(
     after: String
     before: String
@@ -1150,7 +1287,15 @@ type Database implements Node {
     last: Int
     locale: Locale
     where: PhotovoltaicDataPropositionInput
-  ): PhotovoltaicDataConnection @cost(weight: "10")
+  ): PhotovoltaicDataConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   calorimetricData(id: Uuid!, locale: Locale): CalorimetricData
     @cost(weight: "10")
   createdAt: DateTime!
@@ -4977,28 +5122,29 @@ enum OpenIdConnectScope {
 }
 
 enum OpticalComponentSubtype {
-  MONOLITHIC
-  LAMINATE
-  INTERLAYER
-  EMBEDDED_COATING
+  ACID_ETCHED_GLASS
+  APPLIED_FILM
+  CELLULAR_SHADE
+  CHROMOGENIC
   COATED
   COATING
-  APPLIED_FILM
-  FILM
-  VENETIAN_BLIND
   DIFFUSING_SHADE
-  ROLLER_SHADE
-  WOVEN_SHADE
-  VERTICAL_LOUVER
+  EMBEDDED_COATING
+  FILM
+  FRITTED_GLASS
+  INTERLAYER
+  LAMINATE
+  MONOLITHIC
   PERFORATED_SCREEN
-  CELLULAR_SHADE
   PLEATED_SHADE
+  ROLLER_SHADE
   ROMAN_SHADE
-  SHADE_MATERIAL
-  FRITTED_GLASS
-  ACID_ETCHED_GLASS
   SANDBLASTED_GLASS
-  CHROMOGENIC
+  SHADE_MATERIAL
+  SOLAR_SCREEN
+  VENETIAN_BLIND
+  VERTICAL_LOUVER
+  WOVEN_SHADE
 }
 
 enum OpticalComponentType {
diff --git a/frontend/type-defs.graphqls b/frontend/type-defs.graphqls
index 8a68a5f22..b540d77e0 100644
--- a/frontend/type-defs.graphqls
+++ b/frontend/type-defs.graphqls
@@ -11,7 +11,15 @@ type Query {
     last: Int
     locale: String
     where: CalorimetricDataPropositionInput
-  ): CalorimetricDataConnection! @cost(weight: "10")
+  ): CalorimetricDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allGeometricData(
     after: String
     before: String
@@ -19,7 +27,15 @@ type Query {
     last: Int
     locale: String
     where: GeometricDataPropositionInput
-  ): GeometricDataConnection! @cost(weight: "10")
+  ): GeometricDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allHygrothermalData(
     after: String
     before: String
@@ -27,7 +43,15 @@ type Query {
     last: Int
     locale: String
     where: HygrothermalDataPropositionInput
-  ): HygrothermalDataConnection! @cost(weight: "10")
+  ): HygrothermalDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allLifeCycleData(
     after: String
     before: String
@@ -35,7 +59,15 @@ type Query {
     last: Int
     locale: String
     where: LifeCycleDataPropositionInput
-  ): LifeCycleDataConnection! @cost(weight: "10")
+  ): LifeCycleDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allOpticalData(
     after: String
     before: String
@@ -43,7 +75,15 @@ type Query {
     last: Int
     locale: String
     where: OpticalDataPropositionInput
-  ): OpticalDataConnection! @cost(weight: "10")
+  ): OpticalDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allPhotovoltaicData(
     after: String
     before: String
@@ -51,7 +91,15 @@ type Query {
     last: Int
     locale: String
     where: PhotovoltaicDataPropositionInput
-  ): PhotovoltaicDataConnection! @cost(weight: "10")
+  ): PhotovoltaicDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   anyDatabases(
     "Returns the elements in the list that come after the specified cursor."
     after: String
@@ -65,9 +113,9 @@ type Query {
     where: DatabaseFilterInput @cost(weight: "10")
   ): AnyDatabasesConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -88,15 +136,16 @@ type Query {
     where: ComponentFilterInput @cost(weight: "10")
   ): ComponentsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
   currentInstitution: Institution @cost(weight: "10")
   currentOpenIdConnectApplication: OpenIdConnectApplication @cost(weight: "10")
+  currentOpenIdConnectTokenClientId: String
   currentUser: User @cost(weight: "10")
   database(id: Uuid!): Database @cost(weight: "10")
   databases(
@@ -112,9 +161,9 @@ type Query {
     where: DatabaseFilterInput @cost(weight: "10")
   ): DatabasesConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -133,9 +182,9 @@ type Query {
     where: DataFormatFilterInput @cost(weight: "10")
   ): DataFormatsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -157,9 +206,9 @@ type Query {
     where: GnuPgKeyFingerprintFilterInput @cost(weight: "10")
   ): GnuPgKeyFingerprintsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -192,9 +241,9 @@ type Query {
     where: InstitutionFilterInput @cost(weight: "10")
   ): InstitutionsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -215,9 +264,9 @@ type Query {
     where: MethodFilterInput @cost(weight: "10")
   ): MethodsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -243,9 +292,9 @@ type Query {
     where: OpenIdConnectApplicationFilterInput @cost(weight: "10")
   ): OpenIdConnectApplicationsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -265,9 +314,9 @@ type Query {
     where: OpenIdConnectAuthorizationFilterInput @cost(weight: "10")
   ): OpenIdConnectAuthorizationsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -286,9 +335,9 @@ type Query {
     where: OpenIdConnectTokenFilterInput @cost(weight: "10")
   ): OpenIdConnectTokensConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -308,9 +357,9 @@ type Query {
     where: DatabaseFilterInput @cost(weight: "10")
   ): PendingDatabasesConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -328,9 +377,9 @@ type Query {
     where: InstitutionFilterInput @cost(weight: "10")
   ): PendingInstitutionsConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -351,9 +400,9 @@ type Query {
     where: UserFilterInput @cost(weight: "10")
   ): UsersConnection
     @listSize(
-      assumedSize: 99
+      assumedSize: 100
       slicingArguments: ["first", "last"]
-      slicingArgumentDefaultValue: 99
+      slicingArgumentDefaultValue: 100
       sizedFields: ["edges", "nodes"]
       requireOneSlicingArgument: false
     )
@@ -745,7 +794,15 @@ type Component implements Node {
     last: Int
     locale: Locale
     where: CalorimetricDataPropositionInput
-  ): CalorimetricDataConnection! @cost(weight: "10")
+  ): CalorimetricDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allGeometricData(
     after: String
     before: String
@@ -753,7 +810,15 @@ type Component implements Node {
     last: Int
     locale: Locale
     where: GeometricDataPropositionInput
-  ): GeometricDataConnection! @cost(weight: "10")
+  ): GeometricDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allHygrothermalData(
     after: String
     before: String
@@ -761,7 +826,15 @@ type Component implements Node {
     last: Int
     locale: Locale
     where: HygrothermalDataPropositionInput
-  ): HygrothermalDataConnection! @cost(weight: "10")
+  ): HygrothermalDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allLifeCycleData(
     after: String
     before: String
@@ -769,7 +842,15 @@ type Component implements Node {
     last: Int
     locale: Locale
     where: LifeCycleDataPropositionInput
-  ): LifeCycleDataConnection! @cost(weight: "10")
+  ): LifeCycleDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allOpticalData(
     after: String
     before: String
@@ -777,7 +858,15 @@ type Component implements Node {
     last: Int
     locale: Locale
     where: OpticalDataPropositionInput
-  ): OpticalDataConnection! @cost(weight: "10")
+  ): OpticalDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allPhotovoltaicData(
     after: String
     before: String
@@ -785,7 +874,15 @@ type Component implements Node {
     last: Int
     locale: Locale
     where: PhotovoltaicDataPropositionInput
-  ): PhotovoltaicDataConnection! @cost(weight: "10")
+  ): PhotovoltaicDataConnection!
+    @listSize(
+      assumedSize: 99
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 99
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   assembledOf(
     order: [ComponentAssembledOfSortInput!] @cost(weight: "10")
     where: ComponentAssembledOfFilterInput @cost(weight: "10")
@@ -1110,7 +1207,15 @@ type Database implements Node {
     last: Int
     locale: Locale
     where: CalorimetricDataPropositionInput
-  ): CalorimetricDataConnection @cost(weight: "10")
+  ): CalorimetricDataConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allGeometricData(
     after: String
     before: String
@@ -1118,7 +1223,15 @@ type Database implements Node {
     last: Int
     locale: Locale
     where: GeometricDataPropositionInput
-  ): GeometricDataConnection @cost(weight: "10")
+  ): GeometricDataConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allHygrothermalData(
     after: String
     before: String
@@ -1126,7 +1239,15 @@ type Database implements Node {
     last: Int
     locale: Locale
     where: HygrothermalDataPropositionInput
-  ): HygrothermalDataConnection @cost(weight: "10")
+  ): HygrothermalDataConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allLifeCycleData(
     after: String
     before: String
@@ -1134,7 +1255,15 @@ type Database implements Node {
     last: Int
     locale: Locale
     where: LifeCycleDataPropositionInput
-  ): LifeCycleDataConnection @cost(weight: "10")
+  ): LifeCycleDataConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allOpticalData(
     after: String
     before: String
@@ -1142,7 +1271,15 @@ type Database implements Node {
     last: Int
     locale: Locale
     where: OpticalDataPropositionInput
-  ): OpticalDataConnection @cost(weight: "10")
+  ): OpticalDataConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   allPhotovoltaicData(
     after: String
     before: String
@@ -1150,7 +1287,15 @@ type Database implements Node {
     last: Int
     locale: Locale
     where: PhotovoltaicDataPropositionInput
-  ): PhotovoltaicDataConnection @cost(weight: "10")
+  ): PhotovoltaicDataConnection
+    @listSize(
+      assumedSize: 100
+      slicingArguments: ["first", "last"]
+      slicingArgumentDefaultValue: 100
+      sizedFields: ["edges", "nodes"]
+      requireOneSlicingArgument: false
+    )
+    @cost(weight: "10")
   calorimetricData(id: Uuid!, locale: Locale): CalorimetricData
     @cost(weight: "10")
   createdAt: DateTime!
@@ -4977,28 +5122,29 @@ enum OpenIdConnectScope {
 }
 
 enum OpticalComponentSubtype {
-  MONOLITHIC
-  LAMINATE
-  INTERLAYER
-  EMBEDDED_COATING
+  ACID_ETCHED_GLASS
+  APPLIED_FILM
+  CELLULAR_SHADE
+  CHROMOGENIC
   COATED
   COATING
-  APPLIED_FILM
-  FILM
-  VENETIAN_BLIND
   DIFFUSING_SHADE
-  ROLLER_SHADE
-  WOVEN_SHADE
-  VERTICAL_LOUVER
+  EMBEDDED_COATING
+  FILM
+  FRITTED_GLASS
+  INTERLAYER
+  LAMINATE
+  MONOLITHIC
   PERFORATED_SCREEN
-  CELLULAR_SHADE
   PLEATED_SHADE
+  ROLLER_SHADE
   ROMAN_SHADE
-  SHADE_MATERIAL
-  FRITTED_GLASS
-  ACID_ETCHED_GLASS
   SANDBLASTED_GLASS
-  CHROMOGENIC
+  SHADE_MATERIAL
+  SOLAR_SCREEN
+  VENETIAN_BLIND
+  VERTICAL_LOUVER
+  WOVEN_SHADE
 }
 
 enum OpticalComponentType {

From b030a75ceb54af16215d00ab80ac67c577fc5394 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Fri, 26 Jun 2026 19:29:37 +0200
Subject: [PATCH 130/145] Add `UNKNOWN` to component subtype enumeration (the
 IGSDB may return that value)

---
 .../OpticalDataX/OpticalComponentSubtype.cs   |   1 +
 .../GraphQlSchemaTests.IsUnchanged.snap       |   3 +-
 frontend/type-defs.graphqls                   | 281 +++++++++++-------
 3 files changed, 176 insertions(+), 109 deletions(-)

diff --git a/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtype.cs b/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtype.cs
index 1c3a5457f..685d20ce5 100644
--- a/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtype.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtype.cs
@@ -25,6 +25,7 @@ public enum OpticalComponentSubtype
     SANDBLASTED_GLASS,
     SHADE_MATERIAL,
     SOLAR_SCREEN,
+    UNKNOWN,
     VENETIAN_BLIND,
     VERTICAL_LOUVER,
     WOVEN_SHADE
diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index b540d77e0..e225064fc 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -5142,6 +5142,7 @@ enum OpticalComponentSubtype {
   SANDBLASTED_GLASS
   SHADE_MATERIAL
   SOLAR_SCREEN
+  UNKNOWN
   VENETIAN_BLIND
   VERTICAL_LOUVER
   WOVEN_SHADE
@@ -5556,4 +5557,4 @@ directive @listSize(
   slicingArgumentDefaultValue: Int
   "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments."
   slicingArguments: [String!]
-) on FIELD_DEFINITION
\ No newline at end of file
+) on FIELD_DEFINITION
diff --git a/frontend/type-defs.graphqls b/frontend/type-defs.graphqls
index b540d77e0..f87c3230a 100644
--- a/frontend/type-defs.graphqls
+++ b/frontend/type-defs.graphqls
@@ -120,8 +120,11 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  calorimetricData(databaseId: Uuid!, id: Uuid!, locale: String): CalorimetricData
-    @cost(weight: "10")
+  calorimetricData(
+    databaseId: Uuid!
+    id: Uuid!
+    locale: String
+  ): CalorimetricData @cost(weight: "10")
   component(id: Uuid!): Component @cost(weight: "10")
   components(
     "Returns the elements in the list that come after the specified cursor."
@@ -213,20 +216,33 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  hasCalorimetricData(locale: String, where: CalorimetricDataPropositionInput): Boolean!
-    @cost(weight: "10")
-  hasGeometricData(locale: String, where: GeometricDataPropositionInput): Boolean!
-    @cost(weight: "10")
-  hasHygrothermalData(locale: String, where: HygrothermalDataPropositionInput): Boolean!
-    @cost(weight: "10")
-  hasLifeCycleData(locale: String, where: LifeCycleDataPropositionInput): Boolean!
-    @cost(weight: "10")
+  hasCalorimetricData(
+    locale: String
+    where: CalorimetricDataPropositionInput
+  ): Boolean! @cost(weight: "10")
+  hasGeometricData(
+    locale: String
+    where: GeometricDataPropositionInput
+  ): Boolean! @cost(weight: "10")
+  hasHygrothermalData(
+    locale: String
+    where: HygrothermalDataPropositionInput
+  ): Boolean! @cost(weight: "10")
+  hasLifeCycleData(
+    locale: String
+    where: LifeCycleDataPropositionInput
+  ): Boolean! @cost(weight: "10")
   hasOpticalData(locale: String, where: OpticalDataPropositionInput): Boolean!
     @cost(weight: "10")
-  hasPhotovoltaicData(locale: String, where: PhotovoltaicDataPropositionInput): Boolean!
-    @cost(weight: "10")
-  hygrothermalData(databaseId: Uuid!, id: Uuid!, locale: String): HygrothermalData
-    @cost(weight: "10")
+  hasPhotovoltaicData(
+    locale: String
+    where: PhotovoltaicDataPropositionInput
+  ): Boolean! @cost(weight: "10")
+  hygrothermalData(
+    databaseId: Uuid!
+    id: Uuid!
+    locale: String
+  ): HygrothermalData @cost(weight: "10")
   institution(id: Uuid!): Institution @cost(weight: "10")
   institutions(
     "Returns the elements in the list that come after the specified cursor."
@@ -277,8 +293,9 @@ type Query {
   nodes("The list of node IDs." ids: [ID!]!): [Node]! @cost(weight: "10")
   openIdConnectApplication(id: Uuid!): OpenIdConnectApplication
     @cost(weight: "10")
-  openIdConnectApplicationByClientId(clientId: String!): OpenIdConnectApplication
-    @cost(weight: "10")
+  openIdConnectApplicationByClientId(
+    clientId: String!
+  ): OpenIdConnectApplication @cost(weight: "10")
   openIdConnectApplications(
     "Returns the elements in the list that come after the specified cursor."
     after: String
@@ -384,8 +401,11 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  photovoltaicData(databaseId: Uuid!, id: Uuid!, locale: String): PhotovoltaicData
-    @cost(weight: "10")
+  photovoltaicData(
+    databaseId: Uuid!
+    id: Uuid!
+    locale: String
+  ): PhotovoltaicData @cost(weight: "10")
   user(id: Uuid!): User @cost(weight: "10")
   users(
     "Returns the elements in the list that come after the specified cursor."
@@ -410,34 +430,45 @@ type Query {
 }
 
 type Mutation {
-  addComponentAssembly(input: AddComponentAssemblyInput!): AddComponentAssemblyPayload!
-    @cost(weight: "10")
-  addComponentGeneralization(input: AddComponentGeneralizationInput!): AddComponentGeneralizationPayload!
-    @cost(weight: "10")
-  addComponentManufacturer(input: AddComponentManufacturerInput!): AddComponentManufacturerPayload!
-    @cost(weight: "10")
-  addComponentVariant(input: AddComponentVariantInput!): AddComponentVariantPayload!
-    @cost(weight: "10")
-  addGnuPgKeyFingerprint(input: AddGnuPgKeyFingerprintInput!): AddGnuPgKeyFingerprintPayload!
-    @cost(weight: "10")
-  addInstitutionMethodDeveloper(input: AddInstitutionMethodDeveloperInput!): AddInstitutionMethodDeveloperPayload!
-    @cost(weight: "10")
-  addInstitutionRepresentative(input: AddInstitutionRepresentativeInput!): AddInstitutionRepresentativePayload!
-    @cost(weight: "10")
-  addUserMethodDeveloper(input: AddUserMethodDeveloperInput!): AddUserMethodDeveloperPayload!
-    @cost(weight: "10")
+  addComponentAssembly(
+    input: AddComponentAssemblyInput!
+  ): AddComponentAssemblyPayload! @cost(weight: "10")
+  addComponentGeneralization(
+    input: AddComponentGeneralizationInput!
+  ): AddComponentGeneralizationPayload! @cost(weight: "10")
+  addComponentManufacturer(
+    input: AddComponentManufacturerInput!
+  ): AddComponentManufacturerPayload! @cost(weight: "10")
+  addComponentVariant(
+    input: AddComponentVariantInput!
+  ): AddComponentVariantPayload! @cost(weight: "10")
+  addGnuPgKeyFingerprint(
+    input: AddGnuPgKeyFingerprintInput!
+  ): AddGnuPgKeyFingerprintPayload! @cost(weight: "10")
+  addInstitutionMethodDeveloper(
+    input: AddInstitutionMethodDeveloperInput!
+  ): AddInstitutionMethodDeveloperPayload! @cost(weight: "10")
+  addInstitutionRepresentative(
+    input: AddInstitutionRepresentativeInput!
+  ): AddInstitutionRepresentativePayload! @cost(weight: "10")
+  addUserMethodDeveloper(
+    input: AddUserMethodDeveloperInput!
+  ): AddUserMethodDeveloperPayload! @cost(weight: "10")
   addUserRole(input: AddUserRoleInput!): AddUserRolePayload! @cost(weight: "10")
-  allowGnuPgKeyFingerprint(input: AllowGnuPgKeyFingerprintInput!): AllowGnuPgKeyFingerprintPayload!
-    @cost(weight: "10")
+  allowGnuPgKeyFingerprint(
+    input: AllowGnuPgKeyFingerprintInput!
+  ): AllowGnuPgKeyFingerprintPayload! @cost(weight: "10")
   changeInstitutionRepresentativeRole(
     input: ChangeInstitutionRepresentativeRoleInput!
   ): ChangeInstitutionRepresentativeRolePayload! @cost(weight: "10")
   changeUserEmail(input: ChangeUserEmailInput!): ChangeUserEmailPayload!
     @cost(weight: "10")
-  changeUserPassword(input: ChangeUserPasswordInput!): ChangeUserPasswordPayload!
-    @cost(weight: "10")
-  confirmComponentManufacturer(input: ConfirmComponentManufacturerInput!): ConfirmComponentManufacturerPayload!
-    @cost(weight: "10")
+  changeUserPassword(
+    input: ChangeUserPasswordInput!
+  ): ChangeUserPasswordPayload! @cost(weight: "10")
+  confirmComponentManufacturer(
+    input: ConfirmComponentManufacturerInput!
+  ): ConfirmComponentManufacturerPayload! @cost(weight: "10")
   confirmInstitutionMethodDeveloper(
     input: ConfirmInstitutionMethodDeveloperInput!
   ): ConfirmInstitutionMethodDeveloperPayload! @cost(weight: "10")
@@ -446,10 +477,12 @@ type Mutation {
   ): ConfirmInstitutionRepresentativePayload! @cost(weight: "10")
   confirmUserEmail(input: ConfirmUserEmailInput!): ConfirmUserEmailPayload!
     @cost(weight: "10")
-  confirmUserEmailChange(input: ConfirmUserEmailChangeInput!): ConfirmUserEmailChangePayload!
-    @cost(weight: "10")
-  confirmUserMethodDeveloper(input: ConfirmUserMethodDeveloperInput!): ConfirmUserMethodDeveloperPayload!
-    @cost(weight: "10")
+  confirmUserEmailChange(
+    input: ConfirmUserEmailChangeInput!
+  ): ConfirmUserEmailChangePayload! @cost(weight: "10")
+  confirmUserMethodDeveloper(
+    input: ConfirmUserMethodDeveloperInput!
+  ): ConfirmUserMethodDeveloperPayload! @cost(weight: "10")
   createComponent(input: CreateComponentInput!): CreateComponentPayload!
     @cost(weight: "10")
   createDatabase(input: CreateDatabaseInput!): CreateDatabasePayload!
@@ -460,25 +493,29 @@ type Mutation {
     @cost(weight: "10")
   createMethod(input: CreateMethodInput!): CreateMethodPayload!
     @cost(weight: "10")
-  createOpenIdConnectApplication(input: CreateOpenIdConnectApplicationInput!): CreateOpenIdConnectApplicationPayload!
-    @cost(weight: "10")
+  createOpenIdConnectApplication(
+    input: CreateOpenIdConnectApplicationInput!
+  ): CreateOpenIdConnectApplicationPayload! @cost(weight: "10")
   deleteInstitution(input: DeleteInstitutionInput!): DeleteInstitutionPayload!
     @cost(weight: "10")
-  deleteOpenIdConnectApplication(input: DeleteOpenIdConnectApplicationInput!): DeleteOpenIdConnectApplicationPayload!
-    @cost(weight: "10")
+  deleteOpenIdConnectApplication(
+    input: DeleteOpenIdConnectApplicationInput!
+  ): DeleteOpenIdConnectApplicationPayload! @cost(weight: "10")
   deleteOpenIdConnectAuthorization(
     input: DeleteOpenIdConnectAuthorizationInput!
   ): DeleteOpenIdConnectAuthorizationPayload! @cost(weight: "10")
-  deletePersonalUserData(input: DeletePersonalUserDataInput!): DeletePersonalUserDataPayload!
-    @cost(weight: "10")
+  deletePersonalUserData(
+    input: DeletePersonalUserDataInput!
+  ): DeletePersonalUserDataPayload! @cost(weight: "10")
   deleteUser(input: DeleteUserInput!): DeleteUserPayload! @cost(weight: "10")
   disableUserTwoFactorAuthentication: DisableUserTwoFactorAuthenticationPayload!
     @cost(weight: "10")
   enableUserTwoFactorAuthenticator(
     input: EnableUserTwoFactorAuthenticatorInput!
   ): EnableUserTwoFactorAuthenticatorPayload! @cost(weight: "10")
-  forbidGnuPgKeyFingerprint(input: ForbidGnuPgKeyFingerprintInput!): ForbidGnuPgKeyFingerprintPayload!
-    @cost(weight: "10")
+  forbidGnuPgKeyFingerprint(
+    input: ForbidGnuPgKeyFingerprintInput!
+  ): ForbidGnuPgKeyFingerprintPayload! @cost(weight: "10")
   forgetUserTwoFactorAuthenticationClient: ForgetUserTwoFactorAuthenticationClientPayload!
     @cost(weight: "10")
   generateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri: GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUriPayload!
@@ -486,34 +523,44 @@ type Mutation {
   generateUserTwoFactorRecoveryCodes: GenerateUserTwoFactorRecoveryCodesPayload!
     @cost(weight: "10")
   loginUser(input: LoginUserInput!): LoginUserPayload! @cost(weight: "10")
-  loginUserWithRecoveryCode(input: LoginUserWithRecoveryCodeInput!): LoginUserWithRecoveryCodePayload!
-    @cost(weight: "10")
-  loginUserWithTwoFactorCode(input: LoginUserWithTwoFactorCodeInput!): LoginUserWithTwoFactorCodePayload!
-    @cost(weight: "10")
+  loginUserWithRecoveryCode(
+    input: LoginUserWithRecoveryCodeInput!
+  ): LoginUserWithRecoveryCodePayload! @cost(weight: "10")
+  loginUserWithTwoFactorCode(
+    input: LoginUserWithTwoFactorCodeInput!
+  ): LoginUserWithTwoFactorCodePayload! @cost(weight: "10")
   logoutUser: LogoutUserPayload! @cost(weight: "10")
   registerUser(input: RegisterUserInput!): RegisterUserPayload!
     @cost(weight: "10")
-  removeComponentAssembly(input: RemoveComponentAssemblyInput!): RemoveComponentAssemblyPayload!
-    @cost(weight: "10")
-  removeComponentGeneralization(input: RemoveComponentGeneralizationInput!): RemoveComponentGeneralizationPayload!
-    @cost(weight: "10")
-  removeComponentManufacturer(input: RemoveComponentManufacturerInput!): RemoveComponentManufacturerPayload!
-    @cost(weight: "10")
-  removeComponentVariant(input: RemoveComponentVariantInput!): RemoveComponentVariantPayload!
-    @cost(weight: "10")
+  removeComponentAssembly(
+    input: RemoveComponentAssemblyInput!
+  ): RemoveComponentAssemblyPayload! @cost(weight: "10")
+  removeComponentGeneralization(
+    input: RemoveComponentGeneralizationInput!
+  ): RemoveComponentGeneralizationPayload! @cost(weight: "10")
+  removeComponentManufacturer(
+    input: RemoveComponentManufacturerInput!
+  ): RemoveComponentManufacturerPayload! @cost(weight: "10")
+  removeComponentVariant(
+    input: RemoveComponentVariantInput!
+  ): RemoveComponentVariantPayload! @cost(weight: "10")
   removeInstitutionMethodDeveloper(
     input: RemoveInstitutionMethodDeveloperInput!
   ): RemoveInstitutionMethodDeveloperPayload! @cost(weight: "10")
-  removeInstitutionRepresentative(input: RemoveInstitutionRepresentativeInput!): RemoveInstitutionRepresentativePayload!
-    @cost(weight: "10")
-  removeUserMethodDeveloper(input: RemoveUserMethodDeveloperInput!): RemoveUserMethodDeveloperPayload!
-    @cost(weight: "10")
+  removeInstitutionRepresentative(
+    input: RemoveInstitutionRepresentativeInput!
+  ): RemoveInstitutionRepresentativePayload! @cost(weight: "10")
+  removeUserMethodDeveloper(
+    input: RemoveUserMethodDeveloperInput!
+  ): RemoveUserMethodDeveloperPayload! @cost(weight: "10")
   removeUserRole(input: RemoveUserRoleInput!): RemoveUserRolePayload!
     @cost(weight: "10")
-  requestUserPasswordReset(input: RequestUserPasswordResetInput!): RequestUserPasswordResetPayload!
-    @cost(weight: "10")
-  resendUserEmailConfirmation(input: ResendUserEmailConfirmationInput!): ResendUserEmailConfirmationPayload!
-    @cost(weight: "10")
+  requestUserPasswordReset(
+    input: RequestUserPasswordResetInput!
+  ): RequestUserPasswordResetPayload! @cost(weight: "10")
+  resendUserEmailConfirmation(
+    input: ResendUserEmailConfirmationInput!
+  ): ResendUserEmailConfirmationPayload! @cost(weight: "10")
   resendUserEmailVerification: ResendUserEmailVerificationPayload!
     @cost(weight: "10")
   resetOpenIdConnectApplicationClientSecret(
@@ -523,22 +570,28 @@ type Mutation {
     @cost(weight: "10")
   resetUserTwoFactorAuthenticator: ResetUserTwoFactorAuthenticatorPayload!
     @cost(weight: "10")
-  revokeOpenIdConnectToken(input: RevokeOpenIdConnectTokenInput!): RevokeOpenIdConnectTokenPayload!
-    @cost(weight: "10")
-  setComponentExtras(input: SetComponentExtrasInput!): SetComponentExtrasPayload!
-    @cost(weight: "10")
-  setInstitutionExtras(input: SetInstitutionExtrasInput!): SetInstitutionExtrasPayload!
-    @cost(weight: "10")
+  revokeOpenIdConnectToken(
+    input: RevokeOpenIdConnectTokenInput!
+  ): RevokeOpenIdConnectTokenPayload! @cost(weight: "10")
+  setComponentExtras(
+    input: SetComponentExtrasInput!
+  ): SetComponentExtrasPayload! @cost(weight: "10")
+  setInstitutionExtras(
+    input: SetInstitutionExtrasInput!
+  ): SetInstitutionExtrasPayload! @cost(weight: "10")
   setUserPassword(input: SetUserPasswordInput!): SetUserPasswordPayload!
     @cost(weight: "10")
-  setUserPhoneNumber(input: SetUserPhoneNumberInput!): SetUserPhoneNumberPayload!
-    @cost(weight: "10")
-  switchInstitutionOperatingState(input: SwitchInstitutionOperatingStateInput!): SwitchInstitutionOperatingStatePayload!
-    @cost(weight: "10")
+  setUserPhoneNumber(
+    input: SetUserPhoneNumberInput!
+  ): SetUserPhoneNumberPayload! @cost(weight: "10")
+  switchInstitutionOperatingState(
+    input: SwitchInstitutionOperatingStateInput!
+  ): SwitchInstitutionOperatingStatePayload! @cost(weight: "10")
   updateComponent(input: UpdateComponentInput!): UpdateComponentPayload!
     @cost(weight: "10")
-  updateComponentAssembly(input: UpdateComponentAssemblyInput!): UpdateComponentAssemblyPayload!
-    @cost(weight: "10")
+  updateComponentAssembly(
+    input: UpdateComponentAssemblyInput!
+  ): UpdateComponentAssemblyPayload! @cost(weight: "10")
   updateDatabase(input: UpdateDatabaseInput!): UpdateDatabasePayload!
     @cost(weight: "10")
   updateDataFormat(input: UpdateDataFormatInput!): UpdateDataFormatPayload!
@@ -547,8 +600,9 @@ type Mutation {
     @cost(weight: "10")
   updateMethod(input: UpdateMethodInput!): UpdateMethodPayload!
     @cost(weight: "10")
-  updateOpenIdConnectApplication(input: UpdateOpenIdConnectApplicationInput!): UpdateOpenIdConnectApplicationPayload!
-    @cost(weight: "10")
+  updateOpenIdConnectApplication(
+    input: UpdateOpenIdConnectApplicationInput!
+  ): UpdateOpenIdConnectApplicationPayload! @cost(weight: "10")
   verifyDatabase(input: VerifyDatabaseInput!): VerifyDatabasePayload!
     @cost(weight: "10")
   verifyInstitution(input: VerifyInstitutionInput!): VerifyInstitutionPayload!
@@ -1302,20 +1356,33 @@ type Database implements Node {
   data(id: Uuid!, kind: DataKind!, locale: Locale): Data @cost(weight: "10")
   description: String!
   geometricData(id: Uuid!, locale: Locale): GeometricData @cost(weight: "10")
-  hasCalorimetricData(locale: Locale, where: CalorimetricDataPropositionInput): Boolean
-    @cost(weight: "10")
-  hasData(kind: DataKind!, locale: Locale, where: DataPropositionInput): Boolean
-    @cost(weight: "10")
-  hasGeometricData(locale: Locale, where: GeometricDataPropositionInput): Boolean
-    @cost(weight: "10")
-  hasHygrothermalData(locale: Locale, where: HygrothermalDataPropositionInput): Boolean
-    @cost(weight: "10")
-  hasLifeCycleData(locale: Locale, where: LifeCycleDataPropositionInput): Boolean
-    @cost(weight: "10")
+  hasCalorimetricData(
+    locale: Locale
+    where: CalorimetricDataPropositionInput
+  ): Boolean @cost(weight: "10")
+  hasData(
+    kind: DataKind!
+    locale: Locale
+    where: DataPropositionInput
+  ): Boolean @cost(weight: "10")
+  hasGeometricData(
+    locale: Locale
+    where: GeometricDataPropositionInput
+  ): Boolean @cost(weight: "10")
+  hasHygrothermalData(
+    locale: Locale
+    where: HygrothermalDataPropositionInput
+  ): Boolean @cost(weight: "10")
+  hasLifeCycleData(
+    locale: Locale
+    where: LifeCycleDataPropositionInput
+  ): Boolean @cost(weight: "10")
   hasOpticalData(locale: Locale, where: OpticalDataPropositionInput): Boolean
     @cost(weight: "10")
-  hasPhotovoltaicData(locale: Locale, where: PhotovoltaicDataPropositionInput): Boolean
-    @cost(weight: "10")
+  hasPhotovoltaicData(
+    locale: Locale
+    where: PhotovoltaicDataPropositionInput
+  ): Boolean @cost(weight: "10")
   hygrothermalData(id: Uuid!, locale: Locale): HygrothermalData
     @cost(weight: "10")
   id: ID!
@@ -1767,8 +1834,10 @@ type Institution implements Node {
   ): InstitutionManufacturedComponentConnection! @cost(weight: "10")
   name: String!
   openIdConnectApplications(
-    order: [InstitutionOwnedOpenIdConnectApplicationSortInput!] @cost(weight: "10")
-    where: InstitutionOwnedOpenIdConnectApplicationFilterInput @cost(weight: "10")
+    order: [InstitutionOwnedOpenIdConnectApplicationSortInput!]
+      @cost(weight: "10")
+    where: InstitutionOwnedOpenIdConnectApplicationFilterInput
+      @cost(weight: "10")
   ): InstitutionOwnedOpenIdConnectApplicationConnection! @cost(weight: "10")
   operatedDatabases(
     order: [InstitutionOperatedDatabaseSortInput!] @cost(weight: "10")
@@ -5142,6 +5211,7 @@ enum OpticalComponentSubtype {
   SANDBLASTED_GLASS
   SHADE_MATERIAL
   SOLAR_SCREEN
+  UNKNOWN
   VENETIAN_BLIND
   VERTICAL_LOUVER
   WOVEN_SHADE
@@ -5536,13 +5606,7 @@ scalar Uuid
 directive @cost(
   "The `weight` argument defines what value to add to the overall cost for every appearance, or possible appearance, of a type, field, argument, etc."
   weight: String!
-) on
-  | SCALAR
-  | OBJECT
-  | FIELD_DEFINITION
-  | ARGUMENT_DEFINITION
-  | ENUM
-  | INPUT_FIELD_DEFINITION
+) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM | INPUT_FIELD_DEFINITION
 
 "The purpose of the `@listSize` directive is to either inform the static analysis about the size of returned lists (if that information is statically available), or to point the analysis to where to find that information."
 directive @listSize(
@@ -5556,4 +5620,5 @@ directive @listSize(
   slicingArgumentDefaultValue: Int
   "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments."
   slicingArguments: [String!]
-) on FIELD_DEFINITION
\ No newline at end of file
+) on FIELD_DEFINITION
+

From c283421c284b94a130c308550e41acb9124618b8 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sat, 27 Jun 2026 13:39:02 +0200
Subject: [PATCH 131/145] Remove unnecessary truthy filter

---
 .../components/institutions/Institution.tsx   | 177 +++++++++---------
 1 file changed, 88 insertions(+), 89 deletions(-)

diff --git a/frontend/components/institutions/Institution.tsx b/frontend/components/institutions/Institution.tsx
index fa08c9588..9776d1551 100644
--- a/frontend/components/institutions/Institution.tsx
+++ b/frontend/components/institutions/Institution.tsx
@@ -34,95 +34,94 @@ import MethodSummary from "../methods/MethodSummary";
 
 const getMainTabs = (
   institution: InstitutionPartialFragment,
-): LazyTabsProps["items"] =>
-  [
-    {
-      key: "components",
-      count: institution.manufacturedComponents.totalCount,
-      label: "Manufactured Components",
-      children: (
-        <PaginatedComponents
-          where={{
-            manufacturers: {
-              some: { id: { equalTo: institution.uuid } },
-            },
-          }}
-          order={{ createdAt: SortEnumType.Desc }}
-          extra={
-            institution.managedComponents.isAuthorizedToAddEdge && (
-              <CreateComponent
-                initialManager={institution}
-                initialManufacturer={institution}
-              />
-            )
-          }
-        />
-      ),
-    },
-    {
-      key: "methods",
-      count: institution.institutionDevelopedMethods.totalCount,
-      label: "Developed Methods",
-      children: (
-        <PaginatedMethods
-          where={{
-            institutionDevelopers: {
-              some: { id: { equalTo: institution.uuid } },
-            },
-          }}
-          order={{ createdAt: SortEnumType.Desc }}
-          extra={
-            institution.managedMethods.isAuthorizedToAddEdge && (
-              <CreateMethod
-                initialManager={institution}
-                initialInstitutionDevelopers={[institution]}
-              />
-            )
-          }
-        />
-      ),
-    },
-    {
-      key: "databases",
-      count: institution.operatedDatabases.totalCount,
-      label: "Operated Databases",
-      children: (
-        <PaginatedAnyDatabases
-          where={{
-            operator: {
-              id: { equalTo: institution.uuid },
-            },
-          }}
-          order={{ createdAt: SortEnumType.Desc }}
-          extra={
-            institution.operatedDatabases.isAuthorizedToAddEdge && (
-              <CreateDatabase initialOperator={institution} />
-            )
-          }
-        />
-      ),
-    },
-    {
-      key: "gnuPgKeyFingerprints",
-      count: institution.gnuPgKeyFingerprints.totalCount,
-      label: "GnuPG Key Fingerprints",
-      children: (
-        <PaginatedGnuPgKeys
-          where={{
-            institution: {
-              id: { equalTo: institution.uuid },
-            },
-          }}
-          order={{ createdAt: SortEnumType.Desc }}
-          extra={
-            institution.gnuPgKeyFingerprints.isAuthorizedToAddEdge && (
-              <AddGnuPgKeyFingerprint institutionId={institution.uuid} />
-            )
-          }
-        />
-      ),
-    },
-  ].filter(isTruthy);
+): LazyTabsProps["items"] => [
+  {
+    key: "components",
+    count: institution.manufacturedComponents.totalCount,
+    label: "Manufactured Components",
+    children: (
+      <PaginatedComponents
+        where={{
+          manufacturers: {
+            some: { id: { equalTo: institution.uuid } },
+          },
+        }}
+        order={{ createdAt: SortEnumType.Desc }}
+        extra={
+          institution.managedComponents.isAuthorizedToAddEdge && (
+            <CreateComponent
+              initialManager={institution}
+              initialManufacturer={institution}
+            />
+          )
+        }
+      />
+    ),
+  },
+  {
+    key: "methods",
+    count: institution.institutionDevelopedMethods.totalCount,
+    label: "Developed Methods",
+    children: (
+      <PaginatedMethods
+        where={{
+          institutionDevelopers: {
+            some: { id: { equalTo: institution.uuid } },
+          },
+        }}
+        order={{ createdAt: SortEnumType.Desc }}
+        extra={
+          institution.managedMethods.isAuthorizedToAddEdge && (
+            <CreateMethod
+              initialManager={institution}
+              initialInstitutionDevelopers={[institution]}
+            />
+          )
+        }
+      />
+    ),
+  },
+  {
+    key: "databases",
+    count: institution.operatedDatabases.totalCount,
+    label: "Operated Databases",
+    children: (
+      <PaginatedAnyDatabases
+        where={{
+          operator: {
+            id: { equalTo: institution.uuid },
+          },
+        }}
+        order={{ createdAt: SortEnumType.Desc }}
+        extra={
+          institution.operatedDatabases.isAuthorizedToAddEdge && (
+            <CreateDatabase initialOperator={institution} />
+          )
+        }
+      />
+    ),
+  },
+  {
+    key: "gnuPgKeyFingerprints",
+    count: institution.gnuPgKeyFingerprints.totalCount,
+    label: "GnuPG Key Fingerprints",
+    children: (
+      <PaginatedGnuPgKeys
+        where={{
+          institution: {
+            id: { equalTo: institution.uuid },
+          },
+        }}
+        order={{ createdAt: SortEnumType.Desc }}
+        extra={
+          institution.gnuPgKeyFingerprints.isAuthorizedToAddEdge && (
+            <AddGnuPgKeyFingerprint institutionId={institution.uuid} />
+          )
+        }
+      />
+    ),
+  },
+];
 
 const getManagedTabs = (
   institution: InstitutionPartialFragment,

From 86d7880b0a15a17b3949366cc348b1d2e57adf94 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sat, 27 Jun 2026 21:46:24 +0200
Subject: [PATCH 132/145] Support given parsed value to `DateTimeX` component

---
 frontend/components/DateTimeX.tsx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/frontend/components/DateTimeX.tsx b/frontend/components/DateTimeX.tsx
index fdd12a3e5..5e3a7af9d 100644
--- a/frontend/components/DateTimeX.tsx
+++ b/frontend/components/DateTimeX.tsx
@@ -2,12 +2,16 @@ import { Calendar, Popover } from "antd";
 import dayjs from "dayjs";
 import { Scalars } from "../__generated__/graphql";
 
-interface DateTimeProps {
-  value: Scalars["DateTime"]["output"];
-}
+type DateTimeProps =
+  | {
+      value: Scalars["DateTime"]["output"];
+    }
+  | {
+      parsedValue: dayjs.Dayjs;
+    };
 
-export default function DateTimeX({ value }: DateTimeProps) {
-  const parsedValue = dayjs(value);
+export default function DateTimeX(props: DateTimeProps) {
+  const parsedValue = "value" in props ? dayjs(props.value) : props.parsedValue;
 
   const calendarContent = (
     <div style={{ width: 300 }}>

From 25ba677d542049ce5e3243e2b66458be61afc517 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sun, 28 Jun 2026 13:32:59 +0200
Subject: [PATCH 133/145] Log non-sensitive variables in case a GraphQL query
 fails

---
 .../ErrorLoggingDiagnosticEventListener.cs    | 83 +++++++++----------
 1 file changed, 38 insertions(+), 45 deletions(-)

diff --git a/backend/src/GraphQl/ErrorLoggingDiagnosticEventListener.cs b/backend/src/GraphQl/ErrorLoggingDiagnosticEventListener.cs
index 1256eb48b..05a5bd539 100644
--- a/backend/src/GraphQl/ErrorLoggingDiagnosticEventListener.cs
+++ b/backend/src/GraphQl/ErrorLoggingDiagnosticEventListener.cs
@@ -8,6 +8,8 @@
 using HotChocolate.Resolvers;
 using Microsoft.Extensions.Logging;
 using HotChocolate.Language;
+using System.Text;
+using System.Globalization;
 
 namespace Metabase.GraphQl;
 
@@ -97,7 +99,8 @@ public static partial void OperationError(
         this ILogger<ErrorLoggingDiagnosticEventListener> logger,
         IOperationDocument? document,
         string? variables,
-        [TagProvider(typeof(HotChocolateIErrorTagProvider), nameof(HotChocolateIErrorTagProvider.RecordTags))] IError error
+        [TagProvider(typeof(HotChocolateIErrorTagProvider), nameof(HotChocolateIErrorTagProvider.RecordTags))] IError error,
+        Exception? exception
     );
 
     [LoggerMessage(
@@ -211,44 +214,39 @@ private sealed partial class RequestScope(ILogger<ErrorLoggingDiagnosticEventLis
 
         private string? StringifyVariables()
         {
-            // TODO Where are the variables now if not anymore in context.Variables?
-            // if (_variables is not null)
-            // {
-            //     return _variables;
-            // }
-            // if (context.Variables is null)
-            // {
-            //     return null;
-            // }
-            // StringBuilder stringBuilder = new();
-            // foreach (var variableValueCollection in context.Variables)
-            // {
-            //     foreach (var variableValue in variableValueCollection)
-            //     {
-            //         try
-            //         {
-            //             stringBuilder.AppendFormat(
-            //                 CultureInfo.InvariantCulture,
-            //                 $"{variableValue.Name} : {variableValue.Type} = "
-            //             );
-            //             stringBuilder.Append('\'');
-            //             stringBuilder.Append(
-            //                 SecretRegex().IsMatch(variableValue.Name)
-            //                 ? "<redacted>"
-            //                 : variableValue.Value.ToString()
-            //             );
-            //             stringBuilder.Append('\'');
-            //             stringBuilder.AppendFormat(CultureInfo.InvariantCulture, $"{Environment.NewLine}");
-            //         }
-            //         catch (Exception exception)
-            //         {
-            //             // all input type records will land here.
-            //             stringBuilder.AppendFormat(CultureInfo.InvariantCulture, $"Failed stringifying the value: {exception.Message}");
-            //             stringBuilder.AppendFormat(CultureInfo.InvariantCulture, $"{Environment.NewLine}");
-            //         }
-            //     }
-            // }
-            // _variables = stringBuilder.ToString();
+            if (_variables is not null)
+            {
+                return _variables;
+            }
+            var stringBuilder = new StringBuilder();
+            foreach (var variableValueCollection in context.VariableValues)
+            {
+                foreach (var variableValue in variableValueCollection)
+                {
+                    try
+                    {
+                        stringBuilder.AppendFormat(
+                            CultureInfo.InvariantCulture,
+                            $"{variableValue.Name} : {variableValue.Type} = "
+                        );
+                        stringBuilder.Append('\'');
+                        stringBuilder.Append(
+                            SecretRegex().IsMatch(variableValue.Name)
+                            ? "<redacted>"
+                            : variableValue.Value.ToString()
+                        );
+                        stringBuilder.Append('\'');
+                        stringBuilder.AppendFormat(CultureInfo.InvariantCulture, $"{Environment.NewLine}");
+                    }
+                    catch (Exception exception)
+                    {
+                        // all input type records will land here.
+                        stringBuilder.AppendFormat(CultureInfo.InvariantCulture, $"Failed stringifying the value: {exception.Message}");
+                        stringBuilder.AppendFormat(CultureInfo.InvariantCulture, $"{Environment.NewLine}");
+                    }
+                }
+            }
+            _variables = stringBuilder.ToString();
             _variables = null;
             return _variables;
         }
@@ -272,14 +270,9 @@ public void Dispose()
             {
                 foreach (var error in operationResult.Errors)
                 {
-                    logger.OperationError(context.Request.Document, StringifyVariables(), error);
+                    logger.OperationError(context.Request.Document, StringifyVariables(), error, error.Exception);
                 }
             }
-            // TODO Where is the exception now?
-            // if (context.Exception is { })
-            // {
-            //     logger.UnexpectedExecutionException(context.Request.Document, StringifyVariables(), context.Exception);
-            // }
         }
     }
 }
\ No newline at end of file

From 05974c740a0df076109ab9fb898459665a6b8ebc Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sun, 28 Jun 2026 15:03:27 +0200
Subject: [PATCH 134/145] Correct check that data format is non-null

---
 backend/src/Controllers/GetHttpsResourceController.cs | 6 +++---
 frontend/components/UuidFormItem.tsx                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/Controllers/GetHttpsResourceController.cs b/backend/src/Controllers/GetHttpsResourceController.cs
index edfed6cb5..b885d427a 100644
--- a/backend/src/Controllers/GetHttpsResourceController.cs
+++ b/backend/src/Controllers/GetHttpsResourceController.cs
@@ -98,11 +98,11 @@ CancellationToken cancellationToken
         var dataFormat = await databaseContext.DataFormats.AsNoTracking()
             .Where(_ => _.Id == getHttpsResource.DataFormatId)
             .SingleOrDefaultAsync(cancellationToken);
-        if (database is null)
+        if (dataFormat is null)
         {
             return Problem(
-                title: "Database Not Found",
-                detail: $"There is no database with ID '{databaseId:D}'.",
+                title: "Data Format Not Found",
+                detail: $"There is no data format with ID '{getHttpsResource.DataFormatId:D}'.",
                 statusCode: StatusCodes.Status404NotFound,
                 instance: HttpContext.Request.Path
             );
diff --git a/frontend/components/UuidFormItem.tsx b/frontend/components/UuidFormItem.tsx
index 91e9aae84..f8abc5acc 100644
--- a/frontend/components/UuidFormItem.tsx
+++ b/frontend/components/UuidFormItem.tsx
@@ -31,7 +31,7 @@ export default function UuidFormItem({
       <Input
         style={{ fontFamily: "monospace", ...style }}
         maxLength={36}
-        placeholder="xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx"
+        placeholder="xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
       />
     </Form.Item>
   );

From 146ee3f5c9b85c7b9d1d1e602f9cf8b6f0182d94 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sun, 28 Jun 2026 15:56:13 +0200
Subject: [PATCH 135/145] Tell to keep in sync with reverse proxy of machine

---
 nginx/templates/default.conf.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx/templates/default.conf.template b/nginx/templates/default.conf.template
index c755fb734..52b904ea4 100644
--- a/nginx/templates/default.conf.template
+++ b/nginx/templates/default.conf.template
@@ -1,5 +1,5 @@
-# Inspired by https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/linux-nginx?view=aspnetcore-3.1#https-configuration
-# and https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/linux-nginx?view=aspnetcore-3.1#configure-nginx
+# Keep in sync with the NGINX config of the reverse proxy of the machine project
+# ------------------------------------------------------------------------------
 
 # `127.0.0.11` is the default IP address for Docker's embedded DNS server. You can verify it by running `cat /etc/resolv.conf` inside a container.
 # `valid=5s` forces NGINX to re-resolve hostnames every 30 seconds. This is critical in Docker because container IPs can change during a docker-compose restart.

From 4a1b97ba26eb409e2b485f2aaddcd1086893eff4 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sun, 28 Jun 2026 16:55:04 +0200
Subject: [PATCH 136/145] Make schema more compliant with the one of databases,
 in particular, correct GraphQL types of parameter `locale` and properties
 `vertexId`/`parentId`, and allow null as values in the lists
 `OpticalComponent(Sub)TypePropositionInput.(not)In`, and make coated side
 required

---
 .../CalorimetricDataQueries.cs                |  8 +--
 .../GraphQl/Components/ComponentMutations.cs  |  3 +-
 .../GetHttpsResourceTreeNonRootVertex.cs      |  7 ++-
 .../GraphQl/DataX/GetHttpsResourceTreeRoot.cs |  5 +-
 .../DataX/IGetHttpsResourceTreeVertex.cs      |  3 +-
 .../GeometricDataX/GeometricDataQueries.cs    |  8 +--
 .../HygrothermalDataQueries.cs                |  8 +--
 .../LifeCycleDataX/LifeCycleDataQueries.cs    |  8 +--
 ...OpticalComponentSubtypePropositionInput.cs |  4 +-
 .../OpticalComponentTypePropositionInput.cs   |  4 +-
 .../src/GraphQl/OpticalDataX/OpticalData.cs   |  2 +-
 .../OpticalDataX/OpticalDataQueries.cs        |  8 +--
 .../PhotovoltaicDataQueries.cs                |  8 +--
 backend/src/GraphQl/Requests/DataQueries.cs   | 53 ++++++++++---------
 14 files changed, 73 insertions(+), 56 deletions(-)

diff --git a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs
index f1c2df27f..3eb4904de 100644
--- a/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs
+++ b/backend/src/GraphQl/CalorimetricDataX/CalorimetricDataQueries.cs
@@ -2,11 +2,13 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate;
 using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
 using Metabase.GraphQl.Requests;
+using Metabase.GraphQl.Scalars;
 using Microsoft.EntityFrameworkCore;
 
 namespace Metabase.GraphQl.CalorimetricDataX;
@@ -17,7 +19,7 @@ public sealed class CalorimetricDataQueries
     public async Task<CalorimetricData?> GetCalorimetricDataAsync(
         Guid databaseId,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         DataQueries dataQueries,
         ApplicationDbContext databaseContext,
         IResolverContext resolverContext,
@@ -49,7 +51,7 @@ CancellationToken cancellationToken
     )]
     public Task<CalorimetricDataConnection> GetAllCalorimetricDataAsync(
         CalorimetricDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -83,7 +85,7 @@ CancellationToken cancellationToken
 
     public Task<bool> HasCalorimetricDataAsync(
         CalorimetricDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         DataQueries dataQueries,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
diff --git a/backend/src/GraphQl/Components/ComponentMutations.cs b/backend/src/GraphQl/Components/ComponentMutations.cs
index 46023c5ad..ddc2dcc83 100644
--- a/backend/src/GraphQl/Components/ComponentMutations.cs
+++ b/backend/src/GraphQl/Components/ComponentMutations.cs
@@ -28,7 +28,6 @@ public async Task<CreateComponentPayload> CreateComponentAsync(
         CancellationToken cancellationToken
     )
     {
-        // TODO Make CreateComponentInput.ManagerId required and remove fallback in mutation
         var applicationOwnerId = await authorization.SwitchUserOrApplicationAsync(
             claimsPrincipal,
             _ => Task.FromResult<Guid?>(null),
@@ -391,4 +390,4 @@ await context.Components.AsQueryable()
         await context.SaveChangesAsync(cancellationToken);
         return new SetComponentExtrasPayload(component);
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/GetHttpsResourceTreeNonRootVertex.cs b/backend/src/GraphQl/DataX/GetHttpsResourceTreeNonRootVertex.cs
index 6dd6b3c65..5a50e1948 100644
--- a/backend/src/GraphQl/DataX/GetHttpsResourceTreeNonRootVertex.cs
+++ b/backend/src/GraphQl/DataX/GetHttpsResourceTreeNonRootVertex.cs
@@ -1,9 +1,12 @@
+using HotChocolate;
+using HotChocolate.Types;
+
 namespace Metabase.GraphQl.DataX;
 
 public sealed record GetHttpsResourceTreeNonRootVertex(
-    string VertexId,
+    [property: GraphQLType<NonNullType<IdType>>] string VertexId,
     GetHttpsResource Value,
-    string ParentId,
+    [property: GraphQLType<NonNullType<IdType>>] string ParentId,
     ToTreeVertexAppliedConversionMethod AppliedConversionMethod
 )
 : IGetHttpsResourceTreeVertex;
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/GetHttpsResourceTreeRoot.cs b/backend/src/GraphQl/DataX/GetHttpsResourceTreeRoot.cs
index 402dfbb4f..fe6b6887d 100644
--- a/backend/src/GraphQl/DataX/GetHttpsResourceTreeRoot.cs
+++ b/backend/src/GraphQl/DataX/GetHttpsResourceTreeRoot.cs
@@ -1,8 +1,9 @@
-using System;
+using HotChocolate;
+using HotChocolate.Types;
 
 namespace Metabase.GraphQl.DataX;
 
 public sealed record GetHttpsResourceTreeRoot(
-    string VertexId,
+    [property: GraphQLType<NonNullType<IdType>>] string VertexId,
     GetHttpsResource Value
 ) : IGetHttpsResourceTreeVertex;
\ No newline at end of file
diff --git a/backend/src/GraphQl/DataX/IGetHttpsResourceTreeVertex.cs b/backend/src/GraphQl/DataX/IGetHttpsResourceTreeVertex.cs
index 7304ed573..677ab8dfa 100644
--- a/backend/src/GraphQl/DataX/IGetHttpsResourceTreeVertex.cs
+++ b/backend/src/GraphQl/DataX/IGetHttpsResourceTreeVertex.cs
@@ -1,3 +1,4 @@
+using HotChocolate;
 using HotChocolate.Types;
 
 namespace Metabase.GraphQl.DataX;
@@ -5,6 +6,6 @@ namespace Metabase.GraphQl.DataX;
 [InterfaceType("GetHttpsResourceTreeVertex")]
 public interface IGetHttpsResourceTreeVertex
 {
-    // string VertexId { get; }
+    [property: GraphQLType<NonNullType<IdType>>] string VertexId { get; }
     GetHttpsResource Value { get; }
 }
\ No newline at end of file
diff --git a/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs b/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs
index 30f0a8e8f..6e27642d3 100644
--- a/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs
+++ b/backend/src/GraphQl/GeometricDataX/GeometricDataQueries.cs
@@ -2,11 +2,13 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate;
 using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
 using Metabase.GraphQl.Requests;
+using Metabase.GraphQl.Scalars;
 using Microsoft.EntityFrameworkCore;
 
 namespace Metabase.GraphQl.GeometricDataX;
@@ -17,7 +19,7 @@ public sealed class GeometricDataQueries
     public async Task<GeometricData?> GetGeometricDataAsync(
         Guid databaseId,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         DataQueries dataQueries,
         ApplicationDbContext databaseContext,
         IResolverContext resolverContext,
@@ -49,7 +51,7 @@ CancellationToken cancellationToken
     )]
     public Task<GeometricDataConnection> GetAllGeometricDataAsync(
         GeometricDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -83,7 +85,7 @@ CancellationToken cancellationToken
 
     public Task<bool> HasGeometricDataAsync(
         GeometricDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         DataQueries dataQueries,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
diff --git a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs
index d661d7c26..b5ac4b9f2 100644
--- a/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs
+++ b/backend/src/GraphQl/HygrothermalDataX/HygrothermalDataQueries.cs
@@ -2,10 +2,12 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate;
 using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
+using Metabase.GraphQl.Scalars;
 using Metabase.GraphQl.Requests;
 using Microsoft.EntityFrameworkCore;
 
@@ -17,7 +19,7 @@ public sealed class HygrothermalDataQueries
     public async Task<HygrothermalData?> GetHygrothermalDataAsync(
         Guid databaseId,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         DataQueries dataQueries,
         ApplicationDbContext databaseContext,
         IResolverContext resolverContext,
@@ -49,7 +51,7 @@ CancellationToken cancellationToken
     )]
     public Task<HygrothermalDataConnection> GetAllHygrothermalDataAsync(
         HygrothermalDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -83,7 +85,7 @@ CancellationToken cancellationToken
 
     public Task<bool> HasHygrothermalDataAsync(
         HygrothermalDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         DataQueries dataQueries,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
diff --git a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs
index e91b21ab3..748bc79cb 100644
--- a/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs
+++ b/backend/src/GraphQl/LifeCycleDataX/LifeCycleDataQueries.cs
@@ -2,10 +2,12 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate;
 using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
+using Metabase.GraphQl.Scalars;
 using Metabase.GraphQl.Requests;
 using Microsoft.EntityFrameworkCore;
 
@@ -17,7 +19,7 @@ public sealed class LifeCycleDataQueries
     public async Task<LifeCycleData?> GetLifeCycleDataAsync(
         Guid databaseId,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         DataQueries dataQueries,
         ApplicationDbContext databaseContext,
         IResolverContext resolverContext,
@@ -49,7 +51,7 @@ CancellationToken cancellationToken
     )]
     public Task<LifeCycleDataConnection> GetAllLifeCycleDataAsync(
         LifeCycleDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -83,7 +85,7 @@ CancellationToken cancellationToken
 
     public Task<bool> HasLifeCycleDataAsync(
         LifeCycleDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         DataQueries dataQueries,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
diff --git a/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtypePropositionInput.cs b/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtypePropositionInput.cs
index db15d9aea..dd2ca5f17 100644
--- a/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtypePropositionInput.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalComponentSubtypePropositionInput.cs
@@ -5,6 +5,6 @@ namespace Metabase.GraphQl.OpticalDataX;
 public sealed record OpticalComponentSubtypePropositionInput(
   OpticalComponentSubtype? EqualTo,
   OpticalComponentSubtype? NotEqualTo,
-  IReadOnlyList<OpticalComponentSubtype>? In,
-  IReadOnlyList<OpticalComponentSubtype>? NotIn
+  IReadOnlyList<OpticalComponentSubtype?>? In,
+  IReadOnlyList<OpticalComponentSubtype?>? NotIn
 );
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpticalDataX/OpticalComponentTypePropositionInput.cs b/backend/src/GraphQl/OpticalDataX/OpticalComponentTypePropositionInput.cs
index 9000a26f6..2078eedb4 100644
--- a/backend/src/GraphQl/OpticalDataX/OpticalComponentTypePropositionInput.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalComponentTypePropositionInput.cs
@@ -5,6 +5,6 @@ namespace Metabase.GraphQl.OpticalDataX;
 public sealed record OpticalComponentTypePropositionInput(
   OpticalComponentType? EqualTo,
   OpticalComponentType? NotEqualTo,
-  IReadOnlyList<OpticalComponentType>? In,
-  IReadOnlyList<OpticalComponentType>? NotIn
+  IReadOnlyList<OpticalComponentType?>? In,
+  IReadOnlyList<OpticalComponentType?>? NotIn
 );
\ No newline at end of file
diff --git a/backend/src/GraphQl/OpticalDataX/OpticalData.cs b/backend/src/GraphQl/OpticalDataX/OpticalData.cs
index d1e0625c1..1c42f3774 100644
--- a/backend/src/GraphQl/OpticalDataX/OpticalData.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalData.cs
@@ -26,7 +26,7 @@ public sealed record OpticalData(
     OffsetDateTime CreatedAt,
     OpticalComponentType? Type,
     OpticalComponentSubtype? Subtype,
-    CoatedSide? CoatedSide,
+    CoatedSide CoatedSide,
     AppliedMethod AppliedMethod,
     IReadOnlyList<GetHttpsResource> Resources,
     GetHttpsResourceTree ResourceTree,
diff --git a/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs b/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs
index b5916dc3f..d7acff48b 100644
--- a/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs
+++ b/backend/src/GraphQl/OpticalDataX/OpticalDataQueries.cs
@@ -2,10 +2,12 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate;
 using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
+using Metabase.GraphQl.Scalars;
 using Metabase.GraphQl.Requests;
 using Microsoft.EntityFrameworkCore;
 
@@ -17,7 +19,7 @@ public sealed class OpticalDataQueries
     public async Task<OpticalData?> GetOpticalDataAsync(
         Guid databaseId,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         DataQueries dataQueries,
         ApplicationDbContext databaseContext,
         IResolverContext resolverContext,
@@ -49,7 +51,7 @@ CancellationToken cancellationToken
     )]
     public Task<OpticalDataConnection> GetAllOpticalDataAsync(
         OpticalDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -83,7 +85,7 @@ CancellationToken cancellationToken
 
     public Task<bool> HasOpticalDataAsync(
         OpticalDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         DataQueries dataQueries,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
diff --git a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs
index 927dddfb1..9a21d436c 100644
--- a/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs
+++ b/backend/src/GraphQl/PhotovoltaicDataX/PhotovoltaicDataQueries.cs
@@ -2,10 +2,12 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using HotChocolate;
 using HotChocolate.CostAnalysis.Types;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
 using Metabase.Data;
+using Metabase.GraphQl.Scalars;
 using Metabase.GraphQl.Requests;
 using Microsoft.EntityFrameworkCore;
 
@@ -17,7 +19,7 @@ public sealed class PhotovoltaicDataQueries
     public async Task<PhotovoltaicData?> GetPhotovoltaicDataAsync(
         Guid databaseId,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         DataQueries dataQueries,
         ApplicationDbContext databaseContext,
         IResolverContext resolverContext,
@@ -49,7 +51,7 @@ CancellationToken cancellationToken
     )]
     public Task<PhotovoltaicDataConnection> GetAllPhotovoltaicDataAsync(
         PhotovoltaicDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -83,7 +85,7 @@ CancellationToken cancellationToken
 
     public Task<bool> HasPhotovoltaicDataAsync(
         PhotovoltaicDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         DataQueries dataQueries,
         IResolverContext resolverContext,
         CancellationToken cancellationToken
diff --git a/backend/src/GraphQl/Requests/DataQueries.cs b/backend/src/GraphQl/Requests/DataQueries.cs
index b93be9bdd..cc8a6c6b8 100644
--- a/backend/src/GraphQl/Requests/DataQueries.cs
+++ b/backend/src/GraphQl/Requests/DataQueries.cs
@@ -2,9 +2,14 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Text.Json.Serialization;
+using System.Linq;
 using GraphQL;
 using HotChocolate;
 using HotChocolate.Resolvers;
+using HotChocolate.Types.Pagination;
 using Metabase.Data;
 using Metabase.GraphQl.DataX;
 using Metabase.GraphQl.CalorimetricDataX;
@@ -14,14 +19,10 @@
 using Metabase.GraphQl.OpticalDataX;
 using Metabase.GraphQl.PhotovoltaicDataX;
 using Metabase.Json;
+using Metabase.GraphQl.Scalars;
+using Metabase.Extensions;
 using Microsoft.Extensions.Logging;
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using HotChocolate.Types.Pagination;
-using Metabase.Extensions;
-using System.Text.Json.Serialization;
 
 namespace Metabase.GraphQl.Requests;
 
@@ -490,7 +491,7 @@ CancellationToken cancellationToken
         Database database,
         Guid id,
         DataKind kind,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
@@ -511,7 +512,7 @@ CancellationToken cancellationToken
         Database database,
         DataKind kind,
         DataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
@@ -531,7 +532,7 @@ CancellationToken cancellationToken
     public async Task<CalorimetricData?> GetCalorimetricDataAsync(
         Database database,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
@@ -558,7 +559,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<GeometricData?> GetGeometricDataAsync(
         Database database,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
@@ -585,7 +586,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<HygrothermalData?> GetHygrothermalDataAsync(
         Database database,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
@@ -612,7 +613,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<LifeCycleData?> GetLifeCycleDataAsync(
         Database database,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
@@ -640,7 +641,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<OpticalData?> GetOpticalDataAsync(
         Database database,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
@@ -667,7 +668,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<PhotovoltaicData?> GetPhotovoltaicDataAsync(
         Database database,
         Guid id,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
@@ -694,7 +695,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<CalorimetricDataConnection?> GetAllCalorimetricDataAsync(
         Database database,
         CalorimetricDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -729,7 +730,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<GeometricDataConnection?> GetAllGeometricDataAsync(
         Database database,
         GeometricDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -763,7 +764,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<HygrothermalDataConnection?> GetAllHygrothermalDataAsync(
         Database database,
         HygrothermalDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -798,7 +799,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<LifeCycleDataConnection?> GetAllLifeCycleDataAsync(
         Database database,
         LifeCycleDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -833,7 +834,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<OpticalDataConnection?> GetAllOpticalDataAsync(
         Database database,
         OpticalDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -867,7 +868,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<PhotovoltaicDataConnection?> GetAllPhotovoltaicDataAsync(
         Database database,
         PhotovoltaicDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         int? first,
         string? after,
         int? last,
@@ -902,7 +903,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<bool?> HasCalorimetricDataAsync(
         Database database,
         CalorimetricDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
@@ -929,7 +930,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<bool?> HasGeometricDataAsync(
         Database database,
         GeometricDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
@@ -956,7 +957,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<bool?> HasHygrothermalDataAsync(
         Database database,
         HygrothermalDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
@@ -983,7 +984,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<bool?> HasLifeCycleDataAsync(
         Database database,
         LifeCycleDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
@@ -1010,7 +1011,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<bool?> HasOpticalDataAsync(
         Database database,
         OpticalDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )
@@ -1037,7 +1038,7 @@ await QueryingDatabases.ConstructQuery(
     public async Task<bool?> HasPhotovoltaicDataAsync(
         Database database,
         PhotovoltaicDataPropositionInput? where,
-        string? locale,
+        [GraphQLType<LocaleType>] string? locale,
         IResolverContext? resolverContext,
         CancellationToken cancellationToken
     )

From 962c47251c1f67a4fca5eab329b9055392544409 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Sun, 28 Jun 2026 17:01:06 +0200
Subject: [PATCH 137/145] Update the GraphQL schema

---
 .../GraphQlSchemaTests.IsUnchanged.snap       |  55 +--
 frontend/type-defs.graphqls                   | 317 +++++++-----------
 2 files changed, 155 insertions(+), 217 deletions(-)

diff --git a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
index e225064fc..f3ac716aa 100644
--- a/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
+++ b/backend/test/Integration/GraphQl/__snapshots__/GraphQlSchemaTests.IsUnchanged.snap
@@ -9,7 +9,7 @@ type Query {
     before: String
     first: Int
     last: Int
-    locale: String
+    locale: Locale
     where: CalorimetricDataPropositionInput
   ): CalorimetricDataConnection!
     @listSize(
@@ -25,7 +25,7 @@ type Query {
     before: String
     first: Int
     last: Int
-    locale: String
+    locale: Locale
     where: GeometricDataPropositionInput
   ): GeometricDataConnection!
     @listSize(
@@ -41,7 +41,7 @@ type Query {
     before: String
     first: Int
     last: Int
-    locale: String
+    locale: Locale
     where: HygrothermalDataPropositionInput
   ): HygrothermalDataConnection!
     @listSize(
@@ -57,7 +57,7 @@ type Query {
     before: String
     first: Int
     last: Int
-    locale: String
+    locale: Locale
     where: LifeCycleDataPropositionInput
   ): LifeCycleDataConnection!
     @listSize(
@@ -73,7 +73,7 @@ type Query {
     before: String
     first: Int
     last: Int
-    locale: String
+    locale: Locale
     where: OpticalDataPropositionInput
   ): OpticalDataConnection!
     @listSize(
@@ -89,7 +89,7 @@ type Query {
     before: String
     first: Int
     last: Int
-    locale: String
+    locale: Locale
     where: PhotovoltaicDataPropositionInput
   ): PhotovoltaicDataConnection!
     @listSize(
@@ -120,7 +120,7 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  calorimetricData(databaseId: Uuid!, id: Uuid!, locale: String): CalorimetricData
+  calorimetricData(databaseId: Uuid!, id: Uuid!, locale: Locale): CalorimetricData
     @cost(weight: "10")
   component(id: Uuid!): Component @cost(weight: "10")
   components(
@@ -189,7 +189,7 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  geometricData(databaseId: Uuid!, id: Uuid!, locale: String): GeometricData
+  geometricData(databaseId: Uuid!, id: Uuid!, locale: Locale): GeometricData
     @cost(weight: "10")
   gnuPgKeyFingerprint(fingerprint: String!): GnuPgKeyFingerprint
     @cost(weight: "10")
@@ -213,19 +213,19 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  hasCalorimetricData(locale: String, where: CalorimetricDataPropositionInput): Boolean!
+  hasCalorimetricData(locale: Locale, where: CalorimetricDataPropositionInput): Boolean!
     @cost(weight: "10")
-  hasGeometricData(locale: String, where: GeometricDataPropositionInput): Boolean!
+  hasGeometricData(locale: Locale, where: GeometricDataPropositionInput): Boolean!
     @cost(weight: "10")
-  hasHygrothermalData(locale: String, where: HygrothermalDataPropositionInput): Boolean!
+  hasHygrothermalData(locale: Locale, where: HygrothermalDataPropositionInput): Boolean!
     @cost(weight: "10")
-  hasLifeCycleData(locale: String, where: LifeCycleDataPropositionInput): Boolean!
+  hasLifeCycleData(locale: Locale, where: LifeCycleDataPropositionInput): Boolean!
     @cost(weight: "10")
-  hasOpticalData(locale: String, where: OpticalDataPropositionInput): Boolean!
+  hasOpticalData(locale: Locale, where: OpticalDataPropositionInput): Boolean!
     @cost(weight: "10")
-  hasPhotovoltaicData(locale: String, where: PhotovoltaicDataPropositionInput): Boolean!
+  hasPhotovoltaicData(locale: Locale, where: PhotovoltaicDataPropositionInput): Boolean!
     @cost(weight: "10")
-  hygrothermalData(databaseId: Uuid!, id: Uuid!, locale: String): HygrothermalData
+  hygrothermalData(databaseId: Uuid!, id: Uuid!, locale: Locale): HygrothermalData
     @cost(weight: "10")
   institution(id: Uuid!): Institution @cost(weight: "10")
   institutions(
@@ -248,7 +248,7 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  lifeCycleData(databaseId: Uuid!, id: Uuid!, locale: String): LifeCycleData
+  lifeCycleData(databaseId: Uuid!, id: Uuid!, locale: Locale): LifeCycleData
     @cost(weight: "10")
   method(id: Uuid!): Method @cost(weight: "10")
   methods(
@@ -342,7 +342,7 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  opticalData(databaseId: Uuid!, id: Uuid!, locale: String): OpticalData
+  opticalData(databaseId: Uuid!, id: Uuid!, locale: Locale): OpticalData
     @cost(weight: "10")
   pendingDatabases(
     "Returns the elements in the list that come after the specified cursor."
@@ -384,7 +384,7 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  photovoltaicData(databaseId: Uuid!, id: Uuid!, locale: String): PhotovoltaicData
+  photovoltaicData(databaseId: Uuid!, id: Uuid!, locale: Locale): PhotovoltaicData
     @cost(weight: "10")
   user(id: Uuid!): User @cost(weight: "10")
   users(
@@ -1590,14 +1590,14 @@ type GetHttpsResourceTree {
 
 type GetHttpsResourceTreeNonRootVertex implements GetHttpsResourceTreeVertex {
   appliedConversionMethod: ToTreeVertexAppliedConversionMethod!
-  parentId: String!
+  parentId: ID!
   value: GetHttpsResource!
-  vertexId: String!
+  vertexId: ID!
 }
 
 type GetHttpsResourceTreeRoot implements GetHttpsResourceTreeVertex {
   value: GetHttpsResource!
-  vertexId: String!
+  vertexId: ID!
 }
 
 type GnuPgKeyFingerprint implements Node {
@@ -2292,7 +2292,7 @@ type OpticalData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
   cielabColors: [CielabColor!]!
-  coatedSide: CoatedSide
+  coatedSide: CoatedSide!
   colorRenderingIndices: [Float!]!
   component: Component @cost(weight: "10")
   componentId: Uuid!
@@ -3024,6 +3024,7 @@ interface Data {
 
 interface GetHttpsResourceTreeVertex {
   value: GetHttpsResource!
+  vertexId: ID!
 }
 
 "The node interface is implemented by entities that have a global unique identifier."
@@ -4279,16 +4280,16 @@ input OpenIdConnectTokenSortInput {
 
 input OpticalComponentSubtypePropositionInput {
   equalTo: OpticalComponentSubtype
-  in: [OpticalComponentSubtype!]
+  in: [OpticalComponentSubtype]
   notEqualTo: OpticalComponentSubtype
-  notIn: [OpticalComponentSubtype!]
+  notIn: [OpticalComponentSubtype]
 }
 
 input OpticalComponentTypePropositionInput {
   equalTo: OpticalComponentType
-  in: [OpticalComponentType!]
+  in: [OpticalComponentType]
   notEqualTo: OpticalComponentType
-  notIn: [OpticalComponentType!]
+  notIn: [OpticalComponentType]
 }
 
 input OpticalDataPropositionInput {
@@ -5557,4 +5558,4 @@ directive @listSize(
   slicingArgumentDefaultValue: Int
   "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments."
   slicingArguments: [String!]
-) on FIELD_DEFINITION
+) on FIELD_DEFINITION
\ No newline at end of file
diff --git a/frontend/type-defs.graphqls b/frontend/type-defs.graphqls
index f87c3230a..f3ac716aa 100644
--- a/frontend/type-defs.graphqls
+++ b/frontend/type-defs.graphqls
@@ -9,7 +9,7 @@ type Query {
     before: String
     first: Int
     last: Int
-    locale: String
+    locale: Locale
     where: CalorimetricDataPropositionInput
   ): CalorimetricDataConnection!
     @listSize(
@@ -25,7 +25,7 @@ type Query {
     before: String
     first: Int
     last: Int
-    locale: String
+    locale: Locale
     where: GeometricDataPropositionInput
   ): GeometricDataConnection!
     @listSize(
@@ -41,7 +41,7 @@ type Query {
     before: String
     first: Int
     last: Int
-    locale: String
+    locale: Locale
     where: HygrothermalDataPropositionInput
   ): HygrothermalDataConnection!
     @listSize(
@@ -57,7 +57,7 @@ type Query {
     before: String
     first: Int
     last: Int
-    locale: String
+    locale: Locale
     where: LifeCycleDataPropositionInput
   ): LifeCycleDataConnection!
     @listSize(
@@ -73,7 +73,7 @@ type Query {
     before: String
     first: Int
     last: Int
-    locale: String
+    locale: Locale
     where: OpticalDataPropositionInput
   ): OpticalDataConnection!
     @listSize(
@@ -89,7 +89,7 @@ type Query {
     before: String
     first: Int
     last: Int
-    locale: String
+    locale: Locale
     where: PhotovoltaicDataPropositionInput
   ): PhotovoltaicDataConnection!
     @listSize(
@@ -120,11 +120,8 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  calorimetricData(
-    databaseId: Uuid!
-    id: Uuid!
-    locale: String
-  ): CalorimetricData @cost(weight: "10")
+  calorimetricData(databaseId: Uuid!, id: Uuid!, locale: Locale): CalorimetricData
+    @cost(weight: "10")
   component(id: Uuid!): Component @cost(weight: "10")
   components(
     "Returns the elements in the list that come after the specified cursor."
@@ -192,7 +189,7 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  geometricData(databaseId: Uuid!, id: Uuid!, locale: String): GeometricData
+  geometricData(databaseId: Uuid!, id: Uuid!, locale: Locale): GeometricData
     @cost(weight: "10")
   gnuPgKeyFingerprint(fingerprint: String!): GnuPgKeyFingerprint
     @cost(weight: "10")
@@ -216,33 +213,20 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  hasCalorimetricData(
-    locale: String
-    where: CalorimetricDataPropositionInput
-  ): Boolean! @cost(weight: "10")
-  hasGeometricData(
-    locale: String
-    where: GeometricDataPropositionInput
-  ): Boolean! @cost(weight: "10")
-  hasHygrothermalData(
-    locale: String
-    where: HygrothermalDataPropositionInput
-  ): Boolean! @cost(weight: "10")
-  hasLifeCycleData(
-    locale: String
-    where: LifeCycleDataPropositionInput
-  ): Boolean! @cost(weight: "10")
-  hasOpticalData(locale: String, where: OpticalDataPropositionInput): Boolean!
+  hasCalorimetricData(locale: Locale, where: CalorimetricDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasGeometricData(locale: Locale, where: GeometricDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasHygrothermalData(locale: Locale, where: HygrothermalDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasLifeCycleData(locale: Locale, where: LifeCycleDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasOpticalData(locale: Locale, where: OpticalDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hasPhotovoltaicData(locale: Locale, where: PhotovoltaicDataPropositionInput): Boolean!
+    @cost(weight: "10")
+  hygrothermalData(databaseId: Uuid!, id: Uuid!, locale: Locale): HygrothermalData
     @cost(weight: "10")
-  hasPhotovoltaicData(
-    locale: String
-    where: PhotovoltaicDataPropositionInput
-  ): Boolean! @cost(weight: "10")
-  hygrothermalData(
-    databaseId: Uuid!
-    id: Uuid!
-    locale: String
-  ): HygrothermalData @cost(weight: "10")
   institution(id: Uuid!): Institution @cost(weight: "10")
   institutions(
     "Returns the elements in the list that come after the specified cursor."
@@ -264,7 +248,7 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  lifeCycleData(databaseId: Uuid!, id: Uuid!, locale: String): LifeCycleData
+  lifeCycleData(databaseId: Uuid!, id: Uuid!, locale: Locale): LifeCycleData
     @cost(weight: "10")
   method(id: Uuid!): Method @cost(weight: "10")
   methods(
@@ -293,9 +277,8 @@ type Query {
   nodes("The list of node IDs." ids: [ID!]!): [Node]! @cost(weight: "10")
   openIdConnectApplication(id: Uuid!): OpenIdConnectApplication
     @cost(weight: "10")
-  openIdConnectApplicationByClientId(
-    clientId: String!
-  ): OpenIdConnectApplication @cost(weight: "10")
+  openIdConnectApplicationByClientId(clientId: String!): OpenIdConnectApplication
+    @cost(weight: "10")
   openIdConnectApplications(
     "Returns the elements in the list that come after the specified cursor."
     after: String
@@ -359,7 +342,7 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  opticalData(databaseId: Uuid!, id: Uuid!, locale: String): OpticalData
+  opticalData(databaseId: Uuid!, id: Uuid!, locale: Locale): OpticalData
     @cost(weight: "10")
   pendingDatabases(
     "Returns the elements in the list that come after the specified cursor."
@@ -401,11 +384,8 @@ type Query {
       requireOneSlicingArgument: false
     )
     @cost(weight: "10")
-  photovoltaicData(
-    databaseId: Uuid!
-    id: Uuid!
-    locale: String
-  ): PhotovoltaicData @cost(weight: "10")
+  photovoltaicData(databaseId: Uuid!, id: Uuid!, locale: Locale): PhotovoltaicData
+    @cost(weight: "10")
   user(id: Uuid!): User @cost(weight: "10")
   users(
     "Returns the elements in the list that come after the specified cursor."
@@ -430,45 +410,34 @@ type Query {
 }
 
 type Mutation {
-  addComponentAssembly(
-    input: AddComponentAssemblyInput!
-  ): AddComponentAssemblyPayload! @cost(weight: "10")
-  addComponentGeneralization(
-    input: AddComponentGeneralizationInput!
-  ): AddComponentGeneralizationPayload! @cost(weight: "10")
-  addComponentManufacturer(
-    input: AddComponentManufacturerInput!
-  ): AddComponentManufacturerPayload! @cost(weight: "10")
-  addComponentVariant(
-    input: AddComponentVariantInput!
-  ): AddComponentVariantPayload! @cost(weight: "10")
-  addGnuPgKeyFingerprint(
-    input: AddGnuPgKeyFingerprintInput!
-  ): AddGnuPgKeyFingerprintPayload! @cost(weight: "10")
-  addInstitutionMethodDeveloper(
-    input: AddInstitutionMethodDeveloperInput!
-  ): AddInstitutionMethodDeveloperPayload! @cost(weight: "10")
-  addInstitutionRepresentative(
-    input: AddInstitutionRepresentativeInput!
-  ): AddInstitutionRepresentativePayload! @cost(weight: "10")
-  addUserMethodDeveloper(
-    input: AddUserMethodDeveloperInput!
-  ): AddUserMethodDeveloperPayload! @cost(weight: "10")
+  addComponentAssembly(input: AddComponentAssemblyInput!): AddComponentAssemblyPayload!
+    @cost(weight: "10")
+  addComponentGeneralization(input: AddComponentGeneralizationInput!): AddComponentGeneralizationPayload!
+    @cost(weight: "10")
+  addComponentManufacturer(input: AddComponentManufacturerInput!): AddComponentManufacturerPayload!
+    @cost(weight: "10")
+  addComponentVariant(input: AddComponentVariantInput!): AddComponentVariantPayload!
+    @cost(weight: "10")
+  addGnuPgKeyFingerprint(input: AddGnuPgKeyFingerprintInput!): AddGnuPgKeyFingerprintPayload!
+    @cost(weight: "10")
+  addInstitutionMethodDeveloper(input: AddInstitutionMethodDeveloperInput!): AddInstitutionMethodDeveloperPayload!
+    @cost(weight: "10")
+  addInstitutionRepresentative(input: AddInstitutionRepresentativeInput!): AddInstitutionRepresentativePayload!
+    @cost(weight: "10")
+  addUserMethodDeveloper(input: AddUserMethodDeveloperInput!): AddUserMethodDeveloperPayload!
+    @cost(weight: "10")
   addUserRole(input: AddUserRoleInput!): AddUserRolePayload! @cost(weight: "10")
-  allowGnuPgKeyFingerprint(
-    input: AllowGnuPgKeyFingerprintInput!
-  ): AllowGnuPgKeyFingerprintPayload! @cost(weight: "10")
+  allowGnuPgKeyFingerprint(input: AllowGnuPgKeyFingerprintInput!): AllowGnuPgKeyFingerprintPayload!
+    @cost(weight: "10")
   changeInstitutionRepresentativeRole(
     input: ChangeInstitutionRepresentativeRoleInput!
   ): ChangeInstitutionRepresentativeRolePayload! @cost(weight: "10")
   changeUserEmail(input: ChangeUserEmailInput!): ChangeUserEmailPayload!
     @cost(weight: "10")
-  changeUserPassword(
-    input: ChangeUserPasswordInput!
-  ): ChangeUserPasswordPayload! @cost(weight: "10")
-  confirmComponentManufacturer(
-    input: ConfirmComponentManufacturerInput!
-  ): ConfirmComponentManufacturerPayload! @cost(weight: "10")
+  changeUserPassword(input: ChangeUserPasswordInput!): ChangeUserPasswordPayload!
+    @cost(weight: "10")
+  confirmComponentManufacturer(input: ConfirmComponentManufacturerInput!): ConfirmComponentManufacturerPayload!
+    @cost(weight: "10")
   confirmInstitutionMethodDeveloper(
     input: ConfirmInstitutionMethodDeveloperInput!
   ): ConfirmInstitutionMethodDeveloperPayload! @cost(weight: "10")
@@ -477,12 +446,10 @@ type Mutation {
   ): ConfirmInstitutionRepresentativePayload! @cost(weight: "10")
   confirmUserEmail(input: ConfirmUserEmailInput!): ConfirmUserEmailPayload!
     @cost(weight: "10")
-  confirmUserEmailChange(
-    input: ConfirmUserEmailChangeInput!
-  ): ConfirmUserEmailChangePayload! @cost(weight: "10")
-  confirmUserMethodDeveloper(
-    input: ConfirmUserMethodDeveloperInput!
-  ): ConfirmUserMethodDeveloperPayload! @cost(weight: "10")
+  confirmUserEmailChange(input: ConfirmUserEmailChangeInput!): ConfirmUserEmailChangePayload!
+    @cost(weight: "10")
+  confirmUserMethodDeveloper(input: ConfirmUserMethodDeveloperInput!): ConfirmUserMethodDeveloperPayload!
+    @cost(weight: "10")
   createComponent(input: CreateComponentInput!): CreateComponentPayload!
     @cost(weight: "10")
   createDatabase(input: CreateDatabaseInput!): CreateDatabasePayload!
@@ -493,29 +460,25 @@ type Mutation {
     @cost(weight: "10")
   createMethod(input: CreateMethodInput!): CreateMethodPayload!
     @cost(weight: "10")
-  createOpenIdConnectApplication(
-    input: CreateOpenIdConnectApplicationInput!
-  ): CreateOpenIdConnectApplicationPayload! @cost(weight: "10")
+  createOpenIdConnectApplication(input: CreateOpenIdConnectApplicationInput!): CreateOpenIdConnectApplicationPayload!
+    @cost(weight: "10")
   deleteInstitution(input: DeleteInstitutionInput!): DeleteInstitutionPayload!
     @cost(weight: "10")
-  deleteOpenIdConnectApplication(
-    input: DeleteOpenIdConnectApplicationInput!
-  ): DeleteOpenIdConnectApplicationPayload! @cost(weight: "10")
+  deleteOpenIdConnectApplication(input: DeleteOpenIdConnectApplicationInput!): DeleteOpenIdConnectApplicationPayload!
+    @cost(weight: "10")
   deleteOpenIdConnectAuthorization(
     input: DeleteOpenIdConnectAuthorizationInput!
   ): DeleteOpenIdConnectAuthorizationPayload! @cost(weight: "10")
-  deletePersonalUserData(
-    input: DeletePersonalUserDataInput!
-  ): DeletePersonalUserDataPayload! @cost(weight: "10")
+  deletePersonalUserData(input: DeletePersonalUserDataInput!): DeletePersonalUserDataPayload!
+    @cost(weight: "10")
   deleteUser(input: DeleteUserInput!): DeleteUserPayload! @cost(weight: "10")
   disableUserTwoFactorAuthentication: DisableUserTwoFactorAuthenticationPayload!
     @cost(weight: "10")
   enableUserTwoFactorAuthenticator(
     input: EnableUserTwoFactorAuthenticatorInput!
   ): EnableUserTwoFactorAuthenticatorPayload! @cost(weight: "10")
-  forbidGnuPgKeyFingerprint(
-    input: ForbidGnuPgKeyFingerprintInput!
-  ): ForbidGnuPgKeyFingerprintPayload! @cost(weight: "10")
+  forbidGnuPgKeyFingerprint(input: ForbidGnuPgKeyFingerprintInput!): ForbidGnuPgKeyFingerprintPayload!
+    @cost(weight: "10")
   forgetUserTwoFactorAuthenticationClient: ForgetUserTwoFactorAuthenticationClientPayload!
     @cost(weight: "10")
   generateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUri: GenerateUserTwoFactorAuthenticatorSharedKeyAndQrCodeUriPayload!
@@ -523,44 +486,34 @@ type Mutation {
   generateUserTwoFactorRecoveryCodes: GenerateUserTwoFactorRecoveryCodesPayload!
     @cost(weight: "10")
   loginUser(input: LoginUserInput!): LoginUserPayload! @cost(weight: "10")
-  loginUserWithRecoveryCode(
-    input: LoginUserWithRecoveryCodeInput!
-  ): LoginUserWithRecoveryCodePayload! @cost(weight: "10")
-  loginUserWithTwoFactorCode(
-    input: LoginUserWithTwoFactorCodeInput!
-  ): LoginUserWithTwoFactorCodePayload! @cost(weight: "10")
+  loginUserWithRecoveryCode(input: LoginUserWithRecoveryCodeInput!): LoginUserWithRecoveryCodePayload!
+    @cost(weight: "10")
+  loginUserWithTwoFactorCode(input: LoginUserWithTwoFactorCodeInput!): LoginUserWithTwoFactorCodePayload!
+    @cost(weight: "10")
   logoutUser: LogoutUserPayload! @cost(weight: "10")
   registerUser(input: RegisterUserInput!): RegisterUserPayload!
     @cost(weight: "10")
-  removeComponentAssembly(
-    input: RemoveComponentAssemblyInput!
-  ): RemoveComponentAssemblyPayload! @cost(weight: "10")
-  removeComponentGeneralization(
-    input: RemoveComponentGeneralizationInput!
-  ): RemoveComponentGeneralizationPayload! @cost(weight: "10")
-  removeComponentManufacturer(
-    input: RemoveComponentManufacturerInput!
-  ): RemoveComponentManufacturerPayload! @cost(weight: "10")
-  removeComponentVariant(
-    input: RemoveComponentVariantInput!
-  ): RemoveComponentVariantPayload! @cost(weight: "10")
+  removeComponentAssembly(input: RemoveComponentAssemblyInput!): RemoveComponentAssemblyPayload!
+    @cost(weight: "10")
+  removeComponentGeneralization(input: RemoveComponentGeneralizationInput!): RemoveComponentGeneralizationPayload!
+    @cost(weight: "10")
+  removeComponentManufacturer(input: RemoveComponentManufacturerInput!): RemoveComponentManufacturerPayload!
+    @cost(weight: "10")
+  removeComponentVariant(input: RemoveComponentVariantInput!): RemoveComponentVariantPayload!
+    @cost(weight: "10")
   removeInstitutionMethodDeveloper(
     input: RemoveInstitutionMethodDeveloperInput!
   ): RemoveInstitutionMethodDeveloperPayload! @cost(weight: "10")
-  removeInstitutionRepresentative(
-    input: RemoveInstitutionRepresentativeInput!
-  ): RemoveInstitutionRepresentativePayload! @cost(weight: "10")
-  removeUserMethodDeveloper(
-    input: RemoveUserMethodDeveloperInput!
-  ): RemoveUserMethodDeveloperPayload! @cost(weight: "10")
+  removeInstitutionRepresentative(input: RemoveInstitutionRepresentativeInput!): RemoveInstitutionRepresentativePayload!
+    @cost(weight: "10")
+  removeUserMethodDeveloper(input: RemoveUserMethodDeveloperInput!): RemoveUserMethodDeveloperPayload!
+    @cost(weight: "10")
   removeUserRole(input: RemoveUserRoleInput!): RemoveUserRolePayload!
     @cost(weight: "10")
-  requestUserPasswordReset(
-    input: RequestUserPasswordResetInput!
-  ): RequestUserPasswordResetPayload! @cost(weight: "10")
-  resendUserEmailConfirmation(
-    input: ResendUserEmailConfirmationInput!
-  ): ResendUserEmailConfirmationPayload! @cost(weight: "10")
+  requestUserPasswordReset(input: RequestUserPasswordResetInput!): RequestUserPasswordResetPayload!
+    @cost(weight: "10")
+  resendUserEmailConfirmation(input: ResendUserEmailConfirmationInput!): ResendUserEmailConfirmationPayload!
+    @cost(weight: "10")
   resendUserEmailVerification: ResendUserEmailVerificationPayload!
     @cost(weight: "10")
   resetOpenIdConnectApplicationClientSecret(
@@ -570,28 +523,22 @@ type Mutation {
     @cost(weight: "10")
   resetUserTwoFactorAuthenticator: ResetUserTwoFactorAuthenticatorPayload!
     @cost(weight: "10")
-  revokeOpenIdConnectToken(
-    input: RevokeOpenIdConnectTokenInput!
-  ): RevokeOpenIdConnectTokenPayload! @cost(weight: "10")
-  setComponentExtras(
-    input: SetComponentExtrasInput!
-  ): SetComponentExtrasPayload! @cost(weight: "10")
-  setInstitutionExtras(
-    input: SetInstitutionExtrasInput!
-  ): SetInstitutionExtrasPayload! @cost(weight: "10")
+  revokeOpenIdConnectToken(input: RevokeOpenIdConnectTokenInput!): RevokeOpenIdConnectTokenPayload!
+    @cost(weight: "10")
+  setComponentExtras(input: SetComponentExtrasInput!): SetComponentExtrasPayload!
+    @cost(weight: "10")
+  setInstitutionExtras(input: SetInstitutionExtrasInput!): SetInstitutionExtrasPayload!
+    @cost(weight: "10")
   setUserPassword(input: SetUserPasswordInput!): SetUserPasswordPayload!
     @cost(weight: "10")
-  setUserPhoneNumber(
-    input: SetUserPhoneNumberInput!
-  ): SetUserPhoneNumberPayload! @cost(weight: "10")
-  switchInstitutionOperatingState(
-    input: SwitchInstitutionOperatingStateInput!
-  ): SwitchInstitutionOperatingStatePayload! @cost(weight: "10")
+  setUserPhoneNumber(input: SetUserPhoneNumberInput!): SetUserPhoneNumberPayload!
+    @cost(weight: "10")
+  switchInstitutionOperatingState(input: SwitchInstitutionOperatingStateInput!): SwitchInstitutionOperatingStatePayload!
+    @cost(weight: "10")
   updateComponent(input: UpdateComponentInput!): UpdateComponentPayload!
     @cost(weight: "10")
-  updateComponentAssembly(
-    input: UpdateComponentAssemblyInput!
-  ): UpdateComponentAssemblyPayload! @cost(weight: "10")
+  updateComponentAssembly(input: UpdateComponentAssemblyInput!): UpdateComponentAssemblyPayload!
+    @cost(weight: "10")
   updateDatabase(input: UpdateDatabaseInput!): UpdateDatabasePayload!
     @cost(weight: "10")
   updateDataFormat(input: UpdateDataFormatInput!): UpdateDataFormatPayload!
@@ -600,9 +547,8 @@ type Mutation {
     @cost(weight: "10")
   updateMethod(input: UpdateMethodInput!): UpdateMethodPayload!
     @cost(weight: "10")
-  updateOpenIdConnectApplication(
-    input: UpdateOpenIdConnectApplicationInput!
-  ): UpdateOpenIdConnectApplicationPayload! @cost(weight: "10")
+  updateOpenIdConnectApplication(input: UpdateOpenIdConnectApplicationInput!): UpdateOpenIdConnectApplicationPayload!
+    @cost(weight: "10")
   verifyDatabase(input: VerifyDatabaseInput!): VerifyDatabasePayload!
     @cost(weight: "10")
   verifyInstitution(input: VerifyInstitutionInput!): VerifyInstitutionPayload!
@@ -1356,33 +1302,20 @@ type Database implements Node {
   data(id: Uuid!, kind: DataKind!, locale: Locale): Data @cost(weight: "10")
   description: String!
   geometricData(id: Uuid!, locale: Locale): GeometricData @cost(weight: "10")
-  hasCalorimetricData(
-    locale: Locale
-    where: CalorimetricDataPropositionInput
-  ): Boolean @cost(weight: "10")
-  hasData(
-    kind: DataKind!
-    locale: Locale
-    where: DataPropositionInput
-  ): Boolean @cost(weight: "10")
-  hasGeometricData(
-    locale: Locale
-    where: GeometricDataPropositionInput
-  ): Boolean @cost(weight: "10")
-  hasHygrothermalData(
-    locale: Locale
-    where: HygrothermalDataPropositionInput
-  ): Boolean @cost(weight: "10")
-  hasLifeCycleData(
-    locale: Locale
-    where: LifeCycleDataPropositionInput
-  ): Boolean @cost(weight: "10")
+  hasCalorimetricData(locale: Locale, where: CalorimetricDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasData(kind: DataKind!, locale: Locale, where: DataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasGeometricData(locale: Locale, where: GeometricDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasHygrothermalData(locale: Locale, where: HygrothermalDataPropositionInput): Boolean
+    @cost(weight: "10")
+  hasLifeCycleData(locale: Locale, where: LifeCycleDataPropositionInput): Boolean
+    @cost(weight: "10")
   hasOpticalData(locale: Locale, where: OpticalDataPropositionInput): Boolean
     @cost(weight: "10")
-  hasPhotovoltaicData(
-    locale: Locale
-    where: PhotovoltaicDataPropositionInput
-  ): Boolean @cost(weight: "10")
+  hasPhotovoltaicData(locale: Locale, where: PhotovoltaicDataPropositionInput): Boolean
+    @cost(weight: "10")
   hygrothermalData(id: Uuid!, locale: Locale): HygrothermalData
     @cost(weight: "10")
   id: ID!
@@ -1657,14 +1590,14 @@ type GetHttpsResourceTree {
 
 type GetHttpsResourceTreeNonRootVertex implements GetHttpsResourceTreeVertex {
   appliedConversionMethod: ToTreeVertexAppliedConversionMethod!
-  parentId: String!
+  parentId: ID!
   value: GetHttpsResource!
-  vertexId: String!
+  vertexId: ID!
 }
 
 type GetHttpsResourceTreeRoot implements GetHttpsResourceTreeVertex {
   value: GetHttpsResource!
-  vertexId: String!
+  vertexId: ID!
 }
 
 type GnuPgKeyFingerprint implements Node {
@@ -1834,10 +1767,8 @@ type Institution implements Node {
   ): InstitutionManufacturedComponentConnection! @cost(weight: "10")
   name: String!
   openIdConnectApplications(
-    order: [InstitutionOwnedOpenIdConnectApplicationSortInput!]
-      @cost(weight: "10")
-    where: InstitutionOwnedOpenIdConnectApplicationFilterInput
-      @cost(weight: "10")
+    order: [InstitutionOwnedOpenIdConnectApplicationSortInput!] @cost(weight: "10")
+    where: InstitutionOwnedOpenIdConnectApplicationFilterInput @cost(weight: "10")
   ): InstitutionOwnedOpenIdConnectApplicationConnection! @cost(weight: "10")
   operatedDatabases(
     order: [InstitutionOperatedDatabaseSortInput!] @cost(weight: "10")
@@ -2361,7 +2292,7 @@ type OpticalData implements Node & Data {
   appliedMethod: AppliedMethod!
   approvals: [DataApproval!]!
   cielabColors: [CielabColor!]!
-  coatedSide: CoatedSide
+  coatedSide: CoatedSide!
   colorRenderingIndices: [Float!]!
   component: Component @cost(weight: "10")
   componentId: Uuid!
@@ -3093,6 +3024,7 @@ interface Data {
 
 interface GetHttpsResourceTreeVertex {
   value: GetHttpsResource!
+  vertexId: ID!
 }
 
 "The node interface is implemented by entities that have a global unique identifier."
@@ -4348,16 +4280,16 @@ input OpenIdConnectTokenSortInput {
 
 input OpticalComponentSubtypePropositionInput {
   equalTo: OpticalComponentSubtype
-  in: [OpticalComponentSubtype!]
+  in: [OpticalComponentSubtype]
   notEqualTo: OpticalComponentSubtype
-  notIn: [OpticalComponentSubtype!]
+  notIn: [OpticalComponentSubtype]
 }
 
 input OpticalComponentTypePropositionInput {
   equalTo: OpticalComponentType
-  in: [OpticalComponentType!]
+  in: [OpticalComponentType]
   notEqualTo: OpticalComponentType
-  notIn: [OpticalComponentType!]
+  notIn: [OpticalComponentType]
 }
 
 input OpticalDataPropositionInput {
@@ -5606,7 +5538,13 @@ scalar Uuid
 directive @cost(
   "The `weight` argument defines what value to add to the overall cost for every appearance, or possible appearance, of a type, field, argument, etc."
   weight: String!
-) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM | INPUT_FIELD_DEFINITION
+) on
+  | SCALAR
+  | OBJECT
+  | FIELD_DEFINITION
+  | ARGUMENT_DEFINITION
+  | ENUM
+  | INPUT_FIELD_DEFINITION
 
 "The purpose of the `@listSize` directive is to either inform the static analysis about the size of returned lists (if that information is statically available), or to point the analysis to where to find that information."
 directive @listSize(
@@ -5620,5 +5558,4 @@ directive @listSize(
   slicingArgumentDefaultValue: Int
   "The `slicingArguments` argument can be used to define which of the field's arguments with numeric type are slicing arguments, so that their value determines the size of the list returned by that field. It may specify a list of multiple slicing arguments."
   slicingArguments: [String!]
-) on FIELD_DEFINITION
-
+) on FIELD_DEFINITION
\ No newline at end of file

From f5da98c0c656250b19e5a35fc3102a5d39ed4979 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Mon, 29 Jun 2026 16:31:50 +0200
Subject: [PATCH 138/145] Add attempt to validate GraphQL queries used in the
 backend against the GraphQL schemas (I cannot finish it before leaving
 tomorrow but I will open an issue...)

---
 .../Databases/Queries/database.graphqls       | 2837 +++++++++++++++++
 .../GraphQl/GraphQlQueryValidationTests.cs    |  113 +
 2 files changed, 2950 insertions(+)
 create mode 100644 backend/src/GraphQl/Databases/Queries/database.graphqls
 create mode 100644 backend/test/Integration/GraphQl/GraphQlQueryValidationTests.cs

diff --git a/backend/src/GraphQl/Databases/Queries/database.graphqls b/backend/src/GraphQl/Databases/Queries/database.graphqls
new file mode 100644
index 000000000..40c52df8f
--- /dev/null
+++ b/backend/src/GraphQl/Databases/Queries/database.graphqls
@@ -0,0 +1,2837 @@
+"""
+Read-only GraphQL schema for databases that store measurement and simulation
+data in various formats and refer to the "metabase" for meta information like
+data format specifications.
+
+It follows best practices for
+* [Global Object Identification](https://graphql.org/learn/global-object-identification/)
+  as exemplified in
+  [GraphQL Server Specification: Object Identification](https://relay.dev/docs/en/graphql-server-specification.html#object-identification)
+  (see also [GraphQL Global Object Identification Specification](https://relay.dev/graphql/objectidentification.htm)),
+  and
+* [Pagination](https://graphql.org/learn/pagination/),
+  by adhering to the
+  [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm),
+  as exemplified in
+  [GraphQL Server Specification: Connections](https://relay.dev/docs/en/graphql-server-specification.html#connections).
+
+Global object identifiers as required by the best practice are exposed by the
+property `id` and universally unique identifiers as issued by the "metabase"
+are exposed by the property `uuid`. In essence, `id` is the Base64-encoded
+concatenation of `uuid` and the requested locale.
+
+For interoperability with the "metabase", implementations serve HTTP
+requests as elaborated on
+[Serving over HTTP](https://graphql.org/learn/serving-over-http/).
+
+The
+[Internet Engineering Task Force (IETF)](https://www.ietf.org)
+is an Internet standards organization. It publishes standards in
+[Request for Comments (RFC)](https://ietf.org/standards/rfcs/)
+documents. They are
+[searchable](https://www.rfc-editor.org/search/rfc_search.php)
+and
+[indexed](https://www.rfc-editor.org/rfc-index.html).
+Examples are
+[Hypertext Transfer Protocol (HTTP)](https://tools.ietf.org/html/rfc7231)
+and
+[Transport Layer Security (TLS)](https://tools.ietf.org/html/rfc8446).
+
+The
+[Internet Assigned Numbers Authority (IANA)](https://www.iana.org)
+allocates and maintains unique codes and numbering systems that are used in
+technical standards that drive the Internet like
+[domain names](https://www.iana.org/domains),
+[Internet Protocol addresses](https://www.iana.org/numbers), and
+[registries](https://www.iana.org/protocols).
+Examples of the last are
+[HTTP status code registry](https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml)
+and
+[media type registry](https://www.iana.org/assignments/media-types/media-types.xhtml).
+
+The
+[International Organization for Standardization (ISO)](https://www.iso.org)
+develops and publishes
+[International Standards](https://www.iso.org/standards-catalogue/browse-by-ics.html).
+Examples are
+[ISO 8601 Date And Time Format](https://www.iso.org/iso-8601-date-and-time-format.html)
+and
+[ISO 3166 Country Codes](https://www.iso.org/iso-3166-country-codes.html).
+
+The library
+[graphql-scalars](https://github.com/Urigo/graphql-scalars)
+introduces custom scalar types for creating precise type-safe GraphQL schemas.
+We took some inspiration from
+[GitHub GraphQL API](https://docs.github.com/en/graphql).
+"""
+schema {
+  query: Query
+}
+
+"""
+[RFC 4122](https://tools.ietf.org/html/rfc4122)
+compliant
+[non-nil](https://tools.ietf.org/html/rfc4122#section-4.1.7)
+[Universally Unique Identifier (UUID)](https://tools.ietf.org/html/rfc4122#section-4.1)
+string represented as 32 hexadecimal digits in five groups separated by hyphens
+in the form `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`, like
+`"936da01f-9abd-4d9d-80c7-02af85c822a8"`. Such identifiers are not equal to
+`"00000000-0000-0000-0000-000000000000"` and match the regular expression
+`^[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}$`.
+"""
+scalar Uuid
+
+"""
+[ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html)
+encoded date and time string with offset from Coordinated Universal Time (UTC),
+where the fraction of a second permits at most 6 digits. For example, in UTC it
+may be in the form `yyyy-MM-ddTHH:mm:ss.ffffffZ`, like
+`"2009-06-15T13:45:30.381739Z"`, and in local time in the form
+`yyyy-MM-ddTHH:mm:ss.ffffffzzz`, like `"2009-06-15T13:45:30.381739-07:00"`.
+
+Note that
+[RFC 3339](https://tools.ietf.org/html/rfc3339)
+is a profile of the ISO 8601 standard for representation of dates and times
+using the Gregorian calendar.
+"""
+scalar DateTime
+
+"""
+[RFC 3986](https://tools.ietf.org/html/rfc3986)
+and
+[RFC 3987](https://tools.ietf.org/html/rfc3987)
+compliant
+[absolute Uniform Resource Locator (URL)](https://tools.ietf.org/html/rfc3986#section-4.3)
+string with optional
+[fragment identifier](https://tools.ietf.org/html/rfc3986#section-3.5).
+[Valid values are for example](https://datatracker.ietf.org/doc/html/rfc3986#section-1.1.2)
+`ftp://ftp.is.co.za/rfc/rfc1808.txt`, `http://www.ietf.org/rfc/rfc2396.txt`,
+`ldap://[2001:db8::7]/c=GB?objectClass?one`, `mailto:John.Doe@example.com`,
+`news:comp.infosystems.www.servers.unix`, `tel:+1-816-555-1212`,
+`telnet://192.0.2.16:80/`,
+`urn:oasis:names:specification:docbook:dtd:xml:4.1.2`
+
+See also
+[URL Living Standard](https://url.spec.whatwg.org/#absolute-url-with-fragment-string)
+and
+[Identifying resources on the Web](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Identifying_resources_on_the_Web).
+"""
+scalar Url
+
+"""
+arXiv identifier, that is, a string of the format
+[Understanding the arXiv identifier](https://info.arxiv.org/help/arxiv_identifier.html).
+"""
+scalar ArXiv
+
+"""
+Digital Object Identifier (DOI) name, that is, a string compliant with [ISO
+26324:2025](https://www.iso.org/standard/88862.html).
+
+See also
+[What is a DOI?](https://www.doi.org/the-identifier/what-is-a-doi/). In short,
+a DOI name is a digital identifier of an object, any object — physical,
+digital, or abstract. DOIs solve a common problem: keeping track of things.
+Things can be matter, material, content, or activities. Designed to be used by
+humans as well as machines, DOIs identify objects persistently. They allow
+things to be uniquely identified and accessed reliably. You know what you have,
+where it is, and others can track it too.
+"""
+scalar Doi
+
+"""
+[BCP 47](https://tools.ietf.org/html/bcp47)
+compliant
+[Language Tag](https://tools.ietf.org/html/bcp47#section-2)
+string like `"de-AT"`, `"sr-Latn-RS"`, `"en-US"`, or `"en-GB"`, where the language
+part is essentially an
+[ISO 639 Language Code](https://www.iso.org/iso-639-language-codes.html),
+the script an
+[ISO 15924:2004 Script Code](https://www.iso.org/standard/29546.html),
+and the region an
+[ISO 3166-1 Country Code](https://www.iso.org/iso-3166-country-codes.html).
+
+Note that the
+[Internet Assigned Numbers Authority (IANA)](https://www.iana.org)
+maintains the
+[Language Subtag Registry](https://www.iana.org/assignments/lang-subtags-templates/lang-subtags-templates.xhtml).
+"""
+scalar Locale
+
+"""
+[September 2025 GraphQL](https://spec.graphql.org/September2025/)
+compliant
+[query](https://spec.graphql.org/September2025/#sec-Language.Operations)
+string without
+[variables](http://spec.graphql.org/September2025/#sec-Language.Variables)
+and without unnecessary white-space for the present schema.
+"""
+scalar GraphQlQuery
+
+"""
+Anything
+"""
+scalar Any
+
+"""
+Fetch data, ask whether there is data, and search for data. Each field except
+`node` accepts
+- an optional locale to specify essentially the language of prose in the result.
+Each field's value is uniquely determined by the required arguments and locale.
+
+If locale is not given, the default locale is used, which may differ from
+database to database.
+"""
+type Query {
+  """
+  Fetch node by global object identifier as elaborated on
+  [Global Object Identification](https://graphql.org/learn/global-object-identification/)
+  where two nodes with identical identifiers are equal as elaborated in
+  [Field stability](https://graphql.org/learn/global-object-identification/#field-stability).
+
+  See also
+  [Node root field](https://graphql.org/learn/global-object-identification/#node-root-field)
+  """
+  node("Global object identifier." id: ID!): Node
+
+  """
+  Fetch calorimetric data by universally unique identifier, and optional
+  locale, where all three arguments together uniquely determine the data.
+  """
+  calorimetricData(
+    "Data identifier."
+    id: Uuid!
+    "Locale. If not given, the default locale is used, which may differ from database to database."
+    locale: Locale
+  ): CalorimetricData
+
+  """
+  Confer `Query#calorimetricData`.
+  """
+  geometricData(id: Uuid!, locale: Locale): GeometricData
+
+  """
+  Confer `Query#calorimetricData`.
+  """
+  hygrothermalData(id: Uuid!, locale: Locale): HygrothermalData
+
+  """
+  Confer `Query#calorimetricData`.
+  """
+  lifeCycleData(id: Uuid!, locale: Locale): LifeCycleData
+
+  """
+  Confer `Query#calorimetricData`.
+  """
+  opticalData(id: Uuid!, locale: Locale): OpticalData
+
+  """
+  Confer `Query#calorimetricData`.
+  """
+  photovoltaicData(id: Uuid!, locale: Locale): PhotovoltaicData
+
+  """
+  Search for all calorimetric data for which the proposition is true.
+
+  The result is a
+  [connection](https://relay.dev/graphql/connections.htm#sec-Connection-Types)
+  with
+  [edges](https://relay.dev/graphql/connections.htm#sec-Edge-Types)
+  and
+  [nodes](https://relay.dev/graphql/connections.htm#sec-Node)
+  as specified in the
+  [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm),
+  where the nodes are the actual data, and connection and edges are used for
+  meta information and
+  [pagination](https://graphql.org/learn/pagination/)
+  together with the
+  [forward pagination arguments](https://relay.dev/graphql/connections.htm#sec-Forward-pagination-arguments)
+  `first` with the default and maximum 100 and `after` and the
+  [backward pagination arguments](https://relay.dev/graphql/connections.htm#sec-Backward-pagination-arguments)
+  `last` with the default and maximum 100 and `before`.
+
+  Example:
+  ```
+  query {
+    allCalorimetricData(
+      where: {
+        or: [
+          {
+            componentId: { equalTo: "810e84b4-9ebf-416c-88ea-aade848f1fdf" },
+            gValue: { greaterThanOrEqualTo: 0.5 },
+            not: {
+              uValue: { lessThanOrEqualTo: 0.5 }
+            }
+          },
+          {
+            nearnormalHemisphericalVisibleTransmittance: {
+              inClosedInterval: {
+                lowerBound: 0.2,
+                upperBound: 0.8
+              }
+            }
+          }
+        ]
+      }
+    ) {
+      edges {
+        node {
+          uuid
+        }
+      }
+    }
+  }
+  ```
+  """
+  allCalorimetricData(
+    "Compound boolean expression that is true for all data being returned. If not given, a proposition that is always true is used."
+    where: CalorimetricDataPropositionInput
+    "Locale. If not given, the default locale is used, which may differ from database to database."
+    locale: Locale
+    "Maximum number of data edges after the cursor `after`. If not given, the default and maximum value 100 is used."
+    first: Int
+    "Data cursor after which to return at most `first` data edges."
+    after: String
+    "Maximum number of data edges before the cursor `before`."
+    last: Int
+    "Data cursor before which to return at most `last` data edges."
+    before: String
+  ): CalorimetricDataConnection
+
+  """
+  Confer `Query#allCalorimetricData`.
+  """
+  allGeometricData(
+    where: GeometricDataPropositionInput
+    locale: Locale
+    first: Int
+    after: String
+    last: Int
+    before: String
+  ): GeometricDataConnection
+
+  """
+  Confer `Query#allCalorimetricData`.
+  """
+  allHygrothermalData(
+    where: HygrothermalDataPropositionInput
+    locale: Locale
+    first: Int
+    after: String
+    last: Int
+    before: String
+  ): HygrothermalDataConnection
+
+  """
+  Confer `Query#allCalorimetricData`.
+  """
+  allLifeCycleData(
+    where: LifeCycleDataPropositionInput
+    locale: Locale
+    first: Int
+    after: String
+    last: Int
+    before: String
+  ): LifeCycleDataConnection
+
+  """
+  Confer `Query#allCalorimetricData`.
+  """
+  allOpticalData(
+    where: OpticalDataPropositionInput
+    locale: Locale
+    first: Int
+    after: String
+    last: Int
+    before: String
+  ): OpticalDataConnection
+
+  """
+  Confer `Query#allCalorimetricData`.
+  """
+  allPhotovoltaicData(
+    where: PhotovoltaicDataPropositionInput
+    locale: Locale
+    first: Int
+    after: String
+    last: Int
+    before: String
+  ): PhotovoltaicDataConnection
+
+  """
+  Whether there is data for which the proposition is true in the given locale.
+  """
+  hasCalorimetricData(
+    "Compound boolean expression that is true for data being searched for."
+    where: CalorimetricDataPropositionInput
+    "Locale. If not given, the default locale is used, which may differ from database to database."
+    locale: Locale
+  ): Boolean!
+
+  """
+  Confer `Query#hasCalorimetricData`.
+  """
+  hasGeometricData(
+    where: GeometricDataPropositionInput
+    locale: Locale
+  ): Boolean!
+
+  """
+  Confer `Query#hasCalorimetricData`.
+  """
+  hasHygrothermalData(
+    where: HygrothermalDataPropositionInput
+    locale: Locale
+  ): Boolean!
+
+  """
+  Confer `Query#hasCalorimetricData`.
+  """
+  hasLifeCycleData(
+    where: LifeCycleDataPropositionInput
+    locale: Locale
+  ): Boolean!
+
+  """
+  Confer `Query#hasCalorimetricData`.
+  """
+  hasOpticalData(where: OpticalDataPropositionInput, locale: Locale): Boolean!
+
+  """
+  Confer `Query#hasCalorimetricData`.
+  """
+  hasPhotovoltaicData(
+    where: PhotovoltaicDataPropositionInput
+    locale: Locale
+  ): Boolean!
+
+  """
+  The verification code of the database that is generated by the metabase when
+  an institution registers a new database. It is used by the metabase to verify
+  the the institution is indeed under control of the database's GraphQL
+  endpoint.
+
+  To register and verify your database to the metabase do the following:
+
+  1. On the metabase, sign-in as a representative of your institution.
+  2. Register a new database and remember the generated verification code.
+  3. Make the database's GraphQL endpoint return that code when queried for its
+     verification code.
+  4. Ask the metabase to verify the database.
+  """
+  verificationCode: String
+}
+
+"""
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm)
+and
+[Global Object Identification](https://graphql.org/learn/global-object-identification/)
+compliant
+[Node](https://relay.dev/graphql/connections.htm#sec-Node)
+interface.
+
+See also
+[Node](https://graphql.org/learn/global-object-identification/#node-interface).
+
+Note that according to
+[Field stability](https://graphql.org/learn/global-object-identification/#field-stability),
+if two objects appear in a query, both implementing `Node` with identical
+identifiers, then the two objects are equal. For example, for queried data, the
+identifier could be a Base64-encoded concatenation of the data identifier,
+which is a `Uuid`, and the requested locale.
+"""
+interface Node {
+  """
+  Base64-encoded identifier.
+  """
+  id: ID!
+}
+
+"""
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm)
+compliant
+[PageInfo](https://relay.dev/graphql/connections.htm#sec-undefined.PageInfo)
+type.
+
+Note that although the introspection query results on
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm)
+use the scalar type `String` for cursors, the specification of
+[cursors](https://relay.dev/graphql/connections.htm#sec-Cursor)
+says that a cursor is of
+> a type that serializes as a `String`; this may be a `String`, a non‐null
+> wrapper around a `String`, a custom scalar that serializes as a `String`, or
+> a non‐null wrapper around a custom scalar that serializes as a `String`.
+"""
+type PageInfo {
+  """
+  Whether more edges exist following the set defined by the client's arguments.
+  For details see
+  [PageInfo: Fields](https://relay.dev/graphql/connections.htm#sec-undefined.PageInfo.Fields).
+  """
+  hasNextPage: Boolean!
+
+  """
+  Whether more edges exist prior to the set defined by the clients arguments.
+  For details see
+  [PageInfo: Fields](https://relay.dev/graphql/connections.htm#sec-undefined.PageInfo.Fields).
+  """
+  hasPreviousPage: Boolean!
+
+  """
+  Cursor corresponding to the first edge in the set defined by the client's
+  arguments. For details see
+  [PageInfo: Fields](https://relay.dev/graphql/connections.htm#sec-undefined.PageInfo.Fields).
+  """
+  startCursor: String
+
+  """
+  Cursor corresponding to the last edge in the set defined by the client's
+  arguments. For details see
+  [PageInfo: Fields](https://relay.dev/graphql/connections.htm#sec-undefined.PageInfo.Fields).
+  """
+  endCursor: String
+}
+
+"""
+Closed interval from lower to upper bound. Each `Float` `x` is in the interval if
+and only if `x` is greater than or equal to the lower bound and less than or
+equal to the upper bound. In particular, if the lower bound is equal to the
+upper bound, then the interval consists of exactly one float; and, if the lower
+bound is greater than the upper bound, then the interval is empty.
+"""
+input ClosedIntervalInput {
+  """
+  Lower bound.
+  """
+  lowerBound: Float!
+
+  """
+  Upper bound.
+  """
+  upperBound: Float!
+}
+
+"""
+Proposition for values of type `Float`. Multiple sub-propositions are combined
+conjunctively, where the conjunction of an empty set of sub-propositions is true.
+"""
+input FloatPropositionInput {
+  """
+  True for values that are equal to `equalTo`, otherwise false.
+  """
+  equalTo: Float
+
+  """
+  True for values that are greater than or equal to `greaterThanOrEqualTo`,
+  otherwise false.
+  """
+  greaterThanOrEqualTo: Float
+
+  """
+  True for values that are in the closed interval `inClosedInterval`, otherwise
+  false.
+  """
+  inClosedInterval: ClosedIntervalInput
+
+  """
+  True for values that are less than or equal to `lessThanOrEqualTo`, otherwise
+  false.
+  """
+  lessThanOrEqualTo: Float
+}
+
+"""
+Proposition for lists of values of type `Float`. Multiple sub-propositions are
+combined conjunctively, where the conjunction of an empty set of
+sub-propositions is true.
+"""
+input FloatsPropositionInput {
+  """
+  True if each list value satisfies the proposition `all`, otherwise false.
+  """
+  all: FloatPropositionInput
+
+  """
+  True if no list value satisfies the proposition `none`, otherwise false.
+  """
+  none: FloatPropositionInput
+
+  """
+  True if at least one list value satisfies the proposition `some`, otherwise
+  false.
+  """
+  some: FloatPropositionInput
+}
+
+"""
+Proposition for values of type `Uuid`. Multiple sub-propositions are combined
+conjunctively, where the conjunction of an empty set of sub-propositions is true.
+"""
+input UuidPropositionInput {
+  """
+  True for values that are equal to `equalTo`, otherwise false.
+  """
+  equalTo: Uuid
+}
+
+"""
+Proposition for values of type `GetHttpsResource`. Multiple sub-propositions
+are combined conjunctively, where the conjunction of an empty set of
+sub-propositions is true.
+"""
+input GetHttpsResourcePropositionInput {
+  """
+  True for GET HTTPS resources whose data format identifier satisfies the
+  proposition `dataFormatId`, otherwise false.
+  """
+  dataFormatId: UuidPropositionInput
+
+  """
+  True for GET HTTPS resources whose archived files meta information satisfies
+  the proposition `archivedFilesMetaInformation`, otherwise false.
+  """
+  archivedFilesMetaInformation: FilesMetaInformationPropositionInput
+}
+
+"""
+Proposition for lists of values of type `GetHttpsResource`. Multiple
+sub-propositions are combined conjunctively, where the conjunction of an empty
+set of sub-propositions is true.
+"""
+input GetHttpsResourcesPropositionInput {
+  """
+  True if each list value satisfies the proposition `all`, otherwise false.
+  """
+  all: GetHttpsResourcePropositionInput
+
+  """
+  True if no list value satisfies the proposition `none`, otherwise false.
+  """
+  none: GetHttpsResourcePropositionInput
+
+  """
+  True if at least one list value satisfies the proposition `some`, otherwise
+  false.
+  """
+  some: GetHttpsResourcePropositionInput
+}
+
+"""
+Proposition for values of type `FileMetaInformation`. Multiple sub-propositions
+are combined conjunctively, where the conjunction of an empty set of
+sub-propositions is true.
+"""
+input FileMetaInformationPropositionInput {
+  """
+  True for file meta information whose data format identifier satisfies the
+  proposition `dataFormatId`, otherwise false.
+  """
+  dataFormatId: UuidPropositionInput
+}
+
+"""
+Proposition for lists of values of type `FileMetaInformation`. Multiple
+sub-propositions are combined conjunctively, where the conjunction of an empty
+set of sub-propositions is true.
+"""
+input FilesMetaInformationPropositionInput {
+  """
+  True if each list value satisfies the proposition `all`, otherwise false.
+  """
+  all: FileMetaInformationPropositionInput
+
+  """
+  True if no list value satisfies the proposition `none`, otherwise false.
+  """
+  none: FileMetaInformationPropositionInput
+
+  """
+  True if at least one list value satisfies the proposition `some`, otherwise
+  false.
+  """
+  some: FileMetaInformationPropositionInput
+}
+
+"""
+Proposition for values of type `CielabColor`. Multiple sub-propositions are
+combined conjunctively, where the conjunction of an empty set of
+sub-propositions is true.
+"""
+input CielabColorPropositionInput {
+  """
+  True for CIELAB Colors with a coordinate L* that satisfies the proposition
+  `lStar`, otherwise false.
+  """
+  lStar: FloatPropositionInput
+
+  """
+  True CIELAB Colors with a coordinate a* that satisfies the proposition
+  `aStar`, otherwise false.
+  """
+  aStar: FloatPropositionInput
+
+  """
+  True CIELAB Colors with a coordinate b* that satisfies the proposition
+  `bStar`, otherwise false.
+  """
+  bStar: FloatPropositionInput
+}
+
+"""
+Proposition for lists of values of type `CielabColor`. Multiple
+sub-propositions are combined conjunctively, where the conjunction of an empty
+set of sub-propositions is true.
+"""
+input CielabColorsPropositionInput {
+  """
+  True if each list value satisfies the proposition `all`, otherwise false.
+  """
+  all: CielabColorPropositionInput
+
+  """
+  True if no list value satisfies the proposition `none`, otherwise false.
+  """
+  none: CielabColorPropositionInput
+
+  """
+  True if at least one list value satisfies the proposition `some`, otherwise
+  false.
+  """
+  some: CielabColorPropositionInput
+}
+
+"""
+Proposition for values of type `CalorimetricData`. Multiple sub-propositions
+are combined conjunctively, where the conjunction of an empty set of
+sub-propositions is true.
+"""
+input CalorimetricDataPropositionInput {
+  """
+  True for data for the component with identifier `componentId`, otherwise
+  false.
+  """
+  componentId: UuidPropositionInput
+
+  """
+  True for data for which each proposition in `and` is true, otherwise false.
+  In particular, it is true if there is no proposition in `and`.
+  """
+  and: [CalorimetricDataPropositionInput!]
+
+  """
+  True for data for which the proposition `not` is false, otherwise false.
+  """
+  not: CalorimetricDataPropositionInput
+
+  """
+  True for data for which at least one proposition in `or` is true, otherwise
+  false. In particular, it is false if there is no proposition in `or`.
+  """
+  or: [CalorimetricDataPropositionInput!]
+
+  """
+  True for data whose list of resources satisfies the proposition `resources`,
+  otherwise false.
+  """
+  resources: GetHttpsResourcesPropositionInput
+
+  """
+  True for data whose list of `g` values satisfies the proposition `gValues`,
+  otherwise false.
+  """
+  gValues: FloatsPropositionInput
+
+  """
+  True for data whose list of `u` values satisfies the proposition `uValues`,
+  otherwise false.
+  """
+  uValues: FloatsPropositionInput
+}
+
+"""
+Proposition for values of type `GeometricData`. Multiple sub-propositions are
+combined conjunctively, where the conjunction of an empty set of
+sub-propositions is true.
+"""
+input GeometricDataPropositionInput {
+  """
+  True for data for the component with identifier `componentId`, otherwise
+  false.
+  """
+  componentId: UuidPropositionInput
+
+  """
+  True for data for which each proposition in `and` is true, otherwise false.
+  In particular, it is true if there is no proposition in `and`.
+  """
+  and: [GeometricDataPropositionInput!]
+
+  """
+  True for data for which the proposition `not` is false, otherwise false.
+  """
+  not: GeometricDataPropositionInput
+
+  """
+  True for data for which at least one proposition in `or` is true, otherwise
+  false. In particular, it is false if there is no proposition in `or`.
+  """
+  or: [GeometricDataPropositionInput!]
+
+  """
+  True for data whose list of resources satisfies the proposition `resources`,
+  otherwise false.
+  """
+  resources: GetHttpsResourcesPropositionInput
+
+  """
+  True for data whose list of `thickness` values satisfies the proposition `thicknesses`,
+  otherwise false.
+  """
+  thicknesses: FloatsPropositionInput
+}
+
+"""
+Proposition for values of type `HygrothermalData`. Multiple sub-propositions
+are combined conjunctively, where the conjunction of an empty set of
+sub-propositions is true.
+"""
+input HygrothermalDataPropositionInput {
+  """
+  True for data for the component with identifier `componentId`, otherwise
+  false.
+  """
+  componentId: UuidPropositionInput
+
+  """
+  True for data for which each proposition in `and` is true, otherwise false.
+  In particular, it is true if there is no proposition in `and`.
+  """
+  and: [HygrothermalDataPropositionInput!]
+
+  """
+  True for data for which the proposition `not` is false, otherwise false.
+  """
+  not: HygrothermalDataPropositionInput
+
+  """
+  True for data for which at least one proposition in `or` is true, otherwise
+  false. In particular, it is false if there is no proposition in `or`.
+  """
+  or: [HygrothermalDataPropositionInput!]
+
+  """
+  True for data whose list of resources satisfies the proposition `resources`,
+  otherwise false.
+  """
+  resources: GetHttpsResourcesPropositionInput
+}
+
+"""
+Proposition for values of type `LifeCycleData`. Multiple sub-propositions are
+combined conjunctively, where the conjunction of an empty set of
+sub-propositions is true.
+"""
+input LifeCycleDataPropositionInput {
+  """
+  True for data for the component with identifier `componentId`, otherwise
+  false.
+  """
+  componentId: UuidPropositionInput
+
+  """
+  True for data for which each proposition in `and` is true, otherwise false.
+  In particular, it is true if there is no proposition in `and`.
+  """
+  and: [LifeCycleDataPropositionInput!]
+
+  """
+  True for data for which the proposition `not` is false, otherwise false.
+  """
+  not: LifeCycleDataPropositionInput
+
+  """
+  True for data for which at least one proposition in `or` is true, otherwise
+  false. In particular, it is false if there is no proposition in `or`.
+  """
+  or: [LifeCycleDataPropositionInput!]
+
+  """
+  True for data whose list of resources satisfies the proposition `resources`,
+  otherwise false.
+  """
+  resources: GetHttpsResourcesPropositionInput
+}
+
+"""
+Proposition for values of enum type `OpticalComponentType`. Multiple
+sub-propositions are combined conjunctively, where the conjunction of an empty
+sub-propositions is true.
+"""
+input OpticalComponentTypePropositionInput {
+  equalTo: OpticalComponentType
+  notEqualTo: OpticalComponentType
+  in: [OpticalComponentType]
+  notIn: [OpticalComponentType]
+}
+
+"""
+Proposition for values of enum type `OpticalComponentSubtype`. Multiple
+sub-propositions are combined conjunctively, where the conjunction of an empty
+set of sub-propositions is true.
+"""
+input OpticalComponentSubtypePropositionInput {
+  equalTo: OpticalComponentSubtype
+  notEqualTo: OpticalComponentSubtype
+  in: [OpticalComponentSubtype]
+  notIn: [OpticalComponentSubtype]
+}
+
+"""
+Proposition for values of enum type `CoatedSide`. Multiple sub-propositions are
+combined conjunctively, where the conjunction of an empty set of
+sub-propositions is true.
+"""
+input CoatedSidePropositionInput {
+  equalTo: CoatedSide
+  notEqualTo: CoatedSide
+  in: [CoatedSide!]
+  notIn: [CoatedSide!]
+}
+
+"""
+Proposition for values of type `OpticalData`. Multiple sub-propositions are
+combined conjunctively, where the conjunction of an empty set of
+sub-propositions is true.
+"""
+input OpticalDataPropositionInput {
+  """
+  True for data for the component with identifier `componentId`, otherwise
+  false.
+  """
+  componentId: UuidPropositionInput
+
+  """
+  True for data for which each proposition in `and` is true, otherwise false.
+  In particular, it is true if there is no proposition in `and`.
+  """
+  and: [OpticalDataPropositionInput!]
+
+  """
+  True for data for which the proposition `not` is false, otherwise false.
+  """
+  not: OpticalDataPropositionInput
+
+  """
+  True for data for which at least one proposition in `or` is true, otherwise
+  false. In particular, it is false if there is no proposition in `or`.
+  """
+  or: [OpticalDataPropositionInput!]
+
+  """
+  True for data whose list of resources satisfies the proposition `resources`,
+  otherwise false.
+  """
+  resources: GetHttpsResourcesPropositionInput
+
+  """
+  True for data whose type satisfies the proposition `type`, otherwise false.
+  """
+  type: OpticalComponentTypePropositionInput
+
+  """
+  True for data whose subtype satisfies the proposition `subtype`, otherwise
+  false.
+  """
+  subtype: OpticalComponentSubtypePropositionInput
+
+  """
+  True for data whose coated side satisfies the proposition `coatedSide`,
+  otherwise false.
+  """
+  coatedSide: CoatedSidePropositionInput
+
+  """
+  True for data whose list of nearnormal hemispherical visible transmittance
+  values satisfies the proposition
+  `nearnormalHemisphericalVisibleTransmittances`, otherwise false.
+  """
+  nearnormalHemisphericalVisibleTransmittances: FloatsPropositionInput
+
+  """
+  True for data whose list of nearnormal hemispherical visible reflectance
+  values satisfies the proposition
+  `nearnormalHemisphericalVisibleReflectances`, otherwise false.
+  """
+  nearnormalHemisphericalVisibleReflectances: FloatsPropositionInput
+
+  """
+  True for data whose list of nearnormal hemispherical solar transmittance
+  values satisfies the proposition
+  `nearnormalHemisphericalSolarTransmittances`, otherwise false.
+  """
+  nearnormalHemisphericalSolarTransmittances: FloatsPropositionInput
+
+  """
+  True for data whose list of nearnormal hemispherical solar reflectance
+  values satisfies the proposition
+  `nearnormalHemisphericalSolarReflectances`, otherwise false.
+  """
+  nearnormalHemisphericalSolarReflectances: FloatsPropositionInput
+
+  """
+  True for data whose list of infrared emittance values satisfies the
+  proposition `infraredEmittances`, otherwise false.
+  """
+  infraredEmittances: FloatsPropositionInput
+
+  """
+  True for data whose list of Color Rendering Indices satisfies the proposition
+  `colorRenderingIndices`, otherwise false.
+  """
+  colorRenderingIndices: FloatsPropositionInput
+
+  """
+  True for data whose list of CIELAB Color Space coordinates satisfies the
+  proposition `cielabColors`, otherwise false.
+  """
+  cielabColors: CielabColorsPropositionInput
+}
+
+"""
+Proposition for values of type `PhotovoltaicData`. Multiple sub-propositions
+are combined conjunctively, where the conjunction of an empty set of
+sub-propositions is true.
+"""
+input PhotovoltaicDataPropositionInput {
+  """
+  True for data for the component with identifier `componentId`, otherwise
+  false.
+  """
+  componentId: UuidPropositionInput
+
+  """
+  True for data for which each proposition in `and` is true, otherwise false.
+  In particular, it is true if there is no proposition in `and`.
+  """
+  and: [PhotovoltaicDataPropositionInput!]
+
+  """
+  True for data for which the proposition `not` is false, otherwise false.
+  """
+  not: PhotovoltaicDataPropositionInput
+
+  """
+  True for data for which at least one proposition in `or` is true, otherwise
+  false. In particular, it is false if there is no proposition in `or`.
+  """
+  or: [PhotovoltaicDataPropositionInput!]
+
+  """
+  True for data whose list of resources satisfies the proposition `resources`,
+  otherwise false.
+  """
+  resources: GetHttpsResourcesPropositionInput
+}
+
+"""
+Materialized connection from somewhere to calorimetric data to paginate data
+using opaque cursors as elaborated in the best practice
+[Pagination](https://graphql.org/learn/pagination/)
+and the specification
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm),
+see in particular
+[Complete Connection Model](https://graphql.org/learn/pagination/#complete-connection-model)
+and
+[Connection Types](https://relay.dev/graphql/connections.htm#sec-Connection-Types).
+"""
+type CalorimetricDataConnection {
+  """
+  Edges to data nodes that expose opaque cursors for pagination.
+  """
+  edges: [CalorimetricDataEdge!]
+
+  """
+  Information about the present slice of all data edges (and nodes).
+  """
+  pageInfo: PageInfo!
+
+  """
+  The total count of items in the connection.
+  """
+  totalCount: Int!
+}
+
+"""
+Materialized edge from somewhere to calorimetric data to paginate data using
+opaque cursors as elaborated in the best practice
+[Pagination](https://graphql.org/learn/pagination/)
+and the specification
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm),
+see in particular
+[Complete Connection Model](https://graphql.org/learn/pagination/#complete-connection-model)
+and
+[Edge Types](https://relay.dev/graphql/connections.htm#sec-Edge-Types).
+"""
+type CalorimetricDataEdge {
+  """
+  Opaque
+  [cursor](https://relay.dev/graphql/connections.htm#sec-Cursor)
+  that designates the present edge for pagination.
+  """
+  cursor: String!
+
+  """
+  Data node the edge points to.
+  """
+  node: CalorimetricData!
+}
+
+"""
+Materialized connection from somewhere to geometric data to paginate data using
+opaque cursors as elaborated in the best practice
+[Pagination](https://graphql.org/learn/pagination/)
+and the specification
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm),
+see in particular
+[Complete Connection Model](https://graphql.org/learn/pagination/#complete-connection-model)
+and
+[Connection Types](https://relay.dev/graphql/connections.htm#sec-Connection-Types).
+"""
+type GeometricDataConnection {
+  """
+  Edges to data nodes that expose opaque cursors for pagination.
+  """
+  edges: [GeometricDataEdge!]
+
+  """
+  Information about the present slice of all data edges (and nodes).
+  """
+  pageInfo: PageInfo!
+
+  """
+  The total count of items in the connection.
+  """
+  totalCount: Int!
+}
+
+"""
+Materialized edge from somewhere to geometric data to paginate data using
+opaque cursors as elaborated in the best practice
+[Pagination](https://graphql.org/learn/pagination/)
+and the specification
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm),
+see in particular
+[Complete Connection Model](https://graphql.org/learn/pagination/#complete-connection-model)
+and
+[Edge Types](https://relay.dev/graphql/connections.htm#sec-Edge-Types).
+"""
+type GeometricDataEdge {
+  """
+  Opaque
+  [cursor](https://relay.dev/graphql/connections.htm#sec-Cursor)
+  that designates the present edge for pagination.
+  """
+  cursor: String!
+
+  """
+  Data node the edge points to.
+  """
+  node: GeometricData!
+}
+
+"""
+Materialized connection from somewhere to hygrothermal data to paginate data
+using opaque cursors as elaborated in the best practice
+[Pagination](https://graphql.org/learn/pagination/)
+and the specification
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm),
+see in particular
+[Complete Connection Model](https://graphql.org/learn/pagination/#complete-connection-model)
+and
+[Connection Types](https://relay.dev/graphql/connections.htm#sec-Connection-Types).
+"""
+type HygrothermalDataConnection {
+  """
+  Edges to data nodes that expose opaque cursors for pagination.
+  """
+  edges: [HygrothermalDataEdge!]
+
+  """
+  Information about the present slice of all data edges (and nodes).
+  """
+  pageInfo: PageInfo!
+
+  """
+  The total count of items in the connection.
+  """
+  totalCount: Int!
+}
+
+"""
+Materialized edge from somewhere to hygrothermal data to paginate data using
+opaque cursors as elaborated in the best practice
+[Pagination](https://graphql.org/learn/pagination/)
+and the specification
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm),
+see in particular
+[Complete Connection Model](https://graphql.org/learn/pagination/#complete-connection-model)
+and
+[Edge Types](https://relay.dev/graphql/connections.htm#sec-Edge-Types).
+"""
+type HygrothermalDataEdge {
+  """
+  Opaque
+  [cursor](https://relay.dev/graphql/connections.htm#sec-Cursor)
+  that designates the present edge for pagination.
+  """
+  cursor: String!
+
+  """
+  Data node the edge points to.
+  """
+  node: HygrothermalData!
+}
+
+"""
+Materialized connection from somewhere to life-cycle data to paginate data
+using opaque cursors as elaborated in the best practice
+[Pagination](https://graphql.org/learn/pagination/)
+and the specification
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm),
+see in particular
+[Complete Connection Model](https://graphql.org/learn/pagination/#complete-connection-model)
+and
+[Connection Types](https://relay.dev/graphql/connections.htm#sec-Connection-Types).
+"""
+type LifeCycleDataConnection {
+  """
+  Edges to data nodes that expose opaque cursors for pagination.
+  """
+  edges: [LifeCycleDataEdge!]
+
+  """
+  Information about the present slice of all data edges (and nodes).
+  """
+  pageInfo: PageInfo!
+
+  """
+  The total count of items in the connection.
+  """
+  totalCount: Int!
+}
+
+"""
+Materialized edge from somewhere to life-cycle data to paginate data using opaque
+cursors as elaborated in the best practice
+[Pagination](https://graphql.org/learn/pagination/)
+and the specification
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm),
+see in particular
+[Complete Connection Model](https://graphql.org/learn/pagination/#complete-connection-model)
+and
+[Edge Types](https://relay.dev/graphql/connections.htm#sec-Edge-Types).
+"""
+type LifeCycleDataEdge {
+  """
+  Opaque
+  [cursor](https://relay.dev/graphql/connections.htm#sec-Cursor)
+  that designates the present edge for pagination.
+  """
+  cursor: String!
+
+  """
+  Data node the edge points to.
+  """
+  node: LifeCycleData!
+}
+
+"""
+Materialized connection from somewhere to optical data to paginate data using
+opaque cursors as elaborated in the best practice
+[Pagination](https://graphql.org/learn/pagination/)
+and the specification
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm),
+see in particular
+[Complete Connection Model](https://graphql.org/learn/pagination/#complete-connection-model)
+and
+[Connection Types](https://relay.dev/graphql/connections.htm#sec-Connection-Types).
+"""
+type OpticalDataConnection {
+  """
+  Edges to data nodes that expose opaque cursors for pagination.
+  """
+  edges: [OpticalDataEdge!]
+
+  """
+  Information about the present slice of all data edges (and nodes).
+  """
+  pageInfo: PageInfo!
+
+  """
+  The total count of items in the connection.
+  """
+  totalCount: Int!
+}
+
+"""
+Materialized edge from somewhere to optical data to paginate data using opaque
+cursors as elaborated in the best practice
+[Pagination](https://graphql.org/learn/pagination/)
+and the specification
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm),
+see in particular
+[Complete Connection Model](https://graphql.org/learn/pagination/#complete-connection-model)
+and
+[Edge Types](https://relay.dev/graphql/connections.htm#sec-Edge-Types).
+"""
+type OpticalDataEdge {
+  """
+  Opaque
+  [cursor](https://relay.dev/graphql/connections.htm#sec-Cursor)
+  that designates the present edge for pagination.
+  """
+  cursor: String!
+
+  """
+  Data node the edge points to.
+  """
+  node: OpticalData!
+}
+
+"""
+Materialized connection from somewhere to photovoltaic data to paginate data
+using opaque cursors as elaborated in the best practice
+[Pagination](https://graphql.org/learn/pagination/)
+and the specification
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm),
+see in particular
+[Complete Connection Model](https://graphql.org/learn/pagination/#complete-connection-model)
+and
+[Connection Types](https://relay.dev/graphql/connections.htm#sec-Connection-Types).
+"""
+type PhotovoltaicDataConnection {
+  """
+  Edges to data nodes that expose opaque cursors for pagination.
+  """
+  edges: [PhotovoltaicDataEdge!]
+
+  """
+  Information about the present slice of all data edges (and nodes).
+  """
+  pageInfo: PageInfo!
+
+  """
+  The total count of items in the connection.
+  """
+  totalCount: Int!
+}
+
+"""
+Materialized edge from somewhere to photovoltaic data to paginate data using
+opaque cursors as elaborated in the best practice
+[Pagination](https://graphql.org/learn/pagination/)
+and the specification
+[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm),
+see in particular
+[Complete Connection Model](https://graphql.org/learn/pagination/#complete-connection-model)
+and
+[Edge Types](https://relay.dev/graphql/connections.htm#sec-Edge-Types).
+"""
+type PhotovoltaicDataEdge {
+  """
+  Opaque
+  [cursor](https://relay.dev/graphql/connections.htm#sec-Cursor)
+  that designates the present edge for pagination.
+  """
+  cursor: String!
+
+  """
+  Data node the edge points to.
+  """
+  node: PhotovoltaicData!
+}
+
+"""
+Type of data.
+"""
+enum OpticalComponentType {
+  GLAZING
+  SHADING
+}
+
+"""
+Subtype of data.
+"""
+enum OpticalComponentSubtype {
+  ACID_ETCHED_GLASS
+  APPLIED_FILM
+  CELLULAR_SHADE
+  CHROMOGENIC
+  COATED
+  COATING
+  DIFFUSING_SHADE
+  EMBEDDED_COATING
+  FILM
+  FRITTED_GLASS
+  INTERLAYER
+  LAMINATE
+  MONOLITHIC
+  PERFORATED_SCREEN
+  PLEATED_SHADE
+  ROLLER_SHADE
+  ROMAN_SHADE
+  SANDBLASTED_GLASS
+  SHADE_MATERIAL
+  SOLAR_SCREEN
+  VENETIAN_BLIND
+  VERTICAL_LOUVER
+  WOVEN_SHADE
+}
+
+"""
+Coated side
+"""
+enum CoatedSide {
+  PRIME
+  NON_PRIME
+  BOTH
+  NEITHER
+  UNKNOWN
+  NOT_APPLICABLE
+}
+
+"""
+Measured, simulated, or calculated data.
+
+The data identifier identifies the data modulo patches and locale and together
+with locale only modulo patches.
+
+For non-patch versions a new data identifier is needed.
+
+Note that the term 'patch' is used in the sense of
+[Semantic Versioning 2.0.0](https://semver.org/spec/v2.0.0.html)
+"""
+interface Data {
+  """
+  Identifier, which uniquely identifies data modulo patches and locale.
+  """
+  uuid: Uuid!
+
+  """
+  Identifier of this database that manages the data. The database's meta data
+  can be obtained by sending the GraphQL query
+  `query { database(id: ...) { ... }}` to the metabas e.
+  """
+  databaseId: Uuid!
+
+  """
+  Timestamp that designates the patch version. For example, correction of some
+  grammatical error in the description results in a new patch version
+  designated by a new timestamp, or adding an approval by some institution.
+  """
+  timestamp: DateTime!
+
+  """
+  Component identifier issued by the metabase. The components's meta data can
+  be obtained by sending the GraphQL query
+  `query { component(id: ...) { ... } }`
+  to the metabase.
+  """
+  componentId: Uuid!
+
+  """
+  Name
+  """
+  name: String
+
+  """
+  Description for humans
+  """
+  description: String
+
+  """
+  Critical information to avoid mistakes due to data misinterpretation.
+  """
+  warnings: [String!]!
+
+  """
+  Creator identifier issued by the metabase. The creator's meta data can be
+  obtained by sending the GraphQL query
+  `query { institution(id: ...) { ... } }`
+  to the metabase.
+  """
+  creatorId: Uuid!
+
+  """
+  Creation timestamp, designating when the present data set was created, for
+  example, after completion of a measurement, simulation, or calculation.
+  """
+  createdAt: DateTime!
+
+  """
+  Method that was applied to create this data set.
+  """
+  appliedMethod: AppliedMethod!
+
+  """
+  Approvals by institutions in the form of GnuPG signatures. See the type
+  `Approval` for details on how to verify data and approvals.
+  """
+  approvals: [DataApproval!]!
+
+  """
+  Multiple HTTP resources with meta information of the actual data requestable
+  through the protocol HTTP over TLS, in short, HTTPS, with `GET` requests. The
+  first resource's data is the result of applying the method `appliedMethod`.
+  The other resources' data is the result of applying some conversion method or
+  a chain of such methods to the first resource's data. Detailed information
+  about which conversion method applied to which data resulted in which other
+  data is recorded in the tree `resourceTree` with the root `resourceTree.root`
+  and the non-root vertices `resourceTree.nonRootVertices`.
+
+  Note that all resources describe the same data only in different formats.
+  """
+  resources: [GetHttpsResource!]!
+
+  """
+  Multiple HTTP resources organized as tree with meta information of the actual
+  data requestable through the protocol HTTP over TLS, in short, HTTPS, with
+  `GET` requests. The root-resource's data is the result of applying the method
+  `appliedMethod`. Each non-root-resource's data is the result of applying
+  a specified conversion method to its parent resource's data.
+
+  Note that all resources describe the same data only in different formats.
+  """
+  resourceTree: GetHttpsResourceTree!
+
+  """
+  Approval by the database of the result without the field `approval` itself.
+  """
+  approval: ResponseApproval!
+
+  """
+  Locale of text
+  """
+  locale: Locale!
+}
+
+"""
+The CIELAB Color Space is used to define a color. It has three rectangular color coordinates, L* (lStar), a* (aStar) and b* (bStar).
+"""
+type CielabColor {
+  """
+  The coordinate L* (lStar) defines the lightness of the color.
+  """
+  lStar: Float!
+
+  """
+  The coordinate a* (aStar) defines the color between green and red.
+  """
+  aStar: Float!
+
+  """
+  The coordinate b* (bStar) defines the color between blue and yellow.
+  """
+  bStar: Float!
+}
+
+type OpticalData implements Node & Data {
+  id: ID!
+  uuid: Uuid!
+  timestamp: DateTime!
+  locale: Locale!
+  databaseId: Uuid!
+  componentId: Uuid!
+  name: String
+  description: String
+  warnings: [String!]!
+  creatorId: Uuid!
+  createdAt: DateTime!
+  appliedMethod: AppliedMethod!
+  resources: [GetHttpsResource!]!
+  resourceTree: GetHttpsResourceTree!
+  approvals: [DataApproval!]!
+  approval: ResponseApproval!
+
+  """
+  Type
+  """
+  type: OpticalComponentType
+
+  """
+  Subtype
+  """
+  subtype: OpticalComponentSubtype
+
+  """
+  Coated side
+  """
+  coatedSide: CoatedSide!
+
+  """
+  Integral nearnormal hemispherical visible transmittance values that occur in
+  the data If some or all of those values do not occur verbatim in the data,
+  they need not occur in the list, even if they can be calculated based on the
+  data.
+  """
+  nearnormalHemisphericalVisibleTransmittances: [Float!]!
+  """
+  Integral nearnormal hemispherical visible reflectance values that occur in
+  the data. If some or all of those values do not occur verbatim in the data,
+  they need not occur in the list, even if they can be calculated based on the
+  data.
+  """
+  nearnormalHemisphericalVisibleReflectances: [Float!]!
+
+  """
+  Integral nearnormal hemispherical solar transmittance values that occur in
+  the data. If some or all of those values do not occur verbatim in the data,
+  they need not occur in the list, even if they can be calculated based on the
+  data.
+  """
+  nearnormalHemisphericalSolarTransmittances: [Float!]!
+
+  """
+  Integral nearnormal hemispherical solar reflectance values that occur in the
+  data. If some or all of those values do not occur verbatim in the data, they
+  need not occur in the list, even if they can be calculated based on the data.
+  """
+  nearnormalHemisphericalSolarReflectances: [Float!]!
+
+  """
+  Integral infrared emittance values that occur in the data. If some or all of
+  those values do not occur verbatim in the data, they need not occur in the
+  list, even if they can be calculated based on the data.
+  """
+  infraredEmittances: [Float!]!
+
+  """
+  Integral values for the Color Rendering Index that occur in the data. If some
+  or all of those values do not occur verbatim in the data, they need not occur
+  in the list, even if they can be calculated based on the data.
+  """
+  colorRenderingIndices: [Float!]!
+
+  """
+  Integral values for the coordinates in the CIELAB Color Space that occur in
+  the data. If some or all of those values do not occur verbatim in the data,
+  they need not occur in the list, even if they can be calculated based on the
+  data.
+  """
+  cielabColors: [CielabColor!]!
+}
+
+type CalorimetricData implements Node & Data {
+  id: ID!
+  uuid: Uuid!
+  timestamp: DateTime!
+  locale: Locale!
+  databaseId: Uuid!
+  componentId: Uuid!
+  name: String
+  description: String
+  warnings: [String!]!
+  creatorId: Uuid!
+  createdAt: DateTime!
+  appliedMethod: AppliedMethod!
+  resources: [GetHttpsResource!]!
+  resourceTree: GetHttpsResourceTree!
+  approvals: [DataApproval!]!
+  approval: ResponseApproval!
+
+  """
+  Integral `g` values that occur in the data. If some or all of those values do
+  not occur verbatim in the data, they need not occur in the list, even if they
+  can be calculated based on the data.
+  """
+  gValues: [Float!]!
+
+  """
+  Integral `u` values in Watts per square meter Kelvin (W·m⁻²·K⁻¹) that occur
+  in the data. If some or all of those values do not occur verbatim in the in
+  the list, even if they can be calculated based on the data.
+  """
+  uValues: [Float!]!
+}
+
+type GeometricData implements Node & Data {
+  id: ID!
+  uuid: Uuid!
+  timestamp: DateTime!
+  locale: Locale!
+  databaseId: Uuid!
+  componentId: Uuid!
+  name: String
+  description: String
+  warnings: [String!]!
+  creatorId: Uuid!
+  createdAt: DateTime!
+  appliedMethod: AppliedMethod!
+  resources: [GetHttpsResource!]!
+  resourceTree: GetHttpsResourceTree!
+  approvals: [DataApproval!]!
+  approval: ResponseApproval!
+
+  """
+  Mirrored `thickness` values in meter (m) that occur in the data. If some or
+  all of those values do not occur verbatim in the data, they need not occur
+  in the list, even if they can be calculated based on the data.
+  """
+  thicknesses: [Float!]!
+}
+
+type HygrothermalData implements Node & Data {
+  id: ID!
+  uuid: Uuid!
+  timestamp: DateTime!
+  locale: Locale!
+  databaseId: Uuid!
+  componentId: Uuid!
+  name: String
+  description: String
+  warnings: [String!]!
+  creatorId: Uuid!
+  createdAt: DateTime!
+  appliedMethod: AppliedMethod!
+  resources: [GetHttpsResource!]!
+  resourceTree: GetHttpsResourceTree!
+  approvals: [DataApproval!]!
+  approval: ResponseApproval!
+}
+
+type LifeCycleData implements Node & Data {
+  id: ID!
+  uuid: Uuid!
+  timestamp: DateTime!
+  locale: Locale!
+  databaseId: Uuid!
+  componentId: Uuid!
+  name: String
+  description: String
+  warnings: [String!]!
+  creatorId: Uuid!
+  createdAt: DateTime!
+  appliedMethod: AppliedMethod!
+  resources: [GetHttpsResource!]!
+  resourceTree: GetHttpsResourceTree!
+  approvals: [DataApproval!]!
+  approval: ResponseApproval!
+}
+
+type PhotovoltaicData implements Node & Data {
+  id: ID!
+  uuid: Uuid!
+  timestamp: DateTime!
+  locale: Locale!
+  databaseId: Uuid!
+  componentId: Uuid!
+  name: String
+  description: String
+  warnings: [String!]!
+  creatorId: Uuid!
+  createdAt: DateTime!
+  appliedMethod: AppliedMethod!
+  resources: [GetHttpsResource!]!
+  resourceTree: GetHttpsResourceTree!
+  approvals: [DataApproval!]!
+  approval: ResponseApproval!
+}
+
+"""
+Applied method, that is the application of a method with fixed arguments to
+specific source data.
+"""
+type AppliedMethod {
+  """
+  Method identifier of method that was applied by the creator on the source
+  data. The method's meta data can be obtained by sending the GraphQL query
+  `query { method(id: ...) { ... } }`
+  to the metabase.
+  """
+  methodId: Uuid!
+
+  """
+  Named arguments to configure the method.
+  - For each parameter required by the method, there is exactly one argument in
+    the list.
+  - Each argument in the list corresponds to an optional or required parameter
+    of the method.
+  - Each two distinct arguments in the list have different names.
+  """
+  arguments: [NamedMethodArgument!]!
+
+  """
+  Named data sources to which the method was applied.
+  - For each source required by the method, there is exactly one source in the
+    list.
+  - Each source in the list corresponds to an optional or required source of
+    the method.
+  - Each two distinct sources in the list have different names.
+  """
+  sources: [NamedMethodSource!]!
+}
+
+"""
+Applied conversion method to exactly one named source, namely the tree-vertex's
+parent resource.
+"""
+type ToTreeVertexAppliedConversionMethod {
+  """
+  Method identifier of conversion method that was applied by the creator on the
+  source data. The method's meta data can be obtained by sending the GraphQL
+  query
+  `query { method(id: ...) { ... } }`
+  to the metabase.
+  """
+  methodId: Uuid!
+
+  """
+  Named arguments to configure the conversion method.
+  - For each parameter required by the method, there is exactly one argument in
+    the list.
+  - Each argument in the list corresponds to an optional or required parameter
+    of the method.
+  - Each two distinct arguments in the list have different names.
+  """
+  arguments: [NamedMethodArgument!]!
+
+  """
+  Name of the named data source of the conversion method whose value is the
+  tree-vertex's parent resource. The conversion method requires at least one
+  named source and a value for one of these sources is given.
+  """
+  sourceName: String!
+}
+
+"""
+Named argument of a method.
+"""
+type NamedMethodArgument {
+  """
+  Name
+  """
+  name: String!
+
+  """
+  Method argument value.
+  """
+  value: Any!
+}
+
+"""
+Named data source of a method.
+"""
+type NamedMethodSource {
+  """
+  Name
+  """
+  name: String!
+
+  """
+  Method source as cross-database data reference.
+  """
+  value: CrossDatabaseDataReference!
+}
+
+"""
+Cross-database data reference.
+"""
+type CrossDatabaseDataReference {
+  """
+  Identifier of the referenced data.
+  """
+  dataId: Uuid!
+
+  """
+  Timestamp of referenced data to designate the data's version.
+  """
+  dataTimestamp: DateTime!
+
+  """
+  Kind of the referenced data.
+  """
+  dataKind: DataKind!
+
+  """
+  Identifier of the database that manages the referenced data.
+  """
+  databaseId: Uuid!
+}
+
+"""
+Data kind, either calorimetric, hygrothermal, lifeCycle, optical, or photovoltaic.
+"""
+enum DataKind {
+  CALORIMETRIC_DATA
+  GEOMETRIC_DATA
+  HYGROTHERMAL_DATA
+  LIFE_CYCLE_DATA
+  OPTICAL_DATA
+  PHOTOVOLTAIC_DATA
+}
+
+"""
+Numeration of a standard consisting of a main number and optional prefix and
+suffix.
+
+For example, a standard may be named "ISO 52022-1" or "ASTM E2387", which have
+"ISO" and "ASTM" as acronyms for the standardizers, "52022" and "2387" as main
+numbers, "E" as prefix, and "1" as suffix. The suffix may indicate for example
+a part number.
+"""
+type Numeration {
+  """
+  Main number
+  """
+  mainNumber: String!
+
+  """
+  Prefix
+  """
+  prefix: String
+
+  """
+  Suffix
+  """
+  suffix: String
+}
+
+"""
+Acronyms or abbreviations of standardization institutions.
+
+Additional information about each standardization institution is stored in the
+metabase.
+"""
+enum Standardizer {
+  AERC
+  AGI
+  ASHRAE
+  BREEAM
+  BS
+  BSI
+  CEN
+  CIE
+  DGNB
+  DIN
+  DVWG
+  IEC
+  IES
+  IFT
+  ISO
+  JIS
+  LEED
+  NFRC
+  RIBA
+  UL
+  UNECE
+  VDI
+  VFF
+  WELL
+}
+
+"""
+Standard or publication.
+"""
+union Reference = Standard | Publication
+
+"""
+`ISO 52022` is an example of the abbreviation of a standardizer and the main
+number of the identifier.
+"""
+type Standard {
+  """
+  Title
+  """
+  title: String
+
+  """
+  Abstract
+  """
+  abstract: String
+
+  """
+  Section referred to.
+  """
+  section: String
+
+  """
+  Web address
+  """
+  locator: Url
+
+  """
+  Numeration
+  """
+  numeration: Numeration!
+
+  """
+  Standardizers
+  """
+  standardizers: [Standardizer!]!
+
+  """
+  Year
+
+  Important because there can be relevant updates of one standard.
+  """
+  year: Int
+}
+
+type Publication {
+  """
+  Title
+  """
+  title: String
+
+  """
+  Abstract
+  """
+  abstract: String
+
+  """
+  Section referred to.
+  """
+  section: String
+
+  """
+  Names of authors of the publication.
+  """
+  authors: [String!]
+
+  """
+  arXiv identifier. [arXiv](https://arxiv.org) is a free distribution service
+  and an open-access archive for scholarly articles in the fields of physics,
+  mathematics, computer science, quantitative biology, quantitative finance,
+  statistics, electrical engineering and systems science, and economics.
+  """
+  arXiv: ArXiv
+
+  """
+  Digital Object Identifier (DOI). It must be defined here if it exists.
+  """
+  doi: Doi
+
+  """
+  Uniform Resource Name (URN).
+  """
+  urn: Url
+
+  """
+  Web address.
+
+  If a persistent identifiert like DOI is defined above, this address can
+  define a convenient web address to access the publication. However, if no
+  persistent identifier exist, this web address is the only identifier of this
+  publication. In this case, it is important to choose a web address with a high
+  probability to persist long.
+  """
+  webAddress: Url
+}
+
+"""
+Approval with
+[GnuPG](https://www.gnupg.org)
+signature.
+
+To verify an approval,
+1. install [GnuPG](https://www.gnupg.org),
+2. save the approved message in the file `./message.json` (it is the value of
+   the field `message`),
+3. save the ASCII-armored signature in the file `./message.json.asc` (it is the
+   value of the field `signature`),
+4. * receive (and import) the public key for the given fingerprint from the
+     [OpenPGP Keyserver](https://keys.openpgp.org) by running
+     `gpg --keyserver hkps://keys.openpgp.org/ --receive-keys <KEY_FINGERPRINT>`
+     where `<KEY_FINGERPRINT>` is the value of the field `keyFingerprint`.
+   * make sure that the key was not expired and was not revoked when the
+     approval was created by checking that the output of
+     `gpg --list-keys <KEY_FINGERPRINT>`
+     does not say so: Look for the terms 'revoked' and 'expired'.
+   * make sure that the key belongs to the approver and was allowed for signing
+     and not revoked when the approval was created by sending a request of the
+     form
+     ```
+     query {
+       institution(id: <APPROVER_ID>) {
+         hasGnuPgKeyFingerprint(
+           where: {
+             and: [
+               { fingerprint: { equalTo: <KEY_FINGERPRINT> } }
+               { allowedAt: { lessThanOrEqualTo: <TIMESTAMP> } }
+               {
+                 or: [
+                   { forbiddenAt: { equalTo: null } }
+                   { forbiddenAt: { greaterThan: <TIMESTAMP> } }
+                 ]
+               }
+             ]
+           }
+         )
+       }
+     }
+     ```
+     to the metabase and checking that the response is
+     ```
+     {
+       "data": {
+         "institution": {
+           "hasGnuPgKeyFingerprint": true
+         }
+       }
+     }
+     ```
+     where `<APPROVER_ID>`, `<KEY_FINGERPRINT>`, and `<TIMESTAMP>` are the values
+     of the fields `approverId`, `keyFingerprint`, and `timestamp`. Alternatively,
+     retrieve the allowed-for-signing and not-revoked-at-the-given-time key
+     fingerprint from the metabase's GraphQL endpoint by sending a request of
+     the form
+     ```
+     query {
+       institution(id: <APPROVER_ID>) {
+         gnuPgKeyFingerprints(
+           where: {
+             and: [
+               { fingerprint: { equalTo: <KEY_FINGERPRINT> } }
+               { allowedAt: { lessThanOrEqualTo: <TIMESTAMP> } }
+               {
+                 or: [
+                   { forbiddenAt: { equalTo: null } }
+                   { forbiddenAt: { greaterThan: <TIMESTAMP> } }
+                 ]
+               }
+             ]
+           }
+         ) {
+           edges {
+             node {
+               fingerprint
+               allowedAt
+               forbiddenAt
+               user {
+                 node {
+                   uuid
+                   name
+                 }
+               }
+             }
+           }
+           totalCount
+         }
+       }
+     }
+     ```
+     to the metabase and check that the response
+     ```
+     {
+       "data": {
+         "institution": {
+           "gnuPgKeyFingerprints": {
+             "edges": [
+               {
+                 "node": {
+                   "fingerprint": <KEY_FINGERPRINT>,
+                   "allowedAt": ...,
+                   "forbiddenAt": ...,
+                   "user": {
+                     "node": {
+                       "uuid": ...,
+                       "name": ...
+                     }
+                   }
+                 }
+               }
+             ],
+             "totalCount": 1
+           }
+         }
+       }
+     }
+     ```
+     contains exactly one edge (and node).
+5. verify the signature with the public key by running
+   `gpg --assert-signer <KEY_FINGERPRINT> --verify ./message.json.asc ./message.json`.
+
+To create an approval,
+1. install [GnuPG](https://www.gnupg.org),
+2. create a master key by running
+   `gpg --full-generate-key`,
+   selecting option `3. DSA (sign only)`,
+   choosing the keysize `2048`,
+   setting the validity `2y = key expires in 2 years`, and
+   answering all subsequent questions in particular adding a strong passphrase.
+3. create a signing subkey by running
+   `gpg --edit-key <YOUR_EMAIL_ADDRESS>`,
+   entering the command `addkey`
+   selecting option `(3) DSA (sign only)`,
+   choosing the keysize `2048`,
+   setting the validity `2y = key expires in 2 years`, and
+   answering all subsequent questions, and
+   entering the command `save`.
+4. list your keys with fingerprints by running
+   `gpg --list-keys --with-subkey-fingerprint <YOUR_EMAIL_ADDRESS>`.
+5. add your signing key to the
+   [OpenPGP Keyserver](https://keys.openpgp.org)
+   by running
+   `gpg --keyserver hkps://keys.openpgp.org --send-keys <SIGNING_KEY_FINGERPRINT>`
+   or by exporting the public key by running
+   `gpg --export --armor --output ./signing_key.pub.asc <SIGNING_KEY_FINGERPRINT>`
+   and uploading it via the form on
+   [OpenPGP Key Upload](https://keys.openpgp.org/upload).
+6. within a few minutes, verify the signing key's user ID, which is
+   `<YOUR_EMAIL_ADDRESS>`, by following the verification link sent to you.
+7. add the signing key fingerprint to the metabase with the GraphQL mutation
+   ```
+   mutation {
+     addGnuPgKeyFingerprint(input: {
+       institutionId: <APPROVER_ID>
+       fingerprint: <SIGNING_KEY_FINGERPRINT>
+     }) {
+       errors {
+         code
+         message
+         path
+       }
+     }
+   }
+   ```
+   and ask the institution owner to allow the key for signing with the GraphQL
+   mutation
+   ```
+   mutation {
+     allowGnuPgKeyFingerprint(input: {
+       fingerprint: <SIGNING_KEY_FINGERPRINT>
+     }) {
+       errors {
+         code
+         message
+         path
+       }
+     }
+   }
+   ```
+   Note that if you are the owner, the key is allowed automatically.
+
+For a response approval,
+8. save the response of the present query in a file `./message.json`.
+9. compute the signature and write it to `./message.json.asc` by running
+  `gpg --detach-sig --armor --local-user <SIGNING_KEY_FINGERPRINT> --output ./message.json.asc ./message.json`, and
+10. add the approval to the final response of the present query through the
+    field `approval`.
+
+For a data approval,
+8. query meta information of the data set to be signed with a GraphQL query
+   like
+   ```
+   query {
+     opticalData(id: <OPTICAL_DATA_ID>) {
+       uuid
+       name
+       description
+       resourceTree {
+         root {
+           value {
+             hashValue
+             locator
+             dataFormatId
+           }
+         }
+       }
+     }
+   }
+   ```
+   and load the data with an HTTPS GET request to the locator URL by running
+   `wget <LOCATOR>`.
+9. review whether some statement is true for the data, for example, whether the
+   data conforms to some standard. If that is so, query the meta information to
+   be signed which at least contains the hash value of the data
+   ```
+   query {
+     opticalData(id: <OPTICAL_DATA_ID>) {
+       resourceTree {
+         root {
+           value {
+             hashValue
+           }
+         }
+       }
+     }
+   }
+   ```
+   make sure that the hash value is the same as before, wrap the statement and
+   the meta information (named `<RESPONSE>` below) like so
+   ```
+   {
+     "statement": <STATEMENT>,
+     "response": <RESPONSE>
+   }
+   ```
+   and save this in a file `./message.json`. The query should ask for the
+   information necessary to identify the meta information and the data set
+   itself uniquely like its ID and the data set's fingerprint, aka, hash value.
+   It should not ask for information whose change would invalidate the approval
+   unnecessaritly like the the verbal description of the data set.
+10. compute the signature and write it to `./message.json.asc` by running
+    `gpg --detach-sig --armor --local-user <SIGNING_KEY_FINGERPRINT> --output ./message.json.asc ./message.json`, and
+11. add the signature as data approval to the database through its interface,
+    which could for example have a GraphQL mutation `AddDataApproval`.
+
+Best practices for managing GnuPG keys within an institution:
+* In the metabase, each institution has at least one representative. The
+  institution's GnuPG keys are the ones whose fingerprints are associated with
+  the institution. Fingerprints can be added by representatives and allowed and
+  forbidden for signing by instiution owners. The corresponding GraphQL
+  mutations are `addGnuPgKeyFingerprint`, `allowGnuPgKeyFingerprint`, and
+  `forbidGnuPgKeyFingerprint`.
+* Each representative of an institution within the metabase who is supposed to
+  approve data for its institution adds its signing key to the
+  [OpenPGP Keyserver](https://keys.openpgp.org),
+  the key fingerprint to the metabase, and lets the fingerprint be allowed for
+  signing by the institution owner.
+* When a representative's signing subkey is compromised she revokes it as
+  described in
+  [Revoking key components](https://www.gnupg.org/gph/en/manual.html#AEN305),
+  publishes the revocation to the keyserver by running
+  `gpg --keyserver hkps://keys.openpgp.org --send-key <SIGNING_KEY_FINGERPRINT>`,
+  and forbids the key for signing on the metabase with the mutation
+  `forbidGnuPgKeyFingerprint`
+* When a representative leaves a company or is no longer allowed to approve data,
+  the metabase is informed about that with the GraphQL mutation
+  ```
+  mutation {
+    removeInstitutionRepresentative(input: {
+      userId: <USER_ID>
+      institutionId: <INSTITUTION_ID>
+    }) {
+      errors {
+        code
+        message
+        path
+      }
+    }
+  }
+  ```
+  which also forbids all GnuPG keys associated with this representative from
+  signing.
+
+Best practices for accepting data approvals by databases:
+* Check that at the time of approval creation, the fingerprint belonged to
+  a non-revoked and non-disabled GnuPG key.
+* Check that the key was allowed to make signatures for that institution.
+* Check that the query contains all necessary fields and sub-fields.
+* Check that the message is constructed properly according to the documentation
+  of the implementing type `DataApproval`.
+* Check that the signature is valid for the given message.
+
+Note that GnuPG is compliant with
+[OpenPGP Message Format](https://tools.ietf.org/html/rfc4880).
+
+For an introduction to GnuPG consult
+[The GNU Privacy Handbook](https://www.gnupg.org/gph/en/manual.html)
+or the article series
+[Getting started with GPG (GnuPG)](https://www.redhat.com/sysadmin/getting-started-gpg),
+[How to create GPG keypairs](https://www.redhat.com/sysadmin/creating-gpg-keypairs), and
+[Digital signatures with GnuPG](https://www.redhat.com/sysadmin/digital-signatures-gnupg).
+"""
+interface Approval {
+  """
+  Creation timestamp
+  """
+  timestamp: DateTime!
+
+  """
+  Detached ASCII-armored GnuPG signature of the message which includes the
+  GraphQL query response.
+
+  With the message saved in the file `./message.json`, the signature can
+  be computed and written to `./message.json.asc` by running
+  `gpg --detach-sig --armor --output ./message.json.asc ./message.json`
+  (to write it to standard output instead, use the option `--output -`). And,
+  the signature can be verified by running
+  `gpg --verify ./message.json.asc ./message.json`.
+  Note that to compute a signature you need a GnuPG signing private key in your
+  key ring and to verify a signature you need the GnuPG signing public key
+  whose corresponding private key was used to compute the signature.
+  """
+  signature: String!
+
+  """
+  Fingerprint of the GnuPG signing key used to compute the signature.
+
+  The key's fingerprint, long identifier, and short identifier are related as
+  in the following example:
+  * fingerprint: 0D69 E11F 12BD BA07 7B37  26AB 4E1F 799A A4FF 2279
+  * long id:                                    4E1F 799A A4FF 2279
+  * short id:                                             A4FF 2279
+  Fingerprints can be used anywhere where an identifier is expected. For
+  security reasons it is used instead of long and short identifier. Its only
+  disadvantage is that it is less practical for manual human use.
+  """
+  keyFingerprint: String!
+
+  """
+  [GraphQL query](https://graphql.org/learn/queries/)
+  whose response is included in the message being signed, for example,
+  ```
+  query OpticalData($id: Uuid!) {
+    opticalData(id: $id) { ... }
+  }
+  ```
+  Specifying the query explicitly is necessary because approvals shall not
+  become invalid when the GraphQL schema changes.
+  """
+  query: GraphQlQuery!
+
+  """
+  [GraphQL variables](https://graphql.org/learn/queries/#variables)
+  defined by the GraphQL query, for example,
+  ```
+  { "id": "018731a4-4c0a-49af-a5d9-f377fbd0a939" }
+  ```
+  """
+  variables: Any!
+
+  """
+  Message that is signed.
+
+  For `ResponseApproval` it is the serialized GraphQL response of `query`. And
+  for `DataApproval` it is a serialized JSON combining the statement being made
+  and the response. See the documentation of `ResponseApproval#message` and
+  `DataApproval#message` for details.
+
+  With the message put in the file `./message.json`, the GnuPG signature put in
+  the file `./message.json.asc`, and the GnuPG public key of the approver added
+  to the GnuPG key ring, the signature can be verified by running
+  `gpg --verify ./message.json.asc ./message.json`.
+
+  To compare the message `./message.json` and another message `./another.json`,
+  run the command
+  ```
+  diff --side-by-side --suppress-common-lines \
+    <(jq --sort-keys --monochrome-output . ./message.json) \
+    <(jq --sort-keys --monochrome-output . ./another.json)
+  ```
+  in a
+  [Bourne-again shell (Bash)](https://www.gnu.org/software/bash/),
+  see
+  [Faster and simpler with the command line: deep-comparing two 5GB JSON files 3X faster by ditching the code](https://genius.engineering/faster-and-simpler-with-the-command-line-deep-comparing-two-5gb-json-files-3x-faster-by-ditching-the-code/)
+  and
+  [Using jq or alternative command line tools to compare JSON files](https://stackoverflow.com/questions/31930041/using-jq-or-alternative-command-line-tools-to-compare-json-files/37175540#37175540).
+
+  Comparing messages is necessary to verify that the data `./another.json` you
+  received in a query that includes this approval matches the approved data.
+  Which is of course the case if all involved organizations are trustworthy.
+  However, verified signatures and matching messages together prove data
+  integrity (at least if private keys used to make the signatures in the first
+  place are not compromised).
+  """
+  message: String!
+
+  """
+  Approver identifier issued by the metabase. The approver's meta data can be
+  obtained by sending the GraphQL query
+  `query { institution(id: ...) { ... } }`
+  to the metabase. For data approvals, the approver makes the statement about
+  the data identified by the query. For response approvals, the approver states
+  that the message is the response to the query by the present database.
+  """
+  approverId: Uuid!
+}
+
+"""
+Approval of data by third party with GnuPG signature that is created at some
+point in time. It becomes invalid when the approved data changes, even if the
+change is but a spelling-error correction in meta data like the description.
+In that case, the third party needs to re-create its approval. Unnecessary
+invalidation can be avoided by choosing the meta data that is part of the
+message being approved carefully.
+
+Steps to approve data:
+1. An institution adds data with meta information to a database.
+2. Some institution (may be the same) queries some meta information with
+   a GraphQL query like
+   ```
+   query {
+     opticalData(id: <OPTICAL_DATA_ID>) {
+       uuid
+       name
+       description
+       resourceTree {
+         root {
+           value {
+             hashValue
+             locator
+             dataFormatId
+           }
+         }
+       }
+     }
+   }
+   ```
+   and loads the data with an HTTPS GET request to the locator URL by running
+   `wget <LOCATOR>`.
+3. The latter institution reviews whether some statement is true for the data,
+   for example, whether the data conforms to some standard. If that is so, the
+   institution queries the meta information to be signed which at least
+   contains the hash value of the data
+   ```
+   query {
+     opticalData(id: <OPTICAL_DATA_ID>) {
+       resourceTree {
+         root {
+           value {
+             hashValue
+           }
+         }
+       }
+     }
+   }
+   ```
+   makes sure that the hash value is the same as before, wraps the statement
+   and the meta information (named `<RESPONSE>` below) like so
+   ```
+   {
+     "statement": <STATEMENT>,
+     "response": <RESPONSE>
+   }
+   ```
+   and signs this JSON data.
+4. The institution adds its approval of the data to some database or asks it to
+   be added.
+
+Storing the GraphQL query, variables, and message with the signature is
+necessary because it needs to be known exactly which JSON data was signed (with
+exact whitespaces).
+
+Note that the query to be signed only includes paths that are part of the data
+and not part of some associates, which are actually all paths in the present
+GraphQL schema. However, the actual GraphQL schema of the database is in
+general an extension of the present GraphQL schema and may have paths to some
+associates like data format specifics of HTTP resources that it may fetch from
+the "metabase" and provides for convenience. These specifics should not be
+signed as a change of, for example, the data format description would
+invalidate the signature although the data itself did not change.
+"""
+type DataApproval implements Approval {
+  timestamp: DateTime!
+  signature: String!
+  keyFingerprint: String!
+  query: GraphQlQuery!
+  variables: Any!
+  approverId: Uuid!
+
+  """
+  Message that is signed. It is a string representation of the JSON
+  ```
+  {
+    "statement": <STATEMENT>,
+    "response": <RESPONSE>
+  }
+  ```
+  with whitespaces as when the signature was created, where `<STATEMENT>` is
+  the JSON of the field `statement` and `<RESPONSE>` is the JSON response of
+  sending the GraphQL request given by the field `query`.
+  """
+  message: String!
+
+  """
+  Statement that is being made by the approver about the data identified by the
+  query. The reference could for example be an ISO standard, which would mean
+  that this approval states that the data conforms to this standard.
+  """
+  statement: Reference!
+}
+
+"""
+Approval of response by database with
+[GnuPG](https://www.gnupg.org)
+signature.
+"""
+type ResponseApproval implements Approval {
+  timestamp: DateTime!
+  signature: String!
+  keyFingerprint: String!
+  query: GraphQlQuery!
+  variables: Any!
+  approverId: Uuid!
+
+  """
+  Serialized response of the GraphQL query with whitespaces as when the
+  signature was created.
+  """
+  message: String!
+}
+
+"""
+HTTP resource with meta information requestable through the protocol
+[HTTP over TLS](https://tools.ietf.org/html/rfc2818)
+with `GET` requests. The protocol is colloquially called Hypertext Transfer
+Protocol Secure (HTTPS) and uses
+[Transport Layer Security (TLS)](https://tools.ietf.org/html/rfc8446)
+to secure
+[Hypertext Transfer Protocol (HTTP)](https://tools.ietf.org/html/rfc7231)
+connections over the internet.
+
+If an HTTP `GET` request of the resource is
+[successful](https://tools.ietf.org/html/rfc7231#section-6.3)
+with
+[HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6)
+[200](https://tools.ietf.org/html/rfc7231#section-6.3.1),
+the response message body is the resource's content. Otherwise, there is some
+issue that can be identified and hopefully resolved by examining the status
+code.
+
+Note that the
+[Internet Assigned Numbers Authority (IANA)](https://www.iana.org)
+maintains the
+[HTTP status code registry](https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml).
+See also
+[HTTP response status codes](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status).
+"""
+type GetHttpsResource {
+  """
+  Description
+  """
+  description: String
+
+  """
+  Hash value of successful HTTP response message body with
+  [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6)
+  [200](https://tools.ietf.org/html/rfc7231#section-6.3.1)
+  computed with
+  Secure Hash Algorithm 256 (SHA-256)
+  as described in the
+  [United States's Federal Information Processing Standard 180-4 (FIPS 180-4)](https://csrc.nist.gov/publications/detail/fips/180/4/final)
+  by the
+  [National Institute of Standards and Technology (NIST)](https://www.nist.gov).
+  See also
+  [RFC 6234](https://tools.ietf.org/html/rfc6234).
+
+  In Linux,
+  1. install
+     [Coreutils - GNU core utilities](https://www.gnu.org/software/coreutils/),
+     to get the command-line tool
+     [`sha256sum`](http://www.gnu.org/software/coreutils/sha256sum), and
+  2. save the message body in a file, say `message.body`.
+
+  Then, to compute the hash value,
+  3. run the command `sha256sum message.body`, which prints the hash value to
+     standard output.
+
+  And, to check the hash value,
+  4. run the command `echo '<HASH_VALUE>  message.body' | sha256sum --check`,
+     where `<HASH_VALUE>` needs to be replaced by the hash value. Note that
+     there are two spaces between `<HASH_VALUE>` and `message.body`.
+
+  In Mac OS X, the command-line tool `shasum` comes pre-installed and can be
+  used instead of `sha256sum` by adding the option `--algorithm 256` that is
+  by literally replacing `sha256sum` in the above commands by
+  `shasum --algorithm 256`.
+
+  In Windows,
+  1. install
+     [PowerShell](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell)
+  2. save the message body in a file, say `message.body`.
+  3. open a PowerShell window, for example, by pressing `WIN+R`,
+     typing in `powershell`, and pressing `<enter>`, and
+  4. change directory to the folder with the saved files.
+
+  Then, to compute the hash value,
+  5. run the command
+     `(Get-FileHash -Algorithm SHA256 .\message.body).Hash`,
+     which prints the hash value. For details see the documentation
+     [Get-FileHash](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.utility/get-filehash).
+
+  And, to check the hash value,
+  6. save the message body's hash in a file, say `message.body.sha`,
+  7. run the command
+     `(Get-FileHash -Algorithm SHA256 .\message.body).Hash -eq (Get-Content .\message.body.sha).split(" ")[0].ToUpper()`,
+     which prints `True` on success.
+
+  In case [OpenSSL](https://www.openssl.org) is installed, to compute the hash
+  value, you may also run `openssl dgst -sha256 message.body`.
+  """
+  hashValue: String!
+
+  """
+  Locator with scheme `https` to be used with protocol
+  [HTTP over TLS](https://tools.ietf.org/html/rfc2818).
+  """
+  locator: Url!
+
+  """
+  Identifier of data format of successful HTTP response message body with
+  [HTTP response status code](https://tools.ietf.org/html/rfc7231#section-6)
+  [200](https://tools.ietf.org/html/rfc7231#section-6.3.1).
+  The identifier is issued by the metabase. The format's meta data can be
+  obtained by sending the GraphQL query
+  `query { dataFormat(id: ...) { ... } }`
+  to the metabase.
+
+  The data format consists of a
+  [media type](https://www.iana.org/assignments/media-types/media-types.xhtml)
+  and additional information to unambiguously identify the specific format and
+  to locate the format specification.
+
+  In case of an
+  [archive format](https://en.wikipedia.org/wiki/Archive_file),
+  for each archived file (that is, each file in the archive), meta information
+  like its data format is specified in `archivedFilesMetaInformation`. The file
+  and directory names in the archive match the regular expression
+  `^[0-9a-z-._]$` for reasons elaborated in `FileMetaInformation#path`. See
+  also
+  [List of archive formats](https://en.wikipedia.org/wiki/List_of_archive_formats).
+  """
+  dataFormatId: Uuid!
+
+  """
+  Archived files meta information with relative paths from the archive root and
+  data format specifications. In case the data format is not an archive, the
+  list is empty. Otherwise, in case the data format is an, for our purposes,
+  underspecified archive format like
+  [7-Zip](https://www.7-zip.org)
+  with an a priori unknown internal structure, for each archived file, there is
+  exactly one list entry.
+
+  Note that the
+  [extensions of file names](https://en.wikipedia.org/wiki/Filename_extension)
+  in the archive are not sufficient as data format because file extensions are
+  not standardized and not sufficiently precise. For example, the extension
+  `docx` is commonly used for documents with the media type
+  [application/vnd.openxmlformats-officedocument.wordprocessingml.document](https://www.iana.org/assignments/media-types/application/vnd.openxmlformats-officedocument.wordprocessingml.document)
+  but does not tell which exact version of the standard is meant.
+  """
+  archivedFilesMetaInformation: [FileMetaInformation!]!
+}
+
+"""
+Multiple HTTP resources organized as tree with meta information of the actual
+data requestable through the protocol HTTP over TLS, in short, HTTPS, with
+`GET` requests. Each vertex specifies
+* its vertex identifier (unique among the tree vertices), and
+* its HTTP resource.
+Each non-root vertex also specifies
+* its parent vertex's identifier, and
+* an applied conversion method with its parent vertex's identifier as source,
+where indeed the non-root-resource's data is the result of applying the
+conversion method to its parent resource's data.
+
+The root vertex is in the field `root` and non-root resource vertices are in
+the field `nonRootVertices`.
+
+Note that all resources describe the same data only in different formats.
+"""
+type GetHttpsResourceTree {
+  """
+  Root resource vertex.
+  """
+  root: GetHttpsResourceTreeRoot!
+
+  """
+  Non-root resource vertices in breadth-first order starting from, but not
+  including, the root vertex.
+
+  By traversing the tree from the root at each vertex it is clear how the
+  vertex's data was obtained from the parent's data and by remembering or
+  composing the chain of applied conversion methods how the vertex's data was
+  obtained from the root's data.
+  """
+  nonRootVertices: [GetHttpsResourceTreeNonRootVertex!]!
+}
+
+"""
+A root or non-root resource is the result of some measurement or simulation, or
+of applying some conversion method to its parent resource. Its child resources
+are the results of applying conversion methods to it, the child resources of
+its child resources are the results of applying conversion methods to the child
+resources, and so forth. The applied conversion methods are specified in the
+child resource vertices.
+"""
+interface GetHttpsResourceTreeVertex {
+  """
+  Vertex identifier unique among the tree vertices. It is used to set-up edges,
+  that is, parent/child relationships, in the flattened tree structure.
+  """
+  vertexId: ID!
+
+  """
+  Resource
+  """
+  value: GetHttpsResource!
+}
+
+"""
+A root resource is the direct result of some measurement or simulation.
+"""
+type GetHttpsResourceTreeRoot implements GetHttpsResourceTreeVertex {
+  vertexId: ID!
+  value: GetHttpsResource!
+}
+
+"""
+A non-root resource is the result of applying some conversion method to its
+parent resource.
+"""
+type GetHttpsResourceTreeNonRootVertex implements GetHttpsResourceTreeVertex {
+  vertexId: ID!
+  value: GetHttpsResource!
+
+  """
+  Identifier of parent resource vertex. This vertex's resource data it obtained by
+  applying the conversion method to its parent resource data.
+  """
+  parentId: ID!
+
+  """
+  Conversion method applied to the parent resource to obtain the present
+  vertex's resource. The parent resource is identified by the vertex identifier
+  `appliedConversionMethod.source.value`.
+  """
+  appliedConversionMethod: ToTreeVertexAppliedConversionMethod!
+}
+
+"""
+File meta information.
+"""
+type FileMetaInformation {
+  """
+  Relative file path, where
+  * the string-serialized
+    [POSIX-style path](https://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap03.html#tag_03_266)
+    is obtained by prepending the string `./` and joining all components with the
+    forward slash `/`, see also,
+    [IEEE/Open Group 1003.1-2017 - IEEE Standard for Information Technology--Portable Operating System Interface (POSIX(TR)) Base Specifications, Issue 7](https://standards.ieee.org/standard/1003_1-2017.html),
+    and
+  * the string-serialized
+    [Windows-style path](https://docs.microsoft.com/en-us/dotnet/standard/io/file-path-formats)
+    is obtained by prepending the
+    string `.\` and joining all components with the backward slash `\`, see also
+    [Naming Files, Paths, and Namespaces](https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file).
+
+  Each path component is a valid file or directory name in popular operating
+  systems like various Linux distributions, Windows, and Mac OS X, and it is
+  usable. Because of various idiosyncrasies of different file systems and
+  command-line interpreters, each component matches the regular expression
+  `^[a-z0-9-._]+$`. For some reasons see
+  [Answer 1](https://superuser.com/questions/358855/what-characters-are-safe-in-cross-platform-file-names-for-linux-windows-and-os/358861#358861)
+  and
+  [Answer 2](https://superuser.com/questions/358855/what-characters-are-safe-in-cross-platform-file-names-for-linux-windows-and-os/748264#748264)
+  to the dated question
+  [What characters are safe in cross-platform file names for Linux, Windows and OS-X](https://superuser.com/questions/358855/what-characters-are-safe-in-cross-platform-file-names-for-linux-windows-and-os),
+  and also
+  [Best Practices for Filenames on the Web](https://www.surrealcms.com/blog/best-practices-for-filenames-on-the-web.html).
+  """
+  path: [String!]!
+
+  """
+  Identifier of the data format. The identifier is issued by the metabase. The
+  format's meta data can be obtained by sending the GraphQL query
+  `query { dataFormat(id: ...) { ... } }`
+  to the metabase.
+
+  The data format consists of a
+  [media type](https://www.iana.org/assignments/media-types/media-types.xhtml)
+  and additional information to unambiguously identify the specific format and
+  to locate the format specification.
+  """
+  dataFormatId: Uuid!
+}
diff --git a/backend/test/Integration/GraphQl/GraphQlQueryValidationTests.cs b/backend/test/Integration/GraphQl/GraphQlQueryValidationTests.cs
new file mode 100644
index 000000000..92ab6fcbb
--- /dev/null
+++ b/backend/test/Integration/GraphQl/GraphQlQueryValidationTests.cs
@@ -0,0 +1,113 @@
+// using System;
+// using System.Collections.Generic;
+// using System.IO;
+// using System.Linq;
+// using System.Threading.Tasks;
+// using HotChocolate;
+// using HotChocolate.Validation;
+// using HotChocolate.Language;
+// using Microsoft.Extensions.DependencyInjection;
+// using NUnit.Framework;
+// using FluentAssertions;
+// using System.Diagnostics.CodeAnalysis;
+//
+// namespace Metabase.Tests.Integration.GraphQl;
+//
+// [TestFixture]
+// public class GraphQlQueryValidationTests
+// {
+//     private static readonly string MetabaseSchemaPath = System.IO.Path.GetFullPath(
+//         System.IO.Path.Combine("..", "..", "..", "Integration", "GraphQl", "__snapshots__", "GraphQlSchemaTests.IsUnchanged.snap")
+//     );
+//
+//     private static readonly string DatabaseSchemaPath = System.IO.Path.GetFullPath(
+//         System.IO.Path.Combine("GraphQl", "Databases", "Queries", "database.graphqls")
+//     );
+//
+//     private static readonly string DatabaseGraphQlQueryFolder = System.IO.Path.GetFullPath(
+//         System.IO.Path.Combine("src", "GraphQl", "Databases", "Queries")
+//     );
+//
+//     // Code Smell: The variables are properly set in `OneTimeSetUp`
+//     private (Schema, DocumentValidator) metabaseValidator = default!;
+//     private (Schema, DocumentValidator) databaseValidator = default!;
+//
+//     [OneTimeSetUp]
+//     public async Task OneTimeSetUp()
+//     {
+//         metabaseValidator = await CreateValidator(MetabaseSchemaPath);
+//         databaseValidator = await CreateValidator(DatabaseSchemaPath);
+//     }
+//
+//     private static async Task<(Schema, DocumentValidator)> CreateValidator(string schemaPath)
+//     {
+//         if (!File.Exists(schemaPath))
+//         {
+//             Assert.Fail($"GraphQL schema file not found at: {schemaPath}");
+//         }
+//         var schema = SchemaBuilder.New()
+//             .AddDocumentFromString(await File.ReadAllTextAsync(schemaPath))
+//             .Use(_ => _)
+//             .Create();
+//         var validator = new ServiceCollection()
+//             .AddValidation()
+//             .BuildServiceProvider()
+//             .GetRequiredService<DocumentValidatorBuilder>()
+//             .Build();
+//         return (schema, validator);
+//     }
+//
+//     [Test]
+//     [TestCaseSource(nameof(GetMetabaseGraphQLQueryFiles))]
+//     [SuppressMessage("Naming", "CA1707")]
+//     public Task QueryFile_MatchesMetabaseSchema(string queryFilePath)
+//     {
+//         return AssertQueryFileMatchesSchema(queryFilePath, metabaseValidator);
+//     }
+//
+//     [Test]
+//     [TestCaseSource(nameof(GetDatabaseGraphQLQueryFiles))]
+//     [SuppressMessage("Naming", "CA1707")]
+//     public Task QueryFile_MatchesDatabaseSchema(string queryFilePath)
+//     {
+//         return AssertQueryFileMatchesSchema(queryFilePath, databaseValidator);
+//     }
+//
+//     private static IEnumerable<string> GetMetabaseGraphQLQueryFiles()
+//     {
+//         var queriesFolderPath = System.IO.Path.GetFullPath(".");
+//         return Directory.GetFiles(queriesFolderPath, "*.graphql", SearchOption.AllDirectories)
+//             .Where(filePath => !filePath.Contains(DatabaseGraphQlQueryFolder, StringComparison.OrdinalIgnoreCase));
+//     }
+//
+//     private static string[] GetDatabaseGraphQLQueryFiles()
+//     {
+//         return Directory.GetFiles(DatabaseGraphQlQueryFolder, "*.graphql", SearchOption.AllDirectories);
+//     }
+//
+//     public static async Task AssertQueryFileMatchesSchema(string queryFilePath, (Schema schema, DocumentValidator validator) schemaAndValidator)
+//     {
+//         var queryText = await File.ReadAllTextAsync(queryFilePath);
+//         DocumentNode queryDocument;
+//         try
+//         {
+//             queryDocument = Utf8GraphQLParser.Parse(queryText);
+//         }
+//         catch (SyntaxException exception)
+//         {
+//             Assert.Fail($"GraphQL Syntax Error in file '{System.IO.Path.GetFileName(queryFilePath)}': {exception.Message}");
+//             return;
+//         }
+//         var validationResult = schemaAndValidator.validator.Validate(schemaAndValidator.schema, queryDocument);
+//         if (validationResult.HasErrors)
+//         {
+//             var formattedErrors = validationResult.Errors.Select(error =>
+//                 $"[{error.Code}] {error.Message} (Line: {(error.Locations?.Count > 0 ? error.Locations[0].Line : -1)}, Column: {(error.Locations?.Count > 0 ? error.Locations[0].Column : -1)})"
+//             );
+//             validationResult.Errors.Should().BeEmpty($"""
+//                 because the GraphQL query file '{queryFilePath}' must comply with the schema definition. Found issues:
+//                 {string.Join(Environment.NewLine, formattedErrors)}
+//             """);
+//         }
+//     }
+// }
\ No newline at end of file

From e91a69d471b1c60b9b11c1d1aa2948d0a58e92fe Mon Sep 17 00:00:00 2001
From: christoph-maurer <christoph.maurer@ise.fraunhofer.de>
Date: Mon, 29 Jun 2026 16:42:21 +0200
Subject: [PATCH 139/145] Remove target `lint` because `next` does not offer it
 anymore

---
 frontend/Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/Makefile b/frontend/Makefile
index fda168a08..9cb9286db 100644
--- a/frontend/Makefile
+++ b/frontend/Makefile
@@ -41,10 +41,6 @@ outdated : ## Show outdated packages
 	yarn outdated
 .PHONY : outdated
 
-lint : ## Lint code
-	next lint
-.PHONY : lint
-
 format : ## Format the code
 	yarn run \
 		prettier --write .

From 6de7ab8b93048384be248a6db9f162da392fd543 Mon Sep 17 00:00:00 2001
From: christoph-maurer <christoph.maurer@ise.fraunhofer.de>
Date: Tue, 30 Jun 2026 11:02:11 +0200
Subject: [PATCH 140/145] Add snapshot of new test. All tests pass

---
 .../ChangeUserEmailTests.InvalidEmail_IsSyntaxError.snap         | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserEmailTests.InvalidEmail_IsSyntaxError.snap

diff --git a/backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserEmailTests.InvalidEmail_IsSyntaxError.snap b/backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserEmailTests.InvalidEmail_IsSyntaxError.snap
new file mode 100644
index 000000000..a00871d06
--- /dev/null
+++ b/backend/test/Integration/GraphQl/Users/__snapshots__/ChangeUserEmailTests.InvalidEmail_IsSyntaxError.snap
@@ -0,0 +1 @@
+{"errors":[{"message":"EmailAddressType cannot parse the provided value. The provided value does not meet the RFC 5322 specification.","path":["newEmail"],"extensions":{"code":"HC0002","actualType":"EmailAddress"}}]}

From 8ca1bfd8342e3d1ebbd337a8ed33be07073568b8 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 30 Jun 2026 12:01:46 +0200
Subject: [PATCH 141/145] Fix the dotenv linter used to lint deployments

---
 deploy.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy.mk b/deploy.mk
index dd74e59af..116571931 100755
--- a/deploy.mk
+++ b/deploy.mk
@@ -16,7 +16,7 @@ dotenv_linter = \
 		--volume "$(shell pwd):/mnt:ro" \
 		--pull "always" \
 		--quiet \
-		dotenvlinter/dotenv-linter:latest
+		dotenvlinter/dotenv-linter:4.0.0
 
 # Taken from https://www.client9.com/self-documenting-makefiles/
 help : ## Print this help

From b23a64ae479bb1448b008d347c312a33c885f223 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 30 Jun 2026 14:04:17 +0200
Subject: [PATCH 142/145] Increase max-allowed GraphQL costs (again) --- one
 issue is that the default number of edges returned by paginated queries is
 100, which results in high costs quickly, even for queries with actually only
 a handful of edges

---
 backend/src/Configuration/GraphQlConfiguration.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/Configuration/GraphQlConfiguration.cs b/backend/src/Configuration/GraphQlConfiguration.cs
index 64c46e31c..3f8b748e9 100644
--- a/backend/src/Configuration/GraphQlConfiguration.cs
+++ b/backend/src/Configuration/GraphQlConfiguration.cs
@@ -134,8 +134,8 @@ IWebHostEnvironment environment
             )
             .ModifyCostOptions(_ =>
                 {
-                    _.MaxFieldCost = 20000;
-                    _.MaxTypeCost = 20000;
+                    _.MaxFieldCost = 40000;
+                    _.MaxTypeCost = 40000;
                 }
             )
             // Configure

From 49b767669a3f0aac285bbae8a9f49399302fca8c Mon Sep 17 00:00:00 2001
From: GitHub Actions <noreply@github.com>
Date: Tue, 30 Jun 2026 16:33:01 +0000
Subject: [PATCH 143/145] Prepare release v1.2.0

---
 CHANGELOG.md          | 45 +++++++++++++++++++++++++------------------
 frontend/package.json |  2 +-
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0ff11e40..1d4896d36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.2.0] - 2026-06-30
+
 ### Added
 
 -
@@ -37,7 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- **BREAKING**: Use `String` for cursors and `Int` for `first` and `last` parameters to conform to the Relay connection specification, simplify GraphQL filter input type names, and correct plural names ending before in `ys` and now in `ies` [#274](https://github.com/building-envelope-data/metabase/pull/274)
+-   **BREAKING**: Use `String` for cursors and `Int` for `first` and `last` parameters to conform to the Relay connection specification, simplify GraphQL filter input type names, and correct plural names ending before in `ys` and now in `ies` [#274](https://github.com/building-envelope-data/metabase/pull/274)
 -
 -
 -
@@ -123,38 +125,43 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Add two videos to the frontend [#241](https://github.com/building-envelope-data/metabase/pull/514)
+-   Add two videos to the frontend [#241](https://github.com/building-envelope-data/metabase/pull/514)
 
 ## [v1.1.0] - 2024-06-25
 
 ### Added
 
-- Make component assemblies manageable [#152](https://github.com/building-envelope-data/metabase/pull/152)
-- Make variant and concretization associations manageable [#153](https://github.com/building-envelope-data/metabase/pull/153)
-- Make most entities and relations manageable [#155](https://github.com/building-envelope-data/metabase/pull/155)
-- Forward bearer tokens to databases [#158](https://github.com/building-envelope-data/metabase/pull/158)
-- Require verification of registered databases [#160](https://github.com/building-envelope-data/metabase/pull/160)
-- Forward GraphQL errors returned when querying databases for data [bf6d16099cb3f9681883d9a6f20eada4185044c7](https://github.com/building-envelope-data/metabase/commit/bf6d16099cb3f9681883d9a6f20eada4185044c7)
-- Enable automatic persisted queries [94277dfc336af87f279a549b38567dd9c13de233](https://github.com/building-envelope-data/metabase/commit/94277dfc336af87f279a549b38567dd9c13de233)
-- Make entities filterable by associated entities [#167](https://github.com/building-envelope-data/metabase/pull/167)
+-   Make component assemblies manageable [#152](https://github.com/building-envelope-data/metabase/pull/152)
+-   Make variant and concretization associations manageable [#153](https://github.com/building-envelope-data/metabase/pull/153)
+-   Make most entities and relations manageable [#155](https://github.com/building-envelope-data/metabase/pull/155)
+-   Forward bearer tokens to databases [#158](https://github.com/building-envelope-data/metabase/pull/158)
+-   Require verification of registered databases [#160](https://github.com/building-envelope-data/metabase/pull/160)
+-   Forward GraphQL errors returned when querying databases for data [bf6d16099cb3f9681883d9a6f20eada4185044c7](https://github.com/building-envelope-data/metabase/commit/bf6d16099cb3f9681883d9a6f20eada4185044c7)
+-   Enable automatic persisted queries [94277dfc336af87f279a549b38567dd9c13de233](https://github.com/building-envelope-data/metabase/commit/94277dfc336af87f279a549b38567dd9c13de233)
+-   Make entities filterable by associated entities [#167](https://github.com/building-envelope-data/metabase/pull/167)
 
 ### Changed
 
-- Upgrade packages to latest compatible versions in backend and frontend [#151](https://github.com/building-envelope-data/metabase/pull/151), [#143](https://github.com/building-envelope-data/metabase/pull/143), and [#141](https://github.com/building-envelope-data/metabase/pull/141)
-- Make forms type-safe [88259910da5490be845fe79dab066e868ee841c1](https://github.com/building-envelope-data/metabase/commit/88259910da5490be845fe79dab066e868ee841c1)
-- Clean-up authentication and authorization set-up [#161](https://github.com/building-envelope-data/metabase/pull/161)
-- Protect personal user data and login/registration mutations with client-specific scopes [#162](https://github.com/building-envelope-data/metabase/pull/162)
-- Improve security, in particular, implement the Cookie to Header Token Pattern to prevent Cross Site Request Forgery attacks for user mutations [#163](https://github.com/building-envelope-data/metabase/pull/163)
+-   Upgrade packages to latest compatible versions in backend and frontend [#151](https://github.com/building-envelope-data/metabase/pull/151), [#143](https://github.com/building-envelope-data/metabase/pull/143), and [#141](https://github.com/building-envelope-data/metabase/pull/141)
+-   Make forms type-safe [88259910da5490be845fe79dab066e868ee841c1](https://github.com/building-envelope-data/metabase/commit/88259910da5490be845fe79dab066e868ee841c1)
+-   Clean-up authentication and authorization set-up [#161](https://github.com/building-envelope-data/metabase/pull/161)
+-   Protect personal user data and login/registration mutations with client-specific scopes [#162](https://github.com/building-envelope-data/metabase/pull/162)
+-   Improve security, in particular, implement the Cookie to Header Token Pattern to prevent Cross Site Request Forgery attacks for user mutations [#163](https://github.com/building-envelope-data/metabase/pull/163)
 
 ### Fixed
 
-- Update cached schemata in commit [ffb52beeefea6fa841e927b7da4d6d85d31658ca](https://github.com/building-envelope-data/metabase/commit/ffb52beeefea6fa841e927b7da4d6d85d31658ca)
-- Correct wording regarding following links to match the one expected by regular expressions in tests [#114](https://github.com/building-envelope-data/metabase/pull/114)
-- Remove explicit content-type as it results in requests from banana cake pop responding with 404 in commit [4d8d2eb5101785d78fb0cc1579ee901b694147ad](https://github.com/building-envelope-data/metabase/commit/4d8d2eb5101785d78fb0cc1579ee901b694147ad)
+-   Update cached schemata in commit [ffb52beeefea6fa841e927b7da4d6d85d31658ca](https://github.com/building-envelope-data/metabase/commit/ffb52beeefea6fa841e927b7da4d6d85d31658ca)
+-   Correct wording regarding following links to match the one expected by regular expressions in tests [#114](https://github.com/building-envelope-data/metabase/pull/114)
+-   Remove explicit content-type as it results in requests from banana cake pop responding with 404 in commit [4d8d2eb5101785d78fb0cc1579ee901b694147ad](https://github.com/building-envelope-data/metabase/commit/4d8d2eb5101785d78fb0cc1579ee901b694147ad)
 
 ## [v1.0.0] - 2022-02-28
 
-[Unreleased]: https://github.com/building-envelope-data/metabase/compare/v1.1.1...HEAD
+[Unreleased]: https://github.com/building-envelope-data/metabase/compare/v1.2.0...HEAD
+
+[v1.2.0]: https://github.com/building-envelope-data/metabase/compare/v1.1.1...v1.2.0
+
 [v1.1.1]: https://github.com/building-envelope-data/metabase/compare/v1.1.0...v1.1.1
+
 [v1.1.0]: https://github.com/building-envelope-data/metabase/compare/v1.0.0...v1.1.0
+
 [v1.0.0]: https://github.com/building-envelope-data/metabase/compare/5e4c6579bc7b596502c0bc9318cf24435bed2c80...v1.0.0
diff --git a/frontend/package.json b/frontend/package.json
index ec406bf66..1a36b03d6 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "v2.0.0",
+  "version": "v1.2.0",
   "private": true,
   "author": "Simon Wacker",
   "license": "MIT",

From 7cfef64e8520f4f788a200b2855290337674abc3 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 30 Jun 2026 18:36:29 +0200
Subject: [PATCH 144/145] Remove `--detach` from `git switch` when used with a
 release tag (it does not work)

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f3cdec48a..7f0948b61 100644
--- a/README.md
+++ b/README.md
@@ -310,7 +310,7 @@ and the pages following it.
 
    1. Switch to the Git branch, tag, or commit you want to deploy by either running
       `git switch ${BRANCH}`,
-      `git switch --detach release/${TAG}`, or
+      `git switch release/${TAG}`, or
       `git switch --detach ${COMMIT_HASH}`,
       where, for example, `${BRANCH}` is `develop` or `${TAG}` is `v1.0.0` or
       `${COMMIT_HASH}` is `5e14d7d0858f26c00c82ab9c248cd750606a24b6`.
@@ -334,7 +334,7 @@ and the pages following it.
    a new release" on
    [Releases](https://github.com/building-envelope-data/metabase/releases).
 1. Fetch the release branch by running `git fetch` and switch to it by running
-   `git switch --detach release/v*.*.*`, where `*.*.*` is the version.
+   `git switch release/v*.*.*`, where `*.*.*` is the version.
 1. If the databases have not diverged, then apply pending migrations with
    `./database.mk migrate`. Otherwise, recreate the database by running
    `./database.mk drop create migrate`.
@@ -346,7 +346,7 @@ and the pages following it.
 ### Deploying a release
 
 1. Fetch the release branch by running `git fetch` and switch to it by running
-   `git switch --detach release/${TAG}`, where `${TAG}` is the release tag to
+   `git switch release/${TAG}`, where `${TAG}` is the release tag to
    be deployed, for example, `v1.0.0`.
 1. Build and push the Docker images for the services `frontend` and `backend`
    by running `./forge.mk all USER=cloud HOST=${IP}`, where `${IP}` is the

From 37a2d6b3b37208d121ebc0437ab44d5b3b654b99 Mon Sep 17 00:00:00 2001
From: Simon Wacker <simon.wacker@ise.faunhofer.de>
Date: Tue, 30 Jun 2026 18:38:36 +0200
Subject: [PATCH 145/145] Prepare changelog for the upcoming release

---
 CHANGELOG.md | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d4896d36..1a2b3fcd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [v1.2.0] - 2026-06-30
-
 ### Added
 
 -
@@ -39,7 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
--   **BREAKING**: Use `String` for cursors and `Int` for `first` and `last` parameters to conform to the Relay connection specification, simplify GraphQL filter input type names, and correct plural names ending before in `ys` and now in `ies` [#274](https://github.com/building-envelope-data/metabase/pull/274)
+-
 -
 -
 -
@@ -121,47 +119,49 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -
 -
 
+## [v1.2.0] - 2026-06-30
+
+### Changed
+
+- **BREAKING**: Use `String` for cursors and `Int` for `first` and `last` parameters to conform to the Relay connection specification, simplify GraphQL filter input type names, and correct plural names ending before in `ys` and now in `ies` [#274](https://github.com/building-envelope-data/metabase/pull/274)
+
 ## [v1.1.1] - 2026-04-13
 
 ### Added
 
--   Add two videos to the frontend [#241](https://github.com/building-envelope-data/metabase/pull/514)
+- Add two videos to the frontend [#241](https://github.com/building-envelope-data/metabase/pull/514)
 
 ## [v1.1.0] - 2024-06-25
 
 ### Added
 
--   Make component assemblies manageable [#152](https://github.com/building-envelope-data/metabase/pull/152)
--   Make variant and concretization associations manageable [#153](https://github.com/building-envelope-data/metabase/pull/153)
--   Make most entities and relations manageable [#155](https://github.com/building-envelope-data/metabase/pull/155)
--   Forward bearer tokens to databases [#158](https://github.com/building-envelope-data/metabase/pull/158)
--   Require verification of registered databases [#160](https://github.com/building-envelope-data/metabase/pull/160)
--   Forward GraphQL errors returned when querying databases for data [bf6d16099cb3f9681883d9a6f20eada4185044c7](https://github.com/building-envelope-data/metabase/commit/bf6d16099cb3f9681883d9a6f20eada4185044c7)
--   Enable automatic persisted queries [94277dfc336af87f279a549b38567dd9c13de233](https://github.com/building-envelope-data/metabase/commit/94277dfc336af87f279a549b38567dd9c13de233)
--   Make entities filterable by associated entities [#167](https://github.com/building-envelope-data/metabase/pull/167)
+- Make component assemblies manageable [#152](https://github.com/building-envelope-data/metabase/pull/152)
+- Make variant and concretization associations manageable [#153](https://github.com/building-envelope-data/metabase/pull/153)
+- Make most entities and relations manageable [#155](https://github.com/building-envelope-data/metabase/pull/155)
+- Forward bearer tokens to databases [#158](https://github.com/building-envelope-data/metabase/pull/158)
+- Require verification of registered databases [#160](https://github.com/building-envelope-data/metabase/pull/160)
+- Forward GraphQL errors returned when querying databases for data [bf6d16099cb3f9681883d9a6f20eada4185044c7](https://github.com/building-envelope-data/metabase/commit/bf6d16099cb3f9681883d9a6f20eada4185044c7)
+- Enable automatic persisted queries [94277dfc336af87f279a549b38567dd9c13de233](https://github.com/building-envelope-data/metabase/commit/94277dfc336af87f279a549b38567dd9c13de233)
+- Make entities filterable by associated entities [#167](https://github.com/building-envelope-data/metabase/pull/167)
 
 ### Changed
 
--   Upgrade packages to latest compatible versions in backend and frontend [#151](https://github.com/building-envelope-data/metabase/pull/151), [#143](https://github.com/building-envelope-data/metabase/pull/143), and [#141](https://github.com/building-envelope-data/metabase/pull/141)
--   Make forms type-safe [88259910da5490be845fe79dab066e868ee841c1](https://github.com/building-envelope-data/metabase/commit/88259910da5490be845fe79dab066e868ee841c1)
--   Clean-up authentication and authorization set-up [#161](https://github.com/building-envelope-data/metabase/pull/161)
--   Protect personal user data and login/registration mutations with client-specific scopes [#162](https://github.com/building-envelope-data/metabase/pull/162)
--   Improve security, in particular, implement the Cookie to Header Token Pattern to prevent Cross Site Request Forgery attacks for user mutations [#163](https://github.com/building-envelope-data/metabase/pull/163)
+- Upgrade packages to latest compatible versions in backend and frontend [#151](https://github.com/building-envelope-data/metabase/pull/151), [#143](https://github.com/building-envelope-data/metabase/pull/143), and [#141](https://github.com/building-envelope-data/metabase/pull/141)
+- Make forms type-safe [88259910da5490be845fe79dab066e868ee841c1](https://github.com/building-envelope-data/metabase/commit/88259910da5490be845fe79dab066e868ee841c1)
+- Clean-up authentication and authorization set-up [#161](https://github.com/building-envelope-data/metabase/pull/161)
+- Protect personal user data and login/registration mutations with client-specific scopes [#162](https://github.com/building-envelope-data/metabase/pull/162)
+- Improve security, in particular, implement the Cookie to Header Token Pattern to prevent Cross Site Request Forgery attacks for user mutations [#163](https://github.com/building-envelope-data/metabase/pull/163)
 
 ### Fixed
 
--   Update cached schemata in commit [ffb52beeefea6fa841e927b7da4d6d85d31658ca](https://github.com/building-envelope-data/metabase/commit/ffb52beeefea6fa841e927b7da4d6d85d31658ca)
--   Correct wording regarding following links to match the one expected by regular expressions in tests [#114](https://github.com/building-envelope-data/metabase/pull/114)
--   Remove explicit content-type as it results in requests from banana cake pop responding with 404 in commit [4d8d2eb5101785d78fb0cc1579ee901b694147ad](https://github.com/building-envelope-data/metabase/commit/4d8d2eb5101785d78fb0cc1579ee901b694147ad)
+- Update cached schemata in commit [ffb52beeefea6fa841e927b7da4d6d85d31658ca](https://github.com/building-envelope-data/metabase/commit/ffb52beeefea6fa841e927b7da4d6d85d31658ca)
+- Correct wording regarding following links to match the one expected by regular expressions in tests [#114](https://github.com/building-envelope-data/metabase/pull/114)
+- Remove explicit content-type as it results in requests from banana cake pop responding with 404 in commit [4d8d2eb5101785d78fb0cc1579ee901b694147ad](https://github.com/building-envelope-data/metabase/commit/4d8d2eb5101785d78fb0cc1579ee901b694147ad)
 
 ## [v1.0.0] - 2022-02-28
 
 [Unreleased]: https://github.com/building-envelope-data/metabase/compare/v1.2.0...HEAD
-
 [v1.2.0]: https://github.com/building-envelope-data/metabase/compare/v1.1.1...v1.2.0
-
 [v1.1.1]: https://github.com/building-envelope-data/metabase/compare/v1.1.0...v1.1.1
-
 [v1.1.0]: https://github.com/building-envelope-data/metabase/compare/v1.0.0...v1.1.0
-
 [v1.0.0]: https://github.com/building-envelope-data/metabase/compare/5e4c6579bc7b596502c0bc9318cf24435bed2c80...v1.0.0