[7.x] [Snapshot & Restore] NP migration (#59109) (#59520)

src/plugins/es_ui_shared/public/request/np_ready_request.ts

@@ -28,9 +28,9 @@ export interface SendRequestConfig {
   body?: any;
 }
 
-export interface SendRequestResponse<D = any> {
+export interface SendRequestResponse<D = any, E = Error> {
   data: D | null;
-  error: Error | null;
+  error: E | null;
 }
 
 export interface UseRequestConfig extends SendRequestConfig {
@@ -39,20 +39,21 @@ export interface UseRequestConfig extends SendRequestConfig {
   deserializer?: (data: any) => any;
 }
 
-export interface UseRequestResponse<D = any> {
+export interface UseRequestResponse<D = any, E = Error> {
   isInitialRequest: boolean;
   isLoading: boolean;
-  error: Error | null;
+  error: E | null;
   data: D | null;
-  sendRequest: (...args: any[]) => Promise<SendRequestResponse<D>>;
+  sendRequest: (...args: any[]) => Promise<SendRequestResponse<D, E>>;
 }
 
-export const sendRequest = async <D = any>(
+export const sendRequest = async <D = any, E = Error>(
   httpClient: HttpSetup,
   { path, method, body, query }: SendRequestConfig
-): Promise<SendRequestResponse<D>> => {
+): Promise<SendRequestResponse<D, E>> => {
   try {
-    const response = await httpClient[method](path, { body, query });
+    const stringifiedBody = typeof body === 'string' ? body : JSON.stringify(body);
+    const response = await httpClient[method](path, { body: stringifiedBody, query });
 
     return {
       data: response.data ? response.data : response,
@@ -66,7 +67,7 @@ export const sendRequest = async <D = any>(
   }
 };
 
-export const useRequest = <D = any>(
+export const useRequest = <D = any, E = Error>(
   httpClient: HttpSetup,
   {
     path,
@@ -77,9 +78,8 @@ export const useRequest = <D = any>(
     initialData,
     deserializer = (data: any): any => data,
   }: UseRequestConfig
-): UseRequestResponse<D> => {
-  const sendRequestRef = useRef<() => Promise<SendRequestResponse<D>>>();
-
+): UseRequestResponse<D, E> => {
+  const sendRequestRef = useRef<() => Promise<SendRequestResponse<D, E>>>();
   // Main states for tracking request status and data
   const [error, setError] = useState<null | any>(null);
   const [isLoading, setIsLoading] = useState<boolean>(true);
@@ -123,7 +123,7 @@ export const useRequest = <D = any>(
       body,
     };
 
-    const response = await sendRequest(httpClient, requestBody);
+    const response = await sendRequest<D, E>(httpClient, requestBody);
     const { data: serializedResponseData, error: responseError } = response;
 
     // If an outdated request has resolved, DON'T update state, but DO allow the processData handler

x-pack/.i18nrc.json

@@ -36,7 +36,7 @@
     "xpack.security": ["legacy/plugins/security", "plugins/security"],
     "xpack.server": "legacy/server",
     "xpack.siem": "legacy/plugins/siem",
-    "xpack.snapshotRestore": "legacy/plugins/snapshot_restore",
+    "xpack.snapshotRestore": "plugins/snapshot_restore",
     "xpack.spaces": ["legacy/plugins/spaces", "plugins/spaces"],
     "xpack.taskManager": "legacy/plugins/task_manager",
     "xpack.transform": ["legacy/plugins/transform", "plugins/transform"],

x-pack/index.js

@@ -31,7 +31,6 @@ import { crossClusterReplication } from './legacy/plugins/cross_cluster_replicat
 import { upgradeAssistant } from './legacy/plugins/upgrade_assistant';
 import { uptime } from './legacy/plugins/uptime';
 import { encryptedSavedObjects } from './legacy/plugins/encrypted_saved_objects';
-import { snapshotRestore } from './legacy/plugins/snapshot_restore';
 import { transform } from './legacy/plugins/transform';
 import { actions } from './legacy/plugins/actions';
 import { alerting } from './legacy/plugins/alerting';
@@ -70,7 +69,6 @@ module.exports = function(kibana) {
     uptime(kibana),
     encryptedSavedObjects(kibana),
     lens(kibana),
-    snapshotRestore(kibana),
     actions(kibana),
     alerting(kibana),
     ingestManager(kibana),