Merge pull request #33 from rwth-acis/develop

v1.1.1
rwth-acis · Jul 14, 2022 · e8fe95d · e8fe95d
2 parents 6912fe8 + c3c5302
commit e8fe95d
Show file tree

Hide file tree

Showing 9 changed files with 108 additions and 47 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rwth-acis/las2peer-project-service-frontend",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Frontend for las2peer project service.",
   "main": "project-list.js",
   "module": "project-list.js",
@@ -21,6 +21,7 @@
     "@polymer/iron-icons": "^3.0.1",
     "@polymer/paper-button": "^3.0.1",
     "@polymer/paper-card": "^3.0.1",
+    "@polymer/paper-checkbox": "^3.1.0",
     "@polymer/paper-dialog": "^3.0.1",
     "@polymer/paper-dropdown-menu": "^3.1.0",
     "@polymer/paper-input": "^3.2.1",

diff --git a/frontend/project-list.js b/frontend/project-list.js
@@ -10,6 +10,7 @@ import '@polymer/paper-listbox/paper-listbox.js';
 import '@polymer/paper-tabs';
 import '@polymer/iron-icon/iron-icon.js';
 import '@polymer/iron-icons/social-icons.js';
+import '@polymer/paper-checkbox/paper-checkbox.js';
 import OnlineUserListHelper from './util/online-user-list-helper'
 
 import Auth from './util/auth';
@@ -205,7 +206,8 @@ export class ProjectList extends LitElement {
        */
       projectOptionsSelected: {
         type: Object
-      }
+      },
+      connectChannelVisible: { type: Boolean }
     };
   }
 
@@ -225,6 +227,7 @@ export class ProjectList extends LitElement {
     this.disableAllProjects = false;
     this.yjsAddress = "http://127.0.0.1:1234";
     this.yjsResourcePath = "./socket.io";
+    this.connectChannelVisible = false;
   }
 
   connectedCallback() {
@@ -378,6 +381,14 @@ export class ProjectList extends LitElement {
             `)}
         </paper-listbox>
         </paper-dropdown-menu>
+        <div>
+          <paper-checkbox id="cb-connect-channel" @change=${(e) => this.connectChannelVisible = e.target.checked} >Connect to chat channel</paper-checkbox>
+          <div ?hidden=${!this.connectChannelVisible}>
+            <paper-input id="input-channel-name" placeholder="Channel name"></paper-input>
+            or:
+            <paper-checkbox id="cb-create-new-channel">Create new channel</paper-checkbox>
+          </div>
+        </div>
         <div class="buttons">
           <paper-button @click="${this._closeCreateProjectDialogClicked}" dialog-dismiss>Cancel</paper-button>
           <paper-button id="dialog-button-create" @click="${this._createProject}" dialog-confirm>Create</paper-button>
@@ -733,6 +744,23 @@ export class ProjectList extends LitElement {
           "linkedGroup": linkedGroup,
           "users": users
         };
+
+        // check if project should be linked to chat channel
+        const connectChannel = this.shadowRoot.getElementById("cb-connect-channel").checked;
+        const chatInfo = {
+          connectChannel,
+          newChannel: false
+        };
+        if(connectChannel) {
+          // check if new channel should be created
+          const newChannel =  this.shadowRoot.getElementById("cb-create-new-channel").checked;
+          chatInfo.newChannel = newChannel;
+          if(!newChannel) {
+            chatInfo.channelName = this.shadowRoot.getElementById("input-channel-name").value;
+          }
+        }
+        body.chatInfo = chatInfo;
+
         if(GitHub.gitHubUsernameStored()) {
           body.gitHubUsername = GitHub.getGitHubUsername();
         }

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 core.version=1.2.2
 service.name=i5.las2peer.services.projectService
 service.class=ProjectService
-service.version=1.1.0
+service.version=1.1.1
 java.version=17
 
 las2peer_user1.name=alice

diff --git a/project_service/src/main/java/i5/las2peer/services/projectService/ProjectService.java b/project_service/src/main/java/i5/las2peer/services/projectService/ProjectService.java
@@ -241,9 +241,11 @@ public Response postProject(@PathParam("system") String system, String inputProj
 			Project project;
 			String creatorGitHubUsername = null;
 
+			JSONObject bodyJSON;
+
 			try {
 				project = new Project(agent, inputProject);
-				JSONObject bodyJSON = (JSONObject) JSONValue.parseWithException(inputProject);
+				bodyJSON = (JSONObject) JSONValue.parseWithException(inputProject);
 				if(bodyJSON.containsKey("gitHubUsername")) {
 					creatorGitHubUsername = (String) bodyJSON.get("gitHubUsername");
 				}
@@ -296,12 +298,27 @@ public Response postProject(@PathParam("system") String system, String inputProj
 				}
 			}
 
-			// check if chat channel should be created
-			if(this.systemsConfig.isChannelCreationEnabled(system)) {
-                ChatManager chatManager = this.systemsConfig.getChatManager(system);
-                JSONObject chatInfo = chatManager.createProjectChannel(project, system);
-				if(chatInfo != null) {
-					project.setChatInfo(chatInfo);
+			// check if chat channel connection is enabled for the system
+			if(this.systemsConfig.isChannelConnectionEnabled(system)) {
+				// check if channel should be linked for the new project
+				JSONObject bodyChatInfo = (JSONObject) bodyJSON.get("chatInfo");
+				boolean connectChannel = (boolean) bodyChatInfo.get("connectChannel");
+				if(connectChannel) {
+					ChatManager chatManager = this.systemsConfig.getChatManager(system);
+					JSONObject chatInfo;
+
+					boolean newChannel = (boolean) bodyChatInfo.get("newChannel");
+					if (newChannel) {
+						chatInfo = chatManager.createProjectChannel(project, system);
+					} else {
+						// use existing channel
+						String channelName = (String) bodyChatInfo.get("channelName");
+						chatInfo = chatManager.getChannelInfoForExistingChannel(channelName);
+					}
+
+					if (chatInfo != null) {
+						project.setChatInfo(chatInfo);
+					}
 				}
 			}
 

diff --git a/project_service/src/main/java/i5/las2peer/services/projectService/chat/ChatManager.java b/project_service/src/main/java/i5/las2peer/services/projectService/chat/ChatManager.java
@@ -16,5 +16,6 @@ public ChatManager(ChatConfig config) {
     }
 
     public abstract JSONObject createProjectChannel(Project project, String systemName);
+    public abstract JSONObject getChannelInfoForExistingChannel(String channelName);
 
 }
diff --git a/...ect_service/src/main/java/i5/las2peer/services/projectService/chat/RocketChatManager.java b/...ect_service/src/main/java/i5/las2peer/services/projectService/chat/RocketChatManager.java
@@ -45,6 +45,34 @@ public JSONObject createProjectChannel(Project project, String systemName) {
         return channelInfo;
     }
 
+    @Override
+    public JSONObject getChannelInfoForExistingChannel(String channelName) {
+        String channelId = getChannelIdByName(channelName);
+        JSONObject channelInfo = new JSONObject();
+        channelInfo.put("type", "RocketChat");
+        channelInfo.put("url", getConfig().getUrl());
+        channelInfo.put("channelId", channelId);
+        channelInfo.put("chatUrl", getConfig().getUrl() + "/channel/" + channelId);
+        return channelInfo;
+    }
+
+    private String getChannelIdByName(String channelName) {
+        HttpResponse<String> response = Unirest.get(getConfig().getUrl() + "/api/v1/channels.info")
+                .header("X-Auth-Token", getConfig().getBotAuthToken())
+                .header("X-User-Id", getConfig().getBotUserId())
+                .queryString("roomName", channelName)
+                .asString();
+
+        if(!response.isSuccess()) {
+            System.out.println("RocketChat channel info request failed.");
+            return null;
+        }
+
+        JSONObject res = (JSONObject) JSONValue.parse(response.getBody());
+        JSONObject resChannel = (JSONObject) res.get("channel");
+        return (String) resChannel.get("_id");
+    }
+
     private RocketChatConfig getConfig() {
         return (RocketChatConfig) this.config;
     }

diff --git a/..._service/src/main/java/i5/las2peer/services/projectService/util/ProjectServiceSystem.java b/..._service/src/main/java/i5/las2peer/services/projectService/util/ProjectServiceSystem.java
@@ -122,7 +122,7 @@ public RocketChatConfig getRocketChatConfig() {
 		return rocketChatConfig;
 	}
 
-	public boolean isChannelCreationEnabled() {
+	public boolean isChannelConnectionEnabled() {
 		return this.rocketChatConfig != null;
 	}
 

diff --git a/project_service/src/main/java/i5/las2peer/services/projectService/util/SystemsConfig.java b/project_service/src/main/java/i5/las2peer/services/projectService/util/SystemsConfig.java
@@ -94,9 +94,9 @@ public String getGitHubPATBySystem(String systemName) {
 		return null;
 	}
 
-	public boolean isChannelCreationEnabled(String systemName) {
+	public boolean isChannelConnectionEnabled(String systemName) {
 		for(ProjectServiceSystem system : this.systems) {
-			if(system.getName().equals(systemName)) return system.isChannelCreationEnabled();
+			if(system.getName().equals(systemName)) return system.isChannelConnectionEnabled();
 		}
 		return false;
 	}