Compare commits
No commits in common. "f79c7b43cd5f683d6fa1ea189981eb667082f35c" and "888de876c0d91accd455ea732cf6e2b11e89946a" have entirely different histories.
f79c7b43cd
...
888de876c0
5 changed files with 17 additions and 88 deletions
|
|
@ -57,11 +57,6 @@ func initializeGitLabOIDC(router *gin.Engine, authrouter *gin.RouterGroup, admin
|
|||
}
|
||||
|
||||
authrouter.GET("/api/gitlabcri/repositories", GitLab_GetMyRepositories)
|
||||
|
||||
usersRoutes := authrouter.Group("/api/users/:uid")
|
||||
usersRoutes.Use(userHandler)
|
||||
usersRoutes.Use(sameUserMiddleware)
|
||||
usersRoutes.GET("/gitlabcri/repositories", GitLab_GetMyRepositories)
|
||||
}
|
||||
|
||||
if _, err := os.Stat(OAUTH_GITLAB_FILE); err == nil {
|
||||
|
|
|
|||
|
|
@ -167,12 +167,11 @@ func declareAPIAuthRepositoriesRoutes(router *gin.RouterGroup) {
|
|||
})
|
||||
|
||||
repositoriesRoutes.POST("/trigger", func(c *gin.Context) {
|
||||
loggeduser := c.MustGet("LoggedUser").(*User)
|
||||
var u *User
|
||||
if user, ok := c.Get("user"); ok {
|
||||
u = user.(*User)
|
||||
} else {
|
||||
u = loggeduser
|
||||
u = c.MustGet("LoggedUser").(*User)
|
||||
}
|
||||
repo := c.MustGet("repository").(*Repository)
|
||||
work, err := getWork(int(repo.IdWork))
|
||||
|
|
@ -184,17 +183,12 @@ func declareAPIAuthRepositoriesRoutes(router *gin.RouterGroup) {
|
|||
|
||||
now := time.Now()
|
||||
|
||||
if repo.LastCheck != nil && !repo.LastCheck.Before(now.Add(-5*time.Minute)) && !loggeduser.IsAdmin {
|
||||
if repo.LastCheck != nil && !repo.LastCheck.Before(now.Add(-5*time.Minute)) {
|
||||
c.AbortWithStatusJSON(http.StatusPaymentRequired, gin.H{"errmsg": "Please wait between two pulls."})
|
||||
return
|
||||
}
|
||||
|
||||
var tag *string
|
||||
if loggeduser.IsAdmin {
|
||||
c.ShouldBindJSON(&tag)
|
||||
}
|
||||
|
||||
TriggerTagUpdate(c, work, repo, u, tag)
|
||||
TriggerTagUpdate(c, work, repo, u, nil)
|
||||
})
|
||||
|
||||
repositoriesRoutes.GET("/state", func(c *gin.Context) {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
export { className as class };
|
||||
|
||||
export let work = {};
|
||||
export let user = null;
|
||||
export let readonly = false;
|
||||
|
||||
let repo_work = null;
|
||||
|
|
@ -37,28 +36,24 @@
|
|||
show_logs = repo.getBuildLogs()
|
||||
}
|
||||
|
||||
function refresh_repo_work(user) {
|
||||
if (user != null) {
|
||||
repo_work = getRepositories(work.id, user.id);
|
||||
} else {
|
||||
repo_work = getRepositories(work.id);
|
||||
}
|
||||
function refresh_repo_work() {
|
||||
repo_work = getRepositories(work.id);
|
||||
repo_work.then((repos) => {
|
||||
repo_used = repos[0];
|
||||
updatePullState(repos[0])
|
||||
}, () => {
|
||||
repo_used = new WorkRepository({id_work: work.id});
|
||||
remote_repos = getRemoteRepositories(user?user.id:null);
|
||||
remote_repos = getRemoteRepositories();
|
||||
});
|
||||
}
|
||||
$: refresh_repo_work(user);
|
||||
refresh_repo_work();
|
||||
|
||||
let submitInProgress = false;
|
||||
function submitWorkRepository() {
|
||||
submitInProgress = true;
|
||||
repo_used.save(user).then(() => {
|
||||
repo_used.save().then(() => {
|
||||
submitInProgress = false;
|
||||
refresh_repo_work(user);
|
||||
refresh_repo_work();
|
||||
}, (error) => {
|
||||
submitInProgress = false;
|
||||
ToastsStore.addErrorToast({
|
||||
|
|
@ -71,7 +66,7 @@
|
|||
submitInProgress = true;
|
||||
repo.retrieveWork().then(() => {
|
||||
submitInProgress = false;
|
||||
refresh_repo_work(user);
|
||||
refresh_repo_work();
|
||||
}, (error) => {
|
||||
submitInProgress = false;
|
||||
ToastsStore.addErrorToast({msg: "Une erreur s'est produite : " + error});
|
||||
|
|
@ -129,7 +124,7 @@
|
|||
type="button"
|
||||
class="btn btn-outline-danger float-end mt-1"
|
||||
disable={submitInProgress || readonly}
|
||||
on:click={() => repo.delete().then(() => { refresh_repo_work(user) }, (error) => ToastsStore.addErrorToast({msg: "Une erreur s'est produite durant la suppression du lien : " + error}))}
|
||||
on:click={() => repo.delete().then(() => { refresh_repo_work() }, (error) => ToastsStore.addErrorToast({msg: "Une erreur s'est produite durant la suppression du lien : " + error}))}
|
||||
>
|
||||
Supprimer cette liaison
|
||||
</button>
|
||||
|
|
@ -174,7 +169,7 @@
|
|||
type="button"
|
||||
class="mt-2 btn btn-info"
|
||||
title="Rafraîchir la liste des dépôts"
|
||||
on:click={() => remote_repos = getRemoteRepositories(user?user.id:null)}
|
||||
on:click={() => remote_repos = getRemoteRepositories()}
|
||||
>
|
||||
<i class="bi bi-arrow-clockwise"></i>
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -54,11 +54,10 @@ export class WorkRepository {
|
|||
}
|
||||
}
|
||||
|
||||
async retrieveWork(tag) {
|
||||
async retrieveWork() {
|
||||
const res = await fetch(this.id_work?`api/works/${this.id_work}/repositories/${this.id}/trigger`:`api/repositories/${this.id}/trigger`, {
|
||||
method: 'POST',
|
||||
headers: {'Accept': 'application/json'},
|
||||
body: !tag || tag.length == 0?null:JSON.stringify(tag)
|
||||
headers: {'Accept': 'application/json'}
|
||||
});
|
||||
if (res.status == 200) {
|
||||
const data = await res.json();
|
||||
|
|
@ -69,15 +68,12 @@ export class WorkRepository {
|
|||
}
|
||||
}
|
||||
|
||||
async save(user) {
|
||||
async save() {
|
||||
let url = this.id?`repositories/${this.id}`:'repositories';
|
||||
|
||||
if (this.id_work) {
|
||||
url = `works/${this.id_work}/` + url;
|
||||
}
|
||||
if (user != null) {
|
||||
url = `users/${user.id}/` + url;
|
||||
}
|
||||
|
||||
const res = await fetch("api/"+url, {
|
||||
method: this.id?'PUT':'POST',
|
||||
|
|
|
|||
|
|
@ -18,9 +18,7 @@
|
|||
import DateFormat from '../../../components/DateFormat.svelte';
|
||||
import SubmissionStatus from '../../../components/SubmissionStatus.svelte';
|
||||
import SurveyBadge from '../../../components/SurveyBadge.svelte';
|
||||
import WorkRepository from '../../../components/WorkRepository.svelte';
|
||||
import { getRepositories } from '../../../lib/repositories';
|
||||
import { ToastsStore } from '../../../stores/toasts';
|
||||
import { getUsers } from '../../../lib/users';
|
||||
|
||||
export let work = null;
|
||||
|
|
@ -38,8 +36,6 @@
|
|||
let nb_users = 0;
|
||||
|
||||
let show_logs = null;
|
||||
let run_pull_for = {repo: null, user: null, tag: null};
|
||||
let search_repo_for = {repo: null, user: null};
|
||||
</script>
|
||||
|
||||
{#await work then w}
|
||||
|
|
@ -90,7 +86,7 @@
|
|||
<button
|
||||
class="btn btn-sm btn-primary mx-1"
|
||||
title="Rafraîchir"
|
||||
on:click={() => { run_pull_for = { repo, user, tag: '', modal: new bootstrap.Modal(document.getElementById('pullModal'))}; run_pull_for.modal.show(); }}
|
||||
on:click={() => repo.retrieveWork()}
|
||||
>
|
||||
<i class="bi bi-arrow-clockwise"></i>
|
||||
</button>
|
||||
|
|
@ -98,16 +94,7 @@
|
|||
{/each}
|
||||
</div>
|
||||
{:catch err}
|
||||
<div class="d-flex justify-content-between">
|
||||
-
|
||||
<button
|
||||
class="btn btn-sm btn-info mx-1"
|
||||
title="Choisir un dépôt"
|
||||
on:click={() => { search_repo_for = { repo: null, user, modal: new bootstrap.Modal(document.getElementById('repoModal'))}; search_repo_for.modal.show(); }}
|
||||
>
|
||||
<i class="bi bi-search"></i>
|
||||
</button>
|
||||
</div>
|
||||
-
|
||||
{/await}
|
||||
</td>
|
||||
<td>
|
||||
|
|
@ -125,44 +112,6 @@
|
|||
</tbody>
|
||||
</table>
|
||||
{/await}
|
||||
|
||||
<div class="modal fade" tabindex="-1" id="pullModal">
|
||||
<div class="modal-dialog">
|
||||
<form class="modal-content" on:submit|preventDefault={() => {run_pull_for.modal.hide(); try { run_pull_for.repo.retrieveWork(run_pull_for.tag) } catch(err) { ToastsStore.addToast({color: "danger", title: "Connexion impossible", msg: err}) };}}>
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">Repository Pull {#if run_pull_for.user}{run_pull_for.user.login}{/if}</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="form-group row mb-2">
|
||||
<label class="col-2 col-form-label" for="pull-tag">Tag</label>
|
||||
<input class="form-control col" id="pull-tag" autofocus placeholder={w.tag} bind:value={run_pull_for.tag}>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
Récupérer le travail
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" tabindex="-1" id="repoModal">
|
||||
<div class="modal-dialog">
|
||||
<form class="modal-content" on:submit|preventDefault={() => {search_repo_for.modal.hide(); try { search_repo_for.repo.retrieveWork(run_pull_for.tag) } catch(err) { ToastsStore.addToast({color: "danger", title: "Connexion impossible", msg: err}) }; search_repo_for.user = null; }}>
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">Repository selector {#if search_repo_for.user}{search_repo_for.user.login}{/if}</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
{#if search_repo_for.user}
|
||||
<WorkRepository work={w} user={search_repo_for.user} />
|
||||
{/if}
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{/await}
|
||||
|
||||
<div class="modal fade" tabindex="-1" id="logsModal">
|
||||
|
|
|
|||
Reference in a new issue