Merge branch 'develop' into custom/HIO687AS

# Conflicts:
#	shared/styles/application.scss

Author: MrYuion

apps/concierge/src/app/signage/signage-state.service.ts

@@ -23,6 +23,7 @@ import {
     removeSystem,
     SignageMedia,
     SignagePlaylist,
+    token,
     updateSignageMedia,
     updateSignagePlaylist,
     updateSignagePlaylistMedia,
@@ -45,6 +46,7 @@ import {
 } from 'rxjs/operators';
 
 import { MatDialog } from '@angular/material/dialog';
+import { SignedRequest } from '@placeos/cloud-uploads';
 import { openConfirmModal } from '@placeos/components';
 import { SignageApprovePlaylistModalComponent } from './signage-approve-playlist-modal.component';
 import { SignageDisplayModalComponent } from './signage-display-modal.component';
@@ -385,22 +387,26 @@ export class SignageStateService extends AsyncHandler {
             new Promise<{ id: string; link: string }>((resolve, reject) => {
                 let state = null;
                 let resolved = false;
+
                 this.subscription(
                     `upload-${id}`,
                     this._uploads.upload_list.subscribe(
                         (list) => {
-                            console.log('Upload List:', list);
-                            state = list.find(
-                                (s) => s.upload?.id === id || s.id,
-                            );
-                            if (state && state.link) {
+                            console.log('Upload List:', list, id);
+                            state = list.find((s) => id === s.id);
+                            if (
+                                state &&
+                                (state.link || state.progress >= 100)
+                            ) {
                                 resolved = true;
+                                const uid =
+                                    state.upload_id || state.upload?.id || id;
+                                const url = `/api/engine/v2/uploads/${encodeURIComponent(
+                                    uid,
+                                )}/url`;
                                 resolve({
-                                    id:
-                                        state.upload_id ||
-                                        state.upload?.id ||
-                                        id,
-                                    link: state.link,
+                                    id: uid,
+                                    link: state.link || url,
                                 });
                                 this.unsub(`upload-${id}`);
                             }
@@ -417,6 +423,7 @@ export class SignageStateService extends AsyncHandler {
             720,
         ).catch(() => null);
         const media_id = await this._uploads.uploadFileWithPermissions(file);
+        SignedRequest.setToken(token());
         const media = await uploadDetails(media_id);
         let thumbnail = null;
         if (thumbnail_image) {

apps/stagehand/src/app/alerts.component.ts

@@ -346,14 +346,14 @@ import { SidebarComponent } from './ui/sidebar.component';
                         </ng-template>
                         <ng-template #actions_template let-row="row">
                             <div class="flex space-x-2 p-2">
-                                {{ backoffice_link | json }}
                                 <a
                                     icon
                                     matRipple
                                     [href]="
                                         (backoffice_link() || '/backoffice/') +
                                         '#/systems/' +
-                                        row.location
+                                        row.location +
+                                        '/modules'
                                     "
                                     target="_blank"
                                     ref="noopener noreferrer"

apps/stagehand/src/app/remote-support.component.ts

@@ -371,7 +371,8 @@ function contains(str: string, substr: string) {
                                     [href]="
                                         (backoffice_link() || '/backoffice/') +
                                         '#/systems/' +
-                                        row.id
+                                        row.id +
+                                        '/modules'
                                     "
                                     target="_blank"
                                     ref="noopener noreferrer"
@@ -636,6 +637,7 @@ export class RemoteSupportComponent extends AsyncHandler implements OnInit {
     }
 
     public setNextBooking(space: Space, event: CalendarEvent) {
+        console.log('Next:', space, event);
         const current = this.next();
         if (!event && current[space.id]) {
             delete current[space.id];

libs/common/src/lib/uploads.service.ts

@@ -213,16 +213,14 @@ export class UploadsService extends AsyncHandler {
                         upload_details.upload_id = (
                             upload as any
                         )._request.upload_id;
-
                         console.log('Upload:', state, upload_list);
                         if (upload.access_url) {
-                            upload_details.link = !pub
-                                ? `${
-                                      location.origin
-                                  }/api/engine/v2/uploads/${encodeURIComponent(
-                                      upload_details.upload_id || upload.id,
-                                  )}/url`
-                                : upload.access_url;
+                            const local_url = `${
+                                location.origin
+                            }/api/engine/v2/uploads/${encodeURIComponent(
+                                upload_details.upload_id || upload.id,
+                            )}/url`;
+                            upload_details.link = local_url;
                         }
                         upload_details.progress = state.progress;
                         observer.next(upload_details);

libs/components/src/lib/binding.directive.ts

@@ -105,7 +105,7 @@ export class BindingDirective<T = any>
                     this.subscription(
                         'on_changes',
                         binding.bindThenSubscribe((value) => {
-                            if (value == null) return;
+                            // if (value == null) return;
                             setTimeout(() => {
                                 this._binding = false;
                                 this.clearTimeout('bound');

package-lock.json

@@ -73,7 +73,7 @@
         "@nx/playwright": "21.2.0",
         "@nx/web": "21.2.0",
         "@nx/workspace": "21.2.0",
-        "@placeos/cloud-uploads": "^1.0.6",
+        "@placeos/cloud-uploads": "^1.0.10",
         "@placeos/svg-viewer": "^1.0.5",
         "@placeos/ts-client": "^4.5.0",
         "@playwright/test": "^1.49.0",

package.json

@@ -36,10 +36,10 @@
     --neutral-content: hsl(0, 0%, 100%); /* White content on grey background */
 
     /* Base */
-    --base-100: oklch(98.4% 0.003 247.858); /* Near White */
-    --base-200: oklch(92.9% 0.013 255.508); /* Light Grey */
-    --base-300: oklch(86.9% 0.022 252.894); /* Mid Grey */
-    --base-400: oklch(55.4% 0.046 257.417); /* Mid Grey */
+    --base-100: hsl(0, 0%, 98.5%); /* Near White */
+    --base-200: hsl(49, 2%, 92%); /* Light Grey */
+    --base-300: hsl(56, 5%, 71%); /* Mid Grey */
+    --base-400: hsl(58, 7%, 55%); /* Mid Grey */
     --base-content: hsl(0, 0%, 0%); /* Black content on white background */
 
     /* Info */