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

Task/wp 773 remove Box and Google Drive integration #1513

Merged
merged 4 commits into from
Jan 29, 2025
Merged

Task/wp 773 remove Box and Google Drive integration #1513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee54ab2
Remove Box and Google drive integrations.
jmartinez-tacc Jan 21, 2025
861b58c
Merge remote-tracking branch 'origin' into task/wp-773-remove-box-int…
jmartinez-tacc Jan 22, 2025
a0bdcb9
Merge branch 'main' into task/wp-773-remove-box-integration
rstijerina Jan 29, 2025
a2c990b
Merge branch 'main' into task/wp-773-remove-box-integration
jarosenb Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions client/modules/datafiles/src/DatafilesSideNav/DatafilesSideNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,24 +52,12 @@ export const DatafilesSideNav: React.FC = () => {

<hr style={{ margin: '0' }} />

<DataFilesNavLink
to="/box"
tooltip="Access to my Box files for copying"
>
Box.com
</DataFilesNavLink>
<DataFilesNavLink
to="/dropbox"
tooltip="Access to my Dropbox files for copying"
>
Dropbox.com
</DataFilesNavLink>
<DataFilesNavLink
to="/googledrive"
tooltip="Access to my Google Drive files for copying"
>
Google Drive
</DataFilesNavLink>

<hr style={{ margin: '0' }} />
</>
Expand Down
10 changes: 5 additions & 5 deletions designsafe/apps/box_integration/integrations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

def provide_integrations():
return [
{
'label': 'Box.com',
'href': reverse('box_integration:index'),
'description': 'Access files from your Box.com account in DesignSafe.',
},
Comment on lines -6 to -10
Copy link
Member

Choose a reason for hiding this comment

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

Instead of commenting out these lines in these integrations files, you should be able to just remove the app from INSTALLED_APPS in common_settings.py

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I tried that, it thrown errors like this one:
RuntimeError: Model class designsafe.apps.box_integration.models.BoxUserToken doesn't declare an explicit app_label and isn't in an application in INSTALLED_APPS.

I could fix those errors but it implies to modify or delete some other parts of the code. I decided to take this approach since this is just a UI change I rather don't mess with functionality.

#{
# 'label': 'Box.com',
# 'href': reverse('box_integration:index'),
# 'description': 'Access files from your Box.com account in DesignSafe.',
#},
]
10 changes: 5 additions & 5 deletions designsafe/apps/googledrive_integration/integrations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

def provide_integrations():
return [
{
'label': 'GoogleDrive',
'href': reverse('googledrive_integration:index'),
'description': 'Access files from your Google Drive account in DesignSafe.',
},
#{
# 'label': 'GoogleDrive',
# 'href': reverse('googledrive_integration:index'),
# 'description': 'Access files from your Google Drive account in DesignSafe.',
#},
]
Loading