[State Management] Typescripify, jestify, simplify state_hashing and …

…state_storage (elastic#51835)

The hashUrl and unhashUrl functions no longer rely on states being provided as an argument, therefore getUnhashableStates/getUnhashableStatesProvider have been removed.

src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx

@@ -120,10 +120,6 @@ export class DashboardAppController {
  new FilterStateManager(globalState, getAppState, filterManager);
  const queryFilter = filterManager;
 
- function getUnhashableStates(): State[] {
- return [getAppState(), globalState].filter(Boolean);
- }
-
  let lastReloadRequestTime = 0;
 
  const dash = ($scope.dash = $route.current.locals.dash);
@@ -751,7 +747,7 @@ export class DashboardAppController {
  anchorElement,
  allowEmbed: true,
  allowShortUrl: !dashboardConfig.getHideWriteControls(),
- shareableUrl: unhashUrl(window.location.href, getUnhashableStates()),
+ shareableUrl: unhashUrl(window.location.href),
  objectId: dash.id,
  objectType: 'dashboard',
  sharingData: {

src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts

@@ -18,7 +18,7 @@
  */
 
 import './np_core.test.mocks';
-
+import 'ui/state_management/state_storage/mock';
 import { DashboardStateManager } from './dashboard_state_manager';
 import { getAppStateMock, getSavedDashboardMock } from './__tests__';
 import { AppStateClass } from './legacy_imports';

src/legacy/core_plugins/kibana/public/discover/angular/discover.js

@@ -42,7 +42,6 @@ import {
  getRequestInspectorStats,
  getResponseInspectorStats,
  getServices,
- getUnhashableStatesProvider,
  hasSearchStategyForIndexPattern,
  intervalOptions,
  isDefaultTypeIndexPattern,
@@ -195,10 +194,8 @@ function discoverController(
  globalState,
 ) {
  const responseHandler = vislibSeriesResponseHandlerProvider().handler;
- const getUnhashableStates = Private(getUnhashableStatesProvider);
  const filterStateManager = new FilterStateManager(globalState, getAppState, filterManager);
 
-
  const inspectorAdapters = {
  requests: new RequestAdapter()
  };
@@ -333,7 +330,7 @@ function discoverController(
  anchorElement,
  allowEmbed: false,
  allowShortUrl: uiCapabilities.discover.createShortUrl,
- shareableUrl: unhashUrl(window.location.href, getUnhashableStates()),
+ shareableUrl: unhashUrl(window.location.href),
  objectId: savedSearch.id,
  objectType: 'search',
  sharingData: {

src/legacy/core_plugins/kibana/public/discover/kibana_services.ts

@@ -74,8 +74,6 @@ export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 // @ts-ignore
 export { timezoneProvider } from 'ui/vis/lib/timezone';
 // @ts-ignore
-export { getUnhashableStatesProvider } from 'ui/state_management/state_hashing';
-// @ts-ignore
 export { tabifyAggResponse } from 'ui/agg_response/tabify';
 // @ts-ignore
 export { vislibSeriesResponseHandlerProvider } from 'ui/vis/response_handlers/vislib';

src/legacy/core_plugins/kibana/public/visualize/editor/editor.js

@@ -39,7 +39,6 @@ import {
  getServices,
  angular,
  absoluteToParsedUrl,
- getUnhashableStatesProvider,
  KibanaParsedUrl,
  migrateLegacyQuery,
  SavedObjectSaveModal,
@@ -166,7 +165,6 @@ function VisEditor(
  localStorage,
 ) {
  const queryFilter = Private(FilterBarQueryFilterProvider);
- const getUnhashableStates = Private(getUnhashableStatesProvider);
 
  // Retrieve the resolved SavedVis instance.
  const savedVis = $route.current.locals.savedVis;
@@ -250,7 +248,7 @@ function VisEditor(
  anchorElement,
  allowEmbed: true,
  allowShortUrl: capabilities.visualize.createShortUrl,
- shareableUrl: unhashUrl(window.location.href, getUnhashableStates()),
+ shareableUrl: unhashUrl(window.location.href),
  objectId: savedVis.id,
  objectType: 'visualization',
  sharingData: {

src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts

@@ -96,8 +96,6 @@ export { getFromSavedObject } from 'ui/index_patterns';
 export { PersistedState } from 'ui/persisted_state';
 // @ts-ignore
 export { VisEditorTypesRegistryProvider } from 'ui/registry/vis_editor_types';
-// @ts-ignore
-export { getUnhashableStatesProvider } from 'ui/state_management/state_hashing';
 export { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
 export { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
 export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';

src/legacy/core_plugins/state_session_storage_redirect/public/index.js

@@ -20,18 +20,22 @@
 import chrome from 'ui/chrome';
 import { hashUrl } from 'ui/state_management/state_hashing';
 import uiRoutes from 'ui/routes';
+import { fatalError } from 'ui/notify';
 
 uiRoutes.enable();
 uiRoutes
  .when('/', {
  resolve: {
  url: function (AppState, globalState, $window) {
  const redirectUrl = chrome.getInjected('redirectUrl');
+ try {
+ const hashedUrl = hashUrl(redirectUrl);
+ const url = chrome.addBasePath(hashedUrl);
 
- const hashedUrl = hashUrl([new AppState(), globalState], redirectUrl);
- const url = chrome.addBasePath(hashedUrl);
-
- $window.location = url;
+  $window.location = url;
+ } catch (e) {
+ fatalError(e);
+ }
  }
  }
  });

src/legacy/ui/public/chrome/api/sub_url_hooks.js

@@ -20,18 +20,16 @@
 import url from 'url';
 
 import {
- getUnhashableStatesProvider,
  unhashUrl,
 } from '../../state_management/state_hashing';
 
 export function registerSubUrlHooks(angularModule, internals) {
  angularModule.run(($rootScope, Private, $location) => {
- const getUnhashableStates = Private(getUnhashableStatesProvider);
  const subUrlRouteFilter = Private(SubUrlRouteFilterProvider);
 
  function updateSubUrls() {
  const urlWithHashes = window.location.href;
- const urlWithStates = unhashUrl(urlWithHashes, getUnhashableStates());
+ const urlWithStates = unhashUrl(urlWithHashes);
  internals.trackPossibleSubUrl(urlWithStates);
  }
 

src/legacy/ui/public/state_management/__tests__/state.js

@@ -25,13 +25,11 @@ import '../../private';
 import { toastNotifications } from '../../notify';
 import * as FatalErrorNS from '../../notify/fatal_error';
 import { StateProvider } from '../state';
-import {
- unhashQueryString,
-} from '../state_hashing';
 import {
  createStateHash,
  isStateHash,
-} from '../state_storage';
+ unhashQuery
+} from '../state_hashing';
 import { HashedItemStore } from '../state_storage/hashed_item_store';
 import { StubBrowserStorage } from 'test_utils/stub_browser_storage';
 import { EventsProvider } from '../../events';
@@ -60,9 +58,7 @@ describe('State Management', () => {
  const hashedItemStore = new HashedItemStore(store);
  const state = new State(param, initial, hashedItemStore);
 
- const getUnhashedSearch = state => {
- return unhashQueryString($location.search(), [ state ]);
- };
+ const getUnhashedSearch = () => unhashQuery($location.search());
 
  return { store, hashedItemStore, state, getUnhashedSearch };
  };

src/legacy/ui/public/state_management/state.js

@@ -37,10 +37,12 @@ import { createLegacyClass } from '../utils/legacy_class';
 import { callEach } from '../utils/function';
 
 import {
- createStateHash,
  HashedItemStoreSingleton,
- isStateHash,
 } from './state_storage';
+import {
+ createStateHash,
+ isStateHash
+} from './state_hashing';
 
 export function StateProvider(Private, $rootScope, $location, stateManagementConfig, config, kbnUrl, $injector) {
  const Events = Private(EventsProvider);
@@ -293,9 +295,7 @@ export function StateProvider(Private, $rootScope, $location, stateManagementCon
 
  // We need to strip out Angular-specific properties.
  const json = angular.toJson(state);
- const hash = createStateHash(json, hash => {
- return this._hashedItemStore.getItem(hash);
- });
+ const hash = createStateHash(json);
  const isItemSet = this._hashedItemStore.setItem(hash, json);
 
  if (isItemSet) {