Merge pull request #59 from tributech-solutions/release/2.0.0

Release/2.0.0

.editorconfig

@@ -6,7 +6,6 @@ root = true
 charset = utf-8
 indent_style = space
 indent_size = 2
-end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 max_line_length = 80

.eslintrc.json

@@ -0,0 +1,35 @@
+{
+  "root": true,
+  "ignorePatterns": ["**/*"],
+  "plugins": ["@nrwl/nx"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {
+        "@nrwl/nx/enforce-module-boundaries": [
+          "error",
+          {
+            "enforceBuildableLibDependency": true,
+            "allow": [],
+            "depConstraints": [
+              {
+                "sourceTag": "*",
+                "onlyDependOnLibsWithTags": ["*"]
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "extends": ["plugin:@nrwl/nx/typescript"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "extends": ["plugin:@nrwl/nx/javascript"],
+      "rules": {}
+    }
+  ]
+}

.github/workflows/github-actions.yml

@@ -7,12 +7,11 @@ on:
   # https://tributech.atlassian.net/wiki/spaces/TM/pages/99614725/Branches+Build-Pipelines+Tags#Issue-with-merge%2Fbuild-for-master-branch)
 
   push:
-    branches: [ release, develop, hotfix/* ]
+    branches: [release, develop, hotfix/*]
     tags:
       - '*'
   pull_request:
-    branches: [ release, develop, feature/*, hotfix/* ]
-
+    branches: [release, develop, feature/*, hotfix/*]
 
 jobs:
   check:
@@ -23,12 +22,14 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 14.x
-      - run: yarn --frozen-lockfile
-      - run: yarn run format-check
-      - run: yarn run lint
-      - run: yarn run test:cov
-      - run: yarn run build
-  images:
+      - run: npm i --ci
+      - run: npm run generate-connectors
+      - run: npm run format:check
+      - run: npm run lint
+      - run: npm run test
+      - run: npm run build
+
+  image-api:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -52,18 +53,70 @@ jobs:
           echo ::set-output name=tags::${TAGS}
           echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
 
+      - run: npm i --ci
       - name: Login to Azure Container Registry
         uses: docker/login-action@v1
         with:
           registry: tributech.azurecr.io
           username: ${{ secrets.AZURE_CLIENT_ID }}
           password: ${{ secrets.AZURE_CLIENT_SECRET  }}
 
-      - name: Build and push images
-        id: docker_build
-        uses: docker/build-push-action@v2
+      - name: 'nx build'
+        run: npm run docker-api
+        env:
+          INPUT_TAGS: ${{ steps.prep.outputs.tags }}
+          INPUT_PUSH: ${{ github.event_name != 'pull_request' }}
+
+  image-ui:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare
+        id: prep
+        run: |
+          DOCKER_IMAGE=tributech.azurecr.io/catalog-ui
+          TAGS=""
+          VERSION=alpha
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+            TAGS="$TAGS,${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:beta,${DOCKER_IMAGE}:stable,${DOCKER_IMAGE}:latest"
+          elif [[ $GITHUB_REF == refs/heads/develop ]]; then
+            TAGS="$TAGS,${DOCKER_IMAGE}:beta"
+          elif [[ $GITHUB_REF == refs/heads/release/* ]]; then
+            VERSION=${GITHUB_REF#refs/release/}
+            TAGS="$TAGS,${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:beta"
+          fi
+          TAGS="$TAGS,${DOCKER_IMAGE}:${GITHUB_SHA::8},${DOCKER_IMAGE}:alpha"
+          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+
+      - run: npm i --ci
+      - name: Login to Azure Container Registry
+        uses: docker/login-action@v1
         with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.prep.outputs.tags }}
+          registry: tributech.azurecr.io
+          username: ${{ secrets.AZURE_CLIENT_ID }}
+          password: ${{ secrets.AZURE_CLIENT_SECRET  }}
+
+      - name: 'nx build'
+        run: npm run docker-ui
+        env:
+          INPUT_TAGS: ${{ steps.prep.outputs.tags }}
+          INPUT_PUSH: ${{ github.event_name != 'pull_request' }}
 
+  npm:
+    runs-on: ubuntu-latest
+    if: contains(github.ref, '/heads/tags') || contains(github.ref, 'refs/tags')
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+      - run: npm i --ci
+      - run: npm run generate-connectors
+      # Set NPM token to be able to publish
+      - run: echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' > ~/.npmrc
+      - run: npm whoami
+      - run: npm run affected:deploy-all

.gitignore

@@ -1,8 +1,57 @@
-/node_modules/
-/dist/
-/.idea/
+
 /shelf/
 /workspace.xml
 /httpRequests/
 /seeddata/
 /coverage/
+/settings/settings.dev.json
+
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+/reports
+
+# System Files
+.DS_Store
+Thumbs.db
+
+# certificates
+/apps/tributech-catalog-ui/ssl/cert.pem
+/apps/tributech-catalog-ui/ssl/key.pem
+
+# generated files
+/libs/connectors/catalog-api/src/**/*
+/libs/connectors/twin-api/src/**/*
+**/*/config.dev.json

.prettierignore

@@ -1,8 +1,9 @@
-# Add files here to ignore them from prettier formatting
-
-/dist
-/coverage
-/reports
-/ssl
-/tools/schemas
-/node_modules
+# Add files here to ignore them from prettier formatting
+
+/dist
+/coverage
+/reports
+/apps/tributech-catalog-ui/ssl
+/node_modules
+/libs/connectors/catalog-api/src/**/*
+/libs/connectors/twin-api/src/**/*

.prettierrc

@@ -0,0 +1,3 @@
+{
+  "singleQuote": true
+}

.run/serve-api.run.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="serve-api" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="serve-api" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

.run/serve-ui-secure.run.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="serve-ui-secure" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="serve-ui-secure" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

.run/test.run.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="test" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="test" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

LICENSE.md

@@ -15,6 +15,7 @@ Licensor: Tributech Solutions GmbH
                              Apache License
                        Version 2.0, January 2004
                     http://www.apache.org/licenses/
+
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
 Definitions.
@@ -69,19 +70,18 @@ END OF TERMS AND CONDITIONS
 
 APPENDIX: How to apply the Apache License to your work.
 
-  To apply the Apache License to your work, attach the following
-  boilerplate notice, with the fields enclosed by brackets "[]"
-  replaced with your own identifying information. (Don't include
-  the brackets!)  The text should be enclosed in the appropriate
-  comment syntax for the file format. We also recommend that a
-  file or class name and description of purpose be included on the
-  same "printed page" as the copyright notice for easier
-  identification within third-party archives.
-  
+To apply the Apache License to your work, attach the following
+boilerplate notice, with the fields enclosed by brackets "[]"
+replaced with your own identifying information. (Don't include
+the brackets!) The text should be enclosed in the appropriate
+comment syntax for the file format. We also recommend that a
+file or class name and description of purpose be included on the
+same "printed page" as the copyright notice for easier
+identification within third-party archives.
+
 Copyright 2021 Tributech Solutions GmbH
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
 
-   http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-