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

Prepare for TS 3.7 upgrade #47794

Merged
merged 2 commits into from
Oct 14, 2019
Merged

Prepare for TS 3.7 upgrade #47794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84c9421
Prepare for TS 3.7 conversion
Oct 10, 2019
26f86ac
Merge branch 'master' into ts-cleanup-misc
elasticmachine Oct 14, 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
2 changes: 1 addition & 1 deletion ...ins/kbn_tp_embeddable_explorer/public/np_ready/public/app/dashboard_container_example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export class DashboardContainerExample extends React.Component<Props, State> {
}

public switchViewMode = () => {
this.setState((prevState: State) => {
this.setState<'viewMode'>((prevState: State) => {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

ℹ️ It complains that { viewMode } is missing loading, because I think it cannot automatically infer the generic type here, due to the if (it actually infers it to never).

if (!this.container || isErrorEmbeddable<DashboardContainer>(this.container)) {
return prevState;
}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/actions/server/actions_config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ function isWhitelistedHostnameInUri(config: ActionsConfigType, uri: string): boo
tryCatch(() => new URL(uri)),
map(url => url.hostname),
mapNullable(hostname => isWhitelisted(config, hostname)),
getOrElse(() => false)
getOrElse<boolean>(() => false)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

ℹ️ It infers the generic type false here, and then complains, that the mapNullable produces a boolean which is not assignable to false. I think the typings of pipe are just a bit weird, that they are "checking backwards" from the last function.

);
}

Expand Down
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/alerting/server/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { AlertInstance } from './lib';
import { AlertTypeRegistry } from './alert_type_registry';
import { AlertTypeRegistry as OrigAlertTypeRegistry } from './alert_type_registry';
import { PluginSetupContract, PluginStartContract } from './plugin';
import { SavedObjectAttributes, SavedObjectsClientContract } from '../../../../../src/core/server';

Expand Down Expand Up @@ -95,4 +95,4 @@ export interface AlertingPlugin {
start: PluginStartContract;
}

export type AlertTypeRegistry = PublicMethodsOf<AlertTypeRegistry>;
export type AlertTypeRegistry = PublicMethodsOf<OrigAlertTypeRegistry>;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

ℹ️ The usual 3.7 issue, that you cannot have an import and export with the same name (but different values) in one file anymore.

1 change: 1 addition & 0 deletions x-pack/legacy/plugins/infra/types/eui.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ declare module '@elastic/eui' {
message?: any;
rowProps?: any;
cellProps?: any;
responsive?: boolean;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

ℹ️ This was just used somewhere, and I honestly have no idea how this didn't fail in the current TS .

};
export const EuiInMemoryTable: React.SFC<EuiInMemoryTableProps>;
}
4 changes: 1 addition & 3 deletions x-pack/legacy/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,7 @@ describe('ReindexActions', () => {
});

describe('runWhileConsumerLocked', () => {
Object.keys(IndexGroup).forEach(typeKey => {
const consumerType = IndexGroup[typeKey as any] as IndexGroup;

Object.entries(IndexGroup).forEach(([typeKey, consumerType]) => {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

ℹ️ The as any typing complained, that any is not a valid key to the IndexGroup enum. So I actually just used the entries method here, which a/ looks nicer and b/ is perfectly type safe now.

describe(`IndexConsumerType.${typeKey}`, () => {
it('creates the lock doc if it does not exist and executes callback', async () => {
expect.assertions(3);
Expand Down