Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ENG-6879] Disable cloud computing filter for addons #2463

Merged
merged 3 commits into from
Jan 10, 2025
Merged

[ENG-6879] Disable cloud computing filter for addons #2463

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbf6914
disable cloud computing filter for addons
adlius Jan 10, 2025
1a47573
fix tests
adlius Jan 10, 2025
d6297fa
fix another test
adlius Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions lib/osf-components/addon/components/addons-service/manager/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ enum PageMode {
export enum FilterTypes {
STORAGE = 'additional-storage',
CITATION_MANAGER = 'citation-manager',
CLOUD_COMPUTING = 'cloud-computing',
// CLOUD_COMPUTING = 'cloud-computing', // disabled because BOA is down
}

interface Args {
Expand Down Expand Up @@ -75,12 +75,12 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
list: A([]),
configuredAddons: A([]),
},
[FilterTypes.CLOUD_COMPUTING]: {
modelName: 'external-computing-service',
task: taskFor(this.getComputingAddonProviders),
list: A([]),
configuredAddons: A([]),
},
// [FilterTypes.CLOUD_COMPUTING]: {
// modelName: 'external-computing-service',
// task: taskFor(this.getComputingAddonProviders),
// list: A([]),
// configuredAddons: A([]),
// },
};
filterTypeMapper = new TrackedObject(this.mapper);
@tracked filterText = '';
Expand Down
16 changes: 8 additions & 8 deletions lib/osf-components/addon/components/addons-service/user-addons-manager/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ export default class UserAddonManagerComponent extends Component<Args> {
authorizedAccounts: [] as AuthorizedCitationAccountModel[],
authorizedServiceIds: [] as string[],
},
[FilterTypes.CLOUD_COMPUTING]: {
modelName: 'external-computing-service',
fetchProvidersTask: taskFor(this.getComputingAddonProviders),
list: A([]) as EmberArray<Provider>,
getAuthorizedAccountsTask: taskFor(this.getAuthorizedComputingAccounts),
authorizedAccounts: [] as AuthorizedComputingAccountModel[],
authorizedServiceIds: [] as string[],
},
// [FilterTypes.CLOUD_COMPUTING]: {
// modelName: 'external-computing-service',
// fetchProvidersTask: taskFor(this.getComputingAddonProviders),
// list: A([]) as EmberArray<Provider>,
// getAuthorizedAccountsTask: taskFor(this.getAuthorizedComputingAccounts),
// authorizedAccounts: [] as AuthorizedComputingAccountModel[],
// authorizedServiceIds: [] as string[],
// },
};
@tracked filterText = '';
@tracked activeFilterType = FilterTypes.STORAGE;
Expand Down
10 changes: 5 additions & 5 deletions tests/acceptance/guid-node/addons-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module('Acceptance | guid-node/addons', hooks => {
.hasAttribute('aria-selected', 'true', 'All addons tab is selected');

// check additonal storage providers
assert.dom('[data-test-addon-list-filter]').exists({ count: 3 }, '3 addon filters are present');
assert.dom('[data-test-addon-list-filter]').exists({ count: 2 }, '2 addon filters are present');
assert.dom('[data-test-addon-list-filter="additional-storage"]')
.hasClass(styles.active, 'Additional storage filter is active');
assert.dom('[data-test-addon-card-connect]').exists({ count: 9 }, '9 storage addons are present');
Expand All @@ -57,10 +57,10 @@ module('Acceptance | guid-node/addons', hooks => {
assert.dom('[data-test-addon-card-connect]').exists({ count: 2 }, '2 citation addons are present');

// Check cloud-computing providers
await click('[data-test-addon-list-filter="cloud-computing"]');
assert.dom('[data-test-addon-list-filter="cloud-computing"]')
.hasClass(styles.active, 'Additional citation filter is active');
assert.dom('[data-test-addon-card-connect]').exists({ count: 1 }, '1 cloud computing addon is present');
// await click('[data-test-addon-list-filter="cloud-computing"]');
// assert.dom('[data-test-addon-list-filter="cloud-computing"]')
// .hasClass(styles.active, 'Additional citation filter is active');
// assert.dom('[data-test-addon-card-connect]').exists({ count: 1 }, '1 cloud computing addon is present');

// Reset to additional storage
await click('[data-test-addon-list-filter="additional-storage"]');
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/components/addons-service/manager/component-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ module('Integration | Component | addons-service | manager', hooks => {
assert.dom('[data-test-provider]').hasText('Zotero', 'Filtered down to just Zotero');

// Filter by cloud computing
await click('[data-test-filter=cloud-computing]');
assert.dom('[data-test-provider]').exists({ count: 1 }, 'Has cloud providers');
assert.dom('[data-test-provider]').hasText('Boa', 'Has loaded Boa');
// await click('[data-test-filter=cloud-computing]');
// assert.dom('[data-test-provider]').exists({ count: 1 }, 'Has cloud providers');
// assert.dom('[data-test-provider]').hasText('Boa', 'Has loaded Boa');
});
});
6 changes: 3 additions & 3 deletions tests/integration/components/addons-service/user-addons-manager/component-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ module('Integration | Component | addons-service | user-addons-manager', hooks =
assert.dom('[data-test-provider]').hasText('Zotero', 'Filtered down to just Zotero');

// Filter by cloud computing
await click('[data-test-filter=cloud-computing]');
assert.dom('[data-test-provider]').exists({ count: 1 }, 'Has cloud providers');
assert.dom('[data-test-provider]').hasText('Boa', 'Has loaded Boa');
// await click('[data-test-filter=cloud-computing]');
// assert.dom('[data-test-provider]').exists({ count: 1 }, 'Has cloud providers');
// assert.dom('[data-test-provider]').hasText('Boa', 'Has loaded Boa');
});

test('it traverses page modes for new account creation', async function(this: AddonManagerTestContext, assert) {
Expand Down
Loading