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.

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

Create October 16, 2024 Release #1245

Merged
merged 1 commit into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions client/tests/e2e/snapshots/saved/_data-management.html
Original file line number Diff line number Diff line change
Expand Up @@ -1726,7 +1726,7 @@ <h2>Test Plans Status Summary</h2>
<td>
<div class="css-bpz90">
<span class="rd full-width css-be9e2a">R&amp;D</span>
<p class="review-text">Complete <b>Aug 12, 2024</b></p>
<p class="review-text">Complete <b>Oct 10, 2024</b></p>
</div>
</td>
<td>
Expand All @@ -1749,7 +1749,7 @@ <h2>Test Plans Status Summary</h2>
<path
fill="currentColor"
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
><b>V24.08.12</b></span
><b>V24.10.10</b></span
></a
></span
><button
Expand Down Expand Up @@ -2298,7 +2298,7 @@ <h2>Test Plans Status Summary</h2>
<td>
<div class="css-bpz90">
<span class="rd full-width css-be9e2a">R&amp;D</span>
<p class="review-text">Complete <b>Sep 19, 2024</b></p>
<p class="review-text">Complete <b>Oct 12, 2024</b></p>
</div>
</td>
<td>
Expand All @@ -2321,7 +2321,7 @@ <h2>Test Plans Status Summary</h2>
<path
fill="currentColor"
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
><b>V24.09.19</b></span
><b>V24.10.12</b></span
></a
></span
><button
Expand Down
2 changes: 1 addition & 1 deletion server/controllers/AuthController.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const oauthRedirectFromGithubController = async (req, res) => {
vendor => vendor.split('|')[0] === githubUsername
);
if (vendorEntry) {
const [, companyName] = vendorEntry.split('|').trim();
const [, companyName] = vendorEntry.trim().split(/\s*\|\s*/);
const vendor = await findVendorByName({
name: companyName,
transaction: req.transaction
Expand Down
24 changes: 18 additions & 6 deletions server/util/getUsersFromFile.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
const path = require('path');
const fs = require('fs/promises');

const getUsersFromFile = async file => {
const response = await fetch(
// This needs to be switched back the commented out path.
// `https://raw.githubusercontent.com/w3c/aria-at-app/main/${file}`
`https://raw.githubusercontent.com/w3c/aria-at-app/development/${file}`
);
const roleGroupTxt = await response.text();
const isDeployed =
process.env.ENVIRONMENT === 'sandbox' ||
process.env.ENVIRONMENT === 'staging' ||
process.env.ENVIRONMENT === 'production';

let roleGroupTxt;
if (isDeployed) {
const response = await fetch(
`https://raw.githubusercontent.com/w3c/aria-at-app/development/${file}`
);
roleGroupTxt = await response.text();
} else {
const filePath = path.join(__dirname, `../../${file}`);
roleGroupTxt = await fs.readFile(filePath, { encoding: 'utf8' });
}
const linesRaw = roleGroupTxt.split('\n');
const noComments = linesRaw.filter(line => line.substr(0, 1) !== '#');
const noEmpties = noComments.filter(line => line.trim().length > 0);
Expand Down
Loading