mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 18:14:17 +00:00
renamed section upload inner components
This commit is contained in:
@@ -9,10 +9,10 @@ import { Group } from '../../../../core/eperson/models/group.model';
|
||||
import { RemoteData } from '../../../../core/data/remote-data';
|
||||
|
||||
@Component({
|
||||
selector: 'ds-access-conditions',
|
||||
templateUrl: './accessConditions.component.html',
|
||||
selector: 'ds-section-upload-access-conditions',
|
||||
templateUrl: './section-upload-access-conditions.component.html',
|
||||
})
|
||||
export class AccessConditionsComponent implements OnInit {
|
||||
export class SectionUploadAccessConditionsComponent implements OnInit {
|
||||
|
||||
@Input() accessConditions: ResourcePolicy[];
|
||||
|
@@ -15,7 +15,7 @@ import { createTestComponent } from '../../../../../shared/testing/utils';
|
||||
import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service';
|
||||
import { SubmissionServiceStub } from '../../../../../shared/testing/submission-service-stub';
|
||||
import { SubmissionService } from '../../../../submission.service';
|
||||
import { UploadSectionFileEditComponent } from './file-edit.component';
|
||||
import { UploadSectionFileEditComponent } from './section-upload-file-edit.component';
|
||||
import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
|
||||
import {
|
||||
mockGroup,
|
@@ -26,7 +26,7 @@ import {
|
||||
BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT,
|
||||
BITSTREAM_METADATA_FORM_GROUP_CONFIG,
|
||||
BITSTREAM_METADATA_FORM_GROUP_LAYOUT
|
||||
} from './files-edit.model';
|
||||
} from './section-upload-file-edit.model';
|
||||
import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
|
||||
import { isNotEmpty, isNotUndefined } from '../../../../../shared/empty.util';
|
||||
import { SubmissionFormsModel } from '../../../../../core/config/models/config-submission-forms.model';
|
||||
@@ -40,7 +40,7 @@ import { Group } from '../../../../../core/eperson/models/group.model';
|
||||
|
||||
@Component({
|
||||
selector: 'ds-submission-upload-section-file-edit',
|
||||
templateUrl: './file-edit.component.html',
|
||||
templateUrl: './section-upload-file-edit.component.html',
|
||||
})
|
||||
export class UploadSectionFileEditComponent implements OnChanges {
|
||||
|
@@ -15,7 +15,7 @@ import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/json-patch-operations-builder';
|
||||
import { SubmissionJsonPatchOperationsServiceStub } from '../../../../shared/testing/submission-json-patch-operations-service-stub';
|
||||
import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
|
||||
import { UploadSectionFileComponent } from './file.component';
|
||||
import { UploadSectionFileComponent } from './section-upload-file.component';
|
||||
import { SubmissionServiceStub } from '../../../../shared/testing/submission-service-stub';
|
||||
import {
|
||||
mockFileFormData,
|
||||
@@ -36,7 +36,7 @@ import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/buil
|
||||
import { getMockSectionUploadService } from '../../../../shared/mocks/mock-section-upload.service';
|
||||
import { FormFieldMetadataValueObject } from '../../../../shared/form/builder/models/form-field-metadata-value.model';
|
||||
import { Group } from '../../../../core/eperson/models/group.model';
|
||||
import { UploadSectionFileEditComponent } from './edit/file-edit.component';
|
||||
import { UploadSectionFileEditComponent } from './edit/section-upload-file-edit.component';
|
||||
|
||||
function getMockFileService(): FileService {
|
||||
return jasmine.createSpyObj('FileService', {
|
@@ -20,13 +20,13 @@ import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service
|
||||
import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
|
||||
import { SubmissionObject } from '../../../../core/submission/models/submission-object.model';
|
||||
import { WorkspaceitemSectionUploadObject } from '../../../../core/submission/models/workspaceitem-section-upload.model';
|
||||
import { UploadSectionFileEditComponent } from './edit/file-edit.component';
|
||||
import { UploadSectionFileEditComponent } from './edit/section-upload-file-edit.component';
|
||||
import { Group } from '../../../../core/eperson/models/group.model';
|
||||
|
||||
@Component({
|
||||
selector: 'ds-submission-upload-section-file',
|
||||
styleUrls: ['./file.component.scss'],
|
||||
templateUrl: './file.component.html',
|
||||
styleUrls: ['./section-upload-file.component.scss'],
|
||||
templateUrl: './section-upload-file.component.html',
|
||||
})
|
||||
export class UploadSectionFileComponent implements OnChanges, OnInit {
|
||||
|
@@ -25,5 +25,5 @@
|
||||
</ng-container>
|
||||
|
||||
<span class="clearfix"></span>
|
||||
<ds-access-conditions [accessConditions]="fileData.accessConditions"></ds-access-conditions>
|
||||
<ds-section-upload-access-conditions [accessConditions]="fileData.accessConditions"></ds-section-upload-access-conditions>
|
||||
</div>
|
@@ -6,7 +6,7 @@ import { TranslateModule } from '@ngx-translate/core';
|
||||
import { createTestComponent } from '../../../../../shared/testing/utils';
|
||||
import { mockUploadFiles } from '../../../../../shared/mocks/mock-submission';
|
||||
import { FormComponent } from '../../../../../shared/form/form.component';
|
||||
import { UploadSectionFileViewComponent } from './file-view.component';
|
||||
import { UploadSectionFileViewComponent } from './section-upload-file-view.component';
|
||||
import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
|
||||
import { Metadata } from '../../../../../core/shared/metadata.utils';
|
||||
|
@@ -7,7 +7,7 @@ import { MetadataMap, MetadataValue } from '../../../../../core/shared/metadata.
|
||||
|
||||
@Component({
|
||||
selector: 'ds-submission-upload-section-file-view',
|
||||
templateUrl: './file-view.component.html',
|
||||
templateUrl: './section-upload-file-view.component.html',
|
||||
})
|
||||
export class UploadSectionFileViewComponent implements OnInit {
|
||||
@Input() fileData: WorkspaceitemSectionUploadFileObject;
|
@@ -25,7 +25,7 @@
|
||||
{{ 'submission.sections.upload.header.policy.default.withlist' | translate:{ "collectionName": collectionName } }}
|
||||
</ng-container>
|
||||
<span class="clearfix"></span>
|
||||
<ds-access-conditions [accessConditions]="collectionDefaultAccessConditions"></ds-access-conditions>
|
||||
<ds-section-upload-access-conditions [accessConditions]="collectionDefaultAccessConditions"></ds-section-upload-access-conditions>
|
||||
</ds-alert>
|
||||
</div>
|
||||
</div>
|
||||
|
@@ -23,10 +23,10 @@ import { SubmissionRestService } from './submission-rest.service';
|
||||
import { LicenseSectionComponent } from './sections/license/section-license.component';
|
||||
import { SubmissionUploadsConfigService } from '../core/config/submission-uploads-config.service';
|
||||
import { SubmissionEditComponent } from './edit/submission-edit.component';
|
||||
import { UploadSectionFileComponent } from './sections/upload/file/file.component';
|
||||
import { UploadSectionFileEditComponent } from './sections/upload/file/edit/file-edit.component';
|
||||
import { UploadSectionFileViewComponent } from './sections/upload/file/view/file-view.component';
|
||||
import { AccessConditionsComponent } from './sections/upload/accessConditions/accessConditions.component';
|
||||
import { UploadSectionFileComponent } from './sections/upload/file/section-upload-file.component';
|
||||
import { UploadSectionFileEditComponent } from './sections/upload/file/edit/section-upload-file-edit.component';
|
||||
import { UploadSectionFileViewComponent } from './sections/upload/file/view/section-upload-file-view.component';
|
||||
import { SectionUploadAccessConditionsComponent } from './sections/upload/accessConditions/section-upload-access-conditions.component';
|
||||
import { SubmissionSubmitComponent } from './submit/submission-submit.component';
|
||||
|
||||
@NgModule({
|
||||
@@ -39,7 +39,7 @@ import { SubmissionSubmitComponent } from './submit/submission-submit.component'
|
||||
TranslateModule
|
||||
],
|
||||
declarations: [
|
||||
AccessConditionsComponent,
|
||||
SectionUploadAccessConditionsComponent,
|
||||
UploadSectionComponent,
|
||||
FormSectionComponent,
|
||||
LicenseSectionComponent,
|
||||
|
Reference in New Issue
Block a user