diff --git a/src/common/colors.jsx b/src/common/colors.jsx index 5b10b10c..296653d8 100644 --- a/src/common/colors.jsx +++ b/src/common/colors.jsx @@ -77,6 +77,7 @@ export const ERROR_COLORS = { light: '#ba1a1a', dark: '#ffb4ab', contrastText: WHITE, + '95': '#ffedea' } export const COLORS = { diff --git a/src/components/repos/Matching.jsx b/src/components/repos/Matching.jsx index 663b53b1..b76bf86c 100644 --- a/src/components/repos/Matching.jsx +++ b/src/components/repos/Matching.jsx @@ -72,7 +72,7 @@ import uniqBy from 'lodash/uniqBy' import APIService from '../../services/APIService'; import { highlightTexts } from '../../common/utils'; -import { WHITE, SURFACE_COLORS } from '../../common/colors'; +import { WHITE, SURFACE_COLORS, ERROR_COLORS } from '../../common/colors'; import CloseIconButton from '../common/CloseIconButton'; import SearchResults from '../search/SearchResults'; @@ -119,7 +119,7 @@ const ALGOS = [ {id: 'llm', label: 'LLM Matching', disabled: true}, ] const DECISION_TABS = ['map', 'candidates', 'search', 'propose'] -const UPDATED_COLOR = 'rgba(255, 167, 38, 0.1)' +const UPDATED_COLOR = ERROR_COLORS['95'] const formatMappings = item => { let same_as_mappings = [] @@ -431,7 +431,7 @@ const Matching = () => { variant="head" sx={{ width: column.width || undefined, - padding: isEditing ? '8px': '0px 8px', + padding: isEditing ? '0 8px': '6px', backgroundColor: isUpdatedValue ? UPDATED_COLOR : WHITE }} > @@ -737,7 +737,7 @@ const Matching = () => { const worksheet = XLSX.utils.json_to_sheet(rows); const workbook = XLSX.utils.book_new(); XLSX.utils.book_append_sheet(workbook, worksheet, "Dates"); - XLSX.writeFile(workbook, "Matched.csv", { compression: true }); + XLSX.writeFile(workbook, `${name || 'Matched'}.${moment().format('YYYYMMDDHHmmss')}.csv`, { compression: true }); } const onCSVRowSelect = csvRow => { @@ -939,11 +939,13 @@ const Matching = () => { variant='fullWidth' value={selectedRowStatus} onChange={(event, newValue) => onStateTabChange(newValue)} + sx={{minHeight: '38px', height: '38px'}} > { ROW_STATES.map(state => { @@ -951,7 +953,7 @@ const Matching = () => { return ( { DECISION_TABS.map(_tab => { return (