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 825
    • Issues 825
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 44
    • Merge Requests 44
  • 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
  • !587

Open
Opened 5 days ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/PinkPanther](fix): Upload cancelling #2083

Closes #2083 Credits to Mark for the elegant solution

Summary

Upload cancellation is broken on production. Go upload a video on it and try to cancel it.

Test

  1. Upload a video, & whilst uploading, upload a second video - it should replace the existing upload, progress bar should not jump erratically.
  2. Try cancelling the upload. it should cancel. - Without a refresh, try to upload a second video.
  3. Uploading a video should complete all the way and post.
  4. Should not interfere with image upload.
Edited 5 days ago by Ben Hayward

Check out, review, and merge locally

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

git fetch origin
git checkout -b "fix/upload-cancel-2083" "origin/fix/upload-cancel-2083"

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 "fix/upload-cancel-2083"

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 fix/upload-cancel-2083 into master
The source branch is 45 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #88754978 failed for 9483040f on fix/upload-cancel-2083
              Requires 3 more approvals from Devs, Deployers, and QA.
              Emiliano Balbuena
              Emiliano Balbuena
              Mark Harding
              Mark Harding
              Brian Hatchet
              Brian Hatchet
              Xander Miller
              Xander Miller
              Ready to be merged automatically. Ask someone with write access to this repository to merge this request

              Closes #2083

              Deletes source branch

              • Discussion 1
              • Commits 4
              • Pipelines 6
              • Changes 1
              0/1 thread resolved
              • Loading...
              • Ben Hayward @benhayward.ben added MR::Awaiting Review Squad::Yellow scoped labels 5 days ago

                added MR::Awaiting Review Squad::Yellow scoped labels

              • Ben Hayward @benhayward.ben changed the description 5 days ago

                changed the description

              • Ben Hayward @benhayward.ben added 1 commit 2 days ago

                added 1 commit

                • dd210419 - Force tags to lowercase in discovery

                Compare with previous version

              • Mark Harding
                Mark Harding @markeharding started a thread on the diff 17 minutes ago
                src/app/services/attachment.ts
                225 case HttpEventType.Response:
                226 return 100;
                227 default:
                228 return -1;
                229 }
                230 })
                240 231 );
                241 232
                233 if (this.uploadSubscription) this.uploadSubscription.unsubscribe();
                234
                235 this.uploadSubscription = uploadProgress$.subscribe(pct => {
                236 if (pct >= 0) this.progress.next(pct);
                237 });
                238
                239 // wait for completion
                240 await uploadProgress$.pipe(last()).toPromise();
                • Mark Harding
                  Mark Harding @markeharding · 17 minutes ago
                  Owner

                  Where is

                  // Complete the upload
                      await this.clientService.put(
                        `api/v2/media/upload/complete/${lease.media_type}/${lease.guid}`
                  

                  step?

                  Edited by Mark Harding 17 minutes ago
                • Please register or sign in to reply
              • Mark Harding @markeharding added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label 17 minutes ago

                added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label

              • 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
              2
              Labels
              MR::Requires Changes Squad::Yellow
              Assign labels
              • View project labels
              Lock merge request
              Unlocked
              10
              10 participants
              user avatar
              Emiliano Balbuena
              user avatar
              Mark Harding
              user avatar
              Guy Thouret
              user avatar
              Juan Manuel Solaro
              user avatar
              Olivia Madrid
              user avatar
              Brian Hatchet
              user avatar
              Martin Santangelo
              Reference: minds/front!587