cleanup

elastic · Jun 16, 2021 · ad7aaf0 · ad7aaf0
1 parent ec40e56
commit ad7aaf0
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 39 deletions.
diff --git a/x-pack/plugins/rollup/public/crud_app/_crud_app.scss b/x-pack/plugins/rollup/public/crud_app/_crud_app.scss
@@ -5,10 +5,3 @@
   align-items: flex-end; /* 1 */
 }
 
-/**
- * 1. Ensure panel fills width of parent when search input yields no matching rollup jobs.
- */
-.rollupJobsListPanel {
-  // sass-lint:disable-block no-important
-  flex-grow: 1 !important; /* 1 */
-}
diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_list/detail_panel/detail_panel.js b/x-pack/plugins/rollup/public/crud_app/sections/job_list/detail_panel/detail_panel.js
@@ -195,7 +195,7 @@ export class DetailPanel extends Component {
                 <EuiTextColor color="subdued">
                   <FormattedMessage
                     id="xpack.rollupJobs.detailPanel.loadingLabel"
-                    defaultMessage="Loading rollup job..."
+                    defaultMessage="Loading rollup job…"
                   />
                 </EuiTextColor>
               </EuiText>

diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_list/detail_panel/detail_panel.test.js b/x-pack/plugins/rollup/public/crud_app/sections/job_list/detail_panel/detail_panel.test.js
@@ -70,7 +70,7 @@ describe('<DetailPanel />', () => {
       ({ component, find, exists } = initTestBed({ isLoading: true }));
       const loading = find('rollupJobDetailLoading');
       expect(loading.length).toBeTruthy();
-      expect(loading.text()).toEqual('Loading rollup job...');
+      expect(loading.text()).toEqual('Loading rollup job…');
 
       // Make sure the title and the tabs are visible
       expect(exists('detailPanelTabSelected')).toBeTruthy();

diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.js
@@ -18,7 +18,6 @@ import {
   EuiLoadingSpinner,
   EuiPageContent,
   EuiSpacer,
-  EuiCallOut,
 } from '@elastic/eui';
 
 import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
@@ -89,21 +88,21 @@ export class JobListUi extends Component {
       defaultMessage: 'Permission error',
     });
     return (
-      <Fragment>
-        {this.getHeaderSection()}
-        <EuiSpacer size="m" />
-        <EuiCallOut
-          data-test-subj="jobListNoPermission"
-          title={title}
-          color="warning"
-          iconType="help"
-        >
-          <FormattedMessage
-            id="xpack.rollupJobs.jobList.noPermissionText"
-            defaultMessage="You do not have permission to view or add rollup jobs."
-          />
-        </EuiCallOut>
-      </Fragment>
+      <EuiPageContent verticalPosition="center" horizontalPosition="center" color="danger">
+        <EuiEmptyPrompt
+          data-test-subj="jobListError"
+          iconType="alert"
+          title={<h1>{title}</h1>}
+          body={
+            <p>
+              <FormattedMessage
+                id="xpack.rollupJobs.jobList.noPermissionText"
+                defaultMessage="You do not have permission to view or add rollup jobs."
+              />
+            </p>
+          }
+        />
+      </EuiPageContent>
     );
   }
 
@@ -120,7 +119,8 @@ export class JobListUi extends Component {
       <EuiPageContent verticalPosition="center" horizontalPosition="center" color="danger">
         <EuiEmptyPrompt
           data-test-subj="jobListError"
-          title={<h2>{title}</h2>}
+          iconType="alert"
+          title={<h1>{title}</h1>}
           body={
             <p>
               {statusCode} {errorString}

diff --git a/x-pack/plugins/rollup/public/crud_app/store/actions/load_jobs.js b/x-pack/plugins/rollup/public/crud_app/store/actions/load_jobs.js
@@ -5,9 +5,7 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
-
-import { loadJobs as sendLoadJobsRequest, deserializeJobs, showApiError } from '../../services';
+import { loadJobs as sendLoadJobsRequest, deserializeJobs } from '../../services';
 import { LOAD_JOBS_START, LOAD_JOBS_SUCCESS, LOAD_JOBS_FAILURE } from '../action_types';
 
 export const loadJobs = () => async (dispatch) => {
@@ -19,17 +17,10 @@ export const loadJobs = () => async (dispatch) => {
   try {
     jobs = await sendLoadJobsRequest();
   } catch (error) {
-    dispatch({
+    return dispatch({
       type: LOAD_JOBS_FAILURE,
       payload: { error },
     });
-
-    return showApiError(
-      error,
-      i18n.translate('xpack.rollupJobs.loadAction.errorTitle', {
-        defaultMessage: 'Error loading rollup jobs',
-      })
-    );
   }
 
   dispatch({

diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_list.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_list.test.js
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { getRouter, setHttp } from '../../crud_app/services';
+import { getRouter, setHttp, init as initDocumentation } from '../../crud_app/services';
 import { mockHttpRequest, pageHelpers, nextTick } from './helpers';
 import { JOBS } from './helpers/constants';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { coreMock, docLinksServiceMock } from '../../../../../../src/core/public/mocks';
 
 jest.mock('../../crud_app/services', () => {
   const services = jest.requireActual('../../crud_app/services');
@@ -38,6 +38,7 @@ describe('<JobList />', () => {
     beforeAll(() => {
       startMock = coreMock.createStart();
       setHttp(startMock.http);
+      initDocumentation(docLinksServiceMock.createStartContract());
     });
 
     beforeEach(async () => {