fix: remove image name with scheme

kubesphere · Feb 4, 2020 · c58c7af · c58c7af
1 parent 70a944b
commit c58c7af
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/components/Forms/Secret/SecretSettings/index.jsx b/src/components/Forms/Secret/SecretSettings/index.jsx
@@ -186,7 +186,7 @@ export default class SecretSettings extends React.Component {
           <Column>
             <Form.Item
               label={t('Registry Address')}
-              desc={t("Needn't Protocol. ex: docker.io")}
+              desc={t('Example: docker.io')}
               rules={[
                 { required: true, message: t('Please input registry address') },
                 { validator: this.dataValidator },

diff --git a/...Workload/ContainerSettings/ContainerForm/ContainerSetting/ImageSearch/DropdownContent.jsx b/...Workload/ContainerSettings/ContainerForm/ContainerSetting/ImageSearch/DropdownContent.jsx
@@ -56,8 +56,11 @@ export default class DropdownContent extends React.Component {
       const selectedSecret = imageRegistries.find(
         item => item.value === this.secretValue
       )
-      const url = get(selectedSecret, 'url', '')
+
+      let url = get(selectedSecret, 'url', '')
       if (url) {
+        // remove url scheme
+        url = url.replace(/^(http(s)?:\/\/)?(.*)$/, '$3')
         return url
       }
     }

diff --git a/src/locales/zh/secret.js b/src/locales/zh/secret.js
@@ -37,6 +37,7 @@ export default {
 
   SECRET_NO_CHINESE_CODE_DESC: '密钥中不能包含中文字符',
 
+  'Registry Address': '仓库地址',
   'Registry verify failed': '镜像仓库校验失败',
   'Account Password Secret': '账号密码密钥',
 
@@ -47,5 +48,5 @@ export default {
 
   'DATA-KEY': '键(Key)',
   'DATA-VALUE': '值(Value)',
-  "Needn't Protocol. ex: docker.io": '不用添加协议名称, 例：docker.io',
+  'Example: docker.io': '例：docker.io',
 }