TH-1006: Show super event date in event hero if exists #213

melniiv · 2021-02-16T11:22:43Z

Description ✨

Issues 🐛

Testing ⚗️

Screenshots 📸

Additional notes 🗒️

nenonja

I left some comments, also I think that shouldnt this feature be branched from master instead of events-helsinki-2? I think this is wanted to the production before 2.0.
If it's so, basically this feature could be done in two pr:s, first on master and then another in events-helsinki-2 after merging master that adds the super event date to the coursePage.

src/domain/course/CoursePageContainer.tsx

src/domain/event/eventHero/EventHero.tsx

nenonja · 2021-02-16T12:18:26Z

It seems that Tomi Aalto's input about the resolution is still missing from the ticket. Maybe we should wait for it before merging...

melniiv · 2021-02-16T13:36:58Z

yes, with loading part we need Tomi, i ll request to test

codecov-io · 2021-02-16T13:53:00Z

Codecov Report

❗ No coverage uploaded for pull request base (events-helsinki-2@113b348). Click here to learn what that means.
The diff coverage is n/a.

@@                 Coverage Diff                  @@
##             events-helsinki-2     #213   +/-   ##
====================================================
  Coverage                     ?   97.65%           
====================================================
  Files                        ?      158           
  Lines                        ?     2810           
  Branches                     ?      810           
====================================================
  Hits                         ?     2744           
  Misses                       ?       63           
  Partials                     ?        3

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 113b348...3f69318. Read the comment docs.

src/domain/course/CoursePageContainer.tsx

src/domain/event/eventHero/__tests__/EventHero.test.tsx

nenonja · 2021-02-17T08:07:10Z

I left some comments, also I think that shouldnt this feature be branched from master instead of events-helsinki-2? I think this is wanted to the production before 2.0.
If it's so, basically this feature could be done in two pr:s, first on master and then another in events-helsinki-2 after merging master that adds the super event date to the coursePage.

Mari said that this will be only in Courses and 2.0 so all is fine :)

nenonja · 2021-02-17T08:45:24Z

There could be loading-spinner in place when still loading the event time to avoid moving components on page.

melniiv · 2021-02-17T08:47:06Z

yes, we are discussing now with Tomi, he said that spinner might be overkill, but some animation, he is preparing the example

nenonja

Some more comments

src/domain/course/CoursePageContainer.tsx

package.json

nenonja · 2021-02-18T16:04:05Z

I just fixed browser-tests and they rely more on loading spinner, so rebasing events-helsinki-2 would be help to make tests green and avoid conflicts with spinner.

nenonja · 2021-02-19T13:50:44Z

react-content-loader has cpu issue, but perhaps not deal-breaker: danilowoz/react-content-loader#125

nenonja

If Tomi approved the ui, this is fine for me too 👍

src/domain/event/eventInfo/otherEventTimes/OtherEventTimes.tsx

src/domain/course/__tests__/CoursePageContainer.test.tsx

src/domain/event/eventInfo/otherEventTimes/OtherEventTimes.tsx

Sartonon

Good :)

* commit to move work in progresds code to another computer :) * Add course search panel and course results list + some refactor * Add new useDivisionOptions hook * Add buildQueryFromObjetc func * refactor + add tests * Add source parameter to rest of the queries * Fix CourseSearchPageContainer test that relied on specific date * Add todo text to hasUpcomingEvents fix * Use testId variable in FilterSummary * Fix naming onlyOngoingCourses to alsoOngoingCourses * Use eventsRoute default value in EventKeywords component * use same utility functions in course search page as events page * update hds from 13.3 to 17.0 * fix accessibility issues on icons * fix last failing tests: add srOnly text to link name * rebase aftermath: add some more aria-hiddens to fix acceesibility axe-tests * review fixes * TH-681: Replace NavBar with react-hds Navigation component and remove unused components and tests. Some other tests still fail * fix tests * TH-861: added Header tests * add missing snapshot * IntelliJ files ignored * TH-861: fix testcafe test * TH-861: review fixes, use new breakpoints.scss, layout.scss deprecated * TH-861: review fix: fix import * TH-862: improve testcafe test * review fix: simpler anchor link skipToContent * Fix HDS css color variable names * PT-861: start to use helsinki design system footer * TH-861 review fixes * Fix error that came up with rebase and conflict resolving * commit to move work in progresds code to another computer :) * Add course search panel and course results list + some refactor * Initial single course page * Add different backgound color classes for event/course page * Add audience to eventFields * Tests refactoring + delete unused mock * Use different colors for course page and add course specific fields * Update organization info component to work correctly in course context * Update similiar events section to work both course and event page * Fix misspelling of similar * move types from eventCard to event folder root * Make other event time to works for both course and event page * Update typescript * Move other event types components and add new tests * Update course list query to use allOngoingAnd param * Add K8S_PROBE_INITIAL_DELAY: 120 env variable to review pipeline config to avoid timeout * Change the placement of K8S_PROBE_INITIAL_DELAY variable * Add courses link to header * Update sitemap to generate also for courses * update/fix css variables from hds * Add initial tests for course page * commit to move work in progresds code to another computer :) * Add course search panel and course results list + some refactor * Add new useDivisionOptions hook * Add buildQueryFromObjetc func * refactor + add tests * Add source parameter to rest of the queries * Fix CourseSearchPageContainer test that relied on specific date * Add todo text to hasUpcomingEvents fix * Use testId variable in FilterSummary * Fix naming onlyOngoingCourses to alsoOngoingCourses * Use eventsRoute default value in EventKeywords component * use same utility functions in course search page as events page * update hds from 13.3 to 17.0 * fix accessibility issues on icons * fix last failing tests: add srOnly text to link name * rebase aftermath: add some more aria-hiddens to fix acceesibility axe-tests * review fixes * TH-681: Replace NavBar with react-hds Navigation component and remove unused components and tests. Some other tests still fail * fix tests * TH-861: added Header tests * add missing snapshot * IntelliJ files ignored * TH-861: fix testcafe test * TH-861: review fixes, use new breakpoints.scss, layout.scss deprecated * TH-861: review fix: fix import * TH-862: improve testcafe test * review fix: simpler anchor link skipToContent * Fix HDS css color variable names * PT-861: start to use helsinki design system footer * TH-861 review fixes * Fix error that came up with rebase and conflict resolving * Update Dockerfile to generate smaller image * delete ^ from package.prod.json and update Dockerfile * use Docker target development in docker-compose.yml * Add package.prod.json explanation to README * Add dependency to build job in production workflow * Show other eventtime dropdown only if they exist * Update the design of show more mevent button * Add more tests to single course page * Add additional hostnames for production workflow * Improve tests for single event page * Deleter unused footer components * Fix tests * TH-899: Add isFree checkbox and search logic to courses search * move moveToEventPage outside of the events list map callback * Add route direct for deprecated single event url * Fix downloadIcsFile func to support courses * Add REACT_APP_LINKED_COURSES_URL to Dockerfile * Add automatic scrolling to course search page * Refactor useSimilarEventQuery and useSimilarCourseQuery * Downgrade typescript back to 3.9.3 * Further improve typing of useSimilarEvents hooks * TH-901: Add course categories with keyword_set Adds the internal logic for handling course category keyword_sets. The actual set ids not implemented. Waiting for backend. * Fix default searchSource * Fix default searchSource * Add SearchPage component used by EventSearchPageContainer and CourseSearchPageContainer * Update link colors in single course page * Fix broken browser test * use event type enum in EventHero test file * Add tests for newly added stuff in EventInfo * Improve EventPage and CoursePage containers ternaries * Deleted unused utils file * Combine getEventAudience and getEventKeywords into a single function and improve tests * use type instead of enum for EvenType * Add test for deprecated /event/:id route redirection * Fix errors * Initial new frontpage layout * Adjust searchpanel margins for different window sizes * small css-adjustions * Add category options * Th 948 hobby types (#177) * TH-948: Add harrastusmuoto to courses search * TH-948: Add harrastusmuoto to courses search * Adds search component tests * Adds multiple selection tests * fix merging issues Co-authored-by: Jaakko Nenonen <jaakko@codelicious.fi> * Add functionaity to popular categories buttons * Delete old components and add tests to new ones * change padding for search container * Fix autosuggest going under the waves :) * Change files names and add show categories button to mobile * Add isMobile hook for mobile placeholder + translations * Delete landing page costants file * Add test coverage on LandingPage * Move wave clip path to its own file * Add replace clip path with the component and add backgroundHelper to LandingPagePreview * FrontPage renamed to LadingPage in test file * Use Categoryoption type * Add test to make sure all the categories are included * TH-926: Fixes initial lang attribute (#179) * Switch to master branch in Gitlab Staging pipeline * update generated graphql (#182) Removed unused landingPage graphql fields * th-914: Testcafe tests to read service url from environment parameters (#176) * TH-898: Adds age search for courses (#185) * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * TH-898: Adds kohderyhmä to course search wip * Improve RandeDropdown, some refactoring + fix bug when removing filters * Fixes based on comments * landing page improvements * Add focus style handling hook for EventInfo buttons and links * Fix resize observer problem (#187) Ignore ResizeObserver javascript error in testcafe * Add enrol/registration button to course page * Improvements / fixes based on comments * Add aria-expanded property to show popular categories button * Add tests to check the aria-expanded attribute * Flip arrow when expanding other event time * Add test for focus+shift in useTabFocusStyle * use clip path for search section in mobile to avoid clipping focus outlines * Override default focusToTop functionality to avoid focusing skip to content * Change other event times list items to have larger click area * Delete old code * Self close ResetFocus div * fix course back button * Add test to make sure history.replace is called correctly when eventId is deleted from state * TH-915: Cherry pick browser tests to events-helsinki-2 (#200) * TH-915: cherry-pick browser tests to events-helsinki-2 * TH-915: handle client side errors (ResizeObserver and stuff) * Th-908: Fix bottom banner top layer image position: (#193) * TH-915: add header's course search tab test * TH-984: Improves courses search target group dropdown (#203) * TH-984: Improves course search target group dropdown * Fix tests * Improve validation logic * Improve validation logic * Tests, one failing * Improvements, based on comments * Improvements, based on comments * Improvements, based on comments * TH-901,948: Events categories, course categories and course hobby type keyword_set support (#196) * TH-901: Categories demo 2 * TH-901: Categories demo 2 * TH-901:Adds the course mode keyword_set support * Add course categories keyword set support * Fix courses free text with location * Fix courses search tags * Fix tests * Fix tests * Clear code comments * Fix tests * Improvements, based on comments * Improvements, based on comments * Improvements, based on comments * Improvements, based on comments * Improvements, based on comments * use arrays in mapped categories Co-authored-by: Santeri Rusila <santtu_1993@hotmail.com> * Fix keyword / tag linking in course page * codegen browser-test graphql to fix broken collection test * TH-1006: Show super event date in event hero if exists (#213) * TH-1006: Show super event date in event hero if exists * Fixes based on commmnets * Fixes based on commmnets * Fixes tests * Fixes, super event only for courses and optional * Fixes based on comments * Fixes tests * Fixes * Fixes * Add spinner * Add skeleton loader, minor fixes * Improves skeleton loader * Removes skeleton, ssr problems * Fix apollo client reference * Add skeleton, fix otherevent times * Adds tests * Fix * Fixes * Fixes * Fixes clear all outline in range dropdown (#219) * TH-1040: Temporary hides area search for courses (#226) * Fix header navigation label in finnish from 'etsi tapahtumia' to tapahtumat * Use external link icon in external links * refactor coursePageContainer test + better functions * Removed some duplicate style imports. TH-975 Investigated why the normalize.css was added 3 times inside the head-section and it looked like there are lot of deprecated stuff which now come from HDS or other plugins. * Add courses link to footer * Dele .only * Fix tests action errors (#228) * delete unused getLanguageFromUrl and refactor regexp * Add comment to getEventIdFromUrl * Fix header tests * formatPrice func * Fix browser tests on events-helsinki-2 branch + removed doubled text from header (#232) * fix browser tests on events-helsinki-2 branch + remove duplicate link from header * filter out events that have expired but shown due to possible LE cache problem. * fix internet event check * TH-1006: Add local event time to event hero (#231) * improvements * fix tests * TH-1054, TH934: Update HDS to 0.23.0 to fix header SSR issue (#217) * Update HDS to 0.23.0 and delete redundant stuff Co-authored-by: Santeri Rusila <santtu_1993@hotmail.com> * Improves hadling of age dropdown negative values (#236) * Add image credits to banner heros and collection heros * Delete photographerName from image query * update codegern * prettierIgnore -> prettierignore (without capital letter) * use double negation in BannrHero jsx * Refactoring based on comments * TH-1042: Fix dates dropdown in course search page (#238) * TH-1050: Date range min allowed date logic improvement (#237) * TH-1013; Footer redesign with dynamic categories (#240) * init * improvements * tests * refactoring * fix sv translations * improvements * TH-1011: Missing translations added (#241) * translations * translations * TР-1011: Fix icons for course search (#242) * Fix footer background color * Hide image credits in mobile * Add photographer name to single event page description * TH-1065: Adds audience age info to single course page (#250) * init * tests * tests * fixed translations * tests improved * tests improved * TH-1078: Events helsinki 2 feature flag (#249) * review fix: no need to copy-paste BannerHero * Review workflow to use matrix * review fixes * Multiple deployments (#251) * clean up workflows * fix versions * distinct pr deploy messages * sitemap: course links behind feature-flag Co-authored-by: Santeri Rusila <santtu_1993@hotmail.com> Co-authored-by: Jori Lindell <jori.lindell@gmail.com> Co-authored-by: Santeri Rusila <santeri.rusila@sarmadigital.com> Co-authored-by: joonvena <joonvena@gmail.com> Co-authored-by: Joonas Venäläinen <38143731+joonvena@users.noreply.github.com> Co-authored-by: Ivan Melnik <melnik.job@gmail.com> Co-authored-by: Khin Loc <khin.loc@anders.com> Co-authored-by: Niko Lindroos <niko.j.makela@gmail.com> Co-authored-by: Juho Saarinen <juho.saarinen@mavericks.fi> Co-authored-by: Santeri Rusila <santeri.rusila@sarmadigital.com> Co-authored-by: Jaakko Nenonen <jaakko.pekka.nenonen@gmail.com> Co-authored-by: Jaakko Nenonen <jaakko@codelicious.fi> Co-authored-by: Jori Lindell <jori.lindell@gmail.com> Co-authored-by: joonvena <joonvena@gmail.com> Co-authored-by: Joonas Venäläinen <38143731+joonvena@users.noreply.github.com> Co-authored-by: Ivan Melnik <melnik.job@gmail.com> Co-authored-by: Khin Loc <khin.loc@anders.com> Co-authored-by: Niko Lindroos <niko.j.makela@gmail.com> Co-authored-by: Juho Saarinen <juho.saarinen@mavericks.fi>

TH-1006: Show super event date in event hero if exists

9aa24f6

melniiv requested a review from Sartonon February 16, 2021 11:22

nenonja requested changes Feb 16, 2021

View reviewed changes

Fixes based on commmnets

8ba4a7f

melniiv added 2 commits February 16, 2021 15:39

Fixes based on commmnets

032a935

Fixes tests

ab7b51e

melniiv added 3 commits February 16, 2021 17:20

Fixes, super event only for courses and optional

fd61208

Fixes based on comments

ac7cb8d

Fixes tests

cb3c984

Sartonon reviewed Feb 17, 2021

View reviewed changes

src/domain/course/CoursePageContainer.tsx Outdated Show resolved Hide resolved

nenonja reviewed Feb 17, 2021

View reviewed changes

src/domain/event/eventHero/__tests__/EventHero.test.tsx Show resolved Hide resolved

Fixes

4e9547d

melniiv added 4 commits February 17, 2021 13:12

Fixes

9dee0c4

Add spinner

17ab2c3

Add skeleton loader, minor fixes

9b17aff

Improves skeleton loader

f0e634a

nenonja reviewed Feb 18, 2021

View reviewed changes

src/domain/course/CoursePageContainer.tsx Show resolved Hide resolved

package.json Show resolved Hide resolved

melniiv added 3 commits February 19, 2021 10:18

Removes skeleton, ssr problems

2ed28b7

Fix apollo client reference

7537c2f

Add skeleton, fix otherevent times

e4f02d9

nenonja self-requested a review February 19, 2021 13:55

nenonja approved these changes Feb 19, 2021

View reviewed changes

Sartonon reviewed Feb 19, 2021

View reviewed changes

src/domain/event/eventInfo/otherEventTimes/OtherEventTimes.tsx Outdated Show resolved Hide resolved

melniiv added 2 commits February 21, 2021 13:09

Adds tests

71c2e8c

Fix

3f69318

Sartonon reviewed Feb 21, 2021

View reviewed changes

src/domain/course/__tests__/CoursePageContainer.test.tsx Outdated Show resolved Hide resolved

Sartonon reviewed Feb 21, 2021

View reviewed changes

src/domain/event/eventInfo/otherEventTimes/OtherEventTimes.tsx Outdated Show resolved Hide resolved

melniiv added 2 commits February 22, 2021 09:15

Fixes

c4e24c5

Fixes

b7ee011

Sartonon approved these changes Feb 22, 2021

View reviewed changes

melniiv merged commit a05a7fb into events-helsinki-2 Feb 22, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

TH-1006: Show super event date in event hero if exists #213

TH-1006: Show super event date in event hero if exists #213

melniiv commented Feb 16, 2021

nenonja left a comment •

edited

Loading

nenonja commented Feb 16, 2021

melniiv commented Feb 16, 2021

codecov-io commented Feb 16, 2021 •

edited

Loading

nenonja commented Feb 17, 2021 •

edited

Loading

nenonja commented Feb 17, 2021

melniiv commented Feb 17, 2021

nenonja left a comment

nenonja commented Feb 18, 2021

nenonja commented Feb 19, 2021

nenonja left a comment

Sartonon left a comment

TH-1006: Show super event date in event hero if exists #213

TH-1006: Show super event date in event hero if exists #213

Conversation

melniiv commented Feb 16, 2021

Description ✨

Issues 🐛

Testing ⚗️

Screenshots 📸

Additional notes 🗒️

nenonja left a comment • edited Loading

Choose a reason for hiding this comment

nenonja commented Feb 16, 2021

melniiv commented Feb 16, 2021

codecov-io commented Feb 16, 2021 • edited Loading

Codecov Report

nenonja commented Feb 17, 2021 • edited Loading

nenonja commented Feb 17, 2021

melniiv commented Feb 17, 2021

nenonja left a comment

Choose a reason for hiding this comment

nenonja commented Feb 18, 2021

nenonja commented Feb 19, 2021

nenonja left a comment

Choose a reason for hiding this comment

Sartonon left a comment

Choose a reason for hiding this comment

nenonja left a comment •

edited

Loading

codecov-io commented Feb 16, 2021 •

edited

Loading

nenonja commented Feb 17, 2021 •

edited

Loading