Merge branch 'release/22.8.0'

Author: adlius

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [22.8.0] - 2022-8-29
+### Added
+- Registration resources (output reporting)
+
 ## [22.7.0] - 2022-7-20
 ### Added
 - Show extra information on files detail page for dataverse files
@@ -12,7 +16,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Hide left navbar links when users don't have permissions
 - Update registries landing page
 
-
 ## [22.6.2] - 2022-6-24
 ### Hotfix
 - Fix long file name display issue
@@ -1867,6 +1870,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
+[22.8.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.8.0
 [22.7.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.7.0
 [22.6.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.6.0
 [22.5.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.5.0

app/adapters/resource.ts

@@ -0,0 +1,11 @@
+import OsfAdapter from './osf-adapter';
+
+export default class ResourceAdapter extends OsfAdapter {
+
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        resource: ResourceAdapter;
+    } // eslint-disable-line semi
+}

app/helpers/open-badges-icon-map.ts

@@ -0,0 +1,35 @@
+import { ResourceTypes } from 'ember-osf-web/models/resource';
+
+export function getBadgeIcon(resourceType: ResourceTypes) {
+    switch (resourceType) {
+    case ResourceTypes.Data:
+        return '/assets/images/badges/data_small_color.png';
+    case ResourceTypes.Materials:
+        return '/assets/images/badges/materials_small_color.png';
+    case ResourceTypes.AnalyticCode:
+        return '/assets/images/badges/analytic_code_small_color.png';
+    case ResourceTypes.Papers:
+        return '/assets/images/badges/papers_small_color.png';
+    case ResourceTypes.Supplements:
+        return '/assets/images/badges/supplements_small_color.png';
+    default:
+        return '/assets/images/badges/data_small_color.png';
+    }
+}
+
+export function getBadgeIconDisabled(resourceType: ResourceTypes) {
+    switch (resourceType) {
+    case ResourceTypes.Data:
+        return '/assets/images/badges/data_small_gray.png';
+    case ResourceTypes.Materials:
+        return '/assets/images/badges/materials_small_gray.png';
+    case ResourceTypes.AnalyticCode:
+        return '/assets/images/badges/analytic_code_small_gray.png';
+    case ResourceTypes.Papers:
+        return '/assets/images/badges/papers_small_gray.png';
+    case ResourceTypes.Supplements:
+        return '/assets/images/badges/supplements_small_gray.png';
+    default:
+        return '/assets/images/badges/data_small_gray.png';
+    }
+}

app/models/registration.ts

@@ -2,6 +2,7 @@ import { attr, belongsTo, hasMany, AsyncBelongsTo, AsyncHasMany } from '@ember-d
 import { buildValidations, validator } from 'ember-cp-validations';
 
 import DraftRegistrationModel from 'ember-osf-web/models/draft-registration';
+import ResourceModel from 'ember-osf-web/models/resource';
 import ReviewActionModel, { ReviewActionTrigger } from 'ember-osf-web/models/review-action';
 import SchemaResponseModel, { RevisionReviewStates } from 'ember-osf-web/models/schema-response';
 import { RegistrationResponse } from 'ember-osf-web/packages/registration-schema';
@@ -106,6 +107,11 @@ export default class RegistrationModel extends NodeModel.extend(Validations) {
     @attr('array') providerSpecificMetadata!: ProviderMetadata[];
     @attr('fixstring') revisionState!: RevisionReviewStates;
     @attr('boolean') wikiEnabled!: boolean;
+    @attr('boolean') hasData!: boolean;
+    @attr('boolean') hasMaterials!: boolean;
+    @attr('boolean') hasAnalyticCode!: boolean;
+    @attr('boolean') hasPapers!: boolean;
+    @attr('boolean') hasSupplements!: boolean;
 
     // Write-only attributes
     @attr('array') includedNodeIds?: string[];
@@ -153,9 +159,19 @@ export default class RegistrationModel extends NodeModel.extend(Validations) {
     @belongsTo('schema-response', { inverse: null })
     latestResponse!: AsyncBelongsTo<SchemaResponseModel> & SchemaResponseModel; // Latest accepted response
 
+    @hasMany('resource', { inverse: 'registration' })
+    resources!: AsyncHasMany<ResourceModel> | ResourceModel[];
+
     // Write-only relationships
     @belongsTo('draft-registration', { inverse: null })
     draftRegistration!: DraftRegistrationModel;
+
+    get resourcesVisible(): boolean {
+        return ![
+            RegistrationReviewStates.Initial,
+            RegistrationReviewStates.Pending,
+        ].includes(this.reviewsState) && !this.withdrawn && !this.archiving;
+    }
 }
 
 declare module 'ember-data/types/registries/model' {

app/models/resource.ts

@@ -0,0 +1,31 @@
+import { AsyncBelongsTo, attr, belongsTo } from '@ember-data/model';
+import RegistrationModel from 'ember-osf-web/models/registration';
+
+import OsfModel from './osf-model';
+
+export enum ResourceTypes {
+    Data = 'data',
+    AnalyticCode = 'analytic_code',
+    Materials = 'materials',
+    Papers = 'papers',
+    Supplements = 'supplements',
+}
+
+export default class ResourceModel extends OsfModel {
+    @attr('fixstring') pid!: string;
+    @attr('fixstring') name!: string;
+    @attr('fixstring') resourceType!: ResourceTypes | 'undefined';
+    @attr('fixstring') description!: string;
+    @attr('date') dateCreated!: Date;
+    @attr('date') dateModified!: Date;
+    @attr('boolean') finalized!: boolean;
+
+    @belongsTo('registration', { inverse: 'resources' })
+    registration!: AsyncBelongsTo<RegistrationModel> & RegistrationModel;
+}
+
+declare module 'ember-data/types/registries/model' {
+    export default interface ModelRegistry {
+        resource: ResourceModel;
+    } // eslint-disable-line semi
+}

app/serializers/resource.ts

@@ -0,0 +1,11 @@
+import OsfSerializer from './osf-serializer';
+
+export default class ResourceSerializer extends OsfSerializer {
+
+}
+
+declare module 'ember-data/types/registries/serializer' {
+    export default interface SerializerRegistry {
+        'resource': ResourceSerializer;
+    } // eslint-disable-line semi
+}

config/environment.d.ts

@@ -82,6 +82,7 @@ declare const config: {
             keenSessionId: string;
             analyticsDismissAdblock: string;
             cookieConsent: string;
+            outputFeaturePopover: string;
             maintenance: string;
             csrf: string;
             authSession: string;

config/environment.js

@@ -154,6 +154,7 @@ module.exports = function(environment) {
                 keenSessionId: 'keenSessionId',
                 analyticsDismissAdblock: 'adBlockDismiss',
                 cookieConsent: 'osf_cookieconsent',
+                outputFeaturePopover: 'outputFeaturePopover',
                 maintenance: 'maintenance',
                 csrf: 'api-csrf',
                 authSession: 'embosf-auth-session',

lib/osf-components/addon/components/expandable-preview/component.ts

@@ -0,0 +1,64 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+
+interface Args {
+    height?: number;
+    open?: boolean;
+}
+
+export default class ExpandablePreview extends Component<Args> {
+    @tracked thresholdHeight: number;
+    @tracked collapsed: boolean;
+    @tracked collapsible = false;
+    @tracked wrapperElement?: HTMLElement;
+
+    @action
+    didInsert(element: HTMLElement) {
+        this.wrapperElement = element;
+        this.checkThreshold(element);
+    }
+
+    @action
+    checkThreshold(element: HTMLElement) {
+        if (!this.wrapperElement) {
+            this.wrapperElement = element;
+        }
+        if (this.thresholdHeight < element.clientHeight) {
+            this.collapsible = true;
+            if (this.collapsed) {
+                this.collapseWrapper();
+            }
+        }
+    }
+
+    @action
+    toggleCollapse() {
+        this.collapsed = !this.collapsed;
+        if (this.collapsed) {
+            this.collapseWrapper();
+        } else {
+            this.expandWrapper();
+        }
+    }
+
+    @action
+    collapseWrapper() {
+        if (this.wrapperElement) {
+            this.wrapperElement.style.maxHeight = this.thresholdHeight + 'px';
+        }
+    }
+
+    @action
+    expandWrapper() {
+        if (this.wrapperElement) {
+            this.wrapperElement.style.maxHeight = '';
+        }
+    }
+
+    constructor(owner: unknown, args: Args) {
+        super(owner, args);
+        this.thresholdHeight = this.args.height || 200;
+        this.collapsed = !this.args.open;
+    }
+}

lib/osf-components/addon/components/expandable-preview/styles.scss

@@ -0,0 +1,16 @@
+.Wrapper {
+    position: relative;
+    overflow: hidden;
+}
+
+.Wrapper__Overlay {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 100%;
+    height: 100%;
+
+    &.Wrapper__Collapsed {
+        background-image: linear-gradient(rgba(255, 255, 255, 0), rgba(255, 255, 255, 1));
+    }
+}