Browse Source

fix: 代码配置30202改为30203

pull/226/head
cp3hnu 8 months ago
parent
commit
b4d99f8e5c
4 changed files with 30 additions and 6 deletions
  1. +2
    -3
      react-ui/src/components/ResourceSelectorModal/config.tsx
  2. +1
    -1
      react-ui/src/pages/HyperParameter/components/HyperParameterBasic/index.tsx
  3. +8
    -2
      react-ui/src/utils/index.ts
  4. +19
    -0
      react-ui/tests/getGitUrl.tesx.ts

+ 2
- 3
react-ui/src/components/ResourceSelectorModal/config.tsx View File

@@ -1,7 +1,7 @@
import datasetImg from '@/assets/img/modal-select-dataset.png'; import datasetImg from '@/assets/img/modal-select-dataset.png';
import mirrorImg from '@/assets/img/modal-select-mirror.png'; import mirrorImg from '@/assets/img/modal-select-mirror.png';
import modelImg from '@/assets/img/modal-select-model.png'; import modelImg from '@/assets/img/modal-select-model.png';
import { AvailableRange, CommonTabKeys } from '@/enums';
import { AvailableRange, CommonTabKeys, MirrorVersionStatus } from '@/enums';
import { ResourceData, ResourceVersionData } from '@/pages/Dataset/config'; import { ResourceData, ResourceVersionData } from '@/pages/Dataset/config';
import { MirrorVersionData } from '@/pages/Mirror/Info'; import { MirrorVersionData } from '@/pages/Mirror/Info';
import { MirrorData } from '@/pages/Mirror/List'; import { MirrorData } from '@/pages/Mirror/List';
@@ -224,8 +224,7 @@ export class MirrorSelector implements SelectorTypeInfo {
image_id: parentKey, image_id: parentKey,
page: 0, page: 0,
size: 2000, size: 2000,
status: 'available',
state: 1,
status: MirrorVersionStatus.Available,
}); });
if (res && res.data) { if (res && res.data) {
const list = res.data.content || []; const list = res.data.content || [];


+ 1
- 1
react-ui/src/pages/HyperParameter/components/HyperParameterBasic/index.tsx View File

@@ -80,7 +80,7 @@ function HyperParameterBasic({
} }
return [ return [
{ {
label: '代码',
label: '代码配置',
value: info.code_config, value: info.code_config,
format: formatCodeConfig, format: formatCodeConfig,
}, },


+ 8
- 2
react-ui/src/utils/index.ts View File

@@ -278,8 +278,14 @@ export const getGitUrl = (url: string, branch: string): string => {
if (!url) { if (!url) {
return ''; return '';
} }
const gitUrl = url.replace(/\.git$/, '');
return branch ? `${gitUrl}/tree/${branch}` : gitUrl;
let gitUrlStr = url.replace(/\.git$/, '');
const gitUrl = new URL(gitUrlStr);
if (gitUrl.port === '30202') {
gitUrl.port = '30203'; // 30202 该为 30203
}
gitUrlStr = gitUrl.href;

return branch ? `${gitUrlStr.toString()}/tree/${branch}` : gitUrlStr;
}; };


/** /**


+ 19
- 0
react-ui/tests/getGitUrl.tesx.ts View File

@@ -0,0 +1,19 @@
import { getGitUrl } from '../src/utils';

describe('canBeConvertToDate()', () => {
test('empty string', () => {
expect(getGitUrl('', '')).toBe('');
});

test('url domain with branch', () => {
expect(
getGitUrl('https://gitlink.org.cn/somunslotus/material-atom-predict.git', 'master'),
).toBe('https://gitlink.org.cn/somunslotus/material-atom-predict/tree/master');
});

test('url domain without branch', () => {
expect(getGitUrl('https://gitlink.org.cn/somunslotus/material-atom-predict.git', '')).toBe(
'https://gitlink.org.cn/somunslotus/material-atom-predict.git',
);
});
});

Loading…
Cancel
Save