这是indexloc提供的服务,不要输入任何密码
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
237 commits
Select commit Hold shift + click to select a range
c8bd801
wip: no-op refactor
rakeshkky Aug 12, 2020
a2fc7c1
wip: make Metadata easily update-ably by moving types of list to hashmap
rakeshkky Aug 13, 2020
21fb31a
wip: all DDL queries now work on single metadata json blob
rakeshkky Aug 18, 2020
a939b47
wip: use MetadataModifier type everywhere
rakeshkky Aug 19, 2020
900eee0
schema syncing without table & start listener before schema cache build
rakeshkky Aug 21, 2020
1ae53ce
Merge branch 'master' into metadata-separation
rakeshkky Aug 25, 2020
5344120
wip: draft migration to metadata separation
rakeshkky Aug 25, 2020
7679853
[skip ci] wip: abstract metadata management into type class
rakeshkky Aug 27, 2020
0c0d74d
fix run_sql
rakeshkky Aug 28, 2020
f545252
Merge branch 'master' into metadata-separation
0x777 Aug 31, 2020
57a71b6
wip: better metadata storage abstraction
0x777 Sep 1, 2020
966f9ac
wip
0x777 Sep 2, 2020
7b7ee8e
improve catalog migration
rakeshkky Sep 3, 2020
82eaa4b
fix schema syncing
rakeshkky Sep 3, 2020
31b4434
add '/v1/metadata' and '/v2/query' endpoints
rakeshkky Sep 3, 2020
87e2f82
wip: with lots of undefineds
0x777 Sep 6, 2020
dbbf5b5
abstract async actions into a type class
rakeshkky Sep 4, 2020
ad64b93
Merge branch 'multiple-sources' into metadata-separation-multi-source
rakeshkky Sep 7, 2020
b14cb22
metadata version 3.0
rakeshkky Sep 7, 2020
be84310
cleanup schema generation
0x777 Sep 7, 2020
937f5d0
build schema across multiple sources
0x777 Sep 8, 2020
76e45d3
Merge branch 'multiple-sources' into metadata-separation-multi-source
0x777 Sep 8, 2020
59c81cf
cache building with sources & include source in metadata, schema obj ids
rakeshkky Sep 9, 2020
282ad79
fix missing instance definitions
0x777 Sep 9, 2020
2e74580
Merge remote-tracking branch 'rakesh/metadata-separation-multi-source…
0x777 Sep 9, 2020
af2adb9
trivial no-op refactor
rakeshkky Sep 9, 2020
26b5dfc
Support multi pg sources in metadata & refactor schema cache building
rakeshkky Sep 14, 2020
9c6da6d
cache build rule in 'RebuildableSchemaCache' is no more polymorphic o…
rakeshkky Sep 16, 2020
b797673
disabled /v1/query API
rakeshkky Sep 16, 2020
208a75c
clean up code related to old catalog
rakeshkky Sep 17, 2020
2571ce8
remove few warnings & comment unused code
rakeshkky Sep 17, 2020
9a92f5f
disable -Werror and haskell tests in ci
rakeshkky Sep 17, 2020
b3f1056
make haskell test suite compile
rakeshkky Sep 17, 2020
e8dd075
move table event triggers to hdb_catalog schema in user database
rakeshkky Sep 17, 2020
9846de5
add 'pg_drop_source' query type in metadata API
rakeshkky Sep 18, 2020
366a44c
support table event triggers on source databases dynamically.
rakeshkky Sep 21, 2020
29f0627
a minor fix to add_pg_source metadata API
rakeshkky Sep 21, 2020
0bf0331
Merge branch 'master' into metadata-separation-multi-source
rakeshkky Sep 23, 2020
2352b49
scheduled triggers abstraction
rakeshkky Sep 23, 2020
2a16a12
fix resolving source if it is initialised as metadata storage
rakeshkky Sep 24, 2020
cbf8342
move metadata storage abstractions to a single type class
rakeshkky Sep 24, 2020
300001d
fix node query root field in relay schema
rakeshkky Sep 24, 2020
26f5647
cache invalidations for sources, async abstractions no-op refactor
rakeshkky Sep 28, 2020
d701834
create dataSources dir, remove pgUtils, cleanup
Aug 24, 2020
c18f267
add postgres data source
Aug 26, 2020
676b411
modify fix
Aug 26, 2020
6010d25
add dropdown
Aug 26, 2020
35fe94b
extract postgres utilities
Aug 26, 2020
411b99c
move sql queries to postgres module
Aug 26, 2020
6d359c9
small test fix
Aug 26, 2020
14895fd
clean up datat actions
Aug 26, 2020
f18048a
fix data types
Aug 26, 2020
672cea3
lint
Aug 26, 2020
f3dbfa2
lint
Aug 27, 2020
934eb29
fix array data type
Aug 27, 2020
9282ad8
clean up data utils
Aug 27, 2020
f92e561
simplify catalog query
Aug 27, 2020
f26adaf
handle create table in postgres module
Aug 27, 2020
a4e229e
lint
Aug 27, 2020
a160cb6
move more postgres utils to postgres module
Aug 28, 2020
747d8ee
type error
Aug 28, 2020
8214d6a
postgres service
Aug 30, 2020
6346276
fix fks
Aug 30, 2020
8dac8e0
modify fixes
Aug 30, 2020
0275993
fk fix
Aug 30, 2020
ec21674
refactor column modify
Aug 31, 2020
4a596b8
refactor column changes
Aug 31, 2020
7900e70
finish modify actions
Aug 31, 2020
5607393
refactor modify/utils
Aug 31, 2020
e309232
remove sql utils
Aug 31, 2020
5411707
add mysql service
Aug 31, 2020
5d46c82
fix unique constraint sql
Aug 31, 2020
3db9907
sql fixes
Aug 31, 2020
a7d1ab2
fix drop pk
Aug 31, 2020
84b5962
add metadata service
Aug 31, 2020
1985478
fix action type
Aug 31, 2020
85d6e00
metadata actions
Sep 1, 2020
a1a63a7
fix telemetry accidental change
Sep 1, 2020
5d4cf53
lint
Sep 1, 2020
100142b
remove unused var
Sep 1, 2020
1a35b2c
fix permissions, separate allowed queries
Sep 1, 2020
0599a0b
fix custom function link
Sep 1, 2020
5368a85
fetch function definition from db
Sep 2, 2020
de6cc4d
add new data sources ui (#8)
kolharsam Sep 2, 2020
1a9d30c
Custom functions refactor (#9)
Sep 2, 2020
b5c9c4a
remove usage of hdb_function_agg
Sep 2, 2020
93032bb
remove usage of hdb_roles
Sep 2, 2020
60de9c0
remove usage of hdb_catalog.remote_schemas
Sep 2, 2020
fe2394d
remove unused var
Sep 2, 2020
94d22ad
require metadata on start
Sep 3, 2020
823b94b
remove usage of hdb_remote_rel
Sep 3, 2020
8cede07
clean up selectors
Sep 3, 2020
f4eb4dd
pass headers
Sep 3, 2020
78a6e53
app component fix
Sep 3, 2020
5c3ee3b
refactor login validation
Sep 3, 2020
85b4072
don't fetch remote schema
Sep 3, 2020
353b8d8
remote schemas fixes
Sep 3, 2020
4eb0cae
fix allowed queries
Sep 4, 2020
c3612ec
mySQL methods (#10)
kolharsam Sep 4, 2020
7472310
mysql changes (#11)
kolharsam Sep 4, 2020
dc64817
fix views
Sep 4, 2020
1358f1e
tests
Sep 4, 2020
2a3d1d8
fix typos
Sep 4, 2020
81eba5e
remove usage of hdb_table
Sep 3, 2020
73b1352
test
Sep 5, 2020
0932b05
test 2
Sep 5, 2020
3f63b31
fix run_sql queries
Sep 5, 2020
e9831ec
add freqUsedColumns to Datasources
kolharsam Sep 4, 2020
ab86191
add where query to keys sql
Sep 4, 2020
eb3cfee
UI updates
Sep 5, 2020
2be5515
custom functions fix
Sep 5, 2020
0c18103
fetch fks
Sep 5, 2020
8ca7ee3
add is_ref_table_tracked
Sep 5, 2020
4ad3345
remove usage of hdb_foreign_key_constraint
Sep 6, 2020
b8a7da4
fix rel
Sep 6, 2020
f94d141
refactor query utils
kolharsam Sep 6, 2020
18de4f0
remove init queries
Sep 6, 2020
a3556e8
add mysql queries
Sep 6, 2020
bf61165
mysql utils
Sep 6, 2020
5828a8a
mysql data source api
Sep 6, 2020
8835400
move getRunSql to v1 query utils
Sep 7, 2020
138f698
cleanup
Sep 7, 2020
9f15c6e
lint
Sep 7, 2020
5854c26
metadata api
Sep 7, 2020
00844e5
add sources actions
Sep 7, 2020
d6cd674
add dropdown from env to add db ui
Sep 7, 2020
6278c4e
UI updates
Sep 7, 2020
f64aee8
add HasuraMetadataV3
Sep 7, 2020
9106fbf
make console work with both v2 and v3 metadata
Sep 7, 2020
64e54ea
pass source to metadata queries
Sep 7, 2020
4b7ab7d
pass source to queries
Sep 7, 2020
bb416f4
handle 'select' queries
Sep 7, 2020
870ce9f
fixes
Sep 7, 2020
b7de7af
add rel fix
Sep 7, 2020
99c1eea
track table fix
Sep 7, 2020
9896fa6
endpoints
Sep 8, 2020
157f23f
update get run sql func
Sep 8, 2020
eb58bf9
make console work with no schemas
Sep 8, 2020
a7233e2
fix routing
Sep 8, 2020
e4331db
fix layout
Sep 8, 2020
b439f84
lint
Sep 8, 2020
67df96e
fix delete fucntion
Sep 8, 2020
b1e624d
tests
Sep 8, 2020
f4b8182
update driver, schema and fetch info on data source change
Sep 8, 2020
21e0cdb
change data source from shchemas page
Sep 8, 2020
1c75bf7
permission summary fix
Sep 8, 2020
b72ee9f
fix relationships bug
Sep 8, 2020
14bf39a
minor actions bug fix
kolharsam Sep 8, 2020
750efb0
add new relationship UI within actions
kolharsam Sep 8, 2020
6df1e15
actions db fixes
Sep 8, 2020
6c13d79
actions ui fixes
Sep 8, 2020
8a57092
actions fixes
Sep 8, 2020
8018743
add confirmation on deletion of data sources (#19)
kolharsam Sep 9, 2020
8b415b7
add getAddRelationshipQuery (#20)
kolharsam Sep 9, 2020
eca4881
Integration work (#27)
Sep 21, 2020
5ab4ab0
UI Bug fixes (#28)
kolharsam Sep 22, 2020
fc9b431
minor ui changes
Sep 22, 2020
311b46b
fix create table
Sep 24, 2020
40e74ad
don't dispaly metadata db
Sep 24, 2020
bffb93d
filter sources
Sep 24, 2020
b6002c5
misc fixes
Sep 24, 2020
2863403
fix docker compose
Sep 24, 2020
4d77f7d
relationships fixes
Sep 24, 2020
b3053d7
redirect when switching dbs
Sep 24, 2020
686febd
fix tracking tables
Sep 24, 2020
7aa8b65
take care of schemaList
kolharsam Sep 22, 2020
26b2e69
make review corrections and add addintional info query
kolharsam Sep 23, 2020
1b348ce
add schemaList changes
kolharsam Sep 24, 2020
3fccf6d
add minor comment
kolharsam Sep 24, 2020
138ae4b
fix minor thing on about page
kolharsam Sep 24, 2020
af5acea
notes and small fixes
kolharsam Sep 24, 2020
04d2982
fix lint and format issues
kolharsam Sep 28, 2020
50fc5b2
fix run_sql not updating cache with altering table
rakeshkky Sep 29, 2020
f2565ac
move raising check violation error into haskell code
rakeshkky Oct 1, 2020
53b6576
Fix event triggers (#32)
Oct 1, 2020
ef485c1
event triggers fixes
Oct 2, 2020
611fd4d
add confirmation on deletion of data sources (#19)
kolharsam Sep 9, 2020
45e83f8
add and expose 'queryNeedsAdmin' function
rakeshkky Oct 5, 2020
8302796
console: bulk query fixes (#34)
kolharsam Oct 5, 2020
1c9123c
set new data source after delete
Oct 5, 2020
e1e49c5
Merge branch 'console-data-sources' of github.com:beerose/graphql-eng…
Oct 5, 2020
8cf43de
handle create table in separate api calls
Oct 5, 2020
ebff504
simplify migration call
Oct 6, 2020
7728594
improve metadata storage abstraction
rakeshkky Oct 6, 2020
74302ad
fix object type relationships field parsing in custom types payload
rakeshkky Oct 6, 2020
a95afbd
move invoking schema sync listening thread out of `runHGEServer`
rakeshkky Oct 6, 2020
9abff44
store source in url
Oct 6, 2020
da7cb31
fix sql and migrations paths
Oct 7, 2020
859fac3
misc fixes (#31)
kolharsam Oct 7, 2020
c99be25
update unsupported notes
Oct 7, 2020
fd13282
resolve fixme in DDL/ScheduledTrigger.hs
rakeshkky Oct 8, 2020
62b43ff
add 'pg_set_table_custom_fields' query type to /v1/metadata API
rakeshkky Oct 8, 2020
b439133
add abstractions to fetch cli/console state & invocation logs from me…
rakeshkky Oct 8, 2020
86ba6ab
avoid view hdb_catalog.hdb_cron_events_stats
rakeshkky Oct 8, 2020
e279678
integrate console state API
Oct 8, 2020
4f2ca90
actions fixes
Oct 8, 2020
2ae4996
cron triggers integration
Oct 8, 2020
5620a8c
cron triggers modify page
Oct 8, 2020
c53d856
custom field names fixes
Oct 12, 2020
0382772
'get_scheduled_events' & 'delete_scheduled_event' metadata query types
rakeshkky Oct 12, 2020
d8f2c81
custom types - fix 'description' isn't optional in object type
rakeshkky Oct 12, 2020
e984ca2
expose other functions/types in Server/SchemaUpdate.hs
rakeshkky Oct 12, 2020
fbba26b
resolve FIXMEs in Hasura.RQL.DDL.EventTrigger
rakeshkky Oct 12, 2020
f2e299e
add source to event trigger info
Oct 12, 2020
56ac4e4
added datasource to events info table
soorajshankar Oct 12, 2020
faa71fe
simplify event trigger source
Oct 12, 2020
4220c7d
checkout docker compose
Oct 12, 2020
b5e3983
display source name in action rel definiton
Oct 12, 2020
834352f
remove unused import
Oct 12, 2020
504b8d7
fix data loading
Oct 13, 2020
681daa2
untrack table fixes
Oct 13, 2020
c2c6081
remove usage of metadata v2 type
Oct 13, 2020
f39ba69
console: show logs tables (#36)
kolharsam Oct 13, 2020
d299835
minor changes
Oct 13, 2020
9bb3e1d
Merge branch 'console-data-sources' of github.com:beerose/graphql-eng…
Oct 13, 2020
d4818ff
support /v1/query; pg-client library support tx monad transformer
rakeshkky Oct 13, 2020
0dca1da
avoid '_pecPool' in 'PGExecCtx' type
rakeshkky Oct 13, 2020
a4b61d1
source selector on events page
Oct 13, 2020
3be5e47
avoid '_pecRunRepeatableRead' in 'PGExecCtx' type
rakeshkky Oct 14, 2020
54b1f80
Improve styling of db selector on events page
Oct 14, 2020
5401aea
fix bulk queries in `/v1/query'
rakeshkky Oct 14, 2020
3c10d35
implement 'setPreResolvedSource' in haskell test
rakeshkky Oct 14, 2020
a49b7df
direct access -- events (#38)
Oct 14, 2020
ca033ad
require source
Oct 15, 2020
75cb0cf
add getDatabaseUid to the MonadMetadataStorage typeclass
ecthiender Oct 16, 2020
9daa52c
make the listener thread cleanup optional in runHGEServer
ecthiender Oct 16, 2020
b9e3e8e
add getDatabaseUid to wrapped instances
ecthiender Oct 16, 2020
bc8eb90
make --database-url optional & backward compatibility to the same
rakeshkky Oct 16, 2020
0c6c6fb
Merge branch 'master' into metadata-separation-multi-source
rakeshkky Oct 16, 2020
3879815
Merge branch 'metadata-separation-multi-source' into console-data-sou…
Oct 20, 2020
1e46a77
post merge fixes
Oct 20, 2020
7e22a8f
Merge branch 'console-data-sources' of github.com:beerose/graphql-eng…
Oct 20, 2020
a1f7d20
fix events 404
Oct 21, 2020
8b8cc73
add the new queries to console code (#39)
kolharsam Oct 21, 2020
975eb6a
fix typo
Oct 21, 2020
a30d4a4
fix docker compose
Oct 21, 2020
c9b41bc
data sources fixes (#40)
kolharsam Oct 27, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions console/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
"import/prefer-default-export": "off",
"react/prop-types": "off",
"react/jsx-filename-extension": 0,
"no-restricted-syntax": "off",
"no-unused-vars": "off",
"camelcase": "off",
"no-param-reassign": "off",
Expand Down
18 changes: 5 additions & 13 deletions console/cypress/integration/api-explorer/graphql/spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,12 @@ export const createTestTable = () => {
// Enter the table name
cy.get(getElementFromAlias('tableName')).type('users');
// Set first column
cy.get(getElementFromAlias('column-0'))
.clear()
.type('id');
cy.get(getElementFromAlias('column-0')).clear().type('id');
tableColumnTypeSelector('col-type-0');
cy.get(getElementFromAlias('data_test_column_type_value_serial'))
.first()
.click();
cy.get(getElementFromAlias('column-1'))
.clear()
.type('name');
cy.get(getElementFromAlias('column-1')).clear().type('name');
tableColumnTypeSelector('col-type-1');
cy.get(getElementFromAlias('data_test_column_type_value_text'))
.first()
Expand Down Expand Up @@ -138,22 +134,18 @@ export const checkSub = () => {
};

export const delTestTable = () => {
cy.get('a')
.contains('Data')
.click();
cy.get('a').contains('Data').click();
// Go to the modify section of the table
cy.get(getElementFromAlias('users')).click();
cy.get(getElementFromAlias('table-modify')).click();
setPromptValue('users');
// Click on delete
cy.get(getElementFromAlias('delete-table')).click();
// Confirm
cy.window()
.its('prompt')
.should('be.called');
cy.window().its('prompt').should('be.called');
cy.wait(5000);
// Match the URL
cy.url().should('eq', `${baseUrl}/data/schema/public`);
cy.url().should('eq', `${baseUrl}/data/schema`);
// Validate
validateCT('users', ResultType.FAILURE);
};
14 changes: 4 additions & 10 deletions console/cypress/integration/data/create-table/spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ export const failCTDuplicateColumns = () => {

export const failCTWrongDefaultValue = () => {
// Set second column
cy.get(getElementFromAlias('column-1'))
.clear()
.type(getColName(1));
cy.get(getElementFromAlias('column-1')).clear().type(getColName(1));
tableColumnTypeSelector('col-type-1');
cy.get(getElementFromAlias('data_test_column_type_value_integer'))
.first()
Expand All @@ -94,9 +92,7 @@ export const failCTWrongDefaultValue = () => {

export const passCT = () => {
// Set second column
cy.get(getElementFromAlias('column-1'))
.clear()
.type(getColName(1));
cy.get(getElementFromAlias('column-1')).clear().type(getColName(1));
tableColumnTypeSelector('col-type-1');
cy.get(getElementFromAlias('data_test_column_type_value_text'))
.first()
Expand Down Expand Up @@ -212,9 +208,7 @@ const deleteTable = (tableName: string) => {
// Click on delete
cy.get(getElementFromAlias('delete-table')).click();
// Confirm
cy.window()
.its('prompt')
.should('be.called');
cy.window().its('prompt').should('be.called');

cy.wait(5000);
validateCT(tableName, ResultType.FAILURE);
Expand All @@ -229,7 +223,7 @@ export const deleteCTTestTables = () => {
deleteTable(firstTableName);

// Match the URL
cy.url().should('eq', `${baseUrl}/data/schema/public`);
cy.url().should('eq', `${baseUrl}/data/schema`);
};

export const setValidationMetaData = () => {
Expand Down
23 changes: 13 additions & 10 deletions console/cypress/integration/data/insert-browse/spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -213,14 +213,14 @@ export const checkPagination = () => {
cy.get('.-totalPages').contains('3');
// Check if the default value of rows displayed is 10
cy.get('.-pageSizeOptions > select').should('have.value', '10');
cy.get('.-next > button').click();
cy.get('.-next > button').click({ force: true });
cy.wait(3000);
// Check if the page changed
cy.get(
'.rt-tbody > div:nth-child(1) > div > div:nth-child(3) > div'
).contains('11');
cy.get('.-pageJump > input').should('have.value', '2');
cy.get('.-previous > button').click();
cy.get('.-previous > button').click({ force: true });
cy.wait(3000);
// Check if the page changed
cy.get('.-pageJump > input').should('have.value', '1');
Expand All @@ -235,10 +235,13 @@ export const passBISort = (order: string) => {
cy.wait(7000);
// Select column with type 'serial'
const serialIndex = dataTypes.indexOf('serial');
cy.get(getElementFromAlias('sort-column-0')).select(getColName(serialIndex));
cy.get(getElementFromAlias('sort-column-0')).select(getColName(serialIndex), {
force: true,
});
// Select order as `descending`
cy.get(getElementFromAlias('sort-order-0')).select(
order === 'asc' ? 'Asc' : 'Desc'
order === 'asc' ? 'Asc' : 'Desc',
{ force: true }
);
// Run query
cy.get(getElementFromAlias('run-query')).click();
Expand All @@ -247,7 +250,7 @@ export const passBISort = (order: string) => {
checkOrder(order);

// Clear filter
cy.get(getElementFromAlias('clear-sorts-0')).click();
cy.get(getElementFromAlias('clear-sorts-0')).click({ force: true });
// Run query
cy.get(getElementFromAlias('run-query')).click();
cy.wait(5000);
Expand Down Expand Up @@ -286,7 +289,7 @@ export const deleteBITestTable = () => {
cy.window().its('prompt').should('be.called');
cy.wait(7000);
// Match the URL
cy.url().should('eq', `${baseUrl}/data/schema/public`);
cy.url().should('eq', `${baseUrl}/data/schema`);
validateCT(getTableName(2, testName), ResultType.FAILURE);

cy.get(getElementFromAlias(getTableName(1, testName))).click();
Expand All @@ -300,7 +303,7 @@ export const deleteBITestTable = () => {
cy.window().its('prompt').should('be.called');
cy.wait(7000);
// Match the URL
cy.url().should('eq', `${baseUrl}/data/schema/public`);
cy.url().should('eq', `${baseUrl}/data/schema`);
validateCT(getTableName(1, testName), ResultType.FAILURE);

cy.get(getElementFromAlias(getTableName(0, testName))).click();
Expand All @@ -315,7 +318,7 @@ export const deleteBITestTable = () => {
cy.wait(7000);

// Match the URL
cy.url().should('eq', `${baseUrl}/data/schema/public`);
cy.url().should('eq', `${baseUrl}/data/schema`);
validateCT(getTableName(0, testName), ResultType.FAILURE);
};

Expand Down Expand Up @@ -501,12 +504,12 @@ export const passArrayDataType = () => {

// insert new row
cy.get(getElementFromAlias('table-insert-rows')).click();
cy.wait(1000);
cy.wait(5000);
cy.get(getElementFromAlias('typed-input-11')).type('["a", "b"]');
cy.get(getElementFromAlias('insert-save-button')).click();

// go to browse rows and check if row was added
cy.get(getElementFromAlias('table-browse-rows')).click();
cy.wait(1000);
cy.wait(5000);
cy.get(getElementFromAlias('table-browse-rows')).contains('(9)');
};
2 changes: 1 addition & 1 deletion console/cypress/integration/data/modify/spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ export const passMTDeleteTable = () => {
cy.get(getElementFromAlias('delete-table')).click();
cy.window().its('prompt').should('be.called');
cy.wait(5000);
cy.url().should('eq', `${baseUrl}/data/schema/public`);
cy.url().should('eq', `${baseUrl}/data/schema`);
validateCT(getTableName(0, testName), ResultType.FAILURE);
};

Expand Down
22 changes: 6 additions & 16 deletions console/cypress/integration/events/create-trigger/spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,13 @@ export const passCT = () => {
cy.get(getElementFromAlias('delete-operation')).check();

// webhook url
cy.get(getElementFromAlias('webhook-input'))
.clear()
.type(getWebhookURL());
cy.get(getElementFromAlias('webhook-input')).clear().type(getWebhookURL());

// advanced settings
cy.get(getElementFromAlias('advanced-settings')).click();

// retry configuration
cy.get(getElementFromAlias('no-of-retries'))
.clear()
.type(getNoOfRetries());
cy.get(getElementFromAlias('no-of-retries')).clear().type(getNoOfRetries());
cy.get(getElementFromAlias('interval-seconds'))
.clear()
.type(getIntervalSeconds());
Expand Down Expand Up @@ -151,9 +147,7 @@ export const failCTDuplicateTrigger = () => {
cy.get(getElementFromAlias('delete-operation')).check();

// webhook url
cy.get(getElementFromAlias('webhook-input'))
.clear()
.type(getWebhookURL());
cy.get(getElementFromAlias('webhook-input')).clear().type(getWebhookURL());

// click on create
cy.get(getElementFromAlias('trigger-create')).click();
Expand Down Expand Up @@ -191,9 +185,7 @@ export const deleteCTTestTrigger = () => {
// Click on delete
cy.get(getElementFromAlias('delete-trigger')).click();
// Confirm
cy.window()
.its('prompt')
.should('be.called');
cy.window().its('prompt').should('be.called');
cy.wait(7000);
// Match the URL
cy.url().should('eq', `${baseUrl}${EVENT_TRIGGER_INDEX_ROUTE}/manage`);
Expand All @@ -209,12 +201,10 @@ export const deleteCTTestTable = () => {
setPromptValue(getTableName(0, testName));
cy.get(getElementFromAlias('delete-table')).click();
// Confirm
cy.window()
.its('prompt')
.should('be.called');
cy.window().its('prompt').should('be.called');
cy.wait(7000);
// Match the URL
cy.url().should('eq', `${baseUrl}/data/schema/public`);
cy.url().should('eq', `${baseUrl}/data/schema`);
// Validate
validateCT(getTableName(0, testName), ResultType.FAILURE);
};
Expand Down
Loading