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 855
    • Issues 855
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 41
    • Merge Requests 41
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • 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
  • !383

Closed
Opened 1 month ago by Max Nurzia@mnurzia1
  • Report abuse
Report abuse

(wip) Sort selector rework

New sort-selector interface.

Desktop/Tablet: new ui

Mobile:

new ui mobile

Notably this is still missing some kind of distinction between the algorithms and custom types selectors, as well as the settings icon being in an awkward location, both of which I plan to address soon.

Check out, review, and merge locally

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

git fetch https://gitlab.com/mnurzia/front.git sort-selector-rework
git checkout -b mnurzia/front-sort-selector-rework FETCH_HEAD

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 mnurzia/front-sort-selector-rework

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 mnurzia:sort-selector-rework into master
  • Email patches
  • Plain diff
Pipeline #70588059 failed for 59827089 on mnurzia:sort-selector-rework
      Requires 2 more approvals from Devs and Deployers.
      Brian Hatchet
      Brian Hatchet
      Mark Harding
      Mark Harding
      Emiliano Balbuena
      Emiliano Balbuena
      Marcelo Rivera
      Marcelo Rivera
      Martin Santangelo
      Martin Santangelo

      Closed by Mark Harding 1 hour ago

      The changes were not merged into master

      • Discussion 7
      • Commits 2
      • Pipelines 2
      • Changes 2
      0/3 threads resolved
      • Loading...
      • Mark Harding @markeharding added MR::Awaiting Review scoped label 1 month ago

        added MR::Awaiting Review scoped label

      • Mark Harding
        Mark Harding @markeharding started a thread on an old version of the diff 1 month ago
        Last updated by Max Nurzia 3 weeks ago
        src/app/common/components/sort-selector/sort-selector.component.scss
        7 7 > :last-child {
        8 8 margin-left: auto;
        9 9 }
        10
        10
        11 11 .m-dropdown--list--item {
        12 12 cursor: pointer;
        13 &.m-sort-selector--custom-type-item,
        • Mark Harding
          Mark Harding @markeharding · 1 month ago
          Owner

          sounds like this should be moved up a level? I don't think it need to be inside the .m-dropdown--list--item block

        • Max Nurzia @mnurzia changed this line in version 2 of the diff 3 weeks ago

          changed this line in version 2 of the diff

        • Please register or sign in to reply
      • Mark Harding
        Mark Harding @markeharding started a thread on an old version of the diff 1 month ago
        Last updated by Max Nurzia 3 weeks ago
        src/app/common/components/sort-selector/sort-selector.component.scss
        8 8 margin-left: auto;
        9 9 }
        10
        10
        11 11 .m-dropdown--list--item {
        12 12 cursor: pointer;
        13 &.m-sort-selector--custom-type-item,
        14 &.m-sort-selector--algorithm-item {
        15 width: auto;
        16 display: block;
        17 text-align: center;
        18 .m-sort-selector--item-label-icon {
        19 margin-right: 0px;
        20 margin-inline: 8px;
        21 }
        22 }
        • Mark Harding
          Mark Harding @markeharding · 1 month ago
          Owner

          spacing (make sure you use spaces and not tabs)

          Edited by Mark Harding 1 month ago
        • Max Nurzia @mnurzia changed this line in version 2 of the diff 3 weeks ago

          changed this line in version 2 of the diff

        • Please register or sign in to reply
      • Mark Harding
        Mark Harding @markeharding started a thread on an old version of the diff 1 month ago
        Last updated by Max Nurzia 3 weeks ago
        src/app/common/components/sort-selector/sort-selector.component.scss
        61 83
        62 84 .m-sort-selector--algorithm-dropdown,
        63 85 .m-sort-selector--period-dropdown {
        64 .m-dropdown--list {
        86 .li {
        • Mark Harding
          Mark Harding @markeharding · 1 month ago
          Owner

          can you double check this?

        • Max Nurzia @mnurzia changed this line in version 2 of the diff 3 weeks ago

          changed this line in version 2 of the diff

        • Please register or sign in to reply
      • Mark Harding
        Mark Harding @markeharding · 1 month ago
        Owner

        Nice start @mnurzia ! Left some comments for you

      • Mark Harding @markeharding added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label 1 month ago

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

      • Mark Harding @markeharding mentioned in merge request !318 (closed) 4 weeks ago

        mentioned in merge request !318 (closed)

      • Max Nurzia @mnurzia added 1 commit 3 weeks ago

        added 1 commit

        • 59827089 - Fix errors in sort-selector edit, tweak styles

        Compare with previous version

      • Max Nurzia
        Max Nurzia @mnurzia · 3 weeks ago

        I fixed most of the things you pointed out. However, I couldn't find a way to resolve the issue with the parent selectors cleanly. I'm new to SCSS and there is probably an easier and better looking way of doing it, but I couldn't figure out a solution like you described. I figured that I would commit here and continue trying to fix that in the meantime, since the actual output is acceptable.

      • Max Nurzia
        Max Nurzia @mnurzia · 1 hour ago

        @markeharding What should I do next here?

      • Mark Harding
        Mark Harding @markeharding · 1 hour ago
        Owner

        Hey Max. Moved this over to !472 so it will be on our sandbox sites.

        Looks good from a code point of view! Let me know when you are free next week for a quick chat.

      • Mark Harding @markeharding closed 1 hour ago

        closed

      • Mark Harding @markeharding mentioned in merge request !472 1 hour ago

        mentioned in merge request !472

      • 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::Requires Changes
      Assign labels
      • View project labels
      Lock merge request
      Unlocked
      7
      7 participants
      user avatar
      Brian Hatchet
      user avatar
      Mark Harding
      user avatar
      Emiliano Balbuena
      user avatar
      Marcelo Rivera
      user avatar
      Martin Santangelo
      user avatar
      Ben Hayward
      user avatar
      Max Nurzia
      Reference: minds/front!383