Use resource alias mutations in compliance page
Update the compliance page alias field and list items to call the generic setResourceAlias and removeResourceAlias mutations instead of the trust-center-specific ones, and drop the now-removed audit alias field usage. Signed-off-by: Bryan Frimin <bryan@probo.com>
This commit is contained in:
@@ -19,12 +19,12 @@ import { graphql } from "relay-runtime";
|
|||||||
|
|
||||||
import { useMutationWithToasts } from "#/hooks/useMutationWithToasts";
|
import { useMutationWithToasts } from "#/hooks/useMutationWithToasts";
|
||||||
|
|
||||||
const setTrustCenterAliasMutation = graphql`
|
const setResourceAliasMutation = graphql`
|
||||||
mutation CompliancePageAliasField_setTrustCenterAliasMutation(
|
mutation CompliancePageAliasField_setResourceAliasMutation(
|
||||||
$input: SetTrustCenterAliasInput!
|
$input: SetResourceAliasInput!
|
||||||
) {
|
) {
|
||||||
setTrustCenterAlias(input: $input) {
|
setResourceAlias(input: $input) {
|
||||||
alias {
|
resourceAlias {
|
||||||
resourceId
|
resourceId
|
||||||
alias
|
alias
|
||||||
}
|
}
|
||||||
@@ -32,11 +32,11 @@ const setTrustCenterAliasMutation = graphql`
|
|||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const removeTrustCenterAliasMutation = graphql`
|
const removeResourceAliasMutation = graphql`
|
||||||
mutation CompliancePageAliasField_removeTrustCenterAliasMutation(
|
mutation CompliancePageAliasField_removeResourceAliasMutation(
|
||||||
$input: RemoveTrustCenterAliasInput!
|
$input: RemoveResourceAliasInput!
|
||||||
) {
|
) {
|
||||||
removeTrustCenterAlias(input: $input) {
|
removeResourceAlias(input: $input) {
|
||||||
deletedResourceId
|
deletedResourceId
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -57,15 +57,15 @@ export function CompliancePageAliasField(props: {
|
|||||||
setValue(alias ?? "");
|
setValue(alias ?? "");
|
||||||
}, [alias]);
|
}, [alias]);
|
||||||
|
|
||||||
const [setTrustCenterAlias, isSettingAlias] = useMutationWithToasts(
|
const [setResourceAlias, isSettingAlias] = useMutationWithToasts(
|
||||||
setTrustCenterAliasMutation,
|
setResourceAliasMutation,
|
||||||
{
|
{
|
||||||
successMessage: __("Alias updated successfully."),
|
successMessage: __("Alias updated successfully."),
|
||||||
errorMessage: __("Failed to update alias"),
|
errorMessage: __("Failed to update alias"),
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
const [removeTrustCenterAlias, isRemovingAlias] = useMutationWithToasts(
|
const [removeResourceAlias, isRemovingAlias] = useMutationWithToasts(
|
||||||
removeTrustCenterAliasMutation,
|
removeResourceAliasMutation,
|
||||||
{
|
{
|
||||||
successMessage: __("Alias removed successfully."),
|
successMessage: __("Alias removed successfully."),
|
||||||
errorMessage: __("Failed to remove alias"),
|
errorMessage: __("Failed to remove alias"),
|
||||||
@@ -83,7 +83,7 @@ export function CompliancePageAliasField(props: {
|
|||||||
try {
|
try {
|
||||||
if (trimmed === "") {
|
if (trimmed === "") {
|
||||||
if (current !== "" && canRemoveAlias) {
|
if (current !== "" && canRemoveAlias) {
|
||||||
await removeTrustCenterAlias({
|
await removeResourceAlias({
|
||||||
variables: {
|
variables: {
|
||||||
input: {
|
input: {
|
||||||
resourceId,
|
resourceId,
|
||||||
@@ -100,7 +100,7 @@ export function CompliancePageAliasField(props: {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
await setTrustCenterAlias({
|
await setResourceAlias({
|
||||||
variables: {
|
variables: {
|
||||||
input: {
|
input: {
|
||||||
resourceId,
|
resourceId,
|
||||||
@@ -111,7 +111,7 @@ export function CompliancePageAliasField(props: {
|
|||||||
} catch {
|
} catch {
|
||||||
// useMutationWithToasts already shows an error toast.
|
// useMutationWithToasts already shows an error toast.
|
||||||
}
|
}
|
||||||
}, [alias, canRemoveAlias, canSetAlias, removeTrustCenterAlias, resourceId, setTrustCenterAlias, value]);
|
}, [alias, canRemoveAlias, canSetAlias, removeResourceAlias, resourceId, setResourceAlias, value]);
|
||||||
|
|
||||||
const canEdit = canSetAlias || (canRemoveAlias && (alias ?? "") !== "");
|
const canEdit = canSetAlias || (canRemoveAlias && (alias ?? "") !== "");
|
||||||
|
|
||||||
|
|||||||
@@ -53,14 +53,13 @@ export function CompliancePageAuditList(props: { fragmentRef: CompliancePageAudi
|
|||||||
<Th>{__("Name")}</Th>
|
<Th>{__("Name")}</Th>
|
||||||
<Th>{__("Valid Until")}</Th>
|
<Th>{__("Valid Until")}</Th>
|
||||||
<Th>{__("State")}</Th>
|
<Th>{__("State")}</Th>
|
||||||
<Th>{__("Alias")}</Th>
|
|
||||||
<Th>{__("Visibility")}</Th>
|
<Th>{__("Visibility")}</Th>
|
||||||
</Tr>
|
</Tr>
|
||||||
</Thead>
|
</Thead>
|
||||||
<Tbody>
|
<Tbody>
|
||||||
{audits.edges.length === 0 && (
|
{audits.edges.length === 0 && (
|
||||||
<Tr>
|
<Tr>
|
||||||
<Td colSpan={6} className="text-center text-txt-secondary">
|
<Td colSpan={5} className="text-center text-txt-secondary">
|
||||||
{__("No audits available")}
|
{__("No audits available")}
|
||||||
</Td>
|
</Td>
|
||||||
</Tr>
|
</Tr>
|
||||||
|
|||||||
@@ -25,8 +25,6 @@ import type { CompliancePageAuditListItem_updateAuditVisibilityMutation } from "
|
|||||||
import { useMutationWithToasts } from "#/hooks/useMutationWithToasts";
|
import { useMutationWithToasts } from "#/hooks/useMutationWithToasts";
|
||||||
import { useOrganizationId } from "#/hooks/useOrganizationId";
|
import { useOrganizationId } from "#/hooks/useOrganizationId";
|
||||||
|
|
||||||
import { CompliancePageAliasField } from "../../_components/CompliancePageAliasField";
|
|
||||||
|
|
||||||
const compliancePageFragment = graphql`
|
const compliancePageFragment = graphql`
|
||||||
fragment CompliancePageAuditListItem_compliancePageFragment on TrustCenter {
|
fragment CompliancePageAuditListItem_compliancePageFragment on TrustCenter {
|
||||||
canUpdate: permission(action: "core:trust-center:update")
|
canUpdate: permission(action: "core:trust-center:update")
|
||||||
@@ -37,9 +35,6 @@ const auditFragment = graphql`
|
|||||||
fragment CompliancePageAuditListItem_auditFragment on Audit {
|
fragment CompliancePageAuditListItem_auditFragment on Audit {
|
||||||
id
|
id
|
||||||
name
|
name
|
||||||
alias
|
|
||||||
canSetAlias: permission(action: "core:trust-center-alias:set")
|
|
||||||
canRemoveAlias: permission(action: "core:trust-center-alias:remove")
|
|
||||||
framework {
|
framework {
|
||||||
name
|
name
|
||||||
}
|
}
|
||||||
@@ -116,14 +111,6 @@ export function CompliancePageAuditListItem(props: {
|
|||||||
{getAuditStateLabel(__, audit.state)}
|
{getAuditStateLabel(__, audit.state)}
|
||||||
</Badge>
|
</Badge>
|
||||||
</Td>
|
</Td>
|
||||||
<Td noLink>
|
|
||||||
<CompliancePageAliasField
|
|
||||||
resourceId={audit.id}
|
|
||||||
alias={audit.alias}
|
|
||||||
canSetAlias={audit.canSetAlias}
|
|
||||||
canRemoveAlias={audit.canRemoveAlias}
|
|
||||||
/>
|
|
||||||
</Td>
|
|
||||||
<Td noLink width={130} className="pr-0">
|
<Td noLink width={130} className="pr-0">
|
||||||
<Field
|
<Field
|
||||||
type="select"
|
type="select"
|
||||||
|
|||||||
@@ -36,8 +36,8 @@ const documentFragment = graphql`
|
|||||||
fragment CompliancePageDocumentListItem_documentFragment on Document {
|
fragment CompliancePageDocumentListItem_documentFragment on Document {
|
||||||
id
|
id
|
||||||
alias
|
alias
|
||||||
canSetAlias: permission(action: "core:trust-center-alias:set")
|
canSetAlias: permission(action: "resourcealias:alias:set")
|
||||||
canRemoveAlias: permission(action: "core:trust-center-alias:remove")
|
canRemoveAlias: permission(action: "resourcealias:alias:remove")
|
||||||
trustCenterVisibility
|
trustCenterVisibility
|
||||||
latestPublishedVersion: versions(
|
latestPublishedVersion: versions(
|
||||||
first: 1
|
first: 1
|
||||||
|
|||||||
@@ -37,8 +37,8 @@ const fileFragment = graphql`
|
|||||||
id
|
id
|
||||||
name
|
name
|
||||||
alias
|
alias
|
||||||
canSetAlias: permission(action: "core:trust-center-alias:set")
|
canSetAlias: permission(action: "resourcealias:alias:set")
|
||||||
canRemoveAlias: permission(action: "core:trust-center-alias:remove")
|
canRemoveAlias: permission(action: "resourcealias:alias:remove")
|
||||||
category
|
category
|
||||||
file {
|
file {
|
||||||
downloadUrl
|
downloadUrl
|
||||||
|
|||||||
Reference in New Issue
Block a user