From 18e81bc60800ad040f3a4f2747a0675fd9d594c4 Mon Sep 17 00:00:00 2001 From: Daniel Valadas Date: Tue, 1 Sep 2020 03:26:40 -0400 Subject: [PATCH 1/2] Fixes 2 wrong svg imports in resource-manager Somewhere in god knows which update of which dependency, the way to import svgs using raw-loaders changed and we have to add .default to the import. This PR solves that in the resource-manager module. --- .../app/components/FolderSelector/FolderSelector.jsx | 2 +- .../app/components/FolderSelector/Folders.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/FolderSelector.jsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/FolderSelector.jsx index 84b3038cbba..d38a85228f3 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/FolderSelector.jsx +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/FolderSelector.jsx @@ -4,7 +4,7 @@ import Folders from "./Folders"; import { Scrollbars } from "react-custom-scrollbars"; import "./style.less"; -const searchIconImage = require("!raw-loader!./img/search.svg"); +const searchIconImage = require("./img/search.svg").default; export default class FolderSelector extends Component { diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/Folders.jsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/Folders.jsx index 37ebfe23be2..65b30d91136 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/Folders.jsx +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/Folders.jsx @@ -2,7 +2,7 @@ import React, { Component } from "react"; import { PropTypes } from "prop-types"; import "./style.less"; -const folderIcon = require("!raw-loader!./img/folder.svg"); +const folderIcon = require("./img/folder.svg").default; export default class Folders extends Component { From e61e190cbd920c0294fc2e772e9a32f688892799 Mon Sep 17 00:00:00 2001 From: Daniel Valadas Date: Tue, 1 Sep 2020 03:28:43 -0400 Subject: [PATCH 2/2] Actually commit the right change... --- .../app/components/FolderSelector/FolderSelector.jsx | 2 +- .../app/components/FolderSelector/Folders.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/FolderSelector.jsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/FolderSelector.jsx index d38a85228f3..c1dc99e97a5 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/FolderSelector.jsx +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/FolderSelector.jsx @@ -4,7 +4,7 @@ import Folders from "./Folders"; import { Scrollbars } from "react-custom-scrollbars"; import "./style.less"; -const searchIconImage = require("./img/search.svg").default; +const searchIconImage = require("!raw-loader!./img/search.svg").default; export default class FolderSelector extends Component { diff --git a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/Folders.jsx b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/Folders.jsx index 65b30d91136..4cc00d55afa 100644 --- a/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/Folders.jsx +++ b/DNN Platform/Modules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/Folders.jsx @@ -2,7 +2,7 @@ import React, { Component } from "react"; import { PropTypes } from "prop-types"; import "./style.less"; -const folderIcon = require("./img/folder.svg").default; +const folderIcon = require("!raw-loader!./img/folder.svg").default; export default class Folders extends Component {