Merge pull request #108 from liferay/themeSpritemap

themeSpritemap
liferay · Jan 9, 2023 · 84cbe95 · 84cbe95
2 parents c0485a4 + 24b778b
commit 84cbe95
Show file tree

Hide file tree

Showing 20 changed files with 2,295 additions and 355 deletions.
diff --git a/docker/images/localdev-server/workspace/gradle.properties b/docker/images/localdev-server/workspace/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.jvmargs=-Xmx512m
 
 liferay.workspace.environment=lxc
-liferay.workspace.product=dxp-7.4-u54
+liferay.workspace.product=dxp-7.4-u58
 liferay.workspace.node.package.manager=yarn
diff --git a/docker/images/localdev-server/workspace/settings.gradle b/docker/images/localdev-server/workspace/settings.gradle
@@ -1,7 +1,7 @@
 buildscript {
 	dependencies {
 		classpath group: "biz.aQute.bnd", name: "biz.aQute.bnd", version: "5.2.0"
-		classpath(group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "4.0.31") {
+		classpath(group: "com.liferay", name: "com.liferay.gradle.plugins.workspace", version: "4.1.5") {
 			exclude group: "biz.aQute.bnd", module: "biz.aQute.bnd"
 		}
 	}

diff --git a/resources/client-extension-resources.json b/resources/client-extension-resources.json
@@ -182,7 +182,7 @@
       },
       {
         "name": "name",
-        "description": "Display name of the global-css client extension",
+        "description": "Display name of the global-js client extension",
         "default": "My Global JS"
       }
     ]
@@ -292,19 +292,19 @@
   },
   {
     "category": "Front End",
-    "description": "Theme JS Client Extension",
-    "name": "theme-js",
+    "description": "Theme Favicon Client Extension",
+    "name": "theme-favicon",
     "type": "template",
     "args": [
       {
         "name": "id",
-        "description": "Id of the theme-js client extension",
-        "default": "my-theme-js"
+        "description": "Id of the theme-favicon client extension",
+        "default": "my-theme-favicon"
       },
       {
         "name": "name",
-        "description": "Display name of the theme-js client extension",
-        "default": "My Theme JS"
+        "description": "Display name of the theme-favicon client extension",
+        "default": "My Theme Favicon"
       }
     ]
   }

diff --git a/resources/partial/notification-type-springboot/append/client-extension.yaml b/resources/partial/notification-type-springboot/append/client-extension.yaml
@@ -1,7 +1,8 @@
 ${id}-user-agent:
+  homePageURL: https://$[conf:ext.lxc.liferay.com.mainDomain]
   type: oAuthApplicationUserAgent
 
 ${id}-notification-type:
-  type: notificationType
+  oAuth2ApplicationExternalReferenceCode: ${id}-user-agent
   resourcePath: ${resourcePath}
-  oAuth2ApplicationExternalReferenceCode: ${id}-user-agent
+  type: notificationType
diff --git a/resources/partial/object-action-nodejs/append/client-extension.yaml b/resources/partial/object-action-nodejs/append/client-extension.yaml
@@ -1,7 +1,8 @@
 ${id}-user-agent:
-  type: oAuthApplicationUserAgent
+  homePageURL: https://$[conf:ext.lxc.liferay.com.mainDomain]
   scopes:
     - C_${Object}.everything
+  type: oAuthApplicationUserAgent
 
 ${id}-object-action:
   type: objectAction

diff --git a/resources/partial/object-action-springboot/append/client-extension.yaml b/resources/partial/object-action-springboot/append/client-extension.yaml
@@ -1,9 +1,10 @@
 ${id}-user-agent:
-  type: oAuthApplicationUserAgent
+  homePageURL: https://$[conf:ext.lxc.liferay.com.mainDomain]
   scopes:
     - C_${Object}.everything
+  type: oAuthApplicationUserAgent
 
 ${id}-object-action:
-  type: objectAction
+  oAuth2ApplicationExternalReferenceCode: ${id}-user-agent
   resourcePath: ${resourcePath}
-  oAuth2ApplicationExternalReferenceCode: ${id}-user-agent
+  type: objectAction
diff --git a/resources/partial/workflow-action-springboot/append/client-extension.yaml b/resources/partial/workflow-action-springboot/append/client-extension.yaml
@@ -1,9 +1,10 @@
 ${id}-user-agent:
-  type: oAuthApplicationUserAgent
+  homePageURL: https://$[conf:ext.lxc.liferay.com.mainDomain]
   scopes:
     - Liferay.Headless.Admin.Workflow.everything
+  type: oAuthApplicationUserAgent
 
 ${id}-workflow-action:
-  type: workflowAction
+  oAuth2ApplicationExternalReferenceCode: ${id}-user-agent
   resourcePath: ${resourcePath}
-  oAuth2ApplicationExternalReferenceCode: ${id}-user-agent
+  type: workflowAction
diff --git a/resources/sample/coupon-with-object-actions/coupon-configuration/client-extension.yaml b/resources/sample/coupon-with-object-actions/coupon-configuration/client-extension.yaml
@@ -1,4 +1,5 @@
 coupon-configuration:
+  homePageURL: https://$[conf:ext.lxc.liferay.com.mainDomain]
   name: Coupon Configuration as Code
   scopes:
     - Liferay.Headless.Batch.Engine.everything