Merge branch 'master' into 78-remove-id-from-title-of-trainingdefinitioninfomapper

# Conflicts:
#	VERSION.txt

CHANGELOG.md

+### 18.1.0 Move stepperBar from training definition to instance.
+* a913712 -- [CI/CD] Update packages.json version based on GitLab tag.
+* 5cf7f2b -- Merge branch 'develop' into 'master'
+* 8c2eab0 -- Merge branch '76-update-training-instance-and-training-definition-dtos-with-stepper-bar-change' into 'develop'
+* 72436d0 -- Upgrade training model version
+* 928421b -- merge changes from develop
+* 696038b -- revert trainingRunInfo removal of stepperDisplayed flag
+* 4e0786c -- Update version
+* 753200a -- Move stepper bar from definition to instance
+### 18.0.0 Update to Angular 18.
+* 3884209 -- [CI/CD] Update packages.json version based on GitLab tag.
+* 0b366ea -- Merge branch 'develop' into 'master'
+* 34de457 -- Merge branch '77-update-to-angular-18' into 'develop'
+* e1d054c -- Update to Angular 18
 ### 16.1.2 Add new endpoint call for access token to training run by pool id.
 * 1cb9cef -- [CI/CD] Update packages.json version based on GitLab tag.
 * 6364c96 -- Merge branch 'develop' into 'master'

VERSION.txt

-18.0.1 Remove title formatting from TrainingDefinitionInfoMapper
+18.1.1 Remove title formatting from TrainingDefinitionInfoMapper
+18.1.0 Move stepperBar from training definition to instance.
 18.0.0 Update to Angular 18.
 16.1.2 Add new endpoint call for access token to training run by pool id.
 16.1.1 Update sentinel versions.

package-lock.json

@@ -16,7 +16,7 @@
                 "@angular/platform-browser": "^18.2.7",
                 "@angular/platform-browser-dynamic": "^18.2.7",
                 "@angular/router": "^18.2.7",
-                "@muni-kypo-crp/training-model": "^18.0.0",
+                "@muni-kypo-crp/training-model": "^18.1.0",
                 "@sentinel/common": "^18.0.3",
                 "file-saver": "^2.0.5",
                 "rxjs": "^7.8.1",
@@ -3983,9 +3983,9 @@
             ]
         },
         "node_modules/@muni-kypo-crp/training-model": {
-            "version": "18.0.0",
-            "resolved": "https://gitlab.ics.muni.cz/api/v4/projects/2358/packages/npm/@muni-kypo-crp/training-model/-/@muni-kypo-crp/training-model-18.0.0.tgz",
-            "integrity": "sha1-mbKFj9L1PbteS5XhWY+Zo8GW8qw=",
+            "version": "18.1.0",
+            "resolved": "https://gitlab.ics.muni.cz/api/v4/projects/2358/packages/npm/@muni-kypo-crp/training-model/-/@muni-kypo-crp/training-model-18.1.0.tgz",
+            "integrity": "sha1-IRckp/CAJjEBvCZyopczO/OS23g=",
             "dependencies": {
                 "tslib": "^2.7.0"
             },

package.json

@@ -29,7 +29,7 @@
         "@angular/platform-browser": "^18.2.7",
         "@angular/platform-browser-dynamic": "^18.2.7",
         "@angular/router": "^18.2.7",
-        "@muni-kypo-crp/training-model": "^18.0.0",
+        "@muni-kypo-crp/training-model": "^18.1.0",
         "@sentinel/common": "^18.0.3",
         "file-saver": "^2.0.5",
         "rxjs": "^7.8.1",
@@ -70,4 +70,4 @@
         "@esbuild/android-arm": "^0.24.0",
         "fsevents": "^2.3.3"
     }
-}
\ No newline at end of file
+}

projects/kypo-training-api/package.json

 {
     "name": "@muni-kypo-crp/training-api",
-    "version": "16.1.2",
+    "version": "18.1.0",
     "peerDependencies": {
         "@angular/common": "^18.2.7",
         "@angular/core": "^18.2.7",
@@ -11,4 +11,4 @@
     "dependencies": {
         "tslib": "^2.7.0"
     }
-}
\ No newline at end of file
+}

projects/kypo-training-api/src/lib/dto/training-definition/training-definition-create-dto.ts

@@ -16,7 +16,6 @@ export class TrainingDefinitionCreateDTO {
   description?: string;
   outcomes?: string[];
   prerequisites?: string[];
-  show_stepper_bar?: boolean;
   state?: TrainingDefinitionCreateDTO.StateEnum;
   title?: string;
   variant_sandboxes?: boolean;

projects/kypo-training-api/src/lib/dto/training-definition/training-definition-dto.ts

@@ -10,7 +10,6 @@ export class TrainingDefinitionDTO {
   id?: number;
   outcomes?: string[];
   prerequisites?: string[];
-  show_stepper_bar?: boolean;
   state?: TrainingDefinitionDTO.StateEnum;
   title?: string;
   estimated_duration: number;

projects/kypo-training-api/src/lib/dto/training-definition/training-definition-update-dto.ts

@@ -18,7 +18,6 @@ export class TrainingDefinitionUpdateDTO {
   id?: number;
   outcomes?: string[];
   prerequisites?: string[];
-  show_stepper_bar?: boolean;
   state?: TrainingDefinitionUpdateDTO.StateEnum;
   title?: string;
   variant_sandboxes?: boolean;

projects/kypo-training-api/src/lib/dto/training-instance/training-instance-create-dto.ts

@@ -23,4 +23,5 @@ export class TrainingInstanceCreateDTO {
   local_environment?: boolean;
   sandbox_definition_id?: number;
   backward_mode?: boolean;
+  show_stepper_bar?: boolean;
 }

projects/kypo-training-api/src/lib/dto/training-instance/training-instance-dto.ts

@@ -27,4 +27,5 @@ export interface TrainingInstanceDTO {
   local_environment?: boolean;
   sandbox_definition_id?: number;
   backward_mode?: boolean;
+  show_stepper_bar?: boolean;
 }

projects/kypo-training-api/src/lib/dto/training-instance/training-instance-update-dto.ts

@@ -23,4 +23,5 @@ export class TrainingInstanceUpdateDTO {
   local_environment?: boolean;
   sandbox_definition_id?: number;
   backward_mode?: boolean;
+  show_stepper_bar?: boolean;
 }

projects/kypo-training-api/src/lib/mappers/training-definition/training-definition-mapper.ts

@@ -20,7 +20,6 @@ export class TrainingDefinitionMapper {
     result.state = this.stateFromDTO(dto.state);
     result.lastEditTime = dto.last_edited;
     result.estimatedDuration = dto.estimated_duration;
-    result.showStepperBar = dto.show_stepper_bar;
     if (withLevels) {
       result.levels = LevelMapper.fromDTOs(dto.levels);
     } else if (withPhases) {
@@ -74,7 +73,6 @@ export class TrainingDefinitionMapper {
     const result = new TrainingDefinitionUpdateDTO();
     result.id = trainingDefinition.id;
     result.description = trainingDefinition.description;
-    result.show_stepper_bar = trainingDefinition.showStepperBar;
     result.prerequisites = trainingDefinition.prerequisites.filter((prerequisite) => prerequisite.length > 1);
     result.outcomes = trainingDefinition.outcomes.filter((outcome) => outcome.length > 1);
     result.state = TrainingDefinitionMapper.stateToDTO(trainingDefinition.state);
@@ -89,7 +87,6 @@ export class TrainingDefinitionMapper {
     result.description = trainingDefinition.description;
     result.state = TrainingDefinitionDTO.StateEnum.UNRELEASED;
     result.title = trainingDefinition.title;
-    result.show_stepper_bar = trainingDefinition.showStepperBar;
     result.default_content = trainingDefinition.defaultContent;
     return result;
   }

projects/kypo-training-api/src/lib/mappers/training-instance/training-instance-mapper.ts

@@ -21,6 +21,7 @@ export class TrainingInstanceMapper {
     result.localEnvironment = dto.local_environment;
     result.sandboxDefinitionId = dto.sandbox_definition_id;
     result.backwardMode = dto.backward_mode;
+    result.showStepperBar = dto.show_stepper_bar;
     return result;
   }
 
@@ -39,6 +40,7 @@ export class TrainingInstanceMapper {
     result.local_environment = trainingInstance.localEnvironment;
     result.sandbox_definition_id = trainingInstance.sandboxDefinitionId;
     result.backward_mode = trainingInstance.backwardMode;
+    result.show_stepper_bar = trainingInstance.showStepperBar;
     return result;
   }
 
@@ -54,6 +56,7 @@ export class TrainingInstanceMapper {
     result.local_environment = trainingInstance.localEnvironment;
     result.sandbox_definition_id = trainingInstance.sandboxDefinitionId;
     result.backward_mode = trainingInstance.backwardMode;
+    result.show_stepper_bar = trainingInstance.showStepperBar;
     return result;
   }
 }

projects/kypo-training-api/src/lib/mappers/training-run/access-adaptive-run-mapper.ts

@@ -14,7 +14,6 @@ export class AccessAdaptiveRunMapper {
     result.localEnvironment = dto.local_environment;
     result.backwardMode = dto.backward_mode;
     result.startTime = new Date(dto.start_time);
-    result.isStepperDisplayed = dto.show_stepper_bar;
     result.isLevelAnswered = dto.phase_answered;
     result.currentLevel = PhaseMapper.fromDTO(dto.current_phase);
     result.levels = PhaseMapper.fromBasicDTOs(dto.info_about_phases);