Merge pull request #77 from ligangty/2.0-refactor

Re-organize all utils into /utils folder

src/main/webui/src/app/components/ComponentConstants.js

@@ -26,8 +26,5 @@ const hostedOptionLegend = [
   {icon: 'D', title: 'Deployment allowed'}
 ];
 
-// TODO: this should be fetched from backend
-const PACKAGE_TYPES = ["maven", "generic","npm"];
 
-
-export {remoteOptionLegend, hostedOptionLegend, PACKAGE_TYPES};
+export {remoteOptionLegend, hostedOptionLegend};

src/main/webui/src/app/components/content/RemoteEdit.jsx

@@ -20,11 +20,9 @@ import {PropTypes} from 'prop-types';
 import {StoreEditControlPanel as EditControlPanel} from './common/StoreControlPanels.jsx';
 import {DisableTimeoutHint, DurationHint, PrefetchHint, Hint} from './common/Hints.jsx';
 // import ViewJsonDebugger from './Debugger.jsx';
-import {Utils} from '../CompUtils.js';
-// import Filters from '../Filters.js';
-import {TimeUtils} from '../../TimeUtils.js';
-import {PACKAGE_TYPES} from '../ComponentConstants.js';
-import {jsonRest} from '../../RestClient.js';
+import {Utils} from '../../utils/AppUtils.js';
+import {TimeUtils} from '../../utils/TimeUtils.js';
+import {jsonRest} from '../../utils/RestClient.js';
 
 const init = (pkgType, storeName, setState) => {
   const getUrl = `/api/admin/stores/${pkgType}/remote/${storeName}`;
@@ -121,8 +119,8 @@ export default function RemoteEdit() {
   // Utils.logMessage(mode);
   let storeView = state.storeView;
   // let store = state.store;
-  // TODO this package types should be fetched from backend
-  let pkgTypes = PACKAGE_TYPES;
+  // TODO: this package types should be fetched from backend
+  let pkgTypes = ["maven", "generic-http", "npm"];
 
   const handleCheckChange = (event, field) => {
     if (event.target.checked) {

src/main/webui/src/app/components/content/RemoteList.jsx

@@ -18,9 +18,9 @@ import React, {useEffect, useState} from 'react';
 import {ListJsonDebugger} from './common/Debugger.jsx';
 import ListControl from "./common/ListControl.jsx";
 import {remoteOptionLegend as options} from "../ComponentConstants.js";
-import {Utils} from '../CompUtils.js';
 import {StoreListingWidget} from './common/StoreListingWidget.jsx';
-import {jsonRest} from '../../RestClient.js';
+import {Utils} from '../../utils/AppUtils.js';
+import {jsonRest} from '../../utils/RestClient.js';
 
 const init = (state, setState) => {
   useEffect(()=>{

src/main/webui/src/app/components/content/RemoteView.jsx

@@ -20,10 +20,10 @@ import {PropTypes} from 'prop-types';
 import {StoreViewControlPanel as ControlPanel} from './common/StoreControlPanels.jsx';
 import {DisableTimeoutHint, PrefetchHint, Hint, PasswordMask} from './common/Hints.jsx';
 // import ViewJsonDebugger from './Debugger.jsx';
-import {Utils} from '../CompUtils.js';
-import {Filters} from '../Filters.js';
-import {TimeUtils} from '../../TimeUtils.js';
-import {jsonRest} from '../../RestClient.js';
+import {Filters} from '../../utils/Filters.js';
+import {Utils} from '../../utils/AppUtils.js';
+import {TimeUtils} from '../../utils/TimeUtils.js';
+import {jsonRest} from '../../utils/RestClient.js';
 
 const init = (pkgType, storeName, setState) => {
   const storeUrl = `/api/admin/stores/${pkgType}/remote/${storeName}`;

src/main/webui/src/app/components/content/common/CommonPageWidget.jsx

@@ -17,7 +17,7 @@
 import React, {Fragment} from 'react';
 import {Link} from 'react-router-dom';
 import {PropTypes} from 'prop-types';
-import {Utils} from '../../CompUtils.js';
+import {Utils} from '../../../utils/AppUtils.js';
 
 const LocalURLSection = ({storeKey}) => <div className="left-half">
     <label>Local URL:</label>{' '}
@@ -28,7 +28,7 @@ LocalURLSection.propTypes = {
   storeKey: PropTypes.string
 };
 
-// For options, see CompUtils.remoteOptions|hostedOptions
+// For options, see AppUtils.remoteOptions|hostedOptions
 const CapabilitiesSection = ({options}) => <div className="left-half">
     <label>Capabilities:</label>{' '}
     {

src/main/webui/src/app/components/content/common/PackageTypeSelect.jsx

@@ -16,7 +16,7 @@
 
 import React, {useState, useEffect} from 'react';
 import {PropTypes} from 'prop-types';
-import {jsonRest} from '../../../RestClient.js';
+import {jsonRest} from '../../../utils/RestClient.js';
 
 export const PackageTypeSelect = ({pkgType,vauleChangeHandler}) =>{
   const [state, setState] = useState({

src/main/webui/src/app/components/content/common/StoreControlPanels.jsx

@@ -17,8 +17,8 @@
 import React from 'react';
 import {useNavigate} from 'react-router-dom';
 import {PropTypes} from 'prop-types';
-import {Utils} from '../../CompUtils';
-import {http} from '../../../RestClient';
+import {Utils} from '../../../utils/AppUtils';
+import {http} from '../../../utils/RestClient';
 
 const StoreEditControlPanel = ({handleSave, handleCancel, handleRemove}) => <div className="cp-row">
     <button name="save" onClick={handleSave} className="cp-button">Save</button>{'  '}

src/main/webui/src/app/components/content/common/StoreListingWidget.jsx

@@ -16,7 +16,7 @@
 
 import React, {Fragment} from 'react';
 import {PropTypes} from 'prop-types';
-import {Utils} from '../../CompUtils.js';
+import {Utils} from '../../../utils/AppUtils.js';
 import {LocalURLSection,StoreNameSection,CapabilitiesSection} from './CommonPageWidget.jsx';
 
 export const StoreListingWidget = ({StoreList, DisMap, StoreType}) => {

src/main/webui/src/app/components/nav/NavFooter.jsx

@@ -15,8 +15,8 @@
  */
 
 import React, {useEffect, useState} from 'react';
-import {jsonRest} from '../../RestClient';
-import {Utils} from '../CompUtils';
+import {jsonRest} from '../../utils/RestClient';
+import {Utils} from '../../utils/AppUtils';
 
 export default function NavFooter() {
   const [state, setState] = useState({stats: {}});

src/main/webui/src/content-browse/DirectoryListing.jsx

@@ -17,7 +17,7 @@
 import React, {useState, useEffect} from 'react';
 import {PropTypes} from 'prop-types';
 import {styles} from './style.js';
-import {jsonRest} from '../app/RestClient.js';
+import {jsonRest} from '../app/utils/RestClient.js';
 
 const replaceUrl = url =>{
   if (url.includes("api/browse")){