Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ts/WoltLabSuite/Core/Api/GridViews/GetRow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,17 @@ type Response = {
export async function getRow(
gridViewClass: string,
objectId: string | number,
filters?: Map<string, string>,
gridViewParameters?: Map<string, string>,
): Promise<Response> {
const url = new URL(`${window.WSC_RPC_API_URL}core/grid-views/row`);
url.searchParams.set("gridView", gridViewClass);
url.searchParams.set("objectID", objectId.toString());
if (filters) {
filters.forEach((value, key) => {
url.searchParams.set(`filters[${key}]`, value);
});
}
if (gridViewParameters) {
gridViewParameters.forEach((value, key) => {
if (Array.isArray(value)) {
Expand Down
6 changes: 6 additions & 0 deletions ts/WoltLabSuite/Core/Api/ListViews/GetItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,17 @@ type Response = {
export async function getItem(
listViewClass: string,
objectId: string | number,
filters?: Map<string, string>,
listViewParameters?: Map<string, string>,
): Promise<Response> {
const url = new URL(`${window.WSC_RPC_API_URL}core/list-views/item`);
url.searchParams.set("listView", listViewClass);
url.searchParams.set("objectID", objectId.toString());
if (filters) {
filters.forEach((value, key) => {
url.searchParams.set(`filters[${key}]`, value);
});
}
if (listViewParameters) {
listViewParameters.forEach((value, key) => {
if (Array.isArray(value)) {
Expand Down
8 changes: 7 additions & 1 deletion ts/WoltLabSuite/Core/Component/GridView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,17 @@ export class GridView {
}

async #refreshRow(row: HTMLElement): Promise<void> {
const { template } = await getRow(this.#gridClassName, row.dataset.objectId!, this.#gridViewParameters);
const { template } = await getRow(
this.#gridClassName,
row.dataset.objectId!,
this.#state.getActiveFilters(),
this.#gridViewParameters,
);

row.replaceWith(DomUtil.createFragmentFromHtml(template));
this.#state.refreshSelection();
DomChangeListener.trigger();
this.#checkEmptyTable();
}

#initInteractions(): void {
Expand Down
8 changes: 7 additions & 1 deletion ts/WoltLabSuite/Core/Component/ListView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,16 @@ export class ListView {
}

async #refreshItem(item: HTMLElement): Promise<void> {
const { template } = await getItem(this.#viewClassName, item.dataset.objectId!, this.#listViewParameters);
const { template } = await getItem(
this.#viewClassName,
item.dataset.objectId!,
this.#state.getActiveFilters(),
this.#listViewParameters,
);
item.replaceWith(createFragmentFromHtml(template));
this.#state.refreshSelection();
triggerDomChange();
this.#checkEmptyList();
}

#initInteractions(): void {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
throw new PermissionDeniedException();
}

if ($parameters->filters !== []) {
$view->setActiveFilters($parameters->filters);
}

$view->setObjectIDFilter($parameters->objectID);

return new JsonResponse([
Expand All @@ -55,6 +59,8 @@ public function __construct(
/** @var non-empty-string */
public readonly string $gridView,
public readonly string|int $objectID,
/** @var string[] */
public readonly array $filters,
/** @var array<string, string|string[]> */
public readonly array $gridViewParameters,
) {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
throw new PermissionDeniedException();
}

if ($parameters->filters !== []) {
$view->setActiveFilters($parameters->filters);
}

$view->setObjectIDFilter($parameters->objectID);

return new JsonResponse([
Expand All @@ -55,6 +59,8 @@ public function __construct(
/** @var non-empty-string */
public readonly string $listView,
public readonly string|int $objectID,
/** @var string[] */
public readonly array $filters,
/** @var array<string, string|string[]> */
public readonly array $listViewParameters,
) {}
Expand Down