Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/app-1003-iterate-graph-view.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@aragon/app": minor
---

Add the DAO settings permissions page with list and graph views of the DAO's on-chain permissions, filterable by the hide-DAO-grants and hide-governing-body toggles.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ next-env.d.ts
.vscode
.zed
.tempor
.omp/
.agents/**
!.agents/shared/
!.agents/shared/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
} from '@aragon/gov-ui-kit';
import type { IDao, ILinkedAccountSummary } from '@/shared/api/daoService';
import { DaoTypeTag } from '@/shared/components/daoTypeTag';
import { useFeatureFlags } from '@/shared/components/featureFlagsProvider';
import { ResourceLink } from '@/shared/components/resourceLink';
import { useTranslations } from '@/shared/components/translationsProvider';
import { networkDefinitions } from '@/shared/constants/networkDefinitions';
Expand Down Expand Up @@ -157,18 +156,14 @@ const DaoInfo: React.FC<IDaoInfoProps> = ({ dao, permissionsHref }) => {
export const DaoHierarchy: React.FC<IDaoHierarchyProps> = (props) => {
const { dao, currentDaoId } = props;

const { isEnabled } = useFeatureFlags();

const isViewingMainDao = dao.id === currentDaoId;
const hasLinkedAccounts =
dao.linkedAccounts != null && dao.linkedAccounts.length > 0;

const getDaoAvatar = (d: IDao | ILinkedAccountSummary) =>
ipfsUtils.cidToSrc(d.avatar);

const permissionsHref = isEnabled('permissionsPage')
? daoUtils.getDaoUrl(dao, 'settings/permissions')
: undefined;
const permissionsHref = daoUtils.getDaoUrl(dao, 'settings/permissions');

// If viewing main DAO with linked accounts, show accordion structure
if (isViewingMainDao && hasLinkedAccounts) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import type * as GovUiKit from '@aragon/gov-ui-kit';
import { GukModulesProvider } from '@aragon/gov-ui-kit';
import { render, screen } from '@testing-library/react';
import { Network } from '@/shared/api/daoService';
import * as featureFlagsProvider from '@/shared/components/featureFlagsProvider';
import { generateDao } from '@/shared/testUtils';
import { ipfsUtils } from '@/shared/utils/ipfsUtils';
import { DaoSettingsInfo, type IDaoSettingsInfoProps } from './daoSettingsInfo';
Expand All @@ -15,25 +14,6 @@ jest.mock('@aragon/gov-ui-kit', () => ({
}));

describe('<DaoSettingsInfo /> component', () => {
const useFeatureFlagsSpy = jest.spyOn(
featureFlagsProvider,
'useFeatureFlags',
);

const setPermissionsPageEnabled = (enabled: boolean) => {
useFeatureFlagsSpy.mockReturnValue({
isEnabled: (key) => key === 'permissionsPage' && enabled,
} as ReturnType<typeof featureFlagsProvider.useFeatureFlags>);
};

beforeEach(() => {
setPermissionsPageEnabled(true);
});

afterEach(() => {
useFeatureFlagsSpy.mockReset();
});

const createTestComponent = (props?: Partial<IDaoSettingsInfoProps>) => {
const completeProps: IDaoSettingsInfoProps = {
dao: generateDao(),
Expand Down Expand Up @@ -99,15 +79,6 @@ describe('<DaoSettingsInfo /> component', () => {
);
});

it('does not render the permissions link when the flag is disabled', () => {
setPermissionsPageEnabled(false);
render(createTestComponent());

expect(
screen.queryByText(/daoSettingsInfo.permissionsLink/),
).not.toBeInTheDocument();
});

it('renders the correct definition values of the dao', () => {
const dao = generateDao({
name: 'Some DAO',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
Tag,
} from '@aragon/gov-ui-kit';
import type { IDao } from '@/shared/api/daoService';
import { useFeatureFlags } from '@/shared/components/featureFlagsProvider';
import { ResourceLink } from '@/shared/components/resourceLink';
import { useTranslations } from '@/shared/components/translationsProvider';
import { networkDefinitions } from '@/shared/constants/networkDefinitions';
Expand All @@ -26,7 +25,6 @@ export interface IDaoSettingsInfoProps {
export const DaoSettingsInfo: React.FC<IDaoSettingsInfoProps> = (props) => {
const { dao } = props;
const { t } = useTranslations();
const { isEnabled } = useFeatureFlags();

const daoAvatar = ipfsUtils.cidToSrc(dao.avatar);

Expand Down Expand Up @@ -112,23 +110,18 @@ export const DaoSettingsInfo: React.FC<IDaoSettingsInfoProps> = (props) => {
</div>
</DefinitionList.Item>
)}
{isEnabled('permissionsPage') && (
<DefinitionList.Item
description={t(
'app.settings.daoSettingsInfo.permissionsDescription',
)}
link={{
href: daoUtils.getDaoUrl(
dao,
'settings/permissions',
),
isExternal: false,
}}
term={t('app.settings.daoSettingsInfo.permissions')}
>
{t('app.settings.daoSettingsInfo.permissionsLink')}
</DefinitionList.Item>
)}
<DefinitionList.Item
description={t(
'app.settings.daoSettingsInfo.permissionsDescription',
)}
link={{
href: daoUtils.getDaoUrl(dao, 'settings/permissions'),
isExternal: false,
}}
term={t('app.settings.daoSettingsInfo.permissions')}
>
{t('app.settings.daoSettingsInfo.permissionsLink')}
</DefinitionList.Item>
</DefinitionList.Container>
</Card>
);
Expand Down
Loading