You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2022/05/06 09:40:25 UTC
[isis] branch master updated (386c48717b -> bb68d174dc)
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
from 386c48717b Merge pull request #922 from apache/ISIS-3037
new fc29a5f1ee ISIS-3041 blank added
new 0a3755f2e7 ISIS-2957 unused code removed
new 9c015cfca3 ISIS-3042 add PdfJs for KitchenSink
new 80db671f46 Merge branch 'master' of https://github.com/apache/isis
new bb68d174dc ISIS-3043 Upgrade Node / npm
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../components/userguide/modules/fun/pages/ui.adoc | 2 +-
bom/pom.xml | 4 +-
incubator/clients/kroviz/build.gradle.kts | 1 +
.../kroviz/utils/js/ChartjsPluginDatalabels.kt | 7 ---
.../apache/isis/client/kroviz/utils/js/PdfJs.kt | 67 ++++++++++++++++++++++
5 files changed, 71 insertions(+), 10 deletions(-)
delete mode 100644 incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/js/ChartjsPluginDatalabels.kt
create mode 100644 incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/js/PdfJs.kt
[isis] 03/05: ISIS-3042 add PdfJs for KitchenSink
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9c015cfca3e17097c6db26d3023fd458fad5d896
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Fri May 6 10:18:28 2022 +0200
ISIS-3042 add PdfJs for KitchenSink
---
incubator/clients/kroviz/build.gradle.kts | 1 +
.../apache/isis/client/kroviz/utils/js/PdfJs.kt | 67 ++++++++++++++++++++++
2 files changed, 68 insertions(+)
diff --git a/incubator/clients/kroviz/build.gradle.kts b/incubator/clients/kroviz/build.gradle.kts
index 944ffafcde..c4a35fdf48 100644
--- a/incubator/clients/kroviz/build.gradle.kts
+++ b/incubator/clients/kroviz/build.gradle.kts
@@ -106,6 +106,7 @@ kotlin {
implementation(npm("diff2html", "3.4.13", false))
implementation(npm("xml-beautify", "1.1.2", false))
implementation(npm("xterm", "4.15.0", false))
+ implementation(npm("pdfjs", "2.4.7", false))
}
sourceSets["test"].dependencies {
implementation(kotlin("test-js"))
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/js/PdfJs.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/js/PdfJs.kt
new file mode 100644
index 0000000000..b99e98106f
--- /dev/null
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/js/PdfJs.kt
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.client.kroviz.utils.js
+
+@JsModule("pdfjs")
+@JsNonModule
+// https://stackoverflow.com/questions/9328551/how-to-use-pdf-js
+external object PdfJs {
+// Fetch the PDF document from the URL using promises
+// PDFJS.getDocument('helloworld.pdf').then(function(pdf) {
+ // Using promise to fetch the page
+ // pdf.getPage(1).then(function(page) {
+ // var scale = 1.5;
+ // var viewport = page.getViewport(scale);
+
+ // Prepare canvas using PDF page dimensions
+ // var canvas = document.getElementById('the-canvas');
+ // var context = canvas.getContext('2d');
+ // canvas.height = viewport.height;
+ // canvas.width = viewport.width;
+
+ // Render PDF page into canvas context
+ // var renderContext = {
+ // canvasContext: context,
+ // viewport: viewport
+ // };
+ // page.render(renderContext);
+ // });
+ // });
+
+/* fun createDoc(): PdfJs {
+ var doc = PdfJs()
+ doc.text(20, 20, 'hello, I am PDF.');
+ doc.text(20, 30, 'i was created in the browser using javascript.');
+ doc.text(20, 40, 'i can also be created from node.js');
+
+ doc.setProperties({
+ title: 'A sample document created by pdf.js',
+ subject: 'PDFs are kinda cool, i guess',
+ author: 'Marak Squires',
+ keywords: 'pdf.js, javascript, Marak, Marak Squires',
+ creator: 'pdf.js'
+ });
+
+ doc.addPage();
+ doc.setFontSize(22);
+ doc.text(20, 20, 'This is a title');
+ doc.setFontSize(16);
+ doc.text(20, 30, 'This is some normal sized text underneath.');
+ }*/
+}
[isis] 02/05: ISIS-2957 unused code removed
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0a3755f2e79f26778f867633f59ddad54cfb70ac
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Fri May 6 10:10:34 2022 +0200
ISIS-2957 unused code removed
---
.../apache/isis/client/kroviz/utils/js/ChartjsPluginDatalabels.kt | 7 -------
1 file changed, 7 deletions(-)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/js/ChartjsPluginDatalabels.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/js/ChartjsPluginDatalabels.kt
deleted file mode 100644
index dfef22799c..0000000000
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/js/ChartjsPluginDatalabels.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.apache.isis.client.kroviz.utils.js
-
-@JsModule("chartjs-plugin-datalabels")
-@JsNonModule
-external class Datalabels {
-
-}
\ No newline at end of file
[isis] 04/05: Merge branch 'master' of https://github.com/apache/isis
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 80db671f465dd5cef6cff96db75821e22b4c4cc8
Merge: 9c015cfca3 386c48717b
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Fri May 6 11:37:48 2022 +0200
Merge branch 'master' of https://github.com/apache/isis
extensions/vw/pdfjs/fixtures/pom.xml | 7 -
.../isis/testdomain/jdo/JdoTestDomainPersona.java | 10 +-
.../isis/testdomain/jpa/JpaTestDomainPersona.java | 18 +--
.../pages/fixture-scripts/api-and-usage.adoc | 168 +++++++++------------
.../IsisIntegrationTestAbstractWithFixtures.java | 6 +-
.../applib/fixturescripts/FixtureScript.java | 10 +-
.../applib/fixturescripts/FixtureScripts.java | 6 +-
.../applib/personas/BuilderScriptAbstract.java | 2 +-
...{PersonaWithBuilderScript.java => Persona.java} | 24 ++-
.../applib/personas/PersonaWithBuilderScript.java | 4 +-
.../applib/setup/PersonaEnumPersistAll.java | 5 +-
.../fixtures/applib/personas/dom/Customer.java | 14 ++
.../applib/personas/dom/CustomerRepository.java | 21 +++
.../personas/fixtures/CustomerBuilderScript.java | 24 +++
.../applib/personas/fixtures/Customer_persona.java | 33 ++++
.../personas/fixtures/PersistAllFixtureScript.java | 26 ++++
.../personas/fixtures/ScenarioFixtureScript.java | 24 +++
17 files changed, 256 insertions(+), 146 deletions(-)
[isis] 01/05: ISIS-3041 blank added
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit fc29a5f1ee73945ff7d5feaa757096a91857920b
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Fri May 6 09:58:58 2022 +0200
ISIS-3041 blank added
---
antora/components/userguide/modules/fun/pages/ui.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/antora/components/userguide/modules/fun/pages/ui.adoc b/antora/components/userguide/modules/fun/pages/ui.adoc
index 64c5ef5dc1..414a97754c 100644
--- a/antora/components/userguide/modules/fun/pages/ui.adoc
+++ b/antora/components/userguide/modules/fun/pages/ui.adoc
@@ -12,7 +12,7 @@ The Apache Isis programming model includes several mechanisms to influence the w
* the layout of application menu items (inferred from xref:domain-entities-and-services.adoc#domain-services[domain services])
-* the layout of domain objects (xref:domain-entities-and-services.adoc#domain-entities[domain entities] andxref:view-modules.adoc[view models]
+* the layout of domain objects (xref:domain-entities-and-services.adoc#domain-entities[domain entities] and xref:view-modules.adoc[view models]
) allow the positioning of the xref:object-members.adoc[object members] into columns and tabs
* UI hints provided by the domain object itself returning:
[isis] 05/05: ISIS-3043 Upgrade Node / npm
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit bb68d174dc6126c7914ccd1fb4aa28c2377347ae
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Fri May 6 11:40:06 2022 +0200
ISIS-3043 Upgrade Node / npm
---
bom/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index fb083ba494..88f0334b95 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -415,8 +415,8 @@ under the License.
<!-- See https://nodejs.org/en/download/ for latest node and npm (lts)
versions -->
- <node.version>v16.14.2</node.version>
- <npm.version>8.5.0</npm.version>
+ <node.version>v16.15.0</node.version>
+ <npm.version>8.9.0</npm.version>
<objenesis.version>3.2</objenesis.version>
<ognl.version>3.3.2</ognl.version>