From b0e139fd39bbee1dc3a966da49b8953cab014a53 Mon Sep 17 00:00:00 2001 From: Pierre Smeyers <pierre.smeyers@gmail.com> Date: Wed, 21 Aug 2024 23:54:35 +0200 Subject: [PATCH] feat: make component include default with $CI_SERVER_FQDN --- src/app/gitlab-ci/gitlab-ci.component.html | 6 +++--- src/app/kicker.ts | 2 +- src/assets/kicker-aggregated.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/gitlab-ci/gitlab-ci.component.html b/src/app/gitlab-ci/gitlab-ci.component.html index 2468870..7eb85b2 100644 --- a/src/app/gitlab-ci/gitlab-ci.component.html +++ b/src/app/gitlab-ci/gitlab-ci.component.html @@ -111,8 +111,8 @@ ></i ></label> </div> - <!-- Gitlab instance --> - <div *ngIf="!isProjectMode()" class="input-group input-group-sm ms-4"> + <!-- Gitlab server FQDN --> + <div *ngIf="options.includeMode == includeModes.remote" class="input-group input-group-sm ms-4"> <label class="input-group-text" for="gitlab-host" >GitLab Host <i @@ -180,7 +180,7 @@ </div> </div> <div *ngSwitchCase="includeModes.component"> - <pre> - <span class="key">component</span>: "<span class="value">{{ serverHost }}/{{ template.project.path }}/{{ template.templateFile }}@{{ template.project.getLatestVersion(options.versionMode) }}</span>"</pre> + <pre> - <span class="key">component</span>: "<span class="value">$CI_SERVER_FQDN/{{ template.project.path }}/{{ template.templateFile }}@{{ template.project.getLatestVersion(options.versionMode) }}</span>"</pre> <div [class.hide]="!hasInputs(template)"> <pre> <span class="key">inputs</span>:</pre> <div class="elements"> diff --git a/src/app/kicker.ts b/src/app/kicker.ts index e1d5457..5a0d6a3 100644 --- a/src/app/kicker.ts +++ b/src/app/kicker.ts @@ -453,7 +453,7 @@ export enum VersionMode { export class Options { showAdvanced = false; showStages = false; - includeMode = IncludeMode.project; + includeMode = IncludeMode.component; versionMode = VersionMode.minor; ext2enabled = new Map<string, boolean>(); diff --git a/src/assets/kicker-aggregated.json b/src/assets/kicker-aggregated.json index 25e0a5f..ae911b8 100644 --- a/src/assets/kicker-aggregated.json +++ b/src/assets/kicker-aggregated.json @@ -2029,7 +2029,7 @@ "variables": [ { "name": "DBT_SQLFLUFF_LINT_ARGS", - "description": "Lint [options and arguments](https://docs.sqlfluff.com/en/stable/cli.html#sqlfluff-lint)", + "description": "Lint [options and arguments](https://docs.sqlfluff.com/en/stable/reference/cli.html#sqlfluff-lint)", "advanced": true }, { @@ -8186,7 +8186,7 @@ }, { "name": "SQLFLUFF_LINT_ARGS", - "description": "Lint [options and arguments](https://docs.sqlfluff.com/en/stable/cli.html#sqlfluff-lint)", + "description": "Lint [options and arguments](https://docs.sqlfluff.com/en/stable/reference/cli.html#sqlfluff-lint)", "advanced": true } ], -- GitLab