Skip to content

[Workplace Search] Fix button order and remove extra source name label #114899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scottybollinger merged 6 commits into from
Oct 13, 2021
Merged

[Workplace Search] Fix button order and remove extra source name label #114899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a84357
Remove extra source title from Personal dashboard
scottybollinger Oct 13, 2021
461d2da
Change button order to match other views
scottybollinger Oct 13, 2021
ebedc9f
Fix typo
scottybollinger Oct 13, 2021
2b152a1
Fix failing test
scottybollinger Oct 13, 2021
e287b7e
Remove Synchronization nav items from Custom Source
scottybollinger Oct 13, 2021
aa31462
Hide syncTriggerCallout for custom sources
scottybollinger Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...workplace_search/components/layout/personal_dashboard_sidebar/private_sources_sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ export const PrivateSourcesSidebar = () => {
: PRIVATE_VIEW_ONLY_PAGE_DESCRIPTION;

const {
contentSource: { id = '', name = '' },
contentSource: { id = '' },
} = useValues(SourceLogic);

const navItems = [{ id, name, items: useSourceSubNav() }];
const navItems = [{ id, name: '', items: useSourceSubNav() }];

return (
<>
Expand Down
5 changes: 3 additions & 2 deletions ...search/public/applications/workplace_search/views/content_sources/components/overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ export const Overview: React.FC = () => {
const [isModalVisible, setIsModalVisible] = useState(false);
const closeModal = () => setIsModalVisible(false);
const handleSyncClick = () => setIsModalVisible(true);
const showSyncTriggerCallout = !custom && isIndexedSource && isOrganization;

const onSyncConfirm = () => {
initializeSourceSynchronization(id);
Expand Down Expand Up @@ -491,7 +492,7 @@ export const Overview: React.FC = () => {
<EuiText size="s">
<FormattedMessage
id="xpack.enterpriseSearch.workplaceSearch.sources.synchronizationCallout"
defaultMessage="Configure {syncFrequencyLink} or permissions {blockTimeWindowsLink}."
defaultMessage="Configure {syncFrequencyLink} or {blockTimeWindowsLink}."
values={{
syncFrequencyLink: (
<EuiLinkTo to={getContentSourcePath(SYNC_FREQUENCY_PATH, id, isOrganization)}>
Expand Down Expand Up @@ -586,7 +587,7 @@ export const Overview: React.FC = () => {
)}
</>
)}
{isIndexedSource && isOrganization && syncTriggerCallout}
{showSyncTriggerCallout && syncTriggerCallout}
</EuiFlexGroup>
</EuiFlexItem>
</EuiFlexGroup>
Expand Down
2 changes: 1 addition & 1 deletion .../public/applications/workplace_search/views/content_sources/components/source_sub_nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const useSourceSubNav = () => {
if (!id) return undefined;

const isCustom = serviceType === CUSTOM_SERVICE_TYPE;
const showSynchronization = isIndexedSource && isOrganization;
const showSynchronization = isIndexedSource && isOrganization && !isCustom;

const navItems: Array<EuiSideNavItemType<unknown>> = [
{
Expand Down
6 changes: 3 additions & 3 deletions ...lugins/enterprise_search/public/applications/workplace_search/views/security/security.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ export const Security: React.FC = () => {
};

const headerActions = [
<EuiButtonEmpty disabled={!unsavedChanges || dataLoading} onClick={resetState}>
{RESET_BUTTON}
</EuiButtonEmpty>,
<EuiButton
disabled={!hasPlatinumLicense || !unsavedChanges || dataLoading}
onClick={showConfirmModal}
Expand All @@ -86,6 +83,9 @@ export const Security: React.FC = () => {
>
{SAVE_SETTINGS_BUTTON}
</EuiButton>,
<EuiButtonEmpty disabled={!unsavedChanges || dataLoading} onClick={resetState}>
{RESET_BUTTON}
</EuiButtonEmpty>,
];

const allSourcesToggle = (
Expand Down