chore(admin-ui): Fix build errors due to bad imports

packages/admin-ui/src/lib/catalog/src/catalog.module.ts

@@ -6,9 +6,9 @@ import {
     detailComponentWithResolver,
     GetProductVariantDetailDocument,
     PageService,
+    PageBlockComponent,
     SharedModule,
 } from '@vendure/admin-ui/core';
-import { PageBlockComponent } from '../../core/src/shared/components/page-block/page-block.component';
 
 import { createRoutes } from './catalog.routes';
 import { ApplyFacetDialogComponent } from './components/apply-facet-dialog/apply-facet-dialog.component';
@@ -206,7 +206,9 @@ export class CatalogModule {
     standalone: true,
     selector: 'vdr-custom-stock-control',
     imports: [SharedModule],
-    template: `<vdr-page-block>Stock control!</vdr-page-block> `,
+    template: `
+        <vdr-page-block>Stock control!</vdr-page-block>
+    `,
 })
 export class StockControlComponent {
     // component logic

packages/admin-ui/src/lib/catalog/src/catalog.routes.ts

@@ -8,10 +8,10 @@ import {
     detailBreadcrumb,
     FacetWithValuesFragment,
     GetProductWithVariantsQuery,
+    PageComponent,
+    PageService,
 } from '@vendure/admin-ui/core';
 import { map } from 'rxjs/operators';
-import { PageService } from '../../core/src/providers/page/page.service';
-import { PageComponent } from '../../core/src/shared/components/page/page.component';
 
 import { AssetDetailComponent } from './components/asset-detail/asset-detail.component';
 import { FacetDetailComponent } from './components/facet-detail/facet-detail.component';

packages/admin-ui/src/lib/catalog/src/components/product-detail2/product-detail.component.ts

@@ -3,6 +3,7 @@ import { FormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import {
+    Asset,
     BaseDetailComponent,
     CreateProductInput,
     createUpdatedTranslatable,
@@ -44,7 +45,10 @@ import { ApplyFacetDialogComponent } from '../apply-facet-dialog/apply-facet-dia
 import { AssignProductsToChannelDialogComponent } from '../assign-products-to-channel-dialog/assign-products-to-channel-dialog.component';
 import { CreateProductVariantsConfig } from '../generate-product-variants/generate-product-variants.component';
 
-import { SelectedAssets } from './product-detail.types';
+interface SelectedAssets {
+    assets?: Asset[];
+    featuredAsset?: Asset;
+}
 
 @Component({
     selector: 'vdr-product-detail2',

packages/admin-ui/src/lib/catalog/src/components/product-detail2/product-detail.types.ts

@@ -1,6 +0,0 @@
-import { Asset } from '@vendure/admin-ui/core';
-
-export interface SelectedAssets {
-    assets?: Asset[];
-    featuredAsset?: Asset;
-}

packages/admin-ui/src/lib/catalog/src/components/product-variant-detail/product-variant-detail.component.ts

@@ -1,8 +1,8 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
-import { ProductDetailService } from '@vendure/admin-ui/catalog';
 import {
+    Asset,
     BaseDetailComponent,
     DataService,
     findTranslation,
@@ -21,9 +21,14 @@ import {
 } from '@vendure/admin-ui/core';
 import { Observable } from 'rxjs';
 import { map, shareReplay, takeUntil } from 'rxjs/operators';
-import { SelectedAssets } from '../product-detail2/product-detail.types';
+import { ProductDetailService } from '../../providers/product-detail/product-detail.service';
 
-export interface VariantFormValue {
+interface SelectedAssets {
+    assets?: Asset[];
+    featuredAsset?: Asset;
+}
+
+interface VariantFormValue {
     id: string;
     enabled: boolean;
     sku: string;

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

@@ -29,11 +29,16 @@ export * from './components/move-collections-dialog/move-collections-dialog.comp
 export * from './components/option-value-input/option-value-input.component';
 export * from './components/product-detail/product-detail.component';
 export * from './components/product-detail/product-detail.types';
+export * from './components/product-detail2/product-detail.component';
 export * from './components/product-list/product-list-bulk-actions';
 export * from './components/product-list/product-list.component';
+export * from './components/product-list/product-list.graphql';
 export * from './components/product-options-editor/product-options-editor.component';
+export * from './components/product-variant-detail/product-variant-detail.component';
+export * from './components/product-variant-detail/product-variant-detail.graphql';
 export * from './components/product-variant-list/product-list-bulk-actions';
 export * from './components/product-variant-list/product-variant-list.component';
+export * from './components/product-variant-list/product-variant-list.graphql';
 export * from './components/product-variants-editor/product-variants-editor.component';
 export * from './components/product-variants-list/product-variants-list.component';
 export * from './components/product-variants-table/product-variants-table.component';

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

@@ -119,6 +119,7 @@ export * from './shared/components/asset-preview-dialog/asset-preview-dialog.com
 export * from './shared/components/asset-preview-links/asset-preview-links.component';
 export * from './shared/components/asset-search-input/asset-search-input.component';
 export * from './shared/components/bulk-action-menu/bulk-action-menu.component';
+export * from './shared/components/card/card.component';
 export * from './shared/components/channel-assignment-control/channel-assignment-control.component';
 export * from './shared/components/channel-badge/channel-badge.component';
 export * from './shared/components/chip/chip.component';
@@ -130,10 +131,12 @@ export * from './shared/components/customer-label/customer-label.component';
 export * from './shared/components/data-table/data-table-column.component';
 export * from './shared/components/data-table/data-table.component';
 export * from './shared/components/data-table-2/data-table-column.component';
+export * from './shared/components/data-table-2/data-table-custom-field-column.component';
 export * from './shared/components/data-table-2/data-table-search.component';
 export * from './shared/components/data-table-2/data-table2.component';
 export * from './shared/components/data-table-column-picker/data-table-column-picker.component';
 export * from './shared/components/data-table-filter-label/data-table-filter-label.component';
+export * from './shared/components/data-table-filters/custom-filter-component.directive';
 export * from './shared/components/data-table-filters/data-table-filters.component';
 export * from './shared/components/datetime-picker/constants';
 export * from './shared/components/datetime-picker/datetime-picker.component';
@@ -162,6 +165,7 @@ export * from './shared/components/history-entry-detail/history-entry-detail.com
 export * from './shared/components/items-per-page-controls/items-per-page-controls.component';
 export * from './shared/components/labeled-data/labeled-data.component';
 export * from './shared/components/language-selector/language-selector.component';
+export * from './shared/components/localized-text/localized-text.component';
 export * from './shared/components/manage-tags-dialog/manage-tags-dialog.component';
 export * from './shared/components/modal-dialog/dialog-buttons.directive';
 export * from './shared/components/modal-dialog/dialog-component-outlet.component';
@@ -170,13 +174,18 @@ export * from './shared/components/modal-dialog/modal-dialog.component';
 export * from './shared/components/object-tree/object-tree.component';
 export * from './shared/components/order-state-label/order-state-label.component';
 export * from './shared/components/page/page.component';
+export * from './shared/components/page-block/page-block.component';
 export * from './shared/components/page-body/page-body.component';
+export * from './shared/components/page-detail-layout/page-detail-layout.component';
+export * from './shared/components/page-detail-layout/page-detail-sidebar.component';
+export * from './shared/components/page-entity-info/page-entity-info.component';
 export * from './shared/components/page-header/page-header.component';
 export * from './shared/components/page-header-description/page-header-description.component';
 export * from './shared/components/page-header-tabs/page-header-tabs.component';
 export * from './shared/components/page-title/page-title.component';
 export * from './shared/components/pagination-controls/pagination-controls.component';
 export * from './shared/components/product-multi-selector-dialog/product-multi-selector-dialog.component';
+export * from './shared/components/product-multi-selector-dialog/product-multi-selector-dialog.graphql';
 export * from './shared/components/product-search-input/product-search-input.component';
 export * from './shared/components/product-variant-selector/product-variant-selector.component';
 export * from './shared/components/radio-card/radio-card-fieldset.component';

packages/admin-ui/src/lib/core/src/shared/components/data-table-2/data-table-custom-field-column.component.ts

@@ -1,8 +1,9 @@
 import { Component, ContentChild, Input, OnInit, TemplateRef, ViewChild } from '@angular/core';
-import { DataService, DataTableSortCollection, LanguageCode } from '@vendure/admin-ui/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { CustomFieldConfig } from '../../../common/generated-types';
+import { CustomFieldConfig, LanguageCode } from '../../../common/generated-types';
+import { DataService } from '../../../data/providers/data.service';
+import { DataTableSortCollection } from '../../../providers/data-table/data-table-sort-collection';
 import { DataTable2ColumnComponent } from './data-table-column.component';
 
 @Component({

packages/admin-ui/src/lib/core/src/shared/components/data-table-2/data-table2.component.ts

@@ -15,17 +15,14 @@ import {
     SimpleChanges,
     TemplateRef,
 } from '@angular/core';
-import {
-    BulkActionMenuComponent,
-    DataService,
-    DataTableConfig,
-    LanguageCode,
-    LocalStorageService,
-} from '@vendure/admin-ui/core';
 import { PaginationService } from 'ngx-pagination';
 import { Observable, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { LanguageCode } from '../../../common/generated-types';
+import { DataService } from '../../../data/providers/data.service';
 import { DataTableFilterCollection } from '../../../providers/data-table/data-table-filter-collection';
+import { DataTableConfig, LocalStorageService } from '../../../providers/local-storage/local-storage.service';
+import { BulkActionMenuComponent } from '../bulk-action-menu/bulk-action-menu.component';
 
 import { DataTable2ColumnComponent } from './data-table-column.component';
 import { DataTableCustomFieldColumnComponent } from './data-table-custom-field-column.component';

packages/admin-ui/src/lib/core/src/shared/components/localized-text/localized-text.component.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { DataService } from '@vendure/admin-ui/core';
 import { Observable } from 'rxjs';
 import { LanguageCode, LocalizedString } from '../../../common/generated-types';
+import { DataService } from '../../../data/providers/data.service';
 
 @Component({
     selector: 'vdr-localized-text',

packages/admin-ui/src/lib/core/src/shared/components/product-multi-selector-dialog/product-multi-selector-dialog.graphql.ts

@@ -1,5 +1,5 @@
-import { ASSET_FRAGMENT } from '@vendure/admin-ui/core';
 import { gql } from 'apollo-angular';
+import { ASSET_FRAGMENT } from '../../../data/definitions/product-definitions';
 
 export const GET_PRODUCT_VARIANTS_FOR_MULTI_SELECTOR = gql`
     query GetProductVariantsForMultiSelector($options: ProductVariantListOptions!) {

packages/admin-ui/src/lib/customer/src/components/customer-group-member-list/customer-group-member-list-bulk-actions.ts

@@ -6,7 +6,10 @@ import {
     NotificationService,
     Permission,
 } from '@vendure/admin-ui/core';
-import { CustomerGroupMember, CustomerGroupMemberListComponent } from '@vendure/admin-ui/customer';
+import {
+    CustomerGroupMember,
+    CustomerGroupMemberListComponent,
+} from './customer-group-member-list.component';
 
 export const removeCustomerGroupMembersBulkAction: BulkAction<
     CustomerGroupMember,

packages/admin-ui/src/lib/settings/src/components/test-shipping-methods/test-shipping-methods.component.ts

@@ -5,9 +5,10 @@ import {
     ShippingMethodQuote,
     TestEligibleShippingMethodsInput,
 } from '@vendure/admin-ui/core';
-import { TestAddress, TestOrderLine } from '@vendure/admin-ui/settings';
 import { Observable, Subject } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
+import { TestAddress } from '../test-address-form/test-address-form.component';
+import { TestOrderLine } from '../test-order-builder/test-order-builder.component';
 
 @Component({
     selector: 'vdr-test-shipping-methods',

packages/admin-ui/src/lib/settings/src/components/zone-member-list/zone-member-list-bulk-actions.ts

@@ -1,6 +1,6 @@
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { BulkAction, DataService, NotificationService, Permission } from '@vendure/admin-ui/core';
-import { ZoneMember, ZoneMemberListComponent } from '@vendure/admin-ui/settings';
+import { ZoneMember, ZoneMemberListComponent } from './zone-member-list.component';
 
 export const removeZoneMembersBulkAction: BulkAction<ZoneMember, ZoneMemberListComponent> = {
     location: 'zone-members-list',

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

@@ -34,6 +34,7 @@ export * from './components/tax-rate-list/tax-rate-list-bulk-actions';
 export * from './components/tax-rate-list/tax-rate-list.component';
 export * from './components/test-address-form/test-address-form.component';
 export * from './components/test-order-builder/test-order-builder.component';
+export * from './components/test-shipping-methods/test-shipping-methods.component';
 export * from './components/zone-detail-dialog/zone-detail-dialog.component';
 export * from './components/zone-list/zone-list-bulk-actions';
 export * from './components/zone-list/zone-list.component';

packages/admin-ui/src/lib/static/styles/global/_clarity.scss

@@ -26,7 +26,7 @@
 @import '@clr/ui/src/popover/common/popover.clarity';
 
 // Smart Popover
-@import './popover/popover-popover.clarity';
+//@import './popover/popover-popover.clarity';
 
 //Buttons
 //@import '@clr/ui/src/button/buttons.clarity'; // depends on variables.clarity, mixins.clarity, color.clarity