Merged develop

backend/pom.xml

@@ -26,26 +26,32 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-rest</artifactId>
+			<version>2.1.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
+			<version>2.1.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<version>2.1.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
+			<version>2.1.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
+			<version>2.1.2.RELEASE</version>
 		</dependency>
 		<dependency>
-		    	<groupId>org.springframework.boot</groupId>
-		    	<artifactId>spring-boot-starter-mail</artifactId>
+    		<groupId>org.springframework.boot</groupId>
+	    	<artifactId>spring-boot-starter-mail</artifactId>
+	    	<version>2.1.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>

backend/src/main/java/de/btu/swt/backend/version/git_sync/RemoteSynchronizer.java

@@ -47,37 +47,37 @@ private GitUserSettings getGitUserSettings(User user, GitConfiguration newConfig
      * @throws IOException
      * @throws GitException
      */
-    public List<File> cloneSynchronize(User user, GitConfiguration newConfig, Version version) throws IOException, GitException {
+    public List<File> cloneSynchronize(User user, GitConfiguration newConfig, Version version)
+            throws IOException, GitException {
         GitOperations git = new GitOperations(newConfig);
         FileSystemOperations fileSystem = new FileSystemOperations(version);
         EntityOperations entities = new EntityOperations(version, user);
         try {
             fileSystem.createBackup();
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             fileSystem.removeBackup();
             throw e;
         }
         try {
             fileSystem.deleteRemoteFiles();
-            git.clone(version.getRemoteDirectory().toFile().getAbsoluteFile(), getGitUserSettings(user, newConfig, version));
+            git.clone(version.getRemoteDirectory().toFile().getAbsoluteFile(),
+                    getGitUserSettings(user, newConfig, version));
             fileSystem.createNewFilesLink(newConfig);
-            List<File> modifiedFiles = entities.createOrUpdateFileEntities(Arrays.asList(version.getSrcFilesDirectory().toFile().listFiles()));
+            List<File> modifiedFiles = entities
+                    .createOrUpdateFileEntities(Arrays.asList(version.getSrcFilesDirectory().toFile().listFiles()));
             fileSystem.mergeExistingFiles(modifiedFiles);
             fileSystem.removeBackup();
             version.setGitConfiguration(newConfig);
             fileRepository.saveAll(modifiedFiles);
             version = versionRepository.save(version);
             return modifiedFiles;
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             fileSystem.restoreBackup();
             version.setGitConfiguration(null);
             version = versionRepository.save(version);
             fileSystem.deleteRemoteFiles();
             throw e;
-        }
-        finally {
+        } finally {
             fileSystem.removeBackup();
         }
     }
@@ -89,13 +89,13 @@ public List<File> cloneSynchronize(User user, GitConfiguration newConfig, Versio
      * @return List of modified and not deleted files
      * @throws GitException
      */
-    public List<File> pullSynchronize(User user,  Version version) {
+    public List<File> pullSynchronize(User user, Version version) {
         GitConfiguration newConfig = version.getGitConfiguration();
         if (newConfig == null)
             return new LinkedList<>();
         GitOperations git = new GitOperations(newConfig);
         EntityOperations entities = new EntityOperations(version, user);
-        //contains changed, created and deleted files
+        // contains changed, created and deleted files
         String[] changedFiles = git.pull(version.getRemoteDirectory().toFile().getAbsoluteFile());
 
         List<java.io.File> notDeleted = getStorageFiles(changedFiles, version);
@@ -110,9 +110,12 @@ public List<File> pullSynchronize(User user,  Version version) {
         return modifiedFiles;
     }
 
-    public void commitPullAndPushChanges(File[] files, String commitMessage, User user, Version version) throws GitException, IOException {
-//        if (version.getFiles().stream().filter(file -> file.getStatus() == FileStatus.IN_CONFLICT).count() > 0)
-//            throw new GitException("Before you can commit your changes, you have to resolve the merge conflict");
+    public void commitPullAndPushChanges(File[] files, String commitMessage, User user, Version version)
+            throws GitException, IOException {
+        // if (version.getFiles().stream().filter(file -> file.getStatus() ==
+        // FileStatus.IN_CONFLICT).count() > 0)
+        // throw new GitException("Before you can commit your changes, you have to
+        // resolve the merge conflict");
         GitConfiguration newConfig = version.getGitConfiguration();
         EntityOperations entities = new EntityOperations(version, user);
         if (newConfig == null)
@@ -142,7 +145,7 @@ public void commitPullAndPushChanges(File[] files, String commitMessage, User us
 
     private List<java.io.File> getStorageFiles(String[] relFilePaths, Version version) {
         List<java.io.File> result = new LinkedList<>();
-        for(String fileName : relFilePaths) {
+        for (String fileName : relFilePaths) {
             java.io.File file = version.getRemoteDirectory().resolve(fileName).toFile();
             if (file.exists())
                 result.add(file);
@@ -171,28 +174,28 @@ private java.io.File createMarkdownIndex(Version version, GitConfiguration gitCo
         Path indexPath = gitConfig.getPath(version);
         java.io.File index = indexPath.resolve("index.md").toFile();
         index.createNewFile();
-        FileWriter fileWriter = new FileWriter(index);
-        fileWriter.write("| file | raw | generated |\n");
-        fileWriter.write("| ------ | ------ | ------ |\n");
-        for (File file : version.getFiles()) {
-            fileWriter.write("| ");;
-            fileWriter.write(file.getName().replace("_", ""));
-            fileWriter.write(" | ");
-            fileWriter.write("[RAW-Link](");
-            fileWriter.write(indexPath.relativize(file.getPath().toFile().getCanonicalFile().toPath()).toString());
-            fileWriter.write(")");
-            fileWriter.write(" | ");
-            List<String> exports = new LinkedList<>();
-            for (java.io.File export : file.getExports()) {
-                String uri = indexPath.relativize(export.getCanonicalFile().toPath()).toString();
-                String link = getFileExtension(export.getName()).toUpperCase() + "-Link";
-                exports.add("["+link+"]("+uri+")");
+        try (FileWriter fileWriter = new FileWriter(index)) {
+            fileWriter.write("| file | raw | generated |\n");
+            fileWriter.write("| ------ | ------ | ------ |\n");
+            for (File file : version.getFiles()) {
+                fileWriter.write("| ");
+                fileWriter.write(file.getName().replace("_", ""));
+                fileWriter.write(" | ");
+                fileWriter.write("[RAW-Link](");
+                fileWriter.write(indexPath.relativize(file.getPath().toFile().getCanonicalFile().toPath()).toString());
+                fileWriter.write(")");
+                fileWriter.write(" | ");
+                List<String> exports = new LinkedList<>();
+                for (java.io.File export : file.getExports()) {
+                    String uri = indexPath.relativize(export.getCanonicalFile().toPath()).toString();
+                    String link = getFileExtension(export.getName()).toUpperCase() + "-Link";
+                    exports.add("[" + link + "](" + uri + ")");
+                }
+                fileWriter.write(String.join(" &nbsp; ", exports));
+                fileWriter.write(" |\n");
             }
-            fileWriter.write(String.join(" &nbsp; ", exports));
-            fileWriter.write(" |\n");
+            fileWriter.flush();
         }
-        fileWriter.flush();
-        fileWriter.close();
         return index;
     }
 

documentation/modelling/UMLModelling.drawio

@@ -0,0 +1 @@
+<mxfile modified="2019-09-03T13:25:14.870Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/76.0.3809.100 Chrome/76.0.3809.100 Safari/537.36" etag="SOYs3MYIFHv9XSpdQ4Xw" version="11.2.4" type="device" pages="1"><diagram id="AWrdzgOvBNWfOAp6jIh0" name="Page-1">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</diagram></mxfile>

documentation/modelling/UseCase_DRM_Tool.xml

@@ -0,0 +1 @@
+<mxfile modified="2019-01-04T12:45:55.029Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/71.0.3578.80 Chrome/71.0.3578.80 Safari/537.36" etag="a3tKdfdhytN2rKWyC2ye" version="10.0.17" type="device"><diagram id="6seVsgDzblobJ6AC9a5I" name="Page-1">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</diagram></mxfile>

run.sh

@@ -41,8 +41,8 @@ cd ..
 
 
 # start the web front-end of Custom-MADE (react app)
-cd dedoc-web
-	screen -dmS Custom-MADE-Web-UI bash -c "npm install && npm run start"
+cd web-ui
+	screen -dmS Custom-MADE-Web-UI bash -c "npm i && npm run start"
 cd ..
 
 
@@ -60,6 +60,6 @@ cd ..
 #
 
 # start monaco editor employed as LSP Client (language client)
-cd dedoc-editor
+cd editor
 	screen -dmS Custom-MADE-Editor bash -c "yarn && cd browser-app && yarn start"
 cd ..

dedoc-web/src/gui/shared/memberships/AddMemberForm.tsx → web-ui/src/gui/shared/memberships/AddMemberForm.tsx

@@ -56,7 +56,7 @@ const AddMemberForm = (props: FormComponentProps) => {
                 rules: [{required: true, message: 'Please select a role'}],
             })(
                 <PermissionSelect
-                    usersPermissions={usersPermissions}
+                    usersPermissions={usersPermissions.getEntity()}
                     onSelect={p => props.form.setFieldsValue({permissions: p})}
                 />
             )}

dedoc-web/src/gui/shared/memberships/EditableGitUserSettings.tsx → web-ui/src/gui/shared/memberships/EditableGitUserSettings.tsx

@@ -114,7 +114,7 @@ const useEditableGitUserSettings = () => {
         const newMembership = {...membership,
             gitSettings: newSettings,
             version: version.getEntity()};
-        version.memberships.put(newMembership).then(onSuccess).catch(onError);
+        version.memberships.put(newMembership.getEntity()).then(onSuccess).catch(onError);
     };
 
     return {

dedoc-web/src/gui/shared/memberships/EditableMembersPermission.tsx → web-ui/src/gui/shared/memberships/EditableMembersPermission.tsx

@@ -12,15 +12,15 @@ export const EditableMembersPermission = () => {
 
     if (canUserEdit()) {
         return <PermissionSelect
-            usersPermissions={usersPermissions}
-            defaultValue={membership.permissions}
+            usersPermissions={usersPermissions.getEntity()}
+            defaultValue={membership.permissions.getEntity()}
             onSelect={newPermissions => setPermissions(newPermissions,
                 () => message.success("Permissions are changed"),
                 error => message.error(error.message))}
         />;
     }
 
-    const permission = permissionLevels.find(permission => Permissions.equals(permission.p, membership.permissions));
+    const permission = permissionLevels.find(permission => permission.p.equals( membership.permissions.getEntity()));
     if (permission)
         return <span>{permission.name}</span>;
     return <span/>;

dedoc-web/src/gui/shared/memberships/LeaveProjectButton.tsx → web-ui/src/gui/shared/memberships/LeaveProjectButton.tsx

@@ -8,15 +8,15 @@ export const LeaveProjectButton = () => {
 
     const {canLeaveProject, leaveProject} = useLeaveProject();
 
-    return  <Popconfirm
-                title={"Are you sure to leave this project?"}
-                okText="Yes" cancelText="No"
-                onConfirm={leaveProject}>
-                <p/>
-                <Button disabled={!canLeaveProject}>
-                    Leave project
-                </Button>
-            </Popconfirm>;
+    return <Popconfirm
+        title={"Are you sure to leave this project?"}
+        okText="Yes" cancelText="No"
+        onConfirm={leaveProject}>
+        <p />
+        <Button disabled={!canLeaveProject}>
+            Leave project
+        </Button>
+    </Popconfirm>;
 };
 
 
@@ -37,8 +37,8 @@ const useLeaveProject = () => {
     };
 
     return {
-        canLeaveProject: !Permissions.equals(Permissions.GUEST, usersPermissions) &&
-            !Permissions.equals(Permissions.OWNER, usersPermissions),
+        canLeaveProject: !Permissions.GUEST.equals(usersPermissions) &&
+            !Permissions.OWNER.equals(usersPermissions),
         leaveProject,
-    }
+    };
 };

dedoc-web/src/gui/shared/memberships/MembersTable.tsx → web-ui/src/gui/shared/memberships/MembersTable.tsx

@@ -67,7 +67,7 @@ const useMembers = () => {
     const version = useProjectVersion();
     const commonGitSettings = version.gitConfiguration && version.gitConfiguration.commonGitSettings ? version.gitConfiguration.commonGitSettings.getEntity() : null;
     const membersSorted = version.memberships.items
-        .sort((a, b) => Permissions.contains(a.permissions, b.permissions) ? -1 : 1);
+        .sort((a, b) => a.permissions.getEntity().contains(b.permissions.getEntity()) ? -1 : 1);
 
     return {
         membersSorted,

dedoc-web/src/gui/shared/memberships/MembershipContext.ts → web-ui/src/gui/shared/memberships/MembershipContext.ts

@@ -22,7 +22,8 @@ export const useMembershipContext = () => {
         const username = auth.user.username;
         return username != context.user.username &&
             usersPermissions.canAddUsers &&
-            Permissions.isGreaterThan(usersPermissions, context.permissions);
+            usersPermissions.getEntity().isGreaterThan( context.permissions.getEntity());
+            // usersPermissions.isGreaterThan(context.permissions.getEntity());
     };
 
     return {membership: context, canUserEdit};