Skip to content

Commit

Permalink
chore: remove ngx-bootstrap
Browse files Browse the repository at this point in the history
Co-Authored-by: Bertrand Zuchuat <[email protected]>
  • Loading branch information
Garfield-fr committed Sep 18, 2024
1 parent 44eb788 commit 57ac41d
Show file tree
Hide file tree
Showing 15 changed files with 8 additions and 58 deletions.
16 changes: 0 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"lodash-es": "^4.17.21",
"marked": "^10.0.0",
"moment": "^2.30.1",
"ngx-bootstrap": "^12.0.0",
"ngx-spinner": "^16.0.2",
"primeflex": "^3.3.1",
"primeicons": "^7.0.0",
Expand Down
4 changes: 0 additions & 4 deletions projects/ng-core-tester/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { TranslateLoader as BaseTranslateLoader, TranslateModule } from '@ngx-translate/core';
import { CoreConfigService, RecordModule, RecordService, RemoteAutocompleteService, TranslateLoader } from '@rero/ng-core';
import { CollapseModule } from 'ngx-bootstrap/collapse';
import { TypeaheadModule } from 'ngx-bootstrap/typeahead';
import { MenubarModule } from 'primeng/menubar';
import { AppConfigService } from './app-config.service';
import { AppRoutingModule } from './app-routing.module';
Expand Down Expand Up @@ -56,8 +54,6 @@ import { AppRemoteAutocompleteService } from './service/app-remote-autocomplete.
HttpClientModule,
AppRoutingModule,
FormsModule,
CollapseModule.forRoot(),
TypeaheadModule.forRoot(),
TranslateModule.forRoot({
loader: {
provide: BaseTranslateLoader,
Expand Down
2 changes: 1 addition & 1 deletion projects/rero/ng-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Services:

## TranslateService

TranslateService is a proxy service for configuring translations with ngx-translate, BsLocaleService (ngx-bootstrap) and momentjs. During initialization, it sets the default language defined in configuration for all of them.
TranslateService is a proxy service for configuring translations with ngx-translate and momentjs. During initialization, it sets the default language defined in configuration for all of them.

Language can be changed for all dependencies by calling :

Expand Down
1 change: 0 additions & 1 deletion projects/rero/ng-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"@ngx-translate/core": "^15.0.0",
"crypto-js": "^4.2.0",
"font-awesome": "^4.7.0",
"ngx-bootstrap": "^12.0.0",
"ngx-spinner": "^16.0.2",
"easymde": "^2.18.0",
"marked": "^10.0.0",
Expand Down
2 changes: 0 additions & 2 deletions projects/rero/ng-core/src/lib/core.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { HttpClient } from '@angular/common/http';
import { APP_INITIALIZER, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { TranslateLoader as BaseTranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
import { ModalModule } from 'ngx-bootstrap/modal';
import { NgxSpinnerModule } from 'ngx-spinner';
import { ConfirmationService, MessageService } from 'primeng/api';
import { CoreConfigService } from './core-config.service';
Expand Down Expand Up @@ -87,7 +86,6 @@ function initializeAppFactory(translateService: NgCoreTranslateService): () => O
deps: [CoreConfigService, HttpClient]
}
}),
ModalModule.forRoot(),
NgxSpinnerModule,
PrimeNgCoreModule,
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<!-- input field: empty ref -->
<!--
TODO: TO REMOVE AFTER REMOVE TYPEAHEAD ON UI
@if (formControl) {
@if (!formControl.value) {
<div class="input-group">
Expand Down Expand Up @@ -51,7 +53,6 @@
</div>
</div>
} @else {
<!-- text representation of the value in ref -->
@if (valueAsHTML$ | async; as valueAsHTML) {
<div class="py-1">
<span [innerHTML]="valueAsHTML"></span>
Expand Down Expand Up @@ -82,3 +83,4 @@
</div>
}
</ng-template>
-->
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { FieldType, FormlyFieldConfig } from '@ngx-formly/core';
import { TypeaheadMatch } from 'ngx-bootstrap/typeahead';
import { Observable, Observer, merge, of } from 'rxjs';
import { switchMap } from 'rxjs/operators';
import { RemoteTypeaheadService } from './remote-typeahead.service';
Expand Down Expand Up @@ -118,7 +117,7 @@ export class RemoteTypeaheadComponent extends FieldType<FormlyFieldConfig> imple
* Set the field value with the selected suggestion.
* @param e - TypeaheadMatch
*/
typeaheadOnSelect(e: TypeaheadMatch): void {
typeaheadOnSelect(e: any): void {
if (e.item.value != null) {
this.formControl.setValue(e.item.value);
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { SuggestionMetadata } from './remote-typeahead.component';
})
export class RemoteTypeaheadService {

// TODO: TO REMOVE AFTER REMOVE TYPEAHEAD ON UI
/**
* Constructor.
* @param recordService - RecordService
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { RouterModule } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';
import { EditorComponent, RecordModule } from '@rero/ng-core';
import { TypeaheadModule } from 'ngx-bootstrap/typeahead';
import { AddFieldEditorComponent } from './add-field-editor.component';

describe('AddFieldEditorComponent', () => {
Expand All @@ -37,7 +36,6 @@ describe('AddFieldEditorComponent', () => {
RouterModule.forRoot([]),
RecordModule,
FormsModule,
TypeaheadModule.forRoot(),
TranslateModule.forRoot()
],
declarations: [AddFieldEditorComponent, EditorComponent]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import { HttpClientModule } from '@angular/common/http';
import { TestBed } from '@angular/core/testing';
import { TranslateModule } from '@ngx-translate/core';
import { ModalModule } from 'ngx-bootstrap/modal';
import { RecordUiService } from './record-ui.service';
import { RouterModule } from '@angular/router';
import { ConfirmationService, MessageService } from 'primeng/api';
Expand All @@ -29,7 +28,6 @@ describe('RecordUiService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [
ModalModule.forRoot(),
TranslateModule.forRoot(),
HttpClientModule,
RouterModule.forRoot([])
Expand Down
12 changes: 1 addition & 11 deletions projects/rero/ng-core/src/lib/record/record.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ import { FORMLY_CONFIG, FormlyModule } from '@ngx-formly/core';
import { FormlySelectModule } from '@ngx-formly/core/select';
import { FormlyPrimeNGModule } from '@ngx-formly/primeng';
import { TranslateService } from '@ngx-translate/core';
import { CollapseModule } from 'ngx-bootstrap/collapse';
import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
import { PopoverModule } from 'ngx-bootstrap/popover';
import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { TypeaheadModule } from 'ngx-bootstrap/typeahead';
import { AutoCompleteModule } from 'primeng/autocomplete';
import { CalendarModule } from 'primeng/calendar';
import { RadioButtonModule } from 'primeng/radiobutton';
Expand Down Expand Up @@ -134,11 +129,6 @@ import { SearchAutocompleteComponent } from './search-autocomplete/search-autoco
FormsModule,
ReactiveFormsModule,
RecordRoutingModule,
TooltipModule.forRoot(),
PopoverModule.forRoot(),
TypeaheadModule.forRoot(),
CollapseModule.forRoot(),
BsDatepickerModule.forRoot(),
CalendarModule,
ClipboardModule,
RadioButtonModule,
Expand All @@ -164,7 +154,7 @@ import { SearchAutocompleteComponent } from './search-autocomplete/search-autoco
{ name: 'markdown', component: MarkdownFieldComponent },
{ name: 'passwordGenerator', component: PasswordGeneratorTypeComponent },
{ name: 'radioButton', component: RadioButtonComponent },
// Remove after refactoring
// TODO: Remove after refactoring
{ name: 'remoteTypeahead', component: RemoteTypeaheadComponent },
],
wrappers: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import { FormsModule } from '@angular/forms';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ActivatedRoute, Router, RouterModule, convertToParamMap } from '@angular/router';
import { TranslateFakeLoader, TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { ModalModule } from 'ngx-bootstrap/modal';
import { PaginationModule } from 'ngx-bootstrap/pagination';
import { Observable, of } from 'rxjs';
import { DialogComponent } from '../../dialog/dialog.component';
import { DefaultPipe } from '../../pipe/default.pipe';
Expand Down Expand Up @@ -110,8 +108,6 @@ describe('RecordSearchPageComponent', () => {
TranslateModule.forRoot({
loader: { provide: TranslateLoader, useClass: TranslateFakeLoader }
}),
PaginationModule.forRoot(),
ModalModule.forRoot(),
],
providers: [
{ provide: RecordService, useValue: recordServiceSpy },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import { FormsModule } from '@angular/forms';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ActivatedRoute, convertToParamMap, Router } from '@angular/router';
import { TranslateFakeLoader, TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { ModalModule } from 'ngx-bootstrap/modal';
import { PaginationModule } from 'ngx-bootstrap/pagination';
import { Observable, of } from 'rxjs';
import { DialogComponent } from '../../dialog/dialog.component';
import { DefaultPipe } from '../../pipe/default.pipe';
Expand Down Expand Up @@ -155,8 +153,6 @@ describe('RecordSearchComponent', () => {
TranslateModule.forRoot({
loader: { provide: TranslateLoader, useClass: TranslateFakeLoader }
}),
PaginationModule.forRoot(),
ModalModule.forRoot(),
],
providers: [
RecordSearchService,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { RouterModule } from '@angular/router';
import { TranslateFakeLoader, TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { ModalModule } from 'ngx-bootstrap/modal';
import { PopoverModule } from 'ngx-bootstrap/popover';
import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { ButtonModule } from 'primeng/button';
import { CoreModule } from '../../../core.module';
import { JsonComponent } from './item/json.component';
Expand All @@ -40,13 +37,10 @@ describe('RecordSearchResultComponent', () => {
imports: [
ButtonModule,
RouterModule.forRoot([]),
ModalModule.forRoot(),
TranslateModule.forRoot({
loader: { provide: TranslateLoader, useClass: TranslateFakeLoader }
}),
HttpClientModule,
TooltipModule.forRoot(),
PopoverModule.forRoot(),
CoreModule
],
schemas: [ NO_ERRORS_SCHEMA ]
Expand Down

0 comments on commit 57ac41d

Please sign in to comment.