-
Notifications
You must be signed in to change notification settings - Fork 57
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Digital Twins page preview - trigger pipeline from client #891
Closed
VanessaScherma
wants to merge
76
commits into
INTO-CPS-Association:feature/distributed-demo
from
VanessaScherma:gitlab
Closed
Changes from 65 commits
Commits
Show all changes
76 commits
Select commit
Hold shift + click to select a range
5c78206
configuration changes
VanessaScherma 2d2b717
pre-commit-configuration
VanessaScherma 3d6fb92
Merge branch 'INTO-CPS-Association:feature/distributed-demo' into fea…
VanessaScherma a3ff550
Merge branch 'INTO-CPS-Association:feature/distributed-demo' into fea…
VanessaScherma 4a9740b
class DigitalTwin added
e7f2964
configuration changes
6beacfa
Merge branch 'INTO-CPS-Association:feature/distributed-demo' into fea…
VanessaScherma 663cc3d
Update gitlab.ts and gitlab.test.ts
VanessaScherma c35450d
Eslint fixes
VanessaScherma 4f8e74a
gitlab class updated
VanessaScherma f0f1160
Add DigitalTwinSubfolders
VanessaScherma 8536453
Fix
VanessaScherma a86a47b
Add GitlabDriver and divide GitlabInstance and GitlabDigitalTwin
VanessaScherma 56b412e
Change imports
VanessaScherma c8dc464
Adds config for managing gitlab code of client
prasadtalasila 8d20c28
Adds instructions for running gitlab code of client
prasadtalasila f61ea59
Merge branch 'INTO-CPS-Association:feature/distributed-demo' into fea…
VanessaScherma 3f35520
Merge branch 'pr-830' of https://github.com/VanessaScherma/DTaaS into…
VanessaScherma 7806eef
Comments resolved
VanessaScherma ea3fd03
Refactor
VanessaScherma 41cd332
Refactor
VanessaScherma cb8c5e8
Temporary update
VanessaScherma 3a70879
Merge branch 'feature/distributed-demo' of https://github.com/Vanessa…
VanessaScherma d54bbb8
Change GitlabInstance constructor parameters
VanessaScherma 19b893f
Digital Twins page preview completed
VanessaScherma 6bc73f9
Merge branch 'feature/distributed-demo' of https://github.com/Vanessa…
VanessaScherma a3a3b68
Code review fixes
VanessaScherma 751a2e2
Convert DTContent into class
VanessaScherma d4d5b14
Add class for DigitalTwinsPreview
VanessaScherma 809cdc8
Add documentation to DEVELOPER.md
VanessaScherma 52a5f21
Use Asset components (graphical adaptation)
VanessaScherma b6b1f01
Add GITLAB-RUNNER.md
VanessaScherma da096ac
Remove unused import
VanessaScherma 5095cc1
Update gitlab-runner instructions
VanessaScherma af9009b
Use asset components
VanessaScherma 2effdf1
Use asset components
VanessaScherma ed9ecee
Little fix
VanessaScherma 7a07d77
Update gitlab-runner instructions
VanessaScherma 579f7db
Fix codeclimate issues
VanessaScherma 51bfd6d
Fix codeclimate issues
VanessaScherma b75d586
Temporary update
VanessaScherma ede2311
Digital Twins page preview completed
VanessaScherma c0561f5
Code review fixes
VanessaScherma b755928
Convert DTContent into class
VanessaScherma bcf6030
Add class for DigitalTwinsPreview
VanessaScherma 6fe33c2
Add documentation to DEVELOPER.md
VanessaScherma c2e3d60
Use Asset components (graphical adaptation)
VanessaScherma 41bf25f
Add GITLAB-RUNNER.md
VanessaScherma 5f38a79
Update gitlab-runner instructions
VanessaScherma 22ce9ae
Use asset components
VanessaScherma 3b9fc76
Little fix
VanessaScherma 46c4c6a
Update gitlab-runner instructions
VanessaScherma f952324
Fix codeclimate issues
VanessaScherma 4fc5a05
Fix codeclimate issues
VanessaScherma aa2f607
Update
VanessaScherma 98037b0
Merge branch 'gitlab' of https://github.com/VanessaScherma/DTaaS into…
VanessaScherma 58cca12
Temporary update
VanessaScherma 15bdaf6
Digital Twins page preview completed
VanessaScherma 0809a1c
Code review fixes
VanessaScherma 60cd817
Convert DTContent into class
VanessaScherma 84f8901
Add class for DigitalTwinsPreview
VanessaScherma 7535eb4
Add documentation to DEVELOPER.md
VanessaScherma fe2563b
Use Asset components (graphical adaptation)
VanessaScherma 06176f6
Use asset components
VanessaScherma 2f7ce42
Merge branch 'gitlab' of https://github.com/VanessaScherma/DTaaS into…
VanessaScherma 2f65511
Temporary update
VanessaScherma d1f1b87
Digital Twins page preview completed
VanessaScherma 5168797
Code review fixes
VanessaScherma 488ca46
Convert DTContent into class
VanessaScherma f044b6c
Add class for DigitalTwinsPreview
VanessaScherma a518099
Add documentation to DEVELOPER.md
VanessaScherma 99b4ff3
Use Asset components (graphical adaptation)
VanessaScherma e80192c
Use asset components
VanessaScherma 33c9351
Merge branch 'gitlab' of https://github.com/VanessaScherma/DTaaS into…
VanessaScherma 5a1eae8
use redux to store digital twin
VanessaScherma 94614ec
Fix codeclimate issues
VanessaScherma File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
VanessaScherma marked this conversation as resolved.
Show resolved
Hide resolved
|
||
"username": "user1", | ||
"host": "https://maestro.cps.digit.au.dk/gitlab", | ||
"oauth_token": "" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. please add only the asset components needed for your PR. For example, AddButton component is not required for now. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import * as React from 'react'; | ||
import { Button } from '@mui/material'; | ||
import { Asset } from './Asset'; | ||
import useCart from '../../store/CartAccess'; | ||
|
||
function AddButton(asset: Asset) { | ||
const { state, actions } = useCart(); | ||
return ( | ||
<Button | ||
variant="contained" | ||
fullWidth | ||
disabled={ | ||
!!state.assets.find((a: { path: string }) => a.path === asset.path) | ||
} | ||
size="small" | ||
color="primary" | ||
onClick={() => { | ||
actions.add(asset); | ||
}} | ||
> | ||
Select | ||
</Button> | ||
); | ||
} | ||
|
||
export default AddButton; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
export interface Asset { | ||
name: string; | ||
description?: string; | ||
path: string; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
import * as React from 'react'; | ||
import { Grid } from '@mui/material'; | ||
import { GitlabInstance } from 'util/gitlab'; | ||
import { Asset } from './Asset'; | ||
import AssetCardExecute from './AssetCard'; | ||
|
||
const outerGridContainerProps = { | ||
container: true, | ||
spacing: 2, | ||
sx: { | ||
justifyContent: 'flex-start', | ||
overflow: 'auto', | ||
maxHeight: 'inherent', | ||
marginTop: 2, | ||
}, | ||
}; | ||
|
||
|
||
/** | ||
* Displays a board with navigational properties to locate and select assets for DT configuration. | ||
* @param props Takes relative path to Assets. E.g `Functions` for function assets. | ||
* @returns | ||
*/ | ||
function AssetBoard(props: { subfolders: Asset[], gitlabInstance: GitlabInstance, error: string | null }) { | ||
|
||
if (props.error) { | ||
return ( | ||
<em style={{ textAlign: 'center' }}>{props.error}</em> | ||
); | ||
} | ||
|
||
return ( | ||
<Grid {...outerGridContainerProps}> | ||
{props.subfolders.map((asset) => ( | ||
<Grid key={asset.path} item xs={12} sm={6} md={4} lg={3} sx={{ minWidth: 250 }}> | ||
<AssetCardExecute asset={asset} /> | ||
</Grid> | ||
))} | ||
</Grid> | ||
) | ||
} | ||
|
||
export default AssetBoard; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please rebase the PR