renamed section upload inner components

This commit is contained in:
Giuseppe Digilio
2019-03-17 17:16:53 +01:00
parent c6d16abbbd
commit d90f69d15e
15 changed files with 20 additions and 20 deletions

View File

@@ -9,10 +9,10 @@ import { Group } from '../../../../core/eperson/models/group.model';
import { RemoteData } from '../../../../core/data/remote-data'; import { RemoteData } from '../../../../core/data/remote-data';
@Component({ @Component({
selector: 'ds-access-conditions', selector: 'ds-section-upload-access-conditions',
templateUrl: './accessConditions.component.html', templateUrl: './section-upload-access-conditions.component.html',
}) })
export class AccessConditionsComponent implements OnInit { export class SectionUploadAccessConditionsComponent implements OnInit {
@Input() accessConditions: ResourcePolicy[]; @Input() accessConditions: ResourcePolicy[];

View File

@@ -15,7 +15,7 @@ import { createTestComponent } from '../../../../../shared/testing/utils';
import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service'; import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service';
import { SubmissionServiceStub } from '../../../../../shared/testing/submission-service-stub'; import { SubmissionServiceStub } from '../../../../../shared/testing/submission-service-stub';
import { SubmissionService } from '../../../../submission.service'; 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 { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
import { import {
mockGroup, mockGroup,

View File

@@ -26,7 +26,7 @@ import {
BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT, BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT,
BITSTREAM_METADATA_FORM_GROUP_CONFIG, BITSTREAM_METADATA_FORM_GROUP_CONFIG,
BITSTREAM_METADATA_FORM_GROUP_LAYOUT 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 { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
import { isNotEmpty, isNotUndefined } from '../../../../../shared/empty.util'; import { isNotEmpty, isNotUndefined } from '../../../../../shared/empty.util';
import { SubmissionFormsModel } from '../../../../../core/config/models/config-submission-forms.model'; import { SubmissionFormsModel } from '../../../../../core/config/models/config-submission-forms.model';
@@ -40,7 +40,7 @@ import { Group } from '../../../../../core/eperson/models/group.model';
@Component({ @Component({
selector: 'ds-submission-upload-section-file-edit', selector: 'ds-submission-upload-section-file-edit',
templateUrl: './file-edit.component.html', templateUrl: './section-upload-file-edit.component.html',
}) })
export class UploadSectionFileEditComponent implements OnChanges { export class UploadSectionFileEditComponent implements OnChanges {

View File

@@ -15,7 +15,7 @@ import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/json-patch-operations-builder'; import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/json-patch-operations-builder';
import { SubmissionJsonPatchOperationsServiceStub } from '../../../../shared/testing/submission-json-patch-operations-service-stub'; import { SubmissionJsonPatchOperationsServiceStub } from '../../../../shared/testing/submission-json-patch-operations-service-stub';
import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service'; 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 { SubmissionServiceStub } from '../../../../shared/testing/submission-service-stub';
import { import {
mockFileFormData, mockFileFormData,
@@ -36,7 +36,7 @@ import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/buil
import { getMockSectionUploadService } from '../../../../shared/mocks/mock-section-upload.service'; import { getMockSectionUploadService } from '../../../../shared/mocks/mock-section-upload.service';
import { FormFieldMetadataValueObject } from '../../../../shared/form/builder/models/form-field-metadata-value.model'; import { FormFieldMetadataValueObject } from '../../../../shared/form/builder/models/form-field-metadata-value.model';
import { Group } from '../../../../core/eperson/models/group.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 { function getMockFileService(): FileService {
return jasmine.createSpyObj('FileService', { return jasmine.createSpyObj('FileService', {

View File

@@ -20,13 +20,13 @@ import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service
import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service'; import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
import { SubmissionObject } from '../../../../core/submission/models/submission-object.model'; import { SubmissionObject } from '../../../../core/submission/models/submission-object.model';
import { WorkspaceitemSectionUploadObject } from '../../../../core/submission/models/workspaceitem-section-upload.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'; import { Group } from '../../../../core/eperson/models/group.model';
@Component({ @Component({
selector: 'ds-submission-upload-section-file', selector: 'ds-submission-upload-section-file',
styleUrls: ['./file.component.scss'], styleUrls: ['./section-upload-file.component.scss'],
templateUrl: './file.component.html', templateUrl: './section-upload-file.component.html',
}) })
export class UploadSectionFileComponent implements OnChanges, OnInit { export class UploadSectionFileComponent implements OnChanges, OnInit {

View File

@@ -25,5 +25,5 @@
</ng-container> </ng-container>
<span class="clearfix"></span> <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> </div>

View File

@@ -6,7 +6,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { createTestComponent } from '../../../../../shared/testing/utils'; import { createTestComponent } from '../../../../../shared/testing/utils';
import { mockUploadFiles } from '../../../../../shared/mocks/mock-submission'; import { mockUploadFiles } from '../../../../../shared/mocks/mock-submission';
import { FormComponent } from '../../../../../shared/form/form.component'; 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 { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
import { Metadata } from '../../../../../core/shared/metadata.utils'; import { Metadata } from '../../../../../core/shared/metadata.utils';

View File

@@ -7,7 +7,7 @@ import { MetadataMap, MetadataValue } from '../../../../../core/shared/metadata.
@Component({ @Component({
selector: 'ds-submission-upload-section-file-view', selector: 'ds-submission-upload-section-file-view',
templateUrl: './file-view.component.html', templateUrl: './section-upload-file-view.component.html',
}) })
export class UploadSectionFileViewComponent implements OnInit { export class UploadSectionFileViewComponent implements OnInit {
@Input() fileData: WorkspaceitemSectionUploadFileObject; @Input() fileData: WorkspaceitemSectionUploadFileObject;

View File

@@ -25,7 +25,7 @@
{{ 'submission.sections.upload.header.policy.default.withlist' | translate:{ "collectionName": collectionName } }} {{ 'submission.sections.upload.header.policy.default.withlist' | translate:{ "collectionName": collectionName } }}
</ng-container> </ng-container>
<span class="clearfix"></span> <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> </ds-alert>
</div> </div>
</div> </div>

View File

@@ -23,10 +23,10 @@ import { SubmissionRestService } from './submission-rest.service';
import { LicenseSectionComponent } from './sections/license/section-license.component'; import { LicenseSectionComponent } from './sections/license/section-license.component';
import { SubmissionUploadsConfigService } from '../core/config/submission-uploads-config.service'; import { SubmissionUploadsConfigService } from '../core/config/submission-uploads-config.service';
import { SubmissionEditComponent } from './edit/submission-edit.component'; import { SubmissionEditComponent } from './edit/submission-edit.component';
import { UploadSectionFileComponent } from './sections/upload/file/file.component'; import { UploadSectionFileComponent } from './sections/upload/file/section-upload-file.component';
import { UploadSectionFileEditComponent } from './sections/upload/file/edit/file-edit.component'; import { UploadSectionFileEditComponent } from './sections/upload/file/edit/section-upload-file-edit.component';
import { UploadSectionFileViewComponent } from './sections/upload/file/view/file-view.component'; import { UploadSectionFileViewComponent } from './sections/upload/file/view/section-upload-file-view.component';
import { AccessConditionsComponent } from './sections/upload/accessConditions/accessConditions.component'; import { SectionUploadAccessConditionsComponent } from './sections/upload/accessConditions/section-upload-access-conditions.component';
import { SubmissionSubmitComponent } from './submit/submission-submit.component'; import { SubmissionSubmitComponent } from './submit/submission-submit.component';
@NgModule({ @NgModule({
@@ -39,7 +39,7 @@ import { SubmissionSubmitComponent } from './submit/submission-submit.component'
TranslateModule TranslateModule
], ],
declarations: [ declarations: [
AccessConditionsComponent, SectionUploadAccessConditionsComponent,
UploadSectionComponent, UploadSectionComponent,
FormSectionComponent, FormSectionComponent,
LicenseSectionComponent, LicenseSectionComponent,