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.

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

[7.x] Endpoint: Move files, add README, replace implicit any with stricter types. Reorganize types. (#63262) #63363

Merged
merged 1 commit into from
Apr 13, 2020

Conversation

oatkiller
Copy link
Contributor

Backports the following commits to 7.x:

…r types. Reorganize types. (elastic#63262)

* Removed `FIXME` comments and references to private repos. Please use Github issues to track work
* Added a README describing the modules in `applications/endpoint`
* Removed dead code
* Moved `AppRoot` component to its own module
* Moved `applications/endpoint/services` under `store`
* Moved some exported types to `applications/endpoint/types`
* Moved all React code to `view`
* Added types in some places that were implicitly `any`
* Moved `PageId` type from common directory (where it could be shared with the server) to the public directory

Conflicts:
* `x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx`
@oatkiller
Copy link
Contributor Author

@parkiino I had a conflict with your code. Have you backported 6393e08 yet?

@@ -30,7 +30,7 @@ import {
apiError,
} from '../../store/policy_details/selectors';
import { WindowsEventing } from './policy_forms/eventing/windows';
import { PageView, PageViewHeaderTitle } from '../../components/page_view';
import { PageView, PageViewHeaderTitle } from '../components/page_view';
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@parkiino conflict was here. I think you removed WindowsEventing in master but not in 7.x

Copy link
Contributor

Choose a reason for hiding this comment

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

oh i still need to do my backport osrry

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@oatkiller oatkiller merged commit bdc2a99 into elastic:7.x Apr 13, 2020
@oatkiller oatkiller deleted the backport/7.x/pr-63262 branch March 31, 2022 11:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants