isis-git

Clone Tools
  • last updated 28 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
ISIS-993: tidying up GridImplementationService...

specifically:

- change lexical order of methods in GridImplementationServiceAbstract, per call hierarchy

- only generate a warning if in prototyping mode;

also:

- if obtaining the complete(...) or the minimal(...) grids, then instantiate a new grid (rather than using the one that might be being cached by GridFacetDefault) because these methods modify said grid object (complete(...) adds stuff, minimal(...) removes stuff).

ISIS-993: rationalizing and simplifying the domain services that support the dynamic layouts.

Specifically:

- new LayoutServiceMenu (formally was MetadataMenu), now delegates to ...

- renamed GridService to LayoutService, simplified and combined methods, but also added downloadLayouts for LayoutServiceMenu to call

- renamed GridNormalizerService to GridImplementationService

  1. … 6 more files in changeset.
ISIS-993: documentation on XML layouts.

ISIS-993: updating the components.xsd in docs directory

ISIS-1287: minor CSS fix for "are you sure" popup.

ISIS-993: extending grid structure to include offsets and allow multiple col-XX-nn to be defined per column.

Also tidied up the simpleapp:

- removed .layout.json for HomePageViewModel, replaced with a .layout.xml

- cleaned up SimpleObject (removing those test collections)

- removed SimpleObject#updateName action.

ISIS-993: updating javadoc is all.

ISIS-993: removing the ability to view the Grid as a view model (in its own right); no real use case for this functionality at the moment.

ISIS-993: fixing unit test from refactoring of SpecificationCacheDefault earlier

ISIS-993: ensure columns in tables are rendered in correct order (require eagerly obtaining grid); also when rendering, ignore any invalid properties/collections/actions.

ISIS-993: only include entities and view models' layouts in zip file from MetadataMenu#downloadLayouts (XML)

ISIS-993: minor refactoring of helper methos in GridNormalizerService implementations.

ISIS-993: ensure that actions associated to properties/collections/fieldsets are added in the correct order when normalizing grid.

ISIS-993: when normalize, bind actions to properties or field sets (if metadata not already specified as an annotation).

Merge branch 'master' into ISIS-993

# Conflicts:

# core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXml.java

# core/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java

ISIS-993: minor changes, working towards being able to generate .layout.xml for complete vs normalized vs minimal (no longer NPEs for complete etc), however...

... not yet correctly roundtripping for anything other than the complete .layout.xml.

ISIS-993: fixes to prevent SpecificationCacheDefault from getting out-of-whack (by mapping ObjectSpecId to className, rather than spec; can then use the className to look up the spec in turn).

This stuff came about because reloading of grid after change was only working if invalidated the class spec (= refresh twice).

ISIS-1314: adding @ParameterLayout to the DTO mixin (download) actions.

ISIS-1313: new 'commonSchemas' configuration parameter.

ISIS-1312: fix up the generated common schema.

ISIS-1311: split out Persistable_datanucleusVersion mixin into two, one for timestamps and one for longs (per different VersionStrategy in JDO annotation).

Also:

- remove the hideXxx() for Object_downloadLayoutXml mixin, will always be visible.

ISIS-933: fixing layout issues when the layout.xml HAS been specified...

* was adding in properties to fieldsets twice, even if already in the fieldset. (This bug because previously I had been focusing on getting the auto-add for non-referenced properties to work, based on @MemberOrder)

Also:

* ensuring that can reload dynamically without having to invalidate cache. This bug was due to the SpeificationCacheDefault ( which maintains two separate hashmaps to cache specs) getting out-of-whack internally ... specId holding one version of a spec, while className holding a different on.

* remove versionSequence from SimpleObject (as now have the Persistable_... mixins).

ISIS-1311: sorted out issue with Persistable mixins (return Long, not Object, otherwise trips up).

Also, fixed issue with tables that were incorrectly showing the datanucleusId and datanucleusVersion because of how check for HiddenFacets against mixin associations. Now generalized/improved the lookup of facet (had a different facetType key in the ObjectAssociationMixin compared to the underlying ObjectActionDefault).

ISIS-993: incidental, fix for Lombok with boolean properties (didn't find the @Property annotation).

ISIS-993: yet more sorting out of positioning of actions in right drop-down.

ISIS-993: further fixes to honour namedEscaped for property edit prompt.

ISIS-993: more sorting out of positioning of actions in right drop-down.

ISIS-993: honour namedEscaped for property edit prompt.

ISIS-993: responsibility for creating the default grid moved to GrdNormalizerService. Also Wicket viewer html layout fixes...

that is:

- tidying up of ScalarPanelAbstract html/layout, adding missing support for 'edit' button (and use fa-icon for that now, instead).

- removing spurious concurrency exception resulting from new implementation of edit functionality (from action whose button is rendered on panel).

  1. … 5 more files in changeset.
Replaced deprecated getPhase() with getEventPhase() in documentation