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

Split integrations.ts into handlers & data #40685

Merged
merged 11 commits into from
Jul 10, 2019
Merged

Split integrations.ts into handlers & data #40685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
362555a
Split integrations.ts into integrations/{index,handlers}.ts
Jul 9, 2019
e89b5b0
Do what I wanted to do initially but didn't know how.
Jul 9, 2019
5c37b3a
Pull in renames from 40548-correct-asset-names
Jul 9, 2019
f81e670
index -> {handlers,data,registry}.ts. Handlers parse reqs; call data fns
Jul 9, 2019
f737949
Fix eslint/prettier issues. Not sure what happened
Jul 9, 2019
0f2ba73
getObjects: accept a filter function & comments for getting references.
Jul 10, 2019
04247a4
Reorder so all `export`ed functions are at the top of the file.
Jul 10, 2019
5437feb
Collapse `getAsset` into `getObject`. Add some comments.
Jul 10, 2019
9b978e9
Add a name for intermediate value. Avoid extra iterations.
Jul 10, 2019
13cef20
Request interfaces no extend already extend values. Add a param type.
Jul 10, 2019
98dfac8
Change two names related to Saved Objects. Call SO client with types.
Jul 10, 2019
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 x-pack/legacy/plugins/integrations_manager/common/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import { PLUGIN_ID } from './constants';
export const API_ROOT = `/api/${PLUGIN_ID}`;
export const API_LIST_PATTERN = `${API_ROOT}/list`;
export const API_INFO_PATTERN = `${API_ROOT}/package/{pkgkey}`;
export const API_INSTALL_PATTERN = `${API_ROOT}/install/{pkgkey}/{feature?}`;
export const API_DELETE_PATTERN = `${API_ROOT}/delete/{pkgkey}/{feature?}`;
export const API_INSTALL_PATTERN = `${API_ROOT}/install/{pkgkey}/{asset?}`;
export const API_DELETE_PATTERN = `${API_ROOT}/delete/{pkgkey}/{asset?}`;

export function getListPath() {
return API_LIST_PATTERN;
Expand Down
16 changes: 9 additions & 7 deletions x-pack/legacy/plugins/integrations_manager/common/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import {
} from 'src/core/server/saved_objects';

type AssetReference = Pick<SavedObjectReference, 'id' | 'type'>;
export interface Installation extends SavedObjectAttributes {
export interface InstallationAttributes extends SavedObjectAttributes {
installed: AssetReference[];
}

export type InstallationSavedObject = SavedObject<Installation>;
export type Installation = SavedObject<InstallationAttributes>;

// the contract with the registry
export type RegistryList = RegistryListItem[];
Expand Down Expand Up @@ -49,15 +49,17 @@ export interface RegistryPackage {
// the public HTTP response types
export type IntegrationList = IntegrationListItem[];

export type IntegrationListItem = Installed<RegistryListItem> | NotInstalled<RegistryListItem>;
export type IntegrationListItem = Installable<RegistryListItem>;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

So you don’t have to do the | each time. Went with Installable over Maybe*, Either*, etc.


export type IntegrationInfo = Installed<RegistryPackage> | NotInstalled<RegistryPackage>;
export type IntegrationInfo = Installable<RegistryPackage>;

type Installed<T = {}> = T & {
export type Installable<T> = Installed<T> | NotInstalled<T>;

export type Installed<T = {}> = T & {
status: 'installed';
savedObject: InstallationSavedObject;
savedObject: Installation;
};

type NotInstalled<T = {}> = T & {
export type NotInstalled<T = {}> = T & {
status: 'not_installed';
};
9 changes: 3 additions & 6 deletions x-pack/legacy/plugins/integrations_manager/public/screens/detail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@ import { IntegrationInfo } from '../../common/types';

export function Detail(props: { package: string }) {
const [info, setInfo] = useState<IntegrationInfo | null>(null);
useEffect(
() => {
getIntegrationInfoByKey(props.package).then(setInfo);
},
[props.package]
);
useEffect(() => {
getIntegrationInfoByKey(props.package).then(setInfo);
}, [props.package]);

// don't have designs for loading/empty states
if (!info) return null;
Expand Down
230 changes: 0 additions & 230 deletions x-pack/legacy/plugins/integrations_manager/server/integrations.ts
View file
Open in desktop

This file was deleted.

Loading