Skip to content

Fix asset sorting and filtering #178

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
merged 1 commit into from
Aug 16, 2023
Merged

Fix asset sorting and filtering #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions src/components/Assets/AssetList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,10 @@ export const AssetList = (props: AssetListProps) => {
.map((entryId) => {
const entries = props.entries[entryId];
return entries.map((entry) => {
const relatedServices = entries.map((entry) => entry.serviceName);
const relatedServices = entries
.map((entry) => entry.serviceName)
.filter((x, i, arr) => arr.indexOf(x) === i);

return {
...entry,
id: entryId,
Expand Down Expand Up @@ -388,9 +391,17 @@ export const AssetList = (props: AssetListProps) => {
{sortedEntries.length > 0 ? (
<s.List>
{sortedEntries.map((entry) => {
const key = [
entry.serviceName,
entry.endpointCodeObjectId,
entry.span.spanCodeObjectId
]
.filter(Boolean)
.join("|_|");

return (
<AssetEntryComponent
key={`${entry.id}-${entry.serviceName}`}
key={key}
entry={entry}
onAssetLinkClick={handleAssetLinkClick}
/>
Expand Down
15 changes: 6 additions & 9 deletions src/components/RecentActivity/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const actions = addPrefix(ACTION_PREFIX, {
CLOSE_LIVE_VIEW: "CLOSE_LIVE_VIEW"
});

const handleTroubleshootingLinkClick = () => {
const handleTroubleshootButtonClick = () => {
sendTrackingEvent(globalTrackingEvents.TROUBLESHOOTING_LINK_CLICKED, {
origin: "recent activity"
});
Expand All @@ -46,14 +46,11 @@ const renderNoData = () => {
<CursorFollower>
<DigmaLogoFlatIcon size={64} />
</CursorFollower>
<s.NoDataTitle>No Data Yet</s.NoDataTitle>
<s.NoDataText>
Trigger actions that call this application to learn more about its
runtime behavior
</s.NoDataText>
<s.TroubleshootingLink onClick={handleTroubleshootingLinkClick}>
Not seeing your application data?
</s.TroubleshootingLink>
<s.NoDataTitle>No Recent Activity</s.NoDataTitle>
<s.NoDataText>Not seeing your application data?</s.NoDataText>
<s.TroubleshootButton onClick={handleTroubleshootButtonClick}>
Troubleshoot
</s.TroubleshootButton>
</s.NoDataContainer>
);
};
Expand Down
17 changes: 3 additions & 14 deletions src/components/RecentActivity/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from "styled-components";
import { Link } from "../common/Link";
import { Button } from "../common/Button";

export const Container = styled.div`
height: 100%;
Expand Down Expand Up @@ -113,19 +113,8 @@ export const NoDataText = styled.span`
}};
`;

export const TroubleshootingLink = styled(Link)`
font-size: 14px;
line-height: 16px;
text-decoration: none;
color: ${({ theme }) => {
switch (theme.mode) {
case "light":
return "#426dda";
case "dark":
case "dark-jetbrains":
return "#7891d0";
}
}};
export const TroubleshootButton = styled(Button)`
margin-top: 8px;
`;

export const LiveViewContainer = styled.div`
Expand Down