Skip to content

Commit

Permalink
prep client code for np migration
Browse files Browse the repository at this point in the history
  • Loading branch information
alisonelizabeth committed Oct 25, 2019
1 parent 739edd8 commit 82df866
Show file tree
Hide file tree
Showing 132 changed files with 195 additions and 196 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { FormattedMessage } from '@kbn/i18n/react';
import { getIndexListUri } from '../../../../../../../../index_management/public/services/navigation';
import { getIndexListUri } from '../../../../../../../../index_management/public/app/services/navigation';

import {
EuiButton,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import React, { Component, Fragment } from 'react';
import PropTypes from 'prop-types';
import { FormattedMessage } from '@kbn/i18n/react';
import { getIndexListUri } from '../../../../../../../../index_management/public/services/navigation';
import { getIndexListUri } from '../../../../../../../../index_management/public/app/services/navigation';

import {
EuiButton,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { i18n } from '@kbn/i18n';
import {
addBadgeExtension
} from '../../../index_management/public/index_management_extensions';
} from '../../../index_management/public/app/index_management_extensions';
import { get } from 'lodash';

const propertyPath = 'isFollowerIndex';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
addBannerExtension,
addActionExtension,
addFilterExtension,
} from '../../../index_management/public/index_management_extensions';
} from '../../../index_management/public/app/index_management_extensions';
import { retryLifecycleForIndex } from '../services/api';
import { EuiSearchBar } from '@elastic/eui';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import {
} from '@elastic/eui';
import { RIGHT_ALIGNMENT } from '@elastic/eui/lib/services';

import { getIndexListUri } from '../../../../../../index_management/public/services/navigation';
import { getIndexListUri } from '../../../../../../index_management/public/app/services/navigation';
import { BASE_PATH, UIM_EDIT_CLICK } from '../../../../../common/constants';
import { getPolicyPath } from '../../../../services/navigation';
import { flattenPanelTree } from '../../../../services/flatten_panel_tree';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import {
findTestSubject,
nextTick,
} from '../../../../../../test_utils';
import { IndexManagementHome } from '../../../public/sections/home';
import { IndexManagementHome } from '../../../public/app/sections/home';
import { BASE_PATH } from '../../../common/constants';
import { indexManagementStore } from '../../../public/store';
import { indexManagementStore } from '../../../public/app/store';
import { Template } from '../../../common/types';

const testBedConfig: TestBedConfig = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import axios from 'axios';
import axiosXhrAdapter from 'axios/lib/adapters/xhr';
import { init as initHttpRequests } from './http_requests';
import { setHttpClient } from '../../../public/services/api';
import { setHttpClient } from '../../../public/app/services/api';

const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { registerTestBed, TestBedConfig } from '../../../../../../test_utils';
import { BASE_PATH } from '../../../common/constants';
import { TemplateClone } from '../../../public/sections/template_clone';
import { TemplateClone } from '../../../public/app/sections/template_clone';
import { formSetup } from './template_form.helpers';
import { TEMPLATE_NAME } from './constants';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { registerTestBed, TestBedConfig } from '../../../../../../test_utils';
import { BASE_PATH } from '../../../common/constants';
import { TemplateCreate } from '../../../public/sections/template_create';
import { TemplateCreate } from '../../../public/app/sections/template_create';
import { formSetup, TestSubjects } from './template_form.helpers';

const testBedConfig: TestBedConfig = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { registerTestBed, TestBedConfig } from '../../../../../../test_utils';
import { BASE_PATH } from '../../../common/constants';
import { TemplateEdit } from '../../../public/sections/template_edit';
import { TemplateEdit } from '../../../public/app/sections/template_edit';
import { formSetup, TestSubjects } from './template_form.helpers';
import { TEMPLATE_NAME } from './constants';

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@

import React, { useEffect } from 'react';
import { HashRouter, Switch, Route, Redirect } from 'react-router-dom';
import { BASE_PATH, UIM_APP_LOAD } from '../common/constants';
import { BASE_PATH, UIM_APP_LOAD } from '../../common/constants';
import { IndexManagementHome } from './sections/home';
import { TemplateCreate } from './sections/template_create';
import { TemplateClone } from './sections/template_clone';
import { TemplateEdit } from './sections/template_edit';
import { trackUiMetric } from './services';
import { METRIC_TYPE } from './services/track_ui_metric';

export const App = () => {
useEffect(() => trackUiMetric('loaded', UIM_APP_LOAD), []);
useEffect(() => trackUiMetric(METRIC_TYPE.LOADED, UIM_APP_LOAD), []);

return (
<HashRouter>
Expand All @@ -28,12 +29,8 @@ export const AppWithoutRouter = () => (
<Switch>
<Route exact path={`${BASE_PATH}create_template`} component={TemplateCreate} />
<Route exact path={`${BASE_PATH}clone_template/:name*`} component={TemplateClone} />
<Route
exact
path={`${BASE_PATH}edit_template/:name*`}
component={TemplateEdit}
/>
<Route exact path={`${BASE_PATH}edit_template/:name*`} component={TemplateEdit} />
<Route path={`${BASE_PATH}:section(indices|templates)`} component={IndexManagementHome} />
<Redirect from={`${BASE_PATH}`} to={`${BASE_PATH}indices`}/>
<Redirect from={`${BASE_PATH}`} to={`${BASE_PATH}indices`} />
</Switch>
);
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
import React, { Fragment, useState } from 'react';
import { toastNotifications } from 'ui/notify';
import { deleteTemplates } from '../services/api';
import { Template } from '../../common/types';
import { Template } from '../../../common/types';

export const TemplateDeleteModal = ({
templatesToDelete,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import {
useForm,
Form,
getUseField,
} from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
} from '../../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
import {
getFormRow,
Field,
} from '../../../../../../../../src/plugins/es_ui_shared/static/forms/components';
} from '../../../../../../../../../src/plugins/es_ui_shared/static/forms/components';
import { templatesDocumentationLink } from '../../../lib/documentation_links';
import { StepProps } from '../types';
import { schemas } from '../template_form_schemas';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import {
EuiCodeBlock,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { serializers } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/helpers';
import { serializers } from '../../../../../../../../../src/plugins/es_ui_shared/static/forms/helpers';

import { serializeTemplate } from '../../../../common/lib/template_serialization';
import { Template } from '../../../../common/types';
import { serializeTemplate } from '../../../../../common/lib/template_serialization';
import { Template } from '../../../../../common/types';
import { StepProps } from '../types';

const { stripEmptyFields } = serializers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { useEffect, useState } from 'react';
import { i18n } from '@kbn/i18n';

import { isJSON } from '../../../../../../../../src/plugins/es_ui_shared/static/validators/string';
import { isJSON } from '../../../../../../../../../src/plugins/es_ui_shared/static/validators/string';
import { StepProps } from '../types';

interface Parameters {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import {
EuiSpacer,
} from '@elastic/eui';

import { serializers } from '../../../../../../../src/plugins/es_ui_shared/static/forms/helpers';
import { Template } from '../../../common/types';
import { serializers } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/helpers';
import { Template } from '../../../../common/types';
import { TemplateSteps } from './template_steps';
import { StepAliases, StepLogistics, StepMappings, StepSettings, StepReview } from './steps';
import { StepProps, DataGetterFunc } from './types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ import {
FormSchema,
FIELD_TYPES,
VALIDATION_TYPES,
} from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
} from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';

import {
fieldFormatters,
fieldValidators,
} from '../../../../../../../src/plugins/es_ui_shared/static/forms/helpers';
} from '../../../../../../../../src/plugins/es_ui_shared/static/forms/helpers';

import {
INVALID_INDEX_PATTERN_CHARS,
INVALID_TEMPLATE_NAME_CHARS,
} from '../../../common/constants';
} from '../../../../common/constants';

const { emptyField, containsCharsField, startsWithField, indexPatternField } = fieldValidators;
const { toInt } = fieldFormatters;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { Template } from '../../../common/types';
import { Template } from '../../../../common/types';

export interface StepProps {
template: Partial<Template>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,57 +5,55 @@
*/
import { i18n } from '@kbn/i18n';
const summaryExtensions = [];
export const addSummaryExtension = (summaryExtension)=> {
export const addSummaryExtension = summaryExtension => {
summaryExtensions.push(summaryExtension);
};
export const getSummaryExtensions = () => {
return summaryExtensions;
};
const actionExtensions = [];
export const addActionExtension = (actionExtension)=> {
export const addActionExtension = actionExtension => {
actionExtensions.push(actionExtension);
};
export const getActionExtensions = () => {
return actionExtensions;
};
const bannerExtensions = [];
export const addBannerExtension = (actionExtension)=> {
export const addBannerExtension = actionExtension => {
bannerExtensions.push(actionExtension);
};
export const getBannerExtensions = () => {
return bannerExtensions;
};
const filterExtensions = [];
export const addFilterExtension = (filterExtension)=> {
export const addFilterExtension = filterExtension => {
filterExtensions.push(filterExtension);
};
export const getFilterExtensions = () => {
return filterExtensions;
};
const toggleExtensions = [];
export const addToggleExtension = (toggleExtension)=> {
export const addToggleExtension = toggleExtension => {
toggleExtensions.push(toggleExtension);
};
export const getToggleExtensions = () => {
return toggleExtensions;
};
const badgeExtensions = [
{
matchIndex: (index) => {
matchIndex: index => {
return index.isFrozen;
},
label: i18n.translate('xpack.idxMgmt.frozenBadgeLabel', {
defaultMessage: 'Frozen',
}),
filterExpression: 'isFrozen:true',
color: 'primary'
}
color: 'primary',
},
];
export const addBadgeExtension = (badgeExtension)=> {
export const addBadgeExtension = badgeExtension => {
badgeExtensions.push(badgeExtension);
};
export const getBadgeExtensions = () => {
return badgeExtensions;
};


Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
INDEX_REFRESHING,
INDEX_FLUSHING,
INDEX_FORCEMERGING,
} from '../../common/constants';
} from '../../../common/constants';

export const indexStatusLabels = {
[INDEX_CLEARING_CACHE]: i18n.translate('xpack.idxMgmt.indexStatusLabels.clearingCacheStatusLabel', {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { unmountComponentAtNode } from 'react-dom';

export const manageAngularLifecycle = ($scope, $route, elem) => {
export const manageAngularLifecycle = ($scope: any, $route: any, elem: HTMLElement | null) => {
const lastRoute = $route.current;

const deregister = $scope.$on('$locationChangeSuccess', () => {
Expand All @@ -17,7 +17,12 @@ export const manageAngularLifecycle = ($scope, $route, elem) => {
});

$scope.$on('$destroy', () => {
deregister && deregister();
elem && unmountComponentAtNode(elem);
if (deregister) {
deregister();
}

if (elem) {
unmountComponentAtNode(elem);
}
});
};
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
EuiTabs,
EuiTitle,
} from '@elastic/eui';
import { BASE_PATH } from '../../../common/constants';
import { BASE_PATH } from '../../../../common/constants';
import { idxMgmtDocumentationLink } from '../../lib/documentation_links';
import { IndexList } from './index_list';
import { TemplateList } from './template_list';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
EuiTitle,
} from '@elastic/eui';
import { renderBadges } from '../../../../lib/render_badges';
import { INDEX_OPEN } from '../../../../../common/constants';
import { INDEX_OPEN } from '../../../../../../common/constants';
import {
TAB_SUMMARY,
TAB_SETTINGS,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { TAB_SETTINGS } from '../../../../../constants';
import {
settingsToDisplay,
readOnlySettings
} from '../../../../../lib/editSettings';
} from '../../../../../lib/edit_settings';
import { createAceEditor } from '../../../../../lib/ace';
import _ from 'lodash';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
EuiCheckbox
} from '@elastic/eui';
import { flattenPanelTree } from '../../../../lib/flatten_panel_tree';
import { INDEX_OPEN } from '../../../../../common/constants';
import { INDEX_OPEN } from '../../../../../../common/constants';
import { getActionExtensions } from '../../../../index_management_extensions';
import { getHttpClient } from '../../../../services/api';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {
EuiTitle,
} from '@elastic/eui';

import { UIM_SHOW_DETAILS_CLICK } from '../../../../../common/constants';
import { UIM_SHOW_DETAILS_CLICK } from '../../../../../../common/constants';
import { REFRESH_RATE_INDEX_LIST } from '../../../../constants';
import { healthToColor, trackUiMetric } from '../../../../services';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import React from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import { EuiCodeBlock, EuiCallOut } from '@elastic/eui';
import { Template } from '../../../../../../common/types';
import { Template } from '../../../../../../../common/types';

interface Props {
templateDetails: Template;
Expand Down
Loading

0 comments on commit 82df866

Please sign in to comment.