Commit efc13fae authored by Filipa Lacerda's avatar Filipa Lacerda Committed by Phil Hughes

Moves shared quota getter into CE

In jobs store, moves the check for
`shouldRenderSharedRunnerLimitWarning` to the CE
codebase.
parent aaf27d14
...@@ -7,9 +7,6 @@ import { polyfillSticky } from '~/lib/utils/sticky'; ...@@ -7,9 +7,6 @@ import { polyfillSticky } from '~/lib/utils/sticky';
import bp from '~/breakpoints'; import bp from '~/breakpoints';
import CiHeader from '~/vue_shared/components/header_ci_component.vue'; import CiHeader from '~/vue_shared/components/header_ci_component.vue';
import Callout from '~/vue_shared/components/callout.vue'; import Callout from '~/vue_shared/components/callout.vue';
// ee-only start
import SharedRunner from 'ee/jobs/components/shared_runner_limit_block.vue';
// ee-only end
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import createStore from '../store'; import createStore from '../store';
import EmptyState from './empty_state.vue'; import EmptyState from './empty_state.vue';
...@@ -31,13 +28,13 @@ export default { ...@@ -31,13 +28,13 @@ export default {
EmptyState, EmptyState,
EnvironmentsBlock, EnvironmentsBlock,
ErasedBlock, ErasedBlock,
GlLoadingIcon,
Icon, Icon,
Log, Log,
LogTopBar, LogTopBar,
StuckBlock, StuckBlock,
SharedRunner,
Sidebar, Sidebar,
GlLoadingIcon,
SharedRunner: () => import('ee_component/jobs/components/shared_runner_limit_block.vue'),
}, },
mixins: [delayedJobMixin], mixins: [delayedJobMixin],
props: { props: {
......
...@@ -28,7 +28,6 @@ export const emptyStateIllustration = state => ...@@ -28,7 +28,6 @@ export const emptyStateIllustration = state =>
export const emptyStateAction = state => export const emptyStateAction = state =>
(state.job && state.job.status && state.job.status.action) || null; (state.job && state.job.status && state.job.status.action) || null;
// ee-only start
/** /**
* Shared runners limit is only rendered when * Shared runners limit is only rendered when
* used quota is bigger or equal than the limit * used quota is bigger or equal than the limit
...@@ -39,7 +38,6 @@ export const shouldRenderSharedRunnerLimitWarning = state => ...@@ -39,7 +38,6 @@ export const shouldRenderSharedRunnerLimitWarning = state =>
!_.isEmpty(state.job.runners) && !_.isEmpty(state.job.runners) &&
!_.isEmpty(state.job.runners.quota) && !_.isEmpty(state.job.runners.quota) &&
state.job.runners.quota.used >= state.job.runners.quota.limit; state.job.runners.quota.used >= state.job.runners.quota.limit;
// ee-only end
export const isScrollingDown = state => isScrolledToBottom() && !state.isTraceComplete; export const isScrollingDown = state => isScrolledToBottom() && !state.isTraceComplete;
......
---
title: Removes EE differences for jobs/getters.js
merge_request:
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment