Merge remote-tracking branch 'upstream/master'

# Conflicts: # templates/validation.yml

Merge remote-tracking branch 'upstream/master'
2f4602ad · Benguria Elguezabal, Gorka · 02c7a57d · 08f5093b · 02c7a57d · 2f4602ad
Commit 2f4602ad authored 4 months ago by Benguria Elguezabal, Gorka
--- a/kicker-screen.png
+++ b/kicker-screen.png
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
        "@angular/platform-browser": "18.1.0",
        "@angular/platform-browser-dynamic": "18.1.0",
        "@angular/router": "18.1.0",
-        "@ng-bootstrap/ng-bootstrap": "17.0.0",
+        "@ng-bootstrap/ng-bootstrap": "17.0.1",
        "boosted": "5.3.3",
        "marked": "^12.0.0",
        "ng-process-env": "^16.0.6",
@@ -28,12 +28,12 @@
    },
    "devDependencies": {
        "@angular/build": "^18.1.0",
-        "@angular/cli": "18.1.3",
+        "@angular/cli": "18.2.11",
        "@angular/compiler-cli": "18.1.0",
        "@angular/language-service": "18.1.0",
-        "@biomejs/biome": "1.8.3",
+        "@biomejs/biome": "1.9.4",
        "@playwright/test": "^1.45.2",
-        "@types/node": "20.14.13",
+        "@types/node": "22.10.6",
        "ts-node": "10.9.2",
        "typescript": "^5.4.5"
    }

--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -41,6 +41,6 @@

 <footer class="footer navbar-dark bg-dark mt-4 py-2">
  <div class="container">
-    <span class="text-muted">© Orange 2019</span>
+    <!-- <span class="text-muted">© copyright here</span> -->
  </div>
 </footer>
--- a/src/app/gitlab-ci/gitlab-ci.component.css
+++ b/src/app/gitlab-ci/gitlab-ci.component.css
@@ -28,6 +28,7 @@ div {
 pre {
  color: inherit;
  margin: 0;
+  font-size: .875rem;
 }
 .comment {
  font-style: italic;

--- a/src/app/gitlab-ci/gitlab-ci.component.html
+++ b/src/app/gitlab-ci/gitlab-ci.component.html
@@ -216,7 +216,7 @@
            <pre class="comment">
  # {{ template.name }} template ({{ variant.name }} variant)</pre
            >
-            <pre>  - <span class="key">component</span>: "<span class="value">{{ serverHost }}/{{ variant.project.path }}/{{ variant.templateFile }}&#64;{{ variant.project.getLatestVersion(options.versionMode) }}</span>"</pre>
+            <pre>  - <span class="key">component</span>: "<span class="value">$CI_SERVER_FQDN/{{ variant.project.path }}/{{ variant.templateFile }}&#64;{{ variant.project.getLatestVersion(options.versionMode) }}</span>"</pre>
            <div [class.hide]="!hasInputs(variant)">
              <pre>    <span class="key">inputs</span>:</pre>
              <div class="elements">

--- a/src/app/stepbar/stepbar.component.css
+++ b/src/app/stepbar/stepbar.component.css
@@ -83,3 +83,12 @@
  z-index: 1;
 }

+.stepped-process-item.active {
+  background-color: #ea7070 !important;
+}
+.stepped-process-item.active a {
+  color: #ffffff !important;
+}
+.stepped-process-item a {
+  text-decoration: none;
+}
--- a/src/app/variable-editor/variable-editor.component.css
+++ b/src/app/variable-editor/variable-editor.component.css
@@ -25,7 +25,7 @@ input:invalid {
 }
 .form-group.advanced>.col-form-label::after {
  content: "ADV.";
-  color: #f16e00;
+  color: #ea7070;
  font-weight: normal;
  position: relative;
  top: -0.5em;

--- a/src/assets/img/tbc-50.png
+++ b/src/assets/img/tbc-50.png
--- a/src/assets/kicker-aggregated.json
+++ b/src/assets/kicker-aggregated.json
--- a/src/index.html
+++ b/src/index.html
@@ -12,7 +12,7 @@
  <link rel="icon" type="image/x-icon" href="favicon.ico">

  <!-- Font Awesome -->
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css">

 </head>
 <body>

--- a/src/styles.css
+++ b/src/styles.css
@@ -9,6 +9,8 @@ html, body {
 :root {
  /* force no copyrighted font */
  --font-family-sans-serif: Helvetica,Arial,sans-serif;
+  --primary-color: #ea7070;
+  --text-color: #ea7070;
 }

 /* use all available width up to 1320px */
@@ -44,7 +46,7 @@ markdown p {
  border-color: #000 !important;
 }
 .btn-group-toggle>.btn-secondary:hover {
-  color: #f16e00;
+  color: #ea7070;
  background-color: #fff;
  border-color: #ccc;
 }
@@ -175,3 +177,39 @@ markdown p {
 .hide {
  display: none !important;
 }
+.nav-link:hover {
+  color: #ea7070 !important; 
+}
+.navbar-nav .nav-link.active {
+  color: #ea7070 !important; 
+}
+.btn-toggle:hover {
+  color: #ea7070 !important; 
+}
+.btn-toggle:active {
+  color: #fff !important; 
+  background-color: #ea7070 !important; 
+  border-color: #ea7070 !important; 
+}
+.form-check-input:checked {
+  background-color: #ea7070 !important; 
+  border-color: #ea7070 !important;   
+}
+.form-check-input:active {
+  background-color: #ea7070 !important; 
+  border-color: #ea7070 !important;   
+}
+.title:hover {
+  color: #ea7070 !important;   
+}
+.title {
+  color: #fff !important;   
+}
+a:hover {
+  color: #ea7070 !important;   
+}
+.btn-secondary:active {
+  color: #fff !important; 
+  background-color: #ea7070 !important; 
+  border-color: #ea7070 !important; 
+}
--- a/templates/validation.yml
+++ b/templates/validation.yml
@@ -11,7 +11,7 @@ spec:
    yajsv-image:
      description: image to use for validation jobs
      type: string
-      default: cicd-docker-dev.artifact.tecnalia.com/yajsv:latest
+      default: cicd-docker-dev.artifact.tecnalia.dev/yajsv:latest

 ---

@@ -46,6 +46,16 @@ variables:
    fi
  }

+  function install_yajsv() {
+    export PATH=$PATH:$(pwd)
+    if ! command -v yajsv > /dev/null
+    then
+      log_info "Installing yajsv"
+      curl -sSL -o ./yajsv "${YAJSV_RELEASE}"
+      chmod +x ./yajsv
+    fi
+  }
+
 # Abstract JSON schema validation job
 # $JSON_FILE  : the JSON file to test
 # $SCHEMA_URL : the schema url
@@ -55,9 +65,14 @@ variables:
  before_script:
    - !reference [.kicker-scripts]
    - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"
+    - install_yajsv
  script:
-    - 'wget --header "PRIVATE-TOKEN: $GITLAB_TOKEN" "$SCHEMA_URL" -O schema.json'
+    - 'curl -sSL -o schema.json -H "PRIVATE-TOKEN: $GITLAB_TOKEN" "$SCHEMA_URL"'
    - yajsv -s schema.json "$JSON_FILE"
+  cache:
+    key: "$CI_COMMIT_REF_NAME-yajsv"
+    paths:
+      - ./yajsv
  rules:
    # enabled if kicker.json file found
    - exists: