Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 891
    • Issues 891
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 50
    • Merge Requests 50
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds FrontendMinds Frontend
  • Merge Requests
  • !530

Open
Opened 1 day ago by Olivia Madrid@omadrid0 of 17 tasks completed0/17 tasks
  • Report abuse
Report abuse

Agnostic media modal

  • Allows media modal to display more than just activity entities. Now can take objects (image/video/blog) too, so it can be used for Pro
  • Display comment attachments in media modal

Closes #1822

TESTING:

To get to the testing site: click the 'view app' button on this MR page. If there isn't one, click the 4th icon on the pipeline (the row of primarily green checkmarks. The 4th one should be 'review:'). From the dropdown that appears, select 'review:start'

Step 1: Do a bunch of media-related stuff with a test user account

  • Make some posts that have image and video attachments (videos might not work if Mark hasn't enabled them in the staging environment yet, so you might not be able to test videos)
  • In the comment sections of those posts, add comments that have image and video attachments
  • Some posts/comments should be accompanied with text titles/descriptions, others should just be a single media attachment without any words
  • Remind one of the posts from the newsfeed
  • Remind one of the posts from its media page
  • Make a group and make an image/video comment in group chat

Step 2: Try to break it

  • Go through your posts on a desktop and make sure they open the modal when you click on them
  • Make sure the modal opens when you click on image/video comments from:
    • The comments section of a post in your newsfeed
    • The comments section of an open modal
    • The comments section of a media page
    • The comments section of a group chat
    • Any other kind of comments section that isn't listed here
  • Click the action buttons (wire/thumbs/remind)
  • Do anything that isn't included in this list that I haven't thought of
  • Do everything in this 'try to break it' section in a variety of browsers (chrome/brave/firefox/safari)
  • If you have access to a tablet, try that out too
Edited 16 hours ago by Olivia Madrid

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b feat/media-modal-service-1822 origin/feat/media-modal-service-1822

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff feat/media-modal-service-1822

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Request to merge feat/media-modal-service-1822 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #79471320 passed with warnings for 412bc773 on feat/media-modal-service-1822
              Requires approval from QA. Approved by
              Mark Harding
              Mark Harding
              Marcelo Rivera
              Marcelo Rivera
              Emiliano Balbuena
              Emiliano Balbuena
              Guy Thouret
              Guy Thouret
              Brian Hatchet
              Brian Hatchet
              Martin Santangelo
              Martin Santangelo
              Ready to be merged automatically. Ask someone with write access to this repository to merge this request

              Closes #1822

              • Discussion 2
              • Commits 10
              • Pipelines 6
              • Changes 20
              0/1 thread resolved
              • Loading...
              • Olivia Madrid @omadrid added MR::Awaiting Review Product::Media Squad::Blue Type::Feature scoped labels 1 day ago

                added MR::Awaiting Review Product::Media Squad::Blue Type::Feature scoped labels

              • Olivia Madrid @omadrid changed title from WIP: Feat/media modal service 1822 to WIP: Agnostic media modal 1 day ago

                changed title from WIP: Feat/media modal service 1822 to WIP: Agnostic media modal

              • Olivia Madrid @omadrid changed the description 1 day ago

                changed the description

              • Olivia Madrid @omadrid added 1 commit 1 day ago

                added 1 commit

                • 855a4229 - (feat): more linting insanity

                Compare with previous version

              • Olivia Madrid @omadrid added 1 commit 1 day ago

                added 1 commit

                • 55b9ceb6 - (feat): remove an unused fx to pass tests

                Compare with previous version

              • Olivia Madrid @omadrid added 1 commit 1 day ago

                added 1 commit

                • 2b413e4a - (feat): escape from lint/test failure loop

                Compare with previous version

              • Olivia Madrid @omadrid added 1 commit 1 day ago

                added 1 commit

                • c7ad7185 - (feat): lint.

                Compare with previous version

              • Olivia Madrid @omadrid unmarked as a Work In Progress 18 hours ago

                unmarked as a Work In Progress

              • Kate
                Kate @Quitejane · 17 hours ago
                Reporter

                hey, whats the link to test this?

                ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐

              • Olivia Madrid @omadrid changed the description 17 hours ago

                changed the description

              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 16 hours ago
                Last updated by Olivia Madrid 16 hours ago
                src/app/modules/media/modal/modal.component.ts
                249 this.stageWidth = this.mediaWidth;
                250 this.modalWidth = this.stageWidth + this.contentWidth;
                251
                252 if (this.isLoading) {
                253 this.isLoaded();
                254 }
                255
                256 return;
                257 }
                258
                211 259 this.setHeightsAsTallAsPossible();
                212 260
                213 261 // After heights are set, check that scaled width isn't too wide or narrow
                214 262 this.maxStageWidth = Math.max(
                215 window.innerWidth - this.contentWidth - this.padding * 2,
                263 window.innerWidth - this.contentWidth + this.padding * 2,
                • Mark Harding
                  Mark Harding @markeharding · 16 hours ago
                  Owner

                  Looks like this should be a minus?

                • Olivia Madrid @omadrid changed this line in version 6 of the diff 16 hours ago

                  changed this line in version 6 of the diff

                • Please register or sign in to reply
              • Olivia Madrid @omadrid added 3 commits 16 hours ago

                added 3 commits

                • 0f33f752 - 1 commit from branch master
                • 075e344d - (feat): prevent regression
                • 412bc773 - Merge branch 'master' of gitlab.com:minds/front into feat/media-modal-service-1822

                Compare with previous version

              • Olivia Madrid @omadrid changed the description 5 times within 7 minutes 16 hours ago

                changed the description 5 times within 7 minutes

              • Olivia Madrid @omadrid changed the description 16 hours ago

                changed the description

              • Mark Harding @markeharding approved this merge request 16 hours ago

                approved this merge request

              • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
              Please register or sign in to reply
              0 Assignees
              None
              Assign to
              None
              Milestone
              None
              Assign milestone
              None
              Time tracking
              No estimate or time spent
              4
              Labels
              MR::Awaiting Review Product::Media Squad::Blue Type::Feature
              Assign labels
              • View project labels
              Lock merge request
              Unlocked
              10
              10 participants
              user avatar
              Marcelo Rivera
              user avatar
              Emiliano Balbuena
              user avatar
              Guy Thouret
              user avatar
              Brian Hatchet
              user avatar
              Martin Santangelo
              user avatar
              Juan Manuel Solaro
              user avatar
              Ben Hayward
              Reference: minds/front!530