Commit 56fbe4e1 authored by Sarah Groff Hennigh-Palermo's avatar Sarah Groff Hennigh-Palermo Committed by Andrew Fontaine

Pipeline Graph Structural Update: Cleanup CSS and Accessors

parent a8bfc498
...@@ -4,7 +4,7 @@ import ActionComponent from './action_component.vue'; ...@@ -4,7 +4,7 @@ import ActionComponent from './action_component.vue';
import JobNameComponent from './job_name_component.vue'; import JobNameComponent from './job_name_component.vue';
import { sprintf } from '~/locale'; import { sprintf } from '~/locale';
import delayedJobMixin from '~/jobs/mixins/delayed_job_mixin'; import delayedJobMixin from '~/jobs/mixins/delayed_job_mixin';
import { accessors } from './accessors'; import { accessValue } from './accessors';
import { REST } from './constants'; import { REST } from './constants';
/** /**
...@@ -79,10 +79,10 @@ export default { ...@@ -79,10 +79,10 @@ export default {
return this.dropdownLength === 1 ? 'viewport' : 'scrollParent'; return this.dropdownLength === 1 ? 'viewport' : 'scrollParent';
}, },
detailsPath() { detailsPath() {
return this.status[accessors[this.dataMethod].detailsPath]; return accessValue(this.dataMethod, 'detailsPath', this.status);
}, },
hasDetails() { hasDetails() {
return this.status[accessors[this.dataMethod].hasDetails]; return accessValue(this.dataMethod, 'hasDetails', this.status);
}, },
status() { status() {
return this.job && this.job.status ? this.job.status : {}; return this.job && this.job.status ? this.job.status : {};
......
...@@ -5,7 +5,7 @@ import JobItem from './job_item.vue'; ...@@ -5,7 +5,7 @@ import JobItem from './job_item.vue';
import JobGroupDropdown from './job_group_dropdown.vue'; import JobGroupDropdown from './job_group_dropdown.vue';
import ActionComponent from './action_component.vue'; import ActionComponent from './action_component.vue';
import { GRAPHQL } from './constants'; import { GRAPHQL } from './constants';
import { accessors } from './accessors'; import { accessValue } from './accessors';
export default { export default {
components: { components: {
...@@ -39,7 +39,6 @@ export default { ...@@ -39,7 +39,6 @@ export default {
default: () => ({}), default: () => ({}),
}, },
}, },
accessors,
titleClasses: [ titleClasses: [
'gl-font-weight-bold', 'gl-font-weight-bold',
'gl-pipeline-job-width', 'gl-pipeline-job-width',
...@@ -56,8 +55,8 @@ export default { ...@@ -56,8 +55,8 @@ export default {
}, },
}, },
methods: { methods: {
getAccessor(property) { getGroupId(group) {
return accessors[GRAPHQL][property]; return accessValue(GRAPHQL, 'groupId', group);
}, },
groupId(group) { groupId(group) {
return `ci-badge-${escape(group.name)}`; return `ci-badge-${escape(group.name)}`;
...@@ -87,7 +86,7 @@ export default { ...@@ -87,7 +86,7 @@ export default {
<div <div
v-for="group in groups" v-for="group in groups"
:id="groupId(group)" :id="groupId(group)"
:key="group[getAccessor('groupId')]" :key="getGroupId(group)"
data-testid="stage-column-group" data-testid="stage-column-group"
class="gl-relative gl-mb-3 gl-white-space-normal gl-pipeline-job-width" class="gl-relative gl-mb-3 gl-white-space-normal gl-pipeline-job-width"
> >
......
...@@ -129,17 +129,6 @@ ...@@ -129,17 +129,6 @@
overflow: auto; overflow: auto;
} }
// Move to Gitlab UI
.gl-font-weight-100 {
font-weight: 100;
}
.gl-active-text-decoration-none:active,
.gl-focus-text-decoration-none:focus,
.gl-hover-text-decoration-none:hover {
text-decoration: none;
}
// These are single-value classes to use with utility-class style CSS // These are single-value classes to use with utility-class style CSS
// but to still access this variable. Do not add other styles. // but to still access this variable. Do not add other styles.
.gl-pipeline-min-h { .gl-pipeline-min-h {
...@@ -150,10 +139,6 @@ ...@@ -150,10 +139,6 @@
width: 186px; width: 186px;
} }
.gl-pipeline-title-width {
width: 176px;
}
.gl-build-content { .gl-build-content {
@include build-content(); @include build-content();
} }
......
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