Merge branch 'release-23.03' into issue-23977-block-editor-freeze-scr…

…oll-on-tippy-menus-show

.github/workflows/core-cicd-tests.yml

@@ -6,9 +6,10 @@ on:
       - '.github/**'
       - 'cicd/**'
       - 'docker/**'
+      - '!docker/dotcms-compose-examples/**'
       - 'dotCMS/**'
+      - '!dotCMS/src/main/webapp/html'
       - 'pom.xml'
-      - '!docker/dotcms-compose-examples/**'
       - 'tools/**'
   push:
     branches:

.github/workflows/release-process.yml

@@ -7,7 +7,7 @@ jobs:
     name: Release Process Automation
     runs-on: ubuntu-latest
     env:
-      DOT_CICD_BRANCH: master
+      DOT_CICD_BRANCH: release-23.03
       GITHUB_USER_TOKEN: ${{ secrets.CICD_GITHUB_TOKEN }}
       PULL_REQUEST: ${{ github.event.number }}
       REPO_USERNAME: ${{ secrets.EE_REPO_USERNAME }}

.gitmodules

@@ -1,5 +1,5 @@
 [submodule "dotCMS/src/main/enterprise"]
 	path = dotCMS/src/main/enterprise
 	url = git@github.com:dotCMS/enterprise.git
-	branch = master
+	branch = release-23.03
 	ignore = dirty

core-web/libs/dotcms-webcomponents/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dotcms-webcomponents",
-    "version": "23.3.0-next.4",
+    "version": "23.3.0-rc.6",
     "main": "./dist/index.cjs.js",
     "module": "./dist/index.js",
     "es2015": "./dist/esm/index.mjs",

core-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dotcms-ui",
-  "version": "23.3.0-next.16",
+  "version": "23.3.0-rc.23",
   "license": "MIT",
   "engines": {
     "node": ">=16.13.2"

dotCMS/gradle.properties

@@ -1,6 +1,6 @@
-dotcmsReleaseVersion=master
-coreWebReleaseVersion=next
-webComponentsReleaseVersion=next
+dotcmsReleaseVersion=23.03
+coreWebReleaseVersion=rc
+webComponentsReleaseVersion=rc
 
 tomcatInstallRepo=https://github.com/dotCMS/tomcat.git
 tomcatInstallBranch=9.0.60

dotCMS/src/curl-test/Experiments Resource.postman_collection.json

@@ -1,9 +1,9 @@
 {
 	"info": {
-		"_postman_id": "cbba7b98-cbab-4f76-a787-3eae34b58268",
+		"_postman_id": "bf05601a-5a59-46a5-b828-5eaaf8be4be3",
 		"name": "Experiments Resource",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
-		"_exporter_id": "4500400"
+		"_exporter_id": "1549189"
 	},
 	"item": [
 		{
@@ -4098,6 +4098,73 @@
 						}
 					},
 					"response": []
+				},
+				{
+					"name": "endExperiment_shouldSucceed",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"var jsonData = pm.response.json();",
+									"",
+									"",
+									"pm.test(\"Ended Experiment with expected values\", function () {",
+									"    pm.response.to.have.status(200);",
+									"    pm.expect(jsonData.entity.status).equal(\"ENDED\");",
+									"    pm.expect(jsonData.entity.scheduling.startDate).to.be.not.null;",
+									"    pm.expect(jsonData.entity.scheduling.endDate).to.be.not.null;",
+									"});",
+									"",
+									"",
+									""
+								],
+								"type": "text/javascript"
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "basic",
+							"basic": [
+								{
+									"key": "password",
+									"value": "admin",
+									"type": "string"
+								},
+								{
+									"key": "username",
+									"value": "admin@dotcms.com",
+									"type": "string"
+								}
+							]
+						},
+						"method": "POST",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": "",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": {
+							"raw": "{{serverURL}}/api/v1/experiments/{{experimentToAddVariant}}/_end",
+							"host": [
+								"{{serverURL}}"
+							],
+							"path": [
+								"api",
+								"v1",
+								"experiments",
+								"{{experimentToAddVariant}}",
+								"_end"
+							]
+						}
+					},
+					"response": []
 				}
 			]
 		},

dotCMS/src/main/webapp/html/portlet/ext/contentlet/contentlet_actions_inc.jsp

@@ -11,6 +11,8 @@
 <%@ page import="com.dotmarketing.portlets.contentlet.model.ContentletVersionInfo" %>
 <%@ page import="com.dotmarketing.util.Logger" %>
 <%@ page import="com.dotmarketing.util.PageMode" %>
+<%@ page import="com.dotmarketing.business.web.WebAPILocator"%>
+<%@ page import="java.util.Optional" %>
 <%
 
 if(user == null){
@@ -52,9 +54,29 @@ catch(Exception e){
 					APILocator.getWorkflowAPI().findScheme(action.getSchemeId()).getName());
 		}
 	}
+   
+   
+boolean canUserWriteToContentlet = conPerAPI.doesUserHavePermission(contentlet,PermissionAPI.PERMISSION_WRITE,user, PageMode.get(request).respectAnonPerms);
+
+
+
+String previewUrl = null;
+String contentUrl = null;
+if(contentlet.isHTMLPage() && UtilMethods.isSet(contentlet.getIdentifier())){
+	contentUrl = APILocator.getIdentifierAPI().find(contentlet.getIdentifier()).getURI();
+    previewUrl= "/dotAdmin/#/edit-page/content?url=" + contentUrl + "&language_id=" + contentlet.getLanguageId();
+}else{
+	contentUrl = APILocator.getContentletAPI().getUrlMapForContentlet(contentlet, user, PageMode.get(request).respectAnonPerms);
+	previewUrl = "/dotAdmin/#/edit-page/content?url=" + contentUrl + "&language_id=" + contentlet.getLanguageId();  
+}
+
+if(myHost.getIdentifier() != null){
+	previewUrl += "&host_id=" + myHost.getIdentifier();
+}
+
+   
 %>
-<%@page import="com.dotmarketing.business.web.WebAPILocator"%>
-<%@ page import="java.util.Optional" %>
+
 
 
 <script>
@@ -127,11 +149,10 @@ function jumpToContentType(){
 <%}%>
 
 <%--check permissions to display the save and publish button or not--%>
-<%boolean canUserWriteToContentlet = conPerAPI.doesUserHavePermission(contentlet,PermissionAPI.PERMISSION_WRITE,user, PageMode.get(request).respectAnonPerms);%>
 
-<%if(!"edit-page".equals(request.getParameter("angularCurrentPortlet")) && contentlet.isHTMLPage() && contentlet.getIdentifier() != "" && (canUserWriteToContentlet)) {%>
+<%if(!"edit-page".equals(request.getParameter("angularCurrentPortlet")) && UtilMethods.isSet(contentUrl)) {%>
    <div class="content-edit-actions" >
-       <a style="border:0px;" onClick="editPage('<%= APILocator.getIdentifierAPI().find(contentlet.getIdentifier()).getURI() %>', '<%= contentlet.getLanguageId() %>')">
+       <a style="border:0px;" href="<%= previewUrl %>" target="_blank">
            <%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "editpage.toolbar.preview.page")) %>
            <div style="display:inline-block;float:right;">&rarr;</div>
        </a>