Merge branch 'hotfix/25.07.1'

Author: brianjgeiger

app/preprints/-components/submit/metadata/component.ts

@@ -147,13 +147,6 @@ export default class Metadata extends Component<MetadataArgs>{
         }
     }
 
-    @action
-    public async hasSubjects(hasSubjects: boolean): Promise<void> {
-        if (hasSubjects) {
-            this.validate();
-        }
-    }
-
     @action
     public validate(): void {
         this.setHasRequiredFields();

app/preprints/-components/submit/metadata/template.hbs

@@ -93,17 +93,16 @@
                         <Subjects::Manager
                             @model={{@manager.preprint}}
                             @provider={{@manager.provider}}
-                            @metadataChangeset={{this.metadataFormChangeset}} 
+                            @metadataChangeset={{this.metadataFormChangeset}}
                             @doesAutosave={{true}}
-                            @hasSubjects={{action this.hasSubjects}}
                             @onchange={{action this.validate}}
                             id={{subjectsFieldId}}
                             as |subjectsManager|
                         >
                             <Subjects::Widget
                                 @subjectsManager={{subjectsManager}}
                             />
-                            <ValidationErrors 
+                            <ValidationErrors
                             @changeset={{this.metadataFormChangeset}} @key='subjects'
                             @isValidating={{subjectsManager.isSaving}} />
                         </Subjects::Manager>

app/settings/addons/styles.scss

@@ -9,6 +9,10 @@
     display: flex;
     flex-direction: column;
 
+    .detail-wrapper {
+        padding: 10px;
+    }
+
     &.mobile {
         width: 100%;
         flex-wrap: wrap;

app/settings/addons/template.hbs

@@ -119,8 +119,10 @@
                             data-analytics-scope='All addons tab'
                             local-class='addons-list-wrapper {{if (media 'isMobile') 'mobile'}}'
                         >
-                            {{t 'addons.list.sync-details-1'}}
-                            {{t 'addons.list.sync-details-2'}}
+                            <div local-class='detail-wrapper'>
+                                {{t 'addons.list.sync-details-1'}}
+                                {{t 'addons.list.sync-details-4'}}
+                            </div>
                             <ul local-class='addons-card-wrapper'>
                                 {{#each manager.filteredAddonProviders as |provider|}}
                                     <li
@@ -149,7 +151,9 @@
                             data-analytics-scope='Connected accounts tab'
                             local-class='addons-list-wrapper {{if (media 'isMobile') 'mobile'}}'
                         >
-                            {{t 'addons.list.sync-details-3'}}
+                            <div local-class='detail-wrapper'>
+                                {{t 'addons.list.sync-details-3'}}
+                            </div>
                             <ul local-class='configured-addons-wrapper'>
                                 {{#each manager.currentTypeAuthorizedAccounts as |account|}}
                                     <li local-class='provider-list-item' data-test-provider-list-item={{account.displayName}}>

lib/osf-components/addon/components/subjects/manager/component.ts

@@ -60,7 +60,6 @@ export default class SubjectManagerComponent extends Component {
     // optional
     metadataChangeset?: BufferedChangeset;
     onchange?: () => void;
-    hasSubjects?: (_: boolean) => void;
 
     // private
     @service intl!: Intl;
@@ -121,11 +120,6 @@ export default class SubjectManagerComponent extends Component {
         });
         this.incrementProperty('selectedSubjectsChanges');
         this.incrementProperty('savedSubjectsChanges');
-        this.model.set('subjects', savedSubjects);
-        if (this.hasSubjects) {
-            this.metadataChangeset?.validate('subjects');
-            this.hasSubjects(savedSubjectIds.size > 0);
-        }
     }
 
     @restartableTask

translations/en-us.yml

@@ -250,6 +250,7 @@ addons:
         sync-details-1: 'Sync your projects with external services to help stay connected and organized. Select a category and browse the options.'
         sync-details-2: 'To manage all add-ons connected to your account, visit your profile settings.'
         sync-details-3: 'Manage your connected Add-ons, re-authorize, disconnect account, or disconnect project'
+        sync-details-4: 'Add-ons can also be linked directly from Project page.'
         filter-placeholder: 'Filter add-ons'
         filter:
             all: 'All'