Add new permissions handling for custom domain page
Signed-off-by: Émile Ré <nemile.re@gmail.com>
This commit is contained in:
@@ -5,7 +5,9 @@
|
|||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"relay": "find src -type d -name \"__generated__\" -exec rm -rf {} + && npx relay-compiler",
|
"relay-clean": "find src -type d -name \"__generated__\" -exec rm -rf {} +",
|
||||||
|
"relay-compile": "npx relay-compiler",
|
||||||
|
"relay": "npm run relay-clean && npm run relay-compile",
|
||||||
"build": "tsc -b && vite build",
|
"build": "tsc -b && vite build",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"check": "tsc --noEmit -p tsconfig.app.json",
|
"check": "tsc --noEmit -p tsconfig.app.json",
|
||||||
|
|||||||
@@ -15,11 +15,22 @@
|
|||||||
"eagerEsModules": true,
|
"eagerEsModules": true,
|
||||||
"noFutureProofEnums": true,
|
"noFutureProofEnums": true,
|
||||||
"output": "apps/console/src/__generated__/core",
|
"output": "apps/console/src/__generated__/core",
|
||||||
"relativizeJsModulePaths": false
|
"relativizeJsModulePaths": false,
|
||||||
|
"excludesExtensions": ["*.iam.ts"]
|
||||||
|
},
|
||||||
|
"inline-iam": {
|
||||||
|
"base": "core",
|
||||||
|
"schema": "pkg/server/api/connect/v1/schema.graphql",
|
||||||
|
"language": "typescript",
|
||||||
|
"eagerEsModules": true,
|
||||||
|
"noFutureProofEnums": true,
|
||||||
|
"output": "apps/console/src/__generated__/iam",
|
||||||
|
"relativizeJsModulePaths": false,
|
||||||
|
"excludesExtensions": ["*.tsx", "**/hooks/**.ts"]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sources": {
|
"sources": {
|
||||||
"apps/console/src/pages/iam": "iam",
|
"apps/console/src/pages/iam": "iam",
|
||||||
"apps/console/src": "core"
|
"apps/console/src": ["core", "inline-iam"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
136
apps/console/src/__generated__/iam/domainSettingsPage_permissionsQuery.graphql.ts
generated
Normal file
136
apps/console/src/__generated__/iam/domainSettingsPage_permissionsQuery.graphql.ts
generated
Normal file
@@ -0,0 +1,136 @@
|
|||||||
|
/**
|
||||||
|
* @generated SignedSource<<2c18e7bff6b76551479def8a10cce183>>
|
||||||
|
* @lightSyntaxTransform
|
||||||
|
* @nogrep
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* tslint:disable */
|
||||||
|
/* eslint-disable */
|
||||||
|
// @ts-nocheck
|
||||||
|
|
||||||
|
import { ConcreteRequest } from 'relay-runtime';
|
||||||
|
export type domainSettingsPage_permissionsQuery$variables = {
|
||||||
|
organizationId: string;
|
||||||
|
};
|
||||||
|
export type domainSettingsPage_permissionsQuery$data = {
|
||||||
|
readonly viewer: {
|
||||||
|
readonly canCreateCustomDomain: boolean;
|
||||||
|
readonly canDeleteCustomDomain: boolean;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
export type domainSettingsPage_permissionsQuery = {
|
||||||
|
response: domainSettingsPage_permissionsQuery$data;
|
||||||
|
variables: domainSettingsPage_permissionsQuery$variables;
|
||||||
|
};
|
||||||
|
|
||||||
|
const node: ConcreteRequest = (function(){
|
||||||
|
var v0 = [
|
||||||
|
{
|
||||||
|
"defaultValue": null,
|
||||||
|
"kind": "LocalArgument",
|
||||||
|
"name": "organizationId"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
v1 = {
|
||||||
|
"kind": "Variable",
|
||||||
|
"name": "id",
|
||||||
|
"variableName": "organizationId"
|
||||||
|
},
|
||||||
|
v2 = {
|
||||||
|
"alias": "canCreateCustomDomain",
|
||||||
|
"args": [
|
||||||
|
{
|
||||||
|
"kind": "Literal",
|
||||||
|
"name": "action",
|
||||||
|
"value": "core:custom-domain:create"
|
||||||
|
},
|
||||||
|
(v1/*: any*/)
|
||||||
|
],
|
||||||
|
"kind": "ScalarField",
|
||||||
|
"name": "permission",
|
||||||
|
"storageKey": null
|
||||||
|
},
|
||||||
|
v3 = {
|
||||||
|
"alias": "canDeleteCustomDomain",
|
||||||
|
"args": [
|
||||||
|
{
|
||||||
|
"kind": "Literal",
|
||||||
|
"name": "action",
|
||||||
|
"value": "core:custom-domain:delete"
|
||||||
|
},
|
||||||
|
(v1/*: any*/)
|
||||||
|
],
|
||||||
|
"kind": "ScalarField",
|
||||||
|
"name": "permission",
|
||||||
|
"storageKey": null
|
||||||
|
};
|
||||||
|
return {
|
||||||
|
"fragment": {
|
||||||
|
"argumentDefinitions": (v0/*: any*/),
|
||||||
|
"kind": "Fragment",
|
||||||
|
"metadata": null,
|
||||||
|
"name": "domainSettingsPage_permissionsQuery",
|
||||||
|
"selections": [
|
||||||
|
{
|
||||||
|
"kind": "RequiredField",
|
||||||
|
"field": {
|
||||||
|
"alias": null,
|
||||||
|
"args": null,
|
||||||
|
"concreteType": "Identity",
|
||||||
|
"kind": "LinkedField",
|
||||||
|
"name": "viewer",
|
||||||
|
"plural": false,
|
||||||
|
"selections": [
|
||||||
|
(v2/*: any*/),
|
||||||
|
(v3/*: any*/)
|
||||||
|
],
|
||||||
|
"storageKey": null
|
||||||
|
},
|
||||||
|
"action": "THROW"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"type": "Query",
|
||||||
|
"abstractKey": null
|
||||||
|
},
|
||||||
|
"kind": "Request",
|
||||||
|
"operation": {
|
||||||
|
"argumentDefinitions": (v0/*: any*/),
|
||||||
|
"kind": "Operation",
|
||||||
|
"name": "domainSettingsPage_permissionsQuery",
|
||||||
|
"selections": [
|
||||||
|
{
|
||||||
|
"alias": null,
|
||||||
|
"args": null,
|
||||||
|
"concreteType": "Identity",
|
||||||
|
"kind": "LinkedField",
|
||||||
|
"name": "viewer",
|
||||||
|
"plural": false,
|
||||||
|
"selections": [
|
||||||
|
(v2/*: any*/),
|
||||||
|
(v3/*: any*/),
|
||||||
|
{
|
||||||
|
"alias": null,
|
||||||
|
"args": null,
|
||||||
|
"kind": "ScalarField",
|
||||||
|
"name": "id",
|
||||||
|
"storageKey": null
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"storageKey": null
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"params": {
|
||||||
|
"cacheID": "bb016bc1f53b609efc4ac93a93653d08",
|
||||||
|
"id": null,
|
||||||
|
"metadata": {},
|
||||||
|
"name": "domainSettingsPage_permissionsQuery",
|
||||||
|
"operationKind": "query",
|
||||||
|
"text": "query domainSettingsPage_permissionsQuery(\n $organizationId: ID!\n) {\n viewer {\n canCreateCustomDomain: permission(action: \"core:custom-domain:create\", id: $organizationId)\n canDeleteCustomDomain: permission(action: \"core:custom-domain:delete\", id: $organizationId)\n id\n }\n}\n"
|
||||||
|
}
|
||||||
|
};
|
||||||
|
})();
|
||||||
|
|
||||||
|
(node as any).hash = "f09bdc9336bf1ad1339bb3b60987f53f";
|
||||||
|
|
||||||
|
export default node;
|
||||||
@@ -5,6 +5,8 @@ import { useTranslate } from "@probo/i18n";
|
|||||||
import { DomainCard } from "./_components/DomainCard";
|
import { DomainCard } from "./_components/DomainCard";
|
||||||
import { NewDomainDialog } from "./_components/NewDomainDialog";
|
import { NewDomainDialog } from "./_components/NewDomainDialog";
|
||||||
import { Button, Card, IconPlusLarge } from "@probo/ui";
|
import { Button, Card, IconPlusLarge } from "@probo/ui";
|
||||||
|
import { PermissionsContext } from "/providers/NewPermissionsContext";
|
||||||
|
import { use } from "react";
|
||||||
|
|
||||||
export const domainSettingsPageQuery = graphql`
|
export const domainSettingsPageQuery = graphql`
|
||||||
query DomainSettingsPageQuery($organizationId: ID!) {
|
query DomainSettingsPageQuery($organizationId: ID!) {
|
||||||
@@ -27,6 +29,7 @@ export function DomainSettingsPage(props: {
|
|||||||
const { queryRef } = props;
|
const { queryRef } = props;
|
||||||
|
|
||||||
const { __ } = useTranslate();
|
const { __ } = useTranslate();
|
||||||
|
const { canCreateCustomDomain } = use(PermissionsContext);
|
||||||
|
|
||||||
const { organization } = usePreloadedQuery<DomainSettingsPageQuery>(
|
const { organization } = usePreloadedQuery<DomainSettingsPageQuery>(
|
||||||
domainSettingsPageQuery,
|
domainSettingsPageQuery,
|
||||||
@@ -53,11 +56,11 @@ export function DomainSettingsPage(props: {
|
|||||||
)}
|
)}
|
||||||
</p>
|
</p>
|
||||||
<div className="flex justify-center">
|
<div className="flex justify-center">
|
||||||
{/* {isAuthorized("Organization", "createCustomDomain") && ( */}
|
{canCreateCustomDomain && (
|
||||||
<NewDomainDialog>
|
<NewDomainDialog>
|
||||||
<Button icon={IconPlusLarge}>{__("Add Domain")}</Button>
|
<Button icon={IconPlusLarge}>{__("Add Domain")}</Button>
|
||||||
</NewDomainDialog>
|
</NewDomainDialog>
|
||||||
{/* )} */}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
|
|||||||
@@ -7,6 +7,10 @@ import {
|
|||||||
import { useQueryLoader } from "react-relay";
|
import { useQueryLoader } from "react-relay";
|
||||||
import { CoreRelayProvider } from "/providers/CoreRelayProvider";
|
import { CoreRelayProvider } from "/providers/CoreRelayProvider";
|
||||||
import type { DomainSettingsPageQuery } from "/__generated__/core/DomainSettingsPageQuery.graphql";
|
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() {
|
function DomainSettingsPageLoader() {
|
||||||
const organizationId = useOrganizationId();
|
const organizationId = useOrganizationId();
|
||||||
@@ -29,10 +33,16 @@ function DomainSettingsPageLoader() {
|
|||||||
|
|
||||||
export default function () {
|
export default function () {
|
||||||
return (
|
return (
|
||||||
|
<IAMRelayProvider>
|
||||||
|
<PermissionsProviderLoader<domainSettingsPage_permissionsQuery>
|
||||||
|
query={domainSettingsPagePermissionsQuery}
|
||||||
|
>
|
||||||
<CoreRelayProvider>
|
<CoreRelayProvider>
|
||||||
<Suspense>
|
<Suspense>
|
||||||
<DomainSettingsPageLoader />
|
<DomainSettingsPageLoader />
|
||||||
</Suspense>
|
</Suspense>
|
||||||
</CoreRelayProvider>
|
</CoreRelayProvider>
|
||||||
|
</PermissionsProviderLoader>
|
||||||
|
</IAMRelayProvider>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import { graphql } from "relay-runtime";
|
|||||||
import { useFragment } from "react-relay";
|
import { useFragment } from "react-relay";
|
||||||
import type { DomainCardFragment$key } from "/__generated__/core/DomainCardFragment.graphql";
|
import type { DomainCardFragment$key } from "/__generated__/core/DomainCardFragment.graphql";
|
||||||
import { DeleteDomainDialog } from "./DeleteDomainDialog";
|
import { DeleteDomainDialog } from "./DeleteDomainDialog";
|
||||||
|
import { use } from "react";
|
||||||
|
import { PermissionsContext } from "/providers/NewPermissionsContext";
|
||||||
|
|
||||||
const fragment = graphql`
|
const fragment = graphql`
|
||||||
fragment DomainCardFragment on CustomDomain {
|
fragment DomainCardFragment on CustomDomain {
|
||||||
@@ -22,6 +24,7 @@ export function DomainCard(props: { fKey: DomainCardFragment$key }) {
|
|||||||
const { fKey } = props;
|
const { fKey } = props;
|
||||||
|
|
||||||
const { __ } = useTranslate();
|
const { __ } = useTranslate();
|
||||||
|
const { canDeleteCustomDomain } = use(PermissionsContext);
|
||||||
|
|
||||||
const domain = useFragment<DomainCardFragment$key>(fragment, fKey);
|
const domain = useFragment<DomainCardFragment$key>(fragment, fKey);
|
||||||
|
|
||||||
@@ -50,11 +53,11 @@ export function DomainCard(props: { fKey: DomainCardFragment$key }) {
|
|||||||
<Button variant="secondary">{__("View Details")}</Button>
|
<Button variant="secondary">{__("View Details")}</Button>
|
||||||
</DomainDialog>
|
</DomainDialog>
|
||||||
|
|
||||||
{/* {permissions.canDeleteCustomDomain && ( */}
|
{canDeleteCustomDomain && (
|
||||||
<DeleteDomainDialog domain={domain.domain}>
|
<DeleteDomainDialog domain={domain.domain}>
|
||||||
<Button variant="danger">{__("Delete")}</Button>
|
<Button variant="danger">{__("Delete")}</Button>
|
||||||
</DeleteDomainDialog>
|
</DeleteDomainDialog>
|
||||||
{/* )} */}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
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
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
5
apps/console/src/providers/NewPermissionsContext.tsx
Normal file
5
apps/console/src/providers/NewPermissionsContext.tsx
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
import { createContext } from "react";
|
||||||
|
|
||||||
|
export type PermissionsContextType = Record<string, boolean>;
|
||||||
|
|
||||||
|
export const PermissionsContext = createContext<PermissionsContextType>({});
|
||||||
72
apps/console/src/providers/NewPermissionsProvider.tsx
Normal file
72
apps/console/src/providers/NewPermissionsProvider.tsx
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
import { useEffect, type PropsWithChildren } from "react";
|
||||||
|
import { PermissionsContext } from "./NewPermissionsContext";
|
||||||
|
import {
|
||||||
|
usePreloadedQuery,
|
||||||
|
useQueryLoader,
|
||||||
|
type PreloadedQuery,
|
||||||
|
} from "react-relay";
|
||||||
|
import type { GraphQLTaggedNode, OperationType } from "relay-runtime";
|
||||||
|
import { useOrganizationId } from "/hooks/useOrganizationId";
|
||||||
|
|
||||||
|
type PermissionsQueryType = OperationType & {
|
||||||
|
response: { viewer: Record<string, boolean> };
|
||||||
|
};
|
||||||
|
|
||||||
|
type PermissionsProviderLoaderProps = PropsWithChildren<{
|
||||||
|
query: GraphQLTaggedNode;
|
||||||
|
}>;
|
||||||
|
|
||||||
|
export function PermissionsProviderLoader<T extends PermissionsQueryType>(
|
||||||
|
props: PermissionsProviderLoaderProps,
|
||||||
|
) {
|
||||||
|
const { children, query } = props;
|
||||||
|
|
||||||
|
const organizationId = useOrganizationId();
|
||||||
|
const [queryRef, loadQuery] = useQueryLoader<T>(query);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
loadQuery({
|
||||||
|
organizationId,
|
||||||
|
});
|
||||||
|
}, [loadQuery, organizationId]);
|
||||||
|
|
||||||
|
if (!queryRef) {
|
||||||
|
// While permissions are loading, consider there are no permissions
|
||||||
|
return <PermissionsContext value={{}}>{children}</PermissionsContext>;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<PermissionsProvider query={query} queryRef={queryRef}>
|
||||||
|
{children}
|
||||||
|
</PermissionsProvider>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
type PermissionsProviderProps<T extends PermissionsQueryType> =
|
||||||
|
PermissionsProviderLoaderProps & {
|
||||||
|
queryRef: PreloadedQuery<T>;
|
||||||
|
};
|
||||||
|
|
||||||
|
function PermissionsProvider<T extends PermissionsQueryType>(
|
||||||
|
props: PermissionsProviderProps<T>,
|
||||||
|
) {
|
||||||
|
const { children, query, queryRef } = props;
|
||||||
|
|
||||||
|
const { viewer: permissions } = usePreloadedQuery<T>(query, queryRef);
|
||||||
|
|
||||||
|
const handler = {
|
||||||
|
get(target: Record<string, boolean>, prop: string) {
|
||||||
|
if (!(prop in target)) {
|
||||||
|
throw new Error(`Field ${prop} is not defined in IAM viewer node`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Reflect.get(target, prop);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<PermissionsContext value={new Proxy(permissions, handler)}>
|
||||||
|
{children}
|
||||||
|
</PermissionsContext>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@ import { fileURLToPath, URL } from "node:url";
|
|||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
plugins: [
|
plugins: [
|
||||||
react({
|
react({
|
||||||
exclude: "src/pages/iam/**/*",
|
exclude: ["src/pages/iam/**/*", "src/pages/**/*.iam.ts"],
|
||||||
babel: {
|
babel: {
|
||||||
plugins: [
|
plugins: [
|
||||||
[
|
[
|
||||||
@@ -21,7 +21,7 @@ export default defineConfig({
|
|||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
react({
|
react({
|
||||||
include: "src/pages/iam/**/*",
|
include: ["src/pages/iam/**/*", "src/pages/**/*.iam.ts"],
|
||||||
babel: {
|
babel: {
|
||||||
plugins: [
|
plugins: [
|
||||||
[
|
[
|
||||||
|
|||||||
Reference in New Issue
Block a user