From 6cbc502ce6361e6a3a4408006784f35e7dd7a74f Mon Sep 17 00:00:00 2001 From: Oleksandra Kalinina <946369+korel-san@users.noreply.github.com> Date: Wed, 22 Feb 2023 10:32:20 +0200 Subject: [PATCH] feature #177 Create component search with custom filter tokens --- cypress/fixtures/example.json | 5 +++ cypress/support/commands.js | 25 ++++++++++++++ cypress/support/e2e.js | 20 +++++++++++ package-lock.json | 6 ---- package.json | 1 - ui/cypress/e2e/main-tests-spec.cy.ts | 7 ++-- ui/jest.config.js | 12 ++++++- ui/package-lock.json | 1 + ui/package.json | 1 + .../src/lib/core/models/public-api.ts | 17 ---------- .../spline-api/src/lib/core/public-api.ts | 18 ---------- .../src/lib/core/spline-api-core.module.ts | 26 -------------- .../operation-property/expression/index.ts | 17 ---------- .../entities/operation-property/index.ts | 17 ---------- .../models/entities/operation/index.ts | 17 ---------- .../src/lib/execution-event/models/index.ts | 17 ---------- .../lib/execution-event/models/public-api.ts | 17 ---------- .../src/lib/execution-event/public-api.ts | 19 ----------- .../spline-api-execution-event.module.ts | 34 ------------------- .../attribute-lineage.models.ts | 0 .../attribute-linieage-node.models.ts | 0 .../attribute-lineage}/index.ts | 0 .../attribute-lineage/public-api.ts | 0 .../attribute/attribute-data-type.models.ts | 0 .../attribute/attribute-dt-type.models.ts | 0 .../attribute/attribute-schema.models.ts | 0 .../attribute/attribute-search.models.ts | 0 .../models => models/attribute}/index.ts | 0 .../attribute/public-api.ts | 0 .../consumer-api-settings.models.ts | 0 .../data-source/data-source-info.models.ts | 0 .../data-source}/index.ts | 0 .../data-source/public-api.ts | 0 .../execution-event-lineage-list.models.ts | 0 ...xecution-event-lineage-node-type.models.ts | 0 .../execution-event-lineage-node.models.ts | 0 ...execution-event-lineage-overview.models.ts | 0 .../execution-event-overview}/index.ts | 0 .../execution-event-overview/public-api.ts | 0 .../execution-event/execution-event.models.ts | 0 .../execution-events-list.models.ts | 0 .../execution-events-query.models.ts | 0 .../execution-event}/index.ts | 0 .../execution-event/public-api.ts | 0 .../__tests__/execution-plan.models.spec.ts | 0 .../execution-plan-lineage-overview.models.ts | 0 .../execution-plan/execution-plan.models.ts | 0 .../execution-plan}/index.ts | 0 .../execution-plan/public-api.ts | 0 .../index.ts | 0 .../lineage}/index.ts | 0 .../lineage/lineage-node-link.models.ts | 0 .../lineage/lineage-node.models.ts | 0 .../lineage/lineage.models.ts | 0 .../entities => models}/lineage/public-api.ts | 0 .../operation-attribute-lineage}/index.ts | 0 ...operation-attribute-lineage-type.models.ts | 0 .../operation-attribute-lineage.models.ts | 0 ...peration-attribute-linieage-node.models.ts | 0 .../operation-attribute-lineage/public-api.ts | 0 .../operation-property/expression}/index.ts | 0 .../expression/op-expression-type.models.ts | 0 .../expression/op-expression.models.ts | 0 .../expression/public-api.ts | 0 .../operation-property}/index.ts | 0 .../operation-properties.models.ts | 0 .../operation-property/public-api.ts | 0 .../operation}/index.ts | 0 .../operation/operation-details.models.ts | 0 .../operation/operation-type.models.ts | 0 .../operation/operation.models.ts | 0 .../operation/public-api.ts | 0 .../models/entities => models}/public-api.ts | 3 +- ui/projects/spline-api/src/lib/public-api.ts | 4 +-- .../services/attribute-api.service.ts | 0 .../services/base-api.service.ts | 3 +- .../services/execution-event-api.service.ts | 0 .../services/execution-plan-api.service.ts | 0 .../{execution-event => }/services/index.ts | 0 .../services/label-api.service.ts | 0 .../services/public-api.ts | 0 .../spline-data-source-api.service.ts | 0 .../spline-api/src/lib/spline-api.module.ts | 10 +++--- .../spline-common/dynamic-filter/package.json | 3 +- .../spline-date-range-filter.component.ts | 4 --- .../spline-date-range-filter.module.ts | 2 +- ...spline-search-box-with-filter.component.ts | 6 ++-- ui/projects/spline-common/package.json | 5 +-- .../src/spline-attributes-shared.module.ts | 13 ++++--- ...ine-search-dynamic-table.component.spec.ts | 18 +++++++--- .../spline-search-dynamic-table.component.ts | 31 ++++++++++++++++- .../spline-shared/dynamic-table/package.json | 3 +- ui/src/app/app.module.ts | 2 -- ui/src/modules/plans/spline-plans.module.ts | 11 +++--- 94 files changed, 140 insertions(+), 255 deletions(-) create mode 100644 cypress/fixtures/example.json create mode 100644 cypress/support/commands.js create mode 100644 cypress/support/e2e.js delete mode 100644 package-lock.json delete mode 100644 package.json delete mode 100644 ui/projects/spline-api/src/lib/core/models/public-api.ts delete mode 100644 ui/projects/spline-api/src/lib/core/public-api.ts delete mode 100644 ui/projects/spline-api/src/lib/core/spline-api-core.module.ts delete mode 100644 ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/expression/index.ts delete mode 100644 ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/index.ts delete mode 100644 ui/projects/spline-api/src/lib/execution-event/models/entities/operation/index.ts delete mode 100644 ui/projects/spline-api/src/lib/execution-event/models/index.ts delete mode 100644 ui/projects/spline-api/src/lib/execution-event/models/public-api.ts delete mode 100644 ui/projects/spline-api/src/lib/execution-event/public-api.ts delete mode 100644 ui/projects/spline-api/src/lib/execution-event/spline-api-execution-event.module.ts rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/attribute-lineage/attribute-lineage.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/attribute-lineage/attribute-linieage-node.models.ts (100%) rename ui/projects/spline-api/src/lib/{core => models/attribute-lineage}/index.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/attribute-lineage/public-api.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/attribute/attribute-data-type.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/attribute/attribute-dt-type.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/attribute/attribute-schema.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/attribute/attribute-search.models.ts (100%) rename ui/projects/spline-api/src/lib/{core/models => models/attribute}/index.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/attribute/public-api.ts (100%) rename ui/projects/spline-api/src/lib/{core/models => models/consumer-api-settings}/consumer-api-settings.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/data-source/data-source-info.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event => models/data-source}/index.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/data-source/public-api.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/execution-event-overview/execution-event-lineage-list.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/execution-event-overview/execution-event-lineage-node-type.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/execution-event-overview/execution-event-lineage-node.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/execution-event-overview/execution-event-lineage-overview.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities/attribute-lineage => models/execution-event-overview}/index.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/execution-event-overview/public-api.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/execution-event/execution-event.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/execution-event/execution-events-list.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/execution-event/execution-events-query.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities/attribute => models/execution-event}/index.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/execution-event/public-api.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/execution-plan/__tests__/execution-plan.models.spec.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/execution-plan/execution-plan-lineage-overview.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/execution-plan/execution-plan.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities/data-source => models/execution-plan}/index.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/execution-plan/public-api.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities/execution-event-overview => models}/index.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities/execution-event => models/lineage}/index.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/lineage/lineage-node-link.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/lineage/lineage-node.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/lineage/lineage.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/lineage/public-api.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities/execution-plan => models/operation-attribute-lineage}/index.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/operation-attribute-lineage/operation-attribute-lineage-type.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/operation-attribute-lineage/operation-attribute-lineage.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/operation-attribute-lineage/operation-attribute-linieage-node.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/operation-attribute-lineage/public-api.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models/operation-property/expression}/index.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/operation-property/expression/op-expression-type.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/operation-property/expression/op-expression.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/operation-property/expression/public-api.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities/lineage => models/operation-property}/index.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/operation-property/operation-properties.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/operation-property/public-api.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities/operation-attribute-lineage => models/operation}/index.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/operation/operation-details.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/operation/operation-type.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/operation/operation.models.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/operation/public-api.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event/models/entities => models}/public-api.ts (90%) rename ui/projects/spline-api/src/lib/{execution-event => }/services/attribute-api.service.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event => }/services/base-api.service.ts (94%) rename ui/projects/spline-api/src/lib/{execution-event => }/services/execution-event-api.service.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event => }/services/execution-plan-api.service.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event => }/services/index.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event => }/services/label-api.service.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event => }/services/public-api.ts (100%) rename ui/projects/spline-api/src/lib/{execution-event => }/services/spline-data-source-api.service.ts (100%) diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json new file mode 100644 index 00000000..02e42543 --- /dev/null +++ b/cypress/fixtures/example.json @@ -0,0 +1,5 @@ +{ + "name": "Using fixtures to represent data", + "email": "hello@cypress.io", + "body": "Fixtures are a great way to mock data for responses to routes" +} diff --git a/cypress/support/commands.js b/cypress/support/commands.js new file mode 100644 index 00000000..66ea16ef --- /dev/null +++ b/cypress/support/commands.js @@ -0,0 +1,25 @@ +// *********************************************** +// This example commands.js shows you how to +// create various custom commands and overwrite +// existing commands. +// +// For more comprehensive examples of custom +// commands please read more here: +// https://on.cypress.io/custom-commands +// *********************************************** +// +// +// -- This is a parent command -- +// Cypress.Commands.add('login', (email, password) => { ... }) +// +// +// -- This is a child command -- +// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... }) +// +// +// -- This is a dual command -- +// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... }) +// +// +// -- This will overwrite an existing command -- +// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... }) \ No newline at end of file diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js new file mode 100644 index 00000000..0e7290a1 --- /dev/null +++ b/cypress/support/e2e.js @@ -0,0 +1,20 @@ +// *********************************************************** +// This example support/e2e.js is processed and +// loaded automatically before your test files. +// +// This is a great place to put global configuration and +// behavior that modifies Cypress. +// +// You can change the location of this file or turn off +// automatically serving support files with the +// 'supportFile' configuration option. +// +// You can read more here: +// https://on.cypress.io/configuration +// *********************************************************** + +// Import commands.js using ES2015 syntax: +import './commands' + +// Alternatively you can use CommonJS syntax: +// require('./commands') \ No newline at end of file diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index b0946bd5..00000000 --- a/package-lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "spline-ui", - "lockfileVersion": 2, - "requires": true, - "packages": {} -} diff --git a/package.json b/package.json deleted file mode 100644 index 0967ef42..00000000 --- a/package.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/ui/cypress/e2e/main-tests-spec.cy.ts b/ui/cypress/e2e/main-tests-spec.cy.ts index 98a42284..0f4b0500 100644 --- a/ui/cypress/e2e/main-tests-spec.cy.ts +++ b/ui/cypress/e2e/main-tests-spec.cy.ts @@ -46,7 +46,7 @@ describe('Main Tests', () => { cy.get('ngx-daterangepicker-material .ranges .ng-star-inserted:nth-child(5) button').click() cy.get('ngx-daterangepicker-material .buttons_input button.btn:nth-child(3)') .should('contain.text', 'Apply').click() - cy.get('mat-table mat-row').should('have.length.lessThan', 10) + cy.get('mat-table mat-row').should('have.length.lessThan', 11) cy.get('ngx-daterangepicker-material').should('exist') }) @@ -66,11 +66,12 @@ describe('Main Tests', () => { describe('Issue: On event-overview page', () => { it('back button should restore the state of the previous page', () => { cy.visit('/') - cy.get('mat-row:nth-child(9) .link').first().click() + cy.get('mat-row:nth-child(7) .link').first().click() + cy.wait(1000) cy.get('sg-overview-control button').last().click() cy.wait(1000) cy.get('ngx-graph .node-group:nth-child(3)').click() - cy.get('.spline-card-header__title').should('contain.text', 'my-other-job-output') + cy.get('.spline-card-header__title').should('contain.text', 'otherJobResults') cy.get('spline-data-widget .spline-data-record__value a').last().click() cy.get('h2.text-center').should('contain.text', 'Data Source State History') cy.go('back') diff --git a/ui/jest.config.js b/ui/jest.config.js index fb3be600..5ff3d3b0 100644 --- a/ui/jest.config.js +++ b/ui/jest.config.js @@ -21,9 +21,16 @@ module.exports = { '/setup-jest.ts' ], 'rootDir': __dirname, + 'testPathIgnorePatterns': [ + 'projects/spline-shared/dynamic-table/main/src/components/search-dynamic-table/__tests__' + ], 'transformIgnorePatterns': [ 'node_modules/(?!@ngrx)' ], + // transform: { + // "^.+\\.jsx?$": "babel-jest", + // "^.+\\.mjs$": "babel-jest", + // }, 'testResultsProcessor': 'jest-teamcity-reporter', 'coverageReporters': [ 'text', @@ -33,6 +40,7 @@ module.exports = { ], 'coverageDirectory': 'target/coverage', 'moduleNameMapper': { + // '^ngx-daterangepicker-material$': __dirname + 'node_modules/ngx-daterangepicker-material/fesm2015/ngx-daterangepicker-material.mjs', '^lodash-es$': __dirname + '/node_modules/lodash/index.js', '/spline-api/': __dirname + '/projects/spline-api/src/public-api', '^spline-api$': __dirname + '/projects/spline-api/src/public-api', @@ -44,6 +52,8 @@ module.exports = { '^spline-common\/graph$': __dirname + '/projects/spline-common/graph/src/public-api', '/spline-common\/layout/': __dirname + '/projects/spline-common/layout/src/public-api', '^spline-common\/layout$': __dirname + '/projects/spline-common/layout/src/public-api', + '/spline-common\/main/': __dirname + '/projects/spline-common/main/src/public-api', + '^spline-common\/main': __dirname + '/projects/spline-common/main/src/public-api', '/spline-common\/dynamic-table/': __dirname + '/projects/spline-common/dynamic-table/src/public-api', '^spline-common\/dynamic-table$': __dirname + '/projects/spline-common/dynamic-table/src/public-api', '/spline-common\/dynamic-filter\/filter-controls/': __dirname + '/projects/spline-common/dynamic-filter/filter-controls/src/public-api', @@ -72,7 +82,7 @@ module.exports = { 'resolver': null, 'globals': { 'ts-jest': { - tsConfig: '/tsconfig.spec.json' + tsconfig: '/tsconfig.spec.json' } } }; diff --git a/ui/package-lock.json b/ui/package-lock.json index 33065aa1..4ac93615 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -65,6 +65,7 @@ "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "^4.28.2", "@typescript-eslint/parser": "^4.28.2", + "babel-jest": "^27.5.1", "codelyzer": "^6.0.0", "cypress": "^12.5.1", "eslint": "^7.26.0", diff --git a/ui/package.json b/ui/package.json index 1f8e6890..661aacab 100644 --- a/ui/package.json +++ b/ui/package.json @@ -97,6 +97,7 @@ "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "^4.28.2", "@typescript-eslint/parser": "^4.28.2", + "babel-jest": "^27.5.1", "codelyzer": "^6.0.0", "cypress": "^12.5.1", "eslint": "^7.26.0", diff --git a/ui/projects/spline-api/src/lib/core/models/public-api.ts b/ui/projects/spline-api/src/lib/core/models/public-api.ts deleted file mode 100644 index aaf9b76f..00000000 --- a/ui/projects/spline-api/src/lib/core/models/public-api.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2021 ABSA Group Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export * from './consumer-api-settings.models' diff --git a/ui/projects/spline-api/src/lib/core/public-api.ts b/ui/projects/spline-api/src/lib/core/public-api.ts deleted file mode 100644 index 924ec010..00000000 --- a/ui/projects/spline-api/src/lib/core/public-api.ts +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2020 ABSA Group Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export * from './models/public-api' -export * from './spline-api-core.module' diff --git a/ui/projects/spline-api/src/lib/core/spline-api-core.module.ts b/ui/projects/spline-api/src/lib/core/spline-api-core.module.ts deleted file mode 100644 index 9693950b..00000000 --- a/ui/projects/spline-api/src/lib/core/spline-api-core.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2020 ABSA Group Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { NgModule } from '@angular/core' - - -@NgModule({ - declarations: [], - imports: [], - exports: [] -}) -export class SplineApiCoreModule { -} diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/expression/index.ts b/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/expression/index.ts deleted file mode 100644 index bae44076..00000000 --- a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/expression/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2020 ABSA Group Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export * from './public-api' diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/index.ts b/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/index.ts deleted file mode 100644 index bae44076..00000000 --- a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2020 ABSA Group Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export * from './public-api' diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation/index.ts b/ui/projects/spline-api/src/lib/execution-event/models/entities/operation/index.ts deleted file mode 100644 index bae44076..00000000 --- a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2020 ABSA Group Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export * from './public-api' diff --git a/ui/projects/spline-api/src/lib/execution-event/models/index.ts b/ui/projects/spline-api/src/lib/execution-event/models/index.ts deleted file mode 100644 index bae44076..00000000 --- a/ui/projects/spline-api/src/lib/execution-event/models/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2020 ABSA Group Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export * from './public-api' diff --git a/ui/projects/spline-api/src/lib/execution-event/models/public-api.ts b/ui/projects/spline-api/src/lib/execution-event/models/public-api.ts deleted file mode 100644 index 76980ab5..00000000 --- a/ui/projects/spline-api/src/lib/execution-event/models/public-api.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2020 ABSA Group Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export * from './entities/public-api' diff --git a/ui/projects/spline-api/src/lib/execution-event/public-api.ts b/ui/projects/spline-api/src/lib/execution-event/public-api.ts deleted file mode 100644 index 89bd0e6c..00000000 --- a/ui/projects/spline-api/src/lib/execution-event/public-api.ts +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2020 ABSA Group Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export * from './models/public-api' -export * from './services/public-api' -export * from './spline-api-execution-event.module' diff --git a/ui/projects/spline-api/src/lib/execution-event/spline-api-execution-event.module.ts b/ui/projects/spline-api/src/lib/execution-event/spline-api-execution-event.module.ts deleted file mode 100644 index d2e5400b..00000000 --- a/ui/projects/spline-api/src/lib/execution-event/spline-api-execution-event.module.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2020 ABSA Group Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { NgModule } from '@angular/core' - -import { SplineApiCoreModule } from '../core' - -import * as fromServices from './services' - -// TODO: Rename this module, due to not correspondent content to name convention -@NgModule({ - providers: [ - ...fromServices.commonServiceProvider - ], - imports: [ - SplineApiCoreModule - ], - exports: [] -}) -export class SplineApiExecutionEventModule { -} diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/attribute-lineage/attribute-lineage.models.ts b/ui/projects/spline-api/src/lib/models/attribute-lineage/attribute-lineage.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/attribute-lineage/attribute-lineage.models.ts rename to ui/projects/spline-api/src/lib/models/attribute-lineage/attribute-lineage.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/attribute-lineage/attribute-linieage-node.models.ts b/ui/projects/spline-api/src/lib/models/attribute-lineage/attribute-linieage-node.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/attribute-lineage/attribute-linieage-node.models.ts rename to ui/projects/spline-api/src/lib/models/attribute-lineage/attribute-linieage-node.models.ts diff --git a/ui/projects/spline-api/src/lib/core/index.ts b/ui/projects/spline-api/src/lib/models/attribute-lineage/index.ts similarity index 100% rename from ui/projects/spline-api/src/lib/core/index.ts rename to ui/projects/spline-api/src/lib/models/attribute-lineage/index.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/attribute-lineage/public-api.ts b/ui/projects/spline-api/src/lib/models/attribute-lineage/public-api.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/attribute-lineage/public-api.ts rename to ui/projects/spline-api/src/lib/models/attribute-lineage/public-api.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/attribute/attribute-data-type.models.ts b/ui/projects/spline-api/src/lib/models/attribute/attribute-data-type.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/attribute/attribute-data-type.models.ts rename to ui/projects/spline-api/src/lib/models/attribute/attribute-data-type.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/attribute/attribute-dt-type.models.ts b/ui/projects/spline-api/src/lib/models/attribute/attribute-dt-type.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/attribute/attribute-dt-type.models.ts rename to ui/projects/spline-api/src/lib/models/attribute/attribute-dt-type.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/attribute/attribute-schema.models.ts b/ui/projects/spline-api/src/lib/models/attribute/attribute-schema.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/attribute/attribute-schema.models.ts rename to ui/projects/spline-api/src/lib/models/attribute/attribute-schema.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/attribute/attribute-search.models.ts b/ui/projects/spline-api/src/lib/models/attribute/attribute-search.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/attribute/attribute-search.models.ts rename to ui/projects/spline-api/src/lib/models/attribute/attribute-search.models.ts diff --git a/ui/projects/spline-api/src/lib/core/models/index.ts b/ui/projects/spline-api/src/lib/models/attribute/index.ts similarity index 100% rename from ui/projects/spline-api/src/lib/core/models/index.ts rename to ui/projects/spline-api/src/lib/models/attribute/index.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/attribute/public-api.ts b/ui/projects/spline-api/src/lib/models/attribute/public-api.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/attribute/public-api.ts rename to ui/projects/spline-api/src/lib/models/attribute/public-api.ts diff --git a/ui/projects/spline-api/src/lib/core/models/consumer-api-settings.models.ts b/ui/projects/spline-api/src/lib/models/consumer-api-settings/consumer-api-settings.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/core/models/consumer-api-settings.models.ts rename to ui/projects/spline-api/src/lib/models/consumer-api-settings/consumer-api-settings.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/data-source/data-source-info.models.ts b/ui/projects/spline-api/src/lib/models/data-source/data-source-info.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/data-source/data-source-info.models.ts rename to ui/projects/spline-api/src/lib/models/data-source/data-source-info.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/index.ts b/ui/projects/spline-api/src/lib/models/data-source/index.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/index.ts rename to ui/projects/spline-api/src/lib/models/data-source/index.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/data-source/public-api.ts b/ui/projects/spline-api/src/lib/models/data-source/public-api.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/data-source/public-api.ts rename to ui/projects/spline-api/src/lib/models/data-source/public-api.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event-overview/execution-event-lineage-list.models.ts b/ui/projects/spline-api/src/lib/models/execution-event-overview/execution-event-lineage-list.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event-overview/execution-event-lineage-list.models.ts rename to ui/projects/spline-api/src/lib/models/execution-event-overview/execution-event-lineage-list.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event-overview/execution-event-lineage-node-type.models.ts b/ui/projects/spline-api/src/lib/models/execution-event-overview/execution-event-lineage-node-type.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event-overview/execution-event-lineage-node-type.models.ts rename to ui/projects/spline-api/src/lib/models/execution-event-overview/execution-event-lineage-node-type.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event-overview/execution-event-lineage-node.models.ts b/ui/projects/spline-api/src/lib/models/execution-event-overview/execution-event-lineage-node.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event-overview/execution-event-lineage-node.models.ts rename to ui/projects/spline-api/src/lib/models/execution-event-overview/execution-event-lineage-node.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event-overview/execution-event-lineage-overview.models.ts b/ui/projects/spline-api/src/lib/models/execution-event-overview/execution-event-lineage-overview.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event-overview/execution-event-lineage-overview.models.ts rename to ui/projects/spline-api/src/lib/models/execution-event-overview/execution-event-lineage-overview.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/attribute-lineage/index.ts b/ui/projects/spline-api/src/lib/models/execution-event-overview/index.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/attribute-lineage/index.ts rename to ui/projects/spline-api/src/lib/models/execution-event-overview/index.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event-overview/public-api.ts b/ui/projects/spline-api/src/lib/models/execution-event-overview/public-api.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event-overview/public-api.ts rename to ui/projects/spline-api/src/lib/models/execution-event-overview/public-api.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event/execution-event.models.ts b/ui/projects/spline-api/src/lib/models/execution-event/execution-event.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event/execution-event.models.ts rename to ui/projects/spline-api/src/lib/models/execution-event/execution-event.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event/execution-events-list.models.ts b/ui/projects/spline-api/src/lib/models/execution-event/execution-events-list.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event/execution-events-list.models.ts rename to ui/projects/spline-api/src/lib/models/execution-event/execution-events-list.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event/execution-events-query.models.ts b/ui/projects/spline-api/src/lib/models/execution-event/execution-events-query.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event/execution-events-query.models.ts rename to ui/projects/spline-api/src/lib/models/execution-event/execution-events-query.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/attribute/index.ts b/ui/projects/spline-api/src/lib/models/execution-event/index.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/attribute/index.ts rename to ui/projects/spline-api/src/lib/models/execution-event/index.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event/public-api.ts b/ui/projects/spline-api/src/lib/models/execution-event/public-api.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event/public-api.ts rename to ui/projects/spline-api/src/lib/models/execution-event/public-api.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-plan/__tests__/execution-plan.models.spec.ts b/ui/projects/spline-api/src/lib/models/execution-plan/__tests__/execution-plan.models.spec.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-plan/__tests__/execution-plan.models.spec.ts rename to ui/projects/spline-api/src/lib/models/execution-plan/__tests__/execution-plan.models.spec.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-plan/execution-plan-lineage-overview.models.ts b/ui/projects/spline-api/src/lib/models/execution-plan/execution-plan-lineage-overview.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-plan/execution-plan-lineage-overview.models.ts rename to ui/projects/spline-api/src/lib/models/execution-plan/execution-plan-lineage-overview.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-plan/execution-plan.models.ts b/ui/projects/spline-api/src/lib/models/execution-plan/execution-plan.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-plan/execution-plan.models.ts rename to ui/projects/spline-api/src/lib/models/execution-plan/execution-plan.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/data-source/index.ts b/ui/projects/spline-api/src/lib/models/execution-plan/index.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/data-source/index.ts rename to ui/projects/spline-api/src/lib/models/execution-plan/index.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-plan/public-api.ts b/ui/projects/spline-api/src/lib/models/execution-plan/public-api.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-plan/public-api.ts rename to ui/projects/spline-api/src/lib/models/execution-plan/public-api.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event-overview/index.ts b/ui/projects/spline-api/src/lib/models/index.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event-overview/index.ts rename to ui/projects/spline-api/src/lib/models/index.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event/index.ts b/ui/projects/spline-api/src/lib/models/lineage/index.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-event/index.ts rename to ui/projects/spline-api/src/lib/models/lineage/index.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/lineage/lineage-node-link.models.ts b/ui/projects/spline-api/src/lib/models/lineage/lineage-node-link.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/lineage/lineage-node-link.models.ts rename to ui/projects/spline-api/src/lib/models/lineage/lineage-node-link.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/lineage/lineage-node.models.ts b/ui/projects/spline-api/src/lib/models/lineage/lineage-node.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/lineage/lineage-node.models.ts rename to ui/projects/spline-api/src/lib/models/lineage/lineage-node.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/lineage/lineage.models.ts b/ui/projects/spline-api/src/lib/models/lineage/lineage.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/lineage/lineage.models.ts rename to ui/projects/spline-api/src/lib/models/lineage/lineage.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/lineage/public-api.ts b/ui/projects/spline-api/src/lib/models/lineage/public-api.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/lineage/public-api.ts rename to ui/projects/spline-api/src/lib/models/lineage/public-api.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/execution-plan/index.ts b/ui/projects/spline-api/src/lib/models/operation-attribute-lineage/index.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/execution-plan/index.ts rename to ui/projects/spline-api/src/lib/models/operation-attribute-lineage/index.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-attribute-lineage/operation-attribute-lineage-type.models.ts b/ui/projects/spline-api/src/lib/models/operation-attribute-lineage/operation-attribute-lineage-type.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/operation-attribute-lineage/operation-attribute-lineage-type.models.ts rename to ui/projects/spline-api/src/lib/models/operation-attribute-lineage/operation-attribute-lineage-type.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-attribute-lineage/operation-attribute-lineage.models.ts b/ui/projects/spline-api/src/lib/models/operation-attribute-lineage/operation-attribute-lineage.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/operation-attribute-lineage/operation-attribute-lineage.models.ts rename to ui/projects/spline-api/src/lib/models/operation-attribute-lineage/operation-attribute-lineage.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-attribute-lineage/operation-attribute-linieage-node.models.ts b/ui/projects/spline-api/src/lib/models/operation-attribute-lineage/operation-attribute-linieage-node.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/operation-attribute-lineage/operation-attribute-linieage-node.models.ts rename to ui/projects/spline-api/src/lib/models/operation-attribute-lineage/operation-attribute-linieage-node.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-attribute-lineage/public-api.ts b/ui/projects/spline-api/src/lib/models/operation-attribute-lineage/public-api.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/operation-attribute-lineage/public-api.ts rename to ui/projects/spline-api/src/lib/models/operation-attribute-lineage/public-api.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/index.ts b/ui/projects/spline-api/src/lib/models/operation-property/expression/index.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/index.ts rename to ui/projects/spline-api/src/lib/models/operation-property/expression/index.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/expression/op-expression-type.models.ts b/ui/projects/spline-api/src/lib/models/operation-property/expression/op-expression-type.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/expression/op-expression-type.models.ts rename to ui/projects/spline-api/src/lib/models/operation-property/expression/op-expression-type.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/expression/op-expression.models.ts b/ui/projects/spline-api/src/lib/models/operation-property/expression/op-expression.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/expression/op-expression.models.ts rename to ui/projects/spline-api/src/lib/models/operation-property/expression/op-expression.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/expression/public-api.ts b/ui/projects/spline-api/src/lib/models/operation-property/expression/public-api.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/expression/public-api.ts rename to ui/projects/spline-api/src/lib/models/operation-property/expression/public-api.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/lineage/index.ts b/ui/projects/spline-api/src/lib/models/operation-property/index.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/lineage/index.ts rename to ui/projects/spline-api/src/lib/models/operation-property/index.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/operation-properties.models.ts b/ui/projects/spline-api/src/lib/models/operation-property/operation-properties.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/operation-properties.models.ts rename to ui/projects/spline-api/src/lib/models/operation-property/operation-properties.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/public-api.ts b/ui/projects/spline-api/src/lib/models/operation-property/public-api.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/operation-property/public-api.ts rename to ui/projects/spline-api/src/lib/models/operation-property/public-api.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation-attribute-lineage/index.ts b/ui/projects/spline-api/src/lib/models/operation/index.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/operation-attribute-lineage/index.ts rename to ui/projects/spline-api/src/lib/models/operation/index.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation/operation-details.models.ts b/ui/projects/spline-api/src/lib/models/operation/operation-details.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/operation/operation-details.models.ts rename to ui/projects/spline-api/src/lib/models/operation/operation-details.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation/operation-type.models.ts b/ui/projects/spline-api/src/lib/models/operation/operation-type.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/operation/operation-type.models.ts rename to ui/projects/spline-api/src/lib/models/operation/operation-type.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation/operation.models.ts b/ui/projects/spline-api/src/lib/models/operation/operation.models.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/operation/operation.models.ts rename to ui/projects/spline-api/src/lib/models/operation/operation.models.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/operation/public-api.ts b/ui/projects/spline-api/src/lib/models/operation/public-api.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/operation/public-api.ts rename to ui/projects/spline-api/src/lib/models/operation/public-api.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/models/entities/public-api.ts b/ui/projects/spline-api/src/lib/models/public-api.ts similarity index 90% rename from ui/projects/spline-api/src/lib/execution-event/models/entities/public-api.ts rename to ui/projects/spline-api/src/lib/models/public-api.ts index 0293694f..5a802b82 100644 --- a/ui/projects/spline-api/src/lib/execution-event/models/entities/public-api.ts +++ b/ui/projects/spline-api/src/lib/models/public-api.ts @@ -1,5 +1,5 @@ /* - * Copyright 2020 ABSA Group Limited + * Copyright 2023 ABSA Group Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,3 +24,4 @@ export * from './execution-plan/public-api' export * from './lineage/public-api' export * from './operation/public-api' export * from './operation-property/public-api' +export * from './consumer-api-settings/consumer-api-settings.models' diff --git a/ui/projects/spline-api/src/lib/public-api.ts b/ui/projects/spline-api/src/lib/public-api.ts index 1ec0db9c..721d9946 100644 --- a/ui/projects/spline-api/src/lib/public-api.ts +++ b/ui/projects/spline-api/src/lib/public-api.ts @@ -15,5 +15,5 @@ */ export * from './spline-api.module' -export * from './core/public-api' -export * from './execution-event/public-api' +export * from './models/public-api' +export * from './services/public-api' diff --git a/ui/projects/spline-api/src/lib/execution-event/services/attribute-api.service.ts b/ui/projects/spline-api/src/lib/services/attribute-api.service.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/services/attribute-api.service.ts rename to ui/projects/spline-api/src/lib/services/attribute-api.service.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/services/base-api.service.ts b/ui/projects/spline-api/src/lib/services/base-api.service.ts similarity index 94% rename from ui/projects/spline-api/src/lib/execution-event/services/base-api.service.ts rename to ui/projects/spline-api/src/lib/services/base-api.service.ts index a061b1a5..1d10c114 100644 --- a/ui/projects/spline-api/src/lib/execution-event/services/base-api.service.ts +++ b/ui/projects/spline-api/src/lib/services/base-api.service.ts @@ -15,8 +15,7 @@ */ import { HttpClient } from '@angular/common/http' - -import { SplineConsumerApiSettings } from '../../core' +import { SplineConsumerApiSettings } from '../models' export abstract class BaseApiService { diff --git a/ui/projects/spline-api/src/lib/execution-event/services/execution-event-api.service.ts b/ui/projects/spline-api/src/lib/services/execution-event-api.service.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/services/execution-event-api.service.ts rename to ui/projects/spline-api/src/lib/services/execution-event-api.service.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/services/execution-plan-api.service.ts b/ui/projects/spline-api/src/lib/services/execution-plan-api.service.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/services/execution-plan-api.service.ts rename to ui/projects/spline-api/src/lib/services/execution-plan-api.service.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/services/index.ts b/ui/projects/spline-api/src/lib/services/index.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/services/index.ts rename to ui/projects/spline-api/src/lib/services/index.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/services/label-api.service.ts b/ui/projects/spline-api/src/lib/services/label-api.service.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/services/label-api.service.ts rename to ui/projects/spline-api/src/lib/services/label-api.service.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/services/public-api.ts b/ui/projects/spline-api/src/lib/services/public-api.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/services/public-api.ts rename to ui/projects/spline-api/src/lib/services/public-api.ts diff --git a/ui/projects/spline-api/src/lib/execution-event/services/spline-data-source-api.service.ts b/ui/projects/spline-api/src/lib/services/spline-data-source-api.service.ts similarity index 100% rename from ui/projects/spline-api/src/lib/execution-event/services/spline-data-source-api.service.ts rename to ui/projects/spline-api/src/lib/services/spline-data-source-api.service.ts diff --git a/ui/projects/spline-api/src/lib/spline-api.module.ts b/ui/projects/spline-api/src/lib/spline-api.module.ts index dbabd381..4f645595 100644 --- a/ui/projects/spline-api/src/lib/spline-api.module.ts +++ b/ui/projects/spline-api/src/lib/spline-api.module.ts @@ -16,17 +16,15 @@ import { NgModule } from '@angular/core' -import { SplineApiCoreModule } from './core' -import { SplineApiExecutionEventModule } from './execution-event' +import * as fromServices from './services' @NgModule({ declarations: [], - imports: [ - SplineApiCoreModule, - SplineApiExecutionEventModule, - ], exports: [], + providers: [ + ...fromServices.commonServiceProvider + ] }) export class SplineApiModule { } diff --git a/ui/projects/spline-common/dynamic-filter/package.json b/ui/projects/spline-common/dynamic-filter/package.json index a2c8a084..eb261bf4 100644 --- a/ui/projects/spline-common/dynamic-filter/package.json +++ b/ui/projects/spline-common/dynamic-filter/package.json @@ -9,6 +9,7 @@ "@angular/core": "^10.1.0", "@angular/material": "^11.0.4", "spline-common": "^0.0.1", - "spline-common/dynamic-table": "^0.0.1" + "spline-common/dynamic-table": "^0.0.1", + "ngx-daterangepicker-material": "^6.0.4" } } diff --git a/ui/projects/spline-common/main/src/common/component/date-range-filter/spline-date-range-filter.component.ts b/ui/projects/spline-common/main/src/common/component/date-range-filter/spline-date-range-filter.component.ts index 049b7796..e7fc493d 100644 --- a/ui/projects/spline-common/main/src/common/component/date-range-filter/spline-date-range-filter.component.ts +++ b/ui/projects/spline-common/main/src/common/component/date-range-filter/spline-date-range-filter.component.ts @@ -16,7 +16,6 @@ import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild } from '@angular/core' import { MatMenuTrigger } from '@angular/material/menu' -import { DaterangepickerComponent } from 'ngx-daterangepicker-material' import { BaseLocalStateComponent, SplineDateRangeValue } from 'spline-utils' import { SplineDateRangeFilter } from './spline-date-range-filter.models' import dayjs from 'dayjs' @@ -27,8 +26,6 @@ import dayjs from 'dayjs' templateUrl: './spline-date-range-filter.component.html' }) export class SplineDateRangeFilterComponent extends BaseLocalStateComponent implements OnChanges { - - @ViewChild(DaterangepickerComponent) datePicker: DaterangepickerComponent @ViewChild(MatMenuTrigger) matMenuTrigger: MatMenuTrigger @Input() value: SplineDateRangeValue | null @Input() showIcon = true @@ -124,7 +121,6 @@ export class SplineDateRangeFilterComponent extends BaseLocalStateComponent extends Ba const lastToken: SplineFilterToken | SplineSearchToken = this.lastFoundFilterTokenFragment const { startIndex: fragmentStartIndex, - // eslint-disable-next-line @typescript-eslint/no-unused-vars - endIndex: fragmentDelimiter, tokenIndex, type: fragmentType } = lastToken diff --git a/ui/projects/spline-common/package.json b/ui/projects/spline-common/package.json index 7cab56e2..48ae4619 100644 --- a/ui/projects/spline-common/package.json +++ b/ui/projects/spline-common/package.json @@ -4,9 +4,10 @@ "@angular/common": "^9.1.1", "@angular/core": "^9.1.1", "@ngx-translate/core": "^12.1.2", - "ngx-translate-multi-http-loader": "^3.0.0" + "ngx-translate-multi-http-loader": "^3.0.0", + "ngx-daterangepicker-material": "^6.0.4" }, "dependencies": { - "tslib": "^2.0.0" + "tslib": "^2.0.0" } } diff --git a/ui/projects/spline-shared/attributes/src/spline-attributes-shared.module.ts b/ui/projects/spline-shared/attributes/src/spline-attributes-shared.module.ts index 50c48db4..d3d22266 100644 --- a/ui/projects/spline-shared/attributes/src/spline-attributes-shared.module.ts +++ b/ui/projects/spline-shared/attributes/src/spline-attributes-shared.module.ts @@ -22,13 +22,12 @@ import { MatCardModule } from '@angular/material/card' import { MatIconModule } from '@angular/material/icon' import { MatTooltipModule } from '@angular/material/tooltip' import { MatTreeModule } from '@angular/material/tree' -import { SplineApiExecutionEventModule } from 'spline-api' +import { SplineApiModule } from 'spline-api' import { SplineDividerModule, SplineIconModule, SplineLoaderModule, SplineSearchBoxModule } from 'spline-common' import { SD_WIDGET_FACTORY } from 'spline-common/data-view' import { SplineApiConfigModule } from 'spline-shared' import { SplineTranslateModule } from 'spline-utils/translate' - import * as fromComponents from './components' import { SdWidgetAttributesTreeFactory } from './services/sd-widget-attributes-tree.factory' @@ -47,22 +46,22 @@ import { SdWidgetAttributesTreeFactory } from './services/sd-widget-attributes-t SplineDividerModule, SplineLoaderModule, SplineApiConfigModule, - SplineApiExecutionEventModule, + SplineApiModule, SplineIconModule ], declarations: [ - ...fromComponents.attributesComponents, + ...fromComponents.attributesComponents ], exports: [ - ...fromComponents.attributesComponents, + ...fromComponents.attributesComponents ], providers: [ SdWidgetAttributesTreeFactory, { provide: SD_WIDGET_FACTORY, useValue: SdWidgetAttributesTreeFactory, - multi: true, + multi: true } ] }) -export class SplineAttributesSharedModule { } +export class SplineAttributesSharedModule {} diff --git a/ui/projects/spline-shared/dynamic-table/main/src/components/search-dynamic-table/__tests__/spline-search-dynamic-table.component.spec.ts b/ui/projects/spline-shared/dynamic-table/main/src/components/search-dynamic-table/__tests__/spline-search-dynamic-table.component.spec.ts index caf3f667..34027641 100644 --- a/ui/projects/spline-shared/dynamic-table/main/src/components/search-dynamic-table/__tests__/spline-search-dynamic-table.component.spec.ts +++ b/ui/projects/spline-shared/dynamic-table/main/src/components/search-dynamic-table/__tests__/spline-search-dynamic-table.component.spec.ts @@ -32,6 +32,8 @@ import { MockModule } from 'ng-mocks' import { PageResponse, QuerySorter, SearchDataSourceConfigInput, SearchFactoryStore, SearchQuery } from 'spline-utils' import { Component, Input } from '@angular/core' import { MatTooltipModule } from '@angular/material/tooltip' +import { MatDatepickerModule } from '@angular/material/datepicker' +import { SplineDateRangeFilterModule } from 'spline-common' import SortDir = QuerySorter.SortDir import SearchParams = SearchQuery.SearchParams import DEFAULT_SEARCH_PARAMS = SearchQuery.DEFAULT_SEARCH_PARAMS @@ -82,6 +84,13 @@ class SplineContentErrorComponentMock { @Input() floating } +@Component({ + selector: 'ngx-daterangepicker-material', + template: '
' +}) +class DaterangepickerComponentMock { +} + describe('SplineSearchDynamicTableComponent', () => { let componentFixture: ComponentFixture> @@ -96,7 +105,8 @@ describe('SplineSearchDynamicTableComponent', () => { SplineLoaderComponentMock, SplineSearchBoxComponentMock, SplineNoResultComponentMock, - SplineContentErrorComponentMock + SplineContentErrorComponentMock, + DaterangepickerComponentMock ], imports: [ BrowserAnimationsModule, @@ -107,10 +117,10 @@ describe('SplineSearchDynamicTableComponent', () => { MockModule(MatTableModule), MockModule(MatSortModule), MockModule(MatIconModule), - MockModule(MatTooltipModule) + MockModule(MatTooltipModule), + MockModule(MatDatepickerModule), + MockModule(SplineDateRangeFilterModule) // MockModule(SplineLoaderModule) - // MockModule(MatDatepickerModule), - // MockModule(SplineDateRangeFilterModule) // SplineSearchBoxModule, // SplineSortHeaderModule, // DynamicTableModule, diff --git a/ui/projects/spline-shared/dynamic-table/main/src/components/search-dynamic-table/spline-search-dynamic-table.component.ts b/ui/projects/spline-shared/dynamic-table/main/src/components/search-dynamic-table/spline-search-dynamic-table.component.ts index 6137b04e..0085e810 100644 --- a/ui/projects/spline-shared/dynamic-table/main/src/components/search-dynamic-table/spline-search-dynamic-table.component.ts +++ b/ui/projects/spline-shared/dynamic-table/main/src/components/search-dynamic-table/spline-search-dynamic-table.component.ts @@ -16,7 +16,6 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core' import { LabelApiService } from 'spline-api' -import { SplineFilterToken, SplineMatchedTokens, SplineSearchToken } from 'spline-common' import { DtCellCustomEvent, DtHeaderCellCustomEvent, DynamicTableDataMap } from 'spline-common/dynamic-table' import { BaseLocalStateComponent, QuerySorter, RouterNavigation, SearchFactoryStore, SplineRecord } from 'spline-utils' import { SplineSearchDynamicTableStoreNs } from './spline-search-dynamic-table-store.ns' @@ -27,6 +26,36 @@ import { filter } from 'rxjs/operators' import { isEqual } from 'lodash-es' +export interface SplineGenericToken { + tokenIndex: number + type: string + startIndex: number + endIndex: number + rawTokenString?: string +} + +export interface SplineSearchToken extends SplineGenericToken { + searchToken: string +} + +export interface SplineFilterToken extends SplineGenericToken { + startValueIndex?: number + keyFragment?: string + valueFragment?: string + rawFilterValue?: string + isFilterCompleted: boolean + isDoubleQuotesStartChar: boolean +} + +export interface SplineMatchedTokens { + matchedTokens: SplineSearchToken | SplineFilterToken[] + filterTokens: SplineFilterToken[] + searchTokens: SplineSearchToken[] + lastToken: SplineFilterToken + searchInput: string + +} + interface DynamicTableOptions { isSticky?: boolean // stick to container } diff --git a/ui/projects/spline-shared/dynamic-table/package.json b/ui/projects/spline-shared/dynamic-table/package.json index a2c8a084..6ad33eb1 100644 --- a/ui/projects/spline-shared/dynamic-table/package.json +++ b/ui/projects/spline-shared/dynamic-table/package.json @@ -9,6 +9,7 @@ "@angular/core": "^10.1.0", "@angular/material": "^11.0.4", "spline-common": "^0.0.1", - "spline-common/dynamic-table": "^0.0.1" + "spline-common/dynamic-table": "^0.0.1", + "spline-common/icon": "^0.0.1" } } diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts index 5f047413..40c7c7f8 100644 --- a/ui/src/app/app.module.ts +++ b/ui/src/app/app.module.ts @@ -28,7 +28,6 @@ import { StoreRouterConnectingModule } from '@ngrx/router-store' import { MetaReducer, StoreModule } from '@ngrx/store' import { StoreDevtoolsModule } from '@ngrx/store-devtools' import { storeFreeze } from 'ngrx-store-freeze' -import { NgxDaterangepickerMd } from 'ngx-daterangepicker-material' import { SplineIconModule, SplineSearchBoxModule } from 'spline-common' import { DynamicFilterCoreModule } from 'spline-common/dynamic-filter' import { SplineLayoutModule } from 'spline-common/layout' @@ -75,7 +74,6 @@ export const metaReducers: MetaReducer<{}>[] = SplineConfigModule, SplineIconModule, SplineUtilsCommonModule, - NgxDaterangepickerMd.forRoot(), DynamicFilterCoreModule.forRoot() ], providers: [ diff --git a/ui/src/modules/plans/spline-plans.module.ts b/ui/src/modules/plans/spline-plans.module.ts index f1adc258..6eb762a8 100644 --- a/ui/src/modules/plans/spline-plans.module.ts +++ b/ui/src/modules/plans/spline-plans.module.ts @@ -34,7 +34,6 @@ import { MatTabsModule } from '@angular/material/tabs' import { MatTooltipModule } from '@angular/material/tooltip' import { MatTreeModule } from '@angular/material/tree' import { RouterModule } from '@angular/router' -import { NgxDaterangepickerMd } from 'ngx-daterangepicker-material' import { SplineApiModule } from 'spline-api' import { SplineCommonModule } from 'spline-common' import { SplineDataViewModule } from 'spline-common/data-view' @@ -46,7 +45,6 @@ import { SplineExpressionSharedModule } from 'spline-shared/expression' import { SplineGraphSharedModule } from 'spline-shared/graph' import { SplineTranslateModule } from 'spline-utils/translate' - import * as fromComponents from './components' import * as fromDirectives from './directives' import * as fromPages from './pages' @@ -57,7 +55,7 @@ import { SplinePlansRoutingModule } from './spline-plans-routing.module' declarations: [ ...fromPages.pageComponents, ...fromComponents.components, - ...fromDirectives.directives, + ...fromDirectives.directives ], imports: [ CommonModule, @@ -76,14 +74,13 @@ import { SplinePlansRoutingModule } from './spline-plans-routing.module' MatInputModule, MatMenuModule, MatChipsModule, - NgxDaterangepickerMd.forRoot(), SplinePlansRoutingModule, SplineApiConfigModule, SplineApiModule, SplineLayoutModule, SplineTranslateModule.forChild({ moduleNames: [ - 'plans', + 'plans' ] }), SplineGraphModule, @@ -97,9 +94,9 @@ import { SplinePlansRoutingModule } from './spline-plans-routing.module' MatDialogModule ], exports: [ - ...fromPages.pageComponents, + ...fromPages.pageComponents ], - providers: [], + providers: [] }) export class SplinePlansModule { }