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

chore: rename roles toggles to flag #7123

Merged
merged 2 commits into from
May 23, 2024
Merged

chore: rename roles toggles to flag #7123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54b2f40
chore: rename roles toggles to flag
sjaanus May 23, 2024
8eac636
Fix
sjaanus May 23, 2024
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
2 changes: 1 addition & 1 deletion frontend/cypress/integration/feature/feature.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ describe('feature', () => {
it('gives an error if a toggle exists with the same name', () => {
cy.createFeature_UI(featureToggleName, false, projectName);
cy.get("[data-testid='INPUT_ERROR_TEXT']").contains(
'A toggle with that name already exists',
'A flag with that name already exists',
Copy link
Contributor Author

@sjaanus sjaanus May 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixing an failing test.

);
});

Expand Down
32 changes: 32 additions & 0 deletions src/migrations/20240523113322-roles-toggle-to-flag-rename.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
exports.up = function (db, cb) {
db.runSql(`
UPDATE roles
SET description = 'Users with the project owner role have full control over the project, and can add and manage other users within the project context, manage feature flags within the project, and control advanced project features like archiving and deleting the project.'
WHERE name = 'Owner'
AND type = 'project';

UPDATE roles
SET description = 'Users with the project member role are allowed to view, create, and update feature flags within a project, but have limited permissions in regards to managing the project''s user access and can not archive or delete the project.'
WHERE name = 'Member'
AND type = 'project';

`, cb);
};

exports.down = function (db, cb) {
db.runSql(
`
UPDATE roles
SET description = 'Users with the project owner role have full control over the project, and can add and manage other users within the project context, manage feature toggles within the project, and control advanced project features like archiving and deleting the project.'
WHERE name = 'Owner'
AND type = 'project';

UPDATE roles
SET description = 'Users with the project member role are allowed to view, create, and update feature toggles within a project, but have limited permissions in regards to managing the project''s user access and can not archive or delete the project.'
WHERE name = 'Member'
AND type = 'project';

`,
cb,
);
};
7 changes: 5 additions & 2 deletions src/test/e2e/favor-permission-name-over-id.e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ test('Favor permission name over id migration correctly assigns permissions by n
{ role_id: 101, permission: 'TEST_PERMISSION_4' },
]);

// Run the toggle to flag update migration
await dbm.up('20240523113322-roles-toggle-to-flag-rename.js');
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test is manually applying migrations and it was previously running old names. Now I apply the new naming migration to clean it up.


// Check the results that ensure the default roles exist and have the correct permissions
const { rows: resultsRoles } = await client.query(`
SELECT name, description, type FROM "favor_permission_name_over_id_test"."roles" WHERE id != 101 ORDER BY created_at;
Expand Down Expand Up @@ -142,13 +145,13 @@ test('Favor permission name over id migration correctly assigns permissions by n
{
name: 'Owner',
description:
'Users with the project owner role have full control over the project, and can add and manage other users within the project context, manage feature toggles within the project, and control advanced project features like archiving and deleting the project.',
'Users with the project owner role have full control over the project, and can add and manage other users within the project context, manage feature flags within the project, and control advanced project features like archiving and deleting the project.',
type: 'project',
},
{
name: 'Member',
description:
"Users with the project member role are allowed to view, create, and update feature toggles within a project, but have limited permissions in regards to managing the project's user access and can not archive or delete the project.",
"Users with the project member role are allowed to view, create, and update feature flags within a project, but have limited permissions in regards to managing the project's user access and can not archive or delete the project.",
type: 'project',
},
]);
Expand Down
Loading