Compare commits

..

5 Commits

Author SHA1 Message Date
Jonas Plum
c6e2cf8404 Add release workflow 2021-12-18 11:05:44 +01:00
Jonas Plum
f327de134e Hide unneeded headline 2021-12-18 11:05:12 +01:00
Jonas Plum
4ed1d4c19a Show template preview 2021-12-18 11:04:28 +01:00
Jonas Plum
529d97d823 Fix goto redirection 2021-12-18 11:03:45 +01:00
Jonas Plum
cd6ed0feed Fix default CATALYST_ADDRESS 2021-12-18 11:02:48 +01:00
5 changed files with 7 additions and 21 deletions

View File

@@ -2,6 +2,7 @@ name: CI
on:
push: { branches: [ main ] }
pull_request:
release: { types: [ published ] }
env:
REGISTRY: ghcr.io
@@ -63,8 +64,8 @@ jobs:
- name: Version
if: ${{ github.ref != '' }}
run: |
echo ${{ github.ref }}
echo ${{ github.ref }} > VERSION
echo ${{ github.ref_name }}
echo ${{ github.ref_name }} > VERSION
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v3
@@ -76,18 +77,3 @@ jobs:
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
# deploy:
# name: Deploy
# runs-on: self-hosted
# needs: [ build ]
# steps:
# - uses: actions/checkout@v2
# - uses: docker/login-action@v1
# with:
# registry: ${{ env.REGISTRY }}
# username: ${{ github.actor }}
# password: ${{ secrets.GITHUB_TOKEN }}
# - run: docker-compose -f docker-compose.yml -f docker-compose.demo.yml pull
# - run: docker-compose -f docker-compose.yml -f docker-compose.demo.yml up -d --remove-orphans --force-recreate
# - run: docker-compose -f docker-compose.yml -f docker-compose.demo.yml restart

View File

@@ -20,7 +20,7 @@ import (
type CLI struct {
Secret string `env:"SECRET" required:"" help:"A random secret value (can be created with 'openssl rand -hex 32')"`
ExternalAddress string `env:"EXTERNAL_ADDRESS" required:""`
CatalystAddress string `env:"CATALYST_ADDRESS" default:"http://catalyst"`
CatalystAddress string `env:"CATALYST_ADDRESS" default:"http://catalyst:8000"`
OIDCIssuer string `env:"OIDC_ISSUER" required:""`
OIDCClientID string `env:"OIDC_CLIENT_ID" default:"catalyst"`

View File

@@ -182,7 +182,7 @@ export default Vue.extend({
}
this.$router.push({
name: "Ticket",
params: { id: this.goto.toString() }
params: { id: this.goto.toString(), type: "-" }
});
},
openTicketList: function (type: string) {

View File

@@ -12,7 +12,7 @@
<v-text-field label="Name" v-model="template.name" class="flex-grow-0 flex-shrink-0" :readonly="readonly"></v-text-field>
<AdvancedJSONSchemaEditor v-if="schema" @save="save" :schema="schema" :readonly="readonly"></AdvancedJSONSchemaEditor>
<AdvancedJSONSchemaEditor v-if="schema" @save="save" :schema="schema" :readonly="readonly" :hidepreview="false"></AdvancedJSONSchemaEditor>
</div>
</template>

View File

@@ -363,7 +363,7 @@
v-model="valids[selectedTaskPlaybook.toString() + '-' + selectedTask.id]"
class="clearfix"
>
<h3>Input</h3>
<h3 v-if="selectedTask.task.schema">Input</h3>
<v-jsf
v-if="selectedTask.task.schema"
v-model="tdata[selectedTaskPlaybook.toString() + '-' + selectedTask.id]"