-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4463 from NCI-Agency/AB-914-Create-and-display-my…
…-Attachments-List Show a list of My Attachments
- Loading branch information
Showing
21 changed files
with
452 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| import classNames from "classnames" | ||
| import PropTypes from "prop-types" | ||
| import React from "react" | ||
|
|
||
| const AttachmentImage = ({ | ||
| uuid, | ||
| backgroundSize, | ||
| backgroundImage, | ||
| contentMissing | ||
| }) => { | ||
| const image = ( | ||
| <div | ||
| className="image-preview info-show card-image attachment-image" | ||
| style={{ | ||
| backgroundSize, | ||
| backgroundImage: `url(${backgroundImage})` | ||
| }} | ||
| /> | ||
| ) | ||
| return ( | ||
| <div | ||
| className={classNames("img-container", { | ||
| "img-hover-zoom": !contentMissing | ||
| })} | ||
| > | ||
| {contentMissing ? ( | ||
| <>{image}</> | ||
| ) : ( | ||
| <a href={`/api/attachment/view/${uuid}`} className="d-flex h-100"> | ||
| {image} | ||
| </a> | ||
| )} | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| AttachmentImage.propTypes = { | ||
| uuid: PropTypes.string.isRequired, | ||
| backgroundSize: PropTypes.string.isRequired, | ||
| backgroundImage: PropTypes.string.isRequired, | ||
| contentMissing: PropTypes.bool.isRequired | ||
| } | ||
|
|
||
| export default AttachmentImage |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| import { gql } from "@apollo/client" | ||
| import API from "api" | ||
| import AppContext from "components/AppContext" | ||
| import AttachmentImage from "components/Attachment/AttachmentImage" | ||
| import AttachmentRelatedObjectsTable from "components/Attachment/AttachmentRelatedObjectsTable" | ||
| import Fieldset from "components/Fieldset" | ||
| import LinkTo from "components/LinkTo" | ||
| import { | ||
| mapPageDispatchersToProps, | ||
| PageDispatchersPropType, | ||
| useBoilerplate, | ||
| usePageTitle | ||
| } from "components/Page" | ||
| import UltimatePagination from "components/UltimatePagination" | ||
| import { Attachment } from "models" | ||
| import React, { useContext, useState } from "react" | ||
| import { Table } from "react-bootstrap" | ||
| import { connect } from "react-redux" | ||
| import utils from "utils" | ||
|
|
||
| const GQL_GET_ATTACHMENT_LIST = gql` | ||
| query ($attachmentQuery: AttachmentSearchQueryInput) { | ||
| attachmentList(query: $attachmentQuery) { | ||
| totalCount | ||
| pageNum | ||
| pageSize | ||
| list { | ||
| ${Attachment.basicFieldsQuery} | ||
| author { | ||
| uuid | ||
| name | ||
| rank | ||
| avatarUuid | ||
| } | ||
| attachmentRelatedObjects { | ||
| relatedObject { | ||
| ... on AuthorizationGroup { | ||
| name | ||
| } | ||
| ... on Location { | ||
| name | ||
| } | ||
| ... on Organization { | ||
| shortName | ||
| longName | ||
| identificationCode | ||
| } | ||
| ... on Person { | ||
| name | ||
| rank | ||
| avatarUuid | ||
| } | ||
| ... on Position { | ||
| type | ||
| name | ||
| } | ||
| ... on Report { | ||
| intent | ||
| } | ||
| ... on Task { | ||
| shortName | ||
| longName | ||
| } | ||
| } | ||
| relatedObjectUuid | ||
| relatedObjectType | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ` | ||
|
|
||
| const MyAttachments = ({ pageDispatchers }) => { | ||
| const { currentUser } = useContext(AppContext) | ||
| const [pageNum, setPageNum] = useState(0) | ||
| const attachmentQuery = { | ||
| pageNum, | ||
| pageSize: 10, | ||
| authorUuid: currentUser?.uuid | ||
| } | ||
| const { loading, error, data } = API.useApiQuery(GQL_GET_ATTACHMENT_LIST, { | ||
| attachmentQuery | ||
| }) | ||
| const { done, result } = useBoilerplate({ | ||
| loading, | ||
| error, | ||
| pageDispatchers | ||
| }) | ||
| usePageTitle("My Attachments") | ||
| if (done) { | ||
| return result | ||
| } | ||
|
|
||
| const paginatedAttachments = data.attachmentList | ||
| const attachments = paginatedAttachments ? paginatedAttachments.list : [] | ||
| const { pageSize, totalCount } = paginatedAttachments | ||
| const attachmentsExist = totalCount > 0 | ||
|
|
||
| return ( | ||
| <Fieldset id="my-attachments" title="My Attachments"> | ||
| {attachmentsExist ? ( | ||
| <div> | ||
| <UltimatePagination | ||
| Component="header" | ||
| componentClassName="searchPagination" | ||
| className="float-end" | ||
| pageNum={pageNum} | ||
| pageSize={pageSize} | ||
| totalCount={totalCount} | ||
| goToPage={setPageNum} | ||
| /> | ||
|
|
||
| <Table striped hover responsive className="attachments_table"> | ||
| <thead> | ||
| <tr> | ||
| <th>Content</th> | ||
| <th>Caption</th> | ||
| <th>Used In</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {attachments.map(attachment => { | ||
| const { backgroundSize, backgroundImage, contentMissing } = | ||
| utils.getAttachmentIconDetails(attachment, true) | ||
| return ( | ||
| <tr key={attachment.uuid}> | ||
| <td> | ||
| <div style={{ width: "50px", height: "50px" }}> | ||
| <AttachmentImage | ||
| uuid={attachment.uuid} | ||
| contentMissing={contentMissing} | ||
| backgroundSize={backgroundSize} | ||
| backgroundImage={backgroundImage} | ||
| /> | ||
| </div> | ||
| </td> | ||
| <td> | ||
| <LinkTo modelType="Attachment" model={attachment} /> | ||
| </td> | ||
| <td> | ||
| <AttachmentRelatedObjectsTable | ||
| relatedObjects={attachment.attachmentRelatedObjects} | ||
| /> | ||
| </td> | ||
| </tr> | ||
| ) | ||
| })} | ||
| </tbody> | ||
| </Table> | ||
| </div> | ||
| ) : ( | ||
| <em>No attachments found</em> | ||
| )} | ||
| </Fieldset> | ||
| ) | ||
| } | ||
|
|
||
| MyAttachments.propTypes = { | ||
| pageDispatchers: PageDispatchersPropType | ||
| } | ||
|
|
||
| export default connect(null, mapPageDispatchersToProps)(MyAttachments) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import { expect } from "chai" | ||
| import Home from "../pages/home.page" | ||
| import MyAttachments from "../pages/myAttachments.page" | ||
|
|
||
| describe("Home page", () => { | ||
| describe("When checking the navigation items", () => { | ||
| it("Should see a link to my attachments page", async() => { | ||
| await Home.open() | ||
| await (await Home.getLinksMenuButton()).click() | ||
| await (await Home.getMyAttachmentsLink()).waitForDisplayed() | ||
| // eslint-disable-next-line no-unused-expressions | ||
| expect(await (await Home.getMyAttachmentsLink()).isExisting()).to.be.true | ||
| await Home.logout() | ||
| }) | ||
| }) | ||
| }) | ||
|
|
||
| describe("My Attachments page", () => { | ||
| describe("When checking the content of the page", () => { | ||
| it("Should see a table of arthur's attachments", async() => { | ||
| await MyAttachments.openAsAdminUser() | ||
| await (await MyAttachments.getMyAttachments()).waitForDisplayed() | ||
| const myAttachments = await ( | ||
| await MyAttachments.getMyAttachments() | ||
| ).$$("table.attachments_table > tbody > tr") | ||
| // table has a header and 4 attachment rows | ||
| expect(myAttachments).to.have.length(4) | ||
| await MyAttachments.logout() | ||
| }) | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| import Page from "./page" | ||
|
|
||
| const PAGE_URL = "/attachments/mine" | ||
|
|
||
| class MyAttachments extends Page { | ||
| async openAsAdminUser() { | ||
| await super.openAsAdminUser(PAGE_URL) | ||
| } | ||
|
|
||
| async getMyAttachments() { | ||
| return browser.$("#my-attachments") | ||
| } | ||
| } | ||
|
|
||
| export default new MyAttachments() |
29 changes: 29 additions & 0 deletions
29
src/main/java/mil/dds/anet/beans/search/AttachmentSearchQuery.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package mil.dds.anet.beans.search; | ||
|
|
||
| import io.leangen.graphql.annotations.GraphQLInputField; | ||
| import io.leangen.graphql.annotations.GraphQLQuery; | ||
|
|
||
| public class AttachmentSearchQuery extends AbstractSearchQuery<AttachmentSearchSortBy> { | ||
|
|
||
| @GraphQLQuery | ||
| @GraphQLInputField | ||
| private String authorUuid; | ||
|
|
||
| public AttachmentSearchQuery() { | ||
| super(AttachmentSearchSortBy.CREATED_AT); | ||
| this.setSortOrder(SortOrder.DESC); | ||
| } | ||
|
|
||
| public String getAuthorUuid() { | ||
| return authorUuid; | ||
| } | ||
|
|
||
| public void setAuthorUuid(String authorUuid) { | ||
| this.authorUuid = authorUuid; | ||
| } | ||
|
|
||
| @Override | ||
| public AttachmentSearchQuery clone() throws CloneNotSupportedException { | ||
| return (AttachmentSearchQuery) super.clone(); | ||
| } | ||
| } |
Oops, something went wrong.