File tree Expand file tree Collapse file tree 6 files changed +592
-592
lines changed
Expand file tree Collapse file tree 6 files changed +592
-592
lines changed Original file line number Diff line number Diff line change @@ -154,8 +154,7 @@ export const getMenuItems = ({
154154 const hasIssuedGrantRequests = true ; // account.issuedGrantRequests?.totalCount > 0;
155155 const hasReceivedGrantRequests = true ; // account.receivedGrantRequests?.totalCount > 0;
156156 const showReceivedGrantRequests =
157- hasReceivedGrantRequests ||
158- ( ! isIndividual && ! hasMoneyManagement && Boolean ( account . supportedExpenseTypes ?. includes ?.( ExpenseType . GRANT ) ) ) ;
157+ hasReceivedGrantRequests || ( ! isIndividual && ! hasMoneyManagement && hasFeature ( account , FEATURES . RECEIVE_GRANTS ) ) ;
159158
160159 const items : MenuItem [ ] = [
161160 {
Original file line number Diff line number Diff line change @@ -3,11 +3,12 @@ import { uniqBy } from 'lodash';
33import { CollectiveType } from './constants/collectives' ;
44import type { ReverseCompatibleMemberRole } from './constants/roles' ;
55import type { GraphQLV1Collective } from './custom_typings/GraphQLV1' ;
6- import type {
7- AccountType ,
8- CommentFieldsFragment ,
9- LoggedInUserWorkspaceFieldsFragment ,
10- Update ,
6+ import {
7+ type AccountType ,
8+ type CommentFieldsFragment ,
9+ type LoggedInUserWorkspaceFieldsFragment ,
10+ MemberRole ,
11+ type Update ,
1112} from './graphql/types/v2/graphql' ;
1213import type { PREVIEW_FEATURE_KEYS , PreviewFeature } from './preview-features' ;
1314import { previewFeatures } from './preview-features' ;
Original file line number Diff line number Diff line change @@ -19,10 +19,11 @@ const workspaceSubFieldsFragment = gql`
1919 categories
2020 createdAt
2121 canHaveChangelogUpdates # used by update Form view
22- # policies { # not used
23- # id
24- # REQUIRE_2FA_FOR_ADMINS
25- # }
22+ policies {
23+ # used by dashboard page
24+ id
25+ REQUIRE_2FA_FOR_ADMINS
26+ }
2627 features {
2728 # split on various types?
2829 id
@@ -41,10 +42,10 @@ const workspaceSubFieldsFragment = gql`
4142 id
4243 legacyId
4344 slug
44- # policies {
45- # id
46- # REQUIRE_2FA_FOR_ADMINS # how is this used?
47- # }
45+ policies {
46+ id
47+ REQUIRE_2FA_FOR_ADMINS
48+ }
4849 }
4950 }
5051 ... on AccountWithHost {
@@ -100,6 +101,7 @@ const workspaceSubFieldsFragment = gql`
100101 hasMoneyManagement
101102 host {
102103 id
104+ slug
103105 requiredLegalDocuments
104106 #settings
105107 }
You can’t perform that action at this time.
0 commit comments