Added possibilty to add a custom command to a course

GitOrigin-RevId: 7322ddefd741b1fee2f56b2e44d7db05f9ecf41e
CentraleSupelec · Dec 4, 2024 · fc4d86b · fc4d86b
1 parent a0c0890
commit fc4d86b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 0 deletions.
diff --git a/front/CHANGELOG.md b/front/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 - Redirect to containers through reverse proxy
+- Can add a custom command to a course
 
 ## 2.24.6
 ### Fixed

diff --git a/front/src/app/modules/admin-course/components/course-form/course-form.component.ts b/front/src/app/modules/admin-course/components/course-form/course-form.component.ts
@@ -17,6 +17,8 @@ import {
 import { IComputeType } from '../../../compute-type/interfaces/compute-type';
 import { ISessionsById } from "../../../sessions-form/interfaces/admin-session";
 
+const DEFAULT_COMMAND = "${MYDOCKER_USERNAME} ${MYDOCKER_PASSWORD}"
+
 @Component({
   selector: 'app-course-form',
   templateUrl: './course-form.component.html',
@@ -98,6 +100,7 @@ export class CourseFormComponent implements OnInit, ControlValueAccessor, Valida
         nanoCpusLimit: obj?.nanoCpusLimit || null,
         memoryBytesLimit: obj?.memoryBytesLimit || null,
         computeTypeId: obj?.computeTypeId || this.defaultComputeTypeId,
+        command: obj?.command || DEFAULT_COMMAND,
 
         saveStudentWork: obj?.saveStudentWork || false,
         workdirSize: obj?.workdirSize || null,

diff --git a/...onents/course-technical-information-form/course-technical-information-form.component.html b/...onents/course-technical-information-form/course-technical-information-form.component.html
@@ -12,6 +12,11 @@ <h2>Ports:</h2>
   <app-ports-form
     formControlName="ports"
   ></app-ports-form>
+
+  <mat-form-field>
+    <mat-label>Commande</mat-label>
+    <input matInput formControlName="command" type="text">
+  </mat-form-field>
   <br>
   <mat-divider></mat-divider>
   <br>

diff --git a/...mponents/course-technical-information-form/course-technical-information-form.component.ts b/...mponents/course-technical-information-form/course-technical-information-form.component.ts
@@ -54,6 +54,7 @@ export class CourseTechnicalInformationFormComponent implements OnInit, OnDestro
       nanoCpusLimit: null,
       memoryBytesLimit: null,
       computeTypeId: null,
+      command: null,
 
       saveStudentWork: false,
       workdirSize: null,
@@ -107,6 +108,7 @@ export class CourseTechnicalInformationFormComponent implements OnInit, OnDestro
       nanoCpusLimit: obj?.nanoCpusLimit * 1e-9 || null,
       memoryBytesLimit: obj?.memoryBytesLimit * 1e-9 || null,
       computeTypeId: obj?.computeTypeId || this.defaultComputeTypeId,
+      command: obj?.command || null,
 
       saveStudentWork: obj?.saveStudentWork || false,
       workdirSize: obj?.workdirSize || null,

diff --git a/front/src/app/modules/admin-course/interfaces/course.ts b/front/src/app/modules/admin-course/interfaces/course.ts
@@ -22,6 +22,7 @@ export interface IAdminCourseBase {
   nanoCpusLimit: number;
   memoryBytesLimit: number;
   computeTypeId: number;
+  command: string;
 
   saveStudentWork: boolean;
   workdirSize: number;