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

weekly promotion of develop to main #822

Merged
merged 3 commits into from
May 30, 2024
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"cz-conventional-changelog": "^3.3.0",
"husky": "^8.0.0",
"is-ci": "^3.0.1",
"near-social-vm-types": "^1.1.0",
"prettier": "^3.1.0"
},
"config": {
Expand Down
11 changes: 9 additions & 2 deletions src/Search/ComponentCard.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
const [accountId, widget, widgetName] = props.src.split("/");
const metadata = Social.get(`${accountId}/widget/${widgetName}/metadata/**`, "final");
const detailsUrl = `/${REPL_ACCOUNT}/widget/ComponentDetailsPage?src=${accountId}/widget/${widgetName}`;
const variant = props.variant ?? "default";
const metadata =
variant === "nearcatalog"
? { image: props.image, name: props.name }
: Social.get(`${accountId}/widget/${widgetName}/metadata/**`, "final");
const appUrl = `/${accountId}/widget/${widgetName}`;
const detailsUrl =
variant === "nearcatalog"
? appUrl
: `/${REPL_ACCOUNT}/widget/ComponentDetailsPage?src=${accountId}/widget/${widgetName}`;
const accountUrl = `/${REPL_ACCOUNT}/widget/ProfilePage?accountId=${accountId}`;
const onPointerUp =
props.onClick ??
Expand Down
17 changes: 12 additions & 5 deletions src/Search/FullPage/ComponentCard.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
const [accountId, widget, widgetName] = props.src.split("/");
const metadata = Social.get(`${accountId}/widget/${widgetName}/metadata/**`, "final");
const tags = Object.keys(metadata.tags || {});
const detailsUrl = `/${REPL_ACCOUNT}/widget/ComponentDetailsPage?src=${accountId}/widget/${widgetName}`;
const variant = props.variant ?? "default";
const metadata =
variant === "nearcatalog"
? { image: props.image, name: props.name, tags: props.tags }
: Social.get(`${accountId}/widget/${widgetName}/metadata/**`, "final");
const tags = metadata.tags && Array.isArray(metadata.tags) ? metadata.tags : Object.keys(metadata.tags || {});
const appUrl = `/${accountId}/widget/${widgetName}`;
const detailsUrl =
variant === "nearcatalog"
? appUrl
: `/${REPL_ACCOUNT}/widget/ComponentDetailsPage?src=${accountId}/widget/${widgetName}`;
const accountUrl = `/${REPL_ACCOUNT}/widget/ProfilePage?accountId=${accountId}`;
const onPointerUp =
props.onClick ??
Expand Down Expand Up @@ -153,7 +160,7 @@ const ButtonLink = styled("Link")`

return (
<Card>
{
{variant !== "nearcatalog" && (
<CardTag>
<i className="bi bi-clock"></i>{" "}
<Widget
Expand All @@ -165,7 +172,7 @@ return (
/>{" "}
ago
</CardTag>
}
)}

<CardBody>
<Thumbnail href={detailsUrl} onPointerUp={onPointerUp}>
Expand Down
74 changes: 54 additions & 20 deletions src/Search/IndexPage.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const SEARCH_API_KEY = props.searchApiKey ?? "0e42c01107b8f555a41bcc0fa7f2a4df";
const SEARCH_API_KEY = props.searchApiKey ?? "fc7644a5da5306311e8e9418c24fddc4";
const APPLICATION_ID = props.appId ?? "B6PI9UKKJT";
const INDEX = props.index ?? "prod_near-social-feed";
const INDEX = props.index ?? "replica_prod_near-social-feed";
const API_URL = props.apiUrl ?? `https://${APPLICATION_ID}-dsn.algolia.net/1/indexes/${INDEX}/query?`;
const INITIAL_PAGE = props.initialPage ?? 0;
const facets = props.facets ?? ["All", "People", "Apps", "Components", "Posts"];
Expand All @@ -14,6 +14,7 @@ const userId = props.accountId ?? context.accountId;

const componentsUrl = `/${REPL_ACCOUNT}/widget/ComponentsPage`;
const peopleUrl = `/${REPL_ACCOUNT}/widget/PeoplePage`;
const nearcatalogUrl = `/${REPL_NEARCATALOG}/widget/Index`;

State.init({
facet: tab,
Expand Down Expand Up @@ -209,6 +210,26 @@ const components = (records) => {
return components;
};

// creates an array of components
const nearcatalog = (records) => {
const components = [];
for (const [i, component] of records || []) {
const widgetName = "Index";
const accountId = "nearcatalog.near";
components.push({
accountId,
widgetName,
slug: component.slug,
image: component.image,
name: component.name,
tags: component.tags,
variant: "nearcatalog",
searchPosition: i,
});
}
return components;
};

const categorizeSearchHits = (rawResp) => {
const results = {};
for (const [i, result] of rawResp.hits?.entries()) {
Expand Down Expand Up @@ -243,6 +264,7 @@ const fetchSearchHits = (query, { pageNumber, configs, optionalFilters }) => {
query,
page: pageNumber ?? 0,
optionalFilters: optionalFilters ?? [
"categories:nearcatalog<score=4>",
"categories:profile<score=3>",
"categories:widget<score=2>",
"categories:post<score=1>",
Expand All @@ -269,7 +291,9 @@ const updateSearchHits = debounce(({ term, pageNumber, configs }) => {
State.update({
search: {
profiles: profiles(results["profile"]),
components: components(results["app, widget"]).concat(components(results["widget"])),
components: components(results["app, widget, nearcatalog"])
.concat(components(results["widget"]))
.concat(nearcatalog(results["nearcatalog"])),
postsAndComments: posts(results["post"], "post").concat(posts(results["comment, post"], "post-comment")),
},
currentPage: pageNumber,
Expand Down Expand Up @@ -316,7 +340,7 @@ const searchFilters = (facet) => {
filters = `(${filters} OR categories:comment)`;
}
if (category === "app") {
filters = `(${filters} OR tags:app)`;
filters = `(${filters} OR tags:app OR categories:nearcatalog)`;
}
if (filters) {
filters = `${filters} AND `;
Expand Down Expand Up @@ -461,22 +485,32 @@ return (
</GroupHeader>

<Items>
{state.search.components.map((component, i) => (
<Item key={component.accountId + component.widgetName}>
<Widget
src="${REPL_ACCOUNT}/widget/Search.FullPage.ComponentCard"
props={{
src: `${component.accountId}/widget/${component.widgetName}`,
onClick: () =>
onSearchResultClick({
searchPosition: component.searchPosition,
objectID: `${component.accountId}/widget/${component.widgetName}`,
eventName: "Clicked Component After Search",
}),
}}
/>
</Item>
))}
{state.search.components.map((component, i) => {
const isNearCatalogItem = component.variant && component.variant === "nearcatalog";
const componentSrc = isNearCatalogItem
? `${component.accountId}/widget/${component.widgetName}?id=${component.slug}`
: `${component.accountId}/widget/${component.widgetName}`;
const componentProps = isNearCatalogItem
? { image: component.image, name: component.name, tags: component.tags, variant: component.variant }
: {};
return (
<Item key={componentSrc}>
<Widget
src="${REPL_ACCOUNT}/widget/Search.FullPage.ComponentCard"
props={{
src: componentSrc,
...componentProps,
onClick: () =>
onSearchResultClick({
searchPosition: component.searchPosition,
objectID: `${component.accountId}/widget/${component.widgetName}`,
eventName: "Clicked Component After Search",
}),
}}
/>
</Item>
);
})}
</Items>
</Group>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/Search/Insights.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ window.addEventListener("message", (message) => {
return (
<iframe
srcDoc={code}
style={{ position: absolute, width: 0, height: 0, border: 0 }}
style={{ position: "absolute", width: 0, height: 0, border: 0 }}
message={{ event: props.event }}
onMessage={(resp) => onChange(resp)}
/>
Expand Down
Loading
Loading