Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/next' into NAB-354
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/app/app.component.html
#	src/app/app.component.ts
  • Loading branch information
Kovy95 committed May 6, 2024
2 parents c63c83d + b8c1a29 commit 3d76d34
Show file tree
Hide file tree
Showing 17 changed files with 230 additions and 116 deletions.
81 changes: 81 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
name: "🐛 Bug Report"
description: Create a report to help us improve
title: "[BUG] "
labels:
- bug
- unverified
body:
- id: description
type: textarea
attributes:
label: Current behaviour
description: A clear and concise description of what the bug is.
validations:
required: false
- id: steps
type: textarea
attributes:
label: Steps to reproduce
description: Steps to reproduce the behavior.
placeholder: |
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
validations:
required: true
- id: expected
type: textarea
attributes:
label: Expected behaviour
description: A clear and concise description of what you expected to happen.
validations:
required: false
- id: os
type: dropdown
attributes:
label: OS
description: OS of device
options:
- Windows
- Linux
- MacOS
- Android
- iOS
- other
validations:
required: false
- id: browser
type: dropdown
attributes:
label: Browser
description: Used web browser
options:
- Chrome
- Firefox
- Safari
- Edge
- Opera
- Other Chrome/Chromium based
- Other
validations:
required: false
- id: version
type: dropdown
attributes:
label: App version
options:
- 1.0.0
default: 0
validations:
required: true
- id: additional
type: textarea
attributes:
label: Anything else?
description: |
Links? References? Screenshots? Anything that will give us more context about the issue you are encountering!
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: "⬆️ Feature request"
description: Suggest an idea for this project
title: "[FEATURE] "
labels:
- improvement
- new
body:
- id: problem
type: textarea
attributes:
label: Is your feature request related to a problem?
description: A clear and concise description of what the problem is. Ex. I'm always frustrated when...
validations:
required: false
- id: solution
type: textarea
attributes:
label: Describe the solution you'd like
description: A clear and concise description of what you want to happen.
validations:
required: false
- id: alternative
type: textarea
attributes:
label: Describe alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered.
validations:
required: false
- id: additional
type: textarea
attributes:
label: Anything else?
description: |
Links? References? Screenshots? Anything that will give us more context about the request.
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
1 change: 1 addition & 0 deletions .github/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ PR_TITLE_REGEX: /(?:\[[A-Z]+-[0-9]+\] .+)|(CI - Update documentation)|(?:Release
COMMIT_MESSAGE_REGEX: /((^| )(\[[A-Z]+-[0-9]+\] .+(?:\n\r? - .*)*)|(Merge branch .*. into*.*)|((Release .*)+(:?\n\r? .*)*)|(CI - Update documentation)|(Revert ".*.)|(Merge remote-tracking *.*))/gim
INVALID_COMMIT_MESSAGE: Commit messages are invalid. Valid format is -> [JIRA-ISSUE-KEY] Main change in the commit \n - other change in the commit
INVALID_PULL_REQUEST_MESSAGE: Pull request title is invalid -> [JIRA-ISSUE-KEY] Jira issue summary / title
blank_issues_enabled: false
20 changes: 10 additions & 10 deletions .github/workflows/master-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:
- run: npm i --legacy-peer-deps

- name: Test
run: npm run full-test
run: npm run lint && npm run build

- name: Edit Path
run: |
sed -i 's/SF:.*.src/SF:src/g' coverage/lcov.info
sed -i 's/SF:.*.src/SF:src/g' coverage/lcov.info
- name: SonarCloud scan
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
# - name: Edit Path
# run: |
# sed -i 's/SF:.*.src/SF:src/g' coverage/lcov.info
# sed -i 's/SF:.*.src/SF:src/g' coverage/lcov.info
# - name: SonarCloud scan
# uses: SonarSource/sonarcloud-github-action@master
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
29 changes: 16 additions & 13 deletions .github/workflows/pr-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,21 @@ jobs:
- name: Lint
run: npm run lint

- name: Check spelling
run: npm run spell
# - name: Check spelling
# run: npm run spell
#
# - name: Test
# run: npm run test

- name: Test
run: npm run test
- name: Build
run: npm run build

- name: Edit Path
run: |
sed -i 's/SF:.*.src/SF:src/g' coverage/lcov.info
sed -i 's/SF:.*.src/SF:src/g' coverage/lcov.info
- name: SonarCloud scan
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
# - name: Edit Path
# run: |
# sed -i 's/SF:.*.src/SF:src/g' coverage/lcov.info
# sed -i 's/SF:.*.src/SF:src/g' coverage/lcov.info
# - name: SonarCloud scan
# uses: SonarSource/sonarcloud-github-action@master
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
27 changes: 21 additions & 6 deletions .github/workflows/release-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18

- name: Log in to Docker Hub
uses: docker/login-action@v1
with:
Expand All @@ -42,6 +37,13 @@ jobs:
push: true
tags: netgrif/application-builder:latest

- name: Push Next
if: ${{ contains(steps.getVersion.outputs.version, '-') }}
uses: docker/build-push-action@v5
with:
push: true
tags: netgrif/application-builder:next

publish-assets:
name: Upload Release Assets
runs-on: ubuntu-latest
Expand Down Expand Up @@ -69,7 +71,7 @@ jobs:
- name: Build project
run: |
zip -r netgrif-application-builder-${{ steps.getVersion.outputs.version }}.zip target/application-builder
zip -r netgrif-application-builder-${{ steps.getVersion.outputs.version }}.zip dist/application-builder
- name: Upload binaries to release
uses: svenstaro/upload-release-action@v2
Expand All @@ -79,3 +81,16 @@ jobs:
asset_name: netgrif-application-builder-${{ steps.getVersion.outputs.version }}.zip
tag: ${{ github.ref }}
overwrite: true

deploy:
name: Deploy on K3S cluster
runs-on: ubuntu-latest
needs: publish-docker
steps:
- name: Apply new release
uses: actions-hub/kubectl@master
env:
KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
KUBE_CONTEXT: default-github-builder
with:
args: rollout restart deployment/netgrif-application-builder-${{ contains(steps.getVersion.outputs.version, '-') && 'uat' || 'prod' }}-dpl --namespace builder
62 changes: 7 additions & 55 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,16 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

Full Changelog: [https://github.com/netgrif/application-builder/commits/v1.0.0](https://github.com/netgrif/application-builder/commits/v1.0.0)

## [v1.0.0](https://github.com/netgrif/application-builder/releases/tag/v1.0.0) (2023-12-11)

### Added

- Initial open-source release of Netgrif Application Builder

[//]: # (TODO CHANGELOG)

<!-- Template
## [version](https://github.com/netgrif/components/releases/tag/v) (YYYY-MM-dd)
## [version](https://github.com/netgrif/application-builder/releases/tag/v) (YYYY-MM-dd)
### Added
- for new features.
### Changed
Expand All @@ -24,57 +30,3 @@ Full Changelog: [https://github.com/netgrif/application-builder/commits/v1.0.0](
### Security
- in case of vulnerabilities.
-->

-----
## OLD

<a name="https://netgrif.atlassian.net/issues/?jql=project%20%3D%20NAB%20AND%20fixVersion%20%3D%200.4.0"></a>
## 0.4.0 - Silver Dysprosium (10.09.2020)
### Bug Fixes
* [NAB-11](https://netgrif.atlassian.net/browse/NAB-11) - Data variable editor text overflow
* [NAB-95](https://netgrif.atlassian.net/browse/NAB-95) - Arc data reference bug
* [NAB-97](https://netgrif.atlassian.net/browse/NAB-97) - Forms inconsistent in modeler
* [NAB-107](https://netgrif.atlassian.net/browse/NAB-107) - Nezobrazuju sa novo pridane procesy v project overview
* [NAB-117](https://netgrif.atlassian.net/browse/NAB-117) - Data field ids generated as [object Object]
* [NAB-118](https://netgrif.atlassian.net/browse/NAB-118) - Form builder always displays calendar value selection

### Improvements
* [NAB-62](https://netgrif.atlassian.net/browse/NAB-62) - Form builder refactor
* [NAB-124](https://netgrif.atlassian.net/browse/NAB-124) - Select tool preselected by default on modeler screen
* [NAB-125](https://netgrif.atlassian.net/browse/NAB-125) - Add action button to transition context menu

### Features
* [NAB-123](https://netgrif.atlassian.net/browse/NAB-123) - File list data field

<a name="https://netgrif.atlassian.net/issues/?jql=project+%3D+%22NAB%22+AND+fixVersion+%3D+%220.3.0%22"></a>
## 0.3.0 - Aqua Neon (24.07.2020)
### Bug Fixes
* [NAB-31](https://netgrif.atlassian.net/browse/NAB-31) - Form builder - inconsistent number of cols
* [NAB-28](https://netgrif.atlassian.net/browse/NAB-28) - Dashboard tiles refresh
* [NAB-25](https://netgrif.atlassian.net/browse/NAB-25) - Actions has the same id
* [NAB-24](https://netgrif.atlassian.net/browse/NAB-24) - Transition actions have trigger PRE/POST
* [NAB-17](https://netgrif.atlassian.net/browse/NAB-17) - Custom field inconsistencies
* [NAB-16](https://netgrif.atlassian.net/browse/NAB-16) - Builder does not load on Firefox
* [NAB-14](https://netgrif.atlassian.net/browse/NAB-14) - XML special chars are not escaped

### Improvements
* [NAB-100](https://netgrif.atlassian.net/browse/NAB-100) - Form builder default values
* [NAB-96](https://netgrif.atlassian.net/browse/NAB-96) - Jenkins Pipeline
* [NAB-51](https://netgrif.atlassian.net/browse/NAB-51) - Custom datafield export

### Features
* [NAB-93](https://netgrif.atlassian.net/browse/NAB-93) - I18n view
* [NAB-91](https://netgrif.atlassian.net/browse/NAB-91) - Modeler Tour
* [NAB-77](https://netgrif.atlassian.net/browse/NAB-77) - Automation policies
* Task icon is displayed in modeler in the middle of the transition rectangle

### Tasks
* [NAB-8](https://netgrif.atlassian.net/browse/NAB-8) - Datetime field refactor

<a name=""></a>
## 0.2.0 - Navy Hafnium
### Features
* Resizable action editor
* Tables can be sorted by clicking on its headers
* Side editors can be resized
* Data fields options can be edited in the Data variable editor
6 changes: 5 additions & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
Expand All @@ -126,7 +126,11 @@ For answers to common questions about this code of conduct, see the FAQ at
at [https://www.contributor-covenant.org/translations][translations].

[homepage]: https://www.contributor-covenant.org

[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html

[Mozilla CoC]: https://github.com/mozilla/diversity

[FAQ]: https://www.contributor-covenant.org/faq

[translations]: https://www.contributor-covenant.org/translations
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
# Netgrif Application Builder

[![License](https://img.shields.io/badge/license-NETGRIF%20Community%20License-green)](https://netgrif.com/license)
[![Angular dependency](https://img.shields.io/github/package-json/dependency-version/netgrif/application-builder/@angular/core?color=red)](https://www.angular.io/))
[![Angular dependency](https://img.shields.io/github/package-json/dependency-version/netgrif/application-builder/@angular/core?color=red)](https://www.angular.io/)
[![Petriflow 1.0.1](https://img.shields.io/badge/Petriflow-1.0.1-0aa8ff)](https://petriflow.com)
[![Docker Pulls](https://img.shields.io/docker/pulls/netgrif/application-builder)](https://hub.docker.com/r/netgrif/application-builder)
[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/netgrif/application-builder?display_name=tag&sort=semver)](https://github.com/netgrif/application-builder/releases)
[![build](https://github.com/netgrif/application-builder/actions/workflows/master-build.yml/badge.svg)](https://github.com/netgrif/application-builder/actions/workflows/master-build.yml)
[![Master Build](https://github.com/netgrif/application-builder/actions/workflows/master-build.yaml/badge.svg)](https://github.com/netgrif/application-builder/actions/workflows/master-build.yaml)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=netgrif_application-builder&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=netgrif_application-builder)
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=netgrif_application-builder&metric=coverage)](https://sonarcloud.io/dashboard?id=netgrif_application-builder)
[![Known Vulnerabilities](https://snyk.io/test/github/netgrif/application-builder/badge.svg)](https://snyk.io/test/github/netgrif/application-builder)

Netgrif Application Builder is an angular web application for implementing process-driven application in low-code language Petriflow.
Expand All @@ -25,7 +24,7 @@ Builder can be deployed as is directly from the release artifact or as a docker

## Usage

Builder is single-page application (SPA) implemented in Angular. You can deploy it as normal web page on any website hosting. You can use a [release artifact](https://github.com/netgrif/application-builder/releases/tag/v6.3.2)
Builder is single-page application (SPA) implemented in Angular. You can deploy it as normal web page on any website hosting. You can use a [release artifact](https://github.com/netgrif/application-builder/releases/tag/v6.3.2)
to deploy the zip archive. The application is also published to [DockerHub](https://hub.docker.com/r/netgrif/application-builder) for container deployment.
For running the application no further configuration is needed.

Expand All @@ -48,8 +47,8 @@ Application Engine can run as a standalone java application, as a docker image,

### Components

[Netgrif Components](https://github.com/netgrif/components) is an Angular library for creating SPA (Single-page application) compatible with Netgrif Application Engine.
The library provides all necessary tools for creating refined frontend application into NAE environment,
[Netgrif Components](https://github.com/netgrif/components) is an Angular library for creating SPA (Single-page application) compatible with Netgrif Application Engine.
The library provides all necessary tools for creating refined frontend application into NAE environment,
and to create own library of Angular web components to incorporate your own personal design to the platform.

## Reporting issues
Expand Down
4 changes: 2 additions & 2 deletions docs/changelod.tex
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ \subsection*{0.4.0 - Silver Dysprosium (10.09.2020)}
\item NAB-11 - Data variable editor text overflow
\item NAB-95 - Arc data reference bug
\item NAB-97 - Forms inconsistent in modeler
\item NAB-107 - Nezobrazuju sa novo pridane procesy v project overview
\item NAB-107 - New added processes are not displayed in project overview
\item NAB-117 - Data field ids generated as object Object
\item NAB-118 - Form builder always displays calendar value selection
\end{itemize}
Expand Down Expand Up @@ -37,7 +37,7 @@ \subsection*{0.3.0 - Aqua Neon (24.07.2020)}
\begin{itemize}
\item NAB-100 - Form builder default values
\item NAB-96 - Jenkins Pipeline
\item NAB-51 - Custom datafield export
\item NAB-51 - Custom data field export
\end{itemize}

\subsubsection*{Features}
Expand Down
2 changes: 1 addition & 1 deletion nae.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
},
"urls": {
"netgrif": "https://netgrif.com",
"bpmn2pn": "https://bpmn2pn.netgrif.cloud",
"bpmn2pn": "https://bpmn2pn.netgrif.cloud/bpmn2pn/",
"engine": "https://demo.netgrif.com/",
"youtube": "https://www.youtube.com/channel/UCNfqgnjskMMpy7QvOOKhKgw",
"github": "https://github.com/netgrif",
Expand Down
Loading

0 comments on commit 3d76d34

Please sign in to comment.