fix(core): Remove "Placeholder" from Permission enum

vendure-ecommerce · Jun 10, 2021 · eabfe77 · eabfe77
1 parent 31a45c6
commit eabfe77
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 88 deletions.
diff --git a/packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts b/packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts
@@ -2695,7 +2695,6 @@ export enum DeletionResult {
  * @docsCategory common
  */
 export enum Permission {
-  Placeholder = 'Placeholder',
   /** Authenticated means simply that the user is logged in */
   Authenticated = 'Authenticated',
   /** SuperAdmin has unrestricted access to all operations */

diff --git a/packages/common/src/generated-shop-types.ts b/packages/common/src/generated-shop-types.ts
@@ -501,7 +501,6 @@ export enum DeletionResult {
  * @docsCategory common
  */
 export enum Permission {
-  Placeholder = 'Placeholder',
   /** Authenticated means simply that the user is logged in */
   Authenticated = 'Authenticated',
   /** SuperAdmin has unrestricted access to all operations */
@@ -2793,44 +2792,6 @@ export type AuthenticationResult = CurrentUser | InvalidCredentialsError | NotVe
 
 export type ActiveOrderResult = Order | NoActiveOrderError;
 
-export type CollectionFilterParameter = {
-  createdAt?: Maybe<DateOperators>;
-  updatedAt?: Maybe<DateOperators>;
-  languageCode?: Maybe<StringOperators>;
-  name?: Maybe<StringOperators>;
-  slug?: Maybe<StringOperators>;
-  position?: Maybe<NumberOperators>;
-  description?: Maybe<StringOperators>;
-};
-
-export type CollectionSortParameter = {
-  id?: Maybe<SortOrder>;
-  createdAt?: Maybe<SortOrder>;
-  updatedAt?: Maybe<SortOrder>;
-  name?: Maybe<SortOrder>;
-  slug?: Maybe<SortOrder>;
-  position?: Maybe<SortOrder>;
-  description?: Maybe<SortOrder>;
-};
-
-export type ProductFilterParameter = {
-  createdAt?: Maybe<DateOperators>;
-  updatedAt?: Maybe<DateOperators>;
-  languageCode?: Maybe<StringOperators>;
-  name?: Maybe<StringOperators>;
-  slug?: Maybe<StringOperators>;
-  description?: Maybe<StringOperators>;
-};
-
-export type ProductSortParameter = {
-  id?: Maybe<SortOrder>;
-  createdAt?: Maybe<SortOrder>;
-  updatedAt?: Maybe<SortOrder>;
-  name?: Maybe<SortOrder>;
-  slug?: Maybe<SortOrder>;
-  description?: Maybe<SortOrder>;
-};
-
 export type ProductVariantFilterParameter = {
   createdAt?: Maybe<DateOperators>;
   updatedAt?: Maybe<DateOperators>;
@@ -2921,6 +2882,44 @@ export type HistoryEntrySortParameter = {
   updatedAt?: Maybe<SortOrder>;
 };
 
+export type CollectionFilterParameter = {
+  createdAt?: Maybe<DateOperators>;
+  updatedAt?: Maybe<DateOperators>;
+  languageCode?: Maybe<StringOperators>;
+  name?: Maybe<StringOperators>;
+  slug?: Maybe<StringOperators>;
+  position?: Maybe<NumberOperators>;
+  description?: Maybe<StringOperators>;
+};
+
+export type CollectionSortParameter = {
+  id?: Maybe<SortOrder>;
+  createdAt?: Maybe<SortOrder>;
+  updatedAt?: Maybe<SortOrder>;
+  name?: Maybe<SortOrder>;
+  slug?: Maybe<SortOrder>;
+  position?: Maybe<SortOrder>;
+  description?: Maybe<SortOrder>;
+};
+
+export type ProductFilterParameter = {
+  createdAt?: Maybe<DateOperators>;
+  updatedAt?: Maybe<DateOperators>;
+  languageCode?: Maybe<StringOperators>;
+  name?: Maybe<StringOperators>;
+  slug?: Maybe<StringOperators>;
+  description?: Maybe<StringOperators>;
+};
+
+export type ProductSortParameter = {
+  id?: Maybe<SortOrder>;
+  createdAt?: Maybe<SortOrder>;
+  updatedAt?: Maybe<SortOrder>;
+  name?: Maybe<SortOrder>;
+  slug?: Maybe<SortOrder>;
+  description?: Maybe<SortOrder>;
+};
+
 export type NativeAuthInput = {
   username: Scalars['String'];
   password: Scalars['String'];

diff --git a/packages/common/src/generated-types.ts b/packages/common/src/generated-types.ts
@@ -2767,7 +2767,6 @@ export enum DeletionResult {
  * @docsCategory common
  */
 export enum Permission {
-  Placeholder = 'Placeholder',
   /** Authenticated means simply that the user is logged in */
   Authenticated = 'Authenticated',
   /** SuperAdmin has unrestricted access to all operations */

diff --git a/packages/core/e2e/graphql/generated-e2e-admin-types.ts b/packages/core/e2e/graphql/generated-e2e-admin-types.ts
@@ -2695,7 +2695,6 @@ export enum DeletionResult {
  * @docsCategory common
  */
 export enum Permission {
-  Placeholder = 'Placeholder',
   /** Authenticated means simply that the user is logged in */
   Authenticated = 'Authenticated',
   /** SuperAdmin has unrestricted access to all operations */

diff --git a/packages/core/e2e/graphql/generated-e2e-shop-types.ts b/packages/core/e2e/graphql/generated-e2e-shop-types.ts
@@ -487,7 +487,6 @@ export enum DeletionResult {
  * @docsCategory common
  */
 export enum Permission {
-  Placeholder = 'Placeholder',
   /** Authenticated means simply that the user is logged in */
   Authenticated = 'Authenticated',
   /** SuperAdmin has unrestricted access to all operations */
@@ -2677,44 +2676,6 @@ export type AuthenticationResult = CurrentUser | InvalidCredentialsError | NotVe
 
 export type ActiveOrderResult = Order | NoActiveOrderError;
 
-export type CollectionFilterParameter = {
-  createdAt?: Maybe<DateOperators>;
-  updatedAt?: Maybe<DateOperators>;
-  languageCode?: Maybe<StringOperators>;
-  name?: Maybe<StringOperators>;
-  slug?: Maybe<StringOperators>;
-  position?: Maybe<NumberOperators>;
-  description?: Maybe<StringOperators>;
-};
-
-export type CollectionSortParameter = {
-  id?: Maybe<SortOrder>;
-  createdAt?: Maybe<SortOrder>;
-  updatedAt?: Maybe<SortOrder>;
-  name?: Maybe<SortOrder>;
-  slug?: Maybe<SortOrder>;
-  position?: Maybe<SortOrder>;
-  description?: Maybe<SortOrder>;
-};
-
-export type ProductFilterParameter = {
-  createdAt?: Maybe<DateOperators>;
-  updatedAt?: Maybe<DateOperators>;
-  languageCode?: Maybe<StringOperators>;
-  name?: Maybe<StringOperators>;
-  slug?: Maybe<StringOperators>;
-  description?: Maybe<StringOperators>;
-};
-
-export type ProductSortParameter = {
-  id?: Maybe<SortOrder>;
-  createdAt?: Maybe<SortOrder>;
-  updatedAt?: Maybe<SortOrder>;
-  name?: Maybe<SortOrder>;
-  slug?: Maybe<SortOrder>;
-  description?: Maybe<SortOrder>;
-};
-
 export type ProductVariantFilterParameter = {
   createdAt?: Maybe<DateOperators>;
   updatedAt?: Maybe<DateOperators>;
@@ -2805,6 +2766,44 @@ export type HistoryEntrySortParameter = {
   updatedAt?: Maybe<SortOrder>;
 };
 
+export type CollectionFilterParameter = {
+  createdAt?: Maybe<DateOperators>;
+  updatedAt?: Maybe<DateOperators>;
+  languageCode?: Maybe<StringOperators>;
+  name?: Maybe<StringOperators>;
+  slug?: Maybe<StringOperators>;
+  position?: Maybe<NumberOperators>;
+  description?: Maybe<StringOperators>;
+};
+
+export type CollectionSortParameter = {
+  id?: Maybe<SortOrder>;
+  createdAt?: Maybe<SortOrder>;
+  updatedAt?: Maybe<SortOrder>;
+  name?: Maybe<SortOrder>;
+  slug?: Maybe<SortOrder>;
+  position?: Maybe<SortOrder>;
+  description?: Maybe<SortOrder>;
+};
+
+export type ProductFilterParameter = {
+  createdAt?: Maybe<DateOperators>;
+  updatedAt?: Maybe<DateOperators>;
+  languageCode?: Maybe<StringOperators>;
+  name?: Maybe<StringOperators>;
+  slug?: Maybe<StringOperators>;
+  description?: Maybe<StringOperators>;
+};
+
+export type ProductSortParameter = {
+  id?: Maybe<SortOrder>;
+  createdAt?: Maybe<SortOrder>;
+  updatedAt?: Maybe<SortOrder>;
+  name?: Maybe<SortOrder>;
+  slug?: Maybe<SortOrder>;
+  description?: Maybe<SortOrder>;
+};
+
 export type NativeAuthInput = {
   username: Scalars['String'];
   password: Scalars['String'];

diff --git a/packages/core/src/api/config/configure-graphql-module.ts b/packages/core/src/api/config/configure-graphql-module.ts
@@ -141,7 +141,6 @@ async function createGraphQLOptions(
             .map(e => (typeof e.schema === 'function' ? e.schema() : e.schema))
             .filter(notNullOrUndefined)
             .forEach(documentNode => (schema = extendSchema(schema, documentNode)));
-        schema = generatePermissionEnum(schema, configService.authOptions.customPermissions);
         schema = generateListOptions(schema);
         schema = addGraphQLCustomFields(schema, customFields, apiType === 'shop');
         schema = addOrderLineCustomFieldsInput(schema, customFields.OrderLine || []);
@@ -155,6 +154,7 @@ async function createGraphQLOptions(
         if (apiType === 'shop') {
             schema = addRegisterCustomerCustomFieldsInput(schema, customFields.Customer || []);
         }
+        schema = generatePermissionEnum(schema, configService.authOptions.customPermissions);
 
         return schema;
     }

diff --git a/packages/core/src/api/schema/common/common-enums.graphql b/packages/core/src/api/schema/common/common-enums.graphql
@@ -17,9 +17,7 @@ enum DeletionResult {
 }
 
 # Populated at run-time
-enum Permission {
-    Placeholder
-}
+enum Permission
 
 enum SortOrder {
     ASC

diff --git a/packages/elasticsearch-plugin/e2e/graphql/generated-e2e-elasticsearch-plugin-types.ts b/packages/elasticsearch-plugin/e2e/graphql/generated-e2e-elasticsearch-plugin-types.ts
@@ -2695,7 +2695,6 @@ export enum DeletionResult {
  * @docsCategory common
  */
 export enum Permission {
-  Placeholder = 'Placeholder',
   /** Authenticated means simply that the user is logged in */
   Authenticated = 'Authenticated',
   /** SuperAdmin has unrestricted access to all operations */

diff --git a/schema-admin.json b/schema-admin.json
diff --git a/schema-shop.json b/schema-shop.json