1371

Committed 28 Jun 2024 05:54AM UTC coverage: 25.453% (-0.05%) from 25.503%

Build # 1371

Build Type

push

jenkins

Committed by

web-flow

Commit Message

Closes #2474: Store the entity id in saml session once user logs in with the identity provider (#2486)

Run Details

49 of 54 new or added lines in 4 files covered. (90.74%)

860 existing lines in 14 files now uncovered.

17805 of 69953 relevant lines covered (25.45%)

0.25 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataverse/FeaturedDataversesDialog.java

package edu.harvard.iq.dataverse.dataverse;

import edu.harvard.iq.dataverse.featured.FeaturedDataverseServiceBean;
import edu.harvard.iq.dataverse.PermissionsWrapper;
import edu.harvard.iq.dataverse.common.BundleUtil;
import edu.harvard.iq.dataverse.persistence.dataverse.Dataverse;
import edu.harvard.iq.dataverse.util.JsfHelper;
import edu.harvard.iq.dataverse.util.JsfRedirectHelper;
import io.vavr.control.Try;
import org.omnifaces.cdi.ViewScoped;
import org.primefaces.model.DualListModel;

import javax.inject.Inject;
import javax.inject.Named;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;

@ViewScoped
@Named("FeaturedDataversesDialog")
public class FeaturedDataversesDialog implements java.io.Serializable {

    private static final Logger logger = Logger.getLogger(FeaturedDataversesDialog.class.getCanonicalName());

    @Inject
    private DataverseService dataverseService;
    @Inject
    private FeaturedDataverseServiceBean featuredDataverseService;
    @Inject
    private PermissionsWrapper permissionWrapper;
    
    private boolean canEditFeaturedDataverses;
    private DualListModel<Dataverse> featuredDataverses = new DualListModel<>(new ArrayList<>(), new ArrayList<>());
    private Dataverse dataverse;

    // -------------------- GETTERS --------------------

    public boolean isCanEditFeaturedDataverses() {
        return canEditFeaturedDataverses;
    }

    public DualListModel<Dataverse> getFeaturedDataverses() {
        return featuredDataverses;
    }

    public Dataverse.FeaturedDataversesSorting getFeaturedDataversesSorting() {
        return dataverse.getFeaturedDataversesSorting();
    }

    // -------------------- LOGIC --------------------

    public void init(Dataverse dataverse) {
        canEditFeaturedDataverses = permissionWrapper.canIssueUpdateDataverseCommand(dataverse);
        
        if (canEditFeaturedDataverses) {
            this.dataverse = dataverse;
        }
    }

    public void setupDialog() {
        List<Dataverse> featuredSource = featuredDataverseService.findFeaturableDataverses(dataverse.getId());
        List<Dataverse> featuredTarget = featuredDataverseService.findByDataverseId(dataverse.getId());

        featuredTarget.forEach(featuredDataverse -> featuredSource.remove(featuredDataverse));

        featuredDataverses = new DualListModel<>(featuredSource, featuredTarget);
    }

    public String saveFeaturedDataverse() {

        Try.of(() -> dataverseService.saveFeaturedDataverse(dataverse, featuredDataverses.getTarget()))
                .onSuccess(savedDataverse -> JsfHelper.addFlashSuccessMessage(BundleUtil.getStringFromBundle("dataverse.feature.update")))
                .onFailure(ex -> {
                    logger.log(Level.SEVERE, "Unexpected Exception calling dataverse command", ex);
                    JsfHelper.addFlashErrorMessage(BundleUtil.getStringFromBundle("dataverse.update.failure"), "");
                });

        return JsfRedirectHelper.redirectToDataverse(dataverse.getAlias());
    }

    public void updateSort() {
        List<Dataverse> target = featuredDataverses.getTarget();
        featuredDataverses.setTarget(featuredDataverseService.sortFeaturedDataverses(target, dataverse.getFeaturedDataversesSorting()));
    }

    public void manualReorder() {
        dataverse.setFeaturedDataversesSorting(Dataverse.FeaturedDataversesSorting.BY_HAND);
    }

    // -------------------- SETTERS --------------------

    public void setFeaturedDataverses(DualListModel<Dataverse> featuredDataverses) {
        this.featuredDataverses = featuredDataverses;
    }

    public void setFeaturedDataversesSorting(Dataverse.FeaturedDataversesSorting featuredDataversesSorting) {
        this.dataverse.setFeaturedDataversesSorting(featuredDataversesSorting);
    }
}

1	package edu.harvard.iq.dataverse.dataverse;
2
3	import edu.harvard.iq.dataverse.featured.FeaturedDataverseServiceBean;
4	import edu.harvard.iq.dataverse.PermissionsWrapper;
5	import edu.harvard.iq.dataverse.common.BundleUtil;
6	import edu.harvard.iq.dataverse.persistence.dataverse.Dataverse;
7	import edu.harvard.iq.dataverse.util.JsfHelper;
8	import edu.harvard.iq.dataverse.util.JsfRedirectHelper;
9	import io.vavr.control.Try;
10	import org.omnifaces.cdi.ViewScoped;
11	import org.primefaces.model.DualListModel;
12
13	import javax.inject.Inject;
14	import javax.inject.Named;
15	import java.util.ArrayList;
16	import java.util.List;
17	import java.util.logging.Level;
18	import java.util.logging.Logger;
19
20	@ViewScoped
21	@Named("FeaturedDataversesDialog")
22	public class FeaturedDataversesDialog implements java.io.Serializable {	×
23
24	private static final Logger logger = Logger.getLogger(FeaturedDataversesDialog.class.getCanonicalName());	×
25
26	@Inject
27	private DataverseService dataverseService;
28	@Inject
29	private FeaturedDataverseServiceBean featuredDataverseService;
30	@Inject
31	private PermissionsWrapper permissionWrapper;
32
33	private boolean canEditFeaturedDataverses;
34	private DualListModel<Dataverse> featuredDataverses = new DualListModel<>(new ArrayList<>(), new ArrayList<>());	×
35	private Dataverse dataverse;
36
37	// -------------------- GETTERS --------------------
38
39	public boolean isCanEditFeaturedDataverses() {
40	return canEditFeaturedDataverses;	×
41	}
42
43	public DualListModel<Dataverse> getFeaturedDataverses() {
44	return featuredDataverses;	×
45	}
46
47	public Dataverse.FeaturedDataversesSorting getFeaturedDataversesSorting() {
UNCOV 48	return dataverse.getFeaturedDataversesSorting();	×
49	}
50
51	// -------------------- LOGIC --------------------
52
53	public void init(Dataverse dataverse) {
UNCOV 54	canEditFeaturedDataverses = permissionWrapper.canIssueUpdateDataverseCommand(dataverse);	×
55
UNCOV 56	if (canEditFeaturedDataverses) {	×
UNCOV 57	this.dataverse = dataverse;	×
58	}
59	}	×
60
61	public void setupDialog() {
UNCOV 62	List<Dataverse> featuredSource = featuredDataverseService.findFeaturableDataverses(dataverse.getId());	×
63	List<Dataverse> featuredTarget = featuredDataverseService.findByDataverseId(dataverse.getId());	×
64
UNCOV 65	featuredTarget.forEach(featuredDataverse -> featuredSource.remove(featuredDataverse));	×
66
UNCOV 67	featuredDataverses = new DualListModel<>(featuredSource, featuredTarget);	×
68	}	×
69
70	public String saveFeaturedDataverse() {
71
72	Try.of(() -> dataverseService.saveFeaturedDataverse(dataverse, featuredDataverses.getTarget()))	×
73	.onSuccess(savedDataverse -> JsfHelper.addFlashSuccessMessage(BundleUtil.getStringFromBundle("dataverse.feature.update")))	×
UNCOV 74	.onFailure(ex -> {	×
75	logger.log(Level.SEVERE, "Unexpected Exception calling dataverse command", ex);	×
UNCOV 76	JsfHelper.addFlashErrorMessage(BundleUtil.getStringFromBundle("dataverse.update.failure"), "");	×
UNCOV 77	});	×
78
UNCOV 79	return JsfRedirectHelper.redirectToDataverse(dataverse.getAlias());	×
80	}
81
82	public void updateSort() {
UNCOV 83	List<Dataverse> target = featuredDataverses.getTarget();	×
UNCOV 84	featuredDataverses.setTarget(featuredDataverseService.sortFeaturedDataverses(target, dataverse.getFeaturedDataversesSorting()));	×
UNCOV 85	}	×
86
87	public void manualReorder() {
UNCOV 88	dataverse.setFeaturedDataversesSorting(Dataverse.FeaturedDataversesSorting.BY_HAND);	×
UNCOV 89	}	×
90
91	// -------------------- SETTERS --------------------
92
93	public void setFeaturedDataverses(DualListModel<Dataverse> featuredDataverses) {
UNCOV 94	this.featuredDataverses = featuredDataverses;	×
UNCOV 95	}	×
96
97	public void setFeaturedDataversesSorting(Dataverse.FeaturedDataversesSorting featuredDataversesSorting) {
UNCOV 98	this.dataverse.setFeaturedDataversesSorting(featuredDataversesSorting);	×
UNCOV 99	}	×
100	}

CeON / dataverse / 1371

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous