Expose permission field on each core schema node implementation

Signed-off-by: Émile Ré <nemile.re@gmail.com>

apps/console/src/pages/organizations/settings/DomainSettingsPage.tsx

@@ -5,8 +5,6 @@ import { useTranslate } from "@probo/i18n";
 import { DomainCard } from "./_components/DomainCard";
 import { NewDomainDialog } from "./_components/NewDomainDialog";
 import { Button, Card, IconPlusLarge } from "@probo/ui";
-import { PermissionsContext } from "/providers/NewPermissionsContext";
-import { use } from "react";
 
 export const domainSettingsPageQuery = graphql`
   query DomainSettingsPageQuery($organizationId: ID!) {
@@ -14,6 +12,7 @@ export const domainSettingsPageQuery = graphql`
       __typename
       ... on Organization {
         id
+        canCreateCustomDomain: permission(action: "core:custom-domain:create")
         customDomain {
           domain
           ...DomainCardFragment
@@ -29,7 +28,6 @@ export function DomainSettingsPage(props: {
   const { queryRef } = props;
 
   const { __ } = useTranslate();
-  const { canCreateCustomDomain } = use(PermissionsContext);
 
   const { organization } = usePreloadedQuery<DomainSettingsPageQuery>(
     domainSettingsPageQuery,
@@ -56,7 +54,7 @@ export function DomainSettingsPage(props: {
               )}
             </p>
             <div className="flex justify-center">
-              {canCreateCustomDomain && (
+              {organization.canCreateCustomDomain && (
                 <NewDomainDialog>
                   <Button icon={IconPlusLarge}>{__("Add Domain")}</Button>
                 </NewDomainDialog>

apps/console/src/pages/organizations/settings/DomainSettingsPageLoader.tsx

@@ -7,10 +7,6 @@ import {
 import { useQueryLoader } from "react-relay";
 import { CoreRelayProvider } from "/providers/CoreRelayProvider";
 import type { DomainSettingsPageQuery } from "/__generated__/core/DomainSettingsPageQuery.graphql";
-import { PermissionsProviderLoader } from "/providers/NewPermissionsProvider";
-import { IAMRelayProvider } from "/providers/IAMRelayProvider";
-import { domainSettingsPagePermissionsQuery } from "./domainSettingsPage.iam";
-import type { domainSettingsPage_permissionsQuery } from "/__generated__/iam/domainSettingsPage_permissionsQuery.graphql";
 
 function DomainSettingsPageLoader() {
   const organizationId = useOrganizationId();
@@ -33,16 +29,10 @@ function DomainSettingsPageLoader() {
 
 export default function () {
   return (
-    <IAMRelayProvider>
-      <PermissionsProviderLoader<domainSettingsPage_permissionsQuery>
-        query={domainSettingsPagePermissionsQuery}
-      >
-        <CoreRelayProvider>
-          <Suspense>
-            <DomainSettingsPageLoader />
-          </Suspense>
-        </CoreRelayProvider>
-      </PermissionsProviderLoader>
-    </IAMRelayProvider>
+    <CoreRelayProvider>
+      <Suspense>
+        <DomainSettingsPageLoader />
+      </Suspense>
+    </CoreRelayProvider>
   );
 }

apps/console/src/pages/organizations/settings/_components/DomainCard.tsx

@@ -9,13 +9,12 @@ import { graphql } from "relay-runtime";
 import { useFragment } from "react-relay";
 import type { DomainCardFragment$key } from "/__generated__/core/DomainCardFragment.graphql";
 import { DeleteDomainDialog } from "./DeleteDomainDialog";
-import { use } from "react";
-import { PermissionsContext } from "/providers/NewPermissionsContext";
 
 const fragment = graphql`
   fragment DomainCardFragment on CustomDomain {
     domain
     sslStatus
+    canDelete: permission(action: "core:custom-domain:delete")
     ...DomainDialogFragment
   }
 `;
@@ -24,7 +23,6 @@ export function DomainCard(props: { fKey: DomainCardFragment$key }) {
   const { fKey } = props;
 
   const { __ } = useTranslate();
-  const { canDeleteCustomDomain } = use(PermissionsContext);
 
   const domain = useFragment<DomainCardFragment$key>(fragment, fKey);
 
@@ -53,7 +51,7 @@ export function DomainCard(props: { fKey: DomainCardFragment$key }) {
               <Button variant="secondary">{__("View Details")}</Button>
             </DomainDialog>
 
-            {canDeleteCustomDomain && (
+            {domain.canDelete && (
               <DeleteDomainDialog domain={domain.domain}>
                 <Button variant="danger">{__("Delete")}</Button>
               </DeleteDomainDialog>

apps/console/src/pages/organizations/settings/domainSettingsPage.iam.ts

@@ -1,16 +0,0 @@
-import { graphql } from "relay-runtime";
-
-export const domainSettingsPagePermissionsQuery = graphql`
-  query domainSettingsPage_permissionsQuery($organizationId: ID!) {
-    viewer @required(action: THROW) {
-      canCreateCustomDomain: permission(
-        action: "core:custom-domain:create"
-        id: $organizationId
-      )
-      canDeleteCustomDomain: permission(
-        action: "core:custom-domain:delete"
-        id: $organizationId
-      )
-    }
-  }
-`;