SAK-50298 LTI Automatically launch popup when appropriate in left nav (…

…sakaiproject#12756)
susowrc · Jul 25, 2024 · 5db9e54 · 5db9e54
1 parent 01dd527
commit 5db9e54
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/basiclti/web-ifp/src/bundle/vm/main.vm b/basiclti/web-ifp/src/bundle/vm/main.vm
@@ -4,7 +4,7 @@
 ## See also assignment/tool/src/webapp/vm/assignment/chef_assignments_view_launch.vm
 #if ($!newpage)
 <p>
-<sakai-lti-popup launch-url="$!source"></sakai-lti-popup>
+<sakai-lti-popup auto-launch="true" launch-url="$!source"></sakai-lti-popup>
 </p>
 #else
 <p>

diff --git a/basiclti/web-ifp/src/java/org/sakaiproject/portlets/SakaiIFrame.java b/basiclti/web-ifp/src/java/org/sakaiproject/portlets/SakaiIFrame.java
@@ -208,6 +208,15 @@ public void doView(RenderRequest request, RenderResponse response)
 				Object newpageValue = content.get("newpage");
 				newpage = getLongNull(newpageValue) == 1;
 
+				// Check the tool for its policy w.r.t content selecting popup
+				// 0 = never, 1=always, 2=leave it up to the content
+				if ( tool != null ) {
+					newpageValue = tool.get("newpage");
+					Long toolNewpage = getLongNull(newpageValue);
+					if ( toolNewpage == 0 ) newpage = false;
+					if ( toolNewpage == 1 ) newpage = true;
+				}
+
 				String launch = (String) content.get("launch");
 				// Force http:// to pop-up if we are https://
 				String serverUrl = ServerConfigurationService.getServerUrl();

diff --git a/webcomponents/tool/src/main/frontend/packages/sakai-lti-popup/src/SakaiLTIPopup.js b/webcomponents/tool/src/main/frontend/packages/sakai-lti-popup/src/SakaiLTIPopup.js
@@ -8,6 +8,7 @@ export class SakaiLTIPopup extends SakaiElement {
     preLaunchText: { attribute: "pre-launch-text", type: String },
     postLaunchText: { attribute: "post-launch-text", type: String },
     launchUrl: { attribute: "launch-url", type: String },
+    auto: { attribute: "auto-launch", type: Boolean },
   };
 
   constructor() {
@@ -18,6 +19,7 @@ export class SakaiLTIPopup extends SakaiElement {
     this.randomId = randomId;
     this.preLaunchText = null;
     this.postLaunchText = null;
+    this.auto = false;
     this.loadTranslations("lti").then(t => {
 
       this.i18n = t;
@@ -38,6 +40,12 @@ export class SakaiLTIPopup extends SakaiElement {
     return this.preLaunchText && this.postLaunchText && this.launchUrl;
   }
 
+  firstUpdated(changedProperties) {
+    changedProperties.forEach((oldValue, propName) => {
+      if ( propName == "auto" && this.auto ) setTimeout(this.launchPopup(), 1000);
+    });
+  }
+
   render() {
 
     return html`