Skip to content

Commit

Permalink
added object dropdown, fixed linting, enhanced unsaved changes guard,…
Browse files Browse the repository at this point in the history
… added create and edit unsaved changes output to table
  • Loading branch information
tim-fabian committed Apr 21, 2024
1 parent a2a3946 commit cc8823a
Show file tree
Hide file tree
Showing 141 changed files with 1,355 additions and 623 deletions.
19 changes: 18 additions & 1 deletion api-data.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint-disable jsdoc/require-jsdoc */
import { DateFilterFn } from '@angular/material/datepicker';

import { TestEntityWithoutCustomPropertiesInterface } from './projects/ngx-material-entity/src/mocks/test-entity.interface';

function getDatesBetween(
Expand Down Expand Up @@ -52,6 +53,13 @@ const testEntityData: TestEntityWithoutCustomPropertiesInterface = {
rowValue1: 'rowValue1',
rowValue2: 'rowValue2'
},
dropdownObjectValue: {
id: '1',
maxLengthStringValue: '1234',
secondTabStringValue: '12345',
rowValue1: 'rowValue1',
rowValue2: 'rowValue2'
},
stringChipsArrayValue: ['01234', '56789'],
// eslint-disable-next-line cspell/spellchecker
stringChipsAutocompleteArrayValue: ['ABCDE', 'FGHIJ'],
Expand Down Expand Up @@ -227,7 +235,8 @@ interface Person {
firstName: string,
lastName: string,
addressIds: string[],
timeTrackings: TimeTracking[]
timeTrackings: TimeTracking[],
addressDropdownObject: Address
}

const personData: Person = {
Expand All @@ -242,6 +251,14 @@ const personData: Person = {
number: '1',
postcode: '12345'
},
addressDropdownObject: {
city: 'test city',
formOfAddress: 'Mr.',
id: '42',
number: '123',
postcode: '12345',
street: 'test street'
},
addressId: '1',
addressIds: ['1'],
timeTrackings: [
Expand Down
1 change: 1 addition & 0 deletions api.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Application, NextFunction, Request, RequestHandler, Response } from 'express';
import jsonServer from 'json-server';

import { ApiData, apiData } from './api-data';
import { LodashUtilities } from './projects/ngx-material-entity/src/encapsulation/lodash.utilities';

Expand Down
4 changes: 4 additions & 0 deletions cypress/support/commands.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/// <reference types="cypress" />
// eslint-disable-next-line eslintImport/no-unassigned-import
import 'reflect-metadata';

declare global {
Expand Down Expand Up @@ -70,6 +71,9 @@ Cypress.Commands.add(
cy.get('.mdc-tab__text-label').contains('Other properties').click({ force: true });
cy.getInputByLabel('Object Second Tab Value').click().type('objectSecondTabValue');

cy.getInputByLabel('Dropdown Object Value').click();
cy.get('mat-option').contains('Test Object #1').click();

// eslint-disable-next-line cspell/spellchecker
cy.getInputByLabel('String Chips Array Value').click().type('abcd{enter}efgh{enter}');
cy.getInputByLabel('String Chips Autocomplete Array Value').click().type('123{enter}456{enter}');
Expand Down
1 change: 1 addition & 0 deletions cypress/support/e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// ***********************************************************

// Import commands.js using ES2015 syntax:
// eslint-disable-next-line eslintImport/no-unassigned-import
import './commands';

// Alternatively you can use CommonJS syntax:
Expand Down
Loading

0 comments on commit cc8823a

Please sign in to comment.