google_client_id/google_client_secret data now as secrets

Fixed Properties mode in views

Author: namedgraph

docker-compose.yml

@@ -5,6 +5,10 @@ secrets:
     file: ./secrets/secretary_cert_password.txt
   client_truststore_password:
     file: ./secrets/client_truststore_password.txt
+  #google_client_id:
+  #  file: ./secrets/google_client_id.txt
+  #google_client_secret:
+  #  file: ./secrets/google_client_secret.txt
 services:
   nginx:
     image: nginx:1.23.3
@@ -64,8 +68,6 @@ services:
       - MAIL_SMTP_PORT=25
       - MAIL_USER=linkeddatahub@localhost
       - OWNER_MBOX=${OWNER_MBOX}
-      # - GOOGLE_CLIENT_ID=
-      # - GOOGLE_CLIENT_SECRET=
       #- OWNER_URI=${OWNER_URI}
       - OWNER_GIVEN_NAME=${OWNER_GIVEN_NAME}
       - OWNER_FAMILY_NAME=${OWNER_FAMILY_NAME}
@@ -78,6 +80,8 @@ services:
       - owner_cert_password
       - secretary_cert_password
       - client_truststore_password
+      #- google_client_id
+      #- google_client_secret
     volumes:
       - /var/linkeddatahub/oidc
       - ./ssl/server:/var/linkeddatahub/ssl/server:ro

platform/entrypoint.sh

@@ -810,11 +810,13 @@ if [ -n "$MAIL_PASSWORD" ]; then
     MAIL_PASSWORD_PARAM="--stringparam mail.password '$MAIL_PASSWORD' "
 fi
 
-if [ -n "$GOOGLE_CLIENT_ID" ]; then
+if [ -f "/run/secrets/google_client_id" ]; then
+    GOOGLE_CLIENT_ID=$(cat /run/secrets/google_client_id)
     GOOGLE_CLIENT_ID_PARAM="--stringparam google:clientID '$GOOGLE_CLIENT_ID' "
 fi
 
-if [ -n "$GOOGLE_CLIENT_SECRET" ]; then
+if [ -f "/run/secrets/google_client_secret" ]; then
+    GOOGLE_CLIENT_SECRET=$(cat /run/secrets/google_client_secret)
     GOOGLE_CLIENT_SECRET_PARAM="--stringparam google:clientSecret '$GOOGLE_CLIENT_SECRET' "
 fi
 

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl

@@ -637,7 +637,7 @@ exclude-result-prefixes="#all"
         <xsl:param name="active-mode" as="xs:anyURI"/>
         <xsl:param name="select-xml" as="document-node()"/>
         <xsl:param name="base-uri" as="xs:anyURI"/>
-
+        
         <xsl:for-each select="$container">
             <xsl:result-document href="?." method="ixsl:replace-content">
                 <xsl:call-template name="container-mode">
@@ -844,6 +844,15 @@ exclude-result-prefixes="#all"
         </div>
     </xsl:template>
 
+    <!-- DEFAULT  -->
+    
+    <!-- TO-DO: move to Web-Client -->
+    <xsl:template match="rdf:RDF">
+        <xsl:apply-templates>
+            <xsl:sort select="ac:label(.)"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
     <!-- block list -->
 
     <xsl:template match="rdf:RDF" mode="bs2:ContainerBlockList" use-when="system-property('xsl:product-name') eq 'SaxonJS'">