Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.x] [ML] Renaming jobs list directory (#21130) #21152

Merged
merged 1 commit into from
Jul 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/plugins/ml/public/jobs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import './styles/main.less';
import './jobs_list';
import './jobs_list_new';
import './jobs_list_old';
import './new_job/advanced';
import './new_job/simple/single_metric';
import './new_job/simple/multi_metric';
Expand Down
12 changes: 1 addition & 11 deletions x-pack/plugins/ml/public/jobs/jobs_list/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,4 @@
*/



import './styles/main.less';
import './jobs_list_controller';
import './edit_job_modal';
import './job_timepicker_modal';
import './delete_job_modal';
import './create_watch_modal';
import './expanded_row';
import 'ui/directives/confirm_click';
import 'plugins/ml/components/paginated_table';
import 'plugins/ml/components/validate_job';
import './directive';
146 changes: 8 additions & 138 deletions x-pack/plugins/ml/public/jobs/jobs_list/styles/main.less
Original file line number Diff line number Diff line change
@@ -1,141 +1,11 @@
ml-config-jobs {
font-size: 14px;

header {
margin: 15px 0;
}

.jobs-container {
width: 100%;
margin-right: auto;
margin-left: auto;
padding-left: 15px;
padding-right: 15px;

.euiCallOut--warning {
.fa-exclamation-triangle {
color: #fba740;
}
}
}

.jobs-stats-bar {

padding: 14px;
background-color: #EFF0F1;

.stat {
margin-right: 10px;
.stat-label {}
.stat-value {
font-weight: bold
}
}
}

ml-paginated-table {

.job-system-info, .job-info, .job-warning, .job-error {
text-shadow: 1px 1px 1px #BBBBBB;
font-size: 16px;
}

.job-warning-small {
font-size: inherit;
margin-left:2px;
}

.job-system-info {
color: gray;
}
.job-info {
color: dodgerblue;
}
.job-warning {
color: #fba740;
}
.job-error {
color: #fe5050;
}

.col-bucketspan {
width: 120px;
}

.col-info {
width: 24px;
}

.col-action {
width: 175px;
}
.actions {
white-space: nowrap;
}

.col-align-right {
text-align: right;
padding-right: 20px;
}

th.col-align-right {
padding-right: 25px !important;
}

i.job-tab-icon {
margin-left: 5px;
}
}

.ml-mark {
background-color: #fce571;
}

.no-jobs-warning {
text-align: center;
font-size: 17px;
}

.jobs-count {
margin-top: -50px;
}

.ml-pre, .job-audit-list-container {
max-height: 500px;
overflow: auto;
padding: 5px 15px;
font-size: 13px;
line-height: 1.42857143;
color: #444444;
background-color: #ffffff;
background-image: none;
border: 2px solid #ecf0f1;
border-radius: 4px;
}
.job-management {
padding: 20px;
}

.ml-pre {
display: block;
unicode-bidi: embed;
font-family: monospace;
white-space: pre;
.new-job-button-container {
float: right;
}

@media (min-width: 830px) {
max-width: 650px;
}
@media (min-width: 1030px) {
max-width: 850px;
}
@media (min-width: 1230px) {
max-width: 1050px;
}
@media (min-width: 1430px) {
max-width: 1250px;
}
@media (min-width: 1630px) {
max-width: 1450px;
}
@media (min-width: 1830px) {
max-width: 1550px;
}
}
.clear {
clear: both;
}
8 changes: 0 additions & 8 deletions x-pack/plugins/ml/public/jobs/jobs_list_new/index.js

This file was deleted.

11 changes: 0 additions & 11 deletions x-pack/plugins/ml/public/jobs/jobs_list_new/styles/main.less

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,28 @@
<!-- tab 0 General-->
<ml-job-tab-0 ng-show="ui.currentTab.index === 0">
<div class="tab_contents">
<ng-include src="urlBasePath+'/plugins/ml/jobs/jobs_list/expanded_row/tabs/tab_general.html'"></ng-include>
<ng-include src="urlBasePath+'/plugins/ml/jobs/jobs_list_old/expanded_row/tabs/tab_general.html'"></ng-include>
</div>
</ml-job-tab-0>

<!-- tab 1 Config -->
<ml-job-tab-1 ng-show="ui.currentTab.index === 1">
<div class="tab_contents">
<ng-include src="urlBasePath+'/plugins/ml/jobs/jobs_list/expanded_row/tabs/tab_config.html'"></ng-include>
<ng-include src="urlBasePath+'/plugins/ml/jobs/jobs_list_old/expanded_row/tabs/tab_config.html'"></ng-include>
</div>
</ml-job-tab-1>

<!-- tab 2 Datafeed -->
<ml-job-tab-2 ng-show="ui.currentTab.index === 2" >
<div class="tab_contents">
<ng-include src="urlBasePath+'/plugins/ml/jobs/jobs_list/expanded_row/tabs/tab_datafeed.html'"></ng-include>
<ng-include src="urlBasePath+'/plugins/ml/jobs/jobs_list_old/expanded_row/tabs/tab_datafeed.html'"></ng-include>
</div>
</ml-job-tab-2>

<!-- tab 3 Counts -->
<ml-job-tab-3 ng-show="ui.currentTab.index === 3" >
<div class="tab_contents">
<ng-include src="urlBasePath+'/plugins/ml/jobs/jobs_list/expanded_row/tabs/tab_counts.html'"></ng-include>
<ng-include src="urlBasePath+'/plugins/ml/jobs/jobs_list_old/expanded_row/tabs/tab_counts.html'"></ng-include>
</div>
</ml-job-tab-3>

Expand Down
18 changes: 18 additions & 0 deletions x-pack/plugins/ml/public/jobs/jobs_list_old/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/



import './styles/main.less';
import './jobs_list_controller';
import './edit_job_modal';
import './job_timepicker_modal';
import './delete_job_modal';
import './create_watch_modal';
import './expanded_row';
import 'ui/directives/confirm_click';
import 'plugins/ml/components/paginated_table';
import 'plugins/ml/components/validate_job';
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import { getMlNodeCount, mlNodesAvailable, permissionToViewMlNodeCount } from 'p


import template from './jobs_list.html';
import deleteJobTemplate from 'plugins/ml/jobs/jobs_list/delete_job_modal/delete_job_modal.html';
import editJobTemplate from 'plugins/ml/jobs/jobs_list/edit_job_modal/edit_job_modal.html';
import createWatchTemplate from 'plugins/ml/jobs/jobs_list/create_watch_modal/create_watch_modal.html';
import { buttonsEnabledChecks } from 'plugins/ml/jobs/jobs_list/buttons_enabled_checks';
import deleteJobTemplate from 'plugins/ml/jobs/jobs_list_old/delete_job_modal/delete_job_modal.html';
import editJobTemplate from 'plugins/ml/jobs/jobs_list_old/edit_job_modal/edit_job_modal.html';
import createWatchTemplate from 'plugins/ml/jobs/jobs_list_old/create_watch_modal/create_watch_modal.html';
import { buttonsEnabledChecks } from 'plugins/ml/jobs/jobs_list_old/buttons_enabled_checks';
import { cloudServiceProvider } from 'plugins/ml/services/cloud_service';
import { loadNewJobDefaults } from 'plugins/ml/jobs/new_job/utils/new_job_defaults';
import { mlJobService } from 'plugins/ml/services/job_service';
Expand Down
Loading