From 2b29983eb16f06975bc6bca5596f67719e041580 Mon Sep 17 00:00:00 2001
From: Oleksandr Hladchenko
 <85172747+OleksandrHladchenko1@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:33:52 +0300
Subject: [PATCH] UIDATIMP-1461: Clear searches when switching between profile
 types (#1432)

---
 CHANGELOG.md                                    | 1 +
 src/components/SearchAndSort/SearchAndSort.js   | 2 +-
 src/settings/ActionProfiles/ActionProfiles.js   | 2 +-
 src/settings/JobProfiles/JobProfiles.js         | 2 +-
 src/settings/MappingProfiles/MappingProfiles.js | 2 +-
 src/settings/MatchProfiles/MatchProfiles.js     | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7376fc9a1..279bcadcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 * Refactor the ViewJobLog component to be a functional component (UIDATIMP-1457)
 * Job summary - format numbers in summary table (UIDATIMP-1459)
 * Allow to handle text/plain content type when error occurs (UIDATIMP-1465)
+* Clear searches when switching between profile types (UIDATIMP-1461)
 
 ### Bugs fixed:
 * Fix all the failed accessibility tests in ui-data-import (UIDATIMP-1393)
diff --git a/src/components/SearchAndSort/SearchAndSort.js b/src/components/SearchAndSort/SearchAndSort.js
index 268b03dc9..422c8e93b 100644
--- a/src/components/SearchAndSort/SearchAndSort.js
+++ b/src/components/SearchAndSort/SearchAndSort.js
@@ -266,7 +266,7 @@ export class SearchAndSort extends Component {
   setInitialSortQueryParam() {
     const { defaultSort } = this.props;
 
-    this.transitionToParams({ sort: defaultSort });
+    this.transitionToParams({ query: '', sort: defaultSort });
   }
 
   focusSearchField = () => {
diff --git a/src/settings/ActionProfiles/ActionProfiles.js b/src/settings/ActionProfiles/ActionProfiles.js
index c256e727d..ae8cc10ab 100644
--- a/src/settings/ActionProfiles/ActionProfiles.js
+++ b/src/settings/ActionProfiles/ActionProfiles.js
@@ -224,7 +224,7 @@ export class ActionProfiles extends Component {
     ],
     nonInteractiveHeaders: ['selected'],
     visibleColumns: ['selected', ...actionProfilesShape.visibleColumns],
-    columnWidths: { selected: '40px' },
+    columnWidths: { selected: '40px', name: '430px' },
     ViewRecordComponent: ViewActionProfile,
     CreateRecordComponent: CreateActionProfile,
     EditRecordComponent: EditActionProfile,
diff --git a/src/settings/JobProfiles/JobProfiles.js b/src/settings/JobProfiles/JobProfiles.js
index 7fa5f1592..198dbadad 100644
--- a/src/settings/JobProfiles/JobProfiles.js
+++ b/src/settings/JobProfiles/JobProfiles.js
@@ -134,7 +134,7 @@ export const createJobProfiles = (chooseJobProfile = false, dataTypeQuery = '',
       'updated',
       'updatedBy',
     ];
-  const columnWidths = { selected: '40px' };
+  const columnWidths = { selected: '40px', name: '430px' };
 
   const mapStateToProps = state => {
     const {
diff --git a/src/settings/MappingProfiles/MappingProfiles.js b/src/settings/MappingProfiles/MappingProfiles.js
index f267679f3..30e9440ed 100644
--- a/src/settings/MappingProfiles/MappingProfiles.js
+++ b/src/settings/MappingProfiles/MappingProfiles.js
@@ -234,7 +234,7 @@ export class MappingProfiles extends Component {
     ],
     visibleColumns: ['selected', ...mappingProfilesShape.visibleColumns],
     nonInteractiveHeaders: ['selected'],
-    columnWidths: { selected: '40px' },
+    columnWidths: { selected: '40px', name: '430px' },
     isFullScreen: true,
     ViewRecordComponent: ViewMappingProfile,
     CreateRecordComponent: CreateMappingProfile,
diff --git a/src/settings/MatchProfiles/MatchProfiles.js b/src/settings/MatchProfiles/MatchProfiles.js
index 204064598..c8ecbe978 100644
--- a/src/settings/MatchProfiles/MatchProfiles.js
+++ b/src/settings/MatchProfiles/MatchProfiles.js
@@ -344,7 +344,7 @@ export class MatchProfiles extends Component {
     ],
     visibleColumns: ['selected', ...matchProfilesShape.visibleColumns],
     nonInteractiveHeaders: ['selected'],
-    columnWidths: { selected: '40px' },
+    columnWidths: { selected: '40px', name: '430px' },
     ViewRecordComponent: ViewMatchProfile,
     CreateRecordComponent: CreateMatchProfile,
     EditRecordComponent: EditMatchProfile,