Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 801
    • Issues 801
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 58
    • Merge Requests 58
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • 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
  • !373

Merged
Opened 2 weeks ago by Mark Harding@markeharding0 of 2 tasks completed0/2 tasks
  • Report abuse
Report abuse

Refactor/es feeds

TODO:

  • Re-introduce block client side
  • Re-synchronise entities in the background

Check out, review, and merge locally

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

git fetch origin
git checkout -b refactor/es-feeds origin/refactor/es-feeds

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 refactor/es-feeds

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 refactor/es-feeds into master
  • Email patches
  • Plain diff
Pipeline #70071635 passed for 391b5c50 on refactor/es-feeds
    Requires 2 more approvals from Devs.
    Martin Santangelo
    Martin Santangelo
    Brian Hatchet
    Brian Hatchet
    Ben Hayward
    Ben Hayward
    Emiliano Balbuena
    Emiliano Balbuena
    Marcelo Rivera
    Marcelo Rivera

    Merged by Mark Harding 2 minutes ago

    The changes were merged into master with a344dd4e

    Pipeline #70447343 running for a344dd4e on master
          • Discussion 6
          • Commits 12
          • Pipelines 12
          • Changes 27
          3/5 threads resolved
          • Loading...
          • Mark Harding @markeharding mentioned in merge request engine!221 (merged) 2 weeks ago

            mentioned in merge request engine!221 (merged)

          • Mark Harding @markeharding added 1 commit 2 weeks ago

            added 1 commit

            • 9dc4d33a - (fix): use combineLatest to ensure obversables are in sync for hasMore

            Compare with previous version

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 2 weeks ago
            Resolved by Mark Harding 1 day ago
          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 2 weeks ago
            src/app/common/services/feeds.service.ts
            96 this.params.sync = 1;
            97 }
            98 return this;
            99 }
            69 100
            70 // Garbage collection
            101 setOffset(offset: number): FeedsService {
            102 this.offset.next(offset);
            103 return this;
            104 }
            71 105
            72 this.feedsSync.gc();
            73 setTimeout(() => this.feedsSync.gc(), 15 * 60 * 1000); // Every 15 minutes
            106 fetch(): FeedsService {
            107 this.inProgress.next(true);
            108 this.client.get(this.endpoint, {...this.params, ...{ limit: 150 }}) // Over 12 scrolls
            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 2 weeks ago
              Maintainer

              Hissssssssss, I hate the spread operator so much. Your call if we use it, but I find it impossible to keep track of what objects we're mapping.

            • Please register or sign in to reply
          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 weeks ago
            Resolved by Mark Harding 1 day ago
          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 2 weeks ago
            Resolved by Mark Harding 1 day ago
          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 2 weeks ago
            src/app/modules/groups/profile/feed/sorted.component.ts
            125
            126 if (this.entities && !refresh) {
            127 this.entities.push(...entities);
            128 } else {
            129 this.entities = entities;
            130 }
            131
            132 if (!next) {
            133 this.moreData = false;
            134 }
            135
            136 this.offset = next;
            94
            95 this.feedsService
            96 .setEndpoint(`api/v2/feeds/container/${this.group.guid}/${this.type}`)
            97 .setLimit(12)
            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 2 weeks ago
              Maintainer

              These 12s should be defined as constants

            • Please register or sign in to reply
          • Mark Harding @markeharding added 1 commit 2 weeks ago

            added 1 commit

            • 94ed6cc6 - (refactor): re-implement boost and block

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 2 weeks ago

            added 1 commit

            • 6b663682 - (chore): use maps for object

            Compare with previous version

          • Mark Harding @markeharding added MR::Awaiting Review label 1 week ago

            added MR::Awaiting Review label

          • Mark Harding @markeharding added 1 commit 1 week ago

            added 1 commit

            • 02710e34 - (fix): spacing

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 1 day ago

            added 1 commit

            • 3a3cd4cd - (fix): various elastic feed fixes

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 1 day ago

            added 1 commit

            • de42149f - (fix): provide mocks to block service

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 1 day ago

            added 1 commit

            • 50d81326 - (chore): remove unused hydrateEntities component

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 1 day ago

            added 1 commit

            • 37ff5d49 - (chore): remove unused import of observable

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 1 day ago

            added 1 commit

            • aa37120c - (fix): non-canary users with legacy feeds should scroll

            Compare with previous version

          • Mark Harding @markeharding added 1 commit 1 day ago

            added 1 commit

            • 391b5c50 - (chore): do not run switch if no entity

            Compare with previous version

          • Mark Harding @markeharding merged 2 minutes ago

            merged

          • 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
          1
          Labels
          MR::Awaiting Review
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          6
          6 participants
          user avatar
          Martin Santangelo
          user avatar
          Brian Hatchet
          user avatar
          Ben Hayward
          user avatar
          Emiliano Balbuena
          user avatar
          Marcelo Rivera
          user avatar
          Mark Harding
          Reference: minds/front!373

          Revert this merge request

          This will create a new commit in order to revert the existing changes.

          Switch branch
          Cancel
          A new branch will be created in your fork and a new merge request will be started.

          Cherry-pick this merge request

          Switch branch
          Cancel
          A new branch will be created in your fork and a new merge request will be started.