diff --git a/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.html b/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.html index 57b71f0ad4..66b4c094da 100644 --- a/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.html +++ b/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.html @@ -33,6 +33,18 @@
+ + + + + + diff --git a/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.scss b/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.scss index e69de29bb2..6691ea8a79 100644 --- a/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.scss +++ b/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.scss @@ -0,0 +1,3 @@ +.visible-toggle { + margin-top: -3px !important; +} diff --git a/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.ts b/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.ts index 1b4c0c0664..5147e544fd 100644 --- a/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.ts +++ b/admin-ui/src/app/catalog/components/collection-detail/collection-detail.component.ts @@ -61,6 +61,7 @@ export class CollectionDetailComponent extends BaseDetailComponent ({ ...hash, [field.name]: '' }), {}), @@ -194,6 +195,7 @@ export class CollectionDetailComponent extends BaseDetailComponent this.addFilter(f)); @@ -238,6 +240,7 @@ export class CollectionDetailComponent extends BaseDetailComponent {{ collection.name }}
-
- -
+
+ {{ 'catalog.private' | translate }} {{ 'catalog.view-contents' | translate }} diff --git a/admin-ui/src/app/catalog/providers/routing/collection-resolver.ts b/admin-ui/src/app/catalog/providers/routing/collection-resolver.ts index c18eb44e1d..99423fd49f 100644 --- a/admin-ui/src/app/catalog/providers/routing/collection-resolver.ts +++ b/admin-ui/src/app/catalog/providers/routing/collection-resolver.ts @@ -14,6 +14,7 @@ export class CollectionResolver extends BaseEntityResolver id: '', languageCode: getDefaultLanguage(), name: '', + isPrivate: false, description: '', featuredAsset: null, assets: [], diff --git a/admin-ui/src/app/data/definitions/collection-definitions.ts b/admin-ui/src/app/data/definitions/collection-definitions.ts index e2c1d8af76..b32406207e 100644 --- a/admin-ui/src/app/data/definitions/collection-definitions.ts +++ b/admin-ui/src/app/data/definitions/collection-definitions.ts @@ -17,6 +17,7 @@ export const COLLECTION_FRAGMENT = gql` id name description + isPrivate languageCode featuredAsset { ...Asset @@ -53,6 +54,7 @@ export const GET_COLLECTION_LIST = gql` id name description + isPrivate featuredAsset { ...Asset } diff --git a/admin-ui/src/app/data/providers/collection-data.service.ts b/admin-ui/src/app/data/providers/collection-data.service.ts index 0b7ad0ebbd..c0266446dd 100644 --- a/admin-ui/src/app/data/providers/collection-data.service.ts +++ b/admin-ui/src/app/data/providers/collection-data.service.ts @@ -76,6 +76,7 @@ export class CollectionDataService { { input: pick(input, [ 'id', + 'isPrivate', 'translations', 'assetIds', 'featuredAssetId', diff --git a/admin-ui/src/i18n-messages/en.json b/admin-ui/src/i18n-messages/en.json index 2c222641b3..b8f51d82d9 100644 --- a/admin-ui/src/i18n-messages/en.json +++ b/admin-ui/src/i18n-messages/en.json @@ -64,9 +64,11 @@ "price": "Price", "price-includes-tax-at": "Price includes tax at { rate }%", "price-with-tax-in-default-zone": "Price with { rate }% tax: { price }", + "private": "Private", "product-details": "Product details", "product-name": "Product name", "product-variants": "Product variants", + "public": "Public", "remove-asset": "Remove asset", "search-asset-name": "Search assets by name", "search-product-name-or-code": "Search by product name or code", @@ -81,7 +83,8 @@ "truncated-options-count": "{count} further {count, plural, one {option} other {options}}", "upload-assets": "Upload assets", "values": "Values", - "view-contents": "View contents" + "view-contents": "View contents", + "visibility": "Visibility" }, "common": { "ID": "ID",