Skip to content

Commit a397404

Browse files
talhainvenxiontalhainvenxion
committed
Merge branch 'dev' into filter-fixes
2 parents 5ea0e1f + 59e17da commit a397404

File tree

11 files changed

+107
-50
lines changed

11 files changed

+107
-50
lines changed

‎src/services/locales/zu.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@
306306
"text": "Stacks"
307307
},
308308
"stackComponents": {
309-
"text": "Stack Components"
309+
"text": "Components"
310310
},
311311
"setting": {
312312
"text": "Settings"

‎src/ui/components/icons/assets/Stack.svg‎

Lines changed: 3 additions & 2 deletions
Loading

‎src/ui/components/icons/assets/StackComponent.svg‎

Lines changed: 2 additions & 3 deletions
Loading

‎src/ui/components/icons/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import { ReactComponent as Docs } from './assets/Docs.svg';
3535
import { ReactComponent as Example } from './assets/Example.svg';
3636
import { ReactComponent as Pipeline } from './assets/Pipeline.svg';
3737
import { ReactComponent as Stack } from './assets/Stack.svg';
38-
// import { ReactComponent as StackComponent } from './assets/StackComponent.svg';
38+
import { ReactComponent as StackComponent } from './assets/StackComponent.svg';
3939
import { ReactComponent as FunnelFill } from './assets/FunnelFill.svg';
4040
import { ReactComponent as Delete } from './assets/Delete.svg';
4141
import { ReactComponent as SimplePlus } from './assets/SimplePlus.svg';
@@ -46,7 +46,7 @@ import { ReactComponent as Edit } from './assets/Edit.svg';
4646
import { ReactComponent as Search } from './assets/Search.svg';
4747

4848
//icons for stackComponents
49-
import { ReactComponent as PuzzlePiece } from './assets/PuzzlePiece.svg';
49+
// import { ReactComponent as PuzzlePiece } from './assets/PuzzlePiece.svg';
5050
import { ReactComponent as Folders } from './assets/Folders.svg';
5151
import { ReactComponent as BoundingBox } from './assets/BoundingBox.svg';
5252
import { ReactComponent as CloudArrowUp } from './assets/CloudArrowUp.svg';
@@ -165,7 +165,7 @@ const icons = {
165165
example: createIcon({ Component: Example, useStroke: true }),
166166
pipeline: createIcon({ Component: Pipeline, useStroke: true }),
167167
stack: createIcon({ Component: Stack, useStroke: true }),
168-
stackComponent: createIcon({ Component: PuzzlePiece, useStroke: true }),
168+
stackComponent: createIcon({ Component: StackComponent, useStroke: true }),
169169
funnelFill: createIcon({ Component: FunnelFill }),
170170
delete: createIcon({ Component: Delete }),
171171
edit: createIcon({ Component: Edit }),

‎src/ui/layouts/DashBoard.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ import {
4141
import {
4242
showToasterAction,
4343
projectsActions,
44-
pipelinesActions,
44+
// pipelinesActions,
4545
pipelinePagesActions,
4646
runPagesActions,
4747
organizationActions,
4848
} from '../../redux/actions';
4949
import { NotFound } from './NotFound';
5050

51-
import Tour from './Tour';
51+
// import Tour from './Tour';
5252
import { rolesActions } from '../../redux/actions/roles';
5353

5454
export const translate = getTranslateByScope('ui.layouts.Dashboard');
@@ -224,7 +224,7 @@ export const DashBoard: React.FC = () => {
224224
return (
225225
<AuthenticatedLayout>
226226
<SidebarContainer>
227-
<Tour />
227+
{/* <Tour /> */}
228228
<EaseInBox>
229229
<Box marginTop="5xl" marginLeft="xl">
230230
<Row style={{ alignItems: 'center' }}>

‎src/ui/layouts/common/layouts/AuthenticatedLayout/AuthenticatedHeader.module.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
}
99

1010
.selectedProject {
11+
font-family: 'Rubik';
1112
font-size: 10px;
1213
font-weight: 400;
1314
line-height: 12px;
15+
color: #424240;
1416
}
1517

1618
$activeBgColor: #fbfbfb;

‎src/ui/layouts/common/layouts/AuthenticatedLayout/AuthenticatedHeader.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import {
3939
import { routePaths } from '../../../../../routes/routePaths';
4040
import { ProjectPopup } from './ProjectPopup';
4141
import ReactTooltip from 'react-tooltip';
42-
import { CookiePopup } from './CookiePopup'
42+
// import { CookiePopup } from './CookiePopup'
4343

4444
// import { endpoints } from '../../../../../api/endpoints';
4545

@@ -53,7 +53,7 @@ export const AuthenticatedHeader: React.FC<{
5353
const history = useHistory();
5454
const [popupOpen, setPopupOpen] = useState<boolean>(false);
5555
const [createPopupOpen, setCreatePopupOpen] = useState<boolean>(false);
56-
const [showCookiePopup, setShowCookiePopup] = useState<any>(localStorage.getItem('showCookie'));
56+
// const [showCookiePopup, setShowCookiePopup] = useState<any>(localStorage.getItem('showCookie'));
5757

5858
const dispatch = useDispatch();
5959
const { push } = usePushRoute();
@@ -275,7 +275,7 @@ export const AuthenticatedHeader: React.FC<{
275275
</If>
276276
</FlexBox>
277277

278-
{showCookiePopup !== 'false' && <CookiePopup setShowCookie={setShowCookiePopup} />}
278+
{/* {showCookiePopup !== 'false' && <CookiePopup setShowCookie={setShowCookiePopup} />} */}
279279
</>
280280
);
281281
};

‎src/ui/layouts/common/layouts/AuthenticatedLayout/AuthenticatedSidebar/index.module.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
$bgColor: rgba(201, 203, 208, 0.2);
44

55
.sidebar {
6-
// width: 5.31rem !important;
7-
height: 100vh;
6+
width: 7.2rem !important;
7+
height: 100vh;
88
background: linear-gradient(180deg, #433E99 0%, #8F599D 100%);
99
}
1010

‎src/ui/layouts/settings/PersonalDetails.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { EmailPopup } from './EmailPopup';
2323
import { loginAction } from '../../../redux/actions/session/loginAction';
2424
import jwt_decode from 'jwt-decode';
2525

26-
import Tour from './Tour'
26+
// import Tour from './Tour'
2727

2828
export const translate = getTranslateByScope('ui.layouts.PersonalDetails');
2929

@@ -116,7 +116,7 @@ export const PersonalDetails: React.FC = () => {
116116
setPopupOpen={setPopupOpen}
117117
/>
118118
)}
119-
<Tour />
119+
{/* <Tour /> */}
120120
<FlexBox.Column style={{ marginLeft: '40px' }} flex={1}>
121121
<Box marginTop="lg">
122122
<Row>

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

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

33
import { routePaths } from '../../../../routes/routePaths';
4-
import { Box, Paragraph, icons } from '../../../components';
5-
import { iconColors, iconSizes } from '../../../../constants';
6-
import {
7-
camelCaseToParagraph,
8-
formatDateToDisplayOnTable,
9-
} from '../../../../utils';
4+
import { Box } from '../../../components';
5+
// import { iconColors, iconSizes } from '../../../../constants';
6+
import { camelCaseToParagraph } from '../../../../utils';
7+
// import styles from './index.module.scss';
8+
// import cn from 'classnames';
109
import { translate } from './translate';
1110
import { Configuration } from './Configuration';
1211
import { Runs } from './Runs';
@@ -17,6 +16,7 @@ import FilterComponent, {
1716
getInitialFilterStateForRuns,
1817
} from '../../../components/Filters';
1918
import { projectSelectors } from '../../../../redux/selectors';
19+
import { List } from '../Stacks/List';
2020

2121
const FilterWrapperForRun = () => {
2222
const locationPath = useLocationPath();
@@ -119,16 +119,22 @@ export const StackDetail: React.FC = () => {
119119
selectedProject,
120120
);
121121

122-
const boxStyle = {
123-
backgroundColor: '#E9EAEC',
124-
padding: '10px 0',
125-
borderRadius: '8px',
126-
marginTop: '20px',
127-
display: 'flex',
128-
justifyContent: 'space-around',
129-
};
130-
const headStyle = { color: '#828282' };
131-
const paraStyle = { color: '#515151', marginTop: '10px' };
122+
// const boxStyle = {
123+
// backgroundColor: '#E9EAEC',
124+
// padding: '10px 0',
125+
// borderRadius: '8px',
126+
// marginTop: '20px',
127+
// display: 'flex',
128+
// justifyContent: 'space-around',
129+
// };
130+
// const headStyle = { color: '#828282' };
131+
// const paraStyle = { color: '#515151', marginTop: '10px' };
132+
// const data = [
133+
// { name: 'Anom', age: 19, gender: 'Male' },
134+
// { name: 'Megha', age: 19, gender: 'Female' },
135+
// { name: 'Subham', age: 25, gender: 'Male' },
136+
// ];
137+
// const history = useHistory();
132138

133139
return (
134140
<BasePage
@@ -140,7 +146,7 @@ export const StackDetail: React.FC = () => {
140146
)}
141147
breadcrumbs={breadcrumbs}
142148
>
143-
<Box style={boxStyle}>
149+
{/* <Box style={boxStyle}>
144150
<Box>
145151
<Paragraph style={headStyle}>ID</Paragraph>
146152
<Paragraph style={paraStyle}>{stackComponent.id}</Paragraph>
@@ -183,6 +189,36 @@ export const StackDetail: React.FC = () => {
183189
{formatDateToDisplayOnTable(stackComponent.created)}
184190
</Paragraph>
185191
</Box>
192+
</Box> */}
193+
<Box paddingTop={'xl'}>
194+
<List
195+
filter={[]}
196+
pagination={false}
197+
isExpended
198+
id={stackComponent.id}
199+
></List>
200+
{/* <>
201+
<table className={cn(styles.table)}>
202+
<tbody>
203+
<tr className={cn(styles.tableHeader)}>
204+
<th className={cn(styles.tableHeaderText)}>Id</th>
205+
<th className={cn(styles.tableHeaderText)}>Name</th>
206+
<th className={cn(styles.tableHeaderText)}>Flavor</th>
207+
<th className={cn(styles.tableHeaderText)}>Shared</th>
208+
<th className={cn(styles.tableHeaderText)}>Author</th>
209+
<th className={cn(styles.tableHeaderText)}>Created</th>
210+
</tr>
211+
<tr className={cn(styles.tableRow)}>
212+
<td>{stackComponent.id}</td>
213+
<td>{stackComponent.name}</td>
214+
<td>{stackComponent.flavor}</td>
215+
<td>{stackComponent.isShared}</td>
216+
<td>{stackComponent.user.name}</td>
217+
<td> {formatDateToDisplayOnTable(stackComponent.created)}</td>
218+
</tr>
219+
</tbody>
220+
</table>
221+
</> */}
186222
</Box>
187223
</BasePage>
188224
);

0 commit comments

Comments
 (0)