Skip to content

Commit

Permalink
Merge pull request #1083 from griffithlab/add-full-name-to-feature-br…
Browse files Browse the repository at this point in the history 
…owse

Add full name to feature browse table
  • Loading branch information
@acoffman
acoffman authored Aug 7, 2024
2 parents 58c03e2 + e46e4e2 commit f637997
Show file tree
Hide file tree
Showing 14 changed files with 258 additions and 82 deletions.
22 changes: 22 additions & 0 deletions client/src/app/components/features/features-table/features-table.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@
[nzSortFn]="true">
Name
</th>
<th
nzWidth="150px"
nzLeft
[nzColumnKey]="sortColumns.FeatureFullName"
[nzSortFn]="true">
Full Name
</th>
<th
nzLeft
nzWidth="70px">
Expand Down Expand Up @@ -130,6 +137,13 @@
filterChange$.next()
"></cvc-clearable-input-filter>
</th>
<th nzLeft>
<cvc-clearable-input-filter
[(inputModel)]="fullNameInput"
(inputModelChange)="
filterChange$.next()
"></cvc-clearable-input-filter>
</th>
<th nzLeft>
<nz-select
nzAllowClear
Expand Down Expand Up @@ -184,6 +198,14 @@
<td nzLeft>
<cvc-feature-tag [feature]="feature"></cvc-feature-tag>
</td>
<td>
<span
nz-typography
[nzEllipsis]="true"
nzType="secondary">
{{ feature.fullName | titlecase }}
</span>
</td>
<td>
<span
nz-typography
Expand Down
3 changes: 3 additions & 0 deletions client/src/app/components/features/features-table/features-table.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export interface BrowseFeaturesTableUserFilters {
diseaseInput?: Maybe<string>
therapyInput?: Maybe<string>
nameInput?: Maybe<string>
fullNameInput?: Maybe<string>
aliasInput?: Maybe<string>
}

Expand Down Expand Up @@ -89,6 +90,7 @@ export class CvcFeaturesTableComponent implements OnInit {
diseaseInput: Maybe<string>
therapyInput: Maybe<string>
nameInput: Maybe<string>
fullNameInput: Maybe<string>
aliasInput: Maybe<string>
typeInput: Maybe<FeatureInstanceTypes>

Expand Down Expand Up @@ -194,6 +196,7 @@ export class CvcFeaturesTableComponent implements OnInit {
this.queryRef
.refetch({
featureName: this.nameInput,
featureFullName: this.fullNameInput,
featureAlias: this.aliasInput,
diseaseName: this.diseaseInput,
therapyName: this.therapyInput,
Expand Down
3 changes: 3 additions & 0 deletions client/src/app/components/features/features-table/features-table.query.gql
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
query BrowseFeatures(
$featureName: String
$featureFullName: String
$therapyName: String
$featureAlias: String
$diseaseName: String
Expand All @@ -12,6 +13,7 @@ query BrowseFeatures(
) {
browseFeatures(
featureName: $featureName
featureFullName: $featureFullName
therapyName: $therapyName
featureAlias: $featureAlias
diseaseName: $diseaseName
Expand Down Expand Up @@ -44,6 +46,7 @@ query BrowseFeatures(
fragment BrowseFeaturesFields on BrowseFeature {
id
name
fullName
link
deprecated
flagged
Expand Down
20 changes: 10 additions & 10 deletions client/src/app/generated/civic.apollo-helpers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export type BrowseDiseaseEdgeFieldPolicy = {
cursor?: FieldPolicy<any> | FieldReadFunction<any>,
node?: FieldPolicy<any> | FieldReadFunction<any>
};
export type BrowseFeatureKeySpecifier = ('assertionCount' | 'deprecated' | 'description' | 'diseases' | 'evidenceItemCount' | 'featureAliases' | 'featureInstanceId' | 'featureInstanceType' | 'flagged' | 'flags' | 'id' | 'link' | 'molecularProfileCount' | 'name' | 'therapies' | 'variantCount' | BrowseFeatureKeySpecifier)[];
export type BrowseFeatureKeySpecifier = ('assertionCount' | 'deprecated' | 'description' | 'diseases' | 'evidenceItemCount' | 'featureAliases' | 'featureInstanceId' | 'featureInstanceType' | 'flagged' | 'flags' | 'fullName' | 'id' | 'link' | 'molecularProfileCount' | 'name' | 'therapies' | 'variantCount' | BrowseFeatureKeySpecifier)[];
export type BrowseFeatureFieldPolicy = {
assertionCount?: FieldPolicy<any> | FieldReadFunction<any>,
deprecated?: FieldPolicy<any> | FieldReadFunction<any>,
Expand All @@ -206,6 +206,7 @@ export type BrowseFeatureFieldPolicy = {
featureInstanceType?: FieldPolicy<any> | FieldReadFunction<any>,
flagged?: FieldPolicy<any> | FieldReadFunction<any>,
flags?: FieldPolicy<any> | FieldReadFunction<any>,
fullName?: FieldPolicy<any> | FieldReadFunction<any>,
id?: FieldPolicy<any> | FieldReadFunction<any>,
link?: FieldPolicy<any> | FieldReadFunction<any>,
molecularProfileCount?: FieldPolicy<any> | FieldReadFunction<any>,
Expand Down Expand Up @@ -373,33 +374,32 @@ export type BrowseTherapyEdgeFieldPolicy = {
cursor?: FieldPolicy<any> | FieldReadFunction<any>,
node?: FieldPolicy<any> | FieldReadFunction<any>
};
export type BrowseUserKeySpecifier = ('acceptedLicense' | 'areaOfExpertise' | 'bio' | 'countryId' | 'createdAt' | 'deleted' | 'deletedAt' | 'displayName' | 'email' | 'evidenceCount' | 'facebookProfile' | 'id' | 'lastSeenAt' | 'linkedinProfile' | 'mostRecentActivityTimestamp' | 'mostRecentOrganizationId' | 'name' | 'orcid' | 'organizations' | 'profileImagePath' | 'revisionCount' | 'role' | 'signupComplete' | 'twitterHandle' | 'updatedAt' | 'url' | 'username' | BrowseUserKeySpecifier)[];
export type BrowseUserKeySpecifier = ('areaOfExpertise' | 'bio' | 'country' | 'displayName' | 'email' | 'events' | 'evidenceCount' | 'facebookProfile' | 'id' | 'linkedinProfile' | 'mostRecentActivityTimestamp' | 'mostRecentConflictOfInterestStatement' | 'mostRecentEvent' | 'mostRecentOrganizationId' | 'name' | 'notifications' | 'orcid' | 'organizations' | 'profileImagePath' | 'ranks' | 'revisionCount' | 'role' | 'statsHash' | 'twitterHandle' | 'url' | 'username' | BrowseUserKeySpecifier)[];
export type BrowseUserFieldPolicy = {
acceptedLicense?: FieldPolicy<any> | FieldReadFunction<any>,
areaOfExpertise?: FieldPolicy<any> | FieldReadFunction<any>,
bio?: FieldPolicy<any> | FieldReadFunction<any>,
countryId?: FieldPolicy<any> | FieldReadFunction<any>,
createdAt?: FieldPolicy<any> | FieldReadFunction<any>,
deleted?: FieldPolicy<any> | FieldReadFunction<any>,
deletedAt?: FieldPolicy<any> | FieldReadFunction<any>,
country?: FieldPolicy<any> | FieldReadFunction<any>,
displayName?: FieldPolicy<any> | FieldReadFunction<any>,
email?: FieldPolicy<any> | FieldReadFunction<any>,
events?: FieldPolicy<any> | FieldReadFunction<any>,
evidenceCount?: FieldPolicy<any> | FieldReadFunction<any>,
facebookProfile?: FieldPolicy<any> | FieldReadFunction<any>,
id?: FieldPolicy<any> | FieldReadFunction<any>,
lastSeenAt?: FieldPolicy<any> | FieldReadFunction<any>,
linkedinProfile?: FieldPolicy<any> | FieldReadFunction<any>,
mostRecentActivityTimestamp?: FieldPolicy<any> | FieldReadFunction<any>,
mostRecentConflictOfInterestStatement?: FieldPolicy<any> | FieldReadFunction<any>,
mostRecentEvent?: FieldPolicy<any> | FieldReadFunction<any>,
mostRecentOrganizationId?: FieldPolicy<any> | FieldReadFunction<any>,
name?: FieldPolicy<any> | FieldReadFunction<any>,
notifications?: FieldPolicy<any> | FieldReadFunction<any>,
orcid?: FieldPolicy<any> | FieldReadFunction<any>,
organizations?: FieldPolicy<any> | FieldReadFunction<any>,
profileImagePath?: FieldPolicy<any> | FieldReadFunction<any>,
ranks?: FieldPolicy<any> | FieldReadFunction<any>,
revisionCount?: FieldPolicy<any> | FieldReadFunction<any>,
role?: FieldPolicy<any> | FieldReadFunction<any>,
signupComplete?: FieldPolicy<any> | FieldReadFunction<any>,
statsHash?: FieldPolicy<any> | FieldReadFunction<any>,
twitterHandle?: FieldPolicy<any> | FieldReadFunction<any>,
updatedAt?: FieldPolicy<any> | FieldReadFunction<any>,
url?: FieldPolicy<any> | FieldReadFunction<any>,
username?: FieldPolicy<any> | FieldReadFunction<any>
};
Expand Down
62 changes: 44 additions & 18 deletions client/src/app/generated/civic.apollo.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,7 @@ export type BrowseFeature = Flaggable & {
flagged: Scalars['Boolean'];
/** List and filter flags. */
flags: FlagConnection;
fullName?: Maybe<Scalars['String']>;
id: Scalars['Int'];
link: Scalars['String'];
molecularProfileCount: Scalars['Int'];
Expand Down Expand Up @@ -853,33 +854,53 @@ export type BrowseTherapyEdge = {

export type BrowseUser = {
__typename: 'BrowseUser';
acceptedLicense?: Maybe<Scalars['Boolean']>;
areaOfExpertise?: Maybe<Scalars['String']>;
areaOfExpertise?: Maybe<AreaOfExpertise>;
bio?: Maybe<Scalars['String']>;
countryId?: Maybe<Scalars['Int']>;
createdAt?: Maybe<Scalars['ISO8601DateTime']>;
deleted?: Maybe<Scalars['Boolean']>;
deletedAt?: Maybe<Scalars['ISO8601DateTime']>;
country?: Maybe<Country>;
displayName: Scalars['String'];
email?: Maybe<Scalars['String']>;
events: EventConnection;
evidenceCount: Scalars['Int'];
facebookProfile?: Maybe<Scalars['String']>;
id: Scalars['Int'];
lastSeenAt?: Maybe<Scalars['ISO8601DateTime']>;
linkedinProfile?: Maybe<Scalars['String']>;
mostRecentActivityTimestamp?: Maybe<Scalars['ISO8601DateTime']>;
mostRecentConflictOfInterestStatement?: Maybe<Coi>;
mostRecentEvent?: Maybe<Event>;
mostRecentOrganizationId?: Maybe<Scalars['Int']>;
name?: Maybe<Scalars['String']>;
/** Filterable list of notifications for the logged in user. */
notifications?: Maybe<NotificationConnection>;
orcid?: Maybe<Scalars['String']>;
organizations: Array<Organization>;
profileImagePath?: Maybe<Scalars['String']>;
ranks: Ranks;
revisionCount: Scalars['Int'];
role: Scalars['String'];
signupComplete?: Maybe<Scalars['Boolean']>;
role: UserRole;
statsHash: Stats;
twitterHandle?: Maybe<Scalars['String']>;
updatedAt?: Maybe<Scalars['ISO8601DateTime']>;
url?: Maybe<Scalars['String']>;
username?: Maybe<Scalars['String']>;
username: Scalars['String'];
};


export type BrowseUserEventsArgs = {
after?: InputMaybe<Scalars['String']>;
before?: InputMaybe<Scalars['String']>;
first?: InputMaybe<Scalars['Int']>;
last?: InputMaybe<Scalars['Int']>;
};


export type BrowseUserNotificationsArgs = {
after?: InputMaybe<Scalars['String']>;
before?: InputMaybe<Scalars['String']>;
eventType?: InputMaybe<EventAction>;
first?: InputMaybe<Scalars['Int']>;
includeSeen?: InputMaybe<Scalars['Boolean']>;
last?: InputMaybe<Scalars['Int']>;
notificationType?: InputMaybe<NotificationReason>;
subscriptionId?: InputMaybe<Scalars['Int']>;
};


Expand Down Expand Up @@ -2479,6 +2500,7 @@ export enum FeaturesSortColumns {
DiseaseName = 'diseaseName',
EvidenceItemCount = 'evidenceItemCount',
FeatureAlias = 'featureAlias',
FeatureFullName = 'featureFullName',
FeatureName = 'featureName',
MolecularProfileCount = 'molecularProfileCount',
TherapyName = 'therapyName',
Expand Down Expand Up @@ -4467,6 +4489,7 @@ export type QueryBrowseFeaturesArgs = {
before?: InputMaybe<Scalars['String']>;
diseaseName?: InputMaybe<Scalars['String']>;
featureAlias?: InputMaybe<Scalars['String']>;
featureFullName?: InputMaybe<Scalars['String']>;
featureName?: InputMaybe<Scalars['String']>;
featureType?: InputMaybe<FeatureInstanceTypes>;
first?: InputMaybe<Scalars['Int']>;
Expand Down Expand Up @@ -7224,6 +7247,7 @@ export type FeaturePopoverFragment = { __typename: 'Feature', id: number, name:

export type BrowseFeaturesQueryVariables = Exact<{
featureName?: InputMaybe<Scalars['String']>;
featureFullName?: InputMaybe<Scalars['String']>;
therapyName?: InputMaybe<Scalars['String']>;
featureAlias?: InputMaybe<Scalars['String']>;
diseaseName?: InputMaybe<Scalars['String']>;
Expand All @@ -7236,9 +7260,9 @@ export type BrowseFeaturesQueryVariables = Exact<{
}>;


export type BrowseFeaturesQuery = { __typename: 'Query', browseFeatures: { __typename: 'BrowseFeatureConnection', lastUpdated: any, totalCount: number, filteredCount: number, pageCount: number, edges: Array<{ __typename: 'BrowseFeatureEdge', cursor: string, node?: { __typename: 'BrowseFeature', id: number, name: string, link: string, deprecated: boolean, flagged: boolean, featureAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, featureInstanceType: FeatureInstanceTypes, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string, deprecated: boolean }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string, deprecated: boolean }> | undefined } | undefined }>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean } } };
export type BrowseFeaturesQuery = { __typename: 'Query', browseFeatures: { __typename: 'BrowseFeatureConnection', lastUpdated: any, totalCount: number, filteredCount: number, pageCount: number, edges: Array<{ __typename: 'BrowseFeatureEdge', cursor: string, node?: { __typename: 'BrowseFeature', id: number, name: string, fullName?: string | undefined, link: string, deprecated: boolean, flagged: boolean, featureAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, featureInstanceType: FeatureInstanceTypes, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string, deprecated: boolean }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string, deprecated: boolean }> | undefined } | undefined }>, pageInfo: { __typename: 'PageInfo', startCursor?: string | undefined, endCursor?: string | undefined, hasPreviousPage: boolean, hasNextPage: boolean } } };

export type BrowseFeaturesFieldsFragment = { __typename: 'BrowseFeature', id: number, name: string, link: string, deprecated: boolean, flagged: boolean, featureAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, featureInstanceType: FeatureInstanceTypes, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string, deprecated: boolean }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string, deprecated: boolean }> | undefined };
export type BrowseFeaturesFieldsFragment = { __typename: 'BrowseFeature', id: number, name: string, fullName?: string | undefined, link: string, deprecated: boolean, flagged: boolean, featureAliases?: Array<string> | undefined, variantCount: number, evidenceItemCount: number, assertionCount: number, molecularProfileCount: number, featureInstanceType: FeatureInstanceTypes, diseases?: Array<{ __typename: 'Disease', name: string, id: number, link: string, deprecated: boolean }> | undefined, therapies?: Array<{ __typename: 'Therapy', name: string, id: number, link: string, deprecated: boolean }> | undefined };

export type FlagListQueryVariables = Exact<{
flaggable?: InputMaybe<FlaggableInput>;
Expand Down Expand Up @@ -7654,9 +7678,9 @@ export type UsersBrowseQueryVariables = Exact<{
}>;


export type UsersBrowseQuery = { __typename: 'Query', users: { __typename: 'BrowseUserConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined }, edges: Array<{ __typename: 'BrowseUserEdge', cursor: string, node?: { __typename: 'BrowseUser', id: number, name?: string | undefined, displayName: string, username?: string | undefined, role: string, evidenceCount: number, revisionCount: number, profileImagePath?: string | undefined, mostRecentActivityTimestamp?: any | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string }> } | undefined }> } };
export type UsersBrowseQuery = { __typename: 'Query', users: { __typename: 'BrowseUserConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined }, edges: Array<{ __typename: 'BrowseUserEdge', cursor: string, node?: { __typename: 'BrowseUser', id: number, name?: string | undefined, displayName: string, username: string, role: UserRole, evidenceCount: number, revisionCount: number, profileImagePath?: string | undefined, mostRecentActivityTimestamp?: any | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string }> } | undefined }> } };

export type UserBrowseTableRowFieldsFragment = { __typename: 'BrowseUser', id: number, name?: string | undefined, displayName: string, username?: string | undefined, role: string, evidenceCount: number, revisionCount: number, profileImagePath?: string | undefined, mostRecentActivityTimestamp?: any | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string }> };
export type UserBrowseTableRowFieldsFragment = { __typename: 'BrowseUser', id: number, name?: string | undefined, displayName: string, username: string, role: UserRole, evidenceCount: number, revisionCount: number, profileImagePath?: string | undefined, mostRecentActivityTimestamp?: any | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string }> };

export type VariantGroupPopoverQueryVariables = Exact<{
variantGroupId: Scalars['Int'];
Expand Down Expand Up @@ -8652,9 +8676,9 @@ export type OrganizationMembersQueryVariables = Exact<{
}>;


export type OrganizationMembersQuery = { __typename: 'Query', users: { __typename: 'BrowseUserConnection', pageInfo: { __typename: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined, endCursor?: string | undefined }, edges: Array<{ __typename: 'BrowseUserEdge', cursor: string, node?: { __typename: 'BrowseUser', id: number, name?: string | undefined, displayName: string, username?: string | undefined, profileImagePath?: string | undefined, role: string, url?: string | undefined, areaOfExpertise?: string | undefined, orcid?: string | undefined, twitterHandle?: string | undefined, facebookProfile?: string | undefined, linkedinProfile?: string | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string, url: string }> } | undefined }> } };
export type OrganizationMembersQuery = { __typename: 'Query', users: { __typename: 'BrowseUserConnection', pageInfo: { __typename: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined, endCursor?: string | undefined }, edges: Array<{ __typename: 'BrowseUserEdge', cursor: string, node?: { __typename: 'BrowseUser', id: number, name?: string | undefined, displayName: string, username: string, profileImagePath?: string | undefined, role: UserRole, url?: string | undefined, areaOfExpertise?: AreaOfExpertise | undefined, orcid?: string | undefined, twitterHandle?: string | undefined, facebookProfile?: string | undefined, linkedinProfile?: string | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string, url: string }> } | undefined }> } };

export type OrganizationMembersFieldsFragment = { __typename: 'BrowseUser', id: number, name?: string | undefined, displayName: string, username?: string | undefined, profileImagePath?: string | undefined, role: string, url?: string | undefined, areaOfExpertise?: string | undefined, orcid?: string | undefined, twitterHandle?: string | undefined, facebookProfile?: string | undefined, linkedinProfile?: string | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string, url: string }> };
export type OrganizationMembersFieldsFragment = { __typename: 'BrowseUser', id: number, name?: string | undefined, displayName: string, username: string, profileImagePath?: string | undefined, role: UserRole, url?: string | undefined, areaOfExpertise?: AreaOfExpertise | undefined, orcid?: string | undefined, twitterHandle?: string | undefined, facebookProfile?: string | undefined, linkedinProfile?: string | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string, url: string }> };

export type PhenotypeDetailQueryVariables = Exact<{
phenotypeId: Scalars['Int'];
Expand Down Expand Up @@ -9457,6 +9481,7 @@ export const BrowseFeaturesFieldsFragmentDoc = gql`
fragment BrowseFeaturesFields on BrowseFeature {
id
name
fullName
link
deprecated
flagged
Expand Down Expand Up @@ -12394,9 +12419,10 @@ export const FeaturePopoverDocument = gql`
}
}
export const BrowseFeaturesDocument = gql`
query BrowseFeatures($featureName: String, $therapyName: String, $featureAlias: String, $diseaseName: String, $featureType: FeatureInstanceTypes, $sortBy: FeaturesSort, $first: Int, $last: Int, $before: String, $after: String) {
query BrowseFeatures($featureName: String, $featureFullName: String, $therapyName: String, $featureAlias: String, $diseaseName: String, $featureType: FeatureInstanceTypes, $sortBy: FeaturesSort, $first: Int, $last: Int, $before: String, $after: String) {
browseFeatures(
featureName: $featureName
featureFullName: $featureFullName
therapyName: $therapyName
featureAlias: $featureAlias
diseaseName: $diseaseName
Expand Down
Loading

0 comments on commit f637997

Please sign in to comment.