Skip to content

RMA-108407 : Scenarios related to validation message of import fee sc… #216

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

RMA-108407 : Scenarios related to validation message of import fee sc… #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 16 additions & 3 deletions projects/dxc-ngx-cdk/src/lib/dxc-file-input/dxc-file-input.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import {
HttpResponse,
} from "@angular/common/http";
import { FileAddService } from "./services/file.add.service";
import { ToastrService } from "ngx-toastr";
@Component({
selector: "dxc-file-input",
templateUrl: "./dxc-file-input.component.html",
Expand Down Expand Up @@ -83,7 +84,9 @@ export class DxcFileInputComponent
/**
* The file types that the component accepts. Its value must be one of all the possible values of the HTML file input's accept attribute.
*/
@Input() public accept: string;
@Input() public accept: any;

@Input() public extCheckmsg: string;
/**
* If true, the component allows multiple file items and will show all of them. If false, only one file will be shown,
* and if there is already one file selected and a new one is chosen, it will be replaced by the new selected one.
Expand Down Expand Up @@ -242,7 +245,8 @@ export class DxcFileInputComponent
constructor(
@Inject(FILE_SERVICE) private fileService: IFileService,
private utils: CssUtils,
private fileAddService: FileAddService
private fileAddService: FileAddService,
private toastr: ToastrService
) {
this.Subscription = this.fileAddService.files.subscribe(({ files, event }) => {
if (event !== "reset" && (files.length || this.hasValue)) {
Expand Down Expand Up @@ -330,7 +334,16 @@ export class DxcFileInputComponent
checkFileSize(file: File) {
if(file.name!=null){
let fileExtension = file.name.split('.').pop();
if(!this.accept.includes(fileExtension)){
fileExtension = '.'+ fileExtension;
let accepted = this.accept.split(',');
accepted = accepted.filter((x)=>x == fileExtension)
if(accepted != fileExtension){
this.extCheckmsg = this.extCheckmsg === '' || this.extCheckmsg === undefined ? this.resources.acceptedFiles.description + this.accept:this.extCheckmsg;
this.toastr.error(this.extCheckmsg, '', {
disableTimeOut: true,
positionClass: 'toast-top-full-width',

});
return this.resources.acceptedFiles.description + this.accept;
}
}
Expand Down
5 changes: 4 additions & 1 deletion projects/dxc-ngx-cdk/src/lib/dxc-file-input/dxc-file-input.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { FormsModule, ReactiveFormsModule } from "@angular/forms";
import { HttpClientModule } from "@angular/common/http";
import { FilesService } from "./services/files.services";
import { IFileService } from "./model/IFileService";
import { ToastrModule } from 'ngx-toastr';

import {
FILE_SERVICE,
IFileServiceProvider,
Expand All @@ -31,7 +33,8 @@ import { MatTooltipModule } from "@angular/material/tooltip";
ReactiveFormsModule,
DxcProgressbarModule,
HttpClientModule,
MatTooltipModule
MatTooltipModule,
ToastrModule
],
exports: [DxcFileInputComponent],
})
Expand Down