Skip to content

Commit

Permalink
Add scanner_skip_update_pulltime property for system setting (#18214)
Browse files Browse the repository at this point in the history
1. Related backend PR #17807

Signed-off-by: AllForNothing <sshijun@vmware.com>
  • Loading branch information
AllForNothing committed Feb 22, 2023
1 parent 4141d77 commit c5640ac
Show file tree
Hide file tree
Showing 11 changed files with 63 additions and 11 deletions.
2 changes: 2 additions & 0 deletions src/portal/src/app/base/left-side-nav/config/config.ts
Expand Up @@ -113,6 +113,7 @@ export class Configuration {
audit_log_forward_endpoint: StringValueItem;
skip_audit_log_database: BoolValueItem;
session_timeout: NumberValueItem;
scanner_skip_update_pulltime: BoolValueItem;
public constructor() {
this.auth_mode = new StringValueItem('db_auth', true);
this.primary_auth_mode = new BoolValueItem(false, true);
Expand Down Expand Up @@ -188,6 +189,7 @@ export class Configuration {
this.audit_log_forward_endpoint = new StringValueItem('', true);
this.skip_audit_log_database = new BoolValueItem(false, true);
this.session_timeout = new NumberValueItem(60, true);
this.scanner_skip_update_pulltime = new BoolValueItem(false, true);
}
}

Expand Down
Expand Up @@ -194,7 +194,7 @@
>
</div>
</div>
<clr-checkbox-container>
<clr-checkbox-container class="center">
<label id="repo_read_only_lbl" for="repoReadOnly"
>{{ 'CONFIG.REPO_READ_ONLY' | translate }}
<clr-tooltip>
Expand Down Expand Up @@ -252,6 +252,39 @@
[disabled]="!currentConfig.notification_enable.editable" />
</clr-checkbox-wrapper>
</clr-checkbox-container>
<clr-checkbox-container class="center">
<label for="scannerSkipUpdatePullTime"
>{{ 'CONFIG.SKIP_SCANNER_PULL_TIME' | translate }}
<clr-tooltip>
<clr-icon
clrTooltipTrigger
shape="info-circle"
size="24"></clr-icon>
<clr-tooltip-content
clrPosition="top-right"
clrSize="lg"
*clrIfOpen>
<span>{{
'CONFIG.TOOLTIP.SKIP_SCANNER_PULL_TIME_TOOLTIP'
| translate
}}</span>
</clr-tooltip-content>
</clr-tooltip>
</label>
<clr-checkbox-wrapper>
<input
type="checkbox"
clrCheckbox
name="scannerSkipUpdatePullTime"
id="scannerSkipUpdatePullTime"
[(ngModel)]="
currentConfig.scanner_skip_update_pulltime.value
"
[disabled]="
!currentConfig.scanner_skip_update_pulltime.editable
" />
</clr-checkbox-wrapper>
</clr-checkbox-container>
<clr-input-container>
<label for="auditLogForwardEndpoint">
{{ 'CLEARANCES.FORWARD_ENDPOINT' | translate }}
Expand Down
Expand Up @@ -95,7 +95,8 @@ export class SystemSettingsComponent implements OnInit {
prop === 'robot_name_prefix' ||
prop === 'audit_log_forward_endpoint' ||
prop === 'skip_audit_log_database' ||
prop === 'session_timeout'
prop === 'session_timeout' ||
prop === 'scanner_skip_update_pulltime'
) {
changes[prop] = allChanges[prop];
}
Expand Down
4 changes: 3 additions & 1 deletion src/portal/src/i18n/lang/de-de-lang.json
Expand Up @@ -830,6 +830,7 @@
"ROOT_CERT_LINK": "Download",
"REGISTRY_CERTIFICATE": "Registry Zertifikat",
"NO_CHANGE": "Speichern abgebrochen, da nichts verändert wurde",
"SKIP_SCANNER_PULL_TIME": "Skip to update pull time for scanner",
"TOOLTIP": {
"SELF_REGISTRATION_ENABLE": "Registrierung erlaubt. Nutzer können im Anmeldedialog selbstständig Accounts anlegen. Haken entfernen um Selbst-Registrierung zu verbieten.",
"SELF_REGISTRATION_DISABLE": "Registrierung verboten. Haken setzen um Selbst-Registrierung zu erlauben.",
Expand All @@ -851,7 +852,8 @@
"WEBHOOK_TOOLTIP": "Webhooks aktivieren, um Callbacks zu erhalten, wenn bestimmte Aktionen wie Image push, pull, delete, scan o.Ä. durchgeführt werden.",
"HOURLY_CRON": "Läuft einmal am Anfang jeder Stunde. Identisch zu 0 0 * * * *.",
"WEEKLY_CRON": "Läuft wöchentlich um Mitternacht zwischen Sa/So. Identisch zu 0 0 0 * * 0.",
"DAILY_CRON": "Läuft täglich um Mitternacht. Identisch zu 0 0 0 * * *."
"DAILY_CRON": "Läuft täglich um Mitternacht. Identisch zu 0 0 0 * * *.",
"SKIP_SCANNER_PULL_TIME_TOOLTIP": "Skip to update pull time when pulling image from scanner."
},
"LDAP": {
"URL": "LDAP URL",
Expand Down
4 changes: 3 additions & 1 deletion src/portal/src/i18n/lang/en-us-lang.json
Expand Up @@ -830,6 +830,7 @@
"ROOT_CERT_LINK": "Download",
"REGISTRY_CERTIFICATE": "Registry certificate",
"NO_CHANGE": "Save abort because nothing changed",
"SKIP_SCANNER_PULL_TIME": "Skip to update pull time for scanner",
"TOOLTIP": {
"SELF_REGISTRATION_ENABLE": "Enable sign up.",
"SELF_REGISTRATION_DISABLE": "Deactivate sign up.",
Expand All @@ -851,7 +852,8 @@
"WEBHOOK_TOOLTIP": "Enable webhooks to receive callbacks at your designated endpoints when certain actions such as image or chart being pushed, pulled, deleted, scanned are performed",
"HOURLY_CRON": "Run once an hour, beginning of hour. Equivalent to 0 0 * * * *.",
"WEEKLY_CRON": "Run once a week, midnight between Sat/Sun. Equivalent to 0 0 0 * * 0.",
"DAILY_CRON": "Run once a day, midnight. Equivalent to 0 0 0 * * *."
"DAILY_CRON": "Run once a day, midnight. Equivalent to 0 0 0 * * *.",
"SKIP_SCANNER_PULL_TIME_TOOLTIP": "Skip to update pull time when pulling image from scanner."
},
"LDAP": {
"URL": "LDAP URL",
Expand Down
4 changes: 3 additions & 1 deletion src/portal/src/i18n/lang/es-es-lang.json
Expand Up @@ -831,6 +831,7 @@
"ROOT_CERT_LINK": "Descargar",
"REGISTRY_CERTIFICATE": "Certificado de registro",
"NO_CHANGE": "Save abort because nothing changed",
"SKIP_SCANNER_PULL_TIME": "Skip to update pull time for scanner",
"TOOLTIP": {
"SELF_REGISTRATION_ENABLE": "Activar registro.",
"SELF_REGISTRATION_DISABLE": "Disable sign up.",
Expand All @@ -852,7 +853,8 @@
"WEBHOOK_TOOLTIP": "Enable webhooks to receive callbacks at your designated endpoints when certain actions such as image or chart being pushed, pulled, deleted, scanned are performed",
"HOURLY_CRON": "Run once an hour, beginning of hour. Equivalente a 0 0 * * * *.",
"WEEKLY_CRON": "Run once a week, midnight between Sat/Sun. Equivalente a 0 0 0 * * 0.",
"DAILY_CRON": "Run once a day, midnight. Equivalente a 0 0 0 * * *."
"DAILY_CRON": "Run once a day, midnight. Equivalente a 0 0 0 * * *.",
"SKIP_SCANNER_PULL_TIME_TOOLTIP": "Skip to update pull time when pulling image from scanner."

},
"LDAP": {
Expand Down
4 changes: 3 additions & 1 deletion src/portal/src/i18n/lang/fr-fr-lang.json
Expand Up @@ -812,6 +812,7 @@
"GC": "Garbage Collection",
"REGISTRY_CERTIFICATE": "Certificat du registre",
"NO_CHANGE": "Enregistrement abandonné, rien n'a changé",
"SKIP_SCANNER_PULL_TIME": "Skip to update pull time for scanner",
"TOOLTIP": {
"SELF_REGISTRATION_ENABLE": "Activer l'inscription.",
"SELF_REGISTRATION_DISABLE": "Désactiver l'inscription.",
Expand All @@ -832,7 +833,8 @@
"WEBHOOK_TOOLTIP": "Activez les webhooks pour recevoir des callbacks à vos endpoint désignés lorsque certaines actions telles que l'image ou le chart est poussé, tiré, supprimé, scanné sont effectuées",
"HOURLY_CRON": "Exécuter une fois par heure, au début de l'heure. Équivalent à 0 0 * * * *.",
"WEEKLY_CRON": "Exécuter une fois par semaine, à minuit entre Sam. et Dim. Équivalent à 0 0 0 * * 0.",
"DAILY_CRON": "Exécuter une fois par jour, à minuit. Équivalent à 0 0 0 * * *."
"DAILY_CRON": "Exécuter une fois par jour, à minuit. Équivalent à 0 0 0 * * *.",
"SKIP_SCANNER_PULL_TIME_TOOLTIP": "Skip to update pull time when pulling image from scanner."
},
"LDAP": {
"URL": "URL LDAP",
Expand Down
4 changes: 3 additions & 1 deletion src/portal/src/i18n/lang/pt-br-lang.json
Expand Up @@ -828,6 +828,7 @@
"ROOT_CERT_LINK": "Download",
"REGISTRY_CERTIFICATE": "Certificado do Repositório",
"NO_CHANGE": "Sem alterações para salvar.",
"SKIP_SCANNER_PULL_TIME": "Skip to update pull time for scanner",
"TOOLTIP": {
"SELF_REGISTRATION_ENABLE": "Habilitar cadastro de usuários.",
"SELF_REGISTRATION_DISABLE": "Desabilitar cadastro de usuários.",
Expand All @@ -849,7 +850,8 @@
"WEBHOOK_TOOLTIP": "Habilite webhooks para enviar notificações a pontos de serviços remotos quando determinados eventos ocorrerem, como pull, push, análise de imagens, etc.",
"HOURLY_CRON": "Excutar toda hora, no início de cada hora. Equivalente a 0 0 * * * *.",
"WEEKLY_CRON": "Executar uma vez por semana, à meia noite de sábado para domingo. Equivalente a 0 0 0 * * 0.",
"DAILY_CRON": "Executar todos os dias à meia-noite. Equivalente a 0 0 0 * * *."
"DAILY_CRON": "Executar todos os dias à meia-noite. Equivalente a 0 0 0 * * *.",
"SKIP_SCANNER_PULL_TIME_TOOLTIP": "Skip to update pull time when pulling image from scanner."
},
"LDAP": {
"URL": "URL LDAP",
Expand Down
4 changes: 3 additions & 1 deletion src/portal/src/i18n/lang/tr-tr-lang.json
Expand Up @@ -830,6 +830,7 @@
"ROOT_CERT_LINK": "Yükle",
"REGISTRY_CERTIFICATE": "Kayıt defteri sertifikası",
"NO_CHANGE": "İptal et, çünkü hiçbir şey değişmedi",
"SKIP_SCANNER_PULL_TIME": "Skip to update pull time for scanner",
"TOOLTIP": {
"SELF_REGISTRATION_ENABLE": "Kaydolmayı etkinleştir.",
"SELF_REGISTRATION_DISABLE": "Kaydolmayı devre dışı bırak.",
Expand All @@ -851,7 +852,8 @@
"WEBHOOK_TOOLTIP": "Görüntü veya grafik olarak basılan, çekilmiş, silinen, taranan gibi bazı eylemler gerçekleştirildiğinde ağ kancalarının belirtilen bitiş noktalarınızdan geri aramalar almasını sağlayın",
"HOURLY_CRON": "Saat başı bir saat, saat başı çalıştırın. Eşittir 0 0 * * * *.",
"WEEKLY_CRON": "Haftada bir kez, gece yarısı Cmt / Paz arasında koşun. Eşittir 0 0 0 * * 0.",
"DAILY_CRON": "Günde bir kez, gece yarısı çalıştırın. Eşittir0 0 0 * * *."
"DAILY_CRON": "Günde bir kez, gece yarısı çalıştırın. Eşittir0 0 0 * * *.",
"SKIP_SCANNER_PULL_TIME_TOOLTIP": "Skip to update pull time when pulling image from scanner."
},
"LDAP": {
"URL": "LDAP URL",
Expand Down
6 changes: 4 additions & 2 deletions src/portal/src/i18n/lang/zh-cn-lang.json
Expand Up @@ -831,7 +831,8 @@
"ROOT_CERT": "镜像库根证书",
"ROOT_CERT_LINK": "下载",
"REGISTRY_CERTIFICATE": "注册证书",
"NO_CHANGE": "Save abort because nothing changed",
"NO_CHANGE": "保存中止,因为没有变化",
"SKIP_SCANNER_PULL_TIME": "跳过扫描器对于拉取时间的更新",
"TOOLTIP": {
"SELF_REGISTRATION_ENABLE": "激活注册功能。",
"SELF_REGISTRATION_DISABLE": "禁用注册功能。",
Expand All @@ -853,7 +854,8 @@
"WEBHOOK_TOOLTIP": "当执行推送,拉动,删除,扫描镜像或 chart 等特定操作时,启用 webhooks 以在指定端点接收回调",
"HOURLY_CRON": "每小时运行一次。相当于 0 0 * * * *",
"WEEKLY_CRON": "每周一次,周六/周日午夜之间开始。相当于 0 0 0 * * 0",
"DAILY_CRON": "每天午夜运行一次。相当于 0 0 0 * * *"
"DAILY_CRON": "每天午夜运行一次。相当于 0 0 0 * * *",
"SKIP_SCANNER_PULL_TIME_TOOLTIP": "当镜像是由扫描器拉取时,不更新该镜像的拉取时间属性。"
},
"LDAP": {
"URL": "LDAP URL",
Expand Down
4 changes: 3 additions & 1 deletion src/portal/src/i18n/lang/zh-tw-lang.json
Expand Up @@ -827,6 +827,7 @@
"ROOT_CERT_LINK": "下載",
"REGISTRY_CERTIFICATE": "註冊證書",
"NO_CHANGE":"保存中止,因為沒有改變",
"SKIP_SCANNER_PULL_TIME": "Skip to update pull time for scanner",
"TOOLTIP":{
"SELF_REGISTRATION_ENABLE": "激活註冊功能。",
"SELF_REGISTRATION_DISABLE": "禁用註冊功能。",
Expand All @@ -848,7 +849,8 @@
"WEBHOOK_TOOLTIP": "當執行推送,拉動,刪除,掃描鏡像或chart 等特定操作時,啟用webhooks 以在指定端點接收回調",
"HOURLY_CRON": "每小時運行一次。相當於 0 0 * * * *",
"WEEKLY_CRON": "每週一次,週六/週日午夜之間開始。相當於 0 0 0 * * 0",
"DAILY_CRON": "每天午夜運行一次。相當於 0 0 0 * * *"
"DAILY_CRON": "每天午夜運行一次。相當於 0 0 0 * * *",
"SKIP_SCANNER_PULL_TIME_TOOLTIP": "Skip to update pull time when pulling image from scanner."
},
"LDAP":{
"URL":"LDAP URL",
Expand Down

0 comments on commit c5640ac

Please sign in to comment.