Merge pull request #450 from dfpc-coe/video-lease-papercuts

Video Lease Papercuts
dfpc-coe · Dec 17, 2024 · 12fe5ad · 12fe5ad
2 parents d27a857 + 440066b
commit 12fe5ad
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 44 deletions.
diff --git a/api/routes/video-lease.ts b/api/routes/video-lease.ts
@@ -153,6 +153,7 @@ export default async function router(schema: Schema, config: Config) {
             const lease = await videoControl.generate({
                 name: req.body.name,
                 ephemeral: req.body.ephemeral,
+                channel: req.body.channel,
                 expiration: req.body.permanent ? null : moment().add(req.body.duration, 'seconds').toISOString(),
                 path: req.body.path || randomUUID(),
                 username: user.email,

diff --git a/api/web/package-lock.json b/api/web/package-lock.json
diff --git a/api/web/src/components/Admin/Videos/AdminVideoTask.vue b/api/web/src/components/Admin/Videos/AdminVideoTask.vue
@@ -21,8 +21,8 @@
                 <div class='mx-2'>
                     Video Server
                     <span
-                        class='mx-2'
                         v-if='video'
+                        class='mx-2'
                         v-text='video.id'
                     />
                 </div>

diff --git a/api/web/src/components/CloudTAK/Menu/Videos.vue b/api/web/src/components/CloudTAK/Menu/Videos.vue
@@ -162,6 +162,11 @@
                                 style='margin-left: 42px;'
                                 class='subheader text-red'
                             >Expired Lease</span>
+                            <span
+                                v-else-if='l.expiration === null'
+                                style='margin-left: 42px;'
+                                class='subheader text-blue'
+                            >Permanent</span>
                             <span
                                 v-else
                                 style='margin-left: 42px;'

diff --git a/api/web/src/components/CloudTAK/Menu/Videos/VideoLeaseModal.vue b/api/web/src/components/CloudTAK/Menu/Videos/VideoLeaseModal.vue
@@ -164,6 +164,25 @@
                     </div>
                 </div>
 
+                <div class='col-12'>
+                    <label>Lease Expiration</label>
+
+                    <div class='col-12'>
+                        <span
+                            v-if='expired(editLease.expiration)'
+                            class='badge bg-red text-white mt-2'
+                        >Expired</span>
+                        <span
+                            v-else-if='editLease.expiration === null'
+                            class='badge bg-blue text-white mt-2'
+                        >Permanent</span>
+                        <CopyField
+                            v-else-if='editLease.expiration'
+                            :model-value='editLease.expiration'
+                        />
+                    </div>
+                </div>
+
                 <div class='col-12'>
                     <label
                         class='subheader mt-3 cursor-pointer'
@@ -184,20 +203,45 @@
 
                     <div
                         v-if='advanced'
-                        class='col-12'
+                        class='col-12 row'
                     >
-                        <!-- NOT SUPPORTED IN iTAK-->
-                        <TablerInput
-                            v-model='editLease.stream_user'
-                            :disabled='true'
-                            label='Stream Username'
-                        />
+                        <div
+                            class='alert alert-info'
+                            role='alert'
+                        >
+                            <div class='d-flex'>
+                                <div class='me-2'>
+                                    <IconInfoCircle
+                                        :size='32'
+                                        stroke='1'
+                                    />
+                                </div>
+                                <div>
+                                    <h4 class='alert-title'>
+                                        Stream Username & Password Disabled
+                                    </h4>
+                                    <div class='text-secondary'>
+                                        iTAK Does not currently support in URL username/passwords so this option is currently disabled
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
 
-                        <TablerInput
-                            v-model='editLease.stream_pass'
-                            :disabled='true'
-                            label='Stream Password'
-                        />
+                        <!-- NOT SUPPORTED IN iTAK-->
+                        <div class='col-md-6'>
+                            <TablerInput
+                                v-model='editLease.stream_user'
+                                :disabled='true'
+                                label='Stream Username'
+                            />
+                        </div>
+                        <div class='col-md-6'>
+                            <TablerInput
+                                v-model='editLease.stream_pass'
+                                :disabled='true'
+                                label='Stream Password'
+                            />
+                        </div>
                     </div>
                 </div>
 
@@ -285,6 +329,7 @@ import {
     IconPencil,
     IconWand,
     IconAffiliate,
+    IconInfoCircle,
     IconSquareChevronRight,
     IconChevronRight,
     IconChevronLeft,
@@ -400,7 +445,7 @@ async function deleteLease() {
     try {
         loading.value = true;
 
-        await std(`/api/video/lease/${props.lease.id}`, {
+        await std(`/api/video/lease/${editLease.value.id}`, {
             method: 'DELETE',
         });