[PRODDEV-479] [PRODDEV-480] Flag new shared content #423

froboy · 2021-12-06T23:15:14Z

Do not merge PR, only review it and approve/request changes.
Merge is allowed by QA Engineer only.

Related Issue/Ticket:

PLEASE CHECK BASE BRANCH FOR YOUR PR
ONLY urgent and approved fixes for point release should go to master branch

https://openy.atlassian.net/browse/PRODDEV-479
https://openy.atlassian.net/browse/PRODDEV-480

Steps to test:

You will need to have a site connected to a shared content server in order to test and have the shared content server all configured.

Check out this video:

PRODDEV-480-479-shared-content.mp4

Observe "Fetch to my site" button is duplicated on the top of the form.
Observe top "Fetch to my site" button works exactly the same as the bottom button.
Observe once content is added to a site, the checkbox and button are disabled and the button text changes from "Preview" to "Added"
Observe when you click "Preview" a "Fetch to my site" button that fetches content when clicked.
Observe close button that closes the preview with no action.

Observe content is bolded when new (or when it's your first session)
Observe content is unbolded when you Preview it and then close the modal.
Observe content is unbolded when you start a new session.

Quality checks:

Please check these boxes to confirm this PR covers the following cases:

Maintaining our upgrade path is essential. Check one or the other:
- This PR provides updates via hook_update_N or other means.
- No updates are necessary for this change.
Front end fixes should be tested against all of the Open Y Themes.
- Tested against Carnation
- Tested against Lily
- Tested against Rose
- This change does not contain front-end fixes.
I have flagged this PR "Needs Review" or pinged the VY devs/QA
team in Slack

Cleaned things up but broke them Fixed it.

fjbot · 2021-12-06T23:33:04Z

Build 4504

Find the builds:
http://pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://rose.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://lily.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://carnation.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://upgrade.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com

fjbot · 2021-12-08T00:06:05Z

Build 4936

Find the builds:
http://pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://rose.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://lily.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://carnation.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://upgrade.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com

fjbot · 2021-12-08T03:36:36Z

Build 4938
Coding standards checks failed.
See https://ci.fivejars.com/job/OPENY_GC_PR/4938/display/redirect

fjbot · 2021-12-08T03:36:37Z

Build 4938
Build failed.
See https://ci.fivejars.com/job/OPENY_GC_PR/4938/display/redirect for details.

Nope

fjbot · 2021-12-08T03:37:01Z

Build 4939
Coding standards checks failed.
See https://ci.fivejars.com/job/OPENY_GC_PR/4939/display/redirect

fjbot · 2021-12-08T03:37:03Z

Build 4939
Build failed.
See https://ci.fivejars.com/job/OPENY_GC_PR/4939/display/redirect for details.

fjbot · 2021-12-08T03:45:10Z

Build 4937

Find the builds:
http://pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://rose.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://lily.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://carnation.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://upgrade.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com

fjbot · 2021-12-08T04:25:13Z

Build 4941

Find the builds:
http://pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://rose.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://lily.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://carnation.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://upgrade.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com

froboy · 2021-12-08T18:13:47Z

@anpolimus I've completed refactoring based on our call this morning. This is now ready for review again.

froboy · 2021-12-08T18:14:21Z

retest

fjbot · 2021-12-08T18:26:08Z

Build 5493

Find the builds:
http://pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://rose.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://lily.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://carnation.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://upgrade.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com

AndreyMaximov · 2021-12-08T20:50:59Z

retest

fjbot · 2021-12-08T21:25:23Z

Build 5503

Find the builds:
http://pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://rose.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://lily.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://carnation.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://upgrade.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com

modules/openy_gc_shared_content/src/Form/SharedContentPreviewForm.php

anpolimus · 2021-12-09T14:50:09Z

modules/openy_gc_shared_content/src/Form/SharedContentPreviewForm.php

+    if ($form_state->getTriggeringElement()['#value']->__toString() == 'Close') {
+      // Close the modal and remove the new class if it exists.
+      $response->addCommand(new CloseModalDialogCommand());
+      $response->addCommand(new InvokeCommand("tr[data-uuid='$uuid']", 'removeClass', ['new-item']));


Co-authored-by: Anatolii Poliakov <anpolimus@gmail.com>

modules/openy_gc_shared_content/src/Form/SharedContentPreviewForm.php

fjbot · 2021-12-09T15:22:19Z

Build 5509

Find the builds:
http://pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://rose.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://lily.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://carnation.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://upgrade.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com

AnastasiiaPys · 2021-12-10T16:49:20Z

Tested. Works as expected.
1.Shared Content is flagged as new by formatting the row with “bold text”
2.After user clicked the Preview button, the row looks unbolded
3.Content updated on the server since user (Admin) last visit is flagged as “new” by formatting the row with bold text.
4.After the content was fetched to the site, the button “Preview” changed to the “Added”.

But an error occurred after I added new content to the server and fetched the content again.

@froboy is this the type of error that is preventing me from merging this build? or can i merge the build?

froboy · 2021-12-10T16:54:24Z

@AnastasiiaPys comparing the filename in the first line of the error (SharedContentFetchForm) to the files changed here I can see that the error is definitely a result of my new code, so we should resolve that and retest. I'll get on it. Thanks!

froboy · 2021-12-10T17:31:05Z

@AnastasiiaPys I believe I've resolved that issue. Please retest when you're able. Thanks!

fjbot · 2021-12-10T17:49:39Z

Build 5511

Find the builds:
http://pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://rose.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://lily.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://carnation.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://upgrade.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com

fjbot · 2021-12-13T09:55:30Z

Build 5512

Find the builds:
http://pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://rose.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://lily.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://carnation.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com
http://upgrade.pr-423.openy-gated-content.sandbox-2.ci.fivejars.com

AnastasiiaPys · 2021-12-13T12:08:31Z

Retested.

Works good, there is no more error.

froboy added 8 commits December 3, 2021 14:15

[PRODDEV-480] Add "fetch" to preview and disable buttons

0cce6a2

Cleaned things up but broke them Fixed it.

[PRODDEV-480] Disable checkbox for items that exist.

423b256

[PRODDEV-480] Clean things up and phpcs

dd72833

[PRODDEV-480] More phpcs changes

b48201a

Merge branch 'master' into PRODDEV-480-shared-content

86d3610

[PRODDEV-479] Add "Date added" column and sort

c7a7faa

[PRODDEV-479] Sort Blogs by changed

43682d9

[PRODDEV-479] Add "new" styles to fetched rows.

b0da736

froboy added 5 commits December 7, 2021 14:01

[PRODDEV-479] Rework logic to maintain state through the first session

62b75b4

[PRODDEV-480] Tiny style tweak for added items.

df9f2dd

[PRODDEV-479] Rework session logic one more time.

4a0841b

[PRODDEV-479] Update donated title

cc6c4b0

[PRODDEV-479] Unbold previewed items and ensure cancel works.

3faa91e

froboy added 2 commits December 7, 2021 20:47

[PRODDEV-479] Hide default close button

1a5f494

[PRODDEV-479] Clean up table title capitalization.

c0045f5

[PRODDEV-479] Fix double submit

4b378cc

Nope

[PRODDEV-479] Use created date instead of changed.

514c915

Merge branch 'master' into PRODDEV-479-new-shared-content

b03f0ea

froboy changed the title ~~[PRODDEV-479] Flag new shared content~~ [PRODDEV-479] [PRODDEV-480] Flag new shared content Dec 8, 2021

froboy marked this pull request as ready for review December 8, 2021 04:07

froboy mentioned this pull request Dec 8, 2021

PRODDEV-480 Identify content that has been added to my Virtual Y #422

Closed

12 tasks

[PRODDEV-479] Remove redirects and modify form rows on cancel/fetch

d63d757

fivejars deleted a comment from fjbot Dec 8, 2021

anpolimus suggested changes Dec 9, 2021

View reviewed changes

Apply suggestions from code review

61deb48

Co-authored-by: Anatolii Poliakov <anpolimus@gmail.com>

froboy commented Dec 9, 2021

View reviewed changes

modules/openy_gc_shared_content/src/Form/SharedContentPreviewForm.php Outdated Show resolved Hide resolved

Remove stray line breaks.

1b0e5ed

[PRODDEV-479] Add default value to $previewed

20bb773

AnastasiiaPys added the REBUILD Tells the CI server to rebuild a PR label Dec 13, 2021

AnastasiiaPys added TESTED and removed REBUILD Tells the CI server to rebuild a PR labels Dec 13, 2021

froboy requested a review from anpolimus December 13, 2021 15:53

anpolimus approved these changes Dec 14, 2021

View reviewed changes

anpolimus merged commit 28222e8 into fivejars:master Dec 14, 2021

froboy deleted the PRODDEV-479-new-shared-content branch December 16, 2021 15:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[PRODDEV-479] [PRODDEV-480] Flag new shared content #423

[PRODDEV-479] [PRODDEV-480] Flag new shared content #423

froboy commented Dec 6, 2021 •

edited

Loading

fjbot commented Dec 6, 2021

fjbot commented Dec 8, 2021

fjbot commented Dec 8, 2021

fjbot commented Dec 8, 2021

fjbot commented Dec 8, 2021

fjbot commented Dec 8, 2021

fjbot commented Dec 8, 2021

fjbot commented Dec 8, 2021

froboy commented Dec 8, 2021

froboy commented Dec 8, 2021

fjbot commented Dec 8, 2021

AndreyMaximov commented Dec 8, 2021

fjbot commented Dec 8, 2021

anpolimus Dec 9, 2021

fjbot commented Dec 9, 2021

AnastasiiaPys commented Dec 10, 2021

froboy commented Dec 10, 2021 •

edited

Loading

froboy commented Dec 10, 2021

fjbot commented Dec 10, 2021

fjbot commented Dec 13, 2021

AnastasiiaPys commented Dec 13, 2021

[PRODDEV-479] [PRODDEV-480] Flag new shared content #423

[PRODDEV-479] [PRODDEV-480] Flag new shared content #423

Conversation

froboy commented Dec 6, 2021 • edited Loading

Steps to test:

Quality checks:

fjbot commented Dec 6, 2021

fjbot commented Dec 8, 2021

fjbot commented Dec 8, 2021

fjbot commented Dec 8, 2021

fjbot commented Dec 8, 2021

fjbot commented Dec 8, 2021

fjbot commented Dec 8, 2021

fjbot commented Dec 8, 2021

froboy commented Dec 8, 2021

froboy commented Dec 8, 2021

fjbot commented Dec 8, 2021

AndreyMaximov commented Dec 8, 2021

fjbot commented Dec 8, 2021

anpolimus Dec 9, 2021

Choose a reason for hiding this comment

fjbot commented Dec 9, 2021

AnastasiiaPys commented Dec 10, 2021

froboy commented Dec 10, 2021 • edited Loading

froboy commented Dec 10, 2021

fjbot commented Dec 10, 2021

fjbot commented Dec 13, 2021

AnastasiiaPys commented Dec 13, 2021

froboy commented Dec 6, 2021 •

edited

Loading

froboy commented Dec 10, 2021 •

edited

Loading