Skip to content

Commit 19581eb

Browse files
AhsanKhan7AhsanKhan7
committed
Merge branch 'dev' into ahsan/feat/auth-screens
2 parents 9c5b18a + 84b3823 commit 19581eb

File tree

9 files changed

+108
-63
lines changed

9 files changed

+108
-63
lines changed

‎.github/workflows/release.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Release-pipeline
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
tags:
7+
- "v*"
8+
9+
jobs:
10+
release:
11+
name: Release
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout Repository
15+
uses: actions/checkout@v2
16+
with:
17+
fetch-depth: 0
18+
- uses: actions/setup-node@v3
19+
with:
20+
node-version: 14.20.0
21+
- name: Install yarn
22+
run: npm install --global yarn
23+
- name: Build
24+
run: |
25+
yarn install
26+
yarn build
27+
env:
28+
REACT_APP_BASE_API_URL: "/api/v1"
29+
REACT_APP_MOCKAPI_RESPONSE: false
30+
31+
- name: Get the version from the github tag ref
32+
id: get_version
33+
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
34+
35+
- name: Generate Changelog
36+
uses: heinrichreimer/[email protected]
37+
with:
38+
token: ${{ secrets.GITHUB_TOKEN }}
39+
pullRequests: "false"
40+
onlyLastTag: "true"
41+
stripGeneratorNotice: "true"
42+
issuesWoLabels: "true"
43+
stripHeaders: "true"
44+
- name: Release to GitHub
45+
uses: softprops/action-gh-release@v1
46+
with:
47+
files: ./build/*
48+
body_path: ./CHANGELOG.md
49+
prerelease: "true"
50+
env:
51+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎src/api/organizations/getInviteByCodeApi.ts‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { fetchApiWithAuthRequest } from '../fetchApi';
22
import { endpoints } from '../endpoints';
33
import { httpMethods } from '../constants';
44
import { apiUrl } from '../apiUrl';
5-
import mockApi from '../mockApiData';
5+
// import mockApi from '../mockApiData';
66

77
const getInviteByCodeApi = ({
88
username,
@@ -15,13 +15,6 @@ const getInviteByCodeApi = ({
1515
url: apiUrl(endpoints.organizations.reGenerateToken(username)),
1616
method: httpMethods.put,
1717
authenticationToken,
18-
}).catch((res) => {
19-
if (process.env.REACT_APP_MOCKAPI_RESPONSE) {
20-
res = {
21-
data: mockApi.myOrganizationMockResponse.myOrganizationInviteMockResponse,
22-
};
23-
}
24-
return res;
2518
});
2619

2720
export default getInviteByCodeApi;

‎src/routes/routePaths.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,36 @@ export const routePaths = {
1818
base: (id: TId, pipelineId: TId): string =>
1919
`/pipelines/${pipelineId}/runs/${id}`,
2020
statistics: (id: TId, pipelineId: TId): string =>
21-
`/pipelines/${pipelineId}/runs/${id}/statistics`,
21+
`/pipelines/${pipelineId}/runs/${id}/dag`,
2222
results: (id: TId, pipelineId: TId): string =>
23-
`/pipelines/${pipelineId}/runs/${id}/results`,
23+
`/pipelines/${pipelineId}/runs/${id}/configuration`,
2424
tensorboard: (id: TId, pipelineId: TId): string =>
2525
`/pipelines/${pipelineId}/runs/${id}/tensorboard`,
2626
},
2727
stack: {
2828
base: (id: TId, pipelineId: TId): string =>
2929
`/stacks/${pipelineId}/runs/${id}`,
3030
statistics: (id: TId, stackId: TId): string =>
31-
`/stacks/${stackId}/runs/${id}/statistics`,
31+
`/stacks/${stackId}/runs/${id}/dag`,
3232
results: (id: TId, pipelineId: TId): string =>
33-
`/stacks/${pipelineId}/runs/${id}/results`,
33+
`/stacks/${pipelineId}/runs/${id}/configuration`,
3434
tensorboard: (id: TId, pipelineId: TId): string =>
3535
`/stacks/${pipelineId}/runs/${id}/tensorboard`,
3636
},
3737
component: {
3838
base: (id: TId, pipelineId: TId): string =>
3939
`/components/${pipelineId}/runs/${id}`,
4040
statistics: (type: string, id: TId, pipelineId: TId): string =>
41-
`/components/${type}/runs/${id}/statistics`,
41+
`/components/${type}/runs/${id}/dag`,
4242
results: (id: TId, pipelineId: TId): string =>
4343
`/components/${pipelineId}/runs/${id}/results`,
4444
tensorboard: (id: TId, pipelineId: TId): string =>
4545
`/components/${pipelineId}/runs/${id}/tensorboard`,
4646
},
4747
run: {
4848
base: (runId: TId): string => `/runs/${runId}`,
49-
statistics: (id: TId, type?: string): string => `/runs/${id}/statistics`,
50-
results: (runId: TId): string => `/runs/${runId}/results`,
49+
statistics: (id: TId, type?: string): string => `/runs/${id}/dag`,
50+
results: (runId: TId): string => `/runs/${runId}/configuration`,
5151
tensorboard: (runId: TId): string => `/runs/${runId}/tensorboard`,
5252
},
5353
},

‎src/ui/layouts/pipelines/RunDetail/index.tsx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ import { translate } from './translate';
55
import { BasePage } from '../BasePage';
66
import { useService } from './useService';
77

8-
import styles from './index.module.scss';
9-
import { Box, FlexBox, icons, Paragraph, Truncate } from '../../../components';
10-
import { iconColors, iconSizes, ID_MAX_LENGTH } from '../../../../constants';
11-
import { RunTime } from '../RunTime';
12-
import { KeyValue, RunStatus } from './components';
8+
// import styles from './index.module.scss';
9+
// import { Box, FlexBox, icons, Paragraph, Truncate } from '../../../components';
10+
// import { iconColors, iconSizes, ID_MAX_LENGTH } from '../../../../constants';
11+
// import { RunTime } from '../RunTime';
12+
// import { KeyValue, RunStatus } from './components';
1313
// import { Results } from './Results';
1414
// import { Statistics } from './Statistics';
1515
// import { Tensorboard } from './Tensorboard';
16-
import { formatMoney } from '../../../../utils/money';
17-
import { truncate } from '../../../../utils';
16+
// import { formatMoney } from '../../../../utils/money';
17+
// import { truncate } from '../../../../utils';
1818

1919
const getTabPages = ({
2020
pipelineId,
@@ -86,8 +86,8 @@ export interface RunDetailRouteParams {
8686
}
8787

8888
export const RunDetail: React.FC = () => {
89-
const { runId, pipelineId, run, billing } = useService();
90-
89+
// const { runId, pipelineId, run, billing } = useService();
90+
const { runId, pipelineId } = useService();
9191
const tabPages = getTabPages({
9292
runId,
9393
pipelineId,
@@ -103,7 +103,7 @@ export const RunDetail: React.FC = () => {
103103
tabBasePath={routePaths.run.pipeline.base(runId, pipelineId)}
104104
breadcrumbs={breadcrumbs}
105105
>
106-
<FlexBox marginTop="xxl" padding="lg" className={styles.box}>
106+
{/* <FlexBox marginTop="xxl" padding="lg" className={styles.box}>
107107
<KeyValue width="10%" label={translate('box.runId.text')}>
108108
<Truncate maxLines={1}>
109109
<Paragraph size="small">
@@ -155,7 +155,7 @@ export const RunDetail: React.FC = () => {
155155
</Paragraph>
156156
</Truncate>
157157
</KeyValue>
158-
</FlexBox>
158+
</FlexBox> */}
159159
</BasePage>
160160
);
161161
};

‎src/ui/layouts/runs/RunDetail/index.tsx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import React from 'react';
22

33
import { routePaths } from '../../../../routes/routePaths';
4-
import { translate } from './translate';
4+
// import { translate } from './translate';
55
import { BasePage } from '../BasePage';
66
import { useService } from './useService';
77

8-
import styles from './index.module.scss';
9-
import { Box, FlexBox, icons, Paragraph, Truncate } from '../../../components';
10-
import { iconColors, iconSizes, ID_MAX_LENGTH } from '../../../../constants';
11-
import { RunTime } from '../RunTime';
12-
import { KeyValue, RunStatus } from './components';
8+
// import styles from './index.module.scss';
9+
// import { Box, FlexBox, icons, Paragraph, Truncate } from '../../../components';
10+
// import { iconColors, iconSizes, ID_MAX_LENGTH } from '../../../../constants';
11+
// import { RunTime } from '../RunTime';
12+
// import { KeyValue, RunStatus } from './components';
1313
// import { Results } from './Results';
1414
// import { Statistics } from './Statistics';
1515
// import { Tensorboard } from './Tensorboard';
16-
import { formatMoney } from '../../../../utils/money';
17-
import { truncate } from '../../../../utils';
16+
// import { formatMoney } from '../../../../utils/money';
17+
// import { truncate } from '../../../../utils';
1818

1919
const getTabPages = ({ runId }: { runId: TId }): TabPage[] => {
2020
return [
@@ -60,8 +60,8 @@ export interface RunDetailRouteParams {
6060
}
6161

6262
export const RunDetail: React.FC = () => {
63-
const { runId, run, billing } = useService();
64-
63+
// const { runId, run, billing } = useService();
64+
const { runId } = useService();
6565
const tabPages = getTabPages({
6666
runId,
6767
});
@@ -75,7 +75,7 @@ export const RunDetail: React.FC = () => {
7575
tabBasePath={routePaths.run.run.base(runId)}
7676
breadcrumbs={breadcrumbs}
7777
>
78-
<FlexBox marginTop="xxl" padding="lg" className={styles.box}>
78+
{/* <FlexBox marginTop="xxl" padding="lg" className={styles.box}>
7979
<KeyValue width="10%" label={translate('box.runId.text')}>
8080
<Truncate maxLines={1}>
8181
<Paragraph size="small">
@@ -127,7 +127,7 @@ export const RunDetail: React.FC = () => {
127127
</Paragraph>
128128
</Truncate>
129129
</KeyValue>
130-
</FlexBox>
130+
</FlexBox> */}
131131
</BasePage>
132132
);
133133
};

‎src/ui/layouts/session/Login/Form.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const Form: React.FC = () => {
2525
login();
2626
};
2727

28-
const BUTTON_DISABLED = username.trim() === '' || password.trim() === '';
28+
const BUTTON_DISABLED = username.trim() === '';
2929

3030
useEnterKeyPress(() => {
3131
if (!BUTTON_DISABLED) login();

‎src/ui/layouts/session/Login/useService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const useService = (): ServiceInterface => {
3434
login: () => {
3535
setLoading(true);
3636
setHasSubmittedWithErrors(true);
37-
if (username.trim() !== '' && password.trim() !== '') {
37+
if (username.trim() !== '') {
3838
dispatch(
3939
loginAction({
4040
password,

‎src/ui/layouts/stackComponents/RunDetail/index.tsx‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import React from 'react';
22

33
import { routePaths } from '../../../../routes/routePaths';
4-
import { translate } from './translate';
4+
// import { translate } from './translate';
55
import { BasePage } from '../BasePage';
66
import { useService } from './useService';
77

8-
import styles from './index.module.scss';
9-
import { Box, FlexBox, icons, Paragraph, Truncate } from '../../../components';
10-
import { iconColors, iconSizes, ID_MAX_LENGTH } from '../../../../constants';
11-
import { RunTime } from '../RunTime';
12-
import { KeyValue, RunStatus } from './components';
8+
// import styles from './index.module.scss';
9+
// import { Box, FlexBox, icons, Paragraph, Truncate } from '../../../components';
10+
// import { iconColors, iconSizes, ID_MAX_LENGTH } from '../../../../constants';
11+
// import { RunTime } from '../RunTime';
12+
// import { KeyValue, RunStatus } from './components';
1313
// import { Results } from './Results';
1414
// import { Statistics } from './Statistics';
1515
// import { Tensorboard } from './Tensorboard';
16-
import { formatMoney } from '../../../../utils/money';
17-
import { truncate } from '../../../../utils';
16+
// import { formatMoney } from '../../../../utils/money';
17+
// import { truncate } from '../../../../utils';
1818

1919
const getTabPages = ({
2020
stackId,
@@ -71,7 +71,8 @@ export interface RunDetailRouteParams {
7171
}
7272

7373
export const RunDetail: React.FC = () => {
74-
const { runId, stackId, run, billing } = useService();
74+
const { runId, stackId } = useService();
75+
// const { runId, stackId, run, billing } = useService();
7576
// debugger;
7677
const tabPages = getTabPages({
7778
runId,
@@ -88,7 +89,7 @@ export const RunDetail: React.FC = () => {
8889
tabBasePath={routePaths.run.pipeline.base(runId, stackId)}
8990
breadcrumbs={breadcrumbs}
9091
>
91-
<FlexBox marginTop="xxl" padding="lg" className={styles.box}>
92+
{/* <FlexBox marginTop="xxl" padding="lg" className={styles.box}>
9293
<KeyValue width="10%" label={translate('box.runId.text')}>
9394
<Truncate maxLines={1}>
9495
<Paragraph size="small">
@@ -140,7 +141,7 @@ export const RunDetail: React.FC = () => {
140141
</Paragraph>
141142
</Truncate>
142143
</KeyValue>
143-
</FlexBox>
144+
</FlexBox> */}
144145
</BasePage>
145146
);
146147
};

‎src/ui/layouts/stacks/RunDetail/index.tsx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import React from 'react';
22

33
import { routePaths } from '../../../../routes/routePaths';
4-
import { translate } from './translate';
4+
// import { translate } from './translate';
55
import { BasePage } from '../BasePage';
66
import { useService } from './useService';
77

8-
import styles from './index.module.scss';
9-
import { Box, FlexBox, icons, Paragraph, Truncate } from '../../../components';
10-
import { iconColors, iconSizes, ID_MAX_LENGTH } from '../../../../constants';
11-
import { RunTime } from '../RunTime';
12-
import { KeyValue, RunStatus } from './components';
8+
// import styles from './index.module.scss';
9+
// import { Box, FlexBox, icons, Paragraph, Truncate } from '../../../components';
10+
// import { iconColors, iconSizes, ID_MAX_LENGTH } from '../../../../constants';
11+
// import { RunTime } from '../RunTime';
12+
// import { KeyValue, RunStatus } from './components';
1313
// import { Results } from './Results';
1414
// import { Statistics } from './Statistics';
1515
// import { Tensorboard } from './Tensorboard';
16-
import { formatMoney } from '../../../../utils/money';
17-
import { truncate } from '../../../../utils';
16+
// import { formatMoney } from '../../../../utils/money';
17+
// import { truncate } from '../../../../utils';
1818

1919
const getTabPages = ({
2020
stackId,
@@ -76,8 +76,8 @@ export interface RunDetailRouteParams {
7676
}
7777

7878
export const RunDetail: React.FC = () => {
79-
const { runId, stackId, run, billing } = useService();
80-
79+
const { runId, stackId } = useService();
80+
// const { runId, stackId, run, billing } = useService();
8181
const tabPages = getTabPages({
8282
runId,
8383
stackId,
@@ -93,7 +93,7 @@ export const RunDetail: React.FC = () => {
9393
tabBasePath={routePaths.run.stack.base(runId, stackId)}
9494
breadcrumbs={breadcrumbs}
9595
>
96-
<FlexBox marginTop="xxl" padding="lg" className={styles.box}>
96+
{/* <FlexBox marginTop="xxl" padding="lg" className={styles.box}>
9797
<KeyValue width="10%" label={translate('box.runId.text')}>
9898
<Truncate maxLines={1}>
9999
<Paragraph size="small">
@@ -145,7 +145,7 @@ export const RunDetail: React.FC = () => {
145145
</Paragraph>
146146
</Truncate>
147147
</KeyValue>
148-
</FlexBox>
148+
</FlexBox> */}
149149
</BasePage>
150150
);
151151
};

0 commit comments

Comments
 (0)