From f518ca5d3283a997c23d32c5c851939c5af6930d Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Fri, 12 Jul 2024 16:51:40 +0300 Subject: [PATCH 1/4] Add missing user registries UI --- web/components.d.ts | 1 + web/src/assets/locales/en.json | 4 + web/src/components/user/UserRegistriesTab.vue | 115 ++++++++++++++++++ web/src/views/User.vue | 4 + 4 files changed, 124 insertions(+) create mode 100644 web/src/components/user/UserRegistriesTab.vue diff --git a/web/components.d.ts b/web/components.d.ts index 6fab8d9e3a..d63a2bd670 100644 --- a/web/components.d.ts +++ b/web/components.d.ts @@ -116,6 +116,7 @@ declare module 'vue' { TextField: typeof import('./src/components/form/TextField.vue')['default'] UserCLIAndAPITab: typeof import('./src/components/user/UserCLIAndAPITab.vue')['default'] UserGeneralTab: typeof import('./src/components/user/UserGeneralTab.vue')['default'] + UserRegistriesTab: typeof import('./src/components/user/UserRegistriesTab.vue')['default'] UserSecretsTab: typeof import('./src/components/user/UserSecretsTab.vue')['default'] Warning: typeof import('./src/components/atomic/Warning.vue')['default'] } diff --git a/web/src/assets/locales/en.json b/web/src/assets/locales/en.json index d6b9338e8b..9beb4e38e1 100644 --- a/web/src/assets/locales/en.json +++ b/web/src/assets/locales/en.json @@ -388,6 +388,10 @@ "secrets": { "desc": "User secrets can be passed to all user's repository individual pipeline steps at runtime as environmental variables." }, + + "registries": { + "desc": "User registries credentials can be added to use private images for all individual pipelines." + }, "cli_and_api": { "cli_and_api": "CLI & API", "desc": "Personal Access Token, CLI and API usage", diff --git a/web/src/components/user/UserRegistriesTab.vue b/web/src/components/user/UserRegistriesTab.vue new file mode 100644 index 0000000000..0091b62888 --- /dev/null +++ b/web/src/components/user/UserRegistriesTab.vue @@ -0,0 +1,115 @@ + + + diff --git a/web/src/views/User.vue b/web/src/views/User.vue index 93d26b379b..e67fd6dd98 100644 --- a/web/src/views/User.vue +++ b/web/src/views/User.vue @@ -8,6 +8,9 @@ + + + @@ -20,6 +23,7 @@ import Tab from '~/components/layout/scaffold/Tab.vue'; import UserCLIAndAPITab from '~/components/user/UserCLIAndAPITab.vue'; import UserGeneralTab from '~/components/user/UserGeneralTab.vue'; import UserSecretsTab from '~/components/user/UserSecretsTab.vue'; +import UserRegistriesTab from '~/components/user/UserRegistriesTab.vue'; import useConfig from '~/compositions/useConfig'; const address = `${window.location.protocol}//${window.location.host}${useConfig().rootPath}`; // port is included in location.host From 14e0e71a052bfd963816ba776020b483987dafb3 Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Fri, 12 Jul 2024 21:49:08 +0300 Subject: [PATCH 2/4] remove unneeded newline --- web/src/assets/locales/en.json | 1 - 1 file changed, 1 deletion(-) diff --git a/web/src/assets/locales/en.json b/web/src/assets/locales/en.json index 9beb4e38e1..c1538704b2 100644 --- a/web/src/assets/locales/en.json +++ b/web/src/assets/locales/en.json @@ -388,7 +388,6 @@ "secrets": { "desc": "User secrets can be passed to all user's repository individual pipeline steps at runtime as environmental variables." }, - "registries": { "desc": "User registries credentials can be added to use private images for all individual pipelines." }, From 912cd371d4b792ad169e4a3c3fdc93535ed8fc84 Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Fri, 12 Jul 2024 22:31:58 +0300 Subject: [PATCH 3/4] Fix formatting --- web/src/components/user/UserRegistriesTab.vue | 1 - web/src/views/User.vue | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/web/src/components/user/UserRegistriesTab.vue b/web/src/components/user/UserRegistriesTab.vue index 0091b62888..012570e9aa 100644 --- a/web/src/components/user/UserRegistriesTab.vue +++ b/web/src/components/user/UserRegistriesTab.vue @@ -59,7 +59,6 @@ const emptyRegistry: Partial = { password: '', }; - const apiClient = useApiClient(); const notifications = useNotifications(); const i18n = useI18n(); diff --git a/web/src/views/User.vue b/web/src/views/User.vue index e67fd6dd98..db6ba1ff47 100644 --- a/web/src/views/User.vue +++ b/web/src/views/User.vue @@ -22,8 +22,8 @@ import Scaffold from '~/components/layout/scaffold/Scaffold.vue'; import Tab from '~/components/layout/scaffold/Tab.vue'; import UserCLIAndAPITab from '~/components/user/UserCLIAndAPITab.vue'; import UserGeneralTab from '~/components/user/UserGeneralTab.vue'; -import UserSecretsTab from '~/components/user/UserSecretsTab.vue'; import UserRegistriesTab from '~/components/user/UserRegistriesTab.vue'; +import UserSecretsTab from '~/components/user/UserSecretsTab.vue'; import useConfig from '~/compositions/useConfig'; const address = `${window.location.protocol}//${window.location.host}${useConfig().rootPath}`; // port is included in location.host From 5ea832b7c19bbb9bc17e80a46320defaa5cfc1ab Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 13 Jul 2024 05:23:56 +0200 Subject: [PATCH 4/4] build --- web/components.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/components.d.ts b/web/components.d.ts index d63a2bd670..deb27eae3c 100644 --- a/web/components.d.ts +++ b/web/components.d.ts @@ -67,12 +67,12 @@ declare module 'vue' { IMdiPlay: typeof import('~icons/mdi/play')['default'] IMdiRadioboxBlank: typeof import('~icons/mdi/radiobox-blank')['default'] IMdiRadioboxIndeterminateVariant: typeof import('~icons/mdi/radiobox-indeterminate-variant')['default'] - IMdiSync: typeof import('~icons/mdi/sync')['default'] IMdiSourceBranch: typeof import('~icons/mdi/source-branch')['default'] IMdiSourceCommit: typeof import('~icons/mdi/source-commit')['default'] IMdiSourceMerge: typeof import('~icons/mdi/source-merge')['default'] IMdiSourcePull: typeof import('~icons/mdi/source-pull')['default'] IMdiStop: typeof import('~icons/mdi/stop')['default'] + IMdiSync: typeof import('~icons/mdi/sync')['default'] IMdiTagOutline: typeof import('~icons/mdi/tag-outline')['default'] InputField: typeof import('./src/components/form/InputField.vue')['default'] IPhGitlabLogoSimpleFill: typeof import('~icons/ph/gitlab-logo-simple-fill')['default'] @@ -100,8 +100,8 @@ declare module 'vue' { PipelineStepList: typeof import('./src/components/repo/pipeline/PipelineStepList.vue')['default'] Popup: typeof import('./src/components/layout/Popup.vue')['default'] RadioField: typeof import('./src/components/form/RadioField.vue')['default'] - RegistryEdit: typeof import('./src/components/registry/RegistryEdit.vue')['default'] RegistriesTab: typeof import('./src/components/repo/settings/RegistriesTab.vue')['default'] + RegistryEdit: typeof import('./src/components/registry/RegistryEdit.vue')['default'] RegistryList: typeof import('./src/components/registry/RegistryList.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView']