fix(admin-ui): Fix import errors

packages/admin-ui/src/lib/core/src/data/data.module.ts

@@ -1,15 +1,14 @@
-import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 import { APP_INITIALIZER, Injector, NgModule } from '@angular/core';
 import { ApolloClientOptions, InMemoryCache } from '@apollo/client/core';
 import { setContext } from '@apollo/client/link/context';
 import { ApolloLink } from '@apollo/client/link/core';
-import { ApolloModule, APOLLO_OPTIONS } from 'apollo-angular';
+import { APOLLO_OPTIONS, ApolloModule } from 'apollo-angular';
 import createUploadLink from 'apollo-upload-client/createUploadLink.mjs';
 
 import { getAppConfig } from '../app.config';
 import { introspectionResult } from '../common/introspection-result-wrapper';
 import { LocalStorageService } from '../providers/local-storage/local-storage.service';
-import { AddCustomFieldsLink } from './add-custom-fields-link';
 
 import { CheckJobsLink } from './check-jobs-link';
 import { getClientDefaults } from './client-state/client-defaults';
@@ -47,13 +46,6 @@ export function createApollo(
                     },
                 },
             },
-            Query: {
-                fields: {
-                    products: {
-                        merge: (existing, incoming) => incoming,
-                    },
-                },
-            },
         },
     });
     apolloCache.writeQuery({
@@ -69,7 +61,6 @@ export function createApollo(
     return {
         link: ApolloLink.from([
             new OmitTypenameLink(),
-            // new AddCustomFieldsLink(injector.get(ServerConfigService)),
             new CheckJobsLink(injector),
             setContext(() => {
                 const headers: Record<string, string> = {};

packages/admin-ui/src/lib/core/src/data/query-result.ts

@@ -1,7 +1,7 @@
 import { ApolloQueryResult, NetworkStatus } from '@apollo/client/core';
 import { notNullOrUndefined } from '@vendure/common/lib/shared-utils';
 import { Apollo, QueryRef } from 'apollo-angular';
-import { DocumentNode } from 'graphql/index';
+import { DocumentNode } from 'graphql';
 import { merge, Observable, Subject, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, finalize, map, skip, take, takeUntil } from 'rxjs/operators';
 

packages/admin-ui/src/lib/core/src/public_api.ts

@@ -106,6 +106,7 @@ export * from './providers/custom-history-entry-component/history-entry-componen
 export * from './providers/custom-history-entry-component/history-entry-component.service';
 export * from './providers/dashboard-widget/dashboard-widget-types';
 export * from './providers/dashboard-widget/dashboard-widget.service';
+export * from './providers/data-table/data-table-config.service';
 export * from './providers/data-table/data-table-filter-collection';
 export * from './providers/data-table/data-table-filter';
 export * from './providers/data-table/data-table-sort-collection';

packages/core/src/api/common/custom-field-relation-resolver.service.ts

@@ -3,7 +3,6 @@ import { ID } from '@vendure/common/lib/shared-types';
 import { FindOptionsUtils } from 'typeorm/find-options/FindOptionsUtils';
 
 import { Translatable } from '../../common/types/locale-types';
-import { ConfigService } from '../../config/config.service';
 import { RelationCustomFieldConfig } from '../../config/custom-field/custom-field-types';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 import { VendureEntity } from '../../entity/base/base.entity';
@@ -24,7 +23,6 @@ export interface ResolveRelationConfig {
 export class CustomFieldRelationResolverService {
     constructor(
         private connection: TransactionalConnection,
-        private configService: ConfigService,
         private productPriceApplicator: ProductPriceApplicator,
         private translator: TranslatorService,
     ) {}