LPS-151626 Let's get rid of separation between sample minimal and sam…

…ple default
GergoMathe · Feb 17, 2023 · 93be1e8 · 93be1e8
1 parent 08df858
commit 93be1e8
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 54 deletions.
diff --git a/build.xml b/build.xml
@@ -945,7 +945,7 @@ This target has been renamed to "snapshot-bundle". Please call "snapshot-bundle"
 				<dirset
 					dir="${project.dir}/workspaces"
 				>
-					<include name="sample*-workspace" />
+					<include name="sample-workspace" />
 				</dirset>
 			</path>
 			<sequential>

diff --git a/modules/sdk/gradle-plugins-workspace/build.gradle b/modules/sdk/gradle-plugins-workspace/build.gradle
@@ -93,22 +93,22 @@ copyRepo {
 copyWorkspacesSamples {
 	doLast {
 		copy {
-			from new File(GradleUtil.getRootDir(project.getRootProject(), "portal-impl"), "workspaces/sample-minimal-workspace/client-extensions/sample-custom-element-1")
+			from new File(GradleUtil.getRootDir(project.getRootProject(), "portal-impl"), "workspaces/sample-workspace/client-extensions/sample-custom-element-1")
 			into "src/gradleTest/clientExtensionSamples/sample-custom-element-1"
 		}
 
 		copy {
-			from new File(GradleUtil.getRootDir(project.getRootProject(), "portal-impl"), "workspaces/sample-minimal-workspace/client-extensions/sample-iframe-1")
+			from new File(GradleUtil.getRootDir(project.getRootProject(), "portal-impl"), "workspaces/sample-workspace/client-extensions/sample-iframe-1")
 			into "src/gradleTest/clientExtensionSamples/sample-iframe-1"
 		}
 
 		copy {
-			from new File(GradleUtil.getRootDir(project.getRootProject(), "portal-impl"), "workspaces/sample-minimal-workspace/client-extensions/sample-theme-css")
+			from new File(GradleUtil.getRootDir(project.getRootProject(), "portal-impl"), "workspaces/sample-workspace/client-extensions/sample-theme-css")
 			into "src/gradleTest/clientExtensionSamples/sample-theme-css"
 		}
 
 		copy {
-			from new File(GradleUtil.getRootDir(project.getRootProject(), "portal-impl"), "workspaces/sample-minimal-workspace/client-extensions/sample-theme-favicon")
+			from new File(GradleUtil.getRootDir(project.getRootProject(), "portal-impl"), "workspaces/sample-workspace/client-extensions/sample-theme-favicon")
 			into "src/gradleTest/clientExtensionSamples/sample-theme-favicon"
 		}
 	}

diff --git a/workspaces/refresh_liferay.sh b/workspaces/refresh_liferay.sh
@@ -12,7 +12,7 @@ function main {
 
 		mv ${dir} ${dir}.temp
 
-		cp -R sample-minimal-workspace ${dir}
+		cp -R sample-workspace ${dir}
 
 		rm -fr ${dir}/client-extensions
 

diff --git a/workspaces/refresh_sample.sh b/workspaces/refresh_sample.sh
@@ -34,36 +34,15 @@ function check_blade {
 	#jpm install -f https://repository-cdn.liferay.com/nexus/service/local/repositories/liferay-public-releases/content/com/liferay/blade/com.liferay.blade.cli/4.1.1/com.liferay.blade.cli-4.1.1.jar
 }
 
-function copy_template {
-	cp -R ../modules/apps/client-extension/client-extension-type-api/src/main/resources/com/liferay/client/extension/type/dependencies/templates/${1} "${2}"
+function refresh_sample_workspace {
 
-	find "${2}" -not -path '*/*\.ico' -type f -exec sed -i "s/\${id}/$(basename ${2})/g" {} +
-	find "${2}" -not -path '*/*\.ico' -type f -exec sed -i "s/\${name}/${3}/g" {} +
-}
-
-function init_workspace {
-	cp sample-default-workspace/.gitignore ${1}
-	cp sample-default-workspace/gradle.properties ${1}
-	cp sample-default-workspace/gradlew ${1}
-	cp sample-default-workspace/settings.gradle ${1}
-
-	cp -R sample-default-workspace/gradle ${1}
-
-	mkdir -p ${1}/configs/local
-
-	cp sample-default-workspace/configs/local/portal-ext.properties ${1}/configs/local
-}
-
-function refresh_liferay_learn_workspace {
-	init_workspace liferay-learn-workspace
-}
-
-function refresh_sample_default_workspace {
-	rm -fr sample-default-workspace
+	#
+	# Sample Workspace
+	#
 
-	mkdir sample-default-workspace
+	local temp_dir=$(mktemp -d)
 
-	cd sample-default-workspace
+	pushd ${temp_dir}
 
 	${BLADE_PATH} init --liferay-version dxp-7.4-u63
 
@@ -88,17 +67,24 @@ function refresh_sample_default_workspace {
 	touch modules/.touch
 	touch themes/.touch
 
-	cd ..
-}
+	popd
+
+	cp ${temp_dir}/.gitignore sample-workspace
+	cp ${temp_dir}/gradle.properties sample-workspace
+	cp ${temp_dir}/gradlew sample-workspace
+	cp ${temp_dir}/settings.gradle sample-workspace
+
+	cp -R ${temp_dir}/gradle sample-workspace
 
-function refresh_sample_minimal_workspace {
-	init_workspace sample-minimal-workspace
+	mkdir -p sample-workspace/configs/local
+
+	cp ${temp_dir}/configs/local/portal-ext.properties sample-workspace/configs/local
 
 	#
-	# Sample custom element 2 client extension
+	# Client Extension: Sample Custom Element 2
 	#
 
-	rm -fr sample-minimal-workspace/client-extensions/sample-custom-element-2
+	rm -fr sample-workspace/client-extensions/sample-custom-element-2
 
 	../tools/create_remote_app.sh sample-custom-element-2 react
 
@@ -117,7 +103,7 @@ class DadJoke extends React.Component {
 
 	componentDidMount() {
 		this._request = this.oAuth2Client.fetch(
-			'/dad-joke'
+			'/dad/joke'
 		).then(response => response.text()
 		).then(text => {
 			this._request = null;
@@ -146,25 +132,13 @@ EOF
 
 	sed -i "s/react-scripts test/react-scripts test --passWithNoTests --watchAll=false/" sample-custom-element-2/package.json
 
-	mv sample-custom-element-2 sample-minimal-workspace/client-extensions
-
-	#
-	# Sample default workspace
-	#
-
-	rm -fr sample-default-workspace/client-extensions
-
-	cp -R sample-minimal-workspace/client-extensions sample-default-workspace
+	mv sample-custom-element-2 sample-workspace/client-extensions
 }
 
 function main {
 	check_blade
 
-	refresh_sample_default_workspace
-
-	refresh_sample_minimal_workspace
-
-	refresh_liferay_learn_workspace
+	refresh_sample_workspace
 }
 
 main "${@}"