Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 21 additions & 23 deletions projects/filestack-angular/src/lib/filestack.module.ts
Original file line number Diff line number Diff line change
@@ -1,45 +1,43 @@
import { CommonModule } from '@angular/common';
import { NgModule, ModuleWithProviders } from '@angular/core';
import { FilestackService } from './filestack.service';
import { FilestackTransformPipe } from './filestack-transform.pipe';
import { PickerOverlayComponent } from './picker/pickerOverlay.component';
import { PickerInlineComponent } from './picker/pickerInline.component';
import { PickerDropPaneComponent } from './picker/pickerDropPane.component';
import { ClientOptions } from 'filestack-js';
import { CommonModule } from "@angular/common";
import { NgModule, ModuleWithProviders } from "@angular/core";
import { FilestackService } from "./filestack.service";
import { FilestackTransformPipe } from "./filestack-transform.pipe";
import { PickerOverlayComponent } from "./picker/pickerOverlay.component";
import { PickerInlineComponent } from "./picker/pickerInline.component";
import { PickerDropPaneComponent } from "./picker/pickerDropPane.component";
import { ClientOptions } from "filestack-js";

export type InitialConfig = {
apikey?: string,
options?: ClientOptions
}
apikey?: string;
options?: ClientOptions;
};

export const FILSTACK_CONFIG = new InjectionToken<InitialConfig>("config");

@NgModule({
imports: [
CommonModule,
],
providers: [
FilestackService
],
imports: [CommonModule],
providers: [FilestackService],
declarations: [
PickerOverlayComponent,
PickerInlineComponent,
PickerDropPaneComponent,
FilestackTransformPipe
FilestackTransformPipe,
],
exports: [
PickerOverlayComponent,
PickerInlineComponent,
PickerDropPaneComponent,
FilestackTransformPipe
]
FilestackTransformPipe,
],
})
export class FilestackModule {

static forRoot(config: InitialConfig): ModuleWithProviders<FilestackModule> {

return {
ngModule: FilestackModule,
providers: [FilestackService, { provide: 'config', useValue: config }]
providers: [
FilestackService,
{ provide: FILSTACK_CONFIG, useValue: config },
],
};
}
}
27 changes: 17 additions & 10 deletions projects/filestack-angular/src/lib/filestack.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { InitialConfig } from './filestack.module';
import { Injectable, Inject, Optional } from '@angular/core';
import { from, Observable } from 'rxjs';
import { FILSTACK_CONFIG, InitialConfig } from "./filestack.module";
import { Injectable, Inject, Optional } from "@angular/core";
import { from, Observable } from "rxjs";
import {
PickerOptions,
PickerInstance,
Expand All @@ -16,19 +16,19 @@ import {
ClientOptions,
Client,
init,
} from 'filestack-js';

} from "filestack-js";

@Injectable()
export class FilestackService {

private clientInstance: Client;

private clientOptions: ClientOptions;

private apikey: string;

constructor(@Optional() @Inject('config') private config?: InitialConfig) {
constructor(
@Optional() @Inject(FILSTACK_CONFIG) private config?: InitialConfig
) {
if (!config) {
return;
}
Expand Down Expand Up @@ -65,7 +65,10 @@ export class FilestackService {
* @param clientOptions - Client options
*/
init(apikey?: string, clientOptions?: ClientOptions): Client {
this.client = init(apikey || this.apikey, clientOptions || this.clientOptions);
this.client = init(
apikey || this.apikey,
clientOptions || this.clientOptions
);

return this.client;
}
Expand Down Expand Up @@ -152,10 +155,14 @@ export class FilestackService {
security?: Security
): Observable<object> {
if (Array.isArray(file)) {
return from(this.client.multiupload(file, options, storeOptions, token, security));
return from(
this.client.multiupload(file, options, storeOptions, token, security)
);
}

return from(this.client.upload(file, options, storeOptions, token, security));
return from(
this.client.upload(file, options, storeOptions, token, security)
);
}

/**
Expand Down