Skip to content

887 validate required fields for internal apps #990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 6, 2023
Merged

887 validate required fields for internal apps #990

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d18f521
refactor: TTL-887 validate required fields for internal apps
mmaquina May 30, 2023
484326f
fix: TTL-887 make if condition more readable
mmaquina May 30, 2023
cc9339c
test: TTL-887 tests for saving time entries
mmaquina May 30, 2023
a88f38c
refactor: TTL-887 improve tests
Santiago220991 May 31, 2023
2c9a164
refactor: TTL-887 english lessons and safari books can skip descripti…
mmaquina May 31, 2023
0dfddd2
refactor: TTL-887 improve tests
Santiago220991 May 31, 2023
ae5b22f
feat: TTL-887 move constants to a shared file
Santiago220991 May 31, 2023
b8f23e6
refactor: TTL-887 import constants from a shared file
Santiago220991 May 31, 2023
a6a76f3
fix: TTL-887 Activity is required toastr
mmaquina Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: TTL-887 import constants from a shared file
  • Loading branch information
@Santiago220991
Santiago220991 committed May 31, 2023
commit b8f23e6c0034325cb759a076d7a87fac0763c5ae
13 changes: 5 additions & 8 deletions src/app/modules/shared/components/details-fields/details-fields.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@ import { DATE_FORMAT, DATE_FORMAT_YEAR } from 'src/environments/environment';
import { TechnologiesComponent } from '../technologies/technologies.component';
import { MatDatepicker } from '@angular/material/datepicker';
import { Observable } from 'rxjs';

const INTERNAL_APP_STRING = 'ioet';
const PROJECT_NAME_TO_SKIP = ['English Lessons', 'Safari Books'];
const EMPTY_FIELDS_ERROR_MESSAGE = 'Make sure to add a description and/or ticket number when working on an internal app.';
import { EMPTY_FIELDS_ERROR_MESSAGE } from '../../messages';
import { INTERNAL_APP_STRING, PROJECT_NAME_TO_SKIP } from 'src/app/modules/shared/internal-app-constants';

type Merged = TechnologyState & ProjectState & ActivityState & EntryState;
@Component({
Expand Down Expand Up @@ -122,8 +120,8 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
});
}

onClearedComponent({term}) {
const isSearchEmpty = (term === '');
onClearedComponent({ term }) {
const isSearchEmpty = term === '';
if (isSearchEmpty) {
this.isTechnologiesDisabled = true;
this.entryForm.patchValue({
Expand Down Expand Up @@ -172,7 +170,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
projectWithSearchField.search_field = `${project.customer.name} - ${project.name}`;
this.listRecentProjects.push(projectWithSearchField);
});
}else{
} else {
this.listRecentProjects = this.listProjects;
}
this.listProjectsShowed = this.listRecentProjects;
Expand Down Expand Up @@ -335,7 +333,6 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
}

onSubmit() {

const emptyValue = '';
const { project_name, uri, description } = this.entryForm.value;
const areEmptyValues = [uri, description].every(item => item === emptyValue);
Expand Down
20 changes: 10 additions & 10 deletions src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ import { formatDate } from '@angular/common';
import { getTimeEntriesDataSource } from '../../store/entry.selectors';
import { DATE_FORMAT } from 'src/environments/environment';
import { Subscription } from 'rxjs';


const INTERNAL_APP_STRING = 'ioet';
const PROJECT_NAME_TO_SKIP = ['English Lessons', 'Safari Books'];
const EMPTY_FIELDS_ERROR_MESSAGE = 'Make sure to add a description and/or ticket number when working on an internal app.';
import { EMPTY_FIELDS_ERROR_MESSAGE } from 'src/app/modules/shared/messages';
import { INTERNAL_APP_STRING, PROJECT_NAME_TO_SKIP } from 'src/app/modules/shared/internal-app-constants';

type Merged = TechnologyState & ProjectState & ActivityState;

Expand Down Expand Up @@ -144,7 +141,6 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
const dataToUse = ds.data.find((item) => item.project_id === this.activeEntry.project_id);
customerName = dataToUse.customer_name;
projectName = dataToUse.project_name;

});
return this.requiredFieldsForInternalAppExist(customerName, projectName) && this.entryForm.valid;
}
Expand Down Expand Up @@ -209,10 +205,14 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {

requiredFieldsForInternalAppExist(customerName, projectName) {
const emptyValue = '';
const areEmptyValues = [this.entryForm.value.uri, this.entryForm.value.description].every(item => item === emptyValue);

const isInternalApp = customerName.includes('ioet');
const canSkipDescriptionAndURI = PROJECT_NAME_TO_SKIP.some(projectNameItem => projectName.includes(projectNameItem));
const areEmptyValues = [this.entryForm.value.uri, this.entryForm.value.description].every(
(item) => item === emptyValue
);

const isInternalApp = customerName.includes(INTERNAL_APP_STRING);
const canSkipDescriptionAndURI = PROJECT_NAME_TO_SKIP.some((projectNameItem) =>
projectName.includes(projectNameItem)
);

if (isInternalApp && areEmptyValues && !canSkipDescriptionAndURI) {
this.toastrService.error(EMPTY_FIELDS_ERROR_MESSAGE);
Expand Down