Skip to content

Render titles for wiki links to aliases #3362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 2 commits into from
May 17, 2022
Merged

Render titles for wiki links to aliases #3362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4deb8c7
Render titles for wiki links to aliases
labkey-adam May 17, 2022
a29c7d7
Reference issue in comment
labkey-adam May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions wiki/src/org/labkey/wiki/WikiCollections.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
Expand All @@ -55,9 +56,10 @@ public class WikiCollections
private final Map<Integer, WikiTree> _treesByRowId;
private final Map<String, WikiTree> _treesByName;
private final Map<String, String> _nameTitleMap;
private final Map<String, String> _nameAliasTitleMap;
private final List<String> _names;
private final Map<String, String> _namesByAlias;
private final MultiValuedMap<Integer, String> _aliasesByRowsId;
private final MultiValuedMap<Integer, String> _aliasesByRowId;

private final List<NavTree> _adminNavTree;
private final List<NavTree> _nonAdminNavTree;
Expand Down Expand Up @@ -123,14 +125,19 @@ public WikiCollections(Container c)
_adminNavTree = createNavTree(c, true);
_nonAdminNavTree = createNavTree(c, false);

_aliasesByRowsId = new TableSelector(CommSchema.getInstance().getTableInfoPageAliases(), PageFlowUtil.set("Alias", "PageRowId"), SimpleFilter.createContainerFilter(c), null)
_aliasesByRowId = new TableSelector(CommSchema.getInstance().getTableInfoPageAliases(), PageFlowUtil.set("Alias", "PageRowId"), SimpleFilter.createContainerFilter(c), null)
.mapStream()
.map(map->new Alias((Integer)map.get("PageRowId"), (String)map.get("Alias")))
.sorted(Comparator.comparing(Alias::alias, String.CASE_INSENSITIVE_ORDER))
.collect(LabKeyCollectors.toMultiValuedMap(record->record.pageRowId, record->record.alias));
_namesByAlias = _aliasesByRowsId.entries().stream()
_namesByAlias = _aliasesByRowId.entries().stream()
.filter(e->_treesByRowId.get(e.getKey()) != null) // Just in case - ignore orphaned aliases
.collect(LabKeyCollectors.toCaseInsensitiveMap(Map.Entry::getValue, e->_treesByRowId.get(e.getKey()).getName()));
Map<String, String> nameAliasTitleMap = new HashMap<>(_nameTitleMap);
_aliasesByRowId.entries().stream()
.filter(e->_treesByRowId.get(e.getKey()) != null) // Just in case - ignore orphaned aliases
.forEach(e->nameAliasTitleMap.put(e.getValue(), _treesByRowId.get(e.getKey()).getTitle()));
_nameAliasTitleMap = Collections.unmodifiableMap(nameAliasTitleMap);
}

public record Alias(int pageRowId, String alias) {}
Expand Down Expand Up @@ -232,6 +239,11 @@ Map<String, String> getNameTitleMap()
return _nameTitleMap;
}

public Map<String, String> getNameAndAliasTitleMap()
{
return _nameAliasTitleMap;
}

String getName(int rowId)
{
WikiTree tree = getWikiTree(rowId);
Expand Down Expand Up @@ -270,7 +282,7 @@ private Set<WikiTree> populateWikiTrees(WikiTree root, Set<WikiTree> trees)
// Ordered by alias (case-insensitive)
Collection<String> getAliases(int rowId)
{
return _aliasesByRowsId.get(rowId);
return _aliasesByRowId.get(rowId);
}

// Returns null for no match
Expand Down
3 changes: 2 additions & 1 deletion wiki/src/org/labkey/wiki/WikiManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,8 @@ public FormattedHtml formatWiki(Container c, Wiki wiki, WikiVersion wikiversion)
if (null != wiki.getEntityId())
attachPrefix = WikiController.getDownloadURL(wiki.lookupContainer(), wiki, "").getLocalURIString();

Map<String, String> nameTitleMap = WikiSelectManager.getNameTitleMap(c);
// When rendering wikis, we want aliases to resolve to their titles as well, Issue 45497
Map<String, String> nameTitleMap = WikiSelectManager.getNameAndAliasTitleMap(c);

//get formatter specified for this version
WikiRenderer w = wikiversion.getRenderer(hrefPrefix, attachPrefix, nameTitleMap, wiki.getAttachments());
Expand Down
10 changes: 7 additions & 3 deletions wiki/src/org/labkey/wiki/WikiSelectManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ public static Map<String, String> getNameTitleMap(Container c)
return getWikiCollections(c).getNameTitleMap();
}

public static Map<String, String> getNameAndAliasTitleMap(Container c)
{
return getWikiCollections(c).getNameAndAliasTitleMap();
}

// Get a single wiki by rowId
public static Wiki getWiki(Container c, int rowId)
Expand Down Expand Up @@ -151,11 +155,11 @@ static Wiki getWikiFromDatabase(Container c, String name)
if (null == wiki)
{
//Didn't find it with case-sensitive lookup, try case-sensitive (in case the
//underlying database is case sensitive)
//underlying database is case-sensitive)
//Bug 2225
wiki = new TableSelector(CommSchema.getInstance().getTableInfoPages(),
SimpleFilter.createContainerFilter(c).addWhereClause("LOWER(name) = LOWER(?)", new Object[] { name }),
null).getObject(Wiki.class);
SimpleFilter.createContainerFilter(c).addWhereClause("LOWER(name) = LOWER(?)", new Object[] { name }),
null).getObject(Wiki.class);
}

return wiki;
Expand Down