Merge branch 'main' into IVS-24_Blank_Validator_Page_Issue_69

.dockerignore

@@ -1,5 +1,4 @@
 # .dockerignore file for docker compose
-**/.env
 **/.dev
 **/.ssh
 **/.DS_Store

.env

@@ -1,5 +1,5 @@
 # variables in Docker Compose
-VERSION = 0.6.4
+VERSION = 0.6.5
 DEBUG = True
 ENV = Development
 PUBLIC_URL = http://localhost

Makefile

@@ -1,5 +1,3 @@
-VERSION=v0.6.4
-
 none:
 	@echo ERROR: Enter at least one target (start, start-load-balanced, start-full, start-infra-only, stop, build, rebuild, clean, fetch-modules)
 
@@ -36,18 +34,22 @@ rebuild: clean
 
 rebuild-frontend:
 	docker stop frontend || true
-	docker rmi --force buildingsmart/validationsvc-frontend:${VERSION}
+	docker rmi --force $$(docker images -q 'buildingsmart/validationsvc-frontend' | uniq) || true
 	docker compose build
 
 rebuild-backend:
 	docker stop backend || true
 	docker stop worker || true
-	docker rmi --force buildingsmart/validationsvc-backend:${VERSION}
+	docker rmi --force $$(docker images -q 'buildingsmart/validationsvc-backend' | uniq) || true
 	docker compose build
 
 clean:
-	docker compose down
-	docker image prune --force
+	docker stop backend || true
+	docker stop worker || true
+	docker stop frontend || true
+	docker rmi --force $$(docker images -q 'buildingsmart/validationsvc-frontend' | uniq) || true
+	docker rmi --force $$(docker images -q 'buildingsmart/validationsvc-backend' | uniq) || true
+	docker image prune --all --force --filter=label=org.opencontainers.image.vendor="buildingSMART.org"	
 	docker system prune --all --force --volumes --filter=label=org.opencontainers.image.vendor="buildingSMART.org"	
 
 fetch-modules:

backend/.env

@@ -7,7 +7,7 @@
 #    4) host environment variables
 #    5) default value in code
 
-VERSION = 0.6.4
+VERSION = 0.6.5
 DEBUG = True
 ENV = Development
 PUBLIC_URL = http://localhost:3000

docker/frontend/.dockerignore

@@ -9,6 +9,4 @@ README.md
 
 dist
 node_modules
-build
-
-.env
+build

docker/frontend/Dockerfile

@@ -14,6 +14,7 @@ COPY ./frontend/src ./src
 COPY ./frontend/public ./public
 COPY ./frontend/package* ./
 COPY ./frontend/.env.* ./
+COPY ./frontend/.env ./
 
 # build React app
 RUN npm install && \

frontend/.env

@@ -0,0 +1 @@
+REACT_APP_VERSION=$npm_package_version

frontend/package.json

@@ -1,6 +1,9 @@
 {
-    "name": "ui",
-    "version": "0.6.4",
+    "name": "bsi-valsvc-ui",
+    "description": "WebUI of the bSI Validation Service",    
+    "version": "0.6.5",
+    "author": "buildingSMART International Ltd.",
+    "license": "MIT",
     "private": true,
     "dependencies": {
         "@emotion/react": "^11.10.5",

frontend/src/Footer.js

@@ -1,14 +1,15 @@
-import {PageContext} from './Page';
-import { useContext } from 'react';
+import { VERSION } from './environment';
 
+import { PageContext } from './Page';
+import { useContext } from 'react';
 
 function Footer(){
     const context = useContext(PageContext);
 
     const style = {padding:'4px', textAlign:'center'};
     return (
         <div style={style}>
-            <span>{context["environment"]} - Version 0.6.4 | Copyright © 2024 buildingSMART All Rights Reserved | <a href="https://www.buildingsmart.org/wp-content/uploads/2018/05/PrivacyandCookiePolicyV2.pdf" target="_blank" rel="noopener">Privacy and Cookie Statement</a>&nbsp;| <a href="https://www.buildingsmart.org/wp-content/uploads/2021/09/20210923_TermsOfService.pdf" target="_blank" rel="noopener">Terms and Conditions</a>&nbsp;|</span>
+            <span>{context["environment"]} - Version {VERSION} | Copyright © {new Date().getFullYear()} buildingSMART All Rights Reserved | <a href="https://www.buildingsmart.org/wp-content/uploads/2018/05/PrivacyandCookiePolicyV2.pdf" target="_blank" rel="noopener">Privacy and Cookie Statement</a>&nbsp;| <a href="https://www.buildingsmart.org/wp-content/uploads/2021/09/20210923_TermsOfService.pdf" target="_blank" rel="noopener">Terms and Conditions</a>&nbsp;|</span>
             {context["pageTitle"] === "report" &&<div> This validation report is generated by bSI Validation Service based on the input IFC model | bSI assumes no responsability or liability for the content of this report</div>}
         </div>
     )

frontend/src/SideMenu.js

@@ -11,6 +11,8 @@ import HomeIcon from '@mui/icons-material/Home';
 import CheckIcon from '@mui/icons-material/Check';
 import Divider from '@mui/material/Divider';
 
+import { VERSION } from './environment';
+
 import { PageContext } from './Page';
 import { useContext } from 'react';
 
@@ -48,7 +50,7 @@ export default function SideMenu() {
                 <Divider />
                     <ListItem key={"test"} disablePadding>
                         <ListItemButton>
-                            <ListItemText style={{ textAlign: 'center' }} primary={`${context["environment"]} v0.6.4`} />
+                            <ListItemText style={{ textAlign: 'center' }} primary={`${context["environment"]} v${VERSION}`} />
                         </ListItemButton>
                     </ListItem>
                 </List>

frontend/src/environment.js

@@ -1 +1,4 @@
-export const FETCH_PATH = process.env.REACT_APP_FETCH_PATH;
+export const FETCH_PATH = process.env.REACT_APP_FETCH_PATH;
+export const VERSION = process.env.REACT_APP_VERSION;
+export const PUBLIC_URL = process.env.PUBLIC_URL;
+export const NODE_ENV = process.env.NODE_ENV;

frontend/src/index.js

@@ -9,12 +9,15 @@ import Logout from './Logout';
 import Report from './Report';
 import Page from './Page';
 
+import { FETCH_PATH, VERSION, PUBLIC_URL, NODE_ENV } from './environment';
+
 import reportWebVitals from './reportWebVitals';
 import { BrowserRouter, Routes, Route } from "react-router-dom";
 
-console.log('REACT_APP_FETCH_PATH', process.env.REACT_APP_FETCH_PATH)
-console.log('PUBLIC_URL', process.env.PUBLIC_URL)
-console.log('NODE_ENV', process.env.NODE_ENV)
+console.log('REACT_APP_VERSION', VERSION)
+console.log('REACT_APP_FETCH_PATH', FETCH_PATH)
+console.log('PUBLIC_URL', PUBLIC_URL)
+console.log('NODE_ENV', NODE_ENV)
 
 const root = ReactDOM.createRoot(document.getElementById('root'));
 root.render(