Merge branch 'develop' into search-deprecation

CenterForOpenScience · Oct 23, 2023 · 048a8cb · 048a8cb
2 parents 53e2a9d + e41d1ad
commit 048a8cb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/app/settings/tokens/-components/edit-form/component.ts b/app/settings/tokens/-components/edit-form/component.ts
@@ -67,7 +67,8 @@ export default class TokenForm extends Component {
     @action
     async deleteToken() {
         try {
-            await this.token!.destroyRecord();
+            this.token!.deleteRecord();
+            await this.token.save();
             this.toast.success(this.intl.t('settings.tokens.deleted'));
             this.router.transitionTo('settings.tokens');
         } catch {

diff --git a/app/settings/tokens/edit/controller.ts b/app/settings/tokens/edit/controller.ts
@@ -21,7 +21,7 @@ export default class SettingsTokensEditController extends Controller {
     token?: Token;
 
     @action
-    refresh() {
+    refreshToken() {
         this.clearTokenValue();
 
         // Send action to route

diff --git a/app/settings/tokens/edit/template.hbs b/app/settings/tokens/edit/template.hbs
@@ -32,19 +32,21 @@
             {{t 'settings.tokens.createSuccess.instructions'}}
         </p>
         <Button
-            {{on 'click' (action this.refresh)}}
+            {{on 'click' (action this.refreshToken)}}
         >
             {{t 'settings.tokens.createSuccess.editScopes'}}
         </Button>
     {{else}}
         <h4>{{t 'settings.tokens.editToken'}}</h4>
 
-        {{#if this.model.taskInstance.isError}}
-            {{this.model.taskInstance.error}}
-        {{else}}
+        {{#if this.model.taskInstance.isRunning}}
+            <LoadingIndicator @dark={{true}} />
+        {{else if this.model.taskInstance.isSuccessful}}
             <Settings::Tokens::-Components::EditForm
                 @token={{this.token}}
             />
+        {{else}}
+            {{this.model.taskInstance.error}}
         {{/if}}
     {{/if}}
 </div>
diff --git a/lib/osf-components/addon/components/search-page/component.ts b/lib/osf-components/addon/components/search-page/component.ts
@@ -23,6 +23,8 @@ interface ResourceTypeOption {
     value?: ResourceTypeFilterValue | null;
 }
 
+export const CARD_SEARCH_TEXT_PARAM = 'cardSearchText[*,creator.name,isContainedBy.creator.name]';
+
 export enum ResourceTypeFilterValue {
     Registrations = 'Registration,RegistrationComponent',
     Projects = 'Project,ProjectComponent',
@@ -237,7 +239,7 @@ export default class SearchPage extends Component<SearchArgs> {
             }
             this.filterQueryObject = filterQueryObject;
             const searchResult = await this.store.queryRecord('index-card-search', {
-                'cardSearchText[*,creator.name,isContainedBy.creator.name]': cardSearchText,
+                [CARD_SEARCH_TEXT_PARAM]: cardSearchText,
                 'page[cursor]': page,
                 sort,
                 cardSearchFilter: filterQueryObject,

diff --git a/lib/osf-components/addon/components/search-page/filter-facet/component.ts b/lib/osf-components/addon/components/search-page/filter-facet/component.ts
@@ -11,7 +11,7 @@ import RelatedPropertyPathModel from 'ember-osf-web/models/related-property-path
 
 import SearchResultModel from 'ember-osf-web/models/search-result';
 
-import { Filter } from '../component';
+import { Filter, CARD_SEARCH_TEXT_PARAM } from '../component';
 
 interface FakeIndexCard {
     resourceId: string;
@@ -123,7 +123,7 @@ export default class FilterFacet extends Component<FilterFacetArgs> {
             return;  // skip fetching
         }
         const valueSearch = await this.store.queryRecord('index-value-search', {
-            cardSearchText,
+            [CARD_SEARCH_TEXT_PARAM]: cardSearchText,
             cardSearchFilter,
             valueSearchPropertyPath: property.propertyPathKey,
             valueSearchText: filterString || '',