mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 01:54:15 +00:00
Replaced ngx-bootstrap TooltipModule in favour of @ng-bootstrap ngbTooltip
This commit is contained in:
@@ -104,7 +104,6 @@
|
|||||||
"ng-mocks": "^8.1.0",
|
"ng-mocks": "^8.1.0",
|
||||||
"ng2-file-upload": "1.4.0",
|
"ng2-file-upload": "1.4.0",
|
||||||
"ng2-nouislider": "^1.8.2",
|
"ng2-nouislider": "^1.8.2",
|
||||||
"ngx-bootstrap": "^5.3.2",
|
|
||||||
"ngx-infinite-scroll": "6.0.1",
|
"ngx-infinite-scroll": "6.0.1",
|
||||||
"ngx-moment": "^3.4.0",
|
"ngx-moment": "^3.4.0",
|
||||||
"ngx-pagination": "3.0.3",
|
"ngx-pagination": "3.0.3",
|
||||||
|
@@ -8,7 +8,6 @@ import { JournalVolumeComponent } from './item-pages/journal-volume/journal-volu
|
|||||||
import { JournalListElementComponent } from './item-list-elements/journal/journal-list-element.component';
|
import { JournalListElementComponent } from './item-list-elements/journal/journal-list-element.component';
|
||||||
import { JournalIssueListElementComponent } from './item-list-elements/journal-issue/journal-issue-list-element.component';
|
import { JournalIssueListElementComponent } from './item-list-elements/journal-issue/journal-issue-list-element.component';
|
||||||
import { JournalVolumeListElementComponent } from './item-list-elements/journal-volume/journal-volume-list-element.component';
|
import { JournalVolumeListElementComponent } from './item-list-elements/journal-volume/journal-volume-list-element.component';
|
||||||
import { TooltipModule } from 'ngx-bootstrap';
|
|
||||||
import { JournalIssueGridElementComponent } from './item-grid-elements/journal-issue/journal-issue-grid-element.component';
|
import { JournalIssueGridElementComponent } from './item-grid-elements/journal-issue/journal-issue-grid-element.component';
|
||||||
import { JournalVolumeGridElementComponent } from './item-grid-elements/journal-volume/journal-volume-grid-element.component';
|
import { JournalVolumeGridElementComponent } from './item-grid-elements/journal-volume/journal-volume-grid-element.component';
|
||||||
import { JournalGridElementComponent } from './item-grid-elements/journal/journal-grid-element.component';
|
import { JournalGridElementComponent } from './item-grid-elements/journal/journal-grid-element.component';
|
||||||
@@ -41,7 +40,6 @@ const ENTRY_COMPONENTS = [
|
|||||||
imports: [
|
imports: [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
SharedModule,
|
SharedModule,
|
||||||
TooltipModule.forRoot(),
|
|
||||||
ItemPageModule
|
ItemPageModule
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
|
@@ -8,5 +8,5 @@
|
|||||||
<ds-truncatable [id]="metadataRepresentation.id">
|
<ds-truncatable [id]="metadataRepresentation.id">
|
||||||
<a [routerLink]="['/items/' + metadataRepresentation.id]"
|
<a [routerLink]="['/items/' + metadataRepresentation.id]"
|
||||||
[innerHTML]="metadataRepresentation.getValue()"
|
[innerHTML]="metadataRepresentation.getValue()"
|
||||||
[tooltip]="metadataRepresentation.allMetadata(['dc.description']).length > 0 ? descTemplate : null"></a>
|
[ngbTooltip]="metadataRepresentation.allMetadata(['dc.description']).length > 0 ? descTemplate : null"></a>
|
||||||
</ds-truncatable>
|
</ds-truncatable>
|
||||||
|
@@ -4,7 +4,6 @@ import { By } from '@angular/platform-browser';
|
|||||||
import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
|
import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
|
||||||
import { OrgUnitItemMetadataListElementComponent } from './org-unit-item-metadata-list-element.component';
|
import { OrgUnitItemMetadataListElementComponent } from './org-unit-item-metadata-list-element.component';
|
||||||
import { Item } from '../../../../core/shared/item.model';
|
import { Item } from '../../../../core/shared/item.model';
|
||||||
import { TooltipModule } from 'ngx-bootstrap';
|
|
||||||
import { MetadataValue } from '../../../../core/shared/metadata.models';
|
import { MetadataValue } from '../../../../core/shared/metadata.models';
|
||||||
|
|
||||||
const description = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.';
|
const description = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.';
|
||||||
@@ -19,7 +18,6 @@ describe('OrgUnitItemMetadataListElementComponent', () => {
|
|||||||
|
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
imports: [TooltipModule.forRoot()],
|
|
||||||
declarations: [OrgUnitItemMetadataListElementComponent],
|
declarations: [OrgUnitItemMetadataListElementComponent],
|
||||||
schemas: [NO_ERRORS_SCHEMA]
|
schemas: [NO_ERRORS_SCHEMA]
|
||||||
}).overrideComponent(OrgUnitItemMetadataListElementComponent, {
|
}).overrideComponent(OrgUnitItemMetadataListElementComponent, {
|
||||||
|
@@ -11,5 +11,5 @@
|
|||||||
<ds-truncatable [id]="metadataRepresentation.id">
|
<ds-truncatable [id]="metadataRepresentation.id">
|
||||||
<a [routerLink]="['/items/' + metadataRepresentation.id]"
|
<a [routerLink]="['/items/' + metadataRepresentation.id]"
|
||||||
[innerHTML]="metadataRepresentation.getValue()"
|
[innerHTML]="metadataRepresentation.getValue()"
|
||||||
[tooltip]="metadataRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
|
[ngbTooltip]="metadataRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
|
||||||
</ds-truncatable>
|
</ds-truncatable>
|
||||||
|
@@ -4,7 +4,6 @@ import { By } from '@angular/platform-browser';
|
|||||||
import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
|
import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
|
||||||
import { Item } from '../../../../core/shared/item.model';
|
import { Item } from '../../../../core/shared/item.model';
|
||||||
import { PersonItemMetadataListElementComponent } from './person-item-metadata-list-element.component';
|
import { PersonItemMetadataListElementComponent } from './person-item-metadata-list-element.component';
|
||||||
import { TooltipModule } from 'ngx-bootstrap';
|
|
||||||
import { MetadataValue } from '../../../../core/shared/metadata.models';
|
import { MetadataValue } from '../../../../core/shared/metadata.models';
|
||||||
|
|
||||||
const jobTitle ='Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.';
|
const jobTitle ='Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.';
|
||||||
@@ -21,7 +20,6 @@ describe('PersonItemMetadataListElementComponent', () => {
|
|||||||
|
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
imports: [TooltipModule.forRoot()],
|
|
||||||
declarations: [PersonItemMetadataListElementComponent],
|
declarations: [PersonItemMetadataListElementComponent],
|
||||||
schemas: [NO_ERRORS_SCHEMA]
|
schemas: [NO_ERRORS_SCHEMA]
|
||||||
}).overrideComponent(PersonItemMetadataListElementComponent, {
|
}).overrideComponent(PersonItemMetadataListElementComponent, {
|
||||||
|
@@ -8,7 +8,6 @@ import { ProjectComponent } from './item-pages/project/project.component';
|
|||||||
import { OrgUnitListElementComponent } from './item-list-elements/org-unit/org-unit-list-element.component';
|
import { OrgUnitListElementComponent } from './item-list-elements/org-unit/org-unit-list-element.component';
|
||||||
import { PersonListElementComponent } from './item-list-elements/person/person-list-element.component';
|
import { PersonListElementComponent } from './item-list-elements/person/person-list-element.component';
|
||||||
import { ProjectListElementComponent } from './item-list-elements/project/project-list-element.component';
|
import { ProjectListElementComponent } from './item-list-elements/project/project-list-element.component';
|
||||||
import { TooltipModule } from 'ngx-bootstrap';
|
|
||||||
import { PersonGridElementComponent } from './item-grid-elements/person/person-grid-element.component';
|
import { PersonGridElementComponent } from './item-grid-elements/person/person-grid-element.component';
|
||||||
import { OrgUnitGridElementComponent } from './item-grid-elements/org-unit/org-unit-grid-element.component';
|
import { OrgUnitGridElementComponent } from './item-grid-elements/org-unit/org-unit-grid-element.component';
|
||||||
import { ProjectGridElementComponent } from './item-grid-elements/project/project-grid-element.component';
|
import { ProjectGridElementComponent } from './item-grid-elements/project/project-grid-element.component';
|
||||||
@@ -57,7 +56,6 @@ const ENTRY_COMPONENTS = [
|
|||||||
imports: [
|
imports: [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
SharedModule,
|
SharedModule,
|
||||||
TooltipModule.forRoot(),
|
|
||||||
ItemPageModule
|
ItemPageModule
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
|
@@ -15,7 +15,6 @@ import { DYNAMIC_FORM_CONTROL_MAP_FN, DynamicFormsCoreModule } from '@ng-dynamic
|
|||||||
import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
|
import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
|
||||||
import { TextMaskModule } from 'angular2-text-mask';
|
import { TextMaskModule } from 'angular2-text-mask';
|
||||||
import { MomentModule } from 'ngx-moment';
|
import { MomentModule } from 'ngx-moment';
|
||||||
import { TooltipModule } from 'ngx-bootstrap';
|
|
||||||
|
|
||||||
import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component';
|
import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component';
|
||||||
import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
|
import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
|
||||||
@@ -239,8 +238,7 @@ const ROOT_MODULES = [
|
|||||||
TranslateModule.forChild({
|
TranslateModule.forChild({
|
||||||
missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
|
missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
|
||||||
useDefaultLang: true
|
useDefaultLang: true
|
||||||
}),
|
})
|
||||||
TooltipModule.forRoot(),
|
|
||||||
];
|
];
|
||||||
|
|
||||||
const PIPES = [
|
const PIPES = [
|
||||||
|
Reference in New Issue
Block a user