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

feat: add options to v2 route #1080

Merged
merged 6 commits into from
Jul 8, 2024
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
14 changes: 7 additions & 7 deletions app/components/secret-view/component.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { computed } from '@ember/object';
import { computed, get } from '@ember/object';
import Component from '@ember/component';

export default Component.extend({
Expand All @@ -10,8 +10,8 @@ export default Component.extend({
get() {
const { secret, pipeline } = this;

if (pipeline.get('configPipelineId')) {
if (secret.get('pipelineId') === pipeline.get('configPipelineId')) {
if (get(pipeline, 'configPipelineId')) {
if (get(secret, 'pipelineId') === get(pipeline, 'configPipelineId')) {
return 'Override';
}

Expand All @@ -31,7 +31,7 @@ export default Component.extend({
get() {
const { secret, pipeline } = this;

if (secret.get('pipelineId') === pipeline.get('configPipelineId')) {
if (get(secret, 'pipelineId') === get(pipeline, 'configPipelineId')) {
return 'Inherited from parent pipeline';
}

Expand All @@ -57,14 +57,14 @@ export default Component.extend({
}
secret.save();
this.set('newValue', null);
this.set('originalAllowInPR', secret.get('allowInPR'));
this.set('originalAllowInPR', get(secret, 'allowInPR'));
} else if (this.newValue) {
// Create child pipeline secret to override inherited secret of same name
return this.onCreateSecret(
secret.get('name'),
get(secret, 'name'),
this.newValue,
this.get('pipeline.id'),
secret.get('allowInPR')
get(secret, 'allowInPR')
);
}

Expand Down
6 changes: 3 additions & 3 deletions app/components/token-view/component.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { computed } from '@ember/object';
import { computed, get } from '@ember/object';
import Component from '@ember/component';

export default Component.extend({
Expand All @@ -14,8 +14,8 @@ export default Component.extend({
get() {
const { token } = this;

return this.newName !== token.get('name') ||
this.newDescription !== token.get('description')
return this.newName !== get(token, 'name') ||
this.newDescription !== get(token, 'description')
? 'Update'
: 'Delete';
}
Expand Down
17 changes: 12 additions & 5 deletions app/pipeline/service.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,21 @@ export default Service.extend({
// No preferences for the pipeline exist, so we will create the default set.
// Note: the newly created preferences for this pipeline are not saved back on the server as they are just default settings.
// When a user changes the options in the options view of the pipeline, then the settings are saved.
const pipelinePreference = await this.store.createRecord(
let pipelinePreference = await this.store.peekRecord(
'preference/pipeline',
{
id: pipelineId,
...pipelinePreferences
}
`${pipelineId}`
);

if (pipelinePreference === null) {
pipelinePreference = await this.store.createRecord(
'preference/pipeline',
{
id: pipelineId,
...pipelinePreferences
}
);
}

return pipelinePreference;
}
});
8 changes: 8 additions & 0 deletions app/shuttle/service.js
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,14 @@ export default Service.extend({
const method = 'get';
const url = `/pipelines/${pipelineId}/stages`;

return this.fetchFromApi(method, url);
},

// GET /pipelines/{id}/jobs
async fetchJobs(pipelineId) {
const method = 'get';
const url = `/pipelines/${pipelineId}/jobs`;

return this.fetchFromApi(method, url);
}
});
68 changes: 68 additions & 0 deletions app/v2/pipeline/options/controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import Controller from '@ember/controller';
import { service } from '@ember/service';
import { action } from '@ember/object';

export default class PipelineOptionsController extends Controller {
@service session;

@service router;

errorMessage = '';

isSaving = false;

get pipeline() {
return this.model.pipeline;
}

get jobs() {
return this.model.jobs;
}

@action
async removePipeline() {
const currentPipeline = await this.store.findRecord(
'pipeline',
this.pipeilne.id
);

currentPipeline
.destroyRecord()
.then(() => {
this.router.transitionTo('home');
})
.catch(err => {
this.errorMessage = err.errors[0].detail || '';
});
}

@action
async updatePipeline({ scmUrl, rootDir }) {
const { pipeline } = this;

pipeline.setProperties({
checkoutUrl: scmUrl,
rootDir
});
this.isSaving = true;

const currentPipeline = await this.store.findRecord(
'pipeline',
this.pipeline.id
);

currentPipeline.setProperties({
...pipeline
});

currentPipeline
.save()
.then(() => (this.errorMessage = ''))
.catch(err => {
this.errorMessage = err.errors[0].detail || '';
})
.finally(() => {
this.isSaving = false;
});
}
}
40 changes: 39 additions & 1 deletion app/v2/pipeline/options/route.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,41 @@
import Route from '@ember/routing/route';
import { service } from '@ember/service';
import { get } from '@ember/object';

export default class NewPipelineOptionsRoute extends Route {}
export default class PipelineOptionsRoute extends Route {
@service session;

@service router;

@service shuttle;

beforeModel() {
// Guests should not access this page
if (get(this, 'session.data.authenticated.isGuest')) {
this.router.transitionTo('v2.pipeline');
}

// Reset error message when switching pages
this.router.on('routeWillChange', (/* transition */) => {
adong marked this conversation as resolved.
Show resolved Hide resolved
const pipelineOptionsController = this.controllerFor(
'v2.pipeline.options'
);

pipelineOptionsController.set('errorMessage', '');
});
}

async model() {
const { pipeline } = this.modelFor('v2.pipeline');
const pipelineId = pipeline.id;

const jobs = await this.shuttle.fetchJobs(pipelineId).catch(e => {
// eslint-disable-next-line no-console
console.error(e);

return [];
});

return { pipeline, jobs };
}
}
12 changes: 10 additions & 2 deletions app/v2/pipeline/options/template.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
{{page-title "Options"}}
<div class="pipeline-options">
<div>options content</div>
{{outlet}}
<PipelineOptions
class="padded-container"
@username={{this.session.data.authenticated.username}}
@pipeline={{this.pipeline}}
@jobs={{this.jobs}}
@errorMessage={{this.errorMessage}}
@onRemovePipeline={{action "removePipeline"}}
@isSaving={{this.isSaving}}
@onUpdatePipeline={{action "updatePipeline"}}
/>
</div>
6 changes: 6 additions & 0 deletions tests/unit/pipeline/service-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ const storeServiceStub = Service.extend({
query() {
return pipelines;
},
peekRecord(name, id) {
return EmberObject.create({
id,
showPRJobs: true
});
},
peekAll() {
/* eslint new-cap: ["error", { "capIsNewExceptions": ["A"] }] */
return A([
Expand Down