Merge branch 'feature/gravy_valet_integration' into feature/gravy_val…

…et_integration

addons/base/models.py

@@ -377,6 +377,10 @@ def has_auth(self):
  """Whether the node has added credentials for this addon."""
  return False
 
+ @property
+ def display_name(self):
+ return self.short_name
+
  def to_json(self, user):
  ret = super(BaseNodeSettings, self).to_json(user)
  ret.update({

api/nodes/views.py

@@ -1541,18 +1541,21 @@ class NodeStorageProvidersList(JSONAPIBaseView, generics.ListAPIView, NodeMixin)
 
  ordering = ('-id',)
 
- def get_provider_item(self, storage_addon):
- return NodeStorageProvider(self.get_node(), storage_addon.config.short_name, storage_addon)
+ def get_provider_item(self, storage_addon, node=None):
+ node = node or self.get_node()
+ return NodeStorageProvider(resource=node, provider_settings=storage_addon)
 
  def get_queryset(self):
+ node = self.get_node()
  return [
- self.get_provider_item(addon)
+ self.get_provider_item(addon, node=node)
  for addon
- in self.get_node().get_addons()
+ in node.get_addons()
  if addon.config.has_hgrid_files
  and addon.configured
  ]
 
+
 class NodeStorageProviderDetail(JSONAPIBaseView, generics.RetrieveAPIView, NodeMixin):
  """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_providers_read).
  """
@@ -1571,7 +1574,8 @@ class NodeStorageProviderDetail(JSONAPIBaseView, generics.RetrieveAPIView, NodeM
  view_name = 'node-storage-provider-detail'
 
  def get_object(self):
- return NodeStorageProvider(self.get_node(), self.kwargs['provider'])
+ node = self.get_node()
+ return NodeStorageProvider(node, provider_settings=node.get_addon(self.kwargs['provider']))
 
 
 class NodeLogList(JSONAPIBaseView, generics.ListAPIView, NodeMixin, ListFilterMixin):

osf/external/gravy_valet/translations.py

@@ -19,7 +19,7 @@ def make_ephemeral_user_settings(gv_account_data, requesting_user):
  legacy_config = _LegacyConfigsForWBKey[service_wb_key].value
  return EphemeralUserSettings(
  config=EphemeralAddonConfig.from_legacy_config(legacy_config),
- gv_id=gv_account_data.resource_id,
+ gv_data=gv_account_data,
  active_user=requesting_user,
  )
 
@@ -32,8 +32,7 @@ def make_ephemeral_node_settings(gv_addon_data, requested_resource, requesting_u
  legacy_config = _LegacyConfigsForWBKey[service_wb_key].value
  return EphemeralNodeSettings(
  config=EphemeralAddonConfig.from_legacy_config(legacy_config),
- gv_id=gv_addon_data.resource_id,
- folder_id=gv_addon_data.get_attribute('root_folder'),
+ gv_data=gv_addon_data,
  configured_resource=requested_resource,
  active_user=requesting_user,
  )
@@ -61,8 +60,7 @@ def from_legacy_config(cls, legacy_config):
 class EphemeralNodeSettings:
  '''Minimalist dataclass for storing/translating the actually used properties of NodeSettings.'''
  config: EphemeralAddonConfig
- folder_id: str
- gv_id: str
+ gv_data: gv_requests.JSONAPIResultEntry
 
  # These are needed in order to make further requests for credentials
  configured_resource: type # Node
@@ -75,6 +73,21 @@ class EphemeralNodeSettings:
  def short_name(self):
  return self.config.short_name
 
+ @property
+ def gv_id(self):
+ return self.gv_data.resource_id
+
+ @property
+ def configured(self):
+ return self.gv_data.get_included_attribute(
+ include_path=['base_account'],
+ attribute_name='credentials_available'
+ )
+
+ @property
+ def folder_id(self):
+ return self.gv_data.get_attribute('root_folder')
+
  def serialize_waterbutler_credentials(self):
  # sufficient for most OAuth services, including Box
  # TODO: Define per-service translation (and/or common schemes)
@@ -92,7 +105,7 @@ def serialize_waterbutler_settings(self):
 
  def _fetch_wb_config(self):
  result = gv_requests.get_waterbutler_config(
- gv_addon_pk=self.gv_id,
+ gv_addon_pk=self.gv_data.resource_id,
  requested_resource=self.configured_resource,
  requesting_user=self.active_user
  )
@@ -101,20 +114,26 @@ def _fetch_wb_config(self):
  def create_waterbutler_log(self, *args, **kwargs):
  pass
 
- def save():
+ def save(self):
  pass
 
+
 @dataclasses.dataclass
 class EphemeralUserSettings:
  '''Minimalist dataclass for storing the actually used properties of UserSettings.'''
  config: EphemeralAddonConfig
- gv_id: str
+ gv_data: gv_requests.JSONAPIResultEntry
  # This is needed to support making further requests
  active_user: type # : OSFUser
 
  @property
  def short_name(self):
  return self.config.short_name
 
+ @property
+ def gv_id(self):
+ return self.gv_data.resource_id
+
+ @property
  def can_be_merged(self):
  return True