September 2022 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.7
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT pushed new branch release/9.0.7 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/9.0.7 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.0.7 [skip CI]
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f78c8d38 by Tony Chemit at 2022-09-12T00:53:34+02:00 Update changelog for v.9.0.7 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-09-11 20:03. + * Last generated at 2022-09-12 00:53. ## Version [9.0.7](https://gitlab.com/ultreiaio/ird-observe/-/milestones/232) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f78c8d3879bc9e77c865da4d2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f78c8d3879bc9e77c865da4d2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Update changelog for v.9.0.7 [skip CI]
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: df376a3f by Tony Chemit at 2022-09-11T20:04:04+02:00 Update changelog for v.9.0.7 [skip CI] - - - - - 553ce875 by Tony Chemit at 2022-09-11T20:23:37+02:00 update hibernate - - - - - 355d696b by Tony Chemit at 2022-09-11T20:34:39+02:00 update pom - - - - - a9be2e1d by Tony Chemit at 2022-09-11T22:35:16+02:00 Problème lors d'un déplacement de toutes les données d'une marée Senne - Close #2428 - - - - - e6cebd5e by Tony Chemit at 2022-09-11T23:24:38+02:00 Persistence - Improve ReplicatePlan (required types should be replace when possible) - See #2428 - - - - - f2f53e78 by Tony Chemit at 2022-09-12T00:38:25+02:00 Merge branch 'feature/features/fix_replication_sql_2428' into develop - - - - - 9 changed files: - CHANGELOG.md - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlReplicatePlanModel.json - pom.xml - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/TopiaEntitySqlModelResource.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/consumer/DeletePartialEntityConsumer.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/consumer/DuplicateEntityConsumer.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/consumer/ReplicateEntityWork.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/consumer/ReplicateEntityWorkContext.java - toolkit/templates/src/main/java/org/nuiton/topia/templates/sql/plan/TopiaEntitySqlReplicatePlanBuilder.java Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-09-02 19:20. + * Last generated at 2022-09-11 20:03. ## Version [9.0.7](https://gitlab.com/ultreiaio/ird-observe/-/milestones/232) @@ -15,15 +15,25 @@ ### Issues * [[Type::Anomalie 2324]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2324) **Ouverture de base impossible selon configuration précédente de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2327]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2327) **Clé de libellé non traduite en anglais sur la page de synchrod e la synchro avancée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2331]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2331) **Erreur après une mise à jour simple de référentiel de la base locale** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2340]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2340) **La taille de la fenêtre de configuration de l'arbre de navigation tronque les boutons du bas si on passe du module PS vers LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2381]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2381) **Connection manager, bases distantes, champs non visibles sous Windows** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2399]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2399) **Problème SSL - en attente - ne s'est pas reproduit** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) * [[Type::Anomalie 2411]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2411) **HResponseErrorException / InvalidAuthenticationTokenException en 9.0.6 en quittant l'application** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2412]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2412) **Certains services sont encore en GET alors qu'ils devraient être en POST** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2415]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2415) **Erreur lors du rechargement de la source si token expiré** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2416]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2416) **La boîte 'A propos' ne fontionne pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2419]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2419) **Erreur de migration de l'espèce AVDTH 8 de CAPT_ELEM vers ps_logbook.catch** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2420]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2420) **Statut de la doc de mapping des espèces AVDTH/ObServe** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2423]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2423) **Erreur calcul des données sur V9** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) * [[Type::Anomalie 2427]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2427) **Erreur de type de mesure sur les échantillons AVDTH migrés** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2428]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2428) **Problème lors d'un déplacement de toutes les données d'une marée Senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 1248]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1248) **Mise à jour du module cartographie avec les nouvelles données** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) * [[Type::Evolution 1751]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1751) **Mettre un sablier lors de l'ouverture si le nœud a beaucoup de données à charger.** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 1866]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1866) **Remplir les données depuis AVDTH** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2104]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2104) **On pourrait avoir un service de génération de topiaid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2223]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2223) **Ajouter une action nouvelle marée dans l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2225]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2225) **Bien gérer le repositionnement dans l'arbre de navigation d'une marée suite à une sauvegarde si le critère a été modifié** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2232]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2232) **Dans l'UI des profils de connexion, trimmer les espaces** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2259]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2259) **Dans l'assistant rapport, ajouter un export CSV** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2293]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2293) **Il serait intéressant de permettre l'absence de base déclarée par défaut** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ===================================== core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlReplicatePlanModel.json ===================================== @@ -898,6 +898,7 @@ "from": "WHERE sampleActivity.sample %s", "parentColumnName": "sample", "columnNames": "topiaId,topiaCreateDate,topiaVersion,lastUpdateDate,homeId,weightedWeight,activity,sample", + "columnsToDetach": "activity~ps_logbook.activity", "requiredTypes": "ps_logbook.activity" }, { @@ -926,6 +927,7 @@ "from": "WHERE sampleActivity.topiaId %s", "parentColumnName": "sample", "columnNames": "topiaId,topiaCreateDate,topiaVersion,lastUpdateDate,homeId,weightedWeight,activity,sample", + "columnsToDetach": "activity~ps_logbook.activity", "requiredTypes": "ps_logbook.activity", "entryPoint": true } @@ -969,6 +971,7 @@ "from": "WHERE wellPlan.topiaId %s", "parentColumnName": "trip", "columnNames": "topiaId,topiaCreateDate,topiaVersion,trip_idx,lastUpdateDate,homeId,well,weight,activity,species,weightCategory,wellSamplingConformity,wellSamplingStatus,trip", + "columnsToDetach": "activity~ps_logbook.activity", "requiredTypes": "ps_logbook.activity", "entryPoint": true } ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.84</version> + <version>2022.85</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -119,7 +119,7 @@ <lib.version.h2>1.4.196</lib.version.h2>   - <lib.version.hibernate>5.6.10.Final</lib.version.hibernate> + <lib.version.hibernate>5.6.11.Final</lib.version.hibernate>  <lib.version.jaxb-api>2.4.0-b180830.0359</lib.version.jaxb-api> <lib.version.jaxb-runtime>2.4.0-b180830.0438</lib.version.jaxb-runtime> ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/TopiaEntitySqlModelResource.java ===================================== @@ -86,10 +86,6 @@ public interface TopiaEntitySqlModelResource { TopiaEntitySqlBlobModel getBlobModel(); -// TopiaMetadataModel getMetaModel(); - -// TopiaMetadataModelPaths getMetaModelPaths(); - Set<ReplicatePartialRequestCallback> getReplicatePartialRequestCallbacks(); Set<ReplicateRequestCallback> getReplicateRequestCallbacks(); ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/consumer/DeletePartialEntityConsumer.java ===================================== @@ -42,10 +42,6 @@ import java.util.Set; public class DeletePartialEntityConsumer implements SqlRequestConsumer<DeletePartialEntityRequest> { public static final String DELETE_REVERSE_ASSOCIATION_STATEMENT = "UPDATE %1$s _main SET _main.%2$s = NULL WHERE _main.%2$s %3$s;"; - //fr.ird.data.ps.logbook.Route#1616767950667#0.2733836567509864 30/03/2019 - //fr.ird.data.ps.observation.Activity#1554021069610#0.2462353141793846 - //fr.ird.data.ps.logbook.Activity#1616767975989#0.4873500558653976 - @Override public void consume(DeletePartialEntityRequest request, SqlRequestSetConsumerContext context) { TopiaEntitySqlDeletePlan deletePlan = request.getDeletePlan(); @@ -57,12 +53,12 @@ public class DeletePartialEntityConsumer implements SqlRequestConsumer<DeletePar SqlScriptWriter writer = context.getWriter(); for (TopiaEntitySqlDeletePlanTask task : deletePlan) { if (task.accept(shell)) { - consume(context, writer, ids, task, detachTasksMapping == null ? null : detachTasksMapping.get(task.getGav())); + consume(writer, ids, task, detachTasksMapping == null ? null : detachTasksMapping.get(task.getGav())); } } } - protected void consume(SqlRequestSetConsumerContext context, SqlScriptWriter writer, String ids, TopiaEntitySqlDeletePlanTask task, Map<String, Set<String>> detachTasks) { + protected void consume(SqlScriptWriter writer, String ids, TopiaEntitySqlDeletePlanTask task, Map<String, Set<String>> detachTasks) { String deleteSql = task.getDeleteSql(); String realDeleteSql = task.applyIds(deleteSql, ids); if (detachTasks != null) { ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/consumer/DuplicateEntityConsumer.java ===================================== @@ -25,11 +25,9 @@ package org.nuiton.topia.service.sql.internal.consumer; import org.nuiton.topia.service.sql.internal.SqlRequestConsumer; import org.nuiton.topia.service.sql.internal.SqlRequestSetConsumerContext; import org.nuiton.topia.service.sql.internal.request.DuplicateEntityRequest; -import org.nuiton.topia.service.sql.internal.request.ReplicateEntityRequest; import org.nuiton.topia.service.sql.model.TopiaEntitySqlSelectArgument; import org.nuiton.topia.service.sql.plan.replicate.TopiaEntitySqlReplicatePlan; import org.nuiton.topia.service.sql.plan.replicate.TopiaEntitySqlReplicatePlanTask; -import org.nuiton.topia.service.sql.request.ReplicateRequestCallback; import java.util.Set; ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/consumer/ReplicateEntityWork.java ===================================== @@ -75,8 +75,7 @@ class ReplicateEntityWork implements SqlWork { this.columnNames = task.getColumnNames(); String selectClause = SqlRequestConsumer.getSelectClause(task.getTableName(), columnNames); this.sql = TopiaEntitySqlReplicatePlanTask.applyIds(task.getSelectSql(), selectClause, ids); - - this.blobsBuilder = context().initBlobsBuilder(task.useBlob(), task.getSchemaAndTableName()); + this.blobsBuilder = context.initBlobsBuilder(task.useBlob(), task.getSchemaAndTableName()); this.blobColumns = blobsBuilder.keySet(); this.insertStatementSql = SqlRequestConsumer.newInsertStatementSql(task.getInsertSql(), columnNames, blobColumns); this.columnsToReplace = task.getColumnsToReplace(); @@ -95,11 +94,16 @@ class ReplicateEntityWork implements SqlWork { this.parentColumnName = parentColumnName; this.entryPoint = task.isEntryPoint(); Set<String> shell = context.getShell(); - // need to detach only when not in shell + // need to detach only when not in shell, otherwise replace this.columnsToDetach = new LinkedHashSet<>(); for (Map.Entry<String, String> entry : task.getColumnsToDetachSimple()) { - if (!shell.contains(entry.getValue())) { - columnsToDetach.add(entry.getKey()); + String otherGav = entry.getValue(); + String columnName = entry.getKey(); + if (!shell.contains(otherGav)) { + columnsToDetach.add(columnName); + } else { + // do replace + columnsToReplace.add(columnName); } } this.recursiveProperty = task.getRecursiveColumnName().orElse(null); @@ -114,10 +118,10 @@ class ReplicateEntityWork implements SqlWork { this.columnNames = task.getColumnNames(); String selectClause = SqlRequestConsumer.getSelectClause(task.getTableName(), columnNames); this.sql = TopiaEntitySqlReplicatePlanTask.applyIds(partialTask.getCopyTask().getSelectSql(), selectClause, ids); - this.blobsBuilder = context().initBlobsBuilder(task.useBlob(), task.getSchemaAndTableName()); + this.blobsBuilder = context.initBlobsBuilder(task.useBlob(), task.getSchemaAndTableName()); this.blobColumns = blobsBuilder.keySet(); this.insertStatementSql = SqlRequestConsumer.newInsertStatementSql(task.getInsertSql(), columnNames, blobColumns); - this.columnsToReplace = task.getColumnsToReplace(); + this.columnsToReplace = new LinkedHashSet<>(task.getColumnsToReplace()); List<String> parentColumnNames = task.getParentColumnName(); String parentColumnName = null; if (parentColumnNames.size() == 1) { @@ -133,11 +137,16 @@ class ReplicateEntityWork implements SqlWork { this.parentColumnName = parentColumnName; this.entryPoint = task.isEntryPoint(); Set<String> shell = context.getShell(); - // need to detach only when not in shell + // need to detach only when not in shell, otherwise replace this.columnsToDetach = new LinkedHashSet<>(); for (Map.Entry<String, String> entry : task.getColumnsToDetachSimple()) { - if (!shell.contains(entry.getValue())) { - columnsToDetach.add(entry.getKey()); + String otherGav = entry.getValue(); + String columnName = entry.getKey(); + if (!shell.contains(otherGav)) { + columnsToDetach.add(columnName); + } else { + // do replace + columnsToReplace.add(columnName); } } this.recursiveProperty = task.getRecursiveColumnName().orElse(null); @@ -168,7 +177,7 @@ class ReplicateEntityWork implements SqlWork { public void execute(Connection connection) throws SQLException { long t0 = TimeLog.getTime(); try (PreparedStatement statement = connection.prepareStatement(sql)) { - statement.setFetchSize(context.context().getReadFetchSize()); + statement.setFetchSize(context.getReadFetchSize()); try (ResultSet resultSet = statement.executeQuery()) { if (recursiveProperty == null) { simpleCopy(statement, resultSet); @@ -199,7 +208,7 @@ class ReplicateEntityWork implements SqlWork { parents.put(key == null ? sentinel : key, topiaId); requestsByTopiaId.put(topiaId, sql); } - List<String> orderedTopiaIds = context().generateOrder(parents, sentinel); + List<String> orderedTopiaIds = context.generateOrder(parents, sentinel); if (orderedTopiaIds.size() != requestsByTopiaId.size()) { throw new IllegalStateException("Mismatch ids size!!!"); } @@ -251,11 +260,6 @@ class ReplicateEntityWork implements SqlWork { String stringValue = (String) columnValue; if (entryPoint && stringValue.equals(oldParentId)) { argumentsBuilder.append(", NULL"); -// if (newParentId.toLowerCase().contains("." + columnName + "#")) { -// argumentsBuilder.append(", '").append(newParentId).append("'"); -// } else { -// argumentsBuilder.append(", NULL"); -// } continue; } argumentsBuilder.append(", '").append(stringValue.replaceAll("'", "''")).append("'"); @@ -270,7 +274,7 @@ class ReplicateEntityWork implements SqlWork { for (String columnName : blobColumns) { Object columnValue = resultSet.getObject(columnName); if (blobColumns.contains(columnName)) { - context().copyBlob(statement, rowTopiaId, columnValue, blobsBuilder.get(columnName)); + context.copyBlob(statement, rowTopiaId, columnValue, blobsBuilder.get(columnName)); } } String arguments = argumentsBuilder.substring(2); ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/internal/consumer/ReplicateEntityWorkContext.java ===================================== @@ -22,10 +22,15 @@ package org.nuiton.topia.service.sql.internal.consumer; * #L% */ +import com.google.common.collect.Multimap; +import io.ultreia.java4all.util.sql.BlobsContainer; import io.ultreia.java4all.util.sql.SqlScriptWriter; import org.nuiton.topia.persistence.TopiaIdFactoryForBulkSupport; import org.nuiton.topia.service.sql.internal.SqlRequestSetConsumerContext; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; @@ -86,4 +91,20 @@ class ReplicateEntityWorkContext { public void writeSql(String sql) { writer.writeSql(sql); } + + public Map<String, BlobsContainer.Builder> initBlobsBuilder(boolean useBlob, String schemaAndTableName) { + return context.initBlobsBuilder(useBlob, schemaAndTableName); + } + + public int getReadFetchSize() { + return context.getReadFetchSize(); + } + + public void copyBlob(PreparedStatement preparedStatement, String topiaId, Object columnValue, BlobsContainer.Builder blobsBuilder) throws SQLException { + context.copyBlob(preparedStatement, topiaId, columnValue, blobsBuilder); + } + + public List<String> generateOrder(Multimap<String, String> parents, String sentinel) { + return context.generateOrder(parents, sentinel); + } } ===================================== toolkit/templates/src/main/java/org/nuiton/topia/templates/sql/plan/TopiaEntitySqlReplicatePlanBuilder.java ===================================== @@ -136,25 +136,24 @@ public class TopiaEntitySqlReplicatePlanBuilder { throw new IllegalArgumentException(String.format("Can't manage with this case: %s", parentColumnNames)); } } +// Set<String> requiredTypes = new LinkedHashSet<>(); Set<String> requiredTypes = new LinkedHashSet<>(); - Set<String> realRequiredTypes = new LinkedHashSet<>(); String literalName = metadataEntity.getType(); if (mandatoryReverseCompositions.containsKey(literalName)) { for (TopiaMetadataComposition composition : mandatoryReverseCompositions.get(literalName)) { String type = composition.getTarget().getType(); if (missingTypes.contains(type)) { - requiredTypes.add(type); - realRequiredTypes.add(composition.getTarget().getSchemaAndTableName()); + requiredTypes.add(composition.getTarget().getSchemaAndTableName()); } } } List<String> columNames = List.copyOf(table.getAuthorizedColumnNames()); Set<String> columnsToDetach = new LinkedHashSet<>(); for (Map.Entry<String, String> entry : metadataEntity.getManyToOneAssociations().entrySet()) { - addSpecialColumns(columnsToReplace, columnsToDetach, requiredTypes, entry); + addSpecialColumns(columnsToReplace, columnsToDetach, entry); } for (Map.Entry<String, String> entry : metadataEntity.getReversedAssociations().entrySet()) { - addSpecialColumns(columnsToReplace, columnsToDetach, requiredTypes, entry); + addSpecialColumns(columnsToReplace, columnsToDetach, entry); } // the parent column is always to replace parentColumnNames.forEach(columnsToReplace::remove); @@ -167,7 +166,7 @@ public class TopiaEntitySqlReplicatePlanBuilder { columNames, columnsToReplace, columnsToDetach, - realRequiredTypes, + requiredTypes, useBlob, mainTable, recursiveColumnName)); @@ -228,12 +227,12 @@ public class TopiaEntitySqlReplicatePlanBuilder { null)); } - private void addSpecialColumns(Set<String> columnsToReplace, Set<String> columnsToDetach, Set<String> requiredTypes, Map.Entry<String, String> entry) { + private void addSpecialColumns(Set<String> columnsToReplace, Set<String> columnsToDetach, Map.Entry<String, String> entry) { String literalName = entry.getValue(); if (literals.contains(literalName)) { // this one need to be replace columnsToReplace.add(entry.getKey()); - } else if (!standaloneLiterals.contains(literalName) && !requiredTypes.contains(literalName)) { + } else if (!standaloneLiterals.contains(literalName)) {// && !requiredTypes.contains(literalName)) { // this one need to be detach int endIndex = literalName.lastIndexOf("_"); String columnDefinition = entry.getKey() + "~" + literalName.substring(0, endIndex) + "." + Introspector.decapitalize(literalName.substring(endIndex + 1)); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d685e4aa9f7585b1cc15eaf7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d685e4aa9f7585b1cc15eaf7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Client - (on delete - reset) Bien gérer le repositionnement dans l'arbre de...
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2a76de06 by Tony Chemit at 2022-09-11T17:53:48+02:00 Client - (on delete - reset) Bien gérer le repositionnement dans l'arbre de navigation d'une marée suite à une sauvegarde si le critère a été modifié (See #2225) - - - - - bd51e3a9 by Tony Chemit at 2022-09-11T18:11:06+02:00 Client - decorate missing groupBy node dto - See #2225 - - - - - e0df1a24 by Tony Chemit at 2022-09-11T18:17:39+02:00 Client - (on update) Bien gérer le repositionnement dans l'arbre de navigation d'une marée suite à une sauvegarde si le critère a été modifié (See #2225) - - - - - d685e4aa by Tony Chemit at 2022-09-11T18:17:48+02:00 Merge branch 'feature/features/navigation_tree_review_limit_cases' into develop Close #2225 - - - - - 5 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRootTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/reset/DefaultResetAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/actions/SaveContentRootOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRootTreeAdapter.java ===================================== @@ -45,10 +45,14 @@ public abstract class DeleteRootTreeAdapter<OldParent extends NavigationNode> ex @Override public void removeChildren(NavigationUI navigationUI, OldParent parentNode, Set<String> ids) { super.removeChildren(navigationUI, parentNode, ids); - RootNavigationInitializer initializer = (RootNavigationInitializer) parentNode.getRoot().getInitializer(); + NavigationNode rootNode = parentNode.getRoot(); + RootNavigationInitializer initializer = (RootNavigationInitializer) rootNode.getInitializer(); boolean removeGroupBy = parentNode.getChildCount() == 0 && !initializer.getRequest().isLoadEmptyGroupBy(); if (removeGroupBy) { parentNode.removeFromParent(); + if (rootNode.isNotLeaf()) { + navigationUI.getTree().selectFirstNode(); + } } NavigationUIHandler.updateStatistics(navigationUI, removeGroupBy ? -1 : 0, -ids.size()); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/reset/DefaultResetAdapter.java ===================================== @@ -25,9 +25,11 @@ package fr.ird.observe.client.datasource.editor.api.content.actions.reset; import fr.ird.observe.client.datasource.editor.api.content.ContentUI; import fr.ird.observe.client.datasource.editor.api.content.ContentUIHandler; import fr.ird.observe.client.datasource.editor.api.content.ContentUIModel; +import fr.ird.observe.client.datasource.editor.api.content.data.rlist.ContentRootListUINavigationNode; import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.root.RootNavigationInitializer; /** * Created on 19/10/2020. @@ -45,6 +47,18 @@ public class DefaultResetAdapter<U extends ContentUI> implements ResetAdapter<U> NavigationTree tree = handler.getNavigationTree(); NavigationNode parentNode = tree.getSelectedNode().getParent(); tree.getSelectedNode().removeFromParent(); + if (parentNode instanceof ContentRootListUINavigationNode) { + NavigationNode rootNode = parentNode.getRoot(); + RootNavigationInitializer initializer = (RootNavigationInitializer) rootNode.getInitializer(); + boolean removeGroupBy = parentNode.getChildCount() == 0 && !initializer.getRequest().isLoadEmptyGroupBy(); + if (removeGroupBy) { + parentNode.removeFromParent(); + if (rootNode.isNotLeaf()) { + tree.selectFirstNode(); + } + return; + } + } tree.reloadAndSelectSafeNode(parentNode); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUINavigationInitializer.java ===================================== @@ -40,7 +40,7 @@ import java.util.function.Supplier; */ public final class ContentRootOpenableUINavigationInitializer extends NavigationInitializer<ContentRootOpenableUINavigationContext> { - private final Supplier<? extends DataGroupByDto<?>> parentReference; + private Supplier<? extends DataGroupByDto<?>> parentReference; private DataDtoReference reference; private Decorator decorator; @@ -104,6 +104,10 @@ public final class ContentRootOpenableUINavigationInitializer extends Navigation return getSelectId() == null; } + public void setParentReference(Supplier<? extends DataGroupByDto<?>> parentReference) { + this.parentReference = Objects.requireNonNull(parentReference); + } + public void setReference(DataDtoReference reference) { this.reference = Objects.requireNonNull(reference); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/actions/SaveContentRootOpenableUIAdapter.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data.ropen.actions; import fr.ird.observe.client.datasource.editor.api.DataSourceEditor; import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveUIAdapter; +import fr.ird.observe.client.datasource.editor.api.content.data.rlist.ContentRootListUINavigationNode; import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRootOpenableUI; import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRootOpenableUIModel; import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRootOpenableUINavigationNode; @@ -31,11 +32,15 @@ import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationUIHandler; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import fr.ird.observe.client.datasource.editor.api.navigation.tree.capability.ReferenceContainerCapability; +import fr.ird.observe.client.datasource.editor.api.navigation.tree.root.RootNavigationNode; +import fr.ird.observe.dto.data.DataGroupByDto; import fr.ird.observe.dto.data.RootOpenableDto; import fr.ird.observe.dto.reference.DataDtoReference; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.Objects; + /** * Created on 16/10/2020. * @@ -53,9 +58,17 @@ public class SaveContentRootOpenableUIAdapter<D extends RootOpenableDto, U exten ui.stopEdit(); ContentRootOpenableUINavigationNode node = model.getSource(); + + // get old groupBy dto + @SuppressWarnings("unchecked") DataGroupByDto<D> oldGroupByDto = (DataGroupByDto<D>) node.getParentReference(); + + // new groupBy value + String newGroupByValue = oldGroupByDto.definition().toGroupByValue(bean, ((RootNavigationNode) node.getRoot()).getInitializer().getRequest().getGroupByFlavor()); + // is groupBy has changed? + boolean groupByChanged = !Objects.equals(oldGroupByDto.getFilterValue(), newGroupByValue); // We need to inject ot node the new reference (it could does not know the id if not persisted) // As I prefer to use a unique code (for persisted or not, keep it like this) - updateReference(node, bean.getId()); + updateReference(node, bean.getId(), oldGroupByDto, groupByChanged ? newGroupByValue : null); NavigationTree tree = dataSourceEditor.getNavigationUI().getTree(); tree.reSelectSafeNodeThen(node, () -> { @@ -67,11 +80,32 @@ public class SaveContentRootOpenableUIAdapter<D extends RootOpenableDto, U exten }); } - - public void updateReference(ContentRootOpenableUINavigationNode node, String id) { + public void updateReference(ContentRootOpenableUINavigationNode node, + String id, + DataGroupByDto<D> oldGroupByDto, + String newGroupByValue) { boolean notPersisted = node.getInitializer().isNotPersisted(); NavigationNode parent = node.getParent(); - int oldPosition = parent.getIndex(node); + boolean groupByChanged = newGroupByValue != null; + if (groupByChanged) { + // groupBy has changed (remove node from parent) + RootNavigationNode rootNode = (RootNavigationNode) node.getRoot(); + node.removeFromParent(); + // remove old parent node if navigation tree config requires it + boolean removeGroupBy = parent.getChildCount() == 0 && !rootNode.getInitializer().getRequest().isLoadEmptyGroupBy(); + if (removeGroupBy) { + parent.removeFromParent(); + } else { + // update old parent to root + parent.reloadNodeDataToRoot(); + } + // find new parent + parent = rootNode.findChildById(newGroupByValue, true); + // update parent reference in node + DataGroupByDto<?> parentReference = ((ContentRootListUINavigationNode) parent).getInitializer().getParentReference(); + node.getInitializer().setParentReference(() -> parentReference); + } + DataDtoReference reference = node.getInitializer().updateReference(node.getContext(), id); if (notPersisted) { node.getInitializer().updateEditNodeId(id); @@ -86,12 +120,24 @@ public class SaveContentRootOpenableUIAdapter<D extends RootOpenableDto, U exten } ReferenceContainerCapability<?> capability = (ReferenceContainerCapability<?>) parent.getCapability(); - int newPosition = capability.getNodePosition(reference); - if (oldPosition != newPosition) { - log.info(String.format("Move node from: %d to %d", oldPosition, newPosition)); - parent.moveNode(node, newPosition); + if (groupByChanged) { + if (parent.isNotLoaded()) { + // will load all children even the updated one + parent.populateChildrenIfNotLoaded(); + } else { + // need to add updated node + int newPosition = capability.getNodePosition(reference); + log.info(String.format("Change groupBy node from: %s to %s (position: %d)", oldGroupByDto.getFilterValue(), newGroupByValue, newPosition)); + parent.insert(node, newPosition); + } + } else { + int oldPosition = parent.getIndex(node); + int newPosition = capability.getNodePosition(reference); + if (oldPosition != newPosition) { + log.info(String.format("Move node from: %d to %d", oldPosition, newPosition)); + parent.moveNode(node, newPosition); + } } - // repaint selected node and his children node.nodeChangedDeep(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java ===================================== @@ -130,16 +130,13 @@ public class RootNavigationNode extends NavigationNode { return result; } - public <N extends NavigationNode> N findChildByTypeWithNoCreate(Class<N> childType, String id) { - return super.findChildByType(childType, id); - } - protected NavigationNode createMissingNode(String id) { // limit case : node does not exist (was empty previously), need to create it DataGroupByDto<?> reference = getInitializer().getNavigationResult().getGroupBy(id); if (reference == null) { ToolkitTreeFlatModelRootRequest request = getInitializer().getRequest(); reference = getDataSourcesManager().getMainDataSource().getRootOpenableService().getGroupByDtoValue(getInitializer().getNavigationResult().getData().getType(), new DataGroupByParameter(request.getGroupByName(), request.getGroupByFlavor(), id)); + getDecoratorService().installDecorator(reference); } NavigationNode result = getCapability().createChildNode(reference); int position = getCapability().getNodePosition(reference); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/96aca2d40d67ed5079dfdaaa… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/96aca2d40d67ed5079dfdaaa… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 10 commits: Connection manager, bases distantes, champs non visibles sous Windows - Closes #2381
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b1956fb5 by Tony Chemit at 2022-09-03T10:55:21+02:00 Connection manager, bases distantes, champs non visibles sous Windows - Closes #2381 - - - - - 6711ea52 by Tony Chemit at 2022-09-07T08:38:46+02:00 Persistence - See logs from TopiSqlService (show us the location of generation script, can help). - - - - - a1f64eb7 by Tony Chemit at 2022-09-07T08:41:24+02:00 Dto - use getId() in equals and hashcode methods (DataGroupDto are based on it, not on this.id) - - - - - 7fd256c4 by Tony Chemit at 2022-09-07T08:43:29+02:00 Dto - introduce BusinessProject.getBusinessModuleByName method - - - - - 60789a1d by Tony Chemit at 2022-09-07T08:43:29+02:00 Dto - introduce ModuleGroupByHelper - - - - - e53e2ef6 by Tony Chemit at 2022-09-07T15:11:13+02:00 Dto decorator - introduce DataGroupByDecoratorDefinitionForSearch (for search purpose) - - - - - 5da26abf by Tony Chemit at 2022-09-07T15:11:13+02:00 Dto decorator - make long property sortable in decorator API - - - - - 8bcffb77 by Tony Chemit at 2022-09-11T14:44:05+02:00 Client - Mise en place de l'action de recherche/création de marée (Closes #2223) - - - - - 53eab20f by Tony Chemit at 2022-09-11T14:44:05+02:00 missing I18n declaration - - - - - 96aca2d4 by Tony Chemit at 2022-09-11T14:45:51+02:00 Merge branch 'feature/features/search_or_create_trip' into develop - - - - - 30 changed files: - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/core/src/main/java/fr/ird/observe/client/datasource/presets/actions/Create.java - + client/core/src/main/resources/icons/navigation/default/actions/search.png - client/core/src/main/resources/observe-ui.properties - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/actions/ExportToClipboard.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/getters/jaxx.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeStatistics.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ApplyNavigationConfiguration.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/SearchOrCreate.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/SearchUI.jaxx - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/SearchUI.jcss - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/SearchUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/SearchUIModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/actions/AddSearchCriteria.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/actions/CreateNewData.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/actions/GotoSelectedData.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/actions/SearchActionSupport.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/SearchCriteriaUI.jaxx - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/SearchCriteriaUI.jcss - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/SearchCriteriaUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/SearchCriteriaUIModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/actions/ChangePropertyAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/actions/DeleteCriteria.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/actions/SearchCriteriaUIActionSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b73d1dedea0675802ad6fa4e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b73d1dedea0675802ad6fa4e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/features/search_or_create_trip
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT deleted branch feature/features/search_or_create_trip at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/features/search_or_create_trip] 2 commits: Client - Mise en place de l'action de recherche/création de marée (Closes #2223)
by Tony CHEMIT (＠tchemit) 11 Sep '22

11 Sep '22

Tony CHEMIT pushed to branch feature/features/search_or_create_trip at ultreiaio / ird-observe Commits: 8bcffb77 by Tony Chemit at 2022-09-11T14:44:05+02:00 Client - Mise en place de l'action de recherche/création de marée (Closes #2223) - - - - - 53eab20f by Tony Chemit at 2022-09-11T14:44:05+02:00 missing I18n declaration - - - - - 30 changed files: - + client/core/src/main/resources/icons/navigation/default/actions/search.png - client/core/src/main/resources/observe-ui.properties - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/actions/ExportToClipboard.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/getters/jaxx.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ApplyNavigationConfiguration.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/SearchOrCreate.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/SearchUI.jaxx - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/SearchUI.jcss - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/SearchUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/SearchUIModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/actions/AddSearchCriteria.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/actions/CreateNewData.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/actions/GotoSelectedData.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/actions/SearchActionSupport.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/SearchCriteriaUI.jaxx - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/SearchCriteriaUI.jcss - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/SearchCriteriaUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/SearchCriteriaUIModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/actions/ChangePropertyAction.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/actions/DeleteCriteria.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/actions/SearchCriteriaUIActionSupport.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/search/criteria/actions/UseGroupByFlavorAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationInitializer.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/03cb1d6ca0125ef88582ce45… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/03cb1d6ca0125ef88582ce45… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/features/search_or_create_trip
by Tony CHEMIT (＠tchemit) 07 Sep '22

07 Sep '22

Tony CHEMIT pushed new branch feature/features/search_or_create_trip at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/features/search_or_… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] La taille de la fenêtre de configuration de l'arbre de navigation tronque les...
by Tony CHEMIT (＠tchemit) 03 Sep '22

03 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b73d1ded by Tony Chemit at 2022-09-03T08:02:13+02:00 La taille de la fenêtre de configuration de l'arbre de navigation tronque les boutons du bas si on passe du module PS vers LL - Closes #2340 - - - - - 2 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIModel.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIHandler.java ===================================== @@ -49,12 +49,14 @@ import org.nuiton.jaxx.runtime.JAXXObject; import org.nuiton.jaxx.runtime.spi.UIHandler; import javax.swing.AbstractButton; +import javax.swing.Box; import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; +import javax.swing.UIManager; import javax.swing.event.PopupMenuEvent; import javax.swing.event.PopupMenuListener; import java.awt.Component; @@ -85,6 +87,11 @@ public class TreeConfigUIHandler implements UIHandler<TreeConfigUI>, PropertyCha private final Map<String, AbstractButton> allOptions; private final Multimap<String, AbstractButton> groupByOptions; private final Map<String, AbstractButton> temporalOptions; + /** + * Keep the default height (to add some extra components for missing groupBy count in a module and always have + * the same groupByChoose height at any cost). + */ + private final int defaultGroupByComponentHeight; private TreeConfigUI ui; public static void updateStatistics(ToolkitTreeFlatModelRootRequest request, @@ -178,6 +185,7 @@ public class TreeConfigUIHandler implements UIHandler<TreeConfigUI>, PropertyCha groupByOptions = ArrayListMultimap.create(); allOptions = new TreeMap<>(); temporalOptions = new TreeMap<>(); + defaultGroupByComponentHeight = UIManager.getDefaults().getIcon("RadioButton.icon").getIconHeight(); } @Override @@ -226,7 +234,7 @@ public class TreeConfigUIHandler implements UIHandler<TreeConfigUI>, PropertyCha reset(bean); } - public void updateOptions(){ + public void updateOptions() { for (Map.Entry<String, Collection<AbstractButton>> entry : groupByOptions.asMap().entrySet()) { entry.getValue().forEach(c -> { if (Objects.equals(true, c.getClientProperty(DISABLED))) { @@ -279,6 +287,7 @@ public class TreeConfigUIHandler implements UIHandler<TreeConfigUI>, PropertyCha } } } + public void reset(TreeConfig bean) { String moduleName = bean.getModuleName(); String groupByName = bean.getGroupByName(); @@ -309,6 +318,15 @@ public class TreeConfigUIHandler implements UIHandler<TreeConfigUI>, PropertyCha UseGroupByAction action = (UseGroupByAction) editor.getAction(); action.install(); } + int definitionMaxCount = ui.getModel().getDefinitionMaxCount(); + if (definitionMaxCount > editors.size()) { + // Fill with extra component to always have the same number of component in the groupByChoose + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2340 + for (int i = editors.size(); i < definitionMaxCount; i++) { + log.info("Add extra dummy component to fix size {} with height {}", i, defaultGroupByComponentHeight); + groupByChoose.add(Box.createVerticalStrut(defaultGroupByComponentHeight)); + } + } changeGroupByName(newGroupByName); SwingUtilities.invokeLater(ui::revalidate); SwingUtilities.invokeLater(ui::repaint); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIModel.java ===================================== @@ -22,8 +22,11 @@ package fr.ird.observe.client.datasource.editor.api.config; * #L% */ +import fr.ird.observe.dto.data.DataGroupByDtoDefinition; import fr.ird.observe.navigation.tree.GroupByHelper; import fr.ird.observe.navigation.tree.TreeConfig; +import fr.ird.observe.spi.module.BusinessModule; +import fr.ird.observe.spi.module.ObserveBusinessProject; import io.ultreia.java4all.bean.AbstractJavaBean; import io.ultreia.java4all.bean.monitor.BeanMonitor; import io.ultreia.java4all.bean.monitor.PropertyDiff; @@ -78,12 +81,23 @@ public class TreeConfigUIModel extends AbstractJavaBean implements PropertyChang * GroupBy helper. */ private final GroupByHelper groupByHelper; + /** + * To keep to max count of definitions for a module to fix a minimum size in the ui. + * <p> + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2340">issue 2340</a> + */ + private final int definitionMaxCount; protected TreeConfigUIModel(GroupByHelper groupByHelper, TreeConfig originalBean) { this.groupByHelper = groupByHelper; this.originalBean = originalBean; this.bean = new TreeConfig(); this.monitor = new BeanMonitor(MONITORED_PROPERTIES.toArray(new String[0])); + this.definitionMaxCount = computeDefinitionMaxCount(ObserveBusinessProject.get().getModules()); + } + + public int getDefinitionMaxCount() { + return definitionMaxCount; } public TreeConfig getOriginalBean() { @@ -133,15 +147,15 @@ public class TreeConfigUIModel extends AbstractJavaBean implements PropertyChang */ public boolean isStructureChanged() { List<String> modifiedProperties = List.of(monitor.getModifiedProperties()); - if( modifiedProperties.contains(TreeConfig.LOAD_DATA)) { + if (modifiedProperties.contains(TreeConfig.LOAD_DATA)) { // loadData is now off return !bean.isLoadData(); } - if( modifiedProperties.contains(TreeConfig.LOAD_REFERENTIAL)) { + if (modifiedProperties.contains(TreeConfig.LOAD_REFERENTIAL)) { // loadReferential is now off return !bean.isLoadReferential(); } - if( modifiedProperties.contains(TreeConfig.MODULE_NAME)) { + if (modifiedProperties.contains(TreeConfig.MODULE_NAME)) { // previous module name is off return true; } @@ -170,4 +184,15 @@ public class TreeConfigUIModel extends AbstractJavaBean implements PropertyChang private void fireEmpty() { firePropertyChange(EMPTY, isEmpty()); } + + + private int computeDefinitionMaxCount(List<BusinessModule> modules) { + int definitionMaxCount = 0; + for (BusinessModule module : modules) { + List<DataGroupByDtoDefinition<?, ?>> definitions = module.getDataGroupByDtoDefinitions(); + definitionMaxCount = Math.max(definitionMaxCount, definitions.size()); + } + return definitionMaxCount; + } + } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b73d1dedea0675802ad6fa4eb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b73d1dedea0675802ad6fa4eb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.0.7 [skip CI]
by Tony CHEMIT (＠tchemit) 02 Sep '22

02 Sep '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 60fe612d by Tony Chemit at 2022-09-02T19:21:27+02:00 Update changelog for v.9.0.7 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-08-28 14:43. + * Last generated at 2022-09-02 19:20. ## Version [9.0.7](https://gitlab.com/ultreiaio/ird-observe/-/milestones/232) @@ -21,6 +21,7 @@ * [[Type::Anomalie 2419]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2419) **Erreur de migration de l'espèce AVDTH 8 de CAPT_ELEM vers ps_logbook.catch** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2420]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2420) **Statut de la doc de mapping des espèces AVDTH/ObServe** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2423]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2423) **Erreur calcul des données sur V9** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Type::Anomalie 2427]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2427) **Erreur de type de mesure sur les échantillons AVDTH migrés** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 1751]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1751) **Mettre un sablier lors de l'ouverture si le nœud a beaucoup de données à charger.** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2104]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2104) **On pourrait avoir un service de génération de topiaid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2232]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2232) **Dans l'UI des profils de connexion, trimmer les espaces** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) @@ -28,6 +29,8 @@ * [[Type::Evolution 2293]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2293) **Il serait intéressant de permettre l'absence de base déclarée par défaut** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2343]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2343) **Sur les données LL port et associées, rajouter 2 nouveaux champs data entry operators** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2345]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2345) **Ajouter un champ position sur le formulaire Landing LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2366]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2366) **UI de gestion des associations espèce/océan pas disponible sur Océan** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2370]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2370) **Il faudrait un type d'accès en écriture mais qui empêche la modification des références** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2378]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2378) **Convertisseur de longueur m/km/nm/ftm** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2395]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2395) **Titre de l'appli** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2409]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2409) **Aucune barre de progression** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/60fe612d541c4607ea3a21e9d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/60fe612d541c4607ea3a21e9d… You're receiving this email because of your account on gitlab.com.

1 0