You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/11/12 11:28:28 UTC

[isis] branch master updated: ISIS-2877: pre-flight: first iteration on first menu 'Domain Objects'

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 0a8f8c4  ISIS-2877: pre-flight: first iteration on first menu 'Domain Objects'
0a8f8c4 is described below

commit 0a8f8c4268e9786f2551ba72ea71b2c65b56ec5e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Nov 12 12:28:20 2021 +0100

    ISIS-2877: pre-flight: first iteration on first menu 'Domain Objects'
---
 .../sitemap/SitemapServiceDefault.java             |  1 +
 .../usingjaxb/StatefulVmUsingJaxb-description.adoc |  2 +-
 .../objects/other/mixins/MixinVm-description.adoc  |  2 +-
 examples/demo/pre-flight.adoc                      | 77 +++++++++-------------
 4 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sitemap/SitemapServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sitemap/SitemapServiceDefault.java
index 8695edf..b4d9fce 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sitemap/SitemapServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sitemap/SitemapServiceDefault.java
@@ -151,6 +151,7 @@ public class SitemapServiceDefault implements SitemapService {
                                     adoc.append(String.format("_%s_\n\n", describedAs));
                                 });
                                 //FIXME[ISIS-2883] break down into element type as well
+                                //FIXME[ISIS-2883] also visit associated actions
                             });
                         }
                         @Override public void visit(final FieldSet fieldSet) {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb-description.adoc
index 60cc6cd..4a55786 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb-description.adoc
@@ -1,6 +1,6 @@
 :Notice: 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 ag [...]
 
-End users interact with link:https://isis.apache.org/userguide/${ISIS_VERSION}/fun/overview.html#view-models[view models] in the same as a domain entity.
+End users interact with link:https://isis.apache.org/userguide/${ISIS_VERSION}/fun/overview.html#view-models[view models] in the same way as domain entities.
 
 However, whereas domain entities are mapped to a datastore, view models are not.
 Instead they are recreated dynamically by serializing their state, typically into the URL itself.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm-description.adoc
index 9ea2a7b..11f24aa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm-description.adoc
@@ -2,7 +2,7 @@
 
 
 Mixins allow domain object behaviour to be encapsulated as a separate class.
-This behaviour isthen contributed to a target object as an action, property or collection.
+This behaviour is then contributed to a target object as an action, property or collection.
 
 Mixins only contribute behaviour, not state.
 In the case of a contributed property or collection, these are in effect _derived_.
diff --git a/examples/demo/pre-flight.adoc b/examples/demo/pre-flight.adoc
index 4f6e5ee..42610bd 100644
--- a/examples/demo/pre-flight.adoc
+++ b/examples/demo/pre-flight.adoc
@@ -1,7 +1,19 @@
-= Site-Map
+= Demo Pre-Flight Checklist
 
 :sectnums:
 
+[NOTE]
+====
+The entire checklist originates from a template export of the _Demo App_ itself.
+
+(Level 3) sections - once edited - are marked with a ✏, 
+to distinguish them from the yet untouched auto-generated ones.
+
+Once all sections have been edited, the ✏ marker can be removed.
+
+✔ indicates a section where all checks are green-lighted.
+==== 
+
 == Domain Objects
 
 === @DomainObject
@@ -24,12 +36,14 @@ _Default editability of properties_
 
 WARNING: Returns scalar of: `void`
 
-==== Entity Change Publishing
+==== Entity Change Publishing ✏
 
 _Entity changed events as XML_
 
 Returns scalar of: `demo.DomainObjectEntityChangePublishingVm`
 
+WARNING: _Work in Progress_ - should show pretty rendered Change Publishing DTOs, but yet does not 
+
 ===== Top-Bar
 
 * [ ] Action `Create` _Creates one publishing enabled entity and one publishing disabled entity_
@@ -40,9 +54,6 @@ Returns scalar of: `demo.DomainObjectEntityChangePublishingVm`
 
 * [ ] Action `Clear` 
 
-===== FieldSet 
-
-* [ ] Property `Sources` 
 
 ===== Collection Publishing Enabled Annotated Entities
 
@@ -52,26 +63,23 @@ Returns scalar of: `demo.DomainObjectEntityChangePublishingVm`
 
 ===== Collection Publishing Enabled Meta Annot Overridden Entities
 
-===== FieldSet Description
-
-* [ ] Action `Clear Hints` 
-
-* [ ] Property `Description` 
-
 ==== Mixin Method
 
 _For mixins, override the default method name_
 
 WARNING: Returns scalar of: `void`
 
-==== Nature Stateful ✔ 
+==== Nature Stateful ✏ 
 
 _@DomainObject(nature=VIEW_MODEL) for a Stateful View Model_
 
 Returns scalar of: `demo.StatefulVmUsingJaxb`
 
 ===== Collection Children
-* [x] Test: add Child(ren) 
+* [x] Test: add Child(ren)
+* [ ] Test: click on the viewmodel's title, should render the very same thing
+
+IMPORTANT: renders an empty object (JAXB serialization is not working as expected here)   
 * [ ] Test: open a Child, then return to previous page (browser back button)
 
 [IMPORTANT]
@@ -88,31 +96,19 @@ Returns scalar of: `demo.StatefulVmUsingJaxb`
 ==== 
 * [x] Test: remove Child(ren)
 
-==== Nature Stateful Refs Entity
+==== Nature Stateful Refs Entity ✏
 
 _@DomainObject(nature=VIEW_MODEL) for a Stateful View Model referencing an entity_
 
 Returns scalar of: `demo.StatefulViewModelJaxbRefsEntity`
 
-===== FieldSet 
-
-* [ ] Property `Sources` 
-
-===== FieldSet General
-
-* [ ] Property `Message` 
-
 ===== FieldSet Other
 
 * [ ] Property `Favorite Child` 
 
 ===== Collection Children
 
-===== FieldSet Description
-
-* [ ] Action `Clear Hints` 
-
-* [ ] Property `Description` 
+WARNING: Demo not implemented.
 
 ==== Logical Type Name
 
@@ -184,49 +180,38 @@ WARNING: Returns scalar of: `void`
 
 === Other
 
-==== Mixins
+==== Mixins ✏✔
 
 _Contribute behaviour to domain objects_
 
 Returns scalar of: `demo.MixinVm`
 
-===== FieldSet 
-
-* [ ] Property `Sources` 
+* [x] Test: click on the viewmodel's title, should render the very same thing
 
 ===== FieldSet Actions
 
-* [ ] Property `Count` 
+* [x] Property `Count` should be rendered readonly with value `10` 
 
 ===== FieldSet Properties
 
-* [ ] Property `Explanation` 
+* [x] Property `Explanation` should be rendered readonly with value `The collection shows the first 10 fibonacci numbers` 
 
 ===== Collection Fibonacci Sequence
 
-===== FieldSet Description
-
-* [ ] Action `Clear Hints` 
-
-* [ ] Property `Description` 
+* [x] Table should be rendered with two columns `Number` and `Fibonacci` showing the first 10 of the sequence. Last = {10, 55}. 
 
-==== Embedded Types
+==== Embedded Types ✏
 
 _Experimental support for embedded types_
 
 Returns scalar of: `demo.EmbeddedTypeVm`
 
-===== FieldSet 
-
-* [ ] Property `Sources` 
+WARNING: _Work in Progress_ `ISIS-2877` - Support for Value Type Composition
 
 ===== Collection All Constants
 
-===== FieldSet Description
+* [ ] Table should be rendered with 3 value-type entries, that have an icon and a title 
 
-* [ ] Action `Clear Hints` 
-
-* [ ] Property `Description` 
 
 == Actions