From 6824411684b1793fda470b777f944eb2c974d752 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 17 Sep 2020 14:45:40 +0200
Subject: [PATCH] feat(catalog/gql): fixing some of the feedback from PR and
 updating namings

---
 plugins/catalog-graphql/README.md     |  2 +-
 plugins/catalog-graphql/src/schema.js | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/plugins/catalog-graphql/README.md b/plugins/catalog-graphql/README.md
index cec3204c52..911d4a401c 100644
--- a/plugins/catalog-graphql/README.md
+++ b/plugins/catalog-graphql/README.md
@@ -6,6 +6,6 @@ This is the Catalog GraphQL plugin.
 
 It provides the `catalog` part of the GraphQL schema.
 
-To register it with the GraphQL backend, be sure to follow the [Gettting Started](../graphql/README.md#getting-started) guide of the GraphQL plugin.
+To register it with the GraphQL backend, be sure to follow the [Getting Started](../graphql/README.md#getting-started) guide of the GraphQL plugin.
 
 <!-- TODO: Need to make the GraphQL plugin compatible with non forked repos >
diff --git a/plugins/catalog-graphql/src/schema.js b/plugins/catalog-graphql/src/schema.js
index db667d62f0..509bce9f7b 100644
--- a/plugins/catalog-graphql/src/schema.js
+++ b/plugins/catalog-graphql/src/schema.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-const EntityMetadataFields = /* GraphQL */ `
+const metadataFields = /* GraphQL */ `
   name: String!
   annotations: JSONObject!
   annotation(name: String!): JSON
@@ -25,36 +25,32 @@ const EntityMetadataFields = /* GraphQL */ `
   generation: Int!
 `;
 
-const EntityMetadata = /* GraphQL */ `
+const schema = /* GraphQL */ `
   scalar JSON
   scalar JSONObject
   
   interface EntityMetadata {
-    ${EntityMetadataFields}
+    ${metadataFields}
   }
 
   type DefaultEntityMetadata implements EntityMetadata {
-    ${EntityMetadataFields}
+    ${metadataFields}
   }
 
   type ComponentMetadata implements EntityMetadata {
-    ${EntityMetadataFields}
+    ${metadataFields}
     # mock field to prove extensions working
     relationships: String
   }
 
   type TemplateMetadata implements EntityMetadata {
-    ${EntityMetadataFields}
+    ${metadataFields}
     # mock field to prove extensions working
     updatedBy: String
   }
-<<<<<<< HEAD
  
   # TODO: move this definition into plugin-scaffolder-graphql
-=======
-
->>>>>>> 94d28cb5c81798c80b32bf4fa8d834cb873ec06a
-  type TemplateEntitySpec {
+    type TemplateEntitySpec {
     type: String!
     path: String
     schema: JSONObject!
@@ -89,4 +85,4 @@ const EntityMetadata = /* GraphQL */ `
   }
 `;
 
-module.exports = EntityMetadata;
+export default schema;