mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
rename dashboard_embeddable_container to dashboard (#59898)
* rename dashboard_embeddable_container to dashboard * codeowners & typo Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This commit is contained in:
parent
526972e631
commit
b9e9311d1f
60 changed files with 40 additions and 136 deletions
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
|
@ -26,7 +26,7 @@
|
|||
/src/plugins/kibana_legacy/ @elastic/kibana-app
|
||||
/src/plugins/timelion/ @elastic/kibana-app
|
||||
/src/plugins/dev_tools/ @elastic/kibana-app
|
||||
/src/plugins/dashboard_embeddable_container/ @elastic/kibana-app
|
||||
/src/plugins/dashboard/ @elastic/kibana-app
|
||||
|
||||
# App Architecture
|
||||
/packages/kbn-interpreter/ @elastic/kibana-app-arch
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
"common.ui": "src/legacy/ui",
|
||||
"console": "src/plugins/console",
|
||||
"core": "src/core",
|
||||
"dashboardEmbeddableContainer": "src/plugins/dashboard_embeddable_container",
|
||||
"dashboard": "src/plugins/dashboard",
|
||||
"data": [
|
||||
"src/legacy/core_plugins/data",
|
||||
"src/plugins/data"
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
/*
|
||||
* Licensed to Elasticsearch B.V. under one or more contributor
|
||||
* license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright
|
||||
* ownership. Elasticsearch B.V. licenses this file to you under
|
||||
* the Apache License, Version 2.0 (the "License"); you may
|
||||
* not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
// eslint-disable-next-line import/no-default-export
|
||||
export default function(kibana: any) {
|
||||
return new kibana.Plugin({});
|
||||
}
|
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
"name": "dashboard_embeddable_container",
|
||||
"version": "kibana"
|
||||
}
|
|
@ -1,18 +0,0 @@
|
|||
/*
|
||||
* Licensed to Elasticsearch B.V. under one or more contributor
|
||||
* license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright
|
||||
* ownership. Elasticsearch B.V. licenses this file to you under
|
||||
* the Apache License, Version 2.0 (the "License"); you may
|
||||
* not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
|
@ -1,20 +0,0 @@
|
|||
/*
|
||||
* Licensed to Elasticsearch B.V. under one or more contributor
|
||||
* license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright
|
||||
* ownership. Elasticsearch B.V. licenses this file to you under
|
||||
* the Apache License, Version 2.0 (the "License"); you may
|
||||
* not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
export * from '../../../../../../plugins/dashboard_embeddable_container/public';
|
|
@ -1,18 +0,0 @@
|
|||
/*
|
||||
* Licensed to Elasticsearch B.V. under one or more contributor
|
||||
* license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright
|
||||
* ownership. Elasticsearch B.V. licenses this file to you under
|
||||
* the Apache License, Version 2.0 (the "License"); you may
|
||||
* not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
|
@ -48,7 +48,7 @@ import {
|
|||
import {
|
||||
DEFAULT_PANEL_WIDTH,
|
||||
DEFAULT_PANEL_HEIGHT,
|
||||
} from '../../../../dashboard_embeddable_container/public/np_ready/public';
|
||||
} from '../../../../../../plugins/dashboard/public';
|
||||
|
||||
test('6.0 migrates uiState, sort, scales, and gridData', async () => {
|
||||
const uiState = {
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
*/
|
||||
import { i18n } from '@kbn/i18n';
|
||||
import semver from 'semver';
|
||||
import { GridData } from 'src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public';
|
||||
import { GridData } from 'src/plugins/dashboard/public';
|
||||
|
||||
import uuid from 'uuid';
|
||||
import {
|
||||
|
@ -113,7 +113,7 @@ function migratePre61PanelToLatest(
|
|||
? PANEL_HEIGHT_SCALE_FACTOR_WITH_MARGINS
|
||||
: PANEL_HEIGHT_SCALE_FACTOR;
|
||||
|
||||
// These are snapshotted here instead of imported form dashboard_embeddable_container because
|
||||
// These are snapshotted here instead of imported from dashboard because
|
||||
// this function is called from both client and server side, and having an import from a public
|
||||
// folder will cause errors for the server side version. Also, this is only run for the point in time
|
||||
// from panels created in < 7.3 so maybe using a snapshot of the default values when this migration was
|
||||
|
|
|
@ -51,7 +51,7 @@ import {
|
|||
DashboardContainerFactory,
|
||||
DashboardContainerInput,
|
||||
DashboardPanelState,
|
||||
} from '../../../../dashboard_embeddable_container/public/np_ready/public';
|
||||
} from '../../../../../../plugins/dashboard/public';
|
||||
import {
|
||||
EmbeddableFactoryNotFoundError,
|
||||
ErrorEmbeddable,
|
||||
|
|
|
@ -23,7 +23,7 @@ import { Observable, Subscription } from 'rxjs';
|
|||
import { Moment } from 'moment';
|
||||
import { History } from 'history';
|
||||
|
||||
import { DashboardContainer } from 'src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public';
|
||||
import { DashboardContainer } from 'src/plugins/dashboard/public';
|
||||
import { ViewMode } from '../../../../../../plugins/embeddable/public';
|
||||
import { migrateLegacyQuery } from '../legacy_imports';
|
||||
import {
|
||||
|
|
|
@ -23,7 +23,7 @@ import {
|
|||
convertPanelStateToSavedDashboardPanel,
|
||||
} from './embeddable_saved_object_converters';
|
||||
import { SavedDashboardPanel } from '../types';
|
||||
import { DashboardPanelState } from 'src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public';
|
||||
import { DashboardPanelState } from 'src/plugins/dashboard/public';
|
||||
import { EmbeddableInput } from 'src/legacy/core_plugins/embeddable_api/public/np_ready/public';
|
||||
|
||||
interface CustomInput extends EmbeddableInput {
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
import { omit } from 'lodash';
|
||||
import { DashboardPanelState } from 'src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public';
|
||||
import { DashboardPanelState } from 'src/plugins/dashboard/public';
|
||||
import { SavedDashboardPanel } from '../types';
|
||||
|
||||
export function convertSavedDashboardPanelToPanelState(
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"id": "dashboard_embeddable_container",
|
||||
"id": "dashboard",
|
||||
"version": "kibana",
|
||||
"requiredPlugins": [
|
||||
"data",
|
|
@ -53,18 +53,12 @@ export class ExpandPanelAction implements ActionByType<typeof ACTION_EXPAND_PANE
|
|||
}
|
||||
|
||||
return isExpanded(embeddable)
|
||||
? i18n.translate(
|
||||
'dashboardEmbeddableContainer.actions.toggleExpandPanelMenuItem.expandedDisplayName',
|
||||
{
|
||||
defaultMessage: 'Minimize',
|
||||
}
|
||||
)
|
||||
: i18n.translate(
|
||||
'dashboardEmbeddableContainer.actions.toggleExpandPanelMenuItem.notExpandedDisplayName',
|
||||
{
|
||||
defaultMessage: 'Full screen',
|
||||
}
|
||||
);
|
||||
? i18n.translate('dashboard.actions.toggleExpandPanelMenuItem.expandedDisplayName', {
|
||||
defaultMessage: 'Minimize',
|
||||
})
|
||||
: i18n.translate('dashboard.actions.toggleExpandPanelMenuItem.notExpandedDisplayName', {
|
||||
defaultMessage: 'Full screen',
|
||||
});
|
||||
}
|
||||
|
||||
public getIconType({ embeddable }: ExpandPanelActionContext) {
|
|
@ -50,7 +50,7 @@ export class ReplacePanelAction implements ActionByType<typeof ACTION_REPLACE_PA
|
|||
if (!embeddable.parent || !isDashboard(embeddable.parent)) {
|
||||
throw new IncompatibleActionError();
|
||||
}
|
||||
return i18n.translate('dashboardEmbeddableContainer.panel.removePanel.replacePanel', {
|
||||
return i18n.translate('dashboard.panel.removePanel.replacePanel', {
|
||||
defaultMessage: 'Replace panel',
|
||||
});
|
||||
}
|
|
@ -51,15 +51,12 @@ export class ReplacePanelFlyout extends React.Component<Props> {
|
|||
}
|
||||
|
||||
this.lastToast = this.props.notifications.toasts.addSuccess({
|
||||
title: i18n.translate(
|
||||
'dashboardEmbeddableContainer.addPanel.savedObjectAddedToContainerSuccessMessageTitle',
|
||||
{
|
||||
defaultMessage: '{savedObjectName} was added',
|
||||
values: {
|
||||
savedObjectName: name,
|
||||
},
|
||||
}
|
||||
),
|
||||
title: i18n.translate('dashboard.addPanel.savedObjectAddedToContainerSuccessMessageTitle', {
|
||||
defaultMessage: '{savedObjectName} was added',
|
||||
values: {
|
||||
savedObjectName: name,
|
||||
},
|
||||
}),
|
||||
'data-test-subj': 'addObjectToContainerSuccess',
|
||||
});
|
||||
};
|
||||
|
@ -97,12 +94,9 @@ export class ReplacePanelFlyout extends React.Component<Props> {
|
|||
const SavedObjectFinder = this.props.savedObjectsFinder;
|
||||
const savedObjectsFinder = (
|
||||
<SavedObjectFinder
|
||||
noItemsMessage={i18n.translate(
|
||||
'dashboardEmbeddableContainer.addPanel.noMatchingObjectsMessage',
|
||||
{
|
||||
defaultMessage: 'No matching objects found.',
|
||||
}
|
||||
)}
|
||||
noItemsMessage={i18n.translate('dashboard.addPanel.noMatchingObjectsMessage', {
|
||||
defaultMessage: 'No matching objects found.',
|
||||
})}
|
||||
savedObjectMetaData={[...this.props.getEmbeddableFactories()]
|
||||
.filter(
|
||||
embeddableFactory =>
|
|
@ -65,7 +65,7 @@ export class DashboardContainerFactory extends EmbeddableFactory<
|
|||
}
|
||||
|
||||
public getDisplayName() {
|
||||
return i18n.translate('dashboardEmbeddableContainer.factory.displayName', {
|
||||
return i18n.translate('dashboard.factory.displayName', {
|
||||
defaultMessage: 'dashboard',
|
||||
});
|
||||
}
|
|
@ -164,7 +164,7 @@ class DashboardGridUi extends React.Component<DashboardGridProps, State> {
|
|||
isLayoutInvalid = true;
|
||||
this.props.kibana.notifications.toasts.danger({
|
||||
title: this.props.intl.formatMessage({
|
||||
id: 'dashboardEmbeddableContainer.dashboardGrid.toast.unableToLoadDashboardDangerMessage',
|
||||
id: 'dashboard.dashboardGrid.toast.unableToLoadDashboardDangerMessage',
|
||||
defaultMessage: 'Unable to load dashboard.',
|
||||
}),
|
||||
body: error.message,
|
|
@ -24,7 +24,7 @@ import { PIE_CHART_VIS_NAME, AREA_CHART_VIS_NAME } from '../../page_objects/dash
|
|||
// eslint-disable-next-line
|
||||
import {
|
||||
DEFAULT_PANEL_WIDTH
|
||||
} from '../../../../src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants';
|
||||
} from '../../../../src/plugins/dashboard/public/embeddable/dashboard_constants';
|
||||
|
||||
export default function({ getService, getPageObjects }) {
|
||||
const PageObjects = getPageObjects([
|
||||
|
|
|
@ -29,7 +29,6 @@ export default function(kibana: any) {
|
|||
order: 1,
|
||||
main: 'plugins/kbn_tp_embeddable_explorer/np_ready/public/legacy',
|
||||
},
|
||||
hacks: ['plugins/dashboard_embeddable_container/initialize'],
|
||||
},
|
||||
init(server: Legacy.Server) {
|
||||
server.injectUiAppVars('kbn_tp_embeddable_explorer', async () =>
|
||||
|
|
|
@ -30,7 +30,7 @@ import {
|
|||
DASHBOARD_CONTAINER_TYPE,
|
||||
DashboardContainer,
|
||||
DashboardContainerFactory,
|
||||
} from '../../../../../../../../src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public';
|
||||
} from '../../../../../../../../src/plugins/dashboard/public';
|
||||
|
||||
import { CoreStart } from '../../../../../../../../src/core/public';
|
||||
import { dashboardInput } from './dashboard_input';
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
*/
|
||||
|
||||
import { ViewMode, CONTACT_CARD_EMBEDDABLE, HELLO_WORLD_EMBEDDABLE } from '../embeddable_api';
|
||||
import { DashboardContainerInput } from '../../../../../../../../src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public';
|
||||
import { DashboardContainerInput } from '../../../../../../../../src/plugins/dashboard/public';
|
||||
|
||||
export const dashboardInput: DashboardContainerInput = {
|
||||
panels: {
|
||||
|
|
|
@ -10,7 +10,7 @@ import rison from 'rison-node';
|
|||
import url from 'url';
|
||||
|
||||
import { npStart } from 'ui/new_platform';
|
||||
import { DASHBOARD_APP_URL_GENERATOR } from '../../../../../../../../../src/plugins/dashboard_embeddable_container/public';
|
||||
import { DASHBOARD_APP_URL_GENERATOR } from '../../../../../../../../../src/plugins/dashboard/public';
|
||||
|
||||
import { ML_RESULTS_INDEX_PATTERN } from '../../../../../common/constants/index_patterns';
|
||||
import { getPartitioningFieldNames } from '../../../../../common/util/job_utils';
|
||||
|
|
|
@ -621,10 +621,10 @@
|
|||
"core.ui.overlays.banner.attentionTitle": "注意",
|
||||
"core.ui.overlays.banner.closeButtonLabel": "閉じる",
|
||||
"core.ui.recentLinks.linkItem.screenReaderLabel": "{recentlyAccessedItemLinklabel}、タイプ: {pageType}",
|
||||
"dashboardEmbeddableContainer.actions.toggleExpandPanelMenuItem.expandedDisplayName": "最小化",
|
||||
"dashboardEmbeddableContainer.actions.toggleExpandPanelMenuItem.notExpandedDisplayName": "全画面",
|
||||
"dashboardEmbeddableContainer.dashboardGrid.toast.unableToLoadDashboardDangerMessage": "ダッシュボードが読み込めません。",
|
||||
"dashboardEmbeddableContainer.factory.displayName": "ダッシュボード",
|
||||
"dashboard.actions.toggleExpandPanelMenuItem.expandedDisplayName": "最小化",
|
||||
"dashboard.actions.toggleExpandPanelMenuItem.notExpandedDisplayName": "全画面",
|
||||
"dashboard.dashboardGrid.toast.unableToLoadDashboardDangerMessage": "ダッシュボードが読み込めません。",
|
||||
"dashboard.factory.displayName": "ダッシュボード",
|
||||
"embeddableApi.actions.applyFilterActionTitle": "現在のビューにフィルターを適用",
|
||||
"embeddableApi.addPanel.createNewDefaultOption": "新規作成...",
|
||||
"embeddableApi.addPanel.displayName": "パネルの追加",
|
||||
|
|
|
@ -621,10 +621,10 @@
|
|||
"core.ui.overlays.banner.attentionTitle": "注意",
|
||||
"core.ui.overlays.banner.closeButtonLabel": "关闭",
|
||||
"core.ui.recentLinks.linkItem.screenReaderLabel": "{recentlyAccessedItemLinklabel},类型:{pageType}",
|
||||
"dashboardEmbeddableContainer.actions.toggleExpandPanelMenuItem.expandedDisplayName": "最小化",
|
||||
"dashboardEmbeddableContainer.actions.toggleExpandPanelMenuItem.notExpandedDisplayName": "全屏",
|
||||
"dashboardEmbeddableContainer.dashboardGrid.toast.unableToLoadDashboardDangerMessage": "无法加载仪表板。",
|
||||
"dashboardEmbeddableContainer.factory.displayName": "仪表板",
|
||||
"dashboard.actions.toggleExpandPanelMenuItem.expandedDisplayName": "最小化",
|
||||
"dashboard.actions.toggleExpandPanelMenuItem.notExpandedDisplayName": "全屏",
|
||||
"dashboard.dashboardGrid.toast.unableToLoadDashboardDangerMessage": "无法加载仪表板。",
|
||||
"dashboard.factory.displayName": "仪表板",
|
||||
"embeddableApi.actions.applyFilterActionTitle": "将筛选应用于当前视图",
|
||||
"embeddableApi.addPanel.createNewDefaultOption": "创建新的......",
|
||||
"embeddableApi.addPanel.displayName": "添加面板",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue