Add Fullname and Nickname Feature to User Profiles #2575

annapurna-gupta · 2024-11-24T17:56:09Z

##Fixes #1282

ReimarBauer

Hi, thanks for working on this!

There are some flake8 and linter failures found by the tests

Also you added some files which we don't need in the repository
remove

.coverage
dist/mss-9.2.0-py3.11.egg
instance/mscolab.db
output_file.py
pytest.log

There are multiple times added ui_add_user.py, ui_mscolab_connect_dialog.py, ui_mscolab_profile_dialog.py

I have to do a closer look on the other changes,

ReimarBauer · 2024-11-25T08:42:56Z

mslib/mscolab/server.py

+        user_record.nickname = nickname  # Update nickname
+
+        # Commit changes to the database
+        db.session.commit()


all these db commands needs to be moved to the file_manager

likly you can use modify_user
https://github.com/Open-MSS/MSS/blob/develop/mslib/mscolab/file_manager.py#L222

So I need to move all the additional commands to file_manager, and I should revert this part to how it was before.

not mandatory. check if you can use file_manager.modify_user you can maybe reuse the existing method

ReimarBauer · 2024-11-25T08:45:49Z

mslib/mscolab/server.py

+
+    except Exception as e:
+        # Log the error message (use logging instead of print for production)
+        print(f"Error updating user info: {str(e)}")  # Replace with proper logging if needed


when you need output, you have to use logging.debug, a print can create a traceback on a webserver

ReimarBauer · 2024-11-25T08:47:00Z

mslib/msui/mscolab.py

@@ -966,6 +966,34 @@ def delete_account(self, _=None):
            if r.status_code == 200 and json.loads(r.text)["success"] is True:
                self.logout()

+    def editfull_name(self):
+        if verify_user_token(self.mscolab_server_url, self.token):


there is a newer syntax for this by a decorator. Have a look on the other lines where that is used

ReimarBauer · 2024-11-25T08:48:09Z

mslib/msui/qt5/ui_add_user_dialog.py

        self.emailid.setPlaceholderText(_translate("addUserDialog", "[email protected]"))
        self.passwordLabel.setText(_translate("addUserDialog", "Password:"))
        self.password.setPlaceholderText(_translate("addUserDialog", "Your password"))
        self.confirmPasswordLabel.setText(_translate("addUserDialog", "Confirm Password:"))
        self.rePassword.setPlaceholderText(_translate("addUserDialog", "Confirm your password"))
-        self.emailIDLabel.setText(_translate("addUserDialog", "Email:"))
-        self.usernameLabel.setText(_translate("addUserDialog", "Username:"))
+


this section is not needed, likly this comes from an option of the pyuic5 command.

do you mean all the changes in ui_add_user_dialog.py is not needed??

Add only the fullname

ReimarBauer · 2024-11-25T08:48:36Z

mslib/msui/qt5/ui_mscolab_profile_dialog.py



-from . import resources_rc
+if __name__ == "__main__":


this is also not needed

ReimarBauer · 2024-11-25T08:49:28Z

ui_add_user.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-


file on wrong place?

i removed it.

ReimarBauer · 2024-11-25T08:49:37Z

ui_mscolab_connect_dialog.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-


file on wrong place?

i removed it

ReimarBauer · 2024-11-25T08:49:45Z

ui_mscolab_profile_dialog.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-


file on wrong place?

ReimarBauer · 2024-11-25T08:50:38Z

.coverage

we don't need this in the repository

okk i have removed it..

ReimarBauer · 2024-11-25T08:50:52Z

dist/mss-9.2.0-py3.11.egg

we don't need this in the repository

okk i have removed it..

ReimarBauer · 2024-11-25T08:51:03Z

instance/mscolab.db

we don't need this in the repository

okk i have removed it..

ReimarBauer · 2024-11-25T08:57:55Z

mslib/mscolab/models.py

@@ -65,8 +65,11 @@ class User(db.Model):
    permissions = db.relationship('Permission', cascade='all,delete,delete-orphan', backref='user')
    authentication_backend = db.Column(db.String(255), nullable=False, default='local')

+    fullname = db.Column(db.String(255), nullable=True)


because you change the dbase model, you need to do additional steps, see
https://github.com/Open-MSS/MSS/blob/develop/docs/development.rst#changing-the-database-model

when that is not done, a annapurna-gupta/MSS$ python mslib/mscolab/mscolab.py db --seed crashes with
sqlite3.OperationalError: table users has no column named fullname

also it may be useful to change the seed.py to add some of this data.

i have generated the migration script but while applying it to database i am facing import error.

please show the failure

Please show your PYTHONPATH

likly PYTHONPATH should show D:\LOCAL_CODE COPY\MSS

I think on windows you can use setx PYTHONPATH D:\LOCAL_CODE COPY\MSS

currently python can't find mslib. ...

ReimarBauer · 2024-11-26T09:12:43Z

I think we should keep creating an useraccount as it is now, and add into the profile dialog the feature to set a fullname and a nickname.

We need to be able to edit it from here anyway.

matrss · 2024-11-26T10:31:59Z

I won't be able to fully review this until next week, but just a quick comment: we already have a username field, and I understand usernames and nicknames as being the same thing. So I don't see a reason to have two nickname fields when we could just make the username changeable (if it isn't already).

ReimarBauer

see comments

ReimarBauer · 2024-11-26T08:55:15Z

mslib/msui/qt5/ui_mscolab_profile_dialog.py

        self.deleteAccountBtn.setText(_translate("ProfileWindow", "Delete Account"))
        self.uploadImageBtn.setText(_translate("ProfileWindow", "Change Avatar"))
+import resources_rc


where does this comes from?

likly you need to convert the ui file with
pyuic5 --from-imports ui_mscolab_profile_dialog.ui > ../qt5/ui_mscolab_profile_dialog.py

what do you mean? i have converted .ui file to .py file .

ReimarBauer · 2024-11-28T15:10:37Z

mslib/mscolab/server.py

+        user_record.nickname = nickname  # Update nickname
+
+        # Commit changes to the database
+        db.session.commit()


not mandatory. check if you can use file_manager.modify_user you can maybe reuse the existing method

ReimarBauer · 2024-11-29T08:06:33Z

mslib/mscolab/models.py

@@ -65,8 +65,11 @@ class User(db.Model):
    permissions = db.relationship('Permission', cascade='all,delete,delete-orphan', backref='user')
    authentication_backend = db.Column(db.String(255), nullable=False, default='local')

+    fullname = db.Column(db.String(255), nullable=True)


please show the failure

ReimarBauer · 2024-11-29T08:08:39Z

mslib/msui/qt5/ui_add_user_dialog.py

        self.emailid.setPlaceholderText(_translate("addUserDialog", "[email protected]"))
        self.passwordLabel.setText(_translate("addUserDialog", "Password:"))
        self.password.setPlaceholderText(_translate("addUserDialog", "Your password"))
        self.confirmPasswordLabel.setText(_translate("addUserDialog", "Confirm Password:"))
        self.rePassword.setPlaceholderText(_translate("addUserDialog", "Confirm your password"))
-        self.emailIDLabel.setText(_translate("addUserDialog", "Email:"))
-        self.usernameLabel.setText(_translate("addUserDialog", "Username:"))
+


Add only the fullname

ReimarBauer · 2024-11-29T08:09:28Z

mslib/msui/qt5/ui_mscolab_connect_dialog.py

@@ -247,3 +263,13 @@ def retranslateUi(self, MSColabConnectDialog):
        self.idpAuthTokenSubmitBtn.setText(_translate("MSColabConnectDialog", "Submit"))
        self.idpAuthTopicLabel.setText(_translate("MSColabConnectDialog", "Identity Provider Authentication"))
        self.statusLabel.setText(_translate("MSColabConnectDialog", "Status:"))
+
+


the __name__ section gets in by some conversion option, we don't need that

ReimarBauer · 2024-12-06T07:51:39Z

mslib/index.py

@@ -81,7 +81,6 @@ def create_app(name="", imprint=None, gdpr=None):

    @APP.route('/xstatic/<name>/<path:filename>')
    def files(name, filename):
-


this is needed, why?

ReimarBauer · 2024-12-06T07:52:19Z

mslib/index.py

@@ -96,10 +95,6 @@ def mss_theme(filename):

    APP.jinja_env.globals.update(get_topmenu=get_topmenu)

-    @APP.route("/index")


have you moved this? or why is it deleted?

http://localhost:8083/ seems broken.

ReimarBauer · 2024-12-06T07:53:32Z

mslib/mscolab/migrations/versions/a63201ddec7a_to_version_next_major_version.py

+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('users', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('fullname', sa.String(length=255), nullable=True))


there is already a mig script to version 10. Please move the upgrade and downgrade new lines into this and remove your script.

okk .. i got it.

ReimarBauer · 2024-12-06T07:54:06Z

output_file.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-


why do we need this?

ReimarBauer · 2024-12-06T07:54:34Z

pytest.log

@@ -0,0 +1 @@
+2024-11-02 09:57:36 DEBUG Failed to pyproj from mpl_toolkits.basemap


this should not become added into the repository

ReimarBauer · 2024-12-06T07:56:27Z

mslib/msui/mscolab.py

+            self.ui,
+            self.ui.tr("Edit Full Name"),
+            self.ui.tr(
+                f"You're about to change the full name - '{self.active_operation_name}' "


What is the reason to add here self.active_operation_name ? How is the users full name linked to an operation?

i am confused, I need to collect the user's full name and nickname from the UI, send the data to the server, and update the UI with the response from the server. Is this the correct approach?

Start with only adding the full name. See discussion by Matthias.

My question is why is the users fullname related to the operation name?

Screenshot_20241207_041506_GitHub.jpg

sorry.. it's not directly related.

Start with only adding the full name. See discussion by Matthias.

where can i find it?

#2575 (comment)

ReimarBauer · 2024-12-06T07:57:46Z

mslib/msui/mscolab.py

+
+
+    def editnick_name(self):
+        pass


This is currently a stub, or?

ReimarBauer

see comments/questions

ReimarBauer

the migration script seems not correct

Are you sure you want to reset the database? This would delete all your data! (y/[n]):y
INFO [alembic.runtime.migration] Context impl SQLiteImpl.
INFO [alembic.runtime.migration] Will assume non-transactional DDL.
INFO [alembic.runtime.migration] Running downgrade 922e4d9c94e2 -> c171019fe3ee, To version 10.0.0
Traceback (most recent call last):
...
KeyError: 'fullname'

you get on this by

annapurna-gupta/MSS$ python mslib/mscolab/mscolab.py db --reset

please also undo your changes to index.py. This is our homepage.

you can see the crash by

annapurna-gupta/MSS$ python mslib/mswms/mswms.py
on your browser http://127.0.0.1:8081

ReimarBauer · 2024-12-30T11:52:47Z

seems I am not allowed to propose changes to your PR, so that is as patch here

diff --git a/mslib/mscolab/migrations/versions/922e4d9c94e2_to_version_10_0_0.py b/mslib/mscolab/migrations/versions/922e4d9c94e2_to_version_10_0_0.py
index 35fd014c..21c353c2 100644
--- a/mslib/mscolab/migrations/versions/922e4d9c94e2_to_version_10_0_0.py
+++ b/mslib/mscolab/migrations/versions/922e4d9c94e2_to_version_10_0_0.py
@@ -21,8 +21,6 @@ def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('users', schema=None) as batch_op:
         batch_op.add_column(sa.Column('profile_image_path', sa.String(length=255), nullable=True))
-    
-    with op.batch_alter_table('users', schema=None) as batch_op:
         batch_op.add_column(sa.Column('fullname', sa.String(length=255), nullable=True))
 
     # ### end Alembic commands ###
@@ -32,8 +30,6 @@ def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('users', schema=None) as batch_op:
         batch_op.drop_column('profile_image_path')
-
-    with op.batch_alter_table('users', schema=None) as batch_op:
         batch_op.drop_column('fullname')
 
      # ### end Alembic commands ###

Add immutable fullname and nickname fields to user profiles

4e9f830

ReimarBauer requested changes Nov 25, 2024

View reviewed changes

ReimarBauer reviewed Nov 25, 2024

View reviewed changes

ReimarBauer requested a review from matrss November 25, 2024 09:30

ReimarBauer reviewed Nov 29, 2024

View reviewed changes

Updated fullname and nickname fields

2716bd3

ReimarBauer reviewed Dec 6, 2024

View reviewed changes

output_file.py

@@ -0,0 +1,10 @@

# -*- coding: utf-8 -*-

Copy link

Member

ReimarBauer Dec 6, 2024

Choose a reason for hiding this comment

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

why do we need this?

ReimarBauer reviewed Dec 6, 2024

View reviewed changes

mslib/msui/mscolab.py

def editnick_name(self):

pass

Copy link

Member

ReimarBauer Dec 6, 2024

Choose a reason for hiding this comment

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

This is currently a stub, or?

ReimarBauer requested changes Dec 6, 2024

View reviewed changes

annapurna-gupta added 3 commits December 13, 2024 21:07

updated fullname

cee3269

Add full name

d6ffaf8

updated migration

795f612

Revert changes made by mistake

f63cdf3

ReimarBauer requested changes Dec 30, 2024

View reviewed changes

		@@ -81,7 +81,6 @@ def create_app(name="", imprint=None, gdpr=None):

		@APP.route('/xstatic/<name>/<path:filename>')
		def files(name, filename):

		@@ -96,10 +95,6 @@ def mss_theme(filename):

		APP.jinja_env.globals.update(get_topmenu=get_topmenu)

		@APP.route("/index")

		@@ -0,0 +1 @@
		2024-11-02 09:57:36 DEBUG Failed to pyproj from mpl_toolkits.basemap

Add Fullname and Nickname Feature to User Profiles #2575

Are you sure you want to change the base?

Add Fullname and Nickname Feature to User Profiles #2575

Conversation

annapurna-gupta commented Nov 24, 2024

ReimarBauer left a comment

Choose a reason for hiding this comment

ReimarBauer Nov 25, 2024 • 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

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

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

annapurna-gupta Nov 28, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

annapurna-gupta Nov 28, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

annapurna-gupta Nov 28, 2024 • edited Loading

Choose a reason for hiding this comment

ReimarBauer Nov 25, 2024 • 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

Choose a reason for hiding this comment

ReimarBauer Dec 2, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ReimarBauer commented Nov 26, 2024 • edited Loading

matrss commented Nov 26, 2024

ReimarBauer 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

Choose a reason for hiding this comment

ReimarBauer Dec 6, 2024 • 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ReimarBauer Dec 7, 2024 • 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ReimarBauer left a comment

Choose a reason for hiding this comment

ReimarBauer left a comment • edited Loading

Choose a reason for hiding this comment

ReimarBauer commented Dec 30, 2024

ReimarBauer Nov 25, 2024 •

edited

Loading

annapurna-gupta Nov 28, 2024 •

edited

Loading

annapurna-gupta Nov 28, 2024 •

edited

Loading

annapurna-gupta Nov 28, 2024 •

edited

Loading

ReimarBauer Nov 25, 2024 •

edited

Loading

ReimarBauer Dec 2, 2024 •

edited

Loading

ReimarBauer commented Nov 26, 2024 •

edited

Loading

ReimarBauer Dec 6, 2024 •

edited

Loading

ReimarBauer Dec 7, 2024 •

edited

Loading

ReimarBauer left a comment •

edited

Loading