Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: advanced view of asset index #1384

Open
wants to merge 94 commits into
base: main
Choose a base branch
from
Open

feat: advanced view of asset index #1384

wants to merge 94 commits into from

Commits on Sep 19, 2024

  1. Kicked off: 

    - created basic layout of index pagination
- Added AssetIndexSettings model
- Created migration to populate the model for each UserOrganization
    @DonKoko
    DonKoko committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    c6862df View commit details
    Browse the repository at this point in the history

  2. working on API for updating index mode

    @DonKoko
    DonKoko committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    c9c3655 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. adjsuting form

    @DonKoko
    DonKoko committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    0a3c64f View commit details
    Browse the repository at this point in the history

  2. swapping between SIMPLE and ADVANCED mode including a hook to handle … 

    …optimistic value of mode for smoother UI
    @DonKoko
    DonKoko committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    6bb4b84 View commit details
    Browse the repository at this point in the history

  3. adding columns: 

    - adding columns Json field in AssetIndexSettings
- Setting deafualt value for it which consists of the default fields every user has.
- creating a migration that updates all the entries in AssetIndexSettings by adding the values of the custom fields in the related organization
- Building basic ui with checkboxes for the active columns
    @DonKoko
    DonKoko committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    c293cbf View commit details
    Browse the repository at this point in the history

  4. more updates: 

    - adding real relationship between settings and org
- handling updating of settings when updating custom fields
- creating settings for personal org of new users
- creating settings when user creates a new workspace/org
    @DonKoko
    DonKoko committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    bce2f0f View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Merge remote-tracking branch 'origin/main' into 1322-feat-advanced-vi… 

    …ew-of-asset-index
    @DonKoko
    DonKoko committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    5c6b504 View commit details
    Browse the repository at this point in the history

  2. added advanced index table and columns config

    @DonKoko
    DonKoko committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    99ee377 View commit details
    Browse the repository at this point in the history

  3. added advanced index table and columns config

    @DonKoko
    DonKoko committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    e8d2fe3 View commit details
    Browse the repository at this point in the history

  4. removing unecessary migration

    @DonKoko
    DonKoko committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    6a5e8a9 View commit details
    Browse the repository at this point in the history

  5. fixing bug with location column

    @DonKoko
    DonKoko committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    062f503 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. front-end for freezing columns

    @DonKoko
    DonKoko committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    32f737f View commit details
    Browse the repository at this point in the history

  2. removing unecessary migrations because everything is now handled insi… 

    …de getAssetIndexSettings
    @DonKoko
    DonKoko committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    fce1cca View commit details
    Browse the repository at this point in the history

  3. freeze first column and allow to show/hide image

    @DonKoko
    DonKoko committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    fa2cf7b View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. slight style adjustments

    @DonKoko
    DonKoko committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    b3b34d6 View commit details
    Browse the repository at this point in the history

  2. further improving table

    @DonKoko
    DonKoko committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    4c82365 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. working on sticky header

    @DonKoko
    DonKoko committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    12ffc6c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into 1322-feat-advanced-vi… 

    …ew-of-asset-index
    @DonKoko
    DonKoko committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    a7216b8 View commit details
    Browse the repository at this point in the history

  3. sticky header + scrollToTop button

    @DonKoko
    DonKoko committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    e2eec29 View commit details
    Browse the repository at this point in the history

  4. started work on filters and sorting: 

    - separated data fetching for assets into 2 different functions for each mode
- added filter and sort buttons with popovers
- added filters json field in AssetIndexSettings
- changed mode swapping to not use optimistic approach, because we need to actually reload the assets page with the correct mode
- implemented a 'changing mode' loader screen
- made an kind of acceptable version of the sticky header. can still be improved a lot
    @DonKoko
    DonKoko committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    51f60aa View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. continue working on sticky header

    @DonKoko
    DonKoko committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    90f73ac View commit details
    Browse the repository at this point in the history

  2. working version of sticky header

    @DonKoko
    DonKoko committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    f153908 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. minor styles fixing

    @DonKoko
    DonKoko committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    813f5e9 View commit details
    Browse the repository at this point in the history

  2. minor styles fixing

    @DonKoko
    DonKoko committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    05bf7da View commit details
    Browse the repository at this point in the history

  3. working on sorting frontend and backend

    @DonKoko
    DonKoko committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    e9b03f3 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. merge origin/main and fix conflicts

    @DonKoko
    DonKoko committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    0467c6c View commit details
    Browse the repository at this point in the history

  2. fix filters cookies + working on sortBY

    @DonKoko
    DonKoko committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    2869b76 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. fix(assets-index): update view of advanced assets index page

    @rockingrohit9639
    rockingrohit9639 committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    7d5e398 View commit details
    Browse the repository at this point in the history

  2. fully replacing advanced index assets query with raw sql query

    @DonKoko
    DonKoko committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    fe20c38 View commit details
    Browse the repository at this point in the history

  3. Merge branch '1322-feat-advanced-view-of-asset-index' into feature/ad… 

    …vanced-asset-index-view
    @DonKoko
    DonKoko authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    e647bf3 View commit details
    Browse the repository at this point in the history

  4. sorting of standard fields + start on custom fields

    @DonKoko
    DonKoko committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    5434058 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. fix: PR issues

    @rockingrohit9639
    rockingrohit9639 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    d4f9125 View commit details
    Browse the repository at this point in the history

  2. mend

    @DonKoko
    DonKoko committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    aa625f6 View commit details
    Browse the repository at this point in the history

  3. Merge branch '1322-feat-advanced-view-of-asset-index' into feature/ad… 

    …vanced-asset-index-view
    @DonKoko
    DonKoko authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    b731ca2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/advanced-asset-index-view' of github.com:rockin… 

    …grohit9639/shelf.nu into feature/advanced-asset-index-view
    @rockingrohit9639
    rockingrohit9639 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    f2434c0 View commit details
    Browse the repository at this point in the history

  5. storing field type in columns jsonb for custom field columns

    @DonKoko
    DonKoko committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    4357763 View commit details
    Browse the repository at this point in the history

  6. Merge branch '1322-feat-advanced-view-of-asset-index' into feature/ad… 

    …vanced-asset-index-view
    @DonKoko
    DonKoko authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    d20e294 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1335 from rockingrohit9639/feature/advanced-asset… 

    …-index-view

fix(assets-index): update view of advanced assets index page
    @DonKoko
    DonKoko authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    b16b55c View commit details
    Browse the repository at this point in the history

  8. mend

    @DonKoko
    DonKoko committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    b8af1de View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. making sorting work for custom fields & improving code maintainability

    @DonKoko
    DonKoko committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    28026b0 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. merged main and fixed conflicts

    @DonKoko
    DonKoko committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    98c333d View commit details
    Browse the repository at this point in the history

  2. finalizing sorting and making it ready for testing

    @DonKoko
    DonKoko committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    a02bffd View commit details
    Browse the repository at this point in the history

  3. kick off filtering ui

    @DonKoko
    DonKoko committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    dece2c9 View commit details
    Browse the repository at this point in the history

  4. kick off filtering ui

    @DonKoko
    DonKoko committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    9977f4e View commit details
    Browse the repository at this point in the history

  5. operators styling + setting operator

    @DonKoko
    DonKoko committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    e41c593 View commit details
    Browse the repository at this point in the history

  6. field selector

    @DonKoko
    DonKoko committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    f0fd117 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. different value fields for each type of filter field selected

    @DonKoko
    DonKoko committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    1a20348 View commit details
    Browse the repository at this point in the history

  2. making boolean field

    @DonKoko
    DonKoko committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    81d6d44 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Merge remote-tracking branch 'origin/main' into 1322-feat-advanced-vi… 

    …ew-of-asset-index
    @DonKoko
    DonKoko committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    908fae7 View commit details
    Browse the repository at this point in the history

  2. working on different fields

    @DonKoko
    DonKoko committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    91d9808 View commit details
    Browse the repository at this point in the history

  3. mend

    @DonKoko
    DonKoko committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    24d5f78 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Merge remote-tracking branch 'origin/main' into 1322-feat-advanced-vi… 

    …ew-of-asset-index
    @DonKoko
    DonKoko committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    05c2ece View commit details
    Browse the repository at this point in the history

  2. implemented basic setParams for filters and doing testing

    @DonKoko
    DonKoko committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    b651b4a View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. testing all search params for filters & fixing issues with values

    @DonKoko
    DonKoko committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    2179e2f View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Merge remote-tracking branch 'origin/main' into 1322-feat-advanced-vi… 

    …ew-of-asset-index
    @DonKoko
    DonKoko committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    17e0994 View commit details
    Browse the repository at this point in the history

  2. fixing whereClause for search & clear search button empty state

    @DonKoko
    DonKoko committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    c1246a6 View commit details
    Browse the repository at this point in the history

  3. auto fix

    @DonKoko
    DonKoko committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    6759964 View commit details
    Browse the repository at this point in the history

  4. working on filters for direct fields

    @DonKoko
    DonKoko committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    e8001d7 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. small adjustments to filters

    @DonKoko
    DonKoko committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    eef80ce View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. merged origin/main and fixed conflicts

    @DonKoko
    DonKoko committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    e435b43 View commit details
    Browse the repository at this point in the history

  2. changes: 

    - implemented filtering on relation fields
- added qrId column and implemented sorting and filtering
- updated types and implemented special type for the assets returned by the advanced index
- implemented some safety checks and improved schema
    @DonKoko
    DonKoko committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    ce58a5f View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Merge branch 'main' into 1322-feat-advanced-view-of-asset-index

    @DonKoko
    DonKoko committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    ee772e1 View commit details
    Browse the repository at this point in the history

  2. fixing settings types and validations that had the column ordering br… 

    …oken
    @DonKoko
    DonKoko committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    b2fb721 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. remaining functionality of customField filtering

    @DonKoko
    DonKoko committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    fb5d5e7 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. lots of small ui improvements + export button

    @DonKoko
    DonKoko committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    1c7b666 View commit details
    Browse the repository at this point in the history

  2. starting work on logical ORs implemented via operator. Fixed types by… 

    … adding everything to schema
    @DonKoko
    DonKoko committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    b0d2005 View commit details
    Browse the repository at this point in the history

  3. creation option for IN operator for enums, including a multi value se… 

    …lect for the enum field
    @DonKoko
    DonKoko committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    451e53b View commit details
    Browse the repository at this point in the history

  4. small adjustment

    @DonKoko
    DonKoko committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    e608756 View commit details
    Browse the repository at this point in the history

  5. implementing matchesAny and containsAny for string/text fields, relat… 

    …ion fields and custom fields with type single and multi line
    @DonKoko
    DonKoko committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    aec6d69 View commit details
    Browse the repository at this point in the history

  6. inDates filters

    @DonKoko
    DonKoko committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    5fadfc4 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. fix tags filter

    @DonKoko
    DonKoko committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    0747dd3 View commit details
    Browse the repository at this point in the history

  2. exporting assets from index

    @DonKoko
    DonKoko committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    5eb58e1 View commit details
    Browse the repository at this point in the history

  3. styling changes

    @DonKoko
    DonKoko committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    e817e77 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. style adjustments

    @DonKoko
    DonKoko committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    e1c6528 View commit details
    Browse the repository at this point in the history

  2. making sure assetIndexSettings are updated on assetImport when new cu… 

    …stom fields are created. Also implemented an extra validation that runs when settings are loaded and makes sure the data in the AssetIndexSettings.columns is valid
    @DonKoko
    DonKoko committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    172f107 View commit details
    Browse the repository at this point in the history

  3. cleanup

    @DonKoko
    DonKoko committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    5e45623 View commit details
    Browse the repository at this point in the history

  4. changing styling of some buttons in the asset index

    @DonKoko
    DonKoko committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    3c4a141 View commit details
    Browse the repository at this point in the history

  5. fixing header color in advanced index

    @DonKoko
    DonKoko committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    7e30180 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. using dynamic dropdown in advanced filters UI

    @DonKoko
    DonKoko committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    d3c1f37 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. implementing DynamicDropdown and DynamicSelect for custody filter

    @DonKoko
    DonKoko committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    5e60606 View commit details
    Browse the repository at this point in the history

  2. cleanup

    @DonKoko
    DonKoko committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    3368db5 View commit details
    Browse the repository at this point in the history

  3. implementing Category + Location as enum filters

    @DonKoko
    DonKoko committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    9525426 View commit details
    Browse the repository at this point in the history

  4. DynamicDropdown and DynamicSelect for filtering based on kit

    @DonKoko
    DonKoko committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    6659d85 View commit details
    Browse the repository at this point in the history

  5. adding useTextFragment hook

    @DonKoko
    DonKoko committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    39ba63d View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. merged main and resolved conflicts

    @DonKoko
    DonKoko committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    352f426 View commit details
    Browse the repository at this point in the history

  2. mark substring - our own implementation for highlighting text on the … 

    …dom based on search query
    @DonKoko
    DonKoko committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    a3c9cd1 View commit details
    Browse the repository at this point in the history

  3. polishing ui, fixing pagination, updating model filter hook to do loc… 

    …al filtering when all data is loaded
    @DonKoko
    DonKoko committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    d09b44b View commit details
    Browse the repository at this point in the history

  4. attempting to fix column re-ordering

    @DonKoko
    DonKoko committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    b24c723 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Merge remote-tracking branch 'origin/main' into 1322-feat-advanced-vi… 

    …ew-of-asset-index
    @DonKoko
    DonKoko committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    784f902 View commit details
    Browse the repository at this point in the history

  2. update usage of getActiveCustomFields to work with the updated api

    @DonKoko
    DonKoko committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    640ed3d View commit details
    Browse the repository at this point in the history

  3. implemented natural sorting via prisma regex

    @DonKoko
    DonKoko committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    0ae04a2 View commit details
    Browse the repository at this point in the history

  4. fixing bug with rawTeamMembers in advanced index

    @DonKoko
    DonKoko committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    96fe49e View commit details
    Browse the repository at this point in the history

  5. fixing bugs with tags and location in query that were not returning p… 

    …roper stucture
    @DonKoko
    DonKoko committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    705e93c View commit details
    Browse the repository at this point in the history

  6. cleanup

    @DonKoko
    DonKoko committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    25310ce View commit details
    Browse the repository at this point in the history