diff --git a/package.json b/package.json index b2386e1b6..156997370 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ ], "transform": { "\\.[jt]sx?$": "babel-jest", - ".+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$": "jest-transform-stub" + ".+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2|yml)$": "jest-transform-stub" }, "moduleDirectories": [ "node_modules", diff --git a/src/actions/sponsorship-actions.js b/src/actions/sponsorship-actions.js index e2d6d0721..625ecc7ae 100644 --- a/src/actions/sponsorship-actions.js +++ b/src/actions/sponsorship-actions.js @@ -27,6 +27,7 @@ import { fetchResponseHandler, fetchErrorHandler } from "openstack-uicore-foundation/lib/utils/actions"; +import _ from "lodash"; import URI from "urijs"; import history from "../history"; import { getAccessTokenSafely } from "../utils/methods"; diff --git a/src/app.js b/src/app.js index edf4be49d..83342cc97 100644 --- a/src/app.js +++ b/src/app.js @@ -32,8 +32,8 @@ import T from "i18n-react"; import { LocalizationProvider } from "@mui/x-date-pickers"; import { AdapterMoment } from "@mui/x-date-pickers/AdapterMoment"; // eslint-disable-next-line -import exclusiveSections from "js-yaml-loader!./exclusive-sections.yml"; import * as Sentry from "@sentry/react"; +import exclusiveSections from "./exclusive-sections.yml"; import CustomErrorPage from "./pages/custom-error-page"; import history from "./history"; import PrimaryLayout from "./layouts/primary-layout"; diff --git a/src/models/member.js b/src/models/member.js index d0318e238..74c82209c 100644 --- a/src/models/member.js +++ b/src/models/member.js @@ -9,9 +9,9 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - **/ + * */ -import access from "js-yaml-loader!../access-routes.yml"; +import access from "../access-routes.yml"; class Member { constructor(member) { @@ -23,7 +23,7 @@ class Member { if (!this._member) return false; - for (var i in this._member.groups) { + for (const i in this._member.groups) { if (access[accessRoute].includes(this._member.groups[i].code)) return true; } @@ -32,7 +32,7 @@ class Member { } canEditSummit() { - for (var i in this._member.groups) { + for (const i in this._member.groups) { if (access["summit-edit"].includes(this._member.groups[i].code)) return true; } @@ -41,7 +41,7 @@ class Member { } canAddSummits() { - for (var i in this._member.groups) { + for (const i in this._member.groups) { if (access["summit-add"].includes(this._member.groups[i].code)) return true; } @@ -49,7 +49,7 @@ class Member { } canDeleteSummits() { - for (var i in this._member.groups) { + for (const i in this._member.groups) { if (access["summit-delete"].includes(this._member.groups[i].code)) return true; } @@ -57,7 +57,7 @@ class Member { } canDeleteSpeakers() { - for (var i in this._member.groups) { + for (const i in this._member.groups) { if (access["speakers-delete"].includes(this._member.groups[i].code)) return true; } @@ -65,7 +65,7 @@ class Member { } canEditSpeakers() { - for (var i in this._member.groups) { + for (const i in this._member.groups) { if (access["speakers-edit"].includes(this._member.groups[i].code)) return true; } @@ -73,7 +73,7 @@ class Member { } canAddSpeakers() { - for (var i in this._member.groups) { + for (const i in this._member.groups) { if (access["speakers-add"].includes(this._member.groups[i].code)) return true; } @@ -81,7 +81,7 @@ class Member { } canAddSponsors() { - for (var i in this._member.groups) { + for (const i in this._member.groups) { if (access["sponsors-add"].includes(this._member.groups[i].code)) return true; } @@ -89,7 +89,7 @@ class Member { } canEditSponsors() { - for (var i in this._member.groups) { + for (const i in this._member.groups) { if (access["sponsors-edit"].includes(this._member.groups[i].code)) return true; } @@ -97,7 +97,7 @@ class Member { } canDeleteSponsors() { - for (var i in this._member.groups) { + for (const i in this._member.groups) { if (access["sponsors-delete"].includes(this._member.groups[i].code)) return true; } @@ -105,7 +105,7 @@ class Member { } canEditBadgeScans() { - for (var i in this._member.groups) { + for (const i in this._member.groups) { if (access["badge-scans-edit"].includes(this._member.groups[i].code)) return true; } @@ -113,7 +113,7 @@ class Member { } canEditSponsorExtraQuestions() { - for (var i in this._member.groups) { + for (const i in this._member.groups) { if ( access["sponsors-extra-questions-edit"].includes( this._member.groups[i].code @@ -125,7 +125,7 @@ class Member { } canEditLeadReportSettings() { - for (var i in this._member.groups) { + for (const i in this._member.groups) { if ( access["lead-report-settings-edit"].includes( this._member.groups[i].code diff --git a/webpack.common.js b/webpack.common.js index 754ec90f3..f528ca33a 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -134,7 +134,7 @@ module.exports = { use: "file-loader?name=svg/[name].[ext]!svgo-loader" }, { - test: /\.yaml$/, + test: /\.ya?ml$/, use: "js-yaml-loader" }, // word around for react dnd