Merge pull request #1222 from DDMAL/release-v3.1.0

Release v3.1.0

Makefile

@@ -11,7 +11,7 @@ REPLACE := perl -i -pe
 RODAN_PATH := ./rodan-main/code/rodan
 JOBS_PATH := $(RODAN_PATH)/jobs
 
-PROD_TAG := v3.0.0
+PROD_TAG := v3.1.0
 
 DOCKER_TAG := nightly
 

build.yml

@@ -49,8 +49,3 @@ services:
       dockerfile: Dockerfile
     image: "ddmal/rodan-client:nightly"
 
-  iipsrv:
-    build:
-      context: ./iipsrv
-      dockerfile: Dockerfile
-    image: "ddmal/iipsrv:nightly"

gpu-celery/Dockerfile

@@ -94,7 +94,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* \
-  && wget https://bootstrap.pypa.io/get-pip.py \
+  && wget https://bootstrap.pypa.io/pip/3.7/get-pip.py \
   && ${PYTHON} get-pip.py \
   && ln -sf /usr/bin/${PYTHON} /usr/local/bin/python3 \
   && ln -sf /usr/local/bin/pip /usr/local/bin/pip3 \

iipsrv/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine AS builder
+FROM alpine:3.18.5 AS builder
 
 RUN apk add --no-cache \
   autoconf \
@@ -15,7 +15,7 @@ RUN ./autogen.sh
 RUN ./configure --enable-openjpeg
 RUN make
 
-FROM alpine
+FROM alpine:3.18.5
 
 RUN apk add --no-cache \
   libgcc \
@@ -34,4 +34,4 @@ ENV PORT 9003
 
 EXPOSE ${PORT}
 
-ENTRYPOINT /fcgi-bin/iipsrv.fcgi --bind 0.0.0.0:${PORT}
+ENTRYPOINT /fcgi-bin/iipsrv.fcgi --bind 0.0.0.0:${PORT}

production.yml

@@ -3,7 +3,7 @@ version: "3.4"
 services:
 
   nginx:
-    image: "ddmal/nginx:v3.0.0"
+    image: "ddmal/nginx:v3.1.0"
     deploy:
       replicas: 1
       resources:
@@ -37,7 +37,7 @@ services:
       - "resources:/rodan/data"
 
   rodan-main:
-    image: "ddmal/rodan-main:v3.0.0"
+    image: "ddmal/rodan-main:v3.1.0"
     deploy:
       replicas: 1
       resources:
@@ -78,7 +78,7 @@ services:
       - "resources:/rodan/data"
 
   celery:
-    image: "ddmal/rodan-main:v3.0.0"
+    image: "ddmal/rodan-main:v3.1.0"
     deploy:
       replicas: 1
       resources:
@@ -109,7 +109,7 @@ services:
       - "resources:/rodan/data"
 
   py3-celery:
-    image: "ddmal/rodan-python3-celery:v3.0.0"
+    image: "ddmal/rodan-python3-celery:v3.1.0"
     deploy:
       replicas: 1
       resources:
@@ -139,7 +139,7 @@ services:
       - "resources:/rodan/data"
 
   gpu-celery:
-    image: "ddmal/rodan-gpu-celery:v3.0.0"
+    image: "ddmal/rodan-gpu-celery:v3.1.0"
     deploy:
       replicas: 1
       resources:
@@ -195,7 +195,7 @@ services:
       TZ: America/Toronto
 
   postgres:
-    image: "ddmal/postgres-plpython:v3.0.0"
+    image: "ddmal/postgres-plpython:v3.1.0"
     deploy:
       replicas: 1
       endpoint_mode: dnsrr

rodan-client/code/src/js/Controllers/ControllerModal.js

@@ -72,8 +72,7 @@ export default class ControllerModal extends BaseController
             $modalEl.html(this._layoutViewModal.el);
             $('.modal-title').text(options.title);
             $('.modal-body').append(options.content);
-            $('#modal-close').on('click', () => Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_HIDE));
-            $modalEl.show();            
+            $('#modal-close').on('click', () => Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_HIDE));      
         }
         else
         {
@@ -85,9 +84,21 @@ export default class ControllerModal extends BaseController
 
             $modalEl.html(this._layoutViewModal.el);
             $('.modal-title').text(options.title);
-            $('#modal-close').on('click', () => Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_HIDE));
-            $modalEl.show();            
+            $('#modal-close').on('click', () => Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_HIDE));         
         }
+
+        switch (options.scroll) {
+            case 'modal':
+                $('.modal-body').addClass('modal-scroll');
+                break;
+
+            case 'table':
+                $('.modal .table-responsive').css('height', '50vh');
+                $('.modal .table-responsive>.table>tbody').addClass('tbody-scroll');
+                break;
+        }
+
+        $modalEl.show();      
     }
 
     /**
@@ -106,6 +117,7 @@ export default class ControllerModal extends BaseController
         {
             Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_SHOW, options);
         }
+        $('.modal-dialog').addClass('modal-fit');
         $('.modal-footer').removeClass('modal-footer-error');
     }
 

rodan-client/code/src/js/Controllers/ControllerWorkflow.js

@@ -71,7 +71,7 @@ export default class ControllerWorkflow extends BaseController
         // Clear the individual view (if there).
         if (this._viewItem !== null && options.workflow === this._viewItem.model)
         {
-            this._projectView.clearItemView();
+            this._projectView.clearCollectionItemInfoView();
         }
         options.workflow.destroy({success: (model) => this._handleDeleteSuccess(model, this._collection)});
     }

rodan-client/code/src/js/Controllers/ControllerWorkflowBuilder.js

@@ -498,7 +498,7 @@ export default class ControllerWorkflowBuilder extends BaseController
         var collection = new JobCollection();
         collection.fetch();
         var view = new ViewJobCollection({collection: collection, childViewOptions: {workflow: options.workflow}});
-        Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_SHOW, {content: view, title: 'Jobs'});
+        Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_SHOW, {content: view, title: 'Jobs', scroll: 'table'});
     }
 
     /**
@@ -531,7 +531,7 @@ export default class ControllerWorkflowBuilder extends BaseController
     _handleRequestShowWorkflowJobPortsView(options)
     {
         var view = new LayoutViewControlPorts(options);
-        Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_SHOW, {content: view, title: 'WorkflowJob Ports'});
+        Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_SHOW, {content: view, title: 'WorkflowJob Ports', scroll: 'modal'});
     }
 
     /**

rodan-client/code/src/js/Views/Master/Main/ResourceAssignment/LayoutViewResourceAssignment.js

@@ -26,7 +26,7 @@ export default class LayoutViewResourceAssignment extends Marionette.View
         this._viewAssignedResources = options.viewassignedresources;
 
         this._viewAssignedResources.collection.on('update', this._updateAssignedCount);
-        this.setElement('<div class="content-wrapper row-content"></div>');
+        this.setElement('<div class="content-wrapper row-content row-top column-middle"></div>');
     }
 
     /**

rodan-client/code/src/js/Views/Master/Navigation/LayoutViewNavigation.js

@@ -128,7 +128,7 @@ export default class LayoutViewNavigation extends Marionette.View
                                                                  serverConfiguration: serverConfig,
                                                                  date: serverDate,
                                                                  client: Configuration.CLIENT});
-        Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_SHOW, {title: 'About', content: html});
+        Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_SHOW, {title: 'About', content: html, scroll: 'modal'});
     }
 
     /**
@@ -149,7 +149,7 @@ export default class LayoutViewNavigation extends Marionette.View
         var view = new BaseViewCollection({collection: collection,
                                            template: _.template($('#template-resourcetype_collection').text()),
                                            childView: ViewResourceTypeDetailCollectionItem});
-        Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_SHOW, {title: 'Development', content: view});
+        Radio.channel('rodan').request(RODAN_EVENTS.REQUEST__MODAL_SHOW, {title: 'Development', content: view, scroll: 'table'});
     }
 
 

rodan-client/code/styles/default.css

@@ -666,10 +666,8 @@ tbody > tr:hover {
     border: 1px solid #dfdfdf;
     border-radius: 5px;
     background-color: #f0f0f047;
-    height: fit-content;
     width: 100%;
-    overflow-x: auto;
-    max-height: 1000px;
+    overflow: scroll;
 }
 .project-collections {
     gap: 25px;
@@ -708,6 +706,7 @@ tbody > tr:hover {
 }
 .single-project-view-collection-wrapper {
     gap: 10px;
+    overflow: hidden;
 }
 .resource-upload-container {
     height: fit-content;
@@ -938,7 +937,6 @@ div#main_workflowbuilder
     animation: fade-in 0.2s ease-in-out forwards;
 }
 .modal-dialog {
-    width: fit-content;
     height: fit-content;
     border-radius: 3px;
     position: relative;
@@ -947,7 +945,6 @@ div#main_workflowbuilder
     backdrop-filter: blur(20px);
     min-width: 500px;
     max-width: 100%;
-    /* min-height: 300px; */
 }
 .modal-header {
     align-items: center;
@@ -965,7 +962,6 @@ div#main_workflowbuilder
 .modal-body
 {
     max-height: 600px;
-    overflow-y: auto;
     padding: 20px;
     box-sizing: border-box;
     font-size: 12px;
@@ -993,7 +989,13 @@ div#main_workflowbuilder
 .modal-body-section-left {
     align-items: flex-start;
 }
-
+.modal-fit {
+    width: fit-content;
+    height: fit-content;
+}
+.modal-scroll {
+    overflow: scroll;
+}
 /* project-users modal styles */
 #admins-and-workers-tables {
     align-items: flex-start;
@@ -1010,6 +1012,10 @@ div#main_workflowbuilder
 }
 
 /* resource assignment modal */
+.modal-grid {
+    display: grid;
+    grid-template-columns: 8fr 1fr 8fr;
+}
 #resource-assignment-actions-container {
     height: fit-content;
     padding: 5px;
@@ -1019,6 +1025,36 @@ div#main_workflowbuilder
     max-width: 150px;
 }
 
+/* tables in modal */
+.table-modal-container {
+    height: 45vh;
+}
+.table-modal {
+    overflow-y: scroll;
+}
+.table-modal>tbody {
+    overflow: scroll;
+}
+.table-modal>thead>tr>th,
+.table-modal>tbody>tr>th {
+    max-width: 70px;
+    word-wrap: break-word;
+}
+.table-modal>thead>tr>td,
+.table-modal>tbody>tr>td {
+    max-width: 70px;
+    word-wrap: break-word;
+    border-bottom: 1px solid rgb(215 215 215);
+}
+.table-modal>thead>tr>th:first-child,
+.table-modal>tbody>tr>th:first-child,
+.table-modal>thead>tr>td:first-child,
+.table-modal>tbody>tr>td:first-child {
+    max-width: 180px;
+}
+.tbody-scroll {
+    overflow: scroll;
+}
 /* job settings modal */
 #workflowjob-settings:first-child {
     display: flex;

rodan-client/code/templates/Views/Master/Main/InputPort/Collection/template-main_inputport_collection.html

@@ -4,6 +4,7 @@ <h3>Input Ports</h3>
         <thead>
             <tr>
                 <th>Label</th>
+                <th></th>
             </tr>
         </thead>
         <tbody>

rodan-client/code/templates/Views/Master/Main/InputPortType/Collection/template-main_inputporttype_collection.html

@@ -7,6 +7,7 @@ <h3>Input Port Types</h3>
                 <th>Current</th>
                 <th>Min</th>
                 <th>Max</th>
+                <th></th>
             </tr>
         </thead>
         <tbody>

rodan-client/code/templates/Views/Master/Main/Job/Collection/template-main_job_collection.html

@@ -5,6 +5,7 @@
                 <th data-name="category">Category</th>
                 <th data-name="name">Name</th>
                 <th data-name="interactive">Interactive</th>
+                <th></th>
             </tr>
         </thead>
         <tbody>

rodan-client/code/templates/Views/Master/Main/OutputPort/Collection/template-main_outputport_collection.html

@@ -4,6 +4,7 @@ <h3>Output Ports</h3>
         <thead>
             <tr>
                 <th>Label</th>
+                <th></th>
             </tr>
         </thead>
         <tbody>

rodan-client/code/templates/Views/Master/Main/OutputPortType/Collection/template-main_outputporttype_collection.html

@@ -7,6 +7,7 @@ <h3>Output Port Types</h3>
                 <th>Current</th>
                 <th>Min</th>
                 <th>Max</th>
+                <th></th>
             </tr>
         </thead>
         <tbody>

rodan-client/code/templates/Views/Master/Main/Resource/Collection/template-modal_resource_collection.html

@@ -1,5 +1,5 @@
-<div class="table-responsive" style="overflow: auto">
-    <table class="table table-hover table-condensed" id="table-resources">
+<div class="table-responsive table-modal-container" style="overflow: auto">
+    <table class="table table-hover table-condensed table-modal" id="table-resources">
         <thead>
             <tr>
                 <th data-name="name">Name</th>

rodan-client/code/templates/Views/Master/Main/ResourceAssignment/template-main_resourceassignment.html

@@ -1,4 +1,4 @@
-<div class="content-wrapper row-content row-left row-top row-middle flex-gap-10">
+<div class="modal-grid row-left row-top row-middle flex-gap-10">
     <div class="content-wrapper column-content flex-gap-10">
         <div class="content-wrapper row-content row-left modal-subtitle-container">
             <h3 class="text-nowrap">Available Resources</h3>

rodan-client/code/templates/Views/Master/Main/ResourceType/template-resourcetype_collection.html

@@ -7,6 +7,7 @@
                 <th data-name="extension">Extension</th>
                 <th data-name="description">Description</th>
                 <th data-name="url">URL</th>
+                <th></th>
             </tr>
         </thead>
         <tbody>