scottk/wlan-cloud-ui
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ui.git synced 2025-11-03 12:18:08 +00:00
Code Issues Packages Projects Releases 7 Wiki Activity

Merge branch 'master' into NOJIRA-replace-highcharts

Browse Source
This commit is contained in:
Sean Macfarlane
2021-05-03 14:46:43 -04:00
parent 90c4e5bedc debd0712b3
commit 2c0171fe7a
5 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/dockerpublish.yml vendored
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=0.0.1-SNAPSHOT [ "$VERSION" == "master" ] && VERSION=1.1.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=0.0.1-SNAPSHOT [ "$VERSION" == "master" ] && VERSION=1.1.0-SNAPSHOT
echo IMAGE_ID=$IMAGE_ID echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION echo VERSION=$VERSION

1
app/containers/Network/containers/AccessPointDetails/index.js
View File

@@ -63,6 +63,7 @@ const AccessPointDetails = ({ locations }) => {
}`), }`),
{ {
variables: { customerId, type: 'equipment_ap' }, variables: { customerId, type: 'equipment_ap' },
fetchPolicy: 'network-only',
} }
); );

12
app/containers/System/containers/AutoProvision/index.js
View File

@@ -6,6 +6,7 @@ import { AutoProvision as AutoProvisionPage, Loading } from '@tip-wlan/wlan-clou
import UserContext from 'contexts/UserContext'; import UserContext from 'contexts/UserContext';
import { GET_CUSTOMER, GET_ALL_LOCATIONS, GET_ALL_PROFILES } from 'graphql/queries'; import { GET_CUSTOMER, GET_ALL_LOCATIONS, GET_ALL_PROFILES } from 'graphql/queries';
import { UPDATE_CUSTOMER } from 'graphql/mutations'; import { UPDATE_CUSTOMER } from 'graphql/mutations';
import { fetchMoreProfiles } from 'graphql/functions';
const AutoProvision = () => { const AutoProvision = () => {
const { customerId } = useContext(UserContext); const { customerId } = useContext(UserContext);
@@ -14,13 +15,13 @@ const AutoProvision = () => {
}); });
const [updateCustomer] = useMutation(UPDATE_CUSTOMER); const [updateCustomer] = useMutation(UPDATE_CUSTOMER);
const { data: dataLocation, loading: loadingLoaction, error: errorLocation } = useQuery( const { data: dataLocation, loading: loadingLocation, error: errorLocation } = useQuery(
GET_ALL_LOCATIONS, GET_ALL_LOCATIONS,
{ {
variables: { customerId }, variables: { customerId },
} }
); );
const { data: dataProfile, loading: loadingProfile, error: errorProfile } = useQuery( const { data: dataProfile, loading: loadingProfile, error: errorProfile, fetchMore } = useQuery(
GET_ALL_PROFILES(), GET_ALL_PROFILES(),
{ {
variables: { customerId, type: 'equipment_ap', limit: 100 }, variables: { customerId, type: 'equipment_ap', limit: 100 },
@@ -60,6 +61,10 @@ const AutoProvision = () => {
); );
}; };
const handleFetchMoreProfiles = e => {
fetchMoreProfiles(e, dataProfile, fetchMore);
};
if (loading) { if (loading) {
return <Loading />; return <Loading />;
} }
@@ -75,11 +80,12 @@ const AutoProvision = () => {
data={data && data.getCustomer} data={data && data.getCustomer}
dataLocation={dataLocation && dataLocation.getAllLocations} dataLocation={dataLocation && dataLocation.getAllLocations}
dataProfile={dataProfile && dataProfile.getAllProfiles.items} dataProfile={dataProfile && dataProfile.getAllProfiles.items}
loadingLoaction={loadingLoaction} loadingLocation={loadingLocation}
loadingProfile={loadingProfile} loadingProfile={loadingProfile}
errorLocation={errorLocation} errorLocation={errorLocation}
errorProfile={errorProfile} errorProfile={errorProfile}
onUpdateCustomer={handleUpdateCustomer} onUpdateCustomer={handleUpdateCustomer}
onFetchMoreProfiles={handleFetchMoreProfiles}
/> />
); );
}; };

8
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "wlan-cloud-ui", "name": "wlan-cloud-ui",
"version": "1.1.1", "version": "1.1.7",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@@ -2222,9 +2222,15 @@
} }
}, },
"@tip-wlan/wlan-cloud-ui-library": { "@tip-wlan/wlan-cloud-ui-library": {
<<<<<<< HEAD
"version": "1.1.4", "version": "1.1.4",
"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.4.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.4.tgz",
"integrity": "sha1-pAB8TRmyP4nHB8W4+zBQFZqulI8=" "integrity": "sha1-pAB8TRmyP4nHB8W4+zBQFZqulI8="
=======
"version": "1.1.12",
"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.12.tgz",
"integrity": "sha1-pGw7ycPlaN4i6OZXK5b3paDou5s="
>>>>>>> master
}, },
"@types/anymatch": { "@types/anymatch": {
"version": "1.3.1", "version": "1.3.1",

8
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "wlan-cloud-ui", "name": "wlan-cloud-ui",
"version": "1.1.1", "version": "1.1.7",
"author": "ConnectUs", "author": "ConnectUs",
"description": "React Portal", "description": "React Portal",
"engines": { "engines": {
@@ -10,8 +10,8 @@
"scripts": { "scripts": {
"test": "jest --passWithNoTests --coverage", "test": "jest --passWithNoTests --coverage",
"start": "cross-env NODE_ENV=development webpack serve", "start": "cross-env NODE_ENV=development webpack serve",
"start:bare": "cross-env API=ttps://portal.rtl.lab.netexperience.com NODE_ENV=bare webpack serve", "start:bare": "cross-env API=https://wlan-graphql.tip-sdk.lab.netexperience.com NODE_ENV=bare webpack serve",
"start:dev": "cross-env API=https://portal.rtl.lab.netexperience.com NODE_ENV=development webpack serve", "start:dev": "cross-env API=https://wlan-graphql.tip-sdk.lab.netexperience.com NODE_ENV=development webpack serve",
"build": "webpack --mode=production", "build": "webpack --mode=production",
"format": "prettier --write 'app/**/*{.js,.scss}'", "format": "prettier --write 'app/**/*{.js,.scss}'",
"eslint-fix": "eslint --fix 'app/**/*.js'", "eslint-fix": "eslint --fix 'app/**/*.js'",
@@ -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.3", "@tip-wlan/wlan-cloud-ui-library": "^1.1.12",
"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",