Feat/collections #7446

zoek1 · 2020-09-16T20:44:10Z

Description

https://www.loom.com/share/b4be8978eed04874a9aa0757d471b83c

Refers/Fixes

Testing

mds1 · 2020-09-17T17:04:30Z

Hey @zoek1, I checked out this branch, merged the latest stable into, did a make fresh, then ran make migrate and got the error below:

CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0084_grantcollections, 0084_auto_20200917_1631 in grants).
To fix them run 'python manage.py makemigrations --merge'
make: *** [migrations] Error 1

zoek1 · 2020-09-18T01:31:43Z

done @mds1

mds1

Hey @zoek1, left a few comments below.

I also just did a make fresh but can't seem to load anything afterwards. I ran make migrate but it said there were no migrations to run. Let me know if this is an error on my end or if there's something we need to fix!

mds1 · 2020-09-21T12:56:42Z

app/assets/v2/js/cart-data.js

@@ -46,7 +46,7 @@ class CartData {
    return bulk_add_cart;
  }

-  static addToCart(grantData) {
+  static addToCart(grantData, no_report) {


Calls to this function don't pass the second input, so right now the no_report input is never used. This input should either be removed, or added to all calls to addToCart

thanks, i missed this. i used the no_report on bulk operation addAllToCart.

mds1 · 2020-09-21T13:08:24Z

app/assets/v2/js/cart-data.js

-      action: 'ADD_ITEM',
-      metadata: JSON.stringify(cartList)
-    }, {'X-CSRFToken': $("input[name='csrfmiddlewaretoken']").val()});
+    if (!no_report) {


Similar to the above comment, no_report is never used so this will always be undefined right now. Is this the expected behavior? If so some comments explaining this would be useful

mds1 · 2020-09-21T13:12:07Z

app/assets/v2/js/grants/index.js

+        });
+
+        showSideCart();
+        _alert(`Congratulations, ${getGrants.grants.length} ${getGrants.grants.length > 1 ? 'grant were' : 'grants was'} added to your cart!`, 'success');


Typo: Should say "grants were" if > 1, and "grants was" if 1

owocki · 2020-09-21T19:15:34Z

looks relaly good!

just pulled this down to test. my feedback for v1.

can we move the 'save collection' button next to 'share cart' in the UI on the checkout page?
is it easy to add a 'featured collections' view?
when there are 70+ items in cart, or in a collection, the site gets very very very slow. (a quick triage of this would be great)

v2:

ability to add/remove grants from collection after the fact
share collection add/remove ability with other team members (so a group of ppl can curate collections together - this can be stubbed in in the backend if it makes it easier.)

zoek1 · 2020-09-22T07:05:07Z

@owocki i implemented the v1 and v2 requests, could you mind test it again?

zoek1 · 2020-09-22T07:09:40Z

Hey @zoek1, left a few comments below.

I also just did a make fresh but can't seem to load anything afterwards. I ran make migrate but it said there were no migrations to run. Let me know if this is an error on my end or if there's something we need to fix!

I'm not sure what cause this error, as I remember i didn't touch any part of such code 🤔

Also, i added the corresponding migrations

owocki · 2020-09-22T14:54:19Z

my qa this am:

showstoppers

i see ' cannot fund your own grant' on every grant https://bits.owocki.com/yAubpjeX
did something break about clr eligibility upon add to cart in this PR? all of these grants should be eligible for CLR but it says 'not eligible for clr' in the cart https://bits.owocki.com/E0unD7wA https://bits.owocki.com/2Nuygxdp

minor issues

can we add a 'no data' state for my/featured/ all collections? right now its empty and feels broken https://bits.owocki.com/jkuZzow7
just say something like "to create a collection, add some grants to cart + click 'save to collection' at checkout"
when i view a collection, id like to have that collection name/desc in the unfurl info (twitter title/desc) pls https://bits.owocki.com/6quedkOg

enhancements

lets brainstorm how we can edit collections on an ongoing basis. this will be important for ppl to be able to ongoing curate their collections. maybe if you have a collection + you click 'save as collection' during checkout, you can be promipted to add those grants to an existing collection instead of to a new one?
having the ability for me to share my ability to curate a collection with someone else would be 💯

open questions

zoek1 · 2020-09-22T21:38:07Z

@owocki i addressed showstoppers && minor issues

owocki · 2020-09-22T21:56:17Z

left some comments on zoek via DMs:

hmm i see the null state even if there are grants showing up https://bits.owocki.com/4gu9kR7P
also the ‘add to collection’ button doesnt work, when i have no cllections. maybe it makes more sense to have the ‘add to collection’ functionality in the “Save as Collection ” button on the cart
so instead of having ‘save cart as collection’ it should give you the option to add them to an existing collection instead of saving them https://bits.owocki.com/yAubpnl2
also the collections are now showing on the main grant taxonomy

zoek1 · 2020-09-23T01:35:34Z

hmm i see the null state even if there are grants showing up https://bits.owocki.com/4gu9kR7P
also the ‘add to collection’ button doesnt work, when i have no cllections.
instead of having ‘save cart as collection’ it should give you the option to add them to an existing collection instead of saving them https://bits.owocki.com/yAubpnl2
also the collections are now showing on the main grant taxonomy

@owocki

thelostone-mc · 2020-09-23T11:47:23Z

app/grants/admin.py

@@ -28,7 +28,7 @@
 import twitter
 from grants.models import (
    CartActivity, CLRMatch, Contribution, Flag, Grant, GrantCategory, GrantCLR, GrantType, MatchPledge, PhantomFunding,
-    Subscription,
+    Subscription, GrantCollections,


^ GrantCollection
Let's keep it singular

thelostone-mc · 2020-09-23T11:47:49Z

app/grants/admin.py

 class GrantCLRAdmin(admin.ModelAdmin):
    list_display = ['pk', 'round_num', 'start_date', 'end_date','is_active']


+class GrantCollectionsAdmin(admin.ModelAdmin):


^ GrantCollection

thelostone-mc · 2020-09-23T11:47:54Z

app/grants/admin.py

@@ -371,3 +375,5 @@ class GrantCLRAdmin(admin.ModelAdmin):
 admin.site.register(GrantType, GrantTypeAdmin)
 admin.site.register(GrantCategory, GrantCategoryAdmin)
 admin.site.register(GrantCLR, GrantCLRAdmin)
+admin.site.register(GrantCollections, GrantCollectionsAdmin)


GrantCollection

thelostone-mc · 2020-09-23T11:48:39Z

app/grants/models.py

+        )
+
+
+class GrantCollections(SuperModel):


GrantCollection

zoek1 added 3 commits September 16, 2020 10:19

Create collections from cart view

ede15ec

Create grant collections

53f8787

Fix texts

20cd39c

zoek1 requested review from danlipert, frankchen07, octavioamu, PixelantDesign and thelostone-mc as code owners September 16, 2020 20:44

zoek1 added 2 commits September 16, 2020 15:55

Merge branch 'stable' into feat/collections

cb64697

FIx integration error

6ecba4c

zoek1 added 3 commits September 17, 2020 20:09

Collection search and filtering

0881e89

Merge remote-tracking branch 'origin/stable' into feat/collections

dd4847e

fix migration error

1d1c9c6

Fix pagination

334cdfc

mds1 suggested changes Sep 21, 2020

View reviewed changes

Add add/delete grants and pagination for collection's grants

2470b6a

zoek1 added 2 commits September 22, 2020 02:12

Merge remote-tracking branch 'origin/stable' into feat/collections

89a60d2

fix migration error

a6a876c

QA round 2 for collections

1bf8672

zoek1 added 2 commits September 22, 2020 17:01

Remove null state on when exists grants

bd7ad47

Save to existing collection

dcc871c

thelostone-mc reviewed Sep 23, 2020

View reviewed changes

app/grants/models.py Outdated

)

class GrantCollections(SuperModel):

Copy link

Member

thelostone-mc Sep 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GrantCollection

rename model name

bf97011

thelostone-mc approved these changes Sep 23, 2020

View reviewed changes

thelostone-mc merged commit 8b036ff into gitcoinco:stable Sep 23, 2020

zoek1 mentioned this pull request Sep 30, 2020

Load all grants based on current filters into the cart #7371

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/collections #7446

Feat/collections #7446

zoek1 commented Sep 16, 2020 •

edited

Loading

mds1 commented Sep 17, 2020

zoek1 commented Sep 18, 2020

mds1 left a comment

mds1 Sep 21, 2020

zoek1 Sep 22, 2020

mds1 Sep 21, 2020

mds1 Sep 21, 2020

zoek1 Sep 22, 2020

owocki commented Sep 21, 2020

zoek1 commented Sep 22, 2020

zoek1 commented Sep 22, 2020

owocki commented Sep 22, 2020

zoek1 commented Sep 22, 2020

owocki commented Sep 22, 2020

zoek1 commented Sep 23, 2020

thelostone-mc Sep 23, 2020 •

edited

Loading

thelostone-mc Sep 23, 2020

thelostone-mc Sep 23, 2020

thelostone-mc Sep 23, 2020

Feat/collections #7446

Feat/collections #7446

Conversation

zoek1 commented Sep 16, 2020 • edited Loading

Description

Refers/Fixes

Testing

mds1 commented Sep 17, 2020

zoek1 commented Sep 18, 2020

mds1 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

owocki commented Sep 21, 2020

zoek1 commented Sep 22, 2020

zoek1 commented Sep 22, 2020

owocki commented Sep 22, 2020

showstoppers

minor issues

enhancements

open questions

zoek1 commented Sep 22, 2020

owocki commented Sep 22, 2020

zoek1 commented Sep 23, 2020

thelostone-mc Sep 23, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zoek1 commented Sep 16, 2020 •

edited

Loading

thelostone-mc Sep 23, 2020 •

edited

Loading