From a3f7c7a8817640f14ba570c8d225704aa998d4ea Mon Sep 17 00:00:00 2001 From: Pierre Gayvallet Date: Tue, 9 Jul 2024 17:56:58 +0200 Subject: [PATCH 1/2] Add @kbn/crypto-browser to ui-shared-deps (#187740) ## Summary Fix https://github.com/elastic/kibana/issues/135718 --- packages/kbn-crypto-browser/BUILD.bazel | 32 +++++++++++++++++++ packages/kbn-ui-shared-deps-src/BUILD.bazel | 1 + .../kbn-ui-shared-deps-src/src/definitions.js | 1 + packages/kbn-ui-shared-deps-src/src/entry.js | 1 + 4 files changed, 35 insertions(+) create mode 100644 packages/kbn-crypto-browser/BUILD.bazel diff --git a/packages/kbn-crypto-browser/BUILD.bazel b/packages/kbn-crypto-browser/BUILD.bazel new file mode 100644 index 0000000000000..c959d62ffde68 --- /dev/null +++ b/packages/kbn-crypto-browser/BUILD.bazel @@ -0,0 +1,32 @@ +load("@build_bazel_rules_nodejs//:index.bzl", "js_library") + +SRCS = glob( + [ + "**/*.ts", + ], + exclude = [ + "**/*.config.js", + "**/*.mock.*", + "**/*.test.*", + "**/*.stories.*", + "**/__snapshots__/**", + "**/integration_tests/**", + "**/mocks/**", + "**/scripts/**", + "**/storybook/**", + "**/test_fixtures/**", + "**/test_helpers/**", + ], +) + +BUNDLER_DEPS = [ + "@npm//tslib", +] + +js_library( + name = "kbn-crypto-browser", + package_name = "@kbn/crypto-browser", + srcs = ["package.json"] + SRCS, + deps = BUNDLER_DEPS, + visibility = ["//visibility:public"], +) diff --git a/packages/kbn-ui-shared-deps-src/BUILD.bazel b/packages/kbn-ui-shared-deps-src/BUILD.bazel index 3d7dd87020047..cd723a8ed6401 100644 --- a/packages/kbn-ui-shared-deps-src/BUILD.bazel +++ b/packages/kbn-ui-shared-deps-src/BUILD.bazel @@ -28,6 +28,7 @@ webpack_cli( "//packages/kbn-monaco", "//packages/kbn-datemath", "//packages/kbn-analytics", + "//packages/kbn-crypto-browser", "//packages/kbn-es-query", "//packages/kbn-search-errors", "//packages/kbn-std", diff --git a/packages/kbn-ui-shared-deps-src/src/definitions.js b/packages/kbn-ui-shared-deps-src/src/definitions.js index b2b38e131fb80..98c152403dcff 100644 --- a/packages/kbn-ui-shared-deps-src/src/definitions.js +++ b/packages/kbn-ui-shared-deps-src/src/definitions.js @@ -88,6 +88,7 @@ const externals = { tslib: '__kbnSharedDeps__.TsLib', uuid: '__kbnSharedDeps__.Uuid', '@kbn/analytics': '__kbnSharedDeps__.KbnAnalytics', + '@kbn/crypto-browser': '__kbnSharedDeps__.KbnCryptoBrowser', '@kbn/es-query': '__kbnSharedDeps__.KbnEsQuery', '@kbn/search-errors': '__kbnSharedDeps__.KbnSearchErrors', '@kbn/std': '__kbnSharedDeps__.KbnStd', diff --git a/packages/kbn-ui-shared-deps-src/src/entry.js b/packages/kbn-ui-shared-deps-src/src/entry.js index 1d0e88ef0efd8..a9d318721814b 100644 --- a/packages/kbn-ui-shared-deps-src/src/entry.js +++ b/packages/kbn-ui-shared-deps-src/src/entry.js @@ -60,6 +60,7 @@ export const Fflate = { unzlibSync, strFromU8 }; export const TsLib = require('tslib'); export const Uuid = require('uuid'); export const KbnAnalytics = require('@kbn/analytics'); +export const KbnCryptoBrowser = require('@kbn/crypto-browser'); export const KbnEsQuery = require('@kbn/es-query'); export const KbnSearchErrors = require('@kbn/search-errors'); export const KbnStd = require('@kbn/std'); From 7c5cf9c76e35925cba7e3bd57cc01d1fffae81a4 Mon Sep 17 00:00:00 2001 From: Carlos Crespo Date: Tue, 9 Jul 2024 17:59:17 +0200 Subject: [PATCH 2/2] [Infra] Fix date picker with relative date range (#187739) fixes [187735](https://github.com/elastic/kibana/issues/187735) ## Summary This PR fixes a problem with the Anomaly Detection component's date picker when dealing with relative dates https://github.com/elastic/kibana/assets/2767137/2f007a3e-1ee0-44ca-b4ae-8cdb56fbe06c https://github.com/elastic/kibana/assets/2767137/c3b036df-e73c-48d5-a27a-6ed75ffbc76a ### How to test The easiest way is to connect to an oblt cluster and create an ML job - Navigate to `Infrastructure` - Click on `Anomaly Detection` menu at the top of the page and create a ML job for hosts - Follow the same steps from the screen recordings above. --- .../anomalies_table/anomalies_table.tsx | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/x-pack/plugins/observability_solution/infra/public/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx b/x-pack/plugins/observability_solution/infra/public/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx index b38af534df6e7..482d4c7294c5e 100644 --- a/x-pack/plugins/observability_solution/infra/public/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx +++ b/x-pack/plugins/observability_solution/infra/public/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx @@ -221,9 +221,9 @@ export const AnomaliesTable = ({ }: Props) => { const [search, setSearch] = useState(''); const trackMetric = useUiTracker({ app: 'infra_metrics' }); - const [timeRange, setTimeRange] = useState<{ start: number; end: number }>({ - start: datemathToEpochMillis(dateRange.from) || 0, - end: datemathToEpochMillis(dateRange.to, 'up') || 0, + const [timeRange, setTimeRange] = useState<{ start: string; end: string }>({ + start: dateRange.from, + end: dateRange.to, }); const { sorting, setSorting } = useSorting({ field: 'startTime', @@ -256,8 +256,8 @@ export const AnomaliesTable = ({ ({ isInvalid, start: startChange, end: endChange }: OnTimeChangeProps) => { if (!isInvalid) { setTimeRange({ - start: datemathToEpochMillis(startChange)!, - end: datemathToEpochMillis(endChange, 'up')!, + start: startChange, + end: endChange, }); } }, @@ -265,14 +265,17 @@ export const AnomaliesTable = ({ ); const getTimeRange = useCallback(() => { - if (hideDatePicker) { - return { - start: datemathToEpochMillis(dateRange.from) || 0, - end: datemathToEpochMillis(dateRange.to, 'up') || 0, - }; - } else { - return timeRange; - } + const { start, end } = hideDatePicker + ? { + start: dateRange.from, + end: dateRange.to, + } + : timeRange; + + return { + start: datemathToEpochMillis(start) || 0, + end: datemathToEpochMillis(end, 'up') || 0, + }; }, [dateRange.from, dateRange.to, hideDatePicker, timeRange]); const anomalyParams = useMemo(() => { @@ -483,8 +486,8 @@ export const AnomaliesTable = ({ {!hideDatePicker && (