Merge pull request #124 from psteiwer/dev

Dev

Author: psteiwer

.vscode/settings.json

@@ -0,0 +1,17 @@
+{
+    "intersystems.servers": {
+            "pivotsubscriptions": {
+                "webServer": {
+                    "scheme": "http",
+                    "host": "localhost",
+                    "port": 61773
+                },
+                "username": "_system"
+            }
+        },
+        "objectscript.conn": {
+            "server": "pivotsubscriptions",
+            "ns": "USER",
+            "active": true
+        }
+    }

Assets/PivotSubscriptions_BookCover.png Assets/PivotSubscriptions_Cover.pngAssets/PivotSubscriptions_BookCover.png renamed to Assets/PivotSubscriptions_Cover.png

@@ -0,0 +1,20 @@
+ARG IMAGE=intersystemsdc/iris-community
+FROM $IMAGE
+
+USER root
+WORKDIR /opt/irisapp
+RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} /opt/irisapp
+
+USER ${ISC_PACKAGE_MGRUSER}
+
+# copy files
+COPY PivotSubscriptions PivotSubscriptions
+COPY Assets Assets
+COPY iris.script /tmp/iris.script
+COPY module.xml module.xml
+
+# run iris and script
+RUN iris start IRIS \
+	&& iris session IRIS < /tmp/iris.script \
+    && iris stop IRIS quietly
+

Dockerfile

@@ -22,7 +22,7 @@ XData LocalInstall [ XMLNamespace = INSTALLER ]
 		</Invoke>
 		<Import File="${APPPATH}/PivotSubscriptions/" Flags="ck" Recurse="1"/>
 		<Invoke Class="PivotSubscriptions.Installer" Method="ImportImage" CheckStatus="1">
-			<Arg Value="${APPPATH}/Assets/PivotSubscriptions_BookCover.png"/>
+			<Arg Value="${APPPATH}/Assets/PivotSubscriptions_Cover.png"/>
 		</Invoke>
 		<Invoke Class="PivotSubscriptions.Installer" Method="CreateBookCover" CheckStatus="1">
 		</Invoke>
@@ -59,7 +59,7 @@ ClassMethod RunInstaller(pRootDir = "")
 
 	If pRootDir'="" {
 		Do $system.OBJ.LoadDir(pRootDir_"/PivotSubscriptions","ck",,1)
-		Set tSC=..ImportImage(pRootDir_"/Assets/PivotSubscriptions_BookCover.png")
+		Set tSC=..ImportImage(pRootDir_"/Assets/PivotSubscriptions_Cover.png")
 		If $$$ISERR(tSC) Quit
 	}
 

PivotSubscriptions/Installer.cls

@@ -3,7 +3,7 @@ Class PivotSubscriptions.Utils
 
 ClassMethod GetVersion() As %String
 {
-	Quit "v1.8.0"
+	Quit "v1.8.1"
 }
 
 /// Utility method for saving and updating global variables
@@ -390,9 +390,11 @@ ClassMethod ExecuteForSubscription(pMDX, pCustomFilter = "", ByRef pHasResults =
 	Set tRS=##class(%DeepSee.ResultSet).%New()
 	Do tRS.%PrepareMDX(pMDX)
 	Do tRS.%Execute()
-	Do tRS.%Print()
 	If tRS.%Query.queryType="DRILLTHROUGH" {
-		If tRS.listingRows>0 {
+		// Workaround for 2024.1 bug
+		Do tRS.%GetListingResultSet(.tListingRS)
+		While tListingRS.%Next() {}
+		If (tListingRS.%ROWCOUNT>0) {
 			Set pHasResults=1
 		}
 	} Else {

PivotSubscriptions/Utils.cls

@@ -6,6 +6,17 @@ PivotSubsctions allows users to subscribe to a pivot table and recieve a schedul
 Once installation is complete, a new "Pivot Subscriptions" Link will be added to the InterSystems IRIS Business Intelligence User Portal. The User Portal can be found at the Management Portal -> Analytics -> User Portal.
 
 ## Installation
+### ZPM Install
+1. ```zpm "install pivotsubscriptions"```
+2. Follow [Configuration Steps](#configuration-steps)
+
+### Docker Install (for development)
+1. Clone Repo
+2. ```docker compose up -d --build```
+3. http://localhost:61773/csp/user/PivotSubscriptions.UI.SubscriptionManager.zen
+4. Follow [Configuration Steps](#configuration-steps)
+
+### Manual Install
 1. Use the Download ZIP option for this project
 2. Extract the files and copy path
 	* This is the path to the directory that contains README.md and LICENSE
@@ -16,7 +27,7 @@ Once installation is complete, a new "Pivot Subscriptions" Link will be added to
 	do $system.OBJ.Load(path_"/PivotSubscriptions/Installer.cls","ck",,1)
 	do ##class(PivotSubscriptions.Installer).RunInstaller(path)
 ```
-5. Follow the Configuration steps
+5. Follow [Configuration Steps](#configuration-steps)
 
 ## Configuration steps
 ### Configure Task Manager Email Settings

README.md

@@ -0,0 +1,10 @@
+version: '3.6'
+services:
+  iris:
+    build: 
+      context: .
+      dockerfile: Dockerfile
+    restart: unless-stopped
+    ports: 
+      - 61972:1972
+      - 61773:52773

docker-compose.yml

@@ -0,0 +1,11 @@
+    zn "%SYS"
+    Do ##class(Security.Users).UnExpireUserPasswords("*")
+
+    zn "USER"
+    do EnableDeepSee^%SYS.cspServer("/csp/user/")
+    
+    ; install samples-bi to have cubes with test data
+    zpm "install samples-bi"
+
+    ; load app
+    zpm "load /opt/irisapp"

iris.script

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="25">
+  <Document name="pivotsubscriptions.ZPM">
+    <Module>
+      <Name>pivotsubscriptions</Name>
+      <Description>Sample portlets for implementing charts from third party libraries in IRIS BI</Description>
+      <Version>1.8.1</Version>
+      <Packaging>module</Packaging>
+      <Resource Name="PivotSubscriptions.PKG"/>
+      <FileCopy Name="Assets/PivotSubscriptions_Cover.png" Target="${cspdir}broker/covers/PivotSubscriptions_Cover.png"/>
+      <Invokes>
+       <Invoke Class="PivotSubscriptions.Installer" Method="RunInstaller">
+        </Invoke>
+      </Invokes>
+    </Module>
+  </Document>
+</Export>