Grouping feature #719

iamhks · 2023-07-26T21:02:33Z

Summary

Updating the existing Grouping Feature

chaitanya-cloudknox · 2023-07-26T21:39:51Z

@iamhks if id is string can you use uuid to generate default values during migration?
Cc @tuxology

iamhks · 2023-07-27T04:06:23Z

@iamhks if id is string can you use uuid to generate default values during migration? Cc @tuxology

@chaitanya-cloudknox If you see the intial.py file

We do not have the id defined, it's auto created by django.

I can add let say: '1' over there and it generates the migrations file. But when I try to migrate, it gives me error saying for id you have two default values which is not possible.

kamthamc · 2023-07-27T05:01:53Z

@iamhks will this work https://docs.djangoproject.com/en/4.2/howto/writing-migrations/#migrations-that-add-unique-fields ?

I think you can add id value even if its auto created

iamhks · 2023-07-27T11:54:22Z

@iamhks will this work https://docs.djangoproject.com/en/4.2/howto/writing-migrations/#migrations-that-add-unique-fields ?

I think you can add id value even if its auto created

@kamthamc @chaitanya-cloudknox I tried that too:

root@985d47cce9db:/zubhub_backend/zubhub# python manage.py migrate
SystemCheckError: System check identified some issues:

ERRORS:
creators.CreatorGroup: (models.E004) 'id' can only be used as a field name if the field also sets 'primary_key=True'.

And if I set primary key to true for id:

Running migrations:
  Applying creators.0011_auto_20230727_1143...Traceback (most recent call last):
  File "/usr/local/lib/python3.8/site-packages/django/db/backends/utils.py", line 84, in _execute
    return self.cursor.execute(sql, params)
psycopg2.errors.InvalidTableDefinition: multiple primary keys for table "creators_creatorgroup" are not allowed


The above exception was the direct cause of the following exception:

Traceback (most recent call last):
  File "manage.py", line 21, in <module>
    main()
  File "manage.py", line 17, in main
    execute_from_command_line(sys.argv)
  File "/usr/local/lib/python3.8/site-packages/django/core/management/__init__.py", line 419, in execute_from_command_line
    utility.execute()
  File "/usr/local/lib/python3.8/site-packages/django/core/management/__init__.py", line 413, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/usr/local/lib/python3.8/site-packages/django/core/management/base.py", line 354, in run_from_argv
    self.execute(*args, **cmd_options)
  File "/usr/local/lib/python3.8/site-packages/django/core/management/base.py", line 398, in execute
    output = self.handle(*args, **options)
  File "/usr/local/lib/python3.8/site-packages/django/core/management/base.py", line 89, in wrapped
    res = handle_func(*args, **kwargs)
  File "/usr/local/lib/python3.8/site-packages/django/core/management/commands/migrate.py", line 244, in handle
    post_migrate_state = executor.migrate(
  File "/usr/local/lib/python3.8/site-packages/django/db/migrations/executor.py", line 117, in migrate
    state = self._migrate_all_forwards(state, plan, full_plan, fake=fake, fake_initial=fake_initial)
  File "/usr/local/lib/python3.8/site-packages/django/db/migrations/executor.py", line 147, in _migrate_all_forwards
    state = self.apply_migration(state, migration, fake=fake, fake_initial=fake_initial)
  File "/usr/local/lib/python3.8/site-packages/django/db/migrations/executor.py", line 227, in apply_migration
    state = migration.apply(state, schema_editor)
  File "/usr/local/lib/python3.8/site-packages/django/db/migrations/migration.py", line 126, in apply
    operation.database_forwards(self.app_label, schema_editor, old_state, project_state)
  File "/usr/local/lib/python3.8/site-packages/django/db/migrations/operations/fields.py", line 104, in database_forwards
    schema_editor.add_field(
  File "/usr/local/lib/python3.8/site-packages/django/db/backends/base/schema.py", line 508, in add_field
    self.execute(sql, params)
  File "/usr/local/lib/python3.8/site-packages/django/db/backends/base/schema.py", line 145, in execute
    cursor.execute(sql, params)
  File "/usr/local/lib/python3.8/site-packages/django/db/backends/utils.py", line 98, in execute
    return super().execute(sql, params)
  File "/usr/local/lib/python3.8/site-packages/django/db/backends/utils.py", line 66, in execute
    return self._execute_with_wrappers(sql, params, many=False, executor=self._execute)
  File "/usr/local/lib/python3.8/site-packages/django/db/backends/utils.py", line 75, in _execute_with_wrappers
    return executor(sql, params, many, context)
  File "/usr/local/lib/python3.8/site-packages/django/db/backends/utils.py", line 84, in _execute
    return self.cursor.execute(sql, params)
  File "/usr/local/lib/python3.8/site-packages/django/db/utils.py", line 90, in __exit__
    raise dj_exc_value.with_traceback(traceback) from exc_value
  File "/usr/local/lib/python3.8/site-packages/django/db/backends/utils.py", line 84, in _execute
    return self.cursor.execute(sql, params)
django.db.utils.ProgrammingError: multiple primary keys for table "creators_creatorgroup" are not allowed

chaitanya-cloudknox

Nice work. Most of it LGTM. some minor comments.

Translations are missing in some files
Translations are off in some files
When setting a state Promise is not required.
When using Promise.all, check if you need Promise.allSettled/Promise.all
Try to avoid !important in css

chaitanya-cloudknox · 2023-08-11T05:05:27Z

zubhub_backend/zubhub/creators/models.py

@@ -137,40 +137,64 @@ def __str__(self):


 class CreatorGroup(models.Model):
-    creator = models.OneToOneField(
-        Creator, on_delete=models.CASCADE, primary_key=True)
+    id = models.UUIDField(


@tuxology is there a auto formatter for python? The indentation/styling seems to be off

chaitanya-cloudknox · 2023-08-11T05:09:19Z

zubhub_backend/zubhub/creators/serializers.py

+
+    class Meta:
+        model = CreatorGroup
+        fields = ('groupname', 'description', 'members', 'created_on', 'projects_count')


i think group_name is more readable

zubhub_backend/zubhub/creators/views.py

zubhub_frontend/zubhub/package.json

zubhub_frontend/zubhub/src/App.js

chaitanya-cloudknox · 2023-08-11T05:53:52Z

zubhub_frontend/zubhub/src/views/create_team/step2/Step2.jsx

+  return (
+    <Box marginY={6}>
+    <FormControl fullWidth>
+          <label className={commonClasses.commonClasses}>


Missing translations in the file

chaitanya-cloudknox · 2023-08-11T05:54:27Z

zubhub_frontend/zubhub/src/views/create_team/step3/Step3.jsx

+  const [selectedProjects, setSelectedProjects] = useState([]);
+  const handleSetState = (obj) => {
+    if (obj) {
+      Promise.resolve(obj).then((obj) => {


promise is not required

And missing translations in file

chaitanya-cloudknox · 2023-08-11T05:57:50Z

zubhub_frontend/zubhub/src/views/team/Team.jsx

+
+  if (loading) {
+    return <LoadingPage />;
+  } else if (profile && Object.keys(profile).length > 0) {


simplify this for readability.

if (loading) { return loading } else if(!profile || !profile.username) { return "something" } return (<div />)

chaitanya-cloudknox · 2023-08-11T05:59:28Z

zubhub_frontend/zubhub/src/views/team/teamScripts.js

+  return res
+    .then(res => {
+      if (res.project && res.project.title) {
+        if (projects[0]) {


instead check Array.isArray(projects)

chaitanya-cloudknox · 2023-08-11T06:00:25Z

zubhub_frontend/zubhub/src/views/edit_team/EditTeam.jsx

+                  color="textPrimary"
+                  className={classes.titleStyle}
+                >
+                  {t('Edit Team Info')}


looks like translation is off in the page

…ng-feature

tuxology · 2023-09-02T19:48:19Z

Hey @iamhks Thanks a lot for this PR. Here are a few comments based on initial testing which I was able to do finally. I had to use a clean VM, do make init to ensure all migrations ran. I also was able to see the integrated UI with new sidebar! Cool stuff. Just to make sure celery is running fine, I also made these changes #730 but that should not affect.

Blockers

Can't proceed to "Next" if you keep the admin empty. Ideally, if admin is empty, the current user should be assigned as admin. Upon investigating, issue with props
When you assign an admin and try to proceed, the next page shows up where you can select a project. Upon project selection, when you click "Next", you get an "IntegrityError"

I could not proceed and review other parts of the feature since could not move past this.

UX Bugs

In the Invite team members page, the choice of "card" element is incorrect as it doesn't match the UX in Figma design. There are issues in spacing also. You can refer to figma design to ensure this is correct.

Improvements

Remove TEAM_ENABLED flag yaya introduced in his PR so we can see changes in Sidebar (https://github.com/search?q=repo%3Aunstructuredstudio%2Fzubhub%20TEAM_ENABLED&type=code)

Misc UX changes once more (unstructuredstudio#727)

tuxology · 2023-09-04T18:32:18Z

Thanks for the last fixes @iamhks. I was able to proceed with more testing now and have a set of new bugs/improvements and we would be almost ready for a release 👍

Blockers

For /all/teams, the team card is not-clickable. Also refer to Figma for font spacing/padding and Follow Button design for the teams card while you are fixing this. Eg. team card font should not be a hyperlink right now
Clicking on "Add Projects" button takes you to the /create-team view instead of a view where you can select your projects to be added

UX Bugs

If you do not select a project or project doesn't exist and you click "Create Team" - we get no feedback that project is required for creating a team. Error exists in response where projects can't be null. Maybe we should show error in UI as error message "Could not create a team. Please create a project or select a project from the list"

When creating teams, padding in "Project selection" section is incorrect. Review the project cards and their container in My Profile for quick reference
For /all/teams the title font size and position could be adjusted. Refere "My Projects" for reference for now instead of Figma.
Padding and spacing of sections is inconsistent for /teams/$NAME page. Esp. for about Us section the right corners radius is zero so its not consistent. Also title gets cropped.

Use outline button for "Follow" button on team cards. Also ensure size is not too big as its currently. Refer Figma
When editing a team, upon editing text and clicking edit, the page should be redirected to the team details view /teams/$NAME. In addition the text for team deletion says any "job or talent" will be deleted. Remove this line - it doens't make sense. Do we mean to say the project will be deleted? Do team associated projects get deleted when deleting a team?

Improvements

After team creation is done, we do not get a modal indicating we created a team successfuly. Refer Figma
For /teams/all in Figma we also had a distinction between all teams on platform vs Your teams, In the same view, the teams card text/color/spacing is not same as in Figma
In My Profile, For your own team, we should possibly not show a Follow button. If you are viewing someone else's profile, maybe showing teams makes sense.

Activity Creation Revamp (unstructuredstudio#731)

…nto grouping-feature

This reverts commit 9bc54af.

tuxology · 2023-09-18T19:10:36Z

Leaving an update here as we merge this now for future reference:

In its current state, we have found a few improvements that need to be done on the UI side mostly: Add the option to add/edit team members in ZubHub (frontend) #734 and Add the option to add/edit projects for a team in ZubHub #735 This would enable team management better once we release this on production.
In addition, we need to adjust how team projects are created and test this once this PR is merged. A small issue that will come up is discussed in Create project for team has wrong dropdown input selector #733
To unblock further improvements, we have a TEAM_ENABLED flag that has been set to false. This essentially "hides" the teams specific UI for now, without interfering with the teams related APIs that will be released. This way we can continue testing and improvements on the feature while not disrupting day-to-day use of Zubhub.
We will enable teams eventually when issues highlighted in Add the option to add/edit team members in ZubHub (frontend) #734 Add the option to add/edit projects for a team in ZubHub #735 Create project for team has wrong dropdown input selector #733 and Improvements in Grouping feature #719 (comment) get completed!

This is an exciting upcoming feature 🎉

tuxology

Finally ready after lots of reviews 🎉

iamhks and others added 11 commits July 13, 2023 08:18

inital setup

1df76b2

code fix

ddc3521

3rd page code

c79cb46

backend code

f69bb06

frontend

af76d8c

backend-2

c6ac9c3

frontend 2

fe0671c

package.json

8b4ed90

team form

71dbc49

team profile page

78dc915

stuck

32f8515

restore old ui

bfbfff3

iamhks changed the base branch from master to grouping-feature July 28, 2023 02:36

iamhks added 2 commits July 28, 2023 19:18

migration fixes

b7324d4

tested backend

aa9842e

chaitanya-cloudknox reviewed Aug 11, 2023

View reviewed changes

iamhks added 3 commits August 12, 2023 20:19

form all 3 steps and profile page

950721f

edit and delete api integration

9112df0

call for testing

04b2508

iamhks marked this pull request as ready for review August 14, 2023 13:59

iamhks requested review from NdibeRaymond, tuxology and ajain1921 as code owners August 14, 2023 13:59

tuxology removed request for ajain1921 and NdibeRaymond August 14, 2023 20:39

tuxology added the enhancement New feature or request label Aug 14, 2023

tuxology added feature Outreachy labels Aug 14, 2023

iamhks added 5 commits August 17, 2023 21:01

step 3 and teams page

ad65e9b

backend for all teams

fe30318

migration files

7ca58a6

url change for all teams

a45bf6a

Merge branch 'master' of https://github.com/iamhks/zubhub into groupi…

9c76954

…ng-feature

iamhks changed the base branch from grouping-feature to master August 25, 2023 14:12

iamhks added 2 commits August 27, 2023 21:34

Merge branch 'master' of https://github.com/iamhks/zubhub into groupi…

0386929

…ng-feature

rebased code

2188a56

iamhks added 2 commits September 3, 2023 18:30

Merge pull request #1 from iamhks/master

1a3ebe6

Misc UX changes once more (unstructuredstudio#727)

UI changes

1c107f7

iamhks and others added 9 commits September 7, 2023 09:58

UX fixes

441337c

edit-add projects api change

ed97ab0

rebase

4ac6b5a

Merge pull request #2 from iamhks/master

f4eba11

Activity Creation Revamp (unstructuredstudio#731)

trying to fix not clickable issue

bad5c2f

Merge branch 'grouping-feature' of https://github.com/iamhks/zubhub i…

65de286

…nto grouping-feature

adding team_enabled flag

9bc54af

Revert "adding team_enabled flag"

185b126

This reverts commit 9bc54af.

updating the TEAM_ENABLED flag

ecad2e3

tuxology approved these changes Sep 18, 2023

View reviewed changes

tuxology merged commit 7aa0021 into unstructuredstudio:master Sep 18, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Grouping feature #719

Grouping feature #719

iamhks commented Jul 26, 2023 •

edited

Loading

chaitanya-cloudknox commented Jul 26, 2023

iamhks commented Jul 27, 2023 •

edited

Loading

kamthamc commented Jul 27, 2023

iamhks commented Jul 27, 2023

chaitanya-cloudknox left a comment

chaitanya-cloudknox Aug 11, 2023

chaitanya-cloudknox Aug 11, 2023

chaitanya-cloudknox Aug 11, 2023

chaitanya-cloudknox Aug 11, 2023

chaitanya-cloudknox Aug 11, 2023

chaitanya-cloudknox Aug 11, 2023

chaitanya-cloudknox Aug 11, 2023

chaitanya-cloudknox Aug 11, 2023

tuxology commented Sep 2, 2023 •

edited

Loading

tuxology commented Sep 4, 2023 •

edited by iamhks

Loading

tuxology commented Sep 18, 2023

tuxology left a comment

Grouping feature #719

Grouping feature #719

Conversation

iamhks commented Jul 26, 2023 • edited Loading

Summary

chaitanya-cloudknox commented Jul 26, 2023

iamhks commented Jul 27, 2023 • edited Loading

kamthamc commented Jul 27, 2023

iamhks commented Jul 27, 2023

chaitanya-cloudknox 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tuxology commented Sep 2, 2023 • edited Loading

Blockers

UX Bugs

Improvements

tuxology commented Sep 4, 2023 • edited by iamhks Loading

Blockers

UX Bugs

Improvements

tuxology commented Sep 18, 2023

tuxology left a comment

Choose a reason for hiding this comment

iamhks commented Jul 26, 2023 •

edited

Loading

iamhks commented Jul 27, 2023 •

edited

Loading

tuxology commented Sep 2, 2023 •

edited

Loading

tuxology commented Sep 4, 2023 •

edited by iamhks

Loading