Skip to content

Commit

Permalink
Merge branch 'master' into feature/25317-navbar-logo-separate-links
Browse files Browse the repository at this point in the history
  • Loading branch information
KarolNet authored Sep 25, 2024
2 parents a454a2f + ce8c5df commit 584861f
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 16 deletions.
77 changes: 61 additions & 16 deletions docs/API/content-type/listing-co.md
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ Filters can accept the following filter types:
- empty
- notEmpty
- overlaps
- includes

You can check the example for each filter usage below:

Expand Down Expand Up @@ -954,59 +955,103 @@ You can check the example for each filter usage below:

Example:

`filters={"gelery[*].dataUrl":{"type":"overlaps","filter":["/api/v1/content/_media/_media-4a8d1dea-bcb4-4862-a2b8-53ff3d13ce6d","/api/v1/content/_media/_media-ca82f862-75f4-4e3d-a504-d0db7d05b1ba"]}}`
`filters={"gallery[*].dataUrl":{"type":"overlaps","filter":["/api/v1/content/_media/_media-1","/api/v1/content/_media/_media-2"]}}`

Will return:

```
[
{
"id":"1-id"
"gelery":[
"gallery":[
{
"type": "internal",
"dataUrl":"/api/v1/content/_media/_media-4a8d1dea-bcb4-4862-a2b8-53ff3d13ce6d"
"dataUrl":"/api/v1/content/_media/_media-1"
},
{
"type": "internal",
"dataUrl":"/api/v1/content/_media/_media-ca82f862-75f4-4e3d-a504-d0db7d05b1ba"
"dataUrl":"/api/v1/content/_media/_media-2"
},
{
"type": "internal",
"dataUrl":"/api/v1/content/_media/_media-ca82f862-75f4-4e3d-a504-f0ebff3bacd1"
"dataUrl":"/api/v1/content/_media/_media-3"
},
]
},
{
"id":"2-id"
"gelery":[
"gallery":[
{
"type": "internal",
"dataUrl":"/api/v1/content/_media/_media-4a8d1dea-bcb4-4862-a2b8-53ff3d13ce6d"
"dataUrl":"/api/v1/content/_media/_media-1"
},
{
"type": "internal",
"dataUrl":"/api/v1/content/_media/_media-ca82f862-75f4-4dd2-a504-d0db7d05b1ba"
"dataUrl":"/api/v1/content/_media/_media-4"
},
]
}
]
```
{ data-search-exclude }

Will not return:
```
[
{
"id":"4-id"
"gallery":[
{
"type": "internal",
"dataUrl":"/api/v1/content/_media/_media-3"
},
]
},
]
```
{ data-search-exclude }

=== "includes"
Object parameter must fully match a list item from the filter array. This filter is optimized for list-based searching and is significantly faster than `contains`, which performs a more general full-text search with `%term%`.

Can only be used with array parameters.

Example:

`filters={"products[*].dataUrl":{"type":"includes","filter":"/api/v1/content/_media/_media-1"}}`

Will return:

```
[
{
"id":"3-id"
"gelery":[
"id":"1-id"
"gallery":[
{
"type": "internal",
"dataUrl":"/api/v1/content/_media/_media-4a8d1dea-bcb4-4862-a2b8-53ff3d13ce6d"
"dataUrl":"/api/v1/content/_media/_media-1"
},
{
"type": "internal",
"dataUrl":"/api/v1/content/_media/_media-ca82f862-75f4-4e3d-a504-d0db7d05b1ba"
"dataUrl":"/api/v1/content/_media/_media-2"
},
{
"type": "internal",
"dataUrl":"/api/v1/content/_media/_media-ca82f862-75f4-4ffd-a504-cc0dff3bacd1"
"dataUrl":"/api/v1/content/_media/_media-3"
},
]
},
{
"id":"2-id"
"gallery":[
{
"type": "internal",
"dataUrl":"/api/v1/content/_media/_media-1"
}
]
},
]
```
{ data-search-exclude }
Expand All @@ -1016,11 +1061,11 @@ You can check the example for each filter usage below:
```
[
{
"id":"4-id"
"gelery":[
"id":"3-id"
"gallery":[
{
"type": "internal",
"dataUrl":"/api/v1/content/_media/_media-ca82f862-75f4-4e3d-a504-f0ebff3bacd1"
"dataUrl":"/api/v1/content/_media/_media-2"
},
]
},
Expand Down
Binary file added docs/panel/images/BillingInfo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/panel/images/UsersMenu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/panel/images/spaces/SpaceEdit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/panel/images/spaces/SpacesAndUsage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions docs/panel/spaces.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,11 @@ If a user is assigned to a Space, there are ways to manage their access to space
To display the user list, navigate to the `Users` tab in the Organization management view.

![Users in Organization](images/UserList.png){: .border}

## Managing subscriptions

After each billing cycle an invoice is generated and available for download for Administrators.

To manage subscriptions or download invoices go to organization settings and open `Billing info` page.

![Billing info](images/BillingInfo.png){: .border}

0 comments on commit 584861f

Please sign in to comment.