Improvements for migrations (#2556)
* Fix wrong var name * Add is null is not null filtering on dates * Simplify
This commit is contained in:
@ -18,7 +18,7 @@ export const useCurrentUserTaskCount = () => {
|
|||||||
objectNamePlural: 'activitiesV2',
|
objectNamePlural: 'activitiesV2',
|
||||||
filter: {
|
filter: {
|
||||||
type: { equals: ActivityType.Task },
|
type: { equals: ActivityType.Task },
|
||||||
completedAt: { equals: null },
|
completedAt: { eq: null },
|
||||||
...(currentUser
|
...(currentUser
|
||||||
? turnFilterIntoWhereClause({
|
? turnFilterIntoWhereClause({
|
||||||
fieldMetadataId: 'assigneeId',
|
fieldMetadataId: 'assigneeId',
|
||||||
|
|||||||
@ -29,7 +29,7 @@ export const useTasks = (entity?: ActivityTargetableEntity) => {
|
|||||||
skip: !entity && !selectedFilter,
|
skip: !entity && !selectedFilter,
|
||||||
filter: {
|
filter: {
|
||||||
type: { equals: 'Task' },
|
type: { equals: 'Task' },
|
||||||
completedAt: { not: { equals: null } },
|
completedAt: { neq: null },
|
||||||
...whereFilters,
|
...whereFilters,
|
||||||
},
|
},
|
||||||
orderBy: [
|
orderBy: [
|
||||||
@ -44,7 +44,7 @@ export const useTasks = (entity?: ActivityTargetableEntity) => {
|
|||||||
skip: !entity && !selectedFilter,
|
skip: !entity && !selectedFilter,
|
||||||
filter: {
|
filter: {
|
||||||
type: { equals: 'Task' },
|
type: { equals: 'Task' },
|
||||||
completedAt: { equals: null },
|
completedAt: { eq: null },
|
||||||
...whereFilters,
|
...whereFilters,
|
||||||
},
|
},
|
||||||
orderBy: [
|
orderBy: [
|
||||||
|
|||||||
@ -45,7 +45,7 @@ export const SettingsDevelopersApiKeys = () => {
|
|||||||
const [apiKeys, setApiKeys] = useState<Array<ApiFieldItem>>([]);
|
const [apiKeys, setApiKeys] = useState<Array<ApiFieldItem>>([]);
|
||||||
useFindManyObjectRecords({
|
useFindManyObjectRecords({
|
||||||
objectNamePlural: 'apiKeysV2',
|
objectNamePlural: 'apiKeysV2',
|
||||||
/*filter: { revokedAt: { eq: null } },*/
|
filter: { revokedAt: { eq: null } },
|
||||||
onCompleted: (data) => {
|
onCompleted: (data) => {
|
||||||
setApiKeys(
|
setApiKeys(
|
||||||
formatExpirations(
|
formatExpirations(
|
||||||
|
|||||||
@ -150,9 +150,13 @@ export class WorkspaceQueryRunnerService {
|
|||||||
)};
|
)};
|
||||||
`);
|
`);
|
||||||
|
|
||||||
|
const queryFormatted = query
|
||||||
|
.replace('neq:null', 'is:NOT_NULL')
|
||||||
|
.replace('eq:null', 'is:NULL');
|
||||||
|
|
||||||
const results = await workspaceDataSource?.query<PGGraphQLResult>(`
|
const results = await workspaceDataSource?.query<PGGraphQLResult>(`
|
||||||
SELECT graphql.resolve($$
|
SELECT graphql.resolve($$
|
||||||
${query}
|
${queryFormatted}
|
||||||
$$);
|
$$);
|
||||||
`);
|
`);
|
||||||
|
|
||||||
|
|||||||
@ -6,6 +6,7 @@ export const DateFilterType = new GraphQLInputObjectType({
|
|||||||
name: 'DateFilter',
|
name: 'DateFilter',
|
||||||
fields: {
|
fields: {
|
||||||
eq: { type: DateScalarType },
|
eq: { type: DateScalarType },
|
||||||
|
is: { type: DateScalarType },
|
||||||
gt: { type: DateScalarType },
|
gt: { type: DateScalarType },
|
||||||
gte: { type: DateScalarType },
|
gte: { type: DateScalarType },
|
||||||
in: { type: new GraphQLList(new GraphQLNonNull(DateScalarType)) },
|
in: { type: new GraphQLList(new GraphQLNonNull(DateScalarType)) },
|
||||||
|
|||||||
Reference in New Issue
Block a user