Compare commits
77 Commits
v1.1.3
...
debug-flak
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c3e49125f4 | ||
|
|
6aa2639949 | ||
|
|
d167934fa6 | ||
|
|
93662f331a | ||
|
|
427c6f5ecf | ||
|
|
f0ceda5002 | ||
|
|
39095d072c | ||
|
|
beea77a311 | ||
|
|
5ada578271 | ||
|
|
b5f76332d1 | ||
|
|
6862202afe | ||
|
|
33299dc3ec | ||
|
|
073891e1a5 | ||
|
|
3b7b0baa26 | ||
|
|
1e80b7f7d7 | ||
|
|
a5f17b9242 | ||
|
|
7ff51bcc08 | ||
|
|
a345a0518d | ||
|
|
0b6a4d2520 | ||
|
|
a60bc2e155 | ||
|
|
5bd401a038 | ||
|
|
a7312ef615 | ||
|
|
6175af66c1 | ||
|
|
86dead7f57 | ||
|
|
f10f7ea008 | ||
|
|
4c58a646c9 | ||
|
|
686c99f09a | ||
|
|
8947fec1a4 | ||
|
|
8fdbd0abb6 | ||
|
|
98fe1aead2 | ||
|
|
1143caf498 | ||
|
|
a3c781f2ea | ||
|
|
123c006dc7 | ||
|
|
003e93be08 | ||
|
|
efdca4bff1 | ||
|
|
5542b7318b | ||
|
|
e5849335e5 | ||
|
|
0726bd8082 | ||
|
|
417a5426ff | ||
|
|
c3e4f58964 | ||
|
|
f081be2413 | ||
|
|
f7e3d1e6c5 | ||
|
|
7ba29e593f | ||
|
|
8b1ceb836b | ||
|
|
9d3d40ade8 | ||
|
|
ca3e765e58 | ||
|
|
4b719eab82 | ||
|
|
a2eb94b382 | ||
|
|
4e793ef30d | ||
|
|
a3fe9f280a | ||
|
|
51db6c45f1 | ||
|
|
067ca723c8 | ||
|
|
12768d1bc9 | ||
|
|
67d3f84c51 | ||
|
|
17af9fb311 | ||
|
|
8da27576b5 | ||
|
|
d56381df77 | ||
|
|
a133043d0c | ||
|
|
bb92592418 | ||
|
|
6e35326c75 | ||
|
|
b8b416038b | ||
|
|
0b5b2825ee | ||
|
|
886b047ace | ||
|
|
5ad9862680 | ||
|
|
a0fe9cad06 | ||
|
|
be970009a2 | ||
|
|
562253b776 | ||
|
|
df97207c48 | ||
|
|
aa2bc06ea8 | ||
|
|
65d42c001e | ||
|
|
ba3952bd89 | ||
|
|
ef88af1f9a | ||
|
|
8ab2bdcfde | ||
|
|
190bf6f3db | ||
|
|
18b6b4ce5d | ||
|
|
dd65b4697e | ||
|
|
9294c9f885 |
2
.github/CONTRIBUTING.md
vendored
@@ -126,7 +126,7 @@ By default, Kestra will be installed under: `$HOME/.kestra/current`. Set the `KE
|
||||
```bash
|
||||
# build and install Kestra
|
||||
make install
|
||||
# install plugins (plugins installation is based on the `.plugins` or `.plugins.override` files located at the root of the project.
|
||||
# install plugins (plugins installation is based on the API).
|
||||
make install-plugins
|
||||
# start Kestra in standalone mode with Postgres as backend
|
||||
make start-standalone-postgres
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
name: Run Gradle Release for Kestra Plugins
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
releaseVersion:
|
||||
description: 'The release version (e.g., 0.21.0)'
|
||||
required: true
|
||||
type: string
|
||||
nextVersion:
|
||||
description: 'The next version (e.g., 0.22.0-SNAPSHOT)'
|
||||
required: true
|
||||
type: string
|
||||
dryRun:
|
||||
description: 'Use DRY_RUN mode'
|
||||
required: false
|
||||
default: 'false'
|
||||
jobs:
|
||||
release:
|
||||
name: Release plugins
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
# Checkout
|
||||
- uses: actions/checkout@v5
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
# Setup build
|
||||
- uses: kestra-io/actions/composite/setup-build@main
|
||||
id: build
|
||||
with:
|
||||
java-enabled: true
|
||||
node-enabled: true
|
||||
python-enabled: true
|
||||
|
||||
# Get Plugins List
|
||||
- name: Get Plugins List
|
||||
uses: kestra-io/actions/composite/kestra-oss/kestra-oss-plugins-list@main
|
||||
id: plugins-list
|
||||
with:
|
||||
plugin-version: 'LATEST'
|
||||
|
||||
- name: 'Configure Git'
|
||||
run: |
|
||||
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git config --global user.name "github-actions[bot]"
|
||||
|
||||
# Execute
|
||||
- name: Run Gradle Release
|
||||
if: ${{ github.event.inputs.dryRun == 'false' }}
|
||||
env:
|
||||
GITHUB_PAT: ${{ secrets.GH_PERSONAL_TOKEN }}
|
||||
run: |
|
||||
chmod +x ./dev-tools/release-plugins.sh;
|
||||
|
||||
./dev-tools/release-plugins.sh \
|
||||
--release-version=${{github.event.inputs.releaseVersion}} \
|
||||
--next-version=${{github.event.inputs.nextVersion}} \
|
||||
--yes \
|
||||
${{ steps.plugins-list.outputs.repositories }}
|
||||
|
||||
- name: Run Gradle Release (DRY_RUN)
|
||||
if: ${{ github.event.inputs.dryRun == 'true' }}
|
||||
env:
|
||||
GITHUB_PAT: ${{ secrets.GH_PERSONAL_TOKEN }}
|
||||
run: |
|
||||
chmod +x ./dev-tools/release-plugins.sh;
|
||||
|
||||
./dev-tools/release-plugins.sh \
|
||||
--release-version=${{github.event.inputs.releaseVersion}} \
|
||||
--next-version=${{github.event.inputs.nextVersion}} \
|
||||
--dry-run \
|
||||
--yes \
|
||||
${{ steps.plugins-list.outputs.repositories }}
|
||||
@@ -1,60 +0,0 @@
|
||||
name: Set Version and Tag Plugins
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
releaseVersion:
|
||||
description: 'The release version (e.g., 0.21.0)'
|
||||
required: true
|
||||
type: string
|
||||
dryRun:
|
||||
description: 'Use DRY_RUN mode'
|
||||
required: false
|
||||
default: 'false'
|
||||
jobs:
|
||||
tag:
|
||||
name: Release plugins
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
# Checkout
|
||||
- uses: actions/checkout@v5
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
# Get Plugins List
|
||||
- name: Get Plugins List
|
||||
uses: kestra-io/actions/composite/kestra-oss/kestra-oss-plugins-list@main
|
||||
id: plugins-list
|
||||
with:
|
||||
plugin-version: 'LATEST'
|
||||
|
||||
- name: 'Configure Git'
|
||||
run: |
|
||||
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git config --global user.name "github-actions[bot]"
|
||||
|
||||
# Execute
|
||||
- name: Set Version and Tag Plugins
|
||||
if: ${{ github.event.inputs.dryRun == 'false' }}
|
||||
env:
|
||||
GITHUB_PAT: ${{ secrets.GH_PERSONAL_TOKEN }}
|
||||
run: |
|
||||
chmod +x ./dev-tools/setversion-tag-plugins.sh;
|
||||
|
||||
./dev-tools/setversion-tag-plugins.sh \
|
||||
--release-version=${{github.event.inputs.releaseVersion}} \
|
||||
--yes \
|
||||
${{ steps.plugins-list.outputs.repositories }}
|
||||
|
||||
- name: Set Version and Tag Plugins (DRY_RUN)
|
||||
if: ${{ github.event.inputs.dryRun == 'true' }}
|
||||
env:
|
||||
GITHUB_PAT: ${{ secrets.GH_PERSONAL_TOKEN }}
|
||||
run: |
|
||||
chmod +x ./dev-tools/setversion-tag-plugins.sh;
|
||||
|
||||
./dev-tools/setversion-tag-plugins.sh \
|
||||
--release-version=${{github.event.inputs.releaseVersion}} \
|
||||
--dry-run \
|
||||
--yes \
|
||||
${{ steps.plugins-list.outputs.repositories }}
|
||||
65
Makefile
@@ -13,7 +13,7 @@ SHELL := /bin/bash
|
||||
|
||||
KESTRA_BASEDIR := $(shell echo $${KESTRA_HOME:-$$HOME/.kestra/current})
|
||||
KESTRA_WORKER_THREAD := $(shell echo $${KESTRA_WORKER_THREAD:-4})
|
||||
VERSION := $(shell ./gradlew properties -q | awk '/^version:/ {print $$2}')
|
||||
VERSION := $(shell awk -F= '/^version=/ {gsub(/-SNAPSHOT/, "", $$2); gsub(/[[:space:]]/, "", $$2); print $$2}' gradle.properties)
|
||||
GIT_COMMIT := $(shell git rev-parse --short HEAD)
|
||||
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
|
||||
DATE := $(shell date --rfc-3339=seconds)
|
||||
@@ -48,38 +48,43 @@ build-exec:
|
||||
./gradlew -q executableJar --no-daemon --priority=normal
|
||||
|
||||
install: build-exec
|
||||
echo "Installing Kestra: ${KESTRA_BASEDIR}"
|
||||
mkdir -p ${KESTRA_BASEDIR}/bin ${KESTRA_BASEDIR}/plugins ${KESTRA_BASEDIR}/flows ${KESTRA_BASEDIR}/logs
|
||||
cp build/executable/* ${KESTRA_BASEDIR}/bin/kestra && chmod +x ${KESTRA_BASEDIR}/bin
|
||||
VERSION_INSTALLED=$$(${KESTRA_BASEDIR}/bin/kestra --version); \
|
||||
echo "Kestra installed successfully (version=$$VERSION_INSTALLED) 🚀"
|
||||
|
||||
# Install plugins for Kestra from (.plugins file).
|
||||
install-plugins:
|
||||
if [[ ! -f ".plugins" && ! -f ".plugins.override" ]]; then \
|
||||
echo "[ERROR] file '$$(pwd)/.plugins' and '$$(pwd)/.plugins.override' not found."; \
|
||||
@echo "Installing Kestra in ${KESTRA_BASEDIR}" ; \
|
||||
KESTRA_BASEDIR="${KESTRA_BASEDIR}" ; \
|
||||
mkdir -p "$${KESTRA_BASEDIR}/bin" "$${KESTRA_BASEDIR}/plugins" "$${KESTRA_BASEDIR}/flows" "$${KESTRA_BASEDIR}/logs" ; \
|
||||
echo "Copying executable..." ; \
|
||||
EXECUTABLE_FILE=$$(ls build/executable/kestra-* 2>/dev/null | head -n1) ; \
|
||||
if [ -z "$${EXECUTABLE_FILE}" ]; then \
|
||||
echo "[ERROR] No Kestra executable found in build/executable"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
fi ; \
|
||||
cp "$${EXECUTABLE_FILE}" "$${KESTRA_BASEDIR}/bin/kestra" ; \
|
||||
chmod +x "$${KESTRA_BASEDIR}/bin/kestra" ; \
|
||||
VERSION_INSTALLED=$$("$${KESTRA_BASEDIR}/bin/kestra" --version 2>/dev/null || echo "unknown") ; \
|
||||
echo "Kestra installed successfully (version=$${VERSION_INSTALLED}) 🚀"
|
||||
|
||||
PLUGIN_LIST="./.plugins"; \
|
||||
if [[ -f ".plugins.override" ]]; then \
|
||||
PLUGIN_LIST="./.plugins.override"; \
|
||||
fi; \
|
||||
while IFS= read -r plugin; do \
|
||||
[[ $$plugin =~ ^#.* ]] && continue; \
|
||||
PLUGINS_PATH="${KESTRA_INSTALL_DIR}/plugins"; \
|
||||
CURRENT_PLUGIN=$${plugin/LATEST/"${VERSION}"}; \
|
||||
CURRENT_PLUGIN=$$(echo $$CURRENT_PLUGIN | cut -d':' -f2-); \
|
||||
PLUGIN_FILE="$$PLUGINS_PATH/$$(echo $$CURRENT_PLUGIN | awk -F':' '{print $$2"-"$$3}').jar"; \
|
||||
echo "Installing Kestra plugin $$CURRENT_PLUGIN > ${KESTRA_INSTALL_DIR}/plugins"; \
|
||||
if [ -f "$$PLUGIN_FILE" ]; then \
|
||||
echo "Plugin already installed in > $$PLUGIN_FILE"; \
|
||||
else \
|
||||
# Install plugins for Kestra from the API.
|
||||
install-plugins:
|
||||
@echo "Installing plugins for Kestra version ${VERSION}" ; \
|
||||
if [ -z "${VERSION}" ]; then \
|
||||
echo "[ERROR] Kestra version could not be determined."; \
|
||||
exit 1; \
|
||||
fi ; \
|
||||
PLUGINS_PATH="${KESTRA_BASEDIR}/plugins" ; \
|
||||
echo "Fetching plugin list from Kestra API for version ${VERSION}..." ; \
|
||||
RESPONSE=$$(curl -s "https://api.kestra.io/v1/plugins/artifacts/core-compatibility/${VERSION}/latest") ; \
|
||||
if [ -z "$${RESPONSE}" ]; then \
|
||||
echo "[ERROR] Failed to fetch plugin list from API."; \
|
||||
exit 1; \
|
||||
fi ; \
|
||||
echo "Parsing plugin list (excluding EE and secret plugins)..." ; \
|
||||
echo "$${RESPONSE}" | jq -r '.[] | select(.license == "OPEN_SOURCE" and (.groupId != "io.kestra.plugin.ee") and (.groupId != "io.kestra.ee.secret")) | .groupId + ":" + .artifactId + ":" + .version' | while read -r plugin; do \
|
||||
[[ $$plugin =~ ^#.* ]] && continue ; \
|
||||
CURRENT_PLUGIN=$${plugin} ; \
|
||||
echo "Installing $$CURRENT_PLUGIN..." ; \
|
||||
${KESTRA_BASEDIR}/bin/kestra plugins install $$CURRENT_PLUGIN \
|
||||
--plugins ${KESTRA_BASEDIR}/plugins \
|
||||
--repositories=https://central.sonatype.com/repository/maven-snapshots || exit 1; \
|
||||
fi \
|
||||
done < $$PLUGIN_LIST
|
||||
--plugins ${KESTRA_BASEDIR}/plugins \
|
||||
--repositories=https://central.sonatype.com/repository/maven-snapshots || exit 1 ; \
|
||||
done
|
||||
|
||||
# Build docker image from Kestra source.
|
||||
build-docker: build-exec
|
||||
|
||||
@@ -331,7 +331,7 @@ subprojects {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
agent "org.aspectj:aspectjweaver:1.9.24"
|
||||
agent "org.aspectj:aspectjweaver:1.9.25"
|
||||
}
|
||||
|
||||
test {
|
||||
|
||||
@@ -30,15 +30,15 @@ micronaut:
|
||||
read-idle-timeout: 60m
|
||||
write-idle-timeout: 60m
|
||||
idle-timeout: 60m
|
||||
netty:
|
||||
max-zstd-encode-size: 67108864 # increased to 64MB from the default of 32MB
|
||||
max-chunk-size: 10MB
|
||||
max-header-size: 32768 # increased from the default of 8k
|
||||
responses:
|
||||
file:
|
||||
cache-seconds: 86400
|
||||
cache-control:
|
||||
public: true
|
||||
netty:
|
||||
max-zstd-encode-size: 67108864 # increased to 64MB from the default of 32MB
|
||||
max-chunk-size: 10MB
|
||||
max-header-size: 32768 # increased from the default of 8k
|
||||
|
||||
# Access log configuration, see https://docs.micronaut.io/latest/guide/index.html#accessLogger
|
||||
access-logger:
|
||||
|
||||
@@ -68,8 +68,7 @@ class NoConfigCommandTest {
|
||||
|
||||
|
||||
assertThat(exitCode).isNotZero();
|
||||
// check that the only log is an access log: this has the advantage to also check that access log is working!
|
||||
assertThat(out.toString()).contains("POST /api/v1/main/flows HTTP/1.1 | status: 500");
|
||||
assertThat(out.toString()).isEmpty();
|
||||
assertThat(err.toString()).contains("No bean of type [io.kestra.core.repositories.FlowRepositoryInterface] exists");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,8 +5,6 @@ import io.kestra.core.models.annotations.Plugin;
|
||||
import io.kestra.core.models.dashboards.filters.AbstractFilter;
|
||||
import io.kestra.core.repositories.QueryBuilderInterface;
|
||||
import io.kestra.plugin.core.dashboard.data.IData;
|
||||
import jakarta.annotation.Nullable;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
@@ -35,12 +33,9 @@ public abstract class DataFilter<F extends Enum<F>, C extends ColumnDescriptor<F
|
||||
@Pattern(regexp = JAVA_IDENTIFIER_REGEX)
|
||||
private String type;
|
||||
|
||||
@Valid
|
||||
private Map<String, C> columns;
|
||||
|
||||
@Setter
|
||||
@Valid
|
||||
@Nullable
|
||||
private List<AbstractFilter<F>> where;
|
||||
|
||||
private List<OrderBy> orderBy;
|
||||
|
||||
@@ -5,7 +5,6 @@ import io.kestra.core.models.annotations.Plugin;
|
||||
import io.kestra.core.models.dashboards.ChartOption;
|
||||
import io.kestra.core.models.dashboards.DataFilter;
|
||||
import io.kestra.core.validations.DataChartValidation;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
@@ -21,7 +20,6 @@ import lombok.experimental.SuperBuilder;
|
||||
@DataChartValidation
|
||||
public abstract class DataChart<P extends ChartOption, D extends DataFilter<?, ?>> extends Chart<P> implements io.kestra.core.models.Plugin {
|
||||
@NotNull
|
||||
@Valid
|
||||
private D data;
|
||||
|
||||
public Integer minNumberOfAggregations() {
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
package io.kestra.core.models.dashboards.filters;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonSubTypes;
|
||||
import com.fasterxml.jackson.annotation.JsonTypeInfo;
|
||||
import io.micronaut.core.annotation.Introspected;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
@@ -35,9 +32,6 @@ import lombok.experimental.SuperBuilder;
|
||||
@SuperBuilder
|
||||
@Introspected
|
||||
public abstract class AbstractFilter<F extends Enum<F>> {
|
||||
@NotNull
|
||||
@JsonProperty(value = "field", required = true)
|
||||
@Valid
|
||||
private F field;
|
||||
private String labelKey;
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ import io.kestra.core.validations.Regex;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.ConstraintViolationException;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -27,6 +28,7 @@ public class SelectInput extends Input<String> implements RenderableInput {
|
||||
@Schema(
|
||||
title = "List of values."
|
||||
)
|
||||
@Size(min = 2)
|
||||
List<@Regex String> values;
|
||||
|
||||
@Schema(
|
||||
|
||||
@@ -10,6 +10,8 @@ public interface FlowTopologyRepositoryInterface {
|
||||
|
||||
List<FlowTopology> findByNamespace(String tenantId, String namespace);
|
||||
|
||||
List<FlowTopology> findByNamespacePrefix(String tenantId, String namespacePrefix);
|
||||
|
||||
List<FlowTopology> findAll(String tenantId);
|
||||
|
||||
FlowTopology save(FlowTopology flowTopology);
|
||||
|
||||
@@ -82,7 +82,8 @@ public abstract class FilesService {
|
||||
}
|
||||
|
||||
private static String resolveUniqueNameForFile(final Path path) {
|
||||
String filename = path.getFileName().toString().replace(' ', '+');
|
||||
return IdUtils.from(path.toString()) + "-" + filename;
|
||||
String filename = path.getFileName().toString();
|
||||
String encodedFilename = java.net.URLEncoder.encode(filename, java.nio.charset.StandardCharsets.UTF_8);
|
||||
return IdUtils.from(path.toString()) + "-" + encodedFilename;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -151,7 +151,10 @@ abstract class AbstractFileFunction implements Function {
|
||||
// if there is a trigger of type execution, we also allow accessing a file from the parent execution
|
||||
Map<String, String> trigger = (Map<String, String>) context.getVariable(TRIGGER);
|
||||
|
||||
return isFileUriValid(trigger.get(NAMESPACE), trigger.get("flowId"), trigger.get("executionId"), path);
|
||||
if (!isFileUriValid(trigger.get(NAMESPACE), trigger.get("flowId"), trigger.get("executionId"), path)) {
|
||||
throw new IllegalArgumentException("Unable to read the file '" + path + "' as it didn't belong to the parent execution");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -548,6 +548,8 @@ public class FlowService {
|
||||
|
||||
var flowTopologies = flowTopologyRepository.get().findByFlow(tenantId, namespace, id, destinationOnly);
|
||||
|
||||
var visitedNodes = new ArrayList<String>();
|
||||
visitedNodes.add(id);
|
||||
return flowTopologies.stream()
|
||||
// ignore already visited topologies
|
||||
.filter(x -> !visitedTopologies.contains(x.uid()))
|
||||
@@ -555,8 +557,13 @@ public class FlowService {
|
||||
visitedTopologies.add(topology.uid());
|
||||
Stream<FlowTopology> subTopologies = Stream
|
||||
.of(topology.getDestination(), topology.getSource())
|
||||
// ignore already visited nodes
|
||||
.filter(x -> !visitedNodes.contains(x.getId()))
|
||||
// recursively visit children and parents nodes
|
||||
.flatMap(relationNode -> recursiveFlowTopology(visitedTopologies, relationNode.getTenantId(), relationNode.getNamespace(), relationNode.getId(), destinationOnly));
|
||||
.flatMap(relationNode -> {
|
||||
visitedNodes.add(relationNode.getId());
|
||||
return recursiveFlowTopology(visitedTopologies, relationNode.getTenantId(), relationNode.getNamespace(), relationNode.getId(), destinationOnly);
|
||||
});
|
||||
return Stream.concat(Stream.of(topology), subTopologies);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -360,4 +360,41 @@ public interface StorageInterface extends AutoCloseable, Plugin {
|
||||
|
||||
return path;
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensures the object name length does not exceed the allowed maximum.
|
||||
* If it does, the object name is truncated and a short random prefix is added
|
||||
* to avoid potential name collisions.
|
||||
*
|
||||
* @param uri the URI of the object
|
||||
* @param maxObjectNameLength the maximum allowed length for the object name
|
||||
* @return a normalized URI respecting the length limit
|
||||
* @throws IOException if the URI cannot be rebuilt
|
||||
*/
|
||||
default URI limit(URI uri, int maxObjectNameLength) throws IOException {
|
||||
if (uri == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
String path = uri.getPath();
|
||||
String objectName = path.contains("/") ? path.substring(path.lastIndexOf("/") + 1) : path;
|
||||
|
||||
if (objectName.length() > maxObjectNameLength) {
|
||||
objectName = objectName.substring(objectName.length() - maxObjectNameLength + 6);
|
||||
String prefix = org.apache.commons.lang3.RandomStringUtils.secure()
|
||||
.nextAlphanumeric(5)
|
||||
.toLowerCase();
|
||||
|
||||
String newPath = (path.contains("/") ? path.substring(0, path.lastIndexOf("/") + 1) : "")
|
||||
+ prefix + "-" + objectName;
|
||||
|
||||
try {
|
||||
return new URI(uri.getScheme(), uri.getHost(), newPath, uri.getFragment());
|
||||
} catch (java.net.URISyntaxException e) {
|
||||
throw new IOException(e);
|
||||
}
|
||||
}
|
||||
|
||||
return uri;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ public class FlowTopologyService {
|
||||
}
|
||||
|
||||
public FlowTopologyGraph namespaceGraph(String tenantId, String namespace) {
|
||||
List<FlowTopology> flowTopologies = flowTopologyRepository.findByNamespace(tenantId, namespace);
|
||||
List<FlowTopology> flowTopologies = flowTopologyRepository.findByNamespacePrefix(tenantId, namespace);
|
||||
|
||||
FlowTopologyGraph graph = this.graph(flowTopologies.stream(), (flowNode -> flowNode));
|
||||
|
||||
|
||||
@@ -33,13 +33,11 @@ public class ExecutionsDataFilterValidator implements ConstraintValidator<Execut
|
||||
}
|
||||
});
|
||||
|
||||
if (executionsDataFilter.getWhere() != null) {
|
||||
executionsDataFilter.getWhere().forEach(filter -> {
|
||||
if (filter.getField() == Executions.Fields.LABELS && filter.getLabelKey() == null) {
|
||||
violations.add("Label filters must have a `labelKey`.");
|
||||
}
|
||||
});
|
||||
}
|
||||
executionsDataFilter.getWhere().forEach(filter -> {
|
||||
if (filter.getField() == Executions.Fields.LABELS && filter.getLabelKey() == null) {
|
||||
violations.add("Label filters must have a `labelKey`.");
|
||||
}
|
||||
});
|
||||
|
||||
if (!violations.isEmpty()) {
|
||||
context.disableDefaultConstraintViolation();
|
||||
|
||||
@@ -20,6 +20,8 @@ import java.io.BufferedOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.net.URI;
|
||||
import java.net.URLEncoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
@@ -58,15 +60,7 @@ import static io.kestra.core.utils.Rethrow.throwConsumer;
|
||||
public class Download extends AbstractHttp implements RunnableTask<Download.Output> {
|
||||
@Schema(title = "Should the task fail when downloading an empty file.")
|
||||
@Builder.Default
|
||||
private Property<Boolean> failOnEmptyResponse = Property.ofValue(true);
|
||||
|
||||
@Schema(
|
||||
title = "Name of the file inside the output.",
|
||||
description = """
|
||||
If not provided, the filename will be extracted from the `Content-Disposition` header.
|
||||
If no `Content-Disposition` header, a name would be generated."""
|
||||
)
|
||||
private Property<String> saveAs;
|
||||
private final Property<Boolean> failOnEmptyResponse = Property.ofValue(true);
|
||||
|
||||
public Output run(RunContext runContext) throws Exception {
|
||||
Logger logger = runContext.logger();
|
||||
@@ -117,22 +111,20 @@ public class Download extends AbstractHttp implements RunnableTask<Download.Outp
|
||||
}
|
||||
}
|
||||
|
||||
String rFilename = runContext.render(this.saveAs).as(String.class).orElse(null);
|
||||
if (rFilename == null) {
|
||||
if (response.getHeaders().firstValue("Content-Disposition").isPresent()) {
|
||||
String contentDisposition = response.getHeaders().firstValue("Content-Disposition").orElseThrow();
|
||||
rFilename = filenameFromHeader(runContext, contentDisposition);
|
||||
if (rFilename != null) {
|
||||
rFilename = rFilename.replace(' ', '+');
|
||||
}
|
||||
}
|
||||
String filename = null;
|
||||
if (response.getHeaders().firstValue("Content-Disposition").isPresent()) {
|
||||
String contentDisposition = response.getHeaders().firstValue("Content-Disposition").orElseThrow();
|
||||
filename = filenameFromHeader(runContext, contentDisposition);
|
||||
}
|
||||
if (filename != null) {
|
||||
filename = URLEncoder.encode(filename, StandardCharsets.UTF_8);
|
||||
}
|
||||
|
||||
logger.debug("File '{}' downloaded with size '{}'", from, size);
|
||||
|
||||
return Output.builder()
|
||||
.code(response.getStatus().getCode())
|
||||
.uri(runContext.storage().putFile(tempFile, rFilename))
|
||||
.uri(runContext.storage().putFile(tempFile, filename))
|
||||
.headers(response.getHeaders().map())
|
||||
.length(size.get())
|
||||
.build();
|
||||
|
||||
@@ -206,22 +206,22 @@ import static io.kestra.core.utils.Rethrow.throwPredicate;
|
||||
tasks:
|
||||
- id: send_alert
|
||||
type: io.kestra.plugin.notifications.sentry.SentryExecution
|
||||
executionId: "{{ trigger.executionId }}"
|
||||
transaction: "/execution/id/{{ trigger.executionId }}"
|
||||
dsn: "{{ secret('SENTRY_DSN') }}"
|
||||
level: ERROR
|
||||
executionId: "{{ trigger.executionId }}"
|
||||
transaction: "/execution/id/{{ trigger.executionId }}"
|
||||
dsn: "{{ secret('SENTRY_DSN') }}"
|
||||
level: ERROR
|
||||
|
||||
triggers:
|
||||
- id: failed_prod_workflows
|
||||
type: io.kestra.plugin.core.trigger.Flow
|
||||
conditions:
|
||||
- type: io.kestra.plugin.core.condition.ExecutionStatus
|
||||
in:
|
||||
- FAILED
|
||||
- WARNING
|
||||
- type: io.kestra.plugin.core.condition.ExecutionNamespace
|
||||
namespace: company.payroll
|
||||
prefix: false"""
|
||||
type: io.kestra.plugin.core.trigger.Flow
|
||||
conditions:
|
||||
- type: io.kestra.plugin.core.condition.ExecutionStatus
|
||||
in:
|
||||
- FAILED
|
||||
- WARNING
|
||||
- type: io.kestra.plugin.core.condition.ExecutionNamespace
|
||||
namespace: company.payroll
|
||||
prefix: false"""
|
||||
)
|
||||
|
||||
},
|
||||
|
||||
@@ -35,7 +35,7 @@ import jakarta.validation.constraints.Size;
|
||||
description = """
|
||||
Webhook trigger allows you to create a unique URL that you can use to trigger a Kestra flow execution based on events in another application such as GitHub or Amazon EventBridge. In order to use that URL, you have to add a secret key to secure your webhook URL.
|
||||
|
||||
The URL will then follow the following format: `https://{your_hostname}/api/v1/executions/webhook/{namespace}/{flowId}/{key}`. Replace the templated values according to your workflow setup.
|
||||
The URL will then follow the following format: `https://{your_hostname}/api/v1/{tenant}/executions/webhook/{namespace}/{flowId}/{key}`. Replace the templated values according to your workflow setup.
|
||||
|
||||
The webhook URL accepts `GET`, `POST`, and `PUT` requests.
|
||||
|
||||
@@ -85,7 +85,7 @@ import jakarta.validation.constraints.Size;
|
||||
@Plugin(
|
||||
examples = {
|
||||
@Example(
|
||||
title = "Add a webhook trigger to the current flow with the key `4wjtkzwVGBM9yKnjm3yv8r`; the webhook will be available at the URI `/api/v1/executions/webhook/{namespace}/{flowId}/4wjtkzwVGBM9yKnjm3yv8r`.",
|
||||
title = "Add a webhook trigger to the current flow with the key `4wjtkzwVGBM9yKnjm3yv8r`; the webhook will be available at the URI `/api/v1/{tenant}/executions/webhook/{namespace}/{flowId}/4wjtkzwVGBM9yKnjm3yv8r`.",
|
||||
code = """
|
||||
id: webhook_flow
|
||||
namespace: company.team
|
||||
|
||||
@@ -1,6 +1,31 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M5 21H19C20.1 21 21 20.1 21 19V5C21 3.9 20.1 3 19 3H5C3.9 3 3 3.9 3 5V19C3 20.1 3.9 21 5 21ZM5 5H19V19H5V5Z" fill="currentColor"/>
|
||||
<path d="M17.19 12C17.19 10.5913 16.5227 9.25676 15.4106 8.29291L14.2243 8.73776C15.1881 9.47918 15.7071 10.7396 15.7071 12C15.7071 13.2604 15.1881 14.5208 14.2243 15.2623L15.4106 15.7071C16.5227 14.7433 17.19 13.4087 17.19 12Z" fill="currentColor"/>
|
||||
<path d="M9.77575 8.73776L8.58947 8.29291C7.47734 9.25676 6.81006 10.5913 6.81006 12C6.81006 13.4087 7.47734 14.7433 8.58947 15.7071L9.77575 15.2623C8.8119 14.5208 8.2929 13.2604 8.2929 12C8.2929 10.7396 8.8119 9.47918 9.77575 8.73776Z" fill="currentColor"/>
|
||||
<path d="M13.1121 9.77575L12.0742 11.2586L11.481 9.77575H10.5172L11.481 11.9259L9.77575 14.2243H10.962L12 12.7414L12.5931 14.2243H13.557L12.5931 12L14.2243 9.77575H13.1121Z" fill="currentColor"/>
|
||||
<svg width="57" height="57" viewBox="0 0 57 57" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="debug=Return">
|
||||
<g id="Bkg" filter="url(#filter0_i_1386_1709)">
|
||||
<path d="M0 14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57H14.25C6.37994 57 0 50.6201 0 42.75V14.25Z" fill="url(#paint0_linear_1386_1709)"/>
|
||||
</g>
|
||||
<g clip-path="url(#paint1_angular_1386_1709_clip_path)" data-figma-skip-parse="true"><g transform="matrix(0 0.0285 -0.0285 0 28.5 28.5)"><foreignObject x="-1035.09" y="-1035.09" width="2070.18" height="2070.18"><div xmlns="http://www.w3.org/1999/xhtml" style="background:conic-gradient(from 90deg,rgba(181, 231, 255, 1) 0deg,rgba(241, 117, 255, 1) 72.6923deg,rgba(241, 117, 255, 0.1) 360deg);height:100%;width:100%;opacity:1"></div></foreignObject></g></g><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z" data-figma-gradient-fill="{"type":"GRADIENT_ANGULAR","stops":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"stopsVar":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"transform":{"m00":3.4902435166328386e-15,"m01":-57.0,"m02":57.0,"m10":57.0,"m11":3.4902435166328386e-15,"m12":0.0},"opacity":1.0,"blendMode":"NORMAL","visible":true}"/>
|
||||
<g id="bug-check-outline">
|
||||
<path id="Union" d="M41.2998 36.0703L38.8701 38.5H46V43.5H44.5V40H38.8701L41.2998 42.4297L40.2402 43.5L36 39.25L40.2402 35L41.2998 36.0703ZM37.333 14.8252L34.5488 17.542C35.8299 18.3961 36.8895 19.5915 37.6582 20.958H42.458V24.375H38.8877C38.9902 24.9386 39.042 25.5023 39.042 26.083V27.792H42.458V31.208H39.042V31.8066C37.7438 32.2678 36.5479 32.9849 35.54 33.9072C35.6253 33.5829 35.625 33.2414 35.625 32.917V26.083C35.6248 22.3079 32.5671 19.2502 28.792 19.25C25.0167 19.25 21.9582 22.3078 21.958 26.083V32.917C21.9581 36.6923 25.0167 39.75 28.792 39.75C30.1585 39.7499 31.5083 39.34 32.6357 38.5713C32.3624 39.5107 32.2081 40.4844 32.208 41.458V42.5684C27.5615 44.2082 22.4029 42.3125 19.9258 38.042H15.125V34.625H18.6953C18.5928 34.0614 18.542 33.4977 18.542 32.917V31.208H15.125V27.792H18.542V26.083C18.542 25.5023 18.5928 24.9386 18.6953 24.375H15.125V20.958H19.9258C20.6945 19.6086 21.7365 18.3961 23.0176 17.542L20.25 14.8252L22.6592 12.417L26.3828 16.124C27.1686 15.9361 27.9378 15.833 28.792 15.833C29.646 15.833 30.432 15.9361 31.2178 16.124L34.9248 12.417L37.333 14.8252ZM32.208 34.625H25.375V31.208H32.208V34.625ZM32.208 27.792H25.375V24.375H32.208V27.792Z" fill="url(#paint2_linear_1386_1709)"/>
|
||||
</g>
|
||||
</g>
|
||||
<defs>
|
||||
<filter id="filter0_i_1386_1709" x="0" y="0" width="57" height="59" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
||||
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
|
||||
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
|
||||
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
|
||||
<feOffset dy="2"/>
|
||||
<feGaussianBlur stdDeviation="1"/>
|
||||
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
|
||||
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.75 0"/>
|
||||
<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1386_1709"/>
|
||||
</filter>
|
||||
<clipPath id="paint1_angular_1386_1709_clip_path"><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z"/></clipPath><linearGradient id="paint0_linear_1386_1709" x1="52.25" y1="48.6875" x2="8.3125" y2="7.125" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#01000B"/>
|
||||
<stop offset="1" stop-color="#520188"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint2_linear_1386_1709" x1="32.4922" y1="35.7292" x2="32.4922" y2="10.4743" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#91F4FF"/>
|
||||
<stop offset="0.5" stop-color="#D67EE2"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 957 B After Width: | Height: | Size: 5.2 KiB |
@@ -1,4 +1,31 @@
|
||||
<svg fill="currentColor" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
|
||||
<path
|
||||
d="M20,8H17.19C16.74,7.2 16.12,6.5 15.37,6L17,4.41L15.59,3L13.42,5.17C12.96,5.06 12.5,5 12,5C11.5,5 11.05,5.06 10.59,5.17L8.41,3L7,4.41L8.62,6C7.87,6.5 7.26,7.21 6.81,8H4V10H6.09C6.03,10.33 6,10.66 6,11V12H4V14H6V15C6,15.34 6.03,15.67 6.09,16H4V18H6.81C8.47,20.87 12.14,21.84 15,20.18C15.91,19.66 16.67,18.9 17.19,18H20V16H17.91C17.97,15.67 18,15.34 18,15V14H20V12H18V11C18,10.66 17.97,10.33 17.91,10H20V8M16,15A4,4 0 0,1 12,19A4,4 0 0,1 8,15V11A4,4 0 0,1 12,7A4,4 0 0,1 16,11V15M14,10V12H10V10H14M10,14H14V16H10V14Z" fill="currentColor"/>
|
||||
</svg>
|
||||
<svg width="57" height="57" viewBox="0 0 57 57" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="debug=Main">
|
||||
<g id="Bkg" filter="url(#filter0_i_1386_1701)">
|
||||
<path d="M0 14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57H14.25C6.37994 57 0 50.6201 0 42.75V14.25Z" fill="url(#paint0_linear_1386_1701)"/>
|
||||
</g>
|
||||
<g clip-path="url(#paint1_angular_1386_1701_clip_path)" data-figma-skip-parse="true"><g transform="matrix(0 0.0285 -0.0285 0 28.5 28.5)"><foreignObject x="-1035.09" y="-1035.09" width="2070.18" height="2070.18"><div xmlns="http://www.w3.org/1999/xhtml" style="background:conic-gradient(from 90deg,rgba(181, 231, 255, 1) 0deg,rgba(241, 117, 255, 1) 72.6923deg,rgba(241, 117, 255, 0.1) 360deg);height:100%;width:100%;opacity:1"></div></foreignObject></g></g><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z" data-figma-gradient-fill="{"type":"GRADIENT_ANGULAR","stops":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"stopsVar":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"transform":{"m00":3.4902435166328386e-15,"m01":-57.0,"m02":57.0,"m10":57.0,"m11":3.4902435166328386e-15,"m12":0.0},"opacity":1.0,"blendMode":"NORMAL","visible":true}"/>
|
||||
<g id="bug-outline">
|
||||
<path id="Vector" d="M42.1666 20.6667H37.3662C36.5975 19.3 35.5383 18.1042 34.2571 17.25L37.0416 14.5337L34.6329 12.125L30.9258 15.8321C30.14 15.6442 29.3541 15.5417 28.5 15.5417C27.6458 15.5417 26.8771 15.6442 26.0912 15.8321L22.3671 12.125L19.9583 14.5337L22.7258 17.25C21.4446 18.1042 20.4025 19.3171 19.6337 20.6667H14.8333V24.0833H18.4037C18.3012 24.6471 18.25 25.2108 18.25 25.7917V27.5H14.8333V30.9167H18.25V32.625C18.25 33.2058 18.3012 33.7696 18.4037 34.3333H14.8333V37.75H19.6337C22.4696 42.6529 28.7391 44.31 33.625 41.4742C35.1796 40.5858 36.4779 39.2875 37.3662 37.75H42.1666V34.3333H38.5962C38.6987 33.7696 38.75 33.2058 38.75 32.625V30.9167H42.1666V27.5H38.75V25.7917C38.75 25.2108 38.6987 24.6471 38.5962 24.0833H42.1666V20.6667ZM35.3333 32.625C35.3333 34.4373 34.6134 36.1754 33.3319 37.4569C32.0504 38.7384 30.3123 39.4583 28.5 39.4583C26.6877 39.4583 24.9496 38.7384 23.6681 37.4569C22.3866 36.1754 21.6666 34.4373 21.6666 32.625V25.7917C21.6666 23.9794 22.3866 22.2413 23.6681 20.9598C24.9496 19.6783 26.6877 18.9583 28.5 18.9583C30.3123 18.9583 32.0504 19.6783 33.3319 20.9598C34.6134 22.2413 35.3333 23.9794 35.3333 25.7917V32.625ZM31.9166 24.0833V27.5H25.0833V24.0833H31.9166ZM25.0833 30.9167H31.9166V34.3333H25.0833V30.9167Z" fill="url(#paint2_linear_1386_1701)"/>
|
||||
</g>
|
||||
</g>
|
||||
<defs>
|
||||
<filter id="filter0_i_1386_1701" x="0" y="0" width="57" height="59" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
||||
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
|
||||
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
|
||||
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
|
||||
<feOffset dy="2"/>
|
||||
<feGaussianBlur stdDeviation="1"/>
|
||||
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
|
||||
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.75 0"/>
|
||||
<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1386_1701"/>
|
||||
</filter>
|
||||
<clipPath id="paint1_angular_1386_1701_clip_path"><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z"/></clipPath><linearGradient id="paint0_linear_1386_1701" x1="52.25" y1="48.6875" x2="8.3125" y2="7.125" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#01000B"/>
|
||||
<stop offset="1" stop-color="#520188"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint2_linear_1386_1701" x1="30.2083" y1="35.1752" x2="30.2083" y2="10.2041" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#91F4FF"/>
|
||||
<stop offset="0.5" stop-color="#D67EE2"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 645 B After Width: | Height: | Size: 5.3 KiB |
@@ -0,0 +1,50 @@
|
||||
<svg width="57" height="57" viewBox="0 0 57 57" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="kv=Delete">
|
||||
<g id="Bkg" filter="url(#filter0_i_1386_1687)">
|
||||
<path d="M0 14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57H14.25C6.37994 57 0 50.6201 0 42.75V14.25Z" fill="url(#paint0_linear_1386_1687)"/>
|
||||
</g>
|
||||
<g id="KV">
|
||||
<path id="Vector" d="M32.5532 24L28 14H30.7801L33.6454 20.6525L36.5106 14H39.1915L34.6241 24H32.5532Z" fill="url(#paint1_linear_1386_1687)"/>
|
||||
<path id="Vector_2" d="M17 24V14H19.6099V18.2837H19.6383L23.5248 14H26.617L22.1631 18.7518L26.773 24H23.6667L19.6383 19.4894H19.6099V24H17Z" fill="url(#paint2_linear_1386_1687)"/>
|
||||
</g>
|
||||
<g clip-path="url(#paint3_angular_1386_1687_clip_path)" data-figma-skip-parse="true"><g transform="matrix(0 0.0285 -0.0285 0 28.5 28.5)"><foreignObject x="-1035.09" y="-1035.09" width="2070.18" height="2070.18"><div xmlns="http://www.w3.org/1999/xhtml" style="background:conic-gradient(from 90deg,rgba(181, 231, 255, 1) 0deg,rgba(241, 117, 255, 1) 72.6923deg,rgba(241, 117, 255, 0.1) 360deg);height:100%;width:100%;opacity:1"></div></foreignObject></g></g><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z" data-figma-gradient-fill="{"type":"GRADIENT_ANGULAR","stops":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"stopsVar":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"transform":{"m00":3.4902435166328386e-15,"m01":-57.0,"m02":57.0,"m10":57.0,"m11":3.4902435166328386e-15,"m12":0.0},"opacity":1.0,"blendMode":"NORMAL","visible":true}"/>
|
||||
<g id="Vector_3">
|
||||
<path d="M47.3949 43.2913L43.7056 46.9807L28.9483 32.2233L32.6376 28.534L47.3949 43.2913Z" fill="url(#paint4_linear_1386_1687)"/>
|
||||
<path d="M32.6376 46.9807L28.9483 43.2913L43.7056 28.534L47.3949 32.2233L32.6376 46.9807Z" fill="url(#paint5_linear_1386_1687)"/>
|
||||
</g>
|
||||
</g>
|
||||
<defs>
|
||||
<filter id="filter0_i_1386_1687" x="0" y="0" width="57" height="59" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
||||
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
|
||||
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
|
||||
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
|
||||
<feOffset dy="2"/>
|
||||
<feGaussianBlur stdDeviation="1"/>
|
||||
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
|
||||
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.75 0"/>
|
||||
<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1386_1687"/>
|
||||
</filter>
|
||||
<clipPath id="paint3_angular_1386_1687_clip_path"><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z"/></clipPath><linearGradient id="paint0_linear_1386_1687" x1="52.25" y1="48.6875" x2="8.3125" y2="7.125" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#01000B"/>
|
||||
<stop offset="1" stop-color="#520188"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint1_linear_1386_1687" x1="28.7989" y1="16.9796" x2="29.988" y2="28.4007" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EEDBFF"/>
|
||||
<stop offset="0.774038" stop-color="#FBF8FF"/>
|
||||
<stop offset="1" stop-color="#F7E7FF"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint2_linear_1386_1687" x1="26.1471" y1="16.9796" x2="27.3362" y2="28.4007" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EEDBFF"/>
|
||||
<stop offset="0.774038" stop-color="#FBF8FF"/>
|
||||
<stop offset="1" stop-color="#F7E7FF"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint4_linear_1386_1687" x1="35.4046" y1="42.369" x2="47.3949" y2="30.3786" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#91F4FF"/>
|
||||
<stop offset="0.5" stop-color="#D67EE2"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint5_linear_1386_1687" x1="35.4046" y1="42.369" x2="47.3949" y2="30.3786" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#91F4FF"/>
|
||||
<stop offset="0.5" stop-color="#D67EE2"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 5.3 KiB |
@@ -1,4 +1,45 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M21.5 19.5L18.5 22.5L15.5 19.5H17.5V15.5H19.5V19.5H21.5Z" fill="currentColor"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.97119 2.03955C3.86662 2.03955 2.97119 2.93498 2.97119 4.03955V19.9785C2.97119 21.0831 3.86662 21.9785 4.97119 21.9785H13.7188C13.2039 21.0924 12.9091 20.0627 12.9091 18.964C12.9091 15.6454 15.5994 12.9551 18.918 12.9551C19.6608 12.9551 20.3721 13.0899 21.0288 13.3363V4.03955C21.0288 2.93498 20.1334 2.03955 19.0288 2.03955H4.97119ZM13.5582 10.54L12.1582 5.42804H13.4542L14.4582 9.60804H14.5502L15.5582 5.42804H16.8502L15.4542 10.54H13.5582ZM8.57785 8.30004L10.0458 10.54H11.4978L9.72544 7.86056L11.4418 5.42804H10.0258L8.57785 7.54804H8.38985V5.42804H7.14985V10.54H8.38985V8.30004H8.57785Z" fill="currentColor"/>
|
||||
<svg width="57" height="57" viewBox="0 0 57 57" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="kv=Get">
|
||||
<g id="Bkg" filter="url(#filter0_i_1386_1587)">
|
||||
<path d="M0 14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57H14.25C6.37994 57 0 50.6201 0 42.75V14.25Z" fill="url(#paint0_linear_1386_1587)"/>
|
||||
</g>
|
||||
<g id="KV">
|
||||
<path id="Vector" d="M32.5532 24L28 14H30.7801L33.6454 20.6525L36.5106 14H39.1915L34.6241 24H32.5532Z" fill="url(#paint1_linear_1386_1587)"/>
|
||||
<path id="Vector_2" d="M17 24V14H19.6099V18.2837H19.6383L23.5248 14H26.617L22.1631 18.7518L26.773 24H23.6667L19.6383 19.4894H19.6099V24H17Z" fill="url(#paint2_linear_1386_1587)"/>
|
||||
</g>
|
||||
<g id="download">
|
||||
<path id="Vector_3" d="M31 46H45V44H31M45 35H41V29H35V35H31L38 42L45 35Z" fill="url(#paint3_linear_1386_1587)"/>
|
||||
</g>
|
||||
<g clip-path="url(#paint4_angular_1386_1587_clip_path)" data-figma-skip-parse="true"><g transform="matrix(0 0.0285 -0.0285 0 28.5 28.5)"><foreignObject x="-1035.09" y="-1035.09" width="2070.18" height="2070.18"><div xmlns="http://www.w3.org/1999/xhtml" style="background:conic-gradient(from 90deg,rgba(181, 231, 255, 1) 0deg,rgba(241, 117, 255, 1) 72.6923deg,rgba(241, 117, 255, 0.1) 360deg);height:100%;width:100%;opacity:1"></div></foreignObject></g></g><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z" data-figma-gradient-fill="{"type":"GRADIENT_ANGULAR","stops":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"stopsVar":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"transform":{"m00":3.4902435166328386e-15,"m01":-57.0,"m02":57.0,"m10":57.0,"m11":3.4902435166328386e-15,"m12":0.0},"opacity":1.0,"blendMode":"NORMAL","visible":true}"/>
|
||||
</g>
|
||||
<defs>
|
||||
<filter id="filter0_i_1386_1587" x="0" y="0" width="57" height="59" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
||||
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
|
||||
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
|
||||
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
|
||||
<feOffset dy="2"/>
|
||||
<feGaussianBlur stdDeviation="1"/>
|
||||
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
|
||||
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.75 0"/>
|
||||
<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1386_1587"/>
|
||||
</filter>
|
||||
<clipPath id="paint4_angular_1386_1587_clip_path"><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z"/></clipPath><linearGradient id="paint0_linear_1386_1587" x1="52.25" y1="48.6875" x2="8.3125" y2="7.125" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#01000B"/>
|
||||
<stop offset="1" stop-color="#520188"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint1_linear_1386_1587" x1="28.7989" y1="16.9796" x2="29.988" y2="28.4007" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EEDBFF"/>
|
||||
<stop offset="0.774038" stop-color="#FBF8FF"/>
|
||||
<stop offset="1" stop-color="#F7E7FF"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint2_linear_1386_1587" x1="26.1471" y1="16.9796" x2="27.3362" y2="28.4007" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EEDBFF"/>
|
||||
<stop offset="0.774038" stop-color="#FBF8FF"/>
|
||||
<stop offset="1" stop-color="#F7E7FF"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint3_linear_1386_1587" x1="38.875" y1="41.75" x2="38.875" y2="27.9375" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#91F4FF"/>
|
||||
<stop offset="0.5" stop-color="#D67EE2"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 866 B After Width: | Height: | Size: 5.0 KiB |
@@ -1,3 +1,45 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.97852 4.03955C2.97852 2.93498 3.87395 2.03955 4.97852 2.03955H19.0288C20.1334 2.03955 21.0288 2.93498 21.0288 4.03955V19.957C21.0288 21.0616 20.1334 21.957 19.0288 21.957H4.97852C3.87395 21.957 2.97852 21.0616 2.97852 19.957V4.03955ZM7.00647 14.001C7.00647 13.4487 7.45419 13.001 8.00647 13.001C8.55875 13.001 9.00647 13.4487 9.00647 14.001C9.00647 14.5533 8.55875 15.001 8.00647 15.001C7.45419 15.001 7.00647 14.5533 7.00647 14.001ZM8.00647 16.9235C7.45419 16.9235 7.00647 17.3712 7.00647 17.9235C7.00647 18.4758 7.45419 18.9235 8.00647 18.9235C8.55875 18.9235 9.00647 18.4758 9.00647 17.9235C9.00647 17.3712 8.55875 16.9235 8.00647 16.9235ZM10.0037 14.001C10.0037 13.4487 10.4514 13.001 11.0037 13.001H15.988C16.5403 13.001 16.988 13.4487 16.988 14.001C16.988 14.5533 16.5403 15.001 15.988 15.001H11.0037C10.4514 15.001 10.0037 14.5533 10.0037 14.001ZM11.0037 16.9235C10.4514 16.9235 10.0037 17.3712 10.0037 17.9235C10.0037 18.4758 10.4514 18.9235 11.0037 18.9235H15.988C16.5403 18.9235 16.988 18.4758 16.988 17.9235C16.988 17.3712 16.5403 16.9235 15.988 16.9235H11.0037ZM13.5618 10.54L12.1618 5.42804H13.4578L14.4618 9.60804H14.5538L15.5618 5.42804H16.8538L15.4578 10.54H13.5618ZM8.5815 8.30004L10.0495 10.54H11.5015L9.7291 7.86056L11.4455 5.42804H10.0295L8.5815 7.54804H8.3935V5.42804H7.1535V10.54H8.3935V8.30004H8.5815Z" fill="currentColor"/>
|
||||
<svg width="57" height="57" viewBox="0 0 57 57" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="kv=Get​Keys">
|
||||
<g id="Bkg" filter="url(#filter0_i_1386_1593)">
|
||||
<path d="M0 14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57H14.25C6.37994 57 0 50.6201 0 42.75V14.25Z" fill="url(#paint0_linear_1386_1593)"/>
|
||||
</g>
|
||||
<g id="KV">
|
||||
<path id="Vector" d="M32.5532 24L28 14H30.7801L33.6454 20.6525L36.5106 14H39.1915L34.6241 24H32.5532Z" fill="url(#paint1_linear_1386_1593)"/>
|
||||
<path id="Vector_2" d="M17 24V14H19.6099V18.2837H19.6383L23.5248 14H26.617L22.1631 18.7518L26.773 24H23.6667L19.6383 19.4894H19.6099V24H17Z" fill="url(#paint2_linear_1386_1593)"/>
|
||||
</g>
|
||||
<g id="database-search-outline">
|
||||
<path id="Vector_3" d="M37 44.95C33.77 44.72 32 43.45 32 43V40.77C33.13 41.32 34.5 41.69 36 41.87C36 41.21 36.04 40.54 36.21 39.89C34.5 39.67 32.97 39.16 32 38.45V35.64C33.43 36.45 35.5 36.97 37.82 37C37.85 36.97 37.87 36.93 37.9 36.9C40.1 34.71 43.5 34.41 46 36.03V33C46 30.79 42.42 29 38 29C33.58 29 30 30.79 30 33V43C30 45.21 33.59 47 38 47C38.34 47 38.68 47 39 46.97C38.62 46.72 38.24 46.44 37.9 46.1C37.55 45.74 37.25 45.36 37 44.95ZM38 31C41.87 31 44 32.5 44 33C44 33.5 41.87 35 38 35C34.13 35 32 33.5 32 33C32 32.5 34.13 31 38 31ZM46.31 43.9C46.75 43.21 47 42.38 47 41.5C47 39 45 37 42.5 37C40 37 38 39 38 41.5C38 44 40 46 42.5 46C43.37 46 44.19 45.75 44.88 45.32L48 48.39L49.39 47L46.31 43.9ZM42.5 44C41.12 44 40 42.88 40 41.5C40 40.12 41.12 39 42.5 39C43.88 39 45 40.12 45 41.5C45 42.88 43.88 44 42.5 44Z" fill="url(#paint3_linear_1386_1593)"/>
|
||||
</g>
|
||||
<g clip-path="url(#paint4_angular_1386_1593_clip_path)" data-figma-skip-parse="true"><g transform="matrix(0 0.0285 -0.0285 0 28.5 28.5)"><foreignObject x="-1035.09" y="-1035.09" width="2070.18" height="2070.18"><div xmlns="http://www.w3.org/1999/xhtml" style="background:conic-gradient(from 90deg,rgba(181, 231, 255, 1) 0deg,rgba(241, 117, 255, 1) 72.6923deg,rgba(241, 117, 255, 0.1) 360deg);height:100%;width:100%;opacity:1"></div></foreignObject></g></g><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z" data-figma-gradient-fill="{"type":"GRADIENT_ANGULAR","stops":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"stopsVar":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"transform":{"m00":3.4902435166328386e-15,"m01":-57.0,"m02":57.0,"m10":57.0,"m11":3.4902435166328386e-15,"m12":0.0},"opacity":1.0,"blendMode":"NORMAL","visible":true}"/>
|
||||
</g>
|
||||
<defs>
|
||||
<filter id="filter0_i_1386_1593" x="0" y="0" width="57" height="59" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
||||
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
|
||||
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
|
||||
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
|
||||
<feOffset dy="2"/>
|
||||
<feGaussianBlur stdDeviation="1"/>
|
||||
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
|
||||
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.75 0"/>
|
||||
<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1386_1593"/>
|
||||
</filter>
|
||||
<clipPath id="paint4_angular_1386_1593_clip_path"><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z"/></clipPath><linearGradient id="paint0_linear_1386_1593" x1="52.25" y1="48.6875" x2="8.3125" y2="7.125" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#01000B"/>
|
||||
<stop offset="1" stop-color="#520188"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint1_linear_1386_1593" x1="28.7989" y1="16.9796" x2="29.988" y2="28.4007" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EEDBFF"/>
|
||||
<stop offset="0.774038" stop-color="#FBF8FF"/>
|
||||
<stop offset="1" stop-color="#F7E7FF"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint2_linear_1386_1593" x1="26.1471" y1="16.9796" x2="27.3362" y2="28.4007" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EEDBFF"/>
|
||||
<stop offset="0.774038" stop-color="#FBF8FF"/>
|
||||
<stop offset="1" stop-color="#F7E7FF"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint3_linear_1386_1593" x1="40.9069" y1="43.5425" x2="40.9069" y2="27.7881" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#91F4FF"/>
|
||||
<stop offset="0.5" stop-color="#D67EE2"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 5.7 KiB |
@@ -0,0 +1,45 @@
|
||||
<svg width="57" height="57" viewBox="0 0 57 57" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="kv=Purge​K​V">
|
||||
<g id="Bkg" filter="url(#filter0_i_1386_1599)">
|
||||
<path d="M0 14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57H14.25C6.37994 57 0 50.6201 0 42.75V14.25Z" fill="url(#paint0_linear_1386_1599)"/>
|
||||
</g>
|
||||
<g id="delete-variant">
|
||||
<path id="Vector" d="M47.03 29L44 46.31C43.83 47.27 43 48 42 48H34C33 48 32.17 47.27 32 46.31L28.97 29H47.03ZM31.36 31L34 46H42L44.64 31H31.36ZM35 44V40H39V44H35ZM39 39.18L35.82 36L39 32.82L42.18 36L39 39.18Z" fill="url(#paint1_linear_1386_1599)"/>
|
||||
</g>
|
||||
<g id="KV">
|
||||
<path id="Vector_2" d="M32.5532 24L28 14H30.7801L33.6454 20.6525L36.5106 14H39.1915L34.6241 24H32.5532Z" fill="url(#paint2_linear_1386_1599)"/>
|
||||
<path id="Vector_3" d="M17 24V14H19.6099V18.2837H19.6383L23.5248 14H26.617L22.1631 18.7518L26.773 24H23.6667L19.6383 19.4894H19.6099V24H17Z" fill="url(#paint3_linear_1386_1599)"/>
|
||||
</g>
|
||||
<g clip-path="url(#paint4_angular_1386_1599_clip_path)" data-figma-skip-parse="true"><g transform="matrix(0 0.0285 -0.0285 0 28.5 28.5)"><foreignObject x="-1035.09" y="-1035.09" width="2070.18" height="2070.18"><div xmlns="http://www.w3.org/1999/xhtml" style="background:conic-gradient(from 90deg,rgba(181, 231, 255, 1) 0deg,rgba(241, 117, 255, 1) 72.6923deg,rgba(241, 117, 255, 0.1) 360deg);height:100%;width:100%;opacity:1"></div></foreignObject></g></g><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z" data-figma-gradient-fill="{"type":"GRADIENT_ANGULAR","stops":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"stopsVar":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"transform":{"m00":3.4902435166328386e-15,"m01":-57.0,"m02":57.0,"m10":57.0,"m11":3.4902435166328386e-15,"m12":0.0},"opacity":1.0,"blendMode":"NORMAL","visible":true}"/>
|
||||
</g>
|
||||
<defs>
|
||||
<filter id="filter0_i_1386_1599" x="0" y="0" width="57" height="59" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
||||
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
|
||||
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
|
||||
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
|
||||
<feOffset dy="2"/>
|
||||
<feGaussianBlur stdDeviation="1"/>
|
||||
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
|
||||
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.75 0"/>
|
||||
<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1386_1599"/>
|
||||
</filter>
|
||||
<clipPath id="paint4_angular_1386_1599_clip_path"><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z"/></clipPath><linearGradient id="paint0_linear_1386_1599" x1="52.25" y1="48.6875" x2="8.3125" y2="7.125" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#01000B"/>
|
||||
<stop offset="1" stop-color="#520188"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint1_linear_1386_1599" x1="39.1287" y1="43.25" x2="39.1287" y2="27.8125" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#91F4FF"/>
|
||||
<stop offset="0.5" stop-color="#D67EE2"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint2_linear_1386_1599" x1="28.7989" y1="16.9796" x2="29.988" y2="28.4007" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EEDBFF"/>
|
||||
<stop offset="0.774038" stop-color="#FBF8FF"/>
|
||||
<stop offset="1" stop-color="#F7E7FF"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint3_linear_1386_1599" x1="26.1471" y1="16.9796" x2="27.3362" y2="28.4007" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EEDBFF"/>
|
||||
<stop offset="0.774038" stop-color="#FBF8FF"/>
|
||||
<stop offset="1" stop-color="#F7E7FF"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 5.2 KiB |
@@ -1,4 +1,43 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.97119 2.03955C3.86662 2.03955 2.97119 2.93498 2.97119 4.03955V19.9785C2.97119 21.0831 3.86662 21.9785 4.97119 21.9785H13.7188C13.2039 21.0924 12.9091 20.0627 12.9091 18.964C12.9091 15.6454 15.5994 12.9551 18.918 12.9551C19.6608 12.9551 20.3721 13.0899 21.0288 13.3363V4.03955C21.0288 2.93498 20.1334 2.03955 19.0288 2.03955H4.97119ZM13.5582 10.54L12.1582 5.42804H13.4542L14.4582 9.60804H14.5502L15.5582 5.42804H16.8502L15.4542 10.54H13.5582ZM8.57785 8.30004L10.0458 10.54H11.4978L9.72544 7.86056L11.4418 5.42804H10.0258L8.57785 7.54804H8.38984V5.42804H7.14985V10.54H8.38984V8.30004H8.57785Z" fill="currentColor"/>
|
||||
<path d="M19.7985 18.4785H21.7985L18.7985 15.4785L15.7985 18.4785H17.7985V22.4785H19.7985V18.4785Z" fill="currentColor"/>
|
||||
<svg width="57" height="57" viewBox="0 0 57 57" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="kv=Set">
|
||||
<g id="Bkg" filter="url(#filter0_i_1386_1605)">
|
||||
<path d="M0 14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57H14.25C6.37994 57 0 50.6201 0 42.75V14.25Z" fill="url(#paint0_linear_1386_1605)"/>
|
||||
</g>
|
||||
<path id="Vector" d="M45.8388 31.7499C46.1564 31.3317 46.0799 30.724 45.6729 30.4318L43.2165 28.5663C42.8257 28.2526 42.2198 28.342 41.9022 28.7603L40.4024 30.7242L44.339 33.7138M30.5324 43.7314L30.9735 47.237L34.4689 46.721L43.4757 34.8506L39.5391 31.861L30.5324 43.7314Z" fill="url(#paint1_linear_1386_1605)"/>
|
||||
<g id="KV">
|
||||
<path id="Vector_2" d="M32.5532 24L28 14H30.7801L33.6454 20.6525L36.5106 14H39.1915L34.6241 24H32.5532Z" fill="url(#paint2_linear_1386_1605)"/>
|
||||
<path id="Vector_3" d="M17 24V14H19.6099V18.2837H19.6383L23.5248 14H26.617L22.1631 18.7518L26.773 24H23.6667L19.6383 19.4894H19.6099V24H17Z" fill="url(#paint3_linear_1386_1605)"/>
|
||||
</g>
|
||||
<g clip-path="url(#paint4_angular_1386_1605_clip_path)" data-figma-skip-parse="true"><g transform="matrix(0 0.0285 -0.0285 0 28.5 28.5)"><foreignObject x="-1035.09" y="-1035.09" width="2070.18" height="2070.18"><div xmlns="http://www.w3.org/1999/xhtml" style="background:conic-gradient(from 90deg,rgba(181, 231, 255, 1) 0deg,rgba(241, 117, 255, 1) 72.6923deg,rgba(241, 117, 255, 0.1) 360deg);height:100%;width:100%;opacity:1"></div></foreignObject></g></g><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z" data-figma-gradient-fill="{"type":"GRADIENT_ANGULAR","stops":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"stopsVar":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"transform":{"m00":3.4902435166328386e-15,"m01":-57.0,"m02":57.0,"m10":57.0,"m11":3.4902435166328386e-15,"m12":0.0},"opacity":1.0,"blendMode":"NORMAL","visible":true}"/>
|
||||
</g>
|
||||
<defs>
|
||||
<filter id="filter0_i_1386_1605" x="0" y="0" width="57" height="59" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
||||
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
|
||||
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
|
||||
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
|
||||
<feOffset dy="2"/>
|
||||
<feGaussianBlur stdDeviation="1"/>
|
||||
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
|
||||
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.75 0"/>
|
||||
<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1386_1605"/>
|
||||
</filter>
|
||||
<clipPath id="paint4_angular_1386_1605_clip_path"><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z"/></clipPath><linearGradient id="paint0_linear_1386_1605" x1="52.25" y1="48.6875" x2="8.3125" y2="7.125" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#01000B"/>
|
||||
<stop offset="1" stop-color="#520188"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint1_linear_1386_1605" x1="39.534" y1="38.0057" x2="45.0867" y2="29.2374" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#91F4FF"/>
|
||||
<stop offset="0.5" stop-color="#D67EE2"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint2_linear_1386_1605" x1="28.7989" y1="16.9796" x2="29.988" y2="28.4007" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EEDBFF"/>
|
||||
<stop offset="0.774038" stop-color="#FBF8FF"/>
|
||||
<stop offset="1" stop-color="#F7E7FF"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint3_linear_1386_1605" x1="26.1471" y1="16.9796" x2="27.3362" y2="28.4007" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EEDBFF"/>
|
||||
<stop offset="0.774038" stop-color="#FBF8FF"/>
|
||||
<stop offset="1" stop-color="#F7E7FF"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 899 B After Width: | Height: | Size: 5.1 KiB |
@@ -1,3 +1,45 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.97852 4.03955C2.97852 2.93498 3.87395 2.03955 4.97852 2.03955H19.0288C20.1334 2.03955 21.0288 2.93498 21.0288 4.03955V19.957C21.0288 21.0616 20.1334 21.957 19.0288 21.957H4.97852C3.87395 21.957 2.97852 21.0616 2.97852 19.957V4.03955ZM13.5618 14.5L12.1618 9.388H13.4578L14.4618 13.568H14.5538L15.5618 9.388H16.8538L15.4578 14.5H13.5618ZM8.5815 12.26L10.0495 14.5H11.5015L9.7291 11.8205L11.4455 9.388H10.0295L8.5815 11.508H8.3935V9.388H7.1535V14.5H8.3935V12.26H8.5815Z" fill="currentColor"/>
|
||||
<svg width="57" height="57" viewBox="0 0 57 57" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="kv=Main">
|
||||
<g id="Bkg" filter="url(#filter0_i_1386_1574)">
|
||||
<path d="M0 14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57H14.25C6.37994 57 0 50.6201 0 42.75V14.25Z" fill="url(#paint0_linear_1386_1574)"/>
|
||||
</g>
|
||||
<g id="database">
|
||||
<path id="Vector" d="M38 29C33.58 29 30 30.79 30 33C30 35.21 33.58 37 38 37C42.42 37 46 35.21 46 33C46 30.79 42.42 29 38 29ZM30 35V38C30 40.21 33.58 42 38 42C42.42 42 46 40.21 46 38V35C46 37.21 42.42 39 38 39C33.58 39 30 37.21 30 35ZM30 40V43C30 45.21 33.58 47 38 47C42.42 47 46 45.21 46 43V40C46 42.21 42.42 44 38 44C33.58 44 30 42.21 30 40Z" fill="url(#paint1_linear_1386_1574)"/>
|
||||
</g>
|
||||
<g id="KV">
|
||||
<path id="Vector_2" d="M32.5532 24L28 14H30.7801L33.6454 20.6525L36.5106 14H39.1915L34.6241 24H32.5532Z" fill="url(#paint2_linear_1386_1574)"/>
|
||||
<path id="Vector_3" d="M17 24V14H19.6099V18.2837H19.6383L23.5248 14H26.617L22.1631 18.7518L26.773 24H23.6667L19.6383 19.4894H19.6099V24H17Z" fill="url(#paint3_linear_1386_1574)"/>
|
||||
</g>
|
||||
<g clip-path="url(#paint4_angular_1386_1574_clip_path)" data-figma-skip-parse="true"><g transform="matrix(0 0.0285 -0.0285 0 28.5 28.5)"><foreignObject x="-1035.09" y="-1035.09" width="2070.18" height="2070.18"><div xmlns="http://www.w3.org/1999/xhtml" style="background:conic-gradient(from 90deg,rgba(181, 231, 255, 1) 0deg,rgba(241, 117, 255, 1) 72.6923deg,rgba(241, 117, 255, 0.1) 360deg);height:100%;width:100%;opacity:1"></div></foreignObject></g></g><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z" data-figma-gradient-fill="{"type":"GRADIENT_ANGULAR","stops":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"stopsVar":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"transform":{"m00":3.4902435166328386e-15,"m01":-57.0,"m02":57.0,"m10":57.0,"m11":3.4902435166328386e-15,"m12":0.0},"opacity":1.0,"blendMode":"NORMAL","visible":true}"/>
|
||||
</g>
|
||||
<defs>
|
||||
<filter id="filter0_i_1386_1574" x="0" y="0" width="57" height="59" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
||||
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
|
||||
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
|
||||
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
|
||||
<feOffset dy="2"/>
|
||||
<feGaussianBlur stdDeviation="1"/>
|
||||
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
|
||||
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.75 0"/>
|
||||
<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1386_1574"/>
|
||||
</filter>
|
||||
<clipPath id="paint4_angular_1386_1574_clip_path"><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z"/></clipPath><linearGradient id="paint0_linear_1386_1574" x1="52.25" y1="48.6875" x2="8.3125" y2="7.125" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#01000B"/>
|
||||
<stop offset="1" stop-color="#520188"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint1_linear_1386_1574" x1="39" y1="42.5" x2="39" y2="27.875" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#91F4FF"/>
|
||||
<stop offset="0.5" stop-color="#D67EE2"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint2_linear_1386_1574" x1="28.7989" y1="16.9796" x2="29.988" y2="28.4007" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EEDBFF"/>
|
||||
<stop offset="0.774038" stop-color="#FBF8FF"/>
|
||||
<stop offset="1" stop-color="#F7E7FF"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint3_linear_1386_1574" x1="26.1471" y1="16.9796" x2="27.3362" y2="28.4007" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EEDBFF"/>
|
||||
<stop offset="0.774038" stop-color="#FBF8FF"/>
|
||||
<stop offset="1" stop-color="#F7E7FF"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 653 B After Width: | Height: | Size: 5.2 KiB |
@@ -1,6 +1,31 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M5 21H19C20.1 21 21 20.1 21 19V5C21 3.9 20.1 3 19 3H5C3.9 3 3 3.9 3 5V19C3 20.1 3.9 21 5 21ZM5 5H19V19H5V5Z" fill="currentColor"/>
|
||||
<path d="M17.19 12C17.19 10.5913 16.5227 9.25676 15.4106 8.29291L14.2243 8.73776C15.1881 9.47918 15.7071 10.7396 15.7071 12C15.7071 13.2604 15.1881 14.5208 14.2243 15.2623L15.4106 15.7071C16.5227 14.7433 17.19 13.4087 17.19 12Z" fill="currentColor"/>
|
||||
<path d="M9.77575 8.73776L8.58947 8.29291C7.47734 9.25676 6.81006 10.5913 6.81006 12C6.81006 13.4087 7.47734 14.7433 8.58947 15.7071L9.77575 15.2623C8.8119 14.5208 8.2929 13.2604 8.2929 12C8.2929 10.7396 8.8119 9.47918 9.77575 8.73776Z" fill="currentColor"/>
|
||||
<path d="M13.1121 9.77575L12.0742 11.2586L11.481 9.77575H10.5172L11.481 11.9259L9.77575 14.2243H10.962L12 12.7414L12.5931 14.2243H13.557L12.5931 12L14.2243 9.77575H13.1121Z" fill="currentColor"/>
|
||||
</svg>
|
||||
<svg width="57" height="57" viewBox="0 0 57 57" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="output=Output​Values">
|
||||
<g id="Bkg" filter="url(#filter0_i_1386_1788)">
|
||||
<path d="M0 14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57H14.25C6.37994 57 0 50.6201 0 42.75V14.25Z" fill="url(#paint0_linear_1386_1788)"/>
|
||||
</g>
|
||||
<g id="table-arrow-right">
|
||||
<path id="Vector" d="M15.8334 14.125H39.75C41.6463 14.125 43.1667 15.6625 43.1667 17.5417V29.6367C40.5188 29.1925 37.905 29.8075 35.7867 31.2083H29.5V38.0417H31.345C31.1571 39.2033 31.1571 40.3479 31.345 41.4583H15.8334C13.9542 41.4583 12.4167 39.9379 12.4167 38.0417V17.5417C12.4167 15.6625 13.9542 14.125 15.8334 14.125ZM15.8334 20.9583V27.7917H26.0834V20.9583H15.8334ZM29.5 20.9583V27.7917H39.75V20.9583H29.5ZM15.8334 31.2083V38.0417H26.0834V31.2083H15.8334ZM42.21 44.875V41.4583H35.3767V38.0417H42.21V34.625L47.335 39.75L42.21 44.875Z" fill="url(#paint1_linear_1386_1788)"/>
|
||||
</g>
|
||||
<g clip-path="url(#paint2_angular_1386_1788_clip_path)" data-figma-skip-parse="true"><g transform="matrix(0 0.0285 -0.0285 0 28.5 28.5)"><foreignObject x="-1035.09" y="-1035.09" width="2070.18" height="2070.18"><div xmlns="http://www.w3.org/1999/xhtml" style="background:conic-gradient(from 90deg,rgba(181, 231, 255, 1) 0deg,rgba(241, 117, 255, 1) 72.6923deg,rgba(241, 117, 255, 0.1) 360deg);height:100%;width:100%;opacity:1"></div></foreignObject></g></g><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z" data-figma-gradient-fill="{"type":"GRADIENT_ANGULAR","stops":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"stopsVar":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"transform":{"m00":3.4902435166328386e-15,"m01":-57.0,"m02":57.0,"m10":57.0,"m11":3.4902435166328386e-15,"m12":0.0},"opacity":1.0,"blendMode":"NORMAL","visible":true}"/>
|
||||
</g>
|
||||
<defs>
|
||||
<filter id="filter0_i_1386_1788" x="0" y="0" width="57" height="59" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
||||
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
|
||||
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
|
||||
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
|
||||
<feOffset dy="2"/>
|
||||
<feGaussianBlur stdDeviation="1"/>
|
||||
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
|
||||
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.75 0"/>
|
||||
<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1386_1788"/>
|
||||
</filter>
|
||||
<clipPath id="paint2_angular_1386_1788_clip_path"><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z"/></clipPath><linearGradient id="paint0_linear_1386_1788" x1="52.25" y1="48.6875" x2="8.3125" y2="7.125" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#01000B"/>
|
||||
<stop offset="1" stop-color="#520188"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint1_linear_1386_1788" x1="32.0583" y1="37.1875" x2="32.0583" y2="12.2031" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#91F4FF"/>
|
||||
<stop offset="0.5" stop-color="#D67EE2"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 957 B After Width: | Height: | Size: 4.9 KiB |
@@ -1,6 +1,31 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M5 21H19C20.1 21 21 20.1 21 19V5C21 3.9 20.1 3 19 3H5C3.9 3 3 3.9 3 5V19C3 20.1 3.9 21 5 21ZM5 5H19V19H5V5Z" fill="currentColor"/>
|
||||
<path d="M17.19 12C17.19 10.5913 16.5227 9.25676 15.4106 8.29291L14.2243 8.73776C15.1881 9.47918 15.7071 10.7396 15.7071 12C15.7071 13.2604 15.1881 14.5208 14.2243 15.2623L15.4106 15.7071C16.5227 14.7433 17.19 13.4087 17.19 12Z" fill="currentColor"/>
|
||||
<path d="M9.77575 8.73776L8.58947 8.29291C7.47734 9.25676 6.81006 10.5913 6.81006 12C6.81006 13.4087 7.47734 14.7433 8.58947 15.7071L9.77575 15.2623C8.8119 14.5208 8.2929 13.2604 8.2929 12C8.2929 10.7396 8.8119 9.47918 9.77575 8.73776Z" fill="currentColor"/>
|
||||
<path d="M13.1121 9.77575L12.0742 11.2586L11.481 9.77575H10.5172L11.481 11.9259L9.77575 14.2243H10.962L12 12.7414L12.5931 14.2243H13.557L12.5931 12L14.2243 9.77575H13.1121Z" fill="currentColor"/>
|
||||
</svg>
|
||||
<svg width="57" height="57" viewBox="0 0 57 57" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="output=Main">
|
||||
<g id="Bkg" filter="url(#filter0_i_1386_1783)">
|
||||
<path d="M0 14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57H14.25C6.37994 57 0 50.6201 0 42.75V14.25Z" fill="url(#paint0_linear_1386_1783)"/>
|
||||
</g>
|
||||
<g id="table">
|
||||
<path id="Vector" d="M16.8577 14.2791H40.7744C41.6805 14.2791 42.5496 14.639 43.1903 15.2798C43.8311 15.9205 44.191 16.7896 44.191 17.6957V38.1957C44.191 39.1019 43.8311 39.9709 43.1903 40.6117C42.5496 41.2524 41.6805 41.6124 40.7744 41.6124H16.8577C15.9516 41.6124 15.0825 41.2524 14.4418 40.6117C13.801 39.9709 13.441 39.1019 13.441 38.1957V17.6957C13.441 16.7896 13.801 15.9205 14.4418 15.2798C15.0825 14.639 15.9516 14.2791 16.8577 14.2791ZM16.8577 21.1124V27.9457H27.1077V21.1124H16.8577ZM30.5244 21.1124V27.9457H40.7744V21.1124H30.5244ZM16.8577 31.3624V38.1957H27.1077V31.3624H16.8577ZM30.5244 31.3624V38.1957H40.7744V31.3624H30.5244Z" fill="url(#paint1_linear_1386_1783)"/>
|
||||
</g>
|
||||
<g clip-path="url(#paint2_angular_1386_1783_clip_path)" data-figma-skip-parse="true"><g transform="matrix(0 0.0285 -0.0285 0 28.5 28.5)"><foreignObject x="-1035.09" y="-1035.09" width="2070.18" height="2070.18"><div xmlns="http://www.w3.org/1999/xhtml" style="background:conic-gradient(from 90deg,rgba(181, 231, 255, 1) 0deg,rgba(241, 117, 255, 1) 72.6923deg,rgba(241, 117, 255, 0.1) 360deg);height:100%;width:100%;opacity:1"></div></foreignObject></g></g><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z" data-figma-gradient-fill="{"type":"GRADIENT_ANGULAR","stops":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"stopsVar":[{"color":{"r":0.71089994907379150,"g":0.90845167636871338,"b":1.0,"a":1.0},"position":0.0},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":1.0},"position":0.20192307233810425},{"color":{"r":0.94509804248809814,"g":0.45882353186607361,"b":1.0,"a":0.10000000149011612},"position":1.0}],"transform":{"m00":3.4902435166328386e-15,"m01":-57.0,"m02":57.0,"m10":57.0,"m11":3.4902435166328386e-15,"m12":0.0},"opacity":1.0,"blendMode":"NORMAL","visible":true}"/>
|
||||
</g>
|
||||
<defs>
|
||||
<filter id="filter0_i_1386_1783" x="0" y="0" width="57" height="59" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
|
||||
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
|
||||
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
|
||||
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
|
||||
<feOffset dy="2"/>
|
||||
<feGaussianBlur stdDeviation="1"/>
|
||||
<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
|
||||
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.75 0"/>
|
||||
<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1386_1783"/>
|
||||
</filter>
|
||||
<clipPath id="paint2_angular_1386_1783_clip_path"><path id="Stroke" d="M42.75 54.625V57H14.25V54.625H42.75ZM54.625 42.75V14.25C54.625 7.69162 49.3084 2.375 42.75 2.375H14.25C7.69162 2.375 2.375 7.69162 2.375 14.25V42.75C2.375 49.3084 7.69162 54.625 14.25 54.625V57C6.37994 57 0 50.6201 0 42.75V14.25C0 6.37994 6.37994 0 14.25 0H42.75C50.6201 0 57 6.37994 57 14.25V42.75C57 50.6201 50.6201 57 42.75 57V54.625C49.3084 54.625 54.625 49.3084 54.625 42.75Z"/></clipPath><linearGradient id="paint0_linear_1386_1783" x1="52.25" y1="48.6875" x2="8.3125" y2="7.125" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#01000B"/>
|
||||
<stop offset="1" stop-color="#520188"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint1_linear_1386_1783" x1="30.7379" y1="34.7791" x2="30.7379" y2="12.5707" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#91F4FF"/>
|
||||
<stop offset="0.5" stop-color="#D67EE2"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 957 B After Width: | Height: | Size: 4.9 KiB |
@@ -49,6 +49,32 @@ public abstract class AbstractFlowTopologyRepositoryTest {
|
||||
assertThat(list.size()).isEqualTo(1);
|
||||
}
|
||||
|
||||
@Test
|
||||
void findByNamespacePrefix() {
|
||||
String tenant = TestsUtils.randomTenant(this.getClass().getSimpleName());
|
||||
|
||||
flowTopologyRepository.save(
|
||||
createSimpleFlowTopology(tenant, "flow-a", "flow-b", "io.kestra.tests")
|
||||
);
|
||||
|
||||
flowTopologyRepository.save(
|
||||
createSimpleFlowTopology(tenant, "flow-x", "flow-y", "io.kestra.tests.sub")
|
||||
);
|
||||
|
||||
flowTopologyRepository.save(
|
||||
createSimpleFlowTopology(tenant, "flow-p", "flow-q", "io.other.namespace")
|
||||
);
|
||||
|
||||
List<FlowTopology> list = flowTopologyRepository.findByNamespacePrefix(tenant, "io.kestra.tests");
|
||||
|
||||
assertThat(list)
|
||||
.extracting(ft -> ft.getSource().getNamespace())
|
||||
.contains("io.kestra.tests", "io.kestra.tests.sub")
|
||||
.doesNotContain("io.other.namespace");
|
||||
|
||||
assertThat(list.size()).isEqualTo(2);
|
||||
}
|
||||
|
||||
@Test
|
||||
void findByNamespace() {
|
||||
String tenant = TestsUtils.randomTenant(this.getClass().getSimpleName());
|
||||
|
||||
@@ -106,28 +106,28 @@ class FilesServiceTest {
|
||||
var runContext = runContextFactory.of();
|
||||
|
||||
Path fileWithSpace = tempDir.resolve("with space.txt");
|
||||
Path fileWithUnicode = tempDir.resolve("สวัสดี&.txt");
|
||||
Path fileWithUnicode = tempDir.resolve("สวัสดี.txt");
|
||||
|
||||
Files.writeString(fileWithSpace, "content");
|
||||
Files.writeString(fileWithUnicode, "content");
|
||||
|
||||
Path targetFileWithSpace = runContext.workingDir().path().resolve("with space.txt");
|
||||
Path targetFileWithUnicode = runContext.workingDir().path().resolve("สวัสดี&.txt");
|
||||
Path targetFileWithUnicode = runContext.workingDir().path().resolve("สวัสดี.txt");
|
||||
|
||||
Files.copy(fileWithSpace, targetFileWithSpace);
|
||||
Files.copy(fileWithUnicode, targetFileWithUnicode);
|
||||
|
||||
Map<String, URI> outputFiles = FilesService.outputFiles(
|
||||
runContext,
|
||||
List.of("with space.txt", "สวัสดี&.txt")
|
||||
List.of("with space.txt", "สวัสดี.txt")
|
||||
);
|
||||
|
||||
assertThat(outputFiles).hasSize(2);
|
||||
assertThat(outputFiles).containsKey("with space.txt");
|
||||
assertThat(outputFiles).containsKey("สวัสดี&.txt");
|
||||
assertThat(outputFiles).containsKey("สวัสดี.txt");
|
||||
|
||||
assertThat(runContext.storage().getFile(outputFiles.get("with space.txt"))).isNotNull();
|
||||
assertThat(runContext.storage().getFile(outputFiles.get("สวัสดี&.txt"))).isNotNull();
|
||||
assertThat(runContext.storage().getFile(outputFiles.get("สวัสดี.txt"))).isNotNull();
|
||||
}
|
||||
|
||||
private URI createFile() throws IOException {
|
||||
|
||||
@@ -112,6 +112,33 @@ public class FileSizeFunctionTest {
|
||||
assertThat(size).isEqualTo(FILE_SIZE);
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldThrowIllegalArgumentException_givenTrigger_andParentExecution_andMissingNamespace() throws IOException {
|
||||
String executionId = IdUtils.create();
|
||||
URI internalStorageURI = getInternalStorageURI(executionId);
|
||||
URI internalStorageFile = getInternalStorageFile(internalStorageURI);
|
||||
|
||||
Map<String, Object> variables = Map.of(
|
||||
"flow", Map.of(
|
||||
"id", "subflow",
|
||||
"namespace", NAMESPACE,
|
||||
"tenantId", MAIN_TENANT),
|
||||
"execution", Map.of("id", IdUtils.create()),
|
||||
"trigger", Map.of(
|
||||
"flowId", FLOW,
|
||||
"executionId", executionId,
|
||||
"tenantId", MAIN_TENANT
|
||||
)
|
||||
);
|
||||
|
||||
Exception ex = assertThrows(
|
||||
IllegalArgumentException.class,
|
||||
() -> variableRenderer.render("{{ fileSize('" + internalStorageFile + "') }}", variables)
|
||||
);
|
||||
|
||||
assertTrue(ex.getMessage().startsWith("Unable to read the file"), "Exception message doesn't match expected one");
|
||||
}
|
||||
|
||||
@Test
|
||||
void returnsCorrectSize_givenUri_andCurrentExecution() throws IOException, IllegalVariableEvaluationException {
|
||||
String executionId = IdUtils.create();
|
||||
|
||||
@@ -259,27 +259,6 @@ class ReadFileFunctionTest {
|
||||
assertThat(variableRenderer.render("{{ read(nsfile) }}", variables)).isEqualTo("Hello World");
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldReadChildFileEvenIfTrigger() throws IOException, IllegalVariableEvaluationException {
|
||||
String namespace = "my.namespace";
|
||||
String flowId = "flow";
|
||||
String executionId = IdUtils.create();
|
||||
URI internalStorageURI = URI.create("/" + namespace.replace(".", "/") + "/" + flowId + "/executions/" + executionId + "/tasks/task/" + IdUtils.create() + "/123456.ion");
|
||||
URI internalStorageFile = storageInterface.put(MAIN_TENANT, namespace, internalStorageURI, new ByteArrayInputStream("Hello from a task output".getBytes()));
|
||||
|
||||
Map<String, Object> variables = Map.of(
|
||||
"flow", Map.of(
|
||||
"id", "flow",
|
||||
"namespace", "notme",
|
||||
"tenantId", MAIN_TENANT),
|
||||
"execution", Map.of("id", "notme"),
|
||||
"trigger", Map.of("namespace", "notme", "flowId", "parent", "executionId", "parent")
|
||||
);
|
||||
|
||||
String render = variableRenderer.render("{{ read('" + internalStorageFile + "') }}", variables);
|
||||
assertThat(render).isEqualTo("Hello from a task output");
|
||||
}
|
||||
|
||||
private URI createFile() throws IOException {
|
||||
File tempFile = File.createTempFile("file", ".txt");
|
||||
Files.write(tempFile.toPath(), "Hello World".getBytes());
|
||||
|
||||
@@ -3,12 +3,16 @@ package io.kestra.core.topologies;
|
||||
import io.kestra.core.exceptions.FlowProcessingException;
|
||||
import io.kestra.core.junit.annotations.KestraTest;
|
||||
import io.kestra.core.models.flows.FlowWithSource;
|
||||
import io.kestra.core.models.topologies.FlowNode;
|
||||
import io.kestra.core.models.topologies.FlowTopology;
|
||||
import io.kestra.core.models.topologies.FlowTopologyGraph;
|
||||
import io.kestra.core.repositories.FlowRepositoryInterface;
|
||||
import io.kestra.core.repositories.FlowTopologyRepositoryInterface;
|
||||
import io.kestra.core.services.FlowService;
|
||||
import io.kestra.core.utils.IdUtils;
|
||||
import io.kestra.plugin.core.execution.AssertTest;
|
||||
import jakarta.inject.Inject;
|
||||
import jakarta.validation.constraints.AssertTrue;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@@ -56,15 +60,8 @@ public class FlowTopologyTest {
|
||||
|
||||
// When
|
||||
computeAndSaveTopologies(List.of(child, parent, unrelatedFlow));
|
||||
System.out.println();
|
||||
flowTopologyRepository.findAll(tenantId).forEach(topology -> {
|
||||
System.out.println(FlowTopologyTestData.of(topology));
|
||||
});
|
||||
|
||||
var dependencies = flowService.findDependencies(tenantId, "io.kestra.unittest", parent.getId(), false, true);
|
||||
flowTopologyRepository.findAll(tenantId).forEach(topology -> {
|
||||
System.out.println(FlowTopologyTestData.of(topology));
|
||||
});
|
||||
|
||||
// Then
|
||||
assertThat(dependencies.map(FlowTopologyTestData::of))
|
||||
@@ -123,16 +120,8 @@ public class FlowTopologyTest {
|
||||
|
||||
// When
|
||||
computeAndSaveTopologies(List.of(subChild, child, superParent, parent, unrelatedFlow));
|
||||
System.out.println();
|
||||
flowTopologyRepository.findAll(tenantId).forEach(topology -> {
|
||||
System.out.println(FlowTopologyTestData.of(topology));
|
||||
});
|
||||
System.out.println();
|
||||
|
||||
var dependencies = flowService.findDependencies(tenantId, "io.kestra.unittest", parent.getId(), false, true);
|
||||
flowTopologyRepository.findAll(tenantId).forEach(topology -> {
|
||||
System.out.println(FlowTopologyTestData.of(topology));
|
||||
});
|
||||
|
||||
// Then
|
||||
assertThat(dependencies.map(FlowTopologyTestData::of))
|
||||
@@ -180,16 +169,8 @@ public class FlowTopologyTest {
|
||||
// When
|
||||
computeAndSaveTopologies(List.of(triggeredFlowOne, triggeredFlowTwo));
|
||||
|
||||
flowTopologyRepository.findAll(tenantId).forEach(topology -> {
|
||||
System.out.println(FlowTopologyTestData.of(topology));
|
||||
});
|
||||
|
||||
var dependencies = flowService.findDependencies(tenantId, "io.kestra.unittest", triggeredFlowTwo.getId(), false, true).toList();
|
||||
|
||||
flowTopologyRepository.findAll(tenantId).forEach(topology -> {
|
||||
System.out.println(FlowTopologyTestData.of(topology));
|
||||
});
|
||||
|
||||
// Then
|
||||
assertThat(dependencies.stream().map(FlowTopologyTestData::of))
|
||||
.containsExactlyInAnyOrder(
|
||||
@@ -211,7 +192,7 @@ public class FlowTopologyTest {
|
||||
- id: a
|
||||
type: BOOL
|
||||
defaults: true
|
||||
|
||||
|
||||
- id: b
|
||||
type: BOOL
|
||||
defaults: "{{ inputs.a == true }}"
|
||||
@@ -251,15 +232,8 @@ public class FlowTopologyTest {
|
||||
|
||||
// When
|
||||
computeAndSaveTopologies(List.of(child, parent, unrelatedFlow));
|
||||
System.out.println();
|
||||
flowTopologyRepository.findAll(tenantId).forEach(topology -> {
|
||||
System.out.println(FlowTopologyTestData.of(topology));
|
||||
});
|
||||
|
||||
var dependencies = flowService.findDependencies(tenantId, "io.kestra.unittest", parent.getId(), false, true);
|
||||
flowTopologyRepository.findAll(tenantId).forEach(topology -> {
|
||||
System.out.println(FlowTopologyTestData.of(topology));
|
||||
});
|
||||
|
||||
// Then
|
||||
assertThat(dependencies.map(FlowTopologyTestData::of))
|
||||
@@ -268,6 +242,63 @@ public class FlowTopologyTest {
|
||||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
void testNamespaceGraph() throws FlowProcessingException {
|
||||
var tenantId = randomTenantId();
|
||||
|
||||
var subChild = flowService.importFlow(tenantId,
|
||||
"""
|
||||
id: sub_child
|
||||
namespace: io.kestra.unittest.sub
|
||||
tasks:
|
||||
- id: log
|
||||
type: io.kestra.plugin.core.log.Log
|
||||
message: Sub Child
|
||||
""");
|
||||
|
||||
var child = flowService.importFlow(tenantId,
|
||||
"""
|
||||
id: child
|
||||
namespace: io.kestra.unittest
|
||||
tasks:
|
||||
- id: callSub
|
||||
type: io.kestra.core.tasks.flows.Flow
|
||||
flowId: sub_child
|
||||
namespace: io.kestra.unittest.sub
|
||||
""");
|
||||
|
||||
var parent = flowService.importFlow(tenantId,
|
||||
"""
|
||||
id: parent
|
||||
namespace: io.kestra.unittest
|
||||
tasks:
|
||||
- id: callChild
|
||||
type: io.kestra.core.tasks.flows.Flow
|
||||
flowId: child
|
||||
namespace: io.kestra.unittest
|
||||
""");
|
||||
|
||||
var unrelated = flowService.importFlow(tenantId,
|
||||
"""
|
||||
id: unrelated
|
||||
namespace: io.kestra.unittest
|
||||
tasks:
|
||||
- id: log
|
||||
type: io.kestra.plugin.core.log.Log
|
||||
message: Not part of deps
|
||||
""");
|
||||
|
||||
computeAndSaveTopologies(List.of(subChild, child, parent, unrelated));
|
||||
|
||||
FlowTopologyGraph graph = flowTopologyService.namespaceGraph(tenantId, "io.kestra.unittest");
|
||||
|
||||
assertThat(graph.getNodes())
|
||||
.extracting(FlowNode::getId)
|
||||
.contains("parent", "child", "sub_child", "unrelated");
|
||||
|
||||
assertThat(graph.getEdges().size()).isEqualTo(2);
|
||||
}
|
||||
|
||||
/**
|
||||
* this function mimics the production behaviour
|
||||
*/
|
||||
|
||||
@@ -156,26 +156,6 @@ class DownloadTest {
|
||||
assertThat(output.getUri().toString()).endsWith("filename.jpg");
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
void fileNameShouldOverrideContentDisposition() throws Exception {
|
||||
EmbeddedServer embeddedServer = applicationContext.getBean(EmbeddedServer.class);
|
||||
embeddedServer.start();
|
||||
|
||||
Download task = Download.builder()
|
||||
.id(DownloadTest.class.getSimpleName())
|
||||
.type(DownloadTest.class.getName())
|
||||
.uri(Property.ofValue(embeddedServer.getURI() + "/content-disposition"))
|
||||
.saveAs(Property.ofValue("hardcoded-filename.jpg"))
|
||||
.build();
|
||||
|
||||
RunContext runContext = TestsUtils.mockRunContext(this.runContextFactory, task, ImmutableMap.of());
|
||||
|
||||
Download.Output output = task.run(runContext);
|
||||
|
||||
assertThat(output.getUri().toString()).endsWith("hardcoded-filename.jpg");
|
||||
}
|
||||
|
||||
@Test
|
||||
void contentDispositionWithPath() throws Exception {
|
||||
EmbeddedServer embeddedServer = applicationContext.getBean(EmbeddedServer.class);
|
||||
|
||||
@@ -1,162 +0,0 @@
|
||||
#!/bin/bash
|
||||
#===============================================================================
|
||||
# SCRIPT: check-plugin-artifacts.sh
|
||||
#
|
||||
# DESCRIPTION:
|
||||
# This script can be used to check if plugins are available on Maven Central or Sonatype
|
||||
#
|
||||
# USAGE: ./ check-plugin-artifacts.sh [options]
|
||||
# OPTIONS:
|
||||
# --plugin-file File containing the plugin list (default: .plugins)
|
||||
# --version Version for plugins
|
||||
# -y, --yes Automatically confirm prompts (non-interactive).
|
||||
# -h, --help Show the help message and exit
|
||||
|
||||
# EXAMPLES:
|
||||
# To clone all plugins:
|
||||
# ./check-plugin-artifacts.sh --plugin-file .plugins --version 0.21.0
|
||||
|
||||
#===============================================================================
|
||||
|
||||
set -e;
|
||||
|
||||
###############################################################
|
||||
# Global vars
|
||||
###############################################################
|
||||
BASEDIR=$(dirname "$(readlink -f $0)")
|
||||
WORKING_DIR=/tmp/kestra-plugins;
|
||||
PLUGIN_FILE="$BASEDIR/../.plugins"
|
||||
|
||||
# Maven Central URL
|
||||
MAVEN_CENTRAL="https://repo1.maven.org/maven2"
|
||||
SONATYPE_SNAPSHOT="https://central.sonatype.com/repository/maven-snapshots"
|
||||
|
||||
###############################################################
|
||||
# Functions
|
||||
###############################################################
|
||||
|
||||
# Function to display the help message
|
||||
usage() {
|
||||
echo "Usage: $0 --version <version> [--plugin-file]"
|
||||
echo
|
||||
echo "Options:"
|
||||
echo " --plugin-file File containing the plugin list"
|
||||
echo " --version Version for plugins"
|
||||
echo " -y, --yes Automatically confirm prompts (non-interactive)."
|
||||
echo " -h, --help Show this help message and exit."
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Function to ask to continue
|
||||
function askToContinue() {
|
||||
read -p "Are you sure you want to continue? [y/N] " confirm
|
||||
[[ "$confirm" =~ ^[Yy]$ ]] || { echo "Operation cancelled."; exit 1; }
|
||||
}
|
||||
|
||||
###############################################################
|
||||
# Options
|
||||
###############################################################
|
||||
|
||||
PLUGINS_ARGS=()
|
||||
AUTO_YES=false
|
||||
# Get the options
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
case "$1" in
|
||||
--plugin-file)
|
||||
PLUGIN_FILE="$2"
|
||||
shift 2
|
||||
;;
|
||||
--plugin-file=*)
|
||||
PLUGIN_FILE="${1#*=}"
|
||||
shift
|
||||
;;
|
||||
--version)
|
||||
VERSION="$2"
|
||||
shift 2
|
||||
;;
|
||||
--version=*)
|
||||
VERSION="${1#*=}"
|
||||
shift
|
||||
;;
|
||||
-y|--yes)
|
||||
AUTO_YES=true
|
||||
shift
|
||||
;;
|
||||
-h|--help)
|
||||
usage
|
||||
;;
|
||||
*)
|
||||
PLUGINS_ARGS+=("$1")
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
## Check options
|
||||
if [[ -z "$VERSION" ]]; then
|
||||
echo -e "Missing required argument: --version\n";
|
||||
usage
|
||||
fi
|
||||
|
||||
## Get plugin list
|
||||
if [[ "${#PLUGINS_ARGS[@]}" -eq 0 ]]; then
|
||||
if [ -f "$PLUGIN_FILE" ]; then
|
||||
PLUGINS=$(cat "$PLUGIN_FILE" | grep "io\\.kestra\\." | sed -e '/#/s/^.//' | cut -d':' -f2-3 | uniq | sort);
|
||||
PLUGINS_COUNT=$(echo "$PLUGINS" | wc -l);
|
||||
PLUGINS_ARRAY=$(echo "$PLUGINS" | xargs || echo '');
|
||||
PLUGINS_ARRAY=($PLUGINS_ARRAY);
|
||||
fi
|
||||
else
|
||||
PLUGINS_ARRAY=("${PLUGINS_ARGS[@]}")
|
||||
PLUGINS_COUNT="${#PLUGINS_ARGS[@]}"
|
||||
fi
|
||||
|
||||
echo "Arguments: "
|
||||
echo "VERSION=$VERSION"
|
||||
echo "PLUGIN_FILE=$PLUGIN_FILE"
|
||||
|
||||
for PLUGIN in "${PLUGINS_ARRAY[@]}"; do
|
||||
echo "$PLUGIN"
|
||||
done
|
||||
|
||||
if [[ "$AUTO_YES" == false ]]; then
|
||||
askToContinue
|
||||
fi
|
||||
|
||||
###############################################################
|
||||
# Main
|
||||
###############################################################
|
||||
mkdir -p "$WORKING_DIR"
|
||||
|
||||
COUNTER=1;
|
||||
AVAILABLE=0;
|
||||
NOT_AVAILABLE=0;
|
||||
for PLUGIN in "${PLUGINS_ARRAY[@]}"
|
||||
do
|
||||
# Extract groupId and artifactId
|
||||
GROUP_ID="${PLUGIN%%:*}"
|
||||
ARTIFACT_ID="${PLUGIN##*:}"
|
||||
|
||||
# Convert groupId to Maven repository path
|
||||
GROUP_PATH="${GROUP_ID//./\/}"
|
||||
if [[ "$VERSION" == *"-SNAPSHOT" ]]; then
|
||||
ARTIFACT_URL="${GROUP_PATH}/${ARTIFACT_ID}/${VERSION}/maven-metadata.xml"
|
||||
ARTIFACT_URL="${SONATYPE_SNAPSHOT}/${ARTIFACT_URL}"
|
||||
else
|
||||
ARTIFACT_URL="${GROUP_PATH}/${ARTIFACT_ID}/${VERSION}/${ARTIFACT_ID}-${VERSION}.jar"
|
||||
ARTIFACT_URL="${MAVEN_CENTRAL}/${ARTIFACT_URL}"
|
||||
fi
|
||||
|
||||
if curl --silent --fail --head "$ARTIFACT_URL" > /dev/null; then
|
||||
printf "✅ [$COUNTER/$PLUGINS_COUNT] %-45s : %s\n" "[$PLUGIN]" "Artifact is available: $ARTIFACT_URL";
|
||||
AVAILABLE=$(( AVAILABLE + 1 ))
|
||||
else
|
||||
printf "❌ [$COUNTER/$PLUGINS_COUNT] %-45s : %s\n" "[$PLUGIN]" "Artifact is NOT available: $ARTIFACT_URL";
|
||||
NOT_AVAILABLE=$(( NOT_AVAILABLE + 1 ))
|
||||
fi
|
||||
COUNTER=$(( COUNTER + 1 ));
|
||||
done;
|
||||
|
||||
echo -e "\n\n✅ Available: $AVAILABLE, ❌ Unavailable: $NOT_AVAILABLE";
|
||||
|
||||
exit 0;
|
||||
@@ -1,239 +0,0 @@
|
||||
#!/bin/bash
|
||||
#===============================================================================
|
||||
# SCRIPT: release-plugins.sh
|
||||
#
|
||||
# DESCRIPTION:
|
||||
# This script can be used to run a ./gradlew release command on each kestra plugin repository.
|
||||
# By default, if no `GITHUB_PAT` environment variable exist, the script will attempt to clone GitHub repositories using SSH_KEY.
|
||||
#
|
||||
# USAGE: ./release-plugins.sh [options]
|
||||
# OPTIONS:
|
||||
# --release-version <version> Specify the release version (required)
|
||||
# --next-version <version> Specify the next version (required)
|
||||
# --dry-run Specify to run in DRY_RUN.
|
||||
# -y, --yes Automatically confirm prompts (non-interactive).
|
||||
# -h, --help Show the help message and exit
|
||||
|
||||
# EXAMPLES:
|
||||
# To release all plugins:
|
||||
# ./release-plugins.sh --release-version=0.20.0 --next-version=0.21.0-SNAPSHOT
|
||||
# To release a specific plugin:
|
||||
# ./release-plugins.sh --release-version=0.20.0 --next-version=0.21.0-SNAPSHOT plugin-kubernetes
|
||||
# To release specific plugins from file:
|
||||
# ./release-plugins.sh --release-version=0.20.0 --plugin-file .plugins
|
||||
#===============================================================================
|
||||
|
||||
set -e;
|
||||
|
||||
###############################################################
|
||||
# Global vars
|
||||
###############################################################
|
||||
BASEDIR=$(dirname "$(readlink -f $0)")
|
||||
WORKING_DIR=/tmp/kestra-release-plugins-$(date +%s);
|
||||
PLUGIN_FILE="$BASEDIR/../.plugins"
|
||||
GIT_BRANCH=master
|
||||
|
||||
###############################################################
|
||||
# Functions
|
||||
###############################################################
|
||||
|
||||
# Function to display the help message
|
||||
usage() {
|
||||
echo "Usage: $0 --release-version <version> --next-version [plugin-repositories...]"
|
||||
echo
|
||||
echo "Options:"
|
||||
echo " --release-version <version> Specify the release version (required)."
|
||||
echo " --next-version <version> Specify the next version (required)."
|
||||
echo " --plugin-file File containing the plugin list (default: .plugins)"
|
||||
echo " --dry-run Specify to run in DRY_RUN."
|
||||
echo " -y, --yes Automatically confirm prompts (non-interactive)."
|
||||
echo " -h, --help Show this help message and exit."
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Function to ask to continue
|
||||
function askToContinue() {
|
||||
read -p "Are you sure you want to continue? [y/N] " confirm
|
||||
[[ "$confirm" =~ ^[Yy]$ ]] || { echo "Operation cancelled."; exit 1; }
|
||||
}
|
||||
|
||||
###############################################################
|
||||
# Options
|
||||
###############################################################
|
||||
|
||||
PLUGINS_ARGS=()
|
||||
AUTO_YES=false
|
||||
DRY_RUN=false
|
||||
# Get the options
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
case "$1" in
|
||||
--release-version)
|
||||
RELEASE_VERSION="$2"
|
||||
shift 2
|
||||
;;
|
||||
--release-version=*)
|
||||
RELEASE_VERSION="${1#*=}"
|
||||
shift
|
||||
;;
|
||||
--next-version)
|
||||
NEXT_VERSION="$2"
|
||||
shift 2
|
||||
;;
|
||||
--next-version=*)
|
||||
NEXT_VERSION="${1#*=}"
|
||||
shift
|
||||
;;
|
||||
--plugin-file)
|
||||
PLUGIN_FILE="$2"
|
||||
shift 2
|
||||
;;
|
||||
--plugin-file=*)
|
||||
PLUGIN_FILE="${1#*=}"
|
||||
shift
|
||||
;;
|
||||
--dry-run)
|
||||
DRY_RUN=true
|
||||
shift
|
||||
;;
|
||||
-y|--yes)
|
||||
AUTO_YES=true
|
||||
shift
|
||||
;;
|
||||
-h|--help)
|
||||
usage
|
||||
;;
|
||||
*)
|
||||
PLUGINS_ARGS+=("$1")
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
## Check options
|
||||
if [[ -z "$RELEASE_VERSION" ]]; then
|
||||
echo -e "Missing required argument: --release-version\n";
|
||||
usage
|
||||
fi
|
||||
|
||||
if [[ -z "$NEXT_VERSION" ]]; then
|
||||
echo -e "Missing required argument: --next-version\n";
|
||||
usage
|
||||
fi
|
||||
|
||||
## Get plugin list
|
||||
if [[ "${#PLUGINS_ARGS[@]}" -eq 0 ]]; then
|
||||
if [ -f "$PLUGIN_FILE" ]; then
|
||||
PLUGINS=$(cat "$PLUGIN_FILE" | grep "io\\.kestra\\." | sed -e '/#/s/^.//' | cut -d':' -f1 | uniq | sort);
|
||||
PLUGINS_COUNT=$(echo "$PLUGINS" | wc -l);
|
||||
PLUGINS_ARRAY=$(echo "$PLUGINS" | xargs || echo '');
|
||||
PLUGINS_ARRAY=($PLUGINS_ARRAY);
|
||||
fi
|
||||
else
|
||||
PLUGINS_ARRAY=("${PLUGINS_ARGS[@]}")
|
||||
PLUGINS_COUNT="${#PLUGINS_ARGS[@]}"
|
||||
fi
|
||||
|
||||
# Extract the major and minor versions
|
||||
BASE_VERSION=$(echo "$RELEASE_VERSION" | sed -E 's/^([0-9]+\.[0-9]+)\..*/\1/')
|
||||
PUSH_RELEASE_BRANCH="releases/v${BASE_VERSION}.x"
|
||||
|
||||
## Get plugin list
|
||||
echo "RELEASE_VERSION=$RELEASE_VERSION"
|
||||
echo "NEXT_VERSION=$NEXT_VERSION"
|
||||
echo "PUSH_RELEASE_BRANCH=$PUSH_RELEASE_BRANCH"
|
||||
echo "GIT_BRANCH=$GIT_BRANCH"
|
||||
echo "DRY_RUN=$DRY_RUN"
|
||||
echo "Found ($PLUGINS_COUNT) plugin repositories:";
|
||||
|
||||
for PLUGIN in "${PLUGINS_ARRAY[@]}"; do
|
||||
echo "$PLUGIN"
|
||||
done
|
||||
|
||||
if [[ "$AUTO_YES" == false ]]; then
|
||||
askToContinue
|
||||
fi
|
||||
|
||||
###############################################################
|
||||
# Main
|
||||
###############################################################
|
||||
mkdir -p $WORKING_DIR
|
||||
|
||||
COUNTER=1;
|
||||
for PLUGIN in "${PLUGINS_ARRAY[@]}"
|
||||
do
|
||||
cd $WORKING_DIR;
|
||||
|
||||
echo "---------------------------------------------------------------------------------------"
|
||||
echo "[$COUNTER/$PLUGINS_COUNT] Release Plugin: $PLUGIN"
|
||||
echo "---------------------------------------------------------------------------------------"
|
||||
if [[ -z "${GITHUB_PAT}" ]]; then
|
||||
git clone git@github.com:kestra-io/$PLUGIN
|
||||
else
|
||||
echo "Clone git repository using GITHUB PAT"
|
||||
git clone https://${GITHUB_PAT}@github.com/kestra-io/$PLUGIN.git
|
||||
fi
|
||||
cd "$PLUGIN";
|
||||
|
||||
if [[ "$PLUGIN" == "plugin-transform" ]] && [[ "$GIT_BRANCH" == "master" ]]; then # quickfix
|
||||
git checkout main;
|
||||
else
|
||||
git checkout "$GIT_BRANCH";
|
||||
fi
|
||||
|
||||
# Check if tag already exists on remote
|
||||
TAG_EXISTS=$(git ls-remote --tags origin "refs/tags/v${RELEASE_VERSION}" | wc -l)
|
||||
if [[ "$TAG_EXISTS" -ne 0 ]]; then
|
||||
echo "Tag ${RELEASE_VERSION} already exists for $PLUGIN. Skipping..."
|
||||
continue
|
||||
fi
|
||||
|
||||
if [[ "$DRY_RUN" == false ]]; then
|
||||
CURRENT_BRANCH=$(git branch --show-current);
|
||||
|
||||
echo "Run gradle release for plugin: $PLUGIN";
|
||||
echo "Branch: $CURRENT_BRANCH";
|
||||
|
||||
if [[ "$AUTO_YES" == false ]]; then
|
||||
askToContinue
|
||||
fi
|
||||
|
||||
# Create and push release branch
|
||||
git checkout -b "$PUSH_RELEASE_BRANCH";
|
||||
git push -u origin "$PUSH_RELEASE_BRANCH";
|
||||
|
||||
# Run gradle release
|
||||
git checkout "$CURRENT_BRANCH";
|
||||
|
||||
if [[ "$RELEASE_VERSION" == *"-SNAPSHOT" ]]; then
|
||||
# -SNAPSHOT qualifier maybe used to test release-candidates
|
||||
./gradlew release -Prelease.useAutomaticVersion=true \
|
||||
-Prelease.releaseVersion="${RELEASE_VERSION}" \
|
||||
-Prelease.newVersion="${NEXT_VERSION}" \
|
||||
-Prelease.pushReleaseVersionBranch="${PUSH_RELEASE_BRANCH}" \
|
||||
-Prelease.failOnSnapshotDependencies=false
|
||||
else
|
||||
./gradlew release -Prelease.useAutomaticVersion=true \
|
||||
-Prelease.releaseVersion="${RELEASE_VERSION}" \
|
||||
-Prelease.newVersion="${NEXT_VERSION}" \
|
||||
-Prelease.pushReleaseVersionBranch="${PUSH_RELEASE_BRANCH}"
|
||||
fi
|
||||
|
||||
git push;
|
||||
# Update the upper bound version of kestra
|
||||
PLUGIN_KESTRA_VERSION="[${BASE_VERSION},)"
|
||||
git checkout "$PUSH_RELEASE_BRANCH" && git pull;
|
||||
sed -i "s/^kestraVersion=.*/kestraVersion=${PLUGIN_KESTRA_VERSION}/" ./gradle.properties
|
||||
git add ./gradle.properties
|
||||
# Check if there are staged changes
|
||||
if ! git diff --cached --quiet; then
|
||||
git commit -m"chore(deps): update kestraVersion to ${PLUGIN_KESTRA_VERSION}."
|
||||
git push
|
||||
fi
|
||||
sleep 5; # add a short delay to not spam Maven Central
|
||||
else
|
||||
echo "Skip gradle release [DRY_RUN=true]";
|
||||
fi
|
||||
COUNTER=$(( COUNTER + 1 ));
|
||||
done;
|
||||
|
||||
exit 0;
|
||||
@@ -1,190 +0,0 @@
|
||||
#!/bin/bash
|
||||
#===============================================================================
|
||||
# SCRIPT: setversion-tag-plugins.sh
|
||||
#
|
||||
# DESCRIPTION:
|
||||
# This script can be used to update and tag plugins from a release branch .e.g., releases/v0.21.x.
|
||||
# By default, if no `GITHUB_PAT` environment variable exist, the script will attempt to clone GitHub repositories using SSH_KEY.
|
||||
#
|
||||
# USAGE: ./setversion-tag-plugins.sh [options]
|
||||
# OPTIONS:
|
||||
# --release-version <version> Specify the release version (required)
|
||||
# --dry-run Specify to run in DRY_RUN.
|
||||
# -y, --yes Automatically confirm prompts (non-interactive).
|
||||
# -h, --help Show the help message and exit
|
||||
|
||||
# EXAMPLES:
|
||||
# To release all plugins:
|
||||
# ./setversion-tag-plugins.sh --release-version=0.20.0
|
||||
# To release a specific plugin:
|
||||
# ./setversion-tag-plugins.sh --release-version=0.20.0 plugin-kubernetes
|
||||
# To release specific plugins from file:
|
||||
# ./setversion-tag-plugins.sh --release-version=0.20.0 --plugin-file .plugins
|
||||
#===============================================================================
|
||||
|
||||
set -e;
|
||||
|
||||
###############################################################
|
||||
# Global vars
|
||||
###############################################################
|
||||
BASEDIR=$(dirname "$(readlink -f $0)")
|
||||
WORKING_DIR=/tmp/kestra-release-plugins-$(date +%s);
|
||||
PLUGIN_FILE="$BASEDIR/../.plugins"
|
||||
|
||||
###############################################################
|
||||
# Functions
|
||||
###############################################################
|
||||
|
||||
# Function to display the help message
|
||||
usage() {
|
||||
echo "Usage: $0 --release-version <version> [plugin-repositories...]"
|
||||
echo
|
||||
echo "Options:"
|
||||
echo " --release-version <version> Specify the release version (required)."
|
||||
echo " --plugin-file File containing the plugin list (default: .plugins)"
|
||||
echo " --dry-run Specify to run in DRY_RUN."
|
||||
echo " -y, --yes Automatically confirm prompts (non-interactive)."
|
||||
echo " -h, --help Show this help message and exit."
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Function to ask to continue
|
||||
function askToContinue() {
|
||||
read -p "Are you sure you want to continue? [y/N] " confirm
|
||||
[[ "$confirm" =~ ^[Yy]$ ]] || { echo "Operation cancelled."; exit 1; }
|
||||
}
|
||||
|
||||
###############################################################
|
||||
# Options
|
||||
###############################################################
|
||||
|
||||
PLUGINS_ARGS=()
|
||||
AUTO_YES=false
|
||||
DRY_RUN=false
|
||||
# Get the options
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
case "$1" in
|
||||
--release-version)
|
||||
RELEASE_VERSION="$2"
|
||||
shift 2
|
||||
;;
|
||||
--release-version=*)
|
||||
RELEASE_VERSION="${1#*=}"
|
||||
shift
|
||||
;;
|
||||
--plugin-file)
|
||||
PLUGIN_FILE="$2"
|
||||
shift 2
|
||||
;;
|
||||
--plugin-file=*)
|
||||
PLUGIN_FILE="${1#*=}"
|
||||
shift
|
||||
;;
|
||||
--dry-run)
|
||||
DRY_RUN=true
|
||||
shift
|
||||
;;
|
||||
-y|--yes)
|
||||
AUTO_YES=true
|
||||
shift
|
||||
;;
|
||||
-h|--help)
|
||||
usage
|
||||
;;
|
||||
*)
|
||||
PLUGINS_ARGS+=("$1")
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
## Check options
|
||||
if [[ -z "$RELEASE_VERSION" ]]; then
|
||||
echo -e "Missing required argument: --release-version\n";
|
||||
usage
|
||||
fi
|
||||
|
||||
## Get plugin list
|
||||
if [[ "${#PLUGINS_ARGS[@]}" -eq 0 ]]; then
|
||||
if [ -f "$PLUGIN_FILE" ]; then
|
||||
PLUGINS=$(cat "$PLUGIN_FILE" | grep "io\\.kestra\\." | sed -e '/#/s/^.//' | cut -d':' -f1 | uniq | sort);
|
||||
PLUGINS_COUNT=$(echo "$PLUGINS" | wc -l);
|
||||
PLUGINS_ARRAY=$(echo "$PLUGINS" | xargs || echo '');
|
||||
PLUGINS_ARRAY=($PLUGINS_ARRAY);
|
||||
fi
|
||||
else
|
||||
PLUGINS_ARRAY=("${PLUGINS_ARGS[@]}")
|
||||
PLUGINS_COUNT="${#PLUGINS_ARGS[@]}"
|
||||
fi
|
||||
|
||||
# Extract the major and minor versions
|
||||
BASE_VERSION=$(echo "$RELEASE_VERSION" | sed -E 's/^([0-9]+\.[0-9]+)\..*/\1/')
|
||||
RELEASE_BRANCH="releases/v${BASE_VERSION}.x"
|
||||
|
||||
## Get plugin list
|
||||
echo "RELEASE_VERSION=$RELEASE_VERSION"
|
||||
echo "RELEASE_BRANCH=$RELEASE_BRANCH"
|
||||
echo "DRY_RUN=$DRY_RUN"
|
||||
echo "Found ($PLUGINS_COUNT) plugin repositories:";
|
||||
|
||||
for PLUGIN in "${PLUGINS_ARRAY[@]}"; do
|
||||
echo "$PLUGIN"
|
||||
done
|
||||
|
||||
if [[ "$AUTO_YES" == false ]]; then
|
||||
askToContinue
|
||||
fi
|
||||
|
||||
###############################################################
|
||||
# Main
|
||||
###############################################################
|
||||
mkdir -p $WORKING_DIR
|
||||
|
||||
COUNTER=1;
|
||||
for PLUGIN in "${PLUGINS_ARRAY[@]}"
|
||||
do
|
||||
cd $WORKING_DIR;
|
||||
|
||||
echo "---------------------------------------------------------------------------------------"
|
||||
echo "[$COUNTER/$PLUGINS_COUNT] $PLUGIN"
|
||||
echo "---------------------------------------------------------------------------------------"
|
||||
if [[ -z "${GITHUB_PAT}" ]]; then
|
||||
git clone git@github.com:kestra-io/$PLUGIN
|
||||
else
|
||||
echo "Clone git repository using GITHUB PAT"
|
||||
git clone https://${GITHUB_PAT}@github.com/kestra-io/$PLUGIN.git
|
||||
fi
|
||||
|
||||
cd "$PLUGIN";
|
||||
|
||||
git checkout $RELEASE_BRANCH;
|
||||
|
||||
if [[ "$DRY_RUN" == false ]]; then
|
||||
CURRENT_BRANCH=$(git branch --show-current);
|
||||
|
||||
echo "Update version and tag plugin: $PLUGIN";
|
||||
echo "Branch: $CURRENT_BRANCH";
|
||||
|
||||
if [[ "$AUTO_YES" == false ]]; then
|
||||
askToContinue
|
||||
fi
|
||||
|
||||
# Checkout release branch
|
||||
git checkout "$RELEASE_BRANCH";
|
||||
|
||||
# Update version
|
||||
sed -i "s/^version=.*/version=$RELEASE_VERSION/" ./gradle.properties
|
||||
git add ./gradle.properties
|
||||
git commit -m"chore(version): update to version 'v$RELEASE_VERSION'."
|
||||
git push
|
||||
git tag -a "v$RELEASE_VERSION" -m"v$RELEASE_VERSION"
|
||||
git push origin "v$RELEASE_VERSION"
|
||||
|
||||
sleep 5; # add a short delay to not spam Maven Central
|
||||
else
|
||||
echo "Skip tagging [DRY_RUN=true]";
|
||||
fi
|
||||
COUNTER=$(( COUNTER + 1 ));
|
||||
done;
|
||||
|
||||
exit 0;
|
||||
@@ -1,200 +0,0 @@
|
||||
#!/bin/bash
|
||||
#===============================================================================
|
||||
# SCRIPT: update-plugin-kestra-version.sh
|
||||
#
|
||||
# DESCRIPTION:
|
||||
# This script can be used to update the gradle 'kestraVersion' property on each kestra plugin repository.
|
||||
# By default, if no `GITHUB_PAT` environment variable exist, the script will attempt to clone GitHub repositories using SSH_KEY.
|
||||
#
|
||||
#USAGE:
|
||||
# ./dev-tools/update-plugin-kestra-version.sh --branch <branch> --version <version> [plugin-repositories...]
|
||||
#
|
||||
#OPTIONS:
|
||||
# --branch <branch> Specify the branch on which to update the kestraCoreVersion (default: master).
|
||||
# --version <version> Specify the Kestra core version (required).
|
||||
# --plugin-file File containing the plugin list (default: .plugins)
|
||||
# --dry-run Specify to run in DRY_RUN.
|
||||
# -y, --yes Automatically confirm prompts (non-interactive).
|
||||
# -h, --help Show this help message and exit.
|
||||
|
||||
|
||||
# EXAMPLES:
|
||||
# To release all plugins:
|
||||
# ./update-plugin-kestra-version.sh --branch=releases/v0.23.x --version="[0.23,0.24)"
|
||||
# To release a specific plugin:
|
||||
# ./update-plugin-kestra-version.sh --branch=releases/v0.23.x --version="[0.23,0.24)" plugin-kubernetes
|
||||
# To release specific plugins from file:
|
||||
# ./update-plugin-kestra-version.sh --branch=releases/v0.23.x --version="[0.23,0.24)" --plugin-file .plugins
|
||||
#===============================================================================
|
||||
|
||||
set -e;
|
||||
|
||||
###############################################################
|
||||
# Global vars
|
||||
###############################################################
|
||||
BASEDIR=$(dirname "$(readlink -f $0)")
|
||||
SCRIPT_NAME=$(basename "$0")
|
||||
SCRIPT_NAME="${SCRIPT_NAME%.*}"
|
||||
WORKING_DIR="/tmp/kestra-$SCRIPT_NAME-$(date +%s)"
|
||||
PLUGIN_FILE="$BASEDIR/../.plugins"
|
||||
GIT_BRANCH=master
|
||||
|
||||
###############################################################
|
||||
# Functions
|
||||
###############################################################
|
||||
|
||||
# Function to display the help message
|
||||
usage() {
|
||||
echo "Usage: $0 --branch <branch> --version <version> [plugin-repositories...]"
|
||||
echo
|
||||
echo "Options:"
|
||||
echo " --branch <branch> Specify the branch on which to update the kestraCoreVersion (default: master)."
|
||||
echo " --version <version> Specify the Kestra core version (required)."
|
||||
echo " --plugin-file File containing the plugin list (default: .plugins)"
|
||||
echo " --dry-run Specify to run in DRY_RUN."
|
||||
echo " -y, --yes Automatically confirm prompts (non-interactive)."
|
||||
echo " -h, --help Show this help message and exit."
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Function to ask to continue
|
||||
function askToContinue() {
|
||||
read -p "Are you sure you want to continue? [y/N] " confirm
|
||||
[[ "$confirm" =~ ^[Yy]$ ]] || { echo "Operation cancelled."; exit 1; }
|
||||
}
|
||||
|
||||
###############################################################
|
||||
# Options
|
||||
###############################################################
|
||||
|
||||
PLUGINS_ARGS=()
|
||||
AUTO_YES=false
|
||||
DRY_RUN=false
|
||||
# Get the options
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
case "$1" in
|
||||
--branch)
|
||||
GIT_BRANCH="$2"
|
||||
shift 2
|
||||
;;
|
||||
--branch=*)
|
||||
GIT_BRANCH="${1#*=}"
|
||||
shift
|
||||
;;
|
||||
--version)
|
||||
VERSION="$2"
|
||||
shift 2
|
||||
;;
|
||||
--version=*)
|
||||
VERSION="${1#*=}"
|
||||
shift
|
||||
;;
|
||||
--plugin-file)
|
||||
PLUGIN_FILE="$2"
|
||||
shift 2
|
||||
;;
|
||||
--plugin-file=*)
|
||||
PLUGIN_FILE="${1#*=}"
|
||||
shift
|
||||
;;
|
||||
--dry-run)
|
||||
DRY_RUN=true
|
||||
shift
|
||||
;;
|
||||
-y|--yes)
|
||||
AUTO_YES=true
|
||||
shift
|
||||
;;
|
||||
-h|--help)
|
||||
usage
|
||||
;;
|
||||
*)
|
||||
PLUGINS_ARGS+=("$1")
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
## Check options
|
||||
if [[ -z "$VERSION" ]]; then
|
||||
echo -e "Missing required argument: --version\n";
|
||||
usage
|
||||
fi
|
||||
|
||||
## Get plugin list
|
||||
if [[ "${#PLUGINS_ARGS[@]}" -eq 0 ]]; then
|
||||
if [ -f "$PLUGIN_FILE" ]; then
|
||||
PLUGINS=$(cat "$PLUGIN_FILE" | grep "io\\.kestra\\." | sed -e '/#/s/^.//' | cut -d':' -f1 | uniq | sort);
|
||||
PLUGINS_COUNT=$(echo "$PLUGINS" | wc -l);
|
||||
PLUGINS_ARRAY=$(echo "$PLUGINS" | xargs || echo '');
|
||||
PLUGINS_ARRAY=($PLUGINS_ARRAY);
|
||||
fi
|
||||
else
|
||||
PLUGINS_ARRAY=("${PLUGINS_ARGS[@]}")
|
||||
PLUGINS_COUNT="${#PLUGINS_ARGS[@]}"
|
||||
fi
|
||||
|
||||
|
||||
## Get plugin list
|
||||
echo "VERSION=$RELEASE_VERSION"
|
||||
echo "GIT_BRANCH=$GIT_BRANCH"
|
||||
echo "DRY_RUN=$DRY_RUN"
|
||||
echo "Found ($PLUGINS_COUNT) plugin repositories:";
|
||||
|
||||
for PLUGIN in "${PLUGINS_ARRAY[@]}"; do
|
||||
echo "$PLUGIN"
|
||||
done
|
||||
|
||||
if [[ "$AUTO_YES" == false ]]; then
|
||||
askToContinue
|
||||
fi
|
||||
|
||||
###############################################################
|
||||
# Main
|
||||
###############################################################
|
||||
mkdir -p $WORKING_DIR
|
||||
|
||||
COUNTER=1;
|
||||
for PLUGIN in "${PLUGINS_ARRAY[@]}"
|
||||
do
|
||||
cd $WORKING_DIR;
|
||||
|
||||
echo "---------------------------------------------------------------------------------------"
|
||||
echo "[$COUNTER/$PLUGINS_COUNT] Update Plugin: $PLUGIN"
|
||||
echo "---------------------------------------------------------------------------------------"
|
||||
if [[ -z "${GITHUB_PAT}" ]]; then
|
||||
git clone git@github.com:kestra-io/$PLUGIN
|
||||
else
|
||||
echo "Clone git repository using GITHUB PAT"
|
||||
git clone https://${GITHUB_PAT}@github.com/kestra-io/$PLUGIN.git
|
||||
fi
|
||||
cd "$PLUGIN";
|
||||
|
||||
if [[ "$PLUGIN" == "plugin-transform" ]] && [[ "$GIT_BRANCH" == "master" ]]; then # quickfix
|
||||
git checkout main;
|
||||
else
|
||||
git checkout "$GIT_BRANCH" || git checkout -b "$GIT_BRANCH";
|
||||
fi
|
||||
|
||||
CURRENT_BRANCH=$(git branch --show-current);
|
||||
|
||||
echo "Update kestraVersion for plugin: $PLUGIN on branch $CURRENT_BRANCH:";
|
||||
# Update the kestraVersion property
|
||||
sed -i "s/^kestraVersion=.*/kestraVersion=${VERSION}/" ./gradle.properties
|
||||
# Display diff
|
||||
git diff --exit-code --unified=0 ./gradle.properties | grep -E '^\+|^-' | grep -v -E '^\+\+\+|^---' || echo "No changes detected in gradle.properties";
|
||||
|
||||
if [[ "$DRY_RUN" == false ]]; then
|
||||
if [[ "$AUTO_YES" == false ]]; then
|
||||
askToContinue
|
||||
fi
|
||||
git add ./gradle.properties
|
||||
git commit -m"chore(deps): update kestraVersion to ${VERSION}." || true
|
||||
git push --set-upstream origin $GIT_BRANCH || true
|
||||
else
|
||||
echo "Skip git commit/push [DRY_RUN=true]";
|
||||
fi
|
||||
COUNTER=$(( COUNTER + 1 ));
|
||||
done;
|
||||
|
||||
exit 0;
|
||||
@@ -15,9 +15,9 @@ volumes:
|
||||
|
||||
services:
|
||||
postgres:
|
||||
image: postgres
|
||||
image: postgres:18
|
||||
volumes:
|
||||
- postgres-data:/var/lib/postgresql/data
|
||||
- postgres-data:/var/lib/postgresql/18/docker
|
||||
environment:
|
||||
POSTGRES_DB: kestra
|
||||
POSTGRES_USER: kestra
|
||||
|
||||
@@ -6,9 +6,9 @@ volumes:
|
||||
|
||||
services:
|
||||
postgres:
|
||||
image: postgres
|
||||
image: postgres:18
|
||||
volumes:
|
||||
- postgres-data:/var/lib/postgresql/data
|
||||
- postgres-data:/var/lib/postgresql/18/docker
|
||||
environment:
|
||||
POSTGRES_DB: kestra
|
||||
POSTGRES_USER: kestra
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
version=1.1.3
|
||||
version=1.2.0-SNAPSHOT
|
||||
|
||||
org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError
|
||||
org.gradle.parallel=true
|
||||
|
||||
@@ -79,6 +79,28 @@ public abstract class AbstractJdbcFlowTopologyRepository extends AbstractJdbcRep
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FlowTopology> findByNamespacePrefix(String tenantId, String namespacePrefix) {
|
||||
return jdbcRepository
|
||||
.getDslContextWrapper()
|
||||
.transactionResult(configuration -> {
|
||||
// Match flows that originate from the namespace or its children
|
||||
Condition sourceCondition = field("source_namespace").eq(namespacePrefix)
|
||||
.or(field("source_namespace").likeIgnoreCase(namespacePrefix + ".%"));
|
||||
|
||||
Condition tenantSource = buildTenantCondition("source", tenantId);
|
||||
Condition tenantDest = buildTenantCondition("destination", tenantId);
|
||||
|
||||
Select<Record1<Object>> from = DSL
|
||||
.using(configuration)
|
||||
.select(field("value"))
|
||||
.from(this.jdbcRepository.getTable())
|
||||
.where(tenantSource.and(tenantDest).and(sourceCondition));
|
||||
|
||||
return this.jdbcRepository.fetch(from);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FlowTopology> findAll(String tenantId) {
|
||||
return jdbcRepository
|
||||
|
||||
@@ -12,6 +12,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.function.BiConsumer;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
public abstract class AbstractJdbcExecutionQueuedStorage extends AbstractJdbcRepository {
|
||||
protected io.kestra.jdbc.AbstractJdbcRepository<ExecutionQueued> jdbcRepository;
|
||||
@@ -69,12 +70,18 @@ public abstract class AbstractJdbcExecutionQueuedStorage extends AbstractJdbcRep
|
||||
this.jdbcRepository
|
||||
.getDslContextWrapper()
|
||||
.transaction(configuration -> {
|
||||
DSL
|
||||
.using(configuration)
|
||||
.deleteFrom(this.jdbcRepository.getTable())
|
||||
.where(buildTenantCondition(execution.getTenantId()))
|
||||
.and(field("key").eq(IdUtils.fromParts(execution.getTenantId(), execution.getNamespace(), execution.getFlowId(), execution.getId())))
|
||||
.execute();
|
||||
var select = DSL
|
||||
.using(configuration)
|
||||
.select(AbstractJdbcRepository.field("value"))
|
||||
.from(this.jdbcRepository.getTable())
|
||||
.where(buildTenantCondition(execution.getTenantId()))
|
||||
.and(field("key").eq(IdUtils.fromParts(execution.getTenantId(), execution.getNamespace(), execution.getFlowId(), execution.getId())))
|
||||
.forUpdate();
|
||||
|
||||
Optional<ExecutionQueued> maybeExecution = this.jdbcRepository.fetchOne(select);
|
||||
if (maybeExecution.isPresent()) {
|
||||
this.jdbcRepository.delete(maybeExecution.get());
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ import io.kestra.core.models.flows.FlowWithSource;
|
||||
import io.kestra.core.models.triggers.Trigger;
|
||||
import io.kestra.core.repositories.TriggerRepositoryInterface;
|
||||
import io.kestra.core.runners.ScheduleContextInterface;
|
||||
import io.kestra.core.runners.Scheduler;
|
||||
import io.kestra.core.runners.SchedulerTriggerStateInterface;
|
||||
import io.kestra.core.services.FlowListenersInterface;
|
||||
import io.kestra.core.services.FlowService;
|
||||
@@ -57,9 +56,6 @@ public class JdbcScheduler extends AbstractScheduler {
|
||||
.forEach(abstractTrigger -> triggerRepository.delete(Trigger.of(flow, abstractTrigger)));
|
||||
}
|
||||
});
|
||||
|
||||
// No-op consumption of the trigger queue, so the events are purged from the queue
|
||||
this.triggerQueue.receive(Scheduler.class, trigger -> { });
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -19,9 +19,9 @@ dependencies {
|
||||
def jsonschemaVersion = "4.38.0"
|
||||
def kafkaVersion = "4.1.0"
|
||||
def opensearchVersion = "3.2.0"
|
||||
def opensearchRestVersion = "3.3.1"
|
||||
def opensearchRestVersion = "3.3.2"
|
||||
def flyingSaucerVersion = "10.0.3"
|
||||
def jacksonVersion = "2.20.0"
|
||||
def jacksonVersion = "2.20.1"
|
||||
def jacksonAnnotationsVersion = "2.20"
|
||||
def jugVersion = "5.1.1"
|
||||
def langchain4jVersion = "1.8.0"
|
||||
@@ -34,8 +34,8 @@ dependencies {
|
||||
api platform("io.qameta.allure:allure-bom:2.30.0")
|
||||
// we define cloud bom here for GCP, Azure and AWS so they are aligned for all plugins that use them (secret, storage, oss and ee plugins)
|
||||
api platform('com.google.cloud:libraries-bom:26.71.0')
|
||||
api platform("com.azure:azure-sdk-bom:1.3.0")
|
||||
api platform('software.amazon.awssdk:bom:2.36.3')
|
||||
api platform("com.azure:azure-sdk-bom:1.3.2")
|
||||
api platform('software.amazon.awssdk:bom:2.37.5')
|
||||
api platform("dev.langchain4j:langchain4j-bom:$langchain4jVersion")
|
||||
api platform("dev.langchain4j:langchain4j-community-bom:$langchain4jCommunityVersion")
|
||||
|
||||
@@ -103,7 +103,7 @@ dependencies {
|
||||
api group: 'co.elastic.logging', name: 'logback-ecs-encoder', version: '1.7.0'
|
||||
api group: 'de.focus-shift', name: 'jollyday-core', version: jollydayVersion
|
||||
api group: 'de.focus-shift', name: 'jollyday-jaxb', version: jollydayVersion
|
||||
api 'nl.basjes.gitignore:gitignore-reader:1.12.0'
|
||||
api 'nl.basjes.gitignore:gitignore-reader:1.12.1'
|
||||
api group: 'dev.failsafe', name: 'failsafe', version: '3.3.2'
|
||||
api group: 'com.cronutils', name: 'cron-utils', version: '9.2.1'
|
||||
api group: 'com.github.victools', name: 'jsonschema-generator', version: jsonschemaVersion
|
||||
|
||||
228
ui/package-lock.json
generated
@@ -10,7 +10,7 @@
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
"@js-joda/core": "^5.6.5",
|
||||
"@kestra-io/ui-libs": "^0.0.261",
|
||||
"@kestra-io/ui-libs": "^0.0.263",
|
||||
"@vue-flow/background": "^1.3.2",
|
||||
"@vue-flow/controls": "^1.1.2",
|
||||
"@vue-flow/core": "^1.47.0",
|
||||
@@ -105,6 +105,7 @@
|
||||
"patch-package": "^8.0.1",
|
||||
"playwright": "^1.55.0",
|
||||
"prettier": "^3.6.2",
|
||||
"rimraf": "^6.0.1",
|
||||
"rolldown-vite": "^7.1.20",
|
||||
"rollup-plugin-copy": "^3.5.0",
|
||||
"sass": "^1.92.3",
|
||||
@@ -2118,6 +2119,29 @@
|
||||
"url": "https://github.com/sponsors/kazupon"
|
||||
}
|
||||
},
|
||||
"node_modules/@isaacs/balanced-match": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
|
||||
"integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": "20 || >=22"
|
||||
}
|
||||
},
|
||||
"node_modules/@isaacs/brace-expansion": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
|
||||
"integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@isaacs/balanced-match": "^4.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": "20 || >=22"
|
||||
}
|
||||
},
|
||||
"node_modules/@isaacs/cliui": {
|
||||
"version": "8.0.2",
|
||||
"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
|
||||
@@ -3296,9 +3320,9 @@
|
||||
"license": "BSD-3-Clause"
|
||||
},
|
||||
"node_modules/@kestra-io/ui-libs": {
|
||||
"version": "0.0.261",
|
||||
"resolved": "https://registry.npmjs.org/@kestra-io/ui-libs/-/ui-libs-0.0.261.tgz",
|
||||
"integrity": "sha512-beKqB90UYHdJ8jwlTjrenqecYWxM8DuWRaxWogWLVOqFS191kmKo5Qme6fhLbOVMVVdsxH2nY4VIMIvYFnHIOw==",
|
||||
"version": "0.0.263",
|
||||
"resolved": "https://registry.npmjs.org/@kestra-io/ui-libs/-/ui-libs-0.0.263.tgz",
|
||||
"integrity": "sha512-j1rWqcQAK2CudNBkcDPjUXyaGFeBzJ7QEhPKFAbleHSw0N3QFu/iy0rFZxJNIMWRi1mGZBh74D6vL0OqQJkT2Q==",
|
||||
"dependencies": {
|
||||
"@nuxtjs/mdc": "^0.17.3",
|
||||
"@popperjs/core": "^2.11.8",
|
||||
@@ -12584,6 +12608,23 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/istanbul-lib-processinfo/node_modules/rimraf": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
|
||||
"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
|
||||
"deprecated": "Rimraf versions prior to v4 are no longer supported",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"glob": "^7.1.3"
|
||||
},
|
||||
"bin": {
|
||||
"rimraf": "bin.js"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/isaacs"
|
||||
}
|
||||
},
|
||||
"node_modules/istanbul-lib-processinfo/node_modules/uuid": {
|
||||
"version": "8.3.2",
|
||||
"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
|
||||
@@ -13421,6 +13462,23 @@
|
||||
"jest-runner": "^29.3.1"
|
||||
}
|
||||
},
|
||||
"node_modules/jest-playwright-preset/node_modules/rimraf": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
|
||||
"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
|
||||
"deprecated": "Rimraf versions prior to v4 are no longer supported",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"glob": "^7.1.3"
|
||||
},
|
||||
"bin": {
|
||||
"rimraf": "bin.js"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/isaacs"
|
||||
}
|
||||
},
|
||||
"node_modules/jest-playwright-preset/node_modules/uuid": {
|
||||
"version": "8.3.2",
|
||||
"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
|
||||
@@ -17064,6 +17122,23 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/nyc/node_modules/rimraf": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
|
||||
"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
|
||||
"deprecated": "Rimraf versions prior to v4 are no longer supported",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"glob": "^7.1.3"
|
||||
},
|
||||
"bin": {
|
||||
"rimraf": "bin.js"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/isaacs"
|
||||
}
|
||||
},
|
||||
"node_modules/nyc/node_modules/semver": {
|
||||
"version": "6.3.1",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
|
||||
@@ -18910,17 +18985,133 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/rimraf": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
|
||||
"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
|
||||
"deprecated": "Rimraf versions prior to v4 are no longer supported",
|
||||
"version": "6.0.1",
|
||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz",
|
||||
"integrity": "sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"glob": "^7.1.3"
|
||||
"glob": "^11.0.0",
|
||||
"package-json-from-dist": "^1.0.0"
|
||||
},
|
||||
"bin": {
|
||||
"rimraf": "bin.js"
|
||||
"rimraf": "dist/esm/bin.mjs"
|
||||
},
|
||||
"engines": {
|
||||
"node": "20 || >=22"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/isaacs"
|
||||
}
|
||||
},
|
||||
"node_modules/rimraf/node_modules/foreground-child": {
|
||||
"version": "3.3.1",
|
||||
"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
|
||||
"integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"cross-spawn": "^7.0.6",
|
||||
"signal-exit": "^4.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/isaacs"
|
||||
}
|
||||
},
|
||||
"node_modules/rimraf/node_modules/glob": {
|
||||
"version": "11.0.3",
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-11.0.3.tgz",
|
||||
"integrity": "sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"foreground-child": "^3.3.1",
|
||||
"jackspeak": "^4.1.1",
|
||||
"minimatch": "^10.0.3",
|
||||
"minipass": "^7.1.2",
|
||||
"package-json-from-dist": "^1.0.0",
|
||||
"path-scurry": "^2.0.0"
|
||||
},
|
||||
"bin": {
|
||||
"glob": "dist/esm/bin.mjs"
|
||||
},
|
||||
"engines": {
|
||||
"node": "20 || >=22"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/isaacs"
|
||||
}
|
||||
},
|
||||
"node_modules/rimraf/node_modules/jackspeak": {
|
||||
"version": "4.1.1",
|
||||
"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz",
|
||||
"integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==",
|
||||
"dev": true,
|
||||
"license": "BlueOak-1.0.0",
|
||||
"dependencies": {
|
||||
"@isaacs/cliui": "^8.0.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": "20 || >=22"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/isaacs"
|
||||
}
|
||||
},
|
||||
"node_modules/rimraf/node_modules/lru-cache": {
|
||||
"version": "11.2.2",
|
||||
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.2.tgz",
|
||||
"integrity": "sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"engines": {
|
||||
"node": "20 || >=22"
|
||||
}
|
||||
},
|
||||
"node_modules/rimraf/node_modules/minimatch": {
|
||||
"version": "10.0.3",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz",
|
||||
"integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@isaacs/brace-expansion": "^5.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "20 || >=22"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/isaacs"
|
||||
}
|
||||
},
|
||||
"node_modules/rimraf/node_modules/path-scurry": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz",
|
||||
"integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==",
|
||||
"dev": true,
|
||||
"license": "BlueOak-1.0.0",
|
||||
"dependencies": {
|
||||
"lru-cache": "^11.0.0",
|
||||
"minipass": "^7.1.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": "20 || >=22"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/isaacs"
|
||||
}
|
||||
},
|
||||
"node_modules/rimraf/node_modules/signal-exit": {
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
|
||||
"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"engines": {
|
||||
"node": ">=14"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/isaacs"
|
||||
@@ -19708,6 +19899,23 @@
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/spawn-wrap/node_modules/rimraf": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
|
||||
"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
|
||||
"deprecated": "Rimraf versions prior to v4 are no longer supported",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"glob": "^7.1.3"
|
||||
},
|
||||
"bin": {
|
||||
"rimraf": "bin.js"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/isaacs"
|
||||
}
|
||||
},
|
||||
"node_modules/spawn-wrap/node_modules/semver": {
|
||||
"version": "6.3.1",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
|
||||
|
||||
@@ -19,12 +19,12 @@
|
||||
"lint": "eslint --fix",
|
||||
"storybook": "storybook dev -p 6006",
|
||||
"build-storybook": "storybook build",
|
||||
"prepare": "cd .. && husky ui/.husky && rm -f .git/hooks/*",
|
||||
"prepare": "cd .. && husky ui/.husky && rimraf .git/hooks",
|
||||
"postinstall": "patch-package"
|
||||
},
|
||||
"dependencies": {
|
||||
"@js-joda/core": "^5.6.5",
|
||||
"@kestra-io/ui-libs": "^0.0.261",
|
||||
"@kestra-io/ui-libs": "^0.0.263",
|
||||
"@vue-flow/background": "^1.3.2",
|
||||
"@vue-flow/controls": "^1.1.2",
|
||||
"@vue-flow/core": "^1.47.0",
|
||||
@@ -119,6 +119,7 @@
|
||||
"patch-package": "^8.0.1",
|
||||
"playwright": "^1.55.0",
|
||||
"prettier": "^3.6.2",
|
||||
"rimraf": "^6.0.1",
|
||||
"rolldown-vite": "^7.1.20",
|
||||
"rollup-plugin-copy": "^3.5.0",
|
||||
"sass": "^1.92.3",
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
<button v-if="activeTab.length" class="closeButton" @click="setActiveTab('')">
|
||||
<Close />
|
||||
</button>
|
||||
<KeepAlive>
|
||||
<KeepAlive v-if="activeTab">
|
||||
<ContextDocs v-if="activeTab === 'docs'" />
|
||||
<ContextNews v-else-if="activeTab === 'news'" />
|
||||
<template v-else>
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
<template>
|
||||
<el-button data-test-id="execution-status" class="status" :size="props.size ?? ''" :style="style">
|
||||
{{ props.title || FILTERS.cap(props.status) }}
|
||||
</el-button>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {computed} from "vue";
|
||||
import * as FILTERS from "../utils/filters";
|
||||
|
||||
const props = defineProps<{
|
||||
status: string;
|
||||
size?: string;
|
||||
title?: string;
|
||||
label?: boolean;
|
||||
}>();
|
||||
|
||||
const style = computed(() => {
|
||||
const statusVarname = props.status?.toLowerCase();
|
||||
return {
|
||||
color: `var(--ks-content-${statusVarname}) !important`,
|
||||
"border-color": `var(--ks-border-${statusVarname}) !important`,
|
||||
"background-color": `var(--ks-background-${statusVarname}) !important`,
|
||||
};
|
||||
});
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
button.el-button {
|
||||
white-space: nowrap;
|
||||
border-radius: var(--el-border-radius-base);
|
||||
width: 7rem;
|
||||
cursor: default;
|
||||
|
||||
&.no-label {
|
||||
padding: 0.5rem;
|
||||
line-height: 1;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -128,14 +128,9 @@
|
||||
}
|
||||
},
|
||||
getTabClasses(tab) {
|
||||
const isEnterpriseTab = tab.locked;
|
||||
|
||||
return {
|
||||
"container": !isEnterpriseTab,
|
||||
"mt-4": !isEnterpriseTab,
|
||||
"px-0": isEnterpriseTab,
|
||||
};
|
||||
},
|
||||
if(tab.locked) return {"px-0": true};
|
||||
return {"container": true, "mt-4": true};
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
containerClass() {
|
||||
|
||||
@@ -5,17 +5,13 @@
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
const props = defineProps({
|
||||
icon: {
|
||||
type: Object,
|
||||
required: true
|
||||
},
|
||||
label: {
|
||||
type: String,
|
||||
required: true
|
||||
}
|
||||
});
|
||||
<script setup lang="ts">
|
||||
import type {Component} from "vue";
|
||||
|
||||
const props = defineProps<{
|
||||
icon: Component;
|
||||
label: string;
|
||||
}>();
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
||||
@@ -41,7 +41,13 @@
|
||||
<template #expand>
|
||||
<el-table-column type="expand">
|
||||
<template #default="props">
|
||||
<LogsWrapper class="m-3" :filters="props.row" v-if="hasLogsContent(props.row)" :withCharts="false" embed />
|
||||
<LogsWrapper
|
||||
class="m-3"
|
||||
:filters="props.row"
|
||||
v-if="hasLogsContent(props.row)"
|
||||
:withCharts="false"
|
||||
embed
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</template>
|
||||
@@ -71,6 +77,9 @@
|
||||
<el-button @click="deleteBackfills()">
|
||||
{{ $t("delete backfills") }}
|
||||
</el-button>
|
||||
<el-button @click="deleteTriggers()" type="danger">
|
||||
{{ $t("delete triggers") }}
|
||||
</el-button>
|
||||
</BulkSelect>
|
||||
</template>
|
||||
<el-table-column
|
||||
@@ -95,17 +104,32 @@
|
||||
:sortOrders="['flowId', 'namespace', 'nextExecutionDate'].includes(col.prop) ? ['ascending', 'descending'] : undefined"
|
||||
>
|
||||
<template #header v-if="col.prop === 'date'">
|
||||
<el-tooltip :content="$t('last trigger date tooltip')" placement="top" effect="light" popperClass="wide-tooltip">
|
||||
<el-tooltip
|
||||
:content="$t('last trigger date tooltip')"
|
||||
placement="top"
|
||||
effect="light"
|
||||
popperClass="wide-tooltip"
|
||||
>
|
||||
<span>{{ col.label }}</span>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
<template #header v-else-if="col.prop === 'updatedDate'">
|
||||
<el-tooltip :content="$t('context updated date tooltip')" placement="top" effect="light" popperClass="wide-tooltip">
|
||||
<el-tooltip
|
||||
:content="$t('context updated date tooltip')"
|
||||
placement="top"
|
||||
effect="light"
|
||||
popperClass="wide-tooltip"
|
||||
>
|
||||
<span>{{ col.label }}</span>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
<template #header v-else-if="col.prop === 'nextExecutionDate'">
|
||||
<el-tooltip :content="$t('next evaluation date tooltip')" placement="top" effect="light" popperClass="wide-tooltip">
|
||||
<el-tooltip
|
||||
:content="$t('next evaluation date tooltip')"
|
||||
placement="top"
|
||||
effect="light"
|
||||
popperClass="wide-tooltip"
|
||||
>
|
||||
<span>{{ col.label }}</span>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
@@ -181,13 +205,26 @@
|
||||
<LockOff />
|
||||
</Kicon>
|
||||
</el-button>
|
||||
<el-button>
|
||||
<Kicon
|
||||
:tooltip="$t('delete trigger')"
|
||||
placement="left"
|
||||
@click="confirmDeleteTrigger(scope.row)"
|
||||
>
|
||||
<Delete />
|
||||
</Kicon>
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('backfill')" columnKey="backfill">
|
||||
<template #default="scope">
|
||||
<div class="backfillContainer items-center gap-2">
|
||||
<span v-if="scope.row.backfill" class="statusIcon">
|
||||
<el-tooltip v-if="!scope.row.backfill.paused" :content="$t('backfill running')" effect="light">
|
||||
<el-tooltip
|
||||
v-if="!scope.row.backfill.paused"
|
||||
:content="$t('backfill running')"
|
||||
effect="light"
|
||||
>
|
||||
<PlayBox font />
|
||||
</el-tooltip>
|
||||
<el-tooltip v-else :content="$t('backfill paused')">
|
||||
@@ -312,18 +349,16 @@
|
||||
import {useTriggerFilter} from "../filter/configurations";
|
||||
import {useDataTableActions} from "../../composables/useDataTableActions";
|
||||
import {useSelectTableActions} from "../../composables/useSelectTableActions";
|
||||
import {useTableColumns, type ColumnConfig} from "../../composables/useTableColumns";
|
||||
import {type ColumnConfig, useTableColumns} from "../../composables/useTableColumns";
|
||||
|
||||
import action from "../../models/action";
|
||||
import permission from "../../models/permission";
|
||||
|
||||
const triggerFilter = useTriggerFilter();
|
||||
|
||||
import LockOff from "vue-material-design-icons/LockOff.vue";
|
||||
import PlayBox from "vue-material-design-icons/PlayBox.vue";
|
||||
import PauseBox from "vue-material-design-icons/PauseBox.vue";
|
||||
import AlertCircle from "vue-material-design-icons/AlertCircle.vue";
|
||||
import CalendarCollapseHorizontalOutline from "vue-material-design-icons/CalendarCollapseHorizontalOutline.vue";
|
||||
import Delete from "vue-material-design-icons/Delete.vue";
|
||||
|
||||
import Id from "../Id.vue";
|
||||
import Kicon from "../Kicon.vue";
|
||||
@@ -338,9 +373,12 @@
|
||||
import SelectTable from "../layout/SelectTable.vue";
|
||||
import TriggerAvatar from "../flows/TriggerAvatar.vue";
|
||||
import KSFilter from "../filter/components/KSFilter.vue";
|
||||
import useRestoreUrl from "../../composables/useRestoreUrl";
|
||||
import MarkdownTooltip from "../layout/MarkdownTooltip.vue";
|
||||
import useRouteContext from "../../composables/useRouteContext";
|
||||
|
||||
const triggerFilter = useTriggerFilter();
|
||||
|
||||
|
||||
const route = useRoute();
|
||||
const toast = useToast();
|
||||
@@ -369,55 +407,55 @@
|
||||
end: null,
|
||||
inputs: null,
|
||||
labels: []
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
const optionalColumns = computed(() => [
|
||||
{
|
||||
label: t("flow"),
|
||||
prop: "flowId",
|
||||
default: true,
|
||||
label: t("flow"),
|
||||
prop: "flowId",
|
||||
default: true,
|
||||
description: t("filter.table_column.triggers.flow")
|
||||
},
|
||||
{
|
||||
label: t("namespace"),
|
||||
prop: "namespace",
|
||||
default: true,
|
||||
label: t("namespace"),
|
||||
prop: "namespace",
|
||||
default: true,
|
||||
description: t("filter.table_column.triggers.namespace")
|
||||
},
|
||||
{
|
||||
label: t("current execution"),
|
||||
prop: "executionId",
|
||||
default: false,
|
||||
label: t("current execution"),
|
||||
prop: "executionId",
|
||||
default: false,
|
||||
description: t("filter.table_column.triggers.current execution")
|
||||
},
|
||||
{
|
||||
label: t("workerId"),
|
||||
prop: "workerId",
|
||||
default: false,
|
||||
label: t("workerId"),
|
||||
prop: "workerId",
|
||||
default: false,
|
||||
description: t("filter.table_column.triggers.workerId")
|
||||
},
|
||||
{
|
||||
label: t("last trigger date"),
|
||||
prop: "date",
|
||||
default: true,
|
||||
label: t("last trigger date"),
|
||||
prop: "date",
|
||||
default: true,
|
||||
description: t("filter.table_column.triggers.last trigger date")
|
||||
},
|
||||
{
|
||||
label: t("context updated date"),
|
||||
prop: "updatedDate",
|
||||
default: false,
|
||||
label: t("context updated date"),
|
||||
prop: "updatedDate",
|
||||
default: false,
|
||||
description: t("filter.table_column.triggers.context updated date")
|
||||
},
|
||||
{
|
||||
label: t("next evaluation date"),
|
||||
prop: "nextExecutionDate",
|
||||
default: false,
|
||||
label: t("next evaluation date"),
|
||||
prop: "nextExecutionDate",
|
||||
default: false,
|
||||
description: t("filter.table_column.triggers.next evaluation date")
|
||||
},
|
||||
{
|
||||
label: t("evaluation lock date"),
|
||||
prop: "evaluateRunningDate",
|
||||
default: false,
|
||||
label: t("evaluation lock date"),
|
||||
prop: "evaluateRunningDate",
|
||||
default: false,
|
||||
description: t("filter.table_column.triggers.evaluation lock date")
|
||||
}
|
||||
]);
|
||||
@@ -430,12 +468,14 @@
|
||||
initialVisibleColumns: optionalColumns.value.filter(col => col.default).map(col => col.prop)
|
||||
});
|
||||
|
||||
const visibleColumns = computed(() =>
|
||||
const visibleColumns = computed(() =>
|
||||
displayColumns.value
|
||||
.map(prop => optionalColumns.value.find(c => c.prop === prop))
|
||||
.filter(Boolean) as ColumnConfig[]
|
||||
);
|
||||
|
||||
const {saveRestoreUrl} = useRestoreUrl();
|
||||
|
||||
const loadData = (callback?: () => void) => {
|
||||
const query = loadQuery({
|
||||
size: parseInt(String(route.query?.size ?? "25")),
|
||||
@@ -461,11 +501,12 @@
|
||||
|
||||
const {ready, onSort, onPageChanged, queryWithFilter, load} = useDataTableActions({
|
||||
dataTableRef: dataTable,
|
||||
loadData
|
||||
loadData,
|
||||
saveRestoreUrl
|
||||
});
|
||||
|
||||
const {
|
||||
queryBulkAction,
|
||||
queryBulkAction,
|
||||
selection,
|
||||
handleSelectionChange,
|
||||
toggleAllUnselected,
|
||||
@@ -541,7 +582,7 @@
|
||||
const disabledEndDate = (time: Date) => {
|
||||
return new Date() < time || (backfill.value.start && backfill.value.start > time);
|
||||
};
|
||||
|
||||
|
||||
const triggerLoadDataAfterBulkEditAction = () => {
|
||||
loadData();
|
||||
setTimeout(() => loadData(), 200);
|
||||
@@ -598,9 +639,44 @@
|
||||
});
|
||||
};
|
||||
|
||||
const genericConfirmAction = (toastKey: string, queryAction: string, byIdAction: string, success: string, data?: any) => {
|
||||
const confirmDeleteTrigger = (trigger) => {
|
||||
toast.confirm(
|
||||
t(toastKey, {"count": queryBulkAction.value ? total.value : selection.value?.length}) + ". " + t("bulk action async warning"),
|
||||
t("delete trigger confirmation", {id: trigger.id}),
|
||||
() => triggerStore.delete({
|
||||
namespace: trigger.namespace,
|
||||
flowId: trigger.flowId,
|
||||
triggerId: trigger.triggerId
|
||||
}).then(() => {
|
||||
toast.success(t("delete trigger success", {id: trigger.id}));
|
||||
loadData();
|
||||
}).catch(error => {
|
||||
toast.error(t("delete trigger error", {id: trigger.id}));
|
||||
console.error(error);
|
||||
}),
|
||||
"warning"
|
||||
);
|
||||
};
|
||||
|
||||
const deleteTriggers = () => {
|
||||
genericConfirmAction(
|
||||
"bulk delete triggers",
|
||||
"deleteByQuery",
|
||||
"deleteByTriggers",
|
||||
"bulk success delete triggers",
|
||||
null,
|
||||
"WARNING: deleting triggers may lead to duplicate executions if the triggers are still active in flows"
|
||||
);
|
||||
};
|
||||
|
||||
const genericConfirmAction = (toastKey: string, queryAction: string, byIdAction: string, success: string, data?: any, extraWarning = null) => {
|
||||
let message = t(toastKey, {"count": queryBulkAction.value ? total.value : selection.value?.length}) + ". " + t("bulk action async warning");
|
||||
|
||||
if (extraWarning) {
|
||||
message += "<br><br><strong>" + extraWarning + "</strong>";
|
||||
}
|
||||
|
||||
toast.confirm(
|
||||
message,
|
||||
() => genericConfirmCallback(queryAction, byIdAction, success, data)
|
||||
);
|
||||
};
|
||||
@@ -617,6 +693,8 @@
|
||||
"unlockByTriggers": () => triggerStore.unlockByTriggers,
|
||||
"setDisabledByQuery": () => triggerStore.setDisabledByQuery,
|
||||
"setDisabledByTriggers": () => triggerStore.setDisabledByTriggers,
|
||||
"deleteByQuery": () => triggerStore.deleteByQuery,
|
||||
"deleteByTriggers": () => triggerStore.deleteByTriggers,
|
||||
};
|
||||
|
||||
if (queryBulkAction.value) {
|
||||
@@ -758,86 +836,86 @@
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.data-table-wrapper {
|
||||
margin-left: 0 !important;
|
||||
padding-left: 0 !important;
|
||||
}
|
||||
|
||||
.backfillContainer {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.statusIcon {
|
||||
font-size: large;
|
||||
}
|
||||
|
||||
.trigger-issue-icon {
|
||||
color: var(--ks-content-warning);
|
||||
font-size: 1.4em;
|
||||
}
|
||||
|
||||
.alert-circle-icon {
|
||||
color: var(--ks-content-warning);
|
||||
font-size: 1.4em;
|
||||
}
|
||||
|
||||
:deep(.el-table__expand-icon) {
|
||||
pointer-events: none;
|
||||
|
||||
.el-icon {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
:deep(.el-switch) {
|
||||
.is-text {
|
||||
padding: 0 3px;
|
||||
color: inherit;
|
||||
.data-table-wrapper {
|
||||
margin-left: 0 !important;
|
||||
padding-left: 0 !important;
|
||||
}
|
||||
|
||||
&.is-checked {
|
||||
.backfillContainer {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.statusIcon {
|
||||
font-size: large;
|
||||
}
|
||||
|
||||
.trigger-issue-icon {
|
||||
color: var(--ks-content-warning);
|
||||
font-size: 1.4em;
|
||||
}
|
||||
|
||||
.alert-circle-icon {
|
||||
color: var(--ks-content-warning);
|
||||
font-size: 1.4em;
|
||||
}
|
||||
|
||||
:deep(.el-table__expand-icon) {
|
||||
pointer-events: none;
|
||||
|
||||
.el-icon {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
:deep(.el-switch) {
|
||||
.is-text {
|
||||
color: #ffffff;
|
||||
padding: 0 3px;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
&.is-checked {
|
||||
.is-text {
|
||||
color: #ffffff;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.el-table {
|
||||
a {
|
||||
color: var(--ks-content-link);
|
||||
}
|
||||
}
|
||||
|
||||
.wide-tooltip {
|
||||
max-width: 400px;
|
||||
white-space: normal;
|
||||
word-break: break-word;
|
||||
color: var(--ks-content-primary) !important;
|
||||
}
|
||||
|
||||
:deep(.el-collapse) {
|
||||
border-radius: var(--bs-border-radius-lg);
|
||||
border: 1px solid var(--ks-border-primary);
|
||||
background: var(--bs-gray-100);
|
||||
|
||||
.el-collapse-item__header {
|
||||
background: transparent;
|
||||
border-bottom: 1px solid var(--ks-border-primary);
|
||||
font-size: var(--bs-font-size-sm);
|
||||
.el-table {
|
||||
a {
|
||||
color: var(--ks-content-link);
|
||||
}
|
||||
}
|
||||
|
||||
.el-collapse-item__content {
|
||||
.wide-tooltip {
|
||||
max-width: 400px;
|
||||
white-space: normal;
|
||||
word-break: break-word;
|
||||
color: var(--ks-content-primary) !important;
|
||||
}
|
||||
|
||||
:deep(.el-collapse) {
|
||||
border-radius: var(--bs-border-radius-lg);
|
||||
border: 1px solid var(--ks-border-primary);
|
||||
background: var(--bs-gray-100);
|
||||
border-bottom: 1px solid var(--ks-border-primary);
|
||||
}
|
||||
|
||||
.el-collapse-item__header,
|
||||
.el-collapse-item__content {
|
||||
&:last-child {
|
||||
border-bottom-left-radius: var(--bs-border-radius-lg);
|
||||
border-bottom-right-radius: var(--bs-border-radius-lg);
|
||||
.el-collapse-item__header {
|
||||
background: transparent;
|
||||
border-bottom: 1px solid var(--ks-border-primary);
|
||||
font-size: var(--bs-font-size-sm);
|
||||
}
|
||||
|
||||
.el-collapse-item__content {
|
||||
background: var(--bs-gray-100);
|
||||
border-bottom: 1px solid var(--ks-border-primary);
|
||||
}
|
||||
|
||||
.el-collapse-item__header,
|
||||
.el-collapse-item__content {
|
||||
&:last-child {
|
||||
border-bottom-left-radius: var(--bs-border-radius-lg);
|
||||
border-bottom-right-radius: var(--bs-border-radius-lg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@@ -194,6 +194,10 @@
|
||||
showClose: false
|
||||
})
|
||||
})
|
||||
} else {
|
||||
ElMessage.error({
|
||||
message: t("setup.validation.incorrect_creds")
|
||||
})
|
||||
}
|
||||
} catch {
|
||||
ElMessage.error({
|
||||
@@ -266,6 +270,7 @@
|
||||
.basic-auth-login {
|
||||
flex-shrink: 1;
|
||||
width: 400px;
|
||||
container-type: inline-size;
|
||||
|
||||
.logo {
|
||||
width: 250px;
|
||||
@@ -306,5 +311,20 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 640px) {
|
||||
width: 100%;
|
||||
padding: 1rem;
|
||||
|
||||
.logo {
|
||||
width: 200px;
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
|
||||
.el-form {
|
||||
max-width: 100%;
|
||||
padding: 1.5rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,11 +1,6 @@
|
||||
<template>
|
||||
<div class="button-top">
|
||||
<ValidationError
|
||||
class="mx-3"
|
||||
tooltipPlacement="bottom-start"
|
||||
:errors="dashboardStore.errors"
|
||||
:warnings="dashboardStore.warnings"
|
||||
/>
|
||||
<ValidationError class="mx-3" tooltipPlacement="bottom-start" :errors="errors" />
|
||||
|
||||
<el-button
|
||||
:icon="ContentSave"
|
||||
@@ -22,7 +17,6 @@
|
||||
import {useI18n} from "vue-i18n";
|
||||
import ContentSave from "vue-material-design-icons/ContentSave.vue";
|
||||
import ValidationError from "../../flows/ValidationError.vue";
|
||||
import {useDashboardStore} from "../../../stores/dashboard";
|
||||
|
||||
const {t} = useI18n();
|
||||
|
||||
@@ -30,11 +24,15 @@
|
||||
(e: "save"): void;
|
||||
}>();
|
||||
|
||||
const dashboardStore = useDashboardStore();
|
||||
const props = defineProps<{
|
||||
warnings?: string[];
|
||||
errors?: string[];
|
||||
disabled?: boolean;
|
||||
}>();
|
||||
|
||||
const saveButtonType = computed(() => {
|
||||
if (dashboardStore.errors) return "danger";
|
||||
return dashboardStore.warnings ? "warning" : "primary";
|
||||
if (props.errors) return "danger";
|
||||
return props.warnings ? "warning" : "primary";
|
||||
});
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
|
||||
@@ -121,16 +121,32 @@
|
||||
const dataset = chart.data.datasets[0];
|
||||
const meta = chart.getDatasetMeta(0);
|
||||
|
||||
const thicknessScale = dataset.thicknessScale;
|
||||
//dynamically calculate thickness based on chart size
|
||||
const chartArea = chart.chartArea;
|
||||
if (!chartArea || !meta || !meta.data) return;
|
||||
// Available radius = half of the smaller dimension (width or height)
|
||||
const availableRadius = Math.min(chartArea.width, chartArea.height) / 2;
|
||||
// define thickness bounds relative to available radius
|
||||
const minThicknessPx = Math.max(6, availableRadius * 0.05); // >0
|
||||
const maxThicknessPx = Math.max(12, availableRadius * 0.3); // >0
|
||||
// Reading weights from dataset with fallback weight(1)
|
||||
const weights: number[] = (dataset.thicknessWeight && Array.isArray(dataset.thicknessWeight))? dataset.thicknessWeight.map((w: any) =>
|
||||
{
|
||||
const n = Number(w);
|
||||
return Number.isFinite(n) ? Math.min(Math.max(n, 0), 1) : 1;
|
||||
})
|
||||
: meta.data.map(() => 1);
|
||||
for (let i = 0; i < meta.data.length; i++) {
|
||||
const arc = meta.data[i];
|
||||
const w = weights[i] ?? 1;
|
||||
const thicknessPx = minThicknessPx + w * (maxThicknessPx - minThicknessPx);
|
||||
|
||||
meta.data.forEach((arc, index) => {
|
||||
const baseRadius = arc.innerRadius;
|
||||
const additionalThickness = thicknessScale[index];
|
||||
arc.outerRadius = baseRadius + additionalThickness;
|
||||
const baseRadius = arc.innerRadius ?? Math.max(0, availableRadius - thicknessPx);
|
||||
arc.outerRadius = baseRadius + thicknessPx;
|
||||
arc.innerRadius = baseRadius;
|
||||
|
||||
arc.draw(ctx);
|
||||
});
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
@@ -199,9 +215,9 @@
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
$height: 200px;
|
||||
|
||||
.chart {
|
||||
max-height: $height;
|
||||
|
||||
.chart {
|
||||
height: 100% !important;
|
||||
width: 100% !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
import Duration from "./table/columns/Duration.vue";
|
||||
import Link from "./table/columns/Link.vue";
|
||||
import Namespace from "./table/columns/Namespace.vue";
|
||||
import Status from "../../Status.vue";
|
||||
import {Status} from "@kestra-io/ui-libs";
|
||||
|
||||
import Pagination from "../../layout/Pagination.vue";
|
||||
import NoData from "../../layout/NoData.vue";
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
import type cytoscape from "cytoscape";
|
||||
|
||||
import Link from "./Link.vue";
|
||||
import Status from "../../Status.vue";
|
||||
import {Status} from "@kestra-io/ui-libs";
|
||||
|
||||
import OpenInNew from "vue-material-design-icons/OpenInNew.vue";
|
||||
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
import TopNavBar from "../layout/TopNavBar.vue";
|
||||
import {useDocStore} from "../../stores/doc";
|
||||
import DocsLayout from "./DocsLayout.vue";
|
||||
//@ts-expect-error no declaration
|
||||
import Toc from "./Toc.vue";
|
||||
import {computed,ref,watch,getCurrentInstance} from "vue";
|
||||
import {useRoute} from "vue-router";
|
||||
|
||||
@@ -72,9 +72,7 @@
|
||||
|
||||
import StateMachine from "vue-material-design-icons/StateMachine.vue";
|
||||
|
||||
import Status from "../../components/Status.vue";
|
||||
|
||||
import {State} from "@kestra-io/ui-libs";
|
||||
import {State, Status} from "@kestra-io/ui-libs";
|
||||
import * as ExecutionUtils from "../../utils/executionUtils";
|
||||
import permission from "../../models/permission";
|
||||
import action from "../../models/action";
|
||||
@@ -84,7 +82,7 @@
|
||||
import {useExecutionsStore} from "../../stores/executions";
|
||||
import {useAuthStore} from "override/stores/auth";
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
const props = defineProps<{
|
||||
component: string;
|
||||
execution: {
|
||||
id: string;
|
||||
@@ -95,10 +93,7 @@
|
||||
};
|
||||
};
|
||||
tooltipPosition: string;
|
||||
}>(), {
|
||||
component: "el-button",
|
||||
tooltipPosition: "bottom"
|
||||
});
|
||||
}>();
|
||||
|
||||
const emit = defineEmits<{
|
||||
follow: [];
|
||||
|
||||
@@ -68,8 +68,7 @@
|
||||
import {useExecutionsStore} from "../../stores/executions";
|
||||
import permission from "../../models/permission";
|
||||
import action from "../../models/action";
|
||||
import {State} from "@kestra-io/ui-libs"
|
||||
import Status from "../../components/Status.vue";
|
||||
import {State, Status} from "@kestra-io/ui-libs"
|
||||
import * as ExecutionUtils from "../../utils/executionUtils";
|
||||
import {shallowRef} from "vue";
|
||||
import {useAuthStore} from "override/stores/auth"
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
</template>
|
||||
|
||||
<template v-if="showStatChart()" #top>
|
||||
<Sections ref="dashboardComponent" :dashboard="{id: 'default', charts: []}" :charts showDefault class="mb-4" />
|
||||
<Sections ref="dashboardComponent" :dashboard="{id: 'default', charts: []}" :charts showDefault />
|
||||
</template>
|
||||
|
||||
<template #table>
|
||||
@@ -70,7 +70,7 @@
|
||||
@selection-change="handleSelectionChange"
|
||||
:selectable="!hidden?.includes('selection') && canCheck"
|
||||
:no-data-text="$t('no_results.executions')"
|
||||
:rowKey="(row: any) => row.id"
|
||||
:rowKey="(row: any) => `${row.namespace}-${row.id}`"
|
||||
>
|
||||
<template #select-actions>
|
||||
<BulkSelect
|
||||
@@ -144,7 +144,10 @@
|
||||
|
||||
<el-form>
|
||||
<ElFormItem :label="$t('execution labels')">
|
||||
<LabelInput v-model:labels="executionLabels" />
|
||||
<LabelInput
|
||||
:key="executionLabels.map((l) => l.key).join('-')"
|
||||
v-model:labels="executionLabels"
|
||||
/>
|
||||
</ElFormItem>
|
||||
</el-form>
|
||||
</el-dialog>
|
||||
@@ -381,7 +384,7 @@
|
||||
import _merge from "lodash/merge";
|
||||
import {useI18n} from "vue-i18n";
|
||||
import {useRoute, useRouter} from "vue-router";
|
||||
import {ref, computed, watch, h, useTemplateRef} from "vue";
|
||||
import {ref, computed, onMounted, watch, h, useTemplateRef} from "vue";
|
||||
import * as YAML_UTILS from "@kestra-io/ui-libs/flow-yaml-utils";
|
||||
import {ElMessageBox, ElSwitch, ElFormItem, ElAlert, ElCheckbox} from "element-plus";
|
||||
|
||||
@@ -403,7 +406,7 @@
|
||||
|
||||
import Id from "../Id.vue";
|
||||
import Kicon from "../Kicon.vue";
|
||||
import Status from "../Status.vue";
|
||||
import {State, Status} from "@kestra-io/ui-libs";
|
||||
import Labels from "../layout/Labels.vue";
|
||||
import DateAgo from "../layout/DateAgo.vue";
|
||||
import DataTable from "../layout/DataTable.vue";
|
||||
@@ -417,21 +420,21 @@
|
||||
//@ts-expect-error no declaration file
|
||||
import TriggerFlow from "../../components/flows/TriggerFlow.vue";
|
||||
|
||||
import {State} from "@kestra-io/ui-libs";
|
||||
import {filterValidLabels} from "./utils";
|
||||
import {useToast} from "../../utils/toast";
|
||||
import {storageKeys} from "../../utils/constants";
|
||||
import {defaultNamespace} from "../../composables/useNamespaces";
|
||||
import {humanizeDuration, invisibleSpace} from "../../utils/filters";
|
||||
import Utils from "../../utils/utils";
|
||||
|
||||
import action from "../../models/action";
|
||||
import permission from "../../models/permission";
|
||||
|
||||
import useRestoreUrl from "../../composables/useRestoreUrl";
|
||||
import useRouteContext from "../../composables/useRouteContext";
|
||||
import {useTableColumns} from "../../composables/useTableColumns";
|
||||
import {useDataTableActions} from "../../composables/useDataTableActions";
|
||||
import {useSelectTableActions} from "../../composables/useSelectTableActions";
|
||||
import {useApplyDefaultFilter} from "../filter/composables/useDefaultFilter";
|
||||
|
||||
import {useFlowStore} from "../../stores/flow";
|
||||
import {useAuthStore} from "override/stores/auth";
|
||||
@@ -492,6 +495,7 @@
|
||||
const selectedStatus = ref(undefined);
|
||||
const lastRefreshDate = ref(new Date());
|
||||
const unqueueDialogVisible = ref(false);
|
||||
const isDefaultNamespaceAllow = ref(true);
|
||||
const changeStatusDialogVisible = ref(false);
|
||||
const actionOptions = ref<Record<string, any>>({});
|
||||
const dblClickRouteName = ref("executions/update");
|
||||
@@ -609,6 +613,11 @@
|
||||
const routeInfo = computed(() => ({title: t("executions")}));
|
||||
useRouteContext(routeInfo, props.embed);
|
||||
|
||||
const {saveRestoreUrl} = useRestoreUrl({
|
||||
restoreUrl: true,
|
||||
isDefaultNamespaceAllow: isDefaultNamespaceAllow.value
|
||||
});
|
||||
|
||||
const dataTableRef = ref(null);
|
||||
const selectTableRef = useTemplateRef<typeof SelectTable>("selectTable");
|
||||
|
||||
@@ -624,7 +633,8 @@
|
||||
dblClickRouteName: dblClickRouteName.value,
|
||||
embed: props.embed,
|
||||
dataTableRef,
|
||||
loadData: loadData
|
||||
loadData: loadData,
|
||||
saveRestoreUrl
|
||||
});
|
||||
|
||||
const {
|
||||
@@ -1032,10 +1042,29 @@
|
||||
emit("state-count", {runningCount, totalCount});
|
||||
};
|
||||
|
||||
useApplyDefaultFilter({
|
||||
namespace: props.namespace,
|
||||
includeTimeRange: true,
|
||||
includeScope: true
|
||||
onMounted(() => {
|
||||
const query = {...route.query};
|
||||
let queryHasChanged = false;
|
||||
|
||||
const queryKeys = Object.keys(query);
|
||||
if (props.namespace === undefined && defaultNamespace() && !queryKeys.some(key => key.startsWith("filters[namespace]"))) {
|
||||
query["filters[namespace][PREFIX]"] = defaultNamespace();
|
||||
queryHasChanged = true;
|
||||
}
|
||||
|
||||
if (!queryKeys.some(key => key.startsWith("filters[scope]"))) {
|
||||
query["filters[scope][EQUALS]"] = "USER";
|
||||
queryHasChanged = true;
|
||||
}
|
||||
|
||||
if (queryHasChanged) {
|
||||
router.replace({query});
|
||||
}
|
||||
|
||||
if (route.name === "flows/update") {
|
||||
optionalColumns.value = optionalColumns.value.
|
||||
filter(col => col.prop !== "namespace" && col.prop !== "flowId");
|
||||
}
|
||||
});
|
||||
|
||||
watch(isOpenLabelsModal, (opening) => {
|
||||
|
||||
@@ -59,13 +59,13 @@
|
||||
</span>
|
||||
</template>
|
||||
<div
|
||||
:style="{left: `${item.start}%`, width: `${Math.max(item.width, 3)}%`}"
|
||||
:style="item.parentEndPercent !== undefined ? {left: `${item.start}%`, width: `${item.parentEndPercent - item.start}%`} : {left: `${item.start}%`, width: `${Math.max(item.width, 3)}%`}"
|
||||
class="task-progress"
|
||||
>
|
||||
<div class="progress">
|
||||
<div
|
||||
class="progress-bar"
|
||||
:style="{left: `${Math.min(item.left, 90)}%`, width: `${Math.max(100 - item.left, 10)}%`}"
|
||||
class="progress-bar"
|
||||
:class="'bg-' + item.color + (item.running ? ' progress-bar-striped progress-bar-animated' : '')"
|
||||
role="progressbar"
|
||||
/>
|
||||
@@ -195,7 +195,7 @@
|
||||
const sortedTasks = []
|
||||
const tasksById = {}
|
||||
for (let task of (this.execution.taskRunList || [])) {
|
||||
const taskWrapper = {task}
|
||||
const taskWrapper = {task, depth: task.parentTaskRunId ? undefined : 0}
|
||||
if (task.parentTaskRunId) {
|
||||
childTasks.push(taskWrapper)
|
||||
} else {
|
||||
@@ -208,6 +208,7 @@
|
||||
const taskWrapper = childTasks[i];
|
||||
const parentTask = tasksById[taskWrapper.task.parentTaskRunId]
|
||||
if (parentTask) {
|
||||
taskWrapper.depth = parentTask.depth + 1
|
||||
tasksById[taskWrapper.task.id] = taskWrapper
|
||||
if (!parentTask.children) {
|
||||
parentTask.children = []
|
||||
@@ -222,7 +223,7 @@
|
||||
return nodeStart(n1) > nodeStart(n2) ? 1 : -1
|
||||
})
|
||||
for (let node of nodes) {
|
||||
sortedTasks.push(node.task)
|
||||
sortedTasks.push(node)
|
||||
if (node.children) {
|
||||
childrenSort(node.children)
|
||||
}
|
||||
@@ -265,8 +266,11 @@
|
||||
}
|
||||
|
||||
const series = [];
|
||||
const executionDelta = this.delta(); //caching this value matters
|
||||
for (let task of this.tasks) {
|
||||
const executionDelta = this.delta();
|
||||
const taskMap = {};
|
||||
|
||||
for (let taskWrapper of this.tasks) {
|
||||
let task = taskWrapper.task
|
||||
let stopTs;
|
||||
if (State.isRunning(task.state.current)) {
|
||||
stopTs = ts(new Date());
|
||||
@@ -295,13 +299,21 @@
|
||||
|
||||
let width = (stop / executionDelta) * 100
|
||||
if (State.isRunning(task.state.current)) {
|
||||
width = ((this.stop() - startTs) / executionDelta) * 100 //(stop / executionDelta) * 100
|
||||
width = ((this.stop() - startTs) / executionDelta) * 100
|
||||
}
|
||||
|
||||
series.push({
|
||||
let startPercent = (start / executionDelta) * 100;
|
||||
let parentEndPercent = undefined;
|
||||
|
||||
if (task.parentTaskRunId && taskMap[task.parentTaskRunId]) {
|
||||
const parent = taskMap[task.parentTaskRunId];
|
||||
parentEndPercent = parent.start + parent.width;
|
||||
}
|
||||
|
||||
const seriesItem = {
|
||||
id: task.id,
|
||||
name: task.taskId,
|
||||
start: (start / executionDelta) * 100,
|
||||
start: startPercent,
|
||||
width,
|
||||
left: left,
|
||||
tooltip,
|
||||
@@ -311,8 +323,13 @@
|
||||
flowId: task.flowId,
|
||||
namespace: task.namespace,
|
||||
executionId: task.outputs && task.outputs.executionId,
|
||||
attempts: task.attempts ? task.attempts.length : 1
|
||||
});
|
||||
attempts: task.attempts ? task.attempts.length : 1,
|
||||
depth: taskWrapper.depth,
|
||||
parentEndPercent: parentEndPercent
|
||||
};
|
||||
|
||||
taskMap[task.id] = seriesItem;
|
||||
series.push(seriesItem);
|
||||
}
|
||||
this.series = series;
|
||||
},
|
||||
|
||||
@@ -204,7 +204,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Status from "../Status.vue";
|
||||
import {Status} from "@kestra-io/ui-libs";
|
||||
import SetLabels from "./SetLabels.vue";
|
||||
import Restart from "./Restart.vue";
|
||||
import Resume from "./Resume.vue";
|
||||
|
||||
@@ -111,7 +111,7 @@
|
||||
:readOnly="true"
|
||||
component="el-dropdown-item"
|
||||
:taskId="currentTaskRun.taskId"
|
||||
:section="SECTIONS.TASKS"
|
||||
section="tasks"
|
||||
:flowId="followedExecution.flowId"
|
||||
:namespace="followedExecution.namespace"
|
||||
:revision="followedExecution.flowRevision"
|
||||
@@ -175,7 +175,7 @@
|
||||
<script>
|
||||
import Restart from "./Restart.vue";
|
||||
import Metrics from "./Metrics.vue";
|
||||
import Status from "../Status.vue";
|
||||
import {State, Status} from "@kestra-io/ui-libs";
|
||||
import ChangeStatus from "./ChangeStatus.vue";
|
||||
import TaskEdit from "../flows/TaskEdit.vue";
|
||||
import SubFlowLink from "../flows/SubFlowLink.vue";
|
||||
@@ -189,7 +189,6 @@
|
||||
import Download from "vue-material-design-icons/Download.vue";
|
||||
import WorkerInfo from "./WorkerInfo.vue";
|
||||
import AiIcon from "../ai/AiIcon.vue";
|
||||
import {State} from "@kestra-io/ui-libs"
|
||||
import FlowUtils from "../../utils/flowUtils";
|
||||
import _groupBy from "lodash/groupBy";
|
||||
import {TaskIcon, SECTIONS} from "@kestra-io/ui-libs";
|
||||
|
||||
@@ -49,8 +49,7 @@
|
||||
import {useExecutionsStore} from "../../stores/executions";
|
||||
import permission from "../../models/permission";
|
||||
import action from "../../models/action";
|
||||
import {State} from "@kestra-io/ui-libs"
|
||||
import Status from "../../components/Status.vue";
|
||||
import {State, Status} from "@kestra-io/ui-libs"
|
||||
import {useAuthStore} from "override/stores/auth"
|
||||
import {useI18n} from "vue-i18n";
|
||||
import {useToast} from "../../utils/toast";
|
||||
|
||||
@@ -32,6 +32,18 @@
|
||||
<span v-else-if="value === null">
|
||||
<em>null</em>
|
||||
</span>
|
||||
<div v-else-if="isComplexValue(value)">
|
||||
<Editor
|
||||
:readOnly="true"
|
||||
:input="true"
|
||||
:fullHeight="false"
|
||||
:customHeight="Math.min(20, Math.max(5, JSON.stringify(getDisplayValue(value), null, 2).split('\n').length))"
|
||||
:navbar="false"
|
||||
:modelValue="JSON.stringify(getDisplayValue(value), null, 2)"
|
||||
lang="json"
|
||||
class="complex-value-editor"
|
||||
/>
|
||||
</div>
|
||||
<span v-else>
|
||||
{{ value }}
|
||||
</span>
|
||||
@@ -42,6 +54,7 @@
|
||||
import Download from "vue-material-design-icons/Download.vue";
|
||||
import OpenInNew from "vue-material-design-icons/OpenInNew.vue";
|
||||
import FilePreview from "./FilePreview.vue";
|
||||
import Editor from "../inputs/Editor.vue";
|
||||
import {apiUrl} from "override/utils/route";
|
||||
import Utils from "../../utils/utils";
|
||||
|
||||
@@ -88,6 +101,42 @@
|
||||
}
|
||||
};
|
||||
|
||||
const isComplexValue = (value: unknown): boolean => {
|
||||
if ((typeof value === "object" && value !== null) || Array.isArray(value)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (typeof value === "string") {
|
||||
try {
|
||||
const parsed = JSON.parse(value);
|
||||
return (typeof parsed === "object" && parsed !== null) || Array.isArray(parsed);
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
const getDisplayValue = (value: unknown): unknown => {
|
||||
if ((typeof value === "object" && value !== null) || Array.isArray(value)) {
|
||||
return value;
|
||||
}
|
||||
|
||||
if (typeof value === "string") {
|
||||
try {
|
||||
const parsed = JSON.parse(value);
|
||||
if ((typeof parsed === "object" && parsed !== null) || Array.isArray(parsed)) {
|
||||
return parsed;
|
||||
}
|
||||
} catch {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
return value;
|
||||
};
|
||||
|
||||
const itemUrl = (value: string): string => {
|
||||
return `${apiUrl()}/executions/${props.execution?.id}/file?path=${encodeURI(value)}`;
|
||||
};
|
||||
@@ -118,3 +167,11 @@
|
||||
getFileSize();
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.complex-value-editor {
|
||||
margin-top: 0.5rem;
|
||||
border: 1px solid var(--ks-border-primary);
|
||||
border-radius: 4px;
|
||||
}
|
||||
</style>
|
||||
@@ -183,4 +183,4 @@ export function useExecutionRoot() {
|
||||
getBaseTabs,
|
||||
setupLifecycle
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -225,14 +225,15 @@
|
||||
const debugOutput = JSON.stringify(parsedResult, null, 2);
|
||||
debugExpression.value = debugOutput;
|
||||
|
||||
selected.value.push(debugOutput);
|
||||
|
||||
if (response.status === 200 && debugOutput !== null && debugOutput !== undefined) {
|
||||
selected.value.push(debugOutput);
|
||||
}
|
||||
isJSON.value = true;
|
||||
} catch {
|
||||
debugExpression.value = response.data.result;
|
||||
|
||||
// Parsing failed, therefore, copy raw result
|
||||
if (response.status === 200 && response.data.result)
|
||||
if (response.status === 200 && response.data.result !== null && response.data.result !== undefined)
|
||||
selected.value.push(response.data.result);
|
||||
}
|
||||
|
||||
@@ -531,9 +532,8 @@
|
||||
}
|
||||
.content-container {
|
||||
height: calc(100vh - 0px);
|
||||
overflow-y: scroll;
|
||||
overflow-y: auto !important;
|
||||
overflow-x: hidden;
|
||||
scrollbar-gutter: stable;
|
||||
word-wrap: break-word;
|
||||
word-break: break-word;
|
||||
position: relative;
|
||||
@@ -542,16 +542,19 @@
|
||||
|
||||
:deep(.el-collapse) {
|
||||
.el-collapse-item__wrap {
|
||||
overflow-y: auto !important;
|
||||
max-height: none !important;
|
||||
}
|
||||
|
||||
.el-collapse-item__content {
|
||||
overflow-y: auto !important;
|
||||
word-wrap: break-word;
|
||||
word-break: break-word;
|
||||
}
|
||||
}
|
||||
|
||||
:deep(.var-value) {
|
||||
overflow-y: auto !important;
|
||||
word-wrap: break-word;
|
||||
word-break: break-word;
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
<script setup lang="ts">
|
||||
import {computed, ref} from "vue";
|
||||
import {Magnify, InformationOutline} from "../../utils/icons";
|
||||
import Status from "../../../Status.vue";
|
||||
import {Status} from "@kestra-io/ui-libs";
|
||||
import Checkbox from "../../../layout/Checkbox.vue";
|
||||
|
||||
const props = defineProps<{
|
||||
@@ -243,7 +243,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
button.el-button {
|
||||
button.status-button {
|
||||
width: 10rem;
|
||||
}
|
||||
</style>
|
||||
@@ -1,70 +0,0 @@
|
||||
import {onMounted} from "vue";
|
||||
import {LocationQuery, useRoute, useRouter} from "vue-router";
|
||||
import {useMiscStore} from "override/stores/misc";
|
||||
import {defaultNamespace} from "../../../composables/useNamespaces";
|
||||
|
||||
interface DefaultFilterOptions {
|
||||
namespace?: string;
|
||||
includeTimeRange?: boolean;
|
||||
includeScope?: boolean;
|
||||
legacyQuery?: boolean;
|
||||
}
|
||||
|
||||
const NAMESPACE_FILTER_PREFIX = "filters[namespace]";
|
||||
const SCOPE_FILTER_PREFIX = "filters[scope]";
|
||||
const TIME_RANGE_FILTER_PREFIX = "filters[timeRange]";
|
||||
|
||||
const hasFilterKey = (query: LocationQuery, prefix: string): boolean =>
|
||||
Object.keys(query).some(key => key.startsWith(prefix));
|
||||
|
||||
export function applyDefaultFilters(
|
||||
currentQuery: LocationQuery,
|
||||
options: DefaultFilterOptions & {
|
||||
configuration?: any;
|
||||
route?: any
|
||||
} = {}): { query: LocationQuery; hasChanges: boolean } {
|
||||
|
||||
const {configuration, route, namespace, includeTimeRange, includeScope, legacyQuery = false} = options;
|
||||
|
||||
const hasTimeRange = configuration && route
|
||||
? configuration.keys?.some((k: any) => k.key === "timeRange") ?? false
|
||||
: includeTimeRange ?? false;
|
||||
const hasScope = configuration && route
|
||||
? route?.name !== "logs/list" && (configuration.keys?.some((k: any) => k.key === "scope") ?? false)
|
||||
: includeScope ?? false;
|
||||
|
||||
const query = {...currentQuery};
|
||||
let hasChanges = false;
|
||||
|
||||
if (namespace === undefined && defaultNamespace() && !hasFilterKey(query, NAMESPACE_FILTER_PREFIX)) {
|
||||
query[legacyQuery ? "namespace" : `${NAMESPACE_FILTER_PREFIX}[PREFIX]`] = defaultNamespace();
|
||||
hasChanges = true;
|
||||
}
|
||||
|
||||
if (hasScope && !hasFilterKey(query, SCOPE_FILTER_PREFIX)) {
|
||||
query[legacyQuery ? "scope" : `${SCOPE_FILTER_PREFIX}[EQUALS]`] = "USER";
|
||||
hasChanges = true;
|
||||
}
|
||||
|
||||
const TIME_FILTER_KEYS = /startDate|endDate|timeRange/;
|
||||
|
||||
if (hasTimeRange && !Object.keys(query).some(key => TIME_FILTER_KEYS.test(key))) {
|
||||
const defaultDuration = useMiscStore().configs?.chartDefaultDuration ?? "P30D";
|
||||
query[legacyQuery ? "timeRange" : `${TIME_RANGE_FILTER_PREFIX}[EQUALS]`] = defaultDuration;
|
||||
hasChanges = true;
|
||||
}
|
||||
|
||||
return {query, hasChanges};
|
||||
}
|
||||
|
||||
export function useApplyDefaultFilter(options?: DefaultFilterOptions) {
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
|
||||
onMounted(() => {
|
||||
const {query, hasChanges} = applyDefaultFilters(route.query, options);
|
||||
if (hasChanges) {
|
||||
router.replace({query});
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -17,7 +17,6 @@ import {
|
||||
KV_COMPARATORS
|
||||
} from "../utils/filterTypes";
|
||||
import {usePreAppliedFilters} from "./usePreAppliedFilters";
|
||||
import {applyDefaultFilters} from "./useDefaultFilter";
|
||||
|
||||
export function useFilters(configuration: FilterConfiguration, showSearchInput = true, legacyQuery = false) {
|
||||
const router = useRouter();
|
||||
@@ -29,7 +28,8 @@ export function useFilters(configuration: FilterConfiguration, showSearchInput =
|
||||
const {
|
||||
markAsPreApplied,
|
||||
hasPreApplied,
|
||||
getPreApplied
|
||||
getPreApplied,
|
||||
getAllPreApplied
|
||||
} = usePreAppliedFilters();
|
||||
|
||||
const appendQueryParam = (query: Record<string, any>, key: string, value: string) => {
|
||||
@@ -367,10 +367,13 @@ export function useFilters(configuration: FilterConfiguration, showSearchInput =
|
||||
updateRoute();
|
||||
};
|
||||
|
||||
/**
|
||||
* Resets all filters to their pre-applied state and clears the search query
|
||||
*/
|
||||
const resetToPreApplied = () => {
|
||||
const defaultQuery = applyDefaultFilters({}, {configuration, route, legacyQuery}).query;
|
||||
appliedFilters.value = getAllPreApplied();
|
||||
searchQuery.value = "";
|
||||
router.push({query: defaultQuery});
|
||||
updateRoute();
|
||||
};
|
||||
|
||||
return {
|
||||
|
||||
@@ -6,50 +6,46 @@ import {useNamespacesStore} from "override/stores/namespaces";
|
||||
import {useAuthStore} from "override/stores/auth";
|
||||
import {useValues} from "../composables/useValues";
|
||||
import {useI18n} from "vue-i18n";
|
||||
import {useRoute} from "vue-router";
|
||||
|
||||
export const useExecutionFilter = (): ComputedRef<FilterConfiguration> => computed(() => {
|
||||
const {t} = useI18n();
|
||||
const route = useRoute();
|
||||
|
||||
return {
|
||||
title: t("filter.titles.execution_filters"),
|
||||
searchPlaceholder: t("filter.search_placeholders.search_executions"),
|
||||
keys: [
|
||||
...(route.name !== "namespaces/update" ? [
|
||||
{
|
||||
key: "namespace",
|
||||
label: t("filter.namespace.label"),
|
||||
description: t("filter.namespace.description"),
|
||||
comparators: [
|
||||
Comparators.IN,
|
||||
Comparators.NOT_IN,
|
||||
Comparators.CONTAINS,
|
||||
Comparators.PREFIX,
|
||||
],
|
||||
valueType: "multi-select" as const,
|
||||
valueProvider: async () => {
|
||||
const user = useAuthStore().user;
|
||||
if (user && user.hasAnyActionOnAnyNamespace(permission.NAMESPACE, action.READ)) {
|
||||
const namespacesStore = useNamespacesStore();
|
||||
const namespaces = (await namespacesStore.loadAutocomplete()) as string[];
|
||||
return [...new Set(namespaces
|
||||
.flatMap(namespace => {
|
||||
return namespace.split(".").reduce((current: string[], part: string) => {
|
||||
const previousCombination = current?.[current.length - 1];
|
||||
return [...current, `${(previousCombination ? previousCombination + "." : "")}${part}`];
|
||||
}, []);
|
||||
}))].map(namespace => ({
|
||||
label: namespace,
|
||||
value: namespace
|
||||
}));
|
||||
}
|
||||
return [];
|
||||
},
|
||||
searchable: true
|
||||
{
|
||||
key: "namespace",
|
||||
label: t("filter.namespace.label"),
|
||||
description: t("filter.namespace.description"),
|
||||
comparators: [
|
||||
Comparators.IN,
|
||||
Comparators.NOT_IN,
|
||||
Comparators.CONTAINS,
|
||||
Comparators.PREFIX,
|
||||
],
|
||||
valueType: "multi-select",
|
||||
valueProvider: async () => {
|
||||
const user = useAuthStore().user;
|
||||
if (user && user.hasAnyActionOnAnyNamespace(permission.NAMESPACE, action.READ)) {
|
||||
const namespacesStore = useNamespacesStore();
|
||||
const namespaces = (await namespacesStore.loadAutocomplete()) as string[];
|
||||
return [...new Set(namespaces
|
||||
.flatMap(namespace => {
|
||||
return namespace.split(".").reduce((current: string[], part: string) => {
|
||||
const previousCombination = current?.[current.length - 1];
|
||||
return [...current, `${(previousCombination ? previousCombination + "." : "")}${part}`];
|
||||
}, []);
|
||||
}))].map(namespace => ({
|
||||
label: namespace,
|
||||
value: namespace
|
||||
}));
|
||||
}
|
||||
return [];
|
||||
},
|
||||
] : []) as any,
|
||||
...(route.name !== "flows/update" ? [{
|
||||
searchable: true
|
||||
},
|
||||
{
|
||||
key: "flowId",
|
||||
label: t("filter.flowId.label"),
|
||||
description: t("filter.flowId.description"),
|
||||
@@ -61,7 +57,7 @@ export const useExecutionFilter = (): ComputedRef<FilterConfiguration> => comput
|
||||
Comparators.ENDS_WITH,
|
||||
],
|
||||
valueType: "text",
|
||||
}] : []) as any,
|
||||
},
|
||||
{
|
||||
key: "kind",
|
||||
label: t("filter.kind.label"),
|
||||
|
||||
@@ -6,49 +6,45 @@ import {useNamespacesStore} from "override/stores/namespaces";
|
||||
import {useAuthStore} from "override/stores/auth";
|
||||
import {useValues} from "../composables/useValues";
|
||||
import {useI18n} from "vue-i18n";
|
||||
import {useRoute} from "vue-router";
|
||||
|
||||
export const useFlowFilter = (): ComputedRef<FilterConfiguration> => computed(() => {
|
||||
const {t} = useI18n();
|
||||
const route = useRoute();
|
||||
|
||||
return {
|
||||
title: t("filter.titles.flow_filters"),
|
||||
searchPlaceholder: t("filter.search_placeholders.search_flows"),
|
||||
keys: [
|
||||
...(route.name !== "namespaces/update" ? [
|
||||
{
|
||||
key: "namespace",
|
||||
label: t("filter.namespace.label"),
|
||||
description: t("filter.namespace.description"),
|
||||
comparators: [
|
||||
Comparators.IN,
|
||||
Comparators.NOT_IN,
|
||||
Comparators.CONTAINS,
|
||||
Comparators.PREFIX,
|
||||
],
|
||||
valueType: "multi-select" as const,
|
||||
valueProvider: async () => {
|
||||
const user = useAuthStore().user;
|
||||
if (user && user.hasAnyActionOnAnyNamespace(permission.NAMESPACE, action.READ)) {
|
||||
const namespacesStore = useNamespacesStore();
|
||||
const namespaces = (await namespacesStore.loadAutocomplete()) as string[];
|
||||
return [...new Set(namespaces
|
||||
.flatMap(namespace => {
|
||||
return namespace.split(".").reduce((current: string[], part: string) => {
|
||||
const previousCombination = current?.[current.length - 1];
|
||||
return [...current, `${(previousCombination ? previousCombination + "." : "")}${part}`];
|
||||
}, []);
|
||||
}))].map(namespace => ({
|
||||
label: namespace,
|
||||
value: namespace
|
||||
}));
|
||||
}
|
||||
return [];
|
||||
},
|
||||
searchable: true
|
||||
{
|
||||
key: "namespace",
|
||||
label: t("filter.namespace.label"),
|
||||
description: t("filter.namespace.description"),
|
||||
comparators: [
|
||||
Comparators.IN,
|
||||
Comparators.NOT_IN,
|
||||
Comparators.CONTAINS,
|
||||
Comparators.PREFIX,
|
||||
],
|
||||
valueType: "multi-select",
|
||||
valueProvider: async () => {
|
||||
const user = useAuthStore().user;
|
||||
if (user && user.hasAnyActionOnAnyNamespace(permission.NAMESPACE, action.READ)) {
|
||||
const namespacesStore = useNamespacesStore();
|
||||
const namespaces = (await namespacesStore.loadAutocomplete()) as string[];
|
||||
return [...new Set(namespaces
|
||||
.flatMap(namespace => {
|
||||
return namespace.split(".").reduce((current: string[], part: string) => {
|
||||
const previousCombination = current?.[current.length - 1];
|
||||
return [...current, `${(previousCombination ? previousCombination + "." : "")}${part}`];
|
||||
}, []);
|
||||
}))].map(namespace => ({
|
||||
label: namespace,
|
||||
value: namespace
|
||||
}));
|
||||
}
|
||||
return [];
|
||||
},
|
||||
] : []) as any,
|
||||
searchable: true
|
||||
},
|
||||
{
|
||||
key: "scope",
|
||||
label: t("filter.scope_flow.label"),
|
||||
|
||||
@@ -3,51 +3,47 @@ import {Comparators, FilterConfiguration} from "../utils/filterTypes";
|
||||
import {useI18n} from "vue-i18n";
|
||||
import {useNamespacesStore} from "override/stores/namespaces";
|
||||
import {useAuthStore} from "override/stores/auth";
|
||||
import {useRoute} from "vue-router";
|
||||
import permission from "../../../models/permission";
|
||||
import action from "../../../models/action";
|
||||
|
||||
export const useKvFilter = (): ComputedRef<FilterConfiguration> => computed(() => {
|
||||
const {t} = useI18n();
|
||||
const route = useRoute();
|
||||
|
||||
return {
|
||||
title: t("filter.titles.kv_filters"),
|
||||
searchPlaceholder: t("filter.search_placeholders.search_kv"),
|
||||
keys: [
|
||||
...(route.name !== "namespaces/update" ? [
|
||||
{
|
||||
key: "namespace",
|
||||
label: t("filter.namespace.label"),
|
||||
description: t("filter.namespace.description"),
|
||||
comparators: [
|
||||
Comparators.IN,
|
||||
Comparators.NOT_IN,
|
||||
Comparators.CONTAINS,
|
||||
Comparators.PREFIX,
|
||||
],
|
||||
valueType: "multi-select" as const,
|
||||
valueProvider: async () => {
|
||||
const user = useAuthStore().user;
|
||||
if (user && user.hasAnyActionOnAnyNamespace(permission.NAMESPACE, action.READ)) {
|
||||
const namespacesStore = useNamespacesStore();
|
||||
const namespaces = (await namespacesStore.loadAutocomplete()) as string[];
|
||||
return [...new Set(namespaces
|
||||
.flatMap(namespace => {
|
||||
return namespace.split(".").reduce((current: string[], part: string) => {
|
||||
const previousCombination = current?.[current.length - 1];
|
||||
return [...current, `${(previousCombination ? previousCombination + "." : "")}${part}`];
|
||||
}, []);
|
||||
}))].map(namespace => ({
|
||||
label: namespace,
|
||||
value: namespace
|
||||
}));
|
||||
}
|
||||
return [];
|
||||
},
|
||||
searchable: true
|
||||
}
|
||||
] : []) as any,
|
||||
{
|
||||
key: "namespace",
|
||||
label: t("filter.namespace.label"),
|
||||
description: t("filter.namespace.description"),
|
||||
comparators: [
|
||||
Comparators.IN,
|
||||
Comparators.NOT_IN,
|
||||
Comparators.CONTAINS,
|
||||
Comparators.PREFIX,
|
||||
],
|
||||
valueType: "multi-select",
|
||||
valueProvider: async () => {
|
||||
const user = useAuthStore().user;
|
||||
if (user && user.hasAnyActionOnAnyNamespace(permission.NAMESPACE, action.READ)) {
|
||||
const namespacesStore = useNamespacesStore();
|
||||
const namespaces = (await namespacesStore.loadAutocomplete()) as string[];
|
||||
return [...new Set(namespaces
|
||||
.flatMap(namespace => {
|
||||
return namespace.split(".").reduce((current: string[], part: string) => {
|
||||
const previousCombination = current?.[current.length - 1];
|
||||
return [...current, `${(previousCombination ? previousCombination + "." : "")}${part}`];
|
||||
}, []);
|
||||
}))].map(namespace => ({
|
||||
label: namespace,
|
||||
value: namespace
|
||||
}));
|
||||
}
|
||||
return [];
|
||||
},
|
||||
searchable: true
|
||||
}
|
||||
],
|
||||
};
|
||||
});
|
||||
|
||||
@@ -6,49 +6,45 @@ import {useNamespacesStore} from "override/stores/namespaces";
|
||||
import {useAuthStore} from "override/stores/auth";
|
||||
import {useValues} from "../composables/useValues";
|
||||
import {useI18n} from "vue-i18n";
|
||||
import {useRoute} from "vue-router";
|
||||
|
||||
export const useLogFilter = (): ComputedRef<FilterConfiguration> => computed(() => {
|
||||
const {t} = useI18n();
|
||||
const route = useRoute();
|
||||
|
||||
return {
|
||||
title: t("filter.titles.log_filters"),
|
||||
searchPlaceholder: t("filter.search_placeholders.search_logs"),
|
||||
keys: [
|
||||
...(route.name !== "namespaces/update" && route.name !== "flows/update" ? [
|
||||
{
|
||||
key: "namespace",
|
||||
label: t("filter.namespace.label"),
|
||||
description: t("filter.namespace.description"),
|
||||
comparators: [
|
||||
Comparators.IN,
|
||||
Comparators.NOT_IN,
|
||||
Comparators.CONTAINS,
|
||||
Comparators.PREFIX,
|
||||
],
|
||||
valueType: "multi-select" as const,
|
||||
valueProvider: async () => {
|
||||
const user = useAuthStore().user;
|
||||
if (user && user.hasAnyActionOnAnyNamespace(permission.NAMESPACE, action.READ)) {
|
||||
const namespacesStore = useNamespacesStore();
|
||||
const namespaces = (await namespacesStore.loadAutocomplete()) as string[];
|
||||
return [...new Set(namespaces
|
||||
.flatMap(namespace => {
|
||||
return namespace.split(".").reduce((current: string[], part: string) => {
|
||||
const previousCombination = current?.[current.length - 1];
|
||||
return [...current, `${(previousCombination ? previousCombination + "." : "")}${part}`];
|
||||
}, []);
|
||||
}))].map(namespace => ({
|
||||
label: namespace,
|
||||
value: namespace
|
||||
}));
|
||||
}
|
||||
return [];
|
||||
},
|
||||
searchable: true
|
||||
{
|
||||
key: "namespace",
|
||||
label: t("filter.namespace.label"),
|
||||
description: t("filter.namespace.description"),
|
||||
comparators: [
|
||||
Comparators.IN,
|
||||
Comparators.NOT_IN,
|
||||
Comparators.CONTAINS,
|
||||
Comparators.PREFIX,
|
||||
],
|
||||
valueType: "multi-select",
|
||||
valueProvider: async () => {
|
||||
const user = useAuthStore().user;
|
||||
if (user && user.hasAnyActionOnAnyNamespace(permission.NAMESPACE, action.READ)) {
|
||||
const namespacesStore = useNamespacesStore();
|
||||
const namespaces = (await namespacesStore.loadAutocomplete()) as string[];
|
||||
return [...new Set(namespaces
|
||||
.flatMap(namespace => {
|
||||
return namespace.split(".").reduce((current: string[], part: string) => {
|
||||
const previousCombination = current?.[current.length - 1];
|
||||
return [...current, `${(previousCombination ? previousCombination + "." : "")}${part}`];
|
||||
}, []);
|
||||
}))].map(namespace => ({
|
||||
label: namespace,
|
||||
value: namespace
|
||||
}));
|
||||
}
|
||||
return [];
|
||||
},
|
||||
] : []) as any,
|
||||
searchable: true
|
||||
},
|
||||
{
|
||||
key: "level",
|
||||
label: t("filter.level.label"),
|
||||
@@ -99,7 +95,7 @@ export const useLogFilter = (): ComputedRef<FilterConfiguration> => computed(()
|
||||
],
|
||||
valueType: "text",
|
||||
},
|
||||
...(route.name !== "flows/update" ? [{
|
||||
{
|
||||
key: "flowId",
|
||||
label: t("filter.flowId.label"),
|
||||
description: t("filter.flowId.description"),
|
||||
@@ -111,7 +107,7 @@ export const useLogFilter = (): ComputedRef<FilterConfiguration> => computed(()
|
||||
Comparators.ENDS_WITH,
|
||||
],
|
||||
valueType: "text",
|
||||
}] : []) as any,
|
||||
},
|
||||
]
|
||||
};
|
||||
});
|
||||
@@ -6,7 +6,7 @@ export const useNamespacesFilter = (): ComputedRef<FilterConfiguration> => compu
|
||||
const {t} = useI18n();
|
||||
|
||||
return {
|
||||
title: t("filter.titles.namespace_filters"),
|
||||
title: t("filter.titles.namespaces_filters"),
|
||||
searchPlaceholder: t("filter.search_placeholders.search_namespaces"),
|
||||
keys: [],
|
||||
};
|
||||
|
||||
@@ -5,49 +5,45 @@ import action from "../../../models/action";
|
||||
import {useNamespacesStore} from "override/stores/namespaces";
|
||||
import {useAuthStore} from "override/stores/auth";
|
||||
import {useI18n} from "vue-i18n";
|
||||
import {useRoute} from "vue-router";
|
||||
|
||||
export const useSecretsFilter = (): ComputedRef<FilterConfiguration> => computed(() => {
|
||||
const {t} = useI18n();
|
||||
const route = useRoute();
|
||||
|
||||
return {
|
||||
title: t("filter.titles.secret_filters"),
|
||||
searchPlaceholder: t("filter.search_placeholders.search_secrets"),
|
||||
keys: [
|
||||
...(route.name !== "namespaces/update" ? [
|
||||
{
|
||||
key: "namespace",
|
||||
label: t("filter.namespace.label"),
|
||||
description: t("filter.namespace.description"),
|
||||
comparators: [
|
||||
Comparators.IN,
|
||||
Comparators.NOT_IN,
|
||||
Comparators.CONTAINS,
|
||||
Comparators.PREFIX,
|
||||
],
|
||||
valueType: "multi-select" as const,
|
||||
valueProvider: async () => {
|
||||
const user = useAuthStore().user;
|
||||
if (user && user.hasAnyActionOnAnyNamespace(permission.NAMESPACE, action.READ)) {
|
||||
const namespacesStore = useNamespacesStore();
|
||||
const namespaces = (await namespacesStore.loadAutocomplete()) as string[];
|
||||
return [...new Set(namespaces
|
||||
.flatMap(namespace => {
|
||||
return namespace.split(".").reduce((current: string[], part: string) => {
|
||||
const previousCombination = current?.[current.length - 1];
|
||||
return [...current, `${(previousCombination ? previousCombination + "." : "")}${part}`];
|
||||
}, []);
|
||||
}))].map(namespace => ({
|
||||
label: namespace,
|
||||
value: namespace
|
||||
}));
|
||||
}
|
||||
return [];
|
||||
},
|
||||
searchable: true
|
||||
{
|
||||
key: "namespace",
|
||||
label: t("filter.namespace.label"),
|
||||
description: t("filter.namespace.description"),
|
||||
comparators: [
|
||||
Comparators.IN,
|
||||
Comparators.NOT_IN,
|
||||
Comparators.CONTAINS,
|
||||
Comparators.PREFIX,
|
||||
],
|
||||
valueType: "multi-select",
|
||||
valueProvider: async () => {
|
||||
const user = useAuthStore().user;
|
||||
if (user && user.hasAnyActionOnAnyNamespace(permission.NAMESPACE, action.READ)) {
|
||||
const namespacesStore = useNamespacesStore();
|
||||
const namespaces = (await namespacesStore.loadAutocomplete()) as string[];
|
||||
return [...new Set(namespaces
|
||||
.flatMap(namespace => {
|
||||
return namespace.split(".").reduce((current: string[], part: string) => {
|
||||
const previousCombination = current?.[current.length - 1];
|
||||
return [...current, `${(previousCombination ? previousCombination + "." : "")}${part}`];
|
||||
}, []);
|
||||
}))].map(namespace => ({
|
||||
label: namespace,
|
||||
value: namespace
|
||||
}));
|
||||
}
|
||||
return [];
|
||||
},
|
||||
] : []) as any,
|
||||
searchable: true
|
||||
},
|
||||
],
|
||||
};
|
||||
});
|
||||
@@ -6,50 +6,46 @@ import {useNamespacesStore} from "override/stores/namespaces";
|
||||
import {useAuthStore} from "override/stores/auth";
|
||||
import {useValues} from "../composables/useValues";
|
||||
import {useI18n} from "vue-i18n";
|
||||
import {useRoute} from "vue-router";
|
||||
|
||||
export const useTriggerFilter = (): ComputedRef<FilterConfiguration> => computed(() => {
|
||||
const {t} = useI18n();
|
||||
const route = useRoute();
|
||||
|
||||
return {
|
||||
title: t("filter.titles.trigger_filters"),
|
||||
searchPlaceholder: t("filter.search_placeholders.search_triggers"),
|
||||
keys: [
|
||||
...(route.name !== "namespaces/update" ? [
|
||||
{
|
||||
key: "namespace",
|
||||
label: t("filter.namespace.label"),
|
||||
description: t("filter.namespace.description"),
|
||||
comparators: [
|
||||
Comparators.IN,
|
||||
Comparators.NOT_IN,
|
||||
Comparators.CONTAINS,
|
||||
Comparators.PREFIX,
|
||||
],
|
||||
valueType: "multi-select" as const,
|
||||
valueProvider: async () => {
|
||||
const user = useAuthStore().user;
|
||||
if (user && user.hasAnyActionOnAnyNamespace(permission.NAMESPACE, action.READ)) {
|
||||
const namespacesStore = useNamespacesStore();
|
||||
const namespaces = (await namespacesStore.loadAutocomplete()) as string[];
|
||||
return [...new Set(namespaces
|
||||
.flatMap(namespace => {
|
||||
return namespace.split(".").reduce((current: string[], part: string) => {
|
||||
const previousCombination = current?.[current.length - 1];
|
||||
return [...current, `${(previousCombination ? previousCombination + "." : "")}${part}`];
|
||||
}, []);
|
||||
}))].map(namespace => ({
|
||||
label: namespace,
|
||||
value: namespace
|
||||
}));
|
||||
}
|
||||
return [];
|
||||
},
|
||||
searchable: true
|
||||
{
|
||||
key: "namespace",
|
||||
label: t("filter.namespace.label"),
|
||||
description: t("filter.namespace.description"),
|
||||
comparators: [
|
||||
Comparators.IN,
|
||||
Comparators.NOT_IN,
|
||||
Comparators.CONTAINS,
|
||||
Comparators.PREFIX,
|
||||
],
|
||||
valueType: "multi-select",
|
||||
valueProvider: async () => {
|
||||
const user = useAuthStore().user;
|
||||
if (user && user.hasAnyActionOnAnyNamespace(permission.NAMESPACE, action.READ)) {
|
||||
const namespacesStore = useNamespacesStore();
|
||||
const namespaces = (await namespacesStore.loadAutocomplete()) as string[];
|
||||
return [...new Set(namespaces
|
||||
.flatMap(namespace => {
|
||||
return namespace.split(".").reduce((current: string[], part: string) => {
|
||||
const previousCombination = current?.[current.length - 1];
|
||||
return [...current, `${(previousCombination ? previousCombination + "." : "")}${part}`];
|
||||
}, []);
|
||||
}))].map(namespace => ({
|
||||
label: namespace,
|
||||
value: namespace
|
||||
}));
|
||||
}
|
||||
return [];
|
||||
},
|
||||
] : []) as any,
|
||||
...(route.name !== "flows/update" ? [{
|
||||
searchable: true
|
||||
},
|
||||
{
|
||||
key: "flowId",
|
||||
label: t("filter.flowId.label"),
|
||||
description: t("filter.flowId.description"),
|
||||
@@ -61,7 +57,7 @@ export const useTriggerFilter = (): ComputedRef<FilterConfiguration> => computed
|
||||
Comparators.ENDS_WITH,
|
||||
],
|
||||
valueType: "text",
|
||||
}] : []) as any,
|
||||
},
|
||||
{
|
||||
key: "timeRange",
|
||||
label: t("filter.timeRange_trigger.label"),
|
||||
|
||||
@@ -36,8 +36,7 @@
|
||||
import {ref, computed} from "vue";
|
||||
import Executions from "../executions/Executions.vue";
|
||||
import Empty from "../layout/empty/Empty.vue";
|
||||
import {State} from "@kestra-io/ui-libs";
|
||||
import Status from "../Status.vue";
|
||||
import {State, Status} from "@kestra-io/ui-libs";
|
||||
import {useFlowStore} from "../../stores/flow";
|
||||
|
||||
defineOptions({inheritAttrs: false});
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
:namespace="flowStore.flow?.namespace"
|
||||
:flowId="flowStore.flow?.id"
|
||||
:topbar="false"
|
||||
:restoreUrl="false"
|
||||
filter
|
||||
/>
|
||||
</template>
|
||||
|
||||
@@ -472,7 +472,7 @@
|
||||
backfill: cleanBackfill.value
|
||||
})
|
||||
.then((newTrigger: any) => {
|
||||
toast.saved(newTrigger.triggerId);
|
||||
(window as any).$toast().saved(newTrigger.id);
|
||||
triggers.value = triggers.value.map((t: any) => {
|
||||
if (t.id === newTrigger.id) {
|
||||
return newTrigger
|
||||
@@ -493,7 +493,7 @@
|
||||
const pauseBackfill = (trigger: any) => {
|
||||
triggerStore.pauseBackfill(trigger)
|
||||
.then((newTrigger: any) => {
|
||||
toast.saved(newTrigger.triggerId);
|
||||
toast.saved(newTrigger.id);
|
||||
triggers.value = triggers.value.map((t: any) => {
|
||||
if (t.id === newTrigger.id) {
|
||||
return newTrigger
|
||||
@@ -506,7 +506,7 @@
|
||||
const unpauseBackfill = (trigger: any) => {
|
||||
triggerStore.unpauseBackfill(trigger)
|
||||
.then((newTrigger: any) => {
|
||||
toast.saved(newTrigger.triggerId);
|
||||
toast.saved(newTrigger.id);
|
||||
triggers.value = triggers.value.map((t: any) => {
|
||||
if (t.id === newTrigger.id) {
|
||||
return newTrigger
|
||||
@@ -519,7 +519,7 @@
|
||||
const deleteBackfill = (trigger: any) => {
|
||||
triggerStore.deleteBackfill(trigger)
|
||||
.then((newTrigger: any) => {
|
||||
toast.saved(newTrigger.triggerId);
|
||||
toast.saved(newTrigger.id);
|
||||
triggers.value = triggers.value.map((t: any) => {
|
||||
if (t.id === newTrigger.id) {
|
||||
return newTrigger
|
||||
@@ -532,7 +532,7 @@
|
||||
const setDisabled = (trigger: any, value: boolean) => {
|
||||
triggerStore.update({...trigger, disabled: !value})
|
||||
.then((newTrigger: any) => {
|
||||
toast.saved(newTrigger.triggerId);
|
||||
toast.saved(newTrigger.id);
|
||||
triggers.value = triggers.value.map((t: any) => {
|
||||
if (t.id === newTrigger.id) {
|
||||
return newTrigger
|
||||
@@ -548,7 +548,7 @@
|
||||
flowId: trigger.flowId,
|
||||
triggerId: trigger.triggerId
|
||||
}).then((newTrigger: any) => {
|
||||
toast.saved(newTrigger.triggerId);
|
||||
toast.saved(newTrigger.id);
|
||||
triggers.value = triggers.value.map((t: any) => {
|
||||
if (t.id === newTrigger.id) {
|
||||
return newTrigger
|
||||
@@ -564,7 +564,7 @@
|
||||
flowId: trigger.flowId,
|
||||
triggerId: trigger.triggerId
|
||||
}).then((newTrigger: any) => {
|
||||
toast.saved(newTrigger.triggerId);
|
||||
toast.saved(newTrigger.id);
|
||||
triggers.value = triggers.value.map((t: any) => {
|
||||
if (t.id === newTrigger.id) {
|
||||
return newTrigger
|
||||
|
||||
@@ -249,8 +249,8 @@
|
||||
|
||||
|
||||
<script setup lang="ts">
|
||||
import {ref, computed, useTemplateRef} from "vue";
|
||||
import {useRoute} from "vue-router";
|
||||
import {ref, computed, onMounted, useTemplateRef} from "vue";
|
||||
import {useRoute, useRouter} from "vue-router";
|
||||
import {useI18n} from "vue-i18n";
|
||||
import _merge from "lodash/merge";
|
||||
import * as FILTERS from "../../utils/filters";
|
||||
@@ -267,7 +267,7 @@
|
||||
import FileDocumentRemoveOutline from "vue-material-design-icons/FileDocumentRemoveOutline.vue";
|
||||
|
||||
import Kicon from "../Kicon.vue";
|
||||
import Status from "../Status.vue";
|
||||
import {Status} from "@kestra-io/ui-libs";
|
||||
import Labels from "../layout/Labels.vue";
|
||||
import DateAgo from "../layout/DateAgo.vue";
|
||||
import TriggerAvatar from "./TriggerAvatar.vue";
|
||||
@@ -284,6 +284,7 @@
|
||||
import permission from "../../models/permission";
|
||||
|
||||
import {useToast} from "../../utils/toast";
|
||||
import {defaultNamespace} from "../../composables/useNamespaces";
|
||||
|
||||
import {useFlowStore} from "../../stores/flow";
|
||||
import {useAuthStore} from "override/stores/auth";
|
||||
@@ -293,7 +294,7 @@
|
||||
import {useTableColumns} from "../../composables/useTableColumns";
|
||||
import {DataTableRef, useDataTableActions} from "../../composables/useDataTableActions";
|
||||
import {useSelectTableActions} from "../../composables/useSelectTableActions";
|
||||
import {useApplyDefaultFilter} from "../filter/composables/useDefaultFilter";
|
||||
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
topbar?: boolean;
|
||||
@@ -311,6 +312,7 @@
|
||||
const miscStore = useMiscStore();
|
||||
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
|
||||
const {t} = useI18n();
|
||||
const toast = useToast()
|
||||
@@ -495,11 +497,6 @@
|
||||
updateVisibleColumns(newColumns);
|
||||
}
|
||||
|
||||
useApplyDefaultFilter({
|
||||
namespace: props.namespace,
|
||||
includeScope: true
|
||||
});
|
||||
|
||||
function exportFlows() {
|
||||
toast.confirm(
|
||||
t("flow export", {flowCount: queryBulkAction.value ? flowStore.total : selection.value.length}),
|
||||
@@ -636,6 +633,25 @@
|
||||
operation: "EQUALS"
|
||||
}];
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
const query = {...route.query};
|
||||
const queryKeys = Object.keys(query);
|
||||
let queryHasChanged = false;
|
||||
|
||||
if (props.namespace === undefined && defaultNamespace() && !queryKeys.some(key => key.startsWith("filters[namespace]"))) {
|
||||
query["filters[namespace][PREFIX]"] = defaultNamespace();
|
||||
queryHasChanged = true;
|
||||
}
|
||||
|
||||
if (!queryKeys.some(key => key.startsWith("filters[scope]"))) {
|
||||
query["filters[scope][EQUALS]"] = "USER";
|
||||
queryHasChanged = true;
|
||||
}
|
||||
|
||||
if (queryHasChanged) router.replace({query});
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
||||
@@ -56,6 +56,7 @@
|
||||
import DataTable from "../layout/DataTable.vue";
|
||||
import SearchField from "../layout/SearchField.vue";
|
||||
import NamespaceSelect from "../namespaces/components/NamespaceSelect.vue";
|
||||
import useRestoreUrl from "../../composables/useRestoreUrl";
|
||||
import useRouteContext from "../../composables/useRouteContext";
|
||||
import {useDataTableActions} from "../../composables/useDataTableActions";
|
||||
|
||||
@@ -76,9 +77,11 @@
|
||||
}));
|
||||
|
||||
useRouteContext(routeInfo);
|
||||
const {saveRestoreUrl} = useRestoreUrl({restoreUrl: true, isDefaultNamespaceAllow: true});
|
||||
|
||||
const {onPageChanged, onDataTableValue, queryWithFilter, ready} = useDataTableActions({
|
||||
loadData
|
||||
loadData,
|
||||
saveRestoreUrl
|
||||
});
|
||||
|
||||
const namespace = computed({
|
||||
|
||||
@@ -169,9 +169,14 @@
|
||||
? revisions.value?.[props.revision - 1]?.source
|
||||
: flowStore.flow?.source;
|
||||
});
|
||||
|
||||
|
||||
// Methods
|
||||
const load = async (taskId: string) => {
|
||||
await flowStore.loadFlow({
|
||||
namespace: props.namespace,
|
||||
id: props.flowId,
|
||||
revision: props.revision?.toString(),
|
||||
});
|
||||
if (props.revision) {
|
||||
if (!revisions.value?.[props.revision - 1]) {
|
||||
revisions.value = await flowStore.loadRevisions({
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
import Markdown from "../layout/Markdown.vue";
|
||||
import Cron from "../layout/Cron.vue";
|
||||
|
||||
const {t} = useI18n();
|
||||
const {t, te} = useI18n();
|
||||
|
||||
defineProps<{
|
||||
data: Record<string, any>;
|
||||
@@ -51,9 +51,10 @@
|
||||
"date": "last trigger date",
|
||||
"updatedDate": "context updated date",
|
||||
"evaluateRunningDate": "evaluation lock date",
|
||||
"states": "trigger_states",
|
||||
};
|
||||
const translationKey = mappings[key] ?? key;
|
||||
return t(translationKey);
|
||||
return te(translationKey) && t(translationKey) || translationKey;
|
||||
};
|
||||
</script>
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import Status from "../../Status.vue";
|
||||
import {Status} from "@kestra-io/ui-libs";
|
||||
import {date, humanizeDuration} from "../../../utils/filters";
|
||||
import {Execution, useExecutionsStore} from "../../../stores/executions";
|
||||
|
||||
|
||||
@@ -292,6 +292,8 @@
|
||||
return editor?.getEditorType() === monacoEditor.value?.monaco.editor.EditorType.ICodeEditor
|
||||
}
|
||||
|
||||
const scrollMemory = props.scrollKey ? useScrollMemory(ref(props.scrollKey)) : null;
|
||||
|
||||
function editorDidMount(monacoMounted?: monaco.editor.IStandaloneCodeEditor | monaco.editor.IStandaloneDiffEditor) {
|
||||
|
||||
const monacoRef = monacoEditor.value
|
||||
@@ -303,8 +305,6 @@
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// avoid double import of monaco editor, use a reference
|
||||
const KeyCode = monacoRef.monaco.KeyCode;
|
||||
const KeyMod = monacoRef.monaco.KeyMod;
|
||||
@@ -316,7 +316,7 @@
|
||||
}
|
||||
|
||||
const codeEditor = editor as monaco.editor.IStandaloneCodeEditor;
|
||||
const scrollMemory = props.scrollKey ? useScrollMemory(ref(props.scrollKey)) : null;
|
||||
|
||||
|
||||
if (props.scrollKey && scrollMemory) {
|
||||
const savedState = scrollMemory.loadData<monaco.editor.ICodeEditorViewState>("viewState");
|
||||
|
||||
@@ -59,12 +59,12 @@
|
||||
const {t} = useI18n();
|
||||
|
||||
const exportYaml = () => {
|
||||
if(!flowStore.flow || !flowStore.flowYaml) return;
|
||||
|
||||
const {id, namespace} = flowStore.flow;
|
||||
const blob = new Blob([flowStore.flowYaml], {type: "text/yaml"});
|
||||
|
||||
localUtils.downloadUrl(window.URL.createObjectURL(blob), `${namespace}.${id}.yaml`);
|
||||
const src = flowStore.flowYaml
|
||||
if(!src) {
|
||||
return;
|
||||
}
|
||||
const blob = new Blob([src], {type: "text/yaml"});
|
||||
localUtils.downloadUrl(window.URL.createObjectURL(blob), "flow.yaml");
|
||||
};
|
||||
|
||||
const flowStore = useFlowStore();
|
||||
@@ -109,31 +109,24 @@
|
||||
const onSaveAll = inject(FILES_SAVE_ALL_INJECTION_KEY);
|
||||
|
||||
async function save(){
|
||||
try {
|
||||
// Save the isCreating before saving.
|
||||
// saveAll can change its value.
|
||||
const isCreating = flowStore.isCreating
|
||||
await flowStore.saveAll()
|
||||
// Save the isCreating before saving.
|
||||
// saveAll can change its value.
|
||||
const isCreating = flowStore.isCreating
|
||||
await flowStore.saveAll()
|
||||
|
||||
if(isCreating){
|
||||
await router.push({
|
||||
name: "flows/update",
|
||||
params: {
|
||||
id: flowStore.flow?.id,
|
||||
namespace: flowStore.flow?.namespace,
|
||||
tab: "edit",
|
||||
tenant: routeParams.value.tenant,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
onSaveAll?.();
|
||||
} catch (error: any) {
|
||||
if (error?.status === 401) {
|
||||
toast.error("401 Unauthorized", undefined, {duration: 2000});
|
||||
return;
|
||||
}
|
||||
if(isCreating){
|
||||
await router.push({
|
||||
name: "flows/update",
|
||||
params: {
|
||||
id: flowStore.flow?.id,
|
||||
namespace: flowStore.flow?.namespace,
|
||||
tab: "edit",
|
||||
tenant: routeParams.value.tenant,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
onSaveAll?.();
|
||||
}
|
||||
|
||||
const deleteFlow = () => {
|
||||
|
||||
@@ -275,6 +275,10 @@
|
||||
}, 1000);
|
||||
}
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
clearTimeout(timeout.value);
|
||||
});
|
||||
|
||||
|
||||
function updatePluginDocumentation(event: any) {
|
||||
const source = event.model.getValue();
|
||||
|
||||
@@ -463,7 +463,7 @@
|
||||
for (const item of itemsArr) {
|
||||
const fullPath = `${parentPath}${item.fileName}`;
|
||||
result.push({path: fullPath, fileName: item.fileName, id: item.id});
|
||||
if (isDirectory(item) && item.children?.length > 0) {
|
||||
if (isDirectory(item) && item.children.length > 0) {
|
||||
result.push(...flattenTree(item.children, `${fullPath}/`));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -272,6 +272,7 @@
|
||||
import DataTable from "../layout/DataTable.vue";
|
||||
import _merge from "lodash/merge";
|
||||
import {type DataTableRef, useDataTableActions} from "../../composables/useDataTableActions.ts";
|
||||
|
||||
const dataTable = useTemplateRef<DataTableRef>("dataTable");
|
||||
|
||||
const loadData = async (callback?: () => void) => {
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
if (props.labels.length === 0) {
|
||||
addItem();
|
||||
} else {
|
||||
locals.value = props.labels;
|
||||
locals.value = [...props.labels];
|
||||
if (locals.value.length === 0) {
|
||||
addItem();
|
||||
}
|
||||
|
||||
@@ -20,8 +20,7 @@
|
||||
</el-select>
|
||||
</template>
|
||||
<script>
|
||||
import {State} from "@kestra-io/ui-libs"
|
||||
import Status from "../Status.vue";
|
||||
import {State, Status} from "@kestra-io/ui-libs"
|
||||
|
||||
export default {
|
||||
components: {Status},
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<TopNavBar v-if="!embed" :title="routeInfo.title" />
|
||||
<section v-bind="$attrs" :class="{'container': !embed}" class="log-panel">
|
||||
<div class="log-content">
|
||||
<DataTable @page-changed="onPageChanged" ref="dataTable" :total="logsStore.total" :size="internalPageSize" :page="internalPageNumber" :embed="embed">
|
||||
<DataTable @page-changed="onPageChanged" ref="dataTable" :total="logsStore.total" :size="pageSize" :page="pageNumber" :embed="embed">
|
||||
<template #navbar v-if="!embed || showFilters">
|
||||
<KSFilter
|
||||
:configuration="logFilter"
|
||||
@@ -15,12 +15,12 @@
|
||||
</template>
|
||||
|
||||
<template v-if="showStatChart()" #top>
|
||||
<Sections ref="dashboardRef" :charts :dashboard="{id: 'default', charts: []}" showDefault class="mb-4" />
|
||||
<Sections ref="dashboard" :charts :dashboard="{id: 'default', charts: []}" showDefault />
|
||||
</template>
|
||||
|
||||
<template #table>
|
||||
<div v-loading="isLoading">
|
||||
<div v-if="logsStore.logs !== undefined && logsStore.logs?.length > 0" class="logs-wrapper">
|
||||
<div v-if="logsStore.logs !== undefined && logsStore.logs.length > 0" class="logs-wrapper">
|
||||
<LogLine
|
||||
v-for="(log, i) in logsStore.logs"
|
||||
:key="`${log.taskRunId}-${i}`"
|
||||
@@ -42,11 +42,6 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {ref, computed, onMounted, watch} from "vue";
|
||||
import {useRoute} from "vue-router";
|
||||
import {useI18n} from "vue-i18n";
|
||||
import _merge from "lodash/merge";
|
||||
import moment from "moment";
|
||||
import {useLogFilter} from "../filter/configurations";
|
||||
import KSFilter from "../filter/components/KSFilter.vue";
|
||||
import Sections from "../dashboard/sections/Sections.vue";
|
||||
@@ -54,151 +49,193 @@
|
||||
import TopNavBar from "../../components/layout/TopNavBar.vue";
|
||||
import LogLine from "../logs/LogLine.vue";
|
||||
import NoData from "../layout/NoData.vue";
|
||||
|
||||
const logFilter = useLogFilter();
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
import {mapStores} from "pinia";
|
||||
import RouteContext from "../../mixins/routeContext";
|
||||
import RestoreUrl from "../../mixins/restoreUrl";
|
||||
import DataTableActions from "../../mixins/dataTableActions";
|
||||
import _merge from "lodash/merge";
|
||||
import {storageKeys} from "../../utils/constants";
|
||||
import {decodeSearchParams} from "../filter/utils/helpers";
|
||||
import * as YAML_UTILS from "@kestra-io/ui-libs/flow-yaml-utils";
|
||||
import YAML_CHART from "../dashboard/assets/logs_timeseries_chart.yaml?raw";
|
||||
import {useLogsStore} from "../../stores/logs";
|
||||
import {useDataTableActions} from "../../composables/useDataTableActions";
|
||||
import useRouteContext from "../../composables/useRouteContext";
|
||||
import {defaultNamespace} from "../../composables/useNamespaces";
|
||||
import {defineComponent} from "vue";
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
logLevel?: string;
|
||||
embed?: boolean;
|
||||
showFilters?: boolean;
|
||||
filters?: Record<string, any>;
|
||||
reloadLogs?: number;
|
||||
}>(), {
|
||||
embed: false,
|
||||
showFilters: false,
|
||||
filters: undefined,
|
||||
logLevel: undefined,
|
||||
reloadLogs: undefined
|
||||
});
|
||||
export default defineComponent({
|
||||
mixins: [RouteContext, RestoreUrl, DataTableActions],
|
||||
props: {
|
||||
logLevel: {
|
||||
type: String,
|
||||
default: undefined
|
||||
},
|
||||
embed: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
showFilters: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
filters: {
|
||||
type: Object,
|
||||
default: null
|
||||
},
|
||||
reloadLogs: {
|
||||
type: Number,
|
||||
default: undefined
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
isDefaultNamespaceAllow: true,
|
||||
task: undefined,
|
||||
isLoading: false,
|
||||
lastRefreshDate: new Date(),
|
||||
canAutoRefresh: false,
|
||||
showChart: localStorage.getItem(storageKeys.SHOW_LOGS_CHART) !== "false",
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
storageKeys() {
|
||||
return storageKeys
|
||||
},
|
||||
...mapStores(useLogsStore),
|
||||
routeInfo() {
|
||||
return {
|
||||
title: this.$t("logs"),
|
||||
};
|
||||
},
|
||||
isFlowEdit() {
|
||||
return this.$route.name === "flows/update"
|
||||
},
|
||||
isNamespaceEdit() {
|
||||
return this.$route.name === "namespaces/update"
|
||||
},
|
||||
selectedLogLevel() {
|
||||
const decodedParams = decodeSearchParams(this.$route.query);
|
||||
const levelFilters = decodedParams.filter(item => item?.field === "level");
|
||||
const decoded = levelFilters.length > 0 ? levelFilters[0]?.value : "INFO";
|
||||
return this.logLevel || decoded || localStorage.getItem("defaultLogLevel") || "INFO";
|
||||
},
|
||||
endDate() {
|
||||
if (this.$route.query.endDate) {
|
||||
return this.$route.query.endDate;
|
||||
}
|
||||
return undefined;
|
||||
},
|
||||
startDate() {
|
||||
// we mention the last refresh date here to trick
|
||||
// VueJs fine grained reactivity system and invalidate
|
||||
// computed property startDate
|
||||
if (this.$route.query.startDate && this.lastRefreshDate) {
|
||||
return this.$route.query.startDate;
|
||||
}
|
||||
if (this.$route.query.timeRange) {
|
||||
return this.$moment().subtract(this.$moment.duration(this.$route.query.timeRange).as("milliseconds")).toISOString(true);
|
||||
}
|
||||
|
||||
const route = useRoute();
|
||||
const {t} = useI18n();
|
||||
const logsStore = useLogsStore();
|
||||
const logFilter = useLogFilter();
|
||||
// the default is PT30D
|
||||
return this.$moment().subtract(7, "days").toISOString(true);
|
||||
},
|
||||
namespace() {
|
||||
return this.$route.params.namespace ?? this.$route.params.id;
|
||||
},
|
||||
flowId() {
|
||||
return this.$route.params.id;
|
||||
},
|
||||
charts() {
|
||||
return [
|
||||
{...YAML_UTILS.parse(YAML_CHART), content: YAML_CHART}
|
||||
];
|
||||
}
|
||||
},
|
||||
beforeRouteEnter(to: any, _: any, next: (route?: any) => void) {
|
||||
const query = {...to.query};
|
||||
let queryHasChanged = false;
|
||||
|
||||
const routeInfo = computed(() => ({
|
||||
title: t("logs"),
|
||||
}));
|
||||
useRouteContext(routeInfo, props.embed);
|
||||
const queryKeys = Object.keys(query);
|
||||
if (defaultNamespace() && !queryKeys.some(key => key.startsWith("filters[namespace]"))) {
|
||||
query["filters[namespace][PREFIX]"] = defaultNamespace();
|
||||
queryHasChanged = true;
|
||||
}
|
||||
|
||||
const isLoading = ref(false);
|
||||
const lastRefreshDate = ref(new Date());
|
||||
const showChart = ref(localStorage.getItem(storageKeys.SHOW_LOGS_CHART) !== "false");
|
||||
const dashboardRef = ref();
|
||||
if (queryHasChanged) {
|
||||
next({
|
||||
...to,
|
||||
query,
|
||||
replace: true
|
||||
});
|
||||
} else {
|
||||
next();
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
showStatChart() {
|
||||
return this.showChart;
|
||||
},
|
||||
onShowChartChange(value: boolean) {
|
||||
this.showChart = value;
|
||||
localStorage.setItem(storageKeys.SHOW_LOGS_CHART, value.toString());
|
||||
if (this.showStatChart()) {
|
||||
this.load();
|
||||
}
|
||||
},
|
||||
refresh() {
|
||||
this.lastRefreshDate = new Date();
|
||||
if (this.$refs.dashboard) {
|
||||
this.$refs.dashboard.refreshCharts();
|
||||
}
|
||||
this.load();
|
||||
},
|
||||
loadQuery(base: any) {
|
||||
let queryFilter = this.filters ?? this.queryWithFilter();
|
||||
|
||||
const isFlowEdit = computed(() => route.name === "flows/update");
|
||||
const isNamespaceEdit = computed(() => route.name === "namespaces/update");
|
||||
const selectedLogLevel = computed(() => {
|
||||
const decodedParams = decodeSearchParams(route.query);
|
||||
const levelFilters = decodedParams.filter(item => item?.field === "level");
|
||||
const decoded = levelFilters.length > 0 ? levelFilters[0]?.value : "INFO";
|
||||
return props.logLevel || decoded || localStorage.getItem("defaultLogLevel") || "INFO";
|
||||
});
|
||||
const endDate = computed(() => {
|
||||
if (route.query.endDate) {
|
||||
return route.query.endDate;
|
||||
}
|
||||
return undefined;
|
||||
});
|
||||
const startDate = computed(() => {
|
||||
// we mention the last refresh date here to trick
|
||||
// VueJs fine grained reactivity system and invalidate
|
||||
// computed property startDate
|
||||
if (route.query.startDate && lastRefreshDate.value) {
|
||||
return route.query.startDate;
|
||||
}
|
||||
if (route.query.timeRange) {
|
||||
return moment().subtract(moment.duration(route.query.timeRange as string).as("milliseconds")).toISOString(true);
|
||||
}
|
||||
if (this.isFlowEdit) {
|
||||
queryFilter["filters[namespace][EQUALS]"] = this.namespace;
|
||||
queryFilter["filters[flowId][EQUALS]"] = this.flowId;
|
||||
} else if (this.isNamespaceEdit) {
|
||||
queryFilter["filters[namespace][EQUALS]"] = this.namespace;
|
||||
}
|
||||
|
||||
// the default is PT30D
|
||||
return moment().subtract(7, "days").toISOString(true);
|
||||
});
|
||||
const flowId = computed(() => route.params.id);
|
||||
const namespace = computed(() => route.params.namespace ?? route.params.id);
|
||||
const charts = computed(() => [
|
||||
{...YAML_UTILS.parse(YAML_CHART), content: YAML_CHART}
|
||||
]);
|
||||
if (!queryFilter["startDate"] || !queryFilter["endDate"]) {
|
||||
queryFilter["startDate"] = this.startDate;
|
||||
queryFilter["endDate"] = this.endDate;
|
||||
}
|
||||
|
||||
const loadQuery = (base: any) => {
|
||||
let queryFilter = props.filters ?? queryWithFilter();
|
||||
delete queryFilter["level"];
|
||||
|
||||
if (isFlowEdit.value) {
|
||||
queryFilter["filters[namespace][EQUALS]"] = namespace.value;
|
||||
queryFilter["filters[flowId][EQUALS]"] = flowId.value;
|
||||
} else if (isNamespaceEdit.value) {
|
||||
queryFilter["filters[namespace][EQUALS]"] = namespace.value;
|
||||
}
|
||||
return _merge(base, queryFilter)
|
||||
},
|
||||
load() {
|
||||
this.isLoading = true
|
||||
|
||||
if (!queryFilter["startDate"] || !queryFilter["endDate"]) {
|
||||
queryFilter["startDate"] = startDate.value;
|
||||
queryFilter["endDate"] = endDate.value;
|
||||
}
|
||||
const data = {
|
||||
page: this.filters ? this.internalPageNumber : this.$route.query.page || this.internalPageNumber,
|
||||
size: this.filters ? this.internalPageSize : this.$route.query.size || this.internalPageSize,
|
||||
...this.filters
|
||||
};
|
||||
this.logsStore.findLogs(this.loadQuery({
|
||||
...data,
|
||||
minLevel: this.filters ? null : this.selectedLogLevel,
|
||||
sort: "timestamp:desc"
|
||||
}))
|
||||
.finally(() => {
|
||||
this.isLoading = false
|
||||
this.saveRestoreUrl();
|
||||
});
|
||||
|
||||
delete queryFilter["level"];
|
||||
|
||||
return _merge(base, queryFilter);
|
||||
};
|
||||
|
||||
const loadData = (callback?: () => void) => {
|
||||
isLoading.value = true;
|
||||
|
||||
const data = {
|
||||
page: props.filters ? internalPageNumber.value : route.query.page || internalPageNumber.value,
|
||||
size: props.filters ? internalPageSize.value : route.query.size || internalPageSize.value,
|
||||
...props.filters
|
||||
};
|
||||
|
||||
logsStore.findLogs(loadQuery({
|
||||
...data,
|
||||
minLevel: props.filters ? null : selectedLogLevel.value,
|
||||
sort: "timestamp:desc"
|
||||
}))
|
||||
.finally(() => {
|
||||
isLoading.value = false;
|
||||
if (callback) callback();
|
||||
});
|
||||
};
|
||||
|
||||
const {onPageChanged, queryWithFilter, internalPageNumber, internalPageSize} = useDataTableActions({
|
||||
loadData
|
||||
});
|
||||
|
||||
const showStatChart = () => showChart.value;
|
||||
|
||||
const onShowChartChange = (value: boolean) => {
|
||||
showChart.value = value;
|
||||
localStorage.setItem(storageKeys.SHOW_LOGS_CHART, value.toString());
|
||||
if (showStatChart()) {
|
||||
loadData();
|
||||
}
|
||||
};
|
||||
|
||||
const refresh = () => {
|
||||
lastRefreshDate.value = new Date();
|
||||
if (dashboardRef.value) {
|
||||
dashboardRef.value.refreshCharts();
|
||||
}
|
||||
loadData();
|
||||
};
|
||||
|
||||
watch(() => route.query, () => {
|
||||
loadData();
|
||||
}, {deep: true});
|
||||
|
||||
watch(() => props.reloadLogs, (newValue) => {
|
||||
if (newValue) refresh();
|
||||
});
|
||||
|
||||
onMounted(() => {
|
||||
// Load data on mount if not embedded
|
||||
if (!props.embed) {
|
||||
loadData();
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
reloadLogs(newValue) {
|
||||
if(newValue) this.refresh();
|
||||
},
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -8,10 +8,15 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {computed, getCurrentInstance} from "vue";
|
||||
import {computed} from "vue";
|
||||
import {useI18n} from "vue-i18n";
|
||||
import InputText from "../inputs/InputText.vue";
|
||||
|
||||
import {useMiscStore} from "override/stores/misc";
|
||||
const miscStore = useMiscStore();
|
||||
|
||||
const disabled = computed(() => miscStore.configs?.edition === "OSS")
|
||||
|
||||
const {t} = useI18n()
|
||||
|
||||
const modelValue = defineModel<string>({default: ""})
|
||||
@@ -20,8 +25,4 @@
|
||||
name: "TaskVersion",
|
||||
inheritAttrs: false,
|
||||
})
|
||||
|
||||
const disabled = computed(() => {
|
||||
return Boolean(getCurrentInstance()?.appContext.config.globalProperties.$isOss)
|
||||
})
|
||||
</script>
|
||||