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

Feature/admin dashboard visualize group events 413 #448

Conversation

cblanken
Copy link
Contributor

Description

Group repeating events with the same groupId into a single items on the admin dashboard and split single (non-repeating) events and repeating events into separate sections.

Type of change

Please select everything applicable. Please, do not delete any lines.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update
  • This change requires an update to testing

Issue

This PR addresses issue #413

  • Is this related to a specific issue? If so, please specify:

Checklist:

  • This PR is up to date with the main branch, and merge conflicts have been resolved
  • I have executed npm run test and all tests have passed successfully or I have included details within my PR on the failure.
  • I have executed npm run lint and resolved any outstanding errors. Most issues can be solved by executing npm run format
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings

@cblanken cblanken temporarily deployed to DEV August 24, 2023 14:01 — with GitHub Actions Inactive
@cblanken cblanken temporarily deployed to DEV August 28, 2023 19:47 — with GitHub Actions Inactive
@cblanken
Copy link
Contributor Author

cblanken commented Aug 29, 2023

Here are a couple screenshots

Admin Dashboard with 1 single event and 1 recurring event.
image

Recurring event on calender
image

When the DataService fails to retrieve the displayName for the user, "UNKNOWN" is displayed
in its place.
@cblanken cblanken temporarily deployed to DEV September 11, 2023 02:48 — with GitHub Actions Inactive
Copy link
Member

@Caleb-Cohen Caleb-Cohen left a comment

Choose a reason for hiding this comment

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

Just curious why this was added. Did we not have this functionality?

Otherwise, LGTM

@cblanken
Copy link
Contributor Author

cblanken commented Sep 11, 2023

Just curious why this was added. Did we not have this functionality?

Otherwise, LGTM

Before, repeating events were rendered individually for each instance.
According to issue #413 it was requested to group recurring events into individual items which this PR addresses.

@Caleb-Cohen
Copy link
Member

Caleb-Cohen commented Sep 11, 2023

Just curious why this was added. Did we not have this functionality?
Otherwise, LGTM

Before, repeating events were rendered individually for each instance. According to issue #413 it was requested to group recurring events into individual items which this PR addresses.

Sorry I was referencing a code block that didn't carry over to the comment. I'm surprised we did not have the functionality referenced below in

cypress/support/commands.js


Cypress.Commands.add("deleteOwnEvent", id => {
  if (id) {
    cy.request("DELETE", `/events/${id}`);
  }
});

Cypress.Commands.add("getAllEvents", userCode => {
  // cy.login(userCode)
  return cy.request("GET", "/events");
});

@cblanken
Copy link
Contributor Author

Not that I could find. There were only Cypress commands for login, createOwnEvents, and deleteOwnGroupEvents, so I added those to avoid a bunch of code duplication in the tests.

@Caleb-Cohen Caleb-Cohen merged commit 0175bed into Together-100Devs:main Sep 12, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants