mirror of
https://github.com/kestra-io/kestra.git
synced 2025-12-26 14:00:23 -05:00
Compare commits
19 Commits
dependabot
...
chore/noCo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b3bbedaeff | ||
|
|
312ec2c36b | ||
|
|
d57150e69c | ||
|
|
4b25232d4e | ||
|
|
1d1a065833 | ||
|
|
d6ecbadee1 | ||
|
|
205605060d | ||
|
|
6ef3a00e16 | ||
|
|
f70d612878 | ||
|
|
0b345c03d1 | ||
|
|
ecb508f797 | ||
|
|
38caea2568 | ||
|
|
cdad732576 | ||
|
|
0dd4cb963f | ||
|
|
c35ca82356 | ||
|
|
db6cb93df4 | ||
|
|
1f8d2ea918 | ||
|
|
3c09a38eed | ||
|
|
0525e3ece6 |
2
.github/workflows/main-build.yml
vendored
2
.github/workflows/main-build.yml
vendored
@@ -28,7 +28,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
# Targeting develop branch from develop
|
# Targeting develop branch from develop
|
||||||
- name: Trigger EE Workflow (develop push, no payload)
|
- name: Trigger EE Workflow (develop push, no payload)
|
||||||
uses: peter-evans/repository-dispatch@5fc4efd1a4797ddb68ffd0714a238564e4cc0e6f
|
uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697
|
||||||
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
|
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GH_PERSONAL_TOKEN }}
|
token: ${{ secrets.GH_PERSONAL_TOKEN }}
|
||||||
|
|||||||
6
.github/workflows/pull-request.yml
vendored
6
.github/workflows/pull-request.yml
vendored
@@ -16,7 +16,7 @@ jobs:
|
|||||||
- name: Check EE repo for branch with same name
|
- name: Check EE repo for branch with same name
|
||||||
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false }}
|
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false }}
|
||||||
id: check-ee-branch
|
id: check-ee-branch
|
||||||
uses: actions/github-script@v7
|
uses: actions/github-script@v8
|
||||||
with:
|
with:
|
||||||
github-token: ${{ secrets.GH_PERSONAL_TOKEN }}
|
github-token: ${{ secrets.GH_PERSONAL_TOKEN }}
|
||||||
script: |
|
script: |
|
||||||
@@ -40,7 +40,7 @@ jobs:
|
|||||||
|
|
||||||
# Targeting pull request (only if not from a fork and EE has no branch with same name)
|
# Targeting pull request (only if not from a fork and EE has no branch with same name)
|
||||||
- name: Trigger EE Workflow (pull request, with payload)
|
- name: Trigger EE Workflow (pull request, with payload)
|
||||||
uses: peter-evans/repository-dispatch@5fc4efd1a4797ddb68ffd0714a238564e4cc0e6f
|
uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697
|
||||||
if: ${{ github.event_name == 'pull_request'
|
if: ${{ github.event_name == 'pull_request'
|
||||||
&& github.event.pull_request.number != ''
|
&& github.event.pull_request.number != ''
|
||||||
&& github.event.pull_request.head.repo.fork == false
|
&& github.event.pull_request.head.repo.fork == false
|
||||||
@@ -50,7 +50,7 @@ jobs:
|
|||||||
repository: kestra-io/kestra-ee
|
repository: kestra-io/kestra-ee
|
||||||
event-type: "oss-updated"
|
event-type: "oss-updated"
|
||||||
client-payload: >-
|
client-payload: >-
|
||||||
{"commit_sha":"${{ github.sha }}","pr_repo":"${{ github.repository }}"}
|
{"commit_sha":"${{ github.event.pull_request.head.sha }}","pr_repo":"${{ github.repository }}"}
|
||||||
|
|
||||||
file-changes:
|
file-changes:
|
||||||
if: ${{ github.event.pull_request.draft == false }}
|
if: ${{ github.event.pull_request.draft == false }}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "net.e175.klaus:zip-prefixer:0.3.1"
|
classpath "net.e175.klaus:zip-prefixer:0.4.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ kestra:
|
|||||||
server:
|
server:
|
||||||
liveness:
|
liveness:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
termination-grace-period: 5s
|
||||||
micronaut:
|
micronaut:
|
||||||
http:
|
http:
|
||||||
services:
|
services:
|
||||||
|
|||||||
@@ -58,7 +58,8 @@ kestra:
|
|||||||
purge:
|
purge:
|
||||||
initial-delay: 1h
|
initial-delay: 1h
|
||||||
fixed-delay: 1d
|
fixed-delay: 1d
|
||||||
retention: 30d
|
retention: 30dPeriod
|
||||||
|
termination-grace-period: 5s
|
||||||
|
|
||||||
anonymous-usage-report:
|
anonymous-usage-report:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ namespace: io.kestra.tests
|
|||||||
tasks:
|
tasks:
|
||||||
- id: sleep-long
|
- id: sleep-long
|
||||||
type: io.kestra.plugin.core.flow.Sleep
|
type: io.kestra.plugin.core.flow.Sleep
|
||||||
duration: PT300S
|
duration: PT30S
|
||||||
|
|
||||||
afterExecution:
|
afterExecution:
|
||||||
- id: output
|
- id: output
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ kestra:
|
|||||||
- "/api/v1/executions/webhook/"
|
- "/api/v1/executions/webhook/"
|
||||||
liveness:
|
liveness:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
termination-grace-period: 5s
|
||||||
service:
|
service:
|
||||||
purge:
|
purge:
|
||||||
initial-delay: 1h
|
initial-delay: 1h
|
||||||
|
|||||||
@@ -16,6 +16,6 @@ public abstract class H2DashboardRepositoryService {
|
|||||||
conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
|
conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
|
||||||
}
|
}
|
||||||
|
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ public abstract class H2ExecutionRepositoryService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
|
public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
|
||||||
@@ -64,6 +64,6 @@ public abstract class H2ExecutionRepositoryService {
|
|||||||
if (!inConditions.isEmpty()) {
|
if (!inConditions.isEmpty()) {
|
||||||
conditions.add(DSL.or(inConditions));
|
conditions.add(DSL.or(inConditions));
|
||||||
}
|
}
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ public abstract class H2FlowRepositoryService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
|
public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
|
||||||
@@ -54,6 +54,6 @@ public abstract class H2FlowRepositoryService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,6 @@ public abstract class H2KvMetadataRepositoryService {
|
|||||||
conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
|
conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
|
||||||
}
|
}
|
||||||
|
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ public class H2Repository<T> extends io.kestra.jdbc.AbstractJdbcRepository<T> {
|
|||||||
|
|
||||||
public Condition fullTextCondition(List<String> fields, String query) {
|
public Condition fullTextCondition(List<String> fields, String query) {
|
||||||
if (query == null || query.equals("*")) {
|
if (query == null || query.equals("*")) {
|
||||||
return DSL.trueCondition();
|
return DSL.noCondition();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fields.size() > 1) {
|
if (fields.size() > 1) {
|
||||||
@@ -105,12 +105,12 @@ public class H2Repository<T> extends io.kestra.jdbc.AbstractJdbcRepository<T> {
|
|||||||
.sort(select, pageable)
|
.sort(select, pageable)
|
||||||
.asTable("page")
|
.asTable("page")
|
||||||
)
|
)
|
||||||
.where(DSL.trueCondition()),
|
.where(DSL.noCondition()),
|
||||||
pageable
|
pageable
|
||||||
)
|
)
|
||||||
.fetch();
|
.fetch();
|
||||||
|
|
||||||
Integer totalCount = results.size() > 0 ? results.getFirst().get("total_count", Integer.class) : 0;
|
Integer totalCount = !results.isEmpty() ? results.getFirst().get("total_count", Integer.class) : 0;
|
||||||
|
|
||||||
List<E> map = results
|
List<E> map = results
|
||||||
.map((Record record) -> mapper.map((R) record));
|
.map((Record record) -> mapper.map((R) record));
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ kestra:
|
|||||||
server:
|
server:
|
||||||
liveness:
|
liveness:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
termination-grace-period: 5s
|
||||||
service:
|
service:
|
||||||
purge:
|
purge:
|
||||||
initial-delay: 1h
|
initial-delay: 1h
|
||||||
|
|||||||
@@ -17,6 +17,6 @@ public abstract class MysqlDashboardRepositoryService {
|
|||||||
conditions.add(jdbcRepository.fullTextCondition(Arrays.asList("title"), query));
|
conditions.add(jdbcRepository.fullTextCondition(Arrays.asList("title"), query));
|
||||||
}
|
}
|
||||||
|
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ public abstract class MysqlExecutionRepositoryService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
|
public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
|
||||||
@@ -63,7 +63,7 @@ public abstract class MysqlExecutionRepositoryService {
|
|||||||
if(!inConditions.isEmpty()){
|
if(!inConditions.isEmpty()){
|
||||||
conditions.add(DSL.or(inConditions));
|
conditions.add(DSL.or(inConditions));
|
||||||
}
|
}
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ public abstract class MysqlFlowRepositoryService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
|
public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
|
||||||
@@ -45,6 +45,6 @@ public abstract class MysqlFlowRepositoryService {
|
|||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,6 @@ public abstract class MysqlKvMetadataRepositoryService {
|
|||||||
conditions.add(jdbcRepository.fullTextCondition(List.of("name"), query));
|
conditions.add(jdbcRepository.fullTextCondition(List.of("name"), query));
|
||||||
}
|
}
|
||||||
|
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ public class MysqlRepository<T> extends AbstractJdbcRepository<T> {
|
|||||||
@Override
|
@Override
|
||||||
public Condition fullTextCondition(List<String> fields, String query) {
|
public Condition fullTextCondition(List<String> fields, String query) {
|
||||||
if (query == null || query.equals("*")) {
|
if (query == null || query.equals("*")) {
|
||||||
return DSL.trueCondition();
|
return DSL.noCondition();
|
||||||
}
|
}
|
||||||
|
|
||||||
String match = Arrays
|
String match = Arrays
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ public class MysqlTriggerRepository extends AbstractJdbcTriggerRepository {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Condition fullTextCondition(String query) {
|
protected Condition fullTextCondition(String query) {
|
||||||
return query == null ? DSL.trueCondition() : jdbcRepository.fullTextCondition(List.of("namespace", "flow_id", "trigger_id", "execution_id"), query);
|
return query == null ? DSL.noCondition() : jdbcRepository.fullTextCondition(List.of("namespace", "flow_id", "trigger_id", "execution_id"), query);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ kestra:
|
|||||||
server:
|
server:
|
||||||
liveness:
|
liveness:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
termination-grace-period: 5s
|
||||||
service:
|
service:
|
||||||
purge:
|
purge:
|
||||||
initial-delay: 1h
|
initial-delay: 1h
|
||||||
|
|||||||
@@ -17,6 +17,6 @@ public abstract class PostgresDashboardRepositoryService {
|
|||||||
conditions.add(jdbcRepository.fullTextCondition(Collections.singletonList("fulltext"), query));
|
conditions.add(jdbcRepository.fullTextCondition(Collections.singletonList("fulltext"), query));
|
||||||
}
|
}
|
||||||
|
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ public abstract class PostgresExecutionRepositoryService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
|
public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
|
||||||
@@ -60,7 +60,7 @@ public abstract class PostgresExecutionRepositoryService {
|
|||||||
if (!inConditions.isEmpty()) {
|
if (!inConditions.isEmpty()) {
|
||||||
conditions.add(DSL.or(inConditions));
|
conditions.add(DSL.or(inConditions));
|
||||||
}
|
}
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Condition statesFilter(List<State.Type> state) {
|
public static Condition statesFilter(List<State.Type> state) {
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public abstract class PostgresFlowRepositoryService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
|
public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
|
||||||
@@ -49,7 +49,7 @@ public abstract class PostgresFlowRepositoryService {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,6 @@ public abstract class PostgresKvMetadataRepositoryService {
|
|||||||
conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
|
conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
|
||||||
}
|
}
|
||||||
|
|
||||||
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public class PostgresRepository<T> extends io.kestra.jdbc.AbstractJdbcRepository
|
|||||||
@Override
|
@Override
|
||||||
public Condition fullTextCondition(List<String> fields, String query) {
|
public Condition fullTextCondition(List<String> fields, String query) {
|
||||||
if (query == null || query.equals("*")) {
|
if (query == null || query.equals("*")) {
|
||||||
return DSL.trueCondition();
|
return DSL.noCondition();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fields.size() > 1) {
|
if (fields.size() > 1) {
|
||||||
@@ -106,7 +106,7 @@ public class PostgresRepository<T> extends io.kestra.jdbc.AbstractJdbcRepository
|
|||||||
.sort(select, pageable)
|
.sort(select, pageable)
|
||||||
.asTable("page")
|
.asTable("page")
|
||||||
)
|
)
|
||||||
.where(DSL.trueCondition()),
|
.where(DSL.noCondition()),
|
||||||
pageable
|
pageable
|
||||||
)
|
)
|
||||||
.fetch();
|
.fetch();
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ kestra:
|
|||||||
server:
|
server:
|
||||||
liveness:
|
liveness:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
termination-grace-period: 5s
|
||||||
service:
|
service:
|
||||||
purge:
|
purge:
|
||||||
initial-delay: 1h
|
initial-delay: 1h
|
||||||
|
|||||||
@@ -223,8 +223,7 @@ public abstract class AbstractJdbcRepository<T> {
|
|||||||
.from(this
|
.from(this
|
||||||
.sort(select, Pageable.from(Sort.of(Order.asc(orderField))))
|
.sort(select, Pageable.from(Sort.of(Order.asc(orderField))))
|
||||||
.asTable("page")
|
.asTable("page")
|
||||||
)
|
);
|
||||||
.where(DSL.trueCondition());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@SneakyThrows
|
@SneakyThrows
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import java.util.stream.Stream;
|
|||||||
* NOTE: it uses the <code>defaultFilter(tenantId)</code> for querying.
|
* NOTE: it uses the <code>defaultFilter(tenantId)</code> for querying.
|
||||||
* If the child repository uses a default filter, it should override it.
|
* If the child repository uses a default filter, it should override it.
|
||||||
* <p>
|
* <p>
|
||||||
* For example, to avoid supporting allowDeleted:
|
* For example, to avoid supporting the <code>deleted</code> column:
|
||||||
* <pre>{@code
|
* <pre>{@code
|
||||||
* @Override
|
* @Override
|
||||||
* protected Condition defaultFilter(String tenantId) {
|
* protected Condition defaultFilter(String tenantId) {
|
||||||
@@ -30,7 +30,7 @@ import java.util.stream.Stream;
|
|||||||
*
|
*
|
||||||
* @Override
|
* @Override
|
||||||
* protected Condition defaultFilter() {
|
* protected Condition defaultFilter() {
|
||||||
* return DSL.trueCondition();
|
* return DSL.noCondition();
|
||||||
* }
|
* }
|
||||||
* }</pre>
|
* }</pre>
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -770,18 +770,16 @@ public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcCrudRe
|
|||||||
.from(this.jdbcRepository.getTable())
|
.from(this.jdbcRepository.getTable())
|
||||||
.where(this.defaultFilter(tenantId))
|
.where(this.defaultFilter(tenantId))
|
||||||
.and(NORMAL_KIND_CONDITION)
|
.and(NORMAL_KIND_CONDITION)
|
||||||
.and(DSL.or(
|
.and(ListUtils.isEmpty(flows) ?
|
||||||
ListUtils.emptyOnNull(flows).isEmpty() ?
|
DSL.noCondition()
|
||||||
DSL.trueCondition()
|
|
||||||
:
|
:
|
||||||
DSL.or(
|
DSL.or(
|
||||||
flows.stream()
|
flows.stream()
|
||||||
.map(flow -> DSL.and(
|
.map(flow -> DSL.and(
|
||||||
field("namespace").eq(flow.getNamespace()),
|
field("namespace").eq(flow.getNamespace()),
|
||||||
field("flow_id").eq(flow.getId())
|
field("flow_id").eq(flow.getId())
|
||||||
))
|
))
|
||||||
.toList()
|
.toList()
|
||||||
)
|
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public abstract class AbstractJdbcKvMetadataRepository extends AbstractJdbcCrudR
|
|||||||
boolean allowExpired,
|
boolean allowExpired,
|
||||||
FetchVersion fetchBehavior
|
FetchVersion fetchBehavior
|
||||||
) {
|
) {
|
||||||
var condition = allowExpired ? DSL.trueCondition() : DSL.or(
|
var condition = allowExpired ? DSL.noCondition() : DSL.or(
|
||||||
field("expiration_date").greaterThan(Instant.now()),
|
field("expiration_date").greaterThan(Instant.now()),
|
||||||
field("expiration_date").isNull());
|
field("expiration_date").isNull());
|
||||||
|
|
||||||
|
|||||||
@@ -34,12 +34,12 @@ public abstract class AbstractJdbcSettingRepository extends AbstractJdbcCrudRepo
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Optional<Setting> findByKey(String key) {
|
public Optional<Setting> findByKey(String key) {
|
||||||
return findOne(DSL.trueCondition(), field("key").eq(key));
|
return findOne(DSL.noCondition(), field("key").eq(key));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Setting> findAll() {
|
public List<Setting> findAll() {
|
||||||
return findAll(DSL.trueCondition());
|
return findAll(DSL.noCondition());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -72,6 +72,6 @@ public abstract class AbstractJdbcSettingRepository extends AbstractJdbcCrudRepo
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Condition defaultFilter() {
|
protected Condition defaultFilter() {
|
||||||
return DSL.trueCondition();
|
return DSL.noCondition();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ public abstract class AbstractJdbcTemplateRepository extends AbstractJdbcCrudRep
|
|||||||
}
|
}
|
||||||
|
|
||||||
private Condition computeCondition(@Nullable String query, @Nullable String namespace) {
|
private Condition computeCondition(@Nullable String query, @Nullable String namespace) {
|
||||||
Condition condition = DSL.trueCondition();
|
Condition condition = DSL.noCondition();
|
||||||
|
|
||||||
if (query != null) {
|
if (query != null) {
|
||||||
condition = condition.and(this.findCondition(query));
|
condition = condition.and(this.findCondition(query));
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Optional<Trigger> findLast(TriggerContext trigger) {
|
public Optional<Trigger> findLast(TriggerContext trigger) {
|
||||||
return findOne(DSL.trueCondition(), field("key").eq(trigger.uid()));
|
return findOne(DSL.noCondition(), field("key").eq(trigger.uid()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -231,7 +231,7 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected Condition fullTextCondition(String query) {
|
protected Condition fullTextCondition(String query) {
|
||||||
return query == null ? DSL.trueCondition() : jdbcRepository.fullTextCondition(List.of("fulltext"), query);
|
return query == null ? DSL.noCondition() : jdbcRepository.fullTextCondition(List.of("fulltext"), query);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -246,7 +246,7 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Condition defaultFilter() {
|
protected Condition defaultFilter() {
|
||||||
return DSL.trueCondition();
|
return DSL.noCondition();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ public abstract class JdbcFlowRepositoryService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return conditions.size() == 0 ? DSL.trueCondition() : DSL.and(conditions);
|
return conditions.size() == 0 ? DSL.noCondition() : DSL.and(conditions);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Condition findSourceCodeCondition(AbstractJdbcRepository<Flow> jdbcRepository, String query) {
|
public static Condition findSourceCodeCondition(AbstractJdbcRepository<Flow> jdbcRepository, String query) {
|
||||||
|
|||||||
@@ -17,10 +17,10 @@ dependencies {
|
|||||||
def mavenResolverVersion = "2.0.10"
|
def mavenResolverVersion = "2.0.10"
|
||||||
def jollydayVersion = "1.5.6"
|
def jollydayVersion = "1.5.6"
|
||||||
def jsonschemaVersion = "4.38.0"
|
def jsonschemaVersion = "4.38.0"
|
||||||
def kafkaVersion = "4.1.0"
|
def kafkaVersion = "4.1.1"
|
||||||
def opensearchVersion = "3.2.0"
|
def opensearchVersion = "3.2.0"
|
||||||
def opensearchRestVersion = "3.3.2"
|
def opensearchRestVersion = "3.3.2"
|
||||||
def flyingSaucerVersion = "10.0.3"
|
def flyingSaucerVersion = "10.0.4"
|
||||||
def jacksonVersion = "2.20.1"
|
def jacksonVersion = "2.20.1"
|
||||||
def jacksonAnnotationsVersion = "2.20"
|
def jacksonAnnotationsVersion = "2.20"
|
||||||
def jugVersion = "5.1.1"
|
def jugVersion = "5.1.1"
|
||||||
@@ -31,11 +31,11 @@ dependencies {
|
|||||||
api enforcedPlatform("com.fasterxml.jackson:jackson-bom:$jacksonVersion")
|
api enforcedPlatform("com.fasterxml.jackson:jackson-bom:$jacksonVersion")
|
||||||
api enforcedPlatform("org.slf4j:slf4j-api:$slf4jVersion")
|
api enforcedPlatform("org.slf4j:slf4j-api:$slf4jVersion")
|
||||||
api platform("io.micronaut.platform:micronaut-platform:4.9.4")
|
api platform("io.micronaut.platform:micronaut-platform:4.9.4")
|
||||||
api platform("io.qameta.allure:allure-bom:2.30.0")
|
api platform("io.qameta.allure:allure-bom:2.31.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)
|
// 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.google.cloud:libraries-bom:26.72.0')
|
||||||
api platform("com.azure:azure-sdk-bom:1.3.2")
|
api platform("com.azure:azure-sdk-bom:1.3.2")
|
||||||
api platform('software.amazon.awssdk:bom:2.38.4')
|
api platform('software.amazon.awssdk:bom:2.38.9')
|
||||||
api platform("dev.langchain4j:langchain4j-bom:$langchain4jVersion")
|
api platform("dev.langchain4j:langchain4j-bom:$langchain4jVersion")
|
||||||
api platform("dev.langchain4j:langchain4j-community-bom:$langchain4jCommunityVersion")
|
api platform("dev.langchain4j:langchain4j-community-bom:$langchain4jCommunityVersion")
|
||||||
|
|
||||||
@@ -90,7 +90,7 @@ dependencies {
|
|||||||
api group: 'net.thisptr', name: 'jackson-jq', version: '1.6.0'
|
api group: 'net.thisptr', name: 'jackson-jq', version: '1.6.0'
|
||||||
api group: 'com.google.guava', name: 'guava', version: '33.4.8-jre'
|
api group: 'com.google.guava', name: 'guava', version: '33.4.8-jre'
|
||||||
api group: 'commons-io', name: 'commons-io', version: '2.21.0'
|
api group: 'commons-io', name: 'commons-io', version: '2.21.0'
|
||||||
api group: 'org.apache.commons', name: 'commons-lang3', version: '3.19.0'
|
api group: 'org.apache.commons', name: 'commons-lang3', version: '3.20.0'
|
||||||
api 'ch.qos.logback.contrib:logback-json-classic:0.1.5'
|
api 'ch.qos.logback.contrib:logback-json-classic:0.1.5'
|
||||||
api 'ch.qos.logback.contrib:logback-jackson:0.1.5'
|
api 'ch.qos.logback.contrib:logback-jackson:0.1.5'
|
||||||
api group: 'org.apache.maven.resolver', name: 'maven-resolver-impl', version: mavenResolverVersion
|
api group: 'org.apache.maven.resolver', name: 'maven-resolver-impl', version: mavenResolverVersion
|
||||||
@@ -113,8 +113,8 @@ dependencies {
|
|||||||
api 'com.h2database:h2:2.4.240'
|
api 'com.h2database:h2:2.4.240'
|
||||||
api 'com.mysql:mysql-connector-j:9.5.0'
|
api 'com.mysql:mysql-connector-j:9.5.0'
|
||||||
api 'org.postgresql:postgresql:42.7.8'
|
api 'org.postgresql:postgresql:42.7.8'
|
||||||
api 'com.github.docker-java:docker-java:3.7.0'
|
api 'com.github.docker-java:docker-java:3.6.0'
|
||||||
api 'com.github.docker-java:docker-java-transport-httpclient5:3.7.0'
|
api 'com.github.docker-java:docker-java-transport-httpclient5:3.6.0'
|
||||||
api (group: 'org.opensearch.client', name: 'opensearch-java', version: "$opensearchVersion")
|
api (group: 'org.opensearch.client', name: 'opensearch-java', version: "$opensearchVersion")
|
||||||
api (group: 'org.opensearch.client', name: 'opensearch-rest-client', version: "$opensearchRestVersion")
|
api (group: 'org.opensearch.client', name: 'opensearch-rest-client', version: "$opensearchRestVersion")
|
||||||
api (group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "$opensearchRestVersion") // used by the elasticsearch plugin
|
api (group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "$opensearchRestVersion") // used by the elasticsearch plugin
|
||||||
@@ -140,7 +140,7 @@ dependencies {
|
|||||||
api 'org.hamcrest:hamcrest:3.0'
|
api 'org.hamcrest:hamcrest:3.0'
|
||||||
api 'org.hamcrest:hamcrest-library:3.0'
|
api 'org.hamcrest:hamcrest-library:3.0'
|
||||||
api group: 'org.exparity', name: 'hamcrest-date', version: '2.0.8'
|
api group: 'org.exparity', name: 'hamcrest-date', version: '2.0.8'
|
||||||
api "org.wiremock:wiremock-jetty12:3.13.1"
|
api "org.wiremock:wiremock-jetty12:3.13.2"
|
||||||
api "org.apache.kafka:kafka-streams-test-utils:$kafkaVersion"
|
api "org.apache.kafka:kafka-streams-test-utils:$kafkaVersion"
|
||||||
api "com.microsoft.playwright:playwright:1.56.0"
|
api "com.microsoft.playwright:playwright:1.56.0"
|
||||||
api "org.awaitility:awaitility:4.3.0"
|
api "org.awaitility:awaitility:4.3.0"
|
||||||
|
|||||||
@@ -10,3 +10,4 @@ kestra:
|
|||||||
server:
|
server:
|
||||||
liveness:
|
liveness:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
termination-grace-period: 5s
|
||||||
@@ -14,3 +14,4 @@ kestra:
|
|||||||
server:
|
server:
|
||||||
liveness:
|
liveness:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
termination-grace-period: 5s
|
||||||
@@ -54,6 +54,7 @@ kestra:
|
|||||||
- "/api/v1/executions/webhook/"
|
- "/api/v1/executions/webhook/"
|
||||||
liveness:
|
liveness:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
termination-grace-period: 5s
|
||||||
service:
|
service:
|
||||||
purge:
|
purge:
|
||||||
initial-delay: 1h
|
initial-delay: 1h
|
||||||
|
|||||||
4391
ui/package-lock.json
generated
4391
ui/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -38,8 +38,7 @@
|
|||||||
"cronstrue": "^3.9.0",
|
"cronstrue": "^3.9.0",
|
||||||
"cytoscape": "^3.33.0",
|
"cytoscape": "^3.33.0",
|
||||||
"dagre": "^0.8.5",
|
"dagre": "^0.8.5",
|
||||||
"el-table-infinite-scroll": "^3.0.7",
|
"element-plus": "2.11.8",
|
||||||
"element-plus": "2.11.7",
|
|
||||||
"humanize-duration": "^3.33.1",
|
"humanize-duration": "^3.33.1",
|
||||||
"js-yaml": "^4.1.1",
|
"js-yaml": "^4.1.1",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
@@ -98,8 +97,8 @@
|
|||||||
"@types/testing-library__jest-dom": "^6.0.0",
|
"@types/testing-library__jest-dom": "^6.0.0",
|
||||||
"@types/testing-library__user-event": "^4.2.0",
|
"@types/testing-library__user-event": "^4.2.0",
|
||||||
"@typescript-eslint/parser": "^8.46.4",
|
"@typescript-eslint/parser": "^8.46.4",
|
||||||
"@vitejs/plugin-vue": "^6.0.1",
|
"@vitejs/plugin-vue": "^6.0.2",
|
||||||
"@vitejs/plugin-vue-jsx": "^5.1.1",
|
"@vitejs/plugin-vue-jsx": "^5.1.2",
|
||||||
"@vitest/browser": "^3.2.4",
|
"@vitest/browser": "^3.2.4",
|
||||||
"@vitest/coverage-v8": "^3.2.4",
|
"@vitest/coverage-v8": "^3.2.4",
|
||||||
"@vue/eslint-config-prettier": "^10.2.0",
|
"@vue/eslint-config-prettier": "^10.2.0",
|
||||||
@@ -131,26 +130,23 @@
|
|||||||
"uuid": "^13.0.0",
|
"uuid": "^13.0.0",
|
||||||
"vite": "npm:rolldown-vite@latest",
|
"vite": "npm:rolldown-vite@latest",
|
||||||
"vitest": "^3.2.4",
|
"vitest": "^3.2.4",
|
||||||
"vue-tsc": "^3.1.3"
|
"vue-tsc": "^3.1.4"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"@esbuild/darwin-arm64": "^0.27.0",
|
"@esbuild/darwin-arm64": "^0.27.0",
|
||||||
"@esbuild/darwin-x64": "^0.27.0",
|
"@esbuild/darwin-x64": "^0.27.0",
|
||||||
"@esbuild/linux-x64": "^0.27.0",
|
"@esbuild/linux-x64": "^0.27.0",
|
||||||
"@rollup/rollup-darwin-arm64": "^4.53.2",
|
"@rollup/rollup-darwin-arm64": "^4.53.3",
|
||||||
"@rollup/rollup-darwin-x64": "^4.53.2",
|
"@rollup/rollup-darwin-x64": "^4.53.3",
|
||||||
"@rollup/rollup-linux-x64-gnu": "^4.53.2",
|
"@rollup/rollup-linux-x64-gnu": "^4.53.3",
|
||||||
"@swc/core-darwin-arm64": "^1.15.1",
|
"@swc/core-darwin-arm64": "^1.15.2",
|
||||||
"@swc/core-darwin-x64": "^1.15.1",
|
"@swc/core-darwin-x64": "^1.15.2",
|
||||||
"@swc/core-linux-x64-gnu": "^1.15.1"
|
"@swc/core-linux-x64-gnu": "^1.15.2"
|
||||||
},
|
},
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"bootstrap": {
|
"bootstrap": {
|
||||||
"@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7"
|
"@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7"
|
||||||
},
|
},
|
||||||
"el-table-infinite-scroll": {
|
|
||||||
"vue": "^3.5.21"
|
|
||||||
},
|
|
||||||
"storybook": "$storybook",
|
"storybook": "$storybook",
|
||||||
"vite": "npm:rolldown-vite@latest"
|
"vite": "npm:rolldown-vite@latest"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {ref, onMounted, onUnmounted, onUpdated, watch, withDefaults} from "vue";
|
import {ref, onMounted, onUnmounted, onUpdated, watch} from "vue";
|
||||||
|
|
||||||
const props = withDefaults(defineProps<{
|
const props = withDefaults(defineProps<{
|
||||||
showSelection?: boolean;
|
showSelection?: boolean;
|
||||||
|
|||||||
@@ -172,6 +172,7 @@ kestra:
|
|||||||
- "/api/v1/main/executions/webhook/"
|
- "/api/v1/main/executions/webhook/"
|
||||||
liveness:
|
liveness:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
termination-grace-period: 5s
|
||||||
service:
|
service:
|
||||||
purge:
|
purge:
|
||||||
initial-delay: 1h
|
initial-delay: 1h
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ kestra:
|
|||||||
- "/api/v1/executions/webhook/"
|
- "/api/v1/executions/webhook/"
|
||||||
liveness:
|
liveness:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
termination-grace-period: 5s
|
||||||
service:
|
service:
|
||||||
purge:
|
purge:
|
||||||
initial-delay: 1h
|
initial-delay: 1h
|
||||||
|
|||||||
Reference in New Issue
Block a user