Skip to content

feat: migrate bookable resources to use the assets API (PPT-2176) #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrYuion wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

feat: migrate bookable resources to use the assets API (PPT-2176) #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f94d7d8
Reapply "feat: migrate bookable resources to use the assets API (PPT-…
MrYuion Dec 11, 2025
01180c8
Merge branch 'develop' into feat/migrate-resources-to-assets
MrYuion Dec 22, 2025
ff40e8e
chore: fix builds
MrYuion Dec 22, 2025
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
3 changes: 2 additions & 1 deletion apps/concierge/src/app/desks/desk-modal.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const CHARS = '0123456789ABCDEF';
<input
matInput
name="id"
formControlName="id"
[formControlName]="form.value.client_id ? 'client_id' : 'id'"
placeholder="desk-10.123"
/>
<mat-error>{{
Expand Down Expand Up @@ -271,6 +271,7 @@ export class DeskModalComponent implements OnInit {

public readonly form = new FormGroup({
id: new FormControl(``),
client_id: new FormControl(''),
name: new FormControl('', [Validators.required]),
map_id: new FormControl('', [Validators.required]),
groups: new FormControl<string[]>([]),
Expand Down
6 changes: 3 additions & 3 deletions apps/concierge/src/app/desks/desks-manage.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ const QR_CODES = {};
<ng-template #name_template let-row="row">
<button
class="flex flex-col px-4 py-2 text-left leading-tight"
(click)="copyToClipboard(row.map_id || row.id)"
(click)="copyToClipboard(row.client_id || row.map_id || row.id)"
>
<div>{{ row.id || row.map_id }}</div>
@if (row.id && row.map_id !== row.id) {
<div>{{ row.client_id || row.id || row.map_id }}</div>
@if (row.map_id && row.map_id !== (row.client_id || row.id)) {
<div class="font-mono text-[0.625rem] opacity-30">
{{ row.map_id }}
</div>
Expand Down
Loading
Loading