Skip to content
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.

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

search, my dashboard: highlight verified community #2587

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// This file is part of InvenioRDM
// Copyright (C) 2024 CERN.
//
// Invenio App RDM is free software; you can redistribute it and/or modify it
// under the terms of the MIT License; see LICENSE file for more details.

import React from "react";
import PropTypes from "prop-types";
import { i18next } from "@translations/invenio_app_rdm/i18next";

export const DisplayPartOfCommunities = ({ communities }) => {
const PartOfCommunities = () => {
const communitiesEntries = communities.entries;
if (communitiesEntries) {
return (
<>
{i18next.t("Part of ")}
{communitiesEntries.map((community, index) => {
if (!(community.id === communities?.default && community?.theme)) {
return (
<>
<a href={`/communities/${community.slug}`}>
{community.metadata?.title}
</a>
{index !== communitiesEntries.length - 1 && ", "}
</>
);
}
})}
</>
);
}
};
return (
<p>
<b>{PartOfCommunities()}</b>
</p>
);
};

DisplayPartOfCommunities.propTypes = {
communities: PropTypes.object.isRequired,
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// This file is part of InvenioRDM
// Copyright (C) 2024 CERN.
//
// Invenio App RDM is free software; you can redistribute it and/or modify it
// under the terms of the MIT License; see LICENSE file for more details.

import React from "react";
import PropTypes from "prop-types";
import { Label, Image } from "semantic-ui-react";

export const DisplayVerifiedCommunity = ({ communities }) => {
const filterBrandedCommunity = (parentCommunities) => {
const brandedCommunityId = parentCommunities?.default;
const communities = parentCommunities?.entries;
let displayCommunity = null;

if (communities) {
communities.map((community) => {
if (community.id === brandedCommunityId && community?.theme) {
displayCommunity = community;
}
return displayCommunity;
});
}

return displayCommunity;
};

const verifiedCommunity = filterBrandedCommunity(communities);
return (
<>
{verifiedCommunity && (
<Label
as="a"
href={`/communities/${verifiedCommunity.id}`}
style={{ backgroundColor: verifiedCommunity?.theme?.style?.primaryColor }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that should translate to a className rather that inline style if the community is verified

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to discuss. Created an issue for this #2596

className="themed-community-label"
>
{verifiedCommunity.metadata.title}
<Image
className="themed-community-logo right-floated"
src={`/api/communities/${verifiedCommunity.id}/logo`}
alt=""
/>
</Label>
)}
</>
);
};

DisplayVerifiedCommunity.propTypes = {
communities: PropTypes.object.isRequired,
};
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import PropTypes from "prop-types";
import { Item, Label, Icon } from "semantic-ui-react";
import { buildUID } from "react-searchkit";
import { CompactStats } from "./CompactStats";
import { DisplayVerifiedCommunity } from "./DisplayVerifiedCommunity";
import { DisplayPartOfCommunities } from "./DisplayPartOfCommunities";

class RecordsResultsListItem extends Component {
render() {
Expand Down Expand Up @@ -117,6 +119,7 @@ class RecordsResultsListItem extends Component {

<div className="flex justify-space-between align-items-end">
<small>
<DisplayPartOfCommunities communities={result.parent?.communities} />
<p>
{createdDate && (
<>
Expand Down Expand Up @@ -154,6 +157,7 @@ class RecordsResultsListItem extends Component {
/>
</small>
</div>
<DisplayVerifiedCommunity communities={result.parent?.communities} />
</Item.Extra>
</Item.Content>
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import _get from "lodash/get";
import { Button, Icon, Item, Label } from "semantic-ui-react";
import { SearchItemCreators } from "../../utils";
import { CompactStats } from "../../components/CompactStats";
import { DisplayVerifiedCommunity } from "../../components/DisplayVerifiedCommunity";
import { DisplayPartOfCommunities } from "../../components/DisplayPartOfCommunities";

export const ComputerTabletUploadsItem = ({
result,
Expand Down Expand Up @@ -112,6 +114,8 @@ export const ComputerTabletUploadsItem = ({

<div className="flex justify-space-between align-items-end">
<small>
<DisplayPartOfCommunities communities={result.parent?.communities} />

{createdDate ? (
<>
{i18next.t("Uploaded on {{uploadDate}}", { uploadDate: createdDate })}
Expand All @@ -136,6 +140,7 @@ export const ComputerTabletUploadsItem = ({
/>
</small>
</div>
<DisplayVerifiedCommunity communities={result.parent?.communities} />
</Item.Extra>
</Item.Content>
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import _get from "lodash/get";
import { Dropdown, Icon, Item, Label } from "semantic-ui-react";
import { SearchItemCreators } from "../../utils";
import { CompactStats } from "../../components/CompactStats";
import { DisplayVerifiedCommunity } from "../../components/DisplayVerifiedCommunity";
import { DisplayPartOfCommunities } from "../../components/DisplayPartOfCommunities";

export const MobileUploadsItem = ({
result,
Expand Down Expand Up @@ -42,6 +44,7 @@ export const MobileUploadsItem = ({
);
const uniqueViews = _get(result, "stats.all_versions.unique_views", 0);
const uniqueDownloads = _get(result, "stats.all_versions.unique_downloads", 0);

return (
<Item key={result.id} className="deposits-list-item mobile only flex">
<Item.Content className="centered">
Expand Down Expand Up @@ -87,6 +90,7 @@ export const MobileUploadsItem = ({
))}
<div>
<small>
<DisplayPartOfCommunities communities={result.parent?.communities} />
{createdDate ? (
<>
{i18next.t("Uploaded on {{uploadDate}}", {
Expand Down Expand Up @@ -115,6 +119,7 @@ export const MobileUploadsItem = ({
</small>
</div>
</div>
<DisplayVerifiedCommunity communities={result.parent?.communities} />
</Item.Extra>
</Item.Extra>
<Item.Extra>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -510,3 +510,15 @@ dl.details-list {
border: 0;
}

.themed-community-label {
font-weight: @normal !important;
color: @white !important;
width: 100%;
height: @26px;
}

.themed-community-logo {
max-width: 100%;
max-height: 100%;
}

Loading