Merge branch 'release/25.04.0'

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).
 
+## [25.04.0] - 2025-02-24
+### Added
+- Addons and gravyvalet
+
 ## [25.03.0] - 2025-01-27
 ### Added
 - Preprint DOI Versioning

app/adapters/addon-operation-invocation.ts

@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class AddonOperationInvocationAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'addon-operation-invocation': AddonOperationInvocationAdapter;
+    } // eslint-disable-line semi
+}

app/adapters/addon-service.ts

@@ -0,0 +1,18 @@
+import JSONAPIAdapter from '@ember-data/adapter/json-api';
+import config from 'ember-osf-web/config/environment';
+
+const { addonServiceUrl } = config.OSF;
+
+export const addonServiceNamespace = 'v1';
+export const addonServiceAPIUrl = `${addonServiceUrl}${addonServiceNamespace}/`;
+
+export default class AddonServiceAdapter extends JSONAPIAdapter {
+    host = addonServiceUrl.replace(/\/$/, ''); // Remove trailing slash to avoid // in URLs
+    namespace = addonServiceNamespace;
+
+    ajaxOptions(url: string, type: string, options?: any): object {
+        const _ajaxopts: any = super.ajaxOptions(url, type, options);
+        _ajaxopts.credentials = 'include';
+        return _ajaxopts;
+    }
+}

app/adapters/authorized-citation-account.ts

@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class AuthorizedCitationAccountAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'authorized-citation-account': AuthorizedCitationAccountAdapter;
+    } // eslint-disable-line semi
+}

app/adapters/authorized-computing-account.ts

@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class AuthorizedComputingAccountAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'authorized-computing-account': AuthorizedComputingAccountAdapter;
+    } // eslint-disable-line semi
+}

app/adapters/authorized-storage-account.ts

@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class AuthorizedStorageAccountAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'authorized-storage-account': AuthorizedStorageAccountAdapter;
+    } // eslint-disable-line semi
+}

app/adapters/configured-citation-addon.ts

@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class ConfiguredCitationAddonAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'configured-citation-addon': ConfiguredCitationAddonAdapter;
+    } // eslint-disable-line semi
+}

app/adapters/configured-computing-addon.ts

@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class ConfiguredComputingAddonAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'configured-computing-addon': ConfiguredComputingAddonAdapter;
+    } // eslint-disable-line semi
+}

app/adapters/configured-storage-addon.ts

@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class ConfiguredStorageAddonAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'configured-storage-addon': ConfiguredStorageAddonAdapter;
+    } // eslint-disable-line semi
+}

app/adapters/external-citation-service.ts

@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class ExternalCitationServiceAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'external-citation-service': ExternalCitationServiceAdapter;
+    } // eslint-disable-line semi
+}

app/adapters/external-computing-service.ts

@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class ExternalComputingServiceAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'external-computing-service': ExternalComputingServiceAdapter;
+    } // eslint-disable-line semi
+}

app/adapters/external-storage-service.ts

@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class ExternalStorageServiceAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'external-storage-service': ExternalStorageServiceAdapter;
+    } // eslint-disable-line semi
+}

app/adapters/resource-reference.ts

@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class ResourceReferenceAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'resource-reference': ResourceReferenceAdapter;
+    } // eslint-disable-line semi
+}

app/adapters/user-reference.ts

@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class UserReferenceAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'user-reference': UserReferenceAdapter;
+    } // eslint-disable-line semi
+}

app/config/environment.d.ts

@@ -107,10 +107,10 @@ declare const config: {
         donateUrl: string;
         renderUrl: string;
         mfrUrl: string;
+        addonServiceUrl: string;
         waterbutlerUrl: string;
         helpUrl: string;
         shareBaseUrl: string;
-        shareApiUrl: string;
         shareSearchUrl: string;
         devMode: boolean;
         cookieDomain: string;
@@ -192,6 +192,7 @@ declare const config: {
             homePageHeroTextVersionB: string;
         };
         storageI18n: string;
+        gravyWaffle: string;
         enableInactiveSchemas: string;
         registrationFilesPage: string;
         verifyEmailModals: string;

app/guid-file/route.ts

@@ -58,7 +58,9 @@ export default class GuidFile extends Route {
         };
         this.set('headTags', this.metaTags.getHeadTags(metaTagsData));
         this.headTagsService.collectHeadTags();
-        await taskFor(model.target.get('getEnabledAddons')).perform();
+        if(!model.target.get('isRegistration')) {
+            await taskFor(model.target.get('getEnabledAddons')).perform();
+        }
         blocker.done();
     }
 

app/guid-node/addons/index/controller.ts

@@ -0,0 +1,11 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import Media from 'ember-responsive';
+
+export default class GuidNodeAddonsController extends Controller {
+    @service media!: Media;
+
+    get isMobile() {
+        return this.media.isMobile;
+    }
+}

app/guid-node/addons/index/route.ts

@@ -0,0 +1,7 @@
+import Route from '@ember/routing/route';
+
+export default class GuidNodeAddons extends Route {
+    async model() {
+        return await this.modelFor('guid-node').taskInstance;
+    }
+}

app/guid-node/addons/index/styles.scss

@@ -0,0 +1,126 @@
+.addon-page-wrapper {
+    margin: 20px;
+}
+
+.page-heading {
+    font-weight: bold;
+}
+
+.addons-list-wrapper {
+    display: flex;
+    margin-top: 20px;
+
+    &.mobile {
+        flex-wrap: wrap;
+    }
+}
+
+.filter-wrapper {
+    max-width: 200px;
+    display: flex;
+    flex-direction: column;
+    margin-top: 6px;
+
+    &.mobile {
+        max-width: 100%;
+        width: 100%;
+        margin-right: 20px;
+    }
+}
+
+.filter-button {
+    width: 100%;
+    height: 40px;
+    text-align: left;
+    padding: 0 10px;
+
+    &.active {
+        background-color: $color-light;
+    }
+}
+
+.addon-cards-wrapper {
+    display: flex;
+    flex-wrap: wrap;
+    width: 100%;
+    justify-content: center;
+}
+
+.float-right {
+    float: right;
+}
+
+.account-select {
+    margin: 20px 0;
+}
+
+.tab-list {
+    margin-bottom: 10px;
+    border-bottom: 1px solid $color-border-gray;
+    box-sizing: border-box;
+    color: $color-grey;
+    display: block;
+    line-height: 20px;
+    list-style-image: none;
+    list-style-position: outside;
+    list-style-type: none;
+    height: 41px;
+    padding: 0;
+}
+
+.tab-list {
+    li {
+        cursor: pointer;
+        display: block;
+        position: relative;
+        margin-bottom: -1px;
+        float: left;
+        height: 41px;
+        padding: 10px 15px;
+    }
+
+    li:global(.ember-tabs__tab--selected) {
+        background-color: $bg-light;
+        border-bottom: 2px solid $color-blue;
+    }
+
+    li:hover {
+        text-decoration: none;
+        background-color: $bg-light;
+        color: var(--primary-color);
+    }
+}
+
+.configured-addons {
+    border: 1px solid $color-border-gray;
+    box-sizing: border-box;
+    padding: 10px;
+}
+
+.configured-addons-heading {
+    border-bottom: 1px solid $color-border-gray;
+    box-sizing: border-box;
+}
+
+.configured-addon-display-name {
+    margin-top: 10px;
+    font-size: large;
+}
+
+.configured-addon-connected-to {
+    border-bottom: 1px solid $color-border-gray;
+    box-sizing: border-box;
+}
+
+.remove-connected-button {
+    border: 0;
+    color: $brand-danger;
+}
+
+.edit-connected-button {
+    border: 0;
+}
+
+.add-location-button {
+    margin-top: 10px;
+}