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

Add project selector #4

Merged
merged 8 commits into from
Jan 30, 2020
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
111 changes: 69 additions & 42 deletions src/GitLabEnvironments.vue
Original file line number Diff line number Diff line change
@@ -1,50 +1,58 @@
<template>
<v-app>
<v-content>
<v-container>
<v-card>
<v-card-title>
GitLab Environments Status
<v-spacer/>
<v-text-field
v-model="search"
append-icon="search"
label="Search"
single-line
hide-details
/>
</v-card-title>
<v-data-table
:headers="headers"
:items=environments()
:search="search"
:loading="isLoading"
>
<template v-slot:body="{ items }">
<tbody>
<Environment v-for="item in items" :key="item.name" :environment="item"/>
</tbody>
</template>
</v-data-table>
</v-card>
</v-container>
</v-content>
</v-app>
<v-app>
<v-content>
<v-container>
<v-card>
<v-card-title>
<div class="mt-4">GitLab Environments Status</div>
<v-spacer/>
<v-autocomplete :items="projects"
item-text="name_with_namespace"
item-value="id"
label="Project"
class="mt-7"
@change="loadEnvironments()"
v-model="projectId"
:loading="loadingProjects"
/>
<v-spacer/>
<v-text-field
v-model="search"
append-icon="search"
label="Search"
single-line
hide-details
/>
</v-card-title>
<v-data-table
:headers="headers"
:items=environments()
:search="search"
:loading="loadingEnvironments"
>
<template v-slot:item="{ item }">
<Environment :key="item.name" :environment="item"/>
</template>
</v-data-table>
</v-card>
</v-container>
</v-content>
</v-app>
</template>

<script>
import Environment from "./components/Environment";
import Environment from "./components/Environment";

export default {
name : "GitLabEnvironments",
components: {Environment},
data() {
return {
overlay() {
return this.$store.state.isLoading;
},
search : '',
headers: [
loadingProjects : false,
loadingEnvironments: false,
projectId : null,
search : '',
headers : [
{
text : 'Name',
align : 'left',
Expand All @@ -55,18 +63,37 @@ import Environment from "./components/Environment";
{text: 'Status'},
{text: 'Deployment'},
],
projects: [],
environments() {
return this.$store.state.environments
},
}
},
computed : {
isLoading() {
return this.$store.state.isLoading;
}
methods : {
loadEnvironments() {
this.loadingEnvironments = true;
this.$store.dispatch("fetchEnvironments", {
projectId: this.projectId,
}).then(() => {
this.loadingEnvironments = false;
});
},
},
created() {
this.$store.dispatch("fetchEnvironments");
this.loadingProjects = true;
this.$store.dispatch("fetchProjects").then(() => {
let projects = this.$store.state.projects;
projects.sort(function (a, b) {
if (a.name_with_namespace < b.name_with_namespace) {
return -1;
} else if (a.name_with_namespace > b.name_with_namespace) {
return 1;
}
return 0;
});
this.projects = projects;
this.loadingProjects = false;
});
},
}
</script>
8 changes: 4 additions & 4 deletions src/components/Environment.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<tr>
<td>
<v-row>
<v-switch inset :disabled="disabled" @change="loadEnvironment(environment.id)" class="d-inline"/>
<v-switch inset :disabled="disabled" @change="loadEnvironment(environment)" class="d-inline ml-2"/>
<p class="d-inline my-auto">{{ environment.name }}</p>
</v-row>
</td>
Expand Down Expand Up @@ -39,7 +39,6 @@
disabled: false,
loading : false,
environmentRef: null,
environmentId: null,
deployableStatus: null,
userAvatarUrl: null,
deployableFinishedAt: null,
Expand All @@ -60,12 +59,13 @@
}
},
methods : {
loadEnvironment(environmentId) {
loadEnvironment(environment) {
this.disabled = true;
this.loading = true;

this.$store.dispatch("fetchEnvironment", {
environmentId: environmentId
projectId: environment.project.id,
environmentId: environment.id
}).then(response => {
let lastDeployment = response.data.last_deployment;

Expand Down
2 changes: 1 addition & 1 deletion src/components/EnvironmentDeployment.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
data() {
return {
readableDate(date) {
return moment(date).format('Do MMM Y @ HH:mm');
return moment(date).format('dddd, MMMM Do YYYY, h:mm:ss a');
}
}
}
Expand Down
24 changes: 20 additions & 4 deletions src/services/GitLabService.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,26 @@ const apiClient = axios.create({
}
});

const projectId = 39

export default {
async getEnvironments() {
async getProjects() {
let projects = []
let page = 1

try {
let response
do {
response = await apiClient.get("/projects?archived=false&page=" + page++)

projects = projects.concat(response.data)
} while ('x-next-page' in response.headers && response.headers['x-next-page'].length)
} catch (e) {
// eslint-disable-next-line no-console
console.log(e)
}

return projects
},
async getEnvironments(projectId) {
let environments = []
let page = 1

Expand All @@ -31,7 +47,7 @@ export default {

return environments
},
getEnvironment(environmentId) {
getEnvironment(projectId, environmentId) {
return apiClient.get("/projects/" + projectId + "/environments/" + environmentId);
}
};
36 changes: 23 additions & 13 deletions src/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,51 @@ Vue.use(Vuex);

export default new Vuex.Store({
state : {
projects : [],
environments : [],
isLoading : true,
},
mutations: {
SET_PROJECTS(state, projects) {
state.projects = projects;
},
SET_ENVIRONMENTS(state, environments) {
state.environments = environments;
},
SET_LOADING(state, isLoading) {
state.isLoading = isLoading
}
},
actions : {
fetchEnvironments({commit}) {
commit("SET_LOADING", true);
fetchProjects({commit}) {
commit("SET_PROJECTS", []);
return GitLabService.getProjects()
.then(projects => {
projects = projects.filter((project) => {
return project['empty_repo'] === false
});
commit("SET_PROJECTS", projects);
return this;
})
.catch(error => {
// eslint-disable-next-line no-console
console.log('There was an error: ', error);
});
},
fetchEnvironments({commit}, {projectId}) {
commit("SET_ENVIRONMENTS", []);
return GitLabService.getEnvironments()
return GitLabService.getEnvironments(projectId)
.then(environments => {
environments = environments.filter((environment) => {
return environment.state === 'available'
});
commit("SET_ENVIRONMENTS", environments);
commit("SET_LOADING", false);
return this;
})
.catch(error => {
// eslint-disable-next-line no-console
console.log('There was an error: ', error);
commit("SET_LOADING", false)
});
},
fetchEnvironment({commit}, {environmentId}) {
commit("SET_LOADING", true);
return GitLabService.getEnvironment(environmentId)
fetchEnvironment({commit}, {projectId, environmentId}) {
return GitLabService.getEnvironment(projectId, environmentId)
.then(response => {
commit("SET_LOADING", false);
return response
})
.catch(error => {
Expand Down