Merge pull request #442 from oracle/v0.25.0-sprint-25

V0.25.0 sprint 25

CHANGELOG.md

@@ -1,6 +1,20 @@
 # Release Notes
 
 
+## Version 0.25.0
+**Release Date**: 18th August 2021
+### Features
+1. Templates Moved from main menu to sidebar and now opened on a Double Click.
+2. Pan and Zoom added to SVG display returning to 1:1 during redraw.
+3. Display Git Directories as a side panel and allow for double click open.
+4. Reorganise Reference Architecture Templates
+
+### Bug Fixes
+1. Fix query pagination issues where not all resources were being retrieved.
+2. Remove uses of Terraform Data Resource oci_identity_tenancy
+3. GitHub Issue #406: Sub-Menu options can't be selected in Chrome (Subtract scrollbar width)
+
+
 ## Version 0.24.5
 **Release Date**: 19th July 2021
 ### Bug Fixes

Dockerfile

@@ -5,7 +5,7 @@
 FROM oraclelinux:7-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.24.5" \
+      "version"="0.25.0" \
       "description"="OKIT Web Server Container." \
       "copyright"="Copyright (c) 2020, 2021, Oracle and/or its affiliates."
 SHELL ["/bin/bash", "-c"]
@@ -57,15 +57,15 @@ RUN yum install -y \
 # Create Workspace
  && mkdir -p /github \
  && git clone -c core.autocrlf=input https://github.com/oracle/oci-designer-toolkit.git /github/oci-designer-toolkit \
- && mkdir -p /okit/{log,workspace,ssl} \
+ && mkdir -p /okit/{git,local,log,instance/git,instance/local,instance/templates/user,workspace,ssl} \
  && mkdir -p /root/bin \
  && openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /okit/ssl/okit.key -out /okit/ssl/okit.crt -subj "/C=GB/ST=Berkshire/L=Reading/O=Oracle/OU=OKIT/CN=www.oci_okit.com" \
  && ln -sv /github/oci-designer-toolkit/config /okit/config \
  && ln -sv /github/oci-designer-toolkit/okitweb /okit/okitweb \
  && ln -sv /github/oci-designer-toolkit/visualiser /okit/visualiser \
  && ln -sv /github/oci-designer-toolkit/containers/docker/run-server.sh /root/bin/run-server.sh \
  && mkdir -p /okit/okitweb/static/okit/templates \
- && ln -sv /okit/templates /okit/okitweb/static/okit/templates/user \
+ #&& ln -sv /okit/templates /okit/okitweb/static/okit/templates/user \
  && chmod a+x /root/bin/run-server.sh
 # Add entrypoint to automatically start webserver
 CMD ["run-server.sh"]

README.md

@@ -1,4 +1,16 @@
-# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.24.5](CHANGELOG.md#version-0.24.5)
+# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.25.0](CHANGELOG.md#version-0.25.0)
+
+```diff
++ The 0.25.0 release has now moved the templates from the menu to a new side panel and the can be opened by double clicking 
++ the file. This new format allows for user templates with sub directories. The corresponding Save As functionality also 
++ allows the user to create sub directories by specifying the full path.
+
+- The GIT functionality has also been moved to a side panel and on opening the designer page OKIT will attempt to clone/pull
+- from the git repositories specified in the ~/.oci/git_repositories file. If the pull fails then an empty details section
+- will be displayed.
+
++ The User templates and Git directories can be mounted from the local environment as shown in the updated run instructions.
+```
 
 OCI designer and visualisation toolKIT (OKIT) is a browser based tool that allows the user to [design](https://www.ateam-oracle.com/introduction-to-okit-the-oci-designer-toolkit), 
 [deploy](https://www.ateam-oracle.com/introduction-to-okit-the-oci-designer-toolkit) and visualise ([introspect/query](https://www.ateam-oracle.com/the-oci-designer-toolkit-query-feature)) 
@@ -129,10 +141,16 @@ Host github.com
 
 #### Run Container
 
+##### Simple
 ```bash
 docker run -d --rm -p 80:80 --volume <USER HOME DIR>/okit/user/templates:/okit/templates --volume <USER HOME DIR>/.oci:/root/.oci --volume <USER HOME DIR>/.ssh:/root/.ssh --name okit okit
 ```
 
+##### Mount User Templates and Git Directories
+```bash
+docker run -d --rm -p 80:80 --volume <USER HOME DIR>/okit/user/templates:/okit/templates --volume <USER HOME DIR>/.oci:/root/.oci --volume <USER HOME DIR>/.ssh:/root/.ssh --volume <PATH TO USER TEMPLATES DIR>:/okit/instance/user --volume <PATH TO GIT DIR>:/okit/instance/git --volume <PATH TO LOCAL DIR>:/okit/instance/local --name okit okit
+```
+
 Once started the Designer BUI can be accessed on [http://localhost/okit/designer](http://localhost/okit/designer)
 
 ## Usage / Examples

containers/docker/Dockerfile

@@ -5,7 +5,7 @@
 FROM oraclelinux:7-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.24.5" \
+      "version"="0.25.0" \
       "description"="OKIT Web Server Container." \
       "copyright"="Copyright (c) 2020, 2021, Oracle and/or its affiliates."
 SHELL ["/bin/bash", "-c"]
@@ -55,12 +55,12 @@ RUN yum install -y \
         requests==2.25.1 \
         xlsxwriter==1.3.7 \
 # Create Workspace
- && mkdir -p /okit/{config,git,log,ssl,visualiser,okitweb,workspace,templates,skeletons} \
- && mkdir -p /okit/okitweb/static/okit/templates \
- && openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /okit/ssl/okit.key -out /okit/ssl/okit.crt -subj "/C=GB/ST=Berkshire/L=Reading/O=Oracle/OU=OKIT/CN=www.oci_okit.com" \
- && ln -s /okit/templates /okit/okitweb/static/okit/templates/user \
- && ln -s /okit/git /okit/okitweb/static/okit/templates/git \
- && ln -s /okit/git /okit/okitweb/static/okit/git
+ && mkdir -p /okit/{config,git,instance/git,instance/local,instance/templates/user,local,log,ssl,visualiser,okitweb,workspace,skeletons} \
+#  && mkdir -p /okit/okitweb/static/okit/templates \
+ && openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /okit/ssl/okit.key -out /okit/ssl/okit.crt -subj "/C=GB/ST=Berkshire/L=Reading/O=Oracle/OU=OKIT/CN=www.oci_okit.com" 
+#  && ln -s /okit/templates /okit/okitweb/static/okit/templates/user \
+#  && ln -s /okit/git /okit/okitweb/static/okit/templates/git \
+#  && ln -s /okit/git /okit/okitweb/static/okit/git
 # Copy source code
 COPY config /okit/config
 COPY okitweb /okit/okitweb
@@ -69,7 +69,8 @@ COPY visualiser /okit/visualiser
 COPY skeletons /okit/skeletons
 COPY containers/oci/* /root/.oci/
 COPY containers/ssh/* /root/.ssh/
-RUN chmod 600 /root/.ssh/*
+RUN chmod 600 /root/.ssh/* \
+ && ln -s /okit/okitweb/static/okit/templates/reference_architecture /okit/instance/templates/reference_architecture 
 
 # Add entrypoint to automatically start webserver
 ENTRYPOINT ["gunicorn", "okitweb.wsgi:app"]

okitweb/__init__.py

@@ -26,7 +26,7 @@
 
 def create_local_app(test_config=None):
     # Create and Configure OKIT Web Designer App
-    app = Flask(__name__, instance_relative_config=True)
+    app = Flask(__name__, instance_relative_config=True, instance_path='/okit/instance')
 
     # Load Config
     if test_config is None:
@@ -68,7 +68,7 @@ def favicon():
 
 def create_authenticated_app(test_config=None):
     # Create and Configure OKIT Web Designer App
-    app = Flask(__name__, instance_relative_config=True)
+    app = Flask(__name__, instance_relative_config=True, instance_path='/okit/instance')
 
     # Load Config
     if test_config is None: