Merge branch 'master' into UX-136/plugin-error-boundary

dhis2 · Jun 24, 2024 · 9147265 · 9147265
2 parents 4c528be + 7c531f2
commit 9147265
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [3.10.5](https://github.com/dhis2/app-runtime/compare/v3.10.4...v3.10.5) (2024-06-24)
+
+
+### Bug Fixes
+
+* update plugin sizing definition ([#1383](https://github.com/dhis2/app-runtime/issues/1383)) ([266dc49](https://github.com/dhis2/app-runtime/commit/266dc49423516189cf4dee706cc78e720af744e2))
+
 ## [3.10.4](https://github.com/dhis2/app-runtime/compare/v3.10.3...v3.10.4) (2024-04-09)
 
 

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-    "version": "3.10.4",
+    "version": "3.10.5",
     "description": "A singular runtime dependency for applications on the DHIS2 platform",
     "repository": "https://github.com/dhis2/app-runtime.git",
     "author": "Austin McGee <austin@dhis2.org>",

diff --git a/runtime/package.json b/runtime/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@dhis2/app-runtime",
     "description": "A singular runtime dependency for applications on the DHIS2 platform",
-    "version": "3.10.4",
+    "version": "3.10.5",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "types": "./build/types/index.d.ts",
@@ -29,11 +29,11 @@
         "build/**"
     ],
     "dependencies": {
-        "@dhis2/app-service-config": "3.10.4",
-        "@dhis2/app-service-data": "3.10.4",
-        "@dhis2/app-service-alerts": "3.10.4",
-        "@dhis2/app-service-offline": "3.10.4",
-        "@dhis2/app-service-plugin": "3.10.4"
+        "@dhis2/app-service-config": "3.10.5",
+        "@dhis2/app-service-data": "3.10.5",
+        "@dhis2/app-service-alerts": "3.10.5",
+        "@dhis2/app-service-offline": "3.10.5",
+        "@dhis2/app-service-plugin": "3.10.5"
     },
     "peerDependencies": {
         "prop-types": "^15.7.2",

diff --git a/services/alerts/package.json b/services/alerts/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/app-service-alerts",
-    "version": "3.10.4",
+    "version": "3.10.5",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "types": "./build/types/index.d.ts",

diff --git a/services/config/package.json b/services/config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/app-service-config",
-    "version": "3.10.4",
+    "version": "3.10.5",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "types": "build/types/index.d.ts",

diff --git a/services/data/package.json b/services/data/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/app-service-data",
-    "version": "3.10.4",
+    "version": "3.10.5",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "types": "build/types/index.d.ts",
@@ -35,7 +35,7 @@
         "react-query": "^3.13.11"
     },
     "peerDependencies": {
-        "@dhis2/app-service-config": "3.10.4",
+        "@dhis2/app-service-config": "3.10.5",
         "prop-types": "^15.7.2",
         "react": "^16.8",
         "react-dom": "^16.8"

diff --git a/services/offline/package.json b/services/offline/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@dhis2/app-service-offline",
     "description": "A runtime service for online/offline detection and offline caching",
-    "version": "3.10.4",
+    "version": "3.10.5",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "types": "build/types/index.d.ts",
@@ -33,7 +33,7 @@
         "coverage": "yarn test --coverage"
     },
     "peerDependencies": {
-        "@dhis2/app-service-config": "3.10.4",
+        "@dhis2/app-service-config": "3.10.5",
         "prop-types": "^15.7.2",
         "react": "^16.8.6",
         "react-dom": "^16.8.6"

diff --git a/services/plugin/package.json b/services/plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/app-service-plugin",
-    "version": "3.10.4",
+    "version": "3.10.5",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "types": "build/types/index.d.ts",
@@ -28,8 +28,8 @@
         "prop-types": "^15.7.2",
         "react": "^16.8.6",
         "react-dom": "^16.8.6",
-        "@dhis2/app-service-alerts": "3.10.4",
-        "@dhis2/app-service-data": "3.10.4"
+        "@dhis2/app-service-alerts": "3.10.5",
+        "@dhis2/app-service-data": "3.10.5"
     },
     "devDependencies": {
         "@types/post-robot": "^10.0.3"

diff --git a/services/plugin/src/Plugin.tsx b/services/plugin/src/Plugin.tsx
@@ -153,23 +153,16 @@ export const Plugin = ({
 
     if (pluginEntryPoint) {
         return (
-            <div
+            <iframe
+                ref={iframeRef}
+                src={pluginSource}
                 style={{
-                    height: `${pluginHeight}px`,
                     width: `${pluginWidth}px`,
+                    height: `${pluginHeight}px`,
+                    border: 'none',
                 }}
-            >
-                <iframe
-                    ref={iframeRef}
-                    src={pluginSource}
-                    style={{
-                        width: '100%',
-                        height: '100%',
-                        border: 'none',
-                    }}
-                    allow="clipboard-write"
-                ></iframe>
-            </div>
+                allow="clipboard-write"
+            ></iframe>
         )
     }