GitLab

at 2021-09-27T11:49:33+02:00

La synchro simple de marées ne marche pas - See ultreiaio/ird-observe#2003

force build

Add FIXME (See #1999)

 L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans l'écran - Closes #2004

update pom

 observe.ui.action.goto.previous.stage.tip

 observe.ui.action.info.storage.tip

 observe.ui.choice.cancel

-observe.ui.choice.confirm.insert

 observe.ui.choice.replace

 observe.ui.datasource.actions.config.data.sources.equals

 observe.ui.datasource.editor.actions.consolidate

 observe.ui.datasource.editor.actions.data.import.add.missing.referential

 observe.ui.datasource.editor.actions.data.import.add.missing.referential.for.type

 observe.ui.datasource.editor.actions.data.import.result

-observe.ui.datasource.editor.actions.data.import.title.require.add.missing.referential

 observe.ui.datasource.editor.actions.exportData

 observe.ui.datasource.editor.actions.exportData.description

 observe.ui.datasource.editor.actions.exportData.message.not.possible

  * #L%

  */

 

+import com.google.common.collect.LinkedHashMultimap;

 import com.google.common.collect.SetMultimap;

-import fr.ird.observe.client.ClientUIContext;

 import fr.ird.observe.client.datasource.api.ObserveSwingDataSource;

-import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUI;

 import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUIHandler;

 import fr.ird.observe.client.util.ProgressModel;

 import fr.ird.observe.dto.ToolkitIdLabel;

 import fr.ird.observe.spi.decoration.I18nDecoratorHelper;

 import fr.ird.observe.spi.referential.MissingReferentialRequest;

 import fr.ird.observe.spi.referential.MissingReferentialResult;

+import fr.ird.observe.spi.referential.ReferentialIds;

 import io.ultreia.java4all.application.template.spi.GenerateTemplate;

 import io.ultreia.java4all.lang.Strings;

 import org.apache.commons.lang3.StringUtils;

 import org.apache.logging.log4j.Logger;

 import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;

 

-import javax.swing.JOptionPane;

 import java.util.Collection;

 import java.util.Objects;

 import java.util.Set;

 import static io.ultreia.java4all.i18n.I18n.t;

 

 /**

- * Hi-level object to perform business data management (says: delete some trip, copy some trip)

+ * Hi-level object to perform business data management (says: delete some trip, copy some trip, insert missing referential, ...)

  * <p>

  * Created on 10/02/2021.

  *

     public WizardState insertMissingReferential(Collection<String> idsToCopy) {

         progressModel.increments();

 

+        //FIXME Review this code, if a referential synchro was just performed before

+        //FIXME We then have already resolved all ids that are only on incoming source

+        //FIXME From this ids, retains all that are in data to export (on incoming source)

+        //FIXME That's all, no need to call target source

         ReferentialService targetReferentialService = targetSource.getReferentialService();

-        SetMultimap<Class<? extends ReferentialDto>, String> targetSourceReferential = targetReferentialService.getReferentialIds();

-        MissingReferentialRequest missingReferentialRequest = MissingReferentialRequest.of(targetSourceReferential, idsToCopy.toArray(new String[0]));

+        ReferentialIds targetSourceReferential = targetReferentialService.getReferentialIds();

+        MissingReferentialRequest missingReferentialRequest = MissingReferentialRequest.of(targetSourceReferential.getIds(), idsToCopy.toArray(new String[0]));

         MissingReferentialResult missingReferentialResult = incomingSource.getReferentialService().computeMissingReferential(missingReferentialRequest);

 

         progressModel.increments();

 

         SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> usages = incomingSource.getReferentialMap(missingReferentialResult.getMissingIds());

 

-        UsageForDisplayUI usagesUI = UsageForDisplayUIHandler.showMissingReferential(getMessage(), usages);

+        boolean response = UsageForDisplayUIHandler.showMissingReferential(getMessage(), usages, getTargetSourceLabel());

 

-        int response = ClientUIContext.askUser(null,

-                                               t("observe.ui.datasource.editor.actions.data.import.title.require.add.missing.referential", getTargetSourceLabel()),

-                                               usagesUI,

-                                               JOptionPane.WARNING_MESSAGE,

-                                               new Object[]{

-                                                       t("observe.ui.choice.confirm.insert"),

-                                                       t("observe.ui.choice.cancel")},

-                                               0);

-

-        if (response != 0) {

+        if (!response) {

             progressModel.increments();

             return WizardState.CANCELED;

         }

 observe.ui.choice.cancel

 observe.ui.choice.cancel.tip

 observe.ui.choice.confirm.delete

+observe.ui.choice.confirm.insert

 observe.ui.choice.confirm.move

 observe.ui.choice.confirm.replace

 observe.ui.choice.continue

 observe.ui.datasource.avdth.import.tip

 observe.ui.datasource.avdth.newImport

 observe.ui.datasource.avdth.newImport.tip

+observe.ui.datasource.editor.actions.data.import.title.require.add.missing.referential

 observe.ui.datasource.editor.content.map.action.exportPng

 observe.ui.datasource.editor.content.map.action.exportPng.tip

 observe.ui.datasource.editor.content.map.action.zoomIt

  * #L%

  */

 

-import fr.ird.observe.client.ClientUIContext;

 import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi;

 import fr.ird.observe.client.datasource.editor.api.content.actions.ConfigureMenuAction;

 import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUI;

 import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUIModel;

-import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUI;

 import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageForDisplayUIHandler;

-import fr.ird.observe.client.util.UIHelper;

 import fr.ird.observe.dto.ToolkitIdLabel;

 import fr.ird.observe.dto.UsageCount;

 import fr.ird.observe.dto.reference.ReferentialDtoReference;

 import fr.ird.observe.dto.referential.ToolkitReferentialDtoBean;

 import fr.ird.observe.services.service.referential.UsageService;

 

-import javax.swing.JOptionPane;

-import java.awt.Dimension;

 import java.awt.event.ActionEvent;

 

 import static io.ultreia.java4all.i18n.I18n.t;

 

         ToolkitIdLabel reference = bean.toLabel();

         getDecoratorService().installToolkitIdLabelDecorator(request.getType(), reference);

-        UsageForDisplayUI usagesUI = UsageForDisplayUIHandler.showUsages(usageService, reference, request, usages);

-

-        Object[] options = {t("observe.ui.choice.quit")};

-        JOptionPane pane = new JOptionPane(usagesUI, JOptionPane.INFORMATION_MESSAGE,

-                                           JOptionPane.DEFAULT_OPTION, null,

-                                           options, options[0]);

-

-        Dimension size = getMainUI().getPreferredSize();

-        Dimension thisSize = new Dimension((int) size.getWidth() - 20, (int) size.getHeight() - 20);

-        pane.setPreferredSize(thisSize);

-        pane.putClientProperty(UIHelper.NO_PACK, true);

-        ClientUIContext.askUser(pane, t("observe.ui.title.show.usage"), options);

+        UsageForDisplayUIHandler.showUsages(usageService, reference, request, usages);

     }

 

 }

  */

 

 import fr.ird.observe.client.ClientUIContext;

-import fr.ird.observe.client.ClientUIContextApplicationComponent;

-import fr.ird.observe.client.util.UIHelper;

 import fr.ird.observe.dto.BusinessDto;

 import fr.ird.observe.dto.IdDto;

 import fr.ird.observe.dto.ToolkitIdLabel;

 

 import javax.swing.JLabel;

 import javax.swing.JOptionPane;

-import java.awt.Dimension;

 import java.util.Collection;

 import java.util.List;

 

 

         usagesUI.getHandler().attachToOptionPane(pane, replaceText);

 

-        Dimension size = ClientUIContextApplicationComponent.value().getMainUI().getPreferredSize();

-        Dimension thisSize = new Dimension((int) size.getWidth() - 20, (int) size.getHeight() - 20);

-        pane.setPreferredSize(thisSize);

-        pane.putClientProperty(UIHelper.NO_PACK, true);

+        usagesUI.getHandler().setUISize(pane);

         int response = ClientUIContext.askUser(pane, t("observe.ui.title.can.not.delete.referentiel"), options);

 

         if (response == 0) {

  */

 

 import fr.ird.observe.client.ClientUIContext;

-import fr.ird.observe.client.ClientUIContextApplicationComponent;

-import fr.ird.observe.client.util.UIHelper;

 import fr.ird.observe.dto.BusinessDto;

 import fr.ird.observe.dto.IdDto;

 import fr.ird.observe.dto.ToolkitIdLabel;

 

 import javax.swing.JLabel;

 import javax.swing.JOptionPane;

-import java.awt.Dimension;

 import java.util.Collection;

 import java.util.List;

 

         JOptionPane pane = new JOptionPane(usagesUI, JOptionPane.WARNING_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]);

 

         usagesUI.getHandler().attachToOptionPane(pane, replaceText);

-        Dimension size = ClientUIContextApplicationComponent.value().getMainUI().getPreferredSize();

-        Dimension thisSize = new Dimension((int) size.getWidth() - 20, (int) size.getHeight() - 20);

-        pane.setPreferredSize(thisSize);

-        pane.putClientProperty(UIHelper.NO_PACK, true);

+        usagesUI.getHandler().setUISize(pane);

 

         int response = ClientUIContext.askUser(pane, t("observe.ui.title.need.confirm.to.desactivate.referentiel"), options);

         log.debug("response : " + response);

  */

 

 import com.google.common.collect.SetMultimap;

+import fr.ird.observe.client.ClientUIContext;

 import fr.ird.observe.dto.BusinessDto;

 import fr.ird.observe.dto.ToolkitIdLabel;

 import fr.ird.observe.dto.UsageCount;

 import io.ultreia.java4all.util.SingletonSupplier;

 

 import javax.swing.JLabel;

+import javax.swing.JOptionPane;

 import java.util.Collection;

 

 import static io.ultreia.java4all.i18n.I18n.t;

  */

 public class UsageForDisplayUIHandler extends UsageUIHandlerSupport<UsageForDisplayUI> {

 

-    public static UsageForDisplayUI showUsages(UsageService usageService,

-                                               ToolkitIdLabel reference,

-                                               ToolkitReferentialDtoBean request,

-                                               UsageCount usages) {

+    public static void showUsages(UsageService usageService,

+                                  ToolkitIdLabel reference,

+                                  ToolkitReferentialDtoBean request,

+                                  UsageCount usages) {

         //FIXME utiliser une template

         String type = I18nDecoratorHelper.getType(request.getType());

         String message = t("observe.ui.message.show.usages", type, reference);

                 return SingletonSupplier.of(() -> usageService.find(request, dtoType));

             }

         };

-        return UsageForDisplayUI.build(message, getter);

+        UsageForDisplayUI usagesUI = UsageForDisplayUI.build(message, getter);

+

+        Object[] options = {t("observe.ui.choice.quit")};

+        JOptionPane pane = new JOptionPane(usagesUI, JOptionPane.INFORMATION_MESSAGE,

+                                           JOptionPane.DEFAULT_OPTION, null,

+                                           options, options[0]);

+

+        usagesUI.getHandler().setUISize(pane);

+        ClientUIContext.askUser(pane, t("observe.ui.title.show.usage"), options);

     }

 

-    public static UsageForDisplayUI showMissingReferential(String message, SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> usages) {

+    public static boolean showMissingReferential(String message,

+                                                 SetMultimap<Class<? extends ReferentialDto>, ToolkitIdLabel> usages,

+                                                 String targetSourceLabel) {

         UsageCount count = new UsageCount();

         for (Class<? extends ReferentialDto> dtoType : usages.keys()) {

             count.put(dtoType, (long) usages.get(dtoType).size());

                 return SingletonSupplier.of(() -> usages.get((Class<? extends ReferentialDto>) dtoType));

             }

         };

-        return UsageForDisplayUI.build(message, getter);

+        UsageForDisplayUI usagesUI = UsageForDisplayUI.build(message, getter);

+

+        String[] options = {

+                t("observe.ui.choice.confirm.insert"),

+                t("observe.ui.choice.cancel")};

+        JOptionPane pane = new JOptionPane(usagesUI, JOptionPane.WARNING_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]);

+

+        usagesUI.getHandler().setUISize(pane);

+        String title = t("observe.ui.datasource.editor.actions.data.import.title.require.add.missing.referential", targetSourceLabel);

+        int response = ClientUIContext.askUser(pane, title, options);

+        return response == 0;

+

     }

 

     @Override

  * #L%

  */

 

+import fr.ird.observe.client.ClientUIContextApplicationComponent;

 import fr.ird.observe.client.WithClientUIContext;

 import fr.ird.observe.client.util.DisabledItemSelectionModel;

+import fr.ird.observe.client.util.UIHelper;

 import fr.ird.observe.dto.BusinessDto;

 import fr.ird.observe.dto.ToolkitIdLabel;

 import fr.ird.observe.dto.UsageCount;

 

 import javax.swing.ButtonGroup;

 import javax.swing.JButton;

+import javax.swing.JComponent;

 import javax.swing.JLabel;

 import javax.swing.JList;

 import javax.swing.JOptionPane;

 import javax.swing.JToggleButton;

 import java.awt.Component;

 import java.awt.Container;

+import java.awt.Dimension;

 import java.util.Collection;

 import java.util.List;

 import java.util.Objects;

 

         String message = ui.getContextValue(String.class);

         getMessage().setText(message);

+        Dimension preferredSize = getClientUIContext().getMainUI().getPreferredSize();

+        ((JComponent) ui).setMaximumSize(preferredSize);

 

         UsagesGetter usagesGetter = Objects.requireNonNull(ui.getContextValue(UsagesGetter.class));

         if (usagesGetter.isEmpty()) {

         });

     }

 

+    protected void setUISize(JOptionPane pane) {

+        Dimension size = ClientUIContextApplicationComponent.value().getMainUI().getPreferredSize();

+        Dimension thisSize = new Dimension((int) size.getWidth() - 20, (int) size.getHeight() - 20);

+        pane.setPreferredSize(thisSize);

+        pane.putClientProperty(UIHelper.NO_PACK, true);

+    }

+

     private <D extends BusinessDto> void buildUsagePanel(ButtonGroup buttonGroup, Class<D> dtoType, UsagesGetter usagesGetter) {

         long count = usagesGetter.getCount().get(dtoType);

         SingletonSupplier<Collection<ToolkitIdLabel>> factory = usagesGetter.getUsages(dtoType);

   <parent>

     <groupId>io.ultreia.maven</groupId>

     <artifactId>pom</artifactId>

-    <version>2021.96</version>

+    <version>2021.98</version>

   </parent>

 

   <groupId>fr.ird.observe</groupId>

     <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>

     <buildDate>${maven.build.timestamp}</buildDate>

 

-<!--    <lib.version.toolkit>5.0.44-SNAPSHOT</lib.version.toolkit>-->

+    <lib.version.toolkit>5.0.45-SNAPSHOT</lib.version.toolkit>

 

     <lib.version.ognl>3.1.29</lib.version.ognl>

     <!--can't use 1.4.197 (date has changed + blob also)-->

     <lib.version.graalvm>21.1.0</lib.version.graalvm>

 

     <!--    <lib.version.java4all.http>1.0.30</lib.version.java4all.http>-->

-    <!--    <lib.version.java4all.topia>1.47</lib.version.java4all.topia>-->

-    <!--    <lib.version.java4all.eugene>3.0-alpha-38</lib.version.java4all.eugene>-->

+<!--        <lib.version.java4all.topia>1.52-SNAPSHOT</lib.version.java4all.topia>-->

+<!--        <lib.version.java4all.eugene>3.0-alpha-42-SNAPSHOT</lib.version.java4all.eugene>-->

     <!--    <lib.version.java4all.jaxx>3.0.0-RC-8</lib.version.java4all.jaxx>-->

     <!--<lib.version.java4all.application-context>1.0.3-SNAPSHOT</lib.version.java4all.application-context>-->

     <!--<lib.version.java4all.application-template>1.0.2-SNAPSHOT</lib.version.java4all.application-template>-->

 

 

 import com.google.common.collect.LinkedHashMultimap;

-import com.google.common.collect.SetMultimap;

 import fr.ird.observe.dto.ToolkitIdLabel;

 import fr.ird.observe.dto.form.Form;

 import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;

-import fr.ird.observe.dto.referential.ReferentialDto;

 import fr.ird.observe.dto.referential.common.ProgramDto;

 import fr.ird.observe.dto.referential.common.ProgramReference;

 import fr.ird.observe.dto.result.SaveResultDto;

 import fr.ird.observe.services.ObserveServicesProvider;

 import fr.ird.observe.spi.referential.MissingReferentialRequest;

 import fr.ird.observe.spi.referential.MissingReferentialResult;

+import fr.ird.observe.spi.referential.ReferentialIds;

 import org.junit.Assert;

 

 import java.util.Collections;

 

     @Override

     public void getReferentialIds(ObserveServicesProvider servicesProvider, ReferentialService service) {

-        SetMultimap<Class<? extends ReferentialDto>, String> actual = service.getReferentialIds();

+        ReferentialIds actual = service.getReferentialIds();

         Assert.assertNotNull(actual);

         Assert.assertEquals(getIntegerProperty("getReferentialIds.count"), actual.keySet().size());

         Assert.assertEquals(REFERENTIAL_COUNT, actual.size());

       <groupId>org.apache.commons</groupId>

       <artifactId>commons-lang3</artifactId>

     </dependency>

-    <dependency>

-      <groupId>com.google.guava</groupId>

-      <artifactId>guava</artifactId>

-    </dependency>

     <dependency>

       <groupId>com.google.code.gson</groupId>

       <artifactId>gson</artifactId>

-package fr.ird.observe.services.client.referential;

-

-/*-

- * #%L

- * ObServe Services :: Client implementation

- * %%

- * Copyright (C) 2008 - 2021 IRD, Code Lutin, Ultreia.io

- * %%

- * This program is free software: you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as

- * published by the Free Software Foundation, either version 3 of the

- * License, or (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public

- * License along with this program.  If not, see

- * <http://www.gnu.org/licenses/gpl-3.0.html>.

- * #L%

- */

-

-import com.google.common.collect.SetMultimap;

-import com.google.gson.reflect.TypeToken;

-import fr.ird.observe.dto.referential.ReferentialDto;

-import org.apache.http.HttpStatus;

-

-import javax.annotation.Generated;

-import java.util.concurrent.TimeUnit;

-

-@Generated(value = "io.ultreia.java4all.http.maven.plugin.GenerateHttpClientMojo", date = "Fri Sep 17 15:00:51 CEST 2021")

-public class ReferentialServiceClient extends GeneratedReferentialServiceClient {

-

-    //FIXME Generate this

-    @Override

-    public SetMultimap<Class<? extends ReferentialDto>, String> getReferentialIds() {

-        return executeRequest(create("getReferentialIds")

-                                      .addAuthToken()

-                                      .setTimeout(TimeUnit.MINUTES, 1)

-                                      .post(), HttpStatus.SC_OK).toJson(new TypeToken<SetMultimap<Class<? extends ReferentialDto>, String>>(){}.getType());

-    }

-}
 import fr.ird.observe.spi.referential.MissingReferentialIdsBuilder;

 import fr.ird.observe.spi.referential.MissingReferentialRequest;

 import fr.ird.observe.spi.referential.MissingReferentialResult;

+import fr.ird.observe.spi.referential.ReferentialIds;

 import fr.ird.observe.spi.referential.sql.ReplaceSqlStatementGenerator;

 import fr.ird.observe.spi.referential.synchro.OneSideSqlRequest;

 import fr.ird.observe.spi.referential.synchro.OneSideSqlResult;

     }

 

     @Override

-    public SetMultimap<Class<? extends ReferentialDto>, String> getReferentialIds() {

+    public ReferentialIds getReferentialIds() {

         SetMultimap<Class<? extends ReferentialDto>, String> result = LinkedHashMultimap.create();

         for (Class<? extends ReferentialDto> dtoType : ObserveBusinessProject.get().getReferentialTypes()) {

             ReferentialDtoEntityContext<?, ?, ?, ?> spi = ObservePersistenceBusinessProject.fromReferentialDto(dtoType);

             List<String> allIds = spi.getDao(getTopiaPersistenceContext()).findAllIds();

             result.putAll(dtoType, allIds);

         }

-        return result;

+        return ReferentialIds.of(result);

     }

 

     @Override

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

13 changed files:

Changes: