From 925d51f6d6c6ce71ad05bf0e5fe58564e6b4c621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janis=20Da=CC=88hne?= <janis.daehne@informatik.uni-halle.de>
Date: Mon, 6 Mar 2023 14:48:07 +0100
Subject: [PATCH] - compile commands now also send template file ids (to
override hidden files)
---
src/components/sites/doExerciseSite/headerBarContent.tsx | 3 ++-
.../sites/editCustomProjectSite/headerBarContent.tsx | 5 +++--
src/components/sites/tutorViewSite/headerBarContent.tsx | 6 ++++--
src/constants.ts | 2 +-
src/types/testsAndTestProtocol.ts | 6 ++++++
5 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/components/sites/doExerciseSite/headerBarContent.tsx b/src/components/sites/doExerciseSite/headerBarContent.tsx
index aea99bd9..ba88145f 100644
--- a/src/components/sites/doExerciseSite/headerBarContent.tsx
+++ b/src/components/sites/doExerciseSite/headerBarContent.tsx
@@ -375,7 +375,8 @@ class HeaderBar extends React.Component<Props, any> {
files: allFiles.map<SolutionFileForTestServer>(p => {
return {
fileName: p.fileNameWithExtension,
- fileContent: p.content
+ fileContent: p.content,
+ templateFileId: p.templateFileId,
}
})
}
diff --git a/src/components/sites/editCustomProjectSite/headerBarContent.tsx b/src/components/sites/editCustomProjectSite/headerBarContent.tsx
index aac924b2..524a58c2 100644
--- a/src/components/sites/editCustomProjectSite/headerBarContent.tsx
+++ b/src/components/sites/editCustomProjectSite/headerBarContent.tsx
@@ -279,7 +279,8 @@ class HeaderBar extends React.Component<Props, any> {
files: allFiles.map<SolutionFileForTestServer>((p: CustomProjectSolutionFileFullBase) => {
return {
fileName: p.fileNameWithExtension,
- fileContent: p.content
+ fileContent: p.content,
+ templateFileId: null,
}
})
}
@@ -397,4 +398,4 @@ class HeaderBar extends React.Component<Props, any> {
}
}
-export default connect(mapStateToProps, mapDispatchToProps)(HeaderBar)
\ No newline at end of file
+export default connect(mapStateToProps, mapDispatchToProps)(HeaderBar)
diff --git a/src/components/sites/tutorViewSite/headerBarContent.tsx b/src/components/sites/tutorViewSite/headerBarContent.tsx
index bbb85efa..ba8da3da 100644
--- a/src/components/sites/tutorViewSite/headerBarContent.tsx
+++ b/src/components/sites/tutorViewSite/headerBarContent.tsx
@@ -372,7 +372,8 @@ class HeaderBar extends React.Component<Props, any> {
files: allFiles.map<SolutionFileForTestServer>(p => {
return {
fileName: p.fileNameWithExtension,
- fileContent: p.content
+ fileContent: p.content,
+ templateFileId: p.templateFileId,
}
})
}
@@ -430,7 +431,8 @@ class HeaderBar extends React.Component<Props, any> {
files: allFiles.map<SolutionFileForTestServer>(p => {
return {
fileName: p.fileNameWithExtension,
- fileContent: p.content
+ fileContent: p.content,
+ templateFileId: p.templateFileId,
}
})
}
diff --git a/src/constants.ts b/src/constants.ts
index cb692e07..720524cf 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -13,7 +13,7 @@ import Logger from './helpers/logger'
* y - breaking changes / new features
* z - fixes, small changes
*/
-export const versionString = '2.18.2'
+export const versionString = '2.18.3'
export const supportMail = 'yapex@informatik.uni-halle.de'
diff --git a/src/types/testsAndTestProtocol.ts b/src/types/testsAndTestProtocol.ts
index a4405326..1a127799 100644
--- a/src/types/testsAndTestProtocol.ts
+++ b/src/types/testsAndTestProtocol.ts
@@ -419,6 +419,12 @@ export interface SolutionFileForTestServer {
* the file content
*/
readonly fileContent: string
+
+ /**
+ * null or the template file id from which the file was created
+ * might be needed if the solution has some hidden files
+ */
+ readonly templateFileId: number | null
}
/**
--
GitLab