grant mutation requires a NewGrant model as input

Author: erikvatt

.gitignore

@@ -40,3 +40,6 @@ yarn-error.log*
 # Schema from backend
 spec-v1.0.yaml
 data.sql
+
+# asdf
+.tool-versions

components/dataproducts/access/newAccessForm.tsx

@@ -3,6 +3,8 @@ import {
   SubjectType,
   useAddRequesterMutation,
   useGrantAccessMutation,
+  NewGrant,
+  PollyInput,
 } from '../../../lib/schema/graphql'
 import * as React from 'react'
 import {Dispatch, SetStateAction, useState} from 'react'
@@ -50,6 +52,7 @@ const NewAccessForm = ({ open, setOpen, id, pii }: NewAccessFormProps) => {
     subject: '',
     accessType: '',
     expires: '',
+    polly: null,
   }
   const { formState, handleSubmit, control, watch, register, reset } =
       useForm({
@@ -66,7 +69,7 @@ const NewAccessForm = ({ open, setOpen, id, pii }: NewAccessFormProps) => {
   const [addRequester] = useAddRequesterMutation()
   const [grantAccess] = useGrantAccessMutation()
 
-  const onSubmit = async (requestData: { subjectType: string, subject: string, accessType: string, expires: any }) => {
+  const onSubmit = async (requestData: { subjectType: string, subject: string, accessType: string, expires: any, polly: PollyInput }) => {
     requestData.expires = date
     const accessSubject = requestData.subjectType === 'all-users' ? '[email protected]' : subject
 
@@ -100,14 +103,19 @@ const NewAccessForm = ({ open, setOpen, id, pii }: NewAccessFormProps) => {
     }
 
     try {
-      const variables: GrantAccessMutationVariables = {
+      const newGrant: NewGrant = {
         subjectType: toSubjectType(requestData.subjectType),
         subject: accessSubject,
         dataproductID: id,
+        polly: null,
+      }
+
+      const variables: GrantAccessMutationVariables = {
+        input: newGrant,
       }
 
       if (requestData.accessType === 'until') {
-        variables.expires = date
+        variables.input.expires = date
       }
 
       await grantAccess({

lib/queries/access/grantAccess.ts

@@ -1,18 +1,8 @@
 import { gql } from 'graphql-tag'
 
 export const GRANT_ACCESS = gql`
-  mutation GrantAccess(
-    $dataproductID: ID!
-    $subject: String!
-    $subjectType: SubjectType!
-    $expires: Time
-  ) {
-    grantAccessToDataproduct(
-      dataproductID: $dataproductID
-      subject: $subject
-      subjectType: $subjectType
-      expires: $expires
-    ) {
+  mutation GrantAccess($input: NewGrant!) {
+    grantAccessToDataproduct(input: $input) {
       id
     }
   }

lib/schema/graphql.ts

@@ -35,6 +35,8 @@ export type Access = {
   granter: Scalars['String']
   /** id for the access entry */
   id: Scalars['ID']
+  /** polly is the documentation for the access grant */
+  polly?: Maybe<PollyResult>
   /** revoked is timestamp for when access was revoked */
   revoked?: Maybe<Scalars['Time']>
   /** subject to grant access */
@@ -264,10 +266,7 @@ export type MutationDummyArgs = {
 }
 
 export type MutationGrantAccessToDataproductArgs = {
-  dataproductID: Scalars['ID']
-  expires?: Maybe<Scalars['Time']>
-  subject?: Maybe<Scalars['String']>
-  subjectType?: Maybe<SubjectType>
+  input: NewGrant
 }
 
 export type MutationMapDataproductArgs = {
@@ -332,6 +331,20 @@ export type NewDataproduct = {
   teamkatalogenURL?: Maybe<Scalars['String']>
 }
 
+/** NewGrant contains metadata on a dataproduct grant */
+export type NewGrant = {
+  /** id of dataproduct. */
+  dataproductID: Scalars['ID']
+  /** expires is a timestamp for when the access expires. */
+  expires?: Maybe<Scalars['Time']>
+  /** polly is the process policy attached to this grant */
+  polly?: Maybe<PollyInput>
+  /** subject to be granted access. */
+  subject?: Maybe<Scalars['String']>
+  /** subjectType is the type of entity which should be granted access (user, group or service account). */
+  subjectType?: Maybe<SubjectType>
+}
+
 export type NewStory = {
   /** group is the owner group for the story. */
   group: Scalars['String']
@@ -354,6 +367,25 @@ export type Owner = {
   teamkatalogenURL?: Maybe<Scalars['String']>
 }
 
+export type PollyInput = {
+  /** id from polly */
+  id: Scalars['String']
+  /** name from polly */
+  name: Scalars['String']
+  /** url from polly */
+  url: Scalars['String']
+}
+
+export type PollyResult = {
+  __typename?: 'PollyResult'
+  /** id from polly */
+  id: Scalars['String']
+  /** name from polly */
+  name: Scalars['String']
+  /** url from polly */
+  url: Scalars['String']
+}
+
 export type Query = {
   __typename?: 'Query'
   /** dataproduct returns the given dataproduct. */
@@ -376,6 +408,8 @@ export type Query = {
   groupStats: Array<GroupStats>
   /** Keywords returns all keywords, with an optional filter */
   keywords: Array<Keyword>
+  /** searches polly for process purposes matching query input */
+  polly: Array<PollyResult>
   /** search through existing dataproducts. */
   search: Array<SearchResultRow>
   /** stories returns all either draft or published stories depending on the draft boolean. */
@@ -426,6 +460,10 @@ export type QueryKeywordsArgs = {
   prefix?: Maybe<Scalars['String']>
 }
 
+export type QueryPollyArgs = {
+  q: Scalars['String']
+}
+
 export type QuerySearchArgs = {
   options?: Maybe<SearchOptions>
   q?: Maybe<SearchQuery>
@@ -696,10 +734,7 @@ export type DataproductAccessQuery = {
 }
 
 export type GrantAccessMutationVariables = Exact<{
-  dataproductID: Scalars['ID']
-  subject: Scalars['String']
-  subjectType: SubjectType
-  expires?: Maybe<Scalars['Time']>
+  input: NewGrant
 }>
 
 export type GrantAccessMutation = {
@@ -1279,18 +1314,8 @@ export type DataproductAccessQueryResult = Apollo.QueryResult<
   DataproductAccessQueryVariables
 >
 export const GrantAccessDocument = gql`
-  mutation GrantAccess(
-    $dataproductID: ID!
-    $subject: String!
-    $subjectType: SubjectType!
-    $expires: Time
-  ) {
-    grantAccessToDataproduct(
-      dataproductID: $dataproductID
-      subject: $subject
-      subjectType: $subjectType
-      expires: $expires
-    ) {
+  mutation GrantAccess($input: NewGrant!) {
+    grantAccessToDataproduct(input: $input) {
       id
     }
   }
@@ -1313,10 +1338,7 @@ export type GrantAccessMutationFn = Apollo.MutationFunction<
  * @example
  * const [grantAccessMutation, { data, loading, error }] = useGrantAccessMutation({
  *   variables: {
- *      dataproductID: // value for 'dataproductID'
- *      subject: // value for 'subject'
- *      subjectType: // value for 'subjectType'
- *      expires: // value for 'expires'
+ *      input: // value for 'input'
  *   },
  * });
  */