diff --git a/src/app/components/change-request/change-requests-download.jsx b/src/app/components/change-request/change-requests-download.jsx index 8cad142883..d7abe7a89c 100755 --- a/src/app/components/change-request/change-requests-download.jsx +++ b/src/app/components/change-request/change-requests-download.jsx @@ -1,20 +1,14 @@ import React, { useEffect, useState } from 'react'; import { Button, - makeStyles, } from '@material-ui/core'; -import GetAppIcon from '@material-ui/icons/GetApp'; +import CloudDownloadOutlinedIcon from '@material-ui/icons/CloudDownloadOutlined'; import { useSnackbar } from 'notistack'; import { object, number, string } from 'prop-types'; import { usePostReportRequest } from 'api/change-requests'; import { eventTrack } from 'services/analytics.service'; import { useAnalyticsContext } from 'shared/contexts'; -import { utilStyles } from 'themes'; - -const useStyles = makeStyles({ - ...utilStyles, -}); function ChplChangeRequestsDownload({ bonusQuery = '', @@ -25,7 +19,6 @@ function ChplChangeRequestsDownload({ const { enqueueSnackbar } = useSnackbar(); const { mutate } = usePostReportRequest(); const [query, setQuery] = useState({}); - const classes = useStyles(); useEffect(() => { const updated = { @@ -65,6 +58,7 @@ function ChplChangeRequestsDownload({ variant="outlined" onClick={download} disabled={recordCount === 0} + endIcon={} > Download {' '} @@ -72,7 +66,6 @@ function ChplChangeRequestsDownload({ {' '} result { recordCount === 1 ? '' : 's' } - ); } diff --git a/src/app/components/cms-widget/cms-display.jsx b/src/app/components/cms-widget/cms-display.jsx index 62c728fbf2..2bf41da536 100755 --- a/src/app/components/cms-widget/cms-display.jsx +++ b/src/app/components/cms-widget/cms-display.jsx @@ -19,7 +19,7 @@ import { } from '@material-ui/core'; import Skeleton from '@material-ui/lab/Skeleton'; import ArrowForwardIcon from '@material-ui/icons/ArrowForward'; -import CloudDownloadIcon from '@material-ui/icons/CloudDownload'; +import CloudDownloadOutlinedIcon from '@material-ui/icons/CloudDownloadOutlined'; import CompareArrowsIcon from '@material-ui/icons/CompareArrows'; import DeleteIcon from '@material-ui/icons/Delete'; import FileCopyOutlinedIcon from '@material-ui/icons/FileCopyOutlined'; @@ -471,7 +471,7 @@ function ChplCmsDisplay() { variant="contained" id="download-cert-id" onClick={downloadPdf} - endIcon={} + endIcon={} > Download PDF diff --git a/src/app/components/download-listings/download-listings.jsx b/src/app/components/download-listings/download-listings.jsx index 2e0eb337d2..61caf88fe0 100755 --- a/src/app/components/download-listings/download-listings.jsx +++ b/src/app/components/download-listings/download-listings.jsx @@ -10,6 +10,7 @@ import { import { arrayOf, string } from 'prop-types'; import CheckBoxOutlineBlankIcon from '@material-ui/icons/CheckBoxOutlineBlank'; import CheckIcon from '@material-ui/icons/Check'; +import CloudDownloadOutlinedIcon from '@material-ui/icons/CloudDownloadOutlined'; import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; import { ExportToCsv } from 'export-to-csv'; @@ -200,6 +201,7 @@ function ChplDownloadListings({ listings: initialListings = [], toggled = [] }) variant="contained" size="small" id="download-listings" + endIcon={} > Download {' '} diff --git a/src/app/components/listing/details/sed/sed-download.jsx b/src/app/components/listing/details/sed/sed-download.jsx index e14d39790f..5112d69c46 100755 --- a/src/app/components/listing/details/sed/sed-download.jsx +++ b/src/app/components/listing/details/sed/sed-download.jsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'; import { Button, } from '@material-ui/core'; -import CloudDownloadIcon from '@material-ui/icons/CloudDownload'; +import CloudDownloadOutlinedIcon from '@material-ui/icons/CloudDownloadOutlined'; import { ExportToCsv } from 'export-to-csv'; import { listing as listingPropType } from 'shared/prop-types'; @@ -99,7 +99,7 @@ function ChplSedDownload({ listing }) { variant="contained" size="small" id="download-task-details" - endIcon={} + endIcon={} > Download Task Details diff --git a/src/app/components/surveillance/complaints/complaints-view.jsx b/src/app/components/surveillance/complaints/complaints-view.jsx index 62537a4519..7fe8b363f3 100755 --- a/src/app/components/surveillance/complaints/complaints-view.jsx +++ b/src/app/components/surveillance/complaints/complaints-view.jsx @@ -16,7 +16,7 @@ import { makeStyles, } from '@material-ui/core'; import AddIcon from '@material-ui/icons/Add'; -import GetAppIcon from '@material-ui/icons/GetApp'; +import CloudDownloadOutlinedIcon from '@material-ui/icons/CloudDownloadOutlined'; import VisibilityIcon from '@material-ui/icons/Visibility'; import { useSnackbar } from 'notistack'; import { bool, string } from 'prop-types'; @@ -204,7 +204,7 @@ function ChplComplaintsView(props) { color="secondary" variant="contained" id="download-results" - endIcon={} + endIcon={} size="small" > Download all complaints @@ -246,7 +246,7 @@ function ChplComplaintsView(props) { color="secondary" variant="contained" id="download-results" - endIcon={} + endIcon={} size="small" > Download all complaints @@ -260,7 +260,7 @@ function ChplComplaintsView(props) { color="secondary" variant="contained" id="download-results" - endIcon={} + endIcon={} size="small" > Download all complaints diff --git a/src/app/components/surveillance/reporting/annual.jsx b/src/app/components/surveillance/reporting/annual.jsx index 2ee950086a..593595bfc9 100755 --- a/src/app/components/surveillance/reporting/annual.jsx +++ b/src/app/components/surveillance/reporting/annual.jsx @@ -145,7 +145,7 @@ function ChplAnnual({ size="small" variant="outlined" onClick={download} - endIcon={} + endIcon={} > Download diff --git a/src/app/components/surveillance/reporting/quarter.jsx b/src/app/components/surveillance/reporting/quarter.jsx index 55a7e83457..148eb91d5e 100755 --- a/src/app/components/surveillance/reporting/quarter.jsx +++ b/src/app/components/surveillance/reporting/quarter.jsx @@ -159,7 +159,7 @@ function ChplQuarter({ size="small" variant="outlined" onClick={download} - endIcon={} + endIcon={} > Download diff --git a/src/app/pages/administration/cms/cms.jsx b/src/app/pages/administration/cms/cms.jsx index 735de07323..52547e8abd 100755 --- a/src/app/pages/administration/cms/cms.jsx +++ b/src/app/pages/administration/cms/cms.jsx @@ -6,7 +6,7 @@ import { makeStyles, } from '@material-ui/core'; import { useSnackbar } from 'notistack'; -import GetAppIcon from '@material-ui/icons/GetApp'; +import CloudDownloadOutlinedIcon from '@material-ui/icons/CloudDownloadOutlined'; import { usePostReportRequest } from 'api/cms'; import { FlagContext } from 'shared/contexts'; @@ -63,10 +63,9 @@ function ChplCms() { color="primary" variant="contained" id="download-results" + endIcon={} > Download the CMS listing - {' '} - ); diff --git a/src/app/pages/listing/listing.jsx b/src/app/pages/listing/listing.jsx index a778a1a11e..1c2f14733e 100755 --- a/src/app/pages/listing/listing.jsx +++ b/src/app/pages/listing/listing.jsx @@ -9,8 +9,8 @@ import { Typography, makeStyles, } from '@material-ui/core'; +import CloudDownloadOutlinedIcon from '@material-ui/icons/CloudDownloadOutlined'; import { - CloudDownload, Edit, Star, StarOutline, @@ -272,7 +272,7 @@ function ChplListingPage({ id }) { size="small" id={`download-original-csv-${listing.id}`} onClick={downloadOriginalCsv} - endIcon={} + endIcon={} > Original CSV @@ -285,7 +285,7 @@ function ChplListingPage({ id }) { size="small" id={`download-current-csv-${listing.id}`} onClick={downloadCurrentCsv} - endIcon={} + endIcon={} > Current CSV diff --git a/src/app/pages/organizations/developers/developers-view.jsx b/src/app/pages/organizations/developers/developers-view.jsx index 2bbf347eb4..e09e3c36dc 100755 --- a/src/app/pages/organizations/developers/developers-view.jsx +++ b/src/app/pages/organizations/developers/developers-view.jsx @@ -11,6 +11,7 @@ import { Typography, makeStyles, } from '@material-ui/core'; +import CloudDownloadOutlinedIcon from '@material-ui/icons/CloudDownloadOutlined'; import ChplMessaging from './messaging/messaging'; @@ -237,6 +238,7 @@ function ChplDevelopersView() { variant="outlined" color="primary" style={{ marginRight: '8px' }} + endIcon={} > Download information for {' '} diff --git a/src/app/pages/reports/questionable-activity/questionable-activity-view.jsx b/src/app/pages/reports/questionable-activity/questionable-activity-view.jsx index 7631d1ddd0..cac626caec 100755 --- a/src/app/pages/reports/questionable-activity/questionable-activity-view.jsx +++ b/src/app/pages/reports/questionable-activity/questionable-activity-view.jsx @@ -10,6 +10,7 @@ import { Typography, makeStyles, } from '@material-ui/core'; +import CloudDownloadOutlinedIcon from '@material-ui/icons/CloudDownloadOutlined'; import { useFetchQuestionableActivity } from 'api/questionable-activity'; import ChplQuestionableActivityDetails from 'components/activity/questionable-activity-details'; @@ -217,6 +218,7 @@ function ChplQuestionableActivityView() { size="small" id="download-filtered-results" onClick={handleClick} + endIcon={} > Download Filtered Results diff --git a/src/app/pages/resources/api/api.jsx b/src/app/pages/resources/api/api.jsx index f3ab9b4d78..56fbec76a3 100755 --- a/src/app/pages/resources/api/api.jsx +++ b/src/app/pages/resources/api/api.jsx @@ -12,7 +12,7 @@ import { Typography, makeStyles, } from '@material-ui/core'; -import GetAppIcon from '@material-ui/icons/GetApp'; +import CloudDownloadOutlinedIcon from '@material-ui/icons/CloudDownloadOutlined'; import SwaggerUI from 'swagger-ui-react'; import { ChplLink, ChplTextField } from 'components/util'; @@ -196,10 +196,9 @@ function ChplResourcesApi() { variant="contained" id="download-chpl-data-button" onClick={() => downloadFile('data')} + endIcon={} > Download Data File - {' '} - diff --git a/src/app/pages/resources/cms-lookup/cms-lookup.jsx b/src/app/pages/resources/cms-lookup/cms-lookup.jsx index 96b4635bc4..463b016edd 100755 --- a/src/app/pages/resources/cms-lookup/cms-lookup.jsx +++ b/src/app/pages/resources/cms-lookup/cms-lookup.jsx @@ -16,7 +16,7 @@ import { Typography, makeStyles, } from '@material-ui/core'; -import GetAppIcon from '@material-ui/icons/GetApp'; +import CloudDownloadOutlinedIcon from '@material-ui/icons/CloudDownloadOutlined'; import WarningIcon from '@material-ui/icons/Warning'; import { ExportToCsv } from 'export-to-csv'; @@ -201,7 +201,7 @@ function ChplCmsLookup() { fullWidth id="download-listing-data" onClick={downloadListingData} - endIcon={} + endIcon={} > Download Result { listings.length !== 1 ? 's' : '' } diff --git a/src/app/pages/resources/download/download.jsx b/src/app/pages/resources/download/download.jsx index 47b16d14e4..afa4ac87f8 100755 --- a/src/app/pages/resources/download/download.jsx +++ b/src/app/pages/resources/download/download.jsx @@ -13,7 +13,7 @@ import { makeStyles, } from '@material-ui/core'; import CodeIcon from '@material-ui/icons/Code'; -import GetAppIcon from '@material-ui/icons/GetApp'; +import CloudDownloadOutlinedIcon from '@material-ui/icons/CloudDownloadOutlined'; import InfoOutlinedIcon from '@material-ui/icons/InfoOutlined'; import { ChplLink, ChplTextField } from 'components/util'; @@ -238,10 +238,9 @@ function ChplResourcesDownload() { variant="contained" id="download-chpl-data-button" onClick={() => downloadFile('data')} + endIcon={} > Data File - {' '} - { files[selectedOption]?.definition && ( diff --git a/src/app/pages/surveillance/activity-reporting/activity-reporting.jsx b/src/app/pages/surveillance/activity-reporting/activity-reporting.jsx index 30186db41c..f37d5bc55c 100755 --- a/src/app/pages/surveillance/activity-reporting/activity-reporting.jsx +++ b/src/app/pages/surveillance/activity-reporting/activity-reporting.jsx @@ -9,7 +9,7 @@ import { MenuItem, makeStyles, } from '@material-ui/core'; -import CloudDownloadIcon from '@material-ui/icons/CloudDownload'; +import CloudDownloadOutlinedIcon from '@material-ui/icons/CloudDownloadOutlined'; import { useSnackbar } from 'notistack'; import { useFormik } from 'formik'; import * as yup from 'yup'; @@ -28,7 +28,7 @@ const useStyles = makeStyles({ paddingTop: '16px', gap: '16px', }, - formContent:{ + formContent: { display: 'flex', flexDirection: 'column', gap: '16px', @@ -176,7 +176,7 @@ function ChplSurveillanceActivityReporting() { id="download-results" disabled={!formik.isValid} onClick={formik.handleSubmit} - endIcon={} + endIcon={} > Download Results