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

release(0.37.0): merge to master #1388

Merged
merged 17 commits into from
Aug 3, 2023
Merged

release(0.37.0): merge to master #1388

merged 17 commits into from
Aug 3, 2023

Conversation

seaerchin
Copy link
Contributor

dup of #1387 to prod

harishv7 and others added 15 commits July 27, 2023 19:05
* feat(preview): added preview images

* fix(preview): fixes according to review

* ref(preview): remove excess imageUrl check and added comments
* Done what simple copy changes I can

* chore(copy): add design copy changes

* fix(resource room): remove redundant hstack

* fix(eslint): fix eslint issues

* chore(folders): remove redundant node

* chore(copy): change correct folder icons

* fix(folders): fix eslint

---------

Co-authored-by: Nat <[email protected]>
* feat(e2e tests): add merge commit api

* fix(compilation bug): define empty noti text from fixtures

* feat(noti e2e): partial e2e noti changes

* feat(notif): full suite notif e2e

* fix(e2e notif): remove redundant tests
* feat(siteLaunchPad): change API for component

* feat(storybook): site launch pad storybook

* chore(storybook): dont use depreciated functions

* fix(site launch): change the used component
* feat(site launch): add in refetch behvaiour

* refactor(useGetSiteLaunchStatus): change var name
* feat(siteLaunchUtils): add in func to check email

* feat(siteLaunch): only admins see site launch feat

* fix(role): use result from be
* build(package): install new dnd package

* refactor(hero): use new dnd package

* test(homepage.spec): add new spec

* refactor(const): shift cost stuff out

* docs(homepage.spec): fix typo

* docs(homepage.spec): add doc
* chore(copy): add design copy changes

* feat(copy changes):add copy changes

* fix(resource rm): remove redundant code

* fix(ungrouped pages): escape special char

* fix(workspace folder): wrong copy

---------

Co-authored-by: Nat <[email protected]>
* feat!: add design system theme for Isomer

some things will break, because colors are now overriden to use design system tokens.

* fix(card): update theme to use design tokens

* feat(ButtonLink): correctly use `a` tag instead of Link prop

redundant styling was used because of casting to Link component instead of `a` tag

* feat: add inter and ibm plex font imports

both storybook and main appl

* fix(RequestOverview): fix colors and layout

* build(package json): add required deps

* build(index): remove bootstrap

i double checked this by gg to the templates repo and searching for css impotrs both in the
`next-gen` branch and in `staging`. no bootstrap import was spotted so this should be a safe removal
assuming we aren't depending on it for styling for template components. for cms components, we will
use design system for styling instead.

* fix(formfieldmedia): rename formfieldmessage to formhelpertext

* fix(inlinemessage): change to infobox

* fix(govtmasthead): change to restrictedgovtmasthead

* fix(logosettings): change to use components

take note that hte typing on formlabel.description is wrong (checked with @karrui), and have done a
ts-ignore for this. gonna double check by just opening up the screen on local

* fix(toast): update import and change danger to error

* fix(requestoverview): fix searhbar props

* fix(usemarkdown): use html instead

* fix(menudropdownbutton): change props

* fix(motionbox): update props

* fix(usemakrdown): use html

* fix(featuretour): destructuer colour

* fix(formfieldmedia): update import

* chore(colors): update tokens

* fix(sidebar): removing uppercase

* fix(sectioncaption): align center

* fix(siteeditlayout): update zindex

* build(package-lock): update

* fix(chromatic.yml): use sb config for staticdir

* build(package): add font imports

* docs(modal): update docs

* fix(header.stories): add provider

* build(package lock): update deps

* fix(loginpage): updated deps

* fix(handlers): add default handler for collab

* fix(formmediainput): remove border

* fix(warning modal): update button

* fix(package-lock): update deps

* fix(analytics): add ts ignore

* chore(folderoptionbutton): delete as unused

* fix(butotns): removed global styling

* chore(tabs): removed custom styling

* fix(contextmenu): fixed styling

* fix(ui fixes): fixed ui

* fix(colorscheme): change from danger -> critical

* chore(eslint): nOTE: This commit was done automatically through using npm run lint-fix

For some unknown reason, that makes this PR work. without which, `npm run storybook-build` fails
because of a css plugin...

* fix(edit pages): remove extra return

* fix(foldercard): removed bootstrap styling, shift into our own scss

* fix(modal): shift colours to tokens

* fix(siteviewlayout): change zindex of header to docked

* chore(buttons): removed unused stlying

---------

Co-authored-by: seaerchin <[email protected]>
* feat(feedbak): add initial new modal

* feat(feedbackmodal): shift ui

* feat(rating): add new componentn

* refactor(feedbackmodal): update to use new component

* chore(feedbackmodal): update ui

* feat(types): add types

* feat(logincontext): add usertype

* feat(feedbackmodal): submit to be

* docs(usefeedbackdisclosure): update doc
* feat: add utils for review request

* fix: allow remove collaborators to work with more than 2 additional collaborators

* feat: add addAdminCollaborator utils

* feat: add additional api utils

* Fix: sets removeOtherCollaborators to remove only the second collaborator

* feat: add review request tests

* fix: revert e2e_email_collab

* chore: remame e2e_email_collab_2

* chore: rename removeOtherCollaborators

* nit: modify comments

* feat: add check for automatic redirect

* refactor: move common interceptors into util method

* fix: remove unnecessary waits and change wait for dropdown

* feat: add additional test case for collaborators not approving

* fix: add removeOtherCollaborators

* chore: move cypress support method to utils

* fix: remove unused import
@seaerchin seaerchin requested a review from a team August 3, 2023 06:52
@mergify
Copy link

mergify bot commented Aug 3, 2023

⚠️ The sha of the head commit of this PR conflicts with #1387. Mergify cannot evaluate rules on this PR. ⚠️

@seaerchin seaerchin temporarily deployed to staging August 3, 2023 07:19 — with GitHub Actions Inactive
@seaerchin seaerchin temporarily deployed to staging August 3, 2023 07:20 — with GitHub Actions Inactive
@seaerchin seaerchin temporarily deployed to staging August 3, 2023 07:20 — with GitHub Actions Inactive
@cypress
Copy link

cypress bot commented Aug 3, 2023

22 failed tests on run #310 ↗︎

22 138 1 18 Flakiness 0

Details:

release(0.37.0): merge to master
Project: isomercms-frontend Commit: 969b314e5d
Status: Failed Duration: 38:41 💡
Started: Aug 3, 2023 8:33 AM Ended: Aug 3, 2023 9:12 AM
Failed  collaborators.spec.ts • 3 failed tests

View Output Video

Test Artifacts
collaborators flow > Admin adding a collaborator > should be able to add a collaborator Output Screenshots Video
collaborators flow > Admin removing a collaborator > should be able to remove an existing collaborator Output Screenshots Video
collaborators flow > Admin removing a collaborator > should not be able to remove the last site member Output Screenshots Video
Failed  comments.spec.ts • 1 failed test

View Output Video

Test Artifacts
Comments > no access rights > should not be able to create comments for a site which one is not a site member Output Screenshots Video
Failed  editPage.spec.ts • 4 failed tests

View Output Video

Test Artifacts
editPage.spec > Edit unlinked page > Edit page (unlinked) should allow user to modify and save content Output Screenshots Video
editPage.spec > Edit unlinked page > Edit page (unlinked) should allow users to add Instagram embed script Output Screenshots Video
editPage.spec > Edit collection page > Edit page (collection) should allow user to modify and save content Output Screenshots Video
editPage.spec > Edit resource page > Edit page (resource) should have correct colour Output Screenshots Video
Failed  homepage.spec.ts • 1 failed test

View Output Video

Test Artifacts
Homepage > Block editing > should limit users to a single resource component Output Screenshots Video
Failed  notifications.spec.ts • 3 failed tests

View Output Video

Test Artifacts
notifications > should receive a notification on successful creation of a review request Output Screenshots Video
notifications > should send out a notification to reviewers when someone edits the site while a PR is open Output Screenshots Video
notifications > should receive a notification on approval of a review request Output Screenshots Video

The first 5 failed specs are shown, see all 9 specs in Cypress Cloud.

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@seaerchin seaerchin merged commit 112f8a9 into master Aug 3, 2023
@seaerchin seaerchin deleted the release/0.37.0 branch August 3, 2023 11:52
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.

5 participants