Skip to content
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
Changes from 1 commit
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
5c78206
configuration changes
VanessaScherma May 2, 2024
2d2b717
pre-commit-configuration
VanessaScherma May 2, 2024
3d6fb92
Merge branch 'INTO-CPS-Association:feature/distributed-demo' into fea…
VanessaScherma Jun 11, 2024
a3ff550
Merge branch 'INTO-CPS-Association:feature/distributed-demo' into fea…
VanessaScherma Jun 20, 2024
4a9740b
class DigitalTwin added
Jun 20, 2024
e7f2964
configuration changes
Jun 20, 2024
6beacfa
Merge branch 'INTO-CPS-Association:feature/distributed-demo' into fea…
VanessaScherma Jul 30, 2024
663cc3d
Update gitlab.ts and gitlab.test.ts
VanessaScherma Jul 30, 2024
c35450d
Eslint fixes
VanessaScherma Jul 30, 2024
4f8e74a
gitlab class updated
VanessaScherma Aug 1, 2024
f0f1160
Add DigitalTwinSubfolders
VanessaScherma Aug 1, 2024
8536453
Fix
VanessaScherma Aug 1, 2024
a86a47b
Add GitlabDriver and divide GitlabInstance and GitlabDigitalTwin
VanessaScherma Aug 2, 2024
56b412e
Change imports
VanessaScherma Aug 7, 2024
c8dc464
Adds config for managing gitlab code of client
prasadtalasila Aug 16, 2024
8d20c28
Adds instructions for running gitlab code of client
prasadtalasila Aug 16, 2024
f61ea59
Merge branch 'INTO-CPS-Association:feature/distributed-demo' into fea…
VanessaScherma Aug 16, 2024
3f35520
Merge branch 'pr-830' of https://github.com/VanessaScherma/DTaaS into…
VanessaScherma Aug 16, 2024
7806eef
Comments resolved
VanessaScherma Aug 17, 2024
ea3fd03
Refactor
VanessaScherma Aug 18, 2024
41cd332
Refactor
VanessaScherma Aug 18, 2024
cb8c5e8
Temporary update
VanessaScherma Aug 18, 2024
3a70879
Merge branch 'feature/distributed-demo' of https://github.com/Vanessa…
VanessaScherma Aug 18, 2024
d54bbb8
Change GitlabInstance constructor parameters
VanessaScherma Aug 23, 2024
19b893f
Digital Twins page preview completed
VanessaScherma Aug 26, 2024
6bc73f9
Merge branch 'feature/distributed-demo' of https://github.com/Vanessa…
VanessaScherma Aug 30, 2024
a3a3b68
Code review fixes
VanessaScherma Aug 30, 2024
751a2e2
Convert DTContent into class
VanessaScherma Sep 1, 2024
d4d5b14
Add class for DigitalTwinsPreview
VanessaScherma Sep 1, 2024
809cdc8
Add documentation to DEVELOPER.md
VanessaScherma Sep 2, 2024
52a5f21
Use Asset components (graphical adaptation)
VanessaScherma Sep 3, 2024
b6b1f01
Add GITLAB-RUNNER.md
VanessaScherma Sep 4, 2024
da096ac
Remove unused import
VanessaScherma Sep 4, 2024
5095cc1
Update gitlab-runner instructions
VanessaScherma Sep 4, 2024
af9009b
Use asset components
VanessaScherma Sep 5, 2024
2effdf1
Use asset components
VanessaScherma Sep 5, 2024
ed9ecee
Little fix
VanessaScherma Sep 5, 2024
7a07d77
Update gitlab-runner instructions
VanessaScherma Sep 5, 2024
579f7db
Fix codeclimate issues
VanessaScherma Sep 5, 2024
51bfd6d
Fix codeclimate issues
VanessaScherma Sep 5, 2024
b75d586
Temporary update
VanessaScherma Aug 18, 2024
ede2311
Digital Twins page preview completed
VanessaScherma Aug 26, 2024
c0561f5
Code review fixes
VanessaScherma Aug 30, 2024
b755928
Convert DTContent into class
VanessaScherma Sep 1, 2024
bcf6030
Add class for DigitalTwinsPreview
VanessaScherma Sep 1, 2024
6fe33c2
Add documentation to DEVELOPER.md
VanessaScherma Sep 2, 2024
c2e3d60
Use Asset components (graphical adaptation)
VanessaScherma Sep 3, 2024
41bf25f
Add GITLAB-RUNNER.md
VanessaScherma Sep 4, 2024
5f38a79
Update gitlab-runner instructions
VanessaScherma Sep 4, 2024
22ce9ae
Use asset components
VanessaScherma Sep 5, 2024
3b9fc76
Little fix
VanessaScherma Sep 5, 2024
46c4c6a
Update gitlab-runner instructions
VanessaScherma Sep 5, 2024
f952324
Fix codeclimate issues
VanessaScherma Sep 5, 2024
4fc5a05
Fix codeclimate issues
VanessaScherma Sep 5, 2024
aa2f607
Update
VanessaScherma Sep 5, 2024
98037b0
Merge branch 'gitlab' of https://github.com/VanessaScherma/DTaaS into…
VanessaScherma Sep 5, 2024
58cca12
Temporary update
VanessaScherma Aug 18, 2024
15bdaf6
Digital Twins page preview completed
VanessaScherma Aug 26, 2024
0809a1c
Code review fixes
VanessaScherma Aug 30, 2024
60cd817
Convert DTContent into class
VanessaScherma Sep 1, 2024
84f8901
Add class for DigitalTwinsPreview
VanessaScherma Sep 1, 2024
7535eb4
Add documentation to DEVELOPER.md
VanessaScherma Sep 2, 2024
fe2563b
Use Asset components (graphical adaptation)
VanessaScherma Sep 3, 2024
06176f6
Use asset components
VanessaScherma Sep 5, 2024
2f7ce42
Merge branch 'gitlab' of https://github.com/VanessaScherma/DTaaS into…
VanessaScherma Sep 5, 2024
2f65511
Temporary update
VanessaScherma Aug 18, 2024
d1f1b87
Digital Twins page preview completed
VanessaScherma Aug 26, 2024
5168797
Code review fixes
VanessaScherma Aug 30, 2024
488ca46
Convert DTContent into class
VanessaScherma Sep 1, 2024
f044b6c
Add class for DigitalTwinsPreview
VanessaScherma Sep 1, 2024
a518099
Add documentation to DEVELOPER.md
VanessaScherma Sep 2, 2024
99b4ff3
Use Asset components (graphical adaptation)
VanessaScherma Sep 3, 2024
e80192c
Use asset components
VanessaScherma Sep 5, 2024
33c9351
Merge branch 'gitlab' of https://github.com/VanessaScherma/DTaaS into…
VanessaScherma Sep 5, 2024
5a1eae8
use redux to store digital twin
VanessaScherma Sep 5, 2024
94614ec
Fix codeclimate issues
VanessaScherma Sep 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Little fix
VanessaScherma committed Sep 5, 2024
commit 3b9fc7695f47facee9f6afcfdb382baaa0e01fb0
2 changes: 1 addition & 1 deletion client/config/gitlab.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
VanessaScherma marked this conversation as resolved.
Show resolved Hide resolved
"username": "user1",
"host": "https://maestro.cps.digit.au.dk/gitlab",
"oauth_token": "glpat-xyaBAhsD6h4L5SukfG6Q"
"oauth_token": ""
}
2 changes: 1 addition & 1 deletion client/src/components/asset/AssetBoard.tsx
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ if (props.error) {

return (
<Grid {...outerGridContainerProps}>
{props.subfolders.map((asset, index) => (
{props.subfolders.map((asset) => (
<Grid key={asset.path} item xs={12} sm={6} md={4} lg={3} sx={{ minWidth: 250 }}>
<AssetCardExecute asset={asset} />
</Grid>
1 change: 0 additions & 1 deletion client/src/components/asset/AssetCard.tsx
Original file line number Diff line number Diff line change
@@ -147,7 +147,6 @@ function AssetCardExecute({ asset }: AssetCardExecuteProps) {
sessionStorage.getItem('access_token') || '',
);
gitlabInstance.init();
console.log(gitlabInstance);
setDigitalTwin(new DigitalTwin(asset.name, gitlabInstance));
}, []);

2 changes: 0 additions & 2 deletions client/src/route/digitaltwins/ExecutionFunctions.ts
Original file line number Diff line number Diff line change
@@ -155,13 +155,11 @@ export const checkSecondPipelineStatus = async (
gitlabInstance.projectId!,
pipelineId,
);
console.log(jobs);
const logPromises = jobs.map(async (job) => {
let log = await gitlabInstance.getJobTrace(
gitlabInstance.projectId!,
job.id,
);
console.log('Log in fetchJobLogs:', log);
if (typeof log === 'string') {
log = stripAnsi(log)
.split('\n')
8 changes: 0 additions & 8 deletions client/src/route/digitaltwins/GitlabService.ts
Original file line number Diff line number Diff line change
@@ -26,14 +26,6 @@ class GitlabService {
}
return [];
} catch (error) {
if (error instanceof Error && error.message.includes('NetworkError')) {
console.log(
'Error: There is no ‘DTaaS’ group associated with your account.',
error,
);
return 'There is no ‘DTaaS’ group associated with your GitLab account.';
}
console.error('An error occurred:', error);
return 'An error occurred';
}
}