Merge pull request #2053 from Siemens-Healthineers/feat/RepoURLInComp…

…onent-2050 feat(Components): Added a new field called VCS/Repository URL for components Reviewed by: tien1.le@toshiba.co.jp Tested by: tien1.le@toshiba.co.jp
eclipse-sw360 · Jul 31, 2023 · c583c4b · c583c4b
2 parents c5185ab + fd159f3
commit c583c4b
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 8 deletions.
diff --git a/.../main/resources/META-INF/resources/html/components/includes/components/editBasicInfo.jspf b/.../main/resources/META-INF/resources/html/components/includes/components/editBasicInfo.jspf
@@ -92,16 +92,16 @@
         </td>
         <td>
             <div class="form-group">
-                <label for="comp_blogurl"><liferay-ui:message key="blog.url" /></label>
-                <input class="form-control" id="comp_blogurl" name="<portlet:namespace/><%=Component._Fields.BLOG%>" type="URL"
-                    placeholder="<liferay-ui:message key="enter.blog.url" />" value="<sw360:out value="${component.blog}"/>"/>
+                <label for="comp_vcs"><liferay-ui:message key="vcs./.repository.url" /></label>
+                <input class="form-control" id="comp_vcs" name="<portlet:namespace/><%=Component._Fields.VCS%>" type="URL"
+                    value="<sw360:out value="${component.vcs}"/>" placeholder="<liferay-ui:message key="enter.the.repository.url" />"/>
             </div>
         </td>
         <td>
             <div class="form-group">
-                <label for="comp_wikiurl"><liferay-ui:message key="wiki.url" /></label>
-                <input class="form-control" id="comp_wikiurl" name="<portlet:namespace/><%=Component._Fields.WIKI%>" type="URL"
-                    placeholder="<liferay-ui:message key="enter.wiki.url" />" value="<sw360:out value="${component.wiki}"/>"/>
+                <label for="comp_blogurl"><liferay-ui:message key="blog.url" /></label>
+                <input class="form-control" id="comp_blogurl" name="<portlet:namespace/><%=Component._Fields.BLOG%>" type="URL"
+                    placeholder="<liferay-ui:message key="enter.blog.url" />" value="<sw360:out value="${component.blog}"/>"/>
             </div>
         </td>
     </tr>
@@ -137,6 +137,13 @@
     </core_rt:choose>
 
     <tr>
+        <td>
+            <div class="form-group">
+                <label for="comp_wikiurl"><liferay-ui:message key="wiki.url" /></label>
+                <input class="form-control" id="comp_wikiurl" name="<portlet:namespace/><%=Component._Fields.WIKI%>" type="URL"
+                    placeholder="<liferay-ui:message key="enter.wiki.url" />" value="<sw360:out value="${component.wiki}"/>"/>
+            </div>
+        </td>
         <td>
             <div class="form-group">
                 <label for="mailinglist"><liferay-ui:message key="mailing.list.url" /></label>
@@ -151,10 +158,12 @@
                         placeholder="<liferay-ui:message key="enter.description" />"><sw360:out value="${component.description}"/></textarea>
             </div>
         </td>
+    </tr>
+    <tr>
         <td>
             <div class="form-group">
                 <sw360:DisplayUserEdit email="${component.modifiedBy}" id="<%=Component._Fields.MODIFIED_BY.toString()%>"
-                                    description="modified.by" multiUsers="false" readonly="true"/>
+                    description="modified.by" multiUsers="false" readonly="true"/>
             </div>
         </td>
     </tr>

diff --git a/...et/src/main/resources/META-INF/resources/html/components/includes/components/summary.jspf b/...et/src/main/resources/META-INF/resources/html/components/includes/components/summary.jspf
@@ -71,6 +71,10 @@
         <td><liferay-ui:message key="homepage" />:</td>
         <td><sw360:DisplayLink target="${component.homepage}"/></td>
     </tr>
+    <tr>
+        <td><liferay-ui:message key="vcs./.repository.url" />:</td>
+        <td><sw360:DisplayLink target="${component.vcs}"/></td>
+    </tr>
     <tr>
         <td><liferay-ui:message key="blog" />:</td>
         <td><sw360:DisplayLink target="${component.blog}"/></td>

diff --git a/frontend/sw360-portlet/src/main/resources/content/Language.properties b/frontend/sw360-portlet/src/main/resources/content/Language.properties
@@ -574,6 +574,7 @@ enter.shortname=Enter Shortname
 enter.text=Enter text...
 enter.the.license.text.here=Enter the License-Text here...
 enter.the.oblig.text.here=Enter the Obligation-Text here...
+enter.the.repository.url=Enter the Repository URL
 enter.title=Enter title...
 enter.token.name=Enter token name
 enter.url=Enter URL
@@ -1553,6 +1554,7 @@ users.not.in.couchdb=Users not in Couch DB
 use.selection.of.this.subproject=Use selection of this subproject
 valid.for.projects=Valid for Projects
 vcs=VCS
+vcs./.repository.url=VCS/Repository URL
 vcs.version.control.system=VCS (Version Control System)
 vender=Vender
 vendor=Vendor

diff --git a/frontend/sw360-portlet/src/main/resources/content/Language_ja.properties b/frontend/sw360-portlet/src/main/resources/content/Language_ja.properties
@@ -573,6 +573,7 @@ enter.shortname=短縮名を入力
 enter.text=テキストを入力
 enter.the.license.text.here=ここにライセンステキストを入力
 enter.the.oblig.text.here=ここにオブリゲーション内容入力
+enter.the.repository.url=Enter the Repository URL
 enter.title=タイトルを入力
 enter.token.name=トークン名を入力
 enter.url=URLを入力
@@ -1550,6 +1551,7 @@ users.not.in.couchdb=Couch DBにいないユーザ
 use.selection.of.this.subproject=このサブプロジェクトの選択を使用
 valid.for.projects=プロジェクトに有効
 vcs=VCS
+vcs./.repository.url=VCS/Repository URL
 vcs.version.control.system=VCS (Version Control System)
 vender=ベンダー
 vendor=ベンダー

diff --git a/frontend/sw360-portlet/src/main/resources/content/Language_vi.properties b/frontend/sw360-portlet/src/main/resources/content/Language_vi.properties
@@ -576,6 +576,7 @@ enter.text=Nhập văn bản...
 enter.the.license.text.here=Nhập nội dung giấy phép tại đây ...
 #enter.the.oblig.text.here=Nhập văn bản việc cần làm tại đây ...
 enter.the.oblig.text.here=Enter the Obligation-Text here...
+enter.the.repository.url=Enter the Repository URL
 enter.title=Nhập tiêu đề ...
 enter.token.name=Nhập tên mã truy cập
 enter.url=Nhập URL
@@ -1554,6 +1555,7 @@ users.not.in.liferay=Những người dùng không ở trong Liferay
 use.selection.of.this.subproject=Sử dụng lựa chọn của dự án con này
 valid.for.projects=Hợp lệ cho các dự án
 vcs=VCS
+vcs./.repository.url=VCS/Repository URL
 vcs.version.control.system=VCS (Version Control System)
 vender=Nhà cung cấp
 vendor=Nhà cung cấp

diff --git a/libraries/datahandler/src/main/thrift/components.thrift b/libraries/datahandler/src/main/thrift/components.thrift
@@ -351,6 +351,7 @@ struct Component {
     53: optional string blog,
     54: optional string wikipedia,
     55: optional string openHub,
+    56: optional string vcs, //Repository URL of the component
 
     // Information for ModerationRequests
     70: optional DocumentState documentState,

diff --git a/...erver/src/main/java/org/eclipse/sw360/rest/resourceserver/core/JacksonCustomizations.java b/...erver/src/main/java/org/eclipse/sw360/rest/resourceserver/core/JacksonCustomizations.java
@@ -399,7 +399,8 @@ static abstract class UserMixin extends User {
                 "setModifiedBy",
                 "modifiedBy",
                 "cdxComponentType",
-                "setCdxComponentType"
+                "setCdxComponentType",
+                "setVcs",
         })
         static abstract class ComponentMixin extends Component {
             @Override

diff --git a/...server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java b/...server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java
@@ -669,6 +669,7 @@ public Component convertToEmbeddedComponent(Component component) {
         embeddedComponent.setComponentType(component.getComponentType());
         embeddedComponent.setVisbility(component.getVisbility());
         embeddedComponent.setMainLicenseIds(component.getMainLicenseIds());
+        embeddedComponent.setVcs(component.getVcs());
         if (CommonUtils.isNotNullEmptyOrWhitespace(component.getDefaultVendorId())) {
             Vendor defaultVendor = vendorService.getVendorById(component.getDefaultVendorId());
             embeddedComponent.setDefaultVendor(defaultVendor);