25 Commits

Author SHA1 Message Date
Sean Macfarlane
a952a40eb5 v1.1.18 2021-06-25 17:37:53 -04:00
Sean Macfarlane
6c0e5f959d Merge pull request #104 from Telecominfraproject/hotfix/AutofillCss
hotfix/AutofillCss: Fixed autofill styling
2021-06-25 13:48:09 -04:00
Sean Macfarlane
4450a01397 Merge pull request #105 from Telecominfraproject/hotfix/ApRadiosOrder
hotfix/ApRadiosOrder: Changed USER_FRIENDLY_RADIOS order
2021-06-25 13:46:37 -04:00
irtiza-h30
5d3192e314 changed USER_FRIENDLY_RADIOS order 2021-06-25 13:01:01 -04:00
irtiza-h30
7ccebb107a added all fonts 2021-06-24 14:28:40 -04:00
irtiza-h30
42eaa86893 fixed autofill css 2021-06-24 14:19:26 -04:00
Sean Macfarlane
48f6a64790 Merge pull request #103 from Telecominfraproject/hotfix/ScrollToTopComponent
hotfix/ScrollToTop: Added ScrollToTop  component
2021-06-23 12:16:15 -04:00
irtiza-h30
879c97f44d fixed ScrollToTop import 2021-06-22 18:59:42 -04:00
irtiza-h30
01599ca670 Added ScrollToTop component 2021-06-22 15:30:46 -04:00
Sean Macfarlane
1be788925e v1.1.17 2021-06-21 14:08:57 -04:00
Sean Macfarlane
3697d0b4a9 v1.1.16 2021-06-11 15:23:43 -04:00
Sean Macfarlane
a9655e25aa v1.1.15 2021-06-09 13:10:13 -04:00
Sean Macfarlane
6bd8beb436 v1.1.14 2021-06-07 12:52:10 -04:00
Sean Macfarlane
e023ef0569 v1.1.13 2021-06-02 15:28:40 -04:00
Sean Macfarlane
8d93cf4f73 updated library 2021-06-01 13:53:33 -04:00
Sean Macfarlane
87b056967f v1.1.12 2021-05-31 18:06:04 -04:00
norm-traxler
d6d207c058 Merge pull request #102 from Telecominfraproject/WIFI-2434
WIFI-2434: Update SDK master to use image tag 1.2.0-SNAPSHOT
2021-05-26 23:04:17 -04:00
Akshay Jagadish
0017541d82 WIFI-2434: Update SDK master to use image tag 1.2.0-SNAPSHOT 2021-05-26 19:03:40 -04:00
Sean Macfarlane
eab3476dbe v1.1.11 2021-05-26 15:36:10 -04:00
Sean Macfarlane
ff5b6dc1fc install library 2021-05-21 14:07:36 -04:00
Sean Macfarlane
40033efb61 v1.1.10 2021-05-21 13:43:54 -04:00
Sean Macfarlane
516fb50817 Merge pull request #101 from Telecominfraproject/hotfix/AddProfileFileUpload
hotfix/AddProfileFileUpload: Added file uploading to Add Profile
2021-05-19 13:35:42 -04:00
irtiza-h30
4449465edc Added file uploading to Add Profile 2021-05-18 18:27:11 -04:00
Sean Macfarlane
57f91633c2 v1.1.9 2021-05-13 10:57:50 -04:00
Sean Macfarlane
aa559971d8 WIFI-2013 2021-05-13 10:57:11 -04:00
10 changed files with 73 additions and 15 deletions

View File

@@ -61,7 +61,7 @@ jobs:
[[ "${{ github.ref }}" == "refs/heads/release/"* ]] && VERSION=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\/release\/[v]//' | awk '{print $1"-SNAPSHOT"}') [[ "${{ github.ref }}" == "refs/heads/release/"* ]] && VERSION=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\/release\/[v]//' | awk '{print $1"-SNAPSHOT"}')
# Use Docker `latest` tag convention # Use Docker `latest` tag convention
[ "$VERSION" == "master" ] && VERSION=1.1.0-SNAPSHOT [ "$VERSION" == "master" ] && VERSION=1.2.0-SNAPSHOT
TIMESTAMP=$(date +'%Y-%m-%d') TIMESTAMP=$(date +'%Y-%m-%d')
@@ -96,7 +96,7 @@ jobs:
[[ "${{ github.ref }}" == "refs/heads/release/"* ]] && VERSION=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\/release\/[v]//' | awk '{print $1"-SNAPSHOT"}') [[ "${{ github.ref }}" == "refs/heads/release/"* ]] && VERSION=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\/release\/[v]//' | awk '{print $1"-SNAPSHOT"}')
# Use Docker `latest` tag convention # Use Docker `latest` tag convention
[ "$VERSION" == "master" ] && VERSION=1.1.0-SNAPSHOT [ "$VERSION" == "master" ] && VERSION=1.2.0-SNAPSHOT
echo IMAGE_ID=$IMAGE_ID echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION echo VERSION=$VERSION

View File

@@ -3,9 +3,9 @@ export const COMPANY = 'Telecom Infra Project';
export const USER_FRIENDLY_RADIOS = { export const USER_FRIENDLY_RADIOS = {
is2dot4GHz: '2.4GHz', is2dot4GHz: '2.4GHz',
is5GHz: '5GHz',
is5GHzL: '5GHz (L)', is5GHzL: '5GHz (L)',
is5GHzU: '5GHz (U)', is5GHzU: '5GHz (U)',
is5GHz: '5GHz',
}; };
export const ROUTES = { export const ROUTES = {

View File

@@ -95,7 +95,7 @@ const Accounts = () => {
} }
}; };
const handleCreateUser = (email, password, roles) => { const handleCreateUser = ({ email, password, roles }) => {
createUser({ createUser({
variables: { variables: {
username: email, username: email,
@@ -119,7 +119,7 @@ const Accounts = () => {
); );
}; };
const handleEditUser = (id, email, password, roles, lastModifiedTimestamp) => { const handleEditUser = ({ id, email, password, roles, lastModifiedTimestamp }) => {
updateUser({ updateUser({
variables: { variables: {
id, id,

View File

@@ -4,10 +4,11 @@ import { useMutation, useQuery, gql } from '@apollo/client';
import { notification } from 'antd'; import { notification } from 'antd';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import { ROUTES } from 'constants/index'; import { ROUTES, AUTH_TOKEN } from 'constants/index';
import UserContext from 'contexts/UserContext'; import UserContext from 'contexts/UserContext';
import { GET_ALL_PROFILES } from 'graphql/queries'; import { GET_ALL_PROFILES, GET_API_URL } from 'graphql/queries';
import { fetchMoreProfiles } from 'graphql/functions'; import { fetchMoreProfiles } from 'graphql/functions';
import { getItem } from 'utils/localStorage';
const CREATE_PROFILE = gql` const CREATE_PROFILE = gql`
mutation CreateProfile( mutation CreateProfile(
@@ -35,6 +36,9 @@ const CREATE_PROFILE = gql`
const AddProfile = () => { const AddProfile = () => {
const { customerId } = useContext(UserContext); const { customerId } = useContext(UserContext);
const { data: apiUrl } = useQuery(GET_API_URL);
const { data: ssidProfiles, fetchMore } = useQuery(GET_ALL_PROFILES(), { const { data: ssidProfiles, fetchMore } = useQuery(GET_ALL_PROFILES(), {
variables: { customerId, type: 'ssid' }, variables: { customerId, type: 'ssid' },
fetchPolicy: 'network-only', fetchPolicy: 'network-only',
@@ -116,6 +120,46 @@ const AddProfile = () => {
else fetchMoreProfiles(e, ssidProfiles, fetchMore); else fetchMoreProfiles(e, ssidProfiles, fetchMore);
}; };
const handleFileUpload = async (fileName, file) => {
const token = getItem(AUTH_TOKEN);
if (apiUrl?.getApiUrl) {
fetch(`${apiUrl?.getApiUrl}filestore/${fileName}`, {
method: 'POST',
headers: {
Authorization: token ? `Bearer ${token.access_token}` : '',
'Content-Type': 'application/octet-stream',
},
body: file,
})
.then(response => response.json())
.then(resp => {
if (resp?.success) {
notification.success({
message: 'Success',
description: 'File successfully uploaded.',
});
} else {
notification.error({
message: 'Error',
description: 'File could not be uploaded.',
});
}
})
.catch(() => {
notification.error({
message: 'Error',
description: 'File could not be uploaded.',
});
});
} else {
notification.error({
message: 'Error',
description: 'File could not be uploaded.',
});
}
};
return ( return (
<AddProfilePage <AddProfilePage
onCreateProfile={handleAddProfile} onCreateProfile={handleAddProfile}
@@ -127,6 +171,7 @@ const AddProfile = () => {
idProviderProfiles={idProviderProfiles?.getAllProfiles?.items} idProviderProfiles={idProviderProfiles?.getAllProfiles?.items}
rfProfiles={rfProfiles?.getAllProfiles?.items} rfProfiles={rfProfiles?.getAllProfiles?.items}
onFetchMoreProfiles={handleFetchMoreProfiles} onFetchMoreProfiles={handleFetchMoreProfiles}
fileUpload={handleFileUpload}
/> />
); );
}; };

View File

@@ -75,7 +75,6 @@ const App = () => {
<Helmet titleTemplate={`%s - ${COMPANY}`} defaultTitle={COMPANY}> <Helmet titleTemplate={`%s - ${COMPANY}`} defaultTitle={COMPANY}>
<meta name="description" content={COMPANY} /> <meta name="description" content={COMPANY} />
</Helmet> </Helmet>
<Switch> <Switch>
<UnauthenticatedRoute exact path={ROUTES.login} component={Login} /> <UnauthenticatedRoute exact path={ROUTES.login} component={Login} />
<ProtectedRouteWithLayout exact path={ROUTES.root} component={RedirectToDashboard} /> <ProtectedRouteWithLayout exact path={ROUTES.root} component={RedirectToDashboard} />

View File

@@ -1,11 +1,12 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { RolesProvider } from '@tip-wlan/wlan-cloud-ui-library';
import UserContext from 'contexts/UserContext'; import UserContext from 'contexts/UserContext';
const UserProvider = ({ children, id, email, roles, customerId, updateUser, updateToken }) => ( const UserProvider = ({ children, id, email, roles, customerId, updateUser, updateToken }) => (
<UserContext.Provider value={{ id, email, roles, customerId, updateUser, updateToken }}> <UserContext.Provider value={{ id, email, roles, customerId, updateUser, updateToken }}>
{children} <RolesProvider role={roles}>{children}</RolesProvider>
</UserContext.Provider> </UserContext.Provider>
); );

View File

@@ -14,6 +14,7 @@ import { AUTH_TOKEN } from 'constants/index';
import { REFRESH_TOKEN } from 'graphql/mutations'; import { REFRESH_TOKEN } from 'graphql/mutations';
import { getItem, setItem, removeItem } from 'utils/localStorage'; import { getItem, setItem, removeItem } from 'utils/localStorage';
import history from 'utils/history'; import history from 'utils/history';
import { ScrollToTop } from '@tip-wlan/wlan-cloud-ui-library';
const API_URI = process.env.NODE_ENV === 'production' ? window.REACT_APP_API : process.env.API; const API_URI = process.env.NODE_ENV === 'production' ? window.REACT_APP_API : process.env.API;
const MOUNT_NODE = document.getElementById('root'); const MOUNT_NODE = document.getElementById('root');
@@ -102,6 +103,7 @@ const render = () => {
ReactDOM.render( ReactDOM.render(
<Router history={history}> <Router history={history}>
<ApolloProvider client={client}> <ApolloProvider client={client}>
<ScrollToTop />
<App /> <App />
</ApolloProvider> </ApolloProvider>
</Router>, </Router>,

View File

@@ -1,3 +1,14 @@
body { body {
font-family: 'Lato', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-family: 'Lato', 'Helvetica Neue', Helvetica, Arial, sans-serif;
} }
input:-webkit-autofill,
input:-webkit-autofill:hover,
input:-webkit-autofill:focus,
input:-webkit-autofill:active,
input:-webkit-autofill::first-line {
-webkit-transition: color 9999s ease-out, background-color 9999s ease-out;
transition: color 9999s ease-out, background-color 9999s ease-out;
font-size: 14px !important;
font-family: 'Lato', 'Helvetica Neue', Helvetica, Arial, sans-serif !important;
}

8
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "wlan-cloud-ui", "name": "wlan-cloud-ui",
"version": "1.1.8", "version": "1.1.18",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@@ -2223,9 +2223,9 @@
} }
}, },
"@tip-wlan/wlan-cloud-ui-library": { "@tip-wlan/wlan-cloud-ui-library": {
"version": "1.1.13", "version": "1.1.27",
"resolved": "https://tip.jfrog.io/artifactory/api/npm/tip-wlan-cloud-npm-repo/@tip-wlan/wlan-cloud-ui-library/-/@tip-wlan/wlan-cloud-ui-library-1.1.13.tgz", "resolved": "https://tip.jfrog.io/artifactory/api/npm/tip-wlan-cloud-npm-repo/@tip-wlan/wlan-cloud-ui-library/-/@tip-wlan/wlan-cloud-ui-library-1.1.27.tgz",
"integrity": "sha1-vAxSv7SrTSO2PWIdITaEw7y6ONk=" "integrity": "sha1-riV+vGdlxZNNeMWunxrQ60NSAWw="
}, },
"@types/anymatch": { "@types/anymatch": {
"version": "1.3.1", "version": "1.3.1",

View File

@@ -1,6 +1,6 @@
{ {
"name": "wlan-cloud-ui", "name": "wlan-cloud-ui",
"version": "1.1.8", "version": "1.1.18",
"author": "ConnectUs", "author": "ConnectUs",
"description": "React Portal", "description": "React Portal",
"engines": { "engines": {
@@ -21,7 +21,7 @@
"dependencies": { "dependencies": {
"@ant-design/icons": "^4.2.1", "@ant-design/icons": "^4.2.1",
"@apollo/client": "^3.1.3", "@apollo/client": "^3.1.3",
"@tip-wlan/wlan-cloud-ui-library": "^1.1.13", "@tip-wlan/wlan-cloud-ui-library": "^1.1.27",
"antd": "^4.5.2", "antd": "^4.5.2",
"apollo-upload-client": "^13.0.0", "apollo-upload-client": "^13.0.0",
"graphql": "^15.5.0", "graphql": "^15.5.0",