Skip to content
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

[Enterprise Search] Update WS Overview logic to use new config data #77122

Merged
merged 7 commits into from
Sep 10, 2020
Merged

[Enterprise Search] Update WS Overview logic to use new config data #77122

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1f0a043
Update AppLogic to use new data structure
scottybollinger Sep 9, 2020
96f1208
Update components to use AppLogic
scottybollinger Sep 9, 2020
aa672db
Remove unused props from logic file
scottybollinger Sep 9, 2020
c57ca47
Fix failing tests
scottybollinger Sep 9, 2020
b5e728a
Add tests to get 100% converage
scottybollinger Sep 9, 2020
81b908c
Use non-null assertion operator in logic file
scottybollinger Sep 10, 2020
0d5c08c
Remove test for undefined
scottybollinger Sep 10, 2020
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
17 changes: 17 additions & 0 deletions x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ describe('AppLogic', () => {
});

const DEFAULT_VALUES = {
account: {},
hasInitialized: false,
isFederatedAuth: true,
organization: {},
};

it('has expected default values', () => {
Expand All @@ -28,7 +31,21 @@ describe('AppLogic', () => {
AppLogic.actions.initializeAppData(DEFAULT_INITIAL_APP_DATA);

expect(AppLogic.values).toEqual({
account: {
canCreateInvitations: true,
canCreatePersonalSources: true,
groups: ['Default', 'Cats'],
id: 'some-id-string',
isAdmin: true,
isCurated: false,
viewedOnboardingPage: true,
},
hasInitialized: true,
isFederatedAuth: false,
organization: {
defaultOrgName: 'My Organization',
name: 'ACME Donuts',
},
});
});
});
Expand Down
35 changes: 32 additions & 3 deletions x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,29 @@
import { kea, MakeLogicType } from 'kea';

import { IInitialAppData } from '../../../common/types';
import { IWorkplaceSearchInitialData } from '../../../common/types/workplace_search';
import {
IOrganization,
IWorkplaceSearchInitialData,
IAccount,
} from '../../../common/types/workplace_search';

export interface IAppValues extends IWorkplaceSearchInitialData {
hasInitialized: boolean;
isFederatedAuth: boolean;
}
export interface IAppActions {
initializeAppData(props: IInitialAppData): void;
initializeAppData(props: IInitialAppData): IInitialAppData;
}

const emptyAccount = {} as IAccount;
const emptyOrg = {} as IOrganization;

export const AppLogic = kea<MakeLogicType<IAppValues, IAppActions>>({
actions: {
initializeAppData: ({ workplaceSearch }) => workplaceSearch,
initializeAppData: ({ workplaceSearch, isFederatedAuth }) => ({
workplaceSearch,
isFederatedAuth,
}),
},
reducers: {
hasInitialized: [
Expand All @@ -27,5 +38,23 @@ export const AppLogic = kea<MakeLogicType<IAppValues, IAppActions>>({
initializeAppData: () => true,
},
],
isFederatedAuth: [
true,
{
initializeAppData: (_, { isFederatedAuth }) => !!isFederatedAuth,
},
],
organization: [
emptyOrg,
{
initializeAppData: (_, { workplaceSearch }) => workplaceSearch?.organization || emptyOrg,
yakhinvadim marked this conversation as resolved.
Show resolved Hide resolved
},
],
account: [
emptyAccount,
{
initializeAppData: (_, { workplaceSearch }) => workplaceSearch?.account || emptyAccount,
},
],
},
});
11 changes: 7 additions & 4 deletions ...nterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { ORG_SOURCES_PATH, USERS_PATH, ORG_SETTINGS_PATH } from '../../routes';

import { ContentSection } from '../../components/shared/content_section';

import { AppLogic } from '../../app_logic';
import { OverviewLogic } from './overview_logic';

import { OnboardingCard } from './onboarding_card';
Expand Down Expand Up @@ -58,16 +59,18 @@ const ONBOARDING_USERS_CARD_DESCRIPTION = i18n.translate(
);

export const OnboardingSteps: React.FC = () => {
const {
isFederatedAuth,
organization: { name, defaultOrgName },
account: { isCurated, canCreateInvitations },
Copy link
Contributor

@yakhinvadim yakhinvadim Sep 10, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this is a tech update PR, so it's not a blocker in any way.
@scottybollinger Do you know if we still need these values or are they legacy and we can remove them (maybe in future PRs)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know for sure but I am taking a note to find out. Thanks!

} = useValues(AppLogic);

const {
hasUsers,
hasOrgSources,
canCreateContentSources,
canCreateInvitations,
accountsCount,
sourcesCount,
fpAccount: { isCurated },
organization: { name, defaultOrgName },
isFederatedAuth,
} = useValues(OverviewLogic);

const accountsPath =
Expand Down
13 changes: 6 additions & 7 deletions ...erprise_search/public/applications/workplace_search/views/overview/organization_stats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,17 @@ import { i18n } from '@kbn/i18n';
import { ContentSection } from '../../components/shared/content_section';
import { ORG_SOURCES_PATH, USERS_PATH } from '../../routes';

import { AppLogic } from '../../app_logic';
import { OverviewLogic } from './overview_logic';

import { StatisticCard } from './statistic_card';

export const OrganizationStats: React.FC = () => {
const {
sourcesCount,
pendingInvitationsCount,
accountsCount,
personalSourcesCount,
isFederatedAuth,
} = useValues(OverviewLogic);
const { isFederatedAuth } = useValues(AppLogic);

const { sourcesCount, pendingInvitationsCount, accountsCount, personalSourcesCount } = useValues(
OverviewLogic
);

return (
<ContentSection
Expand Down
12 changes: 5 additions & 7 deletions ...lugins/enterprise_search/public/applications/workplace_search/views/overview/overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { useActions, useValues } from 'kea';
import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
import { SendWorkplaceSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';

import { AppLogic } from '../../app_logic';
import { OverviewLogic } from './overview_logic';

import { Loading } from '../../components/shared/loading';
Expand Down Expand Up @@ -44,15 +45,12 @@ const HEADER_DESCRIPTION = i18n.translate(
);

export const Overview: React.FC = () => {
const { initializeOverview } = useActions(OverviewLogic);

const {
dataLoading,
hasUsers,
hasOrgSources,
isOldAccount,
organization: { name: orgName, defaultOrgName },
} = useValues(OverviewLogic);
} = useValues(AppLogic);

const { initializeOverview } = useActions(OverviewLogic);
const { dataLoading, hasUsers, hasOrgSources, isOldAccount } = useValues(OverviewLogic);

useEffect(() => {
initializeOverview();
Expand Down
6 changes: 4 additions & 2 deletions ...enterprise_search/public/applications/workplace_search/views/overview/recent_activity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { sendTelemetry } from '../../../shared/telemetry';
import { KibanaContext, IKibanaContext } from '../../../index';
import { SOURCE_DETAILS_PATH, getContentSourcePath } from '../../routes';

import { AppLogic } from '../../app_logic';
import { OverviewLogic } from './overview_logic';

import './recent_activity.scss';
Expand All @@ -32,8 +33,9 @@ export interface IFeedActivity {
export const RecentActivity: React.FC = () => {
const {
organization: { name, defaultOrgName },
activityFeed,
} = useValues(OverviewLogic);
} = useValues(AppLogic);

const { activityFeed } = useValues(OverviewLogic);

return (
<ContentSection
Expand Down