Merge pull request #1618 from iTerminate/master

Prepare v3.15.5
AdvancedPhotonSource · Apr 19, 2023 · 09d80d6 · 09d80d6
2 parents 731efe2 + 57def01
commit 09d80d6
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 18 deletions.
diff --git a/db/sql/updates/updateTo3.15.4.sql → db/sql/updates/old/updateTo3.15.4.sql b/db/sql/updates/updateTo3.15.4.sql → db/sql/updates/old/updateTo3.15.4.sql
diff --git a/db/sql/updates/updateTo3.15.5.sql b/db/sql/updates/updateTo3.15.5.sql
@@ -3,7 +3,9 @@
 -- See LICENSE file.
 --
 
--- Execute by running `mysql CDB_DB_NAME --host=127.0.0.1 --user=cdb -p < updateTo3.15.4.sql`
+-- Execute by running `mysql CDB_DB_NAME --host=127.0.0.1 --user=cdb -p < updateTo3.15.5.sql`
+
+delimiter //
 
 DROP PROCEDURE IF EXISTS fetch_relationship_children_items;//
 CREATE PROCEDURE `fetch_relationship_children_items` (IN item_id INT, IN relationship_type_id INT, IN parent_relationship_id INT) 

diff --git a/etc/version b/etc/version
@@ -1 +1 @@
-3.15.4
+3.15.5
diff --git a/src/java/CdbWebPortal/src/java/openapi.yaml b/src/java/CdbWebPortal/src/java/openapi.yaml
@@ -4,7 +4,7 @@ prettyPrint: true
 cacheTTL: 0
 openAPI:
   info:
-    version: '3.15.4'
+    version: '3.15.5'
     title: Component Database API
     description: 'The API that provides access to Component Database data.'
     contact:

diff --git a/src/java/CdbWebPortal/web/resources/css/portal.css b/src/java/CdbWebPortal/web/resources/css/portal.css
@@ -834,6 +834,15 @@ h2 {
     filter: grayscale(100%) brightness(500%) brightness(10%);
 }
 
+.ui-icon-control {    
+    background-image: url(../../resources/images/control.svg) !important;
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: contain;     
+    animation: transition-ui-icon-machine-design 0.25s;
+    filter: grayscale(100%) brightness(500%) brightness(10%);
+}
+
 @keyframes transition-ui-icon-machine-design {
     0% {        
         transform:rotate(0deg);  

diff --git a/src/java/CdbWebPortal/web/resources/images/control.svg b/src/java/CdbWebPortal/web/resources/images/control.svg
diff --git a/src/java/CdbWebPortal/web/templates/portalViewMenubarTemplate.xhtml b/src/java/CdbWebPortal/web/templates/portalViewMenubarTemplate.xhtml
@@ -92,7 +92,7 @@ See LICENSE file.
                             styleClass="#{fn:startsWith(view.viewId, '/views/itemDomainCableDesign/list') ? 'activeMenuItem' : ''} "/>
                 <p:menuitem value="Control"
                             id="machineControlMenubarButton"
-                            icon="fa fa-code"
+                            icon="ui-icon-control"
                             url="#{request.contextPath}/views/itemDomainMachineDesignControl/list"
                             styleClass="#{fn:startsWith(view.viewId, '/views/itemDomainMachineDesignControl/list') ? 'activeMenuItem' : ''} "/>
                 <p:menuitem value="Power"
@@ -101,6 +101,11 @@ See LICENSE file.
                             rendered="#{false}"
                             url="#{request.contextPath}/views/itemDomainMachineDesignPower/list"
                             styleClass="#{fn:startsWith(view.viewId, '/views/itemDomainMachineDesignPower/list') ? 'activeMenuItem' : ''} "/>
+                <p:menuitem value="Applications"
+                            id="machineApplicationsMenubarButton"
+                            icon="fa fa-code"
+                            url="#{request.contextPath}/views/itemDomainApp/list"
+                            styleClass="#{fn:startsWith(view.viewId, '/views/itemDomainApp/list') ? 'activeMenuItem' : ''} "/>
             </p:submenu>
 
             <p:menuitem value="MAARC" 

diff --git a/...s/itemDomainInventoryBase/private/itemDomainInventoryBaseListCustomIdentifierObject.xhtml b/...s/itemDomainInventoryBase/private/itemDomainInventoryBaseListCustomIdentifierObject.xhtml
@@ -16,6 +16,7 @@ See LICENSE file.
               value="#{partNameString != null ? partNameString : itemDomainInventoryController.getItemDisplayString(itemListObject)}" />
     <p:column headerText="Inventory Item"
               sortBy="#{partNameString}"
+              exportValue="#{partNameString}"
               filterBy="#{facesUtility.getFilterString(partNameString)}" 
               filterMatchMode="contains"
               filterable="#{filterable}"

diff --git a/src/java/CdbWebPortal/web/views/itemDomainMachineDesignControl/list.xhtml b/src/java/CdbWebPortal/web/views/itemDomainMachineDesignControl/list.xhtml
@@ -25,17 +25,7 @@ See LICENSE file.
 
     <ui:define name="additionalDualColumnEditPanels">
         <ui:include src="private/itemDomainMachineDesignControlSelectMachineControlledByElement.xhtml" /> 
-    </ui:define>
-
-    <ui:define name="additonalItemListButtons">
-        <p:commandButton id="#{entityTypeName}AppsListPageButton"                         
-                         alt="Apps List" styleClass="actionButtonRight"
-                         action="#{itemDomainAppController.getListPath()}"
-                         ajax="false"
-                         icon="fa fa-code">
-            <p:tooltip for="#{entityTypeName}AppsListPageButton" value="Go to apps list."/>
-        </p:commandButton>
-    </ui:define>
+    </ui:define>        
 
     <ui:define name="machineDesignExtraInfoPromotedColumn">
         <ui:param name="controlInterfaceToParentPV"

diff --git a/tools/developer_tools/python-client/setup-api.py b/tools/developer_tools/python-client/setup-api.py
@@ -16,7 +16,7 @@
 from setuptools import find_packages
 
 setup(name='ComponentDB-API',
-      version='3.15.5.dev0',
+      version='3.15.5',
       packages=["cdbApi",
                 "cdbApi.api",
                 "cdbApi.models"],

diff --git a/tools/developer_tools/python-client/setup-cli.py b/tools/developer_tools/python-client/setup-cli.py
@@ -16,7 +16,7 @@
 from setuptools import find_packages
 
 setup(name='ComponentDB-CLI',
-      version='3.15.5.dev0',
+      version='3.15.5',
       packages=['cdbCli',
                 'cdbCli.common',
                 'cdbCli.common.cli',
@@ -32,7 +32,7 @@
                         'pandas',
                         'rich',
                         'InquirerPy',
-                        'ComponentDB-API==3.15.5.dev0'],
+                        'ComponentDB-API==3.15.5'],
       license='Copyright (c) UChicago Argonne, LLC. All rights reserved.',
       description='Python APIs used to communicate with java hosted ComponentDB API.',
       maintainer='Dariusz Jarosz',