Merge branch 'main' into LA-180-improved-session-management-for-long-…

…running-tasks
ethyca · Jan 15, 2025 · d699ac7 · d699ac7
2 parents 32b165a + a4f4aec
commit d699ac7
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,7 @@ Changes can also be flagged with a GitHub label for tracking purposes. The URL o
 - Changed "Reclassify" D&D button to show in an overflow menu when row actions are overcrowded [#5655](https://github.com/ethyca/fides/pull/5655)
 - Removed primary key requirements for BigQuery and Postgres erasures [#5591](https://github.com/ethyca/fides/pull/5591)
 - Updated `DBCache` model so setting cache value always updates the updated_at field [#5669](https://github.com/ethyca/fides/pull/5669)
+- Changed sizes of buttons in table headers [#5654](https://github.com/ethyca/fides/pull/5654)
 
 ### Fixed
 - Fixed issue where the custom report "reset" button was not working as expected [#5649](https://github.com/ethyca/fides/pull/5649)

diff --git a/clients/admin-ui/src/features/common/custom-reports/CustomReportTemplates.tsx b/clients/admin-ui/src/features/common/custom-reports/CustomReportTemplates.tsx
@@ -230,7 +230,6 @@ export const CustomReportTemplates = ({
       >
         <PopoverTrigger>
           <Button
-            size="small"
             className="max-w-40"
             icon={<ChevronDownIcon />}
             iconPosition="end"

diff --git a/clients/admin-ui/src/features/configure-consent/ConsentManagementTable.tsx b/clients/admin-ui/src/features/configure-consent/ConsentManagementTable.tsx
@@ -280,16 +280,14 @@ export const ConsentManagementTable = () => {
           consentCategoryOptions={consentCategoryOptions}
           onConsentCategoryChange={onConsentCategoryChange}
         />
-        <HStack alignItems="center" spacing={4}>
+        <HStack alignItems="center" spacing={2}>
           <AddVendor
             buttonLabel="Add vendors"
-            buttonProps={{ size: "small" }}
             onButtonClick={dictionaryService ? goToAddMultiple : undefined}
           />
           <Button
             onClick={onOpenFilter}
             data-testid="filter-multiple-systems-btn"
-            size="small"
           >
             Filter
           </Button>

diff --git a/clients/admin-ui/src/features/custom-assets/CustomAssetUploadButton.tsx b/clients/admin-ui/src/features/custom-assets/CustomAssetUploadButton.tsx
@@ -16,13 +16,7 @@ const CustomAssetUploadButton = ({
 
   return (
     <>
-      <Button
-        size="small"
-        className="ml-2"
-        onClick={uploadCustomAssetModal.onOpen}
-      >
-        Upload stylesheet
-      </Button>
+      <Button onClick={uploadCustomAssetModal.onOpen}>Upload stylesheet</Button>
       <CustomAssetUploadModal
         isOpen={uploadCustomAssetModal.isOpen}
         onClose={uploadCustomAssetModal.onClose}

diff --git a/clients/admin-ui/src/features/custom-fields/CustomFieldsTable.tsx b/clients/admin-ui/src/features/custom-fields/CustomFieldsTable.tsx
@@ -195,7 +195,6 @@ export const CustomFieldsTable = ({ ...rest }: BoxProps): JSX.Element => {
   const AddCustomFieldButton = () => (
     <Restrict scopes={[ScopeRegistryEnum.CUSTOM_FIELD_DEFINITION_CREATE]}>
       <Button
-        size="small"
         type="primary"
         data-testid="add-custom-field-btn"
         onClick={onOpen}

diff --git a/...s/admin-ui/src/features/data-discovery-and-detection/tables/DiscoveryTableBulkActions.tsx b/...s/admin-ui/src/features/data-discovery-and-detection/tables/DiscoveryTableBulkActions.tsx
@@ -55,13 +55,15 @@ const DiscoveryTableBulkActions = ({
           disabled={anyActionIsLoading}
           loading={isPromoteLoading}
           type="primary"
+          size="middle"
         />
         <ActionButton
           title="Ignore"
           icon={<ViewOffIcon />}
           disabled={anyActionIsLoading}
           loading={isMuteLoading}
           onClick={() => handleIgnoreClicked(selectedUrns)}
+          size="middle"
         />
       </div>
     </Flex>

diff --git a/clients/admin-ui/src/features/datamap/reporting/DatamapReportTable.tsx b/clients/admin-ui/src/features/datamap/reporting/DatamapReportTable.tsx
@@ -527,7 +527,6 @@ export const DatamapReportTable = () => {
                 <Menu>
                   <MenuButton
                     as={Button}
-                    size="small"
                     icon={<ChevronDownIcon />}
                     iconPosition="end"
                     loading={groupChangeStarted}
@@ -560,22 +559,19 @@ export const DatamapReportTable = () => {
                 </Menu>
                 <Button
                   data-testid="filter-multiple-systems-btn"
-                  size="small"
                   onClick={onFilterModalOpen}
                 >
                   Filter
                 </Button>
                 <Button
                   aria-label="Export report"
                   data-testid="export-btn"
-                  size="small"
                   onClick={onExportReportOpen}
                   icon={<DownloadLightIcon ml="1.5px" />}
                 />
                 <Menu placement="bottom-end">
                   <MenuButton
                     as={Button}
-                    size="small"
                     icon={<MoreIcon className="rotate-90" />}
                     data-testid="more-menu"
                     aria-label="More options"

diff --git a/clients/admin-ui/src/features/integrations/configure-monitor/MonitorConfigTab.tsx b/clients/admin-ui/src/features/integrations/configure-monitor/MonitorConfigTab.tsx
@@ -229,7 +229,6 @@ const MonitorConfigTab = ({
         <Spacer />
         <Button
           onClick={modal.onOpen}
-          size="small"
           icon={<MonitorIcon />}
           iconPosition="end"
           data-testid="add-monitor-btn"

diff --git a/clients/admin-ui/src/features/privacy-experience/JavaScriptTag.tsx b/clients/admin-ui/src/features/privacy-experience/JavaScriptTag.tsx
@@ -49,7 +49,6 @@ const JavaScriptTag = () => {
     <>
       <Button
         onClick={modal.onOpen}
-        size="small"
         icon={<CopyIcon />}
         iconPosition="end"
         data-testid="js-tag-btn"

diff --git a/clients/admin-ui/src/features/privacy-experience/PrivacyExperiencesTable.tsx b/clients/admin-ui/src/features/privacy-experience/PrivacyExperiencesTable.tsx
@@ -219,7 +219,7 @@ export const PrivacyExperiencesTable = () => {
       <Flex flex={1} direction="column" overflow="auto">
         {userCanUpdate && (
           <TableActionBar>
-            <HStack alignItems="center" spacing={4}>
+            <HStack alignItems="center" spacing={2}>
               <JavaScriptTag />
               <Restrict scopes={[ScopeRegistryEnum.CUSTOM_ASSET_UPDATE]}>
                 <CustomAssetUploadButton
@@ -229,7 +229,6 @@ export const PrivacyExperiencesTable = () => {
             </HStack>
             <Button
               onClick={() => router.push(`${PRIVACY_EXPERIENCE_ROUTE}/new`)}
-              size="small"
               type="primary"
               data-testid="add-privacy-experience-btn"
             >

diff --git a/clients/admin-ui/src/features/privacy-notices/PrivacyNoticesTable.tsx b/clients/admin-ui/src/features/privacy-notices/PrivacyNoticesTable.tsx
@@ -232,11 +232,7 @@ export const PrivacyNoticesTable = () => {
                 passHref
                 legacyBehavior
               >
-                <Button
-                  size="small"
-                  type="primary"
-                  data-testid="add-privacy-notice-btn"
-                >
+                <Button type="primary" data-testid="add-privacy-notice-btn">
                   Add a privacy notice +
                 </Button>
               </NextLink>

diff --git a/clients/admin-ui/src/features/privacy-requests/RequestTable.tsx b/clients/admin-ui/src/features/privacy-requests/RequestTable.tsx
@@ -139,14 +139,13 @@ export const RequestTable = ({ ...props }: BoxProps): JSX.Element => {
           setGlobalFilter={handleSearch}
           placeholder="Search by request ID or identity value"
         />
-        <HStack alignItems="center" spacing={4}>
-          <Button data-testid="filter-btn" size="small" onClick={onOpen}>
+        <HStack alignItems="center" spacing={2}>
+          <Button data-testid="filter-btn" onClick={onOpen}>
             Filter
           </Button>
           <Button
             aria-label="Export report"
             data-testid="export-btn"
-            size="small"
             icon={<DownloadLightIcon ml="1.5px" />}
             onClick={handleExport}
           />

diff --git a/clients/admin-ui/src/features/privacy-requests/SubmitPrivacyRequest.tsx b/clients/admin-ui/src/features/privacy-requests/SubmitPrivacyRequest.tsx
@@ -92,12 +92,7 @@ const SubmitPrivacyRequest = () => {
   return (
     <>
       <SubmitPrivacyRequestModal isOpen={isOpen} onClose={onClose} />
-      <Button
-        type="primary"
-        size="small"
-        onClick={onOpen}
-        data-testid="submit-request-btn"
-      >
+      <Button type="primary" onClick={onOpen} data-testid="submit-request-btn">
         Create request
       </Button>
     </>

diff --git a/clients/admin-ui/src/features/privacy-requests/drawers/ConfigureAlerts.tsx b/clients/admin-ui/src/features/privacy-requests/drawers/ConfigureAlerts.tsx
@@ -111,7 +111,6 @@ const ConfigureAlerts = () => {
     <>
       <Button
         onClick={onOpen}
-        size="small"
         title="Configure alerts"
         aria-label="Configure alerts"
         icon={<BellIcon />}

diff --git a/clients/admin-ui/src/features/properties/PropertiesTable.tsx b/clients/admin-ui/src/features/properties/PropertiesTable.tsx
@@ -190,10 +190,7 @@ export const PropertiesTable = () => {
           />
           <HStack alignItems="center" spacing={4}>
             <Restrict scopes={[ScopeRegistryEnum.PROPERTY_CREATE]}>
-              <AddPropertyButton
-                buttonLabel="Add property"
-                buttonProps={{ size: "small" }}
-              />
+              <AddPropertyButton buttonLabel="Add property" />
             </Restrict>
           </HStack>
         </TableActionBar>

diff --git a/clients/admin-ui/src/features/system/add-multiple-systems/AddMultipleSystems.tsx b/clients/admin-ui/src/features/system/add-multiple-systems/AddMultipleSystems.tsx
@@ -369,7 +369,6 @@ export const AddMultipleSystems = ({ redirectRoute }: Props) => {
                 <Button
                   onClick={onOpen}
                   data-testid="add-multiple-systems-btn"
-                  size="small"
                   disabled={!anyNewSelectedRows}
                   className="ml-4"
                 >
@@ -380,10 +379,7 @@ export const AddMultipleSystems = ({ redirectRoute }: Props) => {
           ) : null}
         </Flex>
         <HStack spacing={4} alignItems="center">
-          <AddVendor
-            buttonLabel="Add custom vendor"
-            buttonProps={{ size: "small" }}
-          />
+          <AddVendor buttonLabel="Add custom vendor" />
           {isTcfEnabled ? (
             // Wrap in a span so it is consistent height with the add button, whose
             // Tooltip wraps a span

diff --git a/clients/admin-ui/src/pages/messaging/index.tsx b/clients/admin-ui/src/pages/messaging/index.tsx
@@ -182,7 +182,6 @@ const MessagingPage: NextPage = () => {
       <TableActionBar>
         <HStack alignItems="center" spacing={4} marginLeft="auto">
           <Button
-            size="small"
             type="primary"
             data-testid="add-message-btn"
             onClick={() => setIsAddTemplateModalOpen(true)}