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.

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

Feature/google shared drives #561

Merged
merged 46 commits into from
May 15, 2024
Merged
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
20bfe16
initial shared drive record models
mikeseibel Feb 26, 2024
005774b
mock shared drive data and initial templating
mikeseibel Feb 29, 2024
fc173ff
shared drive api tests
mikeseibel Feb 29, 2024
d002f3e
shared drive loader upsert
mikeseibel Feb 29, 2024
314ab80
Merge branch 'develop' into feature/google-shared-drives
mikeseibel Mar 19, 2024
da31dd4
Merge branch 'develop' into feature/google-shared-drives
mikeseibel Mar 20, 2024
485b97d
itbill restclient
mikeseibel Apr 9, 2024
72f3bfe
shared drive record to unique drive
mikeseibel Apr 9, 2024
cc60f54
random key_remote
mikeseibel Apr 9, 2024
4e25613
layout interactions align with wireframes
mikeseibel Apr 27, 2024
e56ff52
Merge pull request #545 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel Apr 29, 2024
2a61d0a
Merge branch 'develop' into feature/google-shared-drives
mikeseibel Apr 30, 2024
c0fdf09
mock dates
mikeseibel Apr 30, 2024
23d6bdb
itbill payload integration
mikeseibel May 4, 2024
8e6bad7
Merge pull request #547 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 4, 2024
ce4d1b8
subscription relationships
mikeseibel May 4, 2024
74c8d5e
Merge pull request #548 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 4, 2024
42daf34
shared drive email warnings and tests
mikeseibel May 8, 2024
d4d5a11
shared drive notification templating
mikeseibel May 8, 2024
e9dbd64
Merge pull request #549 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 8, 2024
e6c7768
shared drive warning email tweaking
mikeseibel May 8, 2024
1923ad2
Merge pull request #550 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 8, 2024
8649e0c
misnamed metho
mikeseibel May 8, 2024
8b1dc57
Merge pull request #551 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 8, 2024
1978096
consolidate notification logic, add access lifecycle warnings
mikeseibel May 9, 2024
3182223
Merge pull request #552 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 9, 2024
9de0681
setting for conditional app exposure, prod value to prevent unintenti…
mikeseibel May 10, 2024
2acac2d
Merge pull request #553 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 10, 2024
a88d308
support notification display bug
mikeseibel May 10, 2024
6652531
Merge pull request #554 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 10, 2024
8f5acce
improve notification testing
mikeseibel May 10, 2024
8c4bb16
Merge pull request #555 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 10, 2024
e459a50
unused constants
mikeseibel May 10, 2024
d8d8e1e
Merge pull request #556 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 10, 2024
3c0a538
access notice tweaks
mikeseibel May 10, 2024
8212fa3
Merge pull request #557 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 10, 2024
0c028c7
tabs as links
mikeseibel May 14, 2024
ca971ba
Merge pull request #559 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 14, 2024
3be16be
over quota unsubsidized warning, handlebars logic cleanup
mikeseibel May 15, 2024
e566292
a11y updates
wmwash May 15, 2024
d5673e3
feature branch merge
mikeseibel May 15, 2024
98554c7
Merge pull request #560 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 15, 2024
25b8a63
pycodestyle
mikeseibel May 15, 2024
83aa449
Merge pull request #562 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 15, 2024
f70353d
jshint
mikeseibel May 15, 2024
d8ea610
Merge pull request #563 from uw-it-aca/work/google-shared-drives-mikes
mikeseibel May 15, 2024
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
Prev Previous commit
Next Next commit
shared drive api tests
mikeseibel committed Feb 29, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit fc173ffbae21ffb2b7de37553392a38affcbc19b
2 changes: 1 addition & 1 deletion endorsement/templates/handlebars/tab/drives/google.html
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
<tr class="shared-drive-row">
<td class="shared-drive-name" data-shared-drive_id="{{ share_drive.drive_id }}">{{ shared_drive.drive_name }}</td>
<td class="shared-drive-quota">{{ shared_drive.drive_quota.org_unit }}</td>
<td class="shared-drive-members">{{#each shared_drive.members}}{{name}}, {{/each}}</td>
<td class="shared-drive-members"><ul class="comma-list">{{#each shared_drive.members}}<li>{{name}}</li>{{/each}}</ul></td>
<td class="access-action">
<button type="button" class="btn btn-primary" id="shared_drive_change" data-loading-text="Loading..." data-mailbox="{{ shared_drive.drive_id }}">Change Quota</button></td>
</tr>
33 changes: 33 additions & 0 deletions endorsement/test/api/test_shared_drives.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Copyright 2024 UW-IT, University of Washington
# SPDX-License-Identifier: Apache-2.0

import json
from django.urls import reverse
from endorsement.test.api import EndorsementApiTest


class TestSharedDrivesAPI(EndorsementApiTest):
fixtures = [
'test_data/member.json',
'test_data/role.json',
'test_data/shared_drive_member.json',
'test_data/shared_drive_quota.json',
'test_data/shared_drive.json',
'test_data/shared_drive_record.json'
]

def test_shared_drives(self):
self.set_user('jstaff')
url = reverse('shared_drives_api')
response = self.client.get(url)
self.assertEquals(response.status_code, 200)
data = json.loads(response.content)
self.assertEqual(len(data['drives']), 3)

def test_no_shared_drives(self):
self.set_user('endorsee2')
url = reverse('shared_drives_api')
response = self.client.get(url)
self.assertEquals(response.status_code, 200)
data = json.loads(response.content)
self.assertEqual(len(data['drives']), 0)