working with multiple forms

.graphqlconfig.yml

@@ -0,0 +1,15 @@
+projects:
+  b4hGraphQL:
+    schemaPath: src/graphql/schema.json
+    includes:
+      - src/graphql/**/*.js
+    excludes:
+      - ./amplify/**
+    extensions:
+      amplify:
+        codeGenTarget: javascript
+        generatedFileName: ''
+        docsFilePath: src/graphql
+extensions:
+  amplify:
+    version: 3

amplify/backend/api/b4hGraphQL/cli-inputs.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "serviceConfiguration": {
+    "apiName": "b4hGraphQL",
+    "serviceName": "AppSync",
+    "gqlSchemaPath": "C:\\Users\\eliu10\\basics4health\\amplify\\backend\\api\\b4hGraphQL\\schema.graphql",
+    "defaultAuthType": {
+      "mode": "AMAZON_COGNITO_USER_POOLS",
+      "cognitoUserPoolId": "authbasics4health41656259"
+    }
+  }
+}

amplify/backend/api/b4hGraphQL/parameters.json

@@ -0,0 +1,11 @@
+{
+  "AppSyncApiName": "b4hGraphQL",
+  "DynamoDBBillingMode": "PAY_PER_REQUEST",
+  "DynamoDBEnableServerSideEncryption": false,
+  "AuthCognitoUserPoolId": {
+    "Fn::GetAtt": [
+      "authbasics4health41656259",
+      "Outputs.UserPoolId"
+    ]
+  }
+}

amplify/backend/api/b4hGraphQL/resolvers/README.md

@@ -0,0 +1,2 @@
+Any resolvers that you add in this directory will override the ones automatically generated by Amplify CLI and will be directly copied to the cloud. 
+For more information, visit [https://docs.amplify.aws/cli/graphql-transformer/resolvers](https://docs.amplify.aws/cli/graphql-transformer/resolvers)

amplify/backend/api/b4hGraphQL/schema.graphql

@@ -0,0 +1,15 @@
+
+type Form @model @auth(rules: [{ allow: owner }, { allow: private, operations: [read] }]) {
+  id: ID!
+  name: String @index(name: "byFormName", queryField: "getFormByName")
+  otherUser: String
+  owner: String
+  file: S3Object
+}
+
+type S3Object {
+  bucket: String!
+  region: String!
+  key: String!
+}
+

amplify/backend/api/b4hGraphQL/stacks/CustomResources.json

@@ -0,0 +1,58 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Description": "An auto-generated nested stack.",
+  "Metadata": {},
+  "Parameters": {
+    "AppSyncApiId": {
+      "Type": "String",
+      "Description": "The id of the AppSync API associated with this project."
+    },
+    "AppSyncApiName": {
+      "Type": "String",
+      "Description": "The name of the AppSync API",
+      "Default": "AppSyncSimpleTransform"
+    },
+    "env": {
+      "Type": "String",
+      "Description": "The environment name. e.g. Dev, Test, or Production",
+      "Default": "NONE"
+    },
+    "S3DeploymentBucket": {
+      "Type": "String",
+      "Description": "The S3 bucket containing all deployment assets for the project."
+    },
+    "S3DeploymentRootKey": {
+      "Type": "String",
+      "Description": "An S3 key relative to the S3DeploymentBucket that points to the root\nof the deployment directory."
+    }
+  },
+  "Resources": {
+    "EmptyResource": {
+      "Type": "Custom::EmptyResource",
+      "Condition": "AlwaysFalse"
+    }
+  },
+  "Conditions": {
+    "HasEnvironmentParameter": {
+      "Fn::Not": [
+        {
+          "Fn::Equals": [
+            {
+              "Ref": "env"
+            },
+            "NONE"
+          ]
+        }
+      ]
+    },
+    "AlwaysFalse": {
+      "Fn::Equals": ["true", "false"]
+    }
+  },
+  "Outputs": {
+    "EmptyOutput": {
+      "Description": "An empty output. You may delete this if you have at least one resource above.",
+      "Value": ""
+    }
+  }
+}

amplify/backend/api/b4hGraphQL/transform.conf.json

@@ -0,0 +1,4 @@
+{
+    "Version": 5,
+    "ElasticsearchWarning": true
+}

amplify/backend/backend-config.json

@@ -79,6 +79,30 @@
           ]
         }
       ]
+    },
+    "b4hGraphQL": {
+      "service": "AppSync",
+      "providerPlugin": "awscloudformation",
+      "dependsOn": [
+        {
+          "category": "auth",
+          "resourceName": "basics4health41656259",
+          "attributes": [
+            "UserPoolId"
+          ]
+        }
+      ],
+      "output": {
+        "authConfig": {
+          "defaultAuthentication": {
+            "authenticationType": "AMAZON_COGNITO_USER_POOLS",
+            "userPoolConfig": {
+              "userPoolId": "authbasics4health41656259"
+            }
+          },
+          "additionalAuthenticationProviders": []
+        }
+      }
     }
   },
   "storage": {
@@ -102,5 +126,6 @@
         }
       ]
     }
-  }
+  },
+  "custom": {}
 }

amplify/backend/storage/b4hstorage/cli-inputs.json

@@ -4,8 +4,9 @@
   "bucketName": "basics4health",
   "storageAccess": "auth",
   "guestAccess": [],
-  "authAccess": [],
-  "triggerFunction": "NONE",
+  "authAccess": [
+    "READ"
+  ],
   "groupAccess": {
     "Admins": [
       "CREATE_AND_UPDATE",

amplify/backend/types/amplify-dependent-resources-ref.d.ts

@@ -26,6 +26,10 @@ export type AmplifyDependentResourcesAttributes = {
             "RootUrl": "string",
             "ApiName": "string",
             "ApiId": "string"
+        },
+        "b4hGraphQL": {
+            "GraphQLAPIIdOutput": "string",
+            "GraphQLAPIEndpointOutput": "string"
         }
     },
     "storage": {

src/App.js

@@ -15,11 +15,22 @@ Amplify.configure(awsExports);
 
 function App(props) {
   const client = props.client;
-  const [patient, setPatient] = useState();
+  const [patient, setPatient] = useState('');
+  const [loading, setLoading] = useState(true);
 
   useEffect(() => {
-    client.patient.read().then((patient) => setPatient(patient));
-  }, [client.patient]);
+    getPatient();
+  }, []);
+
+  async function getPatient() {
+    let pat = await client.patient.read();
+    setPatient(pat);
+    setLoading(false);
+  }
+
+  if (loading) {
+    return <span>Loading...</span>
+  }
 
   return (
     <>

src/Components/navbar.js

@@ -2,11 +2,13 @@ import { useState } from "react";
 import { AppBar, Toolbar, Button, Typography } from "@mui/material";
 import Sidebar from './sidebar';
 import { Auth } from 'aws-amplify';
+import { useNavigate } from 'react-router-dom';
 import { useEffect } from "react";
-// import AdminStatus from "../adminStatus";
+import AdminStatus from "../Helpers/adminStatus";
 
 export default function Navbar() {
     const [admin, setAdmin] = useState(false);
+    const navigate = useNavigate();
 
     useEffect(() => {
         welcomeUser();
@@ -21,21 +23,12 @@ export default function Navbar() {
 
     async function signOut() {
         await Auth.signOut();
+        navigate("/");
         window.location.reload();
     }
 
     async function isAdmin() {
-        let user = await Auth.currentAuthenticatedUser();
-        let group = user.signInUserSession.accessToken.payload['cognito:groups'];
-        if (group === undefined) {
-            setAdmin(false);
-        } else {
-            if (group.includes('Admins')) {
-                setAdmin(true);
-            }
-        }
-        // let adminStatus = await IsAdmin();
-        // setAdmin(await AdminStatus());
+        setAdmin(await AdminStatus());
     }
 
     return (