Dashboard page #184

mkmak2 · 2023-01-07T21:13:00Z

Ticket

Dashboard Page

Summary

to do:
show how many unread comments u have,
fix page display in navbar,
clean code

codecov-commenter · 2023-01-07T21:14:37Z

Codecov Report

Merging #184 (a8fa17b) into develop (34faafa) will decrease coverage by 1.60%.
The diff coverage is 0.00%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@             Coverage Diff             @@
##           develop     #184      +/-   ##
===========================================
- Coverage    79.39%   77.80%   -1.60%     
===========================================
  Files           31       31              
  Lines          830      847      +17     
  Branches       276      279       +3     
===========================================
  Hits           659      659              
- Misses         168      185      +17     
  Partials         3        3

Flag	Coverage Δ
unittest	`77.80% <0.00%> (-1.60%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
content-types/comment.ts	`100.00% <ø> (ø)`
server/services/admin.ts	`70.20% <0.00%> (-6.60%)`	⬇️
server/services/common.ts	`79.65% <ø> (ø)`

CodeVoyager · 2023-01-19T15:56:26Z

admin/src/pages/App/index.tsx

@@ -18,14 +18,16 @@ import {
  useNotification,
 } from '@strapi/helper-plugin';

-import ComingSoonPage from '../ComingSoonPage';
+//import ComingSoonPage from '../ComingSoonPage'; 


CodeVoyager · 2023-01-19T15:56:53Z

admin/src/pages/DashboardPage/components/LatestReports/index.tsx

+
+
+


Too much spacing left

CodeVoyager · 2023-01-19T15:58:34Z

admin/src/pages/Reports/index.tsx

+
+    console.log(result)
+


CodeVoyager · 2023-01-19T15:58:47Z

admin/src/pages/Discover/index.tsx

+  console.log(result);
+


CodeVoyager · 2023-01-19T15:58:58Z

admin/src/pages/Details/index.tsx

@@ -81,12 +81,12 @@ const Details = ({ config }) => {
    parseRegExp(config.regex.uid).flags
  );

-  const {
+  const {     


redundant spacing

CodeVoyager · 2023-01-19T15:59:53Z

admin/src/pages/DashboardPage/components/LatestReports/index.tsx

+                    </Table>
+
+                ) : (
+                  <EmptyStateLayout content={emptyLayout[emptyContent]} />
+                )}
+              </PanelLayout>
+          </>
+        )}
+      </Layout>
+  ) :
+    <NoAcccessPage />;
+


Redundant empty lines left

CodeVoyager · 2023-01-19T16:00:42Z

admin/src/pages/DashboardPage/components/LatestComments/index.tsx

+
+
+


CodeVoyager · 2023-01-19T16:01:32Z

admin/src/pages/DashboardPage/components/LatestComments/index.tsx

+    push(getUrl(`discover/${id}`));
+  };
+
+  const isLoading = isLoadingForData || isFetching;


Suggested change

const isLoading = isLoadingForData || isFetching;

const isLoading = isLoadingForData || isFetching || isLoadingForPermissions;

To make compound flag, well, compound and in one place.

* feat: custom fields on server-side * feat: graphql for custom comments field

* feat: author entity props blocking * feat: integration with settings page

* fix: [CU-862j5xat0] drilldown fail * feat: enable sidebar on details view * refactor: reworks

…tion types should allow comments when no enabled collection types are set. (#214)

Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.2.0 to 4.3.1. - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md) - [Commits](https://github.com/adobe/css-tools/commits) --- updated-dependencies: - dependency-name: "@adobe/css-tools" dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

kamilszewczyk0

I cannot display comments, neither on dashboard, nor discover. Also, error on toast is translate key, not string with error message ;/

kamilszewczyk0 · 2023-11-25T14:22:21Z

admin/src/components/AdminAvatar/styles.ts

+
    position: absolute;
-    right: -30%;
-    top: -30%;
+    right: -20%;
+    top: -20%;
+
+    border-radius: 50%;
+
+    background: transparent;


unnecessary empty spaces

kamilszewczyk0 · 2023-11-25T14:35:18Z

admin/src/components/DiscussionThreadItemActions/index.tsx

-                )}
-              />
-            )}
+            {!isAdminComment && (<>


would You consider extracting this fragment to separate component? Also, my recommendation is to chop this component to smaller parts, which will make it more readable

kamilszewczyk0 · 2023-11-25T14:52:07Z

admin/src/components/Wysiwyg/WysiwygStyles.ts

@@ -30,7 +30,7 @@ export const CustomLinkIconButton = styled(CustomIconButton)`
 `;

 export const MainButtons = styled(IconButtonGroup)`
-  margin-left: ${({ theme }:ThemeInterface) => theme.spaces[4]};
+
 `;

 export const MoreButton = styled(IconButton)`


component not used

kamilszewczyk0 · 2023-11-25T14:55:13Z

admin/src/pages/DashboardPage/components/LatestComments/index.tsx

+  useFocusWhenNavigate();
+
+  const {push} = useHistory();
+  const {notifyStatus} = useNotifyAT();
+  const {trackUsage} = useTracking();
+  const trackUsageRef = useRef(trackUsage);
+  const toggleNotification = useNotification();
+  const [{query: queryParams}] = useQueryParams();
+  const _q = queryParams?._q || '';
+
+  const viewPermissions = useMemo(
+    () => ({
+      access: pluginPermissions.access,
+      moderate: pluginPermissions.moderate,
+      accessReports: pluginPermissions.reports,
+      reviewReports: pluginPermissions.reportsReview,
+    }),
+    [],
+  );
+
+  const {
+    isLoading: isLoadingForPermissions,
+    allowedActions: {
+      canAccess,
+      canModerate,
+      canAccessReports,
+      canReviewReports,
+    },
+  } = useRBAC(viewPermissions);


code repetition - would You consider to extract this to separate file?

kamilszewczyk0 · 2023-11-25T14:56:24Z

admin/src/pages/DashboardPage/components/LatestReports/index.tsx

+  const [storedReports, setStoredReports] = useState([]);
+  const [selectedReports, setSelectedReports] = useState([]);
+
+  useFocusWhenNavigate();
+
+  const { push } = useHistory();
+  const { notifyStatus } = useNotifyAT();
+  const { trackUsage } = useTracking();
+  const trackUsageRef = useRef(trackUsage);
+  const toggleNotification = useNotification();
+  const [{ query: queryParams }] = useQueryParams();
+  const _q = queryParams?._q || "";
+  const queryClient = useQueryClient();
+  const { lockApp, unlockApp } = useOverlayBlocker();


code repetition - would You consider to extract this to separate file?

kamilszewczyk0 · 2023-11-25T14:57:56Z

admin/src/pages/DashboardPage/components/LatestReports/index.tsx

+  const onError = (err) => {
+    handleAPIError(err, toggleNotification);
+  };
+
+  const onSelectionChange = (selection) => setSelectedReports(selection);
+
+  const handleItemSelectionChange = (selection, value) => {
+    if (isArray(selection)) {
+      onSelectionChange(value ? selection : []);
+    } else {
+      onSelectionChange(
+        [...selectedReports, selection].filter(
+          (item) => value || selection !== item,
+        ),
+      );
+    }
+  };
+
+  const areAllItemsSelected = () =>
+    !isEmpty(selectedReports)
+      ? selectedReports.length === storedReports.length
+      : false;
+
+  const isItemSelected = (id) => selectedReports.includes(id);
+
+  const hasAnySelectedReports = selectedReports.length > 0;
+
+  const onValueChange = useCallback(
+    (value) => {
+      handleItemSelectionChange(
+        storedReports.map((_) => _.id),
+        value,
+      );
+    },
+    [storedReports],
+  );
+
+  const resolveReportMutation = useMutation(resolveReport, {
+    onSuccess: onSuccess(),
+    onError,
+    refetchActive: false,
+  });
+
+  const resolveMultipleReportsMutation = useMutation(resolveMultipleReports, {
+    onSuccess: onSuccess(),
+    onError,
+    refetchActive: false,
+  });
+
+  const handleClickResolveSelected = async () => {
+    if (canReviewReports) {
+      lockApp();
+      const items = await resolveMultipleReportsMutation.mutateAsync(
+        selectedReports,
+      );
+      if (!isEmpty(items)) {
+        const updatedReports = storedReports.map((_) => ({
+          ..._,
+          resolved: selectedReports.includes(_.id) ? true : _.resolved,
+        }));
+        setStoredReports(updatedReports);
+        setSelectedReports([], false);
+      }
+    }
+  };
+
+  const isLoading = isLoadingForData || isFetching;
+  const { total } = pagination;


another repetition - it would be better to place it somewhere else and reuse it

kamilszewczyk0 · 2023-11-25T15:05:26Z

admin/src/pages/DashboardPage/components/LatestReports/index.tsx

+
+
+


please do not leave more than 1 empty line of space

kamilszewczyk0 · 2023-11-25T15:09:35Z

admin/src/pages/Discover/components/DiscoverTableRow/index.tsx

@@ -26,6 +26,9 @@ import { IconButtonGroupStyled } from "../../../../components/IconButton/styles"
 import DiscussionThreadItemReviewAction from "../../../../components/DiscussionThreadItemReviewAction";
 import UserAvatar from "../../../../components/Avatar";



unnecessary empty space

kamilszewczyk0 · 2023-11-25T15:14:40Z

admin/src/pages/Reports/index.tsx

+
+
  const {


please leave just one line of space

kamilszewczyk0 · 2023-11-25T15:17:20Z

server/controllers/admin.ts

@@ -289,6 +289,7 @@ const controllers: IControllerAdmin = {
    }
  },

+


unnecessary empty line

mkmak2 added 3 commits December 16, 2022 17:03

build: add dashboard page and latest comments component

c4b116f

build: divide comments adn reports into 2 components

b80eb4e

feat: added action table

ded5601

mkmak2 requested a review from cyp3rius January 7, 2023 21:13

mkmak2 changed the base branch from master to develop January 7, 2023 21:13

CodeVoyager reviewed Jan 19, 2023

View reviewed changes

feat: add displayBY field and displayComment route

bbbee1d

cyp3rius force-pushed the dashboard-page branch from bbbee1d to da8f605 Compare June 6, 2023 09:10

mkmak2 added 2 commits July 16, 2023 10:03

fix: displayedBy field population fixed

0be2b6d

refactor: rebuild displayComment endpoit

cf3d830

mkmak2 force-pushed the dashboard-page branch from da8f605 to cf3d830 Compare July 17, 2023 09:11

mkmak2 and others added 18 commits July 18, 2023 08:50

fix: fixed user data fetching in displayComment endpoint

a8fa17b

feat: custom fields on server-side [CU-xhcmx-63] (#161)

718ecb3

* feat: custom fields on server-side * feat: graphql for custom comments field

chore: version bump

b17f727

feat: basic filters options added to Discover and Reports

466ca17

chore: version bump

8eeaf3a

fix: custom field on existing entity (#178)

36c98e7

chore: version bump

73b1878

chore: version bump

af62f9a

fix: [CU-862hz23aa] Translations init failure while async loading (#181)

f037809

chore: version bump

77e9d5f

feat: author entity props blocking (#186)

0fbe2ed

* feat: author entity props blocking * feat: integration with settings page

[CU-862j5xat0] fix: drilldown fail (#188)

5ec8c07

* fix: [CU-862j5xat0] drilldown fail * feat: enable sidebar on details view * refactor: reworks

chore: version bump

c3b4313

fix: author blocked props

be0a9b9

fix: unused import removed

dd7f519

chore: version bump

19863d2

fix: strapi v4.7.1 compatibility fix because of dependencies

37f7e2c

add: Turkish translation

ff061be

ubaranzorlu and others added 10 commits September 18, 2023 16:16

add: Turkish translation

10a8fcc

docs: tested version update

30cf5e6

fix: stick to older match-sorter dependency following strapi

e9ebf9f

add: Chinese translation

4a41bb7

docs: versions update

8e30a37

feat(api): issue #209 - find all by author

c64cfeb

Fixed behavior when no enabled collections are configured. All collec…

5c9ed4b

…tion types should allow comments when no enabled collection types are set. (#214)

feat: add Displayed By field in DetailsEntity

b03ee4e

commit after pull

d78f797

kamilszewczyk0 self-requested a review November 25, 2023 14:21

kamilszewczyk0 requested changes Nov 25, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dashboard page #184

Dashboard page #184

mkmak2 commented Jan 7, 2023

codecov-commenter commented Jan 7, 2023 •

edited

CodeVoyager Jan 19, 2023

CodeVoyager Jan 19, 2023

CodeVoyager Jan 19, 2023

CodeVoyager Jan 19, 2023

CodeVoyager Jan 19, 2023

CodeVoyager Jan 19, 2023

CodeVoyager Jan 19, 2023

CodeVoyager Jan 19, 2023

kamilszewczyk0 left a comment

kamilszewczyk0 Nov 25, 2023

kamilszewczyk0 Nov 25, 2023

kamilszewczyk0 Nov 25, 2023

kamilszewczyk0 Nov 25, 2023

kamilszewczyk0 Nov 25, 2023

kamilszewczyk0 Nov 25, 2023

kamilszewczyk0 Nov 25, 2023

kamilszewczyk0 Nov 25, 2023

kamilszewczyk0 Nov 25, 2023

kamilszewczyk0 Nov 25, 2023

	const isLoading = isLoadingForData \|\| isFetching;
	const isLoading = isLoadingForData \|\| isFetching \|\| isLoadingForPermissions;

		@@ -26,6 +26,9 @@ import { IconButtonGroupStyled } from "../../../../components/IconButton/styles"
		import DiscussionThreadItemReviewAction from "../../../../components/DiscussionThreadItemReviewAction";
		import UserAvatar from "../../../../components/Avatar";

		@@ -289,6 +289,7 @@ const controllers: IControllerAdmin = {
		}
		},

Dashboard page #184

Are you sure you want to change the base?

Dashboard page #184

Conversation

mkmak2 commented Jan 7, 2023

Ticket

Summary

codecov-commenter commented Jan 7, 2023 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kamilszewczyk0 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-commenter commented Jan 7, 2023 •

edited