diff options
336 files changed, 23847 insertions, 13579 deletions
diff --git a/deliveries/.env b/deliveries/.env new file mode 100644 index 00000000..fa307685 --- /dev/null +++ b/deliveries/.env @@ -0,0 +1,17 @@ +# Environment settings +# used by docker-compose AND by other shell scripts + +# Host directory with config files +PROJECT_DIR=/PROJECT/OpenSource/UbuntuEP + +# Directory within containers +WEBAPPS_DIR=/opt/apache-tomcat-8.0.37/webapps + +# Following are ALSO used in demo/boot/portal_vm_init.sh +EP_IMG_NAME=portal-apps +DB_IMG_NAME=portal-db +WMS_IMG_NAME=portal-wms +# Tag all images with this +PORTAL_TAG=1.1.0 + +NEXUS_REPO=nexus3.onap.org:10003 diff --git a/deliveries/.gitignore b/deliveries/.gitignore index f12ac3a0..796b96d1 100644 --- a/deliveries/.gitignore +++ b/deliveries/.gitignore @@ -1 +1 @@ -/PROJECT +/build diff --git a/deliveries/Apps_Users_OnBoarding_Script.sql b/deliveries/Apps_Users_OnBoarding_Script.sql index ff3d3e96..2d1adfb5 100644 --- a/deliveries/Apps_Users_OnBoarding_Script.sql +++ b/deliveries/Apps_Users_OnBoarding_Script.sql @@ -345,14 +345,14 @@ select * from fn_role where app_id = (select app_id from fn_app where app_name = ) b ); -- end new -INSERT INTO `fn_common_widget_data` (`id`,`CATEGORY`,`HREF`,`TITLE`,`content`,`event_date`,`SORT_ORDER`) VALUES (6,'NEWS','http://about.att.com/innovationblog/next_att_labs','What\s Next at AT&T Labs? AI Set to Revolutionize the Network',NULL,NULL,10); -INSERT INTO `fn_common_widget_data` (`id`,`CATEGORY`,`HREF`,`TITLE`,`content`,`event_date`,`SORT_ORDER`) VALUES (7,'NEWS','http://about.att.com/innovationblog/ecomp_code','Code, Community and Commitment – the 3 Cs of Open Source',NULL,NULL,20); +INSERT INTO `fn_common_widget_data` (`id`,`CATEGORY`,`HREF`,`TITLE`,`content`,`event_date`,`SORT_ORDER`) VALUES (6,'NEWS','http://about.att.com/innovationblog/next_att_labs','What\'s Next at AT&T Labs? AI Set to Revolutionize the Network',NULL,NULL,10); +INSERT INTO `fn_common_widget_data` (`id`,`CATEGORY`,`HREF`,`TITLE`,`content`,`event_date`,`SORT_ORDER`) VALUES (7,'NEWS','http://about.att.com/innovationblog/ecomp_code','Code, Community and Commitment - the 3 Cs of Open Source',NULL,NULL,20); INSERT INTO `fn_common_widget_data` (`id`,`CATEGORY`,`HREF`,`TITLE`,`content`,`event_date`,`SORT_ORDER`) VALUES (8,'NEWS','http://about.att.com/story/orange_testing_att_open_source_ecomp_platform.html','Orange Testing AT&Ts Open Source ECOMP Platform for Building Software-Defined Network Capabilities',NULL,NULL,30); INSERT INTO `fn_common_widget_data` (`id`,`CATEGORY`,`HREF`,`TITLE`,`content`,`event_date`,`SORT_ORDER`) VALUES (9,'NEWS', 'http://about.att.com/innovationblog/linux_foundation','Opening up ECOMP: Our Network Operating System for SDN',NULL,NULL,40); INSERT INTO `fn_common_widget_data` (`id`,`CATEGORY`,`HREF`,`TITLE`,`content`,`event_date`,`SORT_ORDER`) VALUES (10,'EVENTS',NULL,'OpenECOMP Launches into Open Source',NULL,'2017-02-14',1); INSERT INTO `fn_common_widget_data` (`id`,`CATEGORY`,`HREF`,`TITLE`,`content`,`event_date`,`SORT_ORDER`) VALUES (11,'IMPORTANTRESOURCES','http://about.att.com/content/dam/snrdocs/ecomp.pdf','ECOMP White Paper',NULL,NULL,1); INSERT INTO `fn_common_widget_data` (`id`,`CATEGORY`,`HREF`,`TITLE`,`content`,`event_date`,`SORT_ORDER`) VALUES (12,'IMPORTANTRESOURCES','https://wiki.onap.org/','ONAP Wiki',NULL,NULL,2); -INSERT INTO `fn_common_widget_data` (`id`,`CATEGORY`,`HREF`,`TITLE`,`content`,`event_date`,`SORT_ORDER`) VALUES (13,'IMPORTANTRESOURCES','https://wiki.onap.org/display/DW/Portal','ONAP Wiki, Portal',NULL,NULL,3); +INSERT INTO `fn_common_widget_data` (`id`,`CATEGORY`,`HREF`,`TITLE`,`content`,`event_date`,`SORT_ORDER`) VALUES (13,'IMPORTANTRESOURCES','https://wiki.onap.org/display/DW/Portal','ONAP Wiki for Portal',NULL,NULL,3); INSERT INTO `fn_common_widget_data` (`id`,`CATEGORY`,`HREF`,`TITLE`,`content`,`event_date`,`SORT_ORDER`) VALUES (14,'IMPORTANTRESOURCES','https://wiki.onap.org/display/DW/Development+Guides','ONAP User Guide',NULL,NULL,4); diff --git a/deliveries/Dockerfile.mariadb b/deliveries/Dockerfile.mariadb index 004e7af8..5b0abd51 100644 --- a/deliveries/Dockerfile.mariadb +++ b/deliveries/Dockerfile.mariadb @@ -1,34 +1,28 @@ FROM mariadb:latest -#Author -MAINTAINER Manoop talasila@research.att.com - -ARG SCRIPT_DIR=${SCRIPT_DIR} -ARG SCRIPT_COMMON_DIR=${SCRIPT_COMMON_DIR} +ARG PORTAL_SCRIPT_DIR=${PORTAL_SCRIPT_DIR} ARG SDK_SCRIPT_DIR=${SDK_SCRIPT_DIR} -ARG SDK_COMMON_SCRIPT_DIR=${SDK_COMMON_SCRIPT_DIR} -ARG DBC_COMMON_SCRIPT_DIR=${DBC_COMMON_SCRIPT_DIR} ARG DBC_SCRIPT_DIR=${DBC_SCRIPT_DIR} # constant #Add config file -ADD my.cnf /etc/mysql/my.cnf +COPY my.cnf /etc/mysql/my.cnf #ADD cluster.cnf /etc/mysql/conf.d # Scripts are executed in alphabetical order -# Portal DDL and DML -ADD ${SCRIPT_COMMON_DIR}/EcompPortalDDLMySql_1707_Common.sql docker-entrypoint-initdb.d -ADD ${SCRIPT_DIR}/EcompPortalDDLMySql_1707_OS.sql docker-entrypoint-initdb.d -ADD ${SCRIPT_COMMON_DIR}/EcompPortalDMLMySql_1707_Common.sql docker-entrypoint-initdb.d -ADD ${SCRIPT_DIR}/EcompPortalDMLMySql_1707_OS.sql docker-entrypoint-initdb.d -ADD Apps_Users_OnBoarding_Script.sql docker-entrypoint-initdb.d/EcompPortalDMLMySql_1707_z_apps_users.sql +# Portal DDL and DML at 1710 +COPY ${PORTAL_SCRIPT_DIR}/EcompPortalDDLMySql_1710_Common.sql /docker-entrypoint-initdb.d/ +COPY ${PORTAL_SCRIPT_DIR}/EcompPortalDDLMySql_1710_OS.sql /docker-entrypoint-initdb.d/ +COPY ${PORTAL_SCRIPT_DIR}/EcompPortalDMLMySql_1710_Common.sql /docker-entrypoint-initdb.d/ +COPY ${PORTAL_SCRIPT_DIR}/EcompPortalDMLMySql_1710_OS.sql /docker-entrypoint-initdb.d/ +COPY Apps_Users_OnBoarding_Script.sql /docker-entrypoint-initdb.d/EcompPortalDMLMySql_1710_z_apps_users.sql -# SDK App DDL and DML -ADD ${SDK_COMMON_SCRIPT_DIR}/EcompSdkDDLMySql_1707_Common.sql docker-entrypoint-initdb.d -ADD ${SDK_SCRIPT_DIR}/EcompSdkDDLMySql_1707_OS.sql docker-entrypoint-initdb.d -ADD ${SDK_COMMON_SCRIPT_DIR}/EcompSdkDMLMySql_1707_Common.sql docker-entrypoint-initdb.d -ADD ${SDK_SCRIPT_DIR}/EcompSdkDMLMySql_1707_OS.sql docker-entrypoint-initdb.d +# SDK App DDL and DML unchanged since 1707 +COPY ${SDK_SCRIPT_DIR}/EcompSdkDDLMySql_1707_Common.sql /docker-entrypoint-initdb.d/ +COPY ${SDK_SCRIPT_DIR}/EcompSdkDDLMySql_1707_OS.sql /docker-entrypoint-initdb.d/ +COPY ${SDK_SCRIPT_DIR}/EcompSdkDMLMySql_1707_Common.sql /docker-entrypoint-initdb.d/ +COPY ${SDK_SCRIPT_DIR}/EcompSdkDMLMySql_1707_OS.sql /docker-entrypoint-initdb.d/ -# DBC App combined DDL/DML, built by os_build_febe.sh -ADD ${DBC_SCRIPT_DIR}/dbca-complete-mysql-1707-os.sql docker-entrypoint-initdb.d +# DBC App combined DDL/DML, built by script +COPY ${DBC_SCRIPT_DIR}/dbca-complete-mysql-1707-os.sql /docker-entrypoint-initdb.d/ diff --git a/deliveries/Dockerfile.portalapps b/deliveries/Dockerfile.portalapps index 3e295e8f..c9fab4db 100644 --- a/deliveries/Dockerfile.portalapps +++ b/deliveries/Dockerfile.portalapps @@ -1,7 +1,10 @@ # Dockerfile for image with ONAP applications: # Portal app, Portal-SDK app, Portal-DBC app. -FROM openjdk:8-jdk +# Yields an image 823 MB +FROM frolvlad/alpine-oraclejdk8:slim +# Yields an image 1.4 GB +# FROM openjdk:8-jdk # Arguments are supplied by build.sh script # the defaults below only support testing @@ -12,21 +15,28 @@ ARG DBC_WAR=build/dmaap-bc-app-os.war ARG HTTP_PROXY ARG HTTPS_PROXY -# This is just a variable, never passed in -ARG TOMCATHOME=/opt/apache-tomcat-8.0.37 +# Just variables, never passed in +ARG TOMCAT=apache-tomcat-8.0.37 +ARG TOMCATTAR=${TOMCAT}.tar.gz +ARG TOMCATHOME=/opt/${TOMCAT} ENV http_proxy $HTTP_PROXY ENV https_proxy $HTTPS_PROXY RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi -# Install Tomcat; curl is already part of this image +# Install the wait script +COPY wait-for.sh / + +# Install Tomcat. This image already has curl. WORKDIR /tmp -RUN curl -s -O https://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin/apache-tomcat-8.0.37.tar.gz -RUN tar -xzf apache-tomcat-8.0.37.tar.gz +RUN wget -q http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin/apache-tomcat-8.0.37.tar.gz +RUN tar -xzf ${TOMCATTAR} +RUN rm ${TOMCATTAR} # Remove manager and sample apps -RUN rm -fr apache-tomcat-8.0.37/webapps/[a-z]* -RUN mv apache-tomcat-8.0.37 /opt +RUN rm -fr ${TOMCAT}/webapps/[a-z]* +RUN mkdir -p /opt +RUN mv ${TOMCAT} /opt WORKDIR ${TOMCATHOME}/webapps RUN mkdir ECOMPPORTAL && mkdir ECOMPSDKAPP && mkdir ECOMPDBCAPP @@ -46,9 +56,12 @@ RUN cd ECOMPDBCAPP && unzip -q *.war && rm *.war VOLUME ${TOMCATHOME}/logs +# Switch back to root +WORKDIR / + # Define commonly used ENV variables ENV PATH $PATH:$JAVA_HOME/bin:${TOMCATHOME}/bin -COPY configure-and-run.sh / +COPY start-apps-cmd.sh / # Define default command. -CMD ["/configure-and-run.sh"] +CMD /start-apps-cmd.sh diff --git a/deliveries/Dockerfile.widgetms b/deliveries/Dockerfile.widgetms new file mode 100644 index 00000000..16bf60b1 --- /dev/null +++ b/deliveries/Dockerfile.widgetms @@ -0,0 +1,18 @@ +# Large image +# FROM openjdk:8-jdk +# Very small image +FROM frolvlad/alpine-oraclejdk8:slim + +# Arguments are supplied by build script; +# the defaults below only support testing +ARG WMS_JAR=build/widget-ms.jar +# Launch script +COPY start-wms-cmd.sh / +# Wait script, which depends on nc +COPY wait-for.sh / +# Onejar +COPY ${WMS_JAR} /app.jar +RUN sh -c 'touch /app.jar' +VOLUME /tmp +ENV JAVA_OPTS="" +CMD /start-wms-cmd.sh diff --git a/deliveries/README.md b/deliveries/README.md index bc9bc3fe..99832c8e 100644 --- a/deliveries/README.md +++ b/deliveries/README.md @@ -1 +1,6 @@ - "moved insert statement to fn_common_widget_data table from EcompPortalDMLMySql_1707_OS.sql to Apps_Users_OnBoarding_Script.sql, the Onboard script in deliveries folder". +This directory has configuration files for building docker images, +and management files for starting and stopping docker containers. + +The Apps_Users_OnBoarding_Script.sql file has data for ONAP demo deployments: +it adds users and applications so the Portal app has meaningful content on +startup. These were moved from script EcompPortalDMLMySql_1707_OS.sql. diff --git a/deliveries/build_portalapps_dockers.sh b/deliveries/build_portalapps_dockers.sh index a45e55cc..ead31e82 100755 --- a/deliveries/build_portalapps_dockers.sh +++ b/deliveries/build_portalapps_dockers.sh @@ -8,16 +8,9 @@ # Stop on error; show output set -e -x -# For debugging only bcox the FE build takes a long time -SKIPFE=N -if [ $# -gt 0 -a "$1" == "skipfe" ] ; then - echo "Skipping Portal-FE build step" - SKIPFE=Y -fi - -# Establish environment variables -echo "Set variables" -source $(dirname $0)/os_settings.sh +# This reuses the docker-compose file +echo "Set image tag name variables" +source $(dirname $0)/.env # Work standalone AND in the ONAP Jenkins. # Pick up Jenkins settings for this script. @@ -25,70 +18,91 @@ source $(dirname $0)/os_settings.sh if [ -n "$MVN" ]; then export MVN="${MVN} -B -gs ${GLOBAL_SETTINGS_FILE} -s ${SETTINGS_FILE}" else - MVN=mvn + # Force refresh of snapshots + MVN="mvn -B -U" fi # This expects to start in the deliveries folder; make sure -DOCKERFILE=Dockerfile.portalapps -if [ ! -f $DOCKERFILE ] ; then - echo "Failed to find expected file; must start in deliveries folder" +PORTAL_DOCKERFILE=Dockerfile.portalapps +if [ ! -f $PORTAL_DOCKERFILE ] ; then + echo "Failed to find file ${PORTAL_DOCKERFILE}; must start in deliveries folder; exiting" exit 1 fi -# Establish directories and variables +# Store directory names as variables +# This is the Docker Project area. DELIV="$(pwd)" -# Relative path of temp directory -BUILD="build" -# Absolute path of temp directory -OUT=$DELIV/$BUILD -if [ $SKIPFE == "Y" ]; then - echo "Skipping clean/recreate of $OUT" -else - rm -fr $OUT - mkdir $OUT -fi -# parent directory +# parent directory, for finding source projects cd .. BASE="$(pwd)" - -# Copy DDL/DML to required directories (old scripts use long path /PROJECT/...) cd $DELIV -rm -fr PROJECT + +# Relative path of temp directory +BUILD_REL="build" +# Absolute path of temp directory +BUILD_ABS=$DELIV/$BUILD_REL +rm -fr $BUILD_REL +mkdir $BUILD_REL + +# Copy DDL/DML to required directories + +# RELATIVE PATHS to local directories with database scripts +# bcos Docker looks within this build area only +SCR_BASE=$BUILD_REL/scripts +PORTAL_SCRIPT_DIR=$SCR_BASE/ecomp-portal-DB-os +SDK_SCRIPT_DIR=$SCR_BASE/epsdk-app-os +DBC_SCRIPT_DIR=$SCR_BASE/dbca-os +mkdir -p ${PORTAL_SCRIPT_DIR} ${SDK_SCRIPT_DIR} ${DBC_SCRIPT_DIR} + # copy over DB scripts for the dockerfiles -# forgive the ugly trick with the .. at end. -mkdir -p ${SCRIPT_COMMON_DIR} && cp -r $BASE/ecomp-portal-DB-common ${SCRIPT_COMMON_DIR}/.. -mkdir -p ${SCRIPT_DIR} && cp -r $BASE/ecomp-portal-DB-os ${SCRIPT_DIR}/.. -mkdir -p ${SDK_COMMON_SCRIPT_DIR} && cp -r $BASE/sdk/ecomp-sdk/epsdk-app-common/db-scripts ${SDK_COMMON_SCRIPT_DIR}/.. -mkdir -p ${SDK_SCRIPT_DIR} && cp -r $BASE/sdk/ecomp-sdk/epsdk-app-os/db-scripts ${SDK_SCRIPT_DIR}/.. -# Build complete database script for DBC -DBCA_OPEN_SD=$BASE/dmaapbc/dcae_dmaapbc_webapp/dbca-os/db-scripts -DBCA_COMM_SD=$BASE/dmaapbc/dcae_dmaapbc_webapp/dbca-common/db-scripts -# Old scripts expect this path -mkdir -p $DBC_SCRIPT_DIR -cat $DBCA_OPEN_SD/dbca-create-mysql-1707-os.sql $DBCA_COMM_SD/dbca-ddl-mysql-1707-common.sql $DBCA_OPEN_SD/dbca-dml-mysql-1707-os.sql > $DBC_SCRIPT_DIR/dbca-complete-mysql-1707-os.sql - -cd $BASE/ecomp-portal-BE-common +# Portal +cp $BASE/ecomp-portal-DB-common/*.sql ${PORTAL_SCRIPT_DIR} +cp $BASE/ecomp-portal-DB-os/*.sql ${PORTAL_SCRIPT_DIR} +# SDK app +cp $BASE/sdk/ecomp-sdk/epsdk-app-common/db-scripts/*.sql ${SDK_SCRIPT_DIR} +cp $BASE/sdk/ecomp-sdk/epsdk-app-os/db-scripts/*.sql ${SDK_SCRIPT_DIR} +# DBC app +cp $BASE/dmaapbc/dcae_dmaapbc_webapp/dbca-common/db-scripts/*.sql ${DBC_SCRIPT_DIR} +cp $BASE/dmaapbc/dcae_dmaapbc_webapp/dbca-os/db-scripts/*.sql ${DBC_SCRIPT_DIR} +# Assemble a script with "use" at the top. +cat $DBC_SCRIPT_DIR/dbca-create-mysql-1707-os.sql $DBC_SCRIPT_DIR/dbca-ddl-mysql-1707-common.sql $DBC_SCRIPT_DIR/dbca-dml-mysql-1707-os.sql > $DBC_SCRIPT_DIR/dbca-complete-mysql-1707-os.sql + +# build database docker +DB_DOCKER_CMD=" + docker build -t ${DB_IMG_NAME}:${PORTAL_TAG} ${PROXY_ARGS} + --build-arg PORTAL_SCRIPT_DIR=${PORTAL_SCRIPT_DIR} + --build-arg SDK_SCRIPT_DIR=${SDK_SCRIPT_DIR} + --build-arg DBC_SCRIPT_DIR=${DBC_SCRIPT_DIR} + -f Dockerfile.mariadb . +" +echo "Build mariadb docker image" +$DB_DOCKER_CMD + +echo "Build all jar and war files in Portal" +cd $BASE ${MVN} clean install +echo "Copy Portal app BE" cd $BASE/ecomp-portal-BE-os -${MVN} clean package -cp target/ecompportal-be-os.war $OUT +cp target/ecompportal-be-os.war $BUILD_ABS +echo "Copy Portal app FE" cd $BASE/ecomp-portal-FE-os/ -if [ $SKIPFE == "Y" ]; then - echo "Skipping MVN in $(pwd)" -else - ${MVN} clean package - cp -r dist/public $OUT -fi +cp -r dist/public $BUILD_ABS + +echo "Copy Portal widget-ms" +cd $BASE/ecomp-portal-widget-ms +cp widget-ms/target/widget-ms.jar $BUILD_ABS +echo "Build and copy Portal-SDK app" cd $BASE/sdk/ecomp-sdk/epsdk-app-os ${MVN} clean package -cp target/epsdk-app-os.war $OUT +cp target/epsdk-app-os.war $BUILD_ABS +echo "Build and copy Portal-DBC app" cd $BASE/dmaapbc/dcae_dmaapbc_webapp ${MVN} clean package -cp dbca-os/target/dmaap-bc-app-os.war $OUT +cp dbca-os/target/dmaap-bc-app-os.war $BUILD_ABS PROXY_ARGS="" if [ $HTTP_PROXY ]; then @@ -98,19 +112,26 @@ if [ $HTTPS_PROXY ]; then PROXY_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" fi -# build portal docker +echo "Build portal docker image" cd $DELIV PORTAL_DOCKER_CMD=" - docker build -t ${EP_IMG_NAME} ${PROXY_ARGS} - --build-arg FE_DIR=$BUILD/public - --build-arg PORTAL_WAR=$BUILD/ecompportal-be-os.war - --build-arg SDK_WAR=$BUILD/epsdk-app-os.war - --build-arg DBC_WAR=$BUILD/dmaap-bc-app-os.war - -f $DOCKERFILE . + docker build -t ${EP_IMG_NAME}:${PORTAL_TAG} ${PROXY_ARGS} + --build-arg FE_DIR=$BUILD_REL/public + --build-arg PORTAL_WAR=$BUILD_REL/ecompportal-be-os.war + --build-arg SDK_WAR=$BUILD_REL/epsdk-app-os.war + --build-arg DBC_WAR=$BUILD_REL/dmaap-bc-app-os.war + -f $PORTAL_DOCKERFILE . " -echo "Invoking portal docker build" $PORTAL_DOCKER_CMD -# Build widget-ms docker -cd $BASE/ecomp-portal-widget-ms -${MVN} package docker:build +echo "Bbuild widget-ms docker image" +WMS_DOCKER_CMD=" + docker build -t ${WMS_IMG_NAME}:${PORTAL_TAG} ${PROXY_ARGS} + --build-arg WMS_JAR=$BUILD_REL/widget-ms.jar + -f Dockerfile.widgetms . +" +$WMS_DOCKER_CMD + +# For ease of debugging, leave the build dir +# echo "Cleaning up" +# rm -fr $BUILD_REL diff --git a/deliveries/createMaria.sh b/deliveries/createMaria.sh deleted file mode 100755 index 84e6bb38..00000000 --- a/deliveries/createMaria.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# Stop on errors; show output -set -e -x - -source $(dirname $0)/os_settings.sh - -echo ${SCRIPT_DIR} - -docker build -t ${DB_IMG_NAME} --build-arg SCRIPT_DIR="${SCRIPT_DIR}" --build-arg SDK_SCRIPT_DIR="${SDK_SCRIPT_DIR}" --build-arg DBC_SCRIPT_DIR="${DBC_SCRIPT_DIR}" --build-arg SCRIPT_COMMON_DIR="${SCRIPT_COMMON_DIR}" --build-arg SDK_COMMON_SCRIPT_DIR="${SDK_COMMON_SCRIPT_DIR}" --build-arg DBC_COMMON_SCRIPT_DIR="${DBC_COMMON_SCRIPT_DIR}" -f ./Dockerfile.mariadb . diff --git a/deliveries/dbstart.sh b/deliveries/dbstart.sh deleted file mode 100755 index c76cb391..00000000 --- a/deliveries/dbstart.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# Establish environment variables -source $(dirname $0)/os_settings.sh - -#docker create --name ${DB_VOL_NAME} -v /var/lib/mysql mariadb; - -echo "Running docker image ${DB_IMG_NAME} as name ${DB_CONT_NAME} with volume ${DB_VOL_NAME}" -docker run -d --volumes-from ${DB_VOL_NAME} -p 3306:3306 -e MYSQL_ROOT_PASSWORD=Aa123456 --net=host --name ${DB_CONT_NAME} ${DB_IMG_NAME}; diff --git a/deliveries/dbstop.sh b/deliveries/dbstop.sh deleted file mode 100755 index 9c5b73a7..00000000 --- a/deliveries/dbstop.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# Establish environment variables -source $(dirname $0)/os_settings.sh - -echo "Stopping docker container named ${DB_CONT_NAME}" -docker stop ${DB_CONT_NAME} -echo "Removing docker container named ${DB_CONT_NAME}" -docker rm ${DB_CONT_NAME} diff --git a/deliveries/docker-compose.yml b/deliveries/docker-compose.yml new file mode 100644 index 00000000..1ea2bb67 --- /dev/null +++ b/deliveries/docker-compose.yml @@ -0,0 +1,83 @@ +# docker-compose for ONAP portal containers: database, microservice, portal apps. +# Only exposes the portal apps on host network, not the database or WMS. +# Works in multiple environments; does not pull from a Nexus repository. +# Relies on .env file in current directory. + +version: '2.0' + +services: + + # Config files may use hostname "portal-db" + portal-db: + image: ${DB_IMG_NAME}:${PORTAL_TAG} + environment: + MYSQL_ROOT_PASSWORD: 'Aa123456' + expose: + - 3306 + volumes: + # Just specify a path and let the Engine create a volume + - /var/lib/mysql + logging: + driver: json-file + + # An environment variable here CAN override the database URL; + # instead the value in the config file uses hostname from above + portal-wms: + image: ${WMS_IMG_NAME}:${PORTAL_TAG} + expose: + - 8082 + links: + - portal-db + depends_on: + - portal-db + volumes: + - ${PROJECT_DIR}/etc/ECOMPWIDGETMS/application.properties:/application.properties + command: + - /wait-for.sh + - -t + - "60" + - portal-db:3306 + - -- + - /start-wms-cmd.sh + logging: + driver: json-file + + # Environment variables here CANNOT override the database URL because + # two apps use identical configuration keys with different values + portal-apps: + image: ${EP_IMG_NAME}:${PORTAL_TAG} + expose: + - 8989 + ports: + - 8989:8080 + - 8010:8009 + - 8006:8005 + links: + - portal-db + - portal-wms + depends_on: + - portal-db + - portal-wms + volumes: + - ${PROJECT_DIR}/etc/ECOMPPORTALAPP/system.properties:${WEBAPPS_DIR}/ECOMPPORTAL/WEB-INF/conf/system.properties + - ${PROJECT_DIR}/etc/ECOMPPORTALAPP/fusion.properties:${WEBAPPS_DIR}/ECOMPPORTAL/WEB-INF/fusion/conf/fusion.properties + - ${PROJECT_DIR}/etc/ECOMPPORTALAPP/portal.properties:${WEBAPPS_DIR}/ECOMPPORTAL/WEB-INF/classes/portal.properties + - ${PROJECT_DIR}/etc/ECOMPPORTALAPP/openid-connect.properties:${WEBAPPS_DIR}/ECOMPPORTAL/WEB-INF/classes/openid-connect.properties + - ${PROJECT_DIR}/etc/ECOMPPORTALAPP/logback.xml:${WEBAPPS_DIR}/ECOMPPORTAL/WEB-INF/classes/logback.xml + - ${PROJECT_DIR}/etc/ECOMPSDKAPP/fusion.properties:${WEBAPPS_DIR}/ECOMPSDKAPP/WEB-INF/fusion/conf/fusion.properties + - ${PROJECT_DIR}/etc/ECOMPSDKAPP/system.properties:${WEBAPPS_DIR}/ECOMPSDKAPP/WEB-INF/conf/system.properties + - ${PROJECT_DIR}/etc/ECOMPSDKAPP/portal.properties:${WEBAPPS_DIR}/ECOMPSDKAPP/WEB-INF/classes/portal.properties + - ${PROJECT_DIR}/etc/ECOMPDBCAPP/system.properties:${WEBAPPS_DIR}/ECOMPDBCAPP/WEB-INF/conf/system.properties + - ${PROJECT_DIR}/etc/ECOMPDBCAPP/portal.properties:${WEBAPPS_DIR}/ECOMPDBCAPP/WEB-INF/classes/portal.properties + - ${PROJECT_DIR}/etc/ECOMPDBCAPP/dbcapp.properties:${WEBAPPS_DIR}/ECOMPDBCAPP/WEB-INF/dbcapp/dbcapp.properties + - ${PROJECT_DIR}/etc/ECOMPDBCAPP/fusion.properties:${WEBAPPS_DIR}/ECOMPDBCAPP/WEB-INF/fusion/conf/fusion.properties + - ${PROJECT_DIR}/portal-apps-logs:/opt/apache-tomcat-8.0.37/logs + command: + - /wait-for.sh + - -t + - "60" + - portal-db:3306 + - -- + - /start-apps-cmd.sh + logging: + driver: json-file diff --git a/deliveries/etc.zip b/deliveries/etc.zip Binary files differdeleted file mode 100644 index 67a65b27..00000000 --- a/deliveries/etc.zip +++ /dev/null diff --git a/deliveries/new_start.sh b/deliveries/new_start.sh deleted file mode 100755 index cffcda9b..00000000 --- a/deliveries/new_start.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# Establish environment variables -source $(dirname $0)/os_settings.sh - -BASEDIR=/PROJECT/OpenSource/UbuntuEP -PORTALDIR=/opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL -SDKAPPDIR=/opt/apache-tomcat-8.0.37/webapps/ECOMPSDKAPP -DBCAPPDIR=/opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP -PORTALPROPDIR=ECOMPPORTALAPP -SDKAPPPROPDIR=ECOMPSDKAPP -DBCAPPPROPDIR=ECOMPDBCAPP -#docker rm ep_1610 -echo "Running docker image ${EP_IMG_NAME} as name ${EP_CONT_NAME}" -docker run -d --name ${EP_CONT_NAME} \ --p 8989:8080 -p 8010:8009 -p 8006:8005 \ --v ${BASEDIR}/etc/${PORTALPROPDIR}/system.properties:${PORTALDIR}/WEB-INF/conf/system.properties \ --v ${BASEDIR}/etc/${PORTALPROPDIR}/fusion.properties:${PORTALDIR}/WEB-INF/fusion/conf/fusion.properties \ --v ${BASEDIR}/etc/${PORTALPROPDIR}/portal.properties:${PORTALDIR}/WEB-INF/classes/portal.properties \ --v ${BASEDIR}/etc/${PORTALPROPDIR}/openid-connect.properties:${PORTALDIR}/WEB-INF/classes/openid-connect.properties \ --v ${BASEDIR}/etc/${SDKAPPPROPDIR}/fusion.properties:${SDKAPPDIR}/WEB-INF/fusion/conf/fusion.properties \ --v ${BASEDIR}/etc/${SDKAPPPROPDIR}/system.properties:${SDKAPPDIR}/WEB-INF/conf/system.properties \ --v ${BASEDIR}/etc/${SDKAPPPROPDIR}/portal.properties:${SDKAPPDIR}/WEB-INF/classes/portal.properties \ --v ${BASEDIR}/etc/${DBCAPPPROPDIR}/system.properties:${DBCAPPDIR}/WEB-INF/conf/system.properties \ --v ${BASEDIR}/etc/${DBCAPPPROPDIR}/portal.properties:${DBCAPPDIR}/WEB-INF/classes/portal.properties \ --v ${BASEDIR}/etc/${DBCAPPPROPDIR}/dbcapp.properties:${DBCAPPDIR}/WEB-INF/dbcapp/dbcapp.properties \ --v ${BASEDIR}/etc/${DBCAPPPROPDIR}/fusion.properties:${DBCAPPDIR}/WEB-INF/fusion/conf/fusion.properties \ --v ${BASEDIR}/log:/opt/apache-tomcat-8.0.37/logs \ -${EP_IMG_NAME} diff --git a/deliveries/new_stop.sh b/deliveries/new_stop.sh deleted file mode 100755 index 9193e285..00000000 --- a/deliveries/new_stop.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# Establish environment variables -source $(dirname $0)/os_settings.sh - -echo "Stopping docker container named ${EP_CONT_NAME}" -docker stop ${EP_CONT_NAME} -echo "Removing docker container named ${EP_CONT_NAME}" -docker rm ${EP_CONT_NAME} diff --git a/deliveries/os_Dockerfile b/deliveries/os_Dockerfile deleted file mode 100644 index 130244da..00000000 --- a/deliveries/os_Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# Pull base image. -#FROM ubuntu-openjdk-8-jdk - -FROM ubuntu:14.04 - -ARG HTTP_PROXY=${HTTP_PROXY} -ARG HTTPS_PROXY=${HTTPS_PROXY} - -ENV http_proxy $HTTP_PROXY -ENV https_proxy $HTTPS_PROXY - -RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ - if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi - -# Install the python script required for "add-apt-repository" -RUN apt-get update && apt-get install -y software-properties-common - -# Sets language to UTF8 : this works in pretty much all cases -ENV LANG en_US.UTF-8 -RUN locale-gen $LANG - -# Setup the openjdk 8 repo -RUN add-apt-repository ppa:openjdk-r/ppa - -# Install java8 -RUN apt-get update && apt-get install -y --force-yes openjdk-8-jdk - -# Setup JAVA_HOME, this is useful for docker commandline -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/ -RUN export JAVA_HOME - -# Show java version (for debugging) -# RUN java -version - -RUN apt-get update -RUN apt-get install -y curl -# Install Tomcat -RUN cd /tmp && curl -O https://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin/apache-tomcat-8.0.37.tar.gz -RUN tar -xzf /tmp/apache-tomcat-8.0.37.tar.gz -RUN mv apache-tomcat-8.0.37 /opt - -# Define working directory. -WORKDIR /opt/apache-tomcat-8.0.37/bin - -# Define commonly used ENV variables -ENV PATH $PATH:$JAVA_HOME/bin:/opt/apache-tomcat-8.0.37/bin - -VOLUME /opt/apache-tomcat-8.0.37/logs - -ARG VERSION=${VERSION:-1.1.0} -#LABEL Version=${VERSION} -ARG SDK_DIR=${SDK_DIR} -ARG FE_DIR=${FE_DIR} -ARG PORTAL_SDK_DIR=${PORTAL_SDK_DIR} -ARG PORTAL_DBC_DIR=${PORTAL_DBC_DIR} -# Set up variables: -ENV TOMCATHOME /opt/apache-tomcat-8.0.37 -ENV PORTALHOME /PROJECT/APPS/ECOMPPORTAL/ECOMPPORTALAPP -ENV PORTALSDKHOME /PROJECT/APPS/ECOMPPORTAL/ECOMPSDKAPP -ENV PORTALDBCHOME /PROJECT/APPS/ECOMPPORTAL/ECOMPDBCAPP -# Install Common Software,Git,Apache -RUN mkdir -p $PORTALHOME && mkdir -p $PORTALSDKHOME && mkdir -p $PORTALDBCHOME - -COPY ${SDK_DIR} ${PORTALHOME}/ -# step 33 -COPY ${PORTAL_SDK_DIR} ${PORTALSDKHOME}/ -COPY ${PORTAL_DBC_DIR} ${PORTALDBCHOME}/ - -RUN ln -s ${PORTALHOME} ${TOMCATHOME}/webapps/ECOMPPORTAL && ln -s ${PORTALSDKHOME} ${TOMCATHOME}/webapps/ECOMPSDKAPP && ln -s ${PORTALDBCHOME} ${TOMCATHOME}/webapps/ECOMPDBCAPP - - -# Define working directory. -WORKDIR ${TOMCATHOME}/bin -VOLUME ${TOMCATHOME}/logs -# Define commonly used ENV variables -ENV PATH $PATH:$JAVA_HOME/bin:${TOMCATHOME}/bin -COPY configure-and-run.sh /PROJECT/OpenSource/UbuntuEP/ - -#RUN cp -r ${FE_DIR}/dist/public ${PORTALHOME}/public - -COPY ${FE_DIR}/dist/public ${PORTALHOME}/public -# Define default command. -#CMD ["bash"] -CMD ["/PROJECT/OpenSource/UbuntuEP/configure-and-run.sh"] diff --git a/deliveries/os_build_febe.sh b/deliveries/os_build_febe.sh deleted file mode 100755 index d9a59bf1..00000000 --- a/deliveries/os_build_febe.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash -# Builds docker with three webapps: portal app, portal-sdk app, dbc app -# Stop on error; show output -set -e -x - -source $(dirname $0)/os_settings.sh - -# Work standalone and in Jenkins. -# Pick up Jenkins settings for this script. -# Use -B for batch operation to skip download progress output -if [ -n "$MVN" ]; then - export MVN="${MVN} -gs ${GLOBAL_SETTINGS_FILE} -s ${SETTINGS_FILE} -B" -else - MVN=mvn -fi - -CURRENTDIR="$(pwd)" - -# install ecomp portal -rm -rf $CURRENTDIR/$WORKINGDIR -mkdir $CURRENTDIR/$WORKINGDIR -cd $CURRENTDIR/$WORKINGDIR -SOURCEDIR=$CURRENTDIR/$WORKINGDIR/Source -mkdir $SOURCEDIR -cd $SOURCEDIR -PROJECTDIR=$SOURCEDIR/ecomp-portal-core -mkdir $PROJECTDIR - -#create project dir -#copy FE and BE -cd $CURRENTDIR -cd .. - -cp -r ecomp-portal-FE-common $PROJECTDIR/ecomp-portal-FE-common -cp -r ecomp-portal-FE-os $PROJECTDIR/ecomp-portal-FE-os -cp -r ecomp-portal-BE-common $PROJECTDIR/ecomp-portal-BE-common -cp -r ecomp-portal-BE-os $PROJECTDIR/ecomp-portal-BE-os -cp -r ecomp-portal-DB-common $PROJECTDIR/ecomp-portal-DB-common -cp -r ecomp-portal-DB-os $PROJECTDIR/ecomp-portal-DB-os -cp -r sdk/ecomp-sdk $PROJECTDIR/ecomp-sdk - -cd $PROJECTDIR/ecomp-portal-BE-common -${MVN} install - -cd $PROJECTDIR/ecomp-portal-BE-os -${MVN} install - -cd $PROJECTDIR/ecomp-portal-FE-os/ -${MVN} install - -cd $PROJECTDIR/ecomp-sdk/epsdk-app-os -${MVN} install - -# now install DBC app -cd $SOURCEDIR -DBCDIR=$SOURCEDIR/ST_DBPA -mkdir $DBCDIR -#copy DBC project -cd $CURRENTDIR -cd .. -cp -r dmaapbc/dcae_dmaapbc_webapp $DBCDIR/dcae_dmaapbc_webapp -cd $DBCDIR/dcae_dmaapbc_webapp -${MVN} install -cd dbca-os/target -mv dmaap-bc-app-os ep-dbc-app - -# Build complete database script in the "OS" script area -cd ../db-scripts -cat dbca-create-mysql-1707-os.sql ../../dbca-common/db-scripts/dbca-ddl-mysql-1707-common.sql dbca-dml-mysql-1707-os.sql > dbca-complete-mysql-1707-os.sql - -# install into docker -cd $CURRENTDIR - -PROXY_ARGS="" -if [ $HTTP_PROXY ]; then - PROXY_ARGS+="--build-arg HTTP_PROXY=${HTTP_PROXY}" -fi -if [ $HTTPS_PROXY ]; then - PROXY_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" -fi - -EXEC_CMD="docker build -t ${IMGNAME} ${PROXY_ARGS} --build-arg VERSION=${VERSION} --build-arg PORTAL_SDK_DIR=${PORTAL_SDK_DIR} --build-arg SDK_DIR=${SDK_DIR} --build-arg FE_DIR=${FE_DIR} --build-arg PORTAL_DBC_DIR=${PORTAL_DBC_DIR} -f ./os_Dockerfile ." -echo $EXEC_CMD -$EXEC_CMD diff --git a/deliveries/os_docker_base.sh b/deliveries/os_docker_base.sh new file mode 100755 index 00000000..2bdfea68 --- /dev/null +++ b/deliveries/os_docker_base.sh @@ -0,0 +1,49 @@ +#!/bin/bash +# Builds and pushes versions of Portal images +# Invoked by scripts that set VERSION and LATEST + +# be verbose +set -x + +if [ -z "$VERSION" ]; then + echo "VERSION not set" + exit 1 +fi +if [ -z "$LATEST" ]; then + echo "LATEST not set" + exit 1 +fi + +# Establish environment variables +source $(dirname $0)/.env + +# Build the containers +./build_portalapps_dockers.sh + +APPS_VERSION="${NEXUS_REPO}/openecomp/${EP_IMG_NAME}:${VERSION}" +DB_VERSION="${NEXUS_REPO}/openecomp/${DB_IMG_NAME}:${VERSION}" +WMS_VERSION="${NEXUS_REPO}/openecomp/${WMS_IMG_NAME}:${VERSION}" + +APPS_LATEST="${NEXUS_REPO}/openecomp/${EP_IMG_NAME}:${LATEST}" +DB_LATEST="${NEXUS_REPO}/openecomp/${DB_IMG_NAME}:${LATEST}" +WMS_LATEST="${NEXUS_REPO}/openecomp/${WMS_IMG_NAME}:${LATEST}" + +# tag versions +docker tag ${EP_IMG_NAME}:${PORTAL_TAG} ${APPS_VERSION} +docker tag ${EP_IMG_NAME}:${PORTAL_TAG} ${APPS_LATEST} + +docker tag ${DB_IMG_NAME}:${PORTAL_TAG} ${DB_VERSION} +docker tag ${DB_IMG_NAME}:${PORTAL_TAG} ${DB_LATEST} + +docker tag ${WMS_IMG_NAME}:${PORTAL_TAG} ${WMS_VERSION} +docker tag ${WMS_IMG_NAME}:${PORTAL_TAG} ${WMS_LATEST} + +# push +docker push ${APPS_VERSION} +docker push ${APPS_LATEST} + +docker push ${DB_VERSION} +docker push ${DB_LATEST} + +docker push ${WMS_VERSION} +docker push ${WMS_LATEST} diff --git a/deliveries/os_docker_push.sh b/deliveries/os_docker_push.sh index 2ec6de42..eb663b83 100755 --- a/deliveries/os_docker_push.sh +++ b/deliveries/os_docker_push.sh @@ -1,40 +1,11 @@ #!/bin/bash +# Builds and pushes SNAPSHOT versions of Portal images -# Establish environment variables -source $(dirname $0)/os_settings.sh - -./run.sh - -REPO="nexus3.onap.org:10003" +# be verbose +set -x TIMESTAMP=$(date +%C%y%m%dT%H%M%S) -VERSION="1.1.0-SNAPSHOT-${TIMESTAMP}" -LATEST="latest" - -APPS_VERSION="${REPO}/openecomp/${EP_TAG_NAME}:${VERSION}" -DB_VERSION="${REPO}/openecomp/${DB_TAG_NAME}:${VERSION}" -WMS_VERSION="${REPO}/openecomp/${WMS_TAG_NAME}:${VERSION}" - -APPS_LATEST="${REPO}/openecomp/${EP_TAG_NAME}:${LATEST}" -DB_LATEST="${REPO}/openecomp/${DB_TAG_NAME}:${LATEST}" -WMS_LATEST="${REPO}/openecomp/${WMS_TAG_NAME}:${LATEST}" - -# tag versions -docker tag ${EP_IMG_NAME} ${APPS_VERSION} -docker tag ${EP_IMG_NAME} ${APPS_LATEST} - -docker tag ${DB_IMG_NAME} ${DB_VERSION} -docker tag ${DB_IMG_NAME} ${DB_LATEST} - -docker tag ${WMS_IMG_NAME} ${WMS_VERSION} -docker tag ${WMS_IMG_NAME} ${WMS_LATEST} - -# push -docker push ${APPS_VERSION} -docker push ${APPS_LATEST} - -docker push ${DB_VERSION} -docker push ${DB_LATEST} +export VERSION="1.1.0-SNAPSHOT-${TIMESTAMP}" +export LATEST="latest" -docker push ${WMS_VERSION} -docker push ${WMS_LATEST} +exec ./os_docker_base.sh diff --git a/deliveries/os_docker_release.sh b/deliveries/os_docker_release.sh index 2bd2e20d..42825534 100755 --- a/deliveries/os_docker_release.sh +++ b/deliveries/os_docker_release.sh @@ -1,40 +1,11 @@ #!/bin/bash +# Builds and pushes STAGING versions of Portal images -# Establish environment variables -source $(dirname $0)/os_settings.sh - -./run.sh - -REPO="nexus3.onap.org:10003" +# be verbose +set -x TIMESTAMP=$(date +%C%y%m%dT%H%M%S) -VERSION="1.1.0-STAGING-${TIMESTAMP}" -LATEST="1.1-STAGING-latest" - -APPS_VERSION="${REPO}/openecomp/${EP_TAG_NAME}:${VERSION}" -DB_VERSION="${REPO}/openecomp/${DB_TAG_NAME}:${VERSION}" -WMS_VERSION="${REPO}/openecomp/${WMS_TAG_NAME}:${VERSION}" - -APPS_LATEST="${REPO}/openecomp/${EP_TAG_NAME}:${LATEST}" -DB_LATEST="${REPO}/openecomp/${DB_TAG_NAME}:${LATEST}" -WMS_LATEST="${REPO}/openecomp/${WMS_TAG_NAME}:${LATEST}" - -# tag version -docker tag ${EP_IMG_NAME} ${APPS_VERSION} -docker tag ${EP_IMG_NAME} ${APPS_LATEST} - -docker tag ${DB_IMG_NAME} ${DB_VERSION} -docker tag ${DB_IMG_NAME} ${DB_LATEST} - -docker tag ${WMS_IMG_NAME} ${WMS_VERSION} -docker tag ${WMS_IMG_NAME} ${WMS_LATEST} - -# push -docker push ${APPS_VERSION} -docker push ${APPS_LATEST} - -docker push ${DB_VERSION} -docker push ${DB_LATEST} +export VERSION="1.1.0-STAGING-${TIMESTAMP}" +export LATEST="1.1-STAGING-latest" -docker push ${WMS_VERSION} -docker push ${WMS_LATEST} +exec ./os_docker_base.sh diff --git a/deliveries/os_settings.sh b/deliveries/os_settings.sh deleted file mode 100755 index 19a1e0ef..00000000 --- a/deliveries/os_settings.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -# Establish constants for the management shell scripts. -# These variables are ALSO used in demo/boot/portal_vm_init.sh - -EP_TAG_NAME=portalapps -EP_IMG_NAME=portalapps:latest -EP_CONT_NAME=onap_portal - -DB_TAG_NAME=portaldb -DB_IMG_NAME=portaldb:latest -DB_CONT_NAME=onap_portal_db -DB_VOL_NAME=data_vol_portal - -WMS_TAG_NAME=portalwms -WMS_IMG_NAME=widget-ms -WMS_CONT_NAME=onap_portal_widget_ms - -VERSION=1.1.0 -ETCDIR=etc -WORKINGDIR=PROJECT -SDK_DIR=PROJECT/Source/ecomp-portal-core/ecomp-portal-BE-os/target/ecompportal-be-os -FE_DIR=PROJECT/Source/ecomp-portal-core/ecomp-portal-FE-os -SCRIPT_COMMON_DIR="PROJECT/Source/ecomp-portal-core/ecomp-portal-DB-common/" -SCRIPT_DIR="PROJECT/Source/ecomp-portal-core/ecomp-portal-DB-os/" -SDK_COMMON_SCRIPT_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/epsdk-app-common/db-scripts -SDK_SCRIPT_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/epsdk-app-os/db-scripts -DBC_COMMON_SCRIPT_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/dbca-common/db-scripts -DBC_SCRIPT_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/dbca-os/db-scripts -PORTAL_SDK_DIR=PROJECT/Source/ecomp-portal-core/ecomp-sdk/epsdk-app-os/target/epsdk-app-os -PORTAL_DBC_DIR=PROJECT/Source/ST_DBPA/dcae_dmaapbc_webapp/dbca-os/target/ep-dbc-app diff --git a/deliveries/portal_vm_init.sh b/deliveries/portal_vm_init.sh index 5f34aae8..5f4716ec 100755 --- a/deliveries/portal_vm_init.sh +++ b/deliveries/portal_vm_init.sh @@ -1,71 +1,42 @@ #!/bin/bash # Starts docker containers for ONAP Portal +# This version for Amsterdam/R1 of Portal, uses docker-compose. +# Temporarily maintained in portal/deliveries area; +# replicated from the ONAP demo/boot area due to release concerns. # be verbose set -x -# Refresh source area with start scripts -cd /opt/portal -git pull -cd /opt - # Establish environment variables NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) -# Get container, image and tag names used below -source portal/deliveries/os_settings.sh +# Refresh configuration and scripts +cd /opt/portal +git pull +cd deliveries + +# Get image names used below from docker-compose environment file +source .env -# Unpack property files -unzip -o portal/deliveries/etc.zip -d /PROJECT/OpenSource/UbuntuEP/ +# Copy property files +ETC=/PROJECT/OpenSource/UbuntuEP/etc +mkdir -p $ETC +cp -r properties_rackspace/* $ETC # Refresh images docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/openecomp/${DB_TAG_NAME}:$DOCKER_IMAGE_VERSION -docker pull $NEXUS_DOCKER_REPO/openecomp/${EP_TAG_NAME}:$DOCKER_IMAGE_VERSION -docker pull $NEXUS_DOCKER_REPO/openecomp/${WMS_TAG_NAME}:$DOCKER_IMAGE_VERSION - -# Remove lingering containers; order matters. -docker rm -f $DB_CONT_NAME -docker rm -f $DB_VOL_NAME -docker rm -f $EP_CONT_NAME -docker rm -f $WMS_CONT_NAME - -docker create --name $DB_VOL_NAME -v /var/lib/mysql mariadb -docker tag $NEXUS_DOCKER_REPO/openecomp/${DB_TAG_NAME}:$DOCKER_IMAGE_VERSION $DB_IMG_NAME -docker tag $NEXUS_DOCKER_REPO/openecomp/${EP_TAG_NAME}:$DOCKER_IMAGE_VERSION $EP_IMG_NAME -# WMS image has no version in the registry -docker tag $NEXUS_DOCKER_REPO/openecomp/${WMS_TAG_NAME}:$DOCKER_IMAGE_VERSION ${WMS_IMG_NAME}:latest - -# Recreate the named containers -cd portal/deliveries -echo "Starting database" -./dbstart.sh -echo "Delaying for database" -sleep 10 -echo "Starting apps" -./new_start.sh -echo "Starting widget-ms" -./widget_ms_start.sh - -sleep 180 - -if [ ! -e /opt/config/boot.txt ] -then - if [ -e /opt/config/public_ip.txt ] - then - IP_ADDRESS=$(cat /opt/config/public_ip.txt) - else - IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) - fi - # Wait until MySQL is running... - while [[ $(netstat -vulntp |grep -i mysql | awk '{print $4}') != ":::3306" ]] - do - sleep 1 - done - # no longer necessary; done at docker build time - # mysql -u root -p'Aa123456' -h $IP_ADDRESS < /opt/portal/deliveries/Apps_Users_OnBoarding_Script.sql - echo "yes" > /opt/config/boot.txt -fi +docker pull $NEXUS_DOCKER_REPO/openecomp/${DB_IMG_NAME}:$DOCKER_IMAGE_VERSION +docker pull $NEXUS_DOCKER_REPO/openecomp/${EP_IMG_NAME}:$DOCKER_IMAGE_VERSION +docker pull $NEXUS_DOCKER_REPO/openecomp/${WMS_IMG_NAME}:$DOCKER_IMAGE_VERSION + +# Tag them as expected by docker-compose file +docker tag $NEXUS_DOCKER_REPO/openecomp/${DB_IMG_NAME}:$DOCKER_IMAGE_VERSION $DB_IMG_NAME:$PORTAL_TAG +docker tag $NEXUS_DOCKER_REPO/openecomp/${EP_IMG_NAME}:$DOCKER_IMAGE_VERSION $EP_IMG_NAME:$PORTAL_TAG +docker tag $NEXUS_DOCKER_REPO/openecomp/${WMS_IMG_NAME}:$DOCKER_IMAGE_VERSION $WMS_IMG_NAME:$PORTAL_TAG + +# compose is not in /usr/bin +/opt/docker/docker-compose down +/opt/docker/docker-compose up -d diff --git a/deliveries/properties_rackspace/ECOMPDBCAPP/dbcapp.properties b/deliveries/properties_rackspace/ECOMPDBCAPP/dbcapp.properties new file mode 100644 index 00000000..1c13384d --- /dev/null +++ b/deliveries/properties_rackspace/ECOMPDBCAPP/dbcapp.properties @@ -0,0 +1,8 @@ +# Properties for the Data Bus Controller webapp +dmaap.rest.url.list = http://10.0.4.102:18080/webapi +# webapp's mechid is sent to DCAE for authorization +dmaap.mechid.name = m06672@dbcapp.dmaap.dcae.att.com +# encrypted with CipherUtil +dmaap.mechid.password = /F1vRhga1Ijw7yRFFj6R5A== +# Valid access methods are "dao" and "rest" +profile.access.method = dao diff --git a/deliveries/properties_rackspace/ECOMPDBCAPP/fusion.properties b/deliveries/properties_rackspace/ECOMPDBCAPP/fusion.properties new file mode 100644 index 00000000..4d4e17e9 --- /dev/null +++ b/deliveries/properties_rackspace/ECOMPDBCAPP/fusion.properties @@ -0,0 +1,33 @@ +# login settings +login_method_backdoor = backdoor +login_method_attribute_name = login_method +login_method_csp = csp +login_method_web_junction = web_junction + +#login message +login.error.hrid.empty = Login failed, please contact system administrator. +login.error.hrid.not-found = User not found, please contact system administrator. +login.error.user.inactive = Account is disabled, please contact system administrator. + +authentication_mechanism = DBAUTH + +# User Session settings +user_attribute_name = user +roles_attribute_name = roles +role_functions_attribute_name = role_functions + +# POST settings +post_initial_context_factory = com.sun.jndi.ldap.LdapCtxFactory +post_provider_url = todo_ldap +post_security_principal = ou=people,o=org,c=us +post_max_result_size = 499 + +# menu settings +menu_query_name = menuData +application_menu_set_name = APP +application_menu_attribute_name = applicationMenuData +business_direct_menu_set_name = BD +business_direct_menu_attribute_name = businessDirectMenuData + +# Role settings +sys_admin_role_id = 1 diff --git a/deliveries/properties_rackspace/ECOMPDBCAPP/portal.properties b/deliveries/properties_rackspace/ECOMPDBCAPP/portal.properties new file mode 100644 index 00000000..6dbbee84 --- /dev/null +++ b/deliveries/properties_rackspace/ECOMPDBCAPP/portal.properties @@ -0,0 +1,25 @@ +# Properties read by ECOMP Framework library, ecompFW.jar + +portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl +portal.api.prefix = /api +max.idle.time = 5 +user.attribute.name = user_attribute + +# Legacy property TODO +ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm + +# URL of the ECOMP Portal REST API +ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi + +#Use REST API instead of UEB to fetch the functional menu data +use_rest_for_functional_menu=true + +# Don't fetch functional menu via UEB in 1610. +ueb_listeners_enable = false + +# Application key is used by session management +ueb_app_key = MtRwsF16RdpHZ7eM + +# The inbox name property should not be required when the REST API is used, +# but in 1610 FuncMenuController logs ALARM if it cannot find this key. +ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX-TEST diff --git a/deliveries/properties_rackspace/ECOMPDBCAPP/system.properties b/deliveries/properties_rackspace/ECOMPDBCAPP/system.properties new file mode 100644 index 00000000..019268b7 --- /dev/null +++ b/deliveries/properties_rackspace/ECOMPDBCAPP/system.properties @@ -0,0 +1,63 @@ +#Local +app_display_name = DMaaP Bus Ctlr + +db.driver = com.mysql.jdbc.Driver +db.connectionURL = jdbc:mysql://portal-db:3306/dbca_os +db.userName = root +db.password = Aa123456 +db.encrypt_flag = false +db.hib.dialect = org.hibernate.dialect.MySQLDialect +db.min_pool_size = 5 +db.max_pool_size = 10 +hb.dialect = org.hibernate.dialect.MySQLDialect +hb.show_sql = false +hb.db_reconnect = true +hb.idle_connection_test_period = 3600 + +# Directory with the Quantum.lic file +files_path = /opt/app/tomcat/webapps/dmaap-bc-app/WEB-INF/dbcapp + +application_user_id = 30000 +post_default_role_id = 16 +clustered = true + +#Enable Fusion Mobile capabilities for the application +mobile_enable = false + +# Cache config file is needed on the classpath +cache_config_file_path = /WEB-INF/classes/cache.ccf +cache_switch = 199 +cache_load_on_startup = false + +user_name = fullName +decryption_key = AGLDdG4D04BKm2IxIWEr8o== + +#element map files +element_map_file_path = /tmp +element_map_icon_path = app/fusionapp/icons/ + +# Quartz is not used by the DBC application +# log_cron = +# mylogins_feed_cron = +# sessiontimeout_feed_cron = +# my_login_feed_output_dir = + +# ECOMP Portal Shared Context REST API URL is not used by the DBC application +# ecomp_shared_context_rest_url = + +contact_us_link = https://todo_contact_us_link + +# An Unique 128-bit value defined to identify a specific version +# of an application deployed on a specific virtual machine. +# This value must be generated and updated by the application +# which is using the ECOMP SDK at the time of its deployment. +# Online Unique UUID generator - https://www.uuidgenerator.net/ +# ID generated for DBC to supply to EELF +# A bogus value is cached in SCM: 12345678-.. +instance_uuid = 12345678-90ab-cdef-1234-567890abcdef + +# R Cloud feature +guard_notebook_url=https://todo_rcloud_link + +# Application base URL is a proper prefix of the on-boarded URL. +app_base_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPDBCAPP/ diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/fusion.properties b/deliveries/properties_rackspace/ECOMPPORTALAPP/fusion.properties new file mode 100644 index 00000000..c92a5739 --- /dev/null +++ b/deliveries/properties_rackspace/ECOMPPORTALAPP/fusion.properties @@ -0,0 +1,46 @@ +# domain settings +#domain_class_location = + +# validator settings +#default_error_message = Default error message + +login_url_no_ret_val = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm + +user_attribute_name = user + +# User Session settings +roles_attribute_name = roles +role_functions_attribute_name = role_functions + +# menu settings +menu_query_name = menuData +application_menu_set_name = APP +application_menu_attribute_name = applicationMenuData +business_direct_menu_set_name = BD +business_direct_menu_attribute_name = businessDirectMenuData + +# ECOMP settings +ecomp_app_id = 1 +# Role settings +sys_admin_role_id = 1 +account_admin_role_id = 999 +restricted_app_role_id = 900 + +# Home Page index html +home_page = /index.html + +authentication_mechanism =DBAUTH + +login.error.hrid.empty = Login failed, please contact system administrator. +login.error.hrid.not-found = User not found, please contact system administrator. +login.error.user.inactive = Account is disabled, please contact system administrator. + +# +# Number of seconds to poll health (database operational, etc.) +# +health_poll_interval_seconds = 5 +# +# If a component is down a log entry will be written that triggers an alert. This parameter specifies how often this alert should be triggered +# if the component remains down. For example a value of 30, would translate to 30 * 60 seconds = 1800 seconds, or every 30 minutes +# +health_fail_alert_every_x_intervals = 30 diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/logback.xml b/deliveries/properties_rackspace/ECOMPPORTALAPP/logback.xml new file mode 100644 index 00000000..0c0d7647 --- /dev/null +++ b/deliveries/properties_rackspace/ECOMPPORTALAPP/logback.xml @@ -0,0 +1,285 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ================================================================================ + eCOMP Portal + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. + ================================================================================ + --> + +<!DOCTYPE xml> +<configuration scan="true" scanPeriod="3 seconds" debug="true"> + <!-- Log-back files for the ECOMP Portal "ecompportal" are created in directory + ${catalina.base}/logs/ecompportal; e.g., apache-tomcat-8.0.35/logs/ecompportal/application.log --> + <!--<jmxConfigurator /> --> + + <!-- specify the component name --> + <property name="componentName" value="ecompportal"></property> + + <!-- specify the base path of the log directory --> + <property name="logDirPrefix" value="${catalina.base}/logs"></property> + + <!-- The directories where logs are written --> + <property name="logDirectory" value="${logDirPrefix}/${componentName}" /> + <!-- Can easily relocate debug logs by modifying this path. --> + <property name="debugLogDirectory" value="${logDirPrefix}/${componentName}" /> + + <!-- log file names --> + <property name="generalLogName" value="application" /> + <property name="errorLogName" value="error" /> + <property name="metricsLogName" value="metrics" /> + <property name="auditLogName" value="audit" /> + <property name="debugLogName" value="debug" /> + <!-- These loggers are not used in code (yet). <property name="securityLogName" + value="security" /> <property name="policyLogName" value="policy" /> <property + name="performanceLogName" value="performance" /> <property name="serverLogName" + value="server" /> --> + + <!-- ServerFQDN=Server, --> + <property name="auditLoggerPattern" + value="%X{AuditLogBeginTimestamp}|%X{AuditLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" /> + + <property name="metricsLoggerPattern" + value="%X{MetricsLogBeginTimestamp}|%X{MetricsLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVisualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" /> + + <property name="errorLoggerPattern" + value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ClassName}|%X{AlertSeverity}|%X{ErrorCode}|%X{ErrorDescription}| %msg%n" /> + + <property name="defaultLoggerPattern" + value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ClassName}| %msg%n" /> + + <!-- use %class so library logging calls yield their class name --> + <property name="applicationLoggerPattern" + value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%class{36}| %msg%n" /> + + <!-- + <property name="defaultPattern" + value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" /> + <property name="debugLoggerPattern" + value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" /> + --> + <!-- <property name="debugLoggerPattern" value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|[%caller{3}]|%msg%n" + /> --> + <!-- Example evaluator filter applied against console appender --> + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>${applicationLoggerPattern}</pattern> + </encoder> + </appender> + + <!-- ============================================================================ --> + <!-- EELF Appenders --> + <!-- ============================================================================ --> + + <!-- The EELFAppender is used to record events to the general application + log --> + + + <appender name="EELF" + class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${logDirectory}/${generalLogName}.log</file> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <!-- daily rollover --> + <fileNamePattern>${logDirectory}/${generalLogName}.log.%d{yyyy-MM-dd}.zip + </fileNamePattern> + <maxHistory>30</maxHistory> + </rollingPolicy> + <encoder> + <pattern>${applicationLoggerPattern}</pattern> + </encoder> + <filter class="org.openecomp.portalapp.portal.utils.CustomLoggingFilter" /> + </appender> + + <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender"> + <queueSize>256</queueSize> + <!-- Class name is part of caller data --> + <includeCallerData>true</includeCallerData> + <appender-ref ref="EELF" /> + </appender> + + <!-- EELF Security Appender. This appender is used to record security events + to the security log file. Security events are separate from other loggers + in EELF so that security log records can be captured and managed in a secure + way separate from the other logs. This appender is set to never discard any + events. --> + <!-- <appender name="EELFSecurity" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${logDirectory}/${securityLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${logDirectory}/${securityLogName}.%i.log.zip </fileNamePattern> + <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy + class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> + </triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder> + </appender> <appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender"> + <queueSize>256</queueSize> <discardingThreshold>0</discardingThreshold> <appender-ref + ref="EELFSecurity" /> </appender> --> + + <!-- EELF Performance Appender. This appender is used to record performance + records. --> + <!-- <appender name="EELFPerformance" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${logDirectory}/${performanceLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${logDirectory}/${performanceLogName}.%i.log.zip </fileNamePattern> + <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy + class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> + </triggeringPolicy> <encoder> <outputPatternAsHeader>true</outputPatternAsHeader> + <pattern>${defaultPattern}</pattern> </encoder> </appender> <appender name="asyncEELFPerformance" + class="ch.qos.logback.classic.AsyncAppender"> <queueSize>256</queueSize> + <appender-ref ref="EELFPerformance" /> </appender> --> + + <!-- EELF Server Appender. This appender is used to record Server related + logging events. The Server logger and appender are specializations of the + EELF application root logger and appender. This can be used to segregate + Server events from other components, or it can be eliminated to record these + events as part of the application root log. --> + <!-- <appender name="EELFServer" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${logDirectory}/${serverLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${logDirectory}/${serverLogName}.%i.log.zip </fileNamePattern> + <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy + class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> + </triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder> + </appender> <appender name="asyncEELFServer" class="ch.qos.logback.classic.AsyncAppender"> + <queueSize>256</queueSize> <appender-ref ref="EELFServer" /> </appender> --> + + <!-- EELF Policy Appender. This appender is used to record Policy engine + related logging events. The Policy logger and appender are specializations + of the EELF application root logger and appender. This can be used to segregate + Policy engine events from other components, or it can be eliminated to record + these events as part of the application root log. --> + <!-- <appender name="EELFPolicy" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${logDirectory}/${policyLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${logDirectory}/${policyLogName}.%i.log.zip </fileNamePattern> + <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy + class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> + </triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder> + </appender> <appender name="asyncEELFPolicy" class="ch.qos.logback.classic.AsyncAppender"> + <queueSize>256</queueSize> <appender-ref ref="EELFPolicy" /> </appender> --> + + <!-- EELF Audit Appender. This appender is used to record audit engine related + logging events. The audit logger and appender are specializations of the + EELF application root logger and appender. This can be used to segregate + Policy engine events from other components, or it can be eliminated to record + these events as part of the application root log. --> + + <appender name="EELFAudit" + class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${logDirectory}/${auditLogName}.log</file> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <!-- daily roll over --> + <fileNamePattern>${logDirectory}/${auditLogName}.log.%d{yyyy-MM-dd}.zip + </fileNamePattern> + <maxHistory>30</maxHistory> + </rollingPolicy> + <encoder> + <pattern>${auditLoggerPattern}</pattern> + </encoder> + </appender> + <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender"> + <queueSize>256</queueSize> + <appender-ref ref="EELFAudit" /> + </appender> + + <appender name="EELFMetrics" + class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${logDirectory}/${metricsLogName}.log</file> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <!-- daily roll over --> + <fileNamePattern>${logDirectory}/${metricsLogName}.log.%d{yyyy-MM-dd}.zip + </fileNamePattern> + <maxHistory>30</maxHistory> + </rollingPolicy> + <encoder> + <pattern>${metricsLoggerPattern}</pattern> + </encoder> + </appender> + + + <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender"> + <queueSize>256</queueSize> + <appender-ref ref="EELFMetrics" /> + </appender> + + <appender name="EELFError" + class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${logDirectory}/${errorLogName}.log</file> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <!-- daily roll over --> + <fileNamePattern>${logDirectory}/${errorLogName}.log.%d{yyyy-MM-dd}.zip + </fileNamePattern> + <maxHistory>30</maxHistory> + </rollingPolicy> + <encoder> + <pattern>${errorLoggerPattern}</pattern> + </encoder> + </appender> + + <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender"> + <queueSize>256</queueSize> + <appender-ref ref="EELFError" /> + </appender> + + <appender name="EELFDebug" + class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${debugLogDirectory}/${debugLogName}.log</file> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> + <!-- daily roll over --> + <fileNamePattern>${logDirectory}/${debugLogName}.log.%d{yyyy-MM-dd}.zip + </fileNamePattern> + <maxHistory>30</maxHistory> + </rollingPolicy> + <encoder> + <pattern>${defaultLoggerPattern}</pattern> + </encoder> + </appender> + + <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender"> + <queueSize>256</queueSize> + <appender-ref ref="EELFDebug" /> + <includeCallerData>true</includeCallerData> + </appender> + + + <!-- ============================================================================ --> + <!-- EELF loggers --> + <!-- ============================================================================ --> + <logger name="com.att.eelf" level="info" additivity="false"> + <appender-ref ref="asyncEELF" /> + </logger> + + <!-- <logger name="com.att.eelf.security" level="info" additivity="false"> + <appender-ref ref="asyncEELFSecurity" /> </logger> <logger name="com.att.eelf.perf" + level="info" additivity="false"> <appender-ref ref="asyncEELFPerformance" + /> </logger> <logger name="com.att.eelf.server" level="info" additivity="false"> + <appender-ref ref="asyncEELFServer" /> </logger> <logger name="com.att.eelf.policy" + level="info" additivity="false"> <appender-ref ref="asyncEELFPolicy" /> </logger> --> + + <logger name="com.att.eelf.audit" level="info" additivity="false"> + <appender-ref ref="asyncEELFAudit" /> + </logger> + + <logger name="com.att.eelf.metrics" level="info" additivity="false"> + <appender-ref ref="asyncEELFMetrics" /> + </logger> + + <logger name="com.att.eelf.error" level="info" additivity="false"> + <appender-ref ref="asyncEELFError" /> + </logger> + + <logger name="com.att.eelf.debug" level="debug" additivity="false"> + <appender-ref ref="asyncEELFDebug" /> + </logger> + + <root level="INFO"> + <appender-ref ref="asyncEELF" /> + </root> + +</configuration> diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/openid-connect.properties b/deliveries/properties_rackspace/ECOMPPORTALAPP/openid-connect.properties new file mode 100644 index 00000000..33c919b2 --- /dev/null +++ b/deliveries/properties_rackspace/ECOMPPORTALAPP/openid-connect.properties @@ -0,0 +1,3 @@ +authentication_server_url = http://portal.api.simpledemo.openecomp.org:8383/openid-connect-server-webapp/ +ecomp_openid_connect_client = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/openid_connect_login +ecomp_redirect_uri = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/welcome.htm diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/portal.properties b/deliveries/properties_rackspace/ECOMPPORTALAPP/portal.properties new file mode 100644 index 00000000..f7fba31a --- /dev/null +++ b/deliveries/properties_rackspace/ECOMPPORTALAPP/portal.properties @@ -0,0 +1,23 @@ +portal.api.impl.class = org.openecomp.portalsdk.core.onboarding.client.OnBoardingApiServiceImpl +portal.api.prefix = /api +max.idle.time = 5 +user.attribute.name = user_attribute + +# for single sign on +ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm + +# URL of the ECOMP Portal REST API +ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi + +ueb_listeners_enable = true + +ueb_app_key = 7GkVcrO6sIDb3ngW +ueb_app_secret = uCYgKjWKK5IxPGNNZzYSSWo9 +ueb_app_mailbox_name = ECOMP-PORTAL-INBOX + +ueb_url_list = ueb.api.simpledemo.openecomp.org +ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX + +# Consumer group name for UEB topic. +# Use the special tag to generate a unique one for each sdk-app server. +ueb_app_consumer_group_name = {UUID} diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/system.properties b/deliveries/properties_rackspace/ECOMPPORTALAPP/system.properties new file mode 100644 index 00000000..10842953 --- /dev/null +++ b/deliveries/properties_rackspace/ECOMPPORTALAPP/system.properties @@ -0,0 +1,97 @@ +#mysql +db.driver = com.mysql.jdbc.Driver +db.connectionURL = jdbc:mysql://portal-db:3306/portal +db.userName =root +db.password =Aa123456 +db.hib.dialect = org.hibernate.dialect.MySQLDialect +db.min_pool_size = 5 +db.max_pool_size = 10 +hb.dialect = org.hibernate.dialect.MySQLDialect +hb.show_sql = false +hb.db_reconnect = true +hb.idle_connection_test_period = 3600 + +app_display_name = Portal +files_path = /tmp +context_root = ECOMPPORTAL +# menu settings +menu_query_name = menuData +menu_properties_file_location = /WEB-INF/fusion/menu/ +application_menu_set_name = APP +application_menu_attribute_name = applicationMenuData +application_menu_properties_name = menu.properties +business_direct_menu_set_name = BD +business_direct_menu_properties_name = bd.menu.properties +business_direct_menu_attribute_name = businessDirectMenuData + +application_user_id = 30000 +post_default_role_id = 1 + +#Enable Fusion Mobile capabilities for the application +mobile_enable = false + +cache_config_file_path = /WEB-INF/conf/cache.ccf +cache_switch = 1 +cache_load_on_startup = false + +user_name = fullName +decryption_key = AGLDdG4D04BKm2IxIWEr8o== + + +#Cron Schedules +cron_site_name = one +log_cron = 0 * * * * ? * +sessiontimeout_feed_cron = 0 0/5 * * * ? * + +#Front end URL +frontend_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/applicationsHome + +#cookie domain +cookie_domain = openecomp.org + +# An Unqiue 128-bit value defined to indentify a specific version of +# ECOMP Portal deployed on a specific virtual machine. +# This value must be generated and updated at the time of +# the deployment. +# Online Unique UUID generator - https://www.uuidgenerator.net/ +instance_uuid = 90bc9497-10e6-49fe-916b-dcdfaa972383 + +elastic_search_url = http:// +contact_us_link = http:// +user_guide_link = http:// + +# Contact Us page properties +ush_ticket_url = http:// +feedback_email_address = portal@lists.openecomp.org +portal_info_url = https:// + +#Online user bar refresh interval, in seconds +online_user_update_rate = 30 + +#Online user bar refresh total duration, in seconds +online_user_update_duration = 300 + +#authenticate user server +authenticate_user_server=http://portal.api.simpledemo.openecomp.org:8383/openid-connect-server-webapp/allUsers + +#window width threshold to collapse left/right menu when page onload +window_width_threshold_left_menu = 1400 +window_width_threshold_right_menu = 1350 + +# User notification refresh interval and duration, in seconds +notification_update_rate = 90 +notification_update_duration = 900 + +#Microservices Related Properties for Portal +microservices.widget.protocol = http +microservices.widget.hostname = portal-wms +microservices.widget.username = widget_user +microservices.widget.password = KpuqIB08YHg+btG+pjX+sA== +#This property won't be needed after consul is functional on VMs - +microservices.widget.local.port = 8082 +microservices.m-learn.local.port = 8083 +#HALO API enable flag +external_access_enable = false + +#delete auditlog from number of days ago +auditlog_del_day_from = 365 diff --git a/deliveries/properties_rackspace/ECOMPSDKAPP/fusion.properties b/deliveries/properties_rackspace/ECOMPSDKAPP/fusion.properties new file mode 100644 index 00000000..8ce8cc95 --- /dev/null +++ b/deliveries/properties_rackspace/ECOMPSDKAPP/fusion.properties @@ -0,0 +1,35 @@ +# login settings +login_method_backdoor = backdoor +login_method_attribute_name = login_method + +# These properties will be removed after SingleSignOnController is cleaned +authentication_mechanism = BOTH +login_method_csp = csp +login_method_web_junction = web_junction + +#login message +login.error.hrid.empty = Login failed, please contact system administrator. +login.error.hrid.not-found = User not found, please contact system administrator. +login.error.user.inactive = Account is disabled, please contact system administrator. + +# User Session settings +user_attribute_name = user +roles_attribute_name = roles +role_function_list = role_function_list +role_functions_attribute_name = role_functions + +# Import-user LDAP settings +post_initial_context_factory = com.sun.jndi.ldap.LdapCtxFactory +post_provider_url = ldap://ldap.mycompany.com:389 +post_security_principal = ou=people,o=mycompany,c=us +post_max_result_size = 499 + +# menu settings +menu_query_name = menuData +application_menu_set_name = APP +application_menu_attribute_name = applicationMenuData +business_direct_menu_set_name = BD +business_direct_menu_attribute_name = businessDirectMenuData + +# Role settings +sys_admin_role_id = 1 diff --git a/deliveries/properties_rackspace/ECOMPSDKAPP/portal.properties b/deliveries/properties_rackspace/ECOMPSDKAPP/portal.properties new file mode 100644 index 00000000..b569e4fc --- /dev/null +++ b/deliveries/properties_rackspace/ECOMPSDKAPP/portal.properties @@ -0,0 +1,44 @@ +# Properties read by ECOMP Framework library, ecompFW.jar + +########################################################################## +# The following properties should NOT be changed by partner applications. +########################################################################## + +portal.api.prefix = /api +max.idle.time = 5 +user.attribute.name = user_attribute + +#Use REST API instead of UEB to fetch the functional menu data +use_rest_for_functional_menu=true + +########################################################################## +# The following properties MUST be changed by partner applications. +########################################################################## + +# Name of java class that implements the OnBoardingApiService interface. +portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl + +# CSP Global Log On for single sign on +ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm + +# URL of the ECOMP Portal REST API + +ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi + +# Applications do not need to run a UEB listener in 1610. +ueb_listeners_enable = false + +# UEB Configuration +ueb_url_list = ueb.api.simpledemo.openecomp.org +# ECOMP Portal listens on this UEB topic +ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX +# Replace these 3 default values with the ones for your specific App, +# as shown on the on-boarding page on the ECOMP Portal web application. +ueb_app_key = jQd4a9zVNi4ePyBp +ueb_app_secret = P0HpqEBhKJvxjRYdw2sCTUll +ueb_app_mailbox_name = ECOMP-PORTAL-OUTBOX-APP1 +# Consumer group name for UEB topic. +# Use the special tag '{UUID}' to generate a unique one for each sdk-app server. +ueb_app_consumer_group_name = {UUID} + +decryption_key = AGLDdG4D04BKm2IxIWEr8o== diff --git a/deliveries/properties_rackspace/ECOMPSDKAPP/system.properties b/deliveries/properties_rackspace/ECOMPSDKAPP/system.properties new file mode 100644 index 00000000..105502f1 --- /dev/null +++ b/deliveries/properties_rackspace/ECOMPSDKAPP/system.properties @@ -0,0 +1,65 @@ +# Properties read by ECOMP Core library, ecompSDK-core.jar + +########################################################################## +# The following properties should NOT be changed by partner applications. +########################################################################## + +application_user_id = 30000 +post_default_role_id = 16 +clustered = true + +#Enable Fusion Mobile capabilities for the application +mobile_enable = false + +# Cache config file is needed on the classpath +cache_config_file_path = /WEB-INF/classes/cache.ccf +cache_switch = 199 +cache_load_on_startup = false + +user_name = fullName +decryption_key = AGLDdG4D04BKm2IxIWEr8o== + +########################################################################## +# The following properties MAY require changes by partner applications. +########################################################################## + +#Mysql +db.driver = com.mysql.jdbc.Driver +db.connectionURL = jdbc:mysql://portal-db:3306/ecomp_sdk +db.userName = root +db.password = Aa123456 +db.min_pool_size = 5 +db.max_pool_size = 10 +hb.dialect = org.hibernate.dialect.MySQLDialect +# SQL statements are logged to stdout +hb.show_sql = true +hb.idle_connection_test_period = 3600 + +app_display_name = Demo App +files_path = /tmp + +#element map files +element_map_file_path = /tmp +element_map_icon_path = app/fusionapp/icons/ + +#Cron Schedules +log_cron = 0 0/1 * * * ?; +mylogins_feed_cron = 0 0/60 * * * ?; +#sessiontimeout_feed_cron = 0 * * * * ? * +my_login_feed_output_dir = /tmp/MyLogins + +# Link shown in Help menu +contact_us_link = https://todo_contact_us_link.com + +# An Unique 128-bit value defined to identify a specific version +# of an application deployed on a specific virtual machine. +# This value must be generated and updated by the application +# which is using the ECOMP SDK at the time of its deployment. +# Online Unique UUID generator - https://www.uuidgenerator.net/ +instance_uuid=8da691c9-987d-43ed-a358-00ac2f35685d + +# R Cloud feature - configure this property to enable notebook feature - for more details on RCloud please visit https://rcloud.social/index.html +guard_notebook_url= + +#authenticate user server +authenticate_user_server=http://portal.openecomp.org:8383/openid-connect-server-webapp/allUsers diff --git a/deliveries/properties_rackspace/ECOMPWIDGETMS/application.properties b/deliveries/properties_rackspace/ECOMPWIDGETMS/application.properties new file mode 100644 index 00000000..7c95923f --- /dev/null +++ b/deliveries/properties_rackspace/ECOMPWIDGETMS/application.properties @@ -0,0 +1,35 @@ +## General App Properties +server.contextPath=/widget +server.port=8082 +spring.http.multipart.max-file-size=128MB +spring.http.multipart.max-request-size=128MB +microservice.widget.location=/tmp + +## App DB Properties +spring.datasource.url=jdbc:mysql://portal-db:3306/portal +spring.datasource.username=root +spring.datasource.password=Aa123456 +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect +spring.database.driver.classname=org.mariadb.jdbc.Driver +spring.jpa.show-sql=false +spring.jpa.properties.hibernate.format_sql=false + +## Basic Authentication Properties +security.user.name=widget_user +security.user.password=ENC(IjywcRnI9+nuVEh9+OFFiRWAjBT1n718) + +initialization.default.widgets=true +initialization.widgetData.url=http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/commonWidgets + +## Account Basic Authentication Properties +account.user.name=portal +account.user.password=6APqvG4AU2rfLgCvMdySwQ== + +## Certificate Properties +#server.ssl.key-store=classpath:widget-keystore.p12 +#server.ssl.key-store-password=ENC(DiIYnAMab4u7rEW2yKhF9zBL00uU55q8) +#server.ssl.keyStoreType=PKCS12 +#server.ssl.keyAlias=widget-microservice + +## Jasypt Properties +jasypt.encryptor.password=EncryptionKey diff --git a/deliveries/run.sh b/deliveries/run.sh deleted file mode 100755 index bd2a5dd1..00000000 --- a/deliveries/run.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# Stop on errors; show output -set -e -x -# 1610 builder -# ./os_build_febe.sh -# 1707 builder -./build_portalapps_dockers.sh -./createMaria.sh -docker images diff --git a/deliveries/configure-and-run.sh b/deliveries/start-apps-cmd.sh index 5c2b2f46..bbe2a7cb 100755 --- a/deliveries/configure-and-run.sh +++ b/deliveries/start-apps-cmd.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh LOGFILE=/opt/apache-tomcat-8.0.37/logs/catalina.out echo "`date`:<-------------------- Starting -------------------->" >> $LOGFILE diff --git a/deliveries/start-wms-cmd.sh b/deliveries/start-wms-cmd.sh new file mode 100755 index 00000000..dc8336e7 --- /dev/null +++ b/deliveries/start-wms-cmd.sh @@ -0,0 +1,2 @@ +#!/bin/sh +java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar diff --git a/deliveries/wait-for.sh b/deliveries/wait-for.sh new file mode 100755 index 00000000..be9a443f --- /dev/null +++ b/deliveries/wait-for.sh @@ -0,0 +1,82 @@ +#!/bin/sh +# https://github.com/Eficode/wait-for.git +# MIT License + +TIMEOUT=15 +QUIET=0 + +echoerr() { + if [ "$QUIET" -ne 1 ]; then printf "%s\n" "$*" 1>&2; fi +} + +usage() { + exitcode="$1" + cat << USAGE >&2 +Usage: + $cmdname host:port [-t timeout] [-- command args] + -q | --quiet Do not output any status messages + -t TIMEOUT | --timeout=timeout Timeout in seconds, zero for no timeout + -- COMMAND ARGS Execute command with args after the test finishes +USAGE + exit "$exitcode" +} + +wait_for() { + command="$*" + for i in `seq $TIMEOUT` ; do + nc -z "$HOST" "$PORT" > /dev/null 2>&1 + result=$? + if [ $result -eq 0 ] ; then + if [ "$QUIET" -ne 1 ]; then echo "Operation succeeded on try $i"; fi + if [ -n "$command" ] ; then + exec $command + fi + exit 0 + fi + sleep 1 + done + echo "Operation timed out" >&2 + exit 1 +} + +while [ $# -gt 0 ] +do + case "$1" in + *:* ) + HOST=$(printf "%s\n" "$1"| cut -d : -f 1) + PORT=$(printf "%s\n" "$1"| cut -d : -f 2) + shift 1 + ;; + -q | --quiet) + QUIET=1 + shift 1 + ;; + -t) + TIMEOUT="$2" + if [ "$TIMEOUT" = "" ]; then break; fi + shift 2 + ;; + --timeout=*) + TIMEOUT="${1#*=}" + shift 1 + ;; + --) + shift + break + ;; + --help) + usage 0 + ;; + *) + echoerr "Unknown argument: $1" + usage 1 + ;; + esac +done + +if [ "$HOST" = "" -o "$PORT" = "" ]; then + echoerr "Error: you need to provide a host and port to test." + usage 2 +fi + +wait_for "$@" diff --git a/deliveries/widget_ms_start.sh b/deliveries/widget_ms_start.sh deleted file mode 100755 index b5fbdc25..00000000 --- a/deliveries/widget_ms_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# Establish environment variables -source $(dirname $0)/os_settings.sh - -BASEDIR=/PROJECT/OpenSource/UbuntuEP -WIDGETMSAPPPROPDIR=ECOMPWIDGETMS - -echo "Running docker image ${WMS_IMG_NAME} as container ${WMS_CONT_NAME}" -docker run -d --name ${WMS_CONT_NAME} -p 8082:8082 -v ${BASEDIR}/etc/${WIDGETMSAPPPROPDIR}/application.properties:/application.properties ${WMS_IMG_NAME} diff --git a/deliveries/widget_ms_stop.sh b/deliveries/widget_ms_stop.sh deleted file mode 100755 index dd5c9645..00000000 --- a/deliveries/widget_ms_stop.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# Establish environment variables -source $(dirname $0)/os_settings.sh - -echo "Stopping docker container ${WMS_CONT_NAME}" -docker stop ${WMS_CONT_NAME} -echo "Removing docker image ${WMS_CONT_NAME}" -docker rm ${WMS_CONT_NAME} diff --git a/ecomp-portal-BE-common-test/pom.xml b/ecomp-portal-BE-common-test/pom.xml index 2e47388b..afdf35ac 100644 --- a/ecomp-portal-BE-common-test/pom.xml +++ b/ecomp-portal-BE-common-test/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.portal</groupId> + <groupId>org.onap.portal</groupId> <artifactId>ecomp-portal-BE-common-test</artifactId> - <version>1.1.0</version> + <version>1.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>ecompportal-be-common-test</name> @@ -105,7 +105,7 @@ <version>1.8.5</version> </dependency> <dependency> - <groupId>org.openecomp.portal</groupId> + <groupId>org.onap.portal</groupId> <artifactId>ecompportal-be-common</artifactId> <version>${project.version}</version> <type>jar</type> diff --git a/ecomp-portal-BE-common/pom.xml b/ecomp-portal-BE-common/pom.xml index f5f925b8..af828cf2 100644 --- a/ecomp-portal-BE-common/pom.xml +++ b/ecomp-portal-BE-common/pom.xml @@ -1,18 +1,18 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.portal</groupId> + <groupId>org.onap.portal</groupId> <artifactId>ecompportal-be-common</artifactId> <packaging>war</packaging> <!-- Version number is managed manually; no Jenkins build.number --> - <version>1.1.0</version> + <version>1.3.0-SNAPSHOT</version> <properties> <springframework.version>4.2.0.RELEASE</springframework.version> <hibernate.version>4.3.11.Final</hibernate.version> <eelf.version>1.0.0</eelf.version> <fasterxml.version>2.7.4</fasterxml.version> - <epsdk.version>1.1.0</epsdk.version> + <epsdk.version>1.3.0-SNAPSHOT</epsdk.version> <encoding>UTF-8</encoding> <!-- Tests usually require some setup that maven cannot do, so skip. --> <skipTests>true</skipTests> @@ -503,7 +503,7 @@ </dependency> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-fw</artifactId> <version>${epsdk.version}</version> <exclusions> @@ -526,7 +526,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-core</artifactId> <version>${epsdk.version}</version> <exclusions> @@ -537,12 +537,12 @@ </exclusions> </dependency> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-app-common</artifactId> <version>${epsdk.version}</version> </dependency> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-workflow</artifactId> <version>${epsdk.version}</version> </dependency> @@ -550,7 +550,7 @@ <!-- Raptor required Libraries --> <!-- for static charts --> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-analytics</artifactId> <version>${epsdk.version}</version> </dependency> diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/config/PortalCentralAccessConfiguration.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/config/PortalCentralAccessConfiguration.java new file mode 100644 index 00000000..4ee4be20 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/config/PortalCentralAccessConfiguration.java @@ -0,0 +1,29 @@ +package org.openecomp.portalapp.config; + +import org.openecomp.portalapp.portal.service.EPRoleFunctionService; +import org.openecomp.portalapp.portal.service.EPRoleFunctionServiceCentralizedImpl; +import org.openecomp.portalapp.portal.service.EPRoleFunctionServiceImpl; +import org.openecomp.portalsdk.core.service.CentralAccessCondition; +import org.openecomp.portalsdk.core.service.LocalAccessCondition; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Conditional; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class PortalCentralAccessConfiguration { + + + @Bean + @Conditional(LocalAccessCondition.class) + public EPRoleFunctionService ePRoleFunctionServiceImpl() { + return new EPRoleFunctionServiceImpl(); + } + + + @Bean + @Conditional(CentralAccessCondition.class) + public EPRoleFunctionService ePRoleFunctionServiceCentralizedImpl() { + return new EPRoleFunctionServiceCentralizedImpl(); + } + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppsControllerExternalRequest.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppsControllerExternalRequest.java index 774eb3ee..00cf627e 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppsControllerExternalRequest.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppsControllerExternalRequest.java @@ -209,7 +209,7 @@ public class AppsControllerExternalRequest implements BasicAuthenticationControl "myLoginsAppOwner" : "abc123", "name": "dashboard", "url": "http://k8s/something", - "restUrl" : "http://aic.att.com", + "restUrl" : "http://targeturl.com", "restrictedApp" : true, "isOpen" : true, "isEnabled": false @@ -295,7 +295,7 @@ public class AppsControllerExternalRequest implements BasicAuthenticationControl "myLoginsAppOwner" : "abc123", "name": "dashboard", "url": "http://k8s/something", - "restUrl" : "http://aic.att.com", + "restUrl" : "http://targeturl.com", "restrictedApp" : true, "isOpen" : true, "isEnabled": false diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/ExternalAccessRolesController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/ExternalAccessRolesController.java new file mode 100644 index 00000000..43e07af3 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/ExternalAccessRolesController.java @@ -0,0 +1,330 @@ +package org.openecomp.portalapp.portal.controller; + + +import java.util.ArrayList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.openecomp.portalapp.portal.domain.CentralRoleFunction; +import org.openecomp.portalapp.portal.domain.EPApp; +import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse; +import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum; +import org.openecomp.portalapp.portal.logging.aop.EPAuditLog; +import org.openecomp.portalapp.portal.service.ExternalAccessRolesService; +import org.openecomp.portalapp.portal.transport.CentralRole; +import org.openecomp.portalsdk.core.domain.Role; +import org.openecomp.portalsdk.core.domain.RoleFunction; +import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.HttpClientErrorException; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("/auxapi") +@org.springframework.context.annotation.Configuration +@EnableAspectJAutoProxy +@EPAuditLog +public class ExternalAccessRolesController implements BasicAuthenticationController { + + private static final String UEBKEY = "uebkey"; + + private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ExternalAccessRolesController.class); + + @Autowired + private ExternalAccessRolesService externalAccessRolesService; + + @ApiOperation(value = "Gets user role for an application.", response = String.class, responseContainer="List") + @RequestMapping(value = { + "/user/{loginId}" }, method = RequestMethod.GET, produces = "application/json") + public String getUser(HttpServletRequest request, HttpServletResponse response, @PathVariable("loginId") String loginId) throws Exception { + + String answer = null; + try { + answer = externalAccessRolesService.getUser(loginId, request.getHeader(UEBKEY)); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "getUser failed", e); + } + return answer; + } + + @ApiOperation(value = "Gets roles for an application.", response = CentralRole.class, responseContainer="Json") + @RequestMapping(value = { + "/roles" }, method = RequestMethod.GET, produces = "application/json") + public List<CentralRole> getRolesForApp(HttpServletRequest request, HttpServletResponse response) throws Exception { + logger.debug(EELFLoggerDelegate.debugLogger, "Request received for getRolesForApp"); + List<EPApp> applicationList=new ArrayList<>(); + applicationList = externalAccessRolesService.getApp(request.getHeader(UEBKEY)); + EPApp app = applicationList.get(0); + externalAccessRolesService.SyncApplicationRolesWithEcompDB(app); + List<CentralRole> answer = null; + try { + answer = externalAccessRolesService.getRolesForApp(request.getHeader(UEBKEY)); + } catch (HttpClientErrorException e) { + if("Application not found".equalsIgnoreCase(e.getMessage())){ + response.setStatus(HttpServletResponse.SC_NOT_FOUND); + } + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + logger.error(EELFLoggerDelegate.errorLogger, "getRolesForApp failed", e); + } + logger.debug(EELFLoggerDelegate.debugLogger, "Request completed for getRolesForApp"); + return answer; + } + + @ApiOperation(value = "Gets all role functions for an application.", response = CentralRoleFunction.class, responseContainer="Json") + @RequestMapping(value = { + "/functions" }, method = RequestMethod.GET, produces = "application/json") + public List<CentralRoleFunction> getRoleFunctionsList(HttpServletRequest request, HttpServletResponse response) throws Exception { + List<CentralRoleFunction> answer = null; + logger.debug(EELFLoggerDelegate.debugLogger, "Request received for getRoleFunctionsList"); + try { + answer = externalAccessRolesService.getRoleFuncList(request.getHeader(UEBKEY)); + } catch (HttpClientErrorException e) { + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + logger.error(EELFLoggerDelegate.errorLogger, "getRoleFunctionsList failed", e); + } + logger.debug(EELFLoggerDelegate.debugLogger, "Request completed for getRoleFunctionsList"); + return answer; + } + + @ApiOperation(value = "Gets role information for an application.", response = CentralRole.class, responseContainer="Json") + @RequestMapping(value = { + "/role/{role_id}" }, method = RequestMethod.GET, produces = "application/json") + public CentralRole getRoleInfo(HttpServletRequest request, HttpServletResponse response, @PathVariable("role_id") Long roleId) throws Exception { + CentralRole answer = null; + logger.debug(EELFLoggerDelegate.debugLogger, "Request received for getRoleInfo"); + + try { + answer = externalAccessRolesService.getRoleInfo(roleId, request.getHeader(UEBKEY)); + } catch (HttpClientErrorException e) { + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + logger.error(EELFLoggerDelegate.errorLogger, "getRoleInfo failed", e); + } + logger.debug(EELFLoggerDelegate.debugLogger, "Request completed for getRoleInfo"); + return answer; + } + + @ApiOperation(value = "Gets role information for an application provided by function code.", response = CentralRoleFunction.class, responseContainer = "Json") + @RequestMapping(value = { "/function/{code}" }, method = RequestMethod.GET, produces = "application/json") + public CentralRoleFunction getRoleFunction(HttpServletRequest request, HttpServletResponse response, + @PathVariable("code") String code) throws Exception { + CentralRoleFunction centralRoleFunction = null; + try { + centralRoleFunction = externalAccessRolesService.getRoleFunction(code, request.getHeader(UEBKEY)); + } catch (HttpClientErrorException e) { + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + logger.error(EELFLoggerDelegate.errorLogger, "getRoleInfo failed", e); + } + return centralRoleFunction; + } + + @ApiOperation(value = "Saves role function for an application.", response = PortalRestResponse.class, responseContainer = "Json") + @RequestMapping(value = { "/roleFunction" }, method = RequestMethod.POST, produces = "application/json") + public PortalRestResponse<String> saveRoleFunction(HttpServletRequest request, HttpServletResponse response, + @RequestBody String roleFunc) throws Exception { + + ObjectMapper mapper = new ObjectMapper(); + List<EPApp> applicationList = externalAccessRolesService.getApp(request.getHeader(UEBKEY)); + EPApp requestedApp = applicationList.get(0); + Long appId = requestedApp.getId(); + try { + String data = roleFunc; + CentralRoleFunction availableRoleFunction = mapper.readValue(data, CentralRoleFunction.class); + availableRoleFunction.setAppId(appId); + externalAccessRolesService.saveCentralRoleFunction(availableRoleFunction, requestedApp); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "saveRoleFunction failed", e); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.getMessage(), "Failed"); + } + return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Successfully Saved", "Success"); + } + + @ApiOperation(value = "Deletes role function for an application.", response = PortalRestResponse.class, responseContainer = "Json") + @RequestMapping(value = { "/roleFunction/{code}" }, method = RequestMethod.DELETE, produces = "application/json") + public PortalRestResponse<String> deleteRoleFunction(HttpServletRequest request, HttpServletResponse response, @PathVariable("code") String code) throws Exception { + try { + externalAccessRolesService.deleteCentralRoleFunction(code, request.getHeader(UEBKEY)); + } catch (HttpClientErrorException e) { + response.setStatus(HttpServletResponse.SC_BAD_REQUEST); + logger.error(EELFLoggerDelegate.errorLogger, "deleteRoleFunction failed", e); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Failed to deleteRoleFunction", "Failed"); + } + return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Successfully Deleted", "Success"); + + } + + @ApiOperation(value = "Saves role for an application.", response = PortalRestResponse.class, responseContainer = "Json") + @RequestMapping(value = { "/role" }, method = RequestMethod.POST, produces = "application/json") + public PortalRestResponse<String> saveRole(HttpServletRequest request, HttpServletResponse response, + @RequestBody Role role) throws Exception { + try { + externalAccessRolesService.saveRoleForApplication(role,request.getHeader(UEBKEY)); + } catch (Exception e) { + response.setStatus(HttpServletResponse.SC_BAD_REQUEST); + logger.error(EELFLoggerDelegate.errorLogger, "saveRole failed", e); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Failed to saveRole", "Failed"); + } + return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Successfully Saved", "Success"); + } + + @ApiOperation(value = "Deletes role for an application.", response = PortalRestResponse.class, responseContainer = "Json") + @RequestMapping(value = { "/deleteRole/{code}" }, method = RequestMethod.DELETE, produces = "application/json") + public PortalRestResponse<String> deleteRole(HttpServletRequest request, HttpServletResponse response, + @PathVariable String code) throws Exception { + try { + externalAccessRolesService.deleteRoleForApplication(code, request.getHeader(UEBKEY)); + } catch (Exception e) { + response.setStatus(HttpServletResponse.SC_BAD_REQUEST); + logger.error(EELFLoggerDelegate.errorLogger, "deleteRole failed", e); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Failed to deleteRole", "Failed"); + } + return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Successfully Deleted", "Success"); + + } + + @ApiOperation(value = "Gets active roles for an application.", response = CentralRole.class, responseContainer = "Json") + @RequestMapping(value = { "/activeRoles" }, method = RequestMethod.GET, produces = "application/json") + public List<CentralRole> getActiveRoles(HttpServletRequest request, HttpServletResponse response) throws Exception { + List<CentralRole> cenRole = null; + try { + cenRole = externalAccessRolesService.getActiveRoles(request.getHeader(UEBKEY)); + } catch (HttpClientErrorException e) { + response.setStatus(HttpServletResponse.SC_BAD_REQUEST); + logger.error(EELFLoggerDelegate.errorLogger, "getActiveRoles failed", e); + } + return cenRole; + + } + + @ApiOperation(value = "deletes user roles for an application.", response = PortalRestResponse.class, responseContainer = "Json") + @RequestMapping(value = { "/deleteDependcyRoleRecord/{roleId}" }, method = RequestMethod.DELETE, produces = "application/json") + public PortalRestResponse<String> deleteDependcyRoleRecord(HttpServletRequest request, HttpServletResponse response, @PathVariable("roleId") Long roleId) throws Exception { + try { + externalAccessRolesService.deleteDependcyRoleRecord(roleId,request.getHeader(UEBKEY), request.getHeader("LoginId")); + } catch (HttpClientErrorException e) { + response.setStatus(HttpServletResponse.SC_BAD_REQUEST); + logger.error(EELFLoggerDelegate.errorLogger, "deleteDependcyRoleRecord failed", e); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Failed to deleteDependcyRoleRecord", "Failed"); + } + return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Successfully Deleted", "Success"); + } + + @ApiOperation(value = "Bulk upload functions for an application.", response = PortalRestResponse.class, responseContainer = "Json") + @RequestMapping(value = { "/upload/portal/functions" }, method = RequestMethod.POST, produces = "application/json") + public PortalRestResponse<String> bulkUploadFunctions(HttpServletRequest request, HttpServletResponse response) throws Exception { + Integer result = 0; + try { + result = externalAccessRolesService.bulkUploadFunctions(request.getHeader(UEBKEY)); + } catch (HttpClientErrorException e) { + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + logger.error(EELFLoggerDelegate.errorLogger, "bulkUploadFunctions failed", e); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Failed to bulkUploadFunctions", "Failed"); + } + return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Successfully added: "+result, "Success"); + } + + @ApiOperation(value = "Bulk upload roles for an application.", response = PortalRestResponse.class, responseContainer = "Json") + @RequestMapping(value = { "/upload/portal/roles" }, method = RequestMethod.POST, produces = "application/json") + public PortalRestResponse<String> bulkUploadRoles(HttpServletRequest request, HttpServletResponse response) throws Exception { + Integer result = 0; + try { + result = externalAccessRolesService.bulkUploadRoles(request.getHeader(UEBKEY)); + } catch (HttpClientErrorException e) { + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + logger.error(EELFLoggerDelegate.errorLogger, "bulkUploadRoles failed", e); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Failed to bulkUploadRoles", "Failed"); + } + return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Successfully added: "+result, "Success"); + } + + @ApiOperation(value = "Bulk upload role functions for an application.", response = PortalRestResponse.class, responseContainer = "Json") + @RequestMapping(value = { "/upload/portal/roleFunctions" }, method = RequestMethod.POST, produces = "application/json") + public PortalRestResponse<String> bulkUploadRoleFunctions(HttpServletRequest request, HttpServletResponse response) throws Exception { + Integer result = 0; + try { + result = externalAccessRolesService.bulkUploadRolesFunctions(request.getHeader(UEBKEY)); + } catch (HttpClientErrorException e) { + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + logger.error(EELFLoggerDelegate.errorLogger, "bulkUploadRoleFunctions failed", e); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Failed to bulkUploadRoleFunctions", "Failed"); + } + return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Successfully added: "+result, "Success"); + } + + @ApiOperation(value = "Bulk upload user roles for an application.", response = PortalRestResponse.class, responseContainer = "Json") + @RequestMapping(value = { "/upload/portal/userRoles" }, method = RequestMethod.POST, produces = "application/json") + public PortalRestResponse<String> bulkUploadUserRoles(HttpServletRequest request, HttpServletResponse response) throws Exception { + Integer result = 0; + try { + result = externalAccessRolesService.bulkUploadUserRoles(request.getHeader(UEBKEY)); + } catch (HttpClientErrorException e) { + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + logger.error(EELFLoggerDelegate.errorLogger, "bulkUploadUserRoles failed", e); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Failed to bulkUploadUserRoles", "Failed"); + } + return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Successfully added: "+result, "Success"); + } + + @ApiOperation(value = "Bulk upload functions for an partner application.", response = PortalRestResponse.class, responseContainer = "Json") + @RequestMapping(value = { "/upload/partner/functions" }, method = RequestMethod.POST, produces = "application/json") + public PortalRestResponse<String> bulkUploadPartnerFunctions(HttpServletRequest request, HttpServletResponse response, @RequestBody List<RoleFunction> upload) throws Exception { + try { + externalAccessRolesService.bulkUploadPartnerFunctions(request.getHeader(UEBKEY), upload); + } catch (HttpClientErrorException e) { + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + logger.error(EELFLoggerDelegate.errorLogger, "bulkUploadFunctions failed", e); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Failed to bulkUploadFunctions", "Failed"); + } + return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Successfully added", "Success"); + } + + @ApiOperation(value = "Bulk upload roles for an partner application.", response = PortalRestResponse.class, responseContainer = "Json") + @RequestMapping(value = { "/upload/partner/roles" }, method = RequestMethod.POST, produces = "application/json") + public PortalRestResponse<String> bulkUploadPartnerRoles(HttpServletRequest request, HttpServletResponse response, @RequestBody List<Role> upload) throws Exception { + try { + externalAccessRolesService.bulkUploadPartnerRoles(request.getHeader(UEBKEY), upload); + } catch (HttpClientErrorException e) { + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + logger.error(EELFLoggerDelegate.errorLogger, "bulkUploadRoles failed", e); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Failed to bulkUploadRoles", "Failed"); + } + return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Successfully added", "Success"); + } + + @ApiOperation(value = "Bulk upload role functions for an partner application.", response = PortalRestResponse.class, responseContainer = "Json") + @RequestMapping(value = { "/upload/partner/roleFunctions" }, method = RequestMethod.POST, produces = "application/json") + public PortalRestResponse<String> bulkUploadPartnerRoleFunctions(HttpServletRequest request, HttpServletResponse response, @RequestBody List<Role> upload) throws Exception { + try { + externalAccessRolesService.bulkUploadPartnerRoleFunctions(request.getHeader(UEBKEY), upload); + } catch (HttpClientErrorException e) { + response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + logger.error(EELFLoggerDelegate.errorLogger, "bulkUploadRoles failed", e); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Failed to bulkUploadPartnerRoleFunctions", "Failed"); + } + return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Successfully added", "Success"); + } + + @ApiOperation(value = "Gets all functions along with global functions", response = List.class, responseContainer = "Json") + @RequestMapping(value = { "/menuFunctions" }, method = RequestMethod.GET, produces = "application/json") + public List<String> getMenuFunctions(HttpServletRequest request, HttpServletResponse response) throws Exception { + List<String> functionsList = null; + try { + functionsList = externalAccessRolesService.getMenuFunctionsList(request.getHeader(UEBKEY)); + } catch (HttpClientErrorException e) { + response.setStatus(HttpServletResponse.SC_BAD_REQUEST); + logger.error(EELFLoggerDelegate.errorLogger, "getMenuFunctions failed", e); + } + return functionsList; + } + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RoleManageController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RoleManageController.java index 2d0fe279..eefd5004 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RoleManageController.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RoleManageController.java @@ -26,9 +26,13 @@ import org.openecomp.portalapp.controller.EPRestrictedBaseController; import org.openecomp.portalapp.controller.core.RoleController; import org.openecomp.portalapp.controller.core.RoleFunctionListController; import org.openecomp.portalapp.controller.core.RoleListController; +import org.openecomp.portalapp.portal.domain.EPApp; import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse; import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum; import org.openecomp.portalapp.portal.logging.aop.EPAuditLog; +import org.openecomp.portalapp.portal.service.ExternalAccessRolesService; +import org.openecomp.portalapp.portal.service.ExternalAccessRolesServiceImpl; +import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.web.bind.annotation.RequestBody; @@ -47,6 +51,7 @@ import org.springframework.web.servlet.ModelAndView; @EnableAspectJAutoProxy @EPAuditLog public class RoleManageController extends EPRestrictedBaseController { + private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(RoleManageController.class); @Autowired private RoleController roleController; @@ -57,6 +62,9 @@ public class RoleManageController extends EPRestrictedBaseController { @Autowired private RoleFunctionListController roleFunctionListController; + + @Autowired + ExternalAccessRolesService externalAccessRolesService; /** * Calls an SDK-Core library method that gets the available roles and writes * them to the request object. Portal specifies a Hibernate mappings from @@ -120,7 +128,7 @@ public class RoleManageController extends EPRestrictedBaseController { } @RequestMapping(value = { "/portalApi/get_role" }, method = RequestMethod.GET) - public void getRole(HttpServletRequest request, HttpServletResponse response) { + public void getRole(HttpServletRequest request, HttpServletResponse response) throws Exception{ getRoleController().getRole(request, response); } @@ -163,4 +171,13 @@ public class RoleManageController extends EPRestrictedBaseController { this.roleFunctionListController = roleFunctionListController; } + @RequestMapping(value = { "/portalApi/syncRoles" }, method = RequestMethod.GET) + public void syncRoles(EPApp app) + { + try { + externalAccessRolesService.SyncApplicationRolesWithEcompDB(app); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.debugLogger, "failed syncRoles"); + } + } } diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RolesApprovalSystemController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RolesApprovalSystemController.java index c150528e..3dba301a 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RolesApprovalSystemController.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RolesApprovalSystemController.java @@ -78,7 +78,7 @@ public class RolesApprovalSystemController implements BasicAuthenticationControl } catch (Exception e) { logger.error(EELFLoggerDelegate.errorLogger, "postUserProfile: failed for app {}, user {}", extSysUser.getApplicationName(), extSysUser.getLoginId(), e); - if(reqResult == null || (!reqResult.isResult() && !e.getMessage().contains("404"))){ + if(reqResult == null || (!reqResult.isResult() && !e.getMessage().contains("404") && !e.getMessage().contains("405"))){ response.setStatus(HttpServletResponse.SC_BAD_REQUEST); return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.getMessage(), "save user profile failed"); @@ -86,10 +86,14 @@ public class RolesApprovalSystemController implements BasicAuthenticationControl response.setStatus(HttpServletResponse.SC_NOT_FOUND); return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.getMessage(), "save user profile failed"); - } else{ + } else if (e.getMessage().contains("405")) { + response.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.getMessage(), + "save user profile failed"); + } else { response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, - e.getMessage(), "save user profile failed"); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.getMessage(), + "save user profile failed"); } } return new PortalRestResponse<String>(PortalRestStatusEnum.OK, reqResult.getDetailMessage(), "Success"); @@ -117,7 +121,7 @@ public class RolesApprovalSystemController implements BasicAuthenticationControl } catch (Exception e) { logger.error(EELFLoggerDelegate.errorLogger, "putUserProfile: failed for app {}, user {}", extSysUser.getApplicationName(), extSysUser.getLoginId(), e); - if(reqResult == null || (!reqResult.isResult() && !e.getMessage().contains("404"))){ + if(reqResult == null || (!reqResult.isResult() && !e.getMessage().contains("404") && !e.getMessage().contains("405"))){ response.setStatus(HttpServletResponse.SC_BAD_REQUEST); return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.getMessage(), "save user profile failed"); @@ -125,6 +129,9 @@ public class RolesApprovalSystemController implements BasicAuthenticationControl response.setStatus(HttpServletResponse.SC_NOT_FOUND); return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.getMessage(), "save user profile failed"); + } else if (e.getMessage().contains("405")) { + response.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED); + return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.getMessage(), "save user profile failed"); } else{ response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/SharedContextRestController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/SharedContextRestController.java index 984bbf75..08a0d49b 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/SharedContextRestController.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/SharedContextRestController.java @@ -151,7 +151,7 @@ public class SharedContextRestController extends EPRestrictedRESTfulBaseControll SharedContext lastNameContext = contextService.getSharedContext(context_id, EPCommonSystemProperties.USER_LAST_NAME); SharedContext emailContext = contextService.getSharedContext(context_id, EPCommonSystemProperties.USER_EMAIL); - SharedContext attuidContext = contextService.getSharedContext(context_id, + SharedContext orgUserIdContext = contextService.getSharedContext(context_id, EPCommonSystemProperties.USER_ORG_USERID); if (firstNameContext != null) listSharedContext.add(firstNameContext); @@ -159,8 +159,8 @@ public class SharedContextRestController extends EPRestrictedRESTfulBaseControll listSharedContext.add(lastNameContext); if (emailContext != null) listSharedContext.add(emailContext); - if (attuidContext != null) - listSharedContext.add(attuidContext); + if (orgUserIdContext != null) + listSharedContext.add(orgUserIdContext); String jsonResponse = convertResponseToJSON(listSharedContext); return jsonResponse; } diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/TicketEventController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/TicketEventController.java index e0a9e587..102f7709 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/TicketEventController.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/TicketEventController.java @@ -36,8 +36,10 @@ import org.openecomp.portalapp.portal.logging.aop.EPAuditLog; import org.openecomp.portalapp.portal.service.UserNotificationService; import org.openecomp.portalapp.portal.transport.EpNotificationItem; import org.openecomp.portalapp.portal.transport.EpRoleNotificationItem; +import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties; import org.openecomp.portalapp.portal.utils.PortalConstants; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.openecomp.portalsdk.core.util.SystemProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; @@ -62,6 +64,7 @@ import io.swagger.annotations.ApiOperation; @EPAuditLog public class TicketEventController implements BasicAuthenticationController { + @Autowired private UserNotificationService userNotificationService; @@ -73,6 +76,8 @@ public class TicketEventController implements BasicAuthenticationController { private final ObjectMapper mapper = new ObjectMapper(); + + @ApiOperation(value = "Accepts messages from external ticketing systems and creates notifications for Portal users.", response = PortalRestResponse.class) @RequestMapping(value = { "/ticketevent" }, method = RequestMethod.POST) public PortalRestResponse<String> handleRequest(HttpServletRequest request, HttpServletResponse response, @@ -108,6 +113,12 @@ public class TicketEventController implements BasicAuthenticationController { } String eventSource = header.get("eventSource").asText(); epItem.setMsgSource(eventSource); + String ticket = body.get("ticketNum").asText(); + String hyperlink = SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_SYSTEM_NOTIFICATION_URL)+eventSource+"num="+ticket; + if(body.get("notificationHyperlink")!=null){ + hyperlink=body.get("notificationHyperlink").asText(); + } + epItem.setNotificationHyperlink(hyperlink); epItem.setStartTime(new Date(eventDate)); Calendar calendar = Calendar.getInstance(); calendar.setTime(epItem.getStartTime()); @@ -171,14 +182,26 @@ public class TicketEventController implements BasicAuthenticationController { JsonNode header = event.get("header"); JsonNode body = event.get("body"); JsonNode SubscriberInfo = ticketEventNotif.get("SubscriberInfo"); + JsonNode userList = SubscriberInfo.get("UserList"); + if (application == null) - return "application is mandatory"; + return "Application is mandatory"; if (body == null) return "body is mandatory"; if (header.get("eventSource") == null) return "Message Source is mandatory"; - if (SubscriberInfo.get("UserList") == null) + if (userList == null) return "At least one user Id is mandatory"; + JsonNode eventDate=body.get("eventDate"); + + if(eventDate!=null&&eventDate.asText().length()==8) + return "EventDate is invalid"; + String UserIds[] = userList.toString().replace("[", "").replace("]", "").trim().replace("\"", "") + .split(","); + List<EPUser> users = userNotificationService.getUsersByOrgIds(Arrays.asList(UserIds)); + if(users==null||users.size()==0) + return "Invalid Attuid"; return null; } + } diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/CentralRoleFunction.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/CentralRoleFunction.java new file mode 100644 index 00000000..2d659e9c --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/CentralRoleFunction.java @@ -0,0 +1,100 @@ +package org.openecomp.portalapp.portal.domain; + +import org.openecomp.portalsdk.core.domain.support.DomainVo; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +@SuppressWarnings("rawtypes") +public class CentralRoleFunction extends DomainVo implements java.io.Serializable, Comparable{ + + /** + * + */ + private static final long serialVersionUID = -4018975640065252688L; + private String code; + private String name; + @JsonIgnore + private Long appId; + @JsonIgnore + private Long roleId; + private String editUrl; + + + public CentralRoleFunction() { + + } + + + public CentralRoleFunction(Long id, String code, String name, Long appId, String editUrl) { + super(); + this.id = id; + this.code = code; + this.name = name; + this.appId = appId; + this.editUrl = editUrl; + } + + public CentralRoleFunction(String code, String name) { + super(); + this.code = code; + this.name = name; + } + + /** + * @return the code + */ + public String getCode() { + return code; + } + /** + * @param code the code to set + */ + public void setCode(String code) { + this.code = code; + } + /** + * @return the name + */ + public String getName() { + return name; + } + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + /** + * @return the appId + */ + public Long getAppId() { + return appId; + } + /** + * @param appId the appId to set + */ + public void setAppId(Long appId) { + this.appId = appId; + } + /** + * @return the editUrl + */ + public String getEditUrl() { + return editUrl; + } + /** + * @param editUrl the editUrl to set + */ + public void setEditUrl(String editUrl) { + this.editUrl = editUrl; + } + public int compareTo(Object obj){ + String c1 = getName(); + String c2 = ((CentralRoleFunction)obj).getName(); + + return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2); + } + + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPApp.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPApp.java index b0cd13b2..edb3c905 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPApp.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPApp.java @@ -51,8 +51,9 @@ public class EPApp extends DomainVo { private String uebKey; private String uebSecret; private Integer appType; - private AppContactUs contactUs; + private Boolean centralAuth; + private String nameSpace; public EPApp() { // Attention!!! @@ -282,6 +283,28 @@ public class EPApp extends DomainVo { public void setContactUs(AppContactUs contactUs) { this.contactUs = contactUs; } + + public Boolean getCentralAuth() { + return centralAuth; + } + + public void setCentralAuth(Boolean centralAuth) { + if (centralAuth == null) { + centralAuth = new Boolean(false); + } + this.centralAuth = centralAuth; + } + + public String getNameSpace() { + return nameSpace; + } + + public void setNameSpace(String nameSpace) { + if (StringUtils.isEmpty(nameSpace)) { + nameSpace = null; + } + this.nameSpace = nameSpace; + } @Override public String toString() { diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPAppRoleFunction.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPAppRoleFunction.java new file mode 100644 index 00000000..7665fd36 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPAppRoleFunction.java @@ -0,0 +1,50 @@ +package org.openecomp.portalapp.portal.domain; + +import org.openecomp.portalsdk.core.domain.support.DomainVo; + +public class EPAppRoleFunction extends DomainVo implements java.io.Serializable{ + + private static final long serialVersionUID = 7752385247460299630L; + + private Long roleId; + private Long appId; + private String code; + + /** + * @return the roleId + */ + public Long getRoleId() { + return roleId; + } + /** + * @param roleId the roleId to set + */ + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + /** + * @return the appId + */ + public Long getAppId() { + return appId; + } + /** + * @param appId the appId to set + */ + public void setAppId(Long appId) { + this.appId = appId; + } + /** + * @return the code + */ + public String getCode() { + return code; + } + /** + * @param code the code to set + */ + public void setCode(String code) { + this.code = code; + } + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EpUserAppRoles.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppRoles.java index 2649cfd0..574645e3 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EpUserAppRoles.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppRoles.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; @Entity @JsonInclude(JsonInclude.Include.NON_NULL) -public class EpUserAppRoles extends DomainVo { +public class EPUserAppRoles extends DomainVo { private static final long serialVersionUID = -1484592641766545668L; diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompApp.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompApp.java index 6df37e82..24564aaa 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompApp.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompApp.java @@ -143,4 +143,26 @@ public class EcompApp { public void setRestrictedApp(Boolean restrictedApp) { this.restrictedApp = restrictedApp; } + + private Boolean centralAuth; + + public Boolean getCentralAuth() { + return centralAuth; + } + + public void setCentralAuth(Boolean centralAuth) { + this.centralAuth = centralAuth; + } + + private String nameSpace; + + public String getNameSpace() { + return nameSpace; + } + + public void setNameSpace(String nameSpace) { + this.nameSpace = nameSpace; + } + + } diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/ExternalRoleDetails.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/ExternalRoleDetails.java new file mode 100644 index 00000000..e30b5d36 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/ExternalRoleDetails.java @@ -0,0 +1,78 @@ +package org.openecomp.portalapp.portal.domain; + +import java.util.List; + +public class ExternalRoleDetails implements Comparable { + + + private String name; + private boolean active; + private Integer priority; + + private Long appId; // used by ECOMP only + private Long appRoleId; // used by ECOMP only + + private List<EPAppRoleFunction> perms; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public boolean isActive() { + return active; + } + + public void setActive(boolean active) { + this.active = active; + } + + public Integer getPriority() { + return priority; + } + + public void setPriority(Integer priority) { + this.priority = priority; + } + + public Long getAppId() { + return appId; + } + + public void setAppId(Long appId) { + this.appId = appId; + } + + public Long getAppRoleId() { + return appRoleId; + } + + public void setAppRoleId(Long appRoleId) { + this.appRoleId = appRoleId; + } + + + + public List<EPAppRoleFunction> getPerms() { + return perms; + } + + public void setPerms(List<EPAppRoleFunction> perms) { + this.perms = perms; + } + + @Override + public int compareTo(Object obj) { + EPRole other = (EPRole)obj; + + String c1 = getName(); + String c2 = other.getName(); + + return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2); + } + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPEELFLoggerAdvice.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPEELFLoggerAdvice.java index 89f1b92f..1db63fe8 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPEELFLoggerAdvice.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPEELFLoggerAdvice.java @@ -170,6 +170,8 @@ public class EPEELFLoggerAdvice { EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(className); logger.debug(EELFLoggerDelegate.debugLogger, "EPEELFLoggerAdvice#after: finished {}", methodName); + // add the metrics log + logger.info(EELFLoggerDelegate.metricsLogger, methodName + " operation is completed."); // Log security message, if necessary if (securityEventType != null) { diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/EPAppMessagesEnum.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/EPAppMessagesEnum.java index 82c3ad37..62519530 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/EPAppMessagesEnum.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/EPAppMessagesEnum.java @@ -25,7 +25,6 @@ import org.openecomp.portalsdk.core.logging.format.ErrorTypeEnum; /** * - * @author rc580q * Add ECOMP Portal Specific Error Code Enums here, for generic * ones (ones you think are useful not only Portal but also SDK), add it * to the enum class AppMessagesEnum defined in SDK. diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/EPErrorCodesEnum.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/EPErrorCodesEnum.java index 498bfcfe..99a6c34a 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/EPErrorCodesEnum.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/EPErrorCodesEnum.java @@ -24,7 +24,6 @@ import com.att.eelf.i18n.EELFResourceManager; /** * - * @author rc580q * Add ECOMP Portal Specific Error Code Enums here, for generic * ones (ones you think are useful not only Portal but also SDK), add it * to the enum class AppMessagesEnum defined in SDK. diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AdminRolesServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AdminRolesServiceImpl.java index 20daa4fc..b5bccfe3 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AdminRolesServiceImpl.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AdminRolesServiceImpl.java @@ -22,6 +22,7 @@ package org.openecomp.portalapp.portal.service; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.annotation.PostConstruct; @@ -29,14 +30,8 @@ import org.apache.cxf.common.util.StringUtils; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.EnableAspectJAutoProxy; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.openecomp.portalsdk.core.service.DataAccessService; -import org.openecomp.portalsdk.core.util.SystemProperties; +import org.json.JSONArray; +import org.json.JSONObject; import org.openecomp.portalapp.portal.domain.EPApp; import org.openecomp.portalapp.portal.domain.EPRole; import org.openecomp.portalapp.portal.domain.EPUser; @@ -48,8 +43,24 @@ import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum; import org.openecomp.portalapp.portal.logging.logic.EPLogUtil; import org.openecomp.portalapp.portal.transport.AppNameIdIsAdmin; import org.openecomp.portalapp.portal.transport.AppsListWithAdminRole; +import org.openecomp.portalapp.portal.transport.ExternalAccessUser; import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties; import org.openecomp.portalapp.portal.utils.EcompPortalUtils; +import org.openecomp.portalapp.portal.utils.PortalConstants; +import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.openecomp.portalsdk.core.service.DataAccessService; +import org.openecomp.portalsdk.core.util.SystemProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.client.RestTemplate; + +import com.fasterxml.jackson.databind.ObjectMapper; @Service("adminRolesService") @Transactional @@ -72,7 +83,9 @@ public class AdminRolesServiceImpl implements AdminRolesService { SearchService searchService; @Autowired EPAppService appsService; - + + RestTemplate template = new RestTemplate(); + @PostConstruct private void init() { try { @@ -208,7 +221,9 @@ public class AdminRolesServiceImpl implements AdminRolesService { localSession.save(EPUserApp.class.getName(), newUserApp); } transaction.commit(); - result = true; + + // Add user admin role for list of centralized applications in external system + result = addAdminRoleInExternalSystem(user, localSession, newAppsWhereUserIsAdmin); } catch (Exception e) { EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e); logger.error(EELFLoggerDelegate.errorLogger, "setAppsWithAdminRoleStateForUser: exception in point 2", e); @@ -234,6 +249,129 @@ public class AdminRolesServiceImpl implements AdminRolesService { } @SuppressWarnings("unchecked") + private boolean addAdminRoleInExternalSystem(EPUser user, Session localSession, List<AppNameIdIsAdmin> newAppsWhereUserIsAdmin) { + boolean result = false; + try { + // Reset All admin role for centralized applications + List<EPApp> appList = dataAccessService.executeNamedQuery("getCentralizedApps", null, null); + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + for (EPApp app : appList) { + String name = ""; + if (EPCommonSystemProperties + .containsProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN)) { + name = user.getOrgUserId() + SystemProperties + .getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN); + } + String extRole = app.getNameSpace() + "." + PortalConstants.ADMIN_ROLE.replaceAll(" ", "_"); + HttpEntity<String> entity = new HttpEntity<>(headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + try { + ResponseEntity<String> getResponse = template + .exchange(SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "roles/" + extRole, HttpMethod.GET, entity, String.class); + + if (getResponse.getBody().equals("{}")) { + String addDesc = "{\"name\":\"" + extRole + "\"}"; + HttpEntity<String> roleEntity = new HttpEntity<>(addDesc, headers); + template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "role", + HttpMethod.POST, roleEntity, String.class); + } else { + try { + HttpEntity<String> deleteUserRole = new HttpEntity<>(headers); + template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "userRole/" + name + "/" + extRole, + HttpMethod.DELETE, deleteUserRole, String.class); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, + " Role not found for this user may be it gets deleted before", e); + } + } + } catch (Exception e) { + if (e.getMessage().equalsIgnoreCase("404 Not Found")) { + logger.debug(EELFLoggerDelegate.debugLogger, "Application Not found for app {}", + app.getNameSpace(), e.getMessage()); + } else{ + logger.error(EELFLoggerDelegate.errorLogger, "Application Not found for app {}", + app.getNameSpace(), e); + } + } + } + // Add admin role in external application + // application + for (AppNameIdIsAdmin appNameIdIsAdmin : newAppsWhereUserIsAdmin) { + EPApp app = (EPApp) localSession.get(EPApp.class, appNameIdIsAdmin.id); + try { + if (app.getCentralAuth()) { + String extRole = app.getNameSpace() + "." + PortalConstants.ADMIN_ROLE.replaceAll(" ", "_"); + HttpEntity<String> entity = new HttpEntity<>(headers); + String name = ""; + if (EPCommonSystemProperties + .containsProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN)) { + name = user.getOrgUserId() + SystemProperties + .getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN); + } + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + ResponseEntity<String> getUserRolesResponse = template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "userRoles/user/" + name, + HttpMethod.GET, entity, String.class); + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system"); + if (!getUserRolesResponse.getBody().equals("{}")) { + JSONObject jsonObj = new JSONObject(getUserRolesResponse.getBody()); + JSONArray extRoles = jsonObj.getJSONArray("userRole"); + final Map<String, JSONObject> extUserRoles = new HashMap<>(); + for (int i = 0; i < extRoles.length(); i++) { + String userRole = extRoles.getJSONObject(i).getString("role"); + if (userRole.startsWith(app.getNameSpace() + ".") + && !userRole.equals(app.getNameSpace() + ".admin") + && !userRole.equals(app.getNameSpace() + ".owner")) { + + extUserRoles.put(userRole, extRoles.getJSONObject(i)); + } + } + if (!extUserRoles.containsKey(extRole)) { + // Assign with new apps user admin + try { + ExternalAccessUser extUser = new ExternalAccessUser(name, extRole); + // Assign user role for an application in external access system + ObjectMapper addUserRoleMapper = new ObjectMapper(); + String userRole = addUserRoleMapper.writeValueAsString(extUser); + HttpEntity<String> addUserRole = new HttpEntity<>(userRole, headers); + template.exchange( + SystemProperties.getProperty( + EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "userRole", + HttpMethod.POST, addUserRole, String.class); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "Failed to add user admin role", e); + } + + } + } + } + result = true; + } catch (Exception e) { + if (e.getMessage().equalsIgnoreCase("404 Not Found")) { + logger.debug(EELFLoggerDelegate.errorLogger, + "Application name space not found in External system for app {} due to bad rquest name space ", app.getNameSpace(), + e.getMessage()); + } else { + logger.error(EELFLoggerDelegate.errorLogger, "Failed to assign admin role for application {}", + app.getNameSpace(), e); + result = false; + } + } + } + } catch (Exception e) { + result = false; + logger.error(EELFLoggerDelegate.errorLogger, "Failed to assign admin roles operation", e); + } + return result; + } + + @SuppressWarnings("unchecked") @Override public boolean isSuperAdmin(EPUser user) { if ((user != null) /* && (user.getId() == null) */ && (user.getOrgUserId() != null)) { @@ -318,7 +456,7 @@ public class AdminRolesServiceImpl implements AdminRolesService { @EPMetricsLog public List<EPRole> getRolesByApp(EPUser user, Long appId) { List<EPRole> list = new ArrayList<>(); - String sql = "SELECT * FROM FN_ROLE WHERE APP_ID = " + appId; + String sql = "SELECT * FROM FN_ROLE WHERE UPPER(ACTIVE_YN) = 'Y' AND APP_ID = " + appId; @SuppressWarnings("unchecked") List<EPRole> roles = dataAccessService.executeSQLQuery(sql, EPRole.class, null); for (EPRole role: roles) { diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppCommonServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppCommonServiceImpl.java index f38b921a..6a0da9ba 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppCommonServiceImpl.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppCommonServiceImpl.java @@ -44,6 +44,8 @@ import org.openecomp.portalapp.portal.domain.AppIdAndNameTransportModel; import org.openecomp.portalapp.portal.domain.AppsResponse; import org.openecomp.portalapp.portal.domain.EPApp; import org.openecomp.portalapp.portal.domain.EPUser; +import org.openecomp.portalapp.portal.domain.EPUserAppRolesRequest; +import org.openecomp.portalapp.portal.domain.EPUserAppRolesRequestDetail; import org.openecomp.portalapp.portal.domain.EPUserAppsManualSortPreference; import org.openecomp.portalapp.portal.domain.EPUserAppsSortPreference; import org.openecomp.portalapp.portal.domain.EPWidgetsManualSortPreference; @@ -180,6 +182,8 @@ public class EPAppCommonServiceImpl implements EPAppService { ecompApp.setUebKey(app.getUebKey()); ecompApp.setUebSecret(app.getUebSecret()); ecompApp.setEnabled(app.getEnabled()); + ecompApp.setCentralAuth(app.getCentralAuth()); + ecompApp.setNameSpace(app.getNameSpace()); ecompApp.setRestrictedApp(app.isRestrictedApp()); ecompAppList.add(ecompApp); } @@ -322,15 +326,10 @@ public class EPAppCommonServiceImpl implements EPAppService { @Override public UserRoles getUserProfile(String loginId) { - String format = "SELECT DISTINCT user.USER_ID, role.ROLE_ID, user.org_user_id, user.FIRST_NAME, user.LAST_NAME, role.ROLE_NAME FROM fn_user_role userrole " - + "INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID " - + "INNER JOIN fn_role role ON role.ROLE_ID = userrole.ROLE_ID " - + "WHERE user.org_user_id = \"%s\" and (userrole.app_id = 1 or role.role_id = " + ACCOUNT_ADMIN_ROLE_ID - + ") "; - String sql = String.format(format, loginId); - logQuery(sql); + final Map<String, String> params = new HashMap<>(); + params.put("org_user_id", loginId); @SuppressWarnings("unchecked") - List<UserRole> userRoleList = dataAccessService.executeSQLQuery(sql, UserRole.class, null); + List<UserRole> userRoleList = dataAccessService.executeNamedQuery( "getUserRoles", params, null); ArrayList<UserRoles> usersRolesList = aggregateUserProfileRowsResultsByRole(userRoleList); if (usersRolesList == null || usersRolesList.size() < 1) return null; @@ -382,9 +381,11 @@ public class EPAppCommonServiceImpl implements EPAppService { public List<LocalRole> getAppRoles(Long appId) { String sql = ""; if (isRestrictedApp(appId)) { - sql = "SELECT ROLE_ID, ROLE_NAME from FN_ROLE where ROLE_ID = '" + RESTRICTED_APP_ROLE_ID + "'"; - } else { - sql = "SELECT ROLE_ID, ROLE_NAME from FN_ROLE where APP_ID = '" + appId + "'"; + sql = "SELECT ROLE_ID, ROLE_NAME from FN_ROLE where UPPER(ACTIVE_YN) = 'Y' AND ROLE_ID = '" + RESTRICTED_APP_ROLE_ID + "'"; + }else if(appId == 1){ + sql = "SELECT ROLE_ID, ROLE_NAME from FN_ROLE where UPPER(ACTIVE_YN) = 'Y' AND APP_ID IS NULL"; + }else{ + sql = "SELECT ROLE_ID, ROLE_NAME from FN_ROLE where UPPER(ACTIVE_YN) = 'Y' AND APP_ID = '" + appId + "'"; } logQuery(sql); @SuppressWarnings("unchecked") @@ -475,8 +476,8 @@ public class EPAppCommonServiceImpl implements EPAppService { * (non-Javadoc) * * @see - * org.openecomp.portalapp.portal.service.EPAppService#getAppCatalog(com.att - * .fusionapp.ecomp.portal.domain.EPUser) + * org.openecomp.portalapp.portal.service.EPAppService#getAppCatalog( + * org.openecomp.portalapp.portal.domain.EPUser) */ @Override public List<AppCatalogItem> getUserAppCatalog(EPUser user) { @@ -721,6 +722,7 @@ public class EPAppCommonServiceImpl implements EPAppService { return fieldsValidator; } + @SuppressWarnings("unchecked") @Override public FieldsValidator deleteOnboardingApp(EPUser user, Long appid) { FieldsValidator fieldsValidator = new FieldsValidator(); @@ -728,6 +730,16 @@ public class EPAppCommonServiceImpl implements EPAppService { fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_FORBIDDEN); return fieldsValidator; } + final Map<String, Long> params = new HashMap<>(); + params.put("app_id", appid); + List<EPUserAppRolesRequest> EPUserAppRolesRequestList= new ArrayList<>(); + EPUserAppRolesRequestList = dataAccessService.executeNamedQuery( "getRequestIdsForApp", params, null); + for(int i=0;i<EPUserAppRolesRequestList.size();i++) + { + dataAccessService.deleteDomainObjects(EPUserAppRolesRequestDetail.class , "req_id=" + EPUserAppRolesRequestList.get(i).getId(),null); + + } + Boolean result = false; Session localSession = null; Transaction transaction = null; @@ -1123,6 +1135,8 @@ public class EPAppCommonServiceImpl implements EPAppService { onboardingApp.uebTopicName = app.getUebTopicName(); onboardingApp.uebKey = app.getUebKey(); onboardingApp.uebSecret = app.getUebSecret(); + onboardingApp.isCentralAuth = app.getCentralAuth(); + onboardingApp.nameSpace = app.getNameSpace(); onboardingApp.setRestrictedApp(app.isRestrictedApp()); // if (app.getThumbnail() != null) // onboardingApp.thumbnail = new @@ -1152,6 +1166,8 @@ public class EPAppCommonServiceImpl implements EPAppService { app.setUebTopicName(onboardingApp.uebTopicName); app.setUebKey(onboardingApp.uebKey); app.setUebSecret(onboardingApp.uebSecret); + app.setCentralAuth(onboardingApp.isCentralAuth); + app.setNameSpace(onboardingApp.nameSpace); app.setRestrictedApp(onboardingApp.restrictedApp); if (!StringUtils.isEmpty(onboardingApp.thumbnail)) { logger.debug(EELFLoggerDelegate.debugLogger, "createAppFromOnboarding: onboarding thumbnail is NOT empty"); @@ -1424,5 +1440,42 @@ public class EPAppCommonServiceImpl implements EPAppService { public List<EPApp> getUserRemoteApps(String id) { throw new RuntimeException(" Cannot be called from parent class"); } + + @Override + public UserRoles getUserProfileForLeftMenu(String loginId) { + final Map<String, String> params = new HashMap<>(); + params.put("org_user_id", loginId); + @SuppressWarnings("unchecked") + List<UserRole> userRoleList = dataAccessService.executeNamedQuery( "getUserRolesForLeftMenu", params, null); + ArrayList<UserRoles> usersRolesList = aggregateUserProfileRowsResultsByRole(userRoleList); + if (usersRolesList == null || usersRolesList.size() < 1) + return null; + + return usersRolesList.get(0); + } + + + @Override + public UserRoles getUserProfileNormalizedForLeftMenu(EPUser user) { + // Check database. + UserRoles userAndRoles = getUserProfileForLeftMenu(user.getLoginId()); + // If no roles are defined, treat this user as a guest. + if (user.isGuest() || userAndRoles == null) { + logger.debug(EELFLoggerDelegate.debugLogger, "getUserProfileForLeftMenu: treating user {} as guest", + user.getLoginId()); + UserRole userRole = new UserRole(); + userRole.setUser_Id(user.getId()); + userRole.setOrgUserId(user.getLoginId()); + userRole.setFirstName(user.getFirstName()); + userRole.setLastName(user.getLastName()); + userRole.setRoleId(-1L); + userRole.setRoleName("Guest"); + userRole.setUser_Id(-1L); + userAndRoles = new UserRoles(userRole); + } + + return userAndRoles; + } + } diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppService.java index 1e12dd52..3ab12983 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppService.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppService.java @@ -97,7 +97,7 @@ public interface EPAppService { * the user has a defined role for that app. * * @param user - * EPUser object with the user's ATT UID + * EPUser object with the user's Org User ID * @return the user's list of applications, which may be empty. */ List<EPApp> getUserApps(EPUser user); @@ -109,7 +109,7 @@ public interface EPAppService { * applications which the user has chosen to show. * * @param user - * EPUser object with the user's ATT UID + * EPUser object with the user's Org User ID * @return the user's personalized list of applications, which may be empty. */ List<EPApp> getPersAdminApps(EPUser user); @@ -122,7 +122,7 @@ public interface EPAppService { * result. * * @param user - * EPUser object with the user's ATT UID + * EPUser object with the user's Org User ID * @return the user's personalized list of applications, which may be empty. */ List<EPApp> getPersUserApps(EPUser user); @@ -210,4 +210,8 @@ public interface EPAppService { void createOnboardingFromApp(EPApp app, OnboardingApp onboardingApp); + UserRoles getUserProfileNormalizedForLeftMenu(EPUser user); + + UserRoles getUserProfileForLeftMenu(String loginId); + } diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLeftMenuServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLeftMenuServiceImpl.java index 9158e990..f24ab87f 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLeftMenuServiceImpl.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLeftMenuServiceImpl.java @@ -73,7 +73,7 @@ public class EPLeftMenuServiceImpl implements EPLeftMenuService { // be revised as Account Administrator may become obsolete try { if (user != null) { - UserRoles uRoles = appService.getUserProfileNormalized(user); + UserRoles uRoles = appService.getUserProfileNormalizedForLeftMenu(user); if (uRoles.getRoles().contains("Account Administrator")) loadAccAdminNavMap(defaultNavMap); } diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleFunctionService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleFunctionService.java new file mode 100644 index 00000000..66a9ccc2 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleFunctionService.java @@ -0,0 +1,31 @@ +package org.openecomp.portalapp.portal.service; + +import java.util.List; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; + +import org.openecomp.portalapp.portal.domain.EPUser; +import org.openecomp.portalsdk.core.domain.RoleFunction; + +public interface EPRoleFunctionService { + /** + * Builds a set of role functions and sets a session attribute with it. + * + * @param request + * HttpServletRequest + * @return Set of role functions that was built. + */ + public List<RoleFunction> getRoleFunctions(); + + + /** + * Builds a set of role functions of user + * + * @param request + * HttpServletRequest + * @return Set of role functions that was built. + */ + public Set getRoleFunctions(HttpServletRequest request, EPUser user); + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleFunctionServiceCentralizedImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleFunctionServiceCentralizedImpl.java new file mode 100644 index 00000000..d41100ff --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleFunctionServiceCentralizedImpl.java @@ -0,0 +1,70 @@ +package org.openecomp.portalapp.portal.service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.hibernate.SessionFactory; +import org.openecomp.portalapp.portal.domain.CentralRoleFunction; +import org.openecomp.portalapp.portal.domain.EPUser; +import org.openecomp.portalsdk.core.domain.RoleFunction; +import org.openecomp.portalsdk.core.service.DataAccessService; +import org.openecomp.portalsdk.core.util.SystemProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + + +@Transactional +public class EPRoleFunctionServiceCentralizedImpl implements EPRoleFunctionService{ + + + @Autowired + private DataAccessService dataAccessService; + + @Autowired + private SessionFactory sessionFactory; + + @SuppressWarnings({ "unchecked"}) + @Override + public List<RoleFunction> getRoleFunctions() { + List<CentralRoleFunction> getRoleFuncList = null; + List<RoleFunction> getRoleFuncListOfPortal = new ArrayList<>(); + final Map<String, Long> params = new HashMap<>(); + params.put("appId", (long) 1); + //Sync all functions from external system into Ecomp portal DB + getRoleFuncList = dataAccessService.executeNamedQuery("getAllRoleFunctions", params, null); + for(CentralRoleFunction roleFunction : getRoleFuncList) + { + RoleFunction roleFun = new RoleFunction(); + roleFun.setCode(roleFunction.getCode()); + roleFun.setName(roleFunction.getName()); + getRoleFuncListOfPortal.add(roleFun); + } + return getRoleFuncListOfPortal; + } + + @SuppressWarnings("unchecked") + @Override + public Set getRoleFunctions(HttpServletRequest request, EPUser user) { + HttpSession session = request.getSession(); + String userId = user.getId().toString(); + final Map<String, String> params = new HashMap<>(); + params.put("userId", userId); + @SuppressWarnings("unchecked") + List getRoleFuncListOfPortal = dataAccessService.executeNamedQuery("getRoleFunctionsOfUser", params, null); + Set<String> getRoleFuncListOfPortalSet = new HashSet<>(getRoleFuncListOfPortal); + session.setAttribute(SystemProperties.getProperty(SystemProperties.ROLE_FUNCTIONS_ATTRIBUTE_NAME), + getRoleFuncListOfPortalSet); + return getRoleFuncListOfPortalSet; + + } + + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleFunctionServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleFunctionServiceImpl.java new file mode 100644 index 00000000..f36aa544 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleFunctionServiceImpl.java @@ -0,0 +1,79 @@ +package org.openecomp.portalapp.portal.service; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.openecomp.portalapp.portal.domain.EPRole; +import org.openecomp.portalapp.portal.domain.EPUser; +import org.openecomp.portalapp.util.EPUserUtils; +import org.openecomp.portalsdk.core.domain.RoleFunction; +import org.openecomp.portalsdk.core.service.DataAccessService; +import org.openecomp.portalsdk.core.util.SystemProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +@Transactional +public class EPRoleFunctionServiceImpl implements EPRoleFunctionService { + @Autowired + private DataAccessService dataAccessService; + + + + public DataAccessService getDataAccessService() { + return dataAccessService; + } + + public void setDataAccessService(DataAccessService dataAccessService) { + this.dataAccessService = dataAccessService; + } + + @SuppressWarnings("unchecked") + @Override + public List<RoleFunction> getRoleFunctions() { + return getDataAccessService().getList(RoleFunction.class, null); + } + + @SuppressWarnings("unchecked") + @Override + public Set getRoleFunctions(HttpServletRequest request, EPUser user) { + HashSet roleFunctions = null; + + HttpSession session = request.getSession(); + roleFunctions = (HashSet) session + .getAttribute(SystemProperties.getProperty(SystemProperties.ROLE_FUNCTIONS_ATTRIBUTE_NAME)); + + if (roleFunctions == null) { + HashMap roles = EPUserUtils.getRoles(request); + roleFunctions = new HashSet(); + + Iterator i = roles.keySet().iterator(); + + while (i.hasNext()) { + Long roleKey = (Long) i.next(); + EPRole role = (EPRole) roles.get(roleKey); + + Iterator j = role.getRoleFunctions().iterator(); + + while (j.hasNext()) { + RoleFunction function = (RoleFunction) j.next(); + roleFunctions.add(function.getCode()); + } + } + + session.setAttribute(SystemProperties.getProperty(SystemProperties.ROLE_FUNCTIONS_ATTRIBUTE_NAME), + roleFunctions); + } + + return roleFunctions; + } + + + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ExternalAccessRolesService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ExternalAccessRolesService.java new file mode 100644 index 00000000..e57d4fa5 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ExternalAccessRolesService.java @@ -0,0 +1,190 @@ +package org.openecomp.portalapp.portal.service; + +import java.util.List; + +import org.hibernate.Session; +import org.openecomp.portalapp.portal.domain.CentralRoleFunction; +import org.openecomp.portalapp.portal.domain.EPApp; +import org.openecomp.portalapp.portal.domain.EPRole; +import org.openecomp.portalapp.portal.transport.CentralRole; +import org.openecomp.portalsdk.core.domain.Role; +import org.openecomp.portalsdk.core.domain.RoleFunction; + +public interface ExternalAccessRolesService { + + /** + * It gets all application roles + * + * @param appId + * @param extRequestValue + * @return List + * @throws Exception + */ + public List<EPRole> getAppRoles(Long appId, Boolean extRequestValue) throws Exception; + + /** + * It returns application details + * + * @param uebkey + * @return List + * @throws Exception + */ + public List<EPApp> getApp(String uebkey) throws Exception; + + /** + * Adds role in the external access system if fails throws exception + * + * @param addRoles + * @param UE + * @return boolean + * @throws Exception + */ + public boolean addRole(Role addRoles, String uebkey) throws Exception; + + /** + * Updates role in the external access system otherwise throws exception + * + * @param updateRole + * @param uebkey + * @return boolean + * @throws Exception + */ + void updateRole(Role updateRole, EPApp app) throws Exception; + + /** + * It returns complete user information including application roles permissions + * + * @param loginId + * @param uebkey + * @return String + * @throws Exception + */ + String getUser(String loginId, String uebkey) throws Exception; + + /** + * It returns list of all role functions + * @param string + * @return List + * @throws Exception + */ + List<CentralRoleFunction> getRoleFuncList(String string) throws Exception; + + /** + * It return list of role provided by the app uebkey and roleId + * + * @param roleId + * @param uebkey + * @return CentralRole + * @throws Exception + */ + CentralRole getRoleInfo(Long roleId, String uebkey) throws Exception; + + /** + * It returns the CentralRoleFunction object + * + * @param functionCode + * @param uebkey + * @return CentralRoleFunction + * @throws Exception + */ + public CentralRoleFunction getRoleFunction(String functionCode, String uebkey) throws Exception; + + /** + * It saves role function in the DB + * + * @param domainCentralRoleFunction + * @param requestedApp + * @throws Exception + */ + public void saveCentralRoleFunction(CentralRoleFunction domainCentralRoleFunction, EPApp requestedApp) throws Exception; + + /** + * It deletes role function in the DB + * + * @param code + * @param string + */ + public void deleteCentralRoleFunction(String code, String string); + + /** + * It gets all roles the applications + * + * @param uebkey + * @return List + * @throws Exception + */ + public List<CentralRole> getRolesForApp(String uebkey) throws Exception; + + /** + * It saves role function in the DB + * + * @param saveRole + * @param uebkey + * @throws Exception + */ + void saveRoleForApplication(Role saveRole, String uebkey) throws Exception; + + /** + * It deletes role in the DB + * + * @param code + * @param uebkey + * @throws Exception + */ + void deleteRoleForApplication(String code, String uebkey) throws Exception; + + /** + * It gets all active roles for single application + * + * @param uebkey + * @return List + * @throws Exception + */ + List<CentralRole> getActiveRoles(String uebkey) throws Exception; + + /** + * It deletes user related roles for an application in the table + * @param roleId + * @param uebkey + * @param LoginId + * @return + * @throws Exception + */ + public void deleteDependcyRoleRecord(Long roleId, String uebkey, String LoginId) throws Exception; + + /** + * It sync new functions codes and names from and updates role functions from external access system + * + * @param app + * @throws Exception + */ + public void syncRoleFunctionFromExternalAccessSystem(EPApp app) throws Exception; + + public Integer bulkUploadFunctions(String uebkey) throws Exception; + + public Integer bulkUploadRoles(String uebkey) throws Exception; + + public void bulkUploadPartnerFunctions(String header, List<RoleFunction> upload) throws Exception; + + public void bulkUploadPartnerRoles(String header, List<Role> upload) throws Exception; + + Integer bulkUploadRolesFunctions(String uebkey) throws Exception; + + /** + * SyncApplicationRolesWithEcompDB sync the roles and rolefunctions to the ecomp DB from AAF + * @param app + * @throws Exception + */ + + void SyncApplicationRolesWithEcompDB(EPApp app) throws Exception; + + public Integer bulkUploadUserRoles(String uebkey) throws Exception; + + void bulkUploadPartnerRoleFunctions(String uebkey, List<Role> roleList) throws Exception; + + public void deleteRoleDependeciesRecord(Session localSession, Long roleId) throws Exception; + + List<String> getMenuFunctionsList(String uebkey) throws Exception; + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ExternalAccessRolesServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ExternalAccessRolesServiceImpl.java new file mode 100644 index 00000000..17d9ceb0 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ExternalAccessRolesServiceImpl.java @@ -0,0 +1,1678 @@ +package org.openecomp.portalapp.portal.service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.stream.Collectors; + +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.Transaction; +import org.json.JSONArray; +import org.json.JSONObject; +import org.openecomp.portalapp.portal.domain.CentralRoleFunction; +import org.openecomp.portalapp.portal.domain.EPApp; +import org.openecomp.portalapp.portal.domain.EPAppRoleFunction; +import org.openecomp.portalapp.portal.domain.EPRole; +import org.openecomp.portalapp.portal.domain.EPUser; +import org.openecomp.portalapp.portal.domain.EPUserApp; +import org.openecomp.portalapp.portal.domain.ExternalRoleDetails; +import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog; +import org.openecomp.portalapp.portal.transport.BulkUploadRoleFunction; +import org.openecomp.portalapp.portal.transport.BulkUploadUserRoles; +import org.openecomp.portalapp.portal.transport.CentralApp; +import org.openecomp.portalapp.portal.transport.CentralRole; +import org.openecomp.portalapp.portal.transport.CentralUser; +import org.openecomp.portalapp.portal.transport.CentralUserApp; +import org.openecomp.portalapp.portal.transport.ExternalAccessPerms; +import org.openecomp.portalapp.portal.transport.ExternalAccessPermsDetail; +import org.openecomp.portalapp.portal.transport.ExternalAccessRole; +import org.openecomp.portalapp.portal.transport.ExternalAccessRolePerms; +import org.openecomp.portalapp.portal.transport.ExternalAccessUser; +import org.openecomp.portalapp.portal.transport.ExternalRoleDescription; +import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties; +import org.openecomp.portalapp.portal.utils.EcompPortalUtils; +import org.openecomp.portalapp.portal.utils.PortalConstants; +import org.openecomp.portalsdk.core.domain.Role; +import org.openecomp.portalsdk.core.domain.RoleFunction; +import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.openecomp.portalsdk.core.service.DataAccessService; +import org.openecomp.portalsdk.core.util.SystemProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.client.RestTemplate; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.type.TypeFactory; + +@Service("externalAccessRolesService") +@EnableAspectJAutoProxy +@EPMetricsLog +public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesService { + + private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ExternalAccessRolesServiceImpl.class); + + @Autowired + private DataAccessService dataAccessService; + + @Autowired + private SessionFactory sessionFactory; + + + RestTemplate template = new RestTemplate(); + + @SuppressWarnings("unchecked") + public List<EPRole> getAppRoles(Long appId, Boolean extRequestValue) throws Exception { + List<EPRole> applicationRoles = null; + String filter = null; + try { + if (appId == 1) { + filter = " where app_id is null"; + } else { + filter = " where app_id = " + appId; + } + applicationRoles = dataAccessService.getList(EPRole.class, filter, null, null); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "getAppRoles is failed", e); + throw new Exception(e.getMessage()); + } + return applicationRoles; + } + + @SuppressWarnings("unchecked") + @Override + public List<EPApp> getApp(String uebkey) throws Exception { + List<EPApp> app = null; + try { + app = (List<EPApp>) dataAccessService.getList(EPApp.class, " where ueb_key = '" + uebkey + "'", null, null); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "getApp is failed", e); + throw new Exception(e.getMessage()); + } + return app; + } + + public String getSingleAppRole(String addRole, EPApp app) throws Exception { + String response = ""; + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + HttpEntity<String> entity = new HttpEntity<>(headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + response = template + .exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "roles/" + + app.getNameSpace() + "." + addRole.replaceAll(" ", "_"), + HttpMethod.GET, entity, String.class) + .getBody(); + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system"); + + return response; + } + + @Override + public boolean addRole(Role addRole, String uebkey) throws Exception { + boolean response = false; + ResponseEntity<String> addResponse = null; + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + EPApp app = getApp(uebkey).get(0); + String newRole = createNewRoleInExternalSystem(addRole, app); + HttpEntity<String> entity = new HttpEntity<>(newRole, headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + addResponse = template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "role", + HttpMethod.POST, entity, String.class); + if (addResponse.getStatusCode().value() == 201) { + response = true; + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system"); + } + if (addResponse.getStatusCode().value() == 406) { + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system but something went wrong!"); + throw new Exception("Failed to create role"); + } + return response; + } + + @Override + public void updateRole(Role addRole, EPApp app) throws Exception { + boolean addResponse = updateRoleInExternalSystem(addRole, app); + if (!addResponse) { + throw new Exception("Failed to update a role"); + } + } + + private ResponseEntity<String> deleteRoleInExternalSystem(String delRole) throws Exception { + ResponseEntity<String> delResponse = null; + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + HttpEntity<String> entity = new HttpEntity<>(delRole, headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + delResponse = template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "role?force=true", + HttpMethod.DELETE, entity, String.class); + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system"); + return delResponse; + } + + @SuppressWarnings("unchecked") + private boolean updateRoleInExternalSystem(Role updateExtRole, EPApp app) throws Exception { + boolean response = false; + ObjectMapper mapper = new ObjectMapper(); + ResponseEntity<String> deleteResponse = null; + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + ExternalAccessRolePerms extRolePerms = null; + ExternalAccessPerms extPerms = null; + List<EPRole> epRoleList = null; + epRoleList = dataAccessService.getList(EPRole.class, + " where role_id = " + updateExtRole.getId(), null, null); + String appRole = getSingleAppRole(epRoleList.get(0).getName(), app); + if (!appRole.equals("{}")) { + JSONObject jsonObj = new JSONObject(appRole); + JSONArray extRole = jsonObj.getJSONArray("role"); + if (!extRole.getJSONObject(0).has("description")) { + String roleName = extRole.getJSONObject(0).getString("name"); + String delRoleKey = "{\"name\":\"" + roleName + "\"}"; + deleteResponse = deleteRoleInExternalSystem(delRoleKey); + if (deleteResponse.getStatusCode().value() != 200) { + throw new Exception("Failed to delete role in external access system!"); + } + addRole(updateExtRole, app.getUebKey()); + } else { + String desc = extRole.getJSONObject(0).getString("description"); + String name = extRole.getJSONObject(0).getString("name"); + List<ExternalAccessPerms> list = null; + if (extRole.getJSONObject(0).has("perms")) { + JSONArray perms = extRole.getJSONObject(0).getJSONArray("perms"); + ObjectMapper permsMapper = new ObjectMapper(); + list = permsMapper.readValue(perms.toString(), TypeFactory.defaultInstance() + .constructCollectionType(List.class, ExternalAccessPerms.class)); + } + ObjectMapper roleMapper = new ObjectMapper(); + ExternalRoleDescription sysRoleList = roleMapper.readValue(desc, ExternalRoleDescription.class); + // If role name or role functions are updated then delete record in External System and add new record to avoid conflicts + Boolean existingRoleActive; + boolean res; + // check role active status + existingRoleActive = new Boolean(sysRoleList.getActive()); + res = existingRoleActive.equals(updateExtRole.getActive()); + if (!sysRoleList.getName().equals(updateExtRole.getName())) { + String deleteRoleKey = "{\"name\":\"" + name + "\"}"; + deleteResponse = deleteRoleInExternalSystem(deleteRoleKey); + if (deleteResponse.getStatusCode().value() != 200) { + throw new Exception("Failed to delete role in external access system!"); + } + response = addRole(updateExtRole, app.getUebKey()); + ObjectMapper addPermsMapper = new ObjectMapper(); + response = addRoleFunctionsInExternalSystem(updateExtRole, addPermsMapper, app); + } + ExternalAccessRole updateRole = new ExternalAccessRole(); + if (!res || !sysRoleList.getPriority().equals(String.valueOf(updateExtRole.getPriority())) || + sysRoleList.getId().equals("null")) { + String updateDesc = ""; + List<EPRole> getRole = dataAccessService.getList(EPRole.class, + " where role_name = '" + updateExtRole.getName() + "'", null, null); + if (app.getId().equals(PortalConstants.PORTAL_APP_ID)) { + updateDesc = "{\"id\":\"" + getRole.get(0).getId() + "\",\"name\":\"" + updateExtRole.getName() + + "\",\"active\":\"" + updateExtRole.getActive() + "\",\"priority\":\"" + + updateExtRole.getPriority() + "\",\"appId\":\"null\",\"appRoleId\":\"null\"}"; + + } else { + updateDesc = "{\"id\":\"" + getRole.get(0).getId() + "\",\"name\":\"" + updateExtRole.getName() + + "\",\"active\":\"" + updateExtRole.getActive() + "\",\"priority\":\"" + + updateExtRole.getPriority() + "\",\"appId\":\"" + app.getId() + "\",\"appRoleId\":\"" + + getRole.get(0).getAppRoleId() + "\"}"; + + } + updateRole.setName(app.getNameSpace() + "." + updateExtRole.getName().replaceAll(" ", "_")); + updateRole.setDescription(updateDesc); + String updateRoleDesc = mapper.writeValueAsString(updateRole); + HttpEntity<String> entity = new HttpEntity<>(updateRoleDesc, headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "role", + HttpMethod.PUT, entity, String.class); + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system"); + } + List<RoleFunction> roleFunctionListNew = convertSetToListOfRoleFunctions(updateExtRole); + Map<String, RoleFunction> updateRoleFunc = new HashMap<>(); + for (RoleFunction addPerm : roleFunctionListNew) { + updateRoleFunc.put(addPerm.getCode(), addPerm); + } + final Map<String, ExternalAccessPerms> extRolePermMap = new HashMap<>(); + // Update permissions in the ExternalAccess System + ObjectMapper permMapper = new ObjectMapper(); + if (list != null) { + for (ExternalAccessPerms perm : list) { + if (!updateRoleFunc.containsKey(perm.getInstance())) { + removePermForRole(perm, permMapper, name, headers); + } + extRolePermMap.put(perm.getInstance(), perm); + } + } + response = true; + if (!roleFunctionListNew.isEmpty() || roleFunctionListNew.size() > 0) { + for (RoleFunction roleFunc : roleFunctionListNew) { + if (!extRolePermMap.containsKey(roleFunc.getCode())) { + String checkType = roleFunc.getCode().contains("menu") ? "menu" : "url"; + extPerms = new ExternalAccessPerms(app.getNameSpace() + "." + checkType, roleFunc.getCode(), + "*"); + extRolePerms = new ExternalAccessRolePerms(extPerms, + app.getNameSpace() + "." + updateExtRole.getName().replaceAll(" ", "_")); + String updateRolePerms = mapper.writeValueAsString(extRolePerms); + HttpEntity<String> entity = new HttpEntity<>(updateRolePerms, headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + ResponseEntity<String> addResponse = template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "role/perm", + HttpMethod.POST, entity, String.class); + if (addResponse.getStatusCode().value() != 201) { + response = false; + logger.debug(EELFLoggerDelegate.debugLogger, + "Connected to External Access system but something went wrong! due to {} and statuscode: {}", addResponse.getStatusCode().getReasonPhrase(), addResponse.getStatusCode().value()); + } else { + response = true; + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system"); + } + } + } + } + } + } else { + // It seems like role exists in local DB but not in External Access system + addRole(updateExtRole, app.getUebKey()); + List<RoleFunction> roleFunctionListUpdate = convertSetToListOfRoleFunctions(updateExtRole); + response = true; + if (!roleFunctionListUpdate.isEmpty() || roleFunctionListUpdate.size() > 0) { + ObjectMapper addPermsMapper = new ObjectMapper(); + addRoleFunctionsInExternalSystem(updateExtRole, addPermsMapper, app); + } + } + return response; + } + + private boolean addRoleFunctionsInExternalSystem(Role updateExtRole, ObjectMapper addPermsMapper, EPApp app) throws Exception { + boolean response = false; + ExternalAccessRolePerms extAddRolePerms = null; + ExternalAccessPerms extAddPerms = null; + List<RoleFunction> roleFunctionListAdd = convertSetToListOfRoleFunctions(updateExtRole); + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + for (RoleFunction roleFunc : roleFunctionListAdd) { + String checkType = roleFunc.getCode().contains("menu") ? "menu" : "url"; + extAddPerms = new ExternalAccessPerms(app.getNameSpace() + "." + checkType, roleFunc.getCode(), + "*"); + extAddRolePerms = new ExternalAccessRolePerms(extAddPerms, + app.getNameSpace() + "." + updateExtRole.getName().replaceAll(" ", "_")); + String updateRolePerms = addPermsMapper.writeValueAsString(extAddRolePerms); + HttpEntity<String> entity = new HttpEntity<>(updateRolePerms, headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + ResponseEntity<String> addResponse = template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "role/perm", + HttpMethod.POST, entity, String.class); + if (addResponse.getStatusCode().value() != 201) { + response = false; + logger.debug(EELFLoggerDelegate.debugLogger, + "Connected to External Access system but something went wrong! due to {} and statuscode: {}", addResponse.getStatusCode().getReasonPhrase(), addResponse.getStatusCode().value()); + } else { + response = true; + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system"); + } + } + return response; + } + + @SuppressWarnings("unchecked") + private List<RoleFunction> convertSetToListOfRoleFunctions(Role updateExtRole){ + Set<RoleFunction> roleFunctionSetList = updateExtRole.getRoleFunctions(); + List<RoleFunction> roleFunctionList = new ArrayList<>(); + ObjectMapper roleFuncMapper = new ObjectMapper(); + Iterator<RoleFunction> itetaror = roleFunctionSetList.iterator(); + while (itetaror.hasNext()) { + Object nextValue = itetaror.next(); + RoleFunction roleFunction = roleFuncMapper.convertValue(nextValue, RoleFunction.class); + roleFunctionList.add(roleFunction); + } + return roleFunctionList.stream().distinct().collect(Collectors.toList()); + } + + private void removePermForRole(ExternalAccessPerms perm, ObjectMapper permMapper,String name, HttpHeaders headers) throws Exception { + ExternalAccessRolePerms extAccessRolePerms = new ExternalAccessRolePerms(perm, name); + String permDetails = permMapper.writeValueAsString(extAccessRolePerms); + HttpEntity<String> deleteEntity = new HttpEntity<>(permDetails, headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + ResponseEntity<String> deletePermResponse = template.exchange(SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "role/"+name+"/perm", HttpMethod.DELETE, deleteEntity, String.class); + if (deletePermResponse.getStatusCode().value() != 200) { + throw new Exception("Failed to delete role function"); + } + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system"); + } + + private boolean addNewRoleInExternalSystem(List<EPRole> newRole, EPApp app) throws Exception { + boolean response = false; + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + ObjectMapper mapper = new ObjectMapper(); + String addNewRole = ""; + ExternalAccessRole extRole = new ExternalAccessRole(); + String addDesc = null; + addDesc = "{\"id\":\"" + newRole.get(0).getId() + "\",\"name\":\"" + newRole.get(0).getName() + "\",\"active\":\"" + + newRole.get(0).getActive() + "\",\"priority\":\"" +newRole.get(0).getPriority() + "\",\"appId\":\"" + + newRole.get(0).getAppId() + "\",\"appRoleId\":\"" + newRole.get(0).getAppRoleId() + "\"}"; + + extRole.setName(app.getNameSpace() + "." + newRole.get(0).getName().replaceAll(" ", "_")); + extRole.setDescription(addDesc); + addNewRole = mapper.writeValueAsString(extRole); + HttpEntity<String> deleteEntity = new HttpEntity<>(addNewRole, headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + ResponseEntity<String> addNewRoleInExternalSystem = template.exchange(SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "role", HttpMethod.POST, deleteEntity, String.class); + if (addNewRoleInExternalSystem.getStatusCode().value() != 201) { + throw new Exception("Failed to add Role in External System"); + } else{ + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system"); + response = true; + } + return response; + } + + @SuppressWarnings("unchecked") + private String createNewRoleInExternalSystem(Role addRole, EPApp app) throws JsonProcessingException { + ObjectMapper mapper = new ObjectMapper(); + String addNewRole = ""; + ExternalAccessRole extRole = new ExternalAccessRole(); + List<EPRole> role = null; + String addDesc = null; + if(app.getId().equals(PortalConstants.PORTAL_APP_ID)){ + role = dataAccessService.getList(EPRole.class, + " where role_id = " + addRole.getId(), null, null); + addDesc = "{\"id\":\"" + role.get(0).getId() + "\",\"name\":\"" + addRole.getName() + "\",\"active\":\"" + + role.get(0).getActive() + "\",\"priority\":\"" + role.get(0).getPriority() + + "\",\"appId\":\"null\",\"appRoleId\":\"null\"}"; + } else{ + role = dataAccessService.getList(EPRole.class, + " where app_role_id = " + addRole.getId(), null, null); + addDesc = "{\"id\":\"" + role.get(0).getId() + "\",\"name\":\"" + addRole.getName() + "\",\"active\":\"" + + role.get(0).getActive() + "\",\"priority\":\"" + addRole.getPriority() + "\",\"appId\":\"" + + app.getId() + "\",\"appRoleId\":\"" + role.get(0).getAppRoleId() + "\"}"; + } + extRole.setName(app.getNameSpace() + "." + addRole.getName().replaceAll(" ", "_")); + extRole.setDescription(addDesc); + addNewRole = mapper.writeValueAsString(extRole); + return addNewRole; + } + + @SuppressWarnings("unchecked") + @Transactional + private boolean addRoleInEcompDB(Role addRoleInDB, EPApp app) throws Exception { + boolean result = false; + List<EPRole> applicationRoles = null; + EPRole epRole = null; + Set<RoleFunction> roleFunctionList = addRoleInDB.getRoleFunctions(); + List<RoleFunction> roleFunctionListNew = new ArrayList<>(); + ObjectMapper mapper = new ObjectMapper(); + Iterator<RoleFunction> itetaror = roleFunctionList.iterator(); + while (itetaror.hasNext()) { + Object nextValue = itetaror.next(); + RoleFunction roleFunction = mapper.convertValue(nextValue, RoleFunction.class); + roleFunctionListNew.add(roleFunction); + } + List<RoleFunction> listWithoutDuplicates = roleFunctionListNew.stream().distinct().collect(Collectors.toList()); + try { + if (addRoleInDB.getId() == null) { // check if it is new role + checkIfRoleExitsInExternalSystem(addRoleInDB, app); + EPRole epRoleNew = new EPRole(); + epRoleNew.setActive(addRoleInDB.getActive()); + epRoleNew.setName(addRoleInDB.getName()); + epRoleNew.setPriority(addRoleInDB.getPriority()); + if (app.getId().equals(PortalConstants.PORTAL_APP_ID)) { + epRoleNew.setAppId(null); + } else { + epRoleNew.setAppId(app.getId()); + } + dataAccessService.saveDomainObject(epRoleNew, null); + List <EPRole> getRoleCreated = null; + if (!app.getId().equals(PortalConstants.PORTAL_APP_ID)) { + List<EPRole> roleCreated = dataAccessService.getList(EPRole.class, + " where role_name = '" + addRoleInDB.getName() +"'", null, null); + EPRole epUpdateRole = roleCreated.get(0); + epUpdateRole.setAppRoleId(epUpdateRole.getId()); + dataAccessService.saveDomainObject(epUpdateRole, null); + getRoleCreated = dataAccessService.getList(EPRole.class, + " where role_name = '" + addRoleInDB.getName() +"'", null, null); + } else{ + getRoleCreated = dataAccessService.getList(EPRole.class, + " where role_name = '" + addRoleInDB.getName() +"'", null, null); + } + // Add role in External Access system + boolean response = addNewRoleInExternalSystem(getRoleCreated, app); + + if (!response) { + throw new Exception("Failed to add role!"); + } + } else { // if role already exists then update it + if (app.getId().equals(PortalConstants.PORTAL_APP_ID)) { + applicationRoles = dataAccessService.getList(EPRole.class, + " where app_id is null " + " and role_id = " + addRoleInDB.getId(), null, null); + } else { + applicationRoles = dataAccessService.getList(EPRole.class, + " where app_id = " + app.getId() + " and app_role_id = " + addRoleInDB.getId(), null, null); + } + if(applicationRoles.isEmpty() && !app.getId().equals(PortalConstants.PORTAL_APP_ID)){ + applicationRoles = dataAccessService.getList(EPRole.class, + " where app_id = " + app.getId() + " and role_id = " + addRoleInDB.getId(), null, null); + } + updateRoleInExternalSystem(addRoleInDB, app); + deleteRoleFunction(app, applicationRoles); + if (applicationRoles.size() > 0 || !applicationRoles.isEmpty()) { + epRole = applicationRoles.get(0); + epRole.setName(addRoleInDB.getName()); + epRole.setPriority(addRoleInDB.getPriority()); + epRole.setActive(addRoleInDB.getActive()); + if (app.getId().equals(PortalConstants.PORTAL_APP_ID)) { + epRole.setAppId(null); + epRole.setAppRoleId(null); + } else if(!app.getId().equals(PortalConstants.PORTAL_APP_ID) && applicationRoles.get(0).getAppRoleId() == null){ + epRole.setAppRoleId(epRole.getId()); + } + dataAccessService.saveDomainObject(epRole, null); + } + + saveRoleFunction(listWithoutDuplicates, app, applicationRoles); + } + result = true; + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "addRoleInEcompDB is failed", e); + throw new Exception(e.getMessage()); + } + return result; + } + + private void checkIfRoleExitsInExternalSystem(Role checkRole, EPApp app) throws Exception { + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + String roleName = app.getNameSpace()+"."+checkRole.getName().replaceAll(" ", "_"); + HttpEntity<String> checkRoleEntity = new HttpEntity<>(headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + ResponseEntity<String> checkRoleInExternalSystem = template.exchange(SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "roles/"+roleName, HttpMethod.GET, checkRoleEntity, String.class); + if(!checkRoleInExternalSystem.getBody().equals("{}")){ + logger.debug("Role already exists in external system ", checkRoleInExternalSystem.getBody()); + throw new Exception("Role already exists in external system"); + } + } + + private void saveRoleFunction(List<RoleFunction> roleFunctionListNew, EPApp app, List<EPRole> applicationRoles) throws Exception { + for (RoleFunction roleFunc : roleFunctionListNew) { + EPAppRoleFunction appRoleFunc = new EPAppRoleFunction(); + appRoleFunc.setAppId(app.getId()); + appRoleFunc.setRoleId(applicationRoles.get(0).getId()); + appRoleFunc.setCode(roleFunc.getCode()); + dataAccessService.saveDomainObject(appRoleFunc, null); + } + } + + @SuppressWarnings("unchecked") + private void deleteRoleFunction(EPApp app, List<EPRole> role) { + List<EPAppRoleFunction> appRoleFunctionList = dataAccessService.getList(EPAppRoleFunction.class, + " where app_id = " + app.getId() + " and role_id = " + role.get(0).getId(), null, null); + if (!appRoleFunctionList.isEmpty() || appRoleFunctionList.size() > 0) { + for (EPAppRoleFunction approleFunction : appRoleFunctionList) { + dataAccessService.deleteDomainObject(approleFunction, null); + } + } + } + + @SuppressWarnings("unchecked") + public String getUser(String loginId, String uebkey) throws Exception { + final Map<String, String> params = new HashMap<>(); + List<EPUser> userList = null; + CentralUser cenUser = null; + EPApp app = null; + String result = null; + try { + params.put("orgUserIdValue", loginId); + List<EPApp> appList = (List<EPApp>) getApp(uebkey); + if (appList.size() > 0) { + app = appList.get(0); + userList = (List<EPUser>) dataAccessService.getList(EPUser.class, + " where org_user_id = '" + loginId + "'", null, null); + if (userList.size() > 0) { + EPUser user = userList.get(0); + ObjectMapper mapper = new ObjectMapper(); + Set<EPUserApp> userAppSet = user.getEPUserApps(); + cenUser = createEPUser(user, userAppSet, app); + result = mapper.writeValueAsString(cenUser); + } else if (userList.size() == 0) { + throw new Exception("User not found"); + } + } else { + throw new Exception("Application not found"); + } + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "getUser is failed", e); + throw new Exception(e.getMessage()); + } + return result; + } + + @Override + public List<CentralRole> getRolesForApp(String uebkey) throws Exception { + logger.debug(EELFLoggerDelegate.debugLogger, "Entering into getRolesForApp"); + List<CentralRole> roleList = new ArrayList<>(); + final Map<String, Long> params = new HashMap<>(); + try { + List<EPApp> app = getApp(uebkey); + List<EPRole> appRolesList = getAppRoles(app.get(0).getId(), null); + createCentralRoleObject(app, appRolesList, roleList, params); + } catch (Exception e) { + throw new Exception("getRolesForApp Failed", e); + } + logger.debug(EELFLoggerDelegate.debugLogger, "Finished getRolesForApp"); + return roleList; + } + + @SuppressWarnings("unchecked") + @Override + public List<CentralRoleFunction> getRoleFuncList(String uebkey) throws Exception { + EPApp app = getApp(uebkey).get(0); + List<CentralRoleFunction> getRoleFuncList = null; + final Map<String, Long> params = new HashMap<>(); + params.put("appId", app.getId()); + //Sync all functions from external system into Ecomp portal DB + logger.debug(EELFLoggerDelegate.debugLogger, "Entering into syncRoleFunctionFromExternalAccessSystem"); + syncRoleFunctionFromExternalAccessSystem(app); + logger.debug(EELFLoggerDelegate.debugLogger, "Finished syncRoleFunctionFromExternalAccessSystem"); + getRoleFuncList = dataAccessService.executeNamedQuery("getAllRoleFunctions", params, null); + return getRoleFuncList; + } + + @SuppressWarnings("unchecked") + public CentralUser createEPUser(EPUser userInfo, Set<EPUserApp> userAppSet, EPApp app) throws Exception { + + final Map<String, Long> params = new HashMap<>(); + CentralUser userAppList = new CentralUser(); + CentralUser user1 = null; + try { + userAppList.userApps = new TreeSet<CentralUserApp>(); + for (EPUserApp userApp : userAppSet) { + if (userApp.getRole().getActive()) { + EPApp epApp = userApp.getApp(); + String globalRole = userApp.getRole().getName().toLowerCase(); + if (((epApp.getId().equals(app.getId())) + && (!userApp.getRole().getId().equals(PortalConstants.ACCOUNT_ADMIN_ROLE_ID))) + || ((epApp.getId().equals(PortalConstants.PORTAL_APP_ID)) + && (globalRole.startsWith("global_")))) { + CentralUserApp cua = new CentralUserApp(); + cua.setUserId(null); + CentralApp cenApp = new CentralApp(1L, epApp.getCreated(), epApp.getModified(), + epApp.getCreatedId(), epApp.getModifiedId(), epApp.getRowNum(), epApp.getName(), + epApp.getImageUrl(), epApp.getDescription(), epApp.getNotes(), epApp.getUrl(), + epApp.getAlternateUrl(), epApp.getAppRestEndpoint(), epApp.getMlAppName(), + epApp.getMlAppAdminId(), String.valueOf(epApp.getMotsId()), epApp.getAppPassword(), + String.valueOf(epApp.getOpen()), String.valueOf(epApp.getEnabled()), + epApp.getThumbnail(), epApp.getUsername(), epApp.getUebKey(), epApp.getUebSecret(), + epApp.getUebTopicName()); + cua.setApp(cenApp); + params.put("roleId", userApp.getRole().getId()); + params.put("appId", userApp.getApp().getId()); + List<CentralRoleFunction> appRoleFunctionList = dataAccessService + .executeNamedQuery("getAppRoleFunctionList", params, null); + SortedSet<CentralRoleFunction> roleFunctionSet = new TreeSet<CentralRoleFunction>(); + for (CentralRoleFunction roleFunc : appRoleFunctionList) { + CentralRoleFunction cenRoleFunc = new CentralRoleFunction(roleFunc.getId(), + roleFunc.getCode(), roleFunc.getName(), null, null); + roleFunctionSet.add(cenRoleFunc); + } + CentralRole cenRole = new CentralRole(userApp.getRole().getAppRoleId(), + userApp.getRole().getCreated(), userApp.getRole().getModified(), + userApp.getRole().getCreatedId(), userApp.getRole().getModifiedId(), + userApp.getRole().getRowNum(), userApp.getRole().getName(), + userApp.getRole().getActive(), userApp.getRole().getPriority(), roleFunctionSet, null, + null); + cua.setRole(cenRole); + + userAppList.userApps.add(cua); + } + } + } + + user1 = new CentralUser(null, userInfo.getCreated(), userInfo.getModified(), userInfo.getCreatedId(), + userInfo.getModifiedId(), userInfo.getRowNum(), userInfo.getOrgId(), userInfo.getManagerId(), + userInfo.getFirstName(), userInfo.getMiddleInitial(), userInfo.getLastName(), userInfo.getPhone(), + userInfo.getFax(), userInfo.getCellular(), userInfo.getEmail(), userInfo.getAddressId(), + userInfo.getAlertMethodCd(), userInfo.getHrid(), userInfo.getOrgUserId(), userInfo.getOrgCode(), + userInfo.getAddress1(), userInfo.getAddress2(), userInfo.getCity(), userInfo.getState(), + userInfo.getZipCode(), userInfo.getCountry(), userInfo.getOrgManagerUserId(), + userInfo.getLocationClli(), userInfo.getBusinessCountryCode(), userInfo.getBusinessCountryName(), + userInfo.getBusinessUnit(), userInfo.getBusinessUnitName(), userInfo.getDepartment(), + userInfo.getDepartmentName(), userInfo.getCompanyCode(), userInfo.getCompany(), + userInfo.getZipCodeSuffix(), userInfo.getJobTitle(), userInfo.getCommandChain(), + userInfo.getSiloStatus(), userInfo.getCostCenter(), userInfo.getFinancialLocCode(), + userInfo.getLoginId(), userInfo.getLoginPwd(), userInfo.getLastLoginDate(), userInfo.getActive(), + userInfo.getInternal(), userInfo.getSelectedProfileId(), userInfo.getTimeZoneId(), + userInfo.isOnline(), userInfo.getChatId(), userAppList.userApps, null); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "createEPUser failed", e); + throw new Exception(e.getMessage()); + } + + return user1; + } + + @SuppressWarnings("unchecked") + @Override + public CentralRole getRoleInfo(Long roleId, String uebkey) throws Exception { + final Map<String, Long> params = new HashMap<>(); + List<CentralRole> roleList = new ArrayList<>(); + CentralRole cenRole = new CentralRole(); + List<EPRole> roleInfo = null; + List<EPApp> app = null; + try { + app = getApp(uebkey); + if (app.isEmpty() || app.size() == 0) { + throw new Exception("Application not found"); + } + String filter = null; + if (app.get(0).getId() == PortalConstants.PORTAL_APP_ID) { + filter = " where role_id = " + roleId + " and app_id is null "; + } else { + filter = " where app_role_id = " + roleId + " and app_id = " + app.get(0).getId(); + + } + roleInfo = dataAccessService.getList(EPRole.class, filter, null, null); + roleList = createCentralRoleObject(app, roleInfo, roleList, params); + if (roleList.isEmpty()) { + return cenRole; + } + + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "getRoleInfo failed", e); + throw new Exception(e.getMessage()); + + } + return roleList.get(0); + } + + @SuppressWarnings("unchecked") + private List<CentralRole> createCentralRoleObject(List<EPApp> app, List<EPRole> roleInfo, + List<CentralRole> roleList, Map<String, Long> params) { + for (EPRole role : roleInfo) { + params.put("roleId", role.getId()); + params.put("appId", app.get(0).getId()); + List<CentralRoleFunction> cenRoleFuncList = dataAccessService.executeNamedQuery("getAppRoleFunctionList", + params, null); + SortedSet<CentralRoleFunction> roleFunctionSet = new TreeSet<CentralRoleFunction>(); + for (CentralRoleFunction roleFunc : cenRoleFuncList) { + CentralRoleFunction cenRoleFunc = new CentralRoleFunction(role.getId(), roleFunc.getCode(), + roleFunc.getName(), null, null); + roleFunctionSet.add(cenRoleFunc); + } + SortedSet<CentralRole> childRoles = new TreeSet<CentralRole>(); + CentralRole cenRole = null; + if (role.getAppRoleId() == null) { + cenRole = new CentralRole(role.getId(), role.getCreated(), role.getModified(), role.getCreatedId(), + role.getModifiedId(), role.getRowNum(), role.getName(), role.getActive(), role.getPriority(), + roleFunctionSet, childRoles, null); + } else { + cenRole = new CentralRole(role.getAppRoleId(), role.getCreated(), role.getModified(), + role.getCreatedId(), role.getModifiedId(), role.getRowNum(), role.getName(), role.getActive(), + role.getPriority(), roleFunctionSet, childRoles, null); + } + roleList.add(cenRole); + } + return roleList; + } + + @SuppressWarnings("unchecked") + @Override + public CentralRoleFunction getRoleFunction(String functionCode, String uebkey) throws Exception { + CentralRoleFunction roleFunc = null; + EPApp app = getApp(uebkey).get(0); + List<CentralRoleFunction> getRoleFuncList = null; + final Map<String, String> params = new HashMap<>(); + try { + params.put("functionCode", functionCode); + params.put("appId", String.valueOf(app.getId())); + getRoleFuncList = dataAccessService.executeNamedQuery("getRoleFunction", params, null); + if (getRoleFuncList.isEmpty() | getRoleFuncList.size() == 0) { + return roleFunc; + } + + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "getRoleFunction failed", e); + throw new Exception("getRoleFunction failed"); + } + return getRoleFuncList.get(0); + } + + @Override + public void saveCentralRoleFunction(CentralRoleFunction domainCentralRoleFunction, EPApp app) throws Exception { + try { + addRoleFunctionInExternalSystem(domainCentralRoleFunction, app); + dataAccessService.saveDomainObject(domainCentralRoleFunction, null); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "saveCentralRoleFunction failed", e); + throw new Exception(e.getMessage()); + } + } + + @SuppressWarnings("unchecked") + private void addRoleFunctionInExternalSystem(CentralRoleFunction domainCentralRoleFunction, EPApp app) + throws Exception { + ObjectMapper mapper = new ObjectMapper(); + final Map<String, String> params = new HashMap<>(); + params.put("functionCd", domainCentralRoleFunction.getCode()); + params.put("appId", String.valueOf(app.getId())); + ExternalAccessPerms extPerms = new ExternalAccessPerms(); + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + List<CentralRoleFunction> appRoleFunc = dataAccessService.executeNamedQuery("getAppFunctionDetails", params, + null); + String roleFuncName = null; + if (!appRoleFunc.isEmpty()) { + roleFuncName = appRoleFunc.get(0).getCode(); + } else { + roleFuncName = domainCentralRoleFunction.getCode(); + } + String checkType = domainCentralRoleFunction.getCode().contains("menu") ? "menu" : "url"; + HttpEntity<String> getSinglePermEntity = new HttpEntity<>(headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + ResponseEntity<String> getResponse = template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "perms/" + + app.getNameSpace() + "." + checkType + "/" + roleFuncName + "/*", + HttpMethod.GET, getSinglePermEntity, String.class); + if (getResponse.getStatusCode().value() != 200) { + throw new Exception(getResponse.getBody()); + } + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system"); + String res = getResponse.getBody(); + if (res.equals("{}")) { + try{ + extPerms.setAction("*"); + extPerms.setInstance(domainCentralRoleFunction.getCode()); + extPerms.setType(app.getNameSpace() + "." + checkType); + extPerms.setDescription(domainCentralRoleFunction.getName()); + String updateRole = mapper.writeValueAsString(extPerms); + HttpEntity<String> entity = new HttpEntity<>(updateRole, headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "perm", + HttpMethod.POST, entity, String.class); + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system"); + }catch(Exception e){ + logger.error(EELFLoggerDelegate.errorLogger, "Failed to add fucntion in external central auth system", e); + } + } else { + try{ + extPerms.setAction("*"); + extPerms.setInstance(domainCentralRoleFunction.getCode()); + extPerms.setType(app.getNameSpace() + "." + checkType); + extPerms.setDescription(domainCentralRoleFunction.getName()); + String updateRole = mapper.writeValueAsString(extPerms); + HttpEntity<String> entity = new HttpEntity<>(updateRole, headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "perm", + HttpMethod.PUT, entity, String.class); + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system"); + } catch(Exception e){ + logger.error(EELFLoggerDelegate.errorLogger, "Failed to add fucntion in external central auth system", e); + + } + } + } + + @Override + @Transactional + public void deleteCentralRoleFunction(String code, String uebkey) { + try { + EPApp app = getApp(uebkey).get(0); + final Map<String, String> params = new HashMap<>(); + params.put("functionCd", code); + params.put("appId", String.valueOf(app.getId())); + CentralRoleFunction domainCentralRoleFunction = (CentralRoleFunction) dataAccessService.executeNamedQuery("getAppFunctionDetails", params, null).get(0); + deleteRoleFunctionInExternalSystem(domainCentralRoleFunction, app); + //Delete role function dependecy records + deleteAppRoleFunctions(code, app); + dataAccessService.deleteDomainObject(domainCentralRoleFunction, null); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "deleteCentralRoleFunction failed", e); + } + } + + private void deleteAppRoleFunctions(String code, EPApp app) { + dataAccessService.deleteDomainObjects(EPAppRoleFunction.class, " app_id = "+app.getId()+" and function_cd = '"+ code +"'", null); + } + + private void deleteRoleFunctionInExternalSystem(CentralRoleFunction domainCentralRoleFunction, EPApp app) + throws Exception { + try{ + ObjectMapper mapper = new ObjectMapper(); + ExternalAccessPerms extPerms = new ExternalAccessPerms(); + String checkType = domainCentralRoleFunction.getCode().contains("menu") ? "menu" : "url"; + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + extPerms.setAction("*"); + extPerms.setInstance(domainCentralRoleFunction.getCode()); + extPerms.setType(app.getNameSpace() + "." + checkType); + extPerms.setDescription(domainCentralRoleFunction.getName()); + String updateRole = mapper.writeValueAsString(extPerms); + HttpEntity<String> entity = new HttpEntity<>(updateRole, headers); + template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "perm?force=true", + HttpMethod.DELETE, entity, String.class); + } catch(Exception e){ + if(e.getMessage().equalsIgnoreCase("404 Not Found")){ + logger.debug(EELFLoggerDelegate.debugLogger, " It seems like function is already deleted in external central auth system but exists in local DB", e.getMessage()); + } else{ + logger.error(EELFLoggerDelegate.errorLogger, "Failed to delete functions in External System", e); + } + } + } + + @Override + public void saveRoleForApplication(Role saveRole, String uebkey) throws Exception { + try { + EPApp app = getApp(uebkey).get(0); + addRoleInEcompDB(saveRole, app); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "saveRoleForApplication failed", e); + throw new Exception(e.getMessage()); + } + } + + @SuppressWarnings("unchecked") + @Override + public void deleteRoleForApplication(String deleteRole, String uebkey) throws Exception { + Session localSession = null; + Transaction transaction = null; + boolean result = false; + try { + localSession = sessionFactory.openSession(); + transaction = localSession.beginTransaction(); + + List<EPRole> epRoleList = null; + ResponseEntity<String> deleteResponse = null; + EPApp app = getApp(uebkey).get(0); + if(app.getId() == 1) + { + epRoleList = dataAccessService.getList(EPRole.class, + " where app_id is null " + "and role_name = '" + deleteRole +"'", null, null); + } + else{ + epRoleList = dataAccessService.getList(EPRole.class, + " where app_id = " + app.getId() + " and role_name = '" + deleteRole +"'", null, null); + } + // Delete app role functions before deleting role + deleteRoleFunction(app, epRoleList); + if(app.getId() == 1) + { + // Delete fn_user_ role + dataAccessService.deleteDomainObjects(EPUserApp.class, + " app_id = " + app.getId() + " and role_id = " + epRoleList.get(0).getId(), null); + + deleteRoleDependeciesRecord(localSession, epRoleList.get(0).getId()); + } + // Delete Role in External System + String deleteRoleKey = "{\"name\":\"" + app.getNameSpace() + "." + + epRoleList.get(0).getName().replaceAll(" ", "_") + "\"}"; + deleteResponse = deleteRoleInExternalSystem(deleteRoleKey); + if (deleteResponse.getStatusCode().value() != 200) { + throw new Exception("Failed to delete role in external access system!"); + } + logger.debug(EELFLoggerDelegate.debugLogger, "about to commit the transaction"); + transaction.commit(); + logger.debug(EELFLoggerDelegate.debugLogger, "committed the transaction"); + dataAccessService.deleteDomainObject(epRoleList.get(0), null); + result = true; + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "deleteRoleForApplication failed", e); + throw new Exception(e.getMessage()); + }finally { + localSession.close(); + if (!result) { + throw new Exception( + "Exception occurred in deleteRoleForApplication while closing database session for role: '" + deleteRole + "'."); + } + } + } + + private void deleteUserRoleInExternalSystem(EPRole role, EPApp app, String LoginId) throws Exception { + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + HttpEntity<String> entity = new HttpEntity<>(headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + ResponseEntity<String> getResponse = template + .exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "userRole/" + + LoginId + + SystemProperties + .getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN) + + "/" + app.getNameSpace() + "." + role.getName().replaceAll(" ", "_"), + HttpMethod.GET, entity, String.class); + if (getResponse.getStatusCode().value() != 200) { + throw new Exception(getResponse.getBody()); + } + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system"); + String res = getResponse.getBody(); + if (!res.equals("{}")) { + HttpEntity<String> userRoleentity = new HttpEntity<>(headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + ResponseEntity<String> deleteResponse = template + .exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "userRole/" + LoginId + + SystemProperties + .getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN) + + "/" + app.getNameSpace() + "." + role.getName().replaceAll(" ", "_"), + HttpMethod.DELETE, userRoleentity, String.class); + if (deleteResponse.getStatusCode().value() != 200) { + throw new Exception("Failed to delete user role"); + } + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system"); + } + } + + @SuppressWarnings("unchecked") + @Override + public List<CentralRole> getActiveRoles(String uebkey) throws Exception { + List<CentralRole> roleList = new ArrayList<>(); + try { + List<EPApp> app = getApp(uebkey); + final Map<String, Long> params = new HashMap<>(); + // check if portal + Long appId = null; + if (!app.get(0).getId().equals(PortalConstants.PORTAL_APP_ID)) { + appId = app.get(0).getId(); + } + List<EPRole> epRole = dataAccessService.getList(EPRole.class, + " where app_id = " + appId + " and active_yn = 'Y'", null, null); + roleList = createCentralRoleObject(app, epRole, roleList, params); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "getActiveRoles failed", e); + throw new Exception(e.getMessage()); + } + return roleList; + + } + + @SuppressWarnings("unchecked") + @Override + public void deleteDependcyRoleRecord(Long roleId, String uebkey, String LoginId) throws Exception { + boolean result = false; + Session localSession = null; + Transaction transaction = null; + EPApp app = null; + try { + localSession = sessionFactory.openSession(); + transaction = localSession.beginTransaction(); + List<EPRole> epRoleList = null; + app = getApp(uebkey).get(0); + epRoleList = dataAccessService.getList(EPRole.class, + " where app_id = " + app.getId() + " and app_role_id = " + roleId, null, null); + if(epRoleList.isEmpty()){ + epRoleList = dataAccessService.getList(EPRole.class, + " where app_id = " + app.getId() + " and role_id = " + roleId, null, null); + } + // Delete User Role in External System before deleting role + deleteUserRoleInExternalSystem(epRoleList.get(0), app, LoginId); + // Delete user app roles + dataAccessService.deleteDomainObjects(EPUserApp.class, + " app_id = " + app.getId() + " and role_id = " + epRoleList.get(0).getId(), null); + + deleteRoleDependeciesRecord(localSession, epRoleList.get(0).getId()); + logger.debug(EELFLoggerDelegate.debugLogger, "about to commit the transaction"); + transaction.commit(); + logger.debug(EELFLoggerDelegate.debugLogger, "committed the transaction"); + result = true; + } catch (Exception e) { + EcompPortalUtils.rollbackTransaction(transaction, + "deleteDependcyRoleRecord rollback, exception = " + e); + logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e)); + }finally { + localSession.close(); + if (!result) { + throw new Exception( + "Exception occurred in syncAppRoles while closing database session for role: '" + app.getId() + "'."); + } + } + } + + @SuppressWarnings("unchecked") + @Transactional + public void syncRoleFunctionFromExternalAccessSystem(EPApp app){ + try{ + ResponseEntity<String> response = null; + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + HttpEntity<String> entity = new HttpEntity<>(headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + response = template.exchange(SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "perms/ns/" + app.getNameSpace(), HttpMethod.GET, entity, String.class); + + String res = response.getBody(); + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system and the result is :", res); + JSONObject jsonObj = new JSONObject(res); + JSONArray extPerms = jsonObj.getJSONArray("perm"); + for (int i = 0; i < extPerms.length(); i++) { + if (extPerms.getJSONObject(i).getString("type").equals(app.getNameSpace() + ".access")) { + extPerms.remove(i); + i--; + } + } + ExternalAccessPermsDetail permDetails = null; + List<ExternalAccessPermsDetail> permsDetailList = new ArrayList<>(); + for (int i = 0; i < extPerms.length(); i++) { + if (extPerms.getJSONObject(i).has("roles")) { + ObjectMapper rolesListMapper = new ObjectMapper(); + JSONArray resRoles = extPerms.getJSONObject(i).getJSONArray("roles"); + List<String> list = rolesListMapper.readValue(resRoles.toString(), + TypeFactory.defaultInstance().constructCollectionType(List.class, String.class)); + permDetails = new ExternalAccessPermsDetail(extPerms.getJSONObject(i).getString("type"), + extPerms.getJSONObject(i).getString("instance"), extPerms.getJSONObject(i).getString("action"), + list, extPerms.getJSONObject(i).getString("description")); + permsDetailList.add(permDetails); + } else { + permDetails = new ExternalAccessPermsDetail(extPerms.getJSONObject(i).getString("type"), + extPerms.getJSONObject(i).getString("instance"), extPerms.getJSONObject(i).getString("action"), + extPerms.getJSONObject(i).getString("description")); + permsDetailList.add(permDetails); + } + } + + final Map<String, Long> params = new HashMap<>(); + final Map<String, CentralRoleFunction> roleFuncMap = new HashMap<>(); + params.put("appId", app.getId()); + List<CentralRoleFunction> appFunctions = dataAccessService.executeNamedQuery("getAllRoleFunctions", params, + null); + if (appFunctions.size() > 0) { + for (CentralRoleFunction roleFunc : appFunctions) { + roleFuncMap.put(roleFunc.getCode(), roleFunc); + } + } + // delete all application role functions + dataAccessService.deleteDomainObjects(EPAppRoleFunction.class, " app_id = " + app.getId(), null); + + // Add if new functions and app role functions were added in Externalsystem + for (ExternalAccessPermsDetail permsDetail : permsDetailList) { + if (!roleFuncMap.containsKey(permsDetail.getInstance())) { + CentralRoleFunction addFunction = new CentralRoleFunction(); + addFunction.setAppId(app.getId()); + addFunction.setCode(permsDetail.getInstance()); + addFunction.setName(permsDetail.getDescription()); + dataAccessService.saveDomainObject(addFunction, null); + } + List<EPRole> epRolesList = null; + List<String> roles = permsDetail.getRoles(); + if (roles != null) { + for (String roleList : roles) { + if (app.getId().equals(PortalConstants.PORTAL_APP_ID)) { + epRolesList = dataAccessService.getList(EPRole.class, + " where app_id is null " + " and role_name = '" + + roleList.substring(app.getNameSpace().length() + 1).replaceAll("_", " ") +"'", + null, null); + } else { + epRolesList = dataAccessService.getList(EPRole.class, + " where app_id = " + app.getId() + " and role_name = '" + + roleList.substring(app.getNameSpace().length() + 1).replaceAll("_", " ") +"'", + null, null); + } + if(epRolesList.isEmpty()){ + if (app.getId().equals(PortalConstants.PORTAL_APP_ID)) { + epRolesList = dataAccessService.getList(EPRole.class, + " where app_id is null " + " and role_name = '" + + roleList.substring(app.getNameSpace().length() + 1) + + "'", + null, null); + } else { + epRolesList = dataAccessService.getList(EPRole.class, + " where app_id = " + app.getId() + " and role_name = '" + + roleList.substring(app.getNameSpace().length() + 1)+"'", + null, null); + } + } + // save all application role functions + if (epRolesList.size() > 0 || !epRolesList.isEmpty()) { + EPAppRoleFunction addAppRoleFunc = new EPAppRoleFunction(); + addAppRoleFunc.setAppId(app.getId()); + addAppRoleFunc.setCode(permsDetail.getInstance()); + addAppRoleFunc.setRoleId(epRolesList.get(0).getId()); + dataAccessService.saveDomainObject(addAppRoleFunc, null); + } + } + } + } + logger.debug(EELFLoggerDelegate.debugLogger, "Finished syncRoleFunctionFromExternalAccessSystem"); + } catch(Exception e){ + logger.error(EELFLoggerDelegate.errorLogger, "Failed syncRoleFunctionFromExternalAccessSystem", e); + + } + } + + @SuppressWarnings("unchecked") + public Integer bulkUploadFunctions(String uebkey) throws Exception { + EPApp app = getApp(uebkey).get(0); + List<RoleFunction> roleFuncList = null; + roleFuncList = dataAccessService.getList(RoleFunction.class, null); + CentralRoleFunction cenRoleFunc = null; + Integer functionsAdded = 0; + try { + for (RoleFunction roleFunc : roleFuncList) { + cenRoleFunc = new CentralRoleFunction(roleFunc.getCode(), roleFunc.getName()); + addRoleFunctionInExternalSystem(cenRoleFunc, app); + functionsAdded++; + } + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "bulkUploadFunctions failed", e.getMessage(), e); + } + return functionsAdded; + } + + public Integer bulkUploadRoles(String uebkey) throws Exception { + List<EPApp> app = getApp(uebkey); + List<EPRole> roles = getAppRoles(app.get(0).getId(), null); + List<CentralRole> cenRoleList = new ArrayList<>(); + final Map<String, Long> params = new HashMap<>(); + Integer rolesListAdded = 0; + try { + cenRoleList = createCentralRoleObject(app, roles, cenRoleList, params); + ObjectMapper mapper = new ObjectMapper(); + mapper.configure(DeserializationFeature.FAIL_ON_IGNORED_PROPERTIES, false); + String roleList = mapper.writeValueAsString(cenRoleList); + List<Role> roleObjectList = mapper.readValue(roleList, + TypeFactory.defaultInstance().constructCollectionType(List.class, Role.class)); + for (Role role : roleObjectList) { + addRoleInExternalSystem(role, app.get(0)); + rolesListAdded++; + } + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "bulkUploadRoles failed", e); + throw new Exception(e.getMessage()); + } + return rolesListAdded; + } + + private void addRoleInExternalSystem(Role role, EPApp app) throws Exception { + String addRoleNew = createNewRoleInExternalSystem(role, app); + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + try{ + HttpEntity<String> entity = new HttpEntity<>(addRoleNew, headers); + template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "role", + HttpMethod.POST, entity, String.class); + } catch(Exception e){ + if (e.getMessage().equalsIgnoreCase("409 Conflict")) { + logger.error(EELFLoggerDelegate.errorLogger, "Role already exits but does not break functionality"); + } else { + logger.error(EELFLoggerDelegate.errorLogger, "Failed to addRoleInExternalSystem", e.getMessage()); + } + } + } + + @SuppressWarnings("unchecked") + public Integer bulkUploadRolesFunctions(String uebkey) throws Exception { + EPApp app = getApp(uebkey).get(0); + List<EPRole> roles = getAppRoles(app.getId(), null); + final Map<String, Long> params = new HashMap<>(); + Integer roleFunctions = 0; + try { + for (EPRole role : roles) { + params.put("roleId", role.getId()); + List<BulkUploadRoleFunction> appRoleFunc = dataAccessService.executeNamedQuery("uploadAllRoleFunctions", params, null); + if(!appRoleFunc.isEmpty()){ + for(BulkUploadRoleFunction addRoleFunc : appRoleFunc){ + addRoleFunctionsInExternalSystem(addRoleFunc, role, app); + roleFunctions++; + } + } + } + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "bulkUploadRolesFunctions failed", e); + } + return roleFunctions; + } + + private void addRoleFunctionsInExternalSystem(BulkUploadRoleFunction addRoleFunc, EPRole role, EPApp app){ + String checkType = addRoleFunc.getFunctionCd().contains("menu") ? "menu" : "url"; + ExternalAccessRolePerms extRolePerms = null; + ExternalAccessPerms extPerms = null; + ObjectMapper mapper = new ObjectMapper(); + try{ + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + + extPerms = new ExternalAccessPerms(app.getNameSpace() + "." + checkType, addRoleFunc.getFunctionCd(), "*", addRoleFunc.getFunctionName()); + extRolePerms = new ExternalAccessRolePerms(extPerms, + app.getNameSpace() + "." + role.getName().replaceAll(" ", "_")); + String updateRolePerms = mapper.writeValueAsString(extRolePerms); + HttpEntity<String> entity = new HttpEntity<>(updateRolePerms, headers); + template + .exchange(SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "role/perm", HttpMethod.POST, entity, String.class); + } catch(Exception e){ + if (e.getMessage().equalsIgnoreCase("409 Conflict")) { + logger.error(EELFLoggerDelegate.errorLogger, "RoleFunction already exits but does not break functionality",e); + } else { + logger.error(EELFLoggerDelegate.errorLogger, "Failed to addRoleFunctionsInExternalSystem", e.getMessage()); + } + } + } + + @Override + public void bulkUploadPartnerFunctions(String uebkey, List<RoleFunction> roleFunctionsList) throws Exception { + EPApp app = getApp(uebkey).get(0); + CentralRoleFunction cenRoleFunc = null; + for (RoleFunction roleFunction : roleFunctionsList) { + cenRoleFunc = new CentralRoleFunction(roleFunction.getCode(), roleFunction.getName()); + addRoleFunctionInExternalSystem(cenRoleFunc, app); + } + } + + @Override + public void bulkUploadPartnerRoles(String uebkey, List<Role> roleList) throws Exception { + EPApp app = getApp(uebkey).get(0); + for (Role role : roleList) { + addRoleInExternalSystem(role, app); + } + } + + @SuppressWarnings("unchecked") + @Override + public void bulkUploadPartnerRoleFunctions(String uebkey, List<Role> roleList) throws Exception { + EPApp app = getApp(uebkey).get(0); + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + for (Role role : roleList) { + try { + Set<RoleFunction> roleFunctionList = role.getRoleFunctions(); + List<RoleFunction> roleFunctionListNew = new ArrayList<>(); + ObjectMapper roleFunctionsMapper = new ObjectMapper(); + Iterator<RoleFunction> itetaror = roleFunctionList.iterator(); + while (itetaror.hasNext()) { + Object nextValue = itetaror.next(); + RoleFunction roleFunction = roleFunctionsMapper.convertValue(nextValue, RoleFunction.class); + roleFunctionListNew.add(roleFunction); + } + List<RoleFunction> listWithoutDuplicates = roleFunctionListNew.stream().distinct() + .collect(Collectors.toList()); + for (RoleFunction roleFunction : listWithoutDuplicates) { + String checkType = roleFunction.getCode().contains("menu") ? "menu" : "url"; + ExternalAccessRolePerms extRolePerms = null; + ExternalAccessPerms extPerms = null; + ObjectMapper mapper = new ObjectMapper(); + extPerms = new ExternalAccessPerms(app.getNameSpace() + "." + checkType, roleFunction.getCode(), + "*"); + extRolePerms = new ExternalAccessRolePerms(extPerms, + app.getNameSpace() + "." + role.getName().replaceAll(" ", "_")); + String updateRolePerms = mapper.writeValueAsString(extRolePerms); + HttpEntity<String> entity = new HttpEntity<>(updateRolePerms, headers); + template.exchange(SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "role/perm", HttpMethod.PUT, entity, String.class); + } + } catch (Exception e) { + if (e.getMessage().equalsIgnoreCase("409 Conflict")) { + logger.error(EELFLoggerDelegate.errorLogger, + "RoleFunction already exits but does not break functionality"); + } else { + logger.error(EELFLoggerDelegate.errorLogger, "Failed to addRoleFunctionsInExternalSystem", + e.getMessage()); + } + } + + } + } + + @SuppressWarnings("unchecked") + @Transactional + public void SyncApplicationRolesWithEcompDB(EPApp app){ + try{ + ResponseEntity<String> response = null; + List<EPRole> finalRoleList = new ArrayList<>(); + ExternalRoleDescription ApplicationRole = new ExternalRoleDescription(); + ExternalAccessPerms externalAccessPerms = null; + List<String> functionCodelist = new ArrayList<>(); + List<ExternalRoleDetails> externalRoleDetailsList = new ArrayList<>(); + ObjectMapper mapper = new ObjectMapper(); + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + HttpEntity<String> entity = new HttpEntity<>(headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + response = template.exchange(SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "roles/ns/" + app.getNameSpace(), HttpMethod.GET, entity, String.class); + String res = response.getBody(); + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to External Access system and the result is :", res); + JSONObject jsonObj = new JSONObject(res); + JSONArray extRole = jsonObj.getJSONArray("role"); + for (int i = 0; i < extRole.length(); i++) { + if (extRole.getJSONObject(i).getString("name").equals(app.getNameSpace() + ".admin") + || extRole.getJSONObject(i).getString("name").equals(app.getNameSpace() + ".owner") + ) { + extRole.remove(i); + i--; + } + if(!app.getId().equals(PortalConstants.PORTAL_APP_ID) && extRole.getJSONObject(i).get("name").equals(app.getNameSpace()+"."+PortalConstants.ADMIN_ROLE.replaceAll(" ", "_"))){ + extRole.remove(i); + i--; + } + } + List<EPAppRoleFunction> applicationRoleFunctionList = new ArrayList<>(); + for (int i = 0; i < extRole.length(); i++) { + ExternalRoleDetails externalRoleDetail = new ExternalRoleDetails(); + EPAppRoleFunction ePAppRoleFunction = new EPAppRoleFunction(); + JSONObject Role = (JSONObject) extRole.get(i); + if(!extRole.getJSONObject(i).has("description")) + { + ApplicationRole.setActive("true"); + ApplicationRole.setAppId("null"); + ApplicationRole.setPriority("null"); + ApplicationRole.setAppRoleId("null"); + String roleName =extRole.getJSONObject(i).getString("name"); + ApplicationRole.setName(roleName.substring(app.getNameSpace().length()+1)); + } + else { + String desc = extRole.getJSONObject(i).getString("description"); + ApplicationRole = mapper.readValue(desc, ExternalRoleDescription.class); + } + + + SortedSet<ExternalAccessPerms> externalAccessPermsOfRole = new TreeSet<>(); + if (extRole.getJSONObject(i).has("perms")) { + JSONArray extPerm = (JSONArray) Role.get("perms"); + for (int j = 0; j < extPerm.length(); j++) { + JSONObject perms = extPerm.getJSONObject(j); + externalAccessPerms = new ExternalAccessPerms(perms.getString("type"), perms.getString("instance"), + perms.getString("action")); + ePAppRoleFunction.setCode(externalAccessPerms.getInstance()); + functionCodelist.add(ePAppRoleFunction.getCode()); + externalAccessPermsOfRole.add(externalAccessPerms); + } + } + + if (ApplicationRole.getActive().equals("null")) { + externalRoleDetail.setActive(false); + } else { + externalRoleDetail.setActive(Boolean.parseBoolean(ApplicationRole.getActive().toString())); + } + externalRoleDetail.setName(ApplicationRole.getName()); + + if (ApplicationRole.getAppId().equals("null") && app.getId() == 1) { + externalRoleDetail.setAppId(null); + } else if(ApplicationRole.getAppId().equals("null")){ + externalRoleDetail.setAppId(app.getId()); + }else { + externalRoleDetail.setAppId(Long.parseLong(ApplicationRole.getAppId().toString())); + } + + if (ApplicationRole.getPriority().equals("null")) { + externalRoleDetail.setPriority(null); + } else { + externalRoleDetail.setPriority(Integer.parseInt(ApplicationRole.getPriority().toString())); + } + + if (ApplicationRole.getAppRoleId().equals("null") && app.getId() == 1) { + externalRoleDetail.setAppRoleId(null); + } + + if (!externalAccessPermsOfRole.isEmpty() || externalAccessPermsOfRole.size() > 0) { + for (ExternalAccessPerms externalpermission : externalAccessPermsOfRole) { + EPAppRoleFunction apRoleFunction = new EPAppRoleFunction(); + apRoleFunction.setAppId(app.getId()); + apRoleFunction.setRoleId(Long.parseLong(ApplicationRole.getId())); + apRoleFunction.setCode(externalpermission.getInstance()); + applicationRoleFunctionList.add(apRoleFunction); + } + } + externalRoleDetailsList.add(externalRoleDetail); + } + + for (ExternalRoleDetails externalRole : externalRoleDetailsList) { + EPRole ecompRole = new EPRole(); + ecompRole = convertExternalRoleDetailstoEpRole(externalRole); + finalRoleList.add(ecompRole); + } + + List<EPRole> applicationRolesList = new ArrayList<>(); + applicationRolesList = getAppRoles(app.getId(), null); + List<String> applicationRoleIdList = new ArrayList<>(); + for (EPRole applicationRole : applicationRolesList) { + applicationRoleIdList.add(applicationRole.getName()); + } + + List<EPRole> roleListToBeAddInEcompDB = new ArrayList<>(); + for (EPRole aafRole : finalRoleList) { + if (!applicationRoleIdList.contains(aafRole.getName())) { + roleListToBeAddInEcompDB.add(aafRole); + } + } + + // Check if roles exits in external Access system and make it inactive + final Map<String, EPRole> checkRolesInactive = new HashMap<>(); + for(EPRole extrole : finalRoleList){ + checkRolesInactive.put(extrole.getName(), extrole); + } + for (EPRole role : applicationRolesList) { + final Map<String, String> extRoleParams = new HashMap<>(); + List<EPRole> roleList = new ArrayList<>(); + extRoleParams.put("appRoleName", role.getName()); + if (!checkRolesInactive.containsKey(role.getName())) { + if (app.getId() == 1) { + roleList = dataAccessService.executeNamedQuery("getPortalAppRoles", extRoleParams, null); + } else { + extRoleParams.put("appId", app.getId().toString()); + roleList = dataAccessService.executeNamedQuery("getRoletoUpdateAAF", extRoleParams, null); + } + EPRole updateRoleInactive = roleList.get(0); + updateRoleInactive.setActive(false); + dataAccessService.saveDomainObject(updateRoleInactive, null); + } + } + + for (EPRole roleItem : finalRoleList) { + final Map<String, String> roleParams = new HashMap<>(); + List<EPRole> currentList = new ArrayList<>(); + roleParams.put("appRoleName", roleItem.getName()); + if (app.getId() == 1) { + currentList = dataAccessService.executeNamedQuery("getPortalAppRoles", roleParams, null); + } else { + roleParams.put("appId", app.getId().toString()); + currentList = dataAccessService.executeNamedQuery("getRoletoUpdateAAF", roleParams, null); + } + + if (!currentList.isEmpty()) { + Boolean aafRoleActive; + Boolean localRoleActive; + boolean result; + aafRoleActive = Boolean.valueOf(roleItem.getActive()); + localRoleActive = Boolean.valueOf(currentList.get(0).getActive()); + result = aafRoleActive.equals(localRoleActive); + EPRole updateRole = currentList.get(0); + + if (!result) { + updateRole.setActive(roleItem.getActive()); + dataAccessService.saveDomainObject(updateRole, null); + } + if (roleItem.getPriority() != null + && !currentList.get(0).getPriority().equals(roleItem.getPriority())) { + updateRole.setPriority(roleItem.getPriority()); + dataAccessService.saveDomainObject(updateRole, null); + } + } + } + + EPRole roleToBeAddedInEcompDB = new EPRole(); + for (int i = 0; i < roleListToBeAddInEcompDB.size(); i++) { + roleToBeAddedInEcompDB = roleListToBeAddInEcompDB.get(i); + if(app.getId() == 1) + { + roleToBeAddedInEcompDB.setAppRoleId(null); + } + dataAccessService.saveDomainObject(roleToBeAddedInEcompDB, null); + List <EPRole> getRoleCreatedInSync = null; + if (!app.getId().equals(PortalConstants.PORTAL_APP_ID)) { + getRoleCreatedInSync = dataAccessService.getList(EPRole.class, + " where role_name = '" + roleToBeAddedInEcompDB.getName() +"'", null, null); + EPRole epUpdateRole = getRoleCreatedInSync.get(0); + epUpdateRole.setAppRoleId(epUpdateRole.getId()); + dataAccessService.saveDomainObject(epUpdateRole, null); + } + List<EPRole> roleList = new ArrayList<>(); + final Map<String, String> params = new HashMap<>(); + + params.put("appRoleName", roleToBeAddedInEcompDB.getName()); + if (app.getId() == 1) { + roleList = dataAccessService.executeNamedQuery("getPortalAppRoles", params, null); + } else { + params.put("appId", app.getId().toString()); + roleList = dataAccessService.executeNamedQuery("getRoletoUpdateAAF", params, null); + } + EPRole role = roleList.get(0); + Role aaFrole = new Role(); + aaFrole.setId(role.getId()); + aaFrole.setActive(role.getActive()); + aaFrole.setPriority(role.getPriority()); + aaFrole.setName(role.getName()); + updateRoleInExternalSystem(aaFrole, app); + } + dataAccessService.deleteDomainObjects(EPAppRoleFunction.class, " app_id = " + app.getId(), null); + for (EPAppRoleFunction rolefun : applicationRoleFunctionList) { + dataAccessService.saveDomainObject(rolefun, null); + } + + logger.debug(EELFLoggerDelegate.debugLogger, "Finished SyncApplicationRolesWithEcompDB"); + }catch(Exception e){ + logger.error(EELFLoggerDelegate.errorLogger, "Failed to SyncApplicationRolesWithEcompDB", e); + } + } + + public EPRole convertExternalRoleDetailstoEpRole(ExternalRoleDetails externalRoleDetails) { + EPRole role = new EPRole(); + role.setActive(externalRoleDetails.isActive()); + role.setAppId(externalRoleDetails.getAppId()); + role.setAppRoleId(externalRoleDetails.getAppRoleId()); + role.setName(externalRoleDetails.getName()); + role.setPriority(externalRoleDetails.getPriority()); + return role; + } + + @SuppressWarnings("unchecked") + @Override + public Integer bulkUploadUserRoles(String uebkey) throws Exception { + EPApp app = getApp(uebkey).get(0); + final Map<String, String> params = new HashMap<>(); + params.put("uebKey", app.getUebKey()); + List<BulkUploadUserRoles> userRolesList = null; + Integer userRolesAdded = 0; + if (app.getCentralAuth()) { + userRolesList = dataAccessService.executeNamedQuery("getBulkUserRoles", params, null); + for (BulkUploadUserRoles userRolesUpload : userRolesList) { + addUserRoleInExternalSystem(userRolesUpload); + userRolesAdded++; + } + } + return userRolesAdded; + } + + private void addUserRoleInExternalSystem(BulkUploadUserRoles userRolesUpload){ + try{ + String name = ""; + ObjectMapper mapper = new ObjectMapper(); + if (EPCommonSystemProperties.containsProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN)) { + name = userRolesUpload.getOrgUserId() + + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN); + } + ExternalAccessUser extUser = new ExternalAccessUser(name, + userRolesUpload.getAppNameSpace() + "." + userRolesUpload.getRoleName().replaceAll(" ", "_")); + String userRole = mapper.writeValueAsString(extUser); + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + HttpEntity<String> entity = new HttpEntity<>(userRole, headers); + template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "userRole", + HttpMethod.POST, entity, String.class); + } catch (Exception e) { + if (e.getMessage().equalsIgnoreCase("409 Conflict")) { + logger.error(EELFLoggerDelegate.errorLogger, "UserRole already exits but does not break functionality"); + } else { + logger.error(EELFLoggerDelegate.errorLogger, "Failed to addUserRoleInExternalSystem", e.getMessage()); + } + } + } + + @Override + public void deleteRoleDependeciesRecord(Session localSession, Long roleId) throws Exception { + try { + // Delete from fn_role_function + String sql = "DELETE FROM fn_role_function WHERE role_id=" + roleId; + logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); + Query query = localSession.createSQLQuery(sql); + query.executeUpdate(); + + // Delete from ep_app_role_function + sql = "DELETE FROM ep_app_role_function WHERE role_id=" + roleId; + logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); + query = localSession.createSQLQuery(sql); + query.executeUpdate(); + + // Delete from ep_role_notification + sql = "DELETE FROM ep_role_notification WHERE role_id=" + roleId; + logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); + query = localSession.createSQLQuery(sql); + query.executeUpdate(); + + // Delete from fn_role_composite + sql = "DELETE FROM fn_role_composite WHERE parent_role_id=" + roleId + " OR child_role_id=" + + roleId; + logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); + query = localSession.createSQLQuery(sql); + query.executeUpdate(); + + // Delete from fn_user_pseudo_role + sql = "DELETE FROM fn_user_pseudo_role WHERE pseudo_role_id=" + roleId; + logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); + query = localSession.createSQLQuery(sql); + query.executeUpdate(); + + //Delete form EP_WIDGET_CATALOG_ROLE + sql = "DELETE FROM EP_WIDGET_CATALOG_ROLE WHERE role_id=" + roleId; + logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); + query = localSession.createSQLQuery(sql); + query.executeUpdate(); + + //Delete form EP_WIDGET_CATALOG_ROLE + sql = "DELETE FROM ep_user_roles_request_det WHERE requested_role_id=" + roleId; + logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); + query = localSession.createSQLQuery(sql); + query.executeUpdate(); + + //Delete form fn_menu_functional_roles + sql = "DELETE FROM fn_menu_functional_roles WHERE role_id=" + roleId; + logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); + query = localSession.createSQLQuery(sql); + query.executeUpdate(); + + } catch (Exception e) { + logger.debug(EELFLoggerDelegate.debugLogger, "deleteRoleDependeciesRecord failed " , e); + throw new Exception("delete Failed"+ e.getMessage()); + } + + } + + + @SuppressWarnings("unchecked") + @Override + public List<String> getMenuFunctionsList(String uebkey) throws Exception { + List<String> appMenuFunctionsList = null; + try{ + EPApp app = getApp(uebkey).get(0); + final Map<String, Long> appParams = new HashMap<>(); + appParams.put("appId", app.getId()); + appMenuFunctionsList = dataAccessService.executeNamedQuery("getMenuFunctions", appParams, null); + } catch(Exception e){ + logger.error(EELFLoggerDelegate.errorLogger, "Failed getMenuFunctionsList", e); + return appMenuFunctionsList; + } + return appMenuFunctionsList; + } +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PortalAdminServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PortalAdminServiceImpl.java index 0963f048..5979fe82 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PortalAdminServiceImpl.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PortalAdminServiceImpl.java @@ -29,25 +29,34 @@ import javax.servlet.http.HttpServletResponse; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; +import org.openecomp.portalapp.portal.domain.EPApp; import org.openecomp.portalapp.portal.domain.EPUser; import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog; +import org.openecomp.portalapp.portal.transport.ExternalAccessUser; import org.openecomp.portalapp.portal.transport.FieldsValidator; import org.openecomp.portalapp.portal.transport.PortalAdmin; import org.openecomp.portalapp.portal.transport.PortalAdminUserRole; import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties; import org.openecomp.portalapp.portal.utils.EcompPortalUtils; +import org.openecomp.portalapp.portal.utils.PortalConstants; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.openecomp.portalsdk.core.service.DataAccessService; import org.openecomp.portalsdk.core.util.SystemProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +import com.fasterxml.jackson.databind.ObjectMapper; @Service("portalAdminService") @org.springframework.context.annotation.Configuration @EnableAspectJAutoProxy @EPMetricsLog -public class PortalAdminServiceImpl implements PortalAdminService { +public class PortalAdminServiceImpl implements PortalAdminService { private String SYS_ADMIN_ROLE_ID = "1"; private String ECOMP_APP_ID = "1"; @@ -60,7 +69,11 @@ public class PortalAdminServiceImpl implements PortalAdminService { private DataAccessService dataAccessService; @Autowired SearchService searchService; - + @Autowired + private EPAppService epAppService; + + RestTemplate template = new RestTemplate(); + @PostConstruct private void init() { SYS_ADMIN_ROLE_ID = SystemProperties.getProperty(SystemProperties.SYS_ADMIN_ROLE_ID); @@ -130,7 +143,8 @@ public class PortalAdminServiceImpl implements PortalAdminService { } transaction.commit(); - result = true; + // Add role in the external central auth system + result = addPortalAdminInExternalCentralAuth(user.getOrgUserId(), PortalConstants.PORTAL_ADMIN_ROLE); } catch (Exception e) { EcompPortalUtils.rollbackTransaction(transaction, "createPortalAdmin rollback, exception = " + e); logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e)); @@ -147,6 +161,42 @@ public class PortalAdminServiceImpl implements PortalAdminService { } return fieldsValidator; } + + private boolean addPortalAdminInExternalCentralAuth(String loginId, String portalAdminRole){ + boolean result = false; + try{ + String name = ""; + if (EPCommonSystemProperties.containsProperty( + EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN)) { + name = loginId + SystemProperties + .getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN); + } + EPApp app = epAppService.getApp(PortalConstants.PORTAL_APP_ID); + String extRole = app.getNameSpace()+"."+portalAdminRole.replaceAll(" ", "_"); + ObjectMapper addUserRoleMapper = new ObjectMapper(); + ExternalAccessUser extUser = new ExternalAccessUser(name, extRole); + String userRole = addUserRoleMapper.writeValueAsString(extUser); + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + + HttpEntity<String> addUserRole = new HttpEntity<>(userRole, headers); + template.exchange( + SystemProperties.getProperty( + EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "userRole", + HttpMethod.POST, addUserRole, String.class); + result = true; + } catch (Exception e) { + // This happens only if role already exists in external central access system but not in local DB thats where we logging here + if (e.getMessage().equalsIgnoreCase("409 Conflict")) { + result = true; + logger.debug(EELFLoggerDelegate.debugLogger, "Portal Admin role already exists", e.getMessage()); + } else{ + logger.error(EELFLoggerDelegate.errorLogger, "Failed to add Portal Admin role ", e); + result = false; + } + } + return result; + } public FieldsValidator deletePortalAdmin(Long userId) { FieldsValidator fieldsValidator = new FieldsValidator(); @@ -161,7 +211,7 @@ public class PortalAdminServiceImpl implements PortalAdminService { dataAccessService.deleteDomainObjects(PortalAdminUserRole.class, "user_id='" + userId + "' AND role_id='" + SYS_ADMIN_ROLE_ID + "'", null); transaction.commit(); - result = true; + result = deletePortalAdminInExternalCentralAuth(userId, PortalConstants.PORTAL_ADMIN_ROLE); } catch (Exception e) { EcompPortalUtils.rollbackTransaction(transaction, "deletePortalAdmin rollback, exception = " + e); logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e)); @@ -177,6 +227,40 @@ public class PortalAdminServiceImpl implements PortalAdminService { return fieldsValidator; } + + @SuppressWarnings("unchecked") + private boolean deletePortalAdminInExternalCentralAuth(Long userId, String portalAdminRole){ + boolean result = false; + try{ + String name = ""; + List<EPUser> localUserList = dataAccessService.getList(EPUser.class, " where user_id = " + userId, + null, null); + if (EPCommonSystemProperties.containsProperty( + EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN)) { + name = localUserList.get(0).getOrgUserId() + SystemProperties + .getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN); + } + EPApp app = epAppService.getApp(PortalConstants.PORTAL_APP_ID); + String extRole = app.getNameSpace()+"."+portalAdminRole.replaceAll(" ", "_"); + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth(); + HttpEntity<String> addUserRole = new HttpEntity<>(headers); + template.exchange( + SystemProperties.getProperty( + EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "userRole/"+name+"/"+extRole, + HttpMethod.DELETE, addUserRole, String.class); + result = true; + } catch (Exception e) { + if (e.getMessage().equalsIgnoreCase("404 Not Found")) { + logger.debug(EELFLoggerDelegate.debugLogger, "Portal Admin role already deleted or may not be found", e.getMessage()); + } else{ + logger.error(EELFLoggerDelegate.errorLogger, "Failed to add Portal Admin role ", e); + result = false; + } + } + return result; + } + private void logQuery(String sql) { logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); } diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SharedContextServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SharedContextServiceImpl.java index 1b1b6069..b222d189 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SharedContextServiceImpl.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SharedContextServiceImpl.java @@ -108,7 +108,7 @@ public class SharedContextServiceImpl implements SharedContextService { * (non-Javadoc) * * @see org.openecomp.portalsdk.core.service.SharedContextService# - * saveSharedContext(com. att.fusion.core.domain.SharedContext) + * saveSharedContext(org.openecomp.portalapp.portal.domain.SharedContext) */ @Override public void saveSharedContext(SharedContext context) { @@ -119,7 +119,7 @@ public class SharedContextServiceImpl implements SharedContextService { * (non-Javadoc) * * @see org.openecomp.portalsdk.core.service.SharedContextService# - * deleteSharedContext(com. att.fusion.core.domain.SharedContext) + * deleteSharedContext(org.openecomp.portalapp.portal.domain.SharedContext) */ @Override public void deleteSharedContext(SharedContext context) { diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserRolesCommonServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserRolesCommonServiceImpl.java index 58809210..1315c5e9 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserRolesCommonServiceImpl.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserRolesCommonServiceImpl.java @@ -31,16 +31,18 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; import org.apache.cxf.transport.http.HTTPException; -import org.hibernate.Query; import org.hibernate.SQLQuery; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; +import org.json.JSONArray; +import org.json.JSONObject; import org.openecomp.portalapp.externalsystemapproval.model.ExternalSystemRoleApproval; import org.openecomp.portalapp.externalsystemapproval.model.ExternalSystemUser; import org.openecomp.portalapp.portal.domain.EPApp; @@ -48,15 +50,20 @@ import org.openecomp.portalapp.portal.domain.EPRole; import org.openecomp.portalapp.portal.domain.EPUser; import org.openecomp.portalapp.portal.domain.EPUserApp; import org.openecomp.portalapp.portal.domain.EPUserAppCatalogRoles; +import org.openecomp.portalapp.portal.domain.EPUserAppRoles; import org.openecomp.portalapp.portal.domain.EPUserAppRolesRequest; import org.openecomp.portalapp.portal.domain.EPUserAppRolesRequestDetail; -import org.openecomp.portalapp.portal.domain.EpUserAppRoles; import org.openecomp.portalapp.portal.domain.ExternalSystemAccess; import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog; import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum; import org.openecomp.portalapp.portal.logging.logic.EPLogUtil; import org.openecomp.portalapp.portal.transport.AppWithRolesForUser; +import org.openecomp.portalapp.portal.transport.EPUserAppCurrentRoles; +import org.openecomp.portalapp.portal.transport.EcompUserAppRoles; +import org.openecomp.portalapp.portal.transport.ExternalAccessUser; +import org.openecomp.portalapp.portal.transport.ExternalAccessUserRoleDetail; import org.openecomp.portalapp.portal.transport.ExternalRequestFieldsValidator; +import org.openecomp.portalapp.portal.transport.ExternalRoleDescription; import org.openecomp.portalapp.portal.transport.FieldsValidator; import org.openecomp.portalapp.portal.transport.FunctionalMenuItem; import org.openecomp.portalapp.portal.transport.FunctionalMenuRole; @@ -74,6 +81,11 @@ import org.openecomp.portalsdk.core.service.DataAccessService; import org.openecomp.portalsdk.core.service.RoleService; import org.openecomp.portalsdk.core.util.SystemProperties; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.web.client.RestTemplate; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -87,7 +99,7 @@ public class UserRolesCommonServiceImpl { private static final Object syncRests = new Object(); @Autowired - private DataAccessService dataAccessService; + private DataAccessService dataAccessService; @Autowired private SessionFactory sessionFactory; @Autowired @@ -99,7 +111,12 @@ public class UserRolesCommonServiceImpl { @Autowired private EPRoleService epRoleService; @Autowired - private RoleService roleService; + private RoleService roleService; + + @Autowired + private ExternalAccessRolesService externalAccessRolesService; + + RestTemplate template = new RestTemplate(); /** * @@ -255,12 +272,10 @@ public class UserRolesCommonServiceImpl { EPApp app = (EPApp) localSession.get(EPApp.class, appId); HashMap<Long, EPRole> rolesMap = new HashMap<Long, EPRole>(); - if (appId == PortalConstants.PORTAL_APP_ID) { // local app - String appIdValue = null; + if (appId.equals(PortalConstants.PORTAL_APP_ID)) { // local app + String appIdValue = ""; if(!extRequestValue){ - appIdValue = "and id != " + PortalConstants.PORTAL_APP_ID; - }else{ - appIdValue = ""; + appIdValue = "and id != " + PortalConstants.SYS_ADMIN_ROLE_ID; } @SuppressWarnings("unchecked") List<EPRole> roles = localSession @@ -274,19 +289,27 @@ public class UserRolesCommonServiceImpl { List<EPRole> roles = localSession .createQuery("from " + EPRole.class.getName() + " where appId=" + appId).list(); for (EPRole role : roles) { - rolesMap.put(role.getAppRoleId(), role); + if (!extRequestValue && app.getCentralAuth()) { + rolesMap.put(role.getId(), role); + } else { + rolesMap.put(role.getAppRoleId(), role); + } } } + EPRole role = null; for (EcompRole userRole : newRolesToAdd) { EPUserApp userApp = new EPUserApp(); if (("PUT".equals(reqType) || "POST".equals(reqType)) && userRole.getName().equals(PortalConstants.ADMIN_ROLE)) { role = (EPRole) localSession.get(EPRole.class, new Long(PortalConstants.ACCOUNT_ADMIN_ROLE_ID)); userApp.setRole(role); - } else if (userRole.getId().equals(PortalConstants.ACCOUNT_ADMIN_ROLE_ID) && !extRequestValue){ + } else if ((userRole.getId().equals(PortalConstants.ACCOUNT_ADMIN_ROLE_ID)) && !extRequestValue){ continue; - } else { - userApp.setRole(rolesMap.get(userRole.getId())); + }else if((userRole.getId().equals(PortalConstants.SYS_ADMIN_ROLE_ID)) && app.getId().equals(PortalConstants.PORTAL_APP_ID) && !extRequestValue){ + continue; + } + else { + userApp.setRole(rolesMap.get(userRole.getId())); } userApp.setUserId(client.getId()); @@ -305,10 +328,10 @@ public class UserRolesCommonServiceImpl { * code expects the app_id to be null as there is no * concept of App_id in SDK */ + localSession.flush(); SQLQuery sqlQuery = localSession .createSQLQuery("update fn_role set app_id = null where app_id = 1 "); sqlQuery.executeUpdate(); - } } @@ -523,32 +546,7 @@ public class UserRolesCommonServiceImpl { } } } - - // Delete from fn_role_function - String sql = "DELETE FROM fn_role_function WHERE role_id=" + roleId; - logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); - Query query = localSession.createSQLQuery(sql); - query.executeUpdate(); - - // Delete from ep_role_notification - sql = "DELETE FROM ep_role_notification WHERE role_id=" + roleId; - logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); - query = localSession.createSQLQuery(sql); - query.executeUpdate(); - - // Delete from fn_role_composite - sql = "DELETE FROM fn_role_composite WHERE parent_role_id=" + roleId + " OR child_role_id=" - + roleId; - logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); - query = localSession.createSQLQuery(sql); - query.executeUpdate(); - - // Delete from fn_user_pseudo_role - sql = "DELETE FROM fn_user_pseudo_role WHERE pseudo_role_id=" + roleId; - logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); - query = localSession.createSQLQuery(sql); - query.executeUpdate(); - + externalAccessRolesService.deleteRoleDependeciesRecord(localSession, roleId); logger.debug(EELFLoggerDelegate.debugLogger, "about to delete the role: " + role.toString()); localSession.delete(role); logger.debug(EELFLoggerDelegate.debugLogger, "deleted the role"); @@ -571,6 +569,10 @@ public class UserRolesCommonServiceImpl { } } + + + + /** * Called when updating the list of roles for the user * @@ -691,8 +693,8 @@ public class UserRolesCommonServiceImpl { } if (rolesInAppForUser != null) { - EcompRole[] userAppRoles = new EcompRole[rolesInAppForUser.roles.size()]; - for (int i = 0; i < rolesInAppForUser.roles.size(); i++) { + EcompRole[] userAppRoles = new EcompRole[rolesInAppForUser.roles.stream().distinct().collect(Collectors.toList()).size()]; + for (int i = 0; i < rolesInAppForUser.roles.stream().distinct().collect(Collectors.toList()).size(); i++) { RoleInAppForUser roleInAppForUser = rolesInAppForUser.roles.get(i); EcompRole role = new EcompRole(); role.setId(roleInAppForUser.roleId); @@ -759,6 +761,67 @@ public class UserRolesCommonServiceImpl { return rolesList; } + /** + * It adds new user for remote application + * + * @param roleInAppForUserList + * @param remoteAppUser + * @param userId + * @param app + * @param mapper + * @param searchService + * @param applicationsRestClientService + * @throws Exception + */ + private void addRemoteUser(List<RoleInAppForUser> roleInAppForUserList, String userId, EPApp app, ObjectMapper mapper, SearchService searchService, ApplicationsRestClientService applicationsRestClientService) throws Exception{ + EPUser addRemoteUser = null; + if (remoteUserShouldBeCreated(roleInAppForUserList)) { + + createNewUserOnRemoteApp(userId, app, applicationsRestClientService, searchService, mapper, isAppUpgradeVersion(app)); + // If we succeed, we know that the new user was + // persisted on remote app. + addRemoteUser = getUserFromApp(userId, app, applicationsRestClientService); + if (addRemoteUser == null) { + logger.error(EELFLoggerDelegate.errorLogger, + "Failed to persist new user: " + userId + " in remote app. appId = " + app.getId()); + // return null; + } + } + } + + /** + * It checks whether the remote user exists or not + * if exits returns user object else null + * + * @param userId + * @param app + * @param applicationsRestClientService + * @return + * @throws HTTPException + */ + private EPUser checkIfRemoteUserExits(String userId, EPApp app, ApplicationsRestClientService applicationsRestClientService) throws HTTPException{ + EPUser checkRemoteUser = null; + try { + checkRemoteUser = getUserFromApp(userId, app, applicationsRestClientService); + } catch (HTTPException e) { + // Some apps are returning 400 if user is not found. + if (e.getResponseCode() == 400) { + logger.debug(EELFLoggerDelegate.debugLogger, + "setAppWithUserRoleStateForUser: getuserFromApp threw exception with response code 400; continuing", + e); + } else if(e.getResponseCode() == 404) { + logger.debug(EELFLoggerDelegate.debugLogger, + "setAppWithUserRoleStateForUser: getuserFromApp threw exception with response code 404; continuing", + e); + } else { + // Other response code, let it come thru. + throw e; + } + } + return checkRemoteUser; + } + + /* * (non-Javadoc) * @@ -783,58 +846,59 @@ public class UserRolesCommonServiceImpl { EPApp app = appsService.getApp(appId); applyChangesToUserAppRolesForMyLoginsRequest(user, appId); - // if local app - if (appId == PortalConstants.PORTAL_APP_ID) { - // EPUser localUser = getUserFromApp(userId, app, applicationsRestClientService); + // if centralized app + if (app.getCentralAuth()) { + // We should add If user does not exist in remote application + if (!app.getId().equals(PortalConstants.PORTAL_APP_ID)) { + EPUser remoteAppUser = null; + remoteAppUser = checkIfRemoteUserExits(userId, app, applicationsRestClientService); + + if (remoteAppUser == null) { + addRemoteUser(roleInAppForUserList, userId, app, mapper, searchService, + applicationsRestClientService); + } + } + Set<EcompRole> userRolesInLocalApp = postUsersRolesToLocalApp(roleInAppForUserList, mapper, applicationsRestClientService, appId, userId); RolesInAppForUser rolesInAppForUser = constructRolesInAppForUserUpdate(userId, appId, userRolesInLocalApp); - result = applyChangesInUserRolesForAppToEcompDB(rolesInAppForUser, epRequestValue, null); - - } else {// remote app + List<RoleInAppForUser> roleAppUserList = rolesInAppForUser.roles; + // Apply changes in external Access system + updateUserRolesInExternalSystem(app, rolesInAppForUser.orgUserId, roleAppUserList); + result = applyChangesInUserRolesForAppToEcompDB(rolesInAppForUser, epRequestValue, "Portal"); + } + // In case if portal is not centralized then follow existing approach + else if(!app.getCentralAuth() && app.getId().equals(PortalConstants.PORTAL_APP_ID)){ + Set<EcompRole> userRolesInLocalApp = postUsersRolesToLocalApp(roleInAppForUserList, mapper, + applicationsRestClientService, appId, userId); + RolesInAppForUser rolesInAppForUser = constructRolesInAppForUserUpdate(userId, appId, + userRolesInLocalApp); + result = applyChangesInUserRolesForAppToEcompDB(rolesInAppForUser, epRequestValue, "Portal"); + } else{// remote app EPUser remoteAppUser = null; - try { - remoteAppUser = getUserFromApp(userId, app, applicationsRestClientService); - } catch (HTTPException e) { - // Some apps are returning 400 if user is not found. - if (e.getResponseCode() == 400) { - logger.debug(EELFLoggerDelegate.debugLogger, - "setAppWithUserRoleStateForUser: getuserFromApp threw exception with response code 400; continuing", - e); - } else { - // Other response code, let it come thru. - throw e; - } - } - if (remoteAppUser == null) { - if (remoteUserShouldBeCreated(roleInAppForUserList)) { - - createNewUserOnRemoteApp(userId, app, applicationsRestClientService, searchService, mapper, isAppUpgradeVersion(app)); - // If we succeed, we know that the new user was - // persisted on remote app. - remoteAppUser = getUserFromApp(userId, app, applicationsRestClientService); - if (remoteAppUser == null) { - logger.error(EELFLoggerDelegate.errorLogger, - "Failed to persist new user: " + userId + " in remote app. appId = " + appId); - // return null; - } + if(!app.getCentralAuth() && !app.getId().equals(PortalConstants.PORTAL_APP_ID)){ + + remoteAppUser = checkIfRemoteUserExits(userId, app, applicationsRestClientService); + + if (remoteAppUser == null) { + addRemoteUser(roleInAppForUserList, userId, app, mapper, searchService, applicationsRestClientService); } - } - if (remoteAppUser != null) { - Set<EcompRole> userRolesInRemoteApp = postUsersRolesToRemoteApp(roleInAppForUserList, mapper, - applicationsRestClientService, appId, userId); - RolesInAppForUser rolesInAppForUser = constructRolesInAppForUserUpdate(userId, appId, - userRolesInRemoteApp); - result = applyChangesInUserRolesForAppToEcompDB(rolesInAppForUser, epRequestValue, null); + if (remoteAppUser != null) { + Set<EcompRole> userRolesInRemoteApp = postUsersRolesToRemoteApp(roleInAppForUserList, mapper, + applicationsRestClientService, appId, userId); + RolesInAppForUser rolesInAppForUser = constructRolesInAppForUserUpdate(userId, appId, + userRolesInRemoteApp); + result = applyChangesInUserRolesForAppToEcompDB(rolesInAppForUser, epRequestValue, null); - // If no roles remain, request app to set user inactive. - if (userRolesInRemoteApp.size() == 0) { - logger.debug(EELFLoggerDelegate.debugLogger, - "setAppWithUserRoleStateForUser: no roles in app {}, set user {} to inactive", app, - userId); - remoteAppUser.setActive(false); - postUserToRemoteApp(userId, user, app, applicationsRestClientService); + // If no roles remain, request app to set user inactive. + if (userRolesInRemoteApp.size() == 0) { + logger.debug(EELFLoggerDelegate.debugLogger, + "setAppWithUserRoleStateForUser: no roles in app {}, set user {} to inactive", app, + userId); + remoteAppUser.setActive(false); + postUserToRemoteApp(userId, user, app, applicationsRestClientService); + } } } } @@ -849,7 +913,147 @@ public class UserRolesCommonServiceImpl { } return result; } - + + @SuppressWarnings("unchecked") + private void updateUserRolesInExternalSystem(EPApp app, String orgUserId, List<RoleInAppForUser> roleInAppUser) + { + try{ + //check if user exists + final Map<String, String> userParams = new HashMap<>(); + userParams.put("orgUserIdValue", orgUserId); + List<EPUser> userInfo = checkIfUserExists(userParams); + if (userInfo.size() == 0 || userInfo.isEmpty()) { + createLocalUserIfNecessary(orgUserId); + } + final Map<String, String> loginIdParams = new HashMap<>(); + loginIdParams.put("orgUserIdValue", orgUserId); + EPUser user = (EPUser) dataAccessService.executeNamedQuery("epUserAppId", loginIdParams, null).get(0); + String name = ""; + if (EPCommonSystemProperties.containsProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN)) { + name = orgUserId + + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN); + } + ObjectMapper mapper = new ObjectMapper(); + HttpHeaders headers = EcompPortalUtils.base64encodeKeyForAAFBasicAuth() ; + HttpEntity<String> getUserRolesEntity = new HttpEntity<>(headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to external system to get current user roles"); + ResponseEntity<String> getResponse = template + .exchange(SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "roles/user/" + name, HttpMethod.GET, getUserRolesEntity, String.class); + if(getResponse.getStatusCode().value() == 200){ + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to external system and received user roles: ", getResponse.getBody()); + + } + List<ExternalAccessUserRoleDetail> userRoleDetailList = new ArrayList<>(); + String res = getResponse.getBody(); + JSONObject jsonObj = null; + JSONArray extRoles = null; + if (!res.equals("{}")) { + jsonObj = new JSONObject(res); + extRoles = jsonObj.getJSONArray("role"); + } + ExternalAccessUserRoleDetail userRoleDetail = null; + if (extRoles != null) { + for (int i = 0; i < extRoles.length(); i++) { + if (extRoles.getJSONObject(i).getString("name").startsWith(app.getNameSpace() + ".") && !extRoles.getJSONObject(i).getString("name").equals(app.getNameSpace()+".admin") + && !extRoles.getJSONObject(i).getString("name").equals(app.getNameSpace()+".owner")) { + ObjectMapper descMapper = new ObjectMapper(); + if(extRoles.getJSONObject(i).has("description")){ + ExternalRoleDescription desc = descMapper.readValue( + extRoles.getJSONObject(i).getString("description"), ExternalRoleDescription.class); + userRoleDetail = new ExternalAccessUserRoleDetail(extRoles.getJSONObject(i).getString("name"), + desc); + userRoleDetailList.add(userRoleDetail); + }else{ + userRoleDetail = new ExternalAccessUserRoleDetail(extRoles.getJSONObject(i).getString("name"), + null); + userRoleDetailList.add(userRoleDetail); + } + + } + } + } + for (ExternalAccessUserRoleDetail userRole : userRoleDetailList) { + HttpEntity<String> entity = new HttpEntity<>(headers); + template.exchange(SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + + "userRole/" + name + "/" + userRole.getName(), HttpMethod.DELETE, entity, String.class); + } + final Map<String, RoleInAppForUser> roleInAppUserMap = new HashMap<>(); + for(RoleInAppForUser roleInAppUserNew: roleInAppUser){ + roleInAppUserMap.put(roleInAppUserNew.getRoleName(), roleInAppUserNew); + } + final Map<String, Long> params = new HashMap<>(); + params.put("appId", app.getId()); + params.put("userId", user.getId()); + List<EcompUserAppRoles> userAppList = dataAccessService.executeNamedQuery("getUserAppExistingRoles", params, null); + // Check if incoming request has sys admin or account admin, if exists add in external system + if (!roleInAppUser.isEmpty()) { + for (EcompUserAppRoles userApp : userAppList) { + if ((userApp.getRoleId().equals(PortalConstants.SYS_ADMIN_ROLE_ID) + || userApp.getRoleId().equals(PortalConstants.ACCOUNT_ADMIN_ROLE_ID)) && !roleInAppUserMap.containsKey(userApp.getRoleName())) { + RoleInAppForUser addSpecialRole = new RoleInAppForUser(); + addSpecialRole.setIsApplied(true); + addSpecialRole.setRoleId(userApp.getRoleId()); + addSpecialRole.setRoleName(userApp.getRoleName()); + roleInAppUser.add(addSpecialRole); + } + } + } + List<RoleInAppForUser> roleInAppUserNonDupls = roleInAppUser.stream().distinct().collect(Collectors.toList()); + for (RoleInAppForUser addRole : roleInAppUserNonDupls) { + ExternalAccessUser extUser = null; + if ((addRole.getRoleId().equals(PortalConstants.ACCOUNT_ADMIN_ROLE_ID)) + && !app.getId().equals(PortalConstants.PORTAL_APP_ID)) { + try{ + String extRole = app.getNameSpace()+"."+PortalConstants.ADMIN_ROLE.replaceAll(" ","_"); + HttpEntity<String> entity = new HttpEntity<>(headers); + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to External Access system"); + ResponseEntity<String> getRoleResponse = template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "roles/"+extRole, + HttpMethod.GET, entity, String.class); + String extAdminRole = app.getNameSpace()+"."+PortalConstants.ADMIN_ROLE.replaceAll(" ", "_"); + if(getRoleResponse.getBody().equals("{}")){ + String addDesc = "{\"name\":\"" +extAdminRole+ "\"}"; + HttpEntity<String> roleEntity = new HttpEntity<>(addDesc,headers); + template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "role", + HttpMethod.POST, roleEntity, String.class); + } + extUser = new ExternalAccessUser(name, + app.getNameSpace() + "." + PortalConstants.ADMIN_ROLE.replaceAll(" ", "_")); + } catch(Exception e){ + logger.error(EELFLoggerDelegate.errorLogger, "Failed to add admin role for application {} ",app.getId(),e); + continue; + } + } else { + extUser = new ExternalAccessUser(name, + app.getNameSpace() + "." + addRole.getRoleName().replaceAll(" ", "_")); + } + // Assign user role for an application in external access system + String userRole = mapper.writeValueAsString(extUser); + HttpEntity<String> entity = new HttpEntity<>(userRole, headers); + if (addRole.getIsApplied()) { + logger.debug(EELFLoggerDelegate.debugLogger, "Connecting to external system and adding user role", + addRole.getRoleName()); + ResponseEntity<String> addResponse = template.exchange( + SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "userRole", + HttpMethod.POST, entity, String.class); + logger.debug(EELFLoggerDelegate.debugLogger, "Connected to external system and added user role", + getResponse.getBody(), addRole.getRoleName()); + if (addResponse.getStatusCode().value() != 201) { + logger.debug(EELFLoggerDelegate.debugLogger, + "Connected to external system unable to save user role", getResponse.getBody(), + addRole.getRoleName()); + throw new Exception("Failed to add user role for application"); + } + } + } + }catch(Exception e){ + logger.error(EELFLoggerDelegate.errorLogger, "Failed to add user role for application {}", app.getId(),e); + } + + } + /** * * @param userId @@ -1066,60 +1270,86 @@ public class UserRolesCommonServiceImpl { .executeNamedQuery("userAppRolesRequestList", params, null); epRequestIdSize = epRequestId.size(); } - if(!app.getId().equals(PortalConstants.PORTAL_APP_ID)){ + if(!app.getId().equals(PortalConstants.PORTAL_APP_ID) && !app.getCentralAuth()){ EcompRole[] appRoles = applicationsRestClientService.get(EcompRole[].class, app.getId(), "/roles"); syncAppRoles(sessionFactory, app.getId(), appRoles); } List<RoleInAppForUser> roleInAppForUserList = roleInAppForUserList(newAppRolesForUser.getRoles(), app.getId(), app.getMlAppName()); - // if local app - if (app.getId() == PortalConstants.PORTAL_APP_ID) { - // EPUser localUser = getUserFromApp(orgUserId, app, applicationsRestClientService); + List<EcompUserAppRoles> userRoleList = null; + if(userId != null){ + final Map<String, Long> appParams = new HashMap<>(); + appParams.put("userId", userId.getId()); + appParams.put("appId", app.getId()); + userRoleList = dataAccessService.executeNamedQuery("getUserAppExistingRoles", appParams, null); + } + boolean checkIfAdminRoleExists = false; + if (reqType.equals("DELETE")) { + checkIfAdminRoleExists = userRoleList.stream() + .anyMatch(userRole -> userRole.getRoleId().equals(PortalConstants.ACCOUNT_ADMIN_ROLE_ID)); + } else { + checkIfAdminRoleExists = roleInAppForUserList.stream() + .anyMatch(roleList -> roleList.getRoleId().equals(PortalConstants.ACCOUNT_ADMIN_ROLE_ID)); + } + // if Centralized app + if (app.getCentralAuth()) { + // We should add If user does not exist in remote application + try { + if (!(!app.getId().equals(PortalConstants.PORTAL_APP_ID) && checkIfAdminRoleExists + && (roleInAppForUserList.size() == 1 || reqType.equals("DELETE")))) { + EPUser remoteAppUser = null; + remoteAppUser = checkIfRemoteUserExits(userId.getOrgUserId(), app, + applicationsRestClientService); + if (remoteAppUser == null) { + addRemoteUser(roleInAppForUserList, userId.getOrgUserId(), app, mapper, searchService, + applicationsRestClientService); + reqMessage = "Saved Successfully"; + } + } + } catch (Exception e) { + reqMessage = e.getMessage(); + logger.error(EELFLoggerDelegate.errorLogger, "Failed to added remote user", e); + throw new Exception(reqMessage); + } Set<EcompRole> userRolesInLocalApp = postUsersRolesToLocalApp(roleInAppForUserList, mapper, applicationsRestClientService, app.getId(), orgUserId); RolesInAppForUser rolesInAppForUser = constructRolesInAppForUserUpdate(orgUserId, app.getId(), userRolesInLocalApp); - logger.info(EELFLoggerDelegate.debugLogger, "{} user app roles: for app {}, user {}", - logMessage, newAppRolesForUser.getApplicationName(), newAppRolesForUser.getLoginId()); + List<RoleInAppForUser> roleAppUserList = rolesInAppForUser.roles; + // Apply changes in external Access system + updateUserRolesInExternalSystem(app, rolesInAppForUser.orgUserId, roleAppUserList); + logger.info(EELFLoggerDelegate.debugLogger, "{} user app roles: for app {}, user {}", logMessage, + newAppRolesForUser.getApplicationName(), newAppRolesForUser.getLoginId()); + result = applyChangesInUserRolesForAppToEcompDB(rolesInAppForUser, externalSystemRequest, reqType); + } + // If local application is not centralized + else if(!app.getCentralAuth() && app.getId().equals(PortalConstants.PORTAL_APP_ID)){ + Set<EcompRole> userRolesInLocalApp = postUsersRolesToLocalApp(roleInAppForUserList, mapper, + applicationsRestClientService, app.getId(), orgUserId); + RolesInAppForUser rolesInAppForUser = constructRolesInAppForUserUpdate(orgUserId, app.getId(), + userRolesInLocalApp); result = applyChangesInUserRolesForAppToEcompDB(rolesInAppForUser, externalSystemRequest, reqType); } else {// remote app + + if(!((roleInAppForUserList.size() == 1 || reqType.equals("DELETE")) && checkIfAdminRoleExists)){ EPUser remoteAppUser = null; - try { - remoteAppUser = getUserFromApp(orgUserId, app, applicationsRestClientService); - } catch (HTTPException e) { - // Some apps are returning 400 if user is not found. - if (e.getResponseCode() == 400) { - logger.debug(EELFLoggerDelegate.debugLogger, - "setAppWithUserRoleStateForUser: getuserFromApp threw exception with response code 400; continuing", - e); - } else { - // Other response code, let it come thru. - throw e; - } - } + remoteAppUser = checkIfRemoteUserExits(userId.getOrgUserId(), app, applicationsRestClientService); if (remoteAppUser == null) { - createNewUserOnRemoteApp(orgUserId, app, applicationsRestClientService, searchService, mapper, - isAppUpgradeVersion(app)); - // If we succeed, we know that the new user was - // persisted on remote app. - remoteAppUser = getUserFromApp(orgUserId, app, applicationsRestClientService); - if (remoteAppUser == null) { - logger.error(EELFLoggerDelegate.errorLogger, "Failed to persist new user: " + orgUserId - + " in remote app. appId = " + app.getId()); - // return null; - } + addRemoteUser(roleInAppForUserList, userId.getOrgUserId(), app, mapper, searchService, applicationsRestClientService); reqMessage = "Saved Successfully"; } - if (remoteAppUser != null) { + if (remoteAppUser != null) { Set<EcompRole> userRolesInRemoteApp = postUsersRolesToRemoteApp(roleInAppForUserList, - mapper, applicationsRestClientService, app.getId(), orgUserId); - + mapper, applicationsRestClientService, app.getId(), orgUserId); + RolesInAppForUser rolesInAppForUser = constructRolesInAppForUserUpdate(orgUserId, app.getId(), userRolesInRemoteApp); - logger.info(EELFLoggerDelegate.debugLogger, "{} user app roles: for app {}, user {}", - logMessage, newAppRolesForUser.getApplicationName(), newAppRolesForUser.getLoginId()); - result = applyChangesInUserRolesForAppToEcompDB(rolesInAppForUser, externalSystemRequest, reqType); + logger.info(EELFLoggerDelegate.debugLogger, "{} user app roles: for app {}, user {}", + logMessage, newAppRolesForUser.getApplicationName(), + newAppRolesForUser.getLoginId()); + result = applyChangesInUserRolesForAppToEcompDB(rolesInAppForUser, externalSystemRequest, + reqType); // If no roles remain, request app to set user inactive. /*if (userRolesInRemoteApp.size() == 0) { logger.debug(EELFLoggerDelegate.debugLogger, @@ -1129,7 +1359,19 @@ public class UserRolesCommonServiceImpl { remoteAppUser.setActive(false); postUserToRemoteApp(orgUserId, user, app, applicationsRestClientService); }*/ + } + } else { + if(!(reqType.equals("DELETE") && userId == null)){ + reqMessage = "Saved Successfully"; + } + Set<EcompRole> userRolesInRemoteApp = constructUsersEcompRoles(roleInAppForUserList); + RolesInAppForUser rolesInAppForUser = constructRolesInAppForUserUpdate(orgUserId, app.getId(), + userRolesInRemoteApp); + logger.info(EELFLoggerDelegate.debugLogger, "{} user app roles: for app {}, user {}", + logMessage, newAppRolesForUser.getApplicationName(), newAppRolesForUser.getLoginId()); + result = applyChangesInUserRolesForAppToEcompDB(rolesInAppForUser, externalSystemRequest, + reqType); } if(!result){ reqMessage = "Failed to save the user app role(s)"; @@ -1138,7 +1380,6 @@ public class UserRolesCommonServiceImpl { updateStatus = "C"; applyChangesToAppRolesRequest(app.getId(), userId.getId(), updateStatus, epRequestId.get(0)); } - } } catch (Exception e) { String message = String.format("Failed to create user or update user roles for User %s, AppId %s", @@ -1268,23 +1509,16 @@ public class UserRolesCommonServiceImpl { * @see org.openecomp.portalapp.portal.service.UserRolesService# * getAppRolesForUser(java.lang.Long, java.lang.String) */ + @SuppressWarnings("unchecked") public List<RoleInAppForUser> getAppRolesForUser(Long appId, String userId, Boolean extRequestValue) { List<RoleInAppForUser> rolesInAppForUser = null; - List<EPUser> userInfo = null; + EPApp app = appsService.getApp(appId); try { - // for ecomp portal app, no need to make a remote call if (appId == PortalConstants.PORTAL_APP_ID) { - final Map<String, String> userParams = new HashMap<>(); - userParams.put("orgUserIdValue", userId); - userInfo = checkIfUserExists(userParams); - if(userInfo.size() == 0 || userInfo.isEmpty()) - { - createLocalUserIfNecessary(userId); - } - List<Role> roleList = roleService.getAvailableRoles(); + List<Role> roleList = roleService.getAvailableRoles(userId); List<Role> activeRoleList = new ArrayList<Role>(); for(Role role: roleList) { if(role.getActive()) { @@ -1296,28 +1530,66 @@ public class UserRolesCommonServiceImpl { } } - - EPApp app = appsService.getApp(appId); - EPUser localUser = getUserFromApp(userId, app, applicationsRestClientService); - Set<EPRole> roleSet = localUser.getAppEPRoles(app); - rolesInAppForUser = constructRolesInAppForUserGet(activeRoleList, roleSet.toArray(new EPRole[0]), extRequestValue); + EPUser localUser = getUserFromApp(userId, app, applicationsRestClientService); + // If localUser does not exists return roles + Set<EPRole> roleSet = null; + EPRole[] roleSetList = null; + if(localUser != null){ + roleSet = localUser.getAppEPRoles(app); + roleSetList = roleSet.toArray(new EPRole[0]); + } + rolesInAppForUser = constructRolesInAppForUserGet(activeRoleList, roleSetList, extRequestValue); return rolesInAppForUser; } - - EcompRole[] appRoles = applicationsRestClientService.get(EcompRole[].class, appId, "/roles"); - + + EcompRole[] appRoles = null; + List<EcompRole> roles = new ArrayList<>(); + if(app.getCentralAuth()){ + List<EPRole> applicationRoles = dataAccessService.getList(EPRole.class, " where app_id = "+app.getId()+ " and active_yn = 'Y'", null, null);; + for(EPRole role : applicationRoles){ + EcompRole ecompRole = new EcompRole(); + ecompRole.setId(role.getId()); + ecompRole.setName(role.getName()); + roles.add(ecompRole); + } + appRoles = roles.toArray(new EcompRole[roles.size()]); + } else{ + appRoles = applicationsRestClientService.get(EcompRole[].class, appId, "/roles"); + } // Test this error case, for generating an internal Ecomp Portal // error // EcompRole[] appRoles = null; // If there is an exception in the rest client api, then null will // be returned. if (appRoles != null) { + if(!app.getCentralAuth()) { syncAppRoles(sessionFactory, appId, appRoles); + } EcompRole[] userAppRoles = null; try { try { - userAppRoles = applicationsRestClientService.get(EcompRole[].class, appId, - String.format("/user/%s/roles", userId)); + if(app.getCentralAuth()){ + final Map<String, String> params = new HashMap<>(); + final Map<String, Long> userParams = new HashMap<>(); + params.put("orgUserIdValue", userId); + List<EPUser> user = dataAccessService.executeNamedQuery("epUserAppId", params, null); + userParams.put("appId", app.getId()); + userParams.put("userId", user.get(0).getId()); + List<EPUserAppCurrentRoles> userAppsRolesList = dataAccessService.executeNamedQuery("getUserAppCurrentRoles", userParams, null); + List<EcompRole> setUserRoles = new ArrayList<>(); + for(EPUserAppCurrentRoles role : userAppsRolesList){ + EcompRole ecompRole = new EcompRole(); + ecompRole.setId(role.getRoleId()); + ecompRole.setName(role.getRoleName()); + setUserRoles.add(ecompRole); + } + userAppRoles = setUserRoles.toArray(new EcompRole[setUserRoles.size()]); + rolesInAppForUser = constructRolesInAppForUserGet(appRoles, userAppRoles); + return rolesInAppForUser; + }else{ + userAppRoles = applicationsRestClientService.get(EcompRole[].class, appId, + String.format("/user/%s/roles", userId)); + } } catch (HTTPException e) { // Some apps are returning 400 if user is not found. if (e.getResponseCode() == 400) { @@ -1390,7 +1662,7 @@ public class UserRolesCommonServiceImpl { public FieldsValidator putUserAppRolesRequest(AppWithRolesForUser userAppRolesData, EPUser user) { FieldsValidator fieldsValidator = new FieldsValidator(); final Map<String, Long> params = new HashMap<>(); - EpUserAppRoles appRole= new EpUserAppRoles(); + EPUserAppRoles appRole= new EPUserAppRoles(); try { logger.error(EELFLoggerDelegate.errorLogger,"Should not be reached here, still the endpoint is yet to be defined"); boolean result = postUserRolesToMylogins(userAppRolesData, applicationsRestClientService, userAppRolesData.appId, user.getId()); @@ -1409,7 +1681,7 @@ public class UserRolesCommonServiceImpl { Boolean isAppliedVal = userAppRoles.isApplied; params.put("appRoleId", userAppRoles.roleId); if (isAppliedVal) { - appRole = (EpUserAppRoles) dataAccessService.executeNamedQuery("appRoles", params, null).get(0); + appRole = (EPUserAppRoles) dataAccessService.executeNamedQuery("appRoles", params, null).get(0); EPUserAppRolesRequestDetail epAppRoleDetail = new EPUserAppRolesRequestDetail(); epAppRoleDetail.setReqRoleId(appRole.getRoleId()); epAppRoleDetail.setReqType("P"); diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetParameterServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetParameterServiceImpl.java index d7685627..1fead505 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetParameterServiceImpl.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetParameterServiceImpl.java @@ -49,8 +49,8 @@ public class WidgetParameterServiceImpl implements WidgetParameterService{ List<Criterion> restrictionsList = new ArrayList<Criterion>(); Criterion widgetIdCrit = Restrictions.eq("widgetId", widgetId); restrictionsList.add(widgetIdCrit); - Criterion attIdCrit = Restrictions.eq("userId", userId); - restrictionsList.add(attIdCrit); + Criterion userIdCrit = Restrictions.eq("userId", userId); + restrictionsList.add(userIdCrit); Criterion paramIdCrit = Restrictions.eq("paramId", paramId); restrictionsList.add(paramIdCrit); diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/BulkUploadRoleFunction.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/BulkUploadRoleFunction.java new file mode 100644 index 00000000..d25cec5d --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/BulkUploadRoleFunction.java @@ -0,0 +1,68 @@ +package org.openecomp.portalapp.portal.transport; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@Entity +@JsonInclude(JsonInclude.Include.NON_NULL) +public class BulkUploadRoleFunction implements Serializable{ + + + private static final long serialVersionUID = -1880947347092068841L; + + @Id + @Column(name="function_name") + private String functionName; + @Id + @Column(name="function_cd") + private String functionCd; + + public String getFunctionName() { + return functionName; + } + public void setFunctionName(String functionName) { + this.functionName = functionName; + } + public String getFunctionCd() { + return functionCd; + } + public void setFunctionCd(String functionCd) { + this.functionCd = functionCd; + } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((functionCd == null) ? 0 : functionCd.hashCode()); + result = prime * result + ((functionName == null) ? 0 : functionName.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + BulkUploadRoleFunction other = (BulkUploadRoleFunction) obj; + if (functionCd == null) { + if (other.functionCd != null) + return false; + } else if (!functionCd.equals(other.functionCd)) + return false; + if (functionName == null) { + if (other.functionName != null) + return false; + } else if (!functionName.equals(other.functionName)) + return false; + return true; + } + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/BulkUploadUserRoles.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/BulkUploadUserRoles.java new file mode 100644 index 00000000..8187ce4e --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/BulkUploadUserRoles.java @@ -0,0 +1,83 @@ +package org.openecomp.portalapp.portal.transport; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@Entity +@JsonInclude(JsonInclude.Include.NON_NULL) +public class BulkUploadUserRoles implements Serializable{ + + private static final long serialVersionUID = -7478654947593502185L; + + @Id + @Column(name="role_name") + private String roleName; + @Id + @Column(name="org_user_id") + private String orgUserId; + @Id + @Column(name="auth_namespace") + private String appNameSpace; + + public String getRoleName() { + return roleName; + } + public void setRoleName(String roleName) { + this.roleName = roleName; + } + public String getOrgUserId() { + return orgUserId; + } + public void setOrgUserId(String orgUserId) { + this.orgUserId = orgUserId; + } + public String getAppNameSpace() { + return appNameSpace; + } + public void setAppNameSpace(String appNameSpace) { + this.appNameSpace = appNameSpace; + } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((appNameSpace == null) ? 0 : appNameSpace.hashCode()); + result = prime * result + ((orgUserId == null) ? 0 : orgUserId.hashCode()); + result = prime * result + ((roleName == null) ? 0 : roleName.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + BulkUploadUserRoles other = (BulkUploadUserRoles) obj; + if (appNameSpace == null) { + if (other.appNameSpace != null) + return false; + } else if (!appNameSpace.equals(other.appNameSpace)) + return false; + if (orgUserId == null) { + if (other.orgUserId != null) + return false; + } else if (!orgUserId.equals(other.orgUserId)) + return false; + if (roleName == null) { + if (other.roleName != null) + return false; + } else if (!roleName.equals(other.roleName)) + return false; + return true; + } + + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CentralApp.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CentralApp.java new file mode 100644 index 00000000..97907422 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CentralApp.java @@ -0,0 +1,210 @@ +package org.openecomp.portalapp.portal.transport; + +import java.util.Date; + +public class CentralApp { + public Long id; + public Date created; + public Date modified; + public Long createdId; + public Long modifiedId; + public Long rowNum; + public String name; // app_name + public String imageUrl; // app_image_url + public String description; // app_description + public String notes; // app_notes + public String url; // app_url + public String alternateUrl; // app_alternate_url + public String restEndpoint; // app_rest_endpoint + public String mlAppName; // ml_app_name + public String mlAppAdminId; // ml_app_admin_id; + public String motsId; // mots_id + public String appPassword; // app_password + public String open; + public String enabled; + public byte[] thumbnail; + public String username; // app_username + public String uebKey; // ueb_key + public String uebSecret; // ueb_secret + public String uebTopicName; // ueb_topic_name + + + public CentralApp(Long id, Date created, Date modified, Long createdId, Long modifiedId, Long rowNum, String name, + String imageUrl, String description, String notes, String url, String alternateUrl, String restEndpoint, + String mlAppName, String mlAppAdminId, String motsId, String appPassword, String open, String enabled, + byte[] thumbnail, String username, String uebKey, String uebSecret, String uebTopicName) { + super(); + this.id = id; + this.created = created; + this.modified = modified; + this.createdId = createdId; + this.modifiedId = modifiedId; + this.rowNum = rowNum; + this.name = name; + this.imageUrl = imageUrl; + this.description = description; + this.notes = notes; + this.url = url; + this.alternateUrl = alternateUrl; + this.restEndpoint = restEndpoint; + this.mlAppName = mlAppName; + this.mlAppAdminId = mlAppAdminId; + this.motsId = motsId; + this.appPassword = appPassword; + this.open = open; + this.enabled = enabled; + this.thumbnail = thumbnail; + this.username = username; + this.uebKey = uebKey; + this.uebSecret = uebSecret; + this.uebTopicName = uebTopicName; + } + + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + public Date getCreated() { + return created; + } + public void setCreated(Date created) { + this.created = created; + } + public Date getModified() { + return modified; + } + public void setModified(Date modified) { + this.modified = modified; + } + public Long getCreatedId() { + return createdId; + } + public void setCreatedId(Long createdId) { + this.createdId = createdId; + } + public Long getModifiedId() { + return modifiedId; + } + public void setModifiedId(Long modifiedId) { + this.modifiedId = modifiedId; + } + public Long getRowNum() { + return rowNum; + } + public void setRowNum(Long rowNum) { + this.rowNum = rowNum; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getImageUrl() { + return imageUrl; + } + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + public String getNotes() { + return notes; + } + public void setNotes(String notes) { + this.notes = notes; + } + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public String getAlternateUrl() { + return alternateUrl; + } + public void setAlternateUrl(String alternateUrl) { + this.alternateUrl = alternateUrl; + } + public String getRestEndpoint() { + return restEndpoint; + } + public void setRestEndpoint(String restEndpoint) { + this.restEndpoint = restEndpoint; + } + public String getMlAppName() { + return mlAppName; + } + public void setMlAppName(String mlAppName) { + this.mlAppName = mlAppName; + } + public String getMlAppAdminId() { + return mlAppAdminId; + } + public void setMlAppAdminId(String mlAppAdminId) { + this.mlAppAdminId = mlAppAdminId; + } + public String getMotsId() { + return motsId; + } + public void setMotsId(String motsId) { + this.motsId = motsId; + } + public String getAppPassword() { + return appPassword; + } + public void setAppPassword(String appPassword) { + this.appPassword = appPassword; + } + public String getOpen() { + return open; + } + public void setOpen(String open) { + this.open = open; + } + public String getEnabled() { + return enabled; + } + public void setEnabled(String enabled) { + this.enabled = enabled; + } + public byte[] getThumbnail() { + return thumbnail; + } + public void setThumbnail(byte[] thumbnail) { + this.thumbnail = thumbnail; + } + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } + public String getUebKey() { + return uebKey; + } + public void setUebKey(String uebKey) { + this.uebKey = uebKey; + } + public String getUebSecret() { + return uebSecret; + } + public void setUebSecret(String uebSecret) { + this.uebSecret = uebSecret; + } + public String getUebTopicName() { + return uebTopicName; + } + public void setUebTopicName(String uebTopicName) { + this.uebTopicName = uebTopicName; + } + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CentralRole.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CentralRole.java new file mode 100644 index 00000000..a3c3c9d5 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CentralRole.java @@ -0,0 +1,159 @@ +package org.openecomp.portalapp.portal.transport; + +import java.util.Date; +import java.util.SortedSet; + +import org.openecomp.portalapp.portal.domain.CentralRoleFunction; +import org.openecomp.portalapp.portal.domain.EPRole; + +public class CentralRole implements Comparable{ + public Long id; + public Date created; + public Date modified; + public Long createdId; + public Long modifiedId; + public Long rowNum; + + public String name; + public boolean active; + public Integer priority; + + public SortedSet<CentralRoleFunction> roleFunctions = null; + + public SortedSet<CentralRole> childRoles = null; + + public SortedSet<CentralRole> parentRoles = null; + + public CentralRole(Long id, Date created, Date modified, Long createdId, Long modifiedId, Long rowNum, + String name, boolean active, Integer priority, SortedSet<CentralRoleFunction> roleFunctions, + SortedSet<CentralRole> childRoles, SortedSet<CentralRole> parentRoles) { + super(); + this.id = id; + this.created = created; + this.modified = modified; + this.createdId = createdId; + this.modifiedId = modifiedId; + this.rowNum = rowNum; + this.name = name; + this.active = active; + this.priority = priority; + this.roleFunctions = roleFunctions; + this.childRoles = childRoles; + this.parentRoles = parentRoles; + } + + public CentralRole(){ + + } + + public CentralRole(Long id, String name){ + this.id = id; + this.name = name; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + + public Long getCreatedId() { + return createdId; + } + + public void setCreatedId(Long createdId) { + this.createdId = createdId; + } + + public Long getModifiedId() { + return modifiedId; + } + + public void setModifiedId(Long modifiedId) { + this.modifiedId = modifiedId; + } + + public Long getRowNum() { + return rowNum; + } + + public void setRowNum(Long rowNum) { + this.rowNum = rowNum; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public boolean isActive() { + return active; + } + + public void setActive(boolean active) { + this.active = active; + } + + public Integer getPriority() { + return priority; + } + + public void setPriority(Integer priority) { + this.priority = priority; + } + + public SortedSet<CentralRoleFunction> getRoleFunctions() { + return roleFunctions; + } + + public void setRoleFunctions(SortedSet<CentralRoleFunction> roleFunctions) { + this.roleFunctions = roleFunctions; + } + + public SortedSet<CentralRole> getChildRoles() { + return childRoles; + } + + public void setChildRoles(SortedSet<CentralRole> childRoles) { + this.childRoles = childRoles; + } + + public SortedSet<CentralRole> getParentRoles() { + return parentRoles; + } + + public void setParentRoles(SortedSet<CentralRole> parentRoles) { + this.parentRoles = parentRoles; + } + + public int compareTo(Object obj){ + EPRole other = (EPRole)obj; + + String c1 = getName(); + String c2 = other.getName(); + + return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2); + } + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CentralUser.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CentralUser.java new file mode 100644 index 00000000..f8174825 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CentralUser.java @@ -0,0 +1,139 @@ +package org.openecomp.portalapp.portal.transport; + +import java.util.Date; +import java.util.Set; + +public class CentralUser { + + + public Long id; + public Date created; + public Date modified; + public Long createdId; + public Long modifiedId; + public Long rowNum; + + public Long orgId; + public Long managerId; + public String firstName; + public String middleInitial; + public String lastName; + public String phone; + public String fax; + public String cellular; + public String email; + public Long addressId; + public String alertMethodCd; + public String hrid; + public String orgUserId; + public String orgCode; + public String address1; + public String address2; + public String city; + public String state; + public String zipCode; + public String country; + public String orgManagerUserId; + public String locationClli; + public String businessCountryCode; + public String businessCountryName; + public String businessUnit; + public String businessUnitName; + public String department; + public String departmentName; + public String companyCode; + public String company; + public String zipCodeSuffix; + public String jobTitle; + public String commandChain; + public String siloStatus; + public String costCenter; + public String financialLocCode; + + public String loginId; + public String loginPwd; + public Date lastLoginDate; + public boolean active; + public boolean internal; + public Long selectedProfileId; + public Long timeZoneId; + public boolean online; + public String chatId; + + public Set<CentralUserApp> userApps = null; + public Set<CentralRole> pseudoRoles = null; + + public CentralUser(){ + + } + + public CentralUser(Long id, Date created, Date modified, Long createdId, Long modifiedId, Long rowNum, Long orgId, + Long managerId, String firstName, String middleInitial, String lastName, String phone, String fax, + String cellular, String email, Long addressId, String alertMethodCd, String hrid, String orgUserId, + String orgCode, String address1, String address2, String city, String state, String zipCode, String country, + String orgManagerUserId, String locationClli, String businessCountryCode, String businessCountryName, + String businessUnit, String businessUnitName, String department, String departmentName, String companyCode, + String company, String zipCodeSuffix, String jobTitle, String commandChain, String siloStatus, + String costCenter, String financialLocCode, String loginId, String loginPwd, Date lastLoginDate, + boolean active, boolean internal, Long selectedProfileId, Long timeZoneId, boolean online, String chatId, + Set<CentralUserApp> userApps, Set<CentralRole> pseudoRoles) { + super(); + this.id = id; + this.created = created; + this.modified = modified; + this.createdId = createdId; + this.modifiedId = modifiedId; + this.rowNum = rowNum; + this.orgId = orgId; + this.managerId = managerId; + this.firstName = firstName; + this.middleInitial = middleInitial; + this.lastName = lastName; + this.phone = phone; + this.fax = fax; + this.cellular = cellular; + this.email = email; + this.addressId = addressId; + this.alertMethodCd = alertMethodCd; + this.hrid = hrid; + this.orgUserId = orgUserId; + this.orgCode = orgCode; + this.address1 = address1; + this.address2 = address2; + this.city = city; + this.state = state; + this.zipCode = zipCode; + this.country = country; + this.orgManagerUserId = orgManagerUserId; + this.locationClli = locationClli; + this.businessCountryCode = businessCountryCode; + this.businessCountryName = businessCountryName; + this.businessUnit = businessUnit; + this.businessUnitName = businessUnitName; + this.department = department; + this.departmentName = departmentName; + this.companyCode = companyCode; + this.company = company; + this.zipCodeSuffix = zipCodeSuffix; + this.jobTitle = jobTitle; + this.commandChain = commandChain; + this.siloStatus = siloStatus; + this.costCenter = costCenter; + this.financialLocCode = financialLocCode; + this.loginId = loginId; + this.loginPwd = loginPwd; + this.lastLoginDate = lastLoginDate; + this.active = active; + this.internal = internal; + this.selectedProfileId = selectedProfileId; + this.timeZoneId = timeZoneId; + this.online = online; + this.chatId = chatId; + this.userApps = userApps; + this.pseudoRoles = pseudoRoles; + } + + + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CentralUserApp.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CentralUserApp.java new file mode 100644 index 00000000..9317b9fe --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CentralUserApp.java @@ -0,0 +1,70 @@ +package org.openecomp.portalapp.portal.transport; + +@SuppressWarnings("rawtypes") +public class CentralUserApp implements Comparable{ + + private Long userId; + private CentralApp app; + private CentralRole role; + private Short priority; + + + + public Long getUserId() { + return userId; + } + + + + public void setUserId(Long userId) { + this.userId = userId; + } + + + + public CentralApp getApp() { + return app; + } + + + + public void setApp(CentralApp app) { + this.app = app; + } + + + + public CentralRole getRole() { + return role; + } + + + + public void setRole(CentralRole role) { + this.role = role; + } + + + + public Short getPriority() { + return priority; + } + + + + public void setPriority(Short priority) { + this.priority = priority; + } + + + + public int compareTo(Object other){ + CentralUserApp castOther = (CentralUserApp) other; + + Long c1 = (this.getUserId()==null ? 0 : this.getUserId()) + (this.priority==null ? 0 : this.priority); + Long c2 = (castOther.getUserId()==null ? 0 : castOther.getUserId()) + (castOther.getApp()==null||castOther.getApp().getId()==null ? 0 : castOther.getApp().getId()) + (castOther.priority==null ? 0 : castOther.priority); + + return c1.compareTo(c2); + } + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPUserAppCurrentRoles.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPUserAppCurrentRoles.java new file mode 100644 index 00000000..085df3b8 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPUserAppCurrentRoles.java @@ -0,0 +1,98 @@ +package org.openecomp.portalapp.portal.transport; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@Entity +@JsonInclude(JsonInclude.Include.NON_NULL) +public class EPUserAppCurrentRoles implements Serializable{ + + private static final long serialVersionUID = -8145807875293949759L; + + @Id + @Column(name="role_name") + private String roleName; + @Id + @Column(name="user_id") + private Long userId; + @Id + @Column(name="priority") + private String priority ; + @Id + @Column(name="role_id") + private Long roleId; + public String getRoleName() { + return roleName; + } + public void setRoleName(String roleName) { + this.roleName = roleName; + } + public Long getUserId() { + return userId; + } + public void setUserId(Long userId) { + this.userId = userId; + } + public String getPriority() { + return priority; + } + public void setPriority(String priority) { + this.priority = priority; + } + public Long getRoleId() { + return roleId; + } + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((priority == null) ? 0 : priority.hashCode()); + result = prime * result + ((roleId == null) ? 0 : roleId.hashCode()); + result = prime * result + ((roleName == null) ? 0 : roleName.hashCode()); + result = prime * result + ((userId == null) ? 0 : userId.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + EPUserAppCurrentRoles other = (EPUserAppCurrentRoles) obj; + if (priority == null) { + if (other.priority != null) + return false; + } else if (!priority.equals(other.priority)) + return false; + if (roleId == null) { + if (other.roleId != null) + return false; + } else if (!roleId.equals(other.roleId)) + return false; + if (roleName == null) { + if (other.roleName != null) + return false; + } else if (!roleName.equals(other.roleName)) + return false; + if (userId == null) { + if (other.userId != null) + return false; + } else if (!userId.equals(other.userId)) + return false; + return true; + } + + + +} +
\ No newline at end of file diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EcompUserAppRoles.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EcompUserAppRoles.java new file mode 100644 index 00000000..3ac21040 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EcompUserAppRoles.java @@ -0,0 +1,66 @@ +package org.openecomp.portalapp.portal.transport; + +import java.io.Serializable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@Entity +@JsonInclude(JsonInclude.Include.NON_NULL) +public class EcompUserAppRoles implements Serializable { + + private static final long serialVersionUID = -3394219387296578741L; + + @Id + @Column(name="app_id") + private String appId; + @Id + @Column(name="user_id") + private Long userId; + @Id + @Column(name="priority") + private String priority ; + @Id + @Column(name="role_id") + private Long roleId; + @Id + @Column(name="role_name") + private String roleName; + public String getAppId() { + return appId; + } + public void setAppId(String appId) { + this.appId = appId; + } + public Long getUserId() { + return userId; + } + public void setUserId(Long userId) { + this.userId = userId; + } + public String getPriority() { + return priority; + } + public void setPriority(String priority) { + this.priority = priority; + } + public Long getRoleId() { + return roleId; + } + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + public String getRoleName() { + return roleName; + } + public void setRoleName(String roleName) { + this.roleName = roleName; + } + + + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItem.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItem.java index 00df522a..6f7c96b3 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItem.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItem.java @@ -88,6 +88,9 @@ public class EpNotificationItem extends DomainVo { @Column(name = "created_date") public Date createdDate; + + @Column(name = "notification_hyperlink") + public String notificationHyperlink; @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL}, orphanRemoval = true) @@ -212,6 +215,14 @@ public class EpNotificationItem extends DomainVo { public void setMsgSource(String msgSource) { this.msgSource = msgSource; } + + public String getNotificationHyperlink() { + return notificationHyperlink; + } + + public void setNotificationHyperlink(String notificationHyperlink) { + this.notificationHyperlink = notificationHyperlink; + } @Override public int hashCode() { diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItemVO.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItemVO.java index 3cb0f3a6..d1ebe13c 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItemVO.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItemVO.java @@ -65,7 +65,10 @@ public class EpNotificationItemVO extends DomainVo { private Date createdDate; private String loginId; + + private String notificationHyperlink; + /** * Answers whether the notification is expired. * @@ -188,4 +191,13 @@ public class EpNotificationItemVO extends DomainVo { public void setMsgSource(String msgSource) { this.msgSource = msgSource; } + + public String getNotificationHyperlink() { + return notificationHyperlink; + } + + public void setNotificationHyperlink(String notificationHyperlink) { + this.notificationHyperlink = notificationHyperlink; + } + } diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EventWidget.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EventWidget.java index 4922b03e..fe4a3cde 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EventWidget.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EventWidget.java @@ -31,7 +31,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; *//** * This is to handle portal admins - * @author aw3218 *//* @Entity @Table(name="fn_event_widget_data") diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessPerms.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessPerms.java new file mode 100644 index 00000000..60f9f63a --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessPerms.java @@ -0,0 +1,96 @@ +package org.openecomp.portalapp.portal.transport; + +import java.io.Serializable; + +public class ExternalAccessPerms implements Serializable, Comparable{ + + /** + * + */ + private static final long serialVersionUID = -200964838466882602L; + public String type; + public String instance; + public String action; + public String description; + + + public ExternalAccessPerms() { + super(); + } + + + + public ExternalAccessPerms(String type, String instance, String action, String description) { + super(); + this.type = type; + this.instance = instance; + this.action = action; + this.description = description; + } + + public ExternalAccessPerms(String type, String instance, String action) { + super(); + this.type = type; + this.instance = instance; + this.action = action; + } + + + /** + * @return the type + */ + public String getType() { + return type; + } + /** + * @param type the type to set + */ + public void setType(String type) { + this.type = type; + } + /** + * @return the instance + */ + public String getInstance() { + return instance; + } + /** + * @param instance the instance to set + */ + public void setInstance(String instance) { + this.instance = instance; + } + /** + * @return the action + */ + public String getAction() { + return action; + } + /** + * @param action the action to set + */ + public void setAction(String action) { + this.action = action; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + + @Override + public int compareTo(Object obj){ + ExternalAccessPerms other = (ExternalAccessPerms)obj; + + String c1 = getInstance(); + String c2 = other.getInstance(); + + return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2); + } + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessPermsDetail.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessPermsDetail.java new file mode 100644 index 00000000..39c29dd8 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessPermsDetail.java @@ -0,0 +1,90 @@ +package org.openecomp.portalapp.portal.transport; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonRootName; + +@JsonIgnoreProperties(ignoreUnknown = true) +@JsonRootName(value="perm") +public class ExternalAccessPermsDetail { + + private String type; + private String instance; + private String action; + private List<String> roles; + private String description; + + + + public ExternalAccessPermsDetail() { + super(); + } + + /** + * @param type + * @param instance + * @param action + * @param roles + * @param description + */ + public ExternalAccessPermsDetail(String type, String instance, String action, List<String> roles, + String description) { + super(); + this.type = type; + this.instance = instance; + this.action = action; + this.roles = roles; + this.description = description; + } + + /** + * @param type + * @param instance + * @param action + * @param description + */ + public ExternalAccessPermsDetail(String type, String instance, String action, + String description) { + super(); + this.type = type; + this.instance = instance; + this.action = action; + this.description = description; + } + + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + public String getInstance() { + return instance; + } + public void setInstance(String instance) { + this.instance = instance; + } + public String getAction() { + return action; + } + public void setAction(String action) { + this.action = action; + } + public List<String> getRoles() { + return roles; + } + + public void setRoles(List<String> roles) { + this.roles = roles; + } + + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessRole.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessRole.java new file mode 100644 index 00000000..949c191e --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessRole.java @@ -0,0 +1,39 @@ +package org.openecomp.portalapp.portal.transport; + +import java.io.Serializable; + +public class ExternalAccessRole implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 3439986826362436339L; + public String name; + public String description; + + public ExternalAccessRole() { + + } + + public ExternalAccessRole(String name, String description) { + super(); + this.name = name; + this.description = description; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessRolePerms.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessRolePerms.java new file mode 100644 index 00000000..460b02ac --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessRolePerms.java @@ -0,0 +1,29 @@ +package org.openecomp.portalapp.portal.transport; + +public class ExternalAccessRolePerms { + + private ExternalAccessPerms perm; + private String role; + + + public ExternalAccessRolePerms(ExternalAccessPerms perm, String role) { + super(); + this.perm = perm; + this.role = role; + } + + public ExternalAccessPerms getPerm() { + return perm; + } + public void setPerm(ExternalAccessPerms perm) { + this.perm = perm; + } + public String getRole() { + return role; + } + public void setRole(String role) { + this.role = role; + } + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessUser.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessUser.java new file mode 100644 index 00000000..30674bf3 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessUser.java @@ -0,0 +1,28 @@ +package org.openecomp.portalapp.portal.transport; + +public class ExternalAccessUser { + + private String user; + private String role; + + public ExternalAccessUser(String user, String role) { + super(); + this.user = user; + this.role = role; + } + + public String getUser() { + return user; + } + public void setUser(String user) { + this.user = user; + } + public String getRole() { + return role; + } + public void setRole(String role) { + this.role = role; + } + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessUserRoleDetail.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessUserRoleDetail.java new file mode 100644 index 00000000..e5d89e22 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalAccessUserRoleDetail.java @@ -0,0 +1,36 @@ +package org.openecomp.portalapp.portal.transport; + +public class ExternalAccessUserRoleDetail { + + private String name; + private ExternalRoleDescription description; + + + /** + * + */ + public ExternalAccessUserRoleDetail() { + super(); + } + + public ExternalAccessUserRoleDetail(String name, ExternalRoleDescription description) { + super(); + this.name = name; + this.description = description; + } + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public ExternalRoleDescription getDescription() { + return description; + } + public void setDescription(ExternalRoleDescription description) { + this.description = description; + } + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalRoleDescription.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalRoleDescription.java new file mode 100644 index 00000000..d6eba633 --- /dev/null +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/ExternalRoleDescription.java @@ -0,0 +1,50 @@ +package org.openecomp.portalapp.portal.transport; + +public class ExternalRoleDescription { + + private String id; + private String name; + private String active; + private String priority; + private String appId; + private String appRoleId; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getActive() { + return active; + } + public void setActive(String active) { + this.active = active; + } + public String getPriority() { + return priority; + } + public void setPriority(String priority) { + this.priority = priority; + } + public String getAppId() { + return appId; + } + public void setAppId(String appId) { + this.appId = appId; + } + public String getAppRoleId() { + return appRoleId; + } + public void setAppRoleId(String appRoleId) { + this.appRoleId = appRoleId; + } + + +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java index a4198d1d..3187d093 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java @@ -66,6 +66,10 @@ public class OnboardingApp { public String uebSecret; public Boolean restrictedApp; + + public Boolean isCentralAuth; + + public String nameSpace; /** * Sets the name, myLoginsAppName, myLoginsAppOwner, username and diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ueb/EPUebHelper.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ueb/EPUebHelper.java index 34be46e3..a80517d2 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ueb/EPUebHelper.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ueb/EPUebHelper.java @@ -155,7 +155,7 @@ public class EPUebHelper { // // Test existence of topic at UEB url // - // (ie http://uebsb91kcdc.it.att.com:3904/topics/ECOMP-PORTAL-INBOX) + // (ie http://uebsb91kcdc.it.com:3904/topics/ECOMP-PORTAL-INBOX) // boolean available = true; LinkedList<String> urlList = Helper.uebUrlList(); diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EPCommonSystemProperties.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EPCommonSystemProperties.java index dd33bf6e..4d472801 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EPCommonSystemProperties.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EPCommonSystemProperties.java @@ -61,7 +61,14 @@ public class EPCommonSystemProperties extends SystemProperties { public static final String AUTH_USER_SERVER = "auth_user_server"; public static final String EXTERNAL_ACCESS_ENABLE = "external_access_enable"; + + public static final String EXTERNAL_SYSTEM_NOTIFICATION_URL = "external_system_notification_url"; + public static final String EXTERNAL_CENTRAL_AUTH_USER_NAME = "ext_central_access_user_name"; + public static final String EXTERNAL_CENTRAL_AUTH_PASSWORD = "ext_central_access_password"; + public static final String EXTERNAL_CENTRAL_ACCESS_URL = "ext_central_access_url"; + public static final String EXTERNAL_CENTRAL_ACCESS_USER_DOMAIN = "ext_central_access_user_domain"; + public static final String WIDGET_MS_PROTOCOL = "microservices.widget.protocol"; public static final String WIDGET_MS_HOSTNAME = "microservices.widget.hostname"; -}
\ No newline at end of file +} diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java index d471d90b..0284452a 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java @@ -29,6 +29,7 @@ import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletResponse; +import javax.xml.bind.DatatypeConverter; import org.hibernate.Session; import org.hibernate.Transaction; @@ -36,8 +37,11 @@ import org.openecomp.portalapp.portal.domain.EPUser; import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum; import org.openecomp.portalapp.portal.logging.logic.EPLogUtil; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.openecomp.portalsdk.core.onboarding.util.CipherUtil; import org.openecomp.portalsdk.core.util.SystemProperties; import org.slf4j.MDC; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -369,5 +373,45 @@ public class EcompPortalUtils { } } + /** + * It returns headers where username and password of external central auth + * is encoded to base64 + * + * @return header which contains external central auth username and password + * base64 encoded + * @throws Exception + * if unable to decrypt the password + */ + public static HttpHeaders base64encodeKeyForAAFBasicAuth() throws Exception { + + String userName = ""; + String decryptedPass = ""; + if (EPCommonSystemProperties + .containsProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_AUTH_USER_NAME) && EPCommonSystemProperties + .containsProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_AUTH_PASSWORD)) { + decryptedPass = SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_AUTH_PASSWORD); + userName = SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_AUTH_USER_NAME); + } + String decPass = decrypted(decryptedPass); + String usernamePass = userName + ":" + decPass; + String encToBase64 = String.valueOf((DatatypeConverter.printBase64Binary(usernamePass.getBytes()))); + HttpHeaders headers = new HttpHeaders(); + headers.add("Authorization", "Basic " + encToBase64); + headers.setContentType(MediaType.APPLICATION_JSON); + return headers; + } + + private static String decrypted(String encrypted) throws Exception { + String result = ""; + if (encrypted != null && encrypted.length() > 0) { + try { + result = CipherUtil.decrypt(encrypted, SystemProperties.getProperty(SystemProperties.Decryption_Key)); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "decryptedPassword failed", e); + throw e; + } + } + return result; + } } diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/PortalConstants.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/PortalConstants.java index 485a80f5..57bb543f 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/PortalConstants.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/PortalConstants.java @@ -24,6 +24,7 @@ public interface PortalConstants { public static final Long DEFAULT_NOTIFICATION_CREATOR = 1L; public static final String REST_AUX_API = "/auxapi"; public static final Long ACCOUNT_ADMIN_ROLE_ID = 999L; - public static final int SYS_ADMIN_ROLE_ID = 1; + public static final Long SYS_ADMIN_ROLE_ID = 1L; public static final String ADMIN_ROLE = "Account Administrator"; + public static final String PORTAL_ADMIN_ROLE = "System Administrator"; } diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/util/EPUserUtils.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/util/EPUserUtils.java index 7dcf0e95..533ed53d 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/util/EPUserUtils.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/util/EPUserUtils.java @@ -19,11 +19,13 @@ */ package org.openecomp.portalapp.util; +import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.UUID; @@ -31,15 +33,24 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Restrictions; +import org.hibernate.transform.Transformers; +import org.openecomp.portalapp.portal.domain.CentralRoleFunction; import org.openecomp.portalapp.portal.domain.EPRole; import org.openecomp.portalapp.portal.domain.EPUser; import org.openecomp.portalapp.portal.domain.EPUserApp; +import org.openecomp.portalapp.portal.service.EPRoleFunctionService; import org.openecomp.portalapp.portal.utils.EcompPortalUtils; import org.openecomp.portalsdk.core.domain.RoleFunction; import org.openecomp.portalsdk.core.exception.SessionExpiredException; import org.openecomp.portalsdk.core.lm.FusionLicenseManager; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.openecomp.portalsdk.core.menu.MenuBuilder; +import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants; +import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties; import org.openecomp.portalsdk.core.service.DataAccessService; import org.openecomp.portalsdk.core.util.SystemProperties; import org.openecomp.portalsdk.core.web.support.AppUtils; @@ -54,6 +65,9 @@ public class EPUserUtils { public static final String ALL_ROLE_FUNCTIONS = "allRoleFunctions"; private static DataAccessService dataAccessService; + + @Autowired + private static SessionFactory sessionFactory; /** * Gets the EPUser object from the session. @@ -89,17 +103,17 @@ public class EPUserUtils { */ @SuppressWarnings("rawtypes") public static void setUserSession(HttpServletRequest request, EPUser user, Set applicationMenuData, - Set businessDirectMenuData, String loginMethod_ignored, List<RoleFunction> allRoleFunctions) { + Set businessDirectMenuData, String loginMethod_ignored, EPRoleFunctionService ePRoleFunctionService) { HttpSession session = request.getSession(true); // clear the current user session to avoid any conflicts EPUserUtils.clearUserSession(request); session.setAttribute(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME), user); - getAllRoleFunctions(allRoleFunctions, session); - - getRoleFunctions(request); - + setAllRoleFunctions(ePRoleFunctionService.getRoleFunctions(), session); + + ePRoleFunctionService.getRoleFunctions(request,user); + // truncate the role (and therefore the role function) data to save // memory in the session user.setEPRoles(null); @@ -146,7 +160,7 @@ public class EPUserUtils { * @param session * HttpSession */ - private static void getAllRoleFunctions(List<RoleFunction> allRoleFunctions, HttpSession session) { + private static void setAllRoleFunctions(List<RoleFunction> allRoleFunctions, HttpSession session) { if (allRoleFunctions == null) return; Set<String> roleFnSet = new HashSet<String>(); @@ -176,45 +190,6 @@ public class EPUserUtils { session.removeAttribute(SystemProperties.getProperty(SystemProperties.ROLE_FUNCTIONS_ATTRIBUTE_NAME)); } - /** - * Builds a set of role functions and sets a session attribute with it. - * - * @param request - * HttpServletRequest - * @return Set of role functions that was built. - */ - @SuppressWarnings({ "rawtypes", "unchecked" }) - private static Set getRoleFunctions(HttpServletRequest request) { - HashSet roleFunctions = null; - - HttpSession session = request.getSession(); - roleFunctions = (HashSet) session - .getAttribute(SystemProperties.getProperty(SystemProperties.ROLE_FUNCTIONS_ATTRIBUTE_NAME)); - - if (roleFunctions == null) { - HashMap roles = getRoles(request); - roleFunctions = new HashSet(); - - Iterator i = roles.keySet().iterator(); - - while (i.hasNext()) { - Long roleKey = (Long) i.next(); - EPRole role = (EPRole) roles.get(roleKey); - - Iterator j = role.getRoleFunctions().iterator(); - - while (j.hasNext()) { - RoleFunction function = (RoleFunction) j.next(); - roleFunctions.add(function.getCode()); - } - } - - session.setAttribute(SystemProperties.getProperty(SystemProperties.ROLE_FUNCTIONS_ATTRIBUTE_NAME), - roleFunctions); - } - - return roleFunctions; - } /** * Gets role information from the user session, in the cached user object. @@ -225,7 +200,7 @@ public class EPUserUtils { * @return Map of role ID to role object */ @SuppressWarnings("rawtypes") - private static HashMap getRoles(HttpServletRequest request) { + public static HashMap getRoles(HttpServletRequest request) { HashMap roles = null; HttpSession session = AppUtils.getSession(request); diff --git a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml index eea9467a..342a6e8c 100644 --- a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml +++ b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml @@ -321,7 +321,12 @@ <property name="appType" type="integer"> <column name="app_type"></column> </property> - + <property name="centralAuth" type="yes_no"> + <column name="auth_central"></column> + </property> + <property name="nameSpace" type="string"> + <column name="auth_namespace"></column> + </property> <one-to-one name="contactUs" class="AppContactUs" cascade="save-update"></one-to-one> </class> @@ -433,6 +438,29 @@ <property name="statusCode" column="status_cd" /> </class> + <!-- EPAppRoleFunction class mapping details --> + <class name="EPAppRoleFunction" table="ep_app_role_function"> + <id name="id" column="id"> + <generator class="native"> + <param name="property">seq_epp_app_role_func</param> + </generator> + </id> + <property name="roleId" column="role_id"></property> + <property name="appId" column="app_id"></property> + <property name="code" column="function_cd"></property> + </class> + + <!-- CentralRoleFunction class mapping details --> + <class name="CentralRoleFunction" table="ep_app_function"> + <composite-id> + <key-property name="appId" + column="app_id" /> + <key-property name="code" + column="function_cd" /> + </composite-id> + <property name="name" column="function_name" /> + </class> + <class name="PersUserWidgetSelection" table="ep_pers_user_widget_sel"> <id name="id" column="id"> <generator class="native"> @@ -612,17 +640,17 @@ <return alias="notificationResult" class="org.openecomp.portalapp.portal.transport.EpNotificationItem" /> <![CDATA[ - select @rn /*'*/:=/*'*/ @rn+1 AS rowId, notification_ID, is_for_online_users,is_for_all_roles, msg_header, msg_description,msg_source, start_Time, end_time, priority, created_date, creator_ID, active_YN from + select @rn /*'*/:=/*'*/ @rn+1 AS rowId, notification_ID, is_for_online_users,is_for_all_roles, msg_header, msg_description,msg_source, start_Time, end_time, priority, created_date, creator_ID,notification_hyperlink, active_YN from ( - select notification_ID, is_for_online_users, is_for_all_roles, msg_header, msg_description, msg_source,start_Time, end_time, priority,created_date, creator_ID,active_YN + select notification_ID, is_for_online_users, is_for_all_roles, msg_header, msg_description, msg_source,start_Time, end_time, priority,created_date, creator_ID,notification_hyperlink,active_YN from ( - select user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source,start_Time, end_time, priority, created_date, creator_ID,active_YN + select user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source,start_Time, end_time, priority, created_date,notification_hyperlink, creator_ID,active_YN from ( select a.notification_ID,a.is_for_online_users,a.is_for_all_roles,a.active_YN, - a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date,b.role_id,b.recv_user_id + a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.notification_hyperlink,a.created_date,b.role_id,b.recv_user_id from ep_notification a, ep_role_notification b where a.notification_id = b.notification_id and (end_time is null || SYSDATE() <= end_time ) @@ -643,11 +671,11 @@ a.role_id = b.role_id ) union - select :user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source,start_Time, end_time, priority, created_date, creator_ID,active_YN + select :user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source,start_Time, end_time, priority, created_date,notification_hyperlink, creator_ID,active_YN from ( select a.notification_ID,a.is_for_online_users,a.is_for_all_roles,a.active_YN, - a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date, b.role_id,b.recv_user_id + a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date, a.notification_hyperlink,b.role_id,b.recv_user_id from ep_notification a, ep_role_notification b where a.notification_id = b.notification_id and (end_time is null || SYSDATE() <= end_time ) @@ -660,7 +688,7 @@ ) union ( - select :user_id user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description, msg_source,start_Time, end_time, priority, created_date, creator_ID,active_YN + select :user_id user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description, msg_source,start_Time, end_time, priority, created_date,notification_hyperlink, creator_ID,active_YN from ep_notification a where a.notification_id and (end_time is null || SYSDATE() <= end_time ) @@ -713,6 +741,7 @@ SELECT n.priority, n.creator_ID AS creatorId, n.created_date AS createdDate, + n.notification_hyperlink AS notificationHyperlink, u.org_user_id AS loginId FROM ep_notification n @@ -736,6 +765,7 @@ SELECT n.priority, n.creator_ID AS creatorId, n.created_date AS createdDate, + n.notification_hyperlink AS notificationHyperlink, u.org_user_id AS loginId FROM ep_notification n @@ -761,7 +791,7 @@ select a.app_id, a.app_name, b.role_id, b.role_name from union select fn_role.app_id,fn_app.app_name, fn_role.role_id ,fn_role.role_name from fn_app, fn_role -where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name +where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' and fn_role.active_yn='Y' order by app_name @@ -775,7 +805,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name <![CDATA[ SELECT notificationId, isForOnlineUsers, isForAllRoles, msgHeader, msgDescription,msgSource, - startTime, endTime, priority, createdDate, creatorId, loginId, activeYn + startTime, endTime, priority, createdDate,notificationHyperlink,creatorId, loginId, activeYn FROM ( select distinct @@ -790,6 +820,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name priority, created_date AS createdDate, creator_ID AS creatorId, + notification_hyperlink AS notificationHyperlink, login_id AS loginId, active_YN AS activeYn, if (is_viewed is null, 'N', is_viewed) @@ -798,11 +829,11 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name select user_id, login_id,notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source, start_Time, end_time, priority, created_date, - creator_ID,active_YN + creator_ID,notification_hyperlink,active_YN from ( select a.notification_ID,a.is_for_online_users,a.is_for_all_roles,a.active_YN, - a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date, + a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.notification_hyperlink,a.created_date, b.role_id,CASE WHEN a.creator_ID IS NOT NULL THEN u.org_user_id ELSE NULL @@ -837,11 +868,11 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name select :user_id, login_id,notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source, start_Time, end_time, priority, created_date, - creator_ID,active_YN + creator_ID,notification_hyperlink,active_YN from ( select a.notification_ID,a.is_for_online_users,a.is_for_all_roles,a.active_YN, - a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date, + a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date,a.notification_hyperlink, b.role_id,CASE WHEN a.creator_ID IS NOT NULL THEN u.org_user_id ELSE NULL @@ -868,7 +899,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name select :user_id user_id, b.login_id,notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source, start_Time, end_time, priority, a.created_date, - creator_ID, a.active_YN + creator_ID, a.notification_hyperlink,a.active_YN from ep_notification a JOIN fn_user b on b.user_id=a.creator_ID where a.notification_id and a.is_for_all_roles = 'Y' @@ -1048,6 +1079,13 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name select audit_date from fn_audit_log where affected_record_id =:userId order by audit_date desc limit 2; ]]> </sql-query> + + <sql-query name="getActiveUsers"> + <return alias="EPUser" class="org.openecomp.portalapp.portal.domain.EPUser" /> + <![CDATA[ + SELECT * FROM FN_USER WHERE active_yn='Y' + ]]> + </sql-query> <sql-query name="getAppsAdmins"> <return alias="adminUserApp" class="org.openecomp.portalapp.portal.domain.AdminUserApp" /> @@ -1074,7 +1112,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT , a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD , a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED , - a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE + a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL from FN_APP a -- Portal assigns role 999 to app administrator left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999 @@ -1102,7 +1140,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT , a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD , a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED , - a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE + a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL , + a.AUTH_NAMESPACE from FN_APP a -- Portal assigns role 999 to app administrator left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999 @@ -1131,7 +1170,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT , a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD , a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED , - a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE + a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL , + a.AUTH_NAMESPACE from FN_APP a -- Portal assigns role 999 to app administrator left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999 @@ -1161,7 +1201,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT , a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD , a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED , - a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE + a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL , + a.AUTH_NAMESPACE from FN_APP a -- Portal assigns role 999 to app administrator left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999 @@ -1193,7 +1234,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT , a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD , a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED , - a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE + a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL , + a.AUTH_NAMESPACE from FN_APP a -- Portal assigns role 999 to app administrator left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999 @@ -1228,7 +1270,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT , a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD , a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED , - a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE + a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL , + a.AUTH_NAMESPACE from FN_APP a -- Portal assigns role 999 to app administrator left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999 @@ -1266,7 +1309,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT , a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD , a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED , - a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE + a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL , + a.AUTH_NAMESPACE from FN_APP a -- Portal assigns role 999 to app administrator left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999 @@ -1307,7 +1351,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT , a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD , a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED , - a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE + a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL , + a.AUTH_NAMESPACE from FN_APP a -- Portal assigns role 999 to app administrator left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999 @@ -1344,7 +1389,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT , a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD , a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED , - a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE + a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL , + a.AUTH_NAMESPACE from FN_APP a -- Portal assigns role 999 to app administrator left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999 @@ -1381,7 +1427,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name a.APP_NOTES , a.APP_URL , a.APP_ALTERNATE_URL , a.APP_REST_ENDPOINT , a.ML_APP_NAME , a.ML_APP_ADMIN_ID , a.MOTS_ID , a.APP_PASSWORD , a.THUMBNAIL , a.APP_USERNAME , a.OPEN , a.ENABLED , - a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE + a.UEB_TOPIC_NAME , a.UEB_KEY , a.UEB_SECRET , a.APP_TYPE , a.AUTH_CENTRAL , + a.AUTH_NAMESPACE from FN_APP a -- Portal assigns role 999 to app administrator left outer join FN_USER_ROLE r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999 @@ -1460,6 +1507,16 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name ]]> </sql-query> + <sql-query name="getMyAppDetailsByUebKey"> + <return alias="myAppDetailsByUebKey" class="org.openecomp.portalapp.portal.domain.EPApp" /> + + <![CDATA[ + + SELECT * FROM fn_app where ueb_key =:appKey + ; + ]]> + </sql-query> + <sql-query name="deleteAccountEndpoint"> <![CDATA[ @@ -1582,9 +1639,9 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name <sql-query name="appRoles"> <return alias="rolesForApp" - class="org.openecomp.portalapp.portal.domain.EpUserAppRoles" /> + class="org.openecomp.portalapp.portal.domain.EPUserAppRoles" /> <![CDATA[ - SELECT ROLE_ID, APP_ID from FN_ROLE where APP_ROLE_ID =:appRoleId and app_id =:appId + SELECT ROLE_ID, APP_ID from FN_ROLE where APP_ROLE_ID = :appRoleId and app_id = :appId ; ]]> </sql-query> @@ -1681,7 +1738,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name select fr.role_name, fa.app_name from fn_role fr, fn_user_role fur, fn_app fa, fn_user fu - Where fu.user_id = fur.user_id and fur.role_id = fr.role_id and fa.app_id = fur.app_id and fu.org_user_id = :userId + Where fu.user_id = fur.user_id and fur.role_id = fr.role_id and fa.app_id = fur.app_id and fu.org_user_id = :userId and fr.active_yn='Y' and (fa.enabled = 'Y' or fa.app_id=1) ; ]]> @@ -1711,5 +1768,173 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name delete from ep_user_notification where notification_id in (select notification_id from ep_notification where curdate() >= DATE_ADD(end_time,INTERVAL 3 MONTH)) ]]> </sql-query> + + <!-- Gets list of role functions and it requires two parameters appId and roleId--> + <sql-query name="getAppRoleFunctionList"> + <return alias="appRoleFunctionList" + class="org.openecomp.portalapp.portal.domain.CentralRoleFunction" /> + <![CDATA[ + + SELECT DISTINCT f.app_id , f.function_cd, f.function_name from ep_app_role_function rf, ep_app_function f + where rf.role_id =:roleId and rf.app_id =:appId and rf.app_id = f.app_id and rf.function_cd = f.function_cd + ; + + ]]> + </sql-query> + + <!-- Gets list of all role functions --> + <sql-query name="getAllRoleFunctions"> + <return alias="allRoleFunctions" + class="org.openecomp.portalapp.portal.domain.CentralRoleFunction" /> + <![CDATA[ + + SELECT * from ep_app_function where app_id =:appId + ; + + ]]> + </sql-query> + + <!-- Get ep_app_function records provided by single parameter --> + <sql-query name="getRoleFunction"> + <return alias="RoleFunction" + class="org.openecomp.portalapp.portal.domain.CentralRoleFunction" /> + <![CDATA[ + + SELECT * from ep_app_function where function_cd = :functionCode and app_id =:appId + ; + + ]]> + </sql-query> + + <!-- Gets the record from ep_app_function table and requires two parameters --> + <sql-query name="getAppFunctionDetails"> + <return alias="appFunctionDetails" + class="org.openecomp.portalapp.portal.domain.CentralRoleFunction" /> + <![CDATA[ + + select * from ep_app_function where app_id =:appId and function_cd =:functionCd + ; + ]]> + </sql-query> + + <!-- Gets the current user app roles records and requires two parameters --> + <sql-query name="getUserAppCurrentRoles"> + <return alias="userAppCurrentRoles" + class="org.openecomp.portalapp.portal.transport.EPUserAppCurrentRoles" /> + <![CDATA[ + + select distinct fu.role_id, fr.user_id, fu.role_name, fu.priority from fn_role fu left outer join fn_user_role fr ON fu.role_id = fr.role_id and fu.app_id = fr.app_id and fr.role_id != 999 where fu.app_id =:appId and fr.user_id =:userId + ; + ]]> + </sql-query> + + <!-- Gets the current user app roles along with account administrator and requires two parameters --> + <sql-query name="getUserAppExistingRoles"> + <return alias="userAppExistingRoles" + class="org.openecomp.portalapp.portal.transport.EcompUserAppRoles" /> + <![CDATA[ + select fr.role_name, fu.app_id, fu.user_id, fu.priority, fu.role_id from fn_user_role fu + left outer join fn_role fr on fu.role_id = fr.role_id + where fu.user_id =:userId and fu.app_id =:appId + ; + ]]> + </sql-query> + + <!-- Gets the current user app roles records and requires two parameters --> + <sql-query name="getAllFunctions"> + <return alias="allFunctions" + class="org.openecomp.portalsdk.core.domain.RoleFunction" /> + <![CDATA[ + select * from fn_function + ; + ]]> + </sql-query> + <!-- Gets the all role functions and requires one parameters --> + <sql-query name="uploadAllRoleFunctions"> + <return alias="allRoleFunctions" + class="org.openecomp.portalapp.portal.transport.BulkUploadRoleFunction" /> + <![CDATA[ + select fr.function_cd, fn.function_name from fn_role_function fr left outer join fn_function fn on fr.function_cd = fn.function_cd where role_id =:roleId + ; + ]]> + </sql-query> + + <sql-query name="getRoletoUpdateAAF"> + <return alias="getRoletoUpdateAAF" class="org.openecomp.portalapp.portal.domain.EPRole" /> + <![CDATA[ + SELECT * FROM fn_role where role_name =:appRoleName and app_id =:appId + ; + ]]> + </sql-query> + + <sql-query name="getBulkUserRoles"> + <return alias="bulkUserRoles" class="org.openecomp.portalapp.portal.transport.BulkUploadUserRoles" /> + <![CDATA[ + select fr.role_name, fu.org_user_id, fa.auth_namespace from fn_user_role fur + left outer join fn_role fr on fr.role_id = fur.role_id + left outer join fn_app fa on fa.app_id = fur.app_id + left outer join fn_user fu on fu.user_id = fur.user_id where fa.ueb_key =:uebKey and fu.org_user_id != 'su1234' + ; + ]]> + </sql-query> + + <sql-query name="getCentralizedApps"> + <return alias="centralizedApps" class="org.openecomp.portalapp.portal.domain.EPApp" /> + <![CDATA[ + select * from fn_app where auth_central = 'Y' and open = 'N'; + ; + ]]> + </sql-query> + + <sql-query name="getUserRoles"> + <return alias="getUserRolesList" class="org.openecomp.portalapp.portal.domain.UserRole" /> + + <![CDATA[ + + SELECT DISTINCT user.USER_ID, role.ROLE_ID, user.org_user_id, user.FIRST_NAME, user.LAST_NAME, role.ROLE_NAME FROM fn_user_role userrole INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID INNER JOIN fn_role role ON role.ROLE_ID = userrole.ROLE_ID WHERE user.org_user_id =:org_user_id and userrole.app_id = 1 + ; + ]]> + </sql-query> + <sql-query name="getRoleFunctionsOfUser"> + <![CDATA[ + select distinct ep.function_cd from fn_user_role fu, ep_app_role_function ep, ep_app_function ea + where fu.role_id = ep.role_id + and fu.app_id = ep.app_id + and fu.user_id =:userId and ep.app_id = 1 + and ea.function_cd = ep.function_cd + ; + ]]> + </sql-query> + + <sql-query name="getUserRolesForLeftMenu"> + <return alias="getUserRolesListForLeftMenu" class="org.openecomp.portalapp.portal.domain.UserRole" /> + + <![CDATA[ + + SELECT DISTINCT user.USER_ID, role.ROLE_ID, user.org_user_id, user.FIRST_NAME, user.LAST_NAME, role.ROLE_NAME FROM fn_user_role userrole INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID INNER JOIN fn_role role ON role.ROLE_ID = userrole.ROLE_ID WHERE user.org_user_id =:org_user_id and (userrole.app_id = 1 or role.role_id = 999) + ; + ]]> + </sql-query> + + <!-- Gets all functions for an application along with global functions and requires single parameter --> + <sql-query name="getMenuFunctions"> + <![CDATA[ + select f.function_cd from ep_app_function f + where f.app_id =:appId + UNION + select epa.function_cd from fn_role fnr, ep_app_role_function epr, ep_app_function epa where epr.role_id = fnr.role_id + and epa.function_cd = epr.function_cd and fnr.role_name like 'global%' + ; + ]]> + </sql-query> + + <sql-query name="getRequestIdsForApp"> + <return alias="getRequestIdsForApp" class="org.openecomp.portalapp.portal.domain.EPUserAppRolesRequest" /> + <![CDATA[ + select * from ep_user_roles_request where app_id =:app_id + ; + ]]> + </sql-query> + </hibernate-mapping> diff --git a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/jsp/login.jsp b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/jsp/login.jsp deleted file mode 100644 index d90704c3..00000000 --- a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/jsp/login.jsp +++ /dev/null @@ -1,120 +0,0 @@ -<%-- - ================================================================================ - ECOMP Portal - ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - 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. - ================================================================================ - --%> -<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ page import="java.net.URLEncoder" %> -<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties" %> -<!DOCTYPE html> -<html ng-app="abs"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> - <link rel="stylesheet" type="text/css" href="static/ebz/fn-ebz.css" > - <link rel="stylesheet" type="text/css" href="static/ebz/sandbox/styles/style.css" > - <script src="static/js/jquery-1.10.2.js" type="text/javascript"></script> - <script src= "static/ebz/angular_js/angular.js"></script> - <script src= "static/ebz/angular_js/angular-sanitize.js"></script> - <script src= "static/ebz/angular_js/att_abs_tpls.js"></script> - <script src= "static/ebz/angular_js/app.js"></script> - <script src= "static/ebz/angular_js/gestures.js"></script> - <script src="static/js/modalService.js"></script> - <style> - .terms { - font-family: Verdana,Arial,Helvetica, sans-serif; - font-size: 12px; - } - </style> - </head> - <body style="padding-top: 15px;display: none;"> - <% - String returnUrl = request.getParameter("returnUrl"); - String redirectUrl = request.getParameter("redirectUrl"); - returnUrl = ((returnUrl == null) ? (request.isSecure() ?"https://":"http://") + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() + "/process_csp" + "?redirectUrl=" + redirectUrl: URLEncoder.encode(returnUrl)); - %> - <c:set var="returnUrl" value="<%=returnUrl%>"/> - <c:set var="cspLoginUrl" value="<%=SystemProperties.getProperty(SystemProperties.CSP_LOGIN_URL)%>"/> - <div ng-controller="loginController"> - <!-- AT&T Logo --> - <div style="position: fixed; left:15px; top:15px; "> - <img src="static/fusion/images/logo_att_header.jpg" alt="AT&T" /> - </div> - <div class="centered style="-webkit-transform: translateZ(0);background:white, z-index:0;"> - <div class="centered" style="height:15px"> - <div class="centered"> - <div align="center" style="display: block;margin-left: auto;margin-right: auto;width: 100%;"> - <img src="static/fusion/images/ecomp-login.jpg" height="250"/> - <br> - <font class="headerText"> - <a id="goUrl" href="${cspLoginUrl}"><b>Click here to login</b></a> - </font> - </div> - <br /> - <br /> - </div> - </div> - <br/><br/><br/><br/><br/><br/><br/><br/> - <div id="footer" style="margin-top:300px"> - <div style="margin-left:auto;margin-right:auto;text-align: center;"> - <p><font class="terms"> - <b>Warning:</b> This system is restricted to AT&T authorized users for business purposes. - Unauthorized access is a violation of the law. - <br> - This service may be monitored for administrative and security reasons. - By proceeding, you consent to this monitoring. - </font></p> - </div> - <div class="terms" style="text-align: center;"> - <a target="_top" href="http://www.att.com/terms/">Terms and Conditions</a> | - <a target="_top" href="http://www.att.com/privacy/">Privacy Policy</a>. - <br><span>© 2017 AT&T. All rights reserved.</span> - </div> - </div> - </div> - </body> -<script> - function getParameterByName(name, url) { - if (!url) url = window.location.href; - name = name.replace(/[\[\]]/g, "\\$&"); - var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"), - results = regex.exec(url); - if (!results) return ''; - if (!results[2]) return ''; - return (results[2].replace(/\+/g, " ")); - } - - var winHref = window.location.href; - var appPathIndex = winHref.substring(0,winHref.lastIndexOf(".htm")).lastIndexOf("/"); - var goUrl =winHref.substring(0,appPathIndex+1) + "process_csp" + "?redirectUrl=" + getParameterByName('redirectUrl') ; - document.getElementById("goUrl").href = document.getElementById("goUrl").href + goUrl; - if(getParameterByName('skipClick')=="Yes"){ - document.getElementById("goUrl").click(); - }else{ - $("body").show(); - } - -</script> -<script> -app.controller("loginController", function ($scope) { - -}); -</script> -</html> diff --git a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/jsp/login_external.jsp b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/jsp/login_external.jsp deleted file mode 100644 index 94c2f55e..00000000 --- a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/jsp/login_external.jsp +++ /dev/null @@ -1,162 +0,0 @@ -<%-- - ================================================================================ - ECOMP Portal - ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - 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. - ================================================================================ - --%> -<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties" %> -<c:set var="title" value="Login" /> -<c:set var="isMobileEnabled" - value="<%=(SystemProperties.getProperty(SystemProperties.MOBILE_ENABLE)!= null && SystemProperties.getProperty(SystemProperties.MOBILE_ENABLE).trim().equals(\"true\"))%>" /> - -<!DOCTYPE html> -<html ng-app="abs"> - <head> - <title> - Login - </title> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> - <link rel="stylesheet" type="text/css" href="static/ebz/fn-ebz.css" > - <link rel="stylesheet" type="text/css" href="static/fusion/css/jquery-ui.css"> - <script src="static/js/jquery-1.10.2.js" type="text/javascript"></script> - <script src= "static/ebz/angular_js/angular.js"></script> - <script src= "static/ebz/angular_js/angular-sanitize.js"></script> - <script src= "static/ebz/angular_js/att_abs_tpls.js"></script> - <script src= "static/ebz/angular_js/app.js"></script> - <script src= "static/ebz/angular_js/gestures.js"></script> - <script src="static/js/modalService.js"></script> - <style> - .terms { - font-family: Verdana,Arial,Helvetica, sans-serif; - font-size: 9px; - } - </style> - </head> - <body style="padding-top: 15px;"> - <div ng-controller="externalLoginController"> - <!-- Remove Video ----- - <div style="position: fixed; left: -25%; top: -25%; height: 150%; width: 150%; z-index:-1;"> - <video src="http://www.business.att.com/content/mixedmedia/network-on-demand.mp4" autoplay="true" defaultmuted="true" muted="true" height="100%" width="100%"></video> - </div> - --> - <div style="position: fixed; left:15px; top:15px;z-index:-1;"> - <img src="static/fusion/images/logo_att_header.jpg" alt="AT&T" /> - </div> - <div class="centered style="-webkit-transform: translateZ(0);background:white, z-index:0;"> - <div align="center" id="errorInfo" style="display:none;float:left;font-size:12px;margin-left:5px"><span style="color:red">Invaild username or password, Please try again</span></div> - <br/> - <div align="center" style="margin-left:auto;margin-right:auto;width:40%;padding:6px;background-color:white"> - <img src="static/fusion/images/ecomp-login.jpg"/><span style=" color: #c97d25; font-size: 56px; position: relative; text-shadow: 3px 0 #8F9477, 0 2px #d7e7dc, 4px 0 #72b7b2, 0 0px black; top:-144px; left: -26px; font-weight: bold; font-style: italic; font-family:sans-serif">Portal</span> - <h2> ECOMP Portal </h2> - <label> - <label class="form-field__label">Login ID:</label> - </label> - <input type="text" class="fn-ebz-text" ng-model="loginId" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;" - maxlength="30" /> - <br/> - <br/> - <label > Password:</label> - <input type="password" class="span3" ng-model="password" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;" - maxlength="30" onkeydown="if (event.keyCode == 13) document.getElementById('loginBtn').click()"/> - <br /> - <br /> - - <input id="loginBtn" type="image" ng-click="loginExternal();" src="static/fusion/images/login_button.gif" alt="Login" /> - <br> - </div> - </div> - <br/><br/><br/><br/><br/><br/><br/> - <div id="footer"> - <div style="margin-left:auto;margin-right:auto;text-align: center;"> - <p><font class="terms"> - <b>Warning:</b> This system is restricted to AT&T authorized users for business purposes. Unauthorized access is a violation of the law. This service may be monitored for administrative and security reasons. By proceeding, you consent to this monitoring. - </font></p> - </div> - <div class="terms" align="left"> - <a target="_top" href="http://www.att.com/terms/">Terms and Conditions</a> | <a target="_top" href="http://www.att.com/privacy/">Privacy Policy</a>.<br><span>© 2016 AT&T. All rights reserved.</span> - </div> - </div> - </div> - </body> -<script> -app.controller("externalLoginController", function ($scope) { - // Table Data - - $scope.viewPerPage = 200; - $scope.currentPage = 2; - $scope.totalPage; - $scope.searchCategory = ""; - $scope.searchString = ""; - $scope.loginId=""; - $scope.password=""; - $scope.loginError=true; - $scope.viewPerPage = 200; - $scope.currentPage = 2; - $scope.totalPage; - $scope.searchCategory = ""; - $scope.searchString = ""; - $scope.loginId=""; - $scope.password=""; - - - $scope.loginExternal = function() { - - $.ajax({ - url: "login_external/login?"+"loginId="+$scope.loginId+"&password="+$scope.password, - type : "POST", - success:function (response){ - if(response=="success"){ - window.location.href = 'welcome.htm'; - }else{ - $("#errorInfo").show(); - } - }, - error:function( jqXHR, status,error ){ - $("#errorInfo").show(); - } - - }); - - }; - - - /** - $scope.loginExternal = function() { - - - var redirectUrl = "login_external/login"; - var form = $('<form action="' + redirectUrl + '" method="post">' + - '<input type="hidden" name="loginId" value='+$scope.loginId+' />' + - '<input type="hidden" name="password" value='+$scope.password+' />' + - '</form>'); - - $('body').append(form); - $(form).submit(); - - - }; - */ - -}); -</script> - -</html> diff --git a/ecomp-portal-BE-common/src/main/webapp/static/ebz/angular_js/app.js b/ecomp-portal-BE-common/src/main/webapp/static/ebz/angular_js/app.js deleted file mode 100644 index be422026..00000000 --- a/ecomp-portal-BE-common/src/main/webapp/static/ebz/angular_js/app.js +++ /dev/null @@ -1,3 +0,0 @@ -angular.module('att.abs.helper', []); - -var app=angular.module("abs", []);
\ No newline at end of file diff --git a/ecomp-portal-BE-common/src/main/webapp/static/fusion/images/onap-portal-logo.png b/ecomp-portal-BE-common/src/main/webapp/static/fusion/images/onap-portal-logo.png Binary files differindex f48d3d47..3fa9b92e 100644 --- a/ecomp-portal-BE-common/src/main/webapp/static/fusion/images/onap-portal-logo.png +++ b/ecomp-portal-BE-common/src/main/webapp/static/fusion/images/onap-portal-logo.png diff --git a/ecomp-portal-BE-os/README.md b/ecomp-portal-BE-os/README.md index aa406022..e116bc6d 100644 --- a/ecomp-portal-BE-os/README.md +++ b/ecomp-portal-BE-os/README.md @@ -14,10 +14,11 @@ https://www.eclipse.org/m2e-wtp/ ## Release Notes -Version 1.1.0, July 2017 +Version 1.1.0 (Amsterdam), November 2017 - [Portal-6] Updates to License and Trademark in the PORTAL Source Code - [Portal-7] Improvements added as part of the rebasing process - [Portal-17] Remove jfree related items +- [PORTAL-21] FE changes to OS for AAF centralization and name space field; DB script updates for EcompPortalDDLMySql_1710_Common.sql under ecomp-portal-DB-common, EcompPortalDMLMySql_1710_OS.sql under ecomp-portal-DB-os; - [Portal-30] Failed to communicate with the widget microservice: Fixed - [Portal-35] Replaced the portal logo with onap logo on the login screen. - [Portal-40] Fix to add user roles @@ -26,6 +27,12 @@ Version 1.1.0, July 2017 - [Portal-48] Fix to save a new app on Application onboarding - [Portal-49] image icon is missing on Widget corner - [Portal-63] remove att_abs_tpls*.js and greensock url +- [Portal-69] unable to pick role in Functional Menu Update +- [Portal-73] unable to onboard new Application fix +- [Portal-50] Enabled the junit coverage in ONAP +- [Portal-76] Edit functional menu modal doesn't show +- [Portal-61] Fixed the routing problem, loaded data and changed the notification hyperlink +- [Portal-77] Changes to remove preview image and update the new image automatically on App onbarding page Version 1.0.0, February 2017 - Initial release diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml index d00d47a0..a8c19a54 100644 --- a/ecomp-portal-BE-os/pom.xml +++ b/ecomp-portal-BE-os/pom.xml @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.portal</groupId> + <groupId>org.onap.portal</groupId> <artifactId>ecompportal-be-os</artifactId> <packaging>war</packaging> <version>1.1</version> @@ -10,18 +10,17 @@ <springframework.version>4.2.0.RELEASE</springframework.version> <hibernate.version>4.3.11.Final</hibernate.version> <eelf.version>1.0.0</eelf.version> - <epsdk.version>1.1.0</epsdk.version> - <portal.version>1.1.0</portal.version> + <epsdk.version>1.3.0-SNAPSHOT</epsdk.version> + <portal.version>1.3.0-SNAPSHOT</portal.version> <encoding>UTF-8</encoding> <!-- Tests usually require some setup that maven cannot do, so skip. --> - <skiptests>false</skiptests> - <!-- Jenkins invokes mvn with argument -Dbuild.number=${BUILD_NUMBER} --> + <skipTests>true</skipTests> + <!-- Jenkins SHOULD invoke mvn with argument -Dbuild.number=${BUILD_NUMBER} --> <build.number>0</build.number> <sonar.exclusions>**.js</sonar.exclusions> <nexusproxy>https://nexus.onap.org</nexusproxy> <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath> <releaseNexusPath>content/repositories/releases/</releaseNexusPath> - <sitePath>/content/sites/site/org/onap/portal/${project.version}</sitePath> </properties> <reporting> @@ -42,28 +41,26 @@ <useStandardDocletOptions>true</useStandardDocletOptions> </configuration> </plugin> + </plugins> </reporting> <distributionManagement> <site> <id>ecomp-site</id> - <url>dav:${nexusproxy}${sitePath}</url> + <url>dav:${nexusproxy}/content/sites/site/org/onap/portal/${project.version}</url> </site> </distributionManagement> <repositories> <repository> - <id>ecomp-releases</id> - <name>OpenECOMP - Release Repository</name> + <id>onap-releases</id> <url>${nexusproxy}/${releaseNexusPath}</url> </repository> <repository> - <id>ecomp-snapshots</id> - <name>OpenECOMP - Snapshot Repository</name> + <id>onap-snapshots</id> <url>${nexusproxy}/${snapshotNexusPath}</url> </repository> <repository> - <id>ecomp-public</id> - <name>ecomp onap public Repository</name> + <id>onap-public</id> <url>https://nexus.onap.org/content/groups/public</url> </repository> </repositories> @@ -99,6 +96,121 @@ <target>1.8</target> </configuration> </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.5.201505241946</version> + <executions> + + <!-- Prepares the property pointing to the JaCoCo runtime agent which + is passed as VM argument when Maven the Surefire plugin is executed. --> + <execution> + <id>pre-unit-test</id> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <!-- Sets the path to the file which contains the execution data. --> + <destFile>${basedir}/target/coverage-reports/jacoco-ut.exec</destFile> + <!-- Sets the name of the property containing the settings for JaCoCo + runtime agent. --> + <propertyName>surefireArgLine</propertyName> + <skip>${skipTests}</skip> + </configuration> + + </execution> + <!-- Ensures that the code coverage report for unit tests is created + after unit tests have been run. --> + <execution> + <id>post-unit-test</id> + <phase>test</phase> + <goals> + <goal>report</goal> + </goals> + <configuration> + <!-- Sets the path to the file which contains the execution data. --> + <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile> + <!-- Sets the output directory for the code coverage report. --> + <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> + <skip>${skipTests}</skip> + + </configuration> + </execution> + <!-- Will see build errors while running the test cases because of dual + instrumentation --> + <execution> + <id>default-instrument</id> + <goals> + <goal>instrument</goal> + </goals> + <configuration> + <skip>${skipTests}</skip> + </configuration> + </execution> + <execution> + <id>default-restore-instrumented-classes</id> + <goals> + <goal>restore-instrumented-classes</goal> + </goals> + <configuration> + <skip>${skipTests}</skip> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>3.0.2</version> + <executions> + <execution> + <id>copy-src</id> + <phase>generate-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/target/classes</outputDirectory> + <overwrite>false</overwrite> + <skip>${skipTests}</skip> + <resources> + <resource> + <directory>${basedir}/../ecomp-portal-BE-common/target/classes</directory> + </resource> + </resources> + </configuration> + </execution> + + </executions> + </plugin> + + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.19.1</version> + <configuration> + <skipTests>${skipTests}</skipTests> + <includes> + <include>**/*Test.java</include> + <include>**/*TestCase.java</include> + <inlcude>**/*TestSuite.java</inlcude> + </includes> + <!-- Intentionally Excluding TestFromSuite --> + <excludes> + <exclude>**/*TestFromSuite.java</exclude> + </excludes> + <additionalClasspathElements> + <additionalClasspathElement>${basedir}/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>../ecomp-portal-BE-common/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>../ecomp-portal-BE-common</additionalClasspathElement> + </additionalClasspathElements> + <systemPropertyVariables> + <container.classpath>classpath:</container.classpath> + </systemPropertyVariables> + </configuration> + </plugin> <plugin> <artifactId>maven-war-plugin</artifactId> @@ -118,13 +230,13 @@ <overlays> <!-- specify the order in which these should be applied --> <overlay> - <groupId>org.openecomp.portal</groupId> + <groupId>org.onap.portal</groupId> <artifactId>ecompportal-be-common</artifactId> </overlay> <overlay> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-app-overlay</artifactId> - </overlay> + </overlay> </overlays> </configuration> </plugin> @@ -249,17 +361,29 @@ </build> <dependencies> + <!-- <dependency> <groupId>com.att.eelf</groupId> <artifactId>eelf-core</artifactId> <version>${eelf.version}</version> + <exclusions> + <exclusion> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>2.5</version> </dependency> - + --> <!-- Spring --> <dependency> <groupId>org.springframework</groupId> @@ -412,7 +536,6 @@ <artifactId>*</artifactId> </exclusion> </exclusions> - <!-- --> </dependency> <dependency> @@ -540,14 +663,14 @@ <!-- SDK overlay war --> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-app-overlay</artifactId> <version>${epsdk.version}</version> <type>war</type> </dependency> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-app-common</artifactId> <version>${epsdk.version}</version> <type>jar</type> @@ -555,14 +678,14 @@ <!-- EcompPortal common overlay --> <dependency> - <groupId>org.openecomp.portal</groupId> + <groupId>org.onap.portal</groupId> <artifactId>ecompportal-be-common</artifactId> <version>${portal.version}</version> <type>war</type> </dependency> <dependency> - <groupId>org.openecomp.portal</groupId> + <groupId>org.onap.portal</groupId> <artifactId>ecompportal-be-common</artifactId> <version>${portal.version}</version> <type>jar</type> @@ -570,7 +693,7 @@ </dependency> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-fw</artifactId> <version>${epsdk.version}</version> <exclusions> @@ -594,13 +717,13 @@ </dependency> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-core</artifactId> <version>${epsdk.version}</version> </dependency> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-workflow</artifactId> <version>${epsdk.version}</version> </dependency> @@ -608,7 +731,7 @@ <!-- Raptor required Libraries --> <!-- for static charts --> <dependency> - <groupId>org.openecomp.ecompsdkos</groupId> + <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-analytics</artifactId> <version>${epsdk.version}</version> </dependency> @@ -628,13 +751,26 @@ <version>4.11</version> <scope>test</scope> </dependency> - <dependency> + <groupId>org.onap.portal</groupId> + <artifactId>ecomp-portal-BE-common-test</artifactId> + <version>${portal.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.8.5</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>1.9.2</version> </dependency> - + + + <!-- OpenID Connect Dependencies --> <dependency> <groupId>org.mitre</groupId> diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/authentication/OpenIdConnectLoginStrategy.java b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/authentication/OpenIdConnectLoginStrategy.java index 8365ebc2..48f447b4 100644 --- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/authentication/OpenIdConnectLoginStrategy.java +++ b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/authentication/OpenIdConnectLoginStrategy.java @@ -64,7 +64,7 @@ public class OpenIdConnectLoginStrategy extends org.openecomp.portalsdk.core.aut user.setLastName(userInfo.getFamilyName()); //store the currently logged in user's information in the session - EPUserUtils.setUserSession(request, user, new HashSet(), new HashSet(), SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM), null); + EPUserUtils.setUserSession(request, user, new HashSet(), new HashSet(), SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM),null); logger.info(EELFLoggerDelegate.errorLogger, request.getContextPath()); SessionCookieUtil.preSetUp(request, response); diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/authentication/SimpleLoginStrategy.java b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/authentication/SimpleLoginStrategy.java index c1fee7f3..0c3c4996 100644 --- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/authentication/SimpleLoginStrategy.java +++ b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/authentication/SimpleLoginStrategy.java @@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletResponse; import org.openecomp.portalapp.command.EPLoginBean; import org.openecomp.portalapp.portal.service.EPLoginService; +import org.openecomp.portalapp.portal.service.EPRoleFunctionService; import org.openecomp.portalapp.portal.service.EPRoleService; import org.openecomp.portalapp.portal.utils.EPSystemProperties; import org.openecomp.portalapp.portal.utils.EcompPortalUtils; @@ -45,6 +46,9 @@ public class SimpleLoginStrategy extends org.openecomp.portalsdk.core.auth.Login @Autowired private EPRoleService roleService; + @Autowired + private EPRoleFunctionService ePRoleFunctionService; + private static final String GLOBAL_LOCATION_KEY = "Location"; EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SimpleLoginStrategy.class); @@ -66,7 +70,7 @@ public class SimpleLoginStrategy extends org.openecomp.portalsdk.core.auth.Login } else { // store the currently logged in user's information in the session - EPUserUtils.setUserSession(request, commandBean.getUser(), commandBean.getMenu(), commandBean.getBusinessDirectMenu(), "", roleService.getRoleFunctions()); + EPUserUtils.setUserSession(request, commandBean.getUser(), commandBean.getMenu(), commandBean.getBusinessDirectMenu(), "", ePRoleFunctionService); logger.info(EELFLoggerDelegate.debugLogger, commandBean.getUser().getOrgUserId() + " exists in the the system."); } diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java index a16cf56b..92d63742 100644 --- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java +++ b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java @@ -200,7 +200,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable { registry.addInterceptor(sessionTimeoutInterceptor()).excludePathPatterns("/oid-login", "/portalApi/healthCheck", "/portalApi/healthCheck/", "/portalApi/healthCheckSuspend", "/portalApi/healthCheckSuspend/", "/portalApi/healthCheckResume", "/portalApi/healthCheckResume/", "/login_external", - "/login_external.htm*", "login", "/login.htm*", "/auxapi/*", "/context/*", "/api*", + "/login_external.htm*", "login", "/login.htm*","/auxapi/*","/context/*", "/api*", "/single_signon.htm", "/single_signon", "/dashboard", "/OpenSourceLogin.htm"); registry.addInterceptor(portalResourceInterceptor()); diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/controller/LoginController.java b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/controller/LoginController.java index 6f3d2278..33cc4dd7 100644 --- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/controller/LoginController.java +++ b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/controller/LoginController.java @@ -36,6 +36,7 @@ import org.json.JSONObject; import org.openecomp.portalapp.command.EPLoginBean; import org.openecomp.portalapp.portal.domain.SharedContext; import org.openecomp.portalapp.portal.service.EPLoginService; +import org.openecomp.portalapp.portal.service.EPRoleFunctionService; import org.openecomp.portalapp.portal.service.EPRoleService; import org.openecomp.portalapp.portal.service.SharedContextService; import org.openecomp.portalapp.portal.utils.EPSystemProperties; @@ -84,6 +85,9 @@ public class LoginController extends EPUnRestrictedBaseController implements Log @Autowired private EPRoleService roleService; + @Autowired + private EPRoleFunctionService ePRoleFunctionService; + String viewName = "login"; private String welcomeView; @@ -142,8 +146,7 @@ public class LoginController extends EPUnRestrictedBaseController implements Log } else { // store the currently logged in user's information in the session - EPUserUtils.setUserSession(request, commandBean.getUser(), commandBean.getMenu(), commandBean.getBusinessDirectMenu(), SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM), - roleService.getRoleFunctions()); + EPUserUtils.setUserSession(request, commandBean.getUser(), commandBean.getMenu(), commandBean.getBusinessDirectMenu(), SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM),ePRoleFunctionService); try{ logger.info(EELFLoggerDelegate.debugLogger, "******************* store user info into share context begins"); @@ -249,7 +252,7 @@ public class LoginController extends EPUnRestrictedBaseController implements Log sbAdditionalInfo.append(String.format("Login-Id: %s, Login-Method: %s, Request-URL: %s", orgUserId, "", fullURL)); logger.info(EELFLoggerDelegate.debugLogger, "*********************** now set up user session for " + orgUserId); - EPUserUtils.setUserSession(request, commandBean.getUser(), commandBean.getMenu(), commandBean.getBusinessDirectMenu(), SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM), roleService.getRoleFunctions()); + EPUserUtils.setUserSession(request, commandBean.getUser(), commandBean.getMenu(), commandBean.getBusinessDirectMenu(), SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM),ePRoleFunctionService); logger.info(EELFLoggerDelegate.debugLogger, "*********************** now set up user session for " + orgUserId + " finished"); //Store user's information into share context diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java index f953634a..eee12234 100644 --- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java +++ b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java @@ -56,6 +56,10 @@ public class OnboardingApp { public String uebSecret; public Boolean restrictedApp; + + public Boolean isCentralAuth; + + public String nameSpace; public void normalize() { this.name = (this.name == null) ? "" : this.name.trim(); diff --git a/ecomp-portal-BE-os/src/main/resources/portal.properties b/ecomp-portal-BE-os/src/main/resources/portal.properties index a1982632..e23d04e4 100644 --- a/ecomp-portal-BE-os/src/main/resources/portal.properties +++ b/ecomp-portal-BE-os/src/main/resources/portal.properties @@ -42,3 +42,8 @@ ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX-DEV-LOCAL # Consumer group name for UEB topic. # Use the special tag to generate a unique one for each sdk-app server. ueb_app_consumer_group_name = {UUID} + +role_access_centralized = remote + +ext_req_connection_timeout = 15000 +ext_req_read_timeout = 20000 diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/raptor.properties b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/raptor.properties index 0c32ef65..68d60140 100644 --- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/raptor.properties +++ b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/raptor.properties @@ -107,7 +107,7 @@ flat_file_upper_limit=200000 request_get_params=c_master,isEmbedded print_footer_in_download=yes ## footer mentioned here appears in downloaded excel -footer_first_line=AT&T Proprietary +footer_first_line=Raptor footer_second_line=Use Pursuant to Company Instructions ## to run report in popup window report_in_popup_window=yes diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties index 0fc2c69d..8f74a9f2 100644 --- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties +++ b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties @@ -35,7 +35,7 @@ hb.idle_connection_test_period = 3600 # Ecomp portal title app_display_name = Portal -files_path = /demeter/WebApps/dev/ECOMP_APP/files +files_path = /tmp context_root = ECOMPPORTAL # menu settings menu_query_name = menuData @@ -116,3 +116,6 @@ authenticate_user_server=http://todo_enter_auth_server_hostname:8383/openid-conn #window width threshold to collapse left/right menu when page onload window_width_threshold_left_menu = 1400 window_width_threshold_right_menu = 1350 + +#External system notification URL +external_system_notification_url= http://todo_external_system_notification_url? diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/jsp/login.jsp b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/jsp/login.jsp index 1b269d80..a8265c71 100644 --- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/jsp/login.jsp @@ -37,11 +37,9 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> - <link rel="stylesheet" type="text/css" href="static/fusion/css/jquery-ui.css"> <script src="static/js/jquery-1.10.2.js" type="text/javascript"></script> <script src= "static/ebz/angular_js/angular.js"></script> <script src= "static/ebz/angular_js/angular-sanitize.js"></script> - <script src= "static/ebz/angular_js/app.js"></script> <script src= "static/ebz/angular_js/gestures.js"></script> <style> .terms { @@ -126,6 +124,7 @@ </div> </body> <script> +var app=angular.module("abs", []); app.controller("externalLoginController", function ($scope) { // Table Data diff --git a/ecomp-portal-BE-os/src/test/java/org/openecomp/portalapp/portal/framework/MockTestSuite.java b/ecomp-portal-BE-os/src/test/java/org/openecomp/portalapp/portal/framework/MockTestSuite.java new file mode 100644 index 00000000..ec464fd6 --- /dev/null +++ b/ecomp-portal-BE-os/src/test/java/org/openecomp/portalapp/portal/framework/MockTestSuite.java @@ -0,0 +1,68 @@ +package org.openecomp.portalapp.portal.framework; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.openecomp.portalapp.portal.test.controller.AppCatalogControllerTest; +import org.openecomp.portalapp.portal.test.controller.AppContactUsControllerTest; +import org.openecomp.portalapp.portal.test.controller.AppsControllerExternalRequestTest; +import org.openecomp.portalapp.portal.test.controller.AppsControllerTest; +import org.openecomp.portalapp.portal.test.controller.BEPropertyReaderControllerTest; +import org.openecomp.portalapp.portal.test.controller.BasicAuthAccountControllerTest; +import org.openecomp.portalapp.portal.test.controller.CommonWidgetControllerTest; +import org.openecomp.portalapp.portal.test.controller.ConsulClientControllerTest; +import org.openecomp.portalapp.portal.test.controller.DashboardSearchResultControllerTest; +import org.openecomp.portalapp.portal.test.controller.ExternalAppsRestfulControllerTest; +import org.openecomp.portalapp.portal.test.controller.FunctionalMenuControllerTest; +import org.openecomp.portalapp.portal.test.controller.GetAccessControllerTest; +import org.openecomp.portalapp.portal.test.controller.ManifestControllerTest; +import org.openecomp.portalapp.portal.test.controller.MicroserviceControllerTest; +import org.openecomp.portalapp.portal.test.controller.MicroserviceProxyControllerTest; +import org.openecomp.portalapp.portal.test.controller.PortalAdminControllerTest; +import org.openecomp.portalapp.portal.test.controller.RolesApprovalSystemControllerTest; +import org.openecomp.portalapp.portal.test.controller.TicketEventControllerTest; +import org.openecomp.portalapp.portal.test.controller.UserControllerTest; +import org.openecomp.portalapp.portal.test.controller.UserNotificationControllerTest; +import org.openecomp.portalapp.portal.test.controller.UserRolesControllerTest; +import org.openecomp.portalapp.portal.test.controller.WebAnalyticsExtAppControllerTest; +import org.openecomp.portalapp.portal.test.controller.WidgetsCatalogMarkupControllerTest; + + + +/** + * + * + * Create the Test class in ecmop-portal-BE-common-test and extend from MockitoTestSuite + * Add the class in Suite to test it + * + */ + +@RunWith(Suite.class) +@Suite.SuiteClasses({ +UserRolesControllerTest.class, +FunctionalMenuControllerTest.class, +AppCatalogControllerTest.class, +AppContactUsControllerTest.class, +UserNotificationControllerTest.class, +TicketEventControllerTest.class, +CommonWidgetControllerTest.class, +ConsulClientControllerTest.class, +GetAccessControllerTest.class, +AppsControllerTest.class, +BasicAuthAccountControllerTest.class, +DashboardSearchResultControllerTest.class, +PortalAdminControllerTest.class, +ManifestControllerTest.class, +BEPropertyReaderControllerTest.class, +WebAnalyticsExtAppControllerTest.class, +AppsControllerExternalRequestTest.class, +WidgetsCatalogMarkupControllerTest.class, +RolesApprovalSystemControllerTest.class, +MicroserviceProxyControllerTest.class, +MicroserviceControllerTest.class, +ExternalAppsRestfulControllerTest.class, +UserControllerTest.class +}) +public class MockTestSuite { + +} + diff --git a/ecomp-portal-DB-common/EcompPortalDDLMySql_1710_Common.sql b/ecomp-portal-DB-common/EcompPortalDDLMySql_1710_Common.sql new file mode 100644 index 00000000..f4d3c85f --- /dev/null +++ b/ecomp-portal-DB-common/EcompPortalDDLMySql_1710_Common.sql @@ -0,0 +1,1769 @@ +-- --------------------------------------------------------------------------------------------------------------- +-- This is the 1710 Open Source Version of Ecomp Portal database called portal +-- based on 1707 Open Source Version and Ecomp Portal database called portal + +-- note to : database admin, set the mysql system variable called lower_case_table_names +-- it can be set 3 different ways: +-- command-line options (cmd-line), +-- options valid in configuration files (option file), or +-- server system variables (system var). + +-- it needs to be set to 1, then table names are stored in lowercase on disk and comparisons are not case sensitive. +-- MySql/MariaDB Version compatibility information +-- bash-4.2$ mysql --version – cluster version +-- mysql Ver 15.1 Distrib 10.1.17-MariaDB, for Linux (x86_64) using readline 5.1 + +-- All versions newer or older than these DO NOT necessarily mean they are compatible. +-- ----------------------------------------------------------------------------------------------------------------- +set foreign_key_checks=1; + +create database portal; + +use portal; + +-- ------------------ create table section +-- +-- name: cr_favorite_reports; type: table +-- +create table cr_favorite_reports ( + user_id integer not null, + rep_id integer not null +); +-- +-- name: cr_filehist_log; type: table +-- +create table cr_filehist_log ( + schedule_id numeric(11,0) not null, + url character varying(4000), + notes character varying(3500), + run_time timestamp +); +-- +-- name: cr_folder; type: table +-- +create table cr_folder ( + folder_id integer not null, + folder_name character varying(50) not null, + descr character varying(500), + create_id integer not null, + create_date timestamp not null, + parent_folder_id integer, + public_yn character varying(1) default 'n' not null +); +-- +-- name: cr_folder_access; type: table +-- +create table cr_folder_access ( + folder_access_id numeric(11,0) not null, + folder_id numeric(11,0) not null, + order_no numeric(11,0) not null, + role_id numeric(11,0), + user_id numeric(11,0), + read_only_yn character varying(1) default 'n' not null +); +-- +-- name: cr_hist_user_map; type: table +-- +create table cr_hist_user_map ( + hist_id int(11) not null, + user_id int(11) not null +); +-- +-- name: cr_lu_file_type; type: table +-- +create table cr_lu_file_type ( + lookup_id numeric(2,0) not null, + lookup_descr character varying(255) not null, + active_yn character(1) default 'y', + error_code numeric(11,0) +); +-- +-- name: cr_raptor_action_img; type: table +-- +create table cr_raptor_action_img ( + image_id character varying(100) not null, + image_loc character varying(400) +); +-- +-- name: cr_raptor_pdf_img; type: table +-- +create table cr_raptor_pdf_img ( + image_id character varying(100) not null, + image_loc character varying(400) +); +-- +-- name: cr_remote_schema_info; type: table +-- +create table cr_remote_schema_info ( + schema_prefix character varying(5) not null, + schema_desc character varying(75) not null, + datasource_type character varying(100) +); +-- +-- name: cr_report; type: table +-- +create table cr_report ( + rep_id numeric(11,0) not null, + title character varying(100) not null, + descr character varying(255), + public_yn character varying(1) default 'n' not null, + report_xml text, + create_id numeric(11,0), + create_date timestamp default now(), + maint_id numeric(11,0), + maint_date timestamp default now(), + menu_id character varying(500), + menu_approved_yn character varying(1) default 'n' not null, + owner_id numeric(11,0), + folder_id integer default 0, + dashboard_type_yn character varying(1) default 'n', + dashboard_yn character varying(1) default 'n' +); +-- +-- name: cr_report_access; type: table +-- +create table cr_report_access ( + rep_id numeric(11,0) not null, + order_no numeric(11,0) not null, + role_id numeric(11,0), + user_id numeric(11,0), + read_only_yn character varying(1) default 'n' not null +); +-- +-- name: cr_report_dwnld_log; type: table +-- +create table cr_report_dwnld_log ( + user_id numeric(11,0) not null, + rep_id integer not null, + file_name character varying(100) not null, + dwnld_start_time timestamp default now() not null, + record_ready_time timestamp default now(), + filter_params character varying(2000) +); +-- +-- name: cr_report_email_sent_log; type: table +-- +create table cr_report_email_sent_log ( + log_id integer not null, + schedule_id numeric(11,0), + gen_key character varying(25) not null, + rep_id numeric(11,0) not null, + user_id numeric(11,0), + sent_date timestamp default now(), + access_flag character varying(1) default 'y' not null, + touch_date timestamp default now() +); +-- +-- name: cr_report_file_history; type: table +-- +create table cr_report_file_history ( + hist_id int(11) not null, + sched_user_id numeric(11,0) not null, + schedule_id numeric(11,0) not null, + user_id numeric(11,0) not null, + rep_id numeric(11,0), + run_date timestamp, + recurrence character varying(50), + file_type_id numeric(2,0), + file_name character varying(80), + file_blob blob, + file_size numeric(11,0), + raptor_url character varying(4000), + error_yn character(1) default 'n', + error_code numeric(11,0), + deleted_yn character(1) default 'n', + deleted_by numeric(38,0) +); +-- +-- name: cr_report_log; type: table +-- +create table cr_report_log ( + rep_id numeric(11,0) not null, + log_time timestamp not null, + user_id numeric(11,0) not null, + action character varying(2000) not null, + action_value character varying(50), + form_fields character varying(4000) +); +-- +-- name: cr_report_schedule; type: table +-- +create table cr_report_schedule ( + schedule_id numeric(11,0) not null, + sched_user_id numeric(11,0) not null, + rep_id numeric(11,0) not null, + enabled_yn character varying(1) not null, + start_date timestamp default now(), + end_date timestamp default now(), + run_date timestamp default now(), + recurrence character varying(50), + conditional_yn character varying(1) not null, + condition_sql character varying(4000), + notify_type integer default 0, + max_row integer default 1000, + initial_formfields character varying(3500), + processed_formfields character varying(3500), + formfields character varying(3500), + condition_large_sql text, + encrypt_yn character(1) default 'n', + attachment_yn character(1) default 'y' +); +-- +-- name: cr_report_schedule_users; type: table +-- +create table cr_report_schedule_users ( + schedule_id numeric(11,0) not null, + rep_id numeric(11,0) not null, + user_id numeric(11,0) not null, + role_id numeric(11,0), + order_no numeric(11,0) not null +); +-- +-- name: cr_report_template_map; type: table +-- +create table cr_report_template_map ( + report_id integer not null, + template_file character varying(200) +); +-- +-- name: cr_schedule_activity_log; type: table +-- +create table cr_schedule_activity_log ( + schedule_id numeric(11,0) not null, + url character varying(4000), + notes character varying(2000), + run_time timestamp +); +-- +-- name: cr_table_join; type: table +-- +create table cr_table_join ( + src_table_name character varying(30) not null, + dest_table_name character varying(30) not null, + join_expr character varying(500) not null +); +-- +-- name: cr_table_role; type: table +-- +create table cr_table_role ( + table_name character varying(30) not null, + role_id numeric(11,0) not null +); +-- +-- name: cr_table_source; type: table +-- +create table cr_table_source ( + table_name character varying(30) not null, + display_name character varying(30) not null, + pk_fields character varying(200), + web_view_action character varying(50), + large_data_source_yn character varying(1) default 'n' not null, + filter_sql character varying(4000), + source_db character varying(50) +); +-- +-- name: fn_lu_timezone; type: table +-- +create table fn_lu_timezone ( + timezone_id int(11) not null, + timezone_name character varying(100) not null, + timezone_value character varying(100) not null +); + +create table fn_user ( + user_id int(11) not null primary key auto_increment, + org_id int(11), + manager_id int(11), + first_name character varying(50), + middle_name character varying(50), + last_name character varying(50), + phone character varying(25), + fax character varying(25), + cellular character varying(25), + email character varying(50), + address_id numeric(11,0), + alert_method_cd character varying(10), + hrid character varying(20), + org_user_id CHARACTER VARYING(20), + org_code character varying(30), + login_id character varying(25), + login_pwd character varying(100), + last_login_date timestamp, + active_yn character varying(1) default 'y' not null, + created_id int(11), + created_date timestamp default now(), + modified_id int(11), + modified_date timestamp default now(), + is_internal_yn character(1) default 'n' not null, + address_line_1 character varying(100), + address_line_2 character varying(100), + city character varying(50), + state_cd character varying(3), + zip_code character varying(11), + country_cd character varying(3), + location_clli character varying(8), + org_manager_userid CHARACTER VARYING(20), + company character varying(100), + department_name character varying(100), + job_title character varying(100), + timezone int(11), + department character varying(25), + business_unit character varying(25), + business_unit_name character varying(100), + cost_center character varying(25), + fin_loc_code character varying(10), + silo_status character varying(10) +); +-- +-- name: fn_role; type: table +-- +create table fn_role ( + role_id int(11) not null primary key auto_increment, + role_name character varying(300) not null, + active_yn character varying(1) default 'y' not null, + priority numeric(4,0), + app_id int(11) default null, + app_role_id int(11) default null + +); +-- +-- name: fn_audit_action; type: table +-- +create table fn_audit_action ( + audit_action_id integer not null, + class_name character varying(500) not null, + method_name character varying(50) not null, + audit_action_cd character varying(20) not null, + audit_action_desc character varying(200), + active_yn character varying(1) +); +-- +-- name: fn_audit_action_log; type: table +-- +create table fn_audit_action_log ( + audit_log_id integer not null primary key auto_increment, + audit_action_cd character varying(200), + action_time timestamp, + user_id numeric(11,0), + class_name character varying(100), + method_name character varying(50), + success_msg character varying(20), + error_msg character varying(500) +); +-- +-- name: fn_lu_activity; type: table +-- +create table fn_lu_activity ( + activity_cd character varying(50) not null primary key, + activity character varying(50) not null +); +-- +-- name: fn_audit_log; type: table +-- +create table fn_audit_log ( + log_id int(11) not null primary key auto_increment, + user_id int(11) not null, + activity_cd character varying(50) not null, + audit_date timestamp default now() not null, + comments character varying(1000), + affected_record_id_bk character varying(500), + affected_record_id character varying(4000), + constraint fk_fn_audit_ref_209_fn_user foreign key (user_id) references fn_user(user_id) +); +-- +-- name: fn_broadcast_message; type: table +-- +create table fn_broadcast_message ( + message_id int(11) not null primary key auto_increment, + message_text character varying(1000) not null, + message_location_id numeric(11,0) not null, + broadcast_start_date timestamp not null default now(), + broadcast_end_date timestamp not null default now(), + active_yn character(1) default 'y' not null, + sort_order numeric(4,0) not null, + broadcast_site_cd character varying(50) +); +-- +-- name: fn_chat_logs; type: table +-- +create table fn_chat_logs ( + chat_log_id integer not null, + chat_room_id integer, + user_id integer, + message character varying(1000), + message_date_time timestamp +); +-- +-- name: fn_chat_room; type: table +-- +create table fn_chat_room ( + chat_room_id integer not null, + name character varying(50) not null, + description character varying(500), + owner_id integer, + created_date timestamp default now(), + updated_date timestamp default now() +); +-- +-- name: fn_chat_users; type: table +-- +create table fn_chat_users ( + chat_room_id integer, + user_id integer, + last_activity_date_time timestamp, + chat_status character varying(20), + id integer not null +); +-- +-- name: fn_datasource; type: table +-- +create table fn_datasource ( + id integer not null primary key auto_increment, + name character varying(50), + driver_name character varying(256), + server character varying(256), + port integer, + user_name character varying(256), + password character varying(256), + url character varying(256), + min_pool_size integer, + max_pool_size integer, + adapter_id integer, + ds_type character varying(20) +); +-- +-- name: fn_function; type: table +-- +create table fn_function ( + function_cd character varying(30) not null primary key, + function_name character varying(50) not null +); +-- +-- name: fn_lu_alert_method; type: table +-- +create table fn_lu_alert_method ( + alert_method_cd character varying(10) not null, + alert_method character varying(50) not null +); +-- +-- name: fn_lu_broadcast_site; type: table +-- +create table fn_lu_broadcast_site ( + broadcast_site_cd character varying(50) not null, + broadcast_site_descr character varying(100) +); +-- +-- name: fn_lu_menu_set; type: table +-- +create table fn_lu_menu_set ( + menu_set_cd character varying(10) not null primary key, + menu_set_name character varying(50) not null +); +-- +-- name: fn_lu_priority; type: table +-- +create table fn_lu_priority ( + priority_id numeric(11,0) not null, + priority character varying(50) not null, + active_yn character(1) not null, + sort_order numeric(5,0) +); +-- +-- name: fn_lu_role_type; type: table +-- +create table fn_lu_role_type ( + role_type_id numeric(11,0) not null, + role_type character varying(50) not null +); +-- +-- name: fn_lu_tab_set; type: table +-- +create table fn_lu_tab_set ( + tab_set_cd character varying(30) not null, + tab_set_name character varying(50) not null +); +-- +-- name: fn_menu; type: table +-- +create table fn_menu ( + menu_id int(11) not null primary key auto_increment, + label character varying(100), + parent_id int(11), + sort_order numeric(4,0), + action character varying(200), + function_cd character varying(30), + active_yn character varying(1) default 'y' not null, + servlet character varying(50), + query_string character varying(200), + external_url character varying(200), + target character varying(25), + menu_set_cd character varying(10) default 'app', + separator_yn character(1) default 'n', + image_src character varying(100), + constraint fk_fn_menu_ref_196_fn_menu foreign key (parent_id) references fn_menu(menu_id), + constraint fk_fn_menu_menu_set_cd foreign key (menu_set_cd) references fn_lu_menu_set(menu_set_cd), + constraint fk_fn_menu_ref_223_fn_funct foreign key (function_cd) references fn_function(function_cd) +); +-- +-- name: fn_org; type: table +-- +create table fn_org ( + org_id int(11) not null, + org_name character varying(50) not null, + access_cd character varying(10) +); +-- +-- name: fn_restricted_url; type: table +-- +create table fn_restricted_url ( + restricted_url character varying(250) not null, + function_cd character varying(30) not null +); +-- +-- name: fn_role_composite; type: table +-- +create table fn_role_composite ( + parent_role_id int(11) not null, + child_role_id int(11) not null, + constraint fk_fn_role_composite_child foreign key (child_role_id) references fn_role(role_id), + constraint fk_fn_role_composite_parent foreign key (parent_role_id) references fn_role(role_id) +); +-- +-- name: fn_role_function; type: table +-- +create table fn_role_function ( + role_id int(11) not null, + function_cd character varying(30) not null, + constraint fk_fn_role__ref_198_fn_role foreign key (role_id) references fn_role(role_id) +); +-- +-- name: fn_tab; type: table +-- +create table fn_tab ( + tab_cd character varying(30) not null, + tab_name character varying(50) not null, + tab_descr character varying(100), + action character varying(100) not null, + function_cd character varying(30) not null, + active_yn character(1) not null, + sort_order numeric(11,0) not null, + parent_tab_cd character varying(30), + tab_set_cd character varying(30) +); +-- +-- name: fn_tab_selected; type: table +-- +create table fn_tab_selected ( + selected_tab_cd character varying(30) not null, + tab_uri character varying(40) not null +); +-- +-- name: fn_user_pseudo_role; type: table +-- +create table fn_user_pseudo_role ( + pseudo_role_id int(11) not null, + user_id int(11) not null +); +-- +-- name: fn_user_role; type: table +-- +create table fn_user_role ( + user_id int(10) not null, + role_id int(10) not null, + priority numeric(4,0), + app_id int(11) default 2, + constraint fk_fn_user__ref_172_fn_user foreign key (user_id) references fn_user(user_id), + constraint fk_fn_user__ref_175_fn_role foreign key (role_id) references fn_role(role_id) +); +-- +-- name: schema_info; type: table +-- +create table schema_info ( + SCHEMA_ID CHARACTER VARYING(25) not null, + SCHEMA_DESC CHARACTER VARYING(75) not null, + DATASOURCE_TYPE CHARACTER VARYING(100), + CONNECTION_URL VARCHAR(200) not null, + USER_NAME VARCHAR(45) not null, + PASSWORD VARCHAR(45) null default null, + DRIVER_CLASS VARCHAR(100) not null, + MIN_POOL_SIZE INT not null, + MAX_POOL_SIZE INT not null, + IDLE_CONNECTION_TEST_PERIOD INT not null + +); +-- ---------------------------------------------------------- +-- name: fn_app; type: table +-- ---------------------------------------------------------- +create table fn_app ( + app_id int(11) primary key not null auto_increment, + app_name varchar(100) not null default '?', + app_image_url varchar(256) default null, + app_description varchar(512) default null, + app_notes varchar(4096) default null, + app_url varchar(256) default null, + app_alternate_url varchar(256) default null, + app_rest_endpoint varchar(2000) default null, + ml_app_name varchar(50) not null default '?', + ml_app_admin_id varchar(7) not null default '?', + mots_id int(11) default null, + app_password varchar(256) not null default '?', + open char(1) default 'N', + enabled char(1) default 'Y', + thumbnail mediumblob null default null, + app_username varchar(50), + ueb_key varchar(256) default null, + ueb_secret varchar(256) default null, + ueb_topic_name varchar(256) default null, + app_type int(11) not null default 1, + auth_central char(1) not null default 'N', + auth_namespace varchar(100) null default null +); + +-- ------------------ functional menu tables ------------------- +-- +-- table structure for table fn_menu_functional +-- +create table fn_menu_functional ( + menu_id int(11) not null auto_increment, + column_num int(2) not null, + text varchar(100) not null, + parent_menu_id int(11) default null, + url varchar(128) not null default '', + active_yn varchar(1) not null default 'y', + image_src varchar(100) default null, + primary key (menu_id), + key fk_fn_menu_func_parent_menu_id_idx (parent_menu_id), + constraint fk_fn_menu_func_parent_menu_id foreign key (parent_menu_id) references fn_menu_functional (menu_id) on delete no action on update no action +); +-- +-- table structure for table fn_menu_functional_ancestors +-- + +create table fn_menu_functional_ancestors ( + id int(11) not null auto_increment, + menu_id int(11) not null, + ancestor_menu_id int(11) not null, + depth int(2) not null, + primary key (id), + key fk_fn_menu_func_anc_menu_id_idx (menu_id), + key fk_fn_menu_func_anc_anc_menu_id_idx (ancestor_menu_id), + constraint fk_fn_menu_func_anc_anc_menu_id foreign key (ancestor_menu_id) references fn_menu_functional (menu_id) on delete no action on update no action, + constraint fk_fn_menu_func_anc_menu_id foreign key (menu_id) references fn_menu_functional (menu_id) on delete no action on update no action +); +-- +-- table structure for table fn_menu_functional_roles +-- +create table fn_menu_functional_roles ( + id int(11) not null auto_increment, + menu_id int(11) not null, + app_id int(11) not null, + role_id int(10) not null, + primary key (id), + key fk_fn_menu_func_roles_menu_id_idx (menu_id), + key fk_fn_menu_func_roles_app_id_idx (app_id), + key fk_fn_menu_func_roles_role_id_idx (role_id), + constraint fk_fn_menu_func_roles_app_id foreign key (app_id) references fn_app (app_id) on delete no action on update no action, + constraint fk_fn_menu_func_roles_menu_id foreign key (menu_id) references fn_menu_functional (menu_id) on delete no action on update no action, + constraint fk_fn_menu_func_roles_role_id foreign key (role_id) references fn_role (role_id) on delete no action on update no action +); +-- ---------------------------------------------------------- +-- NAME: FN_WORKFLOW; TYPE: TABLE +-- ---------------------------------------------------------- +create table fn_workflow ( + id mediumint(9) not null auto_increment, + name varchar(20) not null, + description varchar(500) default null, + run_link varchar(300) default null, + suspend_link varchar(300) default null, + modified_link varchar(300) default null, + active_yn varchar(300) default null, + created varchar(300) default null, + created_by int(11) default null, + modified varchar(300) default null, + modified_by int(11) default null, + workflow_key varchar(50) default null, + primary key (id), + UNIQUE KEY name (name) +); + + +-- ---------------------------------------------------------- +-- NAME: FN_SCHEDULE_WORKFLOWS; TYPE: TABLE +-- ---------------------------------------------------------- +create table fn_schedule_workflows ( + id_schedule_workflows bigint(25) primary key not null auto_increment, + workflow_server_url varchar(45) default null, + workflow_key varchar(45) not null, + workflow_arguments varchar(45) default null, + startDateTimeCron varchar(45) default null, + endDateTime TIMESTAMP default NOW(), + start_date_time TIMESTAMP default NOW(), + recurrence varchar(45) default null + ); + + +-- ---------------------------------------------------------- +-- NAME: FN_SHARED_CONTEXT; TYPE: TABLE +-- ---------------------------------------------------------- +create table fn_shared_context ( + id int(11) not null auto_increment, + create_time timestamp not null, + context_id character varying(64) not null, + ckey character varying(128) not null, + cvalue character varying(1024), + primary key (id), + UNIQUE KEY session_key (context_id, ckey) ); + + +-- ---------------------------------------------------------- +-- NAME: FN_QZ_JOB_DETAILS; TYPE: TABLE +-- ---------------------------------------------------------- +create table fn_qz_job_details ( +SCHED_NAME VARCHAR(120) not null, +JOB_NAME VARCHAR(200) not null, +JOB_GROUP VARCHAR(200) not null, +DESCRIPTION VARCHAR(250) null, +JOB_CLASS_NAME VARCHAR(250) not null, +IS_DURABLE VARCHAR(1) not null, +IS_NONCONCURRENT VARCHAR(1) not null, +IS_UPDATE_DATA VARCHAR(1) not null, +REQUESTS_RECOVERY VARCHAR(1) not null, +JOB_DATA BLOB null, +primary key (SCHED_NAME,JOB_NAME,JOB_GROUP) +); + +-- ---------------------------------------------------------- +-- NAME: FN_QZ_TRIGGERS; TYPE: TABLE +-- ---------------------------------------------------------- +create table fn_qz_triggers ( +SCHED_NAME VARCHAR(120) not null, +TRIGGER_NAME VARCHAR(200) not null, +TRIGGER_GROUP VARCHAR(200) not null, +JOB_NAME VARCHAR(200) not null, +JOB_GROUP VARCHAR(200) not null, +DESCRIPTION VARCHAR(250) null, +NEXT_FIRE_TIME BIGINT(13) null, +PREV_FIRE_TIME BIGINT(13) null, +PRIORITY INTEGER null, +TRIGGER_STATE VARCHAR(16) not null, +TRIGGER_TYPE VARCHAR(8) not null, +START_TIME BIGINT(13) not null, +END_TIME BIGINT(13) null, +CALENDAR_NAME VARCHAR(200) null, +MISFIRE_INSTR SMALLINT(2) null, +JOB_DATA BLOB null, +primary key (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), +FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP) +REFERENCES FN_QZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP) +); + +-- ---------------------------------------------------------- +-- NAME: FN_QZ_SIMPLE_TRIGGERS; TYPE: TABLE +-- ---------------------------------------------------------- +create table fn_qz_simple_triggers ( +SCHED_NAME VARCHAR(120) not null, +TRIGGER_NAME VARCHAR(200) not null, +TRIGGER_GROUP VARCHAR(200) not null, +REPEAT_COUNT BIGINT(7) not null, +REPEAT_INTERVAL BIGINT(12) not null, +TIMES_TRIGGERED BIGINT(10) not null, +primary key (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), +FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +REFERENCES FN_QZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +); + +-- ---------------------------------------------------------- +-- NAME: FN_QZ_CRON_TRIGGERS; TYPE: TABLE +-- ---------------------------------------------------------- +create table fn_qz_cron_triggers ( +SCHED_NAME VARCHAR(120) not null, +TRIGGER_NAME VARCHAR(200) not null, +TRIGGER_GROUP VARCHAR(200) not null, +CRON_EXPRESSION VARCHAR(120) not null, +TIME_ZONE_ID VARCHAR(80), +primary key (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), +FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +REFERENCES FN_QZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +); + +-- ---------------------------------------------------------- +-- NAME: FN_QZ_SIMPROP_TRIGGERS; TYPE: TABLE +-- ---------------------------------------------------------- +create table fn_qz_simprop_triggers ( + SCHED_NAME VARCHAR(120) not null, + TRIGGER_NAME VARCHAR(200) not null, + TRIGGER_GROUP VARCHAR(200) not null, + STR_PROP_1 VARCHAR(512) null, + STR_PROP_2 VARCHAR(512) null, + STR_PROP_3 VARCHAR(512) null, + INT_PROP_1 INT null, + INT_PROP_2 INT null, + LONG_PROP_1 BIGINT null, + LONG_PROP_2 BIGINT null, + DEC_PROP_1 NUMERIC(13,4) null, + DEC_PROP_2 NUMERIC(13,4) null, + BOOL_PROP_1 VARCHAR(1) null, + BOOL_PROP_2 VARCHAR(1) null, + primary key (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), + FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) + REFERENCES FN_QZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +); + +-- ---------------------------------------------------------- +-- NAME: FN_QZ_BLOB_TRIGGERS; TYPE: TABLE +-- ---------------------------------------------------------- +create table fn_qz_blob_triggers ( +SCHED_NAME VARCHAR(120) not null, +TRIGGER_NAME VARCHAR(200) not null, +TRIGGER_GROUP VARCHAR(200) not null, +BLOB_DATA BLOB null, +primary key (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), +INDEX (SCHED_NAME,TRIGGER_NAME, TRIGGER_GROUP), +FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +REFERENCES FN_QZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) +); + +-- ---------------------------------------------------------- +-- NAME: FN_QZ_CALENDARS; TYPE: TABLE +-- ---------------------------------------------------------- +create table fn_qz_calendars ( +SCHED_NAME VARCHAR(120) not null, +CALENDAR_NAME VARCHAR(200) not null, +CALENDAR BLOB not null, +primary key (SCHED_NAME,CALENDAR_NAME) +); + + +-- ---------------------------------------------------------- +-- NAME: FN_QZ_PAUSED_TRIGGER_GRPS; TYPE: TABLE +-- ---------------------------------------------------------- +create table fn_qz_paused_trigger_grps ( +SCHED_NAME VARCHAR(120) not null, +TRIGGER_GROUP VARCHAR(200) not null, +primary key (SCHED_NAME,TRIGGER_GROUP) +); + +-- ---------------------------------------------------------- +-- NAME: FN_QZ_FIRED_TRIGGERS; TYPE: TABLE +-- ---------------------------------------------------------- +create table fn_qz_fired_triggers ( +SCHED_NAME VARCHAR(120) not null, +ENTRY_ID VARCHAR(95) not null, +TRIGGER_NAME VARCHAR(200) not null, +TRIGGER_GROUP VARCHAR(200) not null, +INSTANCE_NAME VARCHAR(200) not null, +FIRED_TIME BIGINT(13) not null, +SCHED_TIME BIGINT(13) not null, +PRIORITY INTEGER not null, +STATE VARCHAR(16) not null, +JOB_NAME VARCHAR(200) null, +JOB_GROUP VARCHAR(200) null, +IS_NONCONCURRENT VARCHAR(1) null, +REQUESTS_RECOVERY VARCHAR(1) null, +primary key (SCHED_NAME,ENTRY_ID) +); + +-- ---------------------------------------------------------- +-- NAME: FN_QZ_SCHEDULER_STATE; TYPE: TABLE +-- ---------------------------------------------------------- +create table fn_qz_scheduler_state ( +SCHED_NAME VARCHAR(120) not null, +INSTANCE_NAME VARCHAR(200) not null, +LAST_CHECKIN_TIME BIGINT(13) not null, +CHECKIN_INTERVAL BIGINT(13) not null, +primary key (SCHED_NAME,INSTANCE_NAME) +); + +-- ---------------------------------------------------------- +-- NAME: FN_QZ_LOCKS; TYPE: TABLE +-- ---------------------------------------------------------- +create table fn_qz_locks ( +SCHED_NAME VARCHAR(120) not null, +LOCK_NAME VARCHAR(40) not null, +primary key (SCHED_NAME,LOCK_NAME) +); + +-- ---------------------------------------------------------- +-- NAME: FN_MENU_FAVORITES; TYPE: TABLE +-- ---------------------------------------------------------- + +create table fn_menu_favorites ( + user_id int(11) not null, + menu_id int(11) not null, + primary key (user_id,menu_id) +); + +-- FACELIFT - Table for Events, News and Resources + +create table fn_common_widget_data( + id int auto_increment, + category varchar(32), + href varchar(512), + title varchar(256), + content varchar(4096), + event_date varchar(10), -- YYYY-MM-DD + sort_order int, + primary key (id) +); + +create table fn_app_contact_us ( + app_id int(11) not null, + contact_name varchar(128) default null, + contact_email varchar(128) default null, + url varchar(256) default null, + active_yn varchar(2) default null, + description varchar(1024) default null, + primary key (app_id), + constraint fk_fn_a_con__ref_202_fn_app foreign key (app_id) references fn_app (app_id) +); + +-- new 1610.2 +create table fn_pers_user_app_sel ( + id int(11) not null auto_increment, + user_id int(11) not null, + app_id int(11) not null, + status_cd char(1) not null, + primary key(id), + constraint fk_1_fn_pers_user_app_sel_fn_user foreign key (user_id) references fn_user (user_id), + constraint fk_2_fn_pers_user_app_sel_fn_app foreign key (app_id) references fn_app (app_id) +); + +-- end new 1610.2 + +-- new 1702 tables/views + -- 1702 Additions for User Notifications + -- ---------------------------------------------------------- + -- NAME: ep_notification; TYPE: TABLE + -- ---------------------------------------------------------- + create table ep_notification ( + notification_ID int(11) primary key not null auto_increment, + is_for_online_users char(1) default 'N', + is_for_all_roles char(1) default 'N', + active_YN char(1) default 'Y', + msg_header varchar(100), + msg_description varchar(2000), + msg_source varchar(50) default 'EP', + start_time timestamp default now(), + end_time timestamp null, + priority int(11), + creator_ID int(11) null default null, + created_date timestamp null default null, + notification_hyperlink varchar(512) null default null -- new column for 1710 + ); + + -- ---------------------------------------------------------- + -- NAME: ep_role_notification; TYPE: TABLE + -- ---------------------------------------------------------- + create table ep_role_notification ( + ID int(11) primary key not null auto_increment, + notification_ID int(11), + role_ID int(11), + recv_user_id int(11) null, + constraint fk_ep_role_notif_fn_role foreign key (role_ID) references fn_role(role_id), + constraint fk_ep_role_notif_fn_notif foreign key (notification_ID) references ep_notification(notification_ID) + ); + + -- ---------------------------------------------------------- + -- NAME: ep_user_notification; TYPE: TABLE + -- ---------------------------------------------------------- + create table ep_user_notification ( + ID int(11) primary key not null auto_increment, + User_ID int(11), + notification_ID int(11), + is_viewed char(1) default 'N', + updated_time timestamp default now(), + constraint fk_ep_urole_notif_fn_user foreign key (User_ID) references fn_user(user_id), + constraint fk_ep_urole_notif_fn_notif foreign key (notification_ID) references ep_notification(notification_ID) + ); + + -- ---------------------------------------------------------- + -- NAME: ep_pers_user_app_sort; TYPE: Table + -- ---------------------------------------------------------- + + CREATE TABLE ep_pers_user_app_sort ( + id int(11) not null primary key auto_increment, + user_id int(11) not null, + sort_pref char(1) not null, + unique key uk_1_ep_pers_user_app_sort (user_id), + constraint fk_ep_pers_user_app_sort_fn_user foreign key (user_id) references fn_user(user_id) + ); + -- ---------------------------------------------------------- + -- NAME: ep_pers_user_app_man_sort; TYPE: Table + -- ---------------------------------------------------------- + + CREATE TABLE ep_pers_user_app_man_sort ( + id int(11) not null primary key auto_increment, + user_id int(11) not null, + app_id int(11) not null, + sort_order int(11) not null, + unique key uk_1_ep_pers_user_app_man_sort (user_id, app_id), + constraint fk_ep_pers_app_man_sort_fn_user foreign key (user_id) references fn_user(user_id), + constraint fk_ep_pers_app_man_sort_fn_app foreign key (app_id) references fn_app(app_id) + ); + + -- ---------------------------------------------------------- + -- NAME: ep_widget_catalog; TYPE: Table + -- ---------------------------------------------------------- + + CREATE TABLE ep_widget_catalog ( + widget_id int(11) not null auto_increment, + wdg_name varchar(100) not null default '?', + service_id int(11) default null, + wdg_desc varchar(200) default null, + wdg_file_loc varchar(256) not null default '?', + all_user_flag char(1) not null default 'N', + primary key (widget_id) + ); + + -- ---------------------------------------------------------- + -- NAME: ep_widget_catalog_role; TYPE: Table + -- ---------------------------------------------------------- + create table ep_widget_catalog_role ( + widget_id int(10) not null, + app_id int(11) default '1', + role_id int(10) not null, + key fk_ep_widget_catalog_role_fn_widget (widget_id), + key fk_ep_widget_catalog_role_ref_fn_role (role_id), + key fk_ep_widget_catalog_role_app_id (app_id), + constraint fk_ep_widget_catalog_role_fn_widget foreign key (widget_id) references ep_widget_catalog (widget_id), + constraint fk_ep_widget_catalog_role_ref_fn_role foreign key (role_id) references fn_role (role_id), + constraint fk_ep_widget_catalog_role_app_id foreign key (app_id) references fn_app (app_id) + ); + + -- ---------------------------------------------------------- + -- NAME: ep_pers_user_widget_placement; TYPE: Table + -- ---------------------------------------------------------- + CREATE TABLE ep_pers_user_widget_placement ( + id int(11) not null primary key auto_increment, + user_id int(11) not null, + widget_id int(11) not null, + x int(11) not null, + y int(11), + height int(11), + width int(11), + unique key uk_1_ep_pers_user_widg_place (user_id, widget_id), + constraint fk_ep_pers_user_widg_place_fn_user foreign key (user_id) references fn_user(user_id), + constraint fk_ep_pers_user_widg_place_ep_widg foreign key (widget_id) references ep_widget_catalog(widget_id) + ); + + -- ---------------------------------------------------------- + -- NAME: ep_pers_user_widget_sel; TYPE: TABLE + -- ---------------------------------------------------------- + CREATE TABLE ep_pers_user_widget_sel ( + id int(11) not null primary key auto_increment, + user_id int(11) not null, + widget_id int(11) not null, + status_cd char(1) not null, + unique key uk_1_ep_pers_user_widg_sel_user_widg (user_id, widget_id), + CONSTRAINT fk_1_ep_pers_user_wid_sel_fn_user FOREIGN KEY (user_id) REFERENCES fn_user (user_id), + CONSTRAINT fk_2_ep_pers_user_wid_sel_ep_wid FOREIGN KEY (widget_id) REFERENCES ep_widget_catalog (widget_id) + ); + + -- ---------------------------------------------------------- + -- NAME: ep_widget_catalog_files; TYPE: TABLE + -- ---------------------------------------------------------- + CREATE TABLE ep_widget_catalog_files ( + file_id int(11) not null primary key auto_increment, + widget_id int(11), + widget_name VARCHAR(100) NOT NULL, + framework_js LONGBLOB NULL, + controller_js LONGBLOB NULL, + markup_html LONGBLOB NULL, + widget_css LONGBLOB NULL + ); + + -- ---------------------------------------------------------- + -- NAME: fn_role_v; TYPE: VIEW + -- All roles without an APP_ID are Portal only. + -- ---------------------------------------------------------- + create view fn_role_v as + select fn_role.role_id as role_id, + fn_role.role_name as role_name, + fn_role.active_yn as active_yn, + fn_role.priority as priority, + fn_role.app_id as app_id, + fn_role.app_role_id as app_role_id + from fn_role where isnull(fn_role.app_id); + +-- end new 1702 tables/views + +-- new 1707 tables/views + + -- ---------------------------------------------------------- + -- NAME: ep_user_roles_request; TYPE: TABLE + -- ---------------------------------------------------------- + +create table ep_user_roles_request ( + req_id int(11) not null primary key auto_increment, + user_id int(11) not null, + app_id int(11) not null, + created_date timestamp default now(), + updated_date timestamp default now(), + request_status character varying(50) not null, + constraint fk_user_roles_req_fn_user foreign key (user_id) references fn_user(user_id), + constraint fk_user_roles_req_fn_app foreign key (app_id) references fn_app(app_id) + ); + + + -- ---------------------------------------------------------- + -- NAME: ep_user_roles_request_det; TYPE: TABLE + -- ---------------------------------------------------------- +create table ep_user_roles_request_det ( + id int(11) not null primary key auto_increment, + req_id int(11) default null, + requested_role_id int(10) not null, + request_type character varying(10) not null, + constraint fk_user_roles_req_fn_req_id foreign key (req_id) references ep_user_roles_request(req_id), + constraint fk_user_roles_req_fn_role_id foreign key (requested_role_id) references fn_role(role_id) + ); + + -- ---------------------------------------------------------- + -- NAME: ep_microservice; TYPE: TABLE + -- ---------------------------------------------------------- + +CREATE TABLE ep_microservice ( + id INT(11) NOT NULL AUTO_INCREMENT, + name VARCHAR(50) NULL DEFAULT NULL, + description VARCHAR(50) NULL DEFAULT NULL, + appId INT(11) NULL DEFAULT NULL, + endpoint_url VARCHAR(200) NULL DEFAULT NULL, + security_type VARCHAR(50) NULL DEFAULT NULL, + username VARCHAR(50) NULL DEFAULT NULL, + password VARCHAR(50) NULL DEFAULT NULL, + active CHAR(1) NOT NULL DEFAULT 'Y', + PRIMARY KEY (id), + CONSTRAINT FK_FN_APP_EP_MICROSERVICE FOREIGN KEY (appId) REFERENCES fn_app (app_id) +); + + -- ---------------------------------------------------------- + -- NAME: ep_microservice_parameter; TYPE: TABLE + -- ---------------------------------------------------------- + +CREATE TABLE ep_microservice_parameter ( + id INT(11) NOT NULL AUTO_INCREMENT, + service_id INT(11) NULL DEFAULT NULL, + para_key VARCHAR(50) NULL DEFAULT NULL, + para_value VARCHAR(50) NULL DEFAULT NULL, + PRIMARY KEY (id), + CONSTRAINT FK_EP_MICROSERIVCE_EP_MICROSERVICE_PARAMETER FOREIGN KEY (service_id) REFERENCES ep_microservice (id) +); + + + -- ---------------------------------------------------------- + -- NAME: ep_widget_preview_files; TYPE: TABLE + -- ---------------------------------------------------------- + +CREATE TABLE ep_widget_preview_files ( + preview_id INT(11) NOT NULL AUTO_INCREMENT, + html_file LONGBLOB NULL, + css_file LONGBLOB NULL, + javascript_file LONGBLOB NULL, + framework_file LONGBLOB NULL, + PRIMARY KEY (preview_id) +); + + -- ---------------------------------------------------------- + -- NAME: ep_widget_microservice; TYPE: TABLE + -- ---------------------------------------------------------- + +CREATE TABLE ep_widget_microservice ( + id INT(11) NOT NULL AUTO_INCREMENT, + widget_id INT(11) NOT NULL DEFAULT '0', + microservice_id INT(11) NOT NULL DEFAULT '0', + PRIMARY KEY (id), + CONSTRAINT FK_EP_WIDGET_MICROSERVICE_EP_MICROSERVICE FOREIGN KEY (microservice_id) REFERENCES ep_microservice (id), + CONSTRAINT FK_EP_WIDGET_MICROSERVICE_EP_WIDGET FOREIGN KEY (widget_id) REFERENCES ep_widget_catalog (widget_id) +); + + -- ---------------------------------------------------------- + -- NAME: ep_basic_auth_account; TYPE: TABLE + -- ---------------------------------------------------------- + +create table ep_basic_auth_account ( + id INT(11) NOT NULL AUTO_INCREMENT, + ext_app_name VARCHAR(50) NOT NULL, + username VARCHAR(50) NOT NULL, + password VARCHAR(50) NOT NULL, + active_yn char(1) NOT NULL default 'Y', + PRIMARY KEY (id) +); + + -- ---------------------------------------------------------- + -- NAME: ep_widget_catalog_parameter; TYPE: TABLE + -- ---------------------------------------------------------- + +create table ep_widget_catalog_parameter ( + id INT(11) NOT NULL AUTO_INCREMENT, + widget_id INT(11) NOT NULL, + user_id INT(11) NOT NULL, + param_id INT(11) NOT NULL, + user_value VARCHAR(50) NULL, + PRIMARY KEY (id), + CONSTRAINT EP_FN_USER_WIDGET_PARAMETER_FK FOREIGN KEY (user_id) REFERENCES fn_user (user_id), + CONSTRAINT EP_WIDGET_CATALOG_WIDGET_PARAMETER_FK FOREIGN KEY (widget_id) REFERENCES ep_widget_catalog (widget_id), + CONSTRAINT EP_PARAMETER_ID_WIDGET_PARAMETER_FK FOREIGN KEY (param_id) REFERENCES ep_microservice_parameter (id) +); + + -- ---------------------------------------------------------- + -- NAME: ep_web_analytics_source; TYPE: TABLE + -- ---------------------------------------------------------- + +create table ep_web_analytics_source( + resource_id int(11) NOT NULL auto_increment, + app_id int(11) NOT NULL, + report_source varchar(500), + report_name varchar(500), + PRIMARY KEY (resource_id), + FOREIGN KEY (app_id) REFERENCES fn_app(app_id) +); + + -- Machine Learning Tables + -- ---------------------------------------------------------- + -- NAME: ep_ml_model; TYPE: TABLE + -- ---------------------------------------------------------- + +create table ep_ml_model( + time_stamp timestamp default now(), + group_id int(11) NOT NULL, + model longblob, + PRIMARY KEY (time_stamp,group_id) +); + -- ---------------------------------------------------------- + -- NAME: ep_ml_rec; TYPE: TABLE + -- ---------------------------------------------------------- + +create table ep_ml_rec( + time_stamp timestamp default now(), + org_user_id varchar(20) NOT NULL, + rec varchar(4000) DEFAULT NULL, + PRIMARY KEY (time_stamp,org_user_id) +); + + -- ---------------------------------------------------------- + -- NAME: ep_ml_user; TYPE: TABLE + -- ---------------------------------------------------------- + +create table ep_ml_user( + time_stamp timestamp default now(), + org_user_id varchar(20) NOT NULL, + group_id int(11) NOT NULL, + PRIMARY KEY (time_stamp,org_user_id) +); + + -- ---------------------------------------------------------- + -- NAME: ep_endpoints; TYPE: TABLE + -- ---------------------------------------------------------- + +create table ep_endpoints ( + id INT(11) NOT NULL AUTO_INCREMENT, + url VARCHAR(50) NOT NULL, + PRIMARY KEY (id) +); + + -- ---------------------------------------------------------- + -- NAME: ep_endpoints_basic_auth_account; TYPE: TABLE + -- ---------------------------------------------------------- + +create table ep_endpoints_basic_auth_account ( + id INT(11) NOT NULL AUTO_INCREMENT, + ep_id INT(11) DEFAULT NULL, + account_id INT(11) DEFAULT NULL, + PRIMARY KEY (id), + CONSTRAINT ep_endpoints_basic_auth_account_account_id_fk FOREIGN KEY (account_id) REFERENCES ep_basic_auth_account (id), + CONSTRAINT ep_endpoints_basic_auth_account_ep_id_fk FOREIGN KEY (ep_id) REFERENCES ep_endpoints (id) + +); + +-- end new 1707 tables/views + +-- new 1710 tables/views + + -- ---------------------------------------------------------- + -- NAME: ep_app_function; TYPE: TABLE + -- ---------------------------------------------------------- + +CREATE TABLE ep_app_function ( +app_id INT(11) NOT NULL, +function_cd VARCHAR(50) NOT NULL, +function_name VARCHAR(50) NOT NULL, +PRIMARY KEY (function_cd, app_id), +INDEX fk_ep_app_function_app_id (app_id), +CONSTRAINT fk_ep_app_function_app_id FOREIGN KEY (app_id) REFERENCES fn_app (app_id) +); + + -- ---------------------------------------------------------- + -- NAME: ep_app_role_function; TYPE: TABLE + -- ---------------------------------------------------------- + +CREATE TABLE `ep_app_role_function` ( +`id` INT(11) NOT NULL AUTO_INCREMENT, +`app_id` INT(11) NOT NULL, +`role_id` INT(11) NOT NULL, +`function_cd` VARCHAR(50) NOT NULL, +PRIMARY KEY (`id`), +UNIQUE INDEX `UNIQUE KEY` (`app_id`, `role_id`, `function_cd`), +INDEX `fk_ep_app_role_function_role_id` (`role_id`), +INDEX `fk_ep_app_role_function_app_id` (`app_id`), +INDEX `fk_ep_app_role_function_ep_app_func` (`function_cd`,`app_id`), +CONSTRAINT `fk_ep_app_role_function_app_id` FOREIGN KEY (`app_id`) REFERENCES `fn_app` (`app_id`), +CONSTRAINT `fk_ep_app_role_function_ep_app_func` FOREIGN KEY (`app_id`, `function_cd`) REFERENCES `ep_app_function` (`app_id`, `function_cd`), +CONSTRAINT `fk_ep_app_role_function_role_id` FOREIGN KEY (`role_id`) REFERENCES `fn_role` (`role_id`) +); + +-- end new 1710 tables/views + +-- ---------------------------------------------------------- +-- NAME: QUARTZ TYPE: INDEXES +-- ---------------------------------------------------------- +create index idx_fn_qz_j_req_recovery on fn_qz_job_details(sched_name,requests_recovery); +create index idx_fn_qz_j_grp on fn_qz_job_details(sched_name,job_group); +create index idx_fn_qz_t_j on fn_qz_triggers(sched_name,job_name,job_group); +create index idx_fn_qz_t_jg on fn_qz_triggers(sched_name,job_group); +create index idx_fn_qz_t_c on fn_qz_triggers(sched_name,calendar_name); +create index idx_fn_qz_t_g on fn_qz_triggers(sched_name,trigger_group); +create index idx_fn_qz_t_state on fn_qz_triggers(sched_name,trigger_state); +create index idx_fn_qz_t_n_state on fn_qz_triggers(sched_name,trigger_name,trigger_group,trigger_state); +create index idx_fn_qz_t_n_g_state on fn_qz_triggers(sched_name,trigger_group,trigger_state); +create index idx_fn_qz_t_next_fire_time on fn_qz_triggers(sched_name,next_fire_time); +create index idx_fn_qz_t_nft_st on fn_qz_triggers(sched_name,trigger_state,next_fire_time); +create index idx_fn_qz_t_nft_misfire on fn_qz_triggers(sched_name,misfire_instr,next_fire_time); +create index idx_fn_qz_t_nft_st_misfire on fn_qz_triggers(sched_name,misfire_instr,next_fire_time,trigger_state); +create index idx_fn_qz_t_nft_st_misfire_grp on fn_qz_triggers(sched_name,misfire_instr,next_fire_time,trigger_group,trigger_state); +create index idx_fn_qz_ft_trig_inst_name on fn_qz_fired_triggers(sched_name,instance_name); +create index idx_fn_qz_ft_inst_job_req_rcvry on fn_qz_fired_triggers(sched_name,instance_name,requests_recovery); +create index idx_fn_qz_ft_j_g on fn_qz_fired_triggers(sched_name,job_name,job_group); +create index idx_fn_qz_ft_jg on fn_qz_fired_triggers(sched_name,job_group); +create index idx_fn_qz_ft_t_g on fn_qz_fired_triggers(sched_name,trigger_name,trigger_group); +create index idx_fn_qz_ft_tg on fn_qz_fired_triggers(sched_name,trigger_group); + + +-- ------------------ create view section +-- +-- name: v_url_access; type: view +-- +create view v_url_access as + select distinct m.action as url, + m.function_cd + from fn_menu m + where (m.action is not null) +union + select distinct t.action as url, + t.function_cd + from fn_tab t + where (t.action is not null) +union + select r.restricted_url as url, + r.function_cd + from fn_restricted_url r; + +-- ------------------ alter table add constraint primary key section +-- +-- name: cr_favorite_reports_user_idrep_id; type: constraint +-- +alter table cr_favorite_reports + add constraint cr_favorite_reports_user_idrep_id primary key (user_id, rep_id); +-- +-- name: cr_folder_folder_id; type: constraint +-- +alter table cr_folder + add constraint cr_folder_folder_id primary key (folder_id); +-- +-- name: cr_folder_access_folder_access_id; type: constraint +-- +alter table cr_folder_access + add constraint cr_folder_access_folder_access_id primary key (folder_access_id); +-- +-- name: cr_hist_user_map_hist_iduser_id; type: constraint +-- +alter table cr_hist_user_map + add constraint cr_hist_user_map_hist_iduser_id primary key (hist_id, user_id); +-- +-- name: cr_lu_file_type_lookup_id; type: constraint +-- +alter table cr_lu_file_type + add constraint cr_lu_file_type_lookup_id primary key (lookup_id); +-- +-- name: cr_raptor_action_img_image_id; type: constraint +-- +alter table cr_raptor_action_img + add constraint cr_raptor_action_img_image_id primary key (image_id); +-- +-- name: cr_raptor_pdf_img_image_id; type: constraint +-- +alter table cr_raptor_pdf_img + add constraint cr_raptor_pdf_img_image_id primary key (image_id); +-- +-- name: cr_remote_schema_info_schema_prefix; type: constraint +-- +alter table cr_remote_schema_info + add constraint cr_remote_schema_info_schema_prefix primary key (schema_prefix); +-- +-- name: cr_report_rep_id; type: constraint +-- +alter table cr_report + add constraint cr_report_rep_id primary key (rep_id); +-- +-- name: cr_report_access_rep_idorder_no; type: constraint +-- +alter table cr_report_access + add constraint cr_report_access_rep_idorder_no primary key (rep_id, order_no); +-- +-- name: cr_report_email_sent_log_log_id; type: constraint +-- +alter table cr_report_email_sent_log + add constraint cr_report_email_sent_log_log_id primary key (log_id); +-- +-- name: cr_report_file_history_hist_id; type: constraint +-- +alter table cr_report_file_history + add constraint cr_report_file_history_hist_id primary key (hist_id); +-- +-- name: cr_report_schedule_schedule_id; type: constraint +-- +alter table cr_report_schedule + add constraint cr_report_schedule_schedule_id primary key (schedule_id); +-- +-- name: cr_report_schedule_users_schedule_idrep_iduser_idorder_no; type: constraint +-- +alter table cr_report_schedule_users + add constraint cr_report_schedule_users_schedule_idrep_iduser_idorder_no primary key (schedule_id, rep_id, user_id, order_no); +-- +-- name: cr_report_template_map_report_id; type: constraint +-- +alter table cr_report_template_map + add constraint cr_report_template_map_report_id primary key (report_id); +-- +-- name: cr_table_role_table_namerole_id; type: constraint +-- +alter table cr_table_role + add constraint cr_table_role_table_namerole_id primary key (table_name, role_id); +-- +-- name: cr_table_source_table_name; type: constraint +-- +alter table cr_table_source + add constraint cr_table_source_table_name primary key (table_name); +-- +-- name: fn_audit_action_audit_action_id; type: constraint +-- +alter table fn_audit_action + add constraint fn_audit_action_audit_action_id primary key (audit_action_id); +-- +-- +-- name: fk_fn_audit_ref_205_fn_lu_ac; type: constraint +-- +alter table fn_audit_log + add constraint fk_fn_audit_ref_205_fn_lu_ac foreign key (activity_cd) references fn_lu_activity(activity_cd); +-- +-- name: fk_fn_role__ref_201_fn_funct; type: constraint +-- +alter table fn_role_function + add constraint fk_fn_role__ref_201_fn_funct foreign key (function_cd) references fn_function(function_cd); +-- +-- name: fn_chat_logs_chat_log_id; type: constraint +-- +alter table fn_chat_logs + add constraint fn_chat_logs_chat_log_id primary key (chat_log_id); +-- +-- name: fn_chat_room_chat_room_id; type: constraint +-- +alter table fn_chat_room + add constraint fn_chat_room_chat_room_id primary key (chat_room_id); +-- +-- name: fn_chat_users_id; type: constraint +-- +alter table fn_chat_users + add constraint fn_chat_users_id primary key (id); +-- +-- name: fn_lu_alert_method_alert_method_cd; type: constraint +-- +alter table fn_lu_alert_method + add constraint fn_lu_alert_method_alert_method_cd primary key (alert_method_cd); +-- +-- name: fn_lu_broadcast_site_broadcast_site_cd; type: constraint +-- +alter table fn_lu_broadcast_site + add constraint fn_lu_broadcast_site_broadcast_site_cd primary key (broadcast_site_cd); +-- +-- name: fn_lu_priority_priority_id; type: constraint +-- +alter table fn_lu_priority + add constraint fn_lu_priority_priority_id primary key (priority_id); +-- +-- name: fn_lu_role_type_role_type_id; type: constraint +-- +alter table fn_lu_role_type + add constraint fn_lu_role_type_role_type_id primary key (role_type_id); +-- +-- name: fn_lu_tab_set_tab_set_cd; type: constraint +-- +alter table fn_lu_tab_set + add constraint fn_lu_tab_set_tab_set_cd primary key (tab_set_cd); +-- +-- name: fn_lu_timezone_timezone_id; type: constraint +-- +alter table fn_lu_timezone + add constraint fn_lu_timezone_timezone_id primary key (timezone_id); +-- +-- name: fn_org_org_id; type: constraint +-- +alter table fn_org + add constraint fn_org_org_id primary key (org_id); +-- +-- name: fn_restricted_url_restricted_urlfunction_cd; type: constraint +-- +alter table fn_restricted_url + add constraint fn_restricted_url_restricted_urlfunction_cd primary key (restricted_url, function_cd); +-- +-- name: fn_role_composite_parent_role_idchild_role_id; type: constraint +-- +alter table fn_role_composite + add constraint fn_role_composite_parent_role_idchild_role_id primary key (parent_role_id, child_role_id); +-- +-- name: fn_role_function_role_idfunction_cd; type: constraint +-- +alter table fn_role_function + add constraint fn_role_function_role_idfunction_cd primary key (role_id, function_cd); +-- +-- name: fn_tab_tab_cd; type: constraint +-- +alter table fn_tab + add constraint fn_tab_tab_cd primary key (tab_cd); +-- +-- name: fn_tab_selected_selected_tab_cdtab_uri; type: constraint +-- +alter table fn_tab_selected + add constraint fn_tab_selected_selected_tab_cdtab_uri primary key (selected_tab_cd, tab_uri); +-- +-- name: fn_user_pseudo_role_pseudo_role_iduser_id; type: constraint +-- +alter table fn_user_pseudo_role + add constraint fn_user_pseudo_role_pseudo_role_iduser_id primary key (pseudo_role_id, user_id); +-- +-- name: fn_user_role_user_idrole_id; type: constraint +-- +alter table fn_user_role + add constraint fn_user_role_user_idrole_id primary key (user_id, role_id, app_id); +-- ------------------ create index section +-- +-- name: cr_report_create_idpublic_yntitle; type: index +-- +create index cr_report_create_idpublic_yntitle using btree on cr_report (create_id, public_yn, title); +-- +-- name: cr_table_join_dest_table_name; type: index +-- +create index cr_table_join_dest_table_name using btree on cr_table_join (dest_table_name); +-- +-- name: cr_table_join_src_table_name; type: index +-- +create index cr_table_join_src_table_name using btree on cr_table_join (src_table_name); +-- +-- name: fn_audit_log_activity_cd; type: index +-- +create index fn_audit_log_activity_cd using btree on fn_audit_log (activity_cd); +-- +-- name: fn_audit_log_user_id; type: index +-- +create index fn_audit_log_user_id using btree on fn_audit_log (user_id); +-- +-- name: fn_menu_function_cd; type: index +-- +create index fn_menu_function_cd using btree on fn_menu (function_cd); +-- +-- name: fn_org_access_cd; type: index +-- +create index fn_org_access_cd using btree on fn_org (access_cd); +-- +-- name: fn_role_function_function_cd; type: index +-- +create index fn_role_function_function_cd using btree on fn_role_function (function_cd); +-- +-- name: fn_role_function_role_id; type: index +-- +create index fn_role_function_role_id using btree on fn_role_function (role_id); +-- +-- name: fn_user_address_id; type: index +-- +create index fn_user_address_id using btree on fn_user (address_id); +-- +-- name: fn_user_alert_method_cd; type: index +-- +create index fn_user_alert_method_cd using btree on fn_user (alert_method_cd); +-- +-- name: fn_user_hrid; type: index +-- +create unique index fn_user_hrid using btree on fn_user (hrid); +-- +-- name: fn_user_login_id; type: index +-- +create unique index fn_user_login_id using btree on fn_user (login_id); +-- +-- name: fn_user_org_id; type: index +-- +create index fn_user_org_id using btree on fn_user (org_id); +-- +-- name: fn_user_role_role_id; type: index +-- +create index fn_user_role_role_id using btree on fn_user_role (role_id); +-- +-- name: fn_user_role_user_id; type: index +-- +create index fn_user_role_user_id using btree on fn_user_role (user_id); +-- +-- name: fk_fn_user__ref_178_fn_app_idx; type: index +-- +create index fk_fn_user__ref_178_fn_app_idx on fn_user_role (app_id); + -- + -- name: fn_role_name_app_id_idx; type: index + -- + create unique index fn_role_name_app_id_idx using btree on fn_role (role_name,app_id); + +-- new for 1707 + +create index ep_notif_recv_user_id_idx using btree on ep_role_notification (recv_user_id); + +-- end new for 1707 + +-- ------------------ alter table add constraint foreign key section +-- +-- name: fk_fn_user__ref_178_fn_app; type: fk constraint +-- +alter table fn_user_role + add constraint fk_fn_user__ref_178_fn_app foreign key (app_id) references fn_app(app_id); +-- +-- name: fk_cr_repor_ref_14707_cr_repor; type: fk constraint +-- +alter table cr_report_schedule + add constraint fk_cr_repor_ref_14707_cr_repor foreign key (rep_id) references cr_report(rep_id); +-- +-- name: fk_cr_repor_ref_14716_cr_repor; type: fk constraint +-- +alter table cr_report_schedule_users + add constraint fk_cr_repor_ref_14716_cr_repor foreign key (schedule_id) references cr_report_schedule(schedule_id); +-- +-- name: fk_cr_repor_ref_17645_cr_repor; type: fk constraint +-- +alter table cr_report_log + add constraint fk_cr_repor_ref_17645_cr_repor foreign key (rep_id) references cr_report(rep_id); +-- +-- name: fk_cr_repor_ref_8550_cr_repor; type: fk constraint +-- +alter table cr_report_access + add constraint fk_cr_repor_ref_8550_cr_repor foreign key (rep_id) references cr_report(rep_id); +-- +-- name: fk_cr_report_rep_id; type: fk constraint +-- +alter table cr_report_email_sent_log + add constraint fk_cr_report_rep_id foreign key (rep_id) references cr_report(rep_id); +-- +-- name: fk_cr_table_ref_311_cr_tab; type: fk constraint +-- +alter table cr_table_join + add constraint fk_cr_table_ref_311_cr_tab foreign key (src_table_name) references cr_table_source(table_name); +-- +-- name: fk_cr_table_ref_315_cr_tab; type: fk constraint +-- +alter table cr_table_join + add constraint fk_cr_table_ref_315_cr_tab foreign key (dest_table_name) references cr_table_source(table_name); +-- +-- name: fk_cr_table_ref_32384_cr_table; type: fk constraint +-- +alter table cr_table_role + add constraint fk_cr_table_ref_32384_cr_table foreign key (table_name) references cr_table_source(table_name); +-- +-- name: fk_fn_tab_function_cd; type: fk constraint +-- +alter table fn_tab + add constraint fk_fn_tab_function_cd foreign key (function_cd) references fn_function(function_cd); +-- +-- name: fk_fn_tab_selected_tab_cd; type: fk constraint +-- +alter table fn_tab_selected + add constraint fk_fn_tab_selected_tab_cd foreign key (selected_tab_cd) references fn_tab(tab_cd); +-- +-- name: fk_fn_tab_set_cd; type: fk constraint +-- +alter table fn_tab + add constraint fk_fn_tab_set_cd foreign key (tab_set_cd) references fn_lu_tab_set(tab_set_cd); +-- +-- name: fk_fn_user_ref_110_fn_org; type: fk constraint +-- +alter table fn_user + add constraint fk_fn_user_ref_110_fn_org foreign key (org_id) references fn_org(org_id); +-- +-- name: fk_fn_user_ref_123_fn_lu_al; type: fk constraint +-- +alter table fn_user + add constraint fk_fn_user_ref_123_fn_lu_al foreign key (alert_method_cd) references fn_lu_alert_method(alert_method_cd); +-- +-- name: fk_fn_user_ref_197_fn_user; type: fk constraint +-- + alter table fn_user + add constraint fk_fn_user_ref_197_fn_user foreign key (manager_id) references fn_user(user_id); +-- +-- name: fk_fn_user_ref_198_fn_user; type: fk constraint +-- +alter table fn_user + add constraint fk_fn_user_ref_198_fn_user foreign key (created_id) references fn_user(user_id); +-- +-- name: fk_fn_user_ref_199_fn_user; type: fk constraint +-- +alter table fn_user + add constraint fk_fn_user_ref_199_fn_user foreign key (modified_id) references fn_user(user_id); +-- +-- name: fk_parent_key_cr_folder; type: fk constraint +-- +alter table cr_folder + add constraint fk_parent_key_cr_folder foreign key (parent_folder_id) references cr_folder(folder_id); +-- +-- name: fk_pseudo_role_pseudo_role_id; type: fk constraint +-- +alter table fn_user_pseudo_role + add constraint fk_pseudo_role_pseudo_role_id foreign key (pseudo_role_id) references fn_role(role_id); +-- +-- name: fk_pseudo_role_user_id; type: fk constraint +-- +alter table fn_user_pseudo_role + add constraint fk_pseudo_role_user_id foreign key (user_id) references fn_user(user_id); +-- +-- name: fk_restricted_url_function_cd; type: fk constraint +-- +alter table fn_restricted_url + add constraint fk_restricted_url_function_cd foreign key (function_cd) references fn_function(function_cd); +-- +-- name: fk_timezone; type: fk constraint +-- +alter table fn_user + add constraint fk_timezone foreign key (timezone) references fn_lu_timezone(timezone_id); +-- +-- name: sys_c0014614; type: fk constraint +-- +alter table cr_report_file_history + add constraint sys_c0014614 foreign key (file_type_id) references cr_lu_file_type(lookup_id); +-- +-- name: sys_c0014615; type: fk constraint +-- +alter table cr_report_file_history + add constraint sys_c0014615 foreign key (rep_id) references cr_report(rep_id); +-- +-- name: sys_c0014616; type: fk constraint +-- +alter table cr_hist_user_map + add constraint sys_c0014616 foreign key (hist_id) references cr_report_file_history(hist_id); +-- +-- name: sys_c0014617; type: fk constraint +-- +alter table cr_hist_user_map + add constraint sys_c0014617 foreign key (user_id) references fn_user(user_id); +-- +-- name: sys_c0014618; type: fk constraint +-- +alter table fn_menu_favorites +add constraint sys_c0014618 foreign key (user_id) references fn_user(user_id); + +-- +-- name: sys_c0014619; type: fk constraint +-- +alter table fn_menu_favorites +add constraint sys_c0014619 foreign key (menu_id) references fn_menu_functional(menu_id); + +commit;
\ No newline at end of file diff --git a/ecomp-portal-DB-common/EcompPortalDMLMySql_1707_Common.sql b/ecomp-portal-DB-common/EcompPortalDMLMySql_1707_Common.sql index 64ef9238..66d48586 100644 --- a/ecomp-portal-DB-common/EcompPortalDMLMySql_1707_Common.sql +++ b/ecomp-portal-DB-common/EcompPortalDMLMySql_1707_Common.sql @@ -40,6 +40,10 @@ Insert INTO fn_function (function_cd,function_name) values ('getAdminNotificatio Insert INTO fn_function (function_cd,function_name) values ('saveNotification', 'publish notifications'); -- end new 1702 +-- new 1707 +INSERT INTO fn_function (function_cd, function_name) VALUES ('menu_web_analytics', 'Web Analytics'); +-- end new 1707 + -- FN_LU_ACTIVITY Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('add_role','add_role'); Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('remove_role','remove_role'); @@ -115,18 +119,12 @@ Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) values (13,'Microservice Onboarding', 1, 110, 'root.microserviceOnboarding', 'menu_admin', 'Y', 'APP', 'N', 'icon-add-widget'); --- for Web Analytics -INSERT INTO fn_function (function_cd, function_name) VALUES ('menu_web_analytics', 'Web Analytics'); -INSERT INTO fn_role (role_id, role_name, active_yn, priority) VALUES ('1010', 'Usage Analyst', 'Y', '1'); -INSERT INTO fn_role_function (role_id, function_cd) VALUES ('1010', 'menu_web_analytics'); - Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) values(14,'Web Analytics',1,120,'root.webAnalytics','menu_web_analytics','Y','APP','N','icon-misc-piechart'); Insert into fn_menu (menu_id, label, parent_id, sort_order, action, function_cd, active_yn, menu_set_cd, separator_yn, image_src) values(15,'App Account Management', 1, 130, 'root.accountOnboarding', 'menu_admin', 'Y', 'App', 'N', 'icon-add-widget'); Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) - values(16,'Web Analytics Onboarding',1,140,'root.webAnlayticsSource','menu_admin','Y','APP','N','icon-misc-piechart'); - + values(16,'Web Analytics Onboarding',1,140,'root.webAnlayticsSource','menu_admin','Y','APP','N','icon-misc-piechart'); -- end new 1707 -- FN_LU_ALERT_METHOD @@ -210,6 +208,11 @@ Insert into fn_role (ROLE_ID, ROLE_NAME, ACTIVE_YN, PRIORITY, APP_ID, APP_ROLE_I Insert into fn_role (ROLE_ID, ROLE_NAME, ACTIVE_YN, PRIORITY, APP_ID, APP_ROLE_ID) values (950,'Portal Notification Admin','Y','1',NULL,NULL); -- end new 1702 +-- new 1707 +INSERT INTO fn_role (role_id, role_name, active_yn, priority) VALUES ('1010', 'Usage Analyst', 'Y', '1'); +INSERT INTO fn_role (role_id, role_name, active_yn, priority) VALUES ('2115', 'Portal Usage Analyst', 'Y', '6'); +-- end new 1707 + -- FN_ROLE_Composite Insert into fn_role_composite (PARENT_ROLE_ID,CHILD_ROLE_ID) values (1,16); @@ -250,6 +253,11 @@ Insert INTO fn_role_function (ROLE_ID,FUNCTION_CD) values (950, 'getAdminNotific Insert INTO fn_role_function (ROLE_ID,FUNCTION_CD) values (950, 'saveNotification'); -- end new 1702 +-- new 1707 +INSERT INTO fn_role_function (role_id, function_cd) VALUES ('1010', 'menu_web_analytics'); +INSERT INTO fn_role_function (role_id, function_cd) VALUES ('2115', 'menu_web_analytics'); +-- end new 1707 + -- FN_TAB Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB2_SUB1_S1','Left Tab 1','Sub - Sub Tab 1 Information','tab2_sub1.htm','menu_tab','Y',10,'TAB2_SUB1','APP'); Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB1','Tab 1','Tab 1 Information','tab1.htm','menu_tab','Y',10,null,'APP'); diff --git a/ecomp-portal-DB-common/EcompPortalDMLMySql_1710_Common.sql b/ecomp-portal-DB-common/EcompPortalDMLMySql_1710_Common.sql new file mode 100644 index 00000000..581f2c65 --- /dev/null +++ b/ecomp-portal-DB-common/EcompPortalDMLMySql_1710_Common.sql @@ -0,0 +1,280 @@ + -- -------------------------------------------------------------------------------------------- +-- This is the common default data for 1710 Open Source Version of Ecomp Portal database called +-- portal based on 1707 Open Source Version and 1707 +-- Version of Ecomp Portal database called portal +USE portal; + +set foreign_key_checks=1; + +-- FN_FUNCTION +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_process','Process List'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_job','Job Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_job_create','Job Create'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_job_designer','Process in Designer view'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_task','Task Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_task_search','Task Search'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_map','Map Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_sample','Sample Pages Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('login','Login'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_home','Home Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_customer','Customer Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_reports','Reports Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_profile','Profile Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_admin','Admin Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_feedback','Feedback Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_help','Help Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_logout','Logout Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_notes','Notes Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_ajax','Ajax Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_customer_create','Customer Create'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_profile_create','Profile Create'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_profile_import','Profile Import'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_tab','Sample Tab Menu'); +Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('view_reports','View Raptor reports'); + +-- new 1702 +Insert into fn_function (function_cd,function_name) values ('edit_notification','User Notification'); +Insert INTO fn_function (function_cd,function_name) values ('getAdminNotifications', 'Admin Notifications'); +Insert INTO fn_function (function_cd,function_name) values ('saveNotification', 'publish notifications'); +-- end new 1702 + +-- new 1707 +INSERT INTO fn_function (function_cd, function_name) VALUES ('menu_web_analytics', 'Web Analytics'); +-- end new 1707 + +-- FN_LU_ACTIVITY +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('add_role','add_role'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('remove_role','remove_role'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('add_user_role','add_user_role'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('remove_user_role','remove_user_role'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('add_role_function','add_role_function'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('remove_role_function','remove_role_function'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('add_child_role','add_child_role'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('remove_child_role','remove_child_role'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('mobile_login','Mobile Login'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('mobile_logout','Mobile Logout'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('login','Login'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('logout','Logout'); + +-- new 1610.2 +insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values('guest_login','Guest Login'); +-- end new 1610.2 + +-- new 1702 +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('tab_access','Tab Access'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('app_access','App Access'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values('functional_access','Functional Access'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('left_menu_access','Left Menu Access'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('search','Search'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('apa','Add Portal Admin'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('dpa','Delete Portal Admin'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('uaa','Update Account Admin'); +Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('uu','Update User'); + +-- FN_LU_MENU_SET +Insert into fn_lu_menu_set (MENU_SET_CD,MENU_SET_NAME) values ('APP','Application Menu'); + +-- FN_MENU Ecomp Portal now uses the left menu entries from fn_menu +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values(1,'root',NULL,10,NULL,'menu_home','N','APP','N',NULL); + +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values(2,'Home',1,10,'root.applicationsHome','menu_home','Y','APP','N','icon-building-home'); + +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values(3,'Application Catalog',1,15,'root.appCatalog','menu_home','Y','APP','N','icon-apps-marketplace'); + +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values(4,'Widget Catalog',1,20,'root.widgetCatalog','menu_home','Y','APP','N','icon-apps-marketplace'); + +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values(5,'Admins',1,40,'root.admins','menu_admin','Y','APP','N','icon-star'); + +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values(6,'Roles',1,45,'root.roles','menu_admin','Y','APP','N','icon-user'); + +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values(7,'Users',1,50,'root.users','menu_admin','Y','APP','N','icon-user'); + +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values(8,'Portal Admins',1,60,'root.portalAdmins','menu_admin','Y','APP','N','icon-settings'); + +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values(9,'Application Onboarding',1,70,'root.applications','menu_admin','Y','APP','N','icon-add-widget'); + +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values(10,'Widget Onboarding',1,80,'root.widgetOnboarding','menu_admin','Y','APP','N','icon-add-widget'); + +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values(11,'Edit Functional Menu',1,90,'root.functionalMenu','menu_admin','Y','APP','N','icon-edit'); + +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values(12,'User Notifications',1,100,'root.userNotifications','edit_notification','Y','APP','N','icon-settings'); + +-- end new 1702 + +-- new 1707 +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values (13,'Microservice Onboarding', 1, 110, 'root.microserviceOnboarding', 'menu_admin', 'Y', 'APP', 'N', 'icon-add-widget'); +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values(14,'Web Analytics',1,120,'root.webAnalytics','menu_web_analytics','Y','APP','N','icon-misc-piechart'); +Insert into fn_menu (menu_id, label, parent_id, sort_order, action, function_cd, active_yn, menu_set_cd, separator_yn, image_src) + values(15,'App Account Management', 1, 130, 'root.accountOnboarding', 'menu_admin', 'Y', 'App', 'N', 'icon-add-widget'); +Insert into fn_menu(MENU_ID,LABEL,PARENT_ID,SORT_ORDER,ACTION,FUNCTION_CD,ACTIVE_YN,MENU_SET_CD,SEPARATOR_YN,IMAGE_SRC) + values(16,'Web Analytics Onboarding',1,140,'root.webAnlayticsSource','menu_admin','Y','APP','N','icon-misc-piechart'); +-- end new 1707 + +-- FN_LU_ALERT_METHOD +Insert into fn_lu_alert_method (ALERT_METHOD_CD,ALERT_METHOD) values ('PHONE','Phone'); +Insert into fn_lu_alert_method (ALERT_METHOD_CD,ALERT_METHOD) values ('FAX','Fax'); +Insert into fn_lu_alert_method (ALERT_METHOD_CD,ALERT_METHOD) values ('PAGER','Pager'); +Insert into fn_lu_alert_method (ALERT_METHOD_CD,ALERT_METHOD) values ('EMAIL','Email'); +Insert into fn_lu_alert_method (ALERT_METHOD_CD,ALERT_METHOD) values ('SMS','SMS'); + +-- FN_LU_PRIORITY +Insert into fn_lu_priority (PRIORITY_ID,PRIORITY,ACTIVE_YN,SORT_ORDER) values (10,'Low','Y',10); +Insert into fn_lu_priority (PRIORITY_ID,PRIORITY,ACTIVE_YN,SORT_ORDER) values (20,'Normal','Y',20); +Insert into fn_lu_priority (PRIORITY_ID,PRIORITY,ACTIVE_YN,SORT_ORDER) values (30,'High','Y',30); +Insert into fn_lu_priority (PRIORITY_ID,PRIORITY,ACTIVE_YN,SORT_ORDER) values (40,'Urgent','Y',40); +Insert into fn_lu_priority (PRIORITY_ID,PRIORITY,ACTIVE_YN,SORT_ORDER) values (50,'Fatal','Y',50); + +-- FN_LU_TAB_SET +Insert into fn_lu_tab_set (TAB_SET_CD,TAB_SET_NAME) values ('APP','Application Tabs'); + +-- FN_LU_TIMEZONE +Insert into fn_lu_timezone (TIMEZONE_ID,TIMEZONE_NAME,TIMEZONE_VALUE) values (10,'US/Eastern','US/Eastern'); +Insert into fn_lu_timezone (TIMEZONE_ID,TIMEZONE_NAME,TIMEZONE_VALUE) values (20,'US/Central','US/Central'); +Insert into fn_lu_timezone (TIMEZONE_ID,TIMEZONE_NAME,TIMEZONE_VALUE) values (30,'US/Mountain','US/Mountain'); +Insert into fn_lu_timezone (TIMEZONE_ID,TIMEZONE_NAME,TIMEZONE_VALUE) values (40,'US/Arizona','America/Phoenix'); +Insert into fn_lu_timezone (TIMEZONE_ID,TIMEZONE_NAME,TIMEZONE_VALUE) values (50,'US/Pacific','US/Pacific'); +Insert into fn_lu_timezone (TIMEZONE_ID,TIMEZONE_NAME,TIMEZONE_VALUE) values (60,'US/Alaska','US/Alaska'); +Insert into fn_lu_timezone (TIMEZONE_ID,TIMEZONE_NAME,TIMEZONE_VALUE) values (70,'US/Hawaii','US/Hawaii'); + +-- FN_RESTRICTED_URL +Insert into fn_restricted_url (restricted_url, function_cd) values ('attachment.htm','menu_admin'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('broadcast.htm','menu_admin'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('file_upload.htm','menu_admin'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('job.htm','menu_admin'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('role.htm','menu_admin'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('role_function.htm','menu_admin'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('test.htm','menu_admin'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('async_test.htm','menu_home'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('chatWindow.htm','menu_home'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('contact_list.htm','menu_home'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('customer_dynamic_list.htm','menu_home'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('event.htm','menu_home'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('event_list.htm','menu_home'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('mobile_welcome.htm','menu_home'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('sample_map.htm','menu_home'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('template.jsp','menu_home'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('jbpm_designer.htm','menu_job_create'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('jbpm_drools.htm','menu_job_create'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('process_job.htm','menu_job_create'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('profile.htm','menu_profile_create'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('raptor.htm','menu_reports'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('raptor2.htm','menu_reports'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('raptor_blob_extract.htm','menu_reports'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('raptor_email_attachment.htm','menu_reports'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('raptor_search.htm','menu_reports'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('report_list.htm','menu_reports'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('gauge.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('gmap_controller.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('gmap_frame.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('map.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('map_download.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('map_grid_search.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('sample_animated_map.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('sample_map_2.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('sample_map_3.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('tab2_sub1.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('tab2_sub2_link1.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('tab2_sub2_link2.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('tab2_sub3.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('tab3.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('tab4.htm','menu_tab'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('raptor.htm','view_reports'); +Insert into fn_restricted_url (restricted_url, function_cd) values ('raptor_blob_extract.htm','view_reports'); + +-- FN_ROLE +Insert into fn_role (ROLE_ID, ROLE_NAME, ACTIVE_YN, PRIORITY, APP_ID, APP_ROLE_ID) values (1,'System Administrator','Y',1,NULL,NULL); +Insert into fn_role (ROLE_ID, ROLE_NAME, ACTIVE_YN, PRIORITY, APP_ID, APP_ROLE_ID) values (16,'Standard User','Y',5,NULL,NULL); +Insert into fn_role (ROLE_ID, ROLE_NAME, ACTIVE_YN, PRIORITY, APP_ID, APP_ROLE_ID) values (999,'Account Administrator','Y',1,NULL,NULL); +Insert into fn_role (ROLE_ID, ROLE_NAME, ACTIVE_YN, PRIORITY, APP_ID, APP_ROLE_ID) values (900,'Restricted App Role','Y','1',NULL,NULL); + +-- new 1702 +Insert into fn_role (ROLE_ID, ROLE_NAME, ACTIVE_YN, PRIORITY, APP_ID, APP_ROLE_ID) values (950,'Portal Notification Admin','Y','1',NULL,NULL); +-- end new 1702 + +-- new 1707 +INSERT INTO fn_role (role_id, role_name, active_yn, priority) VALUES ('1010', 'Usage Analyst', 'Y', '1'); +INSERT INTO fn_role (role_id, role_name, active_yn, priority) VALUES ('2115', 'Portal Usage Analyst', 'Y', '6'); +-- end new 1707 + +-- FN_ROLE_Composite +Insert into fn_role_composite (PARENT_ROLE_ID,CHILD_ROLE_ID) values (1,16); + +-- FN_ROLE_FUNCTION +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'login'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_admin'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_ajax'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_customer'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_customer_create'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_feedback'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_help'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_home'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_job'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_job_create'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_logout'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_notes'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_process'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_profile'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_profile_create'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_profile_import'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_reports'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_sample'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_tab'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'login'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_ajax'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_customer'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_customer_create'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_home'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_logout'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_map'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_profile'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_reports'); +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_tab'); + +-- new 1702 +Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (950,'edit_notification'); +Insert INTO fn_role_function (ROLE_ID,FUNCTION_CD) values (950, 'getAdminNotifications'); +Insert INTO fn_role_function (ROLE_ID,FUNCTION_CD) values (950, 'saveNotification'); +-- end new 1702 + +-- new 1707 +INSERT INTO fn_role_function (role_id, function_cd) VALUES ('1010', 'menu_web_analytics'); +INSERT INTO fn_role_function (role_id, function_cd) VALUES ('2115', 'menu_web_analytics'); +-- end new 1707 + +-- FN_TAB +Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB2_SUB1_S1','Left Tab 1','Sub - Sub Tab 1 Information','tab2_sub1.htm','menu_tab','Y',10,'TAB2_SUB1','APP'); +Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB1','Tab 1','Tab 1 Information','tab1.htm','menu_tab','Y',10,null,'APP'); +Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB2','Tab 2','Tab 2 Information','tab2_sub1.htm','menu_tab','Y',20,null,'APP'); +Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB3','Tab 3','Tab 3 Information','tab3.htm','menu_tab','Y',30,null,'APP'); +Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB4','Tab 4','Tab 4 Information','tab4.htm','menu_tab','Y',40,null,'APP'); +Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB2_SUB1','Sub Tab 1','Sub Tab 1 Information','tab2_sub1.htm','menu_tab','Y',10,'TAB2','APP'); +Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB2_SUB2','Sub Tab 2','Sub Tab 2 Information','tab2_sub2.htm','menu_tab','Y',20,'TAB2','APP'); +Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB2_SUB3','Sub Tab 3','Sub Tab 3 Information','tab2_sub3.htm','menu_tab','Y',30,'TAB2','APP'); + +-- FN_TAB_SELECTED +Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB1','tab1'); +Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB2','tab2_sub1'); +Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB2','tab2_sub2'); +Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB2','tab2_sub3'); +Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB2_SUB1','tab2_sub1'); +Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB2_SUB1_S1','tab2_sub1'); +Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB2_SUB2','tab2_sub2'); +Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB2_SUB3','tab2_sub3'); +Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB3','tab3'); +Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB4','tab4'); + +commit;
\ No newline at end of file diff --git a/ecomp-portal-DB-common/README.md b/ecomp-portal-DB-common/README.md index f07c3491..b47e15d5 100644 --- a/ecomp-portal-DB-common/README.md +++ b/ecomp-portal-DB-common/README.md @@ -11,9 +11,11 @@ Directions: DDL EcompPortalDDLMySql_1707_Common.sql - this is the DDL entries that both Opensource and AT&T have in common +EcompPortalDDLMySql_1710_Common.sql - this is the DDL entries that both Opensource and AT&T have in common DML EcompPortalDMLMySql_1707_Common.sql - this is the DML entries that both Opensource and AT&T have in common +EcompPortalDMLMySql_1710_Common.sql - this is the DML entries that both Opensource and AT&T have in common *************************************************************************************************************************************** diff --git a/ecomp-portal-DB-os/EcompPortalDDLMySql_1710_OS.sql b/ecomp-portal-DB-os/EcompPortalDDLMySql_1710_OS.sql new file mode 100644 index 00000000..caa022be --- /dev/null +++ b/ecomp-portal-DB-os/EcompPortalDDLMySql_1710_OS.sql @@ -0,0 +1,12 @@ +-- --------------------------------------------------------------------------------------------------------------- +-- This script adds tables for the 1710 OPEN-SOURCE version of the ECOMP Portal database. +-- The DDL 1710 COMMON script must be executed first! +-- --------------------------------------------------------------------------------------------------------------- + +SET FOREIGN_KEY_CHECKS=1; + +USE portal; + +-- No additional tables required at this time + +commit; diff --git a/ecomp-portal-DB-os/EcompPortalDMLMySql_1710_OS.sql b/ecomp-portal-DB-os/EcompPortalDMLMySql_1710_OS.sql new file mode 100644 index 00000000..d06e6d43 --- /dev/null +++ b/ecomp-portal-DB-os/EcompPortalDMLMySql_1710_OS.sql @@ -0,0 +1,79 @@ +-- --------------------------------------------------------------------------------------------------------------- +-- This is the default data for the 1710 Version of ECOMP Portal database called portal - the Opensource project +-- First run the common Opensource DML; then run this file to add The Opensource only data +USE portal; + +set foreign_key_checks=1; + +-- fn_user +Insert into fn_user (USER_ID, ORG_ID, MANAGER_ID,FIRST_NAME,MIDDLE_NAME,LAST_NAME,PHONE,FAX,CELLULAR,EMAIL,ADDRESS_ID,ALERT_METHOD_CD,HRID,ORG_USER_ID,ORG_CODE,LOGIN_ID,LOGIN_PWD,LAST_LOGIN_DATE,ACTIVE_YN,CREATED_ID,CREATED_DATE,MODIFIED_ID,MODIFIED_DATE,IS_INTERNAL_YN,ADDRESS_LINE_1,ADDRESS_LINE_2,CITY,STATE_CD,ZIP_CODE,COUNTRY_CD,LOCATION_CLLI,ORG_MANAGER_USERID,COMPANY,DEPARTMENT_NAME,JOB_TITLE,TIMEZONE,DEPARTMENT,BUSINESS_UNIT,BUSINESS_UNIT_NAME,COST_CENTER,FIN_LOC_CODE,SILO_STATUS) values (1,NULL,NULL,'Demo',NULL,'User',NULL,NULL,NULL,'demo@openecomp.org',NULL,NULL,NULL,'demo',NULL,'demo','95LidzVz7nSpsTsRUrDNVA==','2016-10-20 15:11:16','Y',NULL,'2016-10-14 21:00:00',1,'2016-10-20 15:11:16','N',NULL,NULL,NULL,'NJ',NULL,'US',NULL,NULL,NULL,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL); + +-- fn_appokYTaDrhzibcbGVq5mjkVQ== +Insert INTO fn_app (APP_ID, APP_NAME, APP_IMAGE_URL, APP_DESCRIPTION, APP_NOTES, APP_URL, APP_ALTERNATE_URL, APP_REST_ENDPOINT, ML_APP_NAME, ML_APP_ADMIN_ID, MOTS_ID, APP_PASSWORD, OPEN, ENABLED, THUMBNAIL, APP_USERNAME, UEB_KEY, UEB_SECRET, UEB_TOPIC_NAME, APP_TYPE, AUTH_CENTRAL, AUTH_NAMESPACE) values (1,'Default','assets/images/tmp/portal1.png','Some Default Description','Some Default Note','http://localhost','http://localhost','http://localhost:8080/ecompportal','EcompPortal','',NULL,'okYTaDrhzibcbGVq5mjkVQ==','N','N',NULL,'portal','EkrqsjQqZt4ZrPh6',NULL,NULL,1,'Y',NULL); + +-- fn_user_role +Insert into fn_user_role (USER_ID,ROLE_ID,PRIORITY,APP_ID) values (1,1,NULL,1); +Insert into fn_user_role (USER_ID,ROLE_ID,PRIORITY,APP_ID) values (1,950,NULL,1); +Insert into fn_user_role (USER_ID,ROLE_ID,PRIORITY,APP_ID) values (1,999,NULL,1); + +INSERT INTO cr_report + (rep_id, title, descr, public_yn, report_xml, create_id, create_date, maint_id, maint_date, menu_id, menu_approved_yn, owner_id, folder_id, dashboard_type_yn, dashboard_yn) + VALUES ( + 15, + 'Application Usage Report Wid', + '', + 'Y', + '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<customReport pageSize="200" reportType="Linear">\n <reportName>Application Usage Report Wid</reportName>\n <reportDescr></reportDescr>\n <dbInfo>local</dbInfo>\n <dbType>mysql</dbType>\n <chartType>BarChart3D</chartType>\n <chartWidth>700</chartWidth>\n <chartHeight>500</chartHeight>\n <showChartTitle>false</showChartTitle>\n <public>false</public>\n <hideFormFieldAfterRun>false</hideFormFieldAfterRun>\n <createId>27</createId>\n <createDate>2017-01-28-05:00</createDate>\n <reportSQL>SELECT \n l.date audit_date, \n app_id app_id, \n IF(CHAR_LENGTH(l.app_name) >14, CONCAT(CONCAT(SUBSTR(l.app_name,1,7),\'...\'), SUBSTR(l.app_name, CHAR_LENGTH(l.app_name)-3,CHAR_LENGTH(l.app_name))) , l.app_name) app_name, \n IFNULL(r.ct,0) ct \nfrom\n(\n select a.Date, app_id, app_name\n from (\n select curdate() - INTERVAL (a.a + (10 * b.a) + (100 * c.a)) DAY as Date\n from (select 0 as a union all select 1 union all select 2 union all select 3 union all select 4 union all select 5 union all select 6 union all select 7 union all select 8 union all select 9) as a\n cross join (select 0 as a union all select 1 union all select 2 union all select 3 union all select 4 union all select 5 union all select 6 union all select 7 union all select 8 union all select 9) as b\n cross join (select 0 as a union all select 1 union all select 2 union all select 3 union all select 4 union all select 5 union all select 6 union all select 7 union all select 8 union all select 9) as c\n ) a, \n (\n SELECT \n app_id, app_name\n from\n (\n select @rn := @rn+1 AS rowId, app_id, app_name from \n (\n select app_id, app_name, ct from \n (\n select affected_record_id, count(*) ct\n from fn_audit_log l\n where audit_date > date_add( curdate(), interval -6 day)\n and affected_record_id not in ( 1, -1)\n and activity_cd in (\'tab_access\', \'app_access\')\n and user_id = [USER_ID]\n group by affected_record_id\n ) a, fn_app f\n where a.affected_record_id = f.app_id\n order by ct desc \n ) b,\n (SELECT @rn := 0) t2\n ) mm where rowId <= 4\n )b\n where a.Date between date_add( curdate(), interval -6 day) and curdate()\n) l left outer join\n(\n select app_name, DATE(audit_date) audit_date_1 ,count(*) ct from fn_audit_log a, fn_app b\n where user_id = [USER_ID]\n and audit_date > date_add( curdate(), interval -6 day)\n and activity_cd in (\'tab_access\', \'app_access\')\n and a.affected_record_id = b.app_id\n and b.app_id <> 1\n and b.app_id in \n (\n SELECT \n app_id\n from\n (\n select @rn := @rn+1 AS rowId, app_id from \n (\n select app_id, ct from \n (\n select affected_record_id app_id, count(*) ct\n from fn_audit_log \n where audit_date > date_add( curdate(), interval -6 day)\n and affected_record_id not in ( 1, -1)\n and activity_cd in (\'tab_access\', \'app_access\')\n and user_id = [USER_ID]\n group by affected_record_id\n ) a\n order by ct desc \n ) b,\n (SELECT @rn := 0) t2\n ) mm \n )\n group by app_name, DATE(audit_date)\n) r\non l.Date = r.audit_date_1\nand l.app_name = r.app_name</reportSQL>\n <reportTitle></reportTitle>\n <reportSubTitle></reportSubTitle>\n <reportHeader></reportHeader>\n <frozenColumns>0</frozenColumns>\n <emptyMessage>Your Search didn\'t yield any results.</emptyMessage>\n <dataGridAlign>left</dataGridAlign>\n <reportFooter></reportFooter>\n <numFormCols>1</numFormCols>\n <displayOptions>NNNNNNN</displayOptions>\n <dataContainerHeight>100</dataContainerHeight>\n <dataContainerWidth>100</dataContainerWidth>\n <allowSchedule>N</allowSchedule>\n <multiGroupColumn>N</multiGroupColumn>\n <topDown>N</topDown>\n <sizedByContent>N</sizedByContent>\n <comment>N|</comment>\n <dataSourceList>\n <dataSource tableId="du0">\n <tableName>DUAL</tableName>\n <tablePK></tablePK>\n <displayName>DUAL</displayName>\n <dataColumnList>\n <dataColumn colId="audit_date">\n <tableId>du0</tableId>\n <dbColName>l.date</dbColName>\n <colName>l.date</colName>\n <displayName>audit_date_1</displayName>\n <displayWidth>10</displayWidth>\n <displayWidthInPxls>nullpxpx</displayWidthInPxls>\n <displayAlignment>Left</displayAlignment>\n <orderSeq>1</orderSeq>\n <visible>true</visible>\n <calculated>true</calculated>\n <colType>VARCHAR2</colType>\n <groupBreak>false</groupBreak>\n <colOnChart>LEGEND</colOnChart>\n <chartSeq>1</chartSeq>\n <chartColor></chartColor>\n <chartLineType></chartLineType>\n <chartSeries>false</chartSeries>\n <dbColType>VARCHAR2</dbColType>\n <chartGroup></chartGroup>\n <yAxis></yAxis>\n </dataColumn>\n <dataColumn colId="app_id">\n <tableId>du0</tableId>\n <dbColName>app_id</dbColName>\n <colName>app_id</colName>\n <displayName>app_id</displayName>\n <displayWidth>10</displayWidth>\n <displayAlignment>Left</displayAlignment>\n <orderSeq>2</orderSeq>\n <visible>true</visible>\n <calculated>true</calculated>\n <colType>VARCHAR2</colType>\n <groupBreak>false</groupBreak>\n <dbColType>VARCHAR2</dbColType>\n </dataColumn>\n <dataColumn colId="app_name">\n <tableId>du0</tableId>\n <dbColName>IF(CHAR_LENGTH(l.app_name) >14, CONCAT(CONCAT(SUBSTR(l.app_name,1,7),\'...\'), SUBSTR(l.app_name, CHAR_LENGTH(l.app_name)-3,CHAR_LENGTH(l.app_name))) , l.app_name)</dbColName>\n <colName>IF(CHAR_LENGTH(l.app_name) >14, CONCAT(CONCAT(SUBSTR(l.app_name,1,7),\'...\'), SUBSTR(l.app_name, CHAR_LENGTH(l.app_name)-3,CHAR_LENGTH(l.app_name))) , l.app_name)</colName>\n <displayName>app_name</displayName>\n <displayWidth>10</displayWidth>\n <displayWidthInPxls>nullpxpx</displayWidthInPxls>\n <displayAlignment>Left</displayAlignment>\n <orderSeq>3</orderSeq>\n <visible>true</visible>\n <calculated>true</calculated>\n <colType>VARCHAR2</colType>\n <groupBreak>false</groupBreak>\n <chartSeq>2</chartSeq>\n <chartColor></chartColor>\n <chartLineType></chartLineType>\n <chartSeries>true</chartSeries>\n <dbColType>VARCHAR2</dbColType>\n <chartGroup></chartGroup>\n <yAxis></yAxis>\n </dataColumn>\n <dataColumn colId="ct">\n <tableId>du0</tableId>\n <dbColName>IFNULL(r.ct,0)</dbColName>\n <colName>IFNULL(r.ct,0)</colName>\n <displayName>ct</displayName>\n <displayWidth>10</displayWidth>\n <displayWidthInPxls>nullpxpx</displayWidthInPxls>\n <displayAlignment>Left</displayAlignment>\n <orderSeq>4</orderSeq>\n <visible>true</visible>\n <calculated>true</calculated>\n <colType>VARCHAR2</colType>\n <groupBreak>false</groupBreak>\n <colOnChart>0</colOnChart>\n <chartSeq>1</chartSeq>\n <chartColor></chartColor>\n <chartLineType></chartLineType>\n <chartSeries>false</chartSeries>\n <dbColType>VARCHAR2</dbColType>\n <chartGroup></chartGroup>\n <yAxis></yAxis>\n </dataColumn>\n </dataColumnList>\n </dataSource>\n </dataSourceList>\n <reportInNewWindow>false</reportInNewWindow>\n <displayFolderTree>false</displayFolderTree>\n <maxRowsInExcelDownload>500</maxRowsInExcelDownload>\n <chartAdditionalOptions>\n <chartOrientation>vertical</chartOrientation>\n <hidechartLegend>N</hidechartLegend>\n <legendPosition>bottom</legendPosition>\n <labelAngle>up90</labelAngle>\n <rangeAxisUpperLimit></rangeAxisUpperLimit>\n <rangeAxisLowerLimit></rangeAxisLowerLimit>\n <animate>true</animate>\n <animateAnimatedChart>true</animateAnimatedChart>\n <stacked>true</stacked>\n <barControls>false</barControls>\n <xAxisDateType>false</xAxisDateType>\n <lessXaxisTickers>false</lessXaxisTickers>\n <timeAxis>true</timeAxis>\n <logScale>false</logScale>\n <topMargin>30</topMargin>\n <bottomMargin>50</bottomMargin>\n <rightMargin>60</rightMargin>\n <leftMargin>100</leftMargin>\n </chartAdditionalOptions>\n <folderId>NULL</folderId>\n <isOneTimeScheduleAllowed>N</isOneTimeScheduleAllowed>\n <isHourlyScheduleAllowed>N</isHourlyScheduleAllowed>\n <isDailyScheduleAllowed>N</isDailyScheduleAllowed>\n <isDailyMFScheduleAllowed>N</isDailyMFScheduleAllowed>\n <isWeeklyScheduleAllowed>N</isWeeklyScheduleAllowed>\n <isMonthlyScheduleAllowed>N</isMonthlyScheduleAllowed>\n</customReport>\n', + 1, + now(), + 1, + now(), + '', + 'N', + (select user_id from fn_user where org_user_id = 'demo'), + NULL, + 'N', + 'N' + ); + +-- new for 1707 +INSERT INTO cr_report + (rep_id, title, descr, public_yn, report_xml, create_id, create_date, maint_id, maint_date, menu_id, menu_approved_yn, owner_id, folder_id, dashboard_type_yn, dashboard_yn) + VALUES ( + 18, + 'Application Usage bar Wid', + '', + 'Y', + '<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<customReport pageSize=\"200\" reportType=\"Linear\">\n <reportName>Application Usage Line Wid</reportName>\n <reportDescr></reportDescr>\n <dbInfo>local</dbInfo>\n <dbType>mysql</dbType>\n <chartType>TimeSeriesChart</chartType>\n <chartMultiSeries>N</chartMultiSeries>\n <chartWidth>700</chartWidth>\n <chartHeight>300</chartHeight>\n <showChartTitle>false</showChartTitle>\n <public>false</public>\n <hideFormFieldAfterRun>false</hideFormFieldAfterRun>\n <createId>27</createId>\n <createDate>2017-01-28-05:00</createDate>\n <reportSQL>SELECT \n l.date audit_date, \n IF(CHAR_LENGTH(l.app_name) >14, CONCAT(CONCAT(SUBSTR(l.app_name,1,7),\'...\'), SUBSTR(l.app_name, CHAR_LENGTH(l.app_name)-3,CHAR_LENGTH(l.app_name))) , l.app_name) app_name, \n IFNULL(r.ct,0) ct \nfrom\n(\n select a.Date, app_id, app_name\n from (\n select curdate() - INTERVAL (a.a + (10 * b.a) + (100 * c.a)) DAY as Date\n from (select 0 as a union all select 1 union all select 2 union all select 3 union all select 4 union all select 5 union all select 6 union all select 7 union all select 8 union all select 9) as a\n cross join (select 0 as a union all select 1 union all select 2 union all select 3 union all select 4 union all select 5 union all select 6 union all select 7 union all select 8 union all select 9) as b\n cross join (select 0 as a union all select 1 union all select 2 union all select 3 union all select 4 union all select 5 union all select 6 union all select 7 union all select 8 union all select 9) as c\n ) a, \n (\n SELECT \n app_id, app_name\n from\n (\n select @rn := @rn+1 AS rowId, app_id, app_name from \n (\n select app_id, app_name, ct from \n (\n select affected_record_id, count(*) ct\n from fn_audit_log l\n where audit_date > date_add( curdate(), interval -30 day)\n and affected_record_id not in ( 1, -1)\n and activity_cd in (\'tab_access\', \'app_access\')\n and user_id = [USER_ID]\n group by affected_record_id\n ) a, fn_app f\n where a.affected_record_id = f.app_id\n order by ct desc \n ) b,\n (SELECT @rn := 0) t2\n ) mm where rowId <= 4\n )b\n where a.Date between date_add( curdate(), interval -30 day) and curdate()\n) l left outer join\n(\n select app_name, DATE(audit_date) audit_date_1 ,count(*) ct from fn_audit_log a, fn_app b\n where user_id = [USER_ID]\n and audit_date > date_add( curdate(), interval -30 day)\n and activity_cd in (\'tab_access\', \'app_access\')\n and a.affected_record_id = b.app_id\n and b.app_id <> 1\n and b.app_id in \n (\n SELECT \n app_id\n from\n (\n select @rn := @rn+1 AS rowId, app_id from \n (\n select app_id, ct from \n (\n select affected_record_id app_id, count(*) ct\n from fn_audit_log \n where audit_date > date_add( curdate(), interval -30 day)\n and affected_record_id not in ( 1, -1)\n and activity_cd in (\'tab_access\', \'app_access\')\n and user_id = [USER_ID]\n group by affected_record_id\n ) a\n order by ct desc \n ) b,\n (SELECT @rn := 0) t2\n ) mm \n )\n group by app_name, DATE(audit_date)\n) r\non l.Date = r.audit_date_1\nand l.app_name = r.app_name</reportSQL>\n <reportTitle></reportTitle>\n <reportSubTitle></reportSubTitle>\n <reportHeader></reportHeader>\n <frozenColumns>0</frozenColumns>\n <emptyMessage>Your Search didn\'t yield any results.</emptyMessage>\n <dataGridAlign>left</dataGridAlign>\n <reportFooter></reportFooter>\n <numFormCols>1</numFormCols>\n <displayOptions>NNNNNNN</displayOptions>\n <dataContainerHeight>100</dataContainerHeight>\n <dataContainerWidth>100</dataContainerWidth>\n <allowSchedule>N</allowSchedule>\n <multiGroupColumn>N</multiGroupColumn>\n <topDown>N</topDown>\n <sizedByContent>N</sizedByContent>\n <comment>N|</comment>\n <dataSourceList>\n <dataSource tableId=\"du0\">\n <tableName>DUAL</tableName>\n <tablePK></tablePK>\n <displayName>DUAL</displayName>\n <dataColumnList>\n <dataColumn colId=\"audit_date\">\n <tableId>du0</tableId>\n <dbColName>l.date</dbColName>\n <colName>l.date</colName>\n <displayName>audit_date_1</displayName>\n <displayWidth>10</displayWidth>\n <displayWidthInPxls>nullpxpx</displayWidthInPxls>\n <displayAlignment>Left</displayAlignment>\n <orderSeq>1</orderSeq>\n <visible>true</visible>\n <calculated>true</calculated>\n <colType>VARCHAR2</colType>\n <groupBreak>false</groupBreak>\n <colOnChart>LEGEND</colOnChart>\n <chartSeq>1</chartSeq>\n <chartSeries>false</chartSeries>\n <isRangeAxisFilled>false</isRangeAxisFilled>\n <drillinPoPUp>false</drillinPoPUp>\n <dbColType>VARCHAR2</dbColType>\n <enhancedPagination>false</enhancedPagination>\n </dataColumn>\n <dataColumn colId=\"app_name\">\n <tableId>du0</tableId>\n <dbColName>IF(CHAR_LENGTH(l.app_name) >14, CONCAT(CONCAT(SUBSTR(l.app_name,1,7),\'...\'), SUBSTR(l.app_name, CHAR_LENGTH(l.app_name)-3,CHAR_LENGTH(l.app_name))) , l.app_name)</dbColName>\n <colName>IF(CHAR_LENGTH(l.app_name) >14, CONCAT(CONCAT(SUBSTR(l.app_name,1,7),\'...\'), SUBSTR(l.app_name, CHAR_LENGTH(l.app_name)-3,CHAR_LENGTH(l.app_name))) , l.app_name)</colName>\n <displayName>app_name</displayName>\n <displayWidth>10</displayWidth>\n <displayWidthInPxls>nullpxpx</displayWidthInPxls>\n <displayAlignment>Left</displayAlignment>\n <orderSeq>2</orderSeq>\n <visible>true</visible>\n <calculated>true</calculated>\n <colType>VARCHAR2</colType>\n <groupBreak>false</groupBreak>\n <colOnChart>0</colOnChart>\n <chartSeq>2</chartSeq>\n <chartColor></chartColor>\n <chartLineType></chartLineType>\n <chartSeries>true</chartSeries>\n <isRangeAxisFilled>false</isRangeAxisFilled>\n <drillinPoPUp>false</drillinPoPUp>\n <dbColType>VARCHAR2</dbColType>\n <chartGroup></chartGroup>\n <yAxis></yAxis>\n <enhancedPagination>false</enhancedPagination>\n </dataColumn>\n <dataColumn colId=\"ct\">\n <tableId>du0</tableId>\n <dbColName>IFNULL(r.ct,0)</dbColName>\n <colName>IFNULL(r.ct,0)</colName>\n <displayName>ct</displayName>\n <displayWidth>10</displayWidth>\n <displayWidthInPxls>nullpxpx</displayWidthInPxls>\n <displayAlignment>Left</displayAlignment>\n <orderSeq>3</orderSeq>\n <visible>true</visible>\n <calculated>true</calculated>\n <colType>VARCHAR2</colType>\n <groupBreak>false</groupBreak>\n <colOnChart>0</colOnChart>\n <chartSeq>1</chartSeq>\n <chartColor></chartColor>\n <chartLineType></chartLineType>\n <chartSeries>false</chartSeries>\n <isRangeAxisFilled>false</isRangeAxisFilled>\n <drillinPoPUp>false</drillinPoPUp>\n <dbColType>VARCHAR2</dbColType>\n <chartGroup></chartGroup>\n <yAxis></yAxis>\n <enhancedPagination>false</enhancedPagination>\n </dataColumn>\n </dataColumnList>\n </dataSource>\n </dataSourceList>\n <reportInNewWindow>false</reportInNewWindow>\n <displayFolderTree>false</displayFolderTree>\n <maxRowsInExcelDownload>500</maxRowsInExcelDownload>\n <chartAdditionalOptions>\n <chartOrientation>vertical</chartOrientation>\n <hidechartLegend>N</hidechartLegend>\n <legendPosition>bottom</legendPosition>\n <labelAngle>down45</labelAngle>\n <animate>true</animate>\n <animateAnimatedChart>true</animateAnimatedChart>\n <stacked>true</stacked>\n <barControls>false</barControls>\n <xAxisDateType>false</xAxisDateType>\n <lessXaxisTickers>false</lessXaxisTickers>\n <timeAxis>true</timeAxis>\n <timeSeriesRender>line</timeSeriesRender>\n <multiSeries>false</multiSeries>\n <showXAxisLabel>false</showXAxisLabel>\n <addXAxisTickers>false</addXAxisTickers>\n <topMargin>30</topMargin>\n <bottomMargin>50</bottomMargin>\n <rightMargin>60</rightMargin>\n <leftMargin>100</leftMargin>\n </chartAdditionalOptions>\n <folderId>NULL</folderId>\n <drillURLInPoPUpPresent>false</drillURLInPoPUpPresent>\n <isOneTimeScheduleAllowed>N</isOneTimeScheduleAllowed>\n <isHourlyScheduleAllowed>N</isHourlyScheduleAllowed>\n <isDailyScheduleAllowed>N</isDailyScheduleAllowed>\n <isDailyMFScheduleAllowed>N</isDailyMFScheduleAllowed>\n <isWeeklyScheduleAllowed>N</isWeeklyScheduleAllowed>\n <isMonthlyScheduleAllowed>N</isMonthlyScheduleAllowed>\n</customReport>\n', + 1, + now(), + 1, + now(), + '', + 'N', + (select user_id from fn_user where org_user_id = 'demo'), + NULL, + 'N', + 'N' + ); + +INSERT INTO cr_report + (rep_id, title, descr, public_yn, report_xml, create_id, create_date, maint_id, maint_date, menu_id, menu_approved_yn, owner_id, folder_id, dashboard_type_yn, dashboard_yn) + VALUES ( + 20, + 'Average time spend on portal', + '', + 'Y', + '<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<customReport pageSize=\"200\" reportType=\"Linear\">\n <reportName>Average time spend on portal</reportName>\n <reportDescr></reportDescr>\n <dbInfo>local</dbInfo>\n <dbType>mysql</dbType>\n <chartType>TimeSeriesChart</chartType>\n <chartMultiSeries>N</chartMultiSeries>\n <chartWidth>700</chartWidth>\n <chartHeight>300</chartHeight>\n <showChartTitle>false</showChartTitle>\n <public>true</public>\n <hideFormFieldAfterRun>false</hideFormFieldAfterRun>\n <createId>27</createId>\n <createDate>2017-01-28-05:00</createDate>\n <reportSQL>SELECT \n d.dat audit_date, \n \'# of Minutes\' app, \n coalesce(diff, null, 0) mins \nfrom\n(\n select * from\n (\n select curdate() - INTERVAL (a.a + (10 * b.a) + (100 * c.a)) DAY as dat\n from (select 0 as a union all select 1 union all select 2 union all select 3 union all select 4 union all select 5 union all select 6 union all select 7 union all select 8 union all select 9) as a\n cross join (select 0 as a union all select 1 union all select 2 union all select 3 union all select 4 union all select 5 union all select 6 union all select 7 union all select 8 union all select 9) as b\n cross join (select 0 as a union all select 1 union all select 2 union all select 3 union all select 4 union all select 5 union all select 6 union all select 7 union all select 8 union all select 9) as c \n ) d where d.dat between date_add( curdate(), interval -30 day) and curdate()\n) d left outer join\n(\n select dat, mi, mx, TIMESTAMPDIFF(MINUTE, coalesce(mi, null, 0), coalesce(mx, null, 0)) + 30 diff\n from\n (\n select DATE(audit_date) dat, coalesce(min(audit_date), null, 0) mi, coalesce(max(audit_date), null, 0) mx\n from fn_audit_log \n where user_id = [USER_ID] and DATE(audit_date) between CURDATE()-300 and CURDATE()\n group by DATE(audit_date)\n ) a\n) a\non a.dat = d.dat\norder by 1</reportSQL>\n <reportTitle></reportTitle>\n <reportSubTitle></reportSubTitle>\n <reportHeader></reportHeader>\n <frozenColumns>0</frozenColumns>\n <emptyMessage>Your Search didn\'t yield any results.</emptyMessage>\n <dataGridAlign>left</dataGridAlign>\n <reportFooter></reportFooter>\n <numFormCols>1</numFormCols>\n <displayOptions>NNNNNNN</displayOptions>\n <dataContainerHeight>100</dataContainerHeight>\n <dataContainerWidth>100</dataContainerWidth>\n <allowSchedule>N</allowSchedule>\n <multiGroupColumn>N</multiGroupColumn>\n <topDown>N</topDown>\n <sizedByContent>N</sizedByContent>\n <comment>N|</comment>\n <dataSourceList>\n <dataSource tableId=\"du0\">\n <tableName>DUAL</tableName>\n <tablePK></tablePK>\n <displayName>DUAL</displayName>\n <dataColumnList>\n <dataColumn colId=\"audit_date\">\n <tableId>du0</tableId>\n <dbColName>d.dat</dbColName>\n <colName>d.dat</colName>\n <displayName>audit_date_1</displayName>\n <displayWidth>10</displayWidth>\n <displayWidthInPxls>nullpxpx</displayWidthInPxls>\n <displayAlignment>Left</displayAlignment>\n <orderSeq>1</orderSeq>\n <visible>true</visible>\n <calculated>true</calculated>\n <colType>VARCHAR2</colType>\n <groupBreak>false</groupBreak>\n <colOnChart>LEGEND</colOnChart>\n <chartSeq>1</chartSeq>\n <chartSeries>false</chartSeries>\n <isRangeAxisFilled>false</isRangeAxisFilled>\n <drillinPoPUp>false</drillinPoPUp>\n <dbColType>VARCHAR2</dbColType>\n <enhancedPagination>false</enhancedPagination>\n </dataColumn>\n <dataColumn colId=\"app\">\n <tableId>du0</tableId>\n <dbColName>\'# of Minutes\'</dbColName>\n <colName>\'# of Minutes\'</colName>\n <displayName>app</displayName>\n <displayWidth>10</displayWidth>\n <displayWidthInPxls>nullpxpx</displayWidthInPxls>\n <displayAlignment>Left</displayAlignment>\n <orderSeq>2</orderSeq>\n <visible>true</visible>\n <calculated>true</calculated>\n <colType>VARCHAR2</colType>\n <groupBreak>false</groupBreak>\n <chartSeries>true</chartSeries>\n <dbColType>VARCHAR2</dbColType>\n </dataColumn>\n <dataColumn colId=\"mins\">\n <tableId>du0</tableId>\n <dbColName>coalesce(diff, null, 0)</dbColName>\n <colName>coalesce(diff, null, 0)</colName>\n <displayName>mins</displayName>\n <displayWidth>10</displayWidth>\n <displayWidthInPxls>nullpxpx</displayWidthInPxls>\n <displayAlignment>Left</displayAlignment>\n <orderSeq>3</orderSeq>\n <visible>true</visible>\n <calculated>true</calculated>\n <colType>VARCHAR2</colType>\n <groupBreak>false</groupBreak>\n <colOnChart>0</colOnChart>\n <chartSeq>1</chartSeq>\n <chartColor></chartColor>\n <chartLineType></chartLineType>\n <chartSeries>false</chartSeries>\n <dbColType>VARCHAR2</dbColType>\n <chartGroup></chartGroup>\n <yAxis></yAxis>\n </dataColumn>\n </dataColumnList>\n </dataSource>\n </dataSourceList>\n <reportInNewWindow>false</reportInNewWindow>\n <displayFolderTree>false</displayFolderTree>\n <maxRowsInExcelDownload>500</maxRowsInExcelDownload>\n <chartAdditionalOptions>\n <chartOrientation>vertical</chartOrientation>\n <hidechartLegend>N</hidechartLegend>\n <legendPosition>bottom</legendPosition>\n <labelAngle>down45</labelAngle>\n <animate>true</animate>\n <animateAnimatedChart>true</animateAnimatedChart>\n <stacked>true</stacked>\n <barControls>false</barControls>\n <xAxisDateType>false</xAxisDateType>\n <lessXaxisTickers>false</lessXaxisTickers>\n <timeAxis>true</timeAxis>\n <timeSeriesRender>line</timeSeriesRender>\n <multiSeries>false</multiSeries>\n <showXAxisLabel>false</showXAxisLabel>\n <addXAxisTickers>false</addXAxisTickers>\n <topMargin>30</topMargin>\n <bottomMargin>50</bottomMargin>\n <rightMargin>60</rightMargin>\n <leftMargin>100</leftMargin>\n </chartAdditionalOptions>\n <folderId>NULL</folderId>\n <drillURLInPoPUpPresent>false</drillURLInPoPUpPresent>\n <isOneTimeScheduleAllowed>N</isOneTimeScheduleAllowed>\n <isHourlyScheduleAllowed>N</isHourlyScheduleAllowed>\n <isDailyScheduleAllowed>N</isDailyScheduleAllowed>\n <isDailyMFScheduleAllowed>N</isDailyMFScheduleAllowed>\n <isWeeklyScheduleAllowed>N</isWeeklyScheduleAllowed>\n <isMonthlyScheduleAllowed>N</isMonthlyScheduleAllowed>\n</customReport>\n', + 1, + now(), + 1, + now(), + '', + 'N', + (select user_id from fn_user where org_user_id = 'demo'), + NULL, + 'N', + 'N' + ); +commit;
\ No newline at end of file diff --git a/ecomp-portal-DB-os/README.md b/ecomp-portal-DB-os/README.md index 0075e9cf..0f4422cc 100644 --- a/ecomp-portal-DB-os/README.md +++ b/ecomp-portal-DB-os/README.md @@ -10,13 +10,21 @@ Directions: DDL -For an Opensource instance run only script EcompPortalDDLMySql_1707_Common.sql. +For an Opensource instance run only -EcompPortalDDLMySql_1707_OS.sql is only a placeholder at this time. +1707: script EcompPortalDDLMySql_1707_Common.sql. +1710: script EcompPortalDDLMySql_1710_Common.sql. + +1707: EcompPortalDDLMySql_1707_OS.sql is only a placeholder at this time. +1710: EcompPortalDDLMySql_1710_OS.sql is only a placeholder at this time. DML -For an Opensource instance run script EcompPortalDMLMySql_1707_Common.sql and script EcompPortalDMLMySql_1707_OS.sql. +For an Opensource instance run + +1707: script EcompPortalDMLMySql_1707_Common.sql and script EcompPortalDMLMySql_1707_OS.sql. +1710: script EcompPortalDMLMySql_1710_Common.sql and script EcompPortalDMLMySql_1710_OS.sql. -EcompPortalDMLMySql_1707_OS.sql - this is the specific DML entries that only Opensource needs +1707: EcompPortalDMLMySql_1707_OS.sql - this is the specific DML entries that only Opensource needs +1710: EcompPortalDMLMySql_1710_OS.sql - this is the specific DML entries that only Opensource needs *************************************************************************************************************************************** diff --git a/ecomp-portal-FE-common/client/app/directives/left-menu/left-menu.less b/ecomp-portal-FE-common/client/app/directives/left-menu/left-menu.less index 6c2043dd..ced37d6d 100644 --- a/ecomp-portal-FE-common/client/app/directives/left-menu/left-menu.less +++ b/ecomp-portal-FE-common/client/app/directives/left-menu/left-menu.less @@ -157,6 +157,8 @@ .left-menu-div{ margin-top:110px; float: left; + position: absolute; + z-index: 100; } .b2b-subnav-content > li > a { display: inline-block; @@ -175,3 +177,7 @@ margin-top:10px; margin-bottom:10px; } + +.b2b-nav-menu { + border: 0 !important; +} diff --git a/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.less b/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.less index 7035a329..6aa2ac53 100644 --- a/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.less +++ b/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.less @@ -59,4 +59,8 @@ } + .checkbox .skin{ + left: 0; + top: 0; + } }
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.tpl.html b/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.tpl.html index 73136fe1..ced02920 100644 --- a/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.tpl.html +++ b/ecomp-portal-FE-common/client/app/directives/multiple-select/multiple-select.tpl.html @@ -27,9 +27,9 @@ <div class="checkboxes" ng-show="isExpanded"> <div ng-repeat="item in ngModel" id="{{item[nameAttr].split(' ').join('-')}}-checkbox-div"> - <label id="{{item[nameAttr].split(' ').join('-')}}-checkbox-label"> + <label id="{{item[nameAttr].split(' ').join('-')}}-checkbox-label" class="checkbox"> <input type="checkbox" id="{{item[nameAttr].split(' ').join('-')}}-checkbox" ng-model="item[valueAttr]" ng-change="onCheckboxClicked()"> - {{item[nameAttr]}} + <i class="skin"></i><span>{{item[nameAttr]}}</span> </label> </div> </div> diff --git a/ecomp-portal-FE-common/client/app/services/confirm-box/confirm-box.service.js b/ecomp-portal-FE-common/client/app/services/confirm-box/confirm-box.service.js index 7379a29e..2cebf0c6 100644 --- a/ecomp-portal-FE-common/client/app/services/confirm-box/confirm-box.service.js +++ b/ecomp-portal-FE-common/client/app/services/confirm-box/confirm-box.service.js @@ -24,213 +24,288 @@ (function () { class ConfirmBoxService { - constructor($q, $log, ngDialog) { + constructor($q, $log, ngDialog,$modal) { this.$q = $q; this.$log = $log; this.ngDialog = ngDialog; + this.$modal = $modal; } - - showInformation(message) { + reloadPageConfirm(msg){ + let deferred = this.$q.defer(); + var modalInstance = this.$modal.open({ + templateUrl: 'app/views/confirmation-box/reload-page-confirm.html', + controller: 'ConfirmationBoxCtrl', + sizeClass:'modal-small', + resolve: { + message: function message() { + var message = { + title:msg.title, + content: msg.content + }; + return message; + } + } + }); + modalInstance.result.then(function () { + deferred.resolve(); + }); + return deferred.promise; + } + showInformation(msg) { let deferred = this.$q.defer(); - this.ngDialog.open({ + var modalInstance = this.$modal.open({ templateUrl: 'app/views/confirmation-box/information-box.tpl.html', controller: 'ConfirmationBoxCtrl', - controllerAs: 'confirmBox', - className: 'confirm-box ngdialog-theme-default', - showClose: false, - data: { - message: message + sizeClass:'modal-small', + resolve: { + message: function message() { + var message = { + title:'', + content: msg + }; + return message; + } } - }).closePromise.then(confirmed => { - deferred.resolve(confirmed.value); - }).catch(err => { - deferred.reject(err); }); - return deferred.promise; + modalInstance.result.then(function () { + deferred.resolve(); + }); + return deferred.promise; }; - editItem(message) { - let deferred = this.$q.defer(); - this.ngDialog.open({ + editItem(msg) { + let deferred = this.$q.defer(); + var modalInstance = this.$modal.open({ templateUrl: 'app/views/confirmation-box/confirmation-box.tpl.html', controller: 'ConfirmationBoxCtrl', - controllerAs: 'confirmBox', - className: 'confirm-box ngdialog-theme-default', - showClose: false, - data: { - message: message + sizeClass:'modal-small', + resolve: { + message: function message() { + var message = { + title:'', + content: msg + }; + return message; + } } - }).closePromise.then(confirmed => { - deferred.resolve(confirmed.value); - }).catch(err => { - deferred.reject(err); }); - return deferred.promise; + modalInstance.result.then(function (confirm) { + if(confirm) + deferred.resolve(confirm); + else + deferred.reject(confirm); + }); + return deferred.promise; }; - showDynamicInformation(message, templatePath, controller) { - let deferred = this.$q.defer(); - this.ngDialog.open({ - templateUrl: templatePath, + showDynamicInformation(msg, templatePath, controller) { + let deferred = this.$q.defer(); + var modalInstance = this.$modal.open({ + templateUrl: templatePath, controller: controller, - controllerAs: 'confirmBox', - className: 'confirm-box ngdialog-theme-default', - showClose: false, - data: { - message: message + sizeClass:'modal-small', + resolve: { + message: function message() { + var message = { + title:'', + content: msg + }; + return message; + } } - }).closePromise.then(confirmed => { - deferred.resolve(confirmed.value); - }).catch(err => { - deferred.reject(err); }); - return deferred.promise; + modalInstance.result.then(function () { + deferred.resolve(); + }); + return deferred.promise; }; - confirm(message) { - let deferred = this.$q.defer(); - this.ngDialog.open({ + confirm(msg) { + let deferred = this.$q.defer(); + var modalInstance = this.$modal.open({ templateUrl: 'app/views/confirmation-box/confirmation-box.tpl.html', controller: 'ConfirmationBoxCtrl', - controllerAs: 'confirmBox', - className: 'confirm-box ngdialog-theme-default', - showClose: false, - data: { - message: message + sizeClass:'modal-small', + resolve: { + message: function message() { + var message = { + title:'', + content: msg + }; + return message; + } } - }).closePromise.then(confirmed => { - deferred.resolve(confirmed.value); - }).catch(err => { - deferred.reject(err); }); - return deferred.promise; + modalInstance.result.then(function (confirm) { + if(confirm) + deferred.resolve(confirm); + else + deferred.reject(confirm); + }); + return deferred.promise; }; deleteItem(item) { - let deferred = this.$q.defer(); - this.ngDialog.open({ + let deferred = this.$q.defer(); + var modalInstance = this.$modal.open({ templateUrl: 'app/views/confirmation-box/confirmation-box.tpl.html', controller: 'ConfirmationBoxCtrl', - controllerAs: 'confirmBox', - className: 'confirm-box ngdialog-theme-default', - showClose: false, - data: { - item: item, - title: 'Functional Menu - Delete' + sizeClass:'modal-small', + resolve: { + message: function message() { + var message = { + item:'', + title:'Confirmation', + content: 'Are you sure you want to delete ' +item+ ' ?' + }; + return message; + } } - }).closePromise.then(confirmed => { - deferred.resolve(confirmed.value); - }).catch(err => { - deferred.reject(err); - }); - return deferred.promise; + }); + modalInstance.result.then(function (confirm) { + if(confirm) + deferred.resolve(confirm); + else + deferred.reject(confirm); + }); + return deferred.promise; }; - moveMenuItem(message) { + moveMenuItem(msg) { let deferred = this.$q.defer(); - this.ngDialog.open({ - templateUrl: 'app/views/confirmation-box/dragdrop-confirmation-box.tpl.html', - controller: 'ConfirmationBoxCtrl', - controllerAs: 'confirmBox', - className: 'confirm-box ngdialog-theme-default', - showClose: false, - data: { - message: message, - title:'Functional Menu - Move' - } - }).closePromise.then(confirmed => { - deferred.resolve(confirmed.value); - }).catch(err => { - deferred.reject(err); - }); - return deferred.promise; + var modalInstance = this.$modal.open({ + templateUrl: 'app/views/confirmation-box/dragdrop-confirmation-box.tpl.html', + controller: 'ConfirmationBoxCtrl', + sizeClass:'modal-small', + resolve: { + message: function message() { + var message = { + item:'', + title:'Functional Menu - Move', + content: msg + }; + return message; + } + } + }); + modalInstance.result.then(function (confirm) { + if(confirm) + deferred.resolve(confirm); + else + deferred.reject(confirm); + }); + return deferred.promise; }; - makeAdminChanges(message) { - let deferred = this.$q.defer(); - this.ngDialog.open({ - templateUrl: 'app/views/confirmation-box/admin-confirmation-box.tpl.html', - controller: 'ConfirmationBoxCtrl', - controllerAs: 'confirmBox', - className: 'confirm-box ngdialog-theme-default', - showClose: false, - data: { - message: message, - title: 'Admin Update' - } - }).closePromise.then(confirmed => { - deferred.resolve(confirmed.value); - }).catch(err => { - deferred.reject(err); - }); - return deferred.promise; + makeAdminChanges(msg) { + let deferred = this.$q.defer(); + var modalInstance = this.$modal.open({ + templateUrl: 'app/views/confirmation-box/admin-confirmation-box.tpl.html', + controller: 'ConfirmationBoxCtrl', + sizeClass:'modal-small', + resolve: { + message: function message() { + var message = { + item:'', + title:'Admin Update', + content: msg + }; + return message; + } + } + }); + modalInstance.result.then(function (confirm) { + if(confirm) + deferred.resolve(confirm); + else + deferred.reject(confirm); + }); + return deferred.promise; }; - makeUserAppRoleCatalogChanges(message) { - let deferred = this.$q.defer(); - this.ngDialog.open({ - templateUrl: 'app/views/confirmation-box/admin-confirmation-box.tpl.html', - controller: 'ConfirmationBoxCtrl', - controllerAs: 'confirmBox', - className: 'confirm-box ngdialog-theme-default', - showClose: false, - data: { - message: message, - title: 'UserRoles Update' - } - }).closePromise.then(confirmed => { - deferred.resolve(confirmed.value); - }).catch(err => { - deferred.reject(err); - }); - return deferred.promise; + makeUserAppRoleCatalogChanges(msg) { + let deferred = this.$q.defer(); + var modalInstance = this.$modal.open({ + templateUrl: 'app/views/confirmation-box/admin-confirmation-box.tpl.html', + controller: 'ConfirmationBoxCtrl', + sizeClass:'modal-small', + resolve: { + message: function message() { + var message = { + item:'', + title:'UserRoles Update', + content: msg + }; + return message; + } + } + }); + modalInstance.result.then(function (confirm) { + if(confirm) + deferred.resolve(confirm); + else + deferred.reject(confirm); + }); + return deferred.promise; }; - webAnalyticsChanges(message) { - let deferred = this.$q.defer(); - this.ngDialog.open({ - templateUrl: 'app/views/confirmation-box/admin-confirmation-box.tpl.html', - controller: 'ConfirmationBoxCtrl', - controllerAs: 'confirmBox', - className: 'confirm-box ngdialog-theme-default', - showClose: false, - data: { - message: message, - title: 'Add WebAnalytics Source' - } - }).closePromise.then(confirmed => { - deferred.resolve(confirmed.value); - }).catch(err => { - deferred.reject(err); - }); - return deferred.promise; + webAnalyticsChanges(msg) { + let deferred = this.$q.defer(); + var modalInstance = this.$modal.open({ + templateUrl: 'app/views/confirmation-box/admin-confirmation-box.tpl.html', + controller: 'ConfirmationBoxCtrl', + sizeClass:'modal-small', + resolve: { + message: function message() { + var message = { + item:'', + title:'Add WebAnalytics Source', + content: msg + }; + return message; + } + } + }); + modalInstance.result.then(function (confirm) { + if(confirm) + deferred.resolve(confirm); + else + deferred.reject(confirm); + }); + return deferred.promise; }; - updateWebAnalyticsReport(message) { + updateWebAnalyticsReport(msg) { let deferred = this.$q.defer(); - this.ngDialog.open({ - templateUrl: 'app/views/confirmation-box/admin-confirmation-box.tpl.html', - controller: 'ConfirmationBoxCtrl', - controllerAs: 'confirmBox', - className: 'confirm-box ngdialog-theme-default', - showClose: false, - data: { - message: message, - title: 'Update WebAnalytics Source' - } - }).closePromise.then(confirmed => { - deferred.resolve(confirmed.value); - }).catch(err => { - deferred.reject(err); - }); - return deferred.promise; + var modalInstance = this.$modal.open({ + templateUrl: 'app/views/confirmation-box/admin-confirmation-box.tpl.html', + controller: 'ConfirmationBoxCtrl', + sizeClass:'modal-small', + resolve: { + message: function message() { + var message = { + item:'', + title:'Update WebAnalytics Source', + content: msg + }; + return message; + } + } + }); + modalInstance.result.then(function (confirm) { + if(confirm) + deferred.resolve(confirm); + else + deferred.reject(confirm); + }); + return deferred.promise; }; } - ConfirmBoxService.$inject = ['$q', '$log', 'ngDialog']; + ConfirmBoxService.$inject = ['$q', '$log', 'ngDialog','$modal']; angular.module('ecompApp').service('confirmBoxService', ConfirmBoxService) })(); diff --git a/ecomp-portal-FE-common/client/app/services/utils/utils.service.js b/ecomp-portal-FE-common/client/app/services/utils/utils.service.js index 1cbb3ca8..2b121886 100644 --- a/ecomp-portal-FE-common/client/app/services/utils/utils.service.js +++ b/ecomp-portal-FE-common/client/app/services/utils/utils.service.js @@ -48,6 +48,14 @@ } return false; } + + showLoadingLayer() { + $("#loadLayer").css('display','inline'); + } + + hideLoadingLayer() { + $("#loadLayer").css('display','none'); + } } UtilsService.$inject = ['$log']; diff --git a/ecomp-portal-FE-common/client/app/styles/appDS2.less b/ecomp-portal-FE-common/client/app/styles/appDS2.less new file mode 100644 index 00000000..4e626f97 --- /dev/null +++ b/ecomp-portal-FE-common/client/app/styles/appDS2.less @@ -0,0 +1,7 @@ +.b2b-modal-header{ + font-size: 22px; +} + +.b2b-modal-body{ + font-size: 16px; +}
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.html b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.html index 3ecb47d0..798b4db1 100644 --- a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.html +++ b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.html @@ -1,9 +1,44 @@ -<div class="account-add-details-modal"> - <div id="account-add-details-title" class="account-details-title">Account - Details</div> +<style> + +.checkbox .skin { + left: 0px; + top: 0px; +} + +.add-label-right{ + float: right; + margin-top: -17px; +} + +.endpoint-item-left{ +width:75%; +padding-bottom:10px; +} +.icon-circle-action-remove { + float: right; + margin-top: -27px; +} +.item{ +padding-bottom:15px; +} +.account-property{ +padding-top:10px; +} +</style> + +<div> + + <div class="b2b-modal-header"> + <h2 class="account-details-title" id="account-add-details-title">Account Details</h2> + + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="accountdetails-button-cancel" + ng-click="$dismiss('cancel')"></button> + </div> + </div> - <div id="accounts"> - <div class="account-properties-main" + <div class="b2b-modal-body"> + <div class="account-properties-main" scroll-top="accountAddDetails.scrollApi"> <form id="accounts-details-form" name="serviceForm" novalidate autocomplete="off"> @@ -38,7 +73,7 @@ <input id="account-details-input-username" type="text" name="username" maxlength="100" ng-model="accountAddDetails.account.username" - ng-change="accountAddDetails.updateUsername()" /> + ng-change="accountAddDetails.updateUsername()" autocomplete="off" /> <div class="error-container" ng-show="(accountAddDetails.emptyAccountUsername @@ -53,7 +88,7 @@ <div class="item-label">Password</div> <input id="account-details-input-password" type="password" name="password" maxlength="100" - ng-model="accountAddDetails.account.password" /> + ng-model="accountAddDetails.account.password" autocomplete="off"/> </div> <div class="item"> @@ -74,7 +109,7 @@ <div class="add-endpoint-item"> <div class="item-label add-label-left">Add Endpoint</div> - <div class="icon-add add-label-right" + <div class="icon-add add-label-right" id="accountAddDetails-button-accordion" ng-click="accountAddDetails.addEndpoint()"></div> </div> <div class="item"> @@ -104,24 +139,30 @@ </div> <div class="account-property"> - <input id="accounts-checkbox-app-is-enabled" type="checkbox" - class="checkbox-field" - ng-model="accountAddDetails.account.active" /> - <div class="property-label checkbox-label">Active</div> - </div> - <div class="item"> - <div id="account-details-next-button" class="submit-button" - ng-click="accountAddDetails.closeThisDialog()">close</div> - <div id="account-details-next-button" class="submit-button" - ng-click="accountAddDetails.saveChanges()">Save</div> + <div class="property-label checkbox-label"> + <label for="accounts-checkbox-app-is-enabled" class="checkbox"> + <input type="checkbox" ng-model="accountAddDetails.account.active" id="accounts-checkbox-app-is-enabled"/> + <i class="skin"></i> + <span>Active</span> + </label> + </div> </div> + </div> </form> </div> + </div> + <br> + <div class="b2b-modal-footer"> + <div class="cta-button-group cta-modal-footer-flex"> + <div class="item"> + <div id="account-details-next-button" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Close</div> + <div id="account-details-next-button" class="btn btn-alt btn-small" ng-click="accountAddDetails.saveChanges()">Save</div> + </div> + </div> + </div> - - </div> </div> <script> diff --git a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js index 2f9afd39..97e4b703 100644 --- a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js +++ b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js @@ -1,14 +1,13 @@ 'use strict'; (function () { class AccountAddDetailsCtrl { - constructor($scope, $log, $interval, basicAuthAccountService, errorMessageByCode, ECOMP_URL_REGEX, $window, confirmBoxService, $cookies) { + constructor($scope, $log, $interval, basicAuthAccountService, errorMessageByCode, ECOMP_URL_REGEX, $window, confirmBoxService, $cookies,items) { this.addEndpoint = () => { this.account.endpointList.push({ valid: true }); } - let init = () => { this.account = []; this.account.endpointList = []; @@ -16,11 +15,11 @@ this.dupliateName = false; this.emptyAccountName = false; this.emptyAccountUsername = false; - this.accountList = $scope.ngDialogData.list; + this.accountList = items.list; - if ($scope.ngDialogData && $scope.ngDialogData.account) { + if (items&& items.account) { this.isEditMode = true; - this.account = _.clone($scope.ngDialogData.account); + this.account = _.clone(items.account); this.account.repassword = this.account.password; this.account.endpointList = this.account.endpoints; if(this.account.isActive == 'Y') @@ -42,9 +41,9 @@ }; - this.closeThisDialog = () => { + /* this.closeThisDialog = () => { $scope.closeThisDialog(true); - } + }*/ this.removeEndpointItem = (endpoint) => { for(var i = 0; i < this.account.endpointList.length; i++){ @@ -55,10 +54,6 @@ } } - this.confirmPassword = () => { - this.passwordMatched = true; - } - this.updateUsername = () => { this.emptyAccountUsername = false; } @@ -144,13 +139,17 @@ confirmBoxService.editItem(message).then(isConfirmed => { if(isConfirmed){ basicAuthAccountService.updateAccount(this.account.id, newAccount).then(() => { - $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); + $window.location.reload(); + }); } }); }else{ basicAuthAccountService.createAccount(newAccount).then(() => { - $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); + $window.location.reload(); + }); } } @@ -161,6 +160,6 @@ }); } } - AccountAddDetailsCtrl.$inject = ['$scope', '$log', '$interval', 'basicAuthAccountService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window', 'confirmBoxService', '$cookies']; + AccountAddDetailsCtrl.$inject = ['$scope', '$log', '$interval', 'basicAuthAccountService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window', 'confirmBoxService', '$cookies','items']; angular.module('ecompApp').controller('AccountAddDetailsCtrl', AccountAddDetailsCtrl); })();
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.less b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.less index 6a916d6c..a18be84b 100644 --- a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.less +++ b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.less @@ -36,7 +36,11 @@ vertical-align: middle; position: relative; top: -1px; - } + } + .checkbox .skin { + left: 0px; + top: 0px; + } } .add-endpoint-item{ position: relative; @@ -98,10 +102,7 @@ vertical-align: middle; display:inline-block; width: 15%; - //border-radius: 2px; - //border: 1px solid @attLGray; margin-right: 10px; - //background: @attWhite; white-space: nowrap; .dGray14r; } @@ -110,7 +111,6 @@ width: 45%; border-radius: 2px; border: 1px solid; - //background: @attWhite; vertical-align: middle; } @@ -123,7 +123,6 @@ //border-radius: 2px; //border: 1px solid; margin-right: 10px; - //background: @attWhite; white-space: nowrap; .dGray14r; } @@ -148,7 +147,6 @@ display:inline-block; width: 80%; margin-right: 10px; - //background: @attWhite; white-space: nowrap; .dGray14r; } @@ -157,7 +155,6 @@ height: 30px; display:inline-block; width: 20%; - //background: @attWhite; vertical-align: middle; white-space: nowrap; .dGray14r; diff --git a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.controller.js b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.controller.js index deed9dc8..38c2bb17 100644 --- a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.controller.js +++ b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.controller.js @@ -1,7 +1,7 @@ 'use strict'; (function () { class AccountOnboardingCtrl { - constructor($log, ngDialog, confirmBoxService, basicAuthAccountService, $cookies, $scope) { + constructor($log, ngDialog, confirmBoxService, basicAuthAccountService, $cookies, $scope,$modal) { let init = () => { @@ -34,18 +34,24 @@ list: $scope.accountList } } - ngDialog.open({ + var modalInstance = $modal.open({ templateUrl: 'app/views/account-onboarding/account-add-details/account-add-details.html', - controller: 'AccountAddDetailsCtrl', - controllerAs: 'accountAddDetails', - data: data - }).closePromise.then(needUpdate => { + controller: 'AccountAddDetailsCtrl as accountAddDetails', + sizeClass: 'modal-medium', + resolve: { + items: function () { + return data; + } + } + }) + + modalInstance.result.then(function (needUpdate) { if(needUpdate.value === true){ if(needUpdate.value === true){ - getOnboardingAccounts(); - } - } - }); + getOnboardingAccounts(); + } + } + }); }; @@ -67,6 +73,6 @@ init(); } } - AccountOnboardingCtrl.$inject = ['$log', 'ngDialog', 'confirmBoxService', 'basicAuthAccountService', '$cookies', '$scope']; + AccountOnboardingCtrl.$inject = ['$log', 'ngDialog', 'confirmBoxService', 'basicAuthAccountService', '$cookies', '$scope','$modal']; angular.module('ecompApp').controller('AccountOnboardingCtrl', AccountOnboardingCtrl); })();
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.controller.js b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.controller.js index 9aec9b4f..a5ba0215 100644 --- a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.controller.js +++ b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.controller.js @@ -21,15 +21,14 @@ 'use strict'; (function () { class NewAdminModalCtrl { - constructor($log, adminsService, $scope, confirmBoxService, utilsService, $location) { - + constructor($log, adminsService, $scope, confirmBoxService, utilsService, $location, items) { let init = () => { this.isSaving = false; this.originalApps = []; /* istanbul ignore if */ - if ($scope.ngDialogData && $scope.ngDialogData.selectedUser && $scope.ngDialogData.dialogState) { - this.selectedUser = $scope.ngDialogData.selectedUser; - this.dialogState = $scope.ngDialogData.dialogState; + if (items && items.selectedUser && items.dialogState) { + this.selectedUser = items.selectedUser; + this.dialogState = items.dialogState; this.isShowBack = false; if (this.dialogState === 2) { this.getAdminAppsRoles(); @@ -162,7 +161,7 @@ $log.debug('Admin apps roles updated successfully!', res); //close and resolve dialog promise with true (to update the table) this.remindToAddUserIfNecessary(); - $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); }).catch(err => { $log.error('NewAdminModalCtrl.updateAdminAppsRoles:: Failed - ' + err); }).finally(()=> { @@ -193,7 +192,7 @@ * add it to the user administrated apps list */ $scope.$watch('newAdmin.selectedNewApp.value', (newVal) => { - var newVal= JSON.parse(newVal); + if(newVal) var newVal= JSON.parse(newVal); if (!newVal || newVal.isAdmin === undefined) { return; } @@ -248,6 +247,6 @@ } } - NewAdminModalCtrl.$inject = ['$log', 'adminsService', '$scope', 'confirmBoxService', 'utilsService', '$location']; + NewAdminModalCtrl.$inject = ['$log', 'adminsService', '$scope', 'confirmBoxService', 'utilsService', '$location', 'items']; angular.module('ecompApp').controller('NewAdminModalCtrl', NewAdminModalCtrl); })(); diff --git a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.html b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.html index a18b8f60..f186fc58 100644 --- a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.html +++ b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.html @@ -17,59 +17,102 @@ limitations under the License. ================================================================================ --> -<div class="new-admin-modal"> + <style> + .title{ + border-bottom: none !important; + } + + .b2b-modal-footer .cta-button-group { + border-top: 0px solid #d2d2d2; + } + +</style> - <div class="search-users" ng-show="newAdmin.dialogState===1"> +<div> + <div ng-if="newAdmin.dialogState===1"> - <search-users search-title="New Admin" - selected-user="newAdmin.selectedUser"></search-users> + <div class="b2b-modal-header"> + <h2 class="heading-medium" id="newAdmin">New Admin</h2> - <div class="dialog-control"> - <button id="search-users-button-next" class="btn btn-alt btn-small" ng-click="newAdmin.selectedUser && newAdmin.getAdminAppsRoles()" - ng-class="{disabled: !newAdmin.selectedUser}">Next - </button> - <button id="search-users-button-cancel" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Cancel</button> - </div> - </div> - <br> - <div id="div-admin-app-roles" class="admin-app-roles" ng-show="newAdmin.dialogState===2"> - <div class="title" id="title" - ng-bind="newAdmin.selectedUser.firstName + ' ' + newAdmin.selectedUser.lastName + ' (' + newAdmin.selectedUser.orgUserId + ')'"></div> - <div class="app-roles-main"> - <div id="div-app-roles-main-title" class="app-roles-main-title"> - <span class="left">Administrates:</span> - <!--<span class="right" ng-click="newAdmin.addAdministratedApp()">+Add</span>--> - </div> + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="admin-button-cancel" + ng-click="$dismiss('cancel')"></button> + </div> + </div> + <div class="b2b-modal-body" tabindex="0" + aria-label="Modal header text content" role="region"> + <search-users search-title="" selected-user="newAdmin.selectedUser"></search-users> + </div> - <div class="adminAppsRoles_dropdown"> - <select id="dropdown1" name="dropdown1" b2b-dropdown - placeholder-text="Select application" - ng-model="newAdmin.selectedNewApp.value"> - <option b2b-dropdown-list option-repeat="app in (filteredApps = (newAdmin.adminAppsRoles | filter:{isAdmin:'false'})) track by app.id " ng-disabled="!filteredApps.length" value="{{app}}">{{app.appName}}</option> - </select> - </div> - <br> + <div class="b2b-modal-footer"> + <div class="cta-button-group in"> + <button id="search-users-button-next" class="btn btn-alt btn-small" + ng-click="newAdmin.selectedUser && newAdmin.getAdminAppsRoles()" + ng-class="{disabled: !newAdmin.selectedUser}">Next</button> + <button id="search-users-button-cancel" + class="btn btn-alt btn-small" id="div-cancel-button" ng-click="$dismiss('cancel')">Cancel</button> + </div> + </div> - <div class="admin-roles-list"> - <div ng-repeat="app in (newAdmin.adminAppsRoles | orderBy:newAdmin.orderFilter) track by app.id" ng-show="app.isAdmin"> - <div id="select-app-{{app.appName.split(' ').join('-')}}" class="administrated-application" ng-bind="app.appName | elipsis: 57"></div> - <i id="i-delete-application" class="icon-misc-trash" ng-click="newAdmin.unadminApp(app)"> </i> - </div> - </div> + </div> + + <div id="div-admin-app-roles" class="app-roles-main" ng-if="newAdmin.dialogState===2"> + <div class="b2b-modal-header"> + <div class="title" id="title" + ng-bind="newAdmin.selectedUser.firstName + ' ' + newAdmin.selectedUser.lastName + ' (' + newAdmin.selectedUser.orgUserId + ')'"> + </div> - <div class="dialog-control"> - <span class="ecomp-save-spinner" ng-show="newAdmin.isSaving"></span> - <button id="button-back" ng-show="newAdmin.isShowBack" class="btn btn-alt btn-small" ng-click="newAdmin.navigateBack()">Back</button> - <button id="div-updateAdminAppsRoles" class="btn btn-alt btn-small" ng-click="newAdmin.updateAdminAppsRoles()" - ng-class="{disabled: false}">Save - </button> - <button id="div-cancel-button" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Cancel</button> - </div> + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" + ng-click="$dismiss('cancel')"></button> + </div> + </div> - </div> - </div> + <div class="b2b-modal-body"> + <div id="div-app-roles-main-title" class="app-roles-main-title"> + <span class="left">Administrates:</span> + <!--<span class="right" ng-click="newAdmin.addAdministratedApp()">+Add</span>--> + </div> + <div class="adminAppsRoles_dropdown"> + <select id="dropdown1" name="dropdown1" b2b-dropdown + placeholder-text="Select application" + ng-model="newAdmin.selectedNewApp.value"> + <option b2b-dropdown-list + option-repeat="app in (filteredApps = (newAdmin.adminAppsRoles | filter:{isAdmin:'false'})) track by app.id " + ng-disabled="!filteredApps.length" value="{{app}}">{{app.appName}}</option> + </select> + </div> + <br> + <div class="admin-roles-list"> + <div + ng-repeat="app in (newAdmin.adminAppsRoles | orderBy:newAdmin.orderFilter) track by app.id" + ng-show="app.isAdmin"> + <span id="select-app-{{app.appName.split(' ').join('-')}}" + class="administrated-application" + ng-bind="app.appName | elipsis: 57"></span> <i + id="i-delete-application" class="icon-misc-trash" + ng-click="newAdmin.unadminApp(app)"> </i> + </div> + </div> + </div> + <br> + <div class="b2b-modal-footer"> + <div class="cta-button-group in"> + + <span class="ecomp-save-spinner" ng-show="newAdmin.isSaving"></span> + <button id="button-back" ng-show="newAdmin.isShowBack" + class="btn btn-alt btn-small" ng-click="newAdmin.navigateBack()">Back</button> + <button id="div-updateAdminAppsRoles" class="btn btn-alt btn-small" + ng-click="newAdmin.updateAdminAppsRoles()" + ng-class="{disabled: false}">Save</button> + <button id="div-cancel-button" class="btn btn-alt btn-small" + ng-click="$dismiss('cancel')">Cancel</button> + + </div> + </div> + </div> </div> diff --git a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.less b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.less index f7c1111d..1ac5963f 100644 --- a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.less +++ b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.less @@ -1,6 +1,7 @@ .new-admin-modal { height: 430px; margin-left: 20px; + height: 350px; .search-users { } @@ -8,7 +9,7 @@ .admin-app-roles { .title { //.n18r; - .dGray18r; //AT&T Dark Gray + .dGray18r; border-bottom: @blue-active 3px solid; } @@ -81,5 +82,53 @@ } } + + .adminForm-title { + color: #5a5a5a; + font-size: 18px; + border-bottom: #067ab4 3px solid; + margin-left:0px; + } + + .adminForm-name-property-label { + margin-bottom: 5px; + color: #5a5a5a; + font-size: 14px; + font-weight: bold; + padding-top: 20px; + } + + .adminForm-requiredId { + color: red; + } + + .adminForm-name-property-required { + color: #cf2a2a; + font-size: 10px; + } + + .adminForm-property-required-small { + position: absolute; + } + + .adminForm-code-property-label { + margin-bottom: 5px; + color: #5a5a5a; + font-size: 14px; + font-weight: bold; + padding-top: 20px; + } + + .adminForm-code-property-input { + display: inline-block; + width: 338px; + //height: 40px; + } + + .adminForm-code-property-required { + color: #cf2a2a; + font-size: 10px; + } + } diff --git a/ecomp-portal-FE-common/client/app/views/admins/admins.controller.js b/ecomp-portal-FE-common/client/app/views/admins/admins.controller.js index 05f9db3b..28144ed7 100644 --- a/ecomp-portal-FE-common/client/app/views/admins/admins.controller.js +++ b/ecomp-portal-FE-common/client/app/views/admins/admins.controller.js @@ -20,7 +20,7 @@ 'use strict'; (function () { class AdminsCtrl { - constructor($log, adminsService, applicationsService, ngDialog) { + constructor($log, adminsService, applicationsService, ngDialog, $modal) { let allPortalsFilterObject = {index: 0, title: 'All applications', value: ''}; @@ -119,43 +119,23 @@ } } } - ngDialog.open({ + var modalInstance = $modal.open({ templateUrl: 'app/views/admins/add-admin-dialogs/new-admin.modal.html', - controller: 'NewAdminModalCtrl', - controllerAs: 'newAdmin', - data: data - }).closePromise.then(needUpdate => { - if(needUpdate.value === true){ - // $log.debug('AdminsCtrl:openAddNewAdminModal:: updating table data...'); - updateTableData(); - } + controller: 'NewAdminModalCtrl as newAdmin', + sizeClass: 'modal-medium', + resolve: { + items: function () { + return data; + } + } }); + + modalInstance.result.finally(function () { + updateTableData(); + }); }; - - this.openEditUserModal = (loginId) => { - var data = { - loginId : loginId, - updateRemoteApp : false, - appId : this.selectedApp!=null?this.selectedApp.id:'' - } - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/header/user-edit/edit-user.tpl.html', - controller: 'editUserController', - data: data, - resolve: { - message: function message() { - var message = { - type: 'Contact', - }; - return message; - } - } - }).closePromise.then(needUpdate => { - updateTableData(); - }); - } } } - AdminsCtrl.$inject = ['$log', 'adminsService', 'applicationsService', 'ngDialog']; + AdminsCtrl.$inject = ['$log', 'adminsService', 'applicationsService', 'ngDialog', '$modal']; angular.module('ecompApp').controller('AdminsCtrl', AdminsCtrl); })(); diff --git a/ecomp-portal-FE-common/client/app/views/admins/admins.tpl.html b/ecomp-portal-FE-common/client/app/views/admins/admins.tpl.html index f9ea3ff9..45bd184c 100644 --- a/ecomp-portal-FE-common/client/app/views/admins/admins.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/admins/admins.tpl.html @@ -26,14 +26,14 @@ <div class="table-control"> <div class="table-control-fields"> <div class="table-dropdown"> - <select id="dropdown1" name="dropdown1" b2b-dropdown placeholder-text="All application" ng-model="admins.filterByApp.value"> + <select id="dropdown1" name="dropdown1" b2b-dropdown ng-model="admins.filterByApp.value"> <option b2b-dropdown-list option-repeat="d in admins.availableApps" value="{{d.value}}">{{d.title}}</option> </select> </div> <div > <input id="input-table-search" placeholder="Search in entire table" class="table-search-field" type="text" data-ng-model="admins.searchString"> </div> - <button class="btn btn-alt btn-small" ng-click="admins.openAddNewAdminModal()"><i class="icon-people-userbookmark" aria-hidden="true"></i> Add Admin</button> + <button class="btn btn-alt btn-small" id="admin-button-add" ng-click="admins.openAddNewAdminModal()"><i class="icon-people-userbookmark" aria-hidden="true"></i> Add Admin</button> </div> </div> <span class="ecomp-spinner" ng-show="admins.isLoadingTable"></span> diff --git a/ecomp-portal-FE-common/client/app/views/applications/application-details-dialog/application-details.modal.less b/ecomp-portal-FE-common/client/app/views/applications/application-details-dialog/application-details.modal.less index 1c8ae297..c580ac6a 100644 --- a/ecomp-portal-FE-common/client/app/views/applications/application-details-dialog/application-details.modal.less +++ b/ecomp-portal-FE-common/client/app/views/applications/application-details-dialog/application-details.modal.less @@ -1,9 +1,9 @@ .application-details-modal { - height: 700px; + // height: 700px; .title { //.n18r; - .dGray18r; //AT&T Dark Gray + .dGray18r; border-bottom: @blue-active 3px solid; } @@ -103,4 +103,13 @@ } +.input-app-image-upload-ht { + height: 24px; +} + +.checkbox .skin { + left: 0px; + top: 0px; + } + } diff --git a/ecomp-portal-FE-common/client/app/views/catalog/add-catalog-dialogs/new-catalog.modal.less b/ecomp-portal-FE-common/client/app/views/catalog/add-catalog-dialogs/new-catalog.modal.less new file mode 100644 index 00000000..39eb8ab9 --- /dev/null +++ b/ecomp-portal-FE-common/client/app/views/catalog/add-catalog-dialogs/new-catalog.modal.less @@ -0,0 +1,132 @@ +.new-catalog-modal { + height: 430px; + + .user-catalog-roles{ + .title{ + //.n18r; + .dGray18r; //Dark Gray + border-bottom: @portalDBlue 3px solid; + } + + input:not([type="button"]) { + height: 13px; +} + .display-userApp-Catalog-Roles + { + padding-left: 16px; + padding-top: 10px; + font-family: Omnes-ECOMP-W02,Arial; + font-size: 18px; + color: #5a5a5a; + } + + #pending-checkbox{ + font-family: Omnes-ECOMP-W02,Arial; + font-size: 15px; + color: #5a5a5a; + } + .app-catalog-roles-list{ + height: 286px; + + + .app-catalog-item{ + border: 1px solid @portalLGray; + border-radius: 2px; + background-color: @funcBkgGray; + + padding: 10px; + margin-top: 8px; + //margin-right: 6px; + //margin-left: 6px; + + .app-catalog-item-left{ + padding-top: 0; + line-height: 30px; + height: 30px; + vertical-align: middle; + display:inline-block; + width: 45%; + border-radius: 2px; + border: 1px solid @portalLGray; + margin-right: 10px; + padding-left: 4px; + background: @portalWhite; + white-space: nowrap; + + } + .app-catalog-item-right{ + display:inline-block; + width: 45%; + border-radius: 2px; + border: 1px solid @portalLGray; + background: @portalWhite; + vertical-align: middle; + } + + .app-catalog-item-right-error{ + .portalRed; + padding: 7px 7px 7px 7px; + display:inline-block; + width: 45%; + border-radius: 2px; + border: 1px solid @portalLGray; + background: @portalWhite; + vertical-align: middle; + } + + .app-catalog-item-right-contacting{ + .portalGreen; + padding: 7px 7px 7px 7px; + display:inline-block; + width: 45%; + border-radius: 2px; + border: 1px solid @portalLGray; + background: @portalWhite; + vertical-align: middle; + } + + .app-select-left{ + width: 45%; + margin-right: 10px; + vertical-align: middle; + + + .select-field{ + padding-top: 0; + line-height: 30px; + height: 30px; + vertical-align: middle; + border-radius: 2px; + border: 1px solid @portalLGray; + margin-right: 10px; + padding-left: 4px; + background: @portalWhite; + display:inline-block; + } + } + + + .app-item-delete{ + .ico_trash_default; + display: inline-block; + vertical-align: 2px; + cursor: pointer; + position: relative; + top: 6px; + color: transparent; + margin-left: 8px; + + } + + } + } + + } + + .userApp-Catalog-Roles-value { + height: 150px; + width: 200px; + overflow-y: auto; + } + +} diff --git a/ecomp-portal-FE-common/client/app/views/catalog/catalog.less b/ecomp-portal-FE-common/client/app/views/catalog/catalog.less index dc5e4671..bbff8517 100644 --- a/ecomp-portal-FE-common/client/app/views/catalog/catalog.less +++ b/ecomp-portal-FE-common/client/app/views/catalog/catalog.less @@ -389,9 +389,14 @@ ul { right: 10px; position: absolute; } +.checkbox input{ + margin: 6px; + left: 112px; + top: -20px; + } .checkbox .skin { left: 125px; - top: -24px; + top: -18px; } .form-row { margin-top: -14px; @@ -409,5 +414,19 @@ margin-left: 126px; .checkbox, .radio { min-height: 0px; padding-left: 0px; +} + +.access-request-txt { + text-align: right; +} -}
\ No newline at end of file +.catalog-radio-div{ + display:inline-block; + margin-right:5px; +} + + +.radio input:checked + .skin:after{ + width:22px; + height:22px; +} diff --git a/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html b/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html index fd71e59b..d3c10441 100644 --- a/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html @@ -23,22 +23,37 @@ <h1 class="heading-page">Application Catalog</h1> </div> <div class="app-catalog-list"> - <div class="simulateCatGridHeader"> - <span class="simulateCatGridHeaderDetails"> Click the check - boxes below to choose which applications are shown on the <a - href="applicationsHome">home page</a>. - </span> <br> <br> <label id="label-all" - class="simulateCatGridHeaderRadio"> Filter: <input - id="radio-button-all" type="radio" ng-model="radioValue" - value="All"> All - </label> <label id="label-accessible" class="simulateCatGridHeaderRadio"> - <input id="radio-button-accessible" type="radio" - ng-model="radioValue" value="Accessible"> Accessible - </label> <label id="label-homepage" class="simulateCatGridHeaderRadio"> - <input id="radio-button-homepage" type="radio" - ng-model="radioValue" value="Selected"> On Home Page - </label> - + <div class="simulateCatGridHeader"> + <span class="simulateCatGridHeaderDetails"> Click the check + boxes below to choose which applications are shown on the <a + href="applicationsHome">home page</a>. + </span> <br> <br> + <div class="catalog-radio-div"> + <label for="radio-button-all" class="radio"> + <span>Filter: </span> + </label> + </div> + <div class="catalog-radio-div"> + <label for="radio-button-all" class="radio"> + <input type="radio" ng-model="radioValue" id="radio-button-all" name="All" value="All" > + <i class="skin"></i> + <span>All</span> + </label> + </div> + <div class="catalog-radio-div"> + <label for="radio-button-accessible" class="radio"> + <input type="radio" ng-model="radioValue" id="radio-button-accessible" name="Accessible" value="Accessible" > + <i class="skin"></i> + <span>Accessible</span> + </label> + </div> + <div class="catalog-radio-div"> + <label for="radio-button-homepage" class="radio"> + <input type="radio" ng-model="radioValue" id="radio-button-homepage" name="Selected" value="Selected"> + <i class="skin"></i> + <span>On Home Page</span> + </label> + </div> </div> <div class="appCatalogue-boarder" > <div gridster="catalog.gridsterOpts"> @@ -54,12 +69,21 @@ <div class="form-row" ng-show="item.access || isAdminPortalAdmin"> <label class="checkbox"> <input id="gridster-{{item.headerText.split(' ').join('-')}}-icon-checkbox" type="checkbox" ng-model="item.select" ng-change="catalog.storeSelection(item)"> - <i class="skin"></i> + <i id="gridster-{{item.headerText.split(' ').join('-')}}-icon-checkbox" class="skin"></i> </label> <i ng-show="item.pending" class="icon-tickets-contested"></i> </div> - </div> - <div ng-include src="'app/views/catalog/get-accessswitch.html'"></div> + </div> + <div class="gridster-box-content" + ng-style="{'cursor':'pointer', + 'background-image': 'url('+(item.imageLink)+')', + 'order': item.order, + 'background-color':'white', + 'background-repeat': 'no-repeat', + 'background-size': '168px 118px'}" + ng-click="catalog.openAddRoleModal(item)" + ng-hide="users.isLoadingTable && !users.getAppCatalogIsDone"> + </div> </div> </li> </ul> @@ -68,9 +92,9 @@ <br> - <div style="text-align: right;"> + <div class="access-request-txt"> To request access to an application, please visit the <a - id="get-access-page-link" ng-href="getAccess">Get Access</a> page. + id="get-access-page-link" ng-href="getAccess">Get Access</a> page. </div> <br> diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/admin-confirmation-box.tpl.html b/ecomp-portal-FE-common/client/app/views/confirmation-box/admin-confirmation-box.tpl.html index 69f9af84..3d5e8cc2 100644 --- a/ecomp-portal-FE-common/client/app/views/confirmation-box/admin-confirmation-box.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/admin-confirmation-box.tpl.html @@ -17,15 +17,20 @@ limitations under the License. ================================================================================ --> -<div class="confirmation-box-container"> - <div class="confirmation-title-wrap"> - <div class="confirmation-title" ng-bind="confirmBox.title"></div> - </div> - <div class="confirmation-message-wrap"> - <div class="confirmation-message" ng-bind="confirmBox.message"></div> - </div> - <div class="dialog-control"> - <div id="confirm-admin-update" class="btn btn-alt btn-small" ng-click="confirmBox.closeBox(true)">Confirm</div> - <div id="cancel-admin-update" class="btn btn-alt btn-small" ng-click="confirmBox.closeBox(false)">Cancel</div> - </div> +<div> + <div class="b2b-modal-header ng-scope in"> + <h2 id="myModalLabel" modal-title="">{{message.title}}</h2> + <div class="corner-button in"> + <button type="button" class="close" id="admin-div-close-button" aria-label="Close" ng-click="$dismiss('cancel')"></button> + </div> + </div> + <div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content"> + {{message.content}} + </div> + <div class="b2b-modal-footer ng-scope ng-isolate-scope in"> + <div class="cta-button-group in"> + <button class="btn btn-alt btn-small" id="admin-div-ok-button" type="button" ng-click="ok(true)">OK</button> + <button class="btn btn-alt btn-small" id="admin-div-cancel-button" type="button" ng-click="$dismiss('cancel')">Cancel</button> + </div> + </div> </div> diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js b/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js index 36eb04a8..ef553e23 100644 --- a/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js +++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js @@ -23,13 +23,13 @@ 'use strict'; (function () { class ConfirmationBoxCtrl { - constructor($scope,$state) { - - let init = () => { - let item = ($scope.ngDialogData && $scope.ngDialogData.item) || 'this'; - this.message = $scope.ngDialogData.message ? $scope.ngDialogData.message : `Are you sure you want to delete "${item}"?`; - this.title = $scope.ngDialogData.title ? $scope.ngDialogData.title : ''; - }; + constructor($scope,$state,message,$modalInstance) { + $scope.message = message; + /*let init = () => { + let item = ($scope.message && $scope.message.item) || 'this'; + message = $scope.message.content ? $scope.message.content : `Are you sure you want to delete "${message.item}"?`; + this.title = $scope.message.title ? $scope.message.title : ''; + };*/ this.closeBox = isConfirmed => { $scope.closeThisDialog(isConfirmed); @@ -40,10 +40,14 @@ $state.go(state,params); }; + + $scope.ok =function(confirm){ + $modalInstance.close(confirm); + } - init(); + // init(); } } - ConfirmationBoxCtrl.$inject = ['$scope','$state']; + ConfirmationBoxCtrl.$inject = ['$scope','$state','message','$modalInstance']; angular.module('ecompApp').controller('ConfirmationBoxCtrl', ConfirmationBoxCtrl); })(); diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.tpl.html b/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.tpl.html index 8f880ef4..14bc7fda 100644 --- a/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.tpl.html @@ -17,12 +17,20 @@ limitations under the License. ================================================================================ --> -<div class="confirmation-box-container"> - <div class="confirmation-message-wrap"> - <div id="confirmation-message" class="confirmation-message" ng-bind="confirmBox.message"></div> - </div> - <div class="dialog-control"> - <div id="confirmation-button-next" class="btn btn-alt btn-small" ng-click="confirmBox.closeBox(true)">OK</div> - <div id="confirmation-button-cancel" class="btn btn-alt btn-small" ng-click="confirmBox.closeBox(false)">Cancel</div> - </div> -</div> +<div> + <div class="b2b-modal-header ng-scope in"> + <h2 id="myModalLabel" modal-title="">{{message.title}}</h2> + <div class="corner-button in"> + <button type="button" class="close" id="div-confirm-close-button" aria-label="Close" ng-click="$dismiss('cancel')"></button> + </div> + </div> + <div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content"> + {{message.content}} + </div> + <div class="b2b-modal-footer ng-scope ng-isolate-scope in"> + <div class="cta-button-group in"> + <button class="btn btn-alt btn-small" id="div-confirm-ok-button" type="button" ng-click="ok(true)">OK</button> + <button class="btn btn-alt btn-small" id="div-confirm-cancel-button" type="button" ng-click="ok(false)">Cancel</button> + </div> + </div> +</div>
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/dragdrop-confirmation-box.tpl.html b/ecomp-portal-FE-common/client/app/views/confirmation-box/dragdrop-confirmation-box.tpl.html index f6a1a29b..ba05c656 100644 --- a/ecomp-portal-FE-common/client/app/views/confirmation-box/dragdrop-confirmation-box.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/dragdrop-confirmation-box.tpl.html @@ -17,15 +17,20 @@ limitations under the License. ================================================================================ --> -<div class="confirmation-box-container"> - <div class="confirmation-title-wrap"> - <div class="confirmation-title" ng-bind="confirmBox.title"></div> - </div> - <div class="confirmation-message-wrap"> - <div class="confirmation-message" ng-bind="confirmBox.message"></div> - </div> - <div class="dialog-control"> - <div class="next-button" ng-click="confirmBox.closeBox(true)">Confirm</div> - <div class="cancel-button" ng-click="confirmBox.closeBox(false)">Cancel</div> - </div> +<div> + <div class="b2b-modal-header ng-scope in"> + <h2 id="myModalLabel" modal-title="">{{message.title}}</h2> + <div class="corner-button in"> + <button type="button" class="close" id="div-dragdrop-close-button" aria-label="Close" ng-click="$dismiss('cancel')"></button> + </div> + </div> + <div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content" style="height: 40px;"> + {{message.content}} + </div> + <div class="b2b-modal-footer ng-scope ng-isolate-scope in"> + <div class="cta-button-group in"> + <button class="btn btn-alt btn-small" id="div-dragdrop-ok-button" type="button" ng-click="ok(true)">OK</button> + <button class="btn btn-alt btn-small" id="div-dragdrop-cancel-button" type="button" ng-click="$dismiss('cancel')">Cancel</button> + </div> + </div> </div> diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/information-box.tpl.html b/ecomp-portal-FE-common/client/app/views/confirmation-box/information-box.tpl.html index 1eaa2819..5725fca1 100644 --- a/ecomp-portal-FE-common/client/app/views/confirmation-box/information-box.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/information-box.tpl.html @@ -17,11 +17,19 @@ limitations under the License. ================================================================================ --> -<div class="confirmation-box-container"> - <div class="confirmation-message-wrap"> - <div class="confirmation-message" >{{confirmBox.message}}</div> - </div> - <div class="dialog-control" id="dialog-close"> - <div id="close-button" class="btn btn-alt btn-small" ng-click="confirmBox.closeBox(false)">Close</div> - </div> +<div> + <div class="b2b-modal-header ng-scope in"> + <h2 id="myModalLabel" modal-title="">{{message.title}}</h2> + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="div-information-close-button" ng-click="$dismiss('cancel')"></button> + </div> + </div> + <div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content" style="height: 60px;"> + {{message.content}} + </div> + <div class="b2b-modal-footer ng-scope ng-isolate-scope in"> + <div class="cta-button-group in"> + <button class="btn btn-alt btn-small" type="button" id="information-cancel-button" ng-click="$dismiss('cancel')">OK</button> + </div> + </div> </div> diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/reload-page-confirm.html b/ecomp-portal-FE-common/client/app/views/confirmation-box/reload-page-confirm.html new file mode 100644 index 00000000..0a60edbc --- /dev/null +++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/reload-page-confirm.html @@ -0,0 +1,36 @@ +<!-- + ================================================================================ + ECOMP Portal + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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. + ================================================================================ + --> +<div> + <div class="b2b-modal-header ng-scope in"> + <h2 id="myModalLabel" modal-title="">Page Reload</h2> + <div class="corner-button in"> + <button type="button" class="close" id="div-confirm-close-button" aria-label="Close" ng-click="$dismiss('cancel')"></button> + </div> + </div> + <div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content"> + {{message.content}} + </div> + <div class="b2b-modal-footer ng-scope ng-isolate-scope in"> + <div class="cta-button-group in"> + <button class="btn btn-alt btn-small" id="div-confirm-ok-button" type="button" ng-click="reload()">Retry</button> + <button class="btn btn-alt btn-small" id="div-confirm-cancel-button" type="button" ng-click="$dismiss('cancel')">Cancel</button> + </div> + </div> +</div>
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-manage.html b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-manage.html index f47e17c2..5e78201e 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-manage.html +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-manage.html @@ -17,17 +17,23 @@ limitations under the License. ================================================================================ --> -<div style="margin-top: 10px; margin-bottom: 10psx;"> - <h1 class="heading1"></h1> -</div> -<br /> + + +<div class="manage-widget-txt"> + + <div class="b2b-modal-header"> + <h2 class="title" id="manage-contactUs-home-manageWidgets-title">Manage {{widgetTypeDisplay}} Widgets</h2> + + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" + ng-click="$dismiss('cancel')"></button> + </div> + </div> -<div style="margin-top: 25px;"> - <div id="title" class="manage-contactUs-home-manageWidgets-title">Manage {{widgetTypeDisplay}} Widgets</div> - <div class="widgets-popup-margin"> +<div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content" > <div class="get-access-table"> - <div class="table-control" style="margin:30px;"> - <div class="c-ecomp-portal-abs-table" style="height:300px""> + <div class="table-control widget-table-control"> + <div class="c-ecomp-portal-abs-table widget-table" > <table b2b-table id="table-main" table-data="ignoredTableData" current-page="ignoredCurrentPage"> @@ -70,7 +76,7 @@ <span class="icon-edit"></span> </div> <span ng-show="rowData.showEdit"> - <a id="save-button" att-button btn-type="primary" ng-click="modify($index);" class="button button--primary" size="small" >Save</a> + <a id="save-button" ng-click="modify($index);" class="btn btn-alt btn-small" size="small" >Save</a> </span> </td> <td b2b-table-body> @@ -83,11 +89,10 @@ </table> </div> - <div att-divider-lines></div> - <div style="margin-top: 15px; margin-left: -80px;" > + <div class="widget-field" > <form name = "widgetForm" novalidate> <div id="addWidgetHeader" class="contact-us-margin"> - <h1 style="font-size:18px;">Add</h1> + <h1 class="widget-add">Add</h1> <div class="errMsg">{{errMsg}}</div> <div class="sucessMsg" ng-bind="successMsg"></div> </div> @@ -107,44 +112,43 @@ <input id="widget-input-add-order" class="input-text-area" type="text" ng-model="newWidgetObject.sortOrder"/> </div> </div> - <div class="add-widget-field" ng-controller="DatePickerController" ng-show="{{widgetType=='EVENTS'}}"> - <h4>Event Date</h4> - <div> - <div> - <p class="input-group"> - <input id="widget-input-add-date" type="text" name = "eventDate" datetime="yyyy-MM-dd" class="input-text-area" uib-datepicker-popup="{{format}}" - ng-model="newWidgetObject.eventDate" is-open="popup1.opened" datepicker-options="dateOptions" close-text="Close" alt-input-formats="altInputFormats" - ng-focus="open1()" - ng-required = "widgetType =='EVENTS'" /> - </p> - </div> - </div> - </div> + <div class="add-widget-field"> + <h4>Event Date</h4> + <input class="notif-input-calendar" type="text" id="datepicker-end" + ng-model="newWidgetObject.eventDate" b2b-datepicker min="minDate" max="maxDate" + required /> + </div> <div class="add-contact-us-field-des" ng-show="{{widgetType=='EVENTS'}}"> <div class="property-label">Content</div> - <textarea style="margin-top: 0px; margin-bottom: 0px; height: 150px" ng-model="newWidgetObject.content" name="content" ng-required = "widgetType =='EVENTS'"> + <textarea class="widget-type-txt-area" ng-model="newWidgetObject.content" name="content" ng-required = "widgetType =='EVENTS'"> </textarea> </div> </div> - <div style="height:50px;"> - <a id="add-button" style="float:right; margin-top:20px;" att-button btn-type="primary" class="button button--primary" size="small" ng-click="saveNew()">Add New</a> - - </div> - <div att-divider-lines></div> + </div> </form> </div> - <div style="height:50px;"> - <a id="close-button" style="float:right;" att-button btn-type="primary" class="button button--primary" size="small" ng-click="closeDialog()">Close</a> - </div> + </div> - </div> </div> -</div> + </div> + <br> + <div class="b2b-modal-footer"> + <div class="dialog-control"> + <a id="add-button" class="btn btn-alt btn-small" ng-click="saveNew()">Add New</a> + + <a id="close-button" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Close</a> + + </div> + + </div> + +</div> + <script type="application/javascript"> $(document).ready(function(){ $(".ngdialog-content").css("width","85%"); diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameter-manage.html b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameter-manage.html index 1f958b7f..e5e7bdc2 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameter-manage.html +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameter-manage.html @@ -17,10 +17,19 @@ limitations under the License. ================================================================================ --> -<div class="manage-widget-parameters-header"></div> -<div id="title" class="manage-widget-parameters-title">Manage - Widgets Parameters Page</div> -<div class="widgets-popup-margin"> +<div class="manage-widget-parameter-header"> + + <div class="b2b-modal-header"> + <h2 class="title" id="manage-widget-parameters-title">Manage Widgets Parameters Page</h2> + + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" + ng-click="$dismiss('cancel')"></button> + </div> + </div> + + <div class="b2b-modal-body"> + <div class="widgets-popup-margin"> <div class="get-access-table"> <div class="table-control manage-widget-parameters-table"> <div class="c-ecomp-att-abs-table manage-widget-parameters-table-details"> @@ -60,9 +69,8 @@ <td b2b-table-body> <div ng-hide="rowData.showEdit" ng-click="setEdit($index);"> <span class="icon-edit"></span> - </div> <span ng-show="rowData.showEdit"> <a att-button - btn-type="primary" ng-click="modify($index);" - class="button button--primary" size="small">Save</a> + </div> <span ng-show="rowData.showEdit"> + <button class="btn btn-alt btn-small" id="admin-button-add" ng-click="modify($index);">Save</button> </span> </td> <td b2b-table-body> @@ -84,9 +92,13 @@ </div> </div> </div> + + </div> + <br> + </div> <script> $(document).ready(function(){ $(".ngdialog-close").attr('id','dialog-close'); }); -</script> +</script>
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.js b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.js index fb9a254f..10ccb9bf 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.js +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.js @@ -21,7 +21,8 @@ (function () { class WidgetParameterController { - constructor($scope, widgetsCatalogService, userProfileService) { + constructor($scope, widgetsCatalogService, userProfileService, $state,items) { + $scope.ngDialogData=items; let widgetId = $scope.ngDialogData.widgetId; $scope.modflag = false; $scope.isLoadingTable = false; @@ -70,12 +71,13 @@ if(res.status == 'OK'){ $scope.modflag = false; $scope.widgetParam[index].showEdit = false; + $state.reload(); } }); }; } } - WidgetParameterController.$inject = ['$scope', 'widgetsCatalogService', 'userProfileService']; + WidgetParameterController.$inject = ['$scope', 'widgetsCatalogService', 'userProfileService', '$state','items']; angular.module('ecompApp').controller('WidgetParameterController', WidgetParameterController); -})(); +})();
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.less b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.less index 8f326c42..5c0ce37d 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.less +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.less @@ -79,4 +79,59 @@ padding-bottom: 20px; height: 32px; border-color: slategrey !important; width:100%; - }
\ No newline at end of file + } + .heading1-txt { + margin-top: 10px; + margin-bottom: 10px; + } + .manage-widgets-txt { + margin-top: 25px; + } + .widget-table-control { + margin:30px; + } + .widget-table { + height:300px; + } + .widget-field { + margin-top: 15px; + margin-left: -80px; + } + .widget-add { + font-size:18px; + } + .widget-type-txt-area { + margin-top: 0px; + margin-bottom: 0px; + height: 150px; + } + .widget-button-height { + height:50px; + } + .widget-button { + float:right; + margin-top:20px; + } + .widget-close-button { + float:right; + } + + .btn-calendar-icon { + position: relative; + width: 10px; + right:25px; + top:0px; +} +.dialog-control{ +bottom:30px; +} +input[type="text"]:focus { + z-index: 0; +} + + .get-access-table{ + height:500px; + overflow:auto; + } + +
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js index 8481b5ed..4c5ee2cf 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.controller.js @@ -54,9 +54,10 @@ function _classCallCheck(instance, Constructor) { $scope.editWidgetModalPopup = function(availableData, resourceType) { $scope.editData = JSON.stringify(availableData); $scope.availableDataTemp = $scope.availableData; - ngDialog.open({ + var modalInstance = $modal.open({ templateUrl: 'app/views/dashboard/dashboard-widget-manage.html', controller: 'CommonWidgetController', + windowClass: 'modal-docked', resolve: { message: function message() { var message = { @@ -66,30 +67,41 @@ function _classCallCheck(instance, Constructor) { return message; } } - }).closePromise.then(needUpdate => { - if (resourceType == 'NEWS') { - $scope.updateNews(); - } else if (resourceType == 'EVENTS') { - $scope.updateEvents(); - } else if (resourceType == 'IMPORTANTRESOURCES') { - $scope.updateImportRes(); - } - }); + }) + + modalInstance.result.finally(function (needUpdate){ + if (resourceType == 'NEWS') { + $scope.updateNews(); + } else if (resourceType == 'EVENTS') { + $scope.updateEvents(); + } else if (resourceType == 'IMPORTANTRESOURCES') { + $scope.updateImportRes(); + } + }); }; $scope.editWidgetParameters = function(widgetId) { let data = { widgetId: widgetId } - ngDialog.open({ + var modalInstance = $modal.open({ templateUrl: 'app/views/dashboard/dashboard-widget-parameter-manage.html', controller: 'WidgetParameterController', - data: data - }).closePromise.then(needUpdate => { + windowClass: 'modal-docked', - }); + resolve: { + items: function () { + return data; + } + } + }) + + modalInstance.result.then(function (needUpdate) { + }); }; + + $scope.sort_options = [{ index: 0, value: 'N', @@ -488,7 +500,8 @@ function _classCallCheck(instance, Constructor) { } - }; + + }; this.auditLog = function(app) { console.log(app); diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less index 8d8f39fe..02cd960d 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less @@ -33,7 +33,7 @@ flex-flow: row wrap; width: @table-width; //margin-left: 230px; - margin-bottom: 63px; + margin-bottom: 0px; margin:auto; .app-gridster-header { background-color: @u; @@ -478,10 +478,7 @@ On click the images will be displayed at normal size to complete the effect -webkit-transition: background-color 0.3s ease-out; -moz-transition: background-color 0.3s ease-out; transition: background-color 0.3s ease-out; - span{ - color: #888; } - } .widgetHeaderBtnPosition { width: 30px; @@ -910,4 +907,40 @@ ul { } .icon-content-gridguide{ cursor:move; -}
\ No newline at end of file +} + .error-info-txt { + display: none; + font-size: 12px; + margin-left: 5px; + } + .account-info-msg { + color: red; + } + .icon-info { + margin-left: 50%; + font-size: 90px; + color: black; + } + .gridster-box-pointer { + cursor: pointer; + } + .gridster-txt{ + font-size: 12px; + } + .gridster-icon { + font-size: 80px; + color: #067ab4; + } + .widget-gridster { + cursor:move; + } + .widgetHeaderBtns-span { + color: #888; + } + .widgetHeaderBtns-img { + margin-bottom: 3px; + margin-left: 3px; + } + .widget-menu-options { + display: block; + }
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html index d71b8f79..a981fd66 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html @@ -19,12 +19,11 @@ --> <div class="w-ecomp-dashboard-home" id="widgets"> <div class="dashboard-home-container" id="page-content"> - <div align="center" id="errorInfo" - style="display: none; font-size: 12px; margin-left: 5px"> - <span style="color: red">You don't have a user account in that + <div align="center" id="errorInfo" class="error-info-txt"> + <span class="">You don't have a user account in that application. Please ask the system administrator. </span> </div> - <div class="portals-list" style="margin-bottom: 0px;"> + <div class="portals-list"> <div> <div class="simulateGridHeader"> <span class="simulateGridHeaderTitle">Applications <span @@ -43,7 +42,7 @@ <div ng-if="appsViewData.length==0"> <div class="app-error-block"> <i class="icon-information full-linear-icon-information" - style="margin-left: 50%; font-size: 90px; color: black"></i> <br> + class="icon-info"></i> <br> <div class="activity-error-msg1"> You do not have access to any application or function in ECOMP Portal. @@ -68,13 +67,13 @@ 'background-image': 'url('+(item.imageLink)+')', 'background-color':'white', 'background-repeat': 'no-repeat', - 'background-size': '170px 130px'}" + 'background-size': '168px 118px'}" ng-click="dashboard.goToPortal(item);dashboard.auditLog(item)" ng-hide="users.isLoadingTable && !users.getUserAppsIsDone"> </div> </div> <div class="gridster-box" ng-if="item.addRemoveApps"> - <div class="gridster-box-header" style="cursor: pointer;" + <div class="gridster-box-header gridster-box-pointer" ng-click="dashboard.goToCatalog()"> <i class="icon-content-gridguide"></i> <h3>Select applications...</h3> @@ -91,10 +90,10 @@ 'padding': '4px', 'opacity': '1'}" ng-click="dashboard.goToCatalog()" class="gridsterContent"> - <label id="add-icon-label" style="font-size: 12px;">Click + <label id="add-icon-label" class="gridster-txt">Click here to personalize <br> this applications page </label> <i id="add-icon" class="icon-controls-add-maximize" - style="font-size: 80px; color: #067ab4"></i> + class="gridster-icon"></i> </div> </div> </li> @@ -108,7 +107,10 @@ <br> <br> - + <div class="simulateGridHeader"> + <span class="simulateGridHeaderTitle">Widgets </span> + </div> + <div ng-show=dashboard.isCommError>Failed to communicate with the widget microservice.</div> @@ -118,7 +120,7 @@ <li gridster-item="widget" ng-repeat="widget in widgetsViewData"> <div class="box"> <div class="box-header"> - <i id="widget-gridster-{{widget.headerText.split(' ').join('-')}}-icon" style="cursor:move;" class="icon-content-gridguide"></i> + <i id="widget-gridster-{{widget.headerText.split(' ').join('-')}}-icon" class="icon-content-gridguide widget-gridster"></i> <h3>{{ widget.headerText}}</h3> <div class="box-header-btns pull-right" ng-if="isAdminPortalAdmin == true" class="ng-scope"> @@ -128,10 +130,13 @@ ng-mousedown="showImpResOption=!showImpResOption" ng-mouseleave="showImpResOption=false" title="Settings" ddh-accessibility-click="13,32" tabindex="0"><span - class="icon-controls-moreapplications"></span></a> + class="widgetHeaderBtns-span"><img + ng-src="assets/images/generic.png" + class="widgetHeaderBtns-img" alt="..." + aria-label="Tap or Click to move" + src="assets/images/generic.png"></span></a> - <ul class="optionsMenu" - style="display: block" + <ul class="optionsMenu widget-menu-options" ng-show="showImpResOption" ng-mouseenter="showImpResOption=true" ng-mouseleave="showImpResOption=false"> diff --git a/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.controller.js b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.controller.js index 69fe6e4d..a425297a 100644 --- a/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.controller.js +++ b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.controller.js @@ -4,8 +4,8 @@ 'use strict'; (function () { class MenuDetailsModalCtrl { - constructor($scope, $log, functionalMenuService, errorMessageByCode, ECOMP_URL_REGEX,$rootScope,confirmBoxService) { - + constructor($scope, $log, functionalMenuService, errorMessageByCode, ECOMP_URL_REGEX,$rootScope,confirmBoxService,items) { + $scope.ngDialogData=items; $scope.isAllApplications = false; let newMenuModel = { name: null, @@ -21,6 +21,8 @@ functionalMenuService.getManagedRolesMenu(appid).then(rolesObj => { $log.debug("MenuDetailsModalCtrl::getAvailableRoles: Roles returned = " + JSON.stringify(rolesObj)) this.availableRoles = rolesObj; + + this.preSelectedRoles = {roles:[]}; if(($scope.ngDialogData.source==='edit') && this.isMidLevelMenuItem()){ @@ -42,8 +44,20 @@ } } } + $rootScope.$broadcast('availableRolesReady'); this.isSaving = false; + for(var i=0; i<rolesObj.length;i++){ + this.availableRoles[i].isApplied = false; + for(var j=0;j<this.preSelectedRoles.roles.length;j++){ + if(this.preSelectedRoles.roles[j].roleId==this.availableRoles[i].roleId){ + this.availableRoles[i].isApplied=true; + break; + } + } + + + } }).catch(err => { $log.error("MenuDetailsModalCtrl::getAvailableRoles: error: " + err); }); @@ -89,6 +103,7 @@ this.formEditable = $scope.ngDialogData.source==='view' ? false : true; this.selectedRole = []; this.availableRoles = []; + this.selectedApp={}; this.menuItem = _.clone($scope.ngDialogData.menuItem); $log.info('MenuDetailsModalCtrl::getAvailableApps: Within init, about to check menuDetails for defined'); if(!angular.isUndefined(this.menuItem.menuDetails) && @@ -98,7 +113,7 @@ $log.debug("MenuDetailsModalCtrl::init: menuItem: "); $log.debug('MenuDetailsModalCtrl::init: ',this.menuItem); this.menuItem.menu.url = this.menuItem.menuDetails.url; - this.selectedApp={}; + this.selectedAppIndex=this.menuItem.menuDetails.appid; this.selectedApp.index = this.menuItem.menuDetails.appid; getAvailableRoles(this.selectedApp.index); @@ -186,17 +201,40 @@ this.isParentMenuItem = () => { return this.menuItem.menu.parentMenuId!=null ? false : true; }; + + this.isRoleSelected=()=>{ + var selectedRoleIds=[]; + for(var i=0;i<this.availableRoles.length;i++){ + if(this.availableRoles[i].isApplied){ + selectedRoleIds.push(this.availableRoles[i].roleId); + return true; + } + } + return false; + + }; this.updateSelectedApp = (appItem) => { + /*var appItemobj= JSON.parse(appItem); + this.selectedApp=JSON.parse(this.selectedApp);*/ if (!appItem) { return; } + var appobj={}; + for(var i=0;i<this.availableApps.length;i++ ){ + if(this.availableApps[i].index==appItem){ + appobj=this.availableApps[i]; + break; + } + } + debugger; $log.debug('MenuDetailsModalCtrl::updateSelectedApp: drop down app item = ' + JSON.stringify(appItem.index)); $log.debug("MenuDetailsModalCtrl::updateSelectedApp: appItem in updateSelectedApp: "); $log.debug('MenuDetailsModalCtrl::updateSelectedApp: ',appItem); - this.selectedApp.isDisabled = ! appItem.enabled; - $log.debug("MenuDetailsModalCtrl::updateSelectedApp: isDisabled: "+this.selectedApp.isDisabled); - getAvailableRoles(appItem.index); + this.selectedApp.isDisabled = ! appobj.enabled; + this.selectedApp.index=appobj.index; + $log.debug("MenuDetailsModalCtrl::updateSelectedApp: isDisabled: "+this.selectedApp.isDisabled); + getAvailableRoles(appobj.index); }; this.continue = () => { @@ -210,7 +248,6 @@ /*if($scope.functionalMenuForm.$invalid){ return; }*/ - if(!!this.menuItem.menu.url && (angular.isUndefined(this.selectedApp) || !this.selectedApp.index>0)) { confirmBoxService.showInformation('Please select the appropriate app, or remove the url').then(isConfirmed => {}); return; @@ -227,15 +264,25 @@ if ($scope.ngDialogData.source === 'edit') { // Edit Menu Item $log.debug('MenuDetailsModalCtrl::saveChanges: Will be saving an edit menu item'); + var selectedRoleIds=[]; + for(var i=0;i<this.availableRoles.length;i++){ + if(this.availableRoles[i].isApplied){ + selectedRoleIds.push(this.availableRoles[i].roleId); + } + } activeMenuItem = { menuId:this.menuItem.menu.menuId, column:this.menuItem.menu.column, text:this.menutitle, parentMenuId:this.menuItem.menu.parentMenuId, url:this.menuItem.menu.url, + appid: angular.isUndefined(this.selectedApp) ? null:this.selectedApp.index, - roles:this.selectedRole + + roles:selectedRoleIds }; + + // alert(activeMenuItem); // If we have removed the url and appid, we must remove the roles if (!activeMenuItem.appid && !activeMenuItem.url) { activeMenuItem.roles = null; @@ -243,7 +290,9 @@ functionalMenuService.saveEditedMenuItem(activeMenuItem) .then(() => { $log.debug('MenuDetailsModalCtrl::saveChanges: Menu Item saved'); - $scope.closeThisDialog(true); + // $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); + }).catch(err => { if(err.status === 409){//Conflict handleConflictErrors(err); @@ -259,6 +308,12 @@ $log.debug("MenuDetailsModalCtrl::saveChanges: Edit Menu output will be: " + JSON.stringify(activeMenuItem)); } else { // New Menu Item $log.debug('MenuDetailsModalCtrl::saveChanges: Will be saving a New menu item'); + var selectedRoleIds=[]; + for(var i=0;i<this.availableRoles.length;i++){ + if(this.availableRoles[i].isApplied){ + selectedRoleIds.push(this.availableRoles[i].roleId); + } + } var newMenuItem = { menuId:null, // this is a new menu item column:this.menuItem.menu.column, @@ -267,14 +322,15 @@ parentMenuId:this.menuItem.menu.menuId, url:this.menuItem.menu.url, appid: angular.isUndefined(this.selectedApp) ? null:this.selectedApp.index, - roles:this.selectedRole + roles:selectedRoleIds }; $log.debug("MenuDetailsModalCtrl::saveChanges: New Menu output will be: " + JSON.stringify(newMenuItem)); functionalMenuService.saveMenuItem(newMenuItem) .then(() => { $log.debug('MenuDetailsModalCtrl::saveChanges: Menu Item saved'); - $scope.closeThisDialog(true); + // $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); }).catch(err => { if(err.status === 409){//Conflict handleConflictErrors(err); @@ -298,103 +354,7 @@ }); } } - MenuDetailsModalCtrl.$inject = ['$scope', '$log', 'functionalMenuService', 'errorMessageByCode', 'ECOMP_URL_REGEX','$rootScope','confirmBoxService']; + MenuDetailsModalCtrl.$inject = ['$scope', '$log', 'functionalMenuService', 'errorMessageByCode', 'ECOMP_URL_REGEX','$rootScope','confirmBoxService','items']; angular.module('ecompApp').controller('MenuDetailsModalCtrl', MenuDetailsModalCtrl); - angular.module('ecompApp').directive('dropdownMultiselect', ['functionalMenuService',function(){ - return { - restrict: 'E', - scope: { - model: '=', - options: '=', - populated_roles: '=preSelected', - dropdownTitle: '@', - source: '=' - }, - template: "<div class='btn-group' data-ng-class='{open: open}'>" + - "<button class='btn btn-medium'>{{dropdownTitle}}</button>" + - "<button class='btn dropdown-toggle' data-ng-click='open=!open;openDropDown()'><span class='caret'></span></button>" + - "<ul class='dropdown-menu dropdown-menu-medium' aria-labelledby='dropdownMenu'>" + - "<li data-ng-repeat='option in options'> <input ng-disabled='setDisable(source)' type='checkbox' data-ng-change='setSelectedItem(option.roleId)' ng-model='selectedItems[option.roleId]'>{{option.rolename}}</li>" + - "</ul>" + - "</div>", - controller: function ($scope) { - $scope.selectedItems = {}; - $scope.checkAll = false; - $scope.$on('availableRolesReady', function() { - init(); - }); - - function init() { - console.log('dropdownMultiselect init'); - $scope.dropdownTitle = $scope.source ==='view' ? 'View Roles' : 'Select Roles'; - console.log('$scope.populated_roles = ' + $scope.populated_roles); - } - - $scope.$watch('populated_roles', function(){ - if ($scope.populated_roles && $scope.populated_roles.length>0) { - for (var i = 0; i < $scope.populated_roles.length; i++) { - $scope.model.push($scope.populated_roles[i].roleId); - $scope.selectedItems[$scope.populated_roles[i].roleId] = true; - } - if ($scope.populated_roles.length === $scope.options.length) { - $scope.checkAll = true; - } - }else{ - deselectAll(); - } - }); - - $scope.openDropDown = function () { - - }; - - $scope.checkAllClicked = function () { - if ($scope.checkAll) { - selectAll(); - } else { - deselectAll(); - } - }; - - function selectAll() { - $scope.model = []; - $scope.selectedItems = {}; - angular.forEach($scope.options, function (option) { - $scope.model.push(option.roleId); - }); - angular.forEach($scope.model, function (id) { - $scope.selectedItems[id] = true; - }); - console.log($scope.model); - }; - - function deselectAll() { - $scope.model = []; - $scope.selectedItems = {}; - console.log($scope.model); - }; - - $scope.setSelectedItem = function (id) { - var filteredArray = []; - if ($scope.selectedItems[id] === true) { - $scope.model.push(id); - } else { - filteredArray = $scope.model.filter(function (value) { - return value != id; - }); - $scope.model = filteredArray; - $scope.checkAll = false; - } - console.log(filteredArray); - return false; - }; - - $scope.setDisable = function(source){ - return source ==='view' ? true : false; - } - } - } - }]); - -})();
\ No newline at end of file + })();
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html index 7ba444eb..bae0e776 100644 --- a/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html +++ b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html @@ -1,9 +1,18 @@ <div class="functionalMenu-details-modal"> - <div class="title">{{ngDialogData.title}}</div> + <div class="b2b-modal-header"> + <h2 class="titles" id="microservice-add-details-title">{{ngDialogData.title}}</h2> - <div class="functionalMenu-properties-main" scroll-top="functionalMenuDetails.scrollApi"> - <form name="functionalMenuForm"> + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" + ng-click="$dismiss('cancel')"></button> + </div> + </div> + + <div class="b2b-modal-body"> + <div class="functionalMenu-properties-main" scroll-top="functionalMenuDetails.scrollApi"> + + <form name="functionalMenuForm"> <div class="span6" > <div class="item-label">Parent</div> @@ -26,43 +35,50 @@ <div class="item-label">URL</div> <input id="input-url" ddh-reset ng-readonly="!functionalMenuDetails.formEditable ? 'checked':'' " class="functionalMenu-height" placeholder="http://" class="input-field" ng-model="functionalMenuDetails.menuItem.menu.url" type="url" name="url"/> <div id="error-url-conflict" ng-show="functionalMenuForm.url.$error.url"> - <small class="err-message" style="color: Red; font-size: 11px;">Not valid URL!</small> + <small class="err-message error-msg-txt">Not valid URL!</small> </div> </div> </div> <div class="right-item"> <div class="item-label">App</div> - <div class="custom-select-wraps" ng-readonly="checked"> + <div class="custom-select-wraps" ng-readonly="checked"> <div id='ecomp-small-spinner' class="ecomp-small-spinner" ng-if="isAllApplications"></div> <div ng-if="!isAllApplications"> - <select id="select-app" class="select-field" - ng-model="functionalMenuDetails.selectedApp" - ng-change="functionalMenuDetails.updateSelectedApp(functionalMenuDetails.selectedApp);" - ng-options="app.title for app in functionalMenuDetails.availableApps track by app.index" - - required> - <option value="" >No Application</option> - </select> + + <div class="table-dropdown" > + <select id="select-app" b2b-dropdown placeholder-text="Select Application" ng-model="functionalMenuDetails.selectedAppIndex" ng-change="functionalMenuDetails.updateSelectedApp(functionalMenuDetails.selectedAppIndex);"> + <option b2b-dropdown-list option-repeat="app in functionalMenuDetails.availableApps track by app.index" value="{{app.index}}">{{app.title}}</option> + </select> + </div> </div> </div> + + <!--<span class="err-message" ng-show="functionalMenuForm.app.$dirty && functionalMenuForm.app.$error.required"> Please select App!</span>--> <!-- <pre>{{functionalMenuDetails.menuItem | json}}</pre> --> </div> - - - <div class="item" ng-show="functionalMenuDetails.displayRoles==true"> - <div class="item-label">Roles</div> - <dropdown-multiselect id="dropdown-roles" dropdown-title="Select Roles" pre-selected="functionalMenuDetails.preSelectedRoles.roles" - model="functionalMenuDetails.selectedRole" - options="functionalMenuDetails.availableRoles" source="ngDialogData.source" > - </dropdown-multiselect> - </div> + + <div class="item" + ng-show="functionalMenuDetails.displayRoles==true"> + <div class="item-label">Roles</div> + <div> + <multiple-select id="dropdown-roles" unique-data="{{$index}}" + placeholder="Select Roles" + on-change="functionalMenuDetails.preSelectedRoles.roles" + ng-model="functionalMenuDetails.availableRoles" name-attr="rolename" + value-attr="isApplied"> </multiple-select> + </div> + </div> <div ng-show="functionalMenuDetails.selectedApp && functionalMenuDetails.selectedApp.isDisabled" class="err-message">Application is disabled</div> - </div> + </form> - </div> - <div class="dialog-control"> + </div> + + </div> + <br> + <div class="b2b-modal-footer"> + <div class="dialog-control"> <div ng-if="ngDialogData.source!='view'"> <span class="ecomp-save-spinner" ng-show="functionalMenuDetails.isSaving"></span> <span ng-if="ngDialogData.source=='edit' && functionalMenuDetails.isLeafMenuItem()"> @@ -82,16 +98,21 @@ <span ng-if="ngDialogData.source=='add' || (ngDialogData.source=='edit' && !functionalMenuDetails.isLeafMenuItem())"> <button id="button-save-add" class="btn btn-alt btn-small" ng-show="!functionalMenuDetails.menuItem.menu.url || !(functionalMenuDetails.selectedApp.index>0) - || functionalMenuDetails.selectedRole.length>0 || !functionalMenuDetails.menutitle" ng-disabled="!functionalMenuForm.text.$valid || !functionalMenuDetails.menutitle" + || functionalMenuDetails.isRoleSelected() || !functionalMenuDetails.menutitle" ng-disabled="!functionalMenuForm.text.$valid || !functionalMenuDetails.menutitle" ng-click="functionalMenuDetails.saveChanges()">Save</button> - <button id="button-save-continue" class="save-button" ng-show="!!functionalMenuDetails.menuItem.menu.url && functionalMenuDetails.selectedApp.index>0 && functionalMenuDetails.menutitle - && !functionalMenuDetails.selectedRole.length>0" ng-disabled="!functionalMenuForm.url.$valid" + <button id="button-save-continue" class="btn btn-alt btn-small" ng-show="!!functionalMenuDetails.menuItem.menu.url && functionalMenuDetails.selectedApp.index>0 && functionalMenuDetails.menutitle + && !functionalMenuDetails.isRoleSelected()" ng-disabled="!functionalMenuForm.url.$valid" ng-click="functionalMenuDetails.continue()">Continue</button> </span> - <button id="button-cancel-close-dialog" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Cancel</button> + <button id="button-cancel-close-dialog" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Cancel</button> </div> <div ng-if="ngDialogData.source=='view'"> - <div id="div-close-dialog" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Close</div> + <div id="div-close-dialog" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Close</div> </div> </div> -</div>
\ No newline at end of file + </div> + + + + +</div> diff --git a/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/modal-details.modal.less b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/modal-details.modal.less index ce434b47..c63a63e9 100644 --- a/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/modal-details.modal.less +++ b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/modal-details.modal.less @@ -1,11 +1,11 @@ .functionalMenu-details-modal { - height: 520px; + //height: 520px; .title { //.n18r; .dGray18r; //ECOMP Dark Gray - border-bottom: @blue-active 3px solid; + // border-bottom: @blue-active 3px solid; } .span6{ @@ -23,17 +23,20 @@ padding-top: 10px; .functionalMenu-height{ height:35px; width:140%; +font-family:Omnes-ECOMP-W02, Arial; + } select { max-width: 150%; - width: 380px; + width: 70%; } -.btn{ -font-family: clearview_att_regular; - font-size: 14px !important; -} + + .multiple-select{ + width:70%; + } + .btn-group.open .dropdown-toggle { -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.125); box-shadow: inset 0 0px 0px rgba(0,0,0,.125); @@ -88,8 +91,8 @@ font-family: clearview_att_regular; .functionalMenu-properties-main { padding: 16px; - height: 306px; - overflow-y: visible; + height: 359px; + overflow: auto; input[type=checkbox][disabled]{ height:13px; } @@ -151,10 +154,15 @@ font-family: clearview_att_regular; color: @funcGreen; font-size: 9px; } + } } } - + .dialog-control{ + position: relative; + bottom: 16px; + float: right; + } } diff --git a/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu.less b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu.less index 8452590f..8554fadc 100644 --- a/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu.less +++ b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu.less @@ -22,6 +22,46 @@ margin-left:0px; } + .dropdown-menu{ + + position:absolute; + top:100%; + left:0; + z-index:1000; + display:none; + float:left; + min-width:160px; + padding:5px 0; + margin:2px 0 0; + list-style:none; + font-size:14px; + background-color:#fff; + border:1px solid #ccc; + border:1px solid rgba(0,0,0,.15); + border-radius:6px; + -webkit-box-shadow:0 6px 12px rgba(0,0,0,.175); + box-shadow:0 6px 12px rgba(0,0,0,.175); + background-clip:padding-box; + + } + + .dropdown-menu .divider { + height: 1px; + margin: 9px 0; + overflow: hidden; + background-color: #e5e5e5; +} + +.dropdown-menu>li>a { + display: block; + padding: 3px 20px; + clear: both; + font-weight: 400; + line-height: 1.428571429; + color: #333; + white-space: nowrap; +} + .tree { margin:auto; width: @table-width; @@ -54,7 +94,13 @@ } } + .error-msg-txt { + color: red; + font-size: 11px; + } } - + .regenerate-functionalmenu-btn-txt { + color:black; + } }
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/header/header.controller.js b/ecomp-portal-FE-common/client/app/views/header/header.controller.js index 2eba057c..6b5be745 100644 --- a/ecomp-portal-FE-common/client/app/views/header/header.controller.js +++ b/ecomp-portal-FE-common/client/app/views/header/header.controller.js @@ -20,7 +20,7 @@ 'use strict'; (function () { class HeaderCtrl { - constructor($log, $window, userProfileService, menusService, $scope, ECOMP_URL_REGEX, $cookies, $state,auditLogService,notificationService,ngDialog) { + constructor($log, $window, userProfileService, menusService, $scope, ECOMP_URL_REGEX, $cookies, $state,auditLogService,notificationService,ngDialog,$modal) { this.firstName = ''; this.lastName = ''; this.$log = $log; @@ -348,7 +348,7 @@ } } class NotificationCtrl{ - constructor($log, $scope, $cookies, $timeout, sessionService,notificationService,$interval,ngDialog) { + constructor($log, $scope, $cookies, $timeout, sessionService,notificationService,$interval,ngDialog,$modal) { $scope.notifications=[]; var intervalPromise = null; $scope.notificationCount= notificationService.notificationCount; @@ -372,11 +372,12 @@ var data = res.data.response[i]; var notification ={ id:data.notificationId, - title:data.msgHeader, + msgHeader:data.msgHeader, message:data.msgDescription, - source:data.msgSource, + msgSource:data.msgSource, time:data.createdDate, - priority:data.priority + priority:data.priority, + notificationHyperlink:data.notificationHyperlink }; $scope.notifications.push(notification); } @@ -406,41 +407,27 @@ notificationService.getMessageRecipients(selectedAdminNotification.id).then(res =>{ $scope.messageRecipients = res; var messageObject=JSON.parse(selectedAdminNotification.message); - var html=""; - html+='<p>'+'Message Source'+' : '+selectedAdminNotification.source+'</p>'; - html+='<p>'+'Message Title'+' : '+selectedAdminNotification.title+'</p>'; - html+='<p>'+'Message Recipient'+' : '+$scope.messageRecipients+'</p>'; - - for(var field in messageObject){ - if(field=='eventDate'||field=='lastModifiedDate'){ - html+='<p>'+field+' : '+new Date(+messageObject[field])+'</p>'; - - }else{ - html+='<p>'+field+' : '+messageObject[field]+'</p>'; - - } - } - - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html', - controller: 'userNotificationCtrl', - resolve: { - message: function () { - var message = { - title: '', - text: html - - }; - return message; - }, - - } - }); - - }).catch(err => { - $log.error('userNotificationsCtrl:getMessageRecipients:: error ', err); - $scope.isLoadingTable = false; - }); + var modalInstance = $modal.open({ + templateUrl: 'app/views/user-notifications-admin/user.notifications.json.details.modal.page.html', + controller: 'userNotificationCtrl', + sizeClass: 'modal-large', + resolve: { + items: function () { + var items = { + title: '', + selectedAdminNotification:selectedAdminNotification,messageObject:messageObject,messageRecipients:$scope.messageRecipients + + }; + return items; + } + } + }) + + + }).catch(err => { + $log.error('userNotificationsCtrl:getMessageRecipients:: error ', err); + $scope.isLoadingTable = false; + }); }; notificationService.getNotificationRate().then(res=> { @@ -472,9 +459,9 @@ } } - NotificationCtrl.$inject = ['$log', '$scope', '$cookies', '$timeout', 'sessionService','notificationService','$interval','ngDialog']; + NotificationCtrl.$inject = ['$log', '$scope', '$cookies', '$timeout', 'sessionService','notificationService','$interval','ngDialog','$modal']; LoginSnippetCtrl.$inject = ['$log', '$scope', '$cookies', '$timeout','userProfileService', 'sessionService']; - HeaderCtrl.$inject = ['$log', '$window', 'userProfileService', 'menusService', '$scope', 'ECOMP_URL_REGEX','$cookies','$state','auditLogService','notificationService','ngDialog']; + HeaderCtrl.$inject = ['$log', '$window', 'userProfileService', 'menusService', '$scope', 'ECOMP_URL_REGEX','$cookies','$state','auditLogService','notificationService','ngDialog','$modal']; angular.module('ecompApp').controller('HeaderCtrl', HeaderCtrl); angular.module('ecompApp').controller('loginSnippetCtrl', LoginSnippetCtrl); angular.module('ecompApp').controller('notificationCtrl', NotificationCtrl); diff --git a/ecomp-portal-FE-common/client/app/views/header/header.less b/ecomp-portal-FE-common/client/app/views/header/header.less index e10e9ed7..5a6314f9 100644 --- a/ecomp-portal-FE-common/client/app/views/header/header.less +++ b/ecomp-portal-FE-common/client/app/views/header/header.less @@ -535,3 +535,34 @@ column-count: 4; width: 126.8px; height: 28px; } + +.header-position { + position:fixed; + width: 100%; + top: 0px; + left: 0; + background-color: #222; + z-index:9999; +} + .reg-common-label-spn-txt { + font-weight:bold; +} + .display-userAppRoles-label-txt{ + height:200px; + overflow-y:auto; +} + .notification-history-link-txt { + font-size: 14px; + } + .notification-common-position { + float:left; + } + .notification-common-space { + clear:both; + } + .notification-main-ht { + height:113px; + } + .recommendation-bulb-txt { + font-size: 22px; + } diff --git a/ecomp-portal-FE-common/client/app/views/header/header.tpl.html b/ecomp-portal-FE-common/client/app/views/header/header.tpl.html index ea7273b9..30d616eb 100644 --- a/ecomp-portal-FE-common/client/app/views/header/header.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/header/header.tpl.html @@ -17,7 +17,7 @@ limitations under the License. ================================================================================ --> -<div style="position:fixed;width: 100%;top: 0px;left: 0;background-color: #222;z-index:9999"> +<div class="header-position"> <header class="b2b-header-tabs" b2b-header-responsive> <ul class="header__items" role="navigation"> <!-- Menu Icon and name --> @@ -160,17 +160,17 @@ </div> </div> </li> - <li><div class="reg-userEmail-label"><span class="reg-userEmail-label-spn" style=font-weight:bold>Email<span class="visuallyhidden">: + <li><div class="reg-userEmail-label"><span class="reg-userEmail-label-spn reg-common-label-spn-txt" >Email<span class="visuallyhidden">: </span></span></div></li> <li><div class="reg-userEmail-value"><span class="reg-userEmail-value-spn"> {{loginSnippetEmail}}</span></div></li> <li> </li> - <li><div class="reg-userRole-label"><span class="reg-userRole-label-spn" style=font-weight:bold> + <li><div class="reg-userRole-label"><span class="reg-userRole-label-spn reg-common-label-spn-txt"> User Id<span class="visuallyhidden">:</span></span></div></li> <li><div class="reg-userRole-value"><span class="reg-userRole-value-spn"> {{loginSnippetUserid}}<span class="visuallyhidden"></span></span></div></li> <li> </li> - <li><div class="reg-userLastLogin-label"><span class="reg-userLastLogin-label-spn" style=font-weight:bold> + <li><div class="reg-userLastLogin-label"><span class="reg-userLastLogin-label-spn reg-common-label-spn-txt"> Last login<span class="visuallyhidden">:</span></span></div></li> <li><div class="reg-userLastLogin-value"><span class="reg-userLastLogin-value-spn"> {{lastLogin}}<span class="visuallyhidden"></span></span></div></li> @@ -180,13 +180,14 @@ <a href="javascript:void(0);" ng-click="getUserApplicationRoles()" class="icon-primary-accordion-plus" ng-class="{true: 'icon-primary-accordion-plus', false: 'icon-primary-accordion-minus'}[ !displayUserAppRoles]" >Applications and Roles</a> </div> <br> - <div class="display-userAppRoles-label" ng-show="displayUserAppRoles" style="height:200px; overflow-y:auto;"> + <div class="display-userAppRoles-label display-userAppRoles-label-txt" ng-show="displayUserAppRoles"> <div ng-repeat="ua in userapproles track by $index"> <div class="reg-userApp-value"> - <span class="reg-userApp-value-spn" style=font-weight:bold>{{ua.App}}<span class="visuallyhidden">:</span></span> + <span class="reg-userApp-value-spn reg-common-label-spn-txt">{{ua.App}}<span class="visuallyhidden">:</span></span> </div> <div ng-repeat="role in ua.Roles track by $index" class="reg-userAppRoles-value" > - <span class="reg-userAppRoles-value-spn">{{role}}</span> + <span ng-if="role.indexOf('global_')!=-1" id="required" style="color: Red;" visible="false"> *</span> + <span class="reg-userAppRoles-value-spn">{{role}}</span> </div> <br> </div> @@ -217,17 +218,17 @@ <div class="ng-scope"> <div id="notification" class="notificationBox "> <div align ="right"> - <a id="notification-history-link" ui-sref="root.notificationHistory" style="font-size: 14px"> View All Recent Notifications </a> + <a id="notification-history-link" ui-sref="root.notificationHistory" class="notification-history-link-txt"> View All Recent Notifications </a> </div> <div class="notification-header"> - <div style="float:left;"> + <div class="notification-common-position"> <p class="notification-heading">Notifications</p> </div> - <div style="clear:both;"></div> + <div class="notification-common-space"></div> </div> <div ng-show="notifications.length==0"> <div class="notification-main"> - <div style="height:113px;"> + <div class="notification-main-ht"> <div align="center" class="icon-information notification-info-icon"></div> </div> <div> @@ -243,12 +244,12 @@ <span class="important" ng-show="item.priority==2"/> <span class="normal" ng-show="item.priority==1"/> </div> - <div class="details" ng-click="showDetailedJsonMessage(item)"> - <span class="title" ng-bind="item.source"></span> <span - class="title" ng-bind="item.title"></span> <span - class="message-body" ng-if="item.source==='EP'" + <div class="details" ng-click="showDetailedJsonMessage(item)"> + <span class="title" ng-bind="item.msgSource"></span> <span + class="title" ng-bind="item.msgHeader"></span> <span + class="message-body" ng-if="item.msgSource==='EP'" ng-bind="item.message"></span> <span class="message-body" - ng-if="item.source!=='EP'" + ng-if="item.msgSource!=='EP'" ng-bind="item.message| elipsis: 27"> </span> <!-- <span class="date" ng-bind="item.time" ></span> --> <mydate>{{item.time | date:'MM/dd/yyyy hh:mm:ss a Z'}}</mydate> @@ -260,13 +261,14 @@ </div> <div class="notification-footer"> <div class="notification-links"> - <div style="clear:both;"></div> + <div class="notification-common-space"></div> </div> </div> </div> </b2b-flyout-content> </b2b-flyout> </li> + <li class="header__item recommendation" aria-haspopup="true" class="recommendation-li"> <div ng-include class="recommendation-detail-extension" src="'app/views/headerRecommendation/headerRecommendations.tpl.html'"></div> diff --git a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.html b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.html index 40b6fb30..5a8326b6 100644 --- a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.html +++ b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.html @@ -17,9 +17,29 @@ limitations under the License. ================================================================================ --> + <style> + .table-search-fields{ + margin-left: 248px !important; + position: absolute !important; + margin-top: -36px !important; + width:50% !important; + } + .table-search-field{ + width:50% !important; + } + </style> <div class="microservice-add-details-model"> - <div id="microservice-add-details-title" class="title">Microservice Details</div> + <div class="b2b-modal-header"> + <h2 class="title" id="microservice-add-details-title">Microservice Details</h2> + + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="microservicedetails-button-cancel" + ng-click="$dismiss('cancel')"></button> + </div> + </div> + + <div class="b2b-modal-body"> <div id="microservices" class="microservice-scrolling-table"> <div class="microservice-properties-main" scroll-top="microserviceAddDetails.scrollApi"> @@ -112,7 +132,7 @@ <div class="item-label">Security Type</div> <div class="service-select"> <div class="table-dropdown"> - <select id="microservice-details-input-security-type" name="microservice-details-input-security-type" b2b-dropdown placeholder-text="Select Application" ng-model="microserviceAddDetails.service.security.name" ng-change="microserviceAddDetails.updateApp()"> + <select id="microservice-details-input-security-type" name="microservice-details-input-security-type" b2b-dropdown placeholder-text="Select Security Type" ng-model="microserviceAddDetails.service.security.name" ng-change="microserviceAddDetails.updateApp()"> <option b2b-dropdown-list option-repeat="d in microserviceAddDetails.availableSecurityTypes" value="{{d.name}}">{{d.name}}</option> </select> </div> @@ -158,7 +178,7 @@ ng-click="microserviceAddDetails.addParameter()"></div> </div> <div class="item"> - <div class="para-label-item-left" + <div class="param-label-item-left" ng-show="microserviceAddDetails.service.parameterList.length > 0"> Parameter Key</div> <div class="para-label-item-right" @@ -168,14 +188,14 @@ <div id="microservice-details-user-paramters" ng-repeat="parameter in microserviceAddDetails.service.parameterList"> - <div class="para-item-left"> + <div class="param-item-left"> <input id="microservice-details-input-user-parameter-key" class="table-search-field" type="text" name="param-key" maxlength="200" ng-model="parameter.para_key" /> </div> - <div class="para-item-middle"> + <div class="param-item-middle"> <input id="microservice-details-input-user-parameter-value" - class="table-search-field" type="text" name="param-value" + class="table-search-fields" type="text" name="param-value" maxlength="200" ng-model="parameter.para_value" /> </div> @@ -184,28 +204,38 @@ </div> <div class="microservice-property"> - <input id="microservices-checkbox-app-is-enabled" type="checkbox" - class="checkbox-field" - ng-model="microserviceAddDetails.service.active" /> - <div class="property-label checkbox-label">Active</div> + <label for="microservices-checkbox-app-is-enabled" class="checkbox"> + <input type="checkbox" ng-model="microserviceAddDetails.service.active" id="microservices-checkbox-app-is-enabled" > + <i class="skin"></i> + <span class="property-label checkbox-label">Active</span> + </label> </div> </div> <div id="microservice-scroll-end"></div> - <div class="dialog-control"> - <button class="btn btn-alt btn-small" id="microservice-details-save-button" ng-click="microserviceAddDetails.saveChanges()">Save</button> - <button class="btn btn-alt btn-small" id="microservice-details-close-button" ng-click="microserviceAddDetails.closeThisDialog()">Close</button> - </div> + </form> </div> </div> + </div> + <br> + <div class="b2b-modal-footer"> + <div class="cta-button-group cta-modal-footer-flex"> + <button class="btn btn-alt btn-small" id="microservice-details-save-button" ng-click="microserviceAddDetails.saveChanges()">Save</button> + <button class="btn btn-alt btn-small" id="microservice-details-close-button" ng-click="$dismiss('cancel')">Close</button> + </div> + </div> + + + + </div> <script> $(document).ready(function(){ $(".ngdialog-close").attr('id','dialog-close'); }); -</script> +</script>
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.js b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.js index 8ce9be64..c992b9a0 100644 --- a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.js +++ b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.js @@ -20,9 +20,9 @@ 'use strict'; (function () { class MicroserviceAddDetailsCtrl { - constructor($scope, $log, $interval, widgetsCatalogService, applicationsService, adminsService, microserviceService, errorMessageByCode, ECOMP_URL_REGEX, $window,userProfileService, confirmBoxService, $cookies) { + constructor($scope, $log, $interval, widgetsCatalogService, applicationsService, adminsService, microserviceService, errorMessageByCode, ECOMP_URL_REGEX, $window,userProfileService, confirmBoxService, $cookies,items) { - + $scope.ngDialogData=items; let getAvailableApps = () => { applicationsService.getAppsForSuperAdminAndAccountAdmin().then(apps => { this.availableApps=[]; @@ -130,7 +130,6 @@ }; this.addParameter = () => { - document.getElementById('microservice-scroll-end').scrollIntoView(); this.service.parameterList.push({}); } @@ -314,14 +313,16 @@ if(isConfirmed){ microserviceService.updateService(this.service.id, newService).then(() => { // TODO: result validation check - this.closeThisDialog(); + //this.closeThisDialog(); + $scope.$dismiss('cancel'); }); } }); }else{ microserviceService.createService(newService).then(() => { // TODO: result validation check - $scope.closeThisDialog(true); + //$scope.closeThisDialog(true); + $scope.$dismiss('cancel'); }); } @@ -332,6 +333,6 @@ }); } } - MicroserviceAddDetailsCtrl.$inject = ['$scope', '$log', '$interval', 'widgetsCatalogService', 'applicationsService', 'adminsService', 'microserviceService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window','userProfileService', 'confirmBoxService', '$cookies']; + MicroserviceAddDetailsCtrl.$inject = ['$scope', '$log', '$interval', 'widgetsCatalogService', 'applicationsService', 'adminsService', 'microserviceService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window','userProfileService', 'confirmBoxService', '$cookies','items']; angular.module('ecompApp').controller('MicroserviceAddDetailsCtrl', MicroserviceAddDetailsCtrl); })(); diff --git a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.less b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.less index fa607fee..e8178034 100644 --- a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.less +++ b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.less @@ -1,9 +1,9 @@ .microservice-add-details-model{ - height: 550px; - overflow-y: auto; + //height: 550px; + //overflow-y: auto; .title { - .dGray18r; //AT&T Dark Gray - border-bottom: @blue-active 3px solid; + .dGray18r; + //border-bottom: @blue-active 3px solid; } .microservice-details-title { color: #191919; @@ -39,6 +39,10 @@ position: relative; top: -1px; } + .checkbox .skin { + left: 0px; + top: 0px; + } } .add-para-item{ position: relative; @@ -129,15 +133,18 @@ .dGray14r; } .para-label-item-right{ - line-height: 30px; - height: 30px; - display:inline-block; - width: 45%; - background: @portalWhite; - vertical-align: middle; - white-space: nowrap; - .dGray14r; + margin-left: 248px !important; + position: absolute !important; + margin-top: -19px !important; + width: 50% !important; } + + .table-search-fields{ + margin-left: 248px; + position: absolute; + margin-top: -36px; + + } .para-item-left{ line-height: 30px; height: 36px; @@ -187,11 +194,9 @@ .btn-blue; } .para-item-right{ - margin-top: 10px; - height: 14px; - width: 14px; - float: right; - display:inline-block; + margin-top: -27px; + position: absolute; + margin-left: 500px; } .input-field{ .custom-input-field; @@ -210,7 +215,9 @@ .btn-blue; } - + .modal.fade.in{ + overflow:hidden; + } .add-para-button{ height: 14px; @@ -224,10 +231,11 @@ } } .microservice-scrolling-table{ - width: 548px; +// width: 548px; margin-left: 16px; - height: 430px; + height: 450px; overflow: auto; + margin-right: -29px; } #microservice-scroll-end{ height: 20px; diff --git a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.controller.js b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.controller.js index 6e711b75..dfb424f0 100644 --- a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.controller.js +++ b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.controller.js @@ -2,7 +2,7 @@ (function () { class MicroserviceOnboardingCtrl { constructor($log, applicationsService, microserviceService, ngDialog, confirmBoxService, - userProfileService, $cookies, $scope) { + userProfileService, $cookies, $scope,$modal) { let getOnboardingServices = () => { @@ -42,16 +42,21 @@ } } - ngDialog.open({ + var modalInstance = $modal.open({ templateUrl: 'app/views/microservice-onboarding/microservice-add-details/microservice-add-details.html', - controller: 'MicroserviceAddDetailsCtrl', - controllerAs: 'microserviceAddDetails', - data: data - }).closePromise.then(needUpdate => { - if(needUpdate.value === true){ + controller: 'MicroserviceAddDetailsCtrl as microserviceAddDetails', + sizeClass: 'modal-large', + resolve: { + items: function () { + return data; + } + } + }) + + modalInstance.result.finally(function (){ getOnboardingServices(); - } - }); + }); + }; this.deleteService = service => { @@ -82,6 +87,6 @@ } } MicroserviceOnboardingCtrl.$inject = ['$log', 'applicationsService', 'microserviceService', 'ngDialog', 'confirmBoxService', - 'userProfileService','$cookies', '$scope']; + 'userProfileService','$cookies', '$scope','$modal']; angular.module('ecompApp').controller('MicroserviceOnboardingCtrl', MicroserviceOnboardingCtrl); })();
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.controller.js b/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.controller.js index a5ea9041..de28a8bb 100644 --- a/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.controller.js +++ b/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.controller.js @@ -47,42 +47,27 @@ notificationService.getMessageRecipients(selectedAdminNotification.notificationId).then(res =>{ $scope.messageRecipients = res; var messageObject=JSON.parse(selectedAdminNotification.msgDescription); - var html=""; - html+='<p>'+'Message Source'+' : '+selectedAdminNotification.msgSource+'</p>'; - html+='<p>'+'Message Title'+' : '+selectedAdminNotification.msgHeader+'</p>'; - html+='<p>'+'Message Recipient'+' : '+$scope.messageRecipients+'</p>'; - - for(var field in messageObject){ - if(field=='eventDate'||field=='lastModifiedDate'){ - html+='<p>'+field+' : '+new Date(+messageObject[field])+'</p>'; - - }else{ - html+='<p>'+field+' : '+messageObject[field]+'</p>'; - - } - } - - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html', - controller: 'userNotificationCtrl', - resolve: { - message: function () { - var message = { - title: '', - text: html - - }; - return message; - }, - - } - }); + var modalInstance = $modal.open({ + templateUrl: 'app/views/user-notifications-admin/user.notifications.json.details.modal.page.html', + controller: 'userNotificationCtrl', + sizeClass: 'modal-large', + resolve: { + items: function () { + var items = { + title: '', + selectedAdminNotification:selectedAdminNotification,messageObject:messageObject,messageRecipients:$scope.messageRecipients + + }; + return items; + } + } + }) - }).catch(err => { - $log.error('userNotificationsCtrl:getMessageRecipients:: error ', err); - $scope.isLoadingTable = false; - }); - + + }).catch(err => { + $log.error('userNotificationsCtrl:getMessageRecipients:: error ', err); + $scope.isLoadingTable = false; + }); }; } } diff --git a/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.less b/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.less index 9e1de6fd..7120eb58 100644 --- a/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.less +++ b/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.less @@ -37,5 +37,16 @@ font-style: italic; margin:auto; } +.table-th-txt { + width: 10px; +} + +.table-td-txt { + font-weight: bold; +} + +.table-td-msg { + width:500px +} }
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.tpl.html b/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.tpl.html index f5d0b292..22c476f6 100644 --- a/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.tpl.html @@ -46,7 +46,7 @@ <thead b2b-table-row type="header"> <tr> <th id="th-notif-0" b2b-table-header key="msgSource" - sortable="true" style=" width: 10px;">Message Source</th> + sortable="true" class="table-th-txt">Message Source</th> <th id="th-notif-1" b2b-table-header key="msgHeader" sortable="true">Message</th> <th id="th-notif-2" b2b-table-header key="startTime" @@ -72,8 +72,8 @@ <div id="{{$index}}-msgSource">{{rowData.msgSource}}</div> </td> <td class="td-first" b2b-table-body style="{{rowData.expired?'color:lightgray !important':''}}" ng-click="rowData.msgSource=='EP'||showDetailedJsonMessage(rowData)"> - <div id="{{$index}}-title" style="font-weight: bold;" ng-bind="rowData.msgHeader"></div> - <div id="{{$index}}-message" ng-if="rowData.msgSource==='EP'" style="width:500px" ng-bind="rowData.msgDescription"></div> + <div id="{{$index}}-title" class="table-td-txt" ng-bind="rowData.msgHeader"></div> + <div id="{{$index}}-message" ng-if="rowData.msgSource==='EP'" class="table-td-msg" ng-bind="rowData.msgDescription"></div> <div id="{{$index}}-message" ng-if="rowData.msgSource!=='EP'" ng-bind="rowData.msgDescription| elipsis: 27"></div> </td> <td b2b-table-body style="{{rowData.expired?'color:lightgray !important':''}}"> diff --git a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.js b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.js index 466998a3..49605e59 100644 --- a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.js +++ b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.js @@ -51,22 +51,22 @@ portalAdminsService.addPortalAdmin(this.selectedUser.orgUserId) .then(() => { $log.debug("NewPortalAdminModalCtrl::addNewPortalAdmin: portal admin added successfully"); - $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); }).catch(err => { if(err.status === 409) { //Conflict confirmBoxService.showInformation('This user already exists as a portal admin!').then(function (isConfirmed) { - $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); }); } else { confirmBoxService.showInformation('There was a unknown problem adding the portal admin. ' + 'Please try again later. Error Status: '+ err.status).then(function (isConfirmed) { - $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); }); } }); } }).catch(err => { confirmBoxService.showInformation('There was a unknown problem adding the portal admin. ' + 'Please try again later. Error Status: '+ err.status).then(function (isConfirmed) { - $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); }); $log.error('portalAdminsService.addPortalAdmin error status: '+ err.status); }); diff --git a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html index 206dc168..8205e840 100644 --- a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html +++ b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html @@ -17,23 +17,37 @@ limitations under the License. ================================================================================ --> -<div class="new-admin-modal"> + +<style> + .title{ + border-bottom: none !important; + } +</style> +<div> + <div class="b2b-modal-header"> + <h2 class="heading-medium" id="newAdmin">Add New Portal Admin</h2> + + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="pa-div-close-button" + ng-click="$dismiss('cancel')"></button> + </div> + </div> - <div class="search-users"> + <div class="b2b-modal-body"> + <search-users search-title="" selected-user="newPortalAdmin.selectedUser"></search-users> + </div> - <search-users search-title="Add New Portal Admin" - selected-user="newPortalAdmin.selectedUser"></search-users> + <div class="b2b-modal-footer"> + <div class="cta-button-group in"> + <button id="pa-search-users-button-save" class="btn btn-alt btn-small" + ng-click="newPortalAdmin.selectedUser && newPortalAdmin.addNewPortalAdmin()" + ng-class="{disabled: !newPortalAdmin.selectedUser}">Save</button> + <button id="pa-search-users-button-cancel" + class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Cancel</button> + </div> + </div> - <div class="dialog-control"> - - <button id="pa-search-users-button-save" class="btn btn-alt btn-small" - ng-click="newPortalAdmin.selectedUser && newPortalAdmin.addNewPortalAdmin()" - ng-class="{disabled: !newPortalAdmin.selectedUser}">Save - </button> - <button id="pa-search-users-button-cancel" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Cancel</button> - </div> - </div> -</div> + </div> <script> $(document).ready(function(){ diff --git a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.less b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.less index f8e1960c..7c8e5ff1 100644 --- a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.less +++ b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.less @@ -7,7 +7,7 @@ .admin-app-roles { .title { //.n18r; - .dGray18r; //AT&T Dark Gray + .dGray18r; border-bottom: @blue-active 3px solid; } diff --git a/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin-controller.js b/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin-controller.js index 89f6d0ae..de1557a9 100644 --- a/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin-controller.js +++ b/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin-controller.js @@ -20,7 +20,7 @@ 'use strict'; (function () { class PortalAdminsCtrl { - constructor($log, portalAdminsService, ngDialog, confirmBoxService) { + constructor($log, portalAdminsService, ngDialog, confirmBoxService, $modal) { let updateTableData = () => { this.isLoadingTable = true; @@ -91,20 +91,22 @@ } } } - ngDialog.open({ + + var modalInstance = $modal.open({ templateUrl: 'app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html', - controller: 'NewPortalAdminModalCtrl', - controllerAs: 'newPortalAdmin', + controller: 'NewPortalAdminModalCtrl as newPortalAdmin', + sizeClass: 'modal-medium', data: data - }).closePromise.then(needUpdate => { - if(needUpdate.value === true){ - $log.debug('PortalAdminsCtrl::openAddNewPortalAdminModal: updating Portal Admin table data...'); - updateTableData(); - } - }); + }) + + modalInstance.result.finally(function () { + $log.debug('PortalAdminsCtrl::openAddNewPortalAdminModal: updating Portal Admin table data...'); + updateTableData(); + }); + }; } } - PortalAdminsCtrl.$inject = ['$log', 'portalAdminsService', 'ngDialog', 'confirmBoxService']; + PortalAdminsCtrl.$inject = ['$log', 'portalAdminsService', 'ngDialog', 'confirmBoxService', '$modal']; angular.module('ecompApp').controller('PortalAdminsCtrl', PortalAdminsCtrl); })(); diff --git a/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin.tpl.html b/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin.tpl.html index 33268efb..e5396348 100644 --- a/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin.tpl.html @@ -29,7 +29,7 @@ <input id="input-table-search" placeholder="Search in entire table" class="table-search-field" type="text" data-ng-model="portalAdmin.searchString"> </div> <div class="table-control-buttons"> - <button class="btn btn-alt btn-small" ng-click="portalAdmin.openAddNewPortalAdminModal()"><i class="icon-people-userbookmark" aria-hidden="true"></i> Add Portal Admin</button> + <button class="btn btn-alt btn-small" id="portal-admin-button-add" ng-click="portalAdmin.openAddNewPortalAdminModal()"><i class="icon-people-userbookmark" aria-hidden="true"></i> Add Portal Admin</button> </div> </div> @@ -47,11 +47,11 @@ </thead> <tbody b2b-table-row type="body" row-repeat="rowData in portalAdmin.portalAdminsTableData"> <tr> - <td b2b-table-body id="rowheader_t1_{{$index}}" headers="col1" ng-bind="rowData.firstName"></td> - <td b2b-table-body headers="rowheader_t1_{{$index}} col2" ng-bind="rowData.lastName"></td> - <td b2b-table-body headers="rowheader_t1_{{$index}} col3" ng-bind="rowData.loginId"></td> - <td b2b-table-body headers="rowheader_t1_{{$index}} col4"> - <span class="icon-misc-trash" ng-click="portalAdmin.removePortalAdmin(rowData)"></span> + <td b2b-table-body id="rowheader_t1_{{$index}}-firstName" headers="col1" ng-bind="rowData.firstName"></td> + <td b2b-table-body id="rowheader_t1_{{$index}}-lastName" headers="rowheader_t1_{{$index}} col2" ng-bind="rowData.lastName"></td> + <td b2b-table-body id="rowheader_t1_{{$index}}-loginId" headers="rowheader_t1_{{$index}} col3" ng-bind="rowData.loginId"></td> + <td b2b-table-body id="rowheader_t1_{{$index}}" headers="rowheader_t1_{{$index}} col4"> + <span id="{{$index}}-button-portal-admin-remove" class="icon-misc-trash" ng-click="portalAdmin.removePortalAdmin(rowData)"></span> </td> </tr> </tbody> diff --git a/ecomp-portal-FE-common/client/app/views/role/popup_modal_rolefunction.html b/ecomp-portal-FE-common/client/app/views/role/popup_modal_rolefunction.html index c5673da8..ad05f9d5 100644 --- a/ecomp-portal-FE-common/client/app/views/role/popup_modal_rolefunction.html +++ b/ecomp-portal-FE-common/client/app/views/role/popup_modal_rolefunction.html @@ -17,39 +17,85 @@ limitations under the License. ================================================================================ --> + <style> + .dialog-control { + position: relative; + bottom: -13px; + right: 0px; +} + </style> +<style> + .dialog-control { + position: relative; + bottom: -13px; + right: 0px; +} + </style> -<div class="new-admin-modal" style="height: 350px;"> - <form name="adminForm" novalidate> - <div class="title" ng-bind="label" style="color: #5a5a5a;font-size: 18px;border-bottom: #067ab4 3px solid;margin-left:0px"></div> +<!-- <link rel="stylesheet" href="role.css"> + --><div class="new-admin-modal"> + <div class="b2b-modal-header"> + - <div id="name-property-title" class="property required"> - <div id="name-property-label" class="property-label" style="margin-bottom: 5px; color: #5a5a5a; font-size: 14px; font-weight: bold; padding-top: 20px;"> - <sup><b style="color: Red;">*</b></sup>Name:</div> - <input id="name-property-input" type="text" class="input-field" style=" display: inline-block; width: 396px; height: 40px;"ng-model="editRoleFunction.name" maxlength="30" /> - <div id="name-property-required" ng-show="!editRoleFunction.name||editRoleFunction.name.length==0" style="color: #cf2a2a; font-size: 10px;"><small style="position: absolute;">Name is Required</small> - </div> - </div> - <br /> - <div id="code-property-title" class="property required"> - <div id="code-property-label" class="property-label" style=" margin-bottom: 5px; color: #5a5a5a; font-size: 14px; font-weight: bold; padding-top: 20px;"> - <sup><b style="color: Red;">*</b></sup>Code: + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="button-cancel-role" + ng-click="$dismiss('cancel')"></button> </div> - <input id="code-property-input" type="text" class="input-field" style=" display: inline-block; width: 396px; height: 40px;" - ng-model="editRoleFunction.code" ng-disabled="disableCd" - maxlength="30" /> - <div id="code-property-required" ng-show="!editRoleFunction.code||editRoleFunction.code.length==0" style="color: #cf2a2a; font-size: 10px;"><small style="position: absolute;">Code is Required</small> - </div> </div> - + <div class="b2b-modal-body"> + <form id="admin-details-form" name="adminForm" novalidate> + <div class="title" ng-bind="label" class="adminForm-title"></div> +<br> + <div > + <div class="item-label"> <span ID="required" style="color: Red;" + visible="false"> *</span>Name:</div> + <input id="name-property-input" + class="adminForm-name-property-input" ng-model="editRoleFunction.name" + type="text" maxlength="30" + /> - <div class="dialog-control"> + <div class="error-container" + ng-show="!editRoleFunction.name||editRoleFunction.name.length==0"> + <small id="microservices-details-input-url-required" + class="err-message">Name is Required</small> + </div> + </div> + <br> + <div > + <div class="item-label"> <span ID="required" style="color: Red;" + visible="false"> *</span>Code:</div> + <input id="code-property-input" + class="adminForm-code-property-input" ng-model="editRoleFunction.code" ng-disabled="disableCd" + type="text" maxlength="30" + /> + + <div class="error-container" + ng-show="!editRoleFunction.code||editRoleFunction.code.length==0"> + <small id="code-property-required" + class="err-message">Code is Required</small> + </div> + </div> + + </form> + </div> + + <div class="b2b-modal-footer"> + <div class="dialog-control"> - <button id="button-app-save" class="save-button" size="small" ng-disabled="(!editRoleFunction.name||editRoleFunction.name.length==0)||(!editRoleFunction.code||editRoleFunction.code.length==0 )" ng-click="!saveRoleFunction(editRoleFunction)";herf="javascript:void(0)">Save</button> +<button id="button-app-save" class="btn btn-alt btn-small" size="small" ng-disabled="(!editRoleFunction.name||editRoleFunction.name.length==0)||(!editRoleFunction.code||editRoleFunction.code.length==0 )" ng-click="!saveRoleFunction(editRoleFunction)";herf="javascript:void(0)">Save</button> - <div id="button-app-cancel" class="cancel-button" ng-click="closeThisDialog()" role="button" tabindex="0" herf="javascript:void(0)">Cancel</div> + <div id="button-app-cancel" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')" role="button" tabindex="0" herf="javascript:void(0)">Cancel</div> </div> - </form> + + <!-- <div class="dialog-control"> + +<button id="button-app-save" class="btn btn-alt btn-small" size="small" ng-disabled="(!editRoleFunction.name||editRoleFunction.name.length==0)||(!editRoleFunction.code||editRoleFunction.code.length==0 )" ng-click="!saveRoleFunction(editRoleFunction)";herf="javascript:void(0)">Save</button> + +<div id="button-app-cancel" class="btn btn-alt btn-small" ng-click="closeThisDialog()" role="button" tabindex="0" herf="javascript:void(0)">Cancel</div> +</div> --> + </div> + </div> <script> @@ -57,3 +103,4 @@ $(document).ready(function(){ $(".ngdialog-close").attr('id','dialog-close'); }); </script> + diff --git a/ecomp-portal-FE-common/client/app/views/role/role-controller.js b/ecomp-portal-FE-common/client/app/views/role/role-controller.js index 2bd522a4..22b28e93 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role-controller.js +++ b/ecomp-portal-FE-common/client/app/views/role/role-controller.js @@ -18,70 +18,80 @@ * ================================================================================ */ -app.controller('roleController', function ($scope, $http, confirmBoxService, ngDialog, RoleService, conf, $stateParams){ + +app.controller('roleController', function ($scope, $http, confirmBoxService, ngDialog, RoleService, conf, $stateParams,$modal,utilsService){ //$scope.role=${role}; $( "#dialogRoleFunction" ).hide(); $( "#dialogChildRole" ).hide(); - - //$scope.ociavailableRoleFunctions=${availableRoleFunctions}; + $scope.routeRoleId = $stateParams.roleId; + + // $scope.ociavailableRoleFunctions=${availableRoleFunctions}; $scope.fetchRoles = function() { - - RoleService.getRole($stateParams.roleId).then(function(data){ - - var j = data; - $scope.data = JSON.parse(j.data); - - $scope.role =JSON.parse($scope.data.role); - - $scope.ociavailableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions); - $scope.availableRoleFunctions=[]; - - if($scope.ociavailableRoleFunctions) - $.each($scope.ociavailableRoleFunctions, function(i, a){ - var availableRoleFunction = a; - availableRoleFunction.selected = false; - $.each($scope.role.roleFunctions, function(j, b){ - if(a.code === b.code) { - availableRoleFunction.selected = true; - } - }); - $scope.availableRoleFunctions.push(availableRoleFunction); - }); - + $scope.isLoadingRoleFunctions = true; + utilsService.showLoadingLayer(); // show the loading layer + RoleService.getRole($stateParams.roleId).then(function(data){ + if(data==null || data ==''){ + var msg={ + content:'Something is wrong. Please contact the administrator for more information' + }; + confirmBoxService.reloadPageConfirm(msg); + }else{ + var j = data; + $scope.data = JSON.parse(j.data); + $scope.role =JSON.parse($scope.data.role); + $scope.routeRoleId = $stateParams.roleId; + $scope.ociavailableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions); + $scope.isGlobalRoleChecked=($scope.role.name.indexOf('global_')==-1)?false:true; - $scope.ociavailableRoles=JSON.parse($scope.data.availableRoles); - $scope.availableRoles=[]; - - if($scope.ociavailableRoles) - $.each($scope.ociavailableRoles, function(i, a){ - var availableRole = a; - availableRole.selected = false; - if($scope.role.childRoles){ - $.each($scope.role.childRoles, function(j, b){ - if(a.id === b.id) { - availableRole.selected = true; - } - }); - }; - $scope.availableRoles.push(availableRole); - }); - - - },function(error){ - console.log("RoleService.getRole failed", error); - //reloadPageOnce(); - }); + $scope.availableRoleFunctions=[]; + + if($scope.ociavailableRoleFunctions) + $.each($scope.ociavailableRoleFunctions, function(i, a){ + var availableRoleFunction = a; + availableRoleFunction.selected = false; + $.each($scope.role.roleFunctions, function(j, b){ + if(a.code === b.code) { + availableRoleFunction.selected = true; + } + }); + $scope.availableRoleFunctions.push(availableRoleFunction); + }); + $scope.ociavailableRoles=JSON.parse($scope.data.availableRoles); + $scope.availableRoles=[]; + + if($scope.ociavailableRoles) + $.each($scope.ociavailableRoles, function(i, a){ + var availableRole = a; + availableRole.selected = false; + if($scope.role.childRoles){ + $.each($scope.role.childRoles, function(j, b){ + if(a.id === b.id) { + availableRole.selected = true; + } + }); + }; + $scope.availableRoles.push(availableRole); + }); + } + },function(error){ + console.log("RoleService.getRole failed", error); + }).finally(function(){ + utilsService.hideLoadingLayer(); + $scope.isLoadingRoleFunctions = false; + }); } $scope.fetchRoles(); + $scope.isGlobalRoleChecked; + $scope.saveRole = function() { var exists = false,x; for(x in $scope.availableRoles){ if($scope.availableRoles[x].name==$scope.role.name){ exists = true; - //$modalInstance.close({availableRoleFunctions:message.availableRoleFunctions}); + // $modalInstance.close({availableRoleFunctions:message.availableRoleFunctions}); } } if (exists) { @@ -89,17 +99,30 @@ app.controller('roleController', function ($scope, $http, confirmBoxService, ngD } else { var uuu = conf.api.saveRole + "?role_id="+$stateParams.roleId; + if($scope.isGlobalRoleChecked ){ + $scope.role.name = ($scope.role.name.indexOf('global_')==-1)?('global_'+$scope.role.name):($scope.role.name); + + }else{ + $scope.role.name=$scope.role.name.replace('global_',''); + } var postData = { role: $scope.role, childRoles: $scope.role.childRoles, roleFunctions : $scope.role.roleFunctions }; - $http.post(uuu, JSON.stringify(postData)).then(function(res) { - // console.log('roleController::saveRole: ' + JSON.stringify(res)); - if (res && res.data && res.data.role) + $http.post(uuu, JSON.stringify(postData,$stateParams.roleId)).then(function(res) { + // console.log('roleController::saveRole: ' + + // JSON.stringify(res)); + if (res && res.data && res.data.role){ confirmBoxService.showInformation("Update Successful."); - else + $scope.routeRoleId = res.role; + $scope.isSaveClicked=true; + $scope.role=''; + } + + else{ confirmBoxService.showInformation('Failed to create role: ' + res.data.error) + } }, function(res){ console.log('post failed', res.data); @@ -110,42 +133,42 @@ app.controller('roleController', function ($scope, $http, confirmBoxService, ngD }; $scope.addNewRoleFunctionModalPopup = function() { - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/role/role_functions_popup.html', - controller: 'rolepopupController', - - resolve: { - roleId: function () { - return $stateParams.roleId; - }, - role: function () { - return $scope.role; + var modalInstance = $modal.open({ + templateUrl: 'app/views/role/role_functions_popup.html', + controller: 'rolepopupController', + sizeClass: 'modal-medium', + resolve: { + roleId: function () { + return $stateParams.roleId; }, - availableRoles: function () { - return $scope.ociavailableRoles; - }, - availableRoleFunctions: function () { - return $scope.ociavailableRoleFunctions; - }, - } - }); - modalInstance.closePromise.then(response => { - if($stateParams.roleId === '0'){ - return $scope.role; - }else{ - $scope.fetchRoles(); - } - // $scope.role=response.role; - }); + role: function () { + return $scope.role; + }, + availableRoles: function () { + return $scope.ociavailableRoles; + }, + availableRoleFunctions: function () { + return $scope.ociavailableRoleFunctions; + } + } + }); + + modalInstance.result.finally(function () { + if($stateParams.roleId === '0'){ + return $scope.role; + }else{ + $scope.fetchRoles(); + } + }); }; $scope.addNewChildRoleModalPopup = function() { - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/role/role_childrole_popup.html', - controller: 'rolepopupController', - - resolve: { - roleId: function () { + var modalInstance = $modal.open({ + templateUrl: 'app/views/role/role_childrole_popup.html', + controller: 'rolepopupController', + sizeClass: 'modal-medium', + resolve: { + roleId: function () { return $stateParams.roleId; }, role: function () { @@ -156,16 +179,17 @@ app.controller('roleController', function ($scope, $http, confirmBoxService, ngD }, availableRoleFunctions: function () { return $scope.ociavailableRoleFunctions; - }, - } - }).closePromise.then(function(response){ - if($stateParams.roleId === '0'){ - return $scope.role; - }else{ - $scope.fetchRoles(); - } - //$scope.role=response.role; + } + } }); + + modalInstance.result.finally(function () { + if($stateParams.roleId === '0'){ + return $scope.role; + }else{ + $scope.fetchRoles(); + } + }); }; $scope.removeRoleFunction = function(roleFunction) { diff --git a/ecomp-portal-FE-common/client/app/views/role/role-function-list-controller.js b/ecomp-portal-FE-common/client/app/views/role/role-function-list-controller.js index e7195996..5e7c62cc 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role-function-list-controller.js +++ b/ecomp-portal-FE-common/client/app/views/role/role-function-list-controller.js @@ -17,20 +17,21 @@ * limitations under the License. * ================================================================================ */ -app.controller('roleFunctionListController', function ($scope,RoleService,$http,$state,conf,confirmBoxService, ngDialog){ +app.controller('roleFunctionListController', function ($scope,RoleService,$http,$state,conf,confirmBoxService, ngDialog,$modal){ $( "#dialog" ).hide(); - + $scope.isLoadingRoleFunctions = true; RoleService.getRoleFunctionList().then(function(data){ var j = data; $scope.data = JSON.parse(j.data); $scope.availableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions); - //$scope.resetMenu(); },function(error){ console.log("failed"); //reloadPageOnce(); + }) .finally(function(){ + $scope.isLoadingRoleFunctions = false; }); $scope.editRoleFunction = null; @@ -46,32 +47,35 @@ app.controller('roleFunctionListController', function ($scope,RoleService,$http, $scope.editRoleFunction = availableRoleFunction; $scope.availableRoleFunctionsTemp=$scope.availableRoleFunctions; //$scope.availableRoleFunctions={}; - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/role/popup_modal_rolefunction.html', - controller: 'rolefunctionpopupController', - resolve: { - message: function () { - var message = { - availableRoleFunction: $scope.editRoleFunction, - availableRoleFunctions: $scope.availableRoleFunctionsTemp - }; - return message; - }, - isEditing: function () { - return true; - } - } - }); - modalInstance.closePromise.then(response =>{ - if(response.value!=null){ - if(response.value.result){ - $scope.availableRoleFunctions=response.value.availableRoleFunctions; - } - } - /*else - $scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp; - */ - }); + + var modalInstance = $modal.open({ + templateUrl: 'app/views/role/popup_modal_rolefunction.html', + controller: 'rolefunctionpopupController', + sizeClass: 'modal-small', + resolve: { + message: function () { + var message = { + availableRoleFunction: $scope.editRoleFunction, + availableRoleFunctions: $scope.availableRoleFunctionsTemp + }; + return message; + }, + isEditing: function () { + return true; + } + } + }); + + modalInstance.result.then(function (response) { + if(response.value!=null){ + if(response.value.result){ + $scope.availableRoleFunctions=response.value.availableRoleFunctions; + } + } + else + $scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp; + + }); }; $scope.addNewRoleFunctionModalPopup = function(availableRoleFunction) { @@ -79,34 +83,36 @@ app.controller('roleFunctionListController', function ($scope,RoleService,$http, $scope.editRoleFunction = null; $scope.availableRoleFunctionsTemp=$scope.availableRoleFunctions; //$scope.availableRoleFunctions={}; - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/role/popup_modal_rolefunction.html', - controller: 'rolefunctionpopupController', - resolve: { - message: function () { - var message = { - availableRoleFunction: $scope.editRoleFunction, - availableRoleFunctions: $scope.availableRoleFunctionsTemp - }; - return message; - }, - isEditing: function () { - return false; - } - } - }); - modalInstance.closePromise.then(response => { - if(response.value!=null){ - if(response.value.result){ - $scope.availableRoleFunctions=response.value.availableRoleFunctions; - } - } - /* if(response.availableRoleFunctions != undefined) - $scope.availableRoleFunctions=response.availableRoleFunctions; - else - $scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp; - */ - }); + var modalInstance = $modal.open({ + templateUrl: 'app/views/role/popup_modal_rolefunction.html', + controller: 'rolefunctionpopupController', + sizeClass: 'modal-small', + resolve: { + message: function () { + var message = { + availableRoleFunction: $scope.editRoleFunction, + availableRoleFunctions: $scope.availableRoleFunctionsTemp + }; + return message; + }, + isEditing: function () { + return false; + } + } + }); + + modalInstance.result.then(function (response) { + if(response.value!=null){ + if(response.value.result){ + $scope.availableRoleFunctions=response.value.availableRoleFunctions; + } + } + if(response.availableRoleFunctions != undefined) + $scope.availableRoleFunctions=response.availableRoleFunctions; + else + $scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp; + + }); }; $scope.addNewRoleFunctionPopup = function() { @@ -134,27 +140,28 @@ app.controller('roleFunctionListController', function ($scope,RoleService,$http, $scope.removeRole = function(availableRoleFunction) { confirmBoxService.confirm("You are about to delete the role function "+availableRoleFunction.name+". Do you want to continue?").then( - function(confirmed){ - if(confirmed){ - $scope.availableRoleFunctionsTemp=$scope.availableRoleFunctions; - //$scope.availableRoleFunctions={}; - var uuu = conf.api.removeRoleFunction; - var postData={availableRoleFunction: availableRoleFunction}; - $http.post(uuu,postData).then(function(response) { - var data = response.data; - if(data.availableRoleFunctions == undefined) - confirmBoxService.showInformation("Error while deleting: "+ data); - else - $scope.availableRoleFunctions=data.availableRoleFunctions; - }, - function() { - $scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp; - confirmBoxService.showInformation("Error while deleting: "+ data.responseText); - } - ); - } - }); - - }; + function(confirmed){ + if(confirmed){ + $scope.availableRoleFunctionsTemp=$scope.availableRoleFunctions; + //$scope.availableRoleFunctions={}; + var uuu = conf.api.removeRoleFunction; + var postData=availableRoleFunction; + $http.post(uuu,postData).then(function(response) { + var data = response.data; + if(data == undefined) + confirmBoxService.showInformation("Error while deleting: "+ data); + else + $scope.availableRoleFunctionsTemp.splice($scope.availableRoleFunctionsTemp.indexOf(availableRoleFunction), 1); + $scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp; + }, + function() { + $scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp; + confirmBoxService.showInformation("Error while deleting: "+ data.responseText); + } + ); + } + }); + + }; }); diff --git a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js index 2e1acf37..582706c5 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js +++ b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js @@ -17,7 +17,7 @@ * limitations under the License. * ================================================================================ */ -app.controller('roleListController', function ($scope,RoleService,confirmBoxService,conf,$state,$http){ +app.controller('roleListController', function ($scope,RoleService,confirmBoxService,conf,$state,$http,$log){ $scope.showSpinner = true; RoleService.getRoles().then(function(data){ @@ -26,20 +26,16 @@ app.controller('roleListController', function ($scope,RoleService,confirmBoxServ $scope.data = JSON.parse(j.data); $scope.availableRoles =JSON.parse($scope.data.availableRoles); $scope.showSpinner = false; - //$scope.resetMenu(); },function(error){ - console.log("failed"); - //reloadPageOnce(); + $log.debug('failed'); }); - $scope.goToUrl = function(roleIdVal) { + $scope.goToUrl = function(roleIdVal) { $state.go("root.role", {"roleId":roleIdVal}); - } - //console.log($scope.availableRoles); + } $scope.toggleRole = function(selected,availableRole) { - //alert('toggleRole: '+selected); var toggleType = null; if(selected) { toggleType = "activate"; @@ -48,57 +44,34 @@ app.controller('roleListController', function ($scope,RoleService,confirmBoxServ } confirmBoxService.confirm("You are about to "+toggleType+" the role "+availableRole.name+". Do you want to continue?").then( - function(confirmed){ + function(confirmed){ - if(confirmed) { - var uuu = conf.api.toggleRole; + if(confirmed) { + var uuu = conf.api.toggleRole; var postData={role:availableRole}; $http.post(uuu, postData).then(function(response) { var data = response.data; if (typeof data === 'object') { - console.log(data); + $log.debug('data:'+data); $scope.availableRoles=data.availableRoles; - console.log($scope.availableRoles); + $log.debug('role::availableRoles:'+$scope.availableRoles); } else { // } }, function(response) { - console.log(response.data); + debug.log('response:'+response); availableRole.active=!availableRole.active; confirmBoxService.showInformation("Error while saving."); }); - /* - $.ajax({ - type : 'POST', - url : uuu, - dataType: 'json', - contentType: 'application/json', - data: JSON.stringify(postData), - success : function(data){ - console.log(data); - $scope.$apply(function(){$scope.availableRoles=data.availableRoles;}); - console.log($scope.availableRoles); - }, - error : function(data){ - console.log(data); - availableRole.active=!availableRole.active; - confirmBoxService.showInformation("Error while saving."); - } - }); - */ } - else { - availableRole.active=!availableRole.active; - } - + + }) .catch(function(err) { + $log.error('roleListController::confirmBoxService.confirm error:', err); + availableRole.active=!availableRole.active; }); - //, - //function(){ - // availableRole.active=!availableRole.active; - //}) }; @@ -109,20 +82,7 @@ app.controller('roleListController', function ($scope,RoleService,confirmBoxServ function(confirmed){ var uuu = conf.api.removeRole; var postData={role:role}; - /* $.ajax({ - type : 'POST', - url : uuu, - dataType: 'json', - contentType: 'application/json', - data: JSON.stringify(postData), - success : function(data){ - $scope.$apply(function(){$scope.availableRoles=data.availableRoles;}); - }, - error : function(data){ - console.log(data); - confirmBoxService.showInformation("Error while deleting: "+ data.responseText); - } - }); */ + $http.post(uuu, postData).then(function(response) { @@ -134,7 +94,7 @@ app.controller('roleListController', function ($scope,RoleService,confirmBoxServ } }, function(response) { - console.log(response.data); + $log.debug('response:'+response.data); confirmBoxService.showInformation("Error while deleting: "+ data.responseText); }); diff --git a/ecomp-portal-FE-common/client/app/views/role/role.html b/ecomp-portal-FE-common/client/app/views/role/role.html index 2356058d..9febc978 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role.html +++ b/ecomp-portal-FE-common/client/app/views/role/role.html @@ -17,6 +17,25 @@ limitations under the License. ================================================================================ --> + <style> + .checkbox .skin { + left: 112px; + top: -8px; +} +.checkbox input { + margin: 0px; + left: 105px; + height: 20px; + top: -4px; + } +.checkbox span { + display: inline-block; + margin-left: 1px; + margin-top: 0; + position: relative; + top: -3px; +} + </style> <div class="w-ecomp-admins-page-main"> <div class="admins-home-container" id="page-content"> <div id="title" class="w-ecomp-main-view-title"> @@ -26,10 +45,18 @@ <div> <br> <p class="p-info">Please edit the role details below: </p><br> + + <div class="property-label checkbox-label"> + <label for="checkbox-app-is-restricted" class="checkbox"> + <input type="checkbox" ng-model="isGlobalRoleChecked" id="checkbox-app-is-restricted" ng-checked="isGlobalRoleChecked" /> + <i id="checkbox-app-is-restricted" class="skin"></i> + <span>Global Roles: </span> + </label> + </div> <div id="role-text" > <label id="role-text-name-label" >*Name:</label> - <input id="input-name" class="input-field" maxlength="30" type="text" data-ng-model="role.name"> + <input id="input-name" class="input-field" maxlength="300" type="text" data-ng-model="role.name"> <br> <label id="role-text-priority-label">Priority:</label> <input id="input-priority" class="input-field" maxlength="30" type="text" data-ng-model="role.priority"> @@ -40,12 +67,14 @@ </div> <br> + <div ng-if="routeRoleId!=0"> <div id="page-title" class="pageTitle"> <label>Role Functions</label> <a id="add-new-role" ng-click="addNewRoleFunctionModalPopup();" ng-style="{'cursor':'pointer'}" class="icon-primary-accordion-plus" size="small"></a> </div> <div b2b-table table-data="role.roleFunctions" ng-hide="users.isLoadingTable" search-string="users.searchString" class="b2b-table-div"> + <span class="ecomp-spinner" ng-show="isLoadingRoleFunctions"></span> <table> <thead b2b-table-row type="header"> <tr > @@ -57,7 +86,7 @@ <tr > <td id="role-function-{{roleFunction.name}}" b2b-table-body id="rowheader_t1_{{$index}}" headers="col1" ng-bind="roleFunction.name"></td> <td b2b-table-body headers="rowheader_t1_{{$index}} col4"> - <div ng-click="removeRoleFunction(roleFunction);" ><a href="javascript:void(0)" class="icon-misc-trash"></a></div> + <div id="{{$index}}-remove-trash-button" ng-click="removeRoleFunction(roleFunction);" ><a href="javascript:void(0)" class="icon-misc-trash"></a></div> </td> </tr> </tbody> @@ -82,7 +111,7 @@ <tbody b2b-table-row type="body" row-repeat="role in role.childRoles"> <tr > <td id="role-function-{{role.name}}" b2b-table-body id="rowheader_t1_{{$index}}" headers="col1" ng-bind="role.name"></td> - <td b2b-table-body headers="rowheader_t1_{{$index}} col4"> + <td b2b-table-body headers="rowheader_t1_{{$index}} col4" id="{{$index}}-button-remove-role" > <div ng-click="removeChildRole(role);" ><a href="javascript:void(0)" class="icon-misc-trash"></a></div> </td> </tr> @@ -90,7 +119,7 @@ </table> </div> </div> - + </div> </div> </div> </div> diff --git a/ecomp-portal-FE-common/client/app/views/role/role.less b/ecomp-portal-FE-common/client/app/views/role/role.less index 71d240dc..b6e92c9e 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role.less +++ b/ecomp-portal-FE-common/client/app/views/role/role.less @@ -47,4 +47,27 @@ .scroll-bar { border-radius: 0px !important; -}
\ No newline at end of file +} + +.admins-table-create-new-admin { + marin-bottom: 50px; +} + +.admins-table-space { + text-align: justify; + text-align-last: auto; +} + +.admins-table-tbody { + max-height: 980px; +} + +.admins-table-btn-txt { + font-size:20px; +} + +.admins-table-btn-create { + margin-bottom: 50px; +} + + diff --git a/ecomp-portal-FE-common/client/app/views/role/role_childrole_popup.html b/ecomp-portal-FE-common/client/app/views/role/role_childrole_popup.html index e96fb062..cf9502a1 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role_childrole_popup.html +++ b/ecomp-portal-FE-common/client/app/views/role/role_childrole_popup.html @@ -19,7 +19,14 @@ --> <link rel="stylesheet" href="role.css"> <div class="application-details-modal"> - <div id="title" class="title">Select Role Functions</div> + <div class="b2b-modal-header ng-scope in"> + <h2 id="myModalLabel" modal-title="">Select Role Functions</h2> + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="div-childrole-cancel-button" + ng-click="$dismiss('cancel')"></button> + </div> + </div> +<div class="b2b-modal-body"> <div class="scrolling-table"> <div b2b-table table-data="availableRoles" class="b2b-table-div"> @@ -44,9 +51,13 @@ </table> </div> </div> - <div class="dialog-control"> - <button id="button-app-cancel" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Close</button> - </div> +</div> + <div class="b2b-modal-footer ng-scope ng-isolate-scope in"> + <div class="cta-button-group in"> + <button class="btn btn-alt btn-small" type="button" id="div-childrole-close-button" + ng-click="$dismiss('cancel')">Close</button> + </div> + </div> </div> <script> $(document).ready(function(){ diff --git a/ecomp-portal-FE-common/client/app/views/role/role_function_list.html b/ecomp-portal-FE-common/client/app/views/role/role_function_list.html index 7c50a5ac..6abf6006 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role_function_list.html +++ b/ecomp-portal-FE-common/client/app/views/role/role_function_list.html @@ -42,16 +42,17 @@ <div class="admins-table"> <!-- <a ng-click="addNewRoleFunctionModalPopup();" class="icon-add" size="small" ></a> --> - <div id="create-new-admin" align="left" style="marin-bottom: 50px;"> + <div id="create-new-admin" align="left" class="admins-table-create-new-admin"> <button id="button-admin-create" type="submit" ng-click="addNewRoleFunctionModalPopup();" class="btn btn-alt btn-small">Create</button> </div> - <div style="text-align: justify;text-align-last:auto;"> + <div class="admins-table-space"> <!-- Click on the edit icon to update a role function, the plus icon to add additional role functions, or the delete icon to remove them. --> </div> <div id="rolesTable" class="c-ecomp-abs-table default" title="Role Functions"> + <span class="ecomp-spinner" ng-show="isLoadingRoleFunctions"></span> <table b2b-table table-data="availableRoleFunctions" current-page="1"> <thead b2b-table-row type="header"> <tr> @@ -61,7 +62,7 @@ <th id="table-header-delete" b2b-table-header width="10%" sortable="false">Delete?</th> </tr> </thead> - <tbody b2b-table-row type="body" row-repeat="availableRoleFunction in availableRoleFunctions" style="max-height: 980px;" ><!-- background colors will alternate not properly with multiple tbody--> + <tbody b2b-table-row type="body" row-repeat="availableRoleFunction in availableRoleFunctions" class="admins-table-tbody" ><!-- background colors will alternate not properly with multiple tbody--> <tr> <td id="table-body-role-{{availableRoleFunction['name'].split(' ').join('-')}}" b2b-table-body width="70%" ng-bind="availableRoleFunction['name']"></td> <td id="table-body-role-{{availableRoleFunction['code']}}" b2b-table-body width="10%" ng-bind="availableRoleFunction['code']"></td> @@ -69,11 +70,11 @@ <!-- <a ng-click="editRoleFunctionPopup(availableRoleFunction);" > <img src="static/fusion/images/editicon.gif"> </a> --> - <div ng-click="editRoleFunctionModalPopup(availableRoleFunction);" style="font-size:20px;"><a id="role-{{availableRoleFunction['name'].split(' ').join('-')}}-edit" href="javascript:void(0)" class="icon-edit"></a></div> + <div ng-click="editRoleFunctionModalPopup(availableRoleFunction);" class="admins-table-btn-txt"><a id="role-{{availableRoleFunction['name'].split(' ').join('-')}}-edit" href="javascript:void(0)" class="icon-edit"></a></div> </td> <td b2b-table-body width="10%"> <!-- <a ng-click="removeRole(availableRoleFunction);" ><img src="static/fusion/images/deleteicon.gif"></a> --> - <div ng-click="removeRole(availableRoleFunction);" style="font-size:20px;"><a id="role-{{availableRoleFunction['name'].split(' ').join('-')}}-trash" href="javascript:void(0)" class="icon-misc-trash"></a></div> + <div ng-click="removeRole(availableRoleFunction);" class="admins-table-btn-txt"><a id="role-{{availableRoleFunction['name'].split(' ').join('-')}}-trash" href="javascript:void(0)" class="icon-misc-trash"></a></div> </td> </tr> </tbody> diff --git a/ecomp-portal-FE-common/client/app/views/role/role_functions_popup.html b/ecomp-portal-FE-common/client/app/views/role/role_functions_popup.html index 52c4cb3a..a405ba02 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role_functions_popup.html +++ b/ecomp-portal-FE-common/client/app/views/role/role_functions_popup.html @@ -17,10 +17,21 @@ limitations under the License. ================================================================================ --> -<link rel="stylesheet" href="role.css"> + + + <link rel="stylesheet" href="role.css"> <div class="application-details-modal"> - <div id="title" class="title">Select Role Functions</div> -<div class="scrolling-table"> + <div class="b2b-modal-header"> + <h2 class="account-details-title" id="application-details-title">Select Role Functions</h2> + + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="div-notification-cancel--button" + ng-click="$dismiss('cancel')"></button> + </div> + </div> + + <div class="b2b-modal-body"> + <div class="scrolling-table"> <div b2b-table table-data="availableRoleFunctions" class="b2b-table-div"> <table> <thead b2b-table-row type="header"> @@ -43,13 +54,16 @@ </table> </div> </div> - <div class="dialog-control"> - <button id="button-app-cancel" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Close</button> - </div> -</div> + </div> + + <br> + <div class="b2b-modal-footer"> + <div class="cta-button-group in"> + <button id="button-notification-cancel" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')"role="button" tabindex="0">close</button> + </div> + </div> + + + -<script> -$(document).ready(function(){ - $(".ngdialog-close").attr('id','dialog-close'); -}); -</script> +</div>
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/role/role_list.html b/ecomp-portal-FE-common/client/app/views/role/role_list.html index 74de7c23..4248b46a 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role_list.html +++ b/ecomp-portal-FE-common/client/app/views/role/role_list.html @@ -17,16 +17,25 @@ limitations under the License. ================================================================================ --> + <style> + .property-label{ + text-align: right; + } + </style> <div class="w-ecomp-admins-page-main"> <div class="admins-home-container" id="page-content"> <div id="title" class="w-ecomp-main-view-title"> <h1 class="heading-page" >Roles</h1> </div> <div class="admins-table"> - <div id="button-create-role" align="left" style="marin-bottom: 50px;" > - <button ng-click="goToUrl(0)" class = "btn btn-alt btn-small">Create</button> + <div id="button-create-role" align="left" class="admins-table-btn-create" > + <button id="button-create-role" ng-click="goToUrl(0)" class = "btn btn-alt btn-small">Create</button> </div> + <br> + <div class="property-label"> + <span ID="required" style="color: Red;font-size: 210%;" visible="false"> *</span>-----Indicates Global Roles </div> <div b2b-table table-data="availableRoles" search-string="searchString" class="b2b-table-div"> + <span class="ecomp-spinner" ng-show="showSpinner"></span> <table> <thead b2b-table-row type="header"> <tr> @@ -38,20 +47,28 @@ </thead> <tbody b2b-table-row type="body" row-repeat="rowData in availableRoles"> <tr> - <td b2b-table-body id="rowheader_t1_{{$index}}" headers="col1" ng-bind="rowData['name']"></td> + <!-- <td b2b-table-body id="rowheader_t1_{{$index}}" headers="col1" ng-bind="rowData['name']"></td> --> + <td b2b-table-body> + <span ng-if="rowData.name.indexOf('global_')!=-1" id="required" style="color: Red;font-size: 180%;" visible="false"> *</span> + <span>{{rowData.name}}</span> + </td> <td b2b-table-body ng-bind="rowData['priority']"></td> <td b2b-table-body headers="rowheader_t1_{{$index}} col3" > <div > <label class="btn-switch-label" tabindex="0" role="option"> - <input type="checkbox" b2b-switches ng-model="rowData.active" ng-click="toggleRole(rowData.active,rowData);"> + <input type="checkbox" id="{{$index}}-button-toggle-role" b2b-switches ng-model="rowData.active" ng-click="toggleRole(rowData.active,rowData);"> </label> </div> </td> - <td b2b-table-body class="icon-misc-pen" ng-click="goToUrl(rowData.id)"></td> + <td b2b-table-body id="{{$index}}-button-edit-role" class="icon-misc-pen" ng-click="goToUrl(rowData.id)"></td> </tr> </tbody> </table> + + </div> </div> </div> </div> + + diff --git a/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js b/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js index db5bb1b6..41241500 100644 --- a/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js +++ b/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js @@ -17,79 +17,85 @@ * limitations under the License. * ================================================================================ */ -app.controller('rolefunctionpopupController', function ($scope, confirmBoxService, message, $http,RoleService, conf, isEditing){ - if(message.availableRoleFunction==null) { - $scope.label='Add Role Function'; - var tempText = ""; - } - else{ - $scope.label='Edit Role Function' - $scope.disableCd=true; - var tempText = new String(message.availableRoleFunction.name); - $scope.editRoleFunction = angular.copy(message.availableRoleFunction); - } - - $scope.tempText = tempText; - $scope.isEditing = isEditing; - - $scope.saveRoleFunction = function(availableRoleFunction) { - var uuu = conf.api.saveRoleFunction; - var postData={availableRoleFunction: availableRoleFunction}; +app.controller('rolefunctionpopupController',function($scope, confirmBoxService, message, $http,RoleService, conf, isEditing) { + if (message.availableRoleFunction == null) { + $scope.label = 'Add Role Function'; + var tempText = ""; + } else { + $scope.label = 'Edit Role Function' + $scope.disableCd = true; + var tempText = new String(message.availableRoleFunction.name); + $scope.editRoleFunction = angular.copy(message.availableRoleFunction); + } - if(availableRoleFunction==null){ - confirmBoxService.showInformation("Please enter valid role function details."); - } - var exists = false,x; - for(x in message.availableRoleFunctions){ - console.log(message.availableRoleFunctions[x].name); - if(message.availableRoleFunctions[x].name==availableRoleFunction.name){ - confirmBoxService.showInformation("Role Function already exists."); - exists = true; - availableRoleFunction.name = $scope.tempText; - break; - } - if(!isEditing){ - if (message.availableRoleFunctions[x].code == availableRoleFunction.code) { - confirmBoxService.showInformation("Code already exists. Please create a role function with a different code to proceed."); - exists = true; - availableRoleFunction.name = $scope.tempText; - break; - } - } - } - - if(!exists && availableRoleFunction.name.trim() != '' && availableRoleFunction.code.trim() != ''){ - $http.post(uuu, JSON.stringify(postData)).then(function(res){ - console.log("data"); -// console.log(res.data); -// $scope.availableRoleFunctionsTemp = res.data.availableRoleFunctions; - RoleService.getRoleFunctionList().then(function(data){ - - var j = data; - $scope.data = JSON.parse(j.data); - $scope.availableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions); - - //$scope.resetMenu(); - $scope.closeThisDialog({result: true, availableRoleFunctions: $scope.availableRoleFunctions }); - },function(error){ - console.log("failed"); - //reloadPageOnce(); - $scope.closeThisDialog(true); - }); - - - }); - - - - - } - }; - - - - $scope.close = function() { - this.closeThisDialog(true); - }; -} -); + $scope.tempText = tempText; + $scope.isEditing = isEditing; + + $scope.saveRoleFunction = function(availableRoleFunction) { + confirmBoxService.confirm( + "You are about to Create the role function "+ availableRoleFunction.name+ ". Do you want to continue?") + .then(function(confirmed) { + if (confirmed) { + + var uuu = conf.api.saveRoleFunction; + var postData = availableRoleFunction; + + if (availableRoleFunction == null) { + confirmBoxService.showInformation("Please enter valid role function details."); + } + var exists = false, x; + for (x in message.availableRoleFunctions) { + console.log(message.availableRoleFunctions[x].name); + if (message.availableRoleFunctions[x].name == availableRoleFunction.name) { + confirmBoxService.showInformation("Role Function already exists."); + exists = true; + availableRoleFunction.name = $scope.tempText; + break; + } + if (!isEditing) { + if (message.availableRoleFunctions[x].code == availableRoleFunction.code) { + confirmBoxService.showInformation("Code already exists. Please create a role function with a different code to proceed."); + exists = true; + availableRoleFunction.name = $scope.tempText; + break; + } + } + } + + if (!exists&& availableRoleFunction.name.trim() != ''&& availableRoleFunction.code.trim() != '') { + $http.post(uuu,JSON.stringify(postData)).then(function(res) { + $scope.availableRoleFunctionsTemp = res.data.availableRoleFunctions; + RoleService.getRoleFunctionList().then( + function(data) { + + var j = data; + $scope.data = JSON.parse(j.data); + $scope.availableRoleFunctions = JSON.parse($scope.data.availableRoleFunctions); + + // $scope.resetMenu(); + /*$scope.closeThisDialog({ + result : true, + availableRoleFunctions : $scope.availableRoleFunctions + });*/ + $scope.$dismiss({result : true,availableRoleFunctions : $scope.availableRoleFunctions}); + }, + function(error) { + console.log("failed"); + // reloadPageOnce(); + //$scope.closeThisDialog(true); + $scope.$dismiss('cancel'); + }); + + }); + + } + }; + + $scope.close = function() { + this.closeThisDialog(true); + }; + } + + ); + } + });
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js b/ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js index 1176e50a..67bf3b2e 100644 --- a/ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js +++ b/ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js @@ -88,9 +88,6 @@ app.controller('rolepopupController', function ($scope, role, roleId, confirmBo } - else { - availableRoleFunction.selected=!availableRoleFunction.selected; - } /* $.ajax({ type : 'POST', @@ -106,7 +103,11 @@ app.controller('rolepopupController', function ($scope, role, roleId, confirmBo } }); */ - }); + }).catch(function(err) { + availableRoleFunction.selected=!availableRoleFunction.selected; + $log.error('roleListController::confirmBoxService.confirm error:', err); + + }); } else { //add role function @@ -127,10 +128,7 @@ app.controller('rolepopupController', function ($scope, role, roleId, confirmBo function(data) { confirmBoxService.showInformation("Error while saving."); }); - } else { - availableRoleFunction.selected=!availableRoleFunction.selected; - } - /* + } /* $.ajax({ type : 'POST', url : uuu, @@ -150,7 +148,10 @@ app.controller('rolepopupController', function ($scope, role, roleId, confirmBo function(){ availableRoleFunction.selected=!availableRoleFunction.selected; })*/ - }); + }).catch(function(err) { + availableRoleFunction.selected=!availableRoleFunction.selected; + $log.error('roleListController::confirmBoxService.confirm error:', err); + }); } @@ -180,10 +181,11 @@ app.controller('rolepopupController', function ($scope, role, roleId, confirmBo function(data) { confirmBoxService.showInformation("Error while saving."); }); - } else { - availableRole.selected=false; } - }); + }).catch(function(err) { + availableRole.selected=!availableRole.selected; + $log.error('roleListController::confirmBoxService.confirm error:', err); + }); /* $.ajax({ type : 'POST', url : uuu, @@ -219,8 +221,6 @@ app.controller('rolepopupController', function ($scope, role, roleId, confirmBo function(data) { confirmBoxService.showInformation("Error while saving."); }); - } else { - availableRole.selected=false; } /* $.ajax({ type : 'POST', @@ -236,7 +236,10 @@ app.controller('rolepopupController', function ($scope, role, roleId, confirmBo } });*/ - }); + }).catch(function(err) { + availableRole.selected=!availableRole.selected; + $log.error('roleListController::confirmBoxService.confirm error:', err); + }); } diff --git a/ecomp-portal-FE-common/client/app/views/search/search.less b/ecomp-portal-FE-common/client/app/views/search/search.less index 11c71f9a..85d79d01 100644 --- a/ecomp-portal-FE-common/client/app/views/search/search.less +++ b/ecomp-portal-FE-common/client/app/views/search/search.less @@ -63,4 +63,12 @@ padding-bottom: 20px; .search-popup-content{ line-height: normal; right: 167px; min-height: 122px; height: auto; width: auto; +} + +.search-li { + font-size: 16px; +} + +.contentVertical-pos { + position: relative; }
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.less b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.less index 2625f32c..8dc97447 100644 --- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.less +++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.less @@ -168,3 +168,49 @@ background-color: transparent; padding-bottom: 11px; } + +.contactus-manage-table { + height: 300px; +} + +.contactus-addWidgetHeader { + margin-top: 15px; + margin-left: -78px; +} + +.contactus-addWidgetHeader-txt { + font-size: 18px; +} + +.mots-property-label-spn { + color: Red; +} + +.property-label-desc-txtarea { + margin-top: 0px; + margin-bottom: 0px; + height: 100px; +} + +.btn-ht { + height: 50px; +} + +.btn-ht-href { + float: right; + margin-top: 20px; +} + +.close-btn-ht-href { + float: right; + margin-right: -230px !important; +} + +.manage-contactus-home { + margin-top: 25px; +} + +.manage-contactus-top { + margin-top: 10px; + margin-bottom: 10px; +}
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.html b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.html index 4c8f6dee..c85618e2 100644 --- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.html +++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.html @@ -17,165 +17,112 @@ limitations under the License. ================================================================================ --> -<div style="margin-top: 10px; margin-bottom: 10px;"></div> -<br /> - -<div style="margin-top: 25px;"> - <div id="title" class="manage-contactUs-home-title">Manage - Contact Us</div> - <div class="contact-us-margin"> - <div class="get-access-table"> - <div class="table-control"> - <div class="c-ecomp-portal-abs-table" style="height: 300px"> - <table b2b-table id="table-main" table-data="contactUsList" - current-page="ignoredCurrentPage"> - <thead b2b-table-row type="header"> - <tr> - <th id="th-users-0" b2b-table-header key="ecomp_function" - default-sort="a">App Name</th> - <th id="th-users-1" b2b-table-header key="app_name" - sortable="true">Contact Name</th> - <th id="th-users-2" b2b-table-header key="app_name" - sortable="true">Contact Email</th> - <th id="th-users-3" b2b-table-header key="role_name" - sortable="true">Contact URL</th> - <th id="th-users-4" b2b-table-header key="role_name" - sortable="true">Description</th> - <th id="th-users-5" b2b-table-header key="role_name" - sortable="true">Edit</th> - <th id="th-users-6" b2b-table-header key="role_name" - sortable="true">Delete</th> - </tr> - </thead> - <!-- Use track-by="UNIQUE KEY HERE" or leave out if no unique keys in data --> - <tbody b2b-table-row type="body" class="table-body" - track-by="$index" row-repeat="rowData in contactUsList"> - <tr id="tr-rowData" ng-click=""> - <td b2b-table-body> - <div id="users-page-td-appName" ng-bind="rowData.appName"></div> - </td> - <td b2b-table-body> - <div id="users-page-td-name" ng-hide="rowData.showEdit" - ng-bind="rowData.contactName"></div> <input - class="input-inline-edit-text" type="text" - ng-show="rowData.showEdit" - ng-model="contactUsList[$index].contactName" /> - </td> - <td b2b-table-body> - <div id="users-page-td-email" ng-hide="rowData.showEdit" - ng-bind="rowData.contactEmail"></div> <input - class="input-inline-edit-text" type="text" - ng-show="rowData.showEdit" - ng-model="contactUsList[$index].contactEmail" /> - </td> - <td b2b-table-body> - <div id="users-page-td-url" ng-hide="rowData.showEdit" - ng-bind="rowData.url"></div> <input - class="input-inline-edit-text" type="text" - ng-show="rowData.showEdit" ng-model="contactUsList[$index].url" /> - </td> - <td b2b-table-body> - <div id="users-page-td-descr" ng-hide="rowData.showEdit" - ng-bind=" rowData.description"></div> <input - class="input-inline-edit-text" type="text" - ng-show="rowData.showEdit" - ng-model="contactUsList[$index].description" /> - </td> - <td b2b-table-body> - <div class="delete-contact-us" ng-hide="rowData.showEdit" - ng-click="rowData.showEdit=true"> - <span class="icon-edit"></span> - </div> <span ng-show="rowData.showEdit"> <a - btn-type="primary" - ng-click="editContactUsFun(rowData); rowData.showEdit=false" - class="btn btn-alt btn-small" size="small">Save</a> - </span> - </td> - <td b2b-table-body> - <div class="delete-contact-us" - ng-click="delContactUsFun(rowData)"> - <span class="icon-misc-trash"></span> - </div> - </td> - </tr> - </tbody> - </table> - </div> - - <div id="divider-line"></div> - <div style="margin-top: 15px; margin-left: -78px;"> - <div id="addWidgetHeader" class="contact-us-margin"> - <h1 style="font-size: 18px;">Add Application Contact - Information</h1> - <!-- <div class="errMsg">{{errMsg}}</div> --> - </div> - <div id="addWidget" class="contact-us-margin"> - <div> - <div id="add-contact-us-field-appname" - class="add-contact-us-field"> - <div id="mots-property-label" class="property-label"><span ID="required" style="color: Red;"visible="false"> *</span>App Name</div> - <select id="dropdown1" name="dropdown1" b2b-dropdown - placeholder-text="Select an App" - ng-model="newContactUs.app.value"> - <option b2b-dropdown-list - option-repeat="d in contactUsAllAppList" value="{{d.value}}">{{d.title}}</option> - </select> - <div id="mots-property-label-required" ng-show="newContactUs.app.title==null || newContactUs.app.title=='' "> - <small class="mandatory-categories">App Name is Required</small> - </div> - </div> - <br> - <div id="add-contact-us-field-contactname" - class="add-contact-us-field"> - <div id="property-label-name" class="property-label">Contact - Name</div> - <input id="property-input-name" class="input-text-area" - type="text" ng-model="newContactUs.name" /> - </div> - <div id="add-contact-us-field-email" class="add-contact-us-field"> - <div id="property-label-email" class="property-label">Contact - Email</div> - <input id="property-input-email" class="input-text-area" - type="text" ng-model="newContactUs.email" /> - </div> - <div id="add-contact-us-field-url" class="add-contact-us-field"> - <div id="property-label-url" class="property-label">Contact - URL</div> - <input id="property-input-url" class="input-text-area" - type="text" ng-model="newContactUs.url" /> - </div> - <div id="add-contact-us-field-desc" - class="add-contact-us-field-des"> - <div id="property-label-desc" class="property-label">Description</div> - <textarea id="property-input-desc" - style="margin-top: 0px; margin-bottom: 0px; height: 100px" - ng-model="newContactUs.desc"></textarea> - </div> - </div> - <div style="height: 50px;"> - <a style="float: right; margin-top: 20px" - class="btn btn-alt btn-small" ng-click="newContactUsFun()" ng-disabled="newContactUs.app.title==null || newContactUs.app.title=='' ">Add - New</a> +<div class="b2b-modal-header" > + <h2 id="myModalLabel" b2b-modal-title="" tabindex="-1">Manage Contact Us</h2> + <div class="corner-button"> + <button type="button" class="close" aria-label="Close" ng-click="$dismiss('cancel')"></button> + </div> +</div> +<div class="b2b-modal-body" tabindex="0" role="region" aria-label="Modal header text content" > + <div class="c-ecomp-portal-abs-table contactus-manage-table"> + <table b2b-table id="table-main" table-data="contactUsList" current-page="ignoredCurrentPage"> + <thead b2b-table-row type="header"> + <tr> + <th id="th-users-0" b2b-table-header key="ecomp_function" default-sort="a">App Name</th> + <th id="th-users-1" b2b-table-header key="app_name" sortable="true">Contact Name</th> + <th id="th-users-2" b2b-table-header key="app_name" sortable="true">Contact Email</th> + <th id="th-users-3" b2b-table-header key="role_name" sortable="true">Contact URL</th> + <th id="th-users-4" b2b-table-header key="role_name" sortable="true">Description</th> + <th id="th-users-5" b2b-table-header key="role_name" sortable="true">Edit</th> + <th id="th-users-6" b2b-table-header key="role_name" sortable="true">Delete</th> + </tr> + </thead> + <!-- Use track-by="UNIQUE KEY HERE" or leave out if no unique keys in data --> + <tbody b2b-table-row type="body" class="table-body" track-by="$index" row-repeat="rowData in contactUsList"> + <tr id="tr-rowData" ng-click=""> + <td b2b-table-body> + <div id="users-page-td-appName" ng-bind="rowData.appName"></div> + </td> + <td b2b-table-body> + <div id="users-page-td-name" ng-hide="rowData.showEdit" ng-bind="rowData.contactName"></div> + <input class="input-inline-edit-text" type="text" ng-show="rowData.showEdit" ng-model="contactUsList[$index].contactName" /> + </td> + <td b2b-table-body> + <div id="users-page-td-email" ng-hide="rowData.showEdit" ng-bind="rowData.contactEmail"></div> + <input class="input-inline-edit-text" type="text" ng-show="rowData.showEdit" ng-model="contactUsList[$index].contactEmail" /> + </td> + <td b2b-table-body> + <div id="users-page-td-url" ng-hide="rowData.showEdit" ng-bind="rowData.url"></div> + <input class="input-inline-edit-text" type="text" ng-show="rowData.showEdit" ng-model="contactUsList[$index].url" /> + </td> + <td b2b-table-body> + <div id="users-page-td-descr" ng-hide="rowData.showEdit" ng-bind=" rowData.description"></div> + <input class="input-inline-edit-text" type="text" ng-show="rowData.showEdit" ng-model="contactUsList[$index].description" /> + </td> + <td b2b-table-body> + <div class="delete-contact-us" ng-hide="rowData.showEdit" ng-click="rowData.showEdit=true"> + <span class="icon-edit"></span> + </div> + <span ng-show="rowData.showEdit"> + <a btn-type="primary" ng-click="editContactUsFun(rowData); rowData.showEdit=false" class="btn btn-alt btn-small" size="small">Save</a> + </span> + </td> + <td b2b-table-body> + <div class="delete-contact-us" ng-click="delContactUsFun(rowData)"> + <span class="icon-misc-trash"></span> </div> - <div id="divider-line-bottom"></div> + </td> + </tr> + </tbody> + </table> + </div> - <div style="height: 50px;"> - <a style="float: right; margin-right: -230px !important;" - class="btn btn-alt btn-small" ng-click="closeDialog()">Close</a> - </div> + <div id="divider-line"></div> - </div> + <div class="contactus-addWidgetHeader"> + <div id="addWidgetHeader" class="contact-us-margin"> + <h1 class="contactus-addWidgetHeader-txt">Add Application Contact Information</h1> + </div> + <div id="addWidget" class="contact-us-margin"> + <div> + <div id="add-contact-us-field-appname" class="add-contact-us-field"> + <div id="mots-property-label" class="property-label"> + <span ID="required" class="mots-property-label-spn" visible="false"> *</span>App Name + </div> + <select id="dropdown1" name="dropdown1" b2b-dropdown placeholder-text="Select an App" ng-model="newContactUs.app.value"> + <option b2b-dropdown-list option-repeat="d in contactUsAllAppList" value="{{d.value}}">{{d.title}}</option> + </select> + <div id="mots-property-label-required" ng-show="newContactUs.app.title==null || newContactUs.app.title=='' "> + <small class="mandatory-categories">App Name is Required</small> + </div> </div> - - </div> + <br> + <div id="add-contact-us-field-contactname" class="add-contact-us-field"> + <div id="property-label-name" class="property-label">Contact Name</div> + <input id="property-input-name" class="input-text-area" type="text" ng-model="newContactUs.name" /> + </div> + <div id="add-contact-us-field-email" class="add-contact-us-field"> + <div id="property-label-email" class="property-label">Contact Email</div> + <input id="property-input-email" class="input-text-area" type="text" ng-model="newContactUs.email" /> + </div> + <div id="add-contact-us-field-url" class="add-contact-us-field"> + <div id="property-label-url" class="property-label">Contact URL</div> + <input id="property-input-url" class="input-text-area" type="text" ng-model="newContactUs.url" /> + </div> + <div id="add-contact-us-field-desc" class="add-contact-us-field-des"> + <div id="property-label-desc" class="property-label">Description</div> + <textarea id="property-input-desc" class="property-label-desc-txtarea" ng-model="newContactUs.desc"></textarea> + </div> + </div> </div> </div> </div> - -<script type="application/javascript"> - $(document).ready(function(){ - $(".ngdialog-content").css("width","85%"); - $(".ngdialog-close").attr('id','dialog-close'); - }); -</script> +<div class="b2b-modal-footer ng-scope ng-isolate-scope"> + <div class="cta-button-group cta-modal-footer-flex"> + <div> + <button class="btn btn-clear btn-medium pull-left" type="button" ng-click="$dismiss('cancel')">Close</button> + <button class="btn btn-alt btn-medium" type="button" ng-click="newContactUsFun()" ng-disabled="newContactUs.app.title==null || newContactUs.app.title=='' ">Add New</button> + </div> + </div> +</div>
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.js b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.js index eddde0d9..770f85e6 100644 --- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.js +++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.js @@ -105,21 +105,24 @@ updateContactUsTable(); this.editContactUsModalPopup = () => { - // $log.debug('ContactUsCtrl::editContactUsModalPopup updating table data...'); - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/support/contact-us/contact-us-manage/contact-us-manage.html', - controller: 'ContactUsManageController', - resolve: { - message: function message() { - var message = { - type: 'Contact', - }; - return message; - } - } - }).closePromise.then(needUpdate => { - updateContactUsTable(); - }); + var modalInstance = $modal.open({ + templateUrl: 'app/views/support/contact-us/contact-us-manage/contact-us-manage.html', + controller: 'ContactUsManageController', + windowClass: 'modal-docked', + resolve: { + message: function message() { + var message = { + type: 'Contact', + }; + return message; + } + } + }); + + modalInstance.result.finally(function (needUpdate) { + updateContactUsTable(); + }); + }; this.goToSection = (id) => { diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.less b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.less index 6fd0a420..9b463e40 100644 --- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.less +++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.less @@ -12,6 +12,7 @@ .w-ecomp-main-view-title{ font-family: Omnes-ECOMP-W02,Arial; + font-size: 20px; } #title{ @@ -30,6 +31,8 @@ padding-left: 0; padding-bottom: 32px; width: 100%; + height:100%; + overflow:auto; .contactUs-general-div { @@ -89,5 +92,42 @@ padding-top: 5px; padding-bottom: 5px; } + +.contactUs-table-ht { + height:60px; +} + +.contactUs-table-spn { + top:20px; +} + +.contactUs-table-title-spn { + float: right; + margin-right: 30px; + margin-top:20px; +} + +.contactUs-collapsible-panel-spn { + margin-bottom: 20px; +} +.contactUs-main-table { + border-spacing: 10px 5px; + max-width:950px; + margin:10px; +} + +.contactUs-main-panel-labels { + width: 120px; +} + +.contactUs-main-panel-value { + width: 830px; +} + +.contactUs-table-ht { + height:auto; +} + + } diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.tpl.html b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.tpl.html index 444a9820..c2ec02ca 100644 --- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.tpl.html @@ -17,7 +17,7 @@ limitations under the License. ================================================================================ --> -<div class="w-ecomp-contactUs-home" style=" overflow:auto;''"> +<div class="w-ecomp-contactUs-home"> <div class="contactUs-home-container" id="page-content"> <div class="admins-page-main"> <div id="title" class="w-ecomp-main-view-title"> @@ -28,7 +28,7 @@ <br/> <!-- Function Categories --> - <div id="appFunctionInfo" style="font-size: 20px;" class="w-ecomp-main-view-title"> Application Functions + <div id="appFunctionInfo" class="w-ecomp-main-view-title"> Application Functions <div b2b-table table-data="contact.functionalTableData" class="b2b-table-div"> <table> <thead b2b-table-row type="header"> @@ -66,17 +66,17 @@ <br/> <!-- Display applicationInfo panels --> <div id="allAppInfo"> - <div style="font-size: 20px;" class="w-ecomp-main-view-title"> All Applications + <div class="w-ecomp-main-view-title"> All Applications </div> <div class="contactUs-general-div"> <div class="contact-us-table"> - <div style="height:auto;" class="c-ecomp-portal-abs-table default"> + <div class="c-ecomp-portal-abs-table default contactUs-table-ht"> <div ng-repeat="rowData in contact.appTable" class="contactUs-collapsible-panel"> - <div id="{{rowData.app_Id}}" style="height:60px; " class="contactUs-panel-header" ng-click="rowData.showFlag = !rowData.showFlag" > - <span id="appId{{$index}}" ng-bind="rowData.app_name" style="position:relative; top:20px"></span> + <div id="{{rowData.app_Id}}" class="contactUs-table-ht" class="contactUs-panel-header" ng-click="rowData.showFlag = !rowData.showFlag" > + <span id="appId{{$index}}" ng-bind="rowData.app_name" class="contactUs-table-spn"></span> - <span style="float: right; margin-right: 30px; margin-top:20px;"> + <span class="contactUs-table-title-sp"> <span ng-show="rowData.showFlag" title="Collapse app contact section" class="icon-controls-upPRIMARY"></span> <span ng-hide="rowData.showFlag" title="Expand app contact section" class="icon-controls-down"></span> </span> @@ -85,13 +85,13 @@ <div id="collapse{{$index}}" ng-show="rowData.showFlag" class="contactUs-collapsible-panel"> <div class="contactUs-txt" ng-hide="rowData.contact_name || rowData.contact_email || rowData.url_Info || rowData.desc"> - <span style="margin-bottom: 20px;"> No application information is available. Please use the links above to contact the ECOMP Portal team. </span> + <span class="contactUs-collapsible-panel-spn"> No application information is available. Please use the links above to contact the ECOMP Portal team. </span> </div> <div class="contactUs-txt" ng-show="rowData.contact_name || rowData.contact_email || rowData.url_Info || rowData.desc"> - <table style="border-spacing: 10px 5px; max-width:950px; margin:10px;"> + <table class="contactUs-main-table"> <tr> - <td class="contactUs-panel-labels" style="width: 120px;">Contact:</td> - <td class="contactUs-panel-labels" style="width: 830px;">{{rowData.contact_name}}</td> + <td class="contactUs-panel-labels contactUs-main-panel-labels">Contact:</td> + <td class="contactUs-panel-labels contactUs-main-panel-value">{{rowData.contact_name}}</td> </tr> <tr> <td class="contactUs-panel-labels">Email:</td> diff --git a/ecomp-portal-FE-common/client/app/views/tabs/tabframe.html b/ecomp-portal-FE-common/client/app/views/tabs/tabframe.html index 0155592a..9a6b3f3d 100644 --- a/ecomp-portal-FE-common/client/app/views/tabs/tabframe.html +++ b/ecomp-portal-FE-common/client/app/views/tabs/tabframe.html @@ -17,6 +17,6 @@ limitations under the License. ================================================================================ --> -<iframe id= "tabframe-{{tab.title.split(' ').join('-')}}" scrolling='yes' frameBorder='0' width='100%' style='height: 90vh;' +<iframe id= "tabframe-{{tab.title.split(' ').join('-')}}" scrolling='yes' frameBorder='0' width='100%' class='tab-iframe' src='{{tab.content | trusted}}' ></iframe>
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/tabs/tabs.less b/ecomp-portal-FE-common/client/app/views/tabs/tabs.less index 9f90d610..76ee598c 100644 --- a/ecomp-portal-FE-common/client/app/views/tabs/tabs.less +++ b/ecomp-portal-FE-common/client/app/views/tabs/tabs.less @@ -643,10 +643,13 @@ md-ink-bar{ transition: transform @transition; } +.icon-primary-close{ +font-size: 14px; +} .tab-cross-sign{ - position:relative; - margin-left: 126px; - top:-70px; + position: relative; + margin-left: 123px; + top: -76px; @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { top:-70px; } @@ -658,3 +661,25 @@ md-ink-bar{ border-bottom-width:0px; padding: 6px 6px 6px 3px; } + +.tab-iframe { + height: 90vh; +} + +.selectedIndex-spn { + overflow: hidden; + white-space: + nowrap;display: block; +} + +.tab-space-pos { + position: fixed; + right: 290px; + top: 62px; +} + +.search-box { + position: fixed; + right: 0; + top: 58px; +}
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.controller.js b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.controller.js index 5fc2d894..a691887f 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.controller.js +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.controller.js @@ -22,12 +22,17 @@ (function () { class userNotificationCtrl { - constructor($scope, message, ngDialog) { - $scope.messageData=message.text; - //alert("message.text" + $scope.messageData); + constructor($scope, ngDialog,items) { + $scope.messageData=items.text; + $scope.messageObject=items.messageObject; + $scope.selectedAdminNotification=items.selectedAdminNotification; + $scope.messageRecipients=items.messageRecipients; + $scope.notifiHyperlink=function(ticket){ + window.open(ticket); + } } } - userNotificationCtrl.$inject = ['$scope', 'message', 'ngDialog']; + userNotificationCtrl.$inject = ['$scope','ngDialog','items']; angular.module('ecompApp').controller('userNotificationCtrl', userNotificationCtrl); })(); diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html index 5e5c55db..45c73518 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html @@ -17,32 +17,58 @@ limitations under the License. ================================================================================ --> -<div class="w-ecomp-user-json-notification-details-admin" - ng-style="{bottom: tabBottom}"> - <div class="w-ecomp-main-container" > - <div class="user-notification" > - <div id="'widgets-details-title" class="w-ecomp-main-json-view-title"> Message Notification Details </div> - - -<div class="notifications-properties-main"> - - <div ng-bind-html="messageData"></div> - </div> - - <div class="dialog-control-close"> - - <button id="div-cancel-button" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Close</button> - </div> - + +<div class="b2b-modal-header"> + <h2 class="w-ecomp-main-json-view-title" id="notification-details-title">Message Notification Details</h2> + + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="user-notification-button-cancel" + ng-click="$dismiss('cancel')"></button> </div> + </div> + + <div class="b2b-modal-body"> + <div class="notifications-properties-main"> + + <div> -</div> -</div> + <p>Message Source :{{selectedAdminNotification.msgSource}}</p> + <p>Message Title :{{selectedAdminNotification.msgHeader}}</p> + <p>Message Recipient :{{messageRecipients}}</p> + Notification Hyperlink :<a + ng-click="notifiHyperlink('{{selectedAdminNotification.notificationHyperlink}}')">{{selectedAdminNotification.notificationHyperlink}}</a> -<script type="application/javascript"> - $(document).ready(function(){ - $(".ngdialog-content").css("width","40%") - $(".ngdialog-content").css("height","450px") + <div ng-repeat="(key, data) in messageObject"> - }); -</script> + <div ng-switch on="key"> + <div ng-switch-when="ticketNum"> + {{key}} : <a + ng-click="notifiHyperlink('{{selectedAdminNotification.notificationHyperlink}}')">{{data}} + </a> + </div> + <div ng-switch-when="eventDate"> + <p>{{key}} : {{data | date:'yyyy-MM-dd HH:mm:ss Z'}}</p> + </div> + <div ng-switch-when="lastModifiedDate"> + <p>{{key}} : {{data | date:'yyyy-MM-dd HH:mm:ss Z'}}</p> + </div> + <div ng-switch-default> + <p>{{key}} :{{data}}</p> + </div> + </div> + </div> + + + </div> + </div> + </div> + <br> + <div class="b2b-modal-footer"> + <div class="dialog-control"> + <button id="div-cancel-button" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')"role="button" tabindex="0">Close</button> + + </div> + </div> + + + diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.controller.js b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.controller.js index 4207bc6e..146bc523 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.controller.js +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.controller.js @@ -22,7 +22,7 @@ (function () { class userNotificationsCtrl { - constructor($scope, $log, notificationService, confirmBoxService, $modal, ngDialog, $state) { + constructor($scope, $log, notificationService, filterFilter,confirmBoxService, $modal, ngDialog, $state) { var priorityItems={"1":"Normal","2":"Important"}; $scope.priorityItems=priorityItems; @@ -33,7 +33,8 @@ $scope.totalPages1 = 0; $scope.viewPerPage1 = 15; $scope.currentPage1 = 1; - $scope.showLoader = false; + $scope.startIndex=0; + $scope.showLoader = false; $scope.firstPlay = true; // Start with empty list to silence error in console $scope.tableData = []; @@ -44,33 +45,35 @@ $scope.adminNotifications = res.data; $scope.isLoadingTable = false; $scope.tableData = res.data; - var totalItems = $scope.tableData.length; + var totalItems = $scope.tableData.length; $scope.totalPages1 = Math.ceil(totalItems / $scope.viewPerPage1); $scope.showLoader = false; $scope.currentPage1=1; - var endIndex = 1 * $scope.viewPerPage1; - var startIndex = endIndex - $scope.viewPerPage1; - $scope.tableAdminNotifItems = $scope.tableData.slice(startIndex, endIndex); + $scope.tableAdminNotifItems = $scope.tableData; }).catch(err => { $log.error('userNotificationsCtrl:getAdminNotifications:: error ', err); $scope.isLoadingTable = false; }); } + getAdminNotifications(); - - $scope.customPageHandler = function(num) { - $scope.currentPage1=num; - var endIndex = num * $scope.viewPerPage1; - var startIndex = endIndex - $scope.viewPerPage1; - $scope.tableAdminNotifItems = $scope.tableData.slice(startIndex, endIndex); - }; - - + + + $scope.$watch('searchString', function (searchKey) { + var search = searchKey; + this.totalPage1 = filterFilter($scope.tableData, search); + var resultLen = this.totalPage1.length; + $scope.totalPage1 = Math.ceil(resultLen/$scope.viewPerPage1); + $scope.currentPage1 = 1; + }); - + $scope.updateTable = (num) => { + this.startIndex=this.viewPerPage1*(num-1); + this.currentPage1 = num; + }; - $scope.removeUserNotification = function (selectedAdminNotification) { + this.removeUserNotification = (selectedAdminNotification) => { selectedAdminNotification.activeYn = 'N'; confirmBoxService.deleteItem(selectedAdminNotification.msgHeader) .then(isConfirmed => { @@ -114,41 +117,27 @@ - $scope.showDetailedJsonMessage=function (selectedAdminNotification) { + this.showDetailedJsonMessage = (selectedAdminNotification) => { notificationService.getMessageRecipients(selectedAdminNotification.notificationId).then(res =>{ $scope.messageRecipients = res; var messageObject=JSON.parse(selectedAdminNotification.msgDescription); - var html=""; - html+='<p>'+'Message Source'+' : '+selectedAdminNotification.msgSource+'</p>'; - html+='<p>'+'Message Title'+' : '+selectedAdminNotification.msgHeader+'</p>'; - html+='<p>'+'Message Recipient'+' : '+$scope.messageRecipients+'</p>'; - - for(var field in messageObject){ - if(field=='eventDate'||field=='lastModifiedDate'){ - html+='<p>'+field+' : '+new Date(+messageObject[field])+'</p>'; - - }else{ - html+='<p>'+field+' : '+messageObject[field]+'</p>'; - - } - } - - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html', - controller: 'userNotificationCtrl', - resolve: { - message: function () { - var message = { - title: '', - text: html - - }; - return message; - }, - - } - }); - + var modalInstance = $modal.open({ + templateUrl: 'app/views/user-notifications-admin/user.notifications.json.details.modal.page.html', + controller: 'userNotificationCtrl', + sizeClass: 'modal-large', + resolve: { + items: function () { + var items = { + title: '', + selectedAdminNotification:selectedAdminNotification,messageObject:messageObject,messageRecipients:$scope.messageRecipients + + }; + return items; + } + } + }) + + }).catch(err => { $log.error('userNotificationsCtrl:getMessageRecipients:: error ', err); $scope.isLoadingTable = false; @@ -157,7 +146,7 @@ }; - $scope.editUserNotificationModal = function (selectedAdminNotification) { + this.editUserNotificationModal = (selectedAdminNotification) => { // retrieve roleIds here selectedAdminNotification.roleIds = null; @@ -165,32 +154,44 @@ .then(res => { selectedAdminNotification.roleIds = res.data; - $scope.openUserNotificationModal(selectedAdminNotification); + this.openUserNotificationModal(selectedAdminNotification); }).catch(err => { $log.error('UserNotifCtlr:getNotificationRoles:: error ', err); }); } - $scope.openUserNotificationModal = function (selectedAdminNotification) { + this.openUserNotificationModal = (selectedAdminNotification) => { let data = null; if (selectedAdminNotification) { data = { notif: selectedAdminNotification } } - ngDialog.open({ + + + var modalInstance = $modal.open({ templateUrl: 'app/views/user-notifications-admin/user.notifications.modal.page.html', - controller: 'userNotificationsModalCtrl', - controllerAs: 'userNotifModal', - data: data - }).closePromise.then(function (needUpdate) { - getAdminNotifications(); - }); + controller: 'userNotificationsModalCtrl as userNotifModal', + sizeClass: 'modal-large', + resolve: { + items: function () { + return data; + } + } + }) + + modalInstance.result.finally(function () { + getAdminNotifications(); + }); } - + $scope.customPageHandler = function(num) { + $scope.currentPage1=num; + this.startIndex=$scope.viewPerPage1*(num-1); + }; + } } - userNotificationsCtrl.$inject = ['$scope', '$log', 'notificationService', 'confirmBoxService', '$modal', 'ngDialog', '$state']; + userNotificationsCtrl.$inject = ['$scope', '$log', 'notificationService','filterFilter', 'confirmBoxService', '$modal', 'ngDialog', '$state']; angular.module('ecompApp').controller('userNotificationsCtrl', userNotificationsCtrl); })(); diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.json.details.modal.page.less b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.json.details.modal.page.less index e17ec46f..57926695 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.json.details.modal.page.less +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.json.details.modal.page.less @@ -14,11 +14,15 @@ margin-left: 220px; .w-ecomp-main-json-view-title { //.n18r; - .dGray18r; //AT&T Dark Gray + .dGray18r; border-bottom: @portalDBlue 3px solid; width:100%; } + a:hover { + cursor:pointer; + } + .notifications-properties-main{ padding-top: 16px; font-size: 14px; @@ -27,15 +31,12 @@ } input:not([type="button"]) { - height: 22px; } + height: 22px; + } .widget-properties-main { padding: 16px; height: 460px; overflow-y: auto; - - - - } .dialog-control-close { @@ -44,5 +45,27 @@ input:not([type="button"]) { right: 16px; } +.notifcation-label-user-requiredId { + color: red; +} + +.user-enddate-error-txt { + color: #cf2a2a; + font-size: 10px; +} + +.user-enddate-error-small { + position: absolute; +} + +.add-notification-input-title-ht { + height: 50px; +} + + + +} -}
\ No newline at end of file + a:hover { + cursor:pointer; + }
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.less b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.less index ee5f9e4d..3be148c8 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.less +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.less @@ -124,5 +124,21 @@ p { width: 160px; margin-bottom: 11px; } +} + +.tree-div{ + height:300px; + overflow:auto; + .checkbox .skin{ + left: 0px; + top: 0px; + } + .checkbox input[type=checkbox]{ + margin-left: 0px; + } + .checkbox { + display: inline !important; + vertical-align: middle; + } }
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.controller.js b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.controller.js index 7821e070..48f7d9df 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.controller.js +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.controller.js @@ -22,18 +22,19 @@ (function () { class userNotificationsModalCtrl { - constructor($scope, $log, functionalMenuService, confirmBoxService, notificationService, $modal, ngDialog, $state, $filter) { - - let newNotifModel = { + constructor($scope, $log, functionalMenuService, confirmBoxService, notificationService, $modal, ngDialog, $state, $filter,items) { + this.debug = false; + $scope.newNotifModel = { 'isOnlineUsersOnly': null, 'isForAllRolesOptions': null, 'selectedPriority': null, 'isActive': null, - 'startTime': null, - 'endTime': null, + 'startTime': '', + 'endTime': '', 'msgHeader': null, 'msgDescription': null, 'roleIds': null, + 'anyTreeItemSelected':false, 'roleObj': {notificationRoleIds:null} }; @@ -65,52 +66,52 @@ { "index": 0, "value": "Y", "title": "Yes" }, { "index": 1, "value": "N", "title": "No" } ]; - $scope.isActive = $scope.isActiveOptions[0]; - $scope.selectPriority = $scope.priorityOptions[0]; - $scope.isOnlineUsersOnly = $scope.onlineAllUsersOptions[1]; - $scope.isForAllRoles=$scope.isForAllRolesOptions[0].value; - $scope.isFunctionalMenu ="Y"; - - $scope.selectedPriority=$scope.priorityOptions[0].value; - - // $scope.notificationRoleIds = []; - $scope.msgHeader = ''; - $scope.msgDescription = ''; - $scope.treeTitle="Functional Menu"; - $scope.notifObj= {isCategoriesFunctionalMenu:true}; + $scope.newNotifModel.isActive = $scope.isActiveOptions[0]; + $scope.newNotifModel.selectPriority = $scope.priorityOptions[0]; + $scope.newNotifModel.isOnlineUsersOnly = $scope.onlineAllUsersOptions[1]; + $scope.newNotifModel.isForAllRoles=$scope.isForAllRolesOptions[0].value; + $scope.newNotifModel.isFunctionalMenu ="Y"; + + $scope.newNotifModel.selectedPriority=$scope.priorityOptions[0].value; + $scope.newNotifModel.msgHeader = ''; + $scope.newNotifModel.msgDescription = ''; + $scope.newNotifModel.treeTitle="Functional Menu"; + $scope.newNotifModel.notifObj= {isCategoriesFunctionalMenu:true}; let init = () => { - // $log.info('userNotificationsModalCtrl::init'); + if(this.debug) + $log.debug('userNotificationsModalCtrl::init'); this.isSaving = false; var today = new Date(); $scope.minDate = today.toISOString().substring(0, 10); var threeMonthsFromNow = new Date(); threeMonthsFromNow.setMonth(threeMonthsFromNow.getMonth() + 3); $scope.maxDate = threeMonthsFromNow.toISOString().substring(0, 10); - if ($scope.ngDialogData && $scope.ngDialogData.notif) { - // $log.debug('userNotificationsModalCtrl:init:: Edit - // notification mode for', $scope.ngDialogData.notif); + if (items && items.notif) { + if(this.debug) + $log.debug('userNotificationsModalCtrl:init:: Edit notification mode for', items.notif); $scope.isEditMode = true; $scope.editModeObj = {isEditMode: true}; - this.notif = _.clone($scope.ngDialogData.notif); + this.notif = _.clone(items.notif); $scope.modalPgTitle = 'View Notification' - $scope.isOnlineUsersOnly = $scope.onlineAllUsersOptions[this.YN_index_mapping[this.notif.isForOnlineUsers]]; - $scope.isForAllRoles = $scope.isForAllRolesOptions[this.YN_index_mapping[this.notif.isForAllRoles]].value; - $scope.isActive = $scope.isActiveOptions[this.YN_index_mapping[this.notif.activeYn]]; - $scope.selectedPriority = $scope.priorityOptions[this.notif.priority - 1].value; - $scope.startTime = new Date(this.notif.startTime); - $scope.endTime = new Date(this.notif.endTime); - $scope.msgHeader = this.notif.msgHeader; - $scope.msgDescription = this.notif.msgDescription; + $scope.newNotifModel.isOnlineUsersOnly = $scope.onlineAllUsersOptions[this.YN_index_mapping[this.notif.isForOnlineUsers]]; + $scope.newNotifModel.isForAllRoles = $scope.isForAllRolesOptions[this.YN_index_mapping[this.notif.isForAllRoles]].value; + $scope.newNotifModel.isActive = $scope.isActiveOptions[this.YN_index_mapping[this.notif.activeYn]]; + $scope.newNotifModel.selectedPriority = $scope.priorityOptions[this.notif.priority - 1].value; + $scope.newNotifModel.startTime = new Date(this.notif.startTime); + $scope.newNotifModel.endTime = new Date(this.notif.endTime); + $scope.newNotifModel.msgHeader = this.notif.msgHeader; + $scope.newNotifModel.msgDescription = this.notif.msgDescription; $scope.notificationId = this.notif.notificationId; - $scope.notificationRoleIds = this.notif.roleIds; + $scope.newNotifModel.notificationRoleIds = this.notif.roleIds; $scope.roleObj = {notificationRoleIds:this.notif.roleIds}; } else { - // $log.debug('AppDetailsModalCtrl:init:: New app mode'); + if(this.debug) + $log.debug('AppDetailsModalCtrl:init:: New app mode'); $scope.isEditMode = false; $scope.editModeObj = {isEditMode: false}; $scope.modalPgTitle = 'Add a New Notification' - this.notif = _.clone(newNotifModel); + this.notif = _.clone($scope.newNotifModel); $scope.roleObj = {notificationRoleIds:null}; } }; @@ -143,291 +144,347 @@ } }; $scope.addUserNotificationValidation = function () { - // // pre-processing - if (!($scope.isEditMode)) { - var validation=false; - - if($scope.startTime && $scope.endTime && $scope.msgHeader != '' && $scope.msgDescription != '' && ($scope.startTime<$scope.endTime)){ - validation=true; - if( $scope.isForAllRoles=='N'){ - validation = $scope.checkBoxObj.isAnyRoleSelected; - } - } - else{ - validation=false; - } - - - return !validation; - } - } + // // pre-processing + if (!($scope.isEditMode)) { + var validation=false; + if($scope.isDateValid($scope.newNotifModel.startTime) && $scope.isDateValid($scope.newNotifModel.endTime) && $scope.newNotifModel.msgHeader != '' && $scope.newNotifModel.msgDescription != '' && ($scope.newNotifModel.startTime<$scope.newNotifModel.endTime)){ + validation=true; + if( $scope.newNotifModel.isForAllRoles=='N'){ + validation = $scope.checkTreeSelect(); + } + } + else{ + validation=false; + } + return !validation; + } + } /* format the value for viewing a notification */ $scope.formatStartDate = function () { - if ($scope.startTime) { - $scope.startTime = $filter('date')($scope.startTime, 'medium'); + if ($scope.newNotifModel.startTime) { + $scope.newNotifModel.startTime = $filter('date')($scope.startTime, 'medium'); } } /* format the value for viewing a notification */ $scope.formatEndDate = function () { - if($scope.endTime){ - $scope.endTime = $filter('date')($scope.endTime, 'medium'); + if($scope.newNotifModel.endTime){ + $scope.newNotifModel.endTime = $filter('date')($scope.endTime, 'medium'); } } - $scope.addUserNotification = function () { - $scope.notificationRoleIds = []; - // pre-processing - for (var key in $scope.checkboxIdDict) { - if ($scope.checkboxIdDict[key].is_box_checked && ($scope.checkboxIdDict[key].role_id != null)) { - var role_ids = $scope.checkboxIdDict[key].role_id; - for (var i in role_ids) { - if (!($scope.notificationRoleIds.indexOf(role_ids[i]) > -1)) { - $scope.notificationRoleIds.push(role_ids[i]); - } - } - } - } - - $scope.notificationRoleIds.sort(); - if (($scope.isOnlineUsersOnly) && ($scope.isForAllRoles) && ($scope.selectedPriority) && ($scope.isActive) - && ($scope.startTime) && ($scope.endTime) && ($scope.msgHeader != '') && ($scope.msgDescription != '')) { - this.newUserNotification = - { - 'notificationId':$scope.notificationId, - 'isForOnlineUsers': $scope.isOnlineUsersOnly.value, - 'isForAllRoles': $scope.isForAllRoles, - 'priority': $scope.selectedPriority, - 'activeYn': $scope.isActive.value, - 'startTime': $scope.startTime, - 'endTime': $scope.endTime, - 'msgHeader': $scope.msgHeader, - 'msgDescription': $scope.msgDescription, - 'roleIds': $scope.notificationRoleIds, - 'createdDate': new Date() - }; - - // POST ajax call here; - if ($scope.isEditMode) { - notificationService.updateAdminNotification(this.newUserNotification) - .then(() => { - //$log.debug('NotificationService:updateAdminNotification:: Admin notification update succeeded!'); - $scope.closeThisDialog(true); - // emptyCookies(); - }).catch(err => { - $log.error('notificationService.updateAdminNotfication failed: ' + JSON.stringify(err)); - switch (err.status) { - case '409': // Conflict - // handleConflictErrors(err); - break; - case '500': // Internal Server Error - confirmBoxService.showInformation('There was a problem updating the notification. ' + - 'Please try again later. Error: ' + err.status).then(isConfirmed => { }); - break; - case '403': // Forbidden... possible - // webjunction error to - // try again - confirmBoxService.showInformation('There was a problem updating the notification. ' + - 'Please try again. If the problem persists, then try again later. Error: ' + err.status).then(isConfirmed => { }); - break; - default: - confirmBoxService.showInformation('There was a problem updating the notification. ' + - 'Please try again. If the problem persists, then try again later. Error: ' + err.status).then(isConfirmed => { }); - } - }).finally(() => { - // for bug in IE 11 - var objOffsetVersion = objAgent.indexOf("MSIE"); - if (objOffsetVersion != -1) { - $log.debug('AppDetailsModalCtrl:updateOnboardingApp:: Browser is IE, forcing Refresh'); - $window.location.reload(); - } - // for bug in IE 11 - }); - - } else { - notificationService.addAdminNotification(this.newUserNotification) - .then((res) => { - $log.debug('notificationService:addAdminNotification:: Admin notification creation succeeded!,',res); - if(res.status=='ERROR'){ - confirmBoxService.showInformation('There was a problem adding the notification. ' + - ' Error: ' + res.response).then(isConfirmed => { }); - - - } - else{ - $scope.closeThisDialog(true); - } - - // emptyCookies(); - }).catch(err => { - switch (err.status) { - case '409': // Conflict - // handleConflictErrors(err); - break; - case '500': // Internal Server Error - confirmBoxService.showInformation('There was a problem adding the notification. ' + - 'Please try again later. Error: ' + err.status).then(isConfirmed => { }); - break; - default: - confirmBoxService.showInformation('There was a problem adding the notification. ' + - 'Please try again. If the problem persists, then try again later. Error: ' + - err.status).then(isConfirmed => { }); - } - $log.error('notificationService:addAdminNotification error:: ' + JSON.stringify(err)); - }) - } - - - } else { - $log.warn('please fill in all required fields'); - confirmBoxService.showInformation('Please fill in all required fields').then(isConfirmed => { }); + $scope.isDateValid = function (time) { + if(time == undefined){ + return false; } + if(typeof time == 'object'){ + return true; + } + var startDateformat =time.split('/'); + if (startDateformat.length != 3) return false; + var day = startDateformat[1]; + var month = startDateformat[0]; + month= parseInt(month)-1; + var year = startDateformat[2]; + if(year.length!=4) return false; + var composedDate = new Date(year, month, day); + return composedDate.getDate() == day && + composedDate.getMonth() == month && + composedDate.getFullYear() == year; + + }; + + + $scope.addUserNotification = function () { + $scope.notificationRoleIds = []; + // pre-processing + + for(var fi=0;fi<$scope.treedata.length;fi++){ + var fLevel = $scope.treedata[fi]; + if(fLevel){ + var fLevelChild = fLevel.child; + for(var si=0;si<fLevelChild.length;si++){ + var sLevel = fLevelChild[si]; + if(sLevel){ + var sLevelChild = sLevel.child; + if(sLevelChild){ + for(var ti=0;ti< sLevelChild.length;ti++){ + var tLevel = sLevelChild[ti]; + if(tLevel.isSelected && tLevel.roleId){ + $scope.newNotifModel.anyTreeItemSelected=true; + for(var i in tLevel.roleId) + $scope.notificationRoleIds.push(tLevel.roleId[i]); + } + } + } + } + if(sLevel.isSelected && sLevel.roleId){ + for(var i in sLevel.roleId) + $scope.notificationRoleIds.push(sLevel.roleId[i]); + } + } + } + } + + $scope.notificationRoleIds.sort(); + if (($scope.newNotifModel.isOnlineUsersOnly) && ($scope.newNotifModel.isForAllRoles) && ($scope.newNotifModel.selectedPriority) && ($scope.newNotifModel.isActive) + && ($scope.newNotifModel.startTime) && ($scope.newNotifModel.endTime) && ($scope.newNotifModel.msgHeader != '') && ($scope.newNotifModel.msgDescription != '')) { + this.newUserNotification = + { + 'notificationId':$scope.notificationId, + 'isForOnlineUsers': $scope.newNotifModel.isOnlineUsersOnly.value, + 'isForAllRoles': $scope.newNotifModel.isForAllRoles, + 'priority': $scope.newNotifModel.selectedPriority, + 'activeYn': $scope.newNotifModel.isActive.value, + 'startTime': $scope.newNotifModel.startTime, + 'endTime': $scope.newNotifModel.endTime, + 'msgHeader': $scope.newNotifModel.msgHeader, + 'msgDescription': $scope.newNotifModel.msgDescription, + 'roleIds': $scope.notificationRoleIds, + 'createdDate': new Date() + }; + + // POST ajax call here; + if ($scope.isEditMode) { + notificationService.updateAdminNotification(this.newUserNotification) + .then(() => { + if(this.debug) + $log.debug('NotificationService:updateAdminNotification:: Admin notification update succeeded!'); + $scope.closeThisDialog(true); + }).catch(err => { + $log.error('notificationService.updateAdminNotfication failed: ' + JSON.stringify(err)); + switch (err.status) { + case '409': // Conflict + // handleConflictErrors(err); + break; + case '500': // Internal Server Error + confirmBoxService.showInformation('There was a problem updating the notification. ' + + 'Please try again later. Error: ' + err.status).then(isConfirmed => { }); + break; + case '403': // Forbidden... possible + // webjunction error to + // try again + confirmBoxService.showInformation('There was a problem updating the notification. ' + + 'Please try again. If the problem persists, then try again later. Error: ' + err.status).then(isConfirmed => { }); + break; + default: + confirmBoxService.showInformation('There was a problem updating the notification. ' + + 'Please try again. If the problem persists, then try again later. Error: ' + err.status).then(isConfirmed => { }); + } + }).finally(() => { + // for bug in IE 11 + var objOffsetVersion = objAgent.indexOf("MSIE"); + if (objOffsetVersion != -1) { + if(this.debug) + $log.debug('AppDetailsModalCtrl:updateOnboardingApp:: Browser is IE, forcing Refresh'); + $window.location.reload(); + } + // for bug in IE 11 + }); + + } else { + notificationService.addAdminNotification(this.newUserNotification) + .then((res) => { + if(this.debug) + $log.debug('notificationService:addAdminNotification:: Admin notification creation succeeded!,',res); + if(res.status=='ERROR'){ + confirmBoxService.showInformation('There was a problem adding the notification. ' + + ' Error: ' + res.response).then(isConfirmed => { }); + + + } + else{ + //$scope.closeThisDialog(true); + $scope.$dismiss('cancel'); + } + + // emptyCookies(); + }).catch(err => { + switch (err.status) { + case '409': // Conflict + // handleConflictErrors(err); + break; + case '500': // Internal Server Error + confirmBoxService.showInformation('There was a problem adding the notification. ' + + 'Please try again later. Error: ' + err.status).then(isConfirmed => { }); + break; + default: + confirmBoxService.showInformation('There was a problem adding the notification. ' + + 'Please try again. If the problem persists, then try again later. Error: ' + + err.status).then(isConfirmed => { }); + } + $log.error('notificationService:addAdminNotification error:: ' + JSON.stringify(err)); + }) + } + + + } else { + $log.warn('please fill in all required fields'); + confirmBoxService.showInformation('Please fill in all required fields').then(isConfirmed => { }); + } } + $scope.functionalMenuRes={}; + $scope.checkTreeSelect = function(){ + if($scope.treedata){ + for(var fi=0; fi<$scope.treedata.length;fi++){ + var fLevel = $scope.treedata[fi]; + if(fLevel.isSelected){ + return true; + } + var sLevel = fLevel.child; + if(sLevel){ + for(var si=0;si<sLevel.length;si++){ + if(sLevel[si].isSelected){ + return true; + } + var tLevel = sLevel[si].child; + if(tLevel){ + for(var ti=0;ti<tLevel.length;ti++){ + if(tLevel[ti].isSelected){ + return true; + } + } + } + } + } + } + } + return false; + } // Populate the category list for category dropdown list let getFunctionalMenu = () => { - this.isLoadingTable = true; - $scope.notifObj= {isCategoriesFunctionalMenu:true}; - functionalMenuService.getFunctionalMenuRole().then(role_res => { - var menu_role_dict = {}; - for (var i in role_res) { - // if first time appear in menu_role_dict - if (!(role_res[i].menuId in menu_role_dict)) { - menu_role_dict[role_res[i].menuId] = [role_res[i].roleId]; - } else { - menu_role_dict[role_res[i].menuId].push(role_res[i].roleId); - } - } - functionalMenuService.getManagedFunctionalMenuForNotificationTree().then(res => { - let actualData = []; - var exclude_list = ['Favorites'] - // Adding children and label attribute to all objects in - $scope.checkboxIdDict = {}; - $scope.checkBoxObj = {isAnyRoleSelected:false}; - for (let i = 0; i < res.length; i++) { - res[i].children = []; - res[i].label = res[i].text; - res[i].id = res[i].text; - // res[i].is_box_checked = false; - res[i].can_check = true; - res[i].roleId = menu_role_dict[res[i].menuId]; - $scope.checkboxIdDict[res[i].id] = { 'is_box_checked': false, 'role_id': res[i].roleId }; - } - - // Adding actual child items to children array in res + this.isLoadingTable = true; + if(this.debug) + $log.debug('getFunctionalMenu:init'); + + functionalMenuService.getFunctionalMenuRole().then(role_res => { + var menu_role_dict = {}; + if(this.debug) + $log.debug('functionalMenuService:getFunctionalMenuRole:: getting result', role_res); + + for (var i in role_res) { + // if first time appear in menu_role_dict + if (!(role_res[i].menuId in menu_role_dict)) { + menu_role_dict[role_res[i].menuId] = [role_res[i].roleId]; + } else { + menu_role_dict[role_res[i].menuId].push(role_res[i].roleId); + } + } + + functionalMenuService.getManagedFunctionalMenuForNotificationTree().then(res => { + if(this.debug) + $log.debug('functionalMenuService:getManagedFunctionalMenuForNotificationTree:: getting result', res); + var exclude_list = ['Favorites']; + let actualData=[]; + $scope.functionalMenuRes=res; + + //Adding children and label attribute to all objects in res + for(let i = 0; i < res.length; i++){ + res[i].child=[]; + res[i].name=res[i].text; + res[i].id=res[i].text; + res[i].displayCheckbox= true; + $scope.checkBoxObj = {isAnyRoleSelected:false}; + res[i].roleId = menu_role_dict[res[i].menuId]; + res[i].onSelect = function () { + $scope.$apply(function () { + $scope.newNotifModel.anyTreeItemSelected=$scope.checkTreeSelect(); + }) + }; + + if (res[i].roleId && res[i].roleId.length==_.intersection(res[i].roleId, $scope.roleObj.notificationRoleIds).length){ + res[i].isSelected= true; + res[i].selected= true; + res[i].indeterminate= false; + }else{ + /*default*/ + res[i].isSelected= false; + res[i].selected= false; + res[i].indeterminate= false; + } + } + + // Adding actual child items to children array in res // objects - $scope.parentChildDict ={}; - $scope.parentChildRoleIdDict ={}; - for (let i = 0; i < res.length; i++) { - let parentId = res[i].menuId; - $scope.parentChildDict[parentId] = []; - $scope.parentChildRoleIdDict[parentId]=[]; - for (let j = 0; j < res.length; j++) { - let childId = res[j].parentMenuId; - if (parentId === childId) { - res[i].children.push(res[j]); - $scope.parentChildDict[parentId].push(res[j].menuId); - //if res[j].roleId is defined - if (res[j].roleId) { - for (let k in res[j].roleId) { - $scope.parentChildRoleIdDict[parentId].push(res[j].roleId[k]); - } - - } - } - } - } - - //check if grand children exist - for (var key in $scope.parentChildDict){ - var children = $scope.parentChildDict[key]; - var isGrandParent = false; - if (children.length>0) { - for (var i in children) { - if ($scope.parentChildDict[children[i]].length>0){ - isGrandParent = true; - break; - } - } - } - if (isGrandParent) { - for (var i in children) { - // if the child has children - if ($scope.parentChildDict[children[i]].length>0) { - for (var j in $scope.parentChildRoleIdDict[children[i]]) { - - if ($scope.parentChildRoleIdDict[key].indexOf($scope.parentChildRoleIdDict[children[i]][j]) === -1) { - $scope.parentChildRoleIdDict[key].push($scope.parentChildRoleIdDict[children[i]][j]); - } - } - } else { - - } - } - } - - }; - - - var ListMenuIdToRemove = []; - //$scope.parentObj = {ListMenuIdToRemove : []}; - //get the list of menuId that needs to be removed - for (let i = 0; i < res.length; i++) { - if ((res[i].children.length==0)&&(!res[i].roleId)) { - var menuIdToRemove = res[i].menuId; - if (ListMenuIdToRemove.indexOf(menuIdToRemove) === -1){ - ListMenuIdToRemove.push(menuIdToRemove); - } - } - } - - // a scope variable that marks whether each functional menu item should be displayed. - $scope.toShowItemDict = {}; - for (let i = 0; i < res.length; i++) { - if (res[i].roleId==null) { - if (res[i].children.length==0) { - $scope.toShowItemDict[res[i].menuId]=false; - } else if(res[i].children.length>0){ - if($scope.parentChildDict[res[i].menuId].length === _.intersection($scope.parentChildDict[res[i].menuId], ListMenuIdToRemove).length){ - $scope.toShowItemDict[res[i].menuId]=false; - } else { - $scope.toShowItemDict[res[i].menuId]=true; - } - } - } else { - $scope.toShowItemDict[res[i].menuId]=true; - } - } - - // Sort the top-level menu items in order based on the - // column - res.sort(function (a, b) { - return a.column - b.column; - }); - - // Sort all the children in order based on the column - for (let i = 0; i < res.length; i++) { - res[i].children.sort(function (a, b) { - return a.column - b.column; - }); - } - - // Forming actual parent items - for (let i = 0; i < res.length; i++) { - let parentId = res[i].parentMenuId; - if (parentId === null) { - actualData.push(res[i]); - } - } - - // $scope.treedata = actualData; - var treedata = actualData[0].children; - $scope.treedata = []; - for (var i in treedata) { - if (!(treedata[i].label.indexOf(exclude_list) > -1)) { - $scope.treedata.push(treedata[i]) - } - } + $scope.parentChildDict ={}; + $scope.parentChildRoleIdDict ={}; + for (let i = 0; i < res.length; i++) { + let parentId = res[i].menuId; + $scope.parentChildDict[parentId] = []; + $scope.parentChildRoleIdDict[parentId]=[]; + for (let j = 0; j < res.length; j++) { + let childId = res[j].parentMenuId; + if (parentId === childId) { + res[i].child.push(res[j]); + $scope.parentChildDict[parentId].push(res[j].menuId); + //if res[j].roleId is defined + if (res[j].roleId) { + for (let k in res[j].roleId) { + $scope.parentChildRoleIdDict[parentId].push(res[j].roleId[k]); + } + + } + } + } + } + //check if grand children exist + for (var key in $scope.parentChildDict){ + var child = $scope.parentChildDict[key]; + var isGrandParent = false; + if (child.length>0) { + for (var i in child) { + if ($scope.parentChildDict[child[i]].length>0){ + isGrandParent = true; + break; + } + } + } + if (isGrandParent) { + for (var i in child) { + // if the child has children + if ($scope.parentChildDict[child[i]].length>0) { + for (var j in $scope.parentChildRoleIdDict[child[i]]) { + if ($scope.parentChildRoleIdDict[key].indexOf($scope.parentChildRoleIdDict[child[i]][j]) === -1) { + $scope.parentChildRoleIdDict[key].push($scope.parentChildRoleIdDict[child[i]][j]); + } + } + } + } + } + + }; + + // Sort the top-level menu items in order based on the column + res.sort(function(a, b) { + return a.column-b.column; + }); + + // Sort all the child in order based on the column + for(let i = 0; i < res.length; i++){ + res[i].child.sort(function(a, b){ + return a.column-b.column; + }); + } + + //Forming actual parent items + for(let i = 0; i < res.length; i++){ + let parentId=res[i].parentMenuId; + if(parentId===null){ + actualData.push(res[i]); + } + } + var treedata = actualData[0].child; + $scope.treedata = []; + + /*Remove favorite from the list */ + for (var i in treedata) { + if (!(treedata[i].name.indexOf(exclude_list) > -1)) { + $scope.treedata.push(treedata[i]) + } + } + //setting b2b tree parameter + $scope.settingTreeParam(); }).catch(err => { $log.error('FunctionalMenuCtrl:getFunctionalMenu:: error ', err); @@ -443,71 +500,91 @@ let getAppRoleIds = () => { - $scope.notifObj= {isCategoriesFunctionalMenu:false}; - notificationService.getAppRoleIds().then(res => { - - res = res.data; - let actualData = []; - // var exclude_list = ['Favorites'] - var app_id_name_list = {}; - $scope.checkboxIdDict = {}; - $scope.checkBoxObj = {isAnyRoleSelected:false}; - - for (let i = 0; i < res.length; i++) { - if (!(res[i].appId in app_id_name_list)) { - app_id_name_list[res[i].appId] = res[i].appName; - } - - res[i].children = []; - res[i].label = res[i].roleName; - res[i].id = res[i].roleId; - res[i].menuId = res[i].roleId; - res[i].parentMenuId = res[i].appId; - res[i].can_check = true; - res[i].roleId = [res[i].roleId]; - $scope.checkboxIdDict[res[i].id] = { 'is_box_checked': false, 'role_id': res[i].roleId}; - } - - for (var app_id in app_id_name_list) { - var new_res = {}; - new_res.children = []; - new_res.label = app_id_name_list[app_id]; - new_res.id = app_id; - new_res.menuId = app_id; - new_res.parentMenuId = null; - new_res.appId = null; - new_res.can_check = true; - new_res.roleId = null; - $scope.checkboxIdDict[new_res.id]= { 'is_box_checked': false, 'role_id': new_res.roleId }; - res.push(new_res); - } - $scope.parentChildRoleIdDict ={}; - //Adding actual child items to children array in res objects - for (let i = 0; i < res.length; i++) { - let parentId = res[i].menuId; - $scope.parentChildRoleIdDict[parentId]=[]; - for (let j = 0; j < res.length; j++) { - let childId = res[j].parentMenuId; - if (parentId == childId) { - res[i].children.push(res[j]); - if (res[j].roleId) { - for (let k in res[j].roleId) { - $scope.parentChildRoleIdDict[parentId].push(res[j].roleId[k]); - } - - } - } - } - } - //Forming actual parent items - for (let i = 0; i < res.length; i++) { - let parentId = res[i].parentMenuId; - if (parentId === null) { - actualData.push(res[i]); - } - } - - $scope.treedata = actualData; + $scope.notifObj= {isCategoriesFunctionalMenu:false}; + notificationService.getAppRoleIds().then(res => { + if(this.debug) + $log.debug('notificationService:getAppRoleIds:: getting result', res); + res = res.data; + let actualData = []; + var app_id_name_list = {}; + $scope.checkBoxObj = {isAnyRoleSelected:false}; + for (let i = 0; i < res.length; i++) { + if (!(res[i].appId in app_id_name_list)) { + app_id_name_list[res[i].appId] = res[i].appName; + } + res[i].child=[]; + res[i].name=res[i].roleName; + res[i].displayCheckbox= true; + res[i].id = res[i].roleId; + res[i].menuId = res[i].roleId; + res[i].parentMenuId = res[i].appId; + res[i].can_check = true; + res[i].roleId = [res[i].roleId]; + res[i].onSelect = function () { + $scope.$apply(function () { + $scope.newNotifModel.anyTreeItemSelected=$scope.checkTreeSelect(); + }) + }; + /*assigning selected value*/ + if (res[i].roleId && res[i].roleId.length==_.intersection(res[i].roleId, $scope.roleObj.notificationRoleIds).length){ + res[i].isSelected= true; + res[i].selected= true; + res[i].indeterminate= false; + }else{ + /*default*/ + res[i].isSelected= false; + res[i].selected= false; + res[i].indeterminate= false; + } + } + + for (var app_id in app_id_name_list) { + var new_res = {}; + new_res.child = []; + new_res.name = app_id_name_list[app_id]; + new_res.id = app_id; + new_res.displayCheckbox= true; + new_res.menuId = app_id; + new_res.parentMenuId = null; + new_res.appId = null; + new_res.can_check = true; + new_res.roleId = null; + new_res.onSelect = function () { + $scope.$apply(function () { + $scope.newNotifModel.anyTreeItemSelected=$scope.checkTreeSelect(); + }) + }; + res.push(new_res); + } + $scope.parentChildRoleIdDict ={}; + //Adding actual child items to child array in res objects + for (let i = 0; i < res.length; i++) { + let parentId = res[i].menuId; + $scope.parentChildRoleIdDict[parentId]=[]; + for (let j = 0; j < res.length; j++) { + let childId = res[j].parentMenuId; + if (parentId == childId) { + res[i].child.push(res[j]); + if (res[j].roleId) { + for (let k in res[j].roleId) { + $scope.parentChildRoleIdDict[parentId].push(res[j].roleId[k]); + } + + } + } + } + } + //Forming actual parent items + for (let i = 0; i < res.length; i++) { + let parentId = res[i].parentMenuId; + if (parentId === null) { + actualData.push(res[i]); + } + } + + $scope.treedata = actualData; + //setting correct parameters for b2b tree + $scope.settingTreeParam(); }).catch(err => { $log.error('FunctionalMenuCtrl:getFunctionalMenu:: error ', err); }).finally(() => { @@ -523,6 +600,114 @@ getAppRoleIds(); } + + + $scope.settingTreeParam = function(){ + /**************first level****************/ + for(var fi=0; fi<$scope.treedata.length;fi++){ + var fLevel = $scope.treedata[fi]; + var sLevel = $scope.treedata[fi].child; + var sLevelSelectedCount =0; + var sLevelChildNumber =0 + if(fLevel.child.length==0 && fLevel.roleId==null){ + delete fLevel.child; + }else if(sLevel){ + /**************Second level****************/ + var sLevelDelArray=[]; + for(var si=0;si<sLevel.length;si++){ + var deletThisSLev= false; + if(sLevel[si].child.length==0 && sLevel[si].roleId==null){ + sLevel[si].displayCheckbox=false; + sLevelDelArray.push(sLevel[si].name); + sLevel[si].name = ''; + sLevel[si].active=false; + delete sLevel[si].child; + } else if(sLevel[si].child.length==0){ + delete sLevel[si].child; + }else{ + /**************Third level****************/ + var tLevel = sLevel[si].child; + var tLevelSelectedCount =0; + var tLevelChildNumber =0; + if(tLevel){ + var tLevelDelArray=[]; + var tLevelLen = tLevel.length; + var tLevelRoleIdUndefined =0; + for(var ti=0;ti<tLevel.length;ti++){ + delete tLevel[ti].child; + if(tLevel[ti].roleId==null){ + tLevel[ti].displayCheckbox=false; + tLevelDelArray.push(tLevel[ti].name); + tLevel[ti].name = ''; + tLevel[ti].active=false; + tLevelRoleIdUndefined++ + }else{ + if(tLevel[ti].isSelected) + tLevelSelectedCount++; + + if(tLevel[ti].displayCheckbox) + tLevelChildNumber++; + } + } + if(tLevelRoleIdUndefined==tLevelLen) + deletThisSLev=true; + if(tLevelSelectedCount==tLevelChildNumber){ + sLevel[si].isSelected=true; + sLevel[si].indeterminate=false; + sLevel[si].active=true; + }else if(tLevelSelectedCount>0){ + sLevel[si].indeterminate=true; + sLevel[si].active=true; + } + + /*Cleanup unused third level items*/ + for(var i=0;i<tLevelDelArray.length;i++){ + var name = tLevelDelArray[i]; + for(var ti=0;ti<tLevel.length;ti++){ + if(name==tLevel[ti].text){ + tLevel.splice(ti,1); + break; + } + } + } + } + } + if(deletThisSLev){ //remove the whole second level item if all it's child has no roleId + sLevel[si].displayCheckbox=false; + sLevelDelArray.push(sLevel[si].name); + sLevel[si].name = ''; + sLevel[si].active=false; + }else{ + if(sLevel[si].isSelected) + sLevelSelectedCount++; + if(sLevel[si].displayCheckbox) + sLevelChildNumber++; + } + } + if(sLevelSelectedCount==sLevelChildNumber && sLevelChildNumber!=0){ + fLevel.isSelected=true; + fLevel.indeterminate=false; + fLevel.active=true; + }else if(sLevelSelectedCount>0){ + fLevel.indeterminate=true; + fLevel.active=true; + }else{ + //fLevel.active=false; + fLevel.indeterminate=false; + } + /*Cleanup unused second level items*/ + for(var i=0;i<sLevelDelArray.length;i++){ + var name = sLevelDelArray[i]; + for(var si=0;si<sLevel.length;si++){ + if(name==sLevel[si].text){ + sLevel.splice(si,1); + break; + } + } + } + } + } + } init(); getFunctionalMenu(); @@ -530,7 +715,7 @@ } - userNotificationsModalCtrl.$inject = ['$scope', '$log', 'functionalMenuService', 'confirmBoxService', 'notificationService', '$modal', 'ngDialog', '$state', '$filter']; + userNotificationsModalCtrl.$inject = ['$scope', '$log', 'functionalMenuService', 'confirmBoxService', 'notificationService', '$modal', 'ngDialog', '$state', '$filter','items']; angular.module('ecompApp').controller('userNotificationsModalCtrl', userNotificationsModalCtrl); angular.module('ecompApp').directive('attDatepickerCustom', ['$log', function($log) { @@ -583,165 +768,5 @@ }; }]); - angular.module('ecompApp').directive('jqTreeUserNotif', ['functionalMenuService', '$log', 'confirmBoxService', '$compile', function (functionalMenuService, $log, confirmBoxService, $compile) { - return { - scope: true, - templateUrl: 'jq-tree-tmpl-user-notif.html', - link: function (scope, el, attrs) { - - var $jqTree = el.find('#jqTreeUserNotif').tree({ - data: scope.treedata, - autoOpen: scope.editModeObj.isEditMode, - dragAndDrop: false, - onCreateLi: function (node, $li) { - node.is_checked = false; - if (node.roleId&&scope.roleObj.notificationRoleIds) { - node.is_checked = (node.roleId.length === _.intersection(node.roleId, scope.roleObj.notificationRoleIds).length); - } - if (typeof node.id =="string"){ - $li.attr('id', node.id.replace(/\s+/g, '_')); - } - var isChecked = ''; - if (node.is_checked) { - isChecked = 'checked="checked"'; - } - if (node.can_check) { - var toShow = true; - if (scope.notifObj.isCategoriesFunctionalMenu) { - toShow = scope.toShowItemDict[node.menuId]; - } - var isDisabled = ""; - if (scope.editModeObj.isEditMode) { - isDisabled = " disabled" - - //if node is a parent/grandparent node - if (node.children.length>0){ - //whether to show node first - if (_.intersection(scope.parentChildRoleIdDict[node.menuId], scope.roleObj.notificationRoleIds).length) { - toShow=true; - if (scope.parentChildRoleIdDict[node.menuId].length==_.intersection(scope.parentChildRoleIdDict[node.menuId], scope.roleObj.notificationRoleIds).length) { - isChecked = 'checked="checked"'; - } - } else { - toShow=false; - } - } - //if node is a child node - else { - if (node.is_checked) { - toShow=true; - } else { - toShow=false; - } - } - - } - - - - var template = '<input ng-click="thisCheckboxClicked($event)" type="checkbox" class="edit js-node-check" data-node-menu-id="' + node.menuId + '" data-node-id="' + node.id + '" ' + isChecked + ' ng-show="' + toShow + '"' + isDisabled+ '/>' - - var templateEl = angular.element(template); - var $jqCheckbox = $compile(templateEl)(scope); - if (toShow){ - $li.find('.jqtree-element').prepend($jqCheckbox); - } else { - $li.find('.jqtree-element').remove(); - } - } - } - }); - - scope.thisCheckboxClicked = function (e) { - - var nodeId = e.target.attributes[4].value; - - - - var sBrowser, sUsrAg = window.navigator.userAgent; - //if (sUsrAg.indexOf("Firefox") > -1) { - - if (sUsrAg.indexOf("Trident") > -1) { - nodeId = e.target.attributes[5].value; - } - -// if (sUsrAg.indexOf("MSIE") > 1) { -// alert("hELLO tHIS IS IE10"); -// nodeId = e.target.attributes[3].value; -// alert('nodeId 26 of IE 45 : '+nodeId); -// } -// - var version = navigator.userAgent.match(/Firefox\/(.*)$/); - - if(version && version.length > 1){ - if(parseInt(version[1]) >= 50){ - nodeId = e.target.attributes[3].value; - } else if(parseInt(version[1]) >= 45){ - - nodeId = e.target.attributes[2].value; - } - } - var thisNode = el.find('#jqTreeUserNotif').tree('getNodeById', nodeId); - var isChecked = e.target.checked; - scope.checkboxIdDict[nodeId]['is_box_checked'] = isChecked; - - thisNode = angular.element(thisNode); - if (thisNode[0].hasOwnProperty('children') && thisNode[0].children.length > 0) { - var jsNodeCheckList = angular.element(e.target).parent().next().find('.js-node-check') - // check/uncheck children items - jsNodeCheckList.prop('checked', isChecked); - - for (var i in jsNodeCheckList) { - var singlediv = jsNodeCheckList[i]; - if (typeof singlediv == 'object' & (!singlediv.length)) { - - var tempNodeId = angular.element(singlediv)[0].attributes[4].value; - - - - if (sUsrAg.indexOf("Trident") > -1) { - - var tempNodeId = angular.element(singlediv)[0].attributes[5].value; - - - } - -// if (sUsrAg.indexOf("MSIE") > 0) { -// var tempNodeId = angular.element(singlediv)[0].attributes[3].value; -// alert('tempNodeId 2 FF 45 : '+tempNodeId); -// } - if(version && version.length > 1){ - if(parseInt(version[1]) >= 50){ - tempNodeId = angular.element(singlediv)[0].attributes[3].value; - } - else if(parseInt(version[1]) >= 45){ - tempNodeId = angular.element(singlediv)[0].attributes[2].value; - } - } - scope.checkboxIdDict[tempNodeId]['is_box_checked'] = isChecked; - } - } - } - - scope.checkBoxObj.isAnyRoleSelected = false; - for (var key in scope.checkboxIdDict) { - if (scope.checkboxIdDict[key]['is_box_checked']&&scope.checkboxIdDict[key]['role_id']) { - scope.checkBoxObj.isAnyRoleSelected = true; - break; - } - } - } - - - - scope.$watch('treedata', function (oldValue, newValue) { - if (oldValue !== newValue) { - $jqTree.tree('loadData', scope.treedata); - $jqTree.tree('reload', function () { - }); - } - }); - } - }; - }]); + })(); diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.less b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.less index b712ed26..e648c1d6 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.less +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.less @@ -1,13 +1,16 @@ .user-notification-details-modal { - width: 595px; + // width: 595px; margin:auto; background-color:white; .title { - .dGray18r; //AT&T Dark Gray + .dGray18r; border-bottom: @blue-active 3px solid; } + .btn-calendar-icon{ + z-index:1; + } input:not([type="button"]) { height: 13px; } @@ -41,6 +44,11 @@ width: 80px; } +.radio { + + margin-bottom: 12px; +} + .left-container{ display: inline-block; width: 48%; @@ -59,7 +67,8 @@ position:absolute; } - + + .notif-input{ width:302px; height:50px; @@ -148,10 +157,15 @@ } } - #datepicker{ - z-index: 10000 !important; - width: 302px; - padding-left: 6px; - } - + .radio input:checked + .skin:after{ + width:22px; + height:22px; +} + +.btn-calendar-icon{ + width: 10px; + position: absolute; + right: 25px; + top: 8px; +} diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.page.html b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.page.html index ac7f4895..57433c1c 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.page.html +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.page.html @@ -18,38 +18,64 @@ ================================================================================ --> <div class="user-notification-details-modal"> - <!--<div class="functional-menu-container">--> - <div id="app-title" class="title">{{modalPgTitle}}</div> - <div class="user-notification-details-contents"> + + <div class="b2b-modal-header"> + <h2 class="account-details-title" id="account-add-details-title">{{modalPgTitle}}</h2> + + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="user-notification-button-close" + ng-click="$dismiss('cancel')"></button> + </div> + </div> + + <div class="b2b-modal-body"> + <div class="user-notification-details-contents"> <div class="left-container"> <div class="add-widget-field" style="{{isEditMode? 'opacity : 0.6; pointer-events: none;':' '}} "> <div class="user-notif-label">Broadcast to All Categories</div> - <label id="label-yes" class="simulateCatGridHeaderRadioButton"> <input - id="radio-button-yes" type="radio" ng-model="isForAllRoles" value="Y"> Yes - </label> <label id="label-no" class="simulateCatGridHeaderRadioButton"> <input - id="radio-button-no" type="radio" ng-model="isForAllRoles" value="N"> No - </label> + <div class="user-notif-label"> + <label for="radio-button-yes" class="radio"> + <input type="radio" ng-model="newNotifModel.isForAllRoles" id="radio-button-yes" name="YES" value="Y" > + <i class="skin"></i> + <span>Yes</span> + </label> + </div> + <div class="user-notif-label"> + <label for="radio-button-no" class="radio"> + <input type="radio" ng-model="newNotifModel.isForAllRoles" id="radio-button-no" name="NO" value="N" > + <i class="skin"></i> + <span>No</span> + </label> + </div> </div> <div - style="padding-left: 10px; {{(! isForAllRoles ||isForAllRoles=='Y')? 'opacity : 0.6; pointer-events: none;':' '}} {{isEditMode? 'opacity : 0.6;':' '}} " + style="padding-left: 10px; {{(! newNotifModel.isForAllRoles ||newNotifModel.isForAllRoles=='Y')? 'opacity : 0.6; pointer-events: none;':' '}} {{isEditMode? 'opacity : 0.6;':' '}} " class="user-notif-label"> <div id="notifcation-label-user" class="user-notif-label"> - <span ng-show="isForAllRoles=='N'" runat="server" ID="required" style="color: Red;">*</span> + <span ng-show="newNotifModel.isForAllRoles=='N'" runat="server" ID="required" class="notifcation-label-user-requiredId">*</span> Categories </div> <div> <div id="notifcation-label-user-div" class="user-notif-label"></div> - <label id="funcMenu-label-yes" > <input id="radio-button-funcMenu" - type="radio" ng-model="isFunctionalMenu" ng-click="getFunctionalMenu()" value="Y"> Functional Menu - <br/> - </label> <label id="approles-label-no" > <input id="radio-button-approles" - type="radio" ng-model="isFunctionalMenu" ng-click="getAppRoleIds()" value="N"> Application Roles - </label> + <div class="user-notif-label"> + <label for="funcMenu-label-yes" class="radio"> + <input type="radio" ng-model="newNotifModel.isFunctionalMenu" ng-click="getFunctionalMenu()" id="funcMenu-label-yes" name="FUNCTIONAL MENU" value="Y" > + <i class="skin"></i> + <span>Functional Menu</span> + </label> + </div> + <div class="user-notif-label"> + <label for="approles-label-no" class="radio"> + <input type="radio"ng-model="newNotifModel.isFunctionalMenu" ng-click="getAppRoleIds()" id="approles-label-no" name="APPLICATION ROLES" value="N" > + <i class="skin"></i> + <span>Application Roles</span> + </label> + </div> - <div id="approles-checkbox" ng-show="!checkBoxObj.isAnyRoleSelected&&(isForAllRoles=='N')&&(!isEditMode)"> + <div id="approles-checkbox" ng-show="!newNotifModel.anyTreeItemSelected&&(newNotifModel.isForAllRoles=='N')&&(!newNotifModel.isEditMode)"> - <div id="approles-checkbox-required" ng-show="!checkBoxObj.isAnyRoleSelected" > + <div id="approles-checkbox-required" ng-show="!newNotifModel.anyTreeItemSelected" > <small class="checkbox-categories">At least @@ -60,64 +86,74 @@ </div> - <div id="tree1"> - <div id="Service_Creation"></div> - </div> - <div - - id="jq-tree-div" jq-tree-user-notif ></div> - - - - <script type="text/ng-template" id="jq-tree-tmpl-user-notif.html"> - <div id="jqTreeUserNotif" class="tree"></div> - </script> + + + <br> + <div id="user-notif-tree-div" class="tree-div" > + <div id="user-notif-tree" class="b2b-tree-checkbox" style="{{isEditMode? 'pointer-events: none;':' '}}"> + <b2b-tree-node-checkbox id="jqTreeUserNotif" collection="treedata" set-role="tree" group-it="false" ></b2b-tree-node-checkbox> + </div> + </div> </div> <div> - <div id="add-user-notif-priority" class="add-widget-field" style="{{isEditMode? 'opacity : 0.6; pointer-events: none;':' '}} "> - <div id="user-notification-priority-label" class="user-notif-label">Priority</div> - <label id="label-important" class="simulateCatGridHeaderRadioButton"> <input - id="radio-button-normal" type="radio" ng-model="selectedPriority" value="1"> Normal - </label> <label id="label-normal" class="simulateCatGridHeaderRadioButton"> <input - id="radio-button-important" type="radio" ng-model="selectedPriority" value="2"> - Important - </label> - </div> + </div> </div> <div id="app-conatiner-right" class="right-container"> + <div id="add-user-notif-priority" class="add-widget-field" style="{{isEditMode? 'opacity : 0.6; pointer-events: none;':' '}} "> + <div id="user-notification-priority-label" class="user-notif-label">Priority</div> + <div class="user-notification-priority-label"> + <label for="label-important" class="radio"> + <input type="radio" ng-model="newNotifModel.selectedPriority" id="label-important" name="NORMAL" value="1" > + <i class="skin"></i> + <span>Normal</span> + </label> + </div> + <div class="user-notification-priority-label"> + <label for="label-normal" class="radio"> + <input type="radio" ng-model="newNotifModel.selectedPriority" id="label-normal" name="IMPORTANT" value="2" > + <i class="skin"></i> + <span>Important</span> + </label> + </div> + </div> <div id="add-user-notif-startdate" class="add-widget-field" style="padding-bottom: 12px; width: 301px !important;{{( isEditMode )? 'opacity : 0.6; pointer-events: none;':' '}}"> <div id="user-notification-startdate-label" class="user-notif-label"> <div class="user-notif-label"> - <span runat="server" ID="required" style="color: Red;">*</span> + <span runat="server" ID="required" class="notifcation-label-user-requiredId">*</span> Start Date (Local Time) </div> - <input class="notif-input-calendar" id="datepicker-start" type="text" - ng-model="startTime" b2b-datepicker min="minDate" max="maxDate" - required /> - <div id="user-startdate-required" ng-show="!startTime"> - <small class="mandatory-categories">Start Date is Required</small> + <div class="datepicker-container"> + <input class="notif-input-calendar" id="datepicker-start" type="text" + ng-model="newNotifModel.startTime" b2b-datepicker min="minDate" max="maxDate" + required /> + </div> + <div id="user-startdate-required" ng-show="!isDateValid(newNotifModel.startTime)"> + <small class="mandatory-categories">Please enter valid date in MM/DD/YYYY format!</small> </div> + </div> <div ng-show="!isEditMode" ng-init="formatStartDate()"></div> </div> <div id="add-user-notif-enddate" class="add-widget-field" - style="padding-bottom: 12px; width: 301px !important; {{( isEditMode )? 'opacity : 0.6; pointer-events: none;':' '}}"> + style="padding-bottom: 12px; width: 301px !important; {{( isEditMode )? 'opacity : 0.6; pointer-events: none;':' '}}"> <div id="user-notification-enddate-label" class="user-notif-label"> - <span runat="server" ID="required" style="color: Red;">*</span> End Date (Local Time) + <span runat="server" ID="required" class="notifcation-label-user-requiredId">*</span> End Date (Local Time) </div> - <input class="notif-input-calendar" type="text" id="datepicker-end" - ng-model="endTime" b2b-datepicker min="minDate" max="maxDate" - required /> - <div id="user-enddate-required" ng-show="!endTime" > - <small class="mandatory-categories">End Date is Required</small> + <div class="datepicker-container"> + <input class="notif-input-calendar" type="text" id="datepicker-end" + ng-model="newNotifModel.endTime" b2b-datepicker min="minDate" max="maxDate" + required /> </div> - <div id="user-enddate-error" ng-show="endTime&&startTime&&startTime.getTime()>=endTime.getTime()" style="color: #cf2a2a; font-size: 10px;"> - <small style="position: absolute;">End Date must be greater than start Date</small> + <div id="user-endDate-required" ng-show="!isDateValid(newNotifModel.endTime)"> + <small class="mandatory-categories">Please enter valid date in MM/DD/YYYY format!</small> + </div> + <div id="user-enddate-error" ng-show="newNotifModel.endTime&&newNotifModel.startTime&&newNotifModel.startTime.getTime()>=newNotifModel.endTime.getTime()" class="user-enddate-error-txt"> + <small class="mandatory-categories">End Date must be greater than start Date</small> </div> <div ng-show="!isEditMode" ng-init="formatEndDate()" ></div> </div> @@ -125,12 +161,12 @@ <div id="add-user-notif-title" class="add-widget-field" style="padding-bottom: 12px; {{( isEditMode )? 'opacity : 0.6; pointer-events: none;':' '}}"> <div id="user-notification-title-label" class="user-notif-label"> - <span runat="server" ID="required" style="color: Red;" + <span runat="server" ID="required" class="notifcation-label-user-requiredId" visible="false"> *</span> Title </div> - <textarea id="add-notification-input-title" class="notif-input" ng-model="msgHeader" name="content" style="height: 50px;"> + <textarea id="add-notification-input-title" class="notif-input" ng-model="newNotifModel.msgHeader" name="content" class="add-notification-input-title-ht"> </textarea> - <div id="user-title-required" ng-show="msgHeader.length == 0"> + <div id="user-title-required" ng-show="newNotifModel.msgHeader.length == 0"> <small class="mandatory-categories">Title is Required</small> </div> </div> @@ -138,30 +174,39 @@ <div id="add-user-notif-message" class="add-widget-field" style="padding-bottom: 12px; {{( isEditMode )? 'opacity : 0.6; pointer-events: none;':' '}}"> <div id="user-notif-message-label" class="user-notif-label"> - <span runat="server" ID="required" style="color: Red;" + <span runat="server" ID="required" class="notifcation-label-user-requiredId" visible="false"> *</span> Message </div> - <textarea id="user-notif-input-message" class="notif-input" style="height: 150px" - ng-model="msgDescription" name="content"> + <textarea id="user-notif-input-message" class="notif-input" class="add-notification-input-title-ht" + ng-model="newNotifModel.msgDescription" name="content"> </textarea> - <div id="user-notif-message-required" ng-show="msgDescription.length ==0 "> + <div id="user-notif-message-required" ng-show="newNotifModel.msgDescription.length ==0 "> <small class="mandatory-categories">Message is Required</small> </div> </div> - <div class="dialog-control"> - <a ng-show="!isEditMode"> - <button id="button-notification-save" class="btn btn-alt btn-small" size="small" ng-disabled="addUserNotificationValidation()" - ng-click="addUserNotification()">Save</button></a> - <button id="button-notification-cancel" class="btn btn-alt btn-small" ng-click="closeThisDialog()" role="button" tabindex="0">Cancel</button> - </div> + </div> </div> + </div> + <br> + <div class="b2b-modal-footer"> + <div class="dialog-control"> + <a ng-show="!isEditMode"> + <button id="button-notification-save" class="btn btn-alt btn-small" size="small" ng-disabled="addUserNotificationValidation()" ng-click="addUserNotification()">Save</button></a> + <button id="button-notification-cancel" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')"role="button" tabindex="0">Cancel</button> + + </div> + </div> + + + + </div> <script> $(document).ready(function(){ $(".ngdialog-close").attr('id','dialog-close'); }); -</script> +</script>
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.tpl.html b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.tpl.html index 72c92c21..f7973f71 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.tpl.html @@ -31,16 +31,15 @@ placeholder="Search in entire table" ng-model="searchString" /> </div> <div class="table-control-buttons" ng-controller="userNotificationsCtrl"> - <button class="btn btn-alt btn-small"id="button-openAddNewApp" ng-click="openUserNotificationModal()" > + <button class="btn btn-alt btn-small"id="button-openAddNewApp" ng-click="userNotifications.openUserNotificationModal()" > <i class="icon-people-userbookmark" aria-hidden="true"></i> Add Notification </button> </div> <span class="ecomp-spinner" ng-show="isLoadingTable"></span> - <div class="b2b-table-div" - ng-hide="isLoadingTable" id="table-main"> - <table b2b-table id="table-main" table-data="adminNotifications" search-string="searchString" - current-page="ignoredCurrentPage"> + <div class="b2b-table-div" b2b-table table-data="adminNotifications" + ng-hide="isLoadingTable" id="table-main" search-string="searchString"> + <table id="table-main" > <thead b2b-table-row type="header"> <tr> <th id="th-notif-0" b2b-table-header key="msgSource" @@ -63,7 +62,7 @@ </tr> </thead> <tbody b2b-table-row type="body" class="table-body" - row-repeat="rowData in tableAdminNotifItems"> + row-repeat="rowData in tableAdminNotifItems | filter:searchString | startFrom:(currentPage1-1)*viewPerPage1 | limitTo:viewPerPage1 "track-by="$index"> <tr> <td b2b-table-body style="{{rowData.expired?'color:lightgray !important':''}}"> <div id="{{$index}}-msgSource">{{rowData.msgSource}}</div> @@ -96,9 +95,9 @@ </td> <td b2b-table-body style="{{rowData.expired?' color:lightgray !important':''}}"> - <p id="{{$index}}-notification-edit" ng-if="rowData.msgSource==='EP'" ng-click="editUserNotificationModal(rowData)"class="icon-overview" > /</p> - <p id="{{$index}}-notification-edit" ng-if="rowData.msgSource!=='EP'" ng-click="showDetailedJsonMessage(rowData)"class="icon-overview" >/ </p> - <p id="{{$index}}-notification-delete" ng-click="removeUserNotification(rowData)" class="icon-misc-trash"></p> + <p id="{{$index}}-notification-edit" ng-if="rowData.msgSource==='EP'" ng-click="userNotifications.editUserNotificationModal(rowData)"class="icon-overview" > /</p> + <p id="{{$index}}-notification-edit" ng-if="rowData.msgSource!=='EP'" ng-click="userNotifications.showDetailedJsonMessage(rowData)"class="icon-overview" >/ </p> + <p id="{{$index}}-notification-delete" ng-click="userNotifications.removeUserNotification(rowData)" class="icon-misc-trash"></p> </td> diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.ack.html b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.ack.html index e3bcf0a4..17b8b595 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.ack.html +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.ack.html @@ -19,7 +19,7 @@ --> <div class="new-user-modal"> <div class="search-users-directive"> - <div class="title">Bulk User Upload Acknowledgement</div> + <div id="title" class="title">Bulk User Upload Acknowledgement</div> <div class="main"> <h1>The valid entries have been uploaded.</h1> diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.confirm.html b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.confirm.html index 6df7d240..f7c7adff 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.confirm.html +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.confirm.html @@ -17,9 +17,15 @@ limitations under the License. ================================================================================ --> -<div class="bulk-user-modal"> - <div class="title">Bulk User Upload Confirmation</div> - <div class="main"> +<div> + <div class="b2b-modal-header"> + <h2 class="heading-medium" id="newAdmin">Bulk User Upload Confirmation</h2> + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="bulk-user-button-close" + ng-click="$dismiss('cancel')"></button> + </div> + </div> + <div class="b2b-modal-body"> <!-- progress indicator --> <div class="upload-instructions" @@ -73,11 +79,13 @@ </div> </div> - <div class="dialog-control"> - <button id="bulk-user-ok-button" class="btn btn-alt btn-small" ng-class="{disabled: isValidating}" + + </div> + <div class="b2b-modal-footer"> + <div class="cta-button-group in"> + <button id="bulk-user-ok-button" class="btn btn-alt btn-small" ng-class="{disabled: isValidating}" ng-click="updateDB()">Ok</button> - <button id="bulk-user-cancel-button" class="btn btn-alt btn-small" ng-click="cancelUpload()">Cancel</button> - + <button id="bulk-user-cancel-button" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Cancel</button> </div> </div> </div> diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js index 8c9420d4..1e169953 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js @@ -23,7 +23,7 @@ 'use strict'; (function () { class BulkUserModalCtrl { - constructor($scope, $log, $filter, $q, usersService, applicationsService, confirmBoxService, functionalMenuService, ngDialog) { + constructor($scope, $log, $filter, $q, usersService, applicationsService, confirmBoxService, functionalMenuService, ngDialog,$modal) { // Set to true for copious console output var debug = false; @@ -486,10 +486,13 @@ // Start the process $scope.readValidateFile(); // Dialog shows progress - ngDialog.open({ - templateUrl: 'app/views/users/new-user-dialogs/bulk-user.confirm.html', - scope: $scope - }); + $modal.open({ + templateUrl: 'app/views/users/new-user-dialogs/bulk-user.confirm.html', + controller: '', + sizeClass: 'modal-medium', + resolve:'', + scope: $scope + }) }; // Invoked by the Cancel button on the confirmation dialog. @@ -500,7 +503,7 @@ init(); } // constructor } // class - BulkUserModalCtrl.$inject = ['$scope', '$log', '$filter', '$q', 'usersService', 'applicationsService', 'confirmBoxService', 'functionalMenuService', 'ngDialog']; + BulkUserModalCtrl.$inject = ['$scope', '$log', '$filter', '$q', 'usersService', 'applicationsService', 'confirmBoxService', 'functionalMenuService', 'ngDialog','$modal']; angular.module('ecompApp').controller('BulkUserModalCtrl', BulkUserModalCtrl); angular.module('ecompApp').directive('fileChange', ['$parse', function($parse){ diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.html b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.html index 7945e54a..69f2de08 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.html +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.html @@ -17,44 +17,53 @@ limitations under the License. ================================================================================ --> -<div class="bulk-user-modal"> - <div class="title">Bulk User Upload</div> - <div class="main"> - <div ng-show="bulkUser.step1"> - <div class="upload-instructions">Select Application:</div> - <div class="c-ecomp-portal-abs-select default"> - - <select id="bulk-user-dropdown-apps" name="dropdown1" b2b-dropdown ng-model="selectedApplication.value" ng-disabled="isProcessing" ng-class="{disabled: isProcessing}"> - <option b2b-dropdown-list option-repeat="d in adminApps" value="{{d.value}}">{{d.title}}</option> - </select> - - </div> +<div> + <div class="b2b-modal-header"> + <h2 class="heading-medium" id="newAdmin">Bulk User Upload</h2> + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="bulkuser-button-close" + ng-click="$dismiss('cancel')"></button> </div> - - <div ng-hide="bulkUser.step1"> - <div class="upload-instructions">Select Upload File:</div> - - <!-- input type=file is difficult to style. - Instead use a label styled as a button. --> - <label class="file-label"> - <input type="file" - file-change="fileChangeHandler($event,files)" - ng-model="fileModel" /> - <span>Browse...</span> - </label>{{selectedFile}} - <div class="upload-instructions">File must have one entry per line with this format: - <pre>orgUserId, role name</pre> + </div> + <div class="b2b-modal-body"> + <div class="b2b-modal-body-div"> + <div ng-show="bulkUser.step1"> + <div class="upload-instructions">Select Application:</div> + <div class="c-ecomp-portal-abs-select default"> + + <select id="bulk-user-dropdown-apps" name="dropdown1" b2b-dropdown ng-model="selectedApplication.value" ng-disabled="isProcessing" ng-class="{disabled: isProcessing}"> + <option b2b-dropdown-list option-repeat="d in adminApps" value="{{d.value}}">{{d.title}}</option> + </select> + + </div> </div> + + <div ng-hide="bulkUser.step1"> + <div class="upload-instructions">Select Upload File:</div> + + <!-- input type=file is difficult to style. + Instead use a label styled as a button. --> + <label class="file-label"> + <input type="file" + file-change="fileChangeHandler($event,files)" + ng-model="fileModel" /> + <span>Browse...</span> + </label>{{selectedFile}} + <div class="upload-instructions">File must have one entry per line with this format: + <pre>orgUserId, role name</pre> + </div> + </div> + + <!-- progress indicator in middle --> + <div ng-show="isProcessing"> + <span class="ecomp-spinner"></span> + </div> + <br> </div> - - <!-- progress indicator in middle --> - <div ng-show="isProcessing"> - <span class="ecomp-spinner"></span> - </div> - - <div class="dialog-control"> - - <button id="bulk-user-back-button" class="btn btn-alt btn-small" + </div> + <div class="b2b-modal-footer"> + <div class="cta-button-group in"> + <button id="bulk-user-back-button" class="btn btn-alt btn-small" ng-hide="bulkUser.step1" ng-click="navigateBack()">Back</button> <button id="bulk-user-next-button" class="btn btn-alt btn-small" ng-hide="!bulkUser.step1" ng-click="!isProcessing && step2()" @@ -64,7 +73,7 @@ ng-click="bulkUser.fileSelected && confirmUpload()" ng-class="{disabled: !bulkUser.fileSelected}">Upload</button> <button id="bulk-user-cancel-button" class="btn btn-alt btn-small" - ng-click="closeThisDialog()">Cancel</button> + ng-click="$dismiss('cancel')">Cancel</button> </div> </div> </div> diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.less b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.less index b6ee63f8..07afd90b 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.less +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.less @@ -2,7 +2,7 @@ height: 430px; .title { - .dGray18r; //AT&T Dark Gray + .dGray18r; border-bottom: @blue-active 3px solid; } @@ -58,3 +58,6 @@ } } +.b2b-modal-body-div{ + height:250px; +} diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js index 6550a1ee..5367ecf8 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js @@ -23,7 +23,7 @@ 'use strict'; (function () { class NewUserModalCtrl { - constructor($scope, $log, usersService, applicationsService, confirmBoxService) { + constructor($scope, $log, usersService, applicationsService, confirmBoxService, items) { var extRequestValue = false; let init = () => { //$log.info('NewUserModalCtrl::init'); @@ -31,9 +31,9 @@ this.anyChanges = false; this.adminApps = []; this.isGettingAdminApps = false; - if($scope.ngDialogData && $scope.ngDialogData.selectedUser && $scope.ngDialogData.dialogState){ - this.selectedUser = $scope.ngDialogData.selectedUser; - this.dialogState = $scope.ngDialogData.dialogState; + if(items && items.selectedUser && items.dialogState){ + this.selectedUser = items.selectedUser; + this.dialogState = items.dialogState; this.isShowBack = false; if(this.dialogState === 3){ this.getUserAppsRoles(); @@ -109,6 +109,13 @@ //$log.debug('NewUserModalCtrl::getUserAppsRoles: got a result for app: ',app.id,': ',app.name,': ',userAppRolesResult); app.appRoles = userAppRolesResult; app.isLoading = false; + for(var i=0;i<app.appRoles.length;i++){ + + if(app.appRoles[i].roleName.indexOf('global_')!=-1){ + app.appRoles[i].roleName='*'+app.appRoles[i].roleName; + + } + } }).catch(err => { $log.error(err); @@ -148,6 +155,12 @@ if (app.isChanged) { //$log.debug('NewUserModalCtrl::updateUserAppsRoles: app roles have changed; going to update: id: ', app.id, '; name: ', app.name); app.isUpdating = true; + for(var i=0;i<app.appRoles.length;i++){ + if(app.appRoles[i].roleName.indexOf('*global_')!=-1){ + app.appRoles[i].roleName=app.appRoles[i].roleName.replace('*',''); + + } + } var newUserAppRoles = { orgUserId: this.selectedUser.orgUserId, appId: app.id, @@ -172,7 +185,7 @@ this.isSaving = false; // hide the spinner } if (this.numberAppsSucceeded === this.adminApps.length) { - $scope.closeThisDialog(true);//close and resolve dialog promise with true (to update the table) + $scope.$dismiss('cancel');//close and resolve dialog promise with true (to update the table) } }) } else { @@ -185,7 +198,7 @@ this.isSaving = false; // hide the spinner } if (this.numberAppsSucceeded === this.adminApps.length) { - $scope.closeThisDialog(true);//close and resolve dialog promise with true (to update the table) + $scope.$dismiss('cancel');//close and resolve dialog promise with true (to update the table) } } }); @@ -212,6 +225,6 @@ }); } } - NewUserModalCtrl.$inject = ['$scope', '$log', 'usersService', 'applicationsService', 'confirmBoxService']; + NewUserModalCtrl.$inject = ['$scope', '$log', 'usersService', 'applicationsService', 'confirmBoxService', 'items']; angular.module('ecompApp').controller('NewUserModalCtrl', NewUserModalCtrl); })(); diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html index 5fec021a..b36e8594 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html @@ -17,69 +17,100 @@ limitations under the License. ================================================================================ --> -<div class="new-user-modal"> +<style> + .title { + border-bottom: none !important; + } + + .b2b-modal-footer .cta-button-group { + border-top: 0px solid #d2d2d2; + } + + .multiple-select { + width: 250px; + } +</style> - <div class="search-users" ng-show="newUser.dialogState===1"> + <div > + +<div ng-if="newUser.dialogState===1"> - <search-users search-title="New User" - selected-user="newUser.selectedUser"></search-users> + <div class="b2b-modal-header"> + <h2 class="heading-medium" id="newAdmin">New User</h2> - <div class="dialog-control"> - <button class="btn btn-alt btn-small" id="next-button" ng-click="newUser.selectedUser && newUser.getUserAppsRoles()" - ng-class="{disabled: !newUser.selectedUser}">Next - </button> - <button class="btn btn-alt btn-small" id="cancel-button" ng-click="closeThisDialog()">Cancel</button> - - </div> - </div> + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="user-button-close" + ng-click="$dismiss('cancel')"></button> + </div> + </div> - <div class="user-apps-roles" ng-show="newUser.dialogState===3"> - <div class="title" - ng-bind="newUser.selectedUser.firstName + ' ' + newUser.selectedUser.lastName + ' (' + newUser.selectedUser.orgUserId + ')'"></div> - - - <div class="app-roles-main"> - <div class="app-roles-main-title"> - <span class="left">Access and roles:</span> - </div> + <div class="b2b-modal-body" tabindex="0" + aria-label="Modal header text content" role="region"> + <search-users search-title="" selected-user="newUser.selectedUser"></search-users> + </div> - <div class="app-roles-list"> - <div class="app-item" ng-repeat="app in (newUser.adminApps) track by app.id" id="app-name-{{app.name.split(' ').join('-')}}" ng-show="!app.isDeleted"> - <div class="app-item-left" id="div-app-name-{{app.name.split(' ').join('-')}}">{{app.name | elipsis: 27}}</div> - <div class="app-item-right" id="div-app-name-dropdown-{{app.name.split(' ').join('-')}}" ng-show="!app.isError && !app.isLoading && !app.noChanges && !app.isUpdating && !app.isDoneUpdating && !app.isErrorUpdating"> - <multiple-select id="app-roles" - unique-data="{{$index}}" - placeholder="Select roles" - ng-model="app.appRoles" - on-change="newUser.appChanged($index)" - name-attr="roleName" - value-attr="isApplied"></multiple-select> - </div> - <div id="app-item-no-contact" class="app-item-right-error" ng-show="app.isError">{{app.errorMessage}}</div> - <div id="app-item-contacting" class="app-item-right-contacting" ng-show="app.isLoading">Contacting application...</div> - <div id="app-item-no-changes" class="app-item-right-contacting" ng-show="app.noChanges">No changes</div> - <div id="app-item-no-updating" class="app-item-right-contacting" ng-show="app.isUpdating">Updating application...</div> - <div id="app-item-done-updating" class="app-item-right-contacting" ng-show="app.isDoneUpdating">Finished updating application</div> - <div id="app-item-cannot-update" class="app-item-right-error" ng-show="app.isErrorUpdating">Could not update application...</div> - <div id="app-item-delete" class="app-item-delete" ng-click="newUser.deleteApp(app)" ng-show="!app.isLoading && !app.isError"></div> - <div id='ecomp-small-spinner' class="ecomp-small-spinner" ng-show="app.isLoading"></div> - </div> - </div> - - <div class="dialog-control"> - <span id="ecomp-save-spinner" class="ecomp-save-spinner" ng-show="newUser.isSaving || newUser.isGettingAdminApps"></span> - <button id="new-user-back-button" class="btn btn-alt btn-small" ng-show="newUser.isShowBack" ng-click="newUser.navigateBack()">Back</button> - <button id="new-user-save-button" class="btn btn-alt btn-small" ng-click="newUser.updateUserAppsRoles()" - ng-disabled="(newUser.anyChanges == false)">Save - </button> - <button id="new-user-cancel-button" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Cancel</button> - </div> - - </div> - - </div> + <div class="b2b-modal-footer"> + <div class="cta-button-group in"> + <button class="btn btn-alt btn-small" id="next-button" ng-click="newUser.selectedUser && newUser.getUserAppsRoles()" + ng-class="{disabled: !newUser.selectedUser}">Next + </button> + <button id="search-users-button-cancel" + class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Cancel</button> + </div> + </div> + </div> + <div ng-if="newUser.dialogState===3"> + + <div class="b2b-modal-header"> + <div class="title" + ng-bind="newUser.selectedUser.firstName + ' ' + newUser.selectedUser.lastName + ' (' + newUser.selectedUser.orgUserId + ')'"></div> + + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" id="div-cancel-button" + ng-click="$dismiss('cancel')"></button> + </div> + </div> + + <div class="b2b-modal-body"> + <div class="app-roles-main-title"> + <span class="left">Access and roles:</span> + </div> + <br/> + <table class="app-roles-list"> + <tr class="app-item" ng-repeat="app in (newUser.adminApps) track by app.id" id="app-name-{{app.name.split(' ').join('-')}}" ng-show="!app.isDeleted"> + <td class="app-item-left" id="div-app-name-{{app.name.split(' ').join('-')}}">{{app.name | elipsis: 27}}</td> + <td class="app-item-right" id="div-app-name-dropdown-{{app.name.split(' ').join('-')}}" ng-show="!app.isError && !app.isLoading && !app.noChanges && !app.isUpdating && !app.isDoneUpdating && !app.isErrorUpdating"> + <multiple-select id="app-roles-{{app.name}}" unique-data="{{$index}}" placeholder="Select roles" + ng-model="app.appRoles" on-change="newUser.appChanged($index)" name-attr="roleName" + value-attr="isApplied"></multiple-select> + </td> + <td id="app-item-no-contact" class="app-item-right-error" ng-show="app.isError">{{app.errorMessage}}</td> + <td id="app-item-contacting" class="app-item-right-contacting" ng-show="app.isLoading">Contacting application...</td> + <td id="app-item-no-changes" class="app-item-right-contacting" ng-show="app.noChanges">No changes</td> + <td id="app-item-no-updating" class="app-item-right-contacting" ng-show="app.isUpdating">Updating application...</td> + <td id="app-item-done-updating" class="app-item-right-contacting" ng-show="app.isDoneUpdating">Finished updating application</td> + <td id="app-item-cannot-update" class="app-item-right-error" ng-show="app.isErrorUpdating">Could not update application...</td> + <td id="app-item-delete" ng-click="newUser.deleteApp(app)" ng-show="!app.isLoading && !app.isError" > + <i class="icon-misc-trash"></i> + </td> + <td id='ecomp-small-spinner' class="ecomp-small-spinner" ng-show="app.isLoading"></td> + </tr> + </table > + </div> + + <div class="b2b-modal-footer"> + <div class="cta-button-group in"> + <span id="ecomp-save-spinner" class="ecomp-save-spinner" ng-show="newUser.isSaving || newUser.isGettingAdminApps"></span> + <button id="new-user-back-button" class="btn btn-alt btn-small" ng-show="newUser.isShowBack" ng-click="newUser.navigateBack()">Back</button> + <button id="new-user-save-button" class="btn btn-alt btn-small" ng-click="newUser.updateUserAppsRoles()" + ng-disabled="(newUser.anyChanges == false)">Save + </button> + <button id="new-user-cancel-button" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')">Cancel</button> + </div> + </div> + </div> </div> diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.less b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.less index 68c23e52..8a44b110 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.less +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.less @@ -4,7 +4,7 @@ .user-apps-roles{ .title{ //.n18r; - .dGray18r; //AT&T Dark Gray + .dGray18r; border-bottom: @portalDBlue 3px solid; } @@ -50,28 +50,6 @@ vertical-align: middle; } - .app-item-right-error{ - .portalRed; - padding: 7px 7px 7px 7px; - display:inline-block; - width: 45%; - border-radius: 2px; - border: 1px solid @portalLGray; - background: @portalWhite; - vertical-align: middle; - } - - .app-item-right-contacting{ - .portalGreen; - padding: 7px 7px 7px 7px; - display:inline-block; - width: 45%; - border-radius: 2px; - border: 1px solid @portalLGray; - background: @portalWhite; - vertical-align: middle; - } - .app-select-left{ width: 45%; margin-right: 10px; @@ -94,15 +72,9 @@ .app-item-delete{ - .ico_trash_default; - display: inline-block; - vertical-align: 2px; - cursor: pointer; - position: relative; - top: 6px; - color: transparent; - margin-left: 8px; - + margin-right: -20px; + float: right; + margin-top: -22px; } } @@ -110,3 +82,29 @@ } } + + .icon-misc-trash { + font-size: 20px; + } + + .app-item-right-error{ + .portalRed; + padding: 7px 7px 7px 7px; + display:inline-block; + width: 45%; + border-radius: 2px; + border: 1px solid @portalLGray; + background: @portalWhite; + vertical-align: middle; + } + + .app-item-right-contacting{ + .portalGreen; + padding: 7px 7px 7px 7px; + display:inline-block; + width: 45%; + border-radius: 2px; + border: 1px solid @portalLGray; + background: @portalWhite; + vertical-align: middle; + } diff --git a/ecomp-portal-FE-common/client/app/views/users/users.controller.js b/ecomp-portal-FE-common/client/app/views/users/users.controller.js index ac223ed6..f74b167e 100644 --- a/ecomp-portal-FE-common/client/app/views/users/users.controller.js +++ b/ecomp-portal-FE-common/client/app/views/users/users.controller.js @@ -20,7 +20,7 @@ 'use strict'; (function () { class UsersCtrl { - constructor($log, applicationsService, usersService, confirmBoxService, $scope, ngDialog) { + constructor($log, applicationsService, usersService, confirmBoxService, $scope, ngDialog,$modal) { this.$log = $log; $scope.adminAppsIsNull = false; $scope.appsIsDown = false; @@ -114,7 +114,7 @@ } } - this.updateUsersList = () => { + let updateUsersList = () => { $scope.appsIsDown = false; $scope.noUsersInApp = false; // $log.debug('UsersCtrl::updateUsersList: Starting updateUsersList'); @@ -185,19 +185,24 @@ } } } - ngDialog.open({ + + var modalInstance = $modal.open({ templateUrl: 'app/views/users/new-user-dialogs/new-user.modal.html', - controller: 'NewUserModalCtrl', - controllerAs: 'newUser', - data: data - }).closePromise.then(needUpdate => { - if (needUpdate.value === true) { - $log.debug('UsersCtrl::openAddNewUserModal updating table data...'); - this.updateUsersList(); - } - }); + controller: 'NewUserModalCtrl as newUser', + sizeClass: 'modal-medium', + resolve: { + items: function () { + return data; + } + } + }) + + modalInstance.result.finally(function () { + $log.debug('UsersCtrl::openAddNewUserModal updating table data...'); + updateUsersList(); + }); }; - + this.openBulkUserUploadModal = (adminApps) => { let data = null; if (adminApps) { @@ -209,14 +214,21 @@ } } } - ngDialog.open({ - templateUrl: 'app/views/users/new-user-dialogs/bulk-user.modal.html', - controller: 'BulkUserModalCtrl', - controllerAs: 'bulkUser', - data: data - }).closePromise.then(needUpdate => { - this.updateUsersList(); + var modalInstance = $modal.open({ + templateUrl: 'app/views/users/new-user-dialogs/bulk-user.modal.html', + controller: 'BulkUserModalCtrl as bulkUser', + sizeClass: 'modal-medium', + resolve: { + items: function () { + return data; + } + } }); + + modalInstance.result.finally(function () { + $log.debug('UsersCtrl::openAddNewUserModal updating table data...'); + updateUsersList(); + }); }; @@ -226,7 +238,7 @@ } $log.debug('UsersCtrl::openAddNewUserModal:$watch selectedApp -> Fire with: ', newVal); this.accountUsers = []; //reset table and show swirl here - this.updateUsersList(); + updateUsersList(); }); $scope.$on('$destroy', () => { @@ -239,6 +251,6 @@ init(); } } - UsersCtrl.$inject = ['$log', 'applicationsService', 'usersService', 'confirmBoxService', '$scope', 'ngDialog']; + UsersCtrl.$inject = ['$log', 'applicationsService', 'usersService', 'confirmBoxService', '$scope', 'ngDialog','$modal']; angular.module('ecompApp').controller('UsersCtrl', UsersCtrl); })(); diff --git a/ecomp-portal-FE-common/client/app/views/users/users.tpl.html b/ecomp-portal-FE-common/client/app/views/users/users.tpl.html index 606ced6e..b1a02102 100644 --- a/ecomp-portal-FE-common/client/app/views/users/users.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/users/users.tpl.html @@ -34,8 +34,8 @@ <div> <input id="input-table-search" placeholder="Search" class="table-search-field" type="text" data-ng-model="users.searchString"> </div> - <button class="btn btn-alt btn-small" ng-click="users.openAddNewUserModal()"><i class="icon-people-userbookmark" aria-hidden="true"></i> Add User</button> - <button class="btn btn-alt btn-small" ng-click="users.openBulkUserUploadModal()"><i class="icon-arrows-upload" aria-hidden="true"></i> Bulk Upload</button> + <button class="btn btn-alt btn-small" id="users-button-add" ng-click="users.openAddNewUserModal()"><i class="icon-people-userbookmark" aria-hidden="true"></i> Add User</button> + <button class="btn btn-alt btn-small" id="users-bulk-upload-button-add" ng-click="users.openBulkUserUploadModal()"><i class="icon-arrows-upload" aria-hidden="true"></i> Bulk Upload</button> </div> </div> <div ng-hide="users.isLoadingTable"> @@ -73,11 +73,11 @@ </thead> <tbody b2b-table-row type="body" row-repeat="rowData in users.accountUsers" class="table-users-div"> <tr ng-click="users.openAddNewUserModal(rowData)"> - <td b2b-table-body id="rowheader_t1_{{$index}}" headers="col1" ng-bind="rowData.firstName"></td> - <td b2b-table-body headers="rowheader_t1_{{$index}} col2" ng-bind="rowData.lastName"></td> - <td b2b-table-body headers="rowheader_t1_{{$index}} col3" ng-bind="rowData.orgUserId"></td> - <td b2b-table-body headers="rowheader_t1_{{$index}} col4"> - <div class="ecomp-table-repeat" ng-repeat="role in rowData.roles" ng-bind="role.name"></div> + <td b2b-table-body id="rowheader_t1_{{$index}}-firstName" headers="col1" ng-bind="rowData.firstName"></td> + <td b2b-table-body id="rowheader_t1_{{$index}}-lastName" headers="col2" ng-bind="rowData.lastName"></td> + <td b2b-table-body id="rowheader_t1_{{$index}}-orgUserId" headers="col3" ng-bind="rowData.orgUserId"></td> + <td b2b-table-body id="rowheader_t1_{{$index}}" headers="col4"> + <div class="ecomp-table-repeat" id="rowheader_t1_{{$index}}" ng-repeat="role in rowData.roles" ng-bind="role.name"></div> </td> </tr> </tbody> diff --git a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.controller.js b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.controller.js index ad88c02b..052d623d 100644 --- a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.controller.js +++ b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.controller.js @@ -20,7 +20,7 @@ 'use strict'; (function () { class WidgetOnboardingDetailsModalCtrl { - constructor($scope, $log, $interval, applicationsService, adminsService, microserviceService, widgetsCatalogService, errorMessageByCode, ECOMP_URL_REGEX, $window,userProfileService, confirmBoxService, $cookies) { + constructor($scope, $log, $interval, applicationsService, adminsService, microserviceService, widgetsCatalogService, errorMessageByCode, ECOMP_URL_REGEX, $window,userProfileService, confirmBoxService, $cookies,items) { this.appUpdate = function(){ this.hasSelectedApp = false; @@ -206,10 +206,10 @@ this.allUser = false; this.emptyWidgetName = false; - if ($scope.ngDialogData && $scope.ngDialogData.widget) { + if (items && items.widget) { this.isEditMode = true; this.allRoleSelected = true; - this.widget = _.clone($scope.ngDialogData.widget); + this.widget = _.clone(items.widget); } else { this.isEditMode = false; this.widget = _.clone(newWidgetModel); @@ -316,7 +316,7 @@ var serviceId = null; if(this.widget.serviceURL != null && this.widget.serviceURL != undefined){ - serviceId = this.widget.serviceURL.id; + serviceId = parseInt(this.widget.serviceURL); } @@ -344,14 +344,15 @@ this.widget.saving = false; return; } - $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); this.widget.saving = false; }); } else{ widgetsCatalogService.updateWidget(this.widget.id, newWidget) .then(() => { - $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); + }); } } @@ -365,7 +366,8 @@ this.widget.saving = false; return; } - $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); + this.widget.saving = false; }); } @@ -376,6 +378,6 @@ }); } } - WidgetOnboardingDetailsModalCtrl.$inject = ['$scope', '$log', '$interval', 'applicationsService', 'adminsService', 'microserviceService', 'widgetsCatalogService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window','userProfileService', 'confirmBoxService', '$cookies']; + WidgetOnboardingDetailsModalCtrl.$inject = ['$scope', '$log', '$interval', 'applicationsService', 'adminsService', 'microserviceService', 'widgetsCatalogService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window','userProfileService', 'confirmBoxService', '$cookies','items']; angular.module('ecompApp').controller('WidgetOnboardingDetailsModalCtrl', WidgetOnboardingDetailsModalCtrl); })(); diff --git a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.modal.html b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.modal.html index 9e1c1696..b1232239 100644 --- a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.modal.html +++ b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.modal.html @@ -18,16 +18,25 @@ ================================================================================ --> <div class="widget-details-modal"> - <div id="'widgets-details-title" class="title">Widget Details</div> - <div class="widget-properties-main" + <div class="b2b-modal-header"> + <h2 class="widget-title" id="widgets-details-title">Widget Details</h2> + + <div class="corner-button in"> + <button type="button" class="close" aria-label="Close" + ng-click="$dismiss('cancel')"></button> + </div> + </div> + + <div class="b2b-modal-body"> + <div class="widget-properties-main" scroll-top="widgetOnboardingDetails.scrollApi"> <form id="widgets-details-form" name="widgetForm" novalidate autocomplete="off"> <div class="item required"> <div class="item-label">Widget Name</div> - <input id="widgets-details-input-name" class="input-field" + <input id="widgets-details-input-name" class="table-search-field" type="text" ng-model="widgetOnboardingDetails.widget.name" ng-change="widgetOnboardingDetails.updateWidgetName()" name="name" ng-pattern="/^[\w -]*$/" maxlength="100" @@ -51,35 +60,32 @@ </div> </div> - <div class="item"> <div class="item-label">Widget Description</div> - <input id="widgets-details-input-name" class="input-field" + <!-- <input id="widgets-details-input-description" class="input-field" type="text" ng-model="widgetOnboardingDetails.widget.desc" - name="desc" maxlength="200" /> + name="desc" maxlength="200" /> --> + <textarea b2b-reset b2b-reset-textarea id="widgets-details-input-desc" + name="desc" type="text" ng-model="widgetOnboardingDetails.widget.desc" maxlength="200" ></textarea> </div> <div class="item"> <div class="item-label">Service Endpoint</div> - <div> - <select id="widgets-details-input-endpoint-url" name="url" - class="input-field" - ng-model="widgetOnboardingDetails.widget.serviceURL" - ng-options="service as service.option - for service in widgetOnboardingDetails.availableServices" - ng-disabled="widgetOnboardingDetails.isEditMode"> - <option value="" selected="selected">Select Microservice - Endpoint</option> - </select> - </div> + <div class="table-dropdown" > + <select id="widgets-details-input-endpoint-url" name="url" b2b-dropdown placeholder-text="Select Microservice Endpoint" ng-model="widgetOnboardingDetails.widget.serviceURL" ng-disabled="widgetOnboardingDetails.isEditMode" > + <option b2b-dropdown-list option-repeat="service in widgetOnboardingDetails.availableServices" value="{{service.id}}">{{service.option}}</option> + </select> + </div> </div> <div class="widget-property"> - <input id="widgets-checkbox-app-is-enabled" type="checkbox" - class="checkbox-field" - ng-model="widgetOnboardingDetails.widget.allUser" /> - <div class="property-label checkbox-label">Allow all user - access</div> + <label for="widget-checkbox-app-is-enabled" class="checkbox"> + <input type="checkbox" + ng-model="widgetOnboardingDetails.widget.allUser" + id="widget-checkbox-app-is-enabled"> <i class="skin"></i> + <span class="property-label checkbox-label">Allow all user + access</span> + </label> </div> <div class="item required" @@ -126,7 +132,7 @@ <div> <input id="widget-onboarding-details-upload-file" file-model="widgetOnboardingDetails.widget.file" type="file" - style="height: 24px;" /> + class="widget-onboarding-details-upload-file ht" /> <div class="error-container" @@ -137,20 +143,21 @@ </div> </form> </div> + </div> + <br> + <div class="b2b-modal-footer"> + <div class="cta-button-group cta-modal-footer-flex"> + <span class="ecomp-save-spinner" ng-show="widgetOnboardingDetails.isSaving"></span> + <button id="widgets-details-save-button" class="btn btn-alt btn-small" ng-class="{disabled: widgetOnboardingDetails.widget.name == undefined || !widgetOnboardingDetails.duplicatedName + || (!widgetOnboardingDetails.widget.allUser && widgetOnboardingDetails.appCounter == 0) || (widgetOnboardingDetails.widget.file == undefined && !widgetOnboardingDetails.isEditMode) + || (!widgetOnboardingDetails.widget.allUser && !widgetOnboardingDetails.allRoleSelected) || (widgetOnboardingDetails.widget.saving)}" + ng-click="widgetOnboardingDetails.saveChanges()">Save</button> + <button class="btn btn-alt btn-small" id="widgets-details-cancel-button" ng-click="$dismiss('cancel')">Cancel</button> + </div> + </div> + + + + - <div class="dialog-control"> - <span class="ecomp-save-spinner" - ng-show="widgetOnboardingDetails.isSaving"></span> - <button id="widgets-details-save-button" class="btn btn-alt btn-small" - ng-class="{disabled: widgetOnboardingDetails.widget.name == undefined || !widgetOnboardingDetails.duplicatedName - || (!widgetOnboardingDetails.widget.allUser && widgetOnboardingDetails.appCounter == 0) || (widgetOnboardingDetails.widget.file == undefined && !widgetOnboardingDetails.isEditMode) - || (!widgetOnboardingDetails.widget.allUser && !widgetOnboardingDetails.allRoleSelected) || (widgetOnboardingDetails.widget.saving)}" - ng-click="widgetOnboardingDetails.saveChanges()">Save</button> - <button id="widgets-details-cancel-button" - class="btn btn-alt btn-small" ng-click="closeThisDialog()">Cancel</button> - - </div> - - - -</div> +</div>
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.modal.less b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.modal.less index d7cf2671..065c5428 100644 --- a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.modal.less +++ b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.modal.less @@ -1,9 +1,8 @@ .widget-details-modal { - height: 580px; .title { //.n18r; - .dGray18r; //AT&T Dark Gray - border-bottom: @portalDBlue 3px solid; + .dGray18r; + // border-bottom: @portalDBlue 3px solid; } .widget-input-field{ width:250px; @@ -31,7 +30,10 @@ top: -1px; height:15px; } - + .checkbox .skin { + left: 0px; + top: 0px; + } } .widget-upload-field{ height:24px; @@ -99,4 +101,7 @@ } + .widget-onboarding-details-upload-file ht { + height: 24px; + } } diff --git a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.js b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.js index 0e7fd9fb..8dc2201b 100644 --- a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.js +++ b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.js @@ -21,7 +21,7 @@ (function () { class WidgetOnboardingCtrl { constructor($log, applicationsService, widgetsCatalogService, ngDialog, confirmBoxService, - userProfileService, $cookies, $scope) { + userProfileService, $cookies, $scope,$modal) { $scope.infoMessage = true; let populateAvailableApps = widgets => { @@ -145,16 +145,20 @@ widget: selectedWidget } } - ngDialog.open({ + var modalInstance = $modal.open({ templateUrl: 'app/views/widget-onboarding/widget-details-dialog/widget-details.modal.html', - controller: 'WidgetOnboardingDetailsModalCtrl', - controllerAs: 'widgetOnboardingDetails', - data: data - }).closePromise.then(needUpdate => { - if(needUpdate.value === true){ - getOnboardingWidgets(); - } - }); + controller: 'WidgetOnboardingDetailsModalCtrl as widgetOnboardingDetails', + sizeClass: 'modal-medium', + resolve: { + items: function () { + return data; + } + } + }) + + modalInstance.result.finally(function () { + getOnboardingWidgets(); + }); }; this.deleteWidget = widget => { @@ -199,6 +203,7 @@ document.body.removeChild(a); window.URL.revokeObjectURL(url); }, 100); + }); }; @@ -206,6 +211,6 @@ } } WidgetOnboardingCtrl.$inject = ['$log', 'applicationsService', 'widgetsCatalogService', 'ngDialog', 'confirmBoxService', - 'userProfileService','$cookies', '$scope']; + 'userProfileService','$cookies', '$scope','$modal']; angular.module('ecompApp').controller('WidgetOnboardingCtrl', WidgetOnboardingCtrl); })(); diff --git a/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.modal.html b/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.modal.html index 0f77ef63..779ac902 100644 --- a/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.modal.html +++ b/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.modal.html @@ -22,7 +22,7 @@ <div class="widget-properties-main" scroll-top="widgetDetails.scrollApi"> <form id="widgets-details-form" name="widgetForm" novalidate autocomplete="off"> - <!-- We can remove this script once we get to AT&T Corporate Firefox version 47 + <!-- We can remove this script once we get to Firefox version 47 autocomplete="off" won't work until v47 --> <script type="text/javascript"> document.getElementById("appForm").reset(); @@ -38,7 +38,7 @@ ng-disabled="!widgetDetails.availableApps || !widgetDetails.availableApps.length" name="app" required> - <option id="widgets-details-select-app-disabled" value="" disabled style="display: none;">Select application</option> + <option id="widgets-details-select-app-disabled" value="" disabled class="widgets-details-select-app-disabled">Select application</option> </select> </div> <div class="error-container" ng-show="widgetForm.app.$dirty"> diff --git a/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.modal.less b/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.modal.less index 568b6180..2ab7ebad 100644 --- a/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.modal.less +++ b/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.modal.less @@ -1,9 +1,8 @@ .widget-details-modal { - height: 580px; .title { //.n18r; - .dGray18r; //AT&T Dark Gray + .dGray18r; border-bottom: @portalDBlue 3px solid; } @@ -71,5 +70,7 @@ } } - + .widgets-details-select-app-disabled{ + display: none; + } } diff --git a/ecomp-portal-FE-common/client/bower_components_external/b2b/css/b2b-angular/README.md b/ecomp-portal-FE-common/client/bower_components_external/b2b/css/b2b-angular/README.md index f3b5e66d..338c106c 100644 --- a/ecomp-portal-FE-common/client/bower_components_external/b2b/css/b2b-angular/README.md +++ b/ecomp-portal-FE-common/client/bower_components_external/b2b/css/b2b-angular/README.md @@ -11,4 +11,9 @@ Replace "ATT" with "ECOMP" in font-family in b2b-angular.css file 15 March 2017: Revert the change back to original for input:not([type="button"]) - height: 14px; - + height: 36px;
\ No newline at end of file + + height: 36px; + +22 June 2017: Fix the missing icons by doing the mapping with ionicons +Removed the "!important" tag for the "font family: icoPrimary" + - font family: 'icoPrimary' !important; + + font family: 'icoPrimary';
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/bower_components_external/b2b/css/b2b-angular/b2b-angular.css b/ecomp-portal-FE-common/client/bower_components_external/b2b/css/b2b-angular/b2b-angular.css index 47181f80..5825a9ad 100644 --- a/ecomp-portal-FE-common/client/bower_components_external/b2b/css/b2b-angular/b2b-angular.css +++ b/ecomp-portal-FE-common/client/bower_components_external/b2b/css/b2b-angular/b2b-angular.css @@ -1,48 +1,41 @@ -/*! b2b-angular-library - v1.0.1 - Last updated: 2017-03-02. Copyright (c) 2016 AT&T Services, Inc. */ -.b2b-horizontal-table { - border: 1px solid; - width: 651px; } - .b2b-horizontal-table ::-webkit-scrollbar { - height: 10px; } - .b2b-horizontal-table ::-webkit-scrollbar-thumb { - background: #666666; - border-radius: 5px; } - .b2b-horizontal-table .b2b-horizontal-table-inner-container { - width: 650px; - padding-left: 150px; - overflow-x: scroll; } - .b2b-horizontal-table th:first-child { - background-color: #FFFFFF; } - .b2b-horizontal-table td:first-child { - background-color: #FFFFFF; - border-top: 1px solid #cccccc; - border-right: 1px solid #cccccc; - margin-top: -0.5px; } - .b2b-horizontal-table tr th:nth-child(2), .b2b-horizontal-table tr td:nth-child(2) { - border-left: none; } - .b2b-horizontal-table .b2b-horizontal-table-column-info { - padding-top: 16px; - text-align: center; } - .b2b-horizontal-table .b2b-horizontal-table-arrows .btn-arrow:hover, .b2b-horizontal-table .b2b-horizontal-table-arrows .btn-arrow:focus { - text-decoration: none; } - .b2b-horizontal-table .b2b-horizontal-table-arrows .left { - float: left; - margin: 10px; - color: #0568ae; } - .b2b-horizontal-table .b2b-horizontal-table-arrows .left[disabled] { - color: #767676; - cursor: not-allowed; } - .b2b-horizontal-table .b2b-horizontal-table-arrows .right { - float: right; - clear: right; - margin: 10px; - color: #0568ae; } - .b2b-horizontal-table .b2b-horizontal-table-arrows .right[disabled] { - color: #767676; - cursor: not-allowed; } - .b2b-horizontal-table .b2b-horizontal-table-arrows .right.btn-arrow .btn { - margin-right: 0; - margin-left: 10px; } +/*! b2b-angular-library - v1.0.5 - Last updated: 2017-05-24. Copyright (c) 2016 AT&T Services, Inc. */ +.b2b-horizontal-table ::-webkit-scrollbar { + height: 10px; } + +.b2b-horizontal-table ::-webkit-scrollbar-thumb { + background: #666666; + border-radius: 5px; } + +.b2b-horizontal-table .b2b-frozen-col { + font-size: 12px; + font-weight: normal; + font-style: italic; } + +.b2b-horizontal-table .b2b-horizontal-table-inner-container { + overflow-x: scroll; } + +.b2b-horizontal-table .b2b-horizontal-table-column-info { + text-align: center; } + +.b2b-horizontal-table .b2b-horizontal-table-legend div[b2b-flyout-toggler] { + color: #0568ae; + cursor: pointer; } + +.b2b-horizontal-table .b2b-horizontal-table-legend .b2b-frozen-cell { + width: 16px; + height: 16px; + background-color: #F2F2F2; + display: inline-block; + margin-right: 10px; } + +.b2b-horizontal-table .b2b-horizontal-table-arrows { + margin-bottom: 20px; } + .b2b-horizontal-table .b2b-horizontal-table-arrows .b2b-disabled-text { + color: #767676; } + .b2b-horizontal-table .b2b-horizontal-table-arrows .b2b-next-link { + padding-right: 15px; } + .b2b-horizontal-table .b2b-horizontal-table-arrows .b2b-prev-link { + padding-left: 15px; } @-moz-document url-prefix() { .b2b-horizontal-table td:first-child { @@ -252,19 +245,19 @@ small { font-family: "Omnes-ECOMP-W02", Arial !important; } .font-light { - font-family: "Omnes-ECOMP-W02-Light", Arial !important; } + font-family: "Omnes-ECOMP-W02-Light",Arial !important; } .font-italic { font-family: "Omnes-ECOMP-W02-Italic", Arial !important; } .font-light-italic { - font-family: "Omnes-ECOMP-W02-Light-Italic", Arial !important; } + font-family: "Omnes-ECOMP-W02-Light-Italic",Arial !important; } .font-medium { - font-family: "Omnes-ECOMP-W02-Medium", Arial !important; } + font-family: "Omnes-ECOMP-W02-Medium",Arial !important; } .font-medium-italic { - font-family: "Omnes-ECOMP-W02-Medium-Italic", Arial !important; } + font-family: "Omnes-ECOMP-W02-Medium-Italic",Arial !important; } .font-reset { font-style: normal; @@ -735,7 +728,7 @@ small { line-height: 3.6rem; margin-bottom: 0; } .marquee p:not(.lead) { - font-family: "Omnes-ECOMP-W02-Light" , Arial; + font-family: "Omnes-ECOMP-W02-Light",Arial; font-size: 1.8rem; margin-bottom: 0; } .marquee .btn-fullwidth { @@ -825,7 +818,7 @@ small { @font-face { font-family: 'icoPrimary'; src: url("fonts/icons/icoPrimary.eot?timestamp=@@timestamp"); - src: url("fonts/icons/icoPrimary.eot?timestamp=@@timestamp#iefix") format("embedded-opentype"), url("data:font/woff2; charset=utf-8;base64,d09GMgABAAAAABD0AAsAAAAAIegAABClAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmAAfBEICroMr2IBNgIkA4EgC1IABCAFgyoHIBupG1GUj1aB7Gdh7HA7jbPiOgkYNpcuoRGZ37q6G3w0QpLZI9q02bs97HSRw5ogEesTAjElSqy0FGpCCRWzJBXR9DXJiydPX7T+Ip7vq3Pv2mcm2W+ShSugqkVXWVfbquUDpNKMTezCAYKwBVR91VU1+/0yazd3Lg9/AVmoSmRNKGStQEmoXKfLdLXNNyxbs5Yfwc8kTV8FeDfk73Xq+p9zCqBT5NCYYSvusE3/f1mxnmQFWA6RnaJdkoqgAvFKLJdQbnlDXMbO3TvsHZa1ZsvFBqhZqAl6879jOe2lIjbiiEUU6HPz354AaHoI7QMGgDpOXQeAvZtjQTfBi9SwGR2SIFAN8E15bK7/byAvdR15B0eq3dPoY80wQNCRBpSOYaquB+mFOI/OPmQdcg6lDWUMzf2mPPFfIgEMIB8Vhmz3g8Q/IzYiOSH/Lz9muMlr/jtGiCJVD2IyIRDYAKCZgxRuYmymuEdFrlK6KIorkyoV0Jgn91QkTcVrHlnDg0jnUvGnTA92OqstI80g6PVEEm6BJ58mg+OFFJIiZSQJRK/PEoSkZFHIMFiIwSg5iVar1xtzjZI/tyLTWigIQa1DY08zd4EUSVJK8Gz82QyGgCCkMyoZr7IHBBsvEoBwgxx6h+4EV3YeZwzc4W52q6lXGM9evr6oy1gTMmP79l5RTsJBClIq7jrFUaLH1BlHKTeOKPwhzFfAQqrZ2mdSzISbZTdbdQl5bjevMrg6SgcDfJsLwZ/gjUAu7PiWjAuyegyQbSvIRz8KdZreQMHJY91AKf2ArQnUq2M6QdzlV0h1cKvJFCQVXWrjZUR+mfsPuqrSKAw7vXHdA4jIfVYLo4QrFyzwSOWFzqWWIKXKCEE+n6FtUFH2YbuLsSii68GKBu9o6y0RSZVJ6FRPGxY6Wb2FSJub7hiVhvKqc+F2ZtFE3vy1GtWhiilfD6YouogRzzUU9QRuchi1FjSJJgeylOAoWaCMiX6CWJbjEw6CqMHl0OrKXnIfH7FAFHoZV2FPGgcTV4VSp4ELLxaGwcusuFYdvr5GheLQpKy5GMVLTbBdzuKpytLgd8xSTL08wGmaatJUkkztzRHn2w1Xct5RnWGYyhc+auWs9aErust7X2pNknPQ2B2xIlkrnvHaZA1jFaxXrNVb3cXM+hsVaV1EXdc/huV7XRgkZtxMJhCI4mMuecG0QWlOcxNicqGmtL5Yl1MtLdMuJZAYGFr+/P8+gr7e06WKrICOPml5b5Sf7tmW1JdFGrwGUEwBf/ugoV77AoqJkjXmTRyNQO+F45oBx8CweKoOWwPZj+aomITyzIUd5nHykU3h0LJjuvrUF2MQTKJTKF3omb9SMBepKzcOhZBoAWkP8+mKQRI+dD7mrTs3znGe6gr/mwGLt422RgkZnEDSK3zTEJuKNuypY3YIlACmD/E9UiDiW2pRpQFoIgY7UcwtdgFPmOI1KptGbgcZMkRPIREEQT6lN2dwYWs3U1lqLIorlivL7I4rN2oukpq/qu/QZiikJ5jZH+SjMMi4EXhLg9b7QhPFhFjkFki1i1pl8SNzSoZkDACAalthJVIMPBQdXQdiqtHyZrzsHFI1T5Gb6wPe+qNx+crLqRAFgeKxDOFLaukLuRIbl/ourN1HPnsxaSqUSLpJAXWIYs5UHlzOXzuteVtoQ9hau02jSTcwSs6UMVxp7dI8ung189KKGvmmpMtZF8G85uXCLcWOprejUii+ko1h/AYKs28W8lVRxlHzLI3XJYBelGiLoBBX01ilMCJwScYKsWmLVkmq3hLYezFPsXpoGkVE5aRiCpXBlhyDAsMTY/jqTSxhSLVsMwKRptxYOTg30SKjXESn43ch5IpJaBAUozLiiL05h3Fv0VN2IQVOPehaVXcThJXuuUP07jSi5YgkX2ndValmfTYCjkkCWR8V63ctCjduimfsyJwyXMMi0V6sJBKjXkPZ56wEKGZTEvPG49iM57DV0TwzvaYbajGyUZv0NuTSsnNYBdvKsVZ80SobcaqLo+xtycdXWB+FcsLCVjAcE0eYu6bcbIAxp3N1M+GWLWpksrCjNS5NMpa365lnKZz9bAw3TUuws386w6Zoq20INqiI5w/boj3XHG9/C3MNubDPWsPY/O5u09KaHVOf+vbCgu3+6z5//jc2vXnoO896lqr8R6+f2/+3/Id9t16NzQwm4gf+PncKN87cnnbF+sZXu3+sH5hdu8N1wRwqX6mdkxYu6pw+sW2997RlbPcH0/ZmTC8raJhvqPKYLvXHRhWudJ1Liu64Nz1W8PzkrZp6Z9LWpSP6fa/kdETO32qo9piy5EebyrZ4nnduD+7TLUhvKr613OaZIfbAshG9RfHkhuZOayS3tCbN4lZQQOUt7CEYG95Y7LrV1nEsHErjtvc7U3FsAU4PVnTl3GUMT+i0jMk+bNV9k3a984q/YP+GVL9/c+pBVZ7Gvrd4a81CErT+ojV89xV8dPwpYSkhdeQFsbU/BImq2YOBHTsCg7NnF7Smp9Vs1IHiwstT7vCvX+e/c8oU/x3r1t/pJwZ5vcwDM5Q4XaliSPRz3lVO0/posZkkb11CSuJ1weOcUyd/YPjR8IEMNpzXWqe+plZfVyty0Ta+hbOS+4Pf5+eQB1TkesscVVylVfWpwqpeIo+ZoNBXpr+m7+D83+FFaR3pYBNKfmNFtoNLqD+VsMNrGbzE/1kJMbia6E+rDmfQxMiOnos7MBPGczniMTmEC0RIN5G5tSsIWTFMdU1VqI6Xpri6VYdDOJypzNwIhQfQq/IHhgEY5LaybdyPNqvkJkJV6tvK2iyFAwbOgV9Wx9VnSraqrlGptkLhKMtVKSz+URWSxvuO4w5c+ZoW+nHfeEuEP8SwJA1THlNe7bQ/rsYFBzQfaIpwlKlCcBEi6ADB/HoNDjMowhoPzicj9C72LEWiQtTTeZbsSH8kbccSNEkpuNMeSQ9V0ZlhnvATXeK1XMiOLlVcNbkokdXLjVbLbcF2Y2BnWSxWtjMQKN8Jesoj7q5ySmoZhELhgawx451aHRErl0sOS5WjK7SR/70L9DPSJxQFHJCod5eSp4TGVrqNha981GKj7l0W2QAYb4DIgf7MRzL6D3oWg0RR8Hob0w/2ZzyS2Y+CrO0HbWQjILQRItofbI/YPtamLAOeQjAgH0d4IjtMVhCykoSZ7YHKsCquropUYZpZHT90yiY4+ECT4RefbRyPNykYkPewzh5K73tqrO/kkiUnfWPHCirpaTkWfa3vxypHHMydVDyqsTnYNtppK0W+fwozn7eXbcxSxhQIuIX6Wr1GH9Sr9SEi9YvM8YU/+8jIKk8QNbnTIquTCzti6ZyeS491FCYtiZvjFpYTzJp41vJp4J6lULO3NnWBM700r7aqrZmaIBZaBzeGbWVzV84YVf1EU853ybe8b7QojW6d5HDbeafdSdEgB2+32+D3NRpj54fZLwvC99mVzccCu8LEiqxx2YNZWEaH0/677E86jRpT8it4PjlV+Mu6J0Vh144nfrg77dq1wLWe/Y6994T//mvZWSjZN5H8ePVdv36Wwf/u1Y8JAkAIsBKbl47Ll9++2wzmu9/e9HFLzbIYIO41PbOPPMdEOCU/3Sg9a3bX57+hFtVv1NVXWUINujqdSpevU+q862up1UEROWGr63KbvtWcZYFjgd1WQeQIQKfv/fRKVdLxpCkCVlC7aAVO2p58udqwMfsljBIv7tt1UNKjATlYVfE1pmhKf10H3qktgGC/kYk6imEfAALQvGuq/BZoxCaUw2EsjWDQX9RTmMJJxqqDJLXLkXA4UU8z1DHto99cmRs9NvfsBpBnVCcfwc3xBfAZHKQp6yrHAetqau7Y/3qvEfPOzguH15gjv45zhAYoTAEAlYrW3iuxRcuBeAgAUCkE0ttVJq/ZnGKiMV2qMXtN5OxaIKljlsAszEVLJyYof/m8/L/cdcydFqyuDKfkeZiudqlBdxIAGK4b9JUNAEBS0cjW0hKqLzrGGiOnh3KQ/zP+avzv3uyVqkr6jqEERzETpZddeWYZuMFzMCckS8bWU8OdbYMBh8s10jG433q4j128fIas0f1p8rkb6jweLnX7OtuL+kpGBcrKgoESn9SsUvR4Pc0KX6atPtKUnJ3lTw6Sw8xTjUZQsArReKdhKA8Z9axQK95JCQIbf6d4dVoFXum8/L+RPeZOzU+iJ4+kzV/xyvj1IhSXlObJifEYeN2dxp+mD3oyxtTWTEjLz2e60vNVeAbz3vOiChblVxi/NFbko0rPy+6g473UEa6BhoHqSRNqfVRa3Zz9L9FcPLKtpDTQVjywaMCVMuJm0JFLXsOki3ypXQ70cBq6yXYAgEmkm0C6ZmZzjMlyCROr6iq6K1Zs7MovYVA47f9pWVit40j6vHVwGk/4uay9spjYHWVCzCIMeS7ceBFT4sNoRzwPXw8b/4KIjNR2D+hitbmpNR9o86D4fgvE4DgMWLpa1aARLEtHarsBwkeHS20xkbBYWCwsnsd7PCixPw2A8gwfyq3D5A8Mhu/kYWNu5IP+rfKHhvF4EcYMAOT+kX3gyOjgct+RvgW99/bc+9z5vp4+wyP3Htnx8PupRCcPPCfxIznC8Yh7PMBL3FtWTrcBOMK32gxsKw22MVvMd9ga1ZzZ3+N2thOtW3R/Z88Do5MDPzmEW/zAvoN37evbJ++7d9+F3fLaiznEQ/7Gp5K2Jw8OmgJasSIPEpK3UzRDYiWL8KxtIc2veoLtVb+vYS8K+/MXt7erb7Bu9U2WvS5eavPNPl/Fq+ol0Tlzoxnq1WS5trnU5LReMjlMTxQvdmm411KfpVyhbFzALMcLnn7llvEH1e+z6sfZCer3QJ4ozNngqVQ8oPAiWV332kDBUz0DlqjlkpUniltC1ktm3OZRj7ZDe4nEtHFtjFw6J46fLsQdzCbqh5kOvOkqu3czy/E2vJzB8xBjE47hSeAQUDQ+NIIJJHcgc33JO5go3T5nbvdKNih/LyMcY/AKjIRcPkhVk/UiuI5Kobe/Wfmb29tOdK4Y3xGNAZo99oRLIycsxqF/53E//4rOrZ7IcyUrz1zamdx7l22wa9VPbTt/+3RpwS7XGPXTfznuQ4seHl/I1Bfh7v704h7DbJ1YrZ9fk1Cjh89vud1+e6Dn9oLND1k2nyGb15Py4uQHm/bPPjd6TvWE86Nnb7oWF5eHKmfisSDQBo638MeOe4u9vwwNv3pLvPs/SCLXK3U61/uidPwYDwAaoAEAXk1sFTnoJryR2CFc6H1YnqgROygXnEj8QI9B6wABAAJ4aV5G3xSx/DcViwEA4HX9bwcnNv8/hYF6CgBUCoBj8/ctSgEwLfAaYK1MjKj3JKNalv6Np+hn6IVTECHLyhCO9gGOC0EIQwCL8Cq+AZgJs8mkBPDCFHwJcAOWw3x4DAZhFkRgrBZK8p8ApGFPeAVEoOa7qxHgnjy5EWikZwYFSliTQYMGqgAL+zIYYCE5QwEamBTUgAXu+SEdYXWNHjSQQYEAm5G2CX7EEE5kMCBDFiogxGbRQD5cnhVZ8IcXEWAWRGABBGDxrs+DaZm26jMzoXkuN4Qh+sQlDhpwMeaDHfLABW7SRUiQ/qzjCjAKohCDZTA3bBHS848Uz/MxDNlf8H9qtgQaVMKluR6D6M4VxWl3PQozoE+HVbPq54ZtzPEO3AU0bAAAAAA=") format("woff2"), url("data:application/font-woff; charset=utf-8;base64,d09GRgABAAAAACJAAAsAAAAAIfQAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABCAAAAGAAAABgEAQFaGNtYXAAAAFoAAAAfAAAAHy9F7zuZ2FzcAAAAeQAAAAIAAAACAAAABBnbHlmAAAB7AAAHRgAAB0Yg9YlNWhlYWQAAB8EAAAANgAAADYLSS2jaGhlYQAAHzwAAAAkAAAAJAbOAvZobXR4AAAfYAAAAKAAAACglK4SEGxvY2EAACAAAAAAUgAAAFKIhIEEbWF4cAAAIFQAAAAgAAAAIAA4ANNuYW1lAAAgdAAAAaoAAAGq0IdVx3Bvc3QAACIgAAAAIAAAACAAAwAAAAMD6QGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAA6jwCzP7NATMCzAEzAAAAAQAAAAAAAAAAAAAAIAAAAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEAGAAAAAUABAAAwAEAAEAIOkb6SLpJekn6WzqPP/9//8AAAAAACDpAOkf6SXpJ+ls6jz//f//AAH/4xcEFwEW/xb+FroV6wADAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAH//wAPAAEAAAAAAAAAAAACAAA3OQEAAAAAAQAAAAAAAAAAAAIAADc5AQAAAAABAAAAAAAAAAAAAgAANzkBAAAAAAYACf7JA/0CtwASAC0ATABzAJgArQAAFx4DMzI+AjcOAyMiJicFMj4CNz4BNz4BNw4DIyIuAiceAzMnIi4CJxQWFx4BFx4DMzI+Ajc+AT0BDgMjAQ4BBwYWFx4DMzI+Ajc2NCcuAScWDgIjIi4CNT4BNTIwIyUeARUUDgIjIiY1NDY3DgEHDgEVFB4CMzI+AjU0JicuAScnLgEjIgYHDgEVFBYzMj4CNTYmJ8ogSE5ULDBbVE0hDzlUbkN1mSgBWC9gWk8dEh4PCRAGHGuLpFU8eWxXGRddf55YiGGQYzYHBAQCDQsXU3mhZYqwaC0GCQsJda3SZv6cCxYEAgMCDEmExolTkXBJCwQEBxELAXarvEZKhmQ7AgQCAgMXAgE+c6VmmFcJCxMjEQcHVIeqVluGWCoPEw0ZDUo6gElJgzoRFJCEQXFUMAIPD84ZJxsOESEuHQodGxQqGBoNGiYaDCYYDiEPKUQvGhMmOCYzTjQb3ig8Rx8VMBMJGA0YNy8eJzY2DxVGIh0lUEMsAaIVQRMJCgcYPDMjFCc5JQ0fExUwEzFQOB8cMEIlCxEGogIFBBU2LyBWJQwaDRMlFQgQBCY+LBgbKzYbExsWDRYKNiIlJSQJEgogORIcJBIGDggAAAEA+gCaAw0A5gANAAAlISImNTQ2MyEyFhUUBgLg/kAOGBURAcYPGBqaFRERFRURERUAAAACAAD+wAQAAsAAEwAnAAABIi4CNTQ+AjMyHgIVFA4CAyIOAhUUHgIzMj4CNTQuAgIAarqLUVGLumpquotRUYu6al+of0pKfqlfX6h/Skp+qf7AUYu6amq6i1FRi7pqarqLUQPQSn6pX1+of0pKf6hfX6h/SgAAAAADAEn/UgO3Ai4AEAAgADAAAAEhIgYdARQWMyEyNj0BNCYjESEiBh0BFBYzITI2PQE0JgMhIgYdARQWMyEyNj0BNCYDkvzcDxYWDwMkDxYWD/zcDxYWDwMkDxYWD/zcDxYWDwMkDxYWAi4WD0kPFhYPSQ8W/tsVD0oPFRUPSg8V/twWD0kPFhYPSQ8WAAQAqv8VA1YCawAPAB0AKgA7AAABISIGFREUFjMhMjY1ETQmAyMiJjU0NjsBMhYVFAY3DgEHBiY3PgE3NhYHNxQGIyEiJjURNDYzITIWFREDIv28Fh4eFgJEFh4ew0QJDQ0JRAkMDIQCEgwWHwQDEgwWHwUbDAj97ggLCwgCEggMAmseFf0QFR4eFQLwFR785QwJCQ0NCQkMDQwSAgQfFQwSAwQfFmwIDAwIAlYICwsI/aoAAAYAnP8VA2QCawAQACEASABUAGEAbwAAATQmIyEiBhURFBYzITI2NREDISImNQM0NjMhMhYVERQGIwMRFAYjISImNTQ2MyEyNjURNCYjISIGFREUBiMiJjURNDYzITIWFQMiBhUUFjMyNjU0JgciJjU0NjMyFhUUBiMnFAYrASImNTQ2OwEyFgNkHRT9mhQdHRQCZhQdMf2aCxABEQsCZgwQEAwYEg3+CAUGBgUB+AQFBQT+CAQFBwQFBhINAfgNElERGRkREhgYEggNDQgJDAwJTQYEVgQGBgRWBAYCOxQcHBT9ChQcHBQC9vzvEAsC9gsQEAv9CgsQAtT92Q0RBgUEBgUEAicDBQUD/pQEBwcEAWwMEhIM/ZwYEREYGBERGD0MCAgMDAgIDBQEBgYEBQYGAAAAAgBj/24DnQIBACIAMwAAASEiBhURFBYzIRUjIgYVFBYzITI2NTQmKwE1ITI2NRE0JiMDFAYjISImNRE0NjMhMhYVEQNp/S4WHh4WAU2IDBAQDAFIDBAQDIgBTRYeHhYFDAn9YgkMDAkCngkMAgEeFf5IFh47EQwLERELDBE7HhYBuBUe/i8JDAwJAYQIDAwI/nwAAAMAdf9/A4sCGgAiADIAWQAAASEiBhURFBYzIRUjIgYVFBYzITI2NTQmKwE1ITI2NRE0JiMTFAYjISImNRE0NjMhMhYVBxEUBiMhIiY1NDYzITI2NRE0JiMhIgYVERQGIyImNRE0NjMhMhYVA2X9NhAWFhABWpkEBwcEAUgEBwcEmQFaEBYWEBEKB/02BwoKBwLKBwonDgr9yQQHBwQCNwECAgH9kgECBgUEBg4KAm4KDgIaFw/+CRAWQgcEBAcHBAQHQhYQAfcPF/3jBwkJBwH3BwkJBzD+bgoOBgUEBgIBAZIBAgIB/vYEBwcEAQoKDg4KAAADAQT/DwL8AngAHAAqADsAAAEuASsBIgYHDgEVERQWFx4BOwEyNjc+ATURNCYnAyMiJjU0NjsBMhYVFAY3FAYjISImNRE0NjMhMhYVEQKrJHUPBg91JCgpKSgkdQ8HDnUkKCkpKIBWDRISDVYNEhKLDAj+oggMDAgBXggMAnMDAgIDBCsm/UolKwQDAgIDBCslArYmKwT82BINDRITDA0ShwgMDAgCFgkMDAn96gAAAAIAAP7ABAACwAATACcAAAEiLgI1ND4CMzIeAhUUDgIDIg4CFRQeAjMyPgI1NC4CAgBquotRUYu6amq6i1FRi7pqUIxoPD1ojE9QjGg8PGiM/sBRi7pqarqLUVGLumpquotRA4A8aIxQUIxoPD1ojE9QjGg8AAAAAAEAAP7ABAACwAAoAAABBx4BFRQOAiMiLgI1ND4CMzUiDgIVFB4CMzI+AjU0LgInA2lYMzw9aIxPT4xoPT1ojE9quotRUYu6amq6i1EVJzgjAilbM4xPT4xoPT1ojE9PjGg9gFGLumpquotRUYu6ajVlXFEiAAAAAAIA+v+6Aw0BxgANABsAAAUiJjURNDYzMhYVERQGNyEiJjU0NjMhMhYVFAYCAA4YFRERFRjS/kAOGBURAcYPGBpGFREBwA4YFRH+Og8R4BURERUVEREVAAAFAQD/DAMAAnsAHAA6AEkAVwB+AAABLgEjIgYHDgEVERQWFx4BMzoBMTI2Nz4BNRE0JhMUBgcOASMiJicuATURNDY3PgEzOgExMhYXHgEVEScjIgYVFBY7ATI2NTQmIxUjIiY1NDY7ATIWFRQGExEUBiMhIiY1NDYzITI2NRE0JiMhIgYVERQGIyImNRE0NjMhMhYVAqsngAQEgCcqKysqJHMQAgIEgCcqKysVHyIngQEBgSciHx8iI3YNAgEBgSciH79WERgYEVYRGBgRVggMDAhWCAwMlRMN/rAFBgYFAVAFBgYF/rAFBgYEBQYTDQFQDRMCdgQBAQQDLSj9SictBAMBAQMELScCtigt/PUfIAMEAQEEAyAfArYfIQMEAQEEAyEf/UorGBERGRkRERg+DAkIDAwICQwCnf3hDhIGBQQGBgUCHwQGBgT+fwQGBgQBgQ0SEg0AAAMAVf8VA6sCawAUAC4APwAAJRQOAiMiLgI1ND4CMzIeAhUFMzQ2NTQmIyIGFRQWNz4BMzIWFRQGBwYWMQcUFjsBMjY9ATQmKwEiBh0BA6tDdJxYWJx0Q0N0nFhYnHRD/iM+lFNKU040AQUwNigtgQgBAQ0VFAoUFhYUChQVwFicdENDdJxYWJx0Q0N0nFhoTzBdOEhVIh8LAiM8JiA7KmgHAnEUFBQUCRQWFhQJAAAAAwBV/xUDqwJrABQAKwA7AAAlFA4CIyIuAjU0PgIzMh4CFSUTHgE7ATI2NxM2JicuASsBIgYHDgEXEzQmKwEiBh0BFBY7ATI2NQOrQ3ScWFicdENDdJxYWJx0Q/4cGAEKEQkRCwIXAgQHBxMMFAwTBwcEAnQcGgsZHBwZCxocwFicdENDdJxYWJx0Q0N0nFjg/vQIGxkLAQoPFwcIBwcIBxcO/kQZHBwZChkcHBkAAAACARr/YQLmAh8AIQAyAAAlPgM1NCYjIgYHBiY1ND4CMzIWFRQOAgcOASMiJjcTMzI2PQE0JisBIgYdARQWMwGvATlENzQxQ0AFAVwcOVc7bHk8ST8CAx4XGiECMRAhJCMiECEhIx91QkAlICImK04rAxA2GzoxIGVSQD8sLi8ODRgY/uwhIA0iISIhDSAhAAACANL/hAMrAesAEQAjAAAXIiYnJjQ3ATYyFxYUBwEOASMhIiYnASY0NzYyFwEWFAcOASP3ChIJDg4CDw8qEQ8P/fEIEgsCDwsSCP3xDg4PKhECDw8PCRIKfAgGDyoRAg8PDw8qEf30CAkIBgIPDyoRDw/98Q4qEgYIAAAAAgAA/sAEAALAABMAJwAAASIuAjU0PgIzMh4CFRQOAgMiDgIVFB4CMzI+AjU0LgICAGq6i1FRi7pqarqLUVGLumpfqH9KSn6pX1+of0pKfqn+wFGLumpquotRUYu6amq6i1ED0Ep+qV9fqH9KSn+oX1+of0oAAAAAAQDV/4oDLgHcABYAAAkBDgEjIiYvASY2Nz4BHwEBPgEXHgEHAy7+yQgcDw4ZCb8LAw0NJg2jASILJhAQCAoBnP4MDhANC/AOJgwMAQySAZAPBwsKJhAAAAMAaP9SA5kCLgAuAEUAVQAABRQGBw4BIyEiJicuATU0MDE8ATE0NjU+ATcBPgEzMTIWFwEeARcUFhUwFhU4ARUBFx4BOwEyNj8BNiYnLgErASIGBw4BFxM0JisBIgYdARQWOwEyNjUDmRANDiUU/ZcVJQ4NDwECCAYBNQ4rGRkrDgE1BggCAQH+PRIBBwwHDQcCEQIEBQQOCQ8JDgUFBAJWFRMIExQUEwgTFVwRIQsLCgoLCyERAQEBBAgEChUKAhcZHh4Z/ekKFQoECAQBAQEBkcUGFBMIxAoRBgUGBgUGEAv+uRMVFRMHExQUEwAAAAEAav+DA6EB/QBIAAABIS4BJy4BKwEiBhUUFjsBEhY5AR4BFw4BFRQWMzI2NTQmJzMUBhUUFjMyNjU0JicmIisBIiYnITgBMzgBMTI2PwI0NjU0JiMDcf3hBQkEAg8KnwsREQuIPhcJJR4DBCodHSoBAYwBKR4dKiYaAgQB/zQsCQGTAREaBD4BAR0TAZoVJxEJDREMCxH+7mQmMw0HDwgdKiodBAcDAwcEHSoqHRwoAgEhHRQQ6QUCBAIUHQAAAAQAXf9zA6QB5wAuAGsAkwCuAAAlMCIxISImNTQ2MzEFMDI5ATI2PwEwNDU0JiMhIiY1NDYzMSEyFhUcARUPAQ4BIxcUBiMiJjU8ATcjHAEVFAYjIiY1NDY3LgEnMCYDIyImNTQ2OwEyFhcUHgIVHgEXPgEzMhYXMz4BMzIWFSUxLgEnOAExLgEnLgEjIgYHMQ4BBzgBMQ4BBzEOARUUFjMyNjU0JjUFNCYjIgYHMQ4BBzgBMQ4BBzEUBhUUFjMyNjUDNgH+bwQHBwQBkQEKDgI/EAv96wQGBgQCFRQcAT4EGhElMCEiMAGYMCEiMAYGExoIF0GWBAYGBJ4EBgEcIhwHFhALHREZKQmjCigZIjD+sAEBAQEDAQgbEAsUCAIEAgEDAgMFJBkZIwEBOyQYERoIAgMBAQEBASQZGCRLBwQFBgELCe0DAQsQBwQEBx0UAgQCBekQFIchMDAhAwUDAwUDITAwIQwVCRAwIGUBHwYFBAYEBAJ6k3sCHSkOCwwcFhYcMCILAwUDAwUCDRAIBwIDAgMEAgcPCBgkJBgDBQMLGSQQDQIFAwMFAwMFAxgkJBgAAAABADP/MQPNAlUANQAAJTQmIyE1NC4CIyIOAh0BOAExFBYzMjY1OAE5ATU0NjMyFh0BIyIGFTERMRQWMyEyNjUxEQPNIBb+eiZBVzEyV0ElHRUUHVI6OVILFyAgFwH0FyChFh+YMFQ/JCQ/VDAdFR0dFR03TU03mB8W/sQWHh4WATwAAAAEAF//SgOhAjYADQAbAG4AgAAABSEiJjU0NjMhMhYVFAYnISImNTQ2MyEyFhUUBjc0JiMhNTQuAiMiDgIdARQWFx4BMzI2PQE0NjMyFh0BFBYzMjY9ATQmIyIGHQEUBiMiJicuAT0BND4CMzIeAh0BIyIGBxEeATMhMjY3MxEDFAYjISImNRE0NjMhMhYVERUDMf7HBQYGBQE5BAcHBP7HBQYGBQE5BAcHbCIX/rQjPFEuLlI8IwgIBxIKEyBHMjJHBgQFBlM7O1QVCAYLBAQFIDdJKilKNiBHFyEBASEXAagVHwQBFRUP/lgOFRUOAagPFT8GBQQGBgQFBnYHBAQHBwQEB1YWIZwsTjoiIjpOLEILEwcFBxkYQjBFRTBCBAYGBEI5UVE5QhALAwQDCwZCKEY0Hx80RiicIRf+9RcgGhIBF/70DhQUDgELDhQUDv79CAAAAgDP/zEDMQJVACAAKgAAJTQmKwE1NC4CIyIOAh0BIyIGFTERMRQWMyEyNjUxESU0NjMyFh0BITUDMSAXCyVBVzIxV0EmCxcgIBcB9Bcg/kRSOTpS/umhFh+YMFQ/JCQ/VDCYHxb+xBYeHhYBPM03TU03mJgAAAAABQDN/xQDMwJsAB8ARABdAGsAeQAAJTQmJzU0LgIjIg4CHQEOAQcjERUzHgEzITI2NzMRATIeAh0BIzU0JiMiBh0BFBYzMjY9ATQ2MzIWHQEhNTQ+AjMBFAYjISImJzURNT4BMyE4ATkBMzIWFRMHJyEiJjU0NjMhMhYVFAYnISImNTQ2MyEyFhUUBgMzIBcoRFw0NFxEKBQeBAEBBCQXAeYXJAQB/s0wVD4lRl5DQl4GBQQGUjk6Uf6PJD9ULwEdGRH+GhIYAQEZEQGJXREZAQFp/pkFBgYFAWcEBgYE/pkFBgYFAWcEBgaFFyIDuTJYQiYmQlgyuQIcFP7DCxUeHhUBPgHRIjxQLri4QFxcQEoFBgYFSjhOTji4uC5QPCL8/BEXFxEDASwDERgYEf7ZC0sGBAUGBgUEBocHBAQHBwQEBwAADQB2/1QDhQJQACIAMgBCAEkAWQBpAHkAiQCZAKAAsADAANAAAAEjNTQmIw4BHQEhNTQmIw4BHQEjIgYVERQWMyEyNjURNCYjARQGKwEiJj0BNDY7ATIWFTUUBisBIiY9ATQ2OwEyFhUnLgE1MxQGExQGKwEiJj0BNDY7ATIWFTUUBisBIiY9ATQ2OwEyFhUTFAYrASImPQE0NjsBMhYVNRQGKwEiJj0BNDY7ATIWFTUUBisBIiY9ATQ2OwEyFhU3MxQGJy4BExQGKwEiJj0BNDY7ATIWFTUUBisBIiY9ATQ2OwEyFhU1FAYrASImPQE0NjsBMhYVA2ZhGRERFv6TGRERFmENEhINAtENEhIN/c8GBXEEBgYEcQUGBgVxBAYGBHEFBhgRFlEZuQYEcQUGBgVxBAYGBHEFBgYFcQQGsgYEcQQGBgRxBAYGBHEEBgYEcQQGBgRxBAYGBHEEBhtRGRERFpgGBHIEBgYEcgQGBgRyBAYGBHIEBgYEcgQGBgRyBAYB/ikRGAEaESYpERgBGhEmEg39lA0SEg0CbA0S/ZoFBgYFbAUGBgVCBAYGBG0EBgYE+gEXERIY/ewFBgYFbAUGBgVCBAYGBG0EBgYE/uUFBgYFbAUGBgVCBAYGBG0EBgYEQQQGBgRtBAYGBHUSGAEBF/3TBQYGBWwFBgYFQgQGBgRtBAYGBEEEBgYEbQQGBgQAAA8Abv9mA5ICdwApAC4AMgA2ADoAPgBCAFAAXgCEAIkAkQCVAJkAoQAAJTgBNRE0JisBNTQmIyIGHQEhNTQmIyIGHQEjIgYVERQWMyEyNjUROAE1BTMVIzU7ARUjJSM1MwcjNTMXMxUjNzMVIwM0NjMyFh0BFAYjIiY1JTQ2MzIWHQEUBiMiJjUnNDY7ARUUFjMyNj0BIRUUFjMyNj0BMzIWFREjNTMyNjU0JiMhNRcVIzUzAyImPQEzFSMzNTMVMzUzFTMjNTMVFAYjA5IeFkweFRUf/qkeFRUeTBYeHhYCvBYe/PGyssirqwFwr6/Fq6sWr6/Fq6sQEQ0MEhIMDRH+QhIMDBISDAwSgBINTB4VFR4BVx8VFR5MDRGsMAQHBwT9g7KyspMNErKTqasWr6ONqxENwQEBMRUfHBYeHhYcHBYeHhYcHxX9phUeHhUBJwELlpaWq6KioreWlpYCIw0REQ1RDBISDFENERENUQwSEgwBDBIfFR4eFR8fFR4eFR8SDP7YogYFBAZxhqKi/g4SDHKQkJCQkJByDBIAAAAAAQC6/3kDSAIHAB8AACUUBisBFRQGIyImPQEjIiY1NDY7ATU0NjMyFh0BMzIWA0gpHrkpHh0quR0qKh25Kh0eKbkeKcAdKrkdKioduSodHSq5HSoqHbkqAAEAuQB5A0cBBwANAAAlISImNTQ2MyEyFhUUBgMA/gAdKiodAgAdKip5Kh0dKiodHSoAAAAGAGn/ZAOdAhYADQAbADoARwBWAGcAAAE0JisBIgYVFBY7AT4BFzQmIyEiBhUUFjMhPgEXIzU0Ji8BLgEjISIGFREjIgYdARQWMyEyNj0BLgEjATQ2MyEVFBY7ARUhEQMiJjU0NjsBMhYVFAYrAQUUBiMhIiY9ATQ2MyEyFh0BAiYMC6oJDgwLqgsMig0L/tAJDw0LATAJD6w9CAdsBxMJ/oYRGDoYIyMYAr4YIwMkGv26CAcBRwgEb/4vWwkODAtbCQ4MC1sCLAgG/k4GCAgGAa8GCAFKCA8NCgsNAg1PCQ4MCwsNAwxD0gkUBm0GCBcS/rYjG8cYIiIYxx0kASoHCG8FB8EBLf5sDQsJDgwLCQ+ABwgIBxEHCAgHEQAAAAAIAGP/XgOfAh8AEAAhAC8APQBLAFkAhACHAAAFISImPQE0NjMhMhYdAQ4BIwEiBh0BFBYzITI2PQE0JiMhFzQmKwEiBhUUFjsBMjYFNCYjISIGFRQWMyEyNgM0JiMhIgYVFBYzITI2JzQmKwEiBhUUFjsBMjYlJy4BIyEiBhURFBYzMjY1ETQ2MyEyFhcVFBY7ARQWHQEUFjMyNj0BLgEnJxcjA1z9SBonJxoCuxomAica/UgSFxcSArsSFxcS/UWeBwWBBAcHBIEFBwGOCAT+eAQICAQBiAQIGAcE/qMEBwcEAV0GBbUHBacEBwcEpwUHAQRsCRgL/q0WHwcFBAgTDQFTAgUCBwV9AwgEBAgFCgl4Z2eiJhrHGyYmG8caJgEzFxLHERgYEccSFzcEBwcEBQcHjgUHBwUEBwcBSQQICAQECAhQBQcHBQQIBk9tCAkfFv7/BAgIBAEBDhABAn4ECAIEA4kECAgEiQ4bBltmAAIAWP8VA60CawAUACsAAAEiDgIVFB4CMzI+AjU0LgIjFwEOASMiJi8BJjY3NjIfARM+ARceAQcCAlibdENDdJtYWZt0Q0N0m1nz/v4IFg0MFAifCQILCx8Mh/IJIA0NBwkCa0N0nFhYnHRDQ3ScWFicdEP1/l8LDQoJyAwfCwoKegFODAYJCCANAAAAAwBV/xUDqwJrABQAIQAuAAAlFA4CIyIuAjU0PgIzMh4CFQUyNiMuATcTIwMGFjMTMjY1NCYjIgYVFBYzA6tDdJxYWJx0Q0N0nFhYnHRD/j4hDAEYDAY3RTgJGyY5FRcVFBUXFRTAWJx0Q0N0nFhYnHRDQ3ScWPohAhYbAQb++ygtAaMbEw8RGxMOEgABAHb/QQOKAi4AKAAAATYyHwEeAR8BHgEPAQ4BHwEWBi8BJiIPAQYmPwE2Ji8BJjY/AT4BPwEB5QsgC1ELNBm1GQoSgxIUBB8FGhehF0AWohcZBB8EFBKDEgoZtRk0C1ECLhcXoxcmAxsDHxJ/Ej0ZtBkSC1UMDFULEhm0GT0SfxIfAxsDJhejAAAAAAEAmv/vA1cBfQAZAAATNDY3NjIfATc2MhcWFAcBDgEjIiYnAS4BNZoKChQ4FPT0FDkUFBT+7w0kExMjDv7wCgoBTA0ZChQU9PUUFBQ4FP7uDQ8PDQERChkNAAAAAQAAAAEAAJw5MTFfDzz1AAsEAAAAAADUFPWTAAAAANQU9ZMAAP7ABAACwAAAAAgAAgAAAAAAAAABAAACzP7NAAAEAAAAAAAEAAABAAAAAAAAAAAAAAAAAAAAKAQAAAAAAAAAAAAAAACuAAAEAAAJBAAA+gQAAAAEAABJBAAAqgQAAJwEAABjBAAAdQQAAQQEAAAABAAAAAQAAPoEAAEABAAAVQQAAFUEAAEaBAAA0gQAAAAEAADVBAAAaAQAAGoEAABdBAAAMwQAAF8EAADPBAAAzQQAAHYEAABuBAAAugQAALkEAABpBAAAYwQAAFgEAABVBAAAdgQAAJoAAAAAAAoAFAAeAQ4BKAFkAaoCBAKeAugDYgO6A/YEMgReBQoFYgW6BgIGQAZ8BqgHIAeACFoInAlGCYIKJAsuC/4MKgxEDNQNjA3SDhgOXg6MAAAAAQAAACgA0QAPAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAA4ArgABAAAAAAABAAoAAAABAAAAAAACAAcAewABAAAAAAADAAoAPwABAAAAAAAEAAoAkAABAAAAAAAFAAsAHgABAAAAAAAGAAoAXQABAAAAAAAKABoArgADAAEECQABABQACgADAAEECQACAA4AggADAAEECQADABQASQADAAEECQAEABQAmgADAAEECQAFABYAKQADAAEECQAGABQAZwADAAEECQAKADQAyGljb1ByaW1hcnkAaQBjAG8AUAByAGkAbQBhAHIAeVZlcnNpb24gMS4wAFYAZQByAHMAaQBvAG4AIAAxAC4AMGljb1ByaW1hcnkAaQBjAG8AUAByAGkAbQBhAHIAeWljb1ByaW1hcnkAaQBjAG8AUAByAGkAbQBhAHIAeVJlZ3VsYXIAUgBlAGcAdQBsAGEAcmljb1ByaW1hcnkAaQBjAG8AUAByAGkAbQBhAHIAeUZvbnQgZ2VuZXJhdGVkIGJ5IEljb01vb24uAEYAbwBuAHQAIABnAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAEkAYwBvAE0AbwBvAG4ALgAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=") format("woff"), url("fonts/icons/icoPrimary.ttf?timestamp=@@timestamp") format("truetype"); + src: url("fonts/icons/icoPrimary.eot?timestamp=@@timestamp#iefix") format("embedded-opentype"), url("fonts/icons/icoPrimary.ttf?timestamp=@@timestamp") format("truetype"); font-weight: normal; font-style: normal; } @@ -844,7 +837,7 @@ small { .selectWrap:after { color: #0568ae; display: inline-block; - font-family: 'icoPrimary' !important; + font-family: 'icoPrimary'; font-style: normal; font-size: 20px; font-weight: normal; @@ -864,6 +857,27 @@ small { vertical-align: middle; width: 1em; } +[class*="icoWeather-"], [class*="icoTrans-"], [class*="icoBubble-"], [class*="icoRetail-"], [class*="icoPeople-"], [class*="icoNumslets-"], [class*="icoLocation-"], [class*="icoHealthcare-"], [class*="icoDocuments-"], [class*="icoDevices-"], [class*="icoDatanetwork-"], [class*="icoControls-"], [class*="icoBuilding-"], [class*="icoArrows-"] { + color: #0568ae; + display: inline-block; + font-style: normal; + font-size: 20px; + font-weight: normal; + font-variant: normal; + font-style: normal; + width: 20px; + text-transform: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + position: relative; + speak: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + vertical-align: middle; } + [class*="icon-primary-"]:before, [class*="icon-primary-"]:after { box-sizing: border-box; @@ -1067,16 +1081,16 @@ small { margin-left: -1em; position: absolute; } -[class*="icon-primary-"].white { +[class*="icon-primary-"].white, [class^="ico"][class*="-"].white { color: #fff; } -[class*="icon-primary-"].black { +[class*="icon-primary-"].black, [class^="ico"][class*="-"].black { color: #000; } -[class*="icon-primary-"].blue { +[class*="icon-primary-"].blue, [class^="ico"][class*="-"].blue { color: #0568ae; } -[class*="icon-primary-"].green { +[class*="icon-primary-"].green, [class^="ico"][class*="-"].green { color: #007a3e; } @-webkit-viewport { @@ -1427,12 +1441,12 @@ h6 { .heading-page { font-size: 3.8rem !important; - font-family: "Omnes-ECOMP-W02-Light", Arial; + font-family: "Omnes-ECOMP-W02-Light",Arial; margin-bottom: 40px; } .heading-major-section { font-size: 3rem !important; - font-family: "Omnes-ECOMP-W02-Light" , Arial; + font-family: "Omnes-ECOMP-W02-Light",Arial; margin-bottom: 40px !important; } .heading-sub-section { @@ -1442,7 +1456,7 @@ h6 { .heading-group { font-size: 2rem !important; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; color: #ea7400; margin-bottom: 20px !important; } @@ -1453,7 +1467,7 @@ h6 { .heading-medium-emphasis { font-size: 2rem !important; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; margin-bottom: 20px; } .heading-small { @@ -1463,12 +1477,12 @@ h6 { .heading-small-emphasis { font-size: 1.8rem !important; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; margin-bottom: 20px; } .heading-micro { font-size: 1.3rem !important; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; text-transform: uppercase; color: #da0081; margin-bottom: 10px; } @@ -1499,7 +1513,7 @@ h6 { .lead { color: #666; - font-family: "Omnes-ECOMP-W02-Light-Italic", Arial; + font-family: "Omnes-ECOMP-W02-Light-Italic",Arial; font-size: 2.4rem; line-height: 2.8rem; margin-top: 10px; @@ -1512,7 +1526,7 @@ h6 { .eyebrow, .subheading { font-size: 1.4rem !important; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; color: #666; } .eyebrow + .heading-major-section, @@ -1555,7 +1569,7 @@ h6 { margin-bottom: 10px; } .heading-small-emphasis { font-size: 1.6rem; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; margin-bottom: 5px; } * + .heading-major-section { margin-top: 30px; } @@ -1659,7 +1673,7 @@ p + .p-max { b, strong { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-weight: normal; } i, @@ -1693,7 +1707,7 @@ sup { font-weight: bold; } .text-legal a { - font-family: "Omnes-ECOMP-W02-Medium", Arial; } + font-family: "Omnes-ECOMP-W02-Medium",Arial; } .text-left { text-align: left !important; } @@ -1833,7 +1847,7 @@ dd { box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); cursor: pointer; display: inline-block; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-size: 1.9rem; font-weight: normal; line-height: 1; @@ -2717,11 +2731,19 @@ button.close { .ds2_touchevents textarea.hasScrollbar:focus + .reset-field { right: 22px; } +.ds2-no-colors .b2b-tmpl-card-corner-button { + border: none !important; } + +.ds2-no-colors .b2b-tmpl-card-corner-button .close { + border: 1px solid black; + top: 0px !important; + right: 0px !important; } + .form-row.error .error-msg { display: block; font-size: 14px; line-height: 14px; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; position: relative; padding-left: 18px; } @@ -2792,9 +2814,9 @@ input[type]::-webkit-inner-spin-button, input[type]::-webkit-outer-spin-button { -webkit-appearance: none; } -/* input[type] { - -moz-appearance: textfield; } - */ +input[type] { + -moz-appearance: textfield; } + form { margin: 0; } @@ -2807,7 +2829,7 @@ label, legend { display: inline-block; font-size: 1.4rem; - font-family: "Omnes-ECOMP-W02-Medium", Arial; } + font-family: "Omnes-ECOMP-W02-Medium",Arial; } legend { display: block; } @@ -2972,13 +2994,13 @@ select[disabled], select[readonly], textarea[disabled], textarea[readonly], -span.icon-primary-calendar.disabled, +i.icon-primary-calendar.disabled, span.icon-primary-calendar.readonly { cursor: not-allowed; background-color: #f2f2f2; box-shadow: none; } -span.icon-primary-calendar.disabled input, +i.icon-primary-calendar.disabled input, span.icon-primary-calendar.readonly input { color: #959595 !important; } @@ -3012,8 +3034,8 @@ textarea:placeholder { textarea, input { background-color: #ffffff; - border: 1px solid #d2d2d2; -/* -webkit-appearance: none; */ + border: 1px solid #d2d2d2; + -webkit-appearance: none; box-shadow: 2px 3px 2px -2px rgba(0, 0, 0, 0.08) inset; transition: border .3s linear 0s; font-family: "Omnes-ECOMP-W02", Arial; } @@ -3080,24 +3102,22 @@ legend + .form-row { .ds2_touchevents .tooltip-onclick input:focus { padding-right: 95px; } -span.icon-primary-calendar { - display: block; - position: relative; - background-color: #fff; - border-radius: 4px; - overflow: hidden; - height: 36px; } +.btn-calendar-icon { + position: absolute; + background-color: transparent !important; + top: 8px; + border: 0 !important; + width: 30px; + right: 15px; } -span.icon-primary-calendar:before { +.btn-calendar-icon .icon-primary-calendar:before { position: absolute; - top: 7px; - left: 13px; color: #0568ae; } -span.icon-primary-calendar.disabled { +.btn-calendar-icon .icon-primary-calendar.disabled { background-color: #f2f2f2; } -span.icon-primary-calendar.disabled:before { +.btn-calendar-icon .icon-primary-calendar.disabled:before { color: #959595; } span.icon-primary-calendar input { @@ -3149,7 +3169,7 @@ span.icon-primary-calendar input { display: block; font-size: 14px; line-height: 14px; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; position: relative; padding-left: 18px; margin-top: 10px; } @@ -3222,7 +3242,7 @@ hr.lite { content: " OR "; display: block; font-size: 1.4rem; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; height: 16px; left: 50%; line-height: 1.6rem; @@ -3861,7 +3881,7 @@ hr.bottom-space-only { .alert h3, .alert h4 { color: #fff; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-size: 1.6rem; margin: 0 20px 5px 0; } @@ -4077,7 +4097,7 @@ hr.bottom-space-only { height: 18px; } .b2b-badge { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; background-color: #5A5A5A; border-radius: 12px; color: #FFFFFF; @@ -4098,7 +4118,7 @@ hr.bottom-space-only { margin-top: 20px !important; } .b2b-heading-micro { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-weight: normal; text-rendering: optimizeLegibility; font-size: 1.2rem !important; @@ -4517,7 +4537,7 @@ a > .b2b-badge { background-color: transparent; color: #0568ae; cursor: pointer; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-size: 16px; height: 34px; line-height: 30rem; @@ -4586,13 +4606,13 @@ a > .b2b-badge { border-color: #357ebd; } .datepicker td.active:not(.new) .show-date { color: #0568ae; - font-family: "Omnes-ECOMP-W02-Medium", Arial; } + font-family: "Omnes-ECOMP-W02-Medium",Arial; } .datepicker td.active:hover:not(.new) { color: #FFFFFF; border-color: #357ebd; } .datepicker td.active:hover:not(.new) .show-date { color: #0568ae; - font-family: "Omnes-ECOMP-W02-Medium", Arial; } + font-family: "Omnes-ECOMP-W02-Medium",Arial; } .datepicker .start-date .show-date { background-color: #0568ae; color: #FFFFFF !important; @@ -4736,7 +4756,7 @@ a > .b2b-badge { padding: 0 2px 0 5px; vertical-align: middle; } .datepicker .due-date .show-date { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; background-color: #cf2a2a; border-radius: 5px; color: #FFFFFF !important; } @@ -4929,7 +4949,7 @@ a > .b2b-badge { display: block; } .show-date { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; color: #0568ae; height: 26px; line-height: 26px; @@ -5129,7 +5149,7 @@ a > .b2b-badge { width: 69px; } .b2b-coachmark-container .b2b-coachmark-countlabel { font-size: 12px; - font-family: "Omnes-ECOMP-W02, Arial"; + font-family: "Omnes-ECOMP-W02", Arial; color: #333333; margin-left: 20px; margin-top: 20px; } @@ -5167,8 +5187,7 @@ a > .b2b-badge { text-align: right; width: 100%; } .b2b-coachmark-container .b2b-coachmark-content .b2b-coachmark-btn-group .b2b-coachmark-link { - font-family: "Omnes-ECOMP-W02-Medium", Arial; - font-size: 15px; + font-family: "Omnes-ECOMP-W02-Medium",Arial font-size: 15px; color: #0574ac; line-height: 18px; margin-right: 20px; } @@ -5217,7 +5236,7 @@ a > .b2b-badge { .datepicker-dropdown.datepicker-orient-left:before, .datepicker-dropdown.datepicker-orient-left:after { - left: 16px; } + left: 255px; } .datepicker-dropdown.datepicker-orient-right:before, .datepicker-dropdown.datepicker-orient-right:after { @@ -5275,7 +5294,7 @@ a > .b2b-badge { background-color: transparent; color: #0568ae; cursor: pointer; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-size: 16px; height: 34px; line-height: 30rem; @@ -5330,7 +5349,7 @@ a > .b2b-badge { border-color: #357ebd; } .show-date { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; color: #0568ae; height: 26px; line-height: 26px; @@ -5421,7 +5440,7 @@ a > .b2b-badge { .datepicker td.active:not(.new) .show-date, .datepicker td.active:hover:not(.new) .show-date { color: #0568ae; - font-family: "Omnes-ECOMP-W02-Medium", Arial; } + font-family: "Omnes-ECOMP-W02-Medium",Arial; } .datepicker td.disabled .show-date, .datepicker td.disabled:hover .show-date { @@ -5536,7 +5555,7 @@ a > .b2b-badge { position: relative; } .datepicker .due-date .show-date { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; background-color: #cf2a2a; border-radius: 5px; color: #fff !important; } @@ -5705,6 +5724,15 @@ a > .b2b-badge { .j { background-position: 0 0; } +.datepicker-container { + position: relative; } + +.btn-calendar-icon:focus .icon-primary-calendar { + outline: 1px dotted #191919; } + +.btn-calendar-icon:focus { + outline: none; } + /* remove focus outline when dropdown is opened */ /*resolve blue focus outline over dropdown with error*/ select { @@ -5725,7 +5753,7 @@ select { .selectWrap.disabled button.awd-select { z-index: 0; - text-indent: 15; } + text-indent: 15px; } .selectWrap.disabled:after { color: #5A5A5A; @@ -5743,7 +5771,6 @@ input.awd-select { height: 36px; line-height: 0; margin-bottom: 0; - padding: 12px 45px 8px 0; position: relative; text-align: left; top: 0; @@ -5752,7 +5779,9 @@ input.awd-select { padding: 12px 45px 8px 15px; user-select: none; } input.awd-select:focus { - border-color: #0568ae !important; } + border-color: #0568ae !important; + text-overflow: ellipsis; + padding-right: 45px; } button.awd-select { background-color: transparent; @@ -5766,7 +5795,6 @@ button.awd-select { height: 36px; line-height: 36px; margin-bottom: 0; - /*padding-right: 41px;*/ position: relative; text-align: left; top: 0; @@ -5864,12 +5892,10 @@ span.selectWrap input[readonly]:focus { cursor: pointer; height: 100%; min-height: 36px; - line-height: 38px; + line-height: 20px; overflow: hidden; - padding: 0 15px; + padding: 8px 15px; position: relative; - text-overflow: ellipsis; - white-space: nowrap; z-index: 1000; } .awd-select-list-item:hover { cursor: pointer; @@ -5909,7 +5935,7 @@ span.selectWrap input[readonly]:focus { padding-bottom: 9px; padding-top: 20px; } -.awd-select-list-item[aria-selected="true"] { +.awd-select-list-item[data-hover="true"] { background-color: #d2d2d2; } span input.awd-select { @@ -5919,7 +5945,7 @@ span input.awd-select { padding-right: 45px; } li.optgroup-wrapper { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; cursor: default !important; padding: 0px 15px; } li.optgroup-wrapper:first-child { @@ -6240,12 +6266,6 @@ input.awd-select { -ms-user-select: text; user-select: text; } -input.awd-select.focused { - -webkit-user-select: none !important; - -moz-user-select: none !important; - -ms-user-select: none !important; - user-select: none !important; } - /**********************Dropdown Chrome scrolling fix end ********************/ .mpc-expanders { border-bottom: 1px solid #e4e4e4; @@ -6453,7 +6473,7 @@ input.awd-select.focused { color: #009fdb; font-size: 18px; font-style: normal; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; line-height: 23.9px; margin: 0; } .b2b-footer-container .footer-columns li { @@ -6549,7 +6569,7 @@ input.awd-select.focused { text-align: left; width: auto; font-size: 16px; - font-family: "Omnes-ECOMP-W02, Arial"; + font-family: "Omnes-ECOMP-W02", Arial; cursor: pointer; padding: 5px 15px; color: #fff; } @@ -6903,7 +6923,7 @@ input.awd-select.focused { .b2b-header-tabs .selectWrap button.awd-select, .b2b-header-tabs .selectWrap input.awd-select { height: 36px; - line-height: 8px; + line-height: 31px; font-size: 1rem; display: inline-block; } @@ -6932,7 +6952,7 @@ input.awd-select.focused { top: 20px; } .b2b-header-tabs { height: 90px; } - .selectWrap { + .header__item .selectWrap { bottom: 15px; } .b2b-header-tabs .header__items { padding-top: 25px; } @@ -7058,19 +7078,19 @@ input.awd-select.focused { font-family: "Omnes-ECOMP-W02", Arial !important; } .font-light { - font-family: "Omnes-ECOMP-W02-Light", Arial !important; } + font-family: "Omnes-ECOMP-W02-Light",Arial !important; } .font-italic { font-family: "Omnes-ECOMP-W02-Italic", Arial !important; } .font-light-italic { - font-family: "Omnes-ECOMP-W02-Light-Italic", Arial !important; } + font-family: "Omnes-ECOMP-W02-Light-Italic",Arial !important; } .font-medium { - font-family: "Omnes-ECOMP-W02-Medium", Arial !important; } + font-family: "Omnes-ECOMP-W02-Medium",Arial !important; } .font-medium-italic { - font-family: "Omnes-ECOMP-W02-Medium-Italic", Arial !important; } + font-family: "Omnes-ECOMP-W02-Medium-Italic",Arial !important; } .font-reset { font-style: normal; @@ -7208,6 +7228,14 @@ input.awd-select.focused { top: 50%; left: 50%; } +.small-modal-loader { + width: 420px !important; + height: 212px !important; + text-align: center; } + +.small-modal-loader .icon-primary-spinner { + margin-bottom: 5px; } + .body.styled-by-modal { position: fixed; } @@ -7333,9 +7361,6 @@ input.awd-select.focused { :not(.modal-docked) .b2b-modal-footer { position: relative; } -.modal-docked .b2b-modal-footer { - border-top: 1px solid #d2d2d2; } - .modal-landscape .b2b-modal-footer { position: relative; } @@ -7343,7 +7368,8 @@ input.awd-select.focused { display: flex; justify-content: flex-end; padding: 20px 0 5px; - width: 100%; } + width: 100%; + border-top: 1px solid #d2d2d2; } .b2b-modal-footer .cta-button-group .btn { margin-left: auto; @@ -7351,6 +7377,12 @@ input.awd-select.focused { float: right; margin-left: 10px; } +.b2b-modal-footer .cta-button-group .marginLeft0 { + margin-left: 0px; } + +.b2b-modal-footer .cta-button-group .btn-footer-left { + margin-right: auto; } + .b2b-modal-footer .cta-button-group .btn + .btn { margin-right: 0 !important; } @@ -7523,7 +7555,7 @@ input.awd-select.focused { padding: 0 0 5px 30px; line-height: 22px; margin-left: -10px; - color: #333; + color: #0568ae; font-size: 1.4rem; } .b2b-ml-nav a:focus { @@ -7558,9 +7590,6 @@ input.awd-select.focused { .b2b-ml-nav a > span > i { font-size: 20px; } -.b2b-ml-nav a:only-child { - color: #0574ac; } - .b2b-ml-nav a:only-child > span { left: -6px; border-radius: 50%; @@ -7584,6 +7613,9 @@ input.awd-select.focused { .b2b-ml-nav li a.active + ul { display: block; } +.b2b-ml-nav .selected { + color: #333; } + /*to overide ng-doc inline property for library demo - TODO: Move to docs.css*/ .b2b-ml-nav a [class^="icon-primary-"], a [class*=" icon-primary-"], a [class^="icon-primary-"]:before, a [class*=" icon-primary-"]:before { display: inline-block; } @@ -7594,11 +7626,14 @@ input.awd-select.focused { height: auto; } .b2b-alerts-messages h3 { color: #333 !important; - font-family: "Omnes-ECOMP-W02-Medium", Arial; - margin-bottom: 0 !important; } + font-family: "Omnes-ECOMP-W02-Medium",Arial; + margin-bottom: 0 !important; + margin: 1em 0 5px; + line-height: 27px; + font-size: 18px; } .b2b-alerts-messages h4 { color: #333 !important; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; margin-bottom: 0 !important; } .b2b-alerts-messages .alert-info { background-color: #0574ac; @@ -7696,7 +7731,6 @@ i:focus { margin: 5px; width: 22px; height: 23px; - /*transition: all 0.3s ease-out 0s;*/ vertical-align: baseline; } .pager { @@ -7764,7 +7798,7 @@ a.pager__item--next:focus, a.pager__item--prev:focus { font-size: 1.6rem; margin-top: 20px; display: inline-block; - font-family: "Omnes-ECOMP-W02-Medium", Arial; } + font-family: "Omnes-ECOMP-W02-Medium",Arial; } .mobile-view > .pager__item { margin: 5px 10px; @@ -7806,14 +7840,15 @@ h4#pagination-large-count { .page-heading-group { color: #ef6f00; - font-family: "Omnes-ECOMP-W02-Medium", Arial; } + font-family: "Omnes-ECOMP-W02-Medium",Arial; } .pager > div > span.fieldLabel { margin-left: 18px; } .pager .fieldLabel .btn-arrow { top: 0; - left: 10px; } + left: 10px; + margin-left: -5px; } .b2b-p-col-md-12 { width: 50%; } @@ -7824,8 +7859,7 @@ h4#pagination-large-count { border-radius: 0; cursor: default; display: inline-block; - margin: 5px; - min-width: 23px; + margin: 0px 5px 0 5px; height: 23px; vertical-align: baseline; } @@ -7833,6 +7867,9 @@ h4#pagination-large-count { pointer-events: none !important; cursor: default !important; } +.b2b-pager__item--droppable { + pointer-events: all !important; } + .b2b-pager { padding-top: 10px; padding-bottom: 20px; @@ -7862,7 +7899,7 @@ h4#pagination-large-count { padding-left: 0; padding-right: 0; text-align: center; - margin-left: 10px; } + margin-left: 5px; } .row.section-row { margin-bottom: 20px; } @@ -7899,12 +7936,10 @@ a.b2b-pager__item--prev-disabled > [class^="icon-primary-"] { cursor: not-allowed; } .b2b-pager__item--next { - margin: 5px; - padding: 1.5px 6px 1.5px 6px; } + padding: 1.5px 0px 1.5px 0px; } .b2b-pager__item--prev { - margin: 5px; - padding: 1.5px 6px 1.5px 6px; } + padding: 1.5px 0px 1.5px 0px; } .fieldLabel { color: #666666; } @@ -7957,11 +7992,17 @@ h4#b2b-pagination-large-count { .b2b-page-heading-group { color: #ef6f00; - font-family: "Omnes-ECOMP-W02-Medium", Arial; } + font-family: "Omnes-ECOMP-W02-Medium",Arial; } .b2b-pager > div > span.fieldLabel { margin-left: 18px; } +.b2b-go-to-page { + margin-top: 14px; } + +.b2b-go-to-page-inline { + display: inline-block; } + input.b2b-phone-mask-input { padding-right: 15px; } input.b2b-phone-mask-input:hover, input.b2b-phone-mask-input:focus { @@ -8107,7 +8148,7 @@ a.link-profile { text-transform: uppercase; } .b2b-profile-card .profile-image .name { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-size: 16px; color: #333; text-align: center; @@ -8171,7 +8212,7 @@ a.link-profile { .b2b-profile-card .profile-details label { display: block; cursor: text; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-weight: bolder; font-size: 14px; color: #333; @@ -8492,6 +8533,10 @@ button.btn-search[disabled] { button.btn-search[disabled] i { color: #767676; } +.innershadow { + -webkit-background-blend-mode: mutilply; + box-shadow: 0 3px 0 2px rgba(0, 0, 0, 0.08); } + .linkSelectorModule { position: relative; height: 32px; @@ -8736,7 +8781,8 @@ ul.module-optinalcta { width: 100%; height: 6px; background-color: #cccccc; - border-radius: 10px; } + border-radius: 10px; + border: 1px solid #cccccc; } .b2b-slider-container .slider-track-fill { width: 100%; height: 6px; @@ -8744,7 +8790,8 @@ ul.module-optinalcta { border-radius: 10px; width: 0; background-color: #157BB2; - transition: width 0s linear; } + transition: width 0s linear; + border: 1px solid #cccccc; } .b2b-slider-container .slider-knob-container { transition: left 0s linear; } .b2b-slider-container .slider-knob-container.slider-knob-hidden { @@ -8854,36 +8901,46 @@ ul.module-optinalcta { margin-left: 5px; } .b2b-status-tracker > .b2b-status-tracker-step .b2b-status-tracker-heading { - font-family: "Omnes-ECOMP-W02", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-size: 14px; - color: #767676; + color: #191919; margin-bottom: 10px; } -.b2b-status-tracker > .b2b-status-tracker-step.complete > .b2b-status-tracker-heading { - font-family: "Omnes-ECOMP-W02-Medium", Arial; - color: #1b7e28; } - .b2b-status-tracker > .b2b-status-tracker-step.complete > .progress > .progress-bar { width: 100%; background-color: #1b7e28; } -.b2b-status-tracker > .b2b-status-tracker-step.complete > .b2b-status-tracker-estimate { - font-family: "Omnes-ECOMP-W02-Medium", Arial; - color: #333333; } - .b2b-status-tracker > .b2b-status-tracker-step.complete > .b2b-status-tracker-estimate > .icoControls-approval { - color: #1b7e28; } - -.b2b-status-tracker > .b2b-status-tracker-step.current > .b2b-status-tracker-heading { - font-family: "Omnes-ECOMP-W02-Medium", Arial; - color: #333333; } +.b2b-status-tracker > .b2b-status-tracker-step.complete .icoControls-approval { + color: #1b7e28; } .b2b-status-tracker > .b2b-status-tracker-step.current > .progress > .progress-bar { width: 100%; background-color: #333333; } -.b2b-status-tracker > .b2b-status-tracker-step.current > .b2b-status-tracker-estimate > .icon-misc-time { +.b2b-status-tracker > .b2b-status-tracker-step.current .icon-misc-time { color: #333333; } +.b2b-status-tracker > .b2b-status-tracker-step.pending > .progress > .progress-bar { + width: 100%; + background-color: #ffb81c; } + +.b2b-status-tracker > .b2b-status-tracker-step.pending .icoControls-statusokay { + color: #ffb81c; } + +.b2b-status-tracker > .b2b-status-tracker-step.actionRequired > .progress > .progress-bar { + width: 100%; + background-color: #cf2a2a; } + +.b2b-status-tracker > .b2b-status-tracker-step.actionRequired .icoSecurityalerts-alert { + color: #cf2a2a; } + +.b2b-status-tracker > .b2b-status-tracker-step.notAvailable > .progress > .progress-bar { + width: 100%; + background-color: #767676; } + +.b2b-status-tracker > .b2b-status-tracker-step.notAvailable .icoControls-restricted { + color: #767676; } + .b2b-status-tracker > .b2b-status-tracker-step > .progress { position: relative; border-radius: 1.5px; @@ -8895,18 +8952,18 @@ ul.module-optinalcta { height: 3px; } .b2b-status-tracker > .b2b-status-tracker-step > .b2b-status-tracker-estimate { - font-family: "Omnes-ECOMP-W02", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-size: 14px; - color: #767676; + color: #191919; margin-bottom: 10px; } - .b2b-status-tracker > .b2b-status-tracker-step > .b2b-status-tracker-estimate > .icon-misc-time { - color: #767676; } .b2b-status-tracker > .b2b-status-tracker-step > .b2b-status-tracker-description { font-family: "Omnes-ECOMP-W02", Arial; font-size: 12px; color: #767676; padding-right: 15px; } + .b2b-status-tracker > .b2b-status-tracker-step > .b2b-status-tracker-description a { + cursor: pointer; } .step-indicator { height: auto; @@ -8953,7 +9010,7 @@ ul.module-optinalcta { white-space: nowrap; } .step-on .step-text { - font-family: "Omnes-ECOMP-W02-Medium", Arial; } + font-family: "Omnes-ECOMP-W02-Medium",Arial; } .steps li .step-text[data-large-text]:before { content: attr(data-large-text) " "; } @@ -9098,7 +9155,7 @@ ul.module-optinalcta { background-color: #333333; color: #333333; height: 3px; - font-family: "Omnes-ECOMP-W02-Medium", Arial; } + font-family: "Omnes-ECOMP-W02-Medium",Arial; } .b2b-step-tracker .b2b-steps li .b2b-step-text { bottom: 29px; display: inline-block; @@ -9223,7 +9280,7 @@ ul.module-optinalcta { content: "Password strength: "; } .strength-meter-content:after { - font-family: "Omnes-ECOMP-W02-Medium", Arial; } + font-family: "Omnes-ECOMP-W02-Medium",Arial; } .strength-meter-container { height: 26px; @@ -9276,7 +9333,7 @@ ul.module-optinalcta { content: none; } .strength-meter-container > .strength-meter-content > .strength-meter-content-state { - font-family: "Omnes-ECOMP-W02-Medium", Arial; } + font-family: "Omnes-ECOMP-W02-Medium",Arial; } .btn-switch-label { display: flex; @@ -9308,9 +9365,9 @@ ul.module-optinalcta { top: 0; transition: none; } .btn-switch input[type="checkbox"] + .switch-overlay .btn-slider-on .activo { - font: 0px/0 "Omnes-ECOMP-W02"; } + font: 0px/0 "Omnes-ECOMP-W02", Arial; } .btn-switch input[type="checkbox"] + .switch-overlay .btn-slider-on + .btn + .btn-slider-off .inactivo { - font: 0px/0 "Omnes-ECOMP-W02"; } + font: 0px/0 "Omnes-ECOMP-W02", Arial; } .btn-switch input:checked + .switch-overlay { left: 0; transition: all .3s linear .0s; } @@ -9377,7 +9434,7 @@ ul.module-optinalcta { .btn-switch input[type="checkbox"][disabled] + .switch-overlay .btn-slider-on .activo { border: medium none; color: #666; - font: 16px/32px "Omnes-ECOMP-W02"; + font: 16px/32px "Omnes-ECOMP-W02", Arial; height: auto; margin: 0 auto; width: auto; } @@ -9391,7 +9448,7 @@ ul.module-optinalcta { .btn-switch input[type="checkbox"][disabled] + .switch-overlay .btn-slider-on + .switch-handle + .btn-slider-off .inactivo { border: medium none; color: #666; - font: 16px/32px "Omnes-ECOMP-W02"; + font: 16px/32px "Omnes-ECOMP-W02", Arial; height: auto; margin: 0 auto; width: auto; } @@ -9483,6 +9540,10 @@ ul.module-optinalcta { height: 16px; width: 16px; } +.btn-switch.focused { + outline: 1px dotted #000; + outline-offset: 5px; } + table { max-width: 100%; background-color: transparent; @@ -9507,7 +9568,7 @@ table td { word-wrap: break-word; } table th { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-size: 1.6rem; font-weight: normal; color: #333333; @@ -9701,7 +9762,6 @@ th:nth-child(8) { .b2b-table-div .selectWrap { width: 290px; position: relative; - left: 10px; display: inline-table; margin-bottom: 0px; } @@ -9713,7 +9773,11 @@ th:nth-child(8) { font-size: 36px; border: 1px solid #ccc; background: #FFF; - border-radius: 6px; } + border-radius: 6px; + text-align: center; + background: linear-gradient(#fcfcfc, #f2f2f2); + background-blend-mode: multiply; + width: 1em; } .b2b-external-sort-label { padding-bottom: 10px; } @@ -9725,8 +9789,17 @@ th:nth-child(8) { text-decoration: none; } .b2b-external-sort-label label { - position: relative; - left: 10px; } + position: relative; } + +.b2b-external-sort-margin { + margin-right: 13px !important; } + +.b2b-table-sorter-icon [class*="icoArrows-"]:before { + font-size: 20px; } + +@media screen and (max-width: 950px) { + .b2b-external-sort-margin .selectWrap { + bottom: 0px !important; } } .tablesorter-default .tablesorter-header.sorter-false .tablesorter-header-inner { background: 0 0; @@ -9773,7 +9846,7 @@ th:nth-child(8) { .tablesorter-default thead .headerSortUp .tablesorter-header-inner:after, .tablesorter-default thead .tablesorter-headerAsc .tablesorter-header-inner:after, .tablesorter-default thead .tablesorter-headerSortUp .tablesorter-header-inner:after { - font-family: 'icoPrimary' !important; + font-family: 'icoPrimary'; speak: none; font-style: normal; font-size: 24px; @@ -9799,7 +9872,7 @@ th:nth-child(8) { .tablesorter-default thead .headerSortDown .tablesorter-header-inner:after, .tablesorter-default thead .tablesorter-headerDesc .tablesorter-header-inner:after, .tablesorter-default thead .tablesorter-headerSortDown .tablesorter-header-inner:after { - font-family: 'icoPrimary' !important; + font-family: 'icoPrimary'; speak: none; font-style: normal; font-size: 24px; @@ -9862,7 +9935,8 @@ th:nth-child(8) { .b2b-table-scrollbar { border: 1px solid; - width: 651px; } + width: 651px; + position: relative; } .b2b-table-scrollbar .b2b-table-inner-container { width: 650px; padding-left: 150px; @@ -10154,7 +10228,8 @@ label .tooltip { bottom: 0; left: 0; opacity: 0; - transform: rotate(45deg); } + transform: rotate(45deg); + z-index: 20; } .tooltip.active .icon-primary-tooltip[data-placement="top"] .arrow { display: block; @@ -10282,7 +10357,7 @@ label .tooltip { .popover-title { display: block; font-size: 14px; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-weight: bold; margin-bottom: 8px; white-space: normal; } @@ -10348,7 +10423,7 @@ label .tooltip { border-left: 1px solid #ccc; } .b2b-tree ul li.bg > a { color: #333; - background-image: url("../style/images/treebg.png"); } + background-image: url("./style/images/treebg.png"); } .b2b-tree ul li .b2b-tree-tooltip { display: none; position: absolute; @@ -10649,7 +10724,7 @@ label .tooltip { position: relative; } .filter-header h2 { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-size: 2.4rem; margin-bottom: 0; } @@ -10667,7 +10742,7 @@ label .tooltip { .filter-selected > span, .filter-selected > a.clear-all-filters { - font-family: Omnes-ECOMP-W02-Medium, Arial; } + font-family: Omnes-ECOMP-W02-Medium; } .filter-selected-group { padding-top: 15px; } @@ -10769,7 +10844,7 @@ label .tooltip { position: relative; } .fixed-230-subnav div > a.live { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; color: #666; } .fixed-230-subnav > ng-transclude > div li > a { @@ -10778,7 +10853,7 @@ label .tooltip { line-height: 20px; } .fixed-230-subnav > ng-transclude > div li > a.active { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; text-decoration: none; color: #666; } @@ -10894,7 +10969,7 @@ label .tooltip { .b2b-pane-selector-wrapper .pane-container .panes div.pane-block .form-row .checkbox-selectall { margin: 0px 0 0 24px !important; } .b2b-pane-selector-wrapper .side-nav li { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; border: none; border-top: solid 1px #ccc; display: block !important; @@ -10939,7 +11014,7 @@ label .tooltip { /********************* Utility CSS Ends **********************/ /* Fix for alignment issue on Cancel link inside modal */ -.b2b-modal-footer > .cta-button-group { +.modal-footer > .cta-button-group { line-height: 40px; } /* .att-dark-green { // Not used @@ -11025,7 +11100,7 @@ button .colors-off-msg { } .fixed-230-subnav > li > a.live { color: #333333; - font-family: "Omnes-ECOMP-W02-Medium"; + font-family: "Omnes-ECOMP-W02-Medium",Arial; } .fixed-230-subnav a > i { right: 10px; @@ -11043,7 +11118,7 @@ button .colors-off-msg { } .fixed-230-subnav > li li > a.active { color: #333333; - font-family: "Omnes-ECOMP-W02-Medium"; + font-family: "Omnes-ECOMP-W02-Medium",Arial; text-decoration: none; } .fixed-230-subnav ul { @@ -11051,7 +11126,7 @@ button .colors-off-msg { } */ .unlinked { color: #0568ae !important; - font-family: "Omnes-ECOMP-W02" !important; } + font-family: "Omnes-ECOMP-W02", Arial !important; } .unlinked.active { color: inherit !important; } @@ -11094,7 +11169,7 @@ button .colors-off-msg { } .fixed-230-subnav > li li > a.active { color: inherit; - font-family: "Omnes-ECOMP-W02-Medium"; + font-family: "Omnes-ECOMP-W02-Medium",Arial; } } */ @keyframes DOMinsertion { @@ -11128,9 +11203,9 @@ button .colors-off-msg { outline-color: transparent; } } .ajaxed, -.modal.fade.in .b2b-modal-header, -.modal.fade.in .b2b-modal-body, -.modal.fade.in .b2b-modal-footer { +.modal.fade.in .modal-header, +.modal.fade.in .modal-body, +.modal.fade.in .modal-footer { animation-duration: 0.01s; -o-animation-duration: 0.01s; -ms-animation-duration: 0.01s; @@ -11164,7 +11239,7 @@ button .colors-off-msg { .heading-small-form { font-size: 1.6rem; - font-family: "Omnes-ECOMP-W02, Arial"; + font-family: "Omnes-ECOMP-W02", Arial; margin-top: 0px; } .icon-primary-form-sizeL { @@ -11238,12 +11313,25 @@ button .colors-off-msg { top: 0; z-index: 1; } -.icon-primary-primary-circle:before { - background-image: url("data:image/svg+xml,%3Csvg%20baseProfile%3D%22tiny%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%2036%2036%22%3E%3Ccircle%20fill%3D%22transparent%22%20stroke%3D%22%23666%22%20stroke-miterlimit%3D%2210%22%20cx%3D%2218%22%20cy%3D%2218%22%20r%3D%2216%22%2F%3E%3C%2Fsvg%3E"); - content: ""; - position: absolute; - top: 0; - z-index: 1; } +.b2b-drag-handle { + cursor: move; + -ms-interpolation-mode: bicubic; + margin-bottom: 40px; + height: 23px; + padding-right: 10px; + float: left; } + +.b2b-drag-over { + background-color: #d1d1d1; } + +.b2-drag-element { + background-color: #e8e8e8; } + +[draggable] { + -moz-user-select: none; + -khtml-user-select: none; + -webkit-user-select: none; + user-select: none; } /* Flyout inputs color is not aligned */ textarea, input { color: #333; } @@ -11309,7 +11397,7 @@ textarea, input { .b2b-config-sec-expander-body { font-size: 14px; } .b2b-config-sec-expander-body .b2b-config-vlan-data { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; padding-left: 15px; } .b2b-config-sec-expander-body-first-div { @@ -11345,7 +11433,7 @@ textarea, input { text-align: center; margin-top: 15px; margin-bottom: 35px; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-size: 14px; color: #333333; } @@ -11353,7 +11441,7 @@ textarea, input { text-align: center; margin-top: 15px; margin-bottom: 8px; - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-size: 14px; color: #333333; } @@ -11368,7 +11456,7 @@ textarea, input { padding: 10px 15px 0 15px; } .b2b-confi-sec-router-label { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-size: 16px; color: #333333; float: left; @@ -11376,7 +11464,7 @@ textarea, input { margin-bottom: 7px; } .b2b-config-vlan-label { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-size: 14px; color: #333333; margin-top: 1px; @@ -11426,6 +11514,10 @@ textarea, input { .b2b-config-sec-expander-body-icons .icon-misc-pen { position: relative; left: 18px; } +.b2b-directory-listing .center { + display: block; + margin: 2em auto; } + .b2b-directory-listing .listBox { height: 310px; width: 450px; @@ -11480,30 +11572,38 @@ textarea, input { margin-left: -115px; margin-top: 100px; } -.b2b-directory-listing .btn-right { - margin-bottom: 15px !important; } - .b2b-directory-listing .btn-right:after { - content: " \27A1"; } - -.b2b-directory-listing .btn-left { - margin-top: 10px !important; } - .b2b-directory-listing .btn-remove { margin-right: auto !important; margin-bottom: 15px; } + .b2b-directory-listing .btn-remove i { + margin-right: 0; + color: #fff; + top: -1px; } .b2b-directory-listing .btn-remove-all { margin-top: 0; margin-bottom: 61px !important; /* need to be removed */ margin-right: auto !important; } + .b2b-directory-listing .btn-remove-all i { + margin-right: 0; + color: #fff; + top: -1px; } + +.b2b-directory-listing .btn-add { + margin-bottom: 15px !important; } + .b2b-directory-listing .btn-add i { + margin-right: 0; + color: #fff; + top: -1px; } .b2b-directory-listing .btn-add-all { margin-top: 0; margin-bottom: 61px !important; } - -.b2b-directory-listing .btn-left:before { - content: "\2B05 "; } + .b2b-directory-listing .btn-add-all i { + margin-right: 0; + color: #fff; + top: -1px; } .b2b-directory-listing .btn-search[class*="btn"] { right: 0.09rem; } @@ -11730,7 +11830,7 @@ textarea, input { display: inline-block; } .b2b-static-route-label-heading { - font-family: "Omnes-ECOMP-W02-Medium", Arial; + font-family: "Omnes-ECOMP-W02-Medium",Arial; font-size: 16px !important; color: #333333; font-style: normal; @@ -11798,12 +11898,7 @@ label.b2b-static-route-label-heading { .b2b-static-route-content { display: inline-block; } - -/* -To Remove later -*/ - -.selectWrap::after { + .selectWrap::after { align-items: center; background-position: 7px 7px; background-repeat: no-repeat; @@ -11824,4 +11919,4 @@ To Remove later z-index: 0; position: absolute !important; display: flex !important; -}
\ No newline at end of file +} diff --git a/ecomp-portal-FE-common/client/bower_components_external/b2b/js/b2b-angular/README.md b/ecomp-portal-FE-common/client/bower_components_external/b2b/js/b2b-angular/README.md index addbd91b..ed0222d8 100644 --- a/ecomp-portal-FE-common/client/bower_components_external/b2b/js/b2b-angular/README.md +++ b/ecomp-portal-FE-common/client/bower_components_external/b2b/js/b2b-angular/README.md @@ -1,5 +1,7 @@ This file tracks patches to b2b-angular.js +14 August 2017: fix b2b-tree de-select the parent node issue - code provided by b2b team + 24 April 2017: hide header menu when click on iframe in a new tab + $(window).blur(function() { diff --git a/ecomp-portal-FE-common/client/bower_components_external/b2b/js/b2b-angular/b2b-library.min.js b/ecomp-portal-FE-common/client/bower_components_external/b2b/js/b2b-angular/b2b-library.min.js index bea9fb70..473e069d 100644 --- a/ecomp-portal-FE-common/client/bower_components_external/b2b/js/b2b-angular/b2b-library.min.js +++ b/ecomp-portal-FE-common/client/bower_components_external/b2b/js/b2b-angular/b2b-library.min.js @@ -1,5 +1,5 @@ -/*! b2b-angular-library - v1.0.1 - Last updated: 2017-03-02. Copyright (c) 2016 AT&T Services, Inc. */ -angular.module("b2b.att.tpls", ['b2bTemplate/audioPlayer/audioPlayer.html', 'b2bTemplate/audioRecorder/audioRecorder.html', 'b2bTemplate/backToTop/backToTop.html', 'b2bTemplate/boardstrip/b2bAddBoard.html', 'b2bTemplate/boardstrip/b2bBoard.html', 'b2bTemplate/boardstrip/b2bBoardstrip.html', 'b2bTemplate/calendar/datepicker-popup.html', 'b2bTemplate/calendar/datepicker.html', 'b2bTemplate/coachmark/coachmark.html', 'b2bTemplate/dropdowns/b2bDropdownDesktop.html', 'b2bTemplate/dropdowns/b2bDropdownGroupDesktop.html', 'b2bTemplate/dropdowns/b2bDropdownListDesktop.html', 'b2bTemplate/fileUpload/fileUpload.html', 'b2bTemplate/flyout/flyout.html', 'b2bTemplate/flyout/flyoutContent.html', 'b2bTemplate/footer/footer_column_switch_tpl.html', 'b2bTemplate/horizontalTable/horizontalTable.html', 'b2bTemplate/hourPicker/b2bHourpicker.html', 'b2bTemplate/hourPicker/b2bHourpickerPanel.html', 'b2bTemplate/hourPicker/b2bHourpickerValue.html', 'b2bTemplate/leftNavigation/leftNavigation.html', 'b2bTemplate/listbox/listbox.html', 'b2bTemplate/modalsAndAlerts/b2b-backdrop.html', 'b2bTemplate/modalsAndAlerts/b2b-window.html', 'b2bTemplate/monthSelector/monthSelector-popup.html', 'b2bTemplate/monthSelector/monthSelector.html', 'b2bTemplate/monthSelector/monthSelectorLink.html', 'b2bTemplate/pagination/b2b-pagination.html', 'b2bTemplate/paneSelector/paneSelector.html', 'b2bTemplate/paneSelector/paneSelectorPane.html', 'b2bTemplate/profileCard/profileCard-addUser.html', 'b2bTemplate/profileCard/profileCard.html', 'b2bTemplate/searchField/searchField.html', 'b2bTemplate/seekBar/seekBar.html', 'b2bTemplate/slider/slider.html', 'b2bTemplate/spinButton/spinButton.html', 'b2bTemplate/statusTracker/statusTracker.html', 'b2bTemplate/stepTracker/stepTracker.html', 'b2bTemplate/switches/switches-spanish.html', 'b2bTemplate/switches/switches.html', 'b2bTemplate/tableMessages/tableMessage.html', 'b2bTemplate/tables/b2bTable.html', 'b2bTemplate/tables/b2bTableBody.html', 'b2bTemplate/tables/b2bTableHeaderSortable.html', 'b2bTemplate/tables/b2bTableHeaderUnsortable.html', 'b2bTemplate/tableScrollbar/tableScrollbar.html', 'b2bTemplate/tabs/b2bTab.html', 'b2bTemplate/tabs/b2bTabset.html', 'b2bTemplate/treeNav/groupedTree.html', 'b2bTemplate/treeNav/treeMember.html', 'b2bTemplate/treeNav/ungroupedTree.html', 'b2bTemplate/treeNodeCheckbox/groupedTree.html', 'b2bTemplate/treeNodeCheckbox/treeMember.html', 'b2bTemplate/treeNodeCheckbox/ungroupedTree.html']);angular.module("b2b.att", ["b2b.att.tpls", 'b2b.att.addressInputTemplate','b2b.att.arrows','b2b.att.audioPlayer','b2b.att.audioRecorder','b2b.att.backToTop','b2b.att.badgesForAlerts','b2b.att.boardstrip','b2b.att.breadcrumbs','b2b.att.buttonGroups','b2b.att.buttons','b2b.att.calendar','b2b.att.checkboxes','b2b.att.coachmark','b2b.att.configurationSection','b2b.att.directoryListingTemplate','b2b.att.dropdowns','b2b.att.fileUpload','b2b.att.filters','b2b.att.flyout','b2b.att.footer','b2b.att.header','b2b.att.headings','b2b.att.horizontalTable','b2b.att.hourPicker','b2b.att.inputTemplate','b2b.att.leftNavigation','b2b.att.links','b2b.att.listbox','b2b.att.loaderAnimation','b2b.att.messageWrapper','b2b.att.modalsAndAlerts','b2b.att.monthSelector','b2b.att.multiLevelNavigation','b2b.att.multipurposeExpander','b2b.att.notesMessagesAndErrors','b2b.att.notificationCardTemplate','b2b.att.orderConfirmationTemplate','b2b.att.pagination','b2b.att.paneSelector','b2b.att.phoneNumberInput','b2b.att.profileBlockTemplate','b2b.att.profileCard','b2b.att.radios','b2b.att.searchField','b2b.att.seekBar','b2b.att.selectorModule','b2b.att.separators','b2b.att.slider','b2b.att.spinButton','b2b.att.staticRouteTemplate','b2b.att.statusTracker','b2b.att.stepTracker','b2b.att.switches','b2b.att.tableMessages','b2b.att.tables','b2b.att.tableScrollbar','b2b.att.tabs','b2b.att.tagBadges','b2b.att.textArea','b2b.att.tooltipsForForms','b2b.att.treeNav','b2b.att.treeNodeCheckbox','b2b.att.utilities']);/** +/*! b2b-angular-library - v1.0.5 - Last updated: 2017-05-24. Copyright (c) 2016 AT&T Services, Inc. */ +angular.module("b2b.att.tpls", ['b2bTemplate/audioPlayer/audioPlayer.html', 'b2bTemplate/audioRecorder/audioRecorder.html', 'b2bTemplate/backToTop/backToTop.html', 'b2bTemplate/boardstrip/b2bAddBoard.html', 'b2bTemplate/boardstrip/b2bBoard.html', 'b2bTemplate/boardstrip/b2bBoardstrip.html', 'b2bTemplate/calendar/datepicker-popup.html', 'b2bTemplate/calendar/datepicker.html', 'b2bTemplate/coachmark/coachmark.html', 'b2bTemplate/dropdowns/b2bDropdownDesktop.html', 'b2bTemplate/dropdowns/b2bDropdownGroupDesktop.html', 'b2bTemplate/dropdowns/b2bDropdownListDesktop.html', 'b2bTemplate/fileUpload/fileUpload.html', 'b2bTemplate/flyout/flyout.html', 'b2bTemplate/flyout/flyoutContent.html', 'b2bTemplate/footer/footer_column_switch_tpl.html', 'b2bTemplate/horizontalTable/horizontalTable.html', 'b2bTemplate/hourPicker/b2bHourpicker.html', 'b2bTemplate/hourPicker/b2bHourpickerPanel.html', 'b2bTemplate/hourPicker/b2bHourpickerValue.html', 'b2bTemplate/leftNavigation/leftNavigation.html', 'b2bTemplate/listbox/listbox.html', 'b2bTemplate/modalsAndAlerts/b2b-backdrop.html', 'b2bTemplate/modalsAndAlerts/b2b-window.html', 'b2bTemplate/monthSelector/monthSelector-popup.html', 'b2bTemplate/monthSelector/monthSelector.html', 'b2bTemplate/monthSelector/monthSelectorLink.html', 'b2bTemplate/pagination/b2b-pagination.html', 'b2bTemplate/paneSelector/paneSelector.html', 'b2bTemplate/paneSelector/paneSelectorPane.html', 'b2bTemplate/profileCard/profileCard-addUser.html', 'b2bTemplate/profileCard/profileCard.html', 'b2bTemplate/searchField/searchField.html', 'b2bTemplate/seekBar/seekBar.html', 'b2bTemplate/slider/slider.html', 'b2bTemplate/spinButton/spinButton.html', 'b2bTemplate/statusTracker/statusTracker.html', 'b2bTemplate/stepTracker/stepTracker.html', 'b2bTemplate/switches/switches-spanish.html', 'b2bTemplate/switches/switches.html', 'b2bTemplate/tableMessages/tableMessage.html', 'b2bTemplate/tables/b2bTable.html', 'b2bTemplate/tables/b2bTableBody.html', 'b2bTemplate/tables/b2bTableHeaderSortable.html', 'b2bTemplate/tables/b2bTableHeaderUnsortable.html', 'b2bTemplate/tableScrollbar/tableScrollbar.html', 'b2bTemplate/tabs/b2bTab.html', 'b2bTemplate/tabs/b2bTabset.html', 'b2bTemplate/treeNav/groupedTree.html', 'b2bTemplate/treeNav/treeMember.html', 'b2bTemplate/treeNav/ungroupedTree.html', 'b2bTemplate/treeNodeCheckbox/groupedTree.html', 'b2bTemplate/treeNodeCheckbox/treeMember.html', 'b2bTemplate/treeNodeCheckbox/ungroupedTree.html']);angular.module("b2b.att", ["b2b.att.tpls", 'b2b.att.addressInputTemplate','b2b.att.arrows','b2b.att.audioPlayer','b2b.att.audioRecorder','b2b.att.backToTop','b2b.att.badgesForAlerts','b2b.att.boardstrip','b2b.att.bootstrapGridTemplate','b2b.att.breadcrumbs','b2b.att.buttonGroups','b2b.att.buttons','b2b.att.calendar','b2b.att.checkboxes','b2b.att.coachmark','b2b.att.configurationSection','b2b.att.directoryListingTemplate','b2b.att.dropdowns','b2b.att.fileUpload','b2b.att.filters','b2b.att.flyout','b2b.att.footer','b2b.att.header','b2b.att.headingsAndCopy','b2b.att.horizontalTable','b2b.att.hourPicker','b2b.att.inputTemplate','b2b.att.leftNavigation','b2b.att.links','b2b.att.listbox','b2b.att.loaderAnimation','b2b.att.messageWrapper','b2b.att.modalsAndAlerts','b2b.att.monthSelector','b2b.att.multiLevelNavigation','b2b.att.multipurposeExpander','b2b.att.notesMessagesAndErrors','b2b.att.notificationCardTemplate','b2b.att.orderConfirmationTemplate','b2b.att.pagination','b2b.att.paneSelector','b2b.att.phoneNumberInput','b2b.att.profileBlockTemplate','b2b.att.profileCard','b2b.att.radios','b2b.att.searchField','b2b.att.seekBar','b2b.att.separators','b2b.att.slider','b2b.att.spinButton','b2b.att.staticRouteTemplate','b2b.att.statusTracker','b2b.att.stepTracker','b2b.att.switches','b2b.att.tableDragAndDrop','b2b.att.tableMessages','b2b.att.tables','b2b.att.tableScrollbar','b2b.att.tabs','b2b.att.tagBadges','b2b.att.textArea','b2b.att.timeInputField','b2b.att.tooltipsForForms','b2b.att.treeNav','b2b.att.treeNodeCheckbox','b2b.att.utilities']);/** * @ngdoc directive * @name Template.att:Address Input * @@ -62,263 +62,263 @@ angular.module('b2b.att.arrows', []); */ angular.module('b2b.att.audioPlayer', ['b2b.att.utilities', 'b2b.att.seekBar']) - .constant('AudioPlayerConfig', { - 'defaultVolume': 50, - 'timeShiftInSeconds': 5 - }) - .filter('trustedAudioUrl', ['$sce', function ($sce) { - return function (audioFileFullPath) { - return audioFileFullPath ? $sce.trustAsResourceUrl(audioFileFullPath) : 'undefined'; - }; - }]) - .directive('b2bAudio', ['$log', '$timeout', 'AudioPlayerConfig', '$compile', 'events', function ($log, $timeout, AudioPlayerConfig, $compile, events) { - return { - restrict: 'EA', - replace: true, - scope: { - audioSrcUrl: '=' - }, - templateUrl: 'b2bTemplate/audioPlayer/audioPlayer.html', - controller: function ($scope) { - - $scope.audio = {}; - - if (!angular.isDefined($scope.audioSrcUrl)) { - $log.warn('b2b-audio : audio-src-url undefined'); - $scope.audioSrcUrl = undefined; - $scope.audio.mp3 = undefined; - } - - }, - link: function (scope, element) { - var audioElement = angular.element(element[0].querySelector('audio'))[0]; - scope.audio.audioElement = audioElement; - - function setAttributes(element, attributes) { - Object.keys(attributes).forEach(function (name) { - element.setAttribute(name, attributes[name]); - }); - } - - $timeout(function () { - // TODO: Replace with DDA Tooltip - var seekBarKnob = element[0].querySelector('.b2b-seek-bar-knob'); - var tooltipObject = { - 'tooltip': '{{timeFormatter(audio.currentTime)}}', - 'tooltip-placement': 'above', - 'tooltip-style': 'blue', - 'tooltip-trigger': 'mousedown', - 'tooltip-append-to-body': 'false', - 'tooltip-offset': '-10', - 'refer-by': 'seek-bar-tooltip' - }; - setAttributes(seekBarKnob, tooltipObject); - $compile(seekBarKnob)(scope); - }); - - if (angular.isDefined(scope.audioSrcUrl)) { - scope.audio.mp3 = scope.audioSrcUrl; - } - - scope.audio.currentTime = 0; - scope.audio.currentVolume = AudioPlayerConfig.defaultVolume; - scope.audio.timeShiftInSeconds = AudioPlayerConfig.timeShiftInSeconds; - scope.isPlayInProgress = false; - scope.isReady = false; - scope.isAudioDragging = false; - - $timeout(function () { - audioElement.load(); - audioElement.volume = scope.audio.currentVolume / 100; - }); - - scope.$watch('audioSrcUrl', function (newVal, oldVal) { - if (newVal !== oldVal) { - if (!newVal) { - $log.warn('b2b-audio : audio-src-url undefined. Please provide a valid URL'); - } - - scope.audio.mp3 = newVal; - $timeout(function () { - audioElement.load(); - }); - } - }); - - scope.playAudio = function () { - if (scope.isReady) { - audioElement.play(); - } - }; - - audioElement.onplay = function () { - scope.isPlayInProgress = true; - scope.$digest(); - }; - - scope.pauseAudio = function () { - audioElement.pause(); - }; - - audioElement.onpause = function () { - scope.isPlayInProgress = false; - scope.$digest(); - }; - - scope.toggleAudio = function () { - if (audioElement.paused) { - scope.playAudio(); - } else { - scope.pauseAudio(); - } - }; - - scope.volumeUp = function (delta) { - if (!delta) { - delta = 0.1; - } else { - delta = delta / 100; - } - audioElement.muted = false; - if (audioElement.volume < 1) { - audioElement.volume = Math.min((Math.round((audioElement.volume + delta) * 100) / 100), 1); - } - scope.audio.currentVolume = audioElement.volume * 100; - return audioElement.volume; - }; - - scope.volumeDown = function (delta) { - if (!delta) { - delta = 0.1; - } else { - delta = delta / 100; - } - audioElement.muted = false; - if (audioElement.volume > 0) { - audioElement.volume = Math.max((Math.round((audioElement.volume - delta) * 100) / 100), 0); - } - scope.audio.currentVolume = audioElement.volume * 100; - return audioElement.volume; - }; - - var volumeHandler = function (e) { - events.preventDefault(e); - if ((e.wheelDelta && e.wheelDelta > 0) || (e.detail && e.detail < 0)) { - scope.volumeUp(); - } else { - scope.volumeDown(); - } - scope.$digest(); - }; - - - - scope.$watch('audio.currentVolume', function (newVal, oldVal) { - if (newVal !== oldVal) { - audioElement.volume = newVal / 100; - } - }); - - scope.setCurrentTime = function (timeInSec) { - audioElement.currentTime = timeInSec; - }; - - scope.setAudioPosition = function (val) { - if (scope.isReady) { - scope.setCurrentTime(val); - scope.isAudioDragging = false; - } - }; - - function getTimestampArray(timestamp) { - var d = Math.abs(timestamp) / 1000; // delta - var r = {}; // result - var s = { // structure - day: 86400, - hour: 3600, - minute: 60, - second: 1 - }; - - Object.keys(s).forEach(function (key) { - r[key] = Math.floor(d / s[key]); - d -= r[key] * s[key]; - }); - - return r; - }; - - scope.timeFormatter = function (timeInSec) { - var formattedTime = '00:00'; - - if (!timeInSec || timeInSec < 1) { - return formattedTime; - } - - if (typeof timeInSec === 'string') { - return timeInSec; - } - - var dateArray = getTimestampArray(timeInSec * 1000); - Object.keys(dateArray).forEach(function (key) { - if (dateArray[key] === 0) { - dateArray[key] = '00'; - } else if (dateArray[key] < 10) { - dateArray[key] = '0' + dateArray[key]; - } - }); - - formattedTime = dateArray['minute'] + ':' + dateArray['second']; - - if (dateArray['hour'] !== '00') { - formattedTime = dateArray['hour'] + ':' + formattedTime; - } - - if (dateArray['day'] !== '00') { - formattedTime = dateArray['day'] + ':' + formattedTime; - } - - return formattedTime; - }; - - audioElement.onloadedmetadata = function () { - scope.audio.duration = audioElement.duration; - scope.$digest(); - }; - - audioElement.ontimeupdate = function () { - if (!scope.isAudioDragging) { - scope.audio.currentTime = audioElement.currentTime; - scope.$digest(); - } - }; - - audioElement.onended = function () { - scope.setCurrentTime(0); - scope.audio.currentTime = 0; - if (!audioElement.paused) { - scope.pauseAudio(); - } - scope.$digest(); - }; - - audioElement.oncanplay = function () { - scope.isReady = true; - scope.isPlayInProgress = !audioElement.paused; - scope.$digest(); - }; - - var onloadstart = function () { - scope.isReady = false; - scope.isPlayInProgress = !audioElement.paused; - scope.audio.currentTime = 0; - scope.audio.duration = 0; - scope.$digest(); - }; - audioElement.addEventListener("loadstart", onloadstart); - } - }; - }]); + .constant('AudioPlayerConfig', { + 'defaultVolume': 50, + 'timeShiftInSeconds': 5 + }) + .filter('trustedAudioUrl', ['$sce', function ($sce) { + return function (audioFileFullPath) { + return audioFileFullPath ? $sce.trustAsResourceUrl(audioFileFullPath) : 'undefined'; + }; + }]) + .directive('b2bAudio', ['$log', '$timeout', 'AudioPlayerConfig', '$compile', 'events', function ($log, $timeout, AudioPlayerConfig, $compile, events) { + return { + restrict: 'EA', + replace: true, + scope: { + audioSrcUrl: '=' + }, + templateUrl: 'b2bTemplate/audioPlayer/audioPlayer.html', + controller: function ($scope) { + + $scope.audio = {}; + + if (!angular.isDefined($scope.audioSrcUrl)) { + $log.warn('b2b-audio : audio-src-url undefined'); + $scope.audioSrcUrl = undefined; + $scope.audio.mp3 = undefined; + } + + }, + link: function (scope, element) { + var audioElement = angular.element(element[0].querySelector('audio'))[0]; + scope.audio.audioElement = audioElement; + + function setAttributes(element, attributes) { + Object.keys(attributes).forEach(function (name) { + element.setAttribute(name, attributes[name]); + }); + } + + $timeout(function () { + // TODO: Replace with DDA Tooltip + var seekBarKnob = element[0].querySelector('.b2b-seek-bar-knob'); + var tooltipObject = { + 'tooltip': '{{timeFormatter(audio.currentTime)}}', + 'tooltip-placement': 'above', + 'tooltip-style': 'blue', + 'tooltip-trigger': 'mousedown', + 'tooltip-append-to-body': 'false', + 'tooltip-offset': '-10', + 'refer-by': 'seek-bar-tooltip' + }; + setAttributes(seekBarKnob, tooltipObject); + $compile(seekBarKnob)(scope); + }); + + if (angular.isDefined(scope.audioSrcUrl)) { + scope.audio.mp3 = scope.audioSrcUrl; + } + + scope.audio.currentTime = 0; + scope.audio.currentVolume = AudioPlayerConfig.defaultVolume; + scope.audio.timeShiftInSeconds = AudioPlayerConfig.timeShiftInSeconds; + scope.isPlayInProgress = false; + scope.isReady = false; + scope.isAudioDragging = false; + + $timeout(function () { + audioElement.load(); + audioElement.volume = scope.audio.currentVolume / 100; + }); + + scope.$watch('audioSrcUrl', function (newVal, oldVal) { + if (newVal !== oldVal) { + if (!newVal) { + $log.warn('b2b-audio : audio-src-url undefined. Please provide a valid URL'); + } + + scope.audio.mp3 = newVal; + $timeout(function () { + audioElement.load(); + }); + } + }); + + scope.playAudio = function () { + if (scope.isReady) { + audioElement.play(); + } + }; + + audioElement.onplay = function () { + scope.isPlayInProgress = true; + scope.$digest(); + }; + + scope.pauseAudio = function () { + audioElement.pause(); + }; + + audioElement.onpause = function () { + scope.isPlayInProgress = false; + scope.$digest(); + }; + + scope.toggleAudio = function () { + if (audioElement.paused) { + scope.playAudio(); + } else { + scope.pauseAudio(); + } + }; + + scope.volumeUp = function (delta) { + if (!delta) { + delta = 0.1; + } else { + delta = delta / 100; + } + audioElement.muted = false; + if (audioElement.volume < 1) { + audioElement.volume = Math.min((Math.round((audioElement.volume + delta) * 100) / 100), 1); + } + scope.audio.currentVolume = audioElement.volume * 100; + return audioElement.volume; + }; + + scope.volumeDown = function (delta) { + if (!delta) { + delta = 0.1; + } else { + delta = delta / 100; + } + audioElement.muted = false; + if (audioElement.volume > 0) { + audioElement.volume = Math.max((Math.round((audioElement.volume - delta) * 100) / 100), 0); + } + scope.audio.currentVolume = audioElement.volume * 100; + return audioElement.volume; + }; + + var volumeHandler = function (e) { + events.preventDefault(e); + if ((e.wheelDelta && e.wheelDelta > 0) || (e.detail && e.detail < 0)) { + scope.volumeUp(); + } else { + scope.volumeDown(); + } + scope.$digest(); + }; + + + + scope.$watch('audio.currentVolume', function (newVal, oldVal) { + if (newVal !== oldVal) { + audioElement.volume = newVal / 100; + } + }); + + scope.setCurrentTime = function (timeInSec) { + audioElement.currentTime = timeInSec; + }; + + scope.setAudioPosition = function (val) { + if (scope.isReady) { + scope.setCurrentTime(val); + scope.isAudioDragging = false; + } + }; + + function getTimestampArray(timestamp) { + var d = Math.abs(timestamp) / 1000; // delta + var r = {}; // result + var s = { // structure + day: 86400, + hour: 3600, + minute: 60, + second: 1 + }; + + Object.keys(s).forEach(function (key) { + r[key] = Math.floor(d / s[key]); + d -= r[key] * s[key]; + }); + + return r; + }; + + scope.timeFormatter = function (timeInSec) { + var formattedTime = '00:00'; + + if (!timeInSec || timeInSec < 1) { + return formattedTime; + } + + if (typeof timeInSec === 'string') { + return timeInSec; + } + + var dateArray = getTimestampArray(timeInSec * 1000); + Object.keys(dateArray).forEach(function (key) { + if (dateArray[key] === 0) { + dateArray[key] = '00'; + } else if (dateArray[key] < 10) { + dateArray[key] = '0' + dateArray[key]; + } + }); + + formattedTime = dateArray['minute'] + ':' + dateArray['second']; + + if (dateArray['hour'] !== '00') { + formattedTime = dateArray['hour'] + ':' + formattedTime; + } + + if (dateArray['day'] !== '00') { + formattedTime = dateArray['day'] + ':' + formattedTime; + } + + return formattedTime; + }; + + audioElement.onloadedmetadata = function () { + scope.audio.duration = audioElement.duration; + scope.$digest(); + }; + + audioElement.ontimeupdate = function () { + if (!scope.isAudioDragging) { + scope.audio.currentTime = audioElement.currentTime; + scope.$digest(); + } + }; + + audioElement.onended = function () { + scope.setCurrentTime(0); + scope.audio.currentTime = 0; + if (!audioElement.paused) { + scope.pauseAudio(); + } + scope.$digest(); + }; + + audioElement.oncanplay = function () { + scope.isReady = true; + scope.isPlayInProgress = !audioElement.paused; + scope.$digest(); + }; + + var onloadstart = function () { + scope.isReady = false; + scope.isPlayInProgress = !audioElement.paused; + scope.audio.currentTime = 0; + scope.audio.duration = 0; + scope.$digest(); + }; + audioElement.addEventListener("loadstart", onloadstart); + } + }; + }]); /** * @ngdoc directive * @name Videos, audio & animation.att:Audio Recorder @@ -348,7 +348,7 @@ angular.module('b2b.att.audioRecorder', ['b2b.att.utilities']) restrict: 'EA', replace: true, scope: { - callback: '&' + callback: '&' }, templateUrl: 'b2bTemplate/audioRecorder/audioRecorder.html', controller: function($scope) { @@ -363,8 +363,8 @@ angular.module('b2b.att.audioRecorder', ['b2b.att.utilities']) } if (!(b2bUserAgent.isFF() || b2bUserAgent.isChrome())) { - throw new Error('b2bAudioRecorder does not support this browser!'); - } + throw new Error('b2bAudioRecorder does not support this browser!'); + } }, link: function(scope, element) { @@ -408,17 +408,17 @@ angular.module('b2b.att.audioRecorder', ['b2b.att.utilities']) recorder.exportWAV(function(s) { audio.src = window.URL.createObjectURL(s); context.close().then(function() { - if (timer) { - $interval.cancel(timer); - } - scope.elapsedTime = 0; - - recorder.clear(); - recorder = undefined; - }); - if (angular.isFunction(scope.callback)){ - scope.callback({'data': audio}); - } + if (timer) { + $interval.cancel(timer); + } + scope.elapsedTime = 0; + + recorder.clear(); + recorder = undefined; + }); + if (angular.isFunction(scope.callback)){ + scope.callback({'data': audio}); + } }); @@ -504,9 +504,9 @@ angular.module('b2b.att.audioRecorder', ['b2b.att.utilities']) * * @usage * - <div ng-controller="backToTopController"> - <div b2b-backtotop></div> - </div> + <div ng-controller="backToTopController"> + <div b2b-backtotop></div> + </div> * * @example * <section id="code"> @@ -519,19 +519,19 @@ angular.module('b2b.att.audioRecorder', ['b2b.att.utilities']) */ angular.module('b2b.att.backToTop', ['b2b.att.utilities','b2b.att.position']) - .directive('b2bBacktotopButton', [function () { - return { - restrict: 'EA', - replace: true, - templateUrl: 'b2bTemplate/backToTop/backToTop.html', - link: function (scope, elem, attr) { - elem.bind('click', function(evt) { - var scrollSpeed = parseInt(attr.scrollSpeed) || 1; + .directive('b2bBacktotopButton', [function () { + return { + restrict: 'EA', + replace: true, + templateUrl: 'b2bTemplate/backToTop/backToTop.html', + link: function (scope, elem, attr) { + elem.bind('click', function(evt) { + var scrollSpeed = parseInt(attr.scrollSpeed) || 1; TweenLite.to(window, scrollSpeed, {scrollTo:{x: 0, y: 0}}); }); - } - }; - }]); + } + }; + }]); /** * @ngdoc directive * @name Messages, modals & alerts.att:badgesForAlerts @@ -567,444 +567,462 @@ angular.module('b2b.att.badgesForAlerts', []); </section> */ angular.module('b2b.att.boardstrip', ['b2b.att.utilities']) - .constant('BoardStripConfig', { - 'maxVisibleBoards': 4, - 'boardsToScroll': 1, - /* These parameters are non-configurable and remain unaltered, until there is a change in corresponding CSS */ - 'boardLength': 140, - 'boardMargin': 15 - }) - .directive('b2bBoard', [function () { - return { - restrict: 'AE', - replace: true, - transclude: true, - require: '^b2bBoardStrip', - scope: { - boardIndex: '=', - boardLabel: '=' - }, - templateUrl: 'b2bTemplate/boardstrip/b2bBoard.html', - link: function (scope, element, attrs, ctrls) { - - var parentCtrl = ctrls; - - scope.getCurrentIndex = function () { - return parentCtrl.getCurrentIndex(); - }; - scope.selectBoard = function (boardIndex) { - if (!isNaN(boardIndex)) { - parentCtrl.setCurrentIndex(boardIndex); - } - }; - } - }; - }]) - .directive('b2bBoardStrip', ['BoardStripConfig', '$timeout', function (BoardStripConfig, $timeout) { - return { - restrict: 'AE', - replace: true, - transclude: true, - require: ['?ngModel', 'b2bBoardStrip'], - scope: { - boardsMasterArray: '=', - onAddBoard: '&?' - }, - templateUrl: 'b2bTemplate/boardstrip/b2bBoardstrip.html', - controller: function ($scope) { - if (!angular.isDefined($scope.boardsMasterArray)) { - $scope.boardsMasterArray = []; - } - - this.rectifyMaxVisibleBoards = function () { - if (this.maxVisibleIndex >= $scope.boardsMasterArray.length) { - this.maxVisibleIndex = $scope.boardsMasterArray.length - 1; - } - - if (this.maxVisibleIndex < 0) { - this.maxVisibleIndex = 0; - } - }; - - this.resetBoardStrip = function () { - $scope.currentIndex = 0; - - this.maxVisibleIndex = BoardStripConfig.maxVisibleBoards - 1; - this.minVisibleIndex = 0; - - this.rectifyMaxVisibleBoards(); - }; - - this.getCurrentIndex = function () { - return $scope.currentIndex; - }; - this.setCurrentIndex = function (indx) { - $scope.currentIndex = indx; - }; - - this.getBoardsMasterArrayLength = function () { - return $scope.boardsMasterArray.length; - }; - - $scope.addBoardPressedFlag = false; - this.getAddBoardPressedFlag = function () { - return $scope.addBoardPressedFlag; - }; - this.setAddBoardPressedFlag = function (booleanValue) { - $scope.addBoardPressedFlag = booleanValue; - }; - - }, - link: function (scope, element, attrs, ctrls) { - - var ngModelCtrl = ctrls[0]; - var ctrl = ctrls[1]; - - var oldTimeout; - var animationTimeout = 1000; - - var getBoardViewportWidth = function (numberOfVisibleBoards) { - return numberOfVisibleBoards * (BoardStripConfig.boardLength + BoardStripConfig.boardMargin); - }; - if (element[0].querySelector(".board-viewport")) { - angular.element(element[0].querySelector(".board-viewport")).css({ - "width": getBoardViewportWidth(BoardStripConfig.maxVisibleBoards) + "px" - }); - } - - var getBoardstripContainerWidth = function (totalNumberOfBoards) { - return totalNumberOfBoards * (BoardStripConfig.boardLength + BoardStripConfig.boardMargin); - }; - if (element[0].querySelector(".boardstrip-container")) { - angular.element(element[0].querySelector(".boardstrip-container")).css({ - "width": getBoardstripContainerWidth(ctrl.getBoardsMasterArrayLength()) + "px" - }); - angular.element(element[0].querySelector(".boardstrip-container")).css({ - "left": "0px" - }); - } - - var calculateAndGetBoardstripContainerAdjustment = function () { - - var calculatedAdjustmentValue; - - if (ctrl.getBoardsMasterArrayLength() <= BoardStripConfig.maxVisibleBoards) { - calculatedAdjustmentValue = 0; - } else { - calculatedAdjustmentValue = (ctrl.minVisibleIndex * (BoardStripConfig.boardLength + BoardStripConfig.boardMargin)) * -1; - } - - return calculatedAdjustmentValue; - }; - - var animateBoardstripContainerAdjustment = function (elementToFocusAfterAnimation) { - var oldContainerAdjustment = angular.element(element[0].querySelector(".boardstrip-container"))[0].style.left; - var containerAdjustment = calculateAndGetBoardstripContainerAdjustment(); - if (oldContainerAdjustment !== containerAdjustment + 'px') { - angular.element(element[0].querySelector(".boardstrip-container")).css({ - "left": containerAdjustment + "px" - }); - - $timeout.cancel(oldTimeout); - oldTimeout = $timeout(function () { - elementToFocusAfterAnimation.focus(); - }, animationTimeout); - } else { - elementToFocusAfterAnimation.focus(); - } - }; - - var updateBoardsTabIndex = function (boardArray, minViewIndex, maxViewIndex) { - for (var i = 0; i < boardArray.length; i++) { - angular.element(boardArray[i]).attr('tabindex', '-1'); - } - for (var j = minViewIndex; j <= maxViewIndex; j++) { - angular.element(boardArray[j]).attr('tabindex', '0'); - } - }; - - $timeout(function () { - var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); - updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); - }); - - scope.$watchCollection('boardsMasterArray', function (newVal, oldVal) { - if (newVal !== oldVal) { - /* When a board is removed */ - if (newVal.length < oldVal.length) { - ctrl.resetBoardStrip(); - $timeout(function () { - - var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); - if (currentBoardArray.length !== 0) { - animateBoardstripContainerAdjustment(currentBoardArray[0]); - } else { - element[0].querySelector('div.boardstrip-item--add').focus(); - } - - angular.element(element[0].querySelector(".boardstrip-container")).css({ - "width": getBoardstripContainerWidth(ctrl.getBoardsMasterArrayLength()) + "px" - }); - /* Update tabindecies to ensure keyboard navigation behaves correctly */ - updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); - }); - } - /* When a board is added */ - else { - if (ctrl.getAddBoardPressedFlag()) { - ctrl.maxVisibleIndex = ctrl.getBoardsMasterArrayLength() - 1; - ctrl.minVisibleIndex = Math.max(ctrl.maxVisibleIndex - BoardStripConfig.maxVisibleBoards + 1, 0); - - ctrl.setCurrentIndex(ctrl.maxVisibleIndex); - - $timeout(function () { - angular.element(element[0].querySelector(".boardstrip-container")).css({ - "width": getBoardstripContainerWidth(ctrl.getBoardsMasterArrayLength()) + "px" - }); - - var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); - animateBoardstripContainerAdjustment(currentBoardArray[currentBoardArray.length - 1]); - /* Update tabindecies to ensure keyboard navigation behaves correctly */ - updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); - }); - } else { - if (ctrl.minVisibleIndex === 0 && ctrl.getBoardsMasterArrayLength() < BoardStripConfig.maxVisibleBoards + 1) { - ctrl.maxVisibleIndex = ctrl.getBoardsMasterArrayLength() - 1; - ctrl.rectifyMaxVisibleBoards(); - } - - $timeout(function () { - angular.element(element[0].querySelector(".boardstrip-container")).css({ - "width": getBoardstripContainerWidth(ctrl.getBoardsMasterArrayLength()) + "px" - }); - - var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); - /* Update tabindecies to ensure keyboard navigation behaves correctly */ - updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); - }); - } - - ctrl.setAddBoardPressedFlag(false); - } - } - }); - - scope.nextBoard = function () { - ctrl.maxVisibleIndex += BoardStripConfig.boardsToScroll; - ctrl.rectifyMaxVisibleBoards(); - ctrl.minVisibleIndex = ctrl.maxVisibleIndex - (BoardStripConfig.maxVisibleBoards - 1); - - $timeout.cancel(oldTimeout); - angular.element(element[0].querySelector(".boardstrip-container")).css({ - "left": calculateAndGetBoardstripContainerAdjustment() + "px" - }); - - $timeout(function () { - var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); - - /* Remove tabindex from non-visible boards */ - updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); - - if (!(scope.isNextBoard())) { - try { - currentBoardArray[currentBoardArray.length - 1].focus(); - } catch (e) { /* IE8 may throw exception */ } - } - }, animationTimeout); - }; - scope.prevBoard = function () { - - ctrl.minVisibleIndex -= BoardStripConfig.boardsToScroll; - if (ctrl.minVisibleIndex < 0) { - ctrl.minVisibleIndex = 0; - } - - ctrl.maxVisibleIndex = ctrl.minVisibleIndex + BoardStripConfig.maxVisibleBoards - 1; - ctrl.rectifyMaxVisibleBoards(); - - $timeout.cancel(oldTimeout); - angular.element(element[0].querySelector(".boardstrip-container")).css({ - "left": calculateAndGetBoardstripContainerAdjustment() + "px" - }); - - $timeout(function () { - var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); - - /* Remove tabindex from non-visible boards */ - updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); - - if (ctrl.minVisibleIndex === 0) { - try { - element[0].querySelector('div.boardstrip-item--add').focus(); - } catch (e) { /* IE8 may throw exception */ } - } - }); - }; - - scope.isPrevBoard = function () { - return (ctrl.minVisibleIndex > 0); - }; - scope.isNextBoard = function () { - return (ctrl.getBoardsMasterArrayLength() - 1 > ctrl.maxVisibleIndex); - }; - - ngModelCtrl.$render = function () { - if (ngModelCtrl.$viewValue || ngModelCtrl.$viewValue === 0) { - var newCurrentIndex = ngModelCtrl.$viewValue; - - if (!(newCurrentIndex = parseInt(newCurrentIndex, 10))) { - newCurrentIndex = 0; - } - - if (newCurrentIndex <= 0) { - ctrl.resetBoardStrip(); - newCurrentIndex = 0; - - var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); - if (currentBoardArray.length !== 0) { - animateBoardstripContainerAdjustment(currentBoardArray[0]); - } else { - element[0].querySelector('div.boardstrip-item--add').focus(); - } - /* Update tabindecies to ensure keyboard navigation behaves correctly */ - updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); - } else if (newCurrentIndex >= ctrl.getBoardsMasterArrayLength()) { - ctrl.maxVisibleIndex = ctrl.getBoardsMasterArrayLength() - 1; - ctrl.rectifyMaxVisibleBoards(); - ctrl.minVisibleIndex = Math.max(ctrl.maxVisibleIndex - BoardStripConfig.maxVisibleBoards + 1, 0); - - newCurrentIndex = ctrl.maxVisibleIndex; - - $timeout(function () { - var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); - animateBoardstripContainerAdjustment(currentBoardArray[newCurrentIndex]); - /* Update tabindecies to ensure keyboard navigation behaves correctly */ - updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); - }); - } else { - - if (!(newCurrentIndex >= ctrl.minVisibleIndex && newCurrentIndex <= ctrl.maxVisibleIndex)) { - ctrl.minVisibleIndex = newCurrentIndex; - ctrl.maxVisibleIndex = ctrl.minVisibleIndex + BoardStripConfig.maxVisibleBoards - 1; - ctrl.rectifyMaxVisibleBoards(); - - if (ctrl.getBoardsMasterArrayLength() < BoardStripConfig.maxVisibleBoards) { - ctrl.minVisibleIndex = 0; - } else { - ctrl.minVisibleIndex = Math.max(ctrl.maxVisibleIndex - BoardStripConfig.maxVisibleBoards + 1, 0); - } - - $timeout(function () { - var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); - animateBoardstripContainerAdjustment(currentBoardArray[newCurrentIndex]); - /* Update tabindecies to ensure keyboard navigation behaves correctly */ - updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); - }); - } - } - scope.currentIndex = newCurrentIndex; - ngModelCtrl.$setViewValue(newCurrentIndex); - } else { - ctrl.resetBoardStrip(); - ngModelCtrl.$setViewValue(0); - } - }; - - scope.$watch('currentIndex', function (newVal, oldVal) { - if (newVal !== oldVal && ngModelCtrl && ngModelCtrl.$viewValue !== newVal) { - ngModelCtrl.$setViewValue(newVal); - } - }); - } - }; - }]) - .directive('b2bAddBoard', ['BoardStripConfig', '$parse', function (BoardStripConfig, $parse) { - return { - restrict: 'AE', - replace: true, - require: '^b2bBoardStrip', - scope: { - onAddBoard: '&?' - }, - templateUrl: 'b2bTemplate/boardstrip/b2bAddBoard.html', - link: function (scope, element, attrs, ctrl) { - scope.addBoard = function () { - if (attrs['onAddBoard']) { - scope.onAddBoard = $parse(scope.onAddBoard); - scope.onAddBoard(); - ctrl.setAddBoardPressedFlag(true); - } - }; - } - }; - }]) - .directive('b2bBoardNavigation', ['keymap', 'events', function (keymap, events) { - return { - restrict: 'AE', - link: function (scope, elem) { - - var prevElem = keymap.KEY.LEFT; - var nextElem = keymap.KEY.RIGHT; - - elem.bind('keydown', function (ev) { - - if (!(ev.keyCode)) { - ev.keyCode = ev.which; - } - - switch (ev.keyCode) { - case nextElem: - events.preventDefault(ev); - events.stopPropagation(ev); - - if (elem[0].nextElementSibling && parseInt(angular.element(elem[0].nextElementSibling).attr('tabindex')) >= 0) { - angular.element(elem[0])[0].nextElementSibling.focus(); - } else { - /* IE8 fix */ - var el = angular.element(elem[0])[0]; - do { - if (el.nextSibling) { - el = el.nextSibling; - } else { - break; - } - } while (el && el.tagName !== 'LI'); - - if (el.tagName && el.tagName === 'LI' && parseInt(angular.element(el).attr('tabindex')) >= 0) { - el.focus(); - } - } - - break; - case prevElem: - events.preventDefault(ev); - events.stopPropagation(ev); - - if (elem[0].previousElementSibling && parseInt(angular.element(elem[0].previousElementSibling).attr('tabindex')) >= 0) { - angular.element(elem[0])[0].previousElementSibling.focus(); - } else { - /* IE8 fix */ - var el1 = angular.element(elem[0])[0]; - do { - if (el1.previousSibling) { - el1 = el1.previousSibling; - } else { - break; - } - } while (el1 && el1.tagName !== 'LI'); - - if (el1.tagName && el1.tagName === 'LI' && parseInt(angular.element(el1).attr('tabindex')) >= 0) { - el1.focus(); - } - } - break; - default: - break; - } - }); - } - }; - }]); + .constant('BoardStripConfig', { + 'maxVisibleBoards': 4, + 'boardsToScroll': 1, + /* These parameters are non-configurable and remain unaltered, until there is a change in corresponding CSS */ + 'boardLength': 140, + 'boardMargin': 15 + }) + .directive('b2bBoard', [function () { + return { + restrict: 'AE', + replace: true, + transclude: true, + require: '^b2bBoardStrip', + scope: { + boardIndex: '=', + boardLabel: '=' + }, + templateUrl: 'b2bTemplate/boardstrip/b2bBoard.html', + link: function (scope, element, attrs, ctrls) { + + var parentCtrl = ctrls; + + scope.getCurrentIndex = function () { + return parentCtrl.getCurrentIndex(); + }; + scope.selectBoard = function (boardIndex) { + if (!isNaN(boardIndex)) { + parentCtrl.setCurrentIndex(boardIndex); + } + }; + } + }; + }]) + .directive('b2bBoardStrip', ['BoardStripConfig', '$timeout', function (BoardStripConfig, $timeout) { + return { + restrict: 'AE', + replace: true, + transclude: true, + require: ['?ngModel', 'b2bBoardStrip'], + scope: { + boardsMasterArray: '=', + onAddBoard: '&?' + }, + templateUrl: 'b2bTemplate/boardstrip/b2bBoardstrip.html', + controller: function ($scope) { + if (!angular.isDefined($scope.boardsMasterArray)) { + $scope.boardsMasterArray = []; + } + + this.rectifyMaxVisibleBoards = function () { + if (this.maxVisibleIndex >= $scope.boardsMasterArray.length) { + this.maxVisibleIndex = $scope.boardsMasterArray.length - 1; + } + + if (this.maxVisibleIndex < 0) { + this.maxVisibleIndex = 0; + } + }; + + this.resetBoardStrip = function () { + $scope.currentIndex = 0; + + this.maxVisibleIndex = BoardStripConfig.maxVisibleBoards - 1; + this.minVisibleIndex = 0; + + this.rectifyMaxVisibleBoards(); + }; + + this.getCurrentIndex = function () { + return $scope.currentIndex; + }; + this.setCurrentIndex = function (indx) { + $scope.currentIndex = indx; + }; + + this.getBoardsMasterArrayLength = function () { + return $scope.boardsMasterArray.length; + }; + + $scope.addBoardPressedFlag = false; + this.getAddBoardPressedFlag = function () { + return $scope.addBoardPressedFlag; + }; + this.setAddBoardPressedFlag = function (booleanValue) { + $scope.addBoardPressedFlag = booleanValue; + }; + + }, + link: function (scope, element, attrs, ctrls) { + + var ngModelCtrl = ctrls[0]; + var ctrl = ctrls[1]; + + var oldTimeout; + var animationTimeout = 1000; + + var getBoardViewportWidth = function (numberOfVisibleBoards) { + return numberOfVisibleBoards * (BoardStripConfig.boardLength + BoardStripConfig.boardMargin); + }; + if (element[0].querySelector(".board-viewport")) { + angular.element(element[0].querySelector(".board-viewport")).css({ + "width": getBoardViewportWidth(BoardStripConfig.maxVisibleBoards) + "px" + }); + } + + var getBoardstripContainerWidth = function (totalNumberOfBoards) { + return totalNumberOfBoards * (BoardStripConfig.boardLength + BoardStripConfig.boardMargin); + }; + if (element[0].querySelector(".boardstrip-container")) { + angular.element(element[0].querySelector(".boardstrip-container")).css({ + "width": getBoardstripContainerWidth(ctrl.getBoardsMasterArrayLength()) + "px" + }); + angular.element(element[0].querySelector(".boardstrip-container")).css({ + "left": "0px" + }); + } + + var calculateAndGetBoardstripContainerAdjustment = function () { + + var calculatedAdjustmentValue; + + if (ctrl.getBoardsMasterArrayLength() <= BoardStripConfig.maxVisibleBoards) { + calculatedAdjustmentValue = 0; + } else { + calculatedAdjustmentValue = (ctrl.minVisibleIndex * (BoardStripConfig.boardLength + BoardStripConfig.boardMargin)) * -1; + } + + return calculatedAdjustmentValue; + }; + + var animateBoardstripContainerAdjustment = function (elementToFocusAfterAnimation) { + var oldContainerAdjustment = angular.element(element[0].querySelector(".boardstrip-container"))[0].style.left; + var containerAdjustment = calculateAndGetBoardstripContainerAdjustment(); + if (oldContainerAdjustment !== containerAdjustment + 'px') { + angular.element(element[0].querySelector(".boardstrip-container")).css({ + "left": containerAdjustment + "px" + }); + + $timeout.cancel(oldTimeout); + oldTimeout = $timeout(function () { + elementToFocusAfterAnimation.focus(); + }, animationTimeout); + } else { + elementToFocusAfterAnimation.focus(); + } + }; + + var updateBoardsTabIndex = function (boardArray, minViewIndex, maxViewIndex) { + for (var i = 0; i < boardArray.length; i++) { + angular.element(boardArray[i]).attr('tabindex', '-1'); + } + for (var j = minViewIndex; j <= maxViewIndex; j++) { + angular.element(boardArray[j]).attr('tabindex', '0'); + } + }; + + $timeout(function () { + var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); + updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); + }); + + scope.$watchCollection('boardsMasterArray', function (newVal, oldVal) { + if (newVal !== oldVal) { + /* When a board is removed */ + if (newVal.length < oldVal.length) { + ctrl.resetBoardStrip(); + $timeout(function () { + + var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); + if (currentBoardArray.length !== 0) { + animateBoardstripContainerAdjustment(currentBoardArray[0]); + } else { + element[0].querySelector('div.boardstrip-item--add').focus(); + } + + angular.element(element[0].querySelector(".boardstrip-container")).css({ + "width": getBoardstripContainerWidth(ctrl.getBoardsMasterArrayLength()) + "px" + }); + /* Update tabindecies to ensure keyboard navigation behaves correctly */ + updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); + }); + } + /* When a board is added */ + else { + if (ctrl.getAddBoardPressedFlag()) { + ctrl.maxVisibleIndex = ctrl.getBoardsMasterArrayLength() - 1; + ctrl.minVisibleIndex = Math.max(ctrl.maxVisibleIndex - BoardStripConfig.maxVisibleBoards + 1, 0); + + ctrl.setCurrentIndex(ctrl.maxVisibleIndex); + + $timeout(function () { + angular.element(element[0].querySelector(".boardstrip-container")).css({ + "width": getBoardstripContainerWidth(ctrl.getBoardsMasterArrayLength()) + "px" + }); + + var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); + animateBoardstripContainerAdjustment(currentBoardArray[currentBoardArray.length - 1]); + /* Update tabindecies to ensure keyboard navigation behaves correctly */ + updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); + }); + } else { + if (ctrl.minVisibleIndex === 0 && ctrl.getBoardsMasterArrayLength() < BoardStripConfig.maxVisibleBoards + 1) { + ctrl.maxVisibleIndex = ctrl.getBoardsMasterArrayLength() - 1; + ctrl.rectifyMaxVisibleBoards(); + } + + $timeout(function () { + angular.element(element[0].querySelector(".boardstrip-container")).css({ + "width": getBoardstripContainerWidth(ctrl.getBoardsMasterArrayLength()) + "px" + }); + + var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); + /* Update tabindecies to ensure keyboard navigation behaves correctly */ + updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); + }); + } + + ctrl.setAddBoardPressedFlag(false); + } + } + }); + + scope.nextBoard = function () { + ctrl.maxVisibleIndex += BoardStripConfig.boardsToScroll; + ctrl.rectifyMaxVisibleBoards(); + ctrl.minVisibleIndex = ctrl.maxVisibleIndex - (BoardStripConfig.maxVisibleBoards - 1); + + $timeout.cancel(oldTimeout); + angular.element(element[0].querySelector(".boardstrip-container")).css({ + "left": calculateAndGetBoardstripContainerAdjustment() + "px" + }); + + $timeout(function () { + var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); + + /* Remove tabindex from non-visible boards */ + updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); + + if (!(scope.isNextBoard())) { + try { + currentBoardArray[currentBoardArray.length - 1].focus(); + } catch (e) { /* IE8 may throw exception */ } + } + }, animationTimeout); + }; + scope.prevBoard = function () { + + ctrl.minVisibleIndex -= BoardStripConfig.boardsToScroll; + if (ctrl.minVisibleIndex < 0) { + ctrl.minVisibleIndex = 0; + } + + ctrl.maxVisibleIndex = ctrl.minVisibleIndex + BoardStripConfig.maxVisibleBoards - 1; + ctrl.rectifyMaxVisibleBoards(); + + $timeout.cancel(oldTimeout); + angular.element(element[0].querySelector(".boardstrip-container")).css({ + "left": calculateAndGetBoardstripContainerAdjustment() + "px" + }); + + $timeout(function () { + var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); + + /* Remove tabindex from non-visible boards */ + updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); + + if (ctrl.minVisibleIndex === 0) { + try { + element[0].querySelector('div.boardstrip-item--add').focus(); + } catch (e) { /* IE8 may throw exception */ } + } + }); + }; + + scope.isPrevBoard = function () { + return (ctrl.minVisibleIndex > 0); + }; + scope.isNextBoard = function () { + return (ctrl.getBoardsMasterArrayLength() - 1 > ctrl.maxVisibleIndex); + }; + + ngModelCtrl.$render = function () { + if (ngModelCtrl.$viewValue || ngModelCtrl.$viewValue === 0) { + var newCurrentIndex = ngModelCtrl.$viewValue; + + if (!(newCurrentIndex = parseInt(newCurrentIndex, 10))) { + newCurrentIndex = 0; + } + + if (newCurrentIndex <= 0) { + ctrl.resetBoardStrip(); + newCurrentIndex = 0; + + var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); + if (currentBoardArray.length !== 0) { + animateBoardstripContainerAdjustment(currentBoardArray[0]); + } else { + element[0].querySelector('div.boardstrip-item--add').focus(); + } + /* Update tabindecies to ensure keyboard navigation behaves correctly */ + updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); + } else if (newCurrentIndex >= ctrl.getBoardsMasterArrayLength()) { + ctrl.maxVisibleIndex = ctrl.getBoardsMasterArrayLength() - 1; + ctrl.rectifyMaxVisibleBoards(); + ctrl.minVisibleIndex = Math.max(ctrl.maxVisibleIndex - BoardStripConfig.maxVisibleBoards + 1, 0); + + newCurrentIndex = ctrl.maxVisibleIndex; + + $timeout(function () { + var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); + animateBoardstripContainerAdjustment(currentBoardArray[newCurrentIndex]); + /* Update tabindecies to ensure keyboard navigation behaves correctly */ + updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); + }); + } else { + + if (!(newCurrentIndex >= ctrl.minVisibleIndex && newCurrentIndex <= ctrl.maxVisibleIndex)) { + ctrl.minVisibleIndex = newCurrentIndex; + ctrl.maxVisibleIndex = ctrl.minVisibleIndex + BoardStripConfig.maxVisibleBoards - 1; + ctrl.rectifyMaxVisibleBoards(); + + if (ctrl.getBoardsMasterArrayLength() < BoardStripConfig.maxVisibleBoards) { + ctrl.minVisibleIndex = 0; + } else { + ctrl.minVisibleIndex = Math.max(ctrl.maxVisibleIndex - BoardStripConfig.maxVisibleBoards + 1, 0); + } + + $timeout(function () { + var currentBoardArray = element[0].querySelectorAll('[b2b-board]'); + animateBoardstripContainerAdjustment(currentBoardArray[newCurrentIndex]); + /* Update tabindecies to ensure keyboard navigation behaves correctly */ + updateBoardsTabIndex(currentBoardArray, ctrl.minVisibleIndex, ctrl.maxVisibleIndex); + }); + } + } + scope.currentIndex = newCurrentIndex; + ngModelCtrl.$setViewValue(newCurrentIndex); + } else { + ctrl.resetBoardStrip(); + ngModelCtrl.$setViewValue(0); + } + }; + + scope.$watch('currentIndex', function (newVal, oldVal) { + if (newVal !== oldVal && ngModelCtrl && ngModelCtrl.$viewValue !== newVal) { + ngModelCtrl.$setViewValue(newVal); + } + }); + } + }; + }]) + .directive('b2bAddBoard', ['BoardStripConfig', '$parse', function (BoardStripConfig, $parse) { + return { + restrict: 'AE', + replace: true, + require: '^b2bBoardStrip', + scope: { + onAddBoard: '&?' + }, + templateUrl: 'b2bTemplate/boardstrip/b2bAddBoard.html', + link: function (scope, element, attrs, ctrl) { + scope.addBoard = function () { + if (attrs['onAddBoard']) { + scope.onAddBoard = $parse(scope.onAddBoard); + scope.onAddBoard(); + ctrl.setAddBoardPressedFlag(true); + } + }; + } + }; + }]) + .directive('b2bBoardNavigation', ['keymap', 'events', function (keymap, events) { + return { + restrict: 'AE', + link: function (scope, elem) { + + var prevElem = keymap.KEY.LEFT; + var nextElem = keymap.KEY.RIGHT; + + elem.bind('keydown', function (ev) { + + if (!(ev.keyCode)) { + ev.keyCode = ev.which; + } + + switch (ev.keyCode) { + case nextElem: + events.preventDefault(ev); + events.stopPropagation(ev); + + if (elem[0].nextElementSibling && parseInt(angular.element(elem[0].nextElementSibling).attr('tabindex')) >= 0) { + angular.element(elem[0])[0].nextElementSibling.focus(); + } else { + /* IE8 fix */ + var el = angular.element(elem[0])[0]; + do { + if (el.nextSibling) { + el = el.nextSibling; + } else { + break; + } + } while (el && el.tagName !== 'LI'); + + if (el.tagName && el.tagName === 'LI' && parseInt(angular.element(el).attr('tabindex')) >= 0) { + el.focus(); + } + } + + break; + case prevElem: + events.preventDefault(ev); + events.stopPropagation(ev); + + if (elem[0].previousElementSibling && parseInt(angular.element(elem[0].previousElementSibling).attr('tabindex')) >= 0) { + angular.element(elem[0])[0].previousElementSibling.focus(); + } else { + /* IE8 fix */ + var el1 = angular.element(elem[0])[0]; + do { + if (el1.previousSibling) { + el1 = el1.previousSibling; + } else { + break; + } + } while (el1 && el1.tagName !== 'LI'); + + if (el1.tagName && el1.tagName === 'LI' && parseInt(angular.element(el1).attr('tabindex')) >= 0) { + el1.focus(); + } + } + break; + default: + break; + } + }); + } + }; + }]); +/** + * @ngdoc directive + * @name Template.att:Bootstrap Grid Template + * + * @description + * <file src="src/bootstrapGridTemplate/docs/readme.md" /> + * + * @example + * <section id="code"> + <example module="b2b.att"> + <file src="src/bootstrapGridTemplate/docs/demo.html" /> + <file src="src/bootstrapGridTemplate/docs/demo.js" /> + </example> + </section> + * + */ +angular.module('b2b.att.bootstrapGridTemplate', []) + /** * @ngdoc directive * @name Navigation.att:breadcrumbs @@ -1247,8 +1265,8 @@ Button shape * @example * <section id="code"> <b>HTML + AngularJS</b> - * <example module="b2b.att"> - * <file src="src/buttons/docs/demo.html" /> + * <example module="b2b.att"> + * <file src="src/buttons/docs/demo.html" /> <file src="src/buttons/docs/demo.js" /> * </example> </section> @@ -1295,7 +1313,7 @@ angular.module('b2b.att.calendar', ['b2b.att.position', 'b2b.att.utilities']) legendMessage: null, calendarDisabled: false, collapseWait: 0, - orientation: 'left', + orientation: 'right', inline: false, helperText: 'The date you selected is $date. In case of mobile double tap to open calendar. Select a date to close the calendar.', datepickerEvalAttributes: ['dateFormat', 'dayFormat', 'monthFormat', 'yearFormat', 'dayHeaderFormat', 'dayTitleFormat', 'disableWeekend', 'disableSunday', 'startingDay', 'collapseWait', 'orientation'], @@ -1359,11 +1377,15 @@ angular.module('b2b.att.calendar', ['b2b.att.position', 'b2b.att.utilities']) dayHeader: getValue($attrs.dayHeaderFormat, dtConfig.dayHeaderFormat), dayTitle: getValue($attrs.dayTitleFormat, dtConfig.dayTitleFormat), disableWeekend: getValue($attrs.disableWeekend, dtConfig.disableWeekend), - disableSunday: getValue($attrs.disableSunday, dtConfig.disableSunday), - disableDates: getValue($attrs.disableDates, dtConfig.disableDates) + disableSunday: getValue($attrs.disableSunday, dtConfig.disableSunday) }, startingDay = getValue($attrs.startingDay, dtConfig.startingDay); + if($attrs.disableDates !== undefined) { + format.disableDates = $attrs.disableDates; + } else { + format.disableDates = dtConfig.disableDates; + } $scope.minDate = dtConfig.minDate ? $scope.resetTime(dtConfig.minDate) : null; $scope.maxDate = dtConfig.maxDate ? $scope.resetTime(dtConfig.maxDate) : null; $scope.dueDate = dtConfig.dueDate ? $scope.resetTime(dtConfig.dueDate) : null; @@ -1398,12 +1420,35 @@ angular.module('b2b.att.calendar', ['b2b.att.position', 'b2b.att.utilities']) this.updatePosition = function (b2bDatepickerPopupTemplate) { $scope.position = $position.offset($element); - $scope.position.top = $scope.position.top + $element.find('input').prop('offsetHeight'); - if ($scope.orientation === 'right') { - $scope.position.left = $scope.position.left - (((b2bDatepickerPopupTemplate && b2bDatepickerPopupTemplate.prop('offsetWidth')) || 290) - $element.find('input').prop('offsetWidth')); - } + $scope.position.top = $scope.position.top + $element.prop('offsetHeight'); + $scope.position.left = $scope.position.left - (((b2bDatepickerPopupTemplate && b2bDatepickerPopupTemplate.prop('offsetWidth')) || 290) - $element.prop('offsetWidth')); }; + this.isDateInRange = function(date) { + if ((compare(date, $scope.minDate) >= 0) && (compare(date, $scope.maxDate) <= 0)) { + return true; + } else { + return false; + } + return false; + } + + this.isDisbaledDate = function(date) { + if ($attrs.from && !angular.isDate($scope.fromDate)) { + return true; + } + if (format.disableWeekend === true && (dateFilter(date, format.dayHeader) === "Saturday" || dateFilter(date, format.dayHeader) === "Sunday")) { + return true; + } + if (format.disableSunday === true && (dateFilter(date, format.dayHeader) === "Sunday")) { + return true; + } + + return (($scope.minDate && compare(date, $scope.minDate) < 0) || ($scope.maxDate && compare(date, $scope.maxDate) > 0) || ($scope.datesCallBack({ + date: date + }))); + + } function isSelected(dt) { if (dt && angular.isDate($scope.currentDate) && compare(dt, $scope.currentDate) === 0) { return true; @@ -1470,7 +1515,7 @@ angular.module('b2b.att.calendar', ['b2b.att.position', 'b2b.att.utilities']) if (isOld(date, currentMonthDate) || isNew(date, currentMonthDate)) { return true; } - return (($scope.minDate && compare(date, $scope.minDate) < 0) || ($scope.maxDate && compare(date, $scope.maxDate) > 0) || (format.disableDates && format.disableDates({ + return (($scope.minDate && compare(date, $scope.minDate) < 0) || ($scope.maxDate && compare(date, $scope.maxDate) > 0) || ($scope.datesCallBack({ date: date }))); }; @@ -1582,36 +1627,69 @@ angular.module('b2b.att.calendar', ['b2b.att.position', 'b2b.att.utilities']) ]; }]) -.directive('b2bDatepickerPopup', ['$parse', '$log', '$timeout', '$document', '$documentBind', '$isElement', '$templateCache', '$compile', 'trapFocusInElement', '$position', '$window', function ($parse, $log, $timeout, $document, $documentBind, $isElement, $templateCache, $compile, trapFocusInElement, $position, $window) { +.directive('b2bDatepicker', ['$parse', '$log', '$timeout', '$document', '$documentBind', '$isElement', '$templateCache', '$compile', 'trapFocusInElement', '$position', '$window', '$filter', 'b2bDatepickerConfig', function ($parse, $log, $timeout, $document, $documentBind, $isElement, $templateCache, $compile, trapFocusInElement, $position, $window, $filter, b2bDatepickerConfig) { return { restrict: 'EA', - replace: true, - transclude: true, - templateUrl: function (elem, attr) { - if (attr.inline === 'true') { - return 'b2bTemplate/calendar/datepicker-popup.html'; - } else { - return 'b2bTemplate/calendar/datepicker.html'; - } + scope: { + model: '=ngModel', + datesCallBack: '&disableDates', + onSelectClose: '&', + disabledInput: '=?ngDisabled' }, - scope: {}, - require: ['b2bDatepickerPopup', 'ngModel', '?^b2bDatepickerGroup'], + require: ['b2bDatepicker', 'ngModel', '?^b2bDatepickerGroup'], controller: 'b2bDatepickerController', link: function (scope, element, attrs, ctrls) { var datepickerCtrl = ctrls[0], ngModel = ctrls[1], b2bDatepickerGroupCtrl = ctrls[2]; var b2bDatepickerPopupTemplate; + var isCalendarOpened = false; + if(scope.disabledInput === undefined || scope.disabledInput === '') { + scope.disabledInput = false; + } + if(attrs.inline == 'true'){ + element.after($compile($templateCache.get('b2bTemplate/calendar/datepicker-popup.html'))(scope)); + var temp = element.after(); + element.remove(); + element = temp; + } else { + var buttonTabIndex = scope.disabledInput===true ? -1 : 0; + + element.after($compile('<button class="btn-calendar-icon" ng-disabled='+scope.disabledInput+' ><i class="icon-primary-calendar b2b-calendar-icon" aria-haspopup="true" aria-expanded="false" ng-class=\"{\'disabled\': '+scope.disabledInput+'}\" ></i></button>')(scope)); + element.attr('placeholder', 'MM/dd/yyyy'); + element.attr('b2b-format-date', b2bDatepickerConfig.dateFormat); + } + scope.$watch('model', function(val) { + + if(val !== undefined && val !== '') { + var date_regex = /^(0[1-9]|1[0-2])\/(0[1-9]|1\d|2\d|3[01])\/(19|20)\d{2}$/ ; + + if(!date_regex.test(element[0].value)) { + ngModel.$setValidity('datePattern', false); + } else { + ngModel.$setValidity('datePattern', true); + } + + } else { + ngModel.$setValidity('datePattern', true); + } + + }); if (!ngModel) { $log.error("ng-model is required."); return; // do nothing if no ng-model } + if(scope.model !== undefined && scope.model !== '') { + element[0].value = $filter('date')(scope.model, "MM/dd/yyyy"); + } + // Configuration parameters var mode = 0, selected; scope.isOpen = false; + var isValidDate = false; scope.headers = []; scope.footers = []; @@ -1620,21 +1698,66 @@ angular.module('b2b.att.calendar', ['b2b.att.position', 'b2b.att.utilities']) b2bDatepickerGroupCtrl.registerDatepickerScope(scope); } - element.find('button').bind('click', function () { - element.find('input')[0].click(); - }); + var calendarButton = angular.element(element[0].nextElementSibling); - element.find('input').bind('click', function () { + calendarButton.bind('click',function(){ + openCalendarPopup = false; if (!scope.ngDisabled) { scope.isOpen = !scope.isOpen; toggleCalendar(scope.isOpen); scope.$apply(); datepickerCtrl.updatePosition(b2bDatepickerPopupTemplate); $timeout(function () { - angular.element(element[0].querySelector('.datepicker-input')).scrollTop=0; + // angular.element(element[0].querySelector('.datepicker-input')).scrollTop=0; },10); } - }); + }) + var openCalendarPopup = false; + + element.bind('blur', function() { + if(scope.model !== undefined && scope.model !== '') { + var dateEntered = scope.model; + + var date_regex = /^(0[1-9]|1[0-2])\/(0[1-9]|1\d|2\d|3[01])\/(19|20)\d{2}$/ ; + + if(date_regex.test(dateEntered)) { + var parts = dateEntered.split('/'); + var enteredDate = new Date(parts[2],parts[0]-1,parts[1]); + + if(datepickerCtrl.isDateInRange(enteredDate)) { + isValidDate -= 1; + ngModel.$setValidity('outOfRange', true); + $timeout(function(){ + ngModel.$setValidity('outOfRange', true); + },10); + isValidDate = true; + if(!datepickerCtrl.isDisbaledDate(enteredDate)) { + $timeout(function(){ + ngModel.$setValidity('disabledDate', true); + },10); + scope.select(enteredDate); + openCalendarPopup = true; + } else { + $timeout(function(){ + ngModel.$setValidity('disabledDate', false); + },10); + isValidDate = false; + openCalendarPopup = false; + } + + } else { + isValidDate += 1; + $timeout(function(){ + ngModel.$setValidity('outOfRange', false); + },10); + isValidDate = false; + openCalendarPopup = false; + } + + } + } + }); + var toggleCalendar = function (flag) { if (!scope.inline) { if (flag) { @@ -1650,17 +1773,45 @@ angular.module('b2b.att.calendar', ['b2b.att.position', 'b2b.att.utilities']) scope.getFocus = false; scope.$apply(); }, 100); + handleTabEvent(); }); + angular.element(document.querySelector('.b2b-calendar-icon')).attr('aria-expanded','true'); } else { - b2bDatepickerPopupTemplate.unbind('keydown', keyPress); - b2bDatepickerPopupTemplate.remove(); - element.find('button')[0].focus(); + if(!openCalendarPopup) { + b2bDatepickerPopupTemplate.unbind('keydown', keyPress); + b2bDatepickerPopupTemplate.remove(); + } + element[0].focus(); scope.getFocus = false; + angular.element(document.querySelector('.b2b-calendar-icon')).attr('aria-expanded','false'); trapFocusInElement(flag, b2bDatepickerPopupTemplate); } } }; + var handleTabEvent = function(){ + b2bDatepickerPopupTemplate.find('td').on('keydown', function (e) { + if (e.keyCode == '9') { + if(e.shiftKey){ + if(b2bDatepickerPopupTemplate.find('tr')[0].querySelector('th.next')){ + b2bDatepickerPopupTemplate.find('tr')[0].querySelector('th.next').focus(); + }else{ + b2bDatepickerPopupTemplate.find('tr')[0].querySelector('th.datepicker-switch').focus() + } + }else{ + if(b2bDatepickerPopupTemplate.find('tr')[0].querySelector('th.prev')){ + b2bDatepickerPopupTemplate.find('tr')[0].querySelector('th.prev').focus(); + }else{ + b2bDatepickerPopupTemplate.find('tr')[0].querySelector('th.datepicker-switch').focus() + } + } + + e.preventDefault(); + e.stopPropagation(); + } + }); + } + var outsideClick = function (e) { var isElement = $isElement(angular.element(e.target), element, $document); var isb2bDatepickerPopupTemplate = $isElement(angular.element(e.target), b2bDatepickerPopupTemplate, $document); @@ -1871,6 +2022,8 @@ angular.module('b2b.att.calendar', ['b2b.att.position', 'b2b.att.utilities']) date: dt }) !== false)) { scope.currentDate = dt; + element[0].value = $filter('date')(dt, "MM/dd/yyyy"); + ngModel.$setValidity('outOfRange', true); if (angular.isNumber(scope.collapseWait)) { $timeout(function () { scope.isOpen = false; @@ -1892,6 +2045,7 @@ angular.module('b2b.att.calendar', ['b2b.att.position', 'b2b.att.utilities']) $timeout(function () { trapFocusInElement(); + handleTabEvent(); }, 100); $event.preventDefault(); @@ -1928,73 +2082,6 @@ angular.module('b2b.att.calendar', ['b2b.att.position', 'b2b.att.utilities']) }; }]) -.directive('b2bDatepicker', ['$compile', '$log', 'b2bDatepickerConfig', 'b2bDatepickerService', function ($compile, $log, b2bDatepickerConfig, b2bDatepickerService) { - return { - restrict: 'A', - scope: { - disableDates: '&', - onSelectClose: '&' - }, - require: 'ngModel', - controller: ['$scope', '$element', '$attrs', function (scope, elem, attr) { - var dateFormatString = angular.isDefined(attr.dateFormat) ? scope.$parent.$eval(attr.dateFormat) : b2bDatepickerConfig.dateFormat; - var helperText = angular.isDefined(attr.helperText) ? scope.$parent.$eval(attr.helperText) : b2bDatepickerConfig.helperText; - helperText = helperText.replace('$date', '{{dt | date : \'' + dateFormatString + '\'}}'); - - var inline = false; - if (elem.prop('nodeName') !== 'INPUT') { - inline = true; - } - - var calendarIcon = '<i class="icon-primary-calendar" aria-hidden="true"></i>' - var selectedDateMessage = '<button id="' + attr.btnId + '" type="button" class="span12 faux-input" ng-disabled="ngDisabled"><span class="hidden-spoken">' + helperText + '</span></button>'; - - elem.removeAttr('b2b-datepicker'); - elem.removeAttr('ng-model'); - elem.removeAttr('ng-disabled'); - elem.addClass('datepicker-input'); - elem.attr('ng-model', 'dt'); - elem.attr('aria-describedby', 'datepicker'); - elem.attr('aria-hidden', 'true'); - elem.attr('tabindex', '-1'); - elem.attr('readonly', 'true'); - elem.attr('ng-disabled', 'ngDisabled'); - elem.attr('b2b-format-date', dateFormatString); - - var wrapperElement = angular.element('<div></div>'); - wrapperElement.attr('b2b-datepicker-popup', ''); - wrapperElement.attr('ng-model', 'dt'); - if (inline) { - wrapperElement.attr('inline', inline); - } - - b2bDatepickerService.setAttributes(attr, wrapperElement); - b2bDatepickerService.bindScope(attr, scope); - - wrapperElement.html(''); - wrapperElement.append(calendarIcon); - wrapperElement.append(selectedDateMessage); - wrapperElement.append(elem.prop('outerHTML')); - - var elm = wrapperElement.prop('outerHTML'); - elm = $compile(elm)(scope); - elem.replaceWith(elm); - }], - link: function (scope, elem, attr, ctrl) { - if (!ctrl) { - $log.error("ng-model is required."); - return; // do nothing if no ng-model - } - - scope.$watch('dt', function (value) { - ctrl.$setViewValue(value); - }); - ctrl.$render = function () { - scope.dt = ctrl.$viewValue; - }; - } - }; -}]) .directive('b2bDatepickerGroup', [function () { return { @@ -2145,151 +2232,248 @@ angular.module('b2b.att.checkboxes', ['b2b.att.utilities']) */ angular.module('b2b.att.coachmark', ['b2b.att.utilities','b2b.att.position']) - - .directive('b2bCoachmark', ['$document', '$compile', '$position', '$timeout', function($document, $compile, $position, $timeout) { + + .directive('b2bCoachmark', ['$document', '$compile', '$position', '$timeout', 'b2bViewport', 'keymap', function($document, $compile, $position, $timeout, b2bViewport, keymap) { return { restrict: 'A', - scope: { - coachmarks: '=', - coachmarkIndex: '=', - startCoachmarkCallback: '&', - endCoachmarkCallback: '&', - actionCoachmarkCallback: '&' - }, + scope: { + coachmarks: '=', + coachmarkIndex: '=', + startCoachmarkCallback: '&', + endCoachmarkCallback: '&', + actionCoachmarkCallback: '&' + }, link: function (scope, element, attrs, ctrl) { - var coachmarkItems = scope.coachmarks; - var body = $document.find('body').eq(0); - var coackmarkJqContainer; - var coackmarkContainer; - var coachMarkElement; - var backdropjqLiteEl; - var coachmarkHighlight; - var initaitedCoachmark = false; - scope.coackmarkElPos ={ - 'top':'', - 'left':'' - }; - - scope.currentCoachmark = {}; - - + var coachmarkItems = scope.coachmarks; + var body = $document.find('body').eq(0); + var coackmarkJqContainer; + var coackmarkContainer; + var coachMarkElement; + var backdropjqLiteEl; + var coachmarkHighlight; + var initaitedCoachmark = false; + scope.coackmarkElPos ={ + 'top':'', + 'left':'' + }; + + scope.currentCoachmark = {}; + + var coachmarkBackdrop = function(){ - backdropjqLiteEl = angular.element('<div class="b2b-modal-backdrop fade in hidden-by-modal"></div>'); - body.append(backdropjqLiteEl); - - backdropjqLiteEl.bind('click', function() { - scope.closeCoachmark(); - scope.$apply(); - }); - }; - - - scope.closeButtonFocus = function(){ - if(document.getElementsByClassName('b2b-coachmark-header').length >0){ - document.getElementsByClassName('b2b-coachmark-header')[0].scrollLeft = 0; - document.getElementsByClassName('b2b-coachmark-header')[0].scrollTop = 0; - } - } - - scope.actionCoachmark = function(action){ - scope.actionCoachmarkCallback({ - 'action':action - }) - }; - - scope.closeCoachmark = function(){ - initaitedCoachmark = false; - backdropjqLiteEl.remove(); - coackmarkContainer.remove(); - coachmarkHighlight.remove(); - if(coachMarkElement !== undefined && coachMarkElement !==""){ - coachMarkElement.removeClass('b2b-coachmark-label') - } - if (angular.isFunction(scope.endCoachmarkCallback)){ - scope.endCoachmarkCallback(); - } - element[0].focus(); - } - - function showCoachmark(targetElement) { - scope.currentCoachmark = targetElement; - if(coachMarkElement !== undefined && coachMarkElement !==""){ - coachMarkElement.removeClass('b2b-coachmark-label') - coackmarkContainer.remove(); - coachmarkHighlight.remove(); - } - coachMarkElement = angular.element(document.querySelector(targetElement.elementId)); - coachMarkElement.addClass('b2b-coachmark-label'); - var elementPosition = $position.offset(coachMarkElement); + backdropjqLiteEl = angular.element('<div class="b2b-modal-backdrop fade in hidden-by-modal"></div>'); + body.append(backdropjqLiteEl); + + backdropjqLiteEl.bind('click', function() { + scope.closeCoachmark(); + scope.$apply(); + }); + }; + + + scope.closeButtonFocus = function(){ + if(document.getElementsByClassName('b2b-coachmark-header').length >0){ + document.getElementsByClassName('b2b-coachmark-header')[0].scrollLeft = 0; + document.getElementsByClassName('b2b-coachmark-header')[0].scrollTop = 0; + } + } + + scope.actionCoachmark = function(action){ + scope.actionCoachmarkCallback({ + 'action':action + }) + }; + + scope.closeCoachmark = function(){ + initaitedCoachmark = false; + backdropjqLiteEl.remove(); + coackmarkContainer.remove(); + coachmarkHighlight.remove(); + if(coachMarkElement !== undefined && coachMarkElement !==""){ + coachMarkElement.removeClass('b2b-coachmark-label') + } + if (angular.isFunction(scope.endCoachmarkCallback)){ + scope.endCoachmarkCallback(); + } + element[0].focus(); + } + + var realStyle = function(_elem, _style) { + var computedStyle; + if ( typeof _elem.currentStyle != 'undefined' ) { + computedStyle = _elem.currentStyle; + } else { + computedStyle = document.defaultView.getComputedStyle(_elem, null); + } + + return _style ? computedStyle[_style] : computedStyle; + }; + + var copyComputedStyle = function(src, dest) { + var s = realStyle(src); + for ( var i in s ) { + // Do not use `hasOwnProperty`, nothing will get copied + if ( typeof i == "string" && i != "cssText" && !/\d/.test(i) && i.indexOf('webkit') !== 0 ) { + // The try is for setter only properties + try { + dest.style[i] = s[i]; + // `fontSize` comes before `font` If `font` is empty, `fontSize` gets + // overwritten. So make sure to reset this property. (hackyhackhack) + // Other properties may need similar treatment + if ( i == "font" ) { + dest.style.fontSize = s.fontSize; + } + } catch (e) {} + } + } + }; + + function showCoachmark(targetElement) { + + scope.currentCoachmark = targetElement; + if(coachMarkElement !== undefined && coachMarkElement !==""){ + coachMarkElement.removeClass('b2b-coachmark-label') + coackmarkContainer.remove(); + coachmarkHighlight.remove(); + } + coachMarkElement = angular.element(document.querySelector(targetElement.elementId)); + + var elementPosition = $position.offset(coachMarkElement); + + coachmarkHighlight = angular.element('<div class="b2b-coachmark-highlight"></div><div class="b2b-coachmark-highlight b2b-coachmark-highlight-mask"></div>'); + coachmarkHighlight.css({ + 'width': (elementPosition.width + 25) +'px', + 'top': (elementPosition.top -10) + 'px', + 'left': (elementPosition.left - 10) + 'px', + 'height': (elementPosition.height + 20) +'px' + }); + if(targetElement.cloneHtml){ + var copy = coachMarkElement[0].cloneNode(true); + copy.id = "b2b-unique-"+targetElement.elementId.slice(1); + copyComputedStyle(coachMarkElement[0],copy); + var copychildNodes = copy.childNodes; + var coachmarkChildNodes = coachMarkElement[0].childNodes; + for(i=0;i<copychildNodes.length;i++){ + if(copychildNodes[i].nodeType === '3'){ + copyComputedStyle(coachmarkChildNodes[i],copychildNodes[i]) + } + } + coachmarkHighlight[0].appendChild(copy); // IE11 only supports appendChild, not append + }else{ + coachMarkElement.addClass('b2b-coachmark-label'); + } + + body.append(coachmarkHighlight); + + scope.coackmarkElPos.top = (elementPosition.top + elementPosition.height + 32) + 'px'; + scope.coackmarkElPos.left = (elementPosition.left - 158 + elementPosition.width / 2 ) + 'px'; + coackmarkJqContainer = angular.element('<div b2b-coachmark-container b2b-trap-focus-inside-element="true"></div>'); + coackmarkContainer = $compile(coackmarkJqContainer)(scope); + body.append(coackmarkContainer); + + + $timeout(function () { + var currentCoachmarkContainer = document.getElementsByClassName('b2b-coachmark-container')[0]; + currentCoachmarkContainer.focus(); + + newElem = angular.element(currentCoachmarkContainer); + newElem.bind('keydown', function (e) { + if(e.keyCode == keymap.KEY.TAB){ + if(e.shiftKey) { + if(e.target.className === 'b2b-coachmark-container'){ + e.preventDefault(); + e.stopPropagation(); + } + } + } + }); + var coachmarkHeight = window.getComputedStyle(currentCoachmarkContainer).height.split('px')[0]; + var newOffsetHeight = Math.round(elementPosition.top) - elementPosition.height; + + // We need a slight offset to show the lightboxed item + if(!targetElement.cloneHtml){ + TweenLite.to(window, 2, {scrollTo:{x: (scope.coackmarkElPos.left.split('px')[0] - 100), y: newOffsetHeight-200}}); + } + }, 200); + } + + element.bind('click', function (e) { + initaitedCoachmark = true; - coachmarkHighlight = angular.element('<div class="b2b-coachmark-highlight"></div><div class="b2b-coachmark-highlight b2b-coachmark-highlight-mask"></div>'); - coachmarkHighlight.css({ - 'width': (elementPosition.width + 20) +'px', - 'top': (elementPosition.top -10) + 'px', - 'left': (elementPosition.left - 10) + 'px', - 'height': (elementPosition.height + 20) +'px' - }); - body.append(coachmarkHighlight); - - scope.coackmarkElPos.top = (elementPosition.top + elementPosition.height + 32) + 'px'; - scope.coackmarkElPos.left = (elementPosition.left - 158 + elementPosition.width / 2 ) + 'px'; - coackmarkJqContainer = angular.element('<div b2b-coachmark-container b2b-trap-focus-inside-element="true"></div>'); - coackmarkContainer = $compile(coackmarkJqContainer)(scope); - body.append(coackmarkContainer); - - $timeout(function () { - var currentCoachmarkContainer = document.getElementsByClassName('b2b-coachmark-container')[0]; - currentCoachmarkContainer.focus(); - var coachmarkHeight = window.getComputedStyle(currentCoachmarkContainer).height.split('px')[0]; - var newOffsetHeight = (Math.round(elementPosition.top) - Math.round(coachmarkHeight)); - - // We need a slight offset to show the lightboxed item - TweenLite.to(window, 2, {scrollTo:{x: (scope.coackmarkElPos.left.split('px')[0]-100), y: newOffsetHeight}}); - }, 200); - } - - element.bind('click', function (e) { - initaitedCoachmark = true; - if(scope.coachmarkIndex === -1 || scope.coachmarkIndex >= coachmarkItems.length ){ - scope.coachmarkIndex = 0; - } - scope.$watch('coachmarkIndex', function () { - if(initaitedCoachmark === true){ - if(scope.coachmarkIndex === -1 || scope.coachmarkIndex >= coachmarkItems.length ){ - scope.closeCoachmark(); - }else{ - showCoachmark(coachmarkItems[scope.coachmarkIndex]); - } - } - }); - coachmarkBackdrop(); - showCoachmark(coachmarkItems[scope.coachmarkIndex]); - if (angular.isFunction(scope.startCoachmarkCallback)){ - scope.startCoachmarkCallback(); - } - $document.bind('keydown', function (evt) { - if (evt.which === 27 && initaitedCoachmark) { - scope.closeCoachmark(); - scope.$apply(); + scope.$watch('coachmarkIndex', function () { + if(initaitedCoachmark === true){ + if(scope.coachmarkIndex === -1){ + scope.closeCoachmark(); + }else{ + findAvailableCoachmark(scope.coachmarkIndex); + showCoachmark(scope.coachmarks[scope.coachmarkIndex]); + } + } + }); + coachmarkBackdrop(); + var findAvailableCoachmark = function(index){ + if(index === -1){ + scope.coachmarkIndex = 0; + } else if(!angular.isDefined(scope.coachmarks[index]) || angular.element(document.querySelector(scope.coachmarks[index].elementId)).length === 0){ + findAvailableCoachmark(index-1); + } else { + scope.coachmarkIndex = index; } - }); - }); - + } + if (angular.isFunction(scope.startCoachmarkCallback)){ + scope.startCoachmarkCallback(); + } + findAvailableCoachmark(scope.coachmarkIndex); + showCoachmark(scope.coachmarks[scope.coachmarkIndex]); + + $document.bind('keydown', function (evt) { + if (evt.which === 27 && initaitedCoachmark) { + scope.closeCoachmark(); + scope.$apply(); + } + }); + }); + //performance technique to ensure scroll event doesn't cause lag + var throttle = function(type, name, obj) { + obj = obj || window; + var running = false; + var func = function() { + if (running) { return; } + running = true; + requestAnimationFrame(function() { + obj.dispatchEvent(new CustomEvent(name)); + running = false; + }); + }; + obj.addEventListener(type, func); + }; + + scope.viewportWidth = b2bViewport.viewportWidth(); + /* init - you can init any event */ + throttle("resize", "optimizedResize"); + window.addEventListener("optimizedResize", function() { + if(initaitedCoachmark){ + showCoachmark(scope.coachmarks[scope.coachmarkIndex]); + scope.viewportWidth = b2bViewport.viewportWidth(); + scope.$digest(); + } + }); } }; }]) - .directive('b2bCoachmarkContainer', ['$document', '$position', function($document, $position) { - return { - restrict: 'A', - transclude: true, + .directive('b2bCoachmarkContainer', ['$document', '$position', function($document, $position) { + return { + restrict: 'A', + transclude: true, replace: true, - templateUrl: 'b2bTemplate/coachmark/coachmark.html', - link: function (scope, element, attrs, ctrl) { - - } - }; - }]); - + templateUrl: 'b2bTemplate/coachmark/coachmark.html', + link: function (scope, element, attrs, ctrl) { + + } + }; + }]); + + /** * @ngdoc directive * @name Template.att:Configuration Section @@ -2436,13 +2620,11 @@ angular.module('b2b.att.dropdowns', ['b2b.att.utilities', 'b2b.att.position', 'n set(); }); } + }], link: function (scope, elem, attr, ctrl) { if ((scope.isInputDropdown && b2bUserAgent.notMobile()) || (!scope.isInputDropdown)) { scope.updateModel = function () { - if (ctrl.$dirty) { - debugger; - } ctrl.$setViewValue(scope.currentSelected.value); if (scope.dropdownRequired && scope.currentSelected.value === '') { scope.setRequired(false); @@ -2457,22 +2639,23 @@ angular.module('b2b.att.dropdowns', ['b2b.att.utilities', 'b2b.att.position', 'n } }; ctrl.$render = function () { -// if(ctrl.$dirty || ctrl.$pristine) { - $timeout(function () { - if ((angular.isUndefined(ctrl.$viewValue) || ctrl.$viewValue == '') && (angular.isUndefined(scope.placeHoldertext) || scope.placeHoldertext == '')) { - scope.dropdownLists[ctrl.$viewValue] && scope.dropdownLists[ctrl.$viewValue][0].updateDropdownValue(); - } else if ((angular.isUndefined(scope.placeHoldertext) || scope.placeHoldertext == '') && ctrl.$viewValue !== '' ) { - scope.dropdownLists[ctrl.$viewValue] && scope.dropdownLists[ctrl.$viewValue][0].updateDropdownValue(); - } else if ((angular.isUndefined(ctrl.$viewValue) || ctrl.$viewValue == '') && scope.placeHoldertext !== '' ) { - scope.currentSelected.text = scope.placeHoldertext; - } else { - scope.dropdownLists[ctrl.$viewValue] && scope.dropdownLists[ctrl.$viewValue][0].updateDropdownValue(); - } + $timeout(function () { + + if ((angular.isUndefined(ctrl.$viewValue) || ctrl.$viewValue == '') && (angular.isUndefined(scope.placeHoldertext) || scope.placeHoldertext == '')) { + scope.dropdownLists[ctrl.$viewValue] && scope.dropdownLists[ctrl.$viewValue][0].updateDropdownValue(); + } else if ((angular.isUndefined(scope.placeHoldertext) || scope.placeHoldertext == '') && ctrl.$viewValue !== '' ) { + scope.dropdownLists[ctrl.$viewValue] && scope.dropdownLists[ctrl.$viewValue][0].updateDropdownValue(); + } else if ((angular.isUndefined(ctrl.$viewValue) || ctrl.$viewValue == '') && scope.placeHoldertext !== '' ) { + scope.currentSelected.text = scope.placeHoldertext; + ctrl.$setViewValue(scope.placeHoldertext); + } else { + scope.dropdownLists[ctrl.$viewValue] && scope.dropdownLists[ctrl.$viewValue][0].updateDropdownValue(); + } + + }, 100); + }; - }, 100); - }; -// } scope.disabled = false; scope.dropdownName = attr.name; scope.dropdownId = attr.id; @@ -2525,10 +2708,29 @@ angular.module('b2b.att.dropdowns', ['b2b.att.utilities', 'b2b.att.position', 'n label: '', index: -1 }; + scope.dropdownTextList = []; var searchString = ''; + + scope.removeItem = function(value){ + delete scope.dropdownLists[value]; + var index = scope.dropdownListValues.indexOf(value); + scope.dropdownListValues.splice(index,1); + scope.dropdownTextList=[]; + scope.dropdown.totalIndex = scope.dropdownListValues.length-1; + }; + var getDropdownText = function(){ + var dropdownItems = elem.parent().find('ul').children(); + var count = dropdownItems.length; + for(var i=0;i<count;i++){ + scope.dropdownTextList.push(dropdownItems.eq(i).text()); + } + }; var searchElement = function (searchExp) { - var regex = new RegExp("\\b" + searchExp, "gi"); - var position = scope.dropdownListValues.regexIndexOf(regex, scope.currentSelected.index + 1, true); + if(scope.dropdownTextList.length ==0){ + getDropdownText (); + } + var regex = new RegExp("^" + searchExp, "i"); + var position = scope.dropdownTextList.regexIndexOf(regex, scope.currentSelected.index + 1, true); if (position > -1) { return position; } @@ -2561,6 +2763,17 @@ angular.module('b2b.att.dropdowns', ['b2b.att.utilities', 'b2b.att.position', 'n ctrl.resetCounter(scope.dropdownLists[scope.currentSelected.value][2]); } } + $timeout(function () { + if(scope.dropdownLists[scope.currentSelected.value] !== undefined){ + (scope.dropdownLists[scope.currentSelected.value][1])[0].focus(); + } else { + if (scope.isInputDropdown) { + elem.parent().find('input')[0].focus(); + } else { + elem.parent().find('button')[0].focus(); + } + } + }, 100); if (scope.dropdownType === b2bDropdownConfig.linkMenuKeyword) { scope.appendCaretPositionStyle(); } @@ -2579,7 +2792,7 @@ angular.module('b2b.att.dropdowns', ['b2b.att.utilities', 'b2b.att.position', 'n if (!scope.toggleFlag) { if (ev.keyCode) { var currentIndex = scope.currentSelected.index; - if (ev.altKey === true && ev.keyCode === keymap.KEY.DOWN) { + if (ev.keyCode === keymap.KEY.DOWN) { scope.toggleDropdown(true); ev.preventDefault(); ev.stopPropagation(); @@ -2621,6 +2834,7 @@ angular.module('b2b.att.dropdowns', ['b2b.att.utilities', 'b2b.att.position', 'n } }; $documentBind.click('toggleFlag', outsideClick, scope); + $documentBind.touch('toggleFlag', outsideClick, scope); } }; }]) @@ -2662,14 +2876,14 @@ angular.module('b2b.att.dropdowns', ['b2b.att.utilities', 'b2b.att.position', 'n .directive("b2bDropdownList", ['$compile', '$templateCache', 'b2bUserAgent', function ($compile, $templateCache, b2bUserAgent) { return { restrict: 'A', - controller: ['$scope', '$element', '$attrs', function (scope, elem, attr) { + controller: ['$scope', '$element', '$attrs', function (scope, elem, attr) { if ((scope.isInputDropdown && b2bUserAgent.notMobile()) || (!scope.isInputDropdown)) { var innerHtml = angular.element('<div></div>').append(elem.html()); innerHtml = ($compile(innerHtml)(scope)).html(); var template = angular.element($templateCache.get('b2bTemplate/dropdowns/b2bDropdownListDesktop.html')); template.attr('ng-repeat', attr.optionRepeat); template.attr('value', elem.attr('value')); - template.attr('search-key', elem.attr('value')); + template.attr('search-key', elem.text()); if (elem.attr('aria-describedby')){ template.attr('aria-describedby', attr.ariaDescribedby); } @@ -2701,6 +2915,7 @@ angular.module('b2b.att.dropdowns', ['b2b.att.utilities', 'b2b.att.position', 'n return { restrict: 'A', scope: true, + link: function (scope, elem, attr, ctrl) { var dropdownListValue = scope.dropdownListValue = attr.value; scope.dropdown.totalIndex++; @@ -2710,20 +2925,17 @@ angular.module('b2b.att.dropdowns', ['b2b.att.utilities', 'b2b.att.position', 'n scope.dropdownLists[dropdownListValue][0] = scope; scope.dropdownLists[dropdownListValue][1] = elem; scope.dropdownLists[dropdownListValue][2] = dropdownListIndex; + scope.$parent.$parent.dropdownTextList=[]; scope.updateDropdownValue = function () { scope.currentSelected.value = dropdownListValue; if (scope.isInputDropdown) { scope.currentSelected.text = elem.text(); + scope.currentSelected.label = elem.text(); } else if ((scope.dropdownType === b2bDropdownConfig.linkMenuKeyword) || (scope.dropdownType === b2bDropdownConfig.menuKeyword && scope.dropdownSize === b2bDropdownConfig.smallKeyword)) { scope.currentSelected.text = dropdownListValue; - } else if (scope.dropdownType === b2bDropdownConfig.menuKeyword) { - scope.currentSelected.text = $sce.trustAsHtml(elem.html()); - } - if (scope.isInputDropdown) { - scope.currentSelected.label = elem.text(); - } else if (scope.dropdownType === b2bDropdownConfig.linkMenuKeyword) { scope.currentSelected.label = dropdownListValue; } else if (scope.dropdownType === b2bDropdownConfig.menuKeyword) { + scope.currentSelected.text = $sce.trustAsHtml(elem.html()); scope.currentSelected.label = elem.text(); } scope.currentSelected.index = dropdownListIndex; @@ -2740,6 +2952,7 @@ angular.module('b2b.att.dropdowns', ['b2b.att.utilities', 'b2b.att.position', 'n elem.bind('mouseover', function (ev) { elem[0].focus(); }); + elem.bind('keydown', function (ev) { if (!ev.keyCode) { if (ev.which) { @@ -2759,6 +2972,9 @@ angular.module('b2b.att.dropdowns', ['b2b.att.utilities', 'b2b.att.position', 'n } scope.$apply(); }); + scope.$on('$destroy',function(){ + scope.removeItem(dropdownListValue); + }); } }; }]) @@ -2833,13 +3049,13 @@ angular.module('b2b.att.dropdowns', ['b2b.att.utilities', 'b2b.att.position', 'n * * @usage * -<form id="dragDropFile"> +<form id="dragDropFile"> <div b2b-file-drop file-model="fileModel" on-drop="triggerFileUpload()" align="center"> <p> <br>To upload a file, drag & drop it here or - <span b2b-file-link file-model="fileModel" on-file-select="triggerFileUpload()" > - click here to select from your computer. - </span><br> + <span b2b-file-link file-model="fileModel" on-file-select="triggerFileUpload()" > + click here to select from your computer. + </span><br> </p> </div> </form> @@ -2861,7 +3077,7 @@ angular.module('b2b.att.fileUpload', ['b2b.att.utilities']) fileModel: '=', onDrop: '&' }, - controller: ['$scope', '$attrs', function($scope, $attrs) { + controller: ['$scope', '$attrs', function($scope, $attrs) { this.onDrop = $scope.onDrop; }], link: function(scope, element) { @@ -2952,7 +3168,7 @@ angular.module('b2b.att.fileUpload', ['b2b.att.utilities']) $scope.onFileSelect(); } }; - + }], link: function(scope, element, attr, b2bFileDropCtrl) { scope.takeFileModelFromParent = false; @@ -3003,13 +3219,13 @@ angular.module('b2b.att.fileUpload', ['b2b.att.utilities']) * <div b2b-filters></div> * * @example - * <section id="code"> - <b>HTML + AngularJS</b> - <example module="b2b.att"> + * <section id="code"> + <b>HTML + AngularJS</b> + <example module="b2b.att"> <file src="src/filters/docs/demo.html" /> <file src="src/filters/docs/demo.js" /> </example> - </section> + </section> * */ angular.module('b2b.att.filters', ['b2b.att.utilities', 'b2b.att.multipurposeExpander']) @@ -3357,7 +3573,7 @@ angular.module('b2b.att.flyout', ['b2b.att.utilities', 'b2b.att.position']) closeFlyout: '&' }, link: function (scope, element, attrs, ctrl) { - element.bind('click', function (e) { + element.bind('click touchstart', function (e) { scope.closeFlyout(e); ctrl.closeFlyout(e); }); @@ -3431,10 +3647,10 @@ angular.module('b2b.att.footer', ['b2b.att.utilities']). }, templateUrl: 'b2bTemplate/footer/footer_column_switch_tpl.html', link: function(scope) { - var tempFooterColumns = scope.footerLinkItems.length; - scope.footerColumns = 3; + var tempFooterColumns = scope.footerLinkItems.length; + scope.footerColumns = 3; if ( (tempFooterColumns === 5) || (tempFooterColumns === 4) ) { - scope.footerColumns = tempFooterColumns; + scope.footerColumns = tempFooterColumns; } } @@ -3488,7 +3704,7 @@ angular.module('b2b.att.footer', ['b2b.att.utilities']). * */ angular.module('b2b.att.header', ['b2b.att.dropdowns','b2b.att.utilities']) - .directive('b2bHeaderMenu', ['keymap', '$documentBind', '$timeout', '$isElement', '$document', function (keymap, $documentBind, $timeout, $isElement, $document) { + .directive('b2bHeaderMenu', ['keymap', '$documentBind', '$timeout', '$isElement', '$document', function (keymap, $documentBind, $timeout, $isElement, $document) { return { restrict: 'A', controller:['$scope',function($scope){ @@ -3601,10 +3817,10 @@ angular.module('b2b.att.header', ['b2b.att.dropdowns','b2b.att.utilities']) evt.preventDefault(); scope.showMenu = false; elem.removeClass('active'); - menuItem.attr('aria-expanded',false); - $timeout(function(){ - menuItem[0].focus(); - },100); + menuItem.attr('aria-expanded',false); + $timeout(function(){ + menuItem[0].focus(); + },100); scope.$apply(); break; default: @@ -3620,14 +3836,6 @@ angular.module('b2b.att.header', ['b2b.att.dropdowns','b2b.att.utilities']) } }; $documentBind.click('showMenu', outsideClick, scope); - /*Change for ECOMP - hide header menu when click on iframe in a new tab*/ - $(window).blur(function() { - if(scope.showMenu){ - scope.showMenu = false; - elem.removeClass('active'); - scope.$apply(); - } - }); } }; }]).directive('b2bHeaderSubmenu', ['$timeout',function ($timeout) { @@ -3636,39 +3844,39 @@ angular.module('b2b.att.header', ['b2b.att.dropdowns','b2b.att.utilities']) link: function (scope, elem) { var caretSign = angular.element("<i class='menuCaret'></i>"); $timeout(function(){ - var menuItem = angular.element(elem[0].children[0]); - menuItem.bind('focus mouseenter', function () { - elem.parent().children().removeClass('active'); - elem.addClass('active'); - if(elem[0].childElementCount > 1){ // > 1 has third level menu - menuItem.attr('aria-expanded',true); - menuItem.attr('aria-haspopup',true); - } - var caretLeft = (elem[0].offsetLeft + elem[0].offsetWidth/2) - 10; - caretSign.css({left: caretLeft + 'px'}); - angular.element(caretSign); - var tertiaryItems = elem[0].querySelectorAll('[b2b-header-tertiarymenu]'); - if(tertiaryItems.length >=1){ - elem.append(caretSign); - } - }); - menuItem.bind('blur', function () { - $timeout(function () { - var parentElm = document.activeElement.parentElement.parentElement; - if(parentElm){ - if (!(parentElm.hasAttribute('b2b-header-tertiarymenu'))) { - elem.removeClass('active'); - if(elem[0].childElementCount > 1){ // > 1 has third level menu - menuItem.attr('aria-expanded',false); - } - var caret = elem[0].querySelector('.menuCaret'); - if(caret){ - caret.remove(); - } - } - } - }); - }); + var menuItem = angular.element(elem[0].children[0]); + menuItem.bind('focus mouseenter', function () { + elem.parent().children().removeClass('active'); + elem.addClass('active'); + if(elem[0].childElementCount > 1){ // > 1 has third level menu + menuItem.attr('aria-expanded',true); + menuItem.attr('aria-haspopup',true); + } + var caretLeft = (elem[0].offsetLeft + elem[0].offsetWidth/2) - 10; + caretSign.css({left: caretLeft + 'px'}); + angular.element(caretSign); + var tertiaryItems = elem[0].querySelectorAll('[b2b-header-tertiarymenu]'); + if(tertiaryItems.length >=1){ + elem.append(caretSign); + } + }); + menuItem.bind('blur', function () { + $timeout(function () { + var parentElm = document.activeElement.parentElement.parentElement; + if(parentElm){ + if (!(parentElm.hasAttribute('b2b-header-tertiarymenu'))) { + elem.removeClass('active'); + if(elem[0].childElementCount > 1){ // > 1 has third level menu + menuItem.attr('aria-expanded',false); + } + var caret = elem[0].querySelector('.menuCaret'); + if(caret){ + caret.remove(); + } + } + } + }); + }); }); } }; @@ -3749,102 +3957,81 @@ angular.module('b2b.att.header', ['b2b.att.dropdowns','b2b.att.utilities']) }]).directive('b2bHeaderResponsive', ['$timeout',function ($timeout) { return{ restrict: 'A', - controller: function($scope){ - this.applyMediaQueries = function(value){ - document.querySelector('style').textContent += - "@media screen and (max-width:950px) { \ - .header__item.profile { right: " + value + "px; } \ - }"; - }; - this.arrangeResponsiveHeader = function(children){ - /* - * clientWidth of 1090 === max-width of 1100px - * clientWidth of 920 === max-width of 950px - * see b2b-angular.css for rest of responsive header CSS - */ - if (document.documentElement.clientWidth <= 920) { - switch(children){ - case 1: - this.applyMediaQueries(200); - break; - case 2: - this.applyMediaQueries(200); - break; - default: // anthing above 3, however, should not have more than 3 to date - this.applyMediaQueries(200); - } - } - } - }, + controller: function($scope){ + this.applyMediaQueries = function(value){ + document.querySelector('style').textContent += + "@media screen and (max-width:950px) { \ + .header__item.profile { right: " + value + "px; } \ + }"; + }; + this.arrangeResponsiveHeader = function(children){ + /* + * clientWidth of 1090 === max-width of 1100px + * clientWidth of 920 === max-width of 950px + * see b2b-angular.css for rest of responsive header CSS + */ + if (document.documentElement.clientWidth <= 920) { + switch(children){ + case 1: + this.applyMediaQueries(200); + break; + case 2: + this.applyMediaQueries(200); + break; + default: // anthing above 3, however, should not have more than 3 to date + this.applyMediaQueries(200); + } + } + } + }, link: function (scope, elem, attrs, ctrl) { - var children; - var profile; - - // onload of page - $timeout(function(){ - profile = document.querySelector('li.header__item.profile'); - children = angular.element(profile).children().length; - - ctrl.arrangeResponsiveHeader(children); // shift right-side icon flyovers - }); - - // on screen resize - window.addEventListener('resize', function(event){ // caret adjustmet - var activeSubmenu = elem[0].querySelector('[b2b-header-menu] [b2b-header-submenu].active'); - var activeSubmenuEl = angular.element(activeSubmenu); - if(activeSubmenu){ - var caretSign = activeSubmenu.querySelector('i.menuCaret'); - if(caretSign){ - var caretSignEl = angular.element(caretSign); - var caretLeft = (activeSubmenu.offsetLeft + activeSubmenu.offsetWidth/2) - 10; - caretSignEl.css({left: caretLeft + 'px'}); - } - } - - ctrl.arrangeResponsiveHeader(children); // shift right-side icon flyovers - }); + var children; + var profile; + + // onload of page + $timeout(function(){ + profile = document.querySelector('li.header__item.profile'); + children = angular.element(profile).children().length; + + ctrl.arrangeResponsiveHeader(children); // shift right-side icon flyovers + }); + + // on screen resize + window.addEventListener('resize', function(event){ // caret adjustmet + var activeSubmenu = elem[0].querySelector('[b2b-header-menu] [b2b-header-submenu].active'); + var activeSubmenuEl = angular.element(activeSubmenu); + if(activeSubmenu){ + var caretSign = activeSubmenu.querySelector('i.menuCaret'); + if(caretSign){ + var caretSignEl = angular.element(caretSign); + var caretLeft = (activeSubmenu.offsetLeft + activeSubmenu.offsetWidth/2) - 10; + caretSignEl.css({left: caretLeft + 'px'}); + } + } + + ctrl.arrangeResponsiveHeader(children); // shift right-side icon flyovers + }); } }; - }]); + }]); /** * @ngdoc directive - * @name Layouts.att:headings + * @name Layouts.att:headings & copy * * @description - * <file src="src/headings/docs/readme.md" /> + * <file src="src/headingsAndCopy/docs/readme.md" /> * - * @usage - <h1 class="heading-page">38px page heading</h1> - <h2 class="heading-major-section">30px major section heading</h2> - <h3 class="heading-sub-section">24px sub-section heading</h3> - <h2 class="heading-medium">20px medium heading</h2> - <h2 class="heading-medium-emphasis">20px medium emphasis heading</h2> - <h3 class="heading-small">18px small heading</h3> - <h3 class="heading-small-emphasis">18px small emphasis heading</h3> - <h3 class="heading-micro">13px micro heading</h3> - - <h2 class="heading-group">Lead</h2> - <h1 class="heading-page">This is 38px heading</h1> - <h2 class="lead">This is lead text...The next big thing since the last big thing we announced.</h2> - <h2 class="heading-group">Eyebrow</h2> - <h3 class="eyebrow">EYEBROW TEXT</h3> - <h2 class="heading-major-section">This is a 30px heading</h2> - <h3 class="eyebrow">EYEBROW TEXT</h3> - <h3 class="heading-sub-section">24px sub-section heading</h3> - <h2 class="heading-group">Subheading</h2> - <h2 class="heading-major-section">This is a 30px heading</h2> - <h3 class="subheading">A subheading here to support what was said above</h3> * @example <section id="code"> <b>HTML + AngularJS</b> <example module="b2b.att"> - <file src="src/headings/docs/demo.html" /> + <file src="src/headingsAndCopy/docs/demo.html" /> </example> </section> */ -var b2bLegalCopy = angular.module('b2b.att.headings', []); +var b2bLegalCopy = angular.module('b2b.att.headingsAndCopy', []); /** * @ngdoc directive * @name Tabs, tables & accordions.att:horizontalTable @@ -3855,6 +4042,8 @@ var b2bLegalCopy = angular.module('b2b.att.headings', []); * @usage * @param {int} sticky - Number of sticky columns to have. Maximum of 3. * @param {boolean} refresh - A boolean that when set to true will force a re-render of table. Only use when using 'bulk mode' + * @param {string} legendContent - A string of html to fill in the legend flyout. This should generally be a <ul> with <li> and should not rely on Angular for repeating. + * @param {boolean} retainColumnSet - A boolean that on re-render of the table, determines if the columns visible should reset to 0 or not. Default is false. * @example * <section id="code"> <example module="b2b.att"> @@ -3875,37 +4064,16 @@ angular.module('b2b.att.horizontalTable', []) transclude: true, scope: { numOfStickyCols: '=?sticky', - refresh: '=?' + refresh: '=?', + legendContent: '=?', + retainColumnSet: '=?' }, templateUrl: 'b2bTemplate/horizontalTable/horizontalTable.html', link: function (scope, element, attrs, ctrl) { scope.numOfStickyCols = scope.numOfStickyCols || 1; scope.viewportIndex = scope.numOfStickyCols; - - // JM520E: This is a temporary hack until I solve the ngRepeat issue - function hack() { - if (element.find('th').length < scope.numOfStickyCols) { - // DOM ngRepeat is not ready, let's check back in 10 ms - console.info('THs are not ready, trying again in 10ms'); - $timeout(hack, 10, false); - } else { - init(); - } - } - hack(); - - if (attrs.refresh !== undefined && attrs.refresh !== '') { - scope.$watch('refresh', function(oldVal, newVal) { - if (scope.refresh) { - // From testing it takes about 30 ms before ngRepeat executes, so let's set initial timeout - // NOTE: May need to expose timeout to developers. Application is known to have digest cycle of 3-5k watches. - $timeout(init, 100, false); - scope.refresh = false; - } - }); - } - + scope.countDisplayText = ""; var tableElement = element.find('table'); var thElements = element.find('th'); var innerContainer = angular.element(element[0].querySelector('.b2b-horizontal-table-inner-container')); @@ -3927,72 +4095,7 @@ angular.module('b2b.att.horizontalTable', []) var displayNoneCSS = {'display': 'none'}; var displayBlockCSS = {'display': 'table-cell'}; - function calculateVisibleColumns(startingPoint) { - var usedWidth = 0, - visibleColumns = startingPoint || scope.numOfStickyCols; - - while(usedWidth < stickyPixels && visibleColumns < collectiveColumnWidth.length) { - if (usedWidth+collectiveColumnWidth[visibleColumns] > stickyPixels) { - if (startingPoint === visibleColumns) { - return visibleColumns; // The next cell is too large to fit, it should be only thing to fit - } - visibleColumns--; - return visibleColumns; - } - usedWidth += collectiveColumnWidth[visibleColumns]; - visibleColumns++; - } - - if (usedWidth > stickyPixels) { - return --visibleColumns; - } - return visibleColumns; - } - - function updateCellDisplay(set) { - for (var i = scope.numOfStickyCols; i < tableColumns.length; i++) { - angular.element(tableColumns[i]).css(displayNoneCSS); - } - - for (var i = set[0]; i <= set[1]; i++) { - angular.element(tableColumns[i]).css(displayBlockCSS); - } - } - - function forceDigest() { - if (!scope.$$phase) { - scope.$digest(); - } - } - - function findMax(arr, prop) { - var max = 0; - var localVal = 0; - var prevDisplay; - var item; - for (var i = 0; i < arr.length; i++) { - item = arr[i]; - prevDisplay = angular.element(item).css('display'); - if (scope.$$phase) { - scope.$digest(); - } - if (prop === 'width') { - localVal = Math.ceil(parseInt(window.getComputedStyle(item).width.split('px')[0], 10)) + 30; // 30 px is padding - } else if (prop === 'offsetWidth') { - localVal = item.offsetWidth; - } else if (prop === 'height') { - localVal = item.offsetHeight; - } - - if (localVal >= max) { - max = localVal; - } - } - - return max; - } - - function init() { + var init = function() { // Reset this from a previous execution tableColumns = []; collectiveColumnWidth = []; @@ -4001,7 +4104,9 @@ angular.module('b2b.att.horizontalTable', []) maxHeight = 0; lastVisibleColumn = 0; columnSets = []; - setIndex = 0; + if ((!!scope.retainColumnSet)) { + setIndex = 0; + } visibleColumns = []; stickyPixels = 0; @@ -4010,20 +4115,19 @@ angular.module('b2b.att.horizontalTable', []) innerContainer = angular.element(element[0].querySelector('.b2b-horizontal-table-inner-container')); outerContainer = angular.element(element[0].querySelector('.b2b-horizontal-table')); totalWidth = element.children()[0].offsetWidth; - - tableRows = element.find('tr'); - totalWidth = element.children()[0].offsetWidth; scope.disableLeft = true; scope.disableRight = false; if (scope.numOfStickyCols > b2bHorizontalTableConfig.maxStickyColumns) { - throw new Error("Table can only support 3 sticky columns."); - } - + throw new Error('Table can only support ' + b2bHorizontalTableConfig.maxStickyColumns + ' sticky columns.'); + } + scope.countDisplayText = ""; + for(var count = 1; count <= scope.numOfStickyCols; count++) { + scope.countDisplayText = scope.countDisplayText + count + ", " + } angular.forEach(tableRows, function(row, rowIndex) { - collectiveRowHeight.push(findMax(row.children, 'height')); for(var j = 0; j < row.children.length; j++) { if (tableColumns[j] === undefined) { tableColumns[j] = []; @@ -4037,38 +4141,52 @@ angular.module('b2b.att.horizontalTable', []) for (var i = scope.numOfStickyCols+1; i < tableColumns.length; i++) { angular.element(tableColumns[i]).css(displayBlockCSS); } - } + } + // We must calculate here as we need cells to be reset after re-render. + angular.forEach(tableRows, function(row, rowIndex) { + collectiveRowHeight.push(findMax(row.children, 'height')); // BUG: Keeping this here now causes row height bugs + }); + + for (var i = 0; i < tableColumns.length; i++) { collectiveColumnWidth.push(findMax(tableColumns[i], 'width')); //offsetWidth doesn't take into account custom css inside } for(var i = 0; i < scope.numOfStickyCols; i++) { maxWidth += collectiveColumnWidth[i]; } - - stickyPixels = totalWidth-maxWidth; + // BUG: The code I put in to fix the table not spanning 100% width is now preventing + // table cells from laying out more than stickyPixels and thus we have weird wrapping + stickyPixels = totalWidth-maxWidth; // At this point, for each tr, I need to set the properties (height) and each numOfStickyCols children // should be set with sticky properties (margin-left and width) var width = maxWidth; + var additive = 0; + + if (angular.element(document).find('html').hasClass('isIE')) { + additive = 25; + } + var thObject = undefined; for(var i = 0; i < scope.numOfStickyCols; i++) { for (var j = 0; j < tableRows.length; j++) { - trObject = angular.element(tableRows[j].children[i]); - - angular.element(trObject).css({ + thObject = angular.element(tableRows[j].children[i]); + angular.element(thObject).css({ 'margin-left': -(width + 2) + 'px', 'width': (collectiveColumnWidth[i] + 3) + 'px', // instead of taking the max width, grab max width for that column - 'height': collectiveRowHeight[j] + 'px', + 'height': (collectiveRowHeight[j] + additive) + 'px', 'position': 'absolute', - 'background-color': 'lightgrey' + 'background-color': '#F2F2F2' }); } - - width -= collectiveColumnWidth[i]; } - + angular.element(tableRows[0]).css('height', collectiveRowHeight[0] + 'px'); + for(var i = 0; i < tableRows.length; i++) { + angular.element(tableRows[i]).css('height', (collectiveRowHeight[i] + additive) + 'px'); + } + innerContainer.css({ 'padding-left': (maxWidth + 2) + 'px' }); @@ -4078,19 +4196,113 @@ angular.module('b2b.att.horizontalTable', []) columnSets = []; for (var i = scope.numOfStickyCols; i < tableColumns.length;) { visibleColumns = calculateVisibleColumns(i); - columnSets.push([i, visibleColumns]); + if(visibleColumns === tableColumns.length){ + columnSets.push([i, visibleColumns-1]); + }else{ + columnSets.push([i, visibleColumns]); + } i = visibleColumns + 1; } + //columnSets = [[1, 1], [2,7]]; + updateCellDisplay(columnSets[setIndex]); checkScrollArrows(); scope.numOfCols = tableColumns.length; - console.log('Bulk Mode is ' + (attrs.bulkMode ? 'enabled': 'disabled')); - console.log('tableColumns', tableColumns); - console.log('collectiveColumnWidth: ', collectiveColumnWidth); - console.log('maxWidth: ', maxWidth); + } + + // JM520E: This is a temporary hack until I solve the ngRepeat issue + function hack() { + if (element.find('th').length < scope.numOfStickyCols) { + // DOM ngRepeat is not ready, let's check back in 10 ms + $timeout(hack, 10, false); + } else { + if (scope.refresh !== undefined) { + scope.$watch('refresh', function(oldVal, newVal) { // this watch calls too many times + if (!angular.equals(oldVal, newVal)) { //hackFinished && oldVal < newVal + // From testing it takes about 30 ms before ngRepeat executes, so let's set initial timeout + // NOTE: May need to expose timeout to developers. Application is known to have digest cycle of 3-5k watches. + $timeout(init, 100, false); + scope.refresh = false; + } + }); + } + + init(); + } + } + + + + + // Let's get started with some math! + hack(); + + function calculateVisibleColumns(startingPoint) { + var usedWidth = 0, + visibleColumns = startingPoint || scope.numOfStickyCols; + + while(usedWidth < stickyPixels && visibleColumns < collectiveColumnWidth.length) { + if (usedWidth+collectiveColumnWidth[visibleColumns] > stickyPixels) { + if (startingPoint === visibleColumns) { + return visibleColumns; // The next cell is too large to fit, it should be only thing to fit + } + visibleColumns--; + return visibleColumns; + } + usedWidth += collectiveColumnWidth[visibleColumns]; + visibleColumns++; + } + + if (usedWidth > stickyPixels) { + return --visibleColumns; + } + return visibleColumns; + } + + function updateCellDisplay(set) { + for (var i = scope.numOfStickyCols; i < tableColumns.length; i++) { + angular.element(tableColumns[i]).css(displayNoneCSS); + } + + for (var i = set[0]; i <= set[1]; i++) { + angular.element(tableColumns[i]).css(displayBlockCSS); + } + } + + function findMax(arr, prop) { + var max = 0; + var localVal = 0; + var prevDisplay; + var item; + for (var i = 0; i < arr.length; i++) { + item = arr[i]; + prevDisplay = angular.element(item).css('display'); + + if (scope.$$phase) { + scope.$digest(); + } + // Remove inline styles, they will mess up calculations from original run + angular.element(item).css('height', ''); + angular.element(item).css('width', ''); + if (prop === 'width') { + // If we do not undo previous run's inline styles, this will grow widths on each re-render. + localVal = Math.ceil(parseInt(window.getComputedStyle(item).width.split('px')[0], 10)) + 30; // 30 px is padding + } else if (prop === 'offsetWidth') { + localVal = item.offsetWidth; + } else if (prop === 'height') { + //localVal = item.offsetHeight; + localVal = Math.ceil(parseInt(window.getComputedStyle(item).height.split('px')[0], 10)) + } + + if (localVal >= max) { + max = localVal; + } + } + + return max; } function checkScrollArrows() { @@ -4098,14 +4310,13 @@ angular.module('b2b.att.horizontalTable', []) scope.disableRight = !(setIndex < columnSets.length-1); } - scope.moveViewportLeft = function () { setIndex--; updateCellDisplay(columnSets[setIndex]); checkScrollArrows(); if (scope.disableLeft) { - element.find('span')[0].focus(); + element[0].querySelector('.b2b-horizontal-table-column-info').focus(); } }; @@ -4115,7 +4326,7 @@ angular.module('b2b.att.horizontalTable', []) checkScrollArrows(); if (scope.disableRight) { - element.find('span')[0].focus(); + element[0].querySelector('.b2b-horizontal-table-column-info').focus(); } }; @@ -4525,22 +4736,13 @@ angular.module('b2b.att.leftNavigation', []) scope.idx = -1; scope.itemIdx = -1; scope.navIdx = -1; - scope.toggleNav = function (val,link) { + scope.toggleNav = function (val) { if (val === scope.idx) { scope.idx = -1; return; } scope.idx = val; }; - /*New function for ECOMP sdk*/ - scope.toggleDrawer = function(showmenu){ - scope.idx=-1; /*hide the sunmenus*/ - if(showmenu){ - document.getElementById('page-content').style.paddingLeft = "50px"; - } - else - document.getElementById('page-content').style.paddingLeft = "230px"; - }; scope.liveLink = function (evt, val1, val2) { scope.itemIdx = val1; scope.navIdx = val2; @@ -4617,29 +4819,6 @@ angular.module('b2b.att.listbox', ['b2b.att.utilities']) 'listboxDataIndex': 0 }; - /*scope.$watch('currentIndex', function(oldVal, newVal) { - if (angular.equals(oldVal, newVal)) return; - if (!scope.multiselectable) { - // This doesn't garuntee anything. index will update on focus based on rules - currentIndexSet.listboxDataIndex = scope.currentIndex; - // Should this occur? - //scope.listboxData[currentIndexSet.listboxDataIndex].selected = true; - - // Update elementIndex - elements = elem.children(); - var indecies = Array.prototype.map.call(elements, function(item) { - return parseInt(angular.element(item).attr('data-index'), 10); - }).filter(function(item) { - return item === scope.currentIndex; - }); - currentIndex.elementIndex = indecies[0]; - //focusOnElement(currentIndexSet.elementIndex); // This isn't shifting focus - if (!scope.$$phase) { - scope.$apply(); - } - } - });*/ - function isTrue(item) { if (item.selected === true) { return true; @@ -4745,7 +4924,7 @@ angular.module('b2b.att.listbox', ['b2b.att.utilities']) ctrlKeyPressed = false; } }); - + elem.bind('keydown', function(evt) { var keyCode = evt.keyCode; elements = elem.children(); @@ -4828,7 +5007,9 @@ angular.module('b2b.att.listbox', ['b2b.att.utilities']) // If no modifier keys are selected, all other items need to be unselected. prevDirection = undefined; selectItems(0, scope.listboxData.length, false); - scope.listboxData[currentIndexSet.listboxDataIndex].selected = true; + if(currentIndexSet.listboxDataIndex !== undefined && !isNaN(currentIndexSet.listboxDataIndex)){ + scope.listboxData[currentIndexSet.listboxDataIndex].selected = true; + } } focusOnElement(currentIndexSet.elementIndex); if(!scope.$$phase) { @@ -4862,7 +5043,9 @@ angular.module('b2b.att.listbox', ['b2b.att.utilities']) // If no modifier keys are selected, all other items need to be unselected. prevDirection = undefined; selectItems(0, scope.listboxData.length, false); - scope.listboxData[currentIndexSet.listboxDataIndex].selected = true; + if(currentIndexSet.listboxDataIndex !== undefined && !isNaN(currentIndexSet.listboxDataIndex)){ + scope.listboxData[currentIndexSet.listboxDataIndex].selected = true; + } } focusOnElement(currentIndexSet.elementIndex); @@ -5228,10 +5411,7 @@ angular.module('b2b.att.loaderAnimation', []) }); } }; -}]) - - -; +}]); /** * @ngdoc directive * @name Misc.att:messageWrapper @@ -5397,7 +5577,7 @@ angular.module('b2b.att.modalsAndAlerts', ['b2b.att.position', 'b2b.att.transiti }; } }; -}).factory('trapFocusInElement', ['$document', '$isElement', 'DOMHelper', 'keymap', function ($document, $isElement, DOMHelper, keymap) { +}).factory('trapFocusInElement', ['$document', '$isElement', 'b2bDOMHelper', 'keymap', function ($document, $isElement, b2bDOMHelper, keymap) { var elementStack = []; var stackHead = undefined; var firstTabableElement, lastTabableElement; @@ -5430,8 +5610,8 @@ angular.module('b2b.att.modalsAndAlerts', ['b2b.att.position', 'b2b.att.transiti var trapFocusInElement = function (flag, firstTabableElementParam, lastTabableElementParam) { var bodyElements = $document.find('body').children(); - firstTabableElement = firstTabableElementParam ? firstTabableElementParam : angular.element(DOMHelper.firstTabableElement(stackHead)); - lastTabableElement = lastTabableElementParam ? lastTabableElementParam : angular.element(DOMHelper.lastTabableElement(stackHead)); + firstTabableElement = firstTabableElementParam ? firstTabableElementParam : angular.element(b2bDOMHelper.firstTabableElement(stackHead)); + lastTabableElement = lastTabableElementParam ? lastTabableElementParam : angular.element(b2bDOMHelper.lastTabableElement(stackHead)); if (flag) { for (var i = 0; i < bodyElements.length; i++) { @@ -5504,7 +5684,7 @@ angular.module('b2b.att.modalsAndAlerts', ['b2b.att.position', 'b2b.att.transiti }; }]) -.directive('b2bModalWindow', ['$timeout', 'windowOrientation', '$window', function ($timeout, windowOrientation, $window) { +.directive('b2bModalWindow', ['$timeout', 'windowOrientation', '$window', 'keymap', function ($timeout, windowOrientation, $window, keymap) { return { restrict: 'EA', scope: { @@ -5517,6 +5697,7 @@ angular.module('b2b.att.modalsAndAlerts', ['b2b.att.position', 'b2b.att.transiti scope.windowClass = attrs.windowClass || ''; scope.sizeClass = attrs.sizeClass || ''; scope.isNotifDialog = false; + scope.modalClose = attrs.modalClose || false; this.setTitle = function (title) { scope.title = title; @@ -5567,7 +5748,15 @@ angular.module('b2b.att.modalsAndAlerts', ['b2b.att.position', 'b2b.att.transiti }); } } - + + if(scope.modalClose){ + element.bind('keydown', function (e) { + if(e.keyCode == keymap.KEY.ESC){ + e.preventDefault(); + e.stopPropagation(); + } + }); + } } }; }]) @@ -5743,6 +5932,7 @@ angular.module('b2b.att.modalsAndAlerts', ['b2b.att.position', 'b2b.att.transiti angularDomEl.attr('window-class', modal.windowClass); angularDomEl.attr('size-class', modal.sizeClass); angularDomEl.attr('index', openedWindows.length() - 1); + angularDomEl.attr('modal-close', modal.modalClose); angularDomEl.html(modal.content); var modalDomEl = $compile(angularDomEl)(modal.scope); @@ -5883,7 +6073,8 @@ angular.module('b2b.att.modalsAndAlerts', ['b2b.att.position', 'b2b.att.transiti backdrop: modalOptions.backdrop, keyboard: modalOptions.keyboard, windowClass: modalOptions.windowClass, - sizeClass: modalOptions.sizeClass + sizeClass: modalOptions.sizeClass, + modalClose: modalOptions.modalClose }); }, function resolveError(reason) { @@ -5915,7 +6106,8 @@ angular.module('b2b.att.modalsAndAlerts', ['b2b.att.position', 'b2b.att.transiti modalOk: '&', modalCancel: '&', windowClass: '@', - sizeClass: '@' + sizeClass: '@', + modalClose: '@' }, link: function (scope, elm, attr) { elm.bind('click', function (ev) { @@ -5928,7 +6120,8 @@ angular.module('b2b.att.modalsAndAlerts', ['b2b.att.position', 'b2b.att.transiti templateUrl: scope.b2bModal, controller: scope.modalController, windowClass: scope.windowClass, - sizeClass: scope.sizeClass + sizeClass: scope.sizeClass, + modalClose: scope.modalClose }).result.then(function (value) { scope.modalOk({ value: value @@ -6582,8 +6775,8 @@ angular.module('b2b.att.monthSelector', ['b2b.att.position', 'b2b.att.utilities' } scope.$apply(); } - }; - + }; + $documentBind.click('isOpen', outsideClick, scope); scope.$on('$destroy', function () { @@ -7002,6 +7195,7 @@ angular.module('b2b.att.multiLevelNavigation', ['b2b.att.utilities']) } //for any expandable tree item on click var toggleState = function (e) { + if (angular.element(e.target).attr("b2b-ml-nav") !== "endNode") { var eLink = element.find('a').eq(0); if (eLink.hasClass('active')) { @@ -7088,6 +7282,14 @@ angular.module('b2b.att.multiLevelNavigation', ['b2b.att.utilities']) if(element.attr("b2b-ml-nav") !== "endNode") { toggleState(e); } + if (rootE==undefined){ + findRoot(element); + } + var currSelected = rootE.parent()[0].querySelector('.selected'); + if(currSelected){ + angular.element(currSelected).removeClass('selected'); + } + element.find('a').eq(0).addClass('selected'); e.stopPropagation(); }); element.bind('focus', function (e) { @@ -7379,7 +7581,7 @@ angular.module('b2b.att.multipurposeExpander', ['b2b.att', 'b2b.att.collapse']) var isOpen = myCtrl.isOpened(); scope.setIcon = function () { - element.attr("role", "tab"); + element.attr("role", "button"); if (scope.expandIcon && scope.collapseIcon) { @@ -7395,7 +7597,7 @@ angular.module('b2b.att.multipurposeExpander', ['b2b.att', 'b2b.att.collapse']) element.attr("aria-expanded", "false"); } - } + } }; element.bind('click', function (){ @@ -7478,9 +7680,14 @@ angular.module('b2b.att.orderConfirmationTemplate', []); * * @description * <file src="src/pagination/docs/readme.md" /> + * @param {int} total-pages - Total # of pages, set in your controller $scope + * @param {int} current-page - Current selected page, set in your controller $scope + * @param {function} click-handler - Handler function on click of page number, defined in your controller $scope + * @param {string} input-id - _UNIQUE ID_ __MUST__ be provided for 508 compliance, set in your HTML as static text + * @param {string} input-class - optional class that can be given to use for the go to page container * * @usage - * <div b2b-pagination="" input-id="goto-page-2" total-pages="totalPages1" current-page="currentPage1" click-handler="customHandler" show-input="showInput"></div> + * <div b2b-pagination="" input-id="goto-page-2" total-pages="totalPages1" current-page="currentPage1" click-handler="customHandler"></div> * * @example * <section id="code"> @@ -7498,17 +7705,19 @@ angular.module('b2b.att.pagination', ['b2b.att.utilities', 'ngTouch']) scope: { totalPages: '=', currentPage: '=', - showInput: '=', clickHandler: '=?', - inputId: '=' + inputId: '=', + isDroppable: '=?' }, replace: true, templateUrl: 'b2bTemplate/pagination/b2b-pagination.html', - link: function (scope, elem) { + link: function (scope, elem, attr) { scope.isMobile = b2bUserAgent.isMobile(); scope.notMobile = b2bUserAgent.notMobile(); scope.focusedPage; scope.meanVal = 3; + scope.inputClass = attr.inputClass; + scope.droppableAttribute = scope.isDroppable ? true : false; scope.$watch('totalPages', function (value) { if (angular.isDefined(value) && value !== null) { scope.pages = []; @@ -7539,7 +7748,17 @@ angular.module('b2b.att.pagination', ['b2b.att.utilities', 'ngTouch']) scope.clickHandler(num); } }; - + var getBoundary = function(value){ + if ( value < 100 ) { + return 5; + } else if ( 100 <= value && value < 1000 ) { + return 4; + } else if ( 1000 <= value ) { + return 3; + } else { + return 5; // error + } + }; function currentPageChanged(value) { if (angular.isDefined(value) && value !== null) { if (!value || value < 1) { @@ -7554,12 +7773,33 @@ angular.module('b2b.att.pagination', ['b2b.att.utilities', 'ngTouch']) } if (scope.totalPages > 10) { var val = parseInt(value); - if (val <= 6) { - scope.pages = [1, 2, 3, 4, 5, 6, 7, 8]; - } else if (val > 6 && val <= scope.totalPages - 5) { - scope.pages = [val - 1, val, val + 1]; - } else if (val >= scope.totalPages - 5) { - scope.pages = [scope.totalPages - 7, scope.totalPages - 6, scope.totalPages - 5, scope.totalPages - 4, scope.totalPages - 3, scope.totalPages - 2, scope.totalPages - 1, scope.totalPages]; + scope.boundary = getBoundary(val); + if (val <= 6) { // Left (first) section + scope.pages = [1, 2, 3, 4, 5, 6, 7]; + } else if ( val <= (scope.totalPages - scope.boundary) ) { // Middle section + if ( 7 <= val && val < 9 ) { + if(scope.totalPages < 100) { + scope.pages = [val - 3, val - 2, val - 1, val, val + 1, val + 2]; + } else if(scope.totalPages < 1000) { + scope.pages = [val - 2, val - 1, val, val + 1, val + 2]; + } else if(scope.totalPages < 1000) { + scope.pages = [val - 2, val - 1, val, val + 1, val + 2]; + } + } else if ( 9 <= val && val < 100 ) { + scope.pages = [val - 3, val - 2, val - 1, val, val + 1, val + 2]; + } else if ( 100 <= val && val < 1000 ) { + scope.pages = [val - 2, val - 1, val, val + 1]; + } else if ( 1000 <= val ) { + scope.pages = [val - 1, val, val + 1]; + } + } else if ( (scope.totalPages - scope.boundary) < val ) { // Right (last) section + if ( val < 100 ) { + scope.pages = [scope.totalPages - 5, scope.totalPages - 4, scope.totalPages - 3, scope.totalPages - 2, scope.totalPages - 1, scope.totalPages]; + } else if ( 100 <= val && val < 1000 ) { + scope.pages = [scope.totalPages - 4, scope.totalPages - 3, scope.totalPages - 2, scope.totalPages - 1, scope.totalPages]; + } else if ( 1000 <= val ) { + scope.pages = [scope.totalPages - 3, scope.totalPages - 2, scope.totalPages - 1, scope.totalPages]; + } } } if (scope.isMobile) { @@ -7653,6 +7893,7 @@ angular.module('b2b.att.pagination', ['b2b.att.utilities', 'ngTouch']) } }; }]); + /** * @ngdoc directive * @name Navigation.att:paneSelector @@ -7809,20 +8050,18 @@ angular.module('b2b.att.phoneNumberInput', ['ngMessages', 'b2b.att.utilities']) phoneMaskDot: '___.___.____', phoneMaskHyphen: '___-___-____' }) - .directive('b2bPhoneMask', ['$parse', 'CoreFormsUiConfig', 'keymap', function ($parse, CoreFormsUiConfig, keymap) { + .directive('b2bPhoneMask', ['$parse', 'CoreFormsUiConfig', 'keymap', 'b2bUserAgent', function ($parse, CoreFormsUiConfig, keymap, b2bUserAgent) { return { require: 'ngModel', scope: { ngModel: '=' }, link: function (scope, iElement, iAttrs, ctrl) { - var navigatorAgent = navigator.userAgent.toLowerCase(), - isAndroid = navigatorAgent.indexOf("android") > -1, - oldIE = navigatorAgent.indexOf('msie 8.0') !== -1; + var mask = ''; var validPhoneNumber = false; var currentKey = ''; - if (isAndroid) { + if (b2bUserAgent.isMobile()) { mask = "__________"; } else { switch (iAttrs.b2bPhoneMask) { @@ -7913,13 +8152,13 @@ angular.module('b2b.att.phoneNumberInput', ['ngMessages', 'b2b.att.utilities']) // Allow: Ctrl+C/c (!(e.ctrlKey) && (e.which !== '99' || e.which !== '67')) && // Allow: Ctrl+X/x - (!(e.ctrlKey) && (e.which !== '120' || e.which !== '88'))) { + (!(e.ctrlKey) && (e.which !== '120' || e.which !== '88')) && + /* 229 key code will sent as placeholder key for andriod devices */ + (e.which != 229 )) { e.preventDefault ? e.preventDefault() : e.returnValue = false; - iElement.attr("aria-label", "Only numbers are allowed"); validPhoneNumber = false; } } else { - iElement.removeAttr("aria-label"); validPhoneNumber = true; } @@ -8080,12 +8319,12 @@ angular.module('b2b.att.profileCard', ['b2b.att']) characterLimit: '@' }, link: function(scope, elem, attr){ - scope.characterLimit = parseInt(attr.characterLimit, 10) || 25; - scope.shouldClip = function(str) { - return str.length > scope.characterLimit; - }; + scope.characterLimit = parseInt(attr.characterLimit, 10) || 25; + scope.shouldClip = function(str) { + return str.length > scope.characterLimit; + }; - scope.showEmailTooltip = false; + scope.showEmailTooltip = false; scope.image=true; function isImage(src) { @@ -8496,10 +8735,10 @@ angular.module('b2b.att.searchField', ['b2b.att.utilities', 'b2b.att.position']) * * @usage * Horizontal Seek Bar - * <b2b-seek-bar min="0" max="400" step="1" skip-interval="1" data-ng-model="horizontalSeekBarVal" style="width:180px; margin: auto;" on-drag-end="onDragEnd()" on-drag-init="onDragStart()"></b2b-seek-bar> + * <b2b-seek-bar min="0" max="400" step="1" skip-interval="1" data-ng-model="horizontalSeekBarVal" style="width:180px; margin: auto;" on-drag-end="onDragEnd()" on-drag-init="onDragStart()"></b2b-seek-bar> - * Vertical Seek Bar - * <b2b-seek-bar min="0" max="1" step="0.01" skip-interval="0.1" vertical data-ng-model="verticalSeekBarVal" style=" width: 6px; height: 180px; margin: auto;"></b2b-seek-bar> + * Vertical Seek Bar + * <b2b-seek-bar min="0" max="1" step="0.01" skip-interval="0.1" vertical data-ng-model="verticalSeekBarVal" style=" width: 6px; height: 180px; margin: auto;"></b2b-seek-bar> * * @example <section id="code"> @@ -8774,38 +9013,6 @@ angular.module('b2b.att.seekBar', ['b2b.att.utilities','b2b.att.position']) }]); /** * @ngdoc directive - * @name Forms.att:selectorModule - * - * @description - * <file src="src/selectorModule/docs/readme.md" /> - * - * @usage - * <select name="myNameBig" type="large" b2b-dropdown ng-model="Controller Variable here"> - * <option b2b-dropdown-list option-repeat="option data here" imgsrc="image path" value="value">List Text</option> - * </select> - * - * <select name="myNameBig" type="large" b2b-dropdown ng-model="Controller Variable here"> - * <option b2b-dropdown-list option-repeat="option data here" imgsrc="image path" value="value">List Text</option> - * </select> - * - * <select name="myNameBig" b2b-dropdown ng-model="Controller Variable here"> - * <optgroup b2b-dropdown-group label="Group Label here"> - * <option b2b-dropdown-list option-repeat="option data here" imgsrc="image path" value="value">List Text</option> - * </optgroup> - * </select> - * - * @example - * <section id="code"> - <example module="b2b.att"> - <file src="src/selectorModule/docs/demo.html" /> - <file src="src/selectorModule/docs/demo.js" /> - </example> - </section> - * - */ -angular.module('b2b.att.selectorModule', ['b2b.att.dropdowns']); -/** - * @ngdoc directive * @name Layouts.att:separators * * @description @@ -9219,12 +9426,12 @@ angular.module('b2b.att.slider', ['b2b.att.utilities']) * <file src="src/spinButton/docs/readme.md" /> * * @example - * <section id="code"> - <example module="b2b.att"> + * <section id="code"> + <example module="b2b.att"> <file src="src/spinButton/docs/demo.html" /> <file src="src/spinButton/docs/demo.js" /> </example> - </section> + </section> * */ angular.module('b2b.att.spinButton', ['b2b.att.utilities']) @@ -9373,7 +9580,7 @@ angular.module('b2b.att.staticRouteTemplate', ['b2b.att.utilities']) * @name Progress & usage indicators.att:statusTracker * * @scope - * @param {array} statuses - An array of status objects + * @param {array} statusObject - An array of status objects that accept heading, estimate, description and state * @description * <file src="src/statusTracker/docs/readme.md" /> * @@ -9385,7 +9592,6 @@ angular.module('b2b.att.staticRouteTemplate', ['b2b.att.utilities']) * @example <section id="code"> - <b>HTML + AngularJS</b> <example module="b2b.att"> <file src="src/statusTracker/docs/demo.html" /> <file src="src/statusTracker/docs/demo.js" /> @@ -9395,7 +9601,14 @@ angular.module('b2b.att.staticRouteTemplate', ['b2b.att.utilities']) angular.module('b2b.att.statusTracker', ['b2b.att.utilities']) .constant('b2bStatusTrackerConfig', { - 'maxViewItems': 3 + 'maxViewItems': 3, + 'icons': { + 'complete': 'icoControls-approval', + 'current': 'icon-misc-time', + 'pending': 'icoControls-statusokay', + 'actionRequired': 'icon-primary-securityalerts-alert', + 'notAvailable': 'icoControls-restricted' + } }) .directive('b2bStatusTracker', ['b2bStatusTrackerConfig', function(b2bStatusTrackerConfig) { return { @@ -9425,19 +9638,10 @@ angular.module('b2b.att.statusTracker', ['b2b.att.utilities']) scope.isInViewport = function(index) { return (index < scope.currentViewIndex+3 && index >= scope.currentViewIndex); // && index > scope.currentViewIndex-2 }; - scope.currentStatus = function(index) { - if(index != undefined){ - if(!scope.statuses[index].complete) { - if(index > 0 && scope.statuses[index-1].complete) { - return true; - } else if(index == 0 && !scope.statuses[index].complete){ - return true; - } else { - return false; - } - } - } - }; + + scope.removeCamelCase = function(str) { + return str.replace(/([a-z])([A-Z])/g, '$1 $2').toLowerCase(); + } } }; }]); @@ -9454,7 +9658,7 @@ angular.module('b2b.att.statusTracker', ['b2b.att.utilities']) * * @usage * - * <b2b-step-tracker steps-items-object="stepsObject" current-index="currentStepIndex" step-indicator-heading="stepHeading"></b2b-step-tracker> + * <b2b-step-tracker steps-items-object="stepsObject" current-index="currentStepIndex" step-indicator-heading="stepHeading"></b2b-step-tracker> * * @example @@ -9467,43 +9671,43 @@ angular.module('b2b.att.statusTracker', ['b2b.att.utilities']) </section> */ angular.module('b2b.att.stepTracker', ['b2b.att.utilities']) - .constant('b2bStepTrackerConfig', { - 'maxViewItems': 5 - }) - .directive('b2bStepTracker', ['b2bStepTrackerConfig', function(b2bStepTrackerConfig) { - return { - restrict: 'EA', - transclude: true, - scope:{ - stepsItemsObject:"=", - currentIndex:"=", + .constant('b2bStepTrackerConfig', { + 'maxViewItems': 5 + }) + .directive('b2bStepTracker', ['b2bStepTrackerConfig', function(b2bStepTrackerConfig) { + return { + restrict: 'EA', + transclude: true, + scope:{ + stepsItemsObject:"=", + currentIndex:"=", viewportIndex:"=?" - }, - templateUrl: 'b2bTemplate/stepTracker/stepTracker.html', - link: function(scope, ele, attr) { + }, + templateUrl: 'b2bTemplate/stepTracker/stepTracker.html', + link: function(scope, ele, attr) { if (angular.isDefined(scope.viewportIndex)) { scope.currentViewIndex = scope.viewportIndex - 1; }else{ scope.currentViewIndex = 0; } - - scope.b2bStepTrackerConfig = b2bStepTrackerConfig; - scope.nextStatus = function() { - if (scope.currentViewIndex+1 <= scope.stepsItemsObject.length) { - scope.currentViewIndex++; - } - }; - scope.previousStatus = function() { - if (scope.currentViewIndex-1 >= 0) { - scope.currentViewIndex--; - } - }; - scope.isInViewport = function(index) { - return (index < scope.currentViewIndex+b2bStepTrackerConfig.maxViewItems && index >= scope.currentViewIndex); - }; - } - }; - }]); + + scope.b2bStepTrackerConfig = b2bStepTrackerConfig; + scope.nextStatus = function() { + if (scope.currentViewIndex+1 <= scope.stepsItemsObject.length) { + scope.currentViewIndex++; + } + }; + scope.previousStatus = function() { + if (scope.currentViewIndex-1 >= 0) { + scope.currentViewIndex--; + } + }; + scope.isInViewport = function(index) { + return (index < scope.currentViewIndex+b2bStepTrackerConfig.maxViewItems && index >= scope.currentViewIndex); + }; + } + }; + }]); /** * @ngdoc directive @@ -9577,6 +9781,24 @@ angular.module('b2b.att.switches', ['b2b.att.utilities']) } }; }]); +/** + * @ngdoc directive + * @name Template.att:Table with Drag and Drop + * + * @description + * <file src="src/tableDragAndDrop/docs/readme.md" /> + * + * @example + * <section id="code"> + <example module="b2b.att"> + <file src="src/tableDragAndDrop/docs/demo.html" /> + <file src="src/tableDragAndDrop/docs/demo.js" /> + </example> + </section> + * + */ +angular.module('b2b.att.tableDragAndDrop', ['b2b.att.utilities','b2b.att.tables']) + /** * @ngdoc directive * @name Messages, modals & alerts.att:tableMessages @@ -9703,7 +9925,7 @@ angular.module('b2b.att.tableScrollbar', []) firstColumn = angular.element(trObject.children()[0]); angular.element(firstColumn).css({ - 'margin-left': -(firstColumnWidth + 2) + 'px', + 'left': '0px', 'width': (firstColumnWidth + 2) + 'px', 'position': 'absolute' }); @@ -9755,6 +9977,7 @@ angular.module('b2b.att.tableScrollbar', []) } }; + innerContainer.bind('scroll', function () { $timeout(function () { scope.checkScrollArrows(); @@ -10039,7 +10262,7 @@ angular.module('b2b.att.tables', ['b2b.att.utilities']) } else if (attr.type === 'body') { var html = elem.children(); if (attr.rowRepeat) { - html.attr('ng-repeat', attr.rowRepeat.concat(" | orderBy : columnIndex : reverse | filter : searchCriteria : false ")); + html.attr('ng-repeat', attr.rowRepeat.concat(" | orderBy : (reverse?'-':'')+ columnIndex | filter : searchCriteria : false ")); } html.attr('ng-class', "{'odd': $odd && zebraStripFlag}"); html.attr('class', 'data-row'); @@ -10274,7 +10497,15 @@ angular.module('b2b.att.tables', ['b2b.att.utilities']) tempsort = ''; initialSort = attr.initialSort; - scope.sortTable = function (msg) { + scope.sortTable = function (msg,trigger) { + if(trigger == 'dropdown'){ + if (nextSort === 'd' || nextSort === 'D') { + ctrl.sortData(msg, false, false); + }else{ + ctrl.sortData(msg, true, false); + } + return; + } $timeout(function(){ if (nextSort.length > 0) { @@ -10584,6 +10815,51 @@ angular.module('b2b.att.textArea', ['b2b.att.utilities']) /** * @ngdoc directive + * @name Forms.att:timeInputField + * + * @description + * <file src="src/timeInputField/docs/readme.md" /> + * + + * @example + * <section id="code"> + <example module="b2b.att"> + <file src="src/timeInputField/docs/demo.html" /> + <file src="src/timeInputField/docs/demo.js" /> + </example> + </section> + * + */ +angular.module('b2b.att.timeInputField',['ngMessages', 'b2b.att.utilities']).directive('b2bTimeFormat',function(){ + return{ + restrict : 'A', + require : '^ngModel', + link : function(scope,elem,attr,ctrl){ + elem.on('keyup',function(evt){ + var modelValue = ctrl.$modelValue; + var format = attr.b2bTimeFormat; + modelValue = modelValue.split(':'); + if(format == "12"){ + if(!(modelValue[0] <= 12 && modelValue[0] > 0 ) || !(modelValue[1] <= 59)){ + ctrl.$setValidity('inValidTime',false); + }else{ + ctrl.$setValidity('inValidTime',true); + } + }else if(format =="24"){ + if(!(modelValue[0] <= 23) || !(modelValue[1] <= 59)){ + ctrl.$setValidity('inValidTime',false); + }else{ + ctrl.$setValidity('inValidTime',true); + } + } + scope.$apply(); + }); + } + } +}); + +/** + * @ngdoc directive * @name Forms.att:tooltipsForForms * * @description @@ -10898,11 +11174,11 @@ angular.module('b2b.att.treeNav', ['b2b.att.utilities']) } removeRootTabIndex(elem.parent()); }; - scope.$watch('member.child', function(newVal, oldVal){ - if(newVal !== oldVal){ - scope.showChild(); - }; - }); + scope.$watch('member.child', function(newVal, oldVal){ + if(newVal !== oldVal){ + scope.showChild(); + }; + }); scope.showChild = function () { if (!element.hasClass('grouped')) { if (angular.isArray(scope.member.child) && scope.member.child.length > 0 && (scope.member.divide === undefined || scope.member.child.length < scope.member.divide)) { @@ -10961,11 +11237,11 @@ angular.module('b2b.att.treeNav', ['b2b.att.utilities']) } } } - if(scope.member.divide){ - element.append("<b2b-tree-nav collection='member.child' group-it='" + scope.groupIt + "'></b2b-tree-nav>"); - } else { - element.append("<b2b-tree-nav collection='member.child' group-it='" + scope.groupIt + "'></b2b-tree-nav>"); - } + if(scope.member.divide){ + element.append("<b2b-tree-nav collection='member.child' group-it='" + scope.groupIt + "'></b2b-tree-nav>"); + } else { + element.append("<b2b-tree-nav collection='member.child' group-it='" + scope.groupIt + "'></b2b-tree-nav>"); + } $compile(element.contents())(scope); if(scope.member.active && scope.member.active === true){ element.find('i').eq(0).removeClass('icon-primary-collapsed'); @@ -10979,7 +11255,7 @@ angular.module('b2b.att.treeNav', ['b2b.att.utilities']) } } }; - //Below condition opens node for opening on json load. + //Below condition opens node for opening on json load. if(scope.member.active && scope.member.active == true){ scope.showChild(); }; @@ -11004,9 +11280,9 @@ angular.module('b2b.att.treeNav', ['b2b.att.utilities']) }); //else getting true in every case .. so better use switch case .. that makes more sense you dumb. element.bind('click', function (evt) { - scope.showChild(); - var expandFunc = scope.member.onExpand; - + scope.showChild(); + var expandFunc = scope.member.onExpand; + //onSelect if (element.hasClass('bg') && scope.member.onSelect !== undefined) { scope.member.onSelect(scope.member); @@ -11168,14 +11444,14 @@ angular.module('b2b.att.treeNav', ['b2b.att.utilities']) }; element.bind('click', function (evt) { //first we close others and then we open the clicked element - if (element[0].previousElementSibling) { - closeOthersUp(angular.element(element[0].previousElementSibling)); - } - if (element[0].nextElementSibling) { - closeOthersDown(angular.element(element[0].nextElementSibling)); - } + if (element[0].previousElementSibling) { + closeOthersUp(angular.element(element[0].previousElementSibling)); + } + if (element[0].nextElementSibling) { + closeOthersDown(angular.element(element[0].nextElementSibling)); + } removeBackground(element); - activeToggle(element); + activeToggle(element); evt.stopPropagation(); }); @@ -11620,63 +11896,65 @@ angular.module('b2b.att.treeNodeCheckbox', ['b2b.att.utilities']) } } var upwardSelection = function(elem){ - var childNodes = elem.parent().parent().find('ul').eq(0).children('li'); - checkedCount = 0; - nonCheckedCount = 0; - checkBoxesCount = 0; - for(i=0; i<childNodes.length; i++){ - if(findCheckbox(childNodes[i])){ - isGroupNode(childNodes[i]); - isCheckboxSelected(childNodes[i]); - checkBoxesCount++; - if(checkedTreeNode){ - checkedCount++; - }else if(!angular.element(angular.element(angular.element(childNodes[i]).find('a').eq(0))[0].querySelector('input.treeCheckBox')).prop('indeterminate')){ - nonCheckedCount++; - } - } - } - var parentNodeScope; - parentNodeScope = angular.element(elem.parent().parent()).scope(); - if(findCheckbox(elem.parent().parent())){ - if(nonCheckedCount == checkBoxesCount){ - angular.element(findCheckbox(elem.parent().parent())).prop('indeterminate', false); - if(parentNodeScope && parentNodeScope.member){ - parentNodeScope.member.isSelected = false; - parentNodeScope.member.indeterminate = false; - }else{ - updateGrpNodeCheckboxes(elem.parent().parent(),false); - } - angular.element(elem.parent().parent()).attr('aria-checked',false); - }else if(checkedCount == checkBoxesCount){ - angular.element(findCheckbox(elem.parent().parent())).prop('indeterminate', false); - if(parentNodeScope && parentNodeScope.member){ - parentNodeScope.member.isSelected = true; - parentNodeScope.member.indeterminate = false; - }else{ - updateGrpNodeCheckboxes(elem.parent().parent(),true); - } - angular.element(elem.parent().parent()).attr('aria-checked',true); - }else{ - angular.element(findCheckbox(elem.parent().parent())).prop('indeterminate', true); - if(parentNodeScope && parentNodeScope.member){ - parentNodeScope.member.isSelected = false; - parentNodeScope.member.indeterminate = true; - }else{ - updateGrpNodeCheckboxes(elem.parent().parent(),false); - } - angular.element(elem.parent().parent()).attr('aria-checked',"mixed"); - } - if(parentNodeScope && parentNodeScope.member){ - parentNodeScope.$apply(); - } - } - - - - if(elem.parent().parent().attr('role') == "treeitem"){ - upwardSelection(elem.parent().parent()); - } + if(!elem.parent().parent().eq(0).hasClass('b2b-tree-checkbox')){ + var childNodes = elem.parent().parent().find('ul').eq(0).children('li'); + checkedCount = 0; + nonCheckedCount = 0; + checkBoxesCount = 0; + for(i=0; i<childNodes.length; i++){ + if(findCheckbox(childNodes[i])){ + isGroupNode(childNodes[i]); + isCheckboxSelected(childNodes[i]); + checkBoxesCount++; + if(checkedTreeNode){ + checkedCount++; + }else if(!angular.element(angular.element(angular.element(childNodes[i]).find('a').eq(0))[0].querySelector('input.treeCheckBox')).prop('indeterminate')){ + nonCheckedCount++; + } + } + } + var parentNodeScope; + parentNodeScope = angular.element(elem.parent().parent()).scope(); + if(findCheckbox(elem.parent().parent())){ + if(nonCheckedCount == checkBoxesCount){ + angular.element(findCheckbox(elem.parent().parent())).prop('indeterminate', false); + if(parentNodeScope && parentNodeScope.member){ + parentNodeScope.member.isSelected = false; + parentNodeScope.member.indeterminate = false; + }else{ + updateGrpNodeCheckboxes(elem.parent().parent(),false); + } + angular.element(elem.parent().parent()).attr('aria-checked',false); + }else if(checkedCount == checkBoxesCount){ + angular.element(findCheckbox(elem.parent().parent())).prop('indeterminate', false); + if(parentNodeScope && parentNodeScope.member){ + parentNodeScope.member.isSelected = true; + parentNodeScope.member.indeterminate = false; + }else{ + updateGrpNodeCheckboxes(elem.parent().parent(),true); + } + angular.element(elem.parent().parent()).attr('aria-checked',true); + }else{ + angular.element(findCheckbox(elem.parent().parent())).prop('indeterminate', true); + if(parentNodeScope && parentNodeScope.member){ + parentNodeScope.member.isSelected = false; + parentNodeScope.member.indeterminate = true; + }else{ + updateGrpNodeCheckboxes(elem.parent().parent(),false); + } + angular.element(elem.parent().parent()).attr('aria-checked',"mixed"); + } + if(parentNodeScope && parentNodeScope.member){ + parentNodeScope.$apply(); + } + } + + + + if(elem.parent().parent().attr('role') == "treeitem"){ + upwardSelection(elem.parent().parent()); + } + } } scope.showChild = function () { @@ -12055,106 +12333,106 @@ angular.module('b2b.att.treeNodeCheckbox', ['b2b.att.utilities']) **/ (window._gsQueue || (window._gsQueue = [])).push( function() { - "use strict"; - - var _doc = document.documentElement, - _window = window, - _max = function(element, axis) { - var dim = (axis === "x") ? "Width" : "Height", - scroll = "scroll" + dim, - client = "client" + dim, - body = document.body; - return (element === _window || element === _doc || element === body) ? Math.max(_doc[scroll], body[scroll]) - (_window["inner" + dim] || Math.max(_doc[client], body[client])) : element[scroll] - element["offset" + dim]; - }, - - ScrollToPlugin = window._gsDefine.plugin({ - propName: "scrollTo", - API: 2, - version:"1.7.3", - - //called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. - init: function(target, value, tween) { - this._wdw = (target === _window); - this._target = target; - this._tween = tween; - if (typeof(value) !== "object") { - value = {y:value}; //if we don't receive an object as the parameter, assume the user intends "y". - } - this._autoKill = (value.autoKill !== false); - this.x = this.xPrev = this.getX(); - this.y = this.yPrev = this.getY(); - if (value.x != null) { - this._addTween(this, "x", this.x, (value.x === "max") ? _max(target, "x") : value.x, "scrollTo_x", true); - this._overwriteProps.push("scrollTo_x"); - } else { - this.skipX = true; - } - if (value.y != null) { - this._addTween(this, "y", this.y, (value.y === "max") ? _max(target, "y") : value.y, "scrollTo_y", true); - this._overwriteProps.push("scrollTo_y"); - } else { - this.skipY = true; - } - return true; - }, - - //called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.) - set: function(v) { - this._super.setRatio.call(this, v); - - var x = (this._wdw || !this.skipX) ? this.getX() : this.xPrev, - y = (this._wdw || !this.skipY) ? this.getY() : this.yPrev, - yDif = y - this.yPrev, - xDif = x - this.xPrev; - - if (this._autoKill) { - //note: iOS has a bug that throws off the scroll by several pixels, so we need to check if it's within 7 pixels of the previous one that we set instead of just looking for an exact match. - if (!this.skipX && (xDif > 7 || xDif < -7) && x < _max(this._target, "x")) { - this.skipX = true; //if the user scrolls separately, we should stop tweening! - } - if (!this.skipY && (yDif > 7 || yDif < -7) && y < _max(this._target, "y")) { - this.skipY = true; //if the user scrolls separately, we should stop tweening! - } - if (this.skipX && this.skipY) { - this._tween.kill(); - } - } - if (this._wdw) { - _window.scrollTo((!this.skipX) ? this.x : x, (!this.skipY) ? this.y : y); - } else { - if (!this.skipY) { - this._target.scrollTop = this.y; - } - if (!this.skipX) { - this._target.scrollLeft = this.x; - } - } - this.xPrev = this.x; - this.yPrev = this.y; - } - - }), - p = ScrollToPlugin.prototype; - - ScrollToPlugin.max = _max; - - p.getX = function() { - return (!this._wdw) ? this._target.scrollLeft : (_window.pageXOffset != null) ? _window.pageXOffset : (_doc.scrollLeft != null) ? _doc.scrollLeft : document.body.scrollLeft; - }; - - p.getY = function() { - return (!this._wdw) ? this._target.scrollTop : (_window.pageYOffset != null) ? _window.pageYOffset : (_doc.scrollTop != null) ? _doc.scrollTop : document.body.scrollTop; - }; - - p._kill = function(lookup) { - if (lookup.scrollTo_x) { - this.skipX = true; - } - if (lookup.scrollTo_y) { - this.skipY = true; - } - return this._super._kill.call(this, lookup); - }; + "use strict"; + + var _doc = document.documentElement, + _window = window, + _max = function(element, axis) { + var dim = (axis === "x") ? "Width" : "Height", + scroll = "scroll" + dim, + client = "client" + dim, + body = document.body; + return (element === _window || element === _doc || element === body) ? Math.max(_doc[scroll], body[scroll]) - (_window["inner" + dim] || Math.max(_doc[client], body[client])) : element[scroll] - element["offset" + dim]; + }, + + ScrollToPlugin = window._gsDefine.plugin({ + propName: "scrollTo", + API: 2, + version:"1.7.3", + + //called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. + init: function(target, value, tween) { + this._wdw = (target === _window); + this._target = target; + this._tween = tween; + if (typeof(value) !== "object") { + value = {y:value}; //if we don't receive an object as the parameter, assume the user intends "y". + } + this._autoKill = (value.autoKill !== false); + this.x = this.xPrev = this.getX(); + this.y = this.yPrev = this.getY(); + if (value.x != null) { + this._addTween(this, "x", this.x, (value.x === "max") ? _max(target, "x") : value.x, "scrollTo_x", true); + this._overwriteProps.push("scrollTo_x"); + } else { + this.skipX = true; + } + if (value.y != null) { + this._addTween(this, "y", this.y, (value.y === "max") ? _max(target, "y") : value.y, "scrollTo_y", true); + this._overwriteProps.push("scrollTo_y"); + } else { + this.skipY = true; + } + return true; + }, + + //called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.) + set: function(v) { + this._super.setRatio.call(this, v); + + var x = (this._wdw || !this.skipX) ? this.getX() : this.xPrev, + y = (this._wdw || !this.skipY) ? this.getY() : this.yPrev, + yDif = y - this.yPrev, + xDif = x - this.xPrev; + + if (this._autoKill) { + //note: iOS has a bug that throws off the scroll by several pixels, so we need to check if it's within 7 pixels of the previous one that we set instead of just looking for an exact match. + if (!this.skipX && (xDif > 7 || xDif < -7) && x < _max(this._target, "x")) { + this.skipX = true; //if the user scrolls separately, we should stop tweening! + } + if (!this.skipY && (yDif > 7 || yDif < -7) && y < _max(this._target, "y")) { + this.skipY = true; //if the user scrolls separately, we should stop tweening! + } + if (this.skipX && this.skipY) { + this._tween.kill(); + } + } + if (this._wdw) { + _window.scrollTo((!this.skipX) ? this.x : x, (!this.skipY) ? this.y : y); + } else { + if (!this.skipY) { + this._target.scrollTop = this.y; + } + if (!this.skipX) { + this._target.scrollLeft = this.x; + } + } + this.xPrev = this.x; + this.yPrev = this.y; + } + + }), + p = ScrollToPlugin.prototype; + + ScrollToPlugin.max = _max; + + p.getX = function() { + return (!this._wdw) ? this._target.scrollLeft : (_window.pageXOffset != null) ? _window.pageXOffset : (_doc.scrollLeft != null) ? _doc.scrollLeft : document.body.scrollLeft; + }; + + p.getY = function() { + return (!this._wdw) ? this._target.scrollTop : (_window.pageYOffset != null) ? _window.pageYOffset : (_doc.scrollTop != null) ? _doc.scrollTop : document.body.scrollTop; + }; + + p._kill = function(lookup) { + if (lookup.scrollTo_x) { + this.skipX = true; + } + if (lookup.scrollTo_y) { + this.skipY = true; + } + return this._super._kill.call(this, lookup); + }; }); if (window._gsDefine) { window._gsQueue.pop()(); } /*! @@ -12173,566 +12451,566 @@ angular.module('b2b.att.treeNodeCheckbox', ['b2b.att.utilities']) (window._gsQueue || (window._gsQueue = [])).push( function() { - "use strict"; - - window._gsDefine("TweenMax", ["core.Animation","core.SimpleTimeline","TweenLite"], function(Animation, SimpleTimeline, TweenLite) { - - var _slice = [].slice, - TweenMax = function(target, duration, vars) { - TweenLite.call(this, target, duration, vars); - this._cycle = 0; - this._yoyo = (this.vars.yoyo === true); - this._repeat = this.vars.repeat || 0; - this._repeatDelay = this.vars.repeatDelay || 0; - this._dirty = true; //ensures that if there is any repeat, the totalDuration will get recalculated to accurately report it. - this.render = TweenMax.prototype.render; //speed optimization (avoid prototype lookup on this "hot" method) - }, - _tinyNum = 0.0000000001, - TweenLiteInternals = TweenLite._internals, - _isSelector = TweenLiteInternals.isSelector, - _isArray = TweenLiteInternals.isArray, - p = TweenMax.prototype = TweenLite.to({}, 0.1, {}), - _blankArray = []; - - TweenMax.version = "1.12.1"; - p.constructor = TweenMax; - p.kill()._gc = false; - TweenMax.killTweensOf = TweenMax.killDelayedCallsTo = TweenLite.killTweensOf; - TweenMax.getTweensOf = TweenLite.getTweensOf; - TweenMax.lagSmoothing = TweenLite.lagSmoothing; - TweenMax.ticker = TweenLite.ticker; - TweenMax.render = TweenLite.render; - - p.invalidate = function() { - this._yoyo = (this.vars.yoyo === true); - this._repeat = this.vars.repeat || 0; - this._repeatDelay = this.vars.repeatDelay || 0; - this._uncache(true); - return TweenLite.prototype.invalidate.call(this); - }; - - p.updateTo = function(vars, resetDuration) { - var curRatio = this.ratio, p; - if (resetDuration && this._startTime < this._timeline._time) { - this._startTime = this._timeline._time; - this._uncache(false); - if (this._gc) { - this._enabled(true, false); - } else { - this._timeline.insert(this, this._startTime - this._delay); //ensures that any necessary re-sequencing of Animations in the timeline occurs to make sure the rendering order is correct. - } - } - for (p in vars) { - this.vars[p] = vars[p]; - } - if (this._initted) { - if (resetDuration) { - this._initted = false; - } else { - if (this._gc) { - this._enabled(true, false); - } - if (this._notifyPluginsOfEnabled && this._firstPT) { - TweenLite._onPluginEvent("_onDisable", this); //in case a plugin like MotionBlur must perform some cleanup tasks - } - if (this._time / this._duration > 0.998) { //if the tween has finished (or come extremely close to finishing), we just need to rewind it to 0 and then render it again at the end which forces it to re-initialize (parsing the new vars). We allow tweens that are close to finishing (but haven't quite finished) to work this way too because otherwise, the values are so small when determining where to project the starting values that binary math issues creep in and can make the tween appear to render incorrectly when run backwards. - var prevTime = this._time; - this.render(0, true, false); - this._initted = false; - this.render(prevTime, true, false); - } else if (this._time > 0) { - this._initted = false; - this._init(); - var inv = 1 / (1 - curRatio), - pt = this._firstPT, endValue; - while (pt) { - endValue = pt.s + pt.c; - pt.c *= inv; - pt.s = endValue - pt.c; - pt = pt._next; - } - } - } - } - return this; - }; - - p.render = function(time, suppressEvents, force) { - if (!this._initted) if (this._duration === 0 && this.vars.repeat) { //zero duration tweens that render immediately have render() called from TweenLite's constructor, before TweenMax's constructor has finished setting _repeat, _repeatDelay, and _yoyo which are critical in determining totalDuration() so we need to call invalidate() which is a low-kb way to get those set properly. - this.invalidate(); - } - var totalDur = (!this._dirty) ? this._totalDuration : this.totalDuration(), - prevTime = this._time, - prevTotalTime = this._totalTime, - prevCycle = this._cycle, - duration = this._duration, - prevRawPrevTime = this._rawPrevTime, - isComplete, callback, pt, cycleDuration, r, type, pow, rawPrevTime, i; - if (time >= totalDur) { - this._totalTime = totalDur; - this._cycle = this._repeat; - if (this._yoyo && (this._cycle & 1) !== 0) { - this._time = 0; - this.ratio = this._ease._calcEnd ? this._ease.getRatio(0) : 0; - } else { - this._time = duration; - this.ratio = this._ease._calcEnd ? this._ease.getRatio(1) : 1; - } - if (!this._reversed) { - isComplete = true; - callback = "onComplete"; - } - if (duration === 0) if (this._initted || !this.vars.lazy || force) { //zero-duration tweens are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. - if (this._startTime === this._timeline._duration) { //if a zero-duration tween is at the VERY end of a timeline and that timeline renders at its end, it will typically add a tiny bit of cushion to the render time to prevent rounding errors from getting in the way of tweens rendering their VERY end. If we then reverse() that timeline, the zero-duration tween will trigger its onReverseComplete even though technically the playhead didn't pass over it again. It's a very specific edge case we must accommodate. - time = 0; - } - if (time === 0 || prevRawPrevTime < 0 || prevRawPrevTime === _tinyNum) if (prevRawPrevTime !== time) { - force = true; - if (prevRawPrevTime > _tinyNum) { - callback = "onReverseComplete"; - } - } - this._rawPrevTime = rawPrevTime = (!suppressEvents || time || prevRawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - } - - } else if (time < 0.0000001) { //to work around occasional floating point math artifacts, round super small values to 0. - this._totalTime = this._time = this._cycle = 0; - this.ratio = this._ease._calcEnd ? this._ease.getRatio(0) : 0; - if (prevTotalTime !== 0 || (duration === 0 && prevRawPrevTime > 0 && prevRawPrevTime !== _tinyNum)) { - callback = "onReverseComplete"; - isComplete = this._reversed; - } - if (time < 0) { - this._active = false; - if (duration === 0) if (this._initted || !this.vars.lazy || force) { //zero-duration tweens are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. - if (prevRawPrevTime >= 0) { - force = true; - } - this._rawPrevTime = rawPrevTime = (!suppressEvents || time || prevRawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - } - } else if (!this._initted) { //if we render the very beginning (time == 0) of a fromTo(), we must force the render (normal tweens wouldn't need to render at a time of 0 when the prevTime was also 0). This is also mandatory to make sure overwriting kicks in immediately. - force = true; - } - } else { - this._totalTime = this._time = time; - - if (this._repeat !== 0) { - cycleDuration = duration + this._repeatDelay; - this._cycle = (this._totalTime / cycleDuration) >> 0; //originally _totalTime % cycleDuration but floating point errors caused problems, so I normalized it. (4 % 0.8 should be 0 but Flash reports it as 0.79999999!) - if (this._cycle !== 0) if (this._cycle === this._totalTime / cycleDuration) { - this._cycle--; //otherwise when rendered exactly at the end time, it will act as though it is repeating (at the beginning) - } - this._time = this._totalTime - (this._cycle * cycleDuration); - if (this._yoyo) if ((this._cycle & 1) !== 0) { - this._time = duration - this._time; - } - if (this._time > duration) { - this._time = duration; - } else if (this._time < 0) { - this._time = 0; - } - } - - if (this._easeType) { - r = this._time / duration; - type = this._easeType; - pow = this._easePower; - if (type === 1 || (type === 3 && r >= 0.5)) { - r = 1 - r; - } - if (type === 3) { - r *= 2; - } - if (pow === 1) { - r *= r; - } else if (pow === 2) { - r *= r * r; - } else if (pow === 3) { - r *= r * r * r; - } else if (pow === 4) { - r *= r * r * r * r; - } - - if (type === 1) { - this.ratio = 1 - r; - } else if (type === 2) { - this.ratio = r; - } else if (this._time / duration < 0.5) { - this.ratio = r / 2; - } else { - this.ratio = 1 - (r / 2); - } - - } else { - this.ratio = this._ease.getRatio(this._time / duration); - } - - } - - if (prevTime === this._time && !force && prevCycle === this._cycle) { - if (prevTotalTime !== this._totalTime) if (this._onUpdate) if (!suppressEvents) { //so that onUpdate fires even during the repeatDelay - as long as the totalTime changed, we should trigger onUpdate. - this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); - } - return; - } else if (!this._initted) { - this._init(); - if (!this._initted || this._gc) { //immediateRender tweens typically won't initialize until the playhead advances (_time is greater than 0) in order to ensure that overwriting occurs properly. Also, if all of the tweening properties have been overwritten (which would cause _gc to be true, as set in _init()), we shouldn't continue otherwise an onStart callback could be called for example. - return; - } else if (!force && this._firstPT && ((this.vars.lazy !== false && this._duration) || (this.vars.lazy && !this._duration))) { //we stick it in the queue for rendering at the very end of the tick - this is a performance optimization because browsers invalidate styles and force a recalculation if you read, write, and then read style data (so it's better to read/read/read/write/write/write than read/write/read/write/read/write). The down side, of course, is that usually you WANT things to render immediately because you may have code running right after that which depends on the change. Like imagine running TweenLite.set(...) and then immediately after that, creating a nother tween that animates the same property to another value; the starting values of that 2nd tween wouldn't be accurate if lazy is true. - this._time = prevTime; - this._totalTime = prevTotalTime; - this._rawPrevTime = prevRawPrevTime; - this._cycle = prevCycle; - TweenLiteInternals.lazyTweens.push(this); - this._lazy = time; - return; - } - //_ease is initially set to defaultEase, so now that init() has run, _ease is set properly and we need to recalculate the ratio. Overall this is faster than using conditional logic earlier in the method to avoid having to set ratio twice because we only init() once but renderTime() gets called VERY frequently. - if (this._time && !isComplete) { - this.ratio = this._ease.getRatio(this._time / duration); - } else if (isComplete && this._ease._calcEnd) { - this.ratio = this._ease.getRatio((this._time === 0) ? 0 : 1); - } - } - if (this._lazy !== false) { - this._lazy = false; - } - - if (!this._active) if (!this._paused && this._time !== prevTime && time >= 0) { - this._active = true; //so that if the user renders a tween (as opposed to the timeline rendering it), the timeline is forced to re-render and align it with the proper time/frame on the next rendering cycle. Maybe the tween already finished but the user manually re-renders it as halfway done. - } - if (prevTotalTime === 0) { - if (this._initted === 2 && time > 0) { - //this.invalidate(); - this._init(); //will just apply overwriting since _initted of (2) means it was a from() tween that had immediateRender:true - } - if (this._startAt) { - if (time >= 0) { - this._startAt.render(time, suppressEvents, force); - } else if (!callback) { - callback = "_dummyGS"; //if no callback is defined, use a dummy value just so that the condition at the end evaluates as true because _startAt should render AFTER the normal render loop when the time is negative. We could handle this in a more intuitive way, of course, but the render loop is the MOST important thing to optimize, so this technique allows us to avoid adding extra conditional logic in a high-frequency area. - } - } - if (this.vars.onStart) if (this._totalTime !== 0 || duration === 0) if (!suppressEvents) { - this.vars.onStart.apply(this.vars.onStartScope || this, this.vars.onStartParams || _blankArray); - } - } - - pt = this._firstPT; - while (pt) { - if (pt.f) { - pt.t[pt.p](pt.c * this.ratio + pt.s); - } else { - pt.t[pt.p] = pt.c * this.ratio + pt.s; - } - pt = pt._next; - } - - if (this._onUpdate) { - if (time < 0) if (this._startAt && this._startTime) { //if the tween is positioned at the VERY beginning (_startTime 0) of its parent timeline, it's illegal for the playhead to go back further, so we should not render the recorded startAt values. - this._startAt.render(time, suppressEvents, force); //note: for performance reasons, we tuck this conditional logic inside less traveled areas (most tweens don't have an onUpdate). We'd just have it at the end before the onComplete, but the values should be updated before any onUpdate is called, so we ALSO put it here and then if it's not called, we do so later near the onComplete. - } - if (!suppressEvents) if (this._totalTime !== prevTotalTime || isComplete) { - this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); - } - } - if (this._cycle !== prevCycle) if (!suppressEvents) if (!this._gc) if (this.vars.onRepeat) { - this.vars.onRepeat.apply(this.vars.onRepeatScope || this, this.vars.onRepeatParams || _blankArray); - } - if (callback) if (!this._gc) { //check gc because there's a chance that kill() could be called in an onUpdate - if (time < 0 && this._startAt && !this._onUpdate && this._startTime) { //if the tween is positioned at the VERY beginning (_startTime 0) of its parent timeline, it's illegal for the playhead to go back further, so we should not render the recorded startAt values. - this._startAt.render(time, suppressEvents, force); - } - if (isComplete) { - if (this._timeline.autoRemoveChildren) { - this._enabled(false, false); - } - this._active = false; - } - if (!suppressEvents && this.vars[callback]) { - this.vars[callback].apply(this.vars[callback + "Scope"] || this, this.vars[callback + "Params"] || _blankArray); - } - if (duration === 0 && this._rawPrevTime === _tinyNum && rawPrevTime !== _tinyNum) { //the onComplete or onReverseComplete could trigger movement of the playhead and for zero-duration tweens (which must discern direction) that land directly back on their start time, we don't want to fire again on the next render. Think of several addPause()'s in a timeline that forces the playhead to a certain spot, but what if it's already paused and another tween is tweening the "time" of the timeline? Each time it moves [forward] past that spot, it would move back, and since suppressEvents is true, it'd reset _rawPrevTime to _tinyNum so that when it begins again, the callback would fire (so ultimately it could bounce back and forth during that tween). Again, this is a very uncommon scenario, but possible nonetheless. - this._rawPrevTime = 0; - } - } - }; - + "use strict"; + + window._gsDefine("TweenMax", ["core.Animation","core.SimpleTimeline","TweenLite"], function(Animation, SimpleTimeline, TweenLite) { + + var _slice = [].slice, + TweenMax = function(target, duration, vars) { + TweenLite.call(this, target, duration, vars); + this._cycle = 0; + this._yoyo = (this.vars.yoyo === true); + this._repeat = this.vars.repeat || 0; + this._repeatDelay = this.vars.repeatDelay || 0; + this._dirty = true; //ensures that if there is any repeat, the totalDuration will get recalculated to accurately report it. + this.render = TweenMax.prototype.render; //speed optimization (avoid prototype lookup on this "hot" method) + }, + _tinyNum = 0.0000000001, + TweenLiteInternals = TweenLite._internals, + _isSelector = TweenLiteInternals.isSelector, + _isArray = TweenLiteInternals.isArray, + p = TweenMax.prototype = TweenLite.to({}, 0.1, {}), + _blankArray = []; + + TweenMax.version = "1.12.1"; + p.constructor = TweenMax; + p.kill()._gc = false; + TweenMax.killTweensOf = TweenMax.killDelayedCallsTo = TweenLite.killTweensOf; + TweenMax.getTweensOf = TweenLite.getTweensOf; + TweenMax.lagSmoothing = TweenLite.lagSmoothing; + TweenMax.ticker = TweenLite.ticker; + TweenMax.render = TweenLite.render; + + p.invalidate = function() { + this._yoyo = (this.vars.yoyo === true); + this._repeat = this.vars.repeat || 0; + this._repeatDelay = this.vars.repeatDelay || 0; + this._uncache(true); + return TweenLite.prototype.invalidate.call(this); + }; + + p.updateTo = function(vars, resetDuration) { + var curRatio = this.ratio, p; + if (resetDuration && this._startTime < this._timeline._time) { + this._startTime = this._timeline._time; + this._uncache(false); + if (this._gc) { + this._enabled(true, false); + } else { + this._timeline.insert(this, this._startTime - this._delay); //ensures that any necessary re-sequencing of Animations in the timeline occurs to make sure the rendering order is correct. + } + } + for (p in vars) { + this.vars[p] = vars[p]; + } + if (this._initted) { + if (resetDuration) { + this._initted = false; + } else { + if (this._gc) { + this._enabled(true, false); + } + if (this._notifyPluginsOfEnabled && this._firstPT) { + TweenLite._onPluginEvent("_onDisable", this); //in case a plugin like MotionBlur must perform some cleanup tasks + } + if (this._time / this._duration > 0.998) { //if the tween has finished (or come extremely close to finishing), we just need to rewind it to 0 and then render it again at the end which forces it to re-initialize (parsing the new vars). We allow tweens that are close to finishing (but haven't quite finished) to work this way too because otherwise, the values are so small when determining where to project the starting values that binary math issues creep in and can make the tween appear to render incorrectly when run backwards. + var prevTime = this._time; + this.render(0, true, false); + this._initted = false; + this.render(prevTime, true, false); + } else if (this._time > 0) { + this._initted = false; + this._init(); + var inv = 1 / (1 - curRatio), + pt = this._firstPT, endValue; + while (pt) { + endValue = pt.s + pt.c; + pt.c *= inv; + pt.s = endValue - pt.c; + pt = pt._next; + } + } + } + } + return this; + }; + + p.render = function(time, suppressEvents, force) { + if (!this._initted) if (this._duration === 0 && this.vars.repeat) { //zero duration tweens that render immediately have render() called from TweenLite's constructor, before TweenMax's constructor has finished setting _repeat, _repeatDelay, and _yoyo which are critical in determining totalDuration() so we need to call invalidate() which is a low-kb way to get those set properly. + this.invalidate(); + } + var totalDur = (!this._dirty) ? this._totalDuration : this.totalDuration(), + prevTime = this._time, + prevTotalTime = this._totalTime, + prevCycle = this._cycle, + duration = this._duration, + prevRawPrevTime = this._rawPrevTime, + isComplete, callback, pt, cycleDuration, r, type, pow, rawPrevTime, i; + if (time >= totalDur) { + this._totalTime = totalDur; + this._cycle = this._repeat; + if (this._yoyo && (this._cycle & 1) !== 0) { + this._time = 0; + this.ratio = this._ease._calcEnd ? this._ease.getRatio(0) : 0; + } else { + this._time = duration; + this.ratio = this._ease._calcEnd ? this._ease.getRatio(1) : 1; + } + if (!this._reversed) { + isComplete = true; + callback = "onComplete"; + } + if (duration === 0) if (this._initted || !this.vars.lazy || force) { //zero-duration tweens are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. + if (this._startTime === this._timeline._duration) { //if a zero-duration tween is at the VERY end of a timeline and that timeline renders at its end, it will typically add a tiny bit of cushion to the render time to prevent rounding errors from getting in the way of tweens rendering their VERY end. If we then reverse() that timeline, the zero-duration tween will trigger its onReverseComplete even though technically the playhead didn't pass over it again. It's a very specific edge case we must accommodate. + time = 0; + } + if (time === 0 || prevRawPrevTime < 0 || prevRawPrevTime === _tinyNum) if (prevRawPrevTime !== time) { + force = true; + if (prevRawPrevTime > _tinyNum) { + callback = "onReverseComplete"; + } + } + this._rawPrevTime = rawPrevTime = (!suppressEvents || time || prevRawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. + } + + } else if (time < 0.0000001) { //to work around occasional floating point math artifacts, round super small values to 0. + this._totalTime = this._time = this._cycle = 0; + this.ratio = this._ease._calcEnd ? this._ease.getRatio(0) : 0; + if (prevTotalTime !== 0 || (duration === 0 && prevRawPrevTime > 0 && prevRawPrevTime !== _tinyNum)) { + callback = "onReverseComplete"; + isComplete = this._reversed; + } + if (time < 0) { + this._active = false; + if (duration === 0) if (this._initted || !this.vars.lazy || force) { //zero-duration tweens are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. + if (prevRawPrevTime >= 0) { + force = true; + } + this._rawPrevTime = rawPrevTime = (!suppressEvents || time || prevRawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. + } + } else if (!this._initted) { //if we render the very beginning (time == 0) of a fromTo(), we must force the render (normal tweens wouldn't need to render at a time of 0 when the prevTime was also 0). This is also mandatory to make sure overwriting kicks in immediately. + force = true; + } + } else { + this._totalTime = this._time = time; + + if (this._repeat !== 0) { + cycleDuration = duration + this._repeatDelay; + this._cycle = (this._totalTime / cycleDuration) >> 0; //originally _totalTime % cycleDuration but floating point errors caused problems, so I normalized it. (4 % 0.8 should be 0 but Flash reports it as 0.79999999!) + if (this._cycle !== 0) if (this._cycle === this._totalTime / cycleDuration) { + this._cycle--; //otherwise when rendered exactly at the end time, it will act as though it is repeating (at the beginning) + } + this._time = this._totalTime - (this._cycle * cycleDuration); + if (this._yoyo) if ((this._cycle & 1) !== 0) { + this._time = duration - this._time; + } + if (this._time > duration) { + this._time = duration; + } else if (this._time < 0) { + this._time = 0; + } + } + + if (this._easeType) { + r = this._time / duration; + type = this._easeType; + pow = this._easePower; + if (type === 1 || (type === 3 && r >= 0.5)) { + r = 1 - r; + } + if (type === 3) { + r *= 2; + } + if (pow === 1) { + r *= r; + } else if (pow === 2) { + r *= r * r; + } else if (pow === 3) { + r *= r * r * r; + } else if (pow === 4) { + r *= r * r * r * r; + } + + if (type === 1) { + this.ratio = 1 - r; + } else if (type === 2) { + this.ratio = r; + } else if (this._time / duration < 0.5) { + this.ratio = r / 2; + } else { + this.ratio = 1 - (r / 2); + } + + } else { + this.ratio = this._ease.getRatio(this._time / duration); + } + + } + + if (prevTime === this._time && !force && prevCycle === this._cycle) { + if (prevTotalTime !== this._totalTime) if (this._onUpdate) if (!suppressEvents) { //so that onUpdate fires even during the repeatDelay - as long as the totalTime changed, we should trigger onUpdate. + this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); + } + return; + } else if (!this._initted) { + this._init(); + if (!this._initted || this._gc) { //immediateRender tweens typically won't initialize until the playhead advances (_time is greater than 0) in order to ensure that overwriting occurs properly. Also, if all of the tweening properties have been overwritten (which would cause _gc to be true, as set in _init()), we shouldn't continue otherwise an onStart callback could be called for example. + return; + } else if (!force && this._firstPT && ((this.vars.lazy !== false && this._duration) || (this.vars.lazy && !this._duration))) { //we stick it in the queue for rendering at the very end of the tick - this is a performance optimization because browsers invalidate styles and force a recalculation if you read, write, and then read style data (so it's better to read/read/read/write/write/write than read/write/read/write/read/write). The down side, of course, is that usually you WANT things to render immediately because you may have code running right after that which depends on the change. Like imagine running TweenLite.set(...) and then immediately after that, creating a nother tween that animates the same property to another value; the starting values of that 2nd tween wouldn't be accurate if lazy is true. + this._time = prevTime; + this._totalTime = prevTotalTime; + this._rawPrevTime = prevRawPrevTime; + this._cycle = prevCycle; + TweenLiteInternals.lazyTweens.push(this); + this._lazy = time; + return; + } + //_ease is initially set to defaultEase, so now that init() has run, _ease is set properly and we need to recalculate the ratio. Overall this is faster than using conditional logic earlier in the method to avoid having to set ratio twice because we only init() once but renderTime() gets called VERY frequently. + if (this._time && !isComplete) { + this.ratio = this._ease.getRatio(this._time / duration); + } else if (isComplete && this._ease._calcEnd) { + this.ratio = this._ease.getRatio((this._time === 0) ? 0 : 1); + } + } + if (this._lazy !== false) { + this._lazy = false; + } + + if (!this._active) if (!this._paused && this._time !== prevTime && time >= 0) { + this._active = true; //so that if the user renders a tween (as opposed to the timeline rendering it), the timeline is forced to re-render and align it with the proper time/frame on the next rendering cycle. Maybe the tween already finished but the user manually re-renders it as halfway done. + } + if (prevTotalTime === 0) { + if (this._initted === 2 && time > 0) { + //this.invalidate(); + this._init(); //will just apply overwriting since _initted of (2) means it was a from() tween that had immediateRender:true + } + if (this._startAt) { + if (time >= 0) { + this._startAt.render(time, suppressEvents, force); + } else if (!callback) { + callback = "_dummyGS"; //if no callback is defined, use a dummy value just so that the condition at the end evaluates as true because _startAt should render AFTER the normal render loop when the time is negative. We could handle this in a more intuitive way, of course, but the render loop is the MOST important thing to optimize, so this technique allows us to avoid adding extra conditional logic in a high-frequency area. + } + } + if (this.vars.onStart) if (this._totalTime !== 0 || duration === 0) if (!suppressEvents) { + this.vars.onStart.apply(this.vars.onStartScope || this, this.vars.onStartParams || _blankArray); + } + } + + pt = this._firstPT; + while (pt) { + if (pt.f) { + pt.t[pt.p](pt.c * this.ratio + pt.s); + } else { + pt.t[pt.p] = pt.c * this.ratio + pt.s; + } + pt = pt._next; + } + + if (this._onUpdate) { + if (time < 0) if (this._startAt && this._startTime) { //if the tween is positioned at the VERY beginning (_startTime 0) of its parent timeline, it's illegal for the playhead to go back further, so we should not render the recorded startAt values. + this._startAt.render(time, suppressEvents, force); //note: for performance reasons, we tuck this conditional logic inside less traveled areas (most tweens don't have an onUpdate). We'd just have it at the end before the onComplete, but the values should be updated before any onUpdate is called, so we ALSO put it here and then if it's not called, we do so later near the onComplete. + } + if (!suppressEvents) if (this._totalTime !== prevTotalTime || isComplete) { + this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); + } + } + if (this._cycle !== prevCycle) if (!suppressEvents) if (!this._gc) if (this.vars.onRepeat) { + this.vars.onRepeat.apply(this.vars.onRepeatScope || this, this.vars.onRepeatParams || _blankArray); + } + if (callback) if (!this._gc) { //check gc because there's a chance that kill() could be called in an onUpdate + if (time < 0 && this._startAt && !this._onUpdate && this._startTime) { //if the tween is positioned at the VERY beginning (_startTime 0) of its parent timeline, it's illegal for the playhead to go back further, so we should not render the recorded startAt values. + this._startAt.render(time, suppressEvents, force); + } + if (isComplete) { + if (this._timeline.autoRemoveChildren) { + this._enabled(false, false); + } + this._active = false; + } + if (!suppressEvents && this.vars[callback]) { + this.vars[callback].apply(this.vars[callback + "Scope"] || this, this.vars[callback + "Params"] || _blankArray); + } + if (duration === 0 && this._rawPrevTime === _tinyNum && rawPrevTime !== _tinyNum) { //the onComplete or onReverseComplete could trigger movement of the playhead and for zero-duration tweens (which must discern direction) that land directly back on their start time, we don't want to fire again on the next render. Think of several addPause()'s in a timeline that forces the playhead to a certain spot, but what if it's already paused and another tween is tweening the "time" of the timeline? Each time it moves [forward] past that spot, it would move back, and since suppressEvents is true, it'd reset _rawPrevTime to _tinyNum so that when it begins again, the callback would fire (so ultimately it could bounce back and forth during that tween). Again, this is a very uncommon scenario, but possible nonetheless. + this._rawPrevTime = 0; + } + } + }; + //---- STATIC FUNCTIONS ----------------------------------------------------------------------------------------------------------- - - TweenMax.to = function(target, duration, vars) { - return new TweenMax(target, duration, vars); - }; - - TweenMax.from = function(target, duration, vars) { - vars.runBackwards = true; - vars.immediateRender = (vars.immediateRender != false); - return new TweenMax(target, duration, vars); - }; - - TweenMax.fromTo = function(target, duration, fromVars, toVars) { - toVars.startAt = fromVars; - toVars.immediateRender = (toVars.immediateRender != false && fromVars.immediateRender != false); - return new TweenMax(target, duration, toVars); - }; - - TweenMax.staggerTo = TweenMax.allTo = function(targets, duration, vars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { - stagger = stagger || 0; - var delay = vars.delay || 0, - a = [], - finalComplete = function() { - if (vars.onComplete) { - vars.onComplete.apply(vars.onCompleteScope || this, arguments); - } - onCompleteAll.apply(onCompleteAllScope || this, onCompleteAllParams || _blankArray); - }, - l, copy, i, p; - if (!_isArray(targets)) { - if (typeof(targets) === "string") { - targets = TweenLite.selector(targets) || targets; - } - if (_isSelector(targets)) { - targets = _slice.call(targets, 0); - } - } - l = targets.length; - for (i = 0; i < l; i++) { - copy = {}; - for (p in vars) { - copy[p] = vars[p]; - } - copy.delay = delay; - if (i === l - 1 && onCompleteAll) { - copy.onComplete = finalComplete; - } - a[i] = new TweenMax(targets[i], duration, copy); - delay += stagger; - } - return a; - }; - - TweenMax.staggerFrom = TweenMax.allFrom = function(targets, duration, vars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { - vars.runBackwards = true; - vars.immediateRender = (vars.immediateRender != false); - return TweenMax.staggerTo(targets, duration, vars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope); - }; - - TweenMax.staggerFromTo = TweenMax.allFromTo = function(targets, duration, fromVars, toVars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { - toVars.startAt = fromVars; - toVars.immediateRender = (toVars.immediateRender != false && fromVars.immediateRender != false); - return TweenMax.staggerTo(targets, duration, toVars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope); - }; - - TweenMax.delayedCall = function(delay, callback, params, scope, useFrames) { - return new TweenMax(callback, 0, {delay:delay, onComplete:callback, onCompleteParams:params, onCompleteScope:scope, onReverseComplete:callback, onReverseCompleteParams:params, onReverseCompleteScope:scope, immediateRender:false, useFrames:useFrames, overwrite:0}); - }; - - TweenMax.set = function(target, vars) { - return new TweenMax(target, 0, vars); - }; - - TweenMax.isTweening = function(target) { - return (TweenLite.getTweensOf(target, true).length > 0); - }; - - var _getChildrenOf = function(timeline, includeTimelines) { - var a = [], - cnt = 0, - tween = timeline._first; - while (tween) { - if (tween instanceof TweenLite) { - a[cnt++] = tween; - } else { - if (includeTimelines) { - a[cnt++] = tween; - } - a = a.concat(_getChildrenOf(tween, includeTimelines)); - cnt = a.length; - } - tween = tween._next; - } - return a; - }, - getAllTweens = TweenMax.getAllTweens = function(includeTimelines) { - return _getChildrenOf(Animation._rootTimeline, includeTimelines).concat( _getChildrenOf(Animation._rootFramesTimeline, includeTimelines) ); - }; - - TweenMax.killAll = function(complete, tweens, delayedCalls, timelines) { - if (tweens == null) { - tweens = true; - } - if (delayedCalls == null) { - delayedCalls = true; - } - var a = getAllTweens((timelines != false)), - l = a.length, - allTrue = (tweens && delayedCalls && timelines), - isDC, tween, i; - for (i = 0; i < l; i++) { - tween = a[i]; - if (allTrue || (tween instanceof SimpleTimeline) || ((isDC = (tween.target === tween.vars.onComplete)) && delayedCalls) || (tweens && !isDC)) { - if (complete) { - tween.totalTime(tween._reversed ? 0 : tween.totalDuration()); - } else { - tween._enabled(false, false); - } - } - } - }; - - TweenMax.killChildTweensOf = function(parent, complete) { - if (parent == null) { - return; - } - var tl = TweenLiteInternals.tweenLookup, - a, curParent, p, i, l; - if (typeof(parent) === "string") { - parent = TweenLite.selector(parent) || parent; - } - if (_isSelector(parent)) { - parent = _slice.call(parent, 0); - } - if (_isArray(parent)) { - i = parent.length; - while (--i > -1) { - TweenMax.killChildTweensOf(parent[i], complete); - } - return; - } - a = []; - for (p in tl) { - curParent = tl[p].target.parentNode; - while (curParent) { - if (curParent === parent) { - a = a.concat(tl[p].tweens); - } - curParent = curParent.parentNode; - } - } - l = a.length; - for (i = 0; i < l; i++) { - if (complete) { - a[i].totalTime(a[i].totalDuration()); - } - a[i]._enabled(false, false); - } - }; - - var _changePause = function(pause, tweens, delayedCalls, timelines) { - tweens = (tweens !== false); - delayedCalls = (delayedCalls !== false); - timelines = (timelines !== false); - var a = getAllTweens(timelines), - allTrue = (tweens && delayedCalls && timelines), - i = a.length, - isDC, tween; - while (--i > -1) { - tween = a[i]; - if (allTrue || (tween instanceof SimpleTimeline) || ((isDC = (tween.target === tween.vars.onComplete)) && delayedCalls) || (tweens && !isDC)) { - tween.paused(pause); - } - } - }; - - TweenMax.pauseAll = function(tweens, delayedCalls, timelines) { - _changePause(true, tweens, delayedCalls, timelines); - }; - - TweenMax.resumeAll = function(tweens, delayedCalls, timelines) { - _changePause(false, tweens, delayedCalls, timelines); - }; - - TweenMax.globalTimeScale = function(value) { - var tl = Animation._rootTimeline, - t = TweenLite.ticker.time; - if (!arguments.length) { - return tl._timeScale; - } - value = value || _tinyNum; //can't allow zero because it'll throw the math off - tl._startTime = t - ((t - tl._startTime) * tl._timeScale / value); - tl = Animation._rootFramesTimeline; - t = TweenLite.ticker.frame; - tl._startTime = t - ((t - tl._startTime) * tl._timeScale / value); - tl._timeScale = Animation._rootTimeline._timeScale = value; - return value; - }; - - + + TweenMax.to = function(target, duration, vars) { + return new TweenMax(target, duration, vars); + }; + + TweenMax.from = function(target, duration, vars) { + vars.runBackwards = true; + vars.immediateRender = (vars.immediateRender != false); + return new TweenMax(target, duration, vars); + }; + + TweenMax.fromTo = function(target, duration, fromVars, toVars) { + toVars.startAt = fromVars; + toVars.immediateRender = (toVars.immediateRender != false && fromVars.immediateRender != false); + return new TweenMax(target, duration, toVars); + }; + + TweenMax.staggerTo = TweenMax.allTo = function(targets, duration, vars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { + stagger = stagger || 0; + var delay = vars.delay || 0, + a = [], + finalComplete = function() { + if (vars.onComplete) { + vars.onComplete.apply(vars.onCompleteScope || this, arguments); + } + onCompleteAll.apply(onCompleteAllScope || this, onCompleteAllParams || _blankArray); + }, + l, copy, i, p; + if (!_isArray(targets)) { + if (typeof(targets) === "string") { + targets = TweenLite.selector(targets) || targets; + } + if (_isSelector(targets)) { + targets = _slice.call(targets, 0); + } + } + l = targets.length; + for (i = 0; i < l; i++) { + copy = {}; + for (p in vars) { + copy[p] = vars[p]; + } + copy.delay = delay; + if (i === l - 1 && onCompleteAll) { + copy.onComplete = finalComplete; + } + a[i] = new TweenMax(targets[i], duration, copy); + delay += stagger; + } + return a; + }; + + TweenMax.staggerFrom = TweenMax.allFrom = function(targets, duration, vars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { + vars.runBackwards = true; + vars.immediateRender = (vars.immediateRender != false); + return TweenMax.staggerTo(targets, duration, vars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope); + }; + + TweenMax.staggerFromTo = TweenMax.allFromTo = function(targets, duration, fromVars, toVars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { + toVars.startAt = fromVars; + toVars.immediateRender = (toVars.immediateRender != false && fromVars.immediateRender != false); + return TweenMax.staggerTo(targets, duration, toVars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope); + }; + + TweenMax.delayedCall = function(delay, callback, params, scope, useFrames) { + return new TweenMax(callback, 0, {delay:delay, onComplete:callback, onCompleteParams:params, onCompleteScope:scope, onReverseComplete:callback, onReverseCompleteParams:params, onReverseCompleteScope:scope, immediateRender:false, useFrames:useFrames, overwrite:0}); + }; + + TweenMax.set = function(target, vars) { + return new TweenMax(target, 0, vars); + }; + + TweenMax.isTweening = function(target) { + return (TweenLite.getTweensOf(target, true).length > 0); + }; + + var _getChildrenOf = function(timeline, includeTimelines) { + var a = [], + cnt = 0, + tween = timeline._first; + while (tween) { + if (tween instanceof TweenLite) { + a[cnt++] = tween; + } else { + if (includeTimelines) { + a[cnt++] = tween; + } + a = a.concat(_getChildrenOf(tween, includeTimelines)); + cnt = a.length; + } + tween = tween._next; + } + return a; + }, + getAllTweens = TweenMax.getAllTweens = function(includeTimelines) { + return _getChildrenOf(Animation._rootTimeline, includeTimelines).concat( _getChildrenOf(Animation._rootFramesTimeline, includeTimelines) ); + }; + + TweenMax.killAll = function(complete, tweens, delayedCalls, timelines) { + if (tweens == null) { + tweens = true; + } + if (delayedCalls == null) { + delayedCalls = true; + } + var a = getAllTweens((timelines != false)), + l = a.length, + allTrue = (tweens && delayedCalls && timelines), + isDC, tween, i; + for (i = 0; i < l; i++) { + tween = a[i]; + if (allTrue || (tween instanceof SimpleTimeline) || ((isDC = (tween.target === tween.vars.onComplete)) && delayedCalls) || (tweens && !isDC)) { + if (complete) { + tween.totalTime(tween._reversed ? 0 : tween.totalDuration()); + } else { + tween._enabled(false, false); + } + } + } + }; + + TweenMax.killChildTweensOf = function(parent, complete) { + if (parent == null) { + return; + } + var tl = TweenLiteInternals.tweenLookup, + a, curParent, p, i, l; + if (typeof(parent) === "string") { + parent = TweenLite.selector(parent) || parent; + } + if (_isSelector(parent)) { + parent = _slice.call(parent, 0); + } + if (_isArray(parent)) { + i = parent.length; + while (--i > -1) { + TweenMax.killChildTweensOf(parent[i], complete); + } + return; + } + a = []; + for (p in tl) { + curParent = tl[p].target.parentNode; + while (curParent) { + if (curParent === parent) { + a = a.concat(tl[p].tweens); + } + curParent = curParent.parentNode; + } + } + l = a.length; + for (i = 0; i < l; i++) { + if (complete) { + a[i].totalTime(a[i].totalDuration()); + } + a[i]._enabled(false, false); + } + }; + + var _changePause = function(pause, tweens, delayedCalls, timelines) { + tweens = (tweens !== false); + delayedCalls = (delayedCalls !== false); + timelines = (timelines !== false); + var a = getAllTweens(timelines), + allTrue = (tweens && delayedCalls && timelines), + i = a.length, + isDC, tween; + while (--i > -1) { + tween = a[i]; + if (allTrue || (tween instanceof SimpleTimeline) || ((isDC = (tween.target === tween.vars.onComplete)) && delayedCalls) || (tweens && !isDC)) { + tween.paused(pause); + } + } + }; + + TweenMax.pauseAll = function(tweens, delayedCalls, timelines) { + _changePause(true, tweens, delayedCalls, timelines); + }; + + TweenMax.resumeAll = function(tweens, delayedCalls, timelines) { + _changePause(false, tweens, delayedCalls, timelines); + }; + + TweenMax.globalTimeScale = function(value) { + var tl = Animation._rootTimeline, + t = TweenLite.ticker.time; + if (!arguments.length) { + return tl._timeScale; + } + value = value || _tinyNum; //can't allow zero because it'll throw the math off + tl._startTime = t - ((t - tl._startTime) * tl._timeScale / value); + tl = Animation._rootFramesTimeline; + t = TweenLite.ticker.frame; + tl._startTime = t - ((t - tl._startTime) * tl._timeScale / value); + tl._timeScale = Animation._rootTimeline._timeScale = value; + return value; + }; + + //---- GETTERS / SETTERS ---------------------------------------------------------------------------------------------------------- - - p.progress = function(value) { - return (!arguments.length) ? this._time / this.duration() : this.totalTime( this.duration() * ((this._yoyo && (this._cycle & 1) !== 0) ? 1 - value : value) + (this._cycle * (this._duration + this._repeatDelay)), false); - }; - - p.totalProgress = function(value) { - return (!arguments.length) ? this._totalTime / this.totalDuration() : this.totalTime( this.totalDuration() * value, false); - }; - - p.time = function(value, suppressEvents) { - if (!arguments.length) { - return this._time; - } - if (this._dirty) { - this.totalDuration(); - } - if (value > this._duration) { - value = this._duration; - } - if (this._yoyo && (this._cycle & 1) !== 0) { - value = (this._duration - value) + (this._cycle * (this._duration + this._repeatDelay)); - } else if (this._repeat !== 0) { - value += this._cycle * (this._duration + this._repeatDelay); - } - return this.totalTime(value, suppressEvents); - }; - - p.duration = function(value) { - if (!arguments.length) { - return this._duration; //don't set _dirty = false because there could be repeats that haven't been factored into the _totalDuration yet. Otherwise, if you create a repeated TweenMax and then immediately check its duration(), it would cache the value and the totalDuration would not be correct, thus repeats wouldn't take effect. - } - return Animation.prototype.duration.call(this, value); - }; - - p.totalDuration = function(value) { - if (!arguments.length) { - if (this._dirty) { - //instead of Infinity, we use 999999999999 so that we can accommodate reverses - this._totalDuration = (this._repeat === -1) ? 999999999999 : this._duration * (this._repeat + 1) + (this._repeatDelay * this._repeat); - this._dirty = false; - } - return this._totalDuration; - } - return (this._repeat === -1) ? this : this.duration( (value - (this._repeat * this._repeatDelay)) / (this._repeat + 1) ); - }; - - p.repeat = function(value) { - if (!arguments.length) { - return this._repeat; - } - this._repeat = value; - return this._uncache(true); - }; - - p.repeatDelay = function(value) { - if (!arguments.length) { - return this._repeatDelay; - } - this._repeatDelay = value; - return this._uncache(true); - }; - - p.yoyo = function(value) { - if (!arguments.length) { - return this._yoyo; - } - this._yoyo = value; - return this; - }; - - - return TweenMax; - - }, true); + + p.progress = function(value) { + return (!arguments.length) ? this._time / this.duration() : this.totalTime( this.duration() * ((this._yoyo && (this._cycle & 1) !== 0) ? 1 - value : value) + (this._cycle * (this._duration + this._repeatDelay)), false); + }; + + p.totalProgress = function(value) { + return (!arguments.length) ? this._totalTime / this.totalDuration() : this.totalTime( this.totalDuration() * value, false); + }; + + p.time = function(value, suppressEvents) { + if (!arguments.length) { + return this._time; + } + if (this._dirty) { + this.totalDuration(); + } + if (value > this._duration) { + value = this._duration; + } + if (this._yoyo && (this._cycle & 1) !== 0) { + value = (this._duration - value) + (this._cycle * (this._duration + this._repeatDelay)); + } else if (this._repeat !== 0) { + value += this._cycle * (this._duration + this._repeatDelay); + } + return this.totalTime(value, suppressEvents); + }; + + p.duration = function(value) { + if (!arguments.length) { + return this._duration; //don't set _dirty = false because there could be repeats that haven't been factored into the _totalDuration yet. Otherwise, if you create a repeated TweenMax and then immediately check its duration(), it would cache the value and the totalDuration would not be correct, thus repeats wouldn't take effect. + } + return Animation.prototype.duration.call(this, value); + }; + + p.totalDuration = function(value) { + if (!arguments.length) { + if (this._dirty) { + //instead of Infinity, we use 999999999999 so that we can accommodate reverses + this._totalDuration = (this._repeat === -1) ? 999999999999 : this._duration * (this._repeat + 1) + (this._repeatDelay * this._repeat); + this._dirty = false; + } + return this._totalDuration; + } + return (this._repeat === -1) ? this : this.duration( (value - (this._repeat * this._repeatDelay)) / (this._repeat + 1) ); + }; + + p.repeat = function(value) { + if (!arguments.length) { + return this._repeat; + } + this._repeat = value; + return this._uncache(true); + }; + + p.repeatDelay = function(value) { + if (!arguments.length) { + return this._repeatDelay; + } + this._repeatDelay = value; + return this._uncache(true); + }; + + p.yoyo = function(value) { + if (!arguments.length) { + return this._yoyo; + } + this._yoyo = value; + return this; + }; + + + return TweenMax; + + }, true); @@ -12746,4023 +13024,4023 @@ angular.module('b2b.att.treeNodeCheckbox', ['b2b.att.utilities']) * TimelineLite * ---------------------------------------------------------------- */ - window._gsDefine("TimelineLite", ["core.Animation","core.SimpleTimeline","TweenLite"], function(Animation, SimpleTimeline, TweenLite) { - - var TimelineLite = function(vars) { - SimpleTimeline.call(this, vars); - this._labels = {}; - this.autoRemoveChildren = (this.vars.autoRemoveChildren === true); - this.smoothChildTiming = (this.vars.smoothChildTiming === true); - this._sortChildren = true; - this._onUpdate = this.vars.onUpdate; - var v = this.vars, - val, p; - for (p in v) { - val = v[p]; - if (_isArray(val)) if (val.join("").indexOf("{self}") !== -1) { - v[p] = this._swapSelfInParams(val); - } - } - if (_isArray(v.tweens)) { - this.add(v.tweens, 0, v.align, v.stagger); - } - }, - _tinyNum = 0.0000000001, - _isSelector = TweenLite._internals.isSelector, - _isArray = TweenLite._internals.isArray, - _blankArray = [], - _globals = window._gsDefine.globals, - _copy = function(vars) { - var copy = {}, p; - for (p in vars) { - copy[p] = vars[p]; - } - return copy; - }, - _pauseCallback = function(tween, callback, params, scope) { - tween._timeline.pause(tween._startTime); - if (callback) { - callback.apply(scope || tween._timeline, params || _blankArray); - } - }, - _slice = _blankArray.slice, - p = TimelineLite.prototype = new SimpleTimeline(); - - TimelineLite.version = "1.12.1"; - p.constructor = TimelineLite; - p.kill()._gc = false; - - p.to = function(target, duration, vars, position) { - var Engine = (vars.repeat && _globals.TweenMax) || TweenLite; - return duration ? this.add( new Engine(target, duration, vars), position) : this.set(target, vars, position); - }; - - p.from = function(target, duration, vars, position) { - return this.add( ((vars.repeat && _globals.TweenMax) || TweenLite).from(target, duration, vars), position); - }; - - p.fromTo = function(target, duration, fromVars, toVars, position) { - var Engine = (toVars.repeat && _globals.TweenMax) || TweenLite; - return duration ? this.add( Engine.fromTo(target, duration, fromVars, toVars), position) : this.set(target, toVars, position); - }; - - p.staggerTo = function(targets, duration, vars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { - var tl = new TimelineLite({onComplete:onCompleteAll, onCompleteParams:onCompleteAllParams, onCompleteScope:onCompleteAllScope, smoothChildTiming:this.smoothChildTiming}), - i; - if (typeof(targets) === "string") { - targets = TweenLite.selector(targets) || targets; - } - if (_isSelector(targets)) { //senses if the targets object is a selector. If it is, we should translate it into an array. - targets = _slice.call(targets, 0); - } - stagger = stagger || 0; - for (i = 0; i < targets.length; i++) { - if (vars.startAt) { - vars.startAt = _copy(vars.startAt); - } - tl.to(targets[i], duration, _copy(vars), i * stagger); - } - return this.add(tl, position); - }; - - p.staggerFrom = function(targets, duration, vars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { - vars.immediateRender = (vars.immediateRender != false); - vars.runBackwards = true; - return this.staggerTo(targets, duration, vars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope); - }; - - p.staggerFromTo = function(targets, duration, fromVars, toVars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { - toVars.startAt = fromVars; - toVars.immediateRender = (toVars.immediateRender != false && fromVars.immediateRender != false); - return this.staggerTo(targets, duration, toVars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope); - }; - - p.call = function(callback, params, scope, position) { - return this.add( TweenLite.delayedCall(0, callback, params, scope), position); - }; - - p.set = function(target, vars, position) { - position = this._parseTimeOrLabel(position, 0, true); - if (vars.immediateRender == null) { - vars.immediateRender = (position === this._time && !this._paused); - } - return this.add( new TweenLite(target, 0, vars), position); - }; - - TimelineLite.exportRoot = function(vars, ignoreDelayedCalls) { - vars = vars || {}; - if (vars.smoothChildTiming == null) { - vars.smoothChildTiming = true; - } - var tl = new TimelineLite(vars), - root = tl._timeline, - tween, next; - if (ignoreDelayedCalls == null) { - ignoreDelayedCalls = true; - } - root._remove(tl, true); - tl._startTime = 0; - tl._rawPrevTime = tl._time = tl._totalTime = root._time; - tween = root._first; - while (tween) { - next = tween._next; - if (!ignoreDelayedCalls || !(tween instanceof TweenLite && tween.target === tween.vars.onComplete)) { - tl.add(tween, tween._startTime - tween._delay); - } - tween = next; - } - root.add(tl, 0); - return tl; - }; - - p.add = function(value, position, align, stagger) { - var curTime, l, i, child, tl, beforeRawTime; - if (typeof(position) !== "number") { - position = this._parseTimeOrLabel(position, 0, true, value); - } - if (!(value instanceof Animation)) { - if ((value instanceof Array) || (value && value.push && _isArray(value))) { - align = align || "normal"; - stagger = stagger || 0; - curTime = position; - l = value.length; - for (i = 0; i < l; i++) { - if (_isArray(child = value[i])) { - child = new TimelineLite({tweens:child}); - } - this.add(child, curTime); - if (typeof(child) !== "string" && typeof(child) !== "function") { - if (align === "sequence") { - curTime = child._startTime + (child.totalDuration() / child._timeScale); - } else if (align === "start") { - child._startTime -= child.delay(); - } - } - curTime += stagger; - } - return this._uncache(true); - } else if (typeof(value) === "string") { - return this.addLabel(value, position); - } else if (typeof(value) === "function") { - value = TweenLite.delayedCall(0, value); - } else { - throw("Cannot add " + value + " into the timeline; it is not a tween, timeline, function, or string."); - } - } - - SimpleTimeline.prototype.add.call(this, value, position); - - //if the timeline has already ended but the inserted tween/timeline extends the duration, we should enable this timeline again so that it renders properly. We should also align the playhead with the parent timeline's when appropriate. - if (this._gc || this._time === this._duration) if (!this._paused) if (this._duration < this.duration()) { - //in case any of the ancestors had completed but should now be enabled... - tl = this; - beforeRawTime = (tl.rawTime() > value._startTime); //if the tween is placed on the timeline so that it starts BEFORE the current rawTime, we should align the playhead (move the timeline). This is because sometimes users will create a timeline, let it finish, and much later append a tween and expect it to run instead of jumping to its end state. While technically one could argue that it should jump to its end state, that's not what users intuitively expect. - while (tl._timeline) { - if (beforeRawTime && tl._timeline.smoothChildTiming) { - tl.totalTime(tl._totalTime, true); //moves the timeline (shifts its startTime) if necessary, and also enables it. - } else if (tl._gc) { - tl._enabled(true, false); - } - tl = tl._timeline; - } - } - - return this; - }; - - p.remove = function(value) { - if (value instanceof Animation) { - return this._remove(value, false); - } else if (value instanceof Array || (value && value.push && _isArray(value))) { - var i = value.length; - while (--i > -1) { - this.remove(value[i]); - } - return this; - } else if (typeof(value) === "string") { - return this.removeLabel(value); - } - return this.kill(null, value); - }; - - p._remove = function(tween, skipDisable) { - SimpleTimeline.prototype._remove.call(this, tween, skipDisable); - var last = this._last; - if (!last) { - this._time = this._totalTime = this._duration = this._totalDuration = 0; - } else if (this._time > last._startTime + last._totalDuration / last._timeScale) { - this._time = this.duration(); - this._totalTime = this._totalDuration; - } - return this; - }; - - p.append = function(value, offsetOrLabel) { - return this.add(value, this._parseTimeOrLabel(null, offsetOrLabel, true, value)); - }; - - p.insert = p.insertMultiple = function(value, position, align, stagger) { - return this.add(value, position || 0, align, stagger); - }; - - p.appendMultiple = function(tweens, offsetOrLabel, align, stagger) { - return this.add(tweens, this._parseTimeOrLabel(null, offsetOrLabel, true, tweens), align, stagger); - }; - - p.addLabel = function(label, position) { - this._labels[label] = this._parseTimeOrLabel(position); - return this; - }; - - p.addPause = function(position, callback, params, scope) { - return this.call(_pauseCallback, ["{self}", callback, params, scope], this, position); - }; - - p.removeLabel = function(label) { - delete this._labels[label]; - return this; - }; - - p.getLabelTime = function(label) { - return (this._labels[label] != null) ? this._labels[label] : -1; - }; - - p._parseTimeOrLabel = function(timeOrLabel, offsetOrLabel, appendIfAbsent, ignore) { - var i; - //if we're about to add a tween/timeline (or an array of them) that's already a child of this timeline, we should remove it first so that it doesn't contaminate the duration(). - if (ignore instanceof Animation && ignore.timeline === this) { - this.remove(ignore); - } else if (ignore && ((ignore instanceof Array) || (ignore.push && _isArray(ignore)))) { - i = ignore.length; - while (--i > -1) { - if (ignore[i] instanceof Animation && ignore[i].timeline === this) { - this.remove(ignore[i]); - } - } - } - if (typeof(offsetOrLabel) === "string") { - return this._parseTimeOrLabel(offsetOrLabel, (appendIfAbsent && typeof(timeOrLabel) === "number" && this._labels[offsetOrLabel] == null) ? timeOrLabel - this.duration() : 0, appendIfAbsent); - } - offsetOrLabel = offsetOrLabel || 0; - if (typeof(timeOrLabel) === "string" && (isNaN(timeOrLabel) || this._labels[timeOrLabel] != null)) { //if the string is a number like "1", check to see if there's a label with that name, otherwise interpret it as a number (absolute value). - i = timeOrLabel.indexOf("="); - if (i === -1) { - if (this._labels[timeOrLabel] == null) { - return appendIfAbsent ? (this._labels[timeOrLabel] = this.duration() + offsetOrLabel) : offsetOrLabel; - } - return this._labels[timeOrLabel] + offsetOrLabel; - } - offsetOrLabel = parseInt(timeOrLabel.charAt(i-1) + "1", 10) * Number(timeOrLabel.substr(i+1)); - timeOrLabel = (i > 1) ? this._parseTimeOrLabel(timeOrLabel.substr(0, i-1), 0, appendIfAbsent) : this.duration(); - } else if (timeOrLabel == null) { - timeOrLabel = this.duration(); - } - return Number(timeOrLabel) + offsetOrLabel; - }; - - p.seek = function(position, suppressEvents) { - return this.totalTime((typeof(position) === "number") ? position : this._parseTimeOrLabel(position), (suppressEvents !== false)); - }; - - p.stop = function() { - return this.paused(true); - }; - - p.gotoAndPlay = function(position, suppressEvents) { - return this.play(position, suppressEvents); - }; - - p.gotoAndStop = function(position, suppressEvents) { - return this.pause(position, suppressEvents); - }; - - p.render = function(time, suppressEvents, force) { - if (this._gc) { - this._enabled(true, false); - } - var totalDur = (!this._dirty) ? this._totalDuration : this.totalDuration(), - prevTime = this._time, - prevStart = this._startTime, - prevTimeScale = this._timeScale, - prevPaused = this._paused, - tween, isComplete, next, callback, internalForce; - if (time >= totalDur) { - this._totalTime = this._time = totalDur; - if (!this._reversed) if (!this._hasPausedChild()) { - isComplete = true; - callback = "onComplete"; - if (this._duration === 0) if (time === 0 || this._rawPrevTime < 0 || this._rawPrevTime === _tinyNum) if (this._rawPrevTime !== time && this._first) { - internalForce = true; - if (this._rawPrevTime > _tinyNum) { - callback = "onReverseComplete"; - } - } - } - this._rawPrevTime = (this._duration || !suppressEvents || time || this._rawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration timeline or tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - time = totalDur + 0.0001; //to avoid occasional floating point rounding errors - sometimes child tweens/timelines were not being fully completed (their progress might be 0.999999999999998 instead of 1 because when _time - tween._startTime is performed, floating point errors would return a value that was SLIGHTLY off). Try (999999999999.7 - 999999999999) * 1 = 0.699951171875 instead of 0.7. - - } else if (time < 0.0000001) { //to work around occasional floating point math artifacts, round super small values to 0. - this._totalTime = this._time = 0; - if (prevTime !== 0 || (this._duration === 0 && this._rawPrevTime !== _tinyNum && (this._rawPrevTime > 0 || (time < 0 && this._rawPrevTime >= 0)))) { - callback = "onReverseComplete"; - isComplete = this._reversed; - } - if (time < 0) { - this._active = false; - if (this._duration === 0) if (this._rawPrevTime >= 0 && this._first) { //zero-duration timelines are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. - internalForce = true; - } - this._rawPrevTime = time; - } else { - this._rawPrevTime = (this._duration || !suppressEvents || time || this._rawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration timeline or tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - - time = 0; //to avoid occasional floating point rounding errors (could cause problems especially with zero-duration tweens at the very beginning of the timeline) - if (!this._initted) { - internalForce = true; - } - } - - } else { - this._totalTime = this._time = this._rawPrevTime = time; - } - if ((this._time === prevTime || !this._first) && !force && !internalForce) { - return; - } else if (!this._initted) { - this._initted = true; - } - - if (!this._active) if (!this._paused && this._time !== prevTime && time > 0) { - this._active = true; //so that if the user renders the timeline (as opposed to the parent timeline rendering it), it is forced to re-render and align it with the proper time/frame on the next rendering cycle. Maybe the timeline already finished but the user manually re-renders it as halfway done, for example. - } - - if (prevTime === 0) if (this.vars.onStart) if (this._time !== 0) if (!suppressEvents) { - this.vars.onStart.apply(this.vars.onStartScope || this, this.vars.onStartParams || _blankArray); - } - - if (this._time >= prevTime) { - tween = this._first; - while (tween) { - next = tween._next; //record it here because the value could change after rendering... - if (this._paused && !prevPaused) { //in case a tween pauses the timeline when rendering - break; - } else if (tween._active || (tween._startTime <= this._time && !tween._paused && !tween._gc)) { - if (!tween._reversed) { - tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); - } else { - tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); - } - } - tween = next; - } - } else { - tween = this._last; - while (tween) { - next = tween._prev; //record it here because the value could change after rendering... - if (this._paused && !prevPaused) { //in case a tween pauses the timeline when rendering - break; - } else if (tween._active || (tween._startTime <= prevTime && !tween._paused && !tween._gc)) { - if (!tween._reversed) { - tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); - } else { - tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); - } - } - tween = next; - } - } - - if (this._onUpdate) if (!suppressEvents) { - this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); - } - - if (callback) if (!this._gc) if (prevStart === this._startTime || prevTimeScale !== this._timeScale) if (this._time === 0 || totalDur >= this.totalDuration()) { //if one of the tweens that was rendered altered this timeline's startTime (like if an onComplete reversed the timeline), it probably isn't complete. If it is, don't worry, because whatever call altered the startTime would complete if it was necessary at the new time. The only exception is the timeScale property. Also check _gc because there's a chance that kill() could be called in an onUpdate - if (isComplete) { - if (this._timeline.autoRemoveChildren) { - this._enabled(false, false); - } - this._active = false; - } - if (!suppressEvents && this.vars[callback]) { - this.vars[callback].apply(this.vars[callback + "Scope"] || this, this.vars[callback + "Params"] || _blankArray); - } - } - }; - - p._hasPausedChild = function() { - var tween = this._first; - while (tween) { - if (tween._paused || ((tween instanceof TimelineLite) && tween._hasPausedChild())) { - return true; - } - tween = tween._next; - } - return false; - }; - - p.getChildren = function(nested, tweens, timelines, ignoreBeforeTime) { - ignoreBeforeTime = ignoreBeforeTime || -9999999999; - var a = [], - tween = this._first, - cnt = 0; - while (tween) { - if (tween._startTime < ignoreBeforeTime) { - //do nothing - } else if (tween instanceof TweenLite) { - if (tweens !== false) { - a[cnt++] = tween; - } - } else { - if (timelines !== false) { - a[cnt++] = tween; - } - if (nested !== false) { - a = a.concat(tween.getChildren(true, tweens, timelines)); - cnt = a.length; - } - } - tween = tween._next; - } - return a; - }; - - p.getTweensOf = function(target, nested) { - var disabled = this._gc, - a = [], - cnt = 0, - tweens, i; - if (disabled) { - this._enabled(true, true); //getTweensOf() filters out disabled tweens, and we have to mark them as _gc = true when the timeline completes in order to allow clean garbage collection, so temporarily re-enable the timeline here. - } - tweens = TweenLite.getTweensOf(target); - i = tweens.length; - while (--i > -1) { - if (tweens[i].timeline === this || (nested && this._contains(tweens[i]))) { - a[cnt++] = tweens[i]; - } - } - if (disabled) { - this._enabled(false, true); - } - return a; - }; - - p._contains = function(tween) { - var tl = tween.timeline; - while (tl) { - if (tl === this) { - return true; - } - tl = tl.timeline; - } - return false; - }; - - p.shiftChildren = function(amount, adjustLabels, ignoreBeforeTime) { - ignoreBeforeTime = ignoreBeforeTime || 0; - var tween = this._first, - labels = this._labels, - p; - while (tween) { - if (tween._startTime >= ignoreBeforeTime) { - tween._startTime += amount; - } - tween = tween._next; - } - if (adjustLabels) { - for (p in labels) { - if (labels[p] >= ignoreBeforeTime) { - labels[p] += amount; - } - } - } - return this._uncache(true); - }; - - p._kill = function(vars, target) { - if (!vars && !target) { - return this._enabled(false, false); - } - var tweens = (!target) ? this.getChildren(true, true, false) : this.getTweensOf(target), - i = tweens.length, - changed = false; - while (--i > -1) { - if (tweens[i]._kill(vars, target)) { - changed = true; - } - } - return changed; - }; - - p.clear = function(labels) { - var tweens = this.getChildren(false, true, true), - i = tweens.length; - this._time = this._totalTime = 0; - while (--i > -1) { - tweens[i]._enabled(false, false); - } - if (labels !== false) { - this._labels = {}; - } - return this._uncache(true); - }; - - p.invalidate = function() { - var tween = this._first; - while (tween) { - tween.invalidate(); - tween = tween._next; - } - return this; - }; - - p._enabled = function(enabled, ignoreTimeline) { - if (enabled === this._gc) { - var tween = this._first; - while (tween) { - tween._enabled(enabled, true); - tween = tween._next; - } - } - return SimpleTimeline.prototype._enabled.call(this, enabled, ignoreTimeline); - }; - - p.duration = function(value) { - if (!arguments.length) { - if (this._dirty) { - this.totalDuration(); //just triggers recalculation - } - return this._duration; - } - if (this.duration() !== 0 && value !== 0) { - this.timeScale(this._duration / value); - } - return this; - }; - - p.totalDuration = function(value) { - if (!arguments.length) { - if (this._dirty) { - var max = 0, - tween = this._last, - prevStart = 999999999999, - prev, end; - while (tween) { - prev = tween._prev; //record it here in case the tween changes position in the sequence... - if (tween._dirty) { - tween.totalDuration(); //could change the tween._startTime, so make sure the tween's cache is clean before analyzing it. - } - if (tween._startTime > prevStart && this._sortChildren && !tween._paused) { //in case one of the tweens shifted out of order, it needs to be re-inserted into the correct position in the sequence - this.add(tween, tween._startTime - tween._delay); - } else { - prevStart = tween._startTime; - } - if (tween._startTime < 0 && !tween._paused) { //children aren't allowed to have negative startTimes unless smoothChildTiming is true, so adjust here if one is found. - max -= tween._startTime; - if (this._timeline.smoothChildTiming) { - this._startTime += tween._startTime / this._timeScale; - } - this.shiftChildren(-tween._startTime, false, -9999999999); - prevStart = 0; - } - end = tween._startTime + (tween._totalDuration / tween._timeScale); - if (end > max) { - max = end; - } - tween = prev; - } - this._duration = this._totalDuration = max; - this._dirty = false; - } - return this._totalDuration; - } - if (this.totalDuration() !== 0) if (value !== 0) { - this.timeScale(this._totalDuration / value); - } - return this; - }; - - p.usesFrames = function() { - var tl = this._timeline; - while (tl._timeline) { - tl = tl._timeline; - } - return (tl === Animation._rootFramesTimeline); - }; - - p.rawTime = function() { - return this._paused ? this._totalTime : (this._timeline.rawTime() - this._startTime) * this._timeScale; - }; - - return TimelineLite; - - }, true); - - - - - - - - - - - - - + window._gsDefine("TimelineLite", ["core.Animation","core.SimpleTimeline","TweenLite"], function(Animation, SimpleTimeline, TweenLite) { + + var TimelineLite = function(vars) { + SimpleTimeline.call(this, vars); + this._labels = {}; + this.autoRemoveChildren = (this.vars.autoRemoveChildren === true); + this.smoothChildTiming = (this.vars.smoothChildTiming === true); + this._sortChildren = true; + this._onUpdate = this.vars.onUpdate; + var v = this.vars, + val, p; + for (p in v) { + val = v[p]; + if (_isArray(val)) if (val.join("").indexOf("{self}") !== -1) { + v[p] = this._swapSelfInParams(val); + } + } + if (_isArray(v.tweens)) { + this.add(v.tweens, 0, v.align, v.stagger); + } + }, + _tinyNum = 0.0000000001, + _isSelector = TweenLite._internals.isSelector, + _isArray = TweenLite._internals.isArray, + _blankArray = [], + _globals = window._gsDefine.globals, + _copy = function(vars) { + var copy = {}, p; + for (p in vars) { + copy[p] = vars[p]; + } + return copy; + }, + _pauseCallback = function(tween, callback, params, scope) { + tween._timeline.pause(tween._startTime); + if (callback) { + callback.apply(scope || tween._timeline, params || _blankArray); + } + }, + _slice = _blankArray.slice, + p = TimelineLite.prototype = new SimpleTimeline(); + + TimelineLite.version = "1.12.1"; + p.constructor = TimelineLite; + p.kill()._gc = false; + + p.to = function(target, duration, vars, position) { + var Engine = (vars.repeat && _globals.TweenMax) || TweenLite; + return duration ? this.add( new Engine(target, duration, vars), position) : this.set(target, vars, position); + }; + + p.from = function(target, duration, vars, position) { + return this.add( ((vars.repeat && _globals.TweenMax) || TweenLite).from(target, duration, vars), position); + }; + + p.fromTo = function(target, duration, fromVars, toVars, position) { + var Engine = (toVars.repeat && _globals.TweenMax) || TweenLite; + return duration ? this.add( Engine.fromTo(target, duration, fromVars, toVars), position) : this.set(target, toVars, position); + }; + + p.staggerTo = function(targets, duration, vars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { + var tl = new TimelineLite({onComplete:onCompleteAll, onCompleteParams:onCompleteAllParams, onCompleteScope:onCompleteAllScope, smoothChildTiming:this.smoothChildTiming}), + i; + if (typeof(targets) === "string") { + targets = TweenLite.selector(targets) || targets; + } + if (_isSelector(targets)) { //senses if the targets object is a selector. If it is, we should translate it into an array. + targets = _slice.call(targets, 0); + } + stagger = stagger || 0; + for (i = 0; i < targets.length; i++) { + if (vars.startAt) { + vars.startAt = _copy(vars.startAt); + } + tl.to(targets[i], duration, _copy(vars), i * stagger); + } + return this.add(tl, position); + }; + + p.staggerFrom = function(targets, duration, vars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { + vars.immediateRender = (vars.immediateRender != false); + vars.runBackwards = true; + return this.staggerTo(targets, duration, vars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope); + }; + + p.staggerFromTo = function(targets, duration, fromVars, toVars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { + toVars.startAt = fromVars; + toVars.immediateRender = (toVars.immediateRender != false && fromVars.immediateRender != false); + return this.staggerTo(targets, duration, toVars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope); + }; + + p.call = function(callback, params, scope, position) { + return this.add( TweenLite.delayedCall(0, callback, params, scope), position); + }; + + p.set = function(target, vars, position) { + position = this._parseTimeOrLabel(position, 0, true); + if (vars.immediateRender == null) { + vars.immediateRender = (position === this._time && !this._paused); + } + return this.add( new TweenLite(target, 0, vars), position); + }; + + TimelineLite.exportRoot = function(vars, ignoreDelayedCalls) { + vars = vars || {}; + if (vars.smoothChildTiming == null) { + vars.smoothChildTiming = true; + } + var tl = new TimelineLite(vars), + root = tl._timeline, + tween, next; + if (ignoreDelayedCalls == null) { + ignoreDelayedCalls = true; + } + root._remove(tl, true); + tl._startTime = 0; + tl._rawPrevTime = tl._time = tl._totalTime = root._time; + tween = root._first; + while (tween) { + next = tween._next; + if (!ignoreDelayedCalls || !(tween instanceof TweenLite && tween.target === tween.vars.onComplete)) { + tl.add(tween, tween._startTime - tween._delay); + } + tween = next; + } + root.add(tl, 0); + return tl; + }; + + p.add = function(value, position, align, stagger) { + var curTime, l, i, child, tl, beforeRawTime; + if (typeof(position) !== "number") { + position = this._parseTimeOrLabel(position, 0, true, value); + } + if (!(value instanceof Animation)) { + if ((value instanceof Array) || (value && value.push && _isArray(value))) { + align = align || "normal"; + stagger = stagger || 0; + curTime = position; + l = value.length; + for (i = 0; i < l; i++) { + if (_isArray(child = value[i])) { + child = new TimelineLite({tweens:child}); + } + this.add(child, curTime); + if (typeof(child) !== "string" && typeof(child) !== "function") { + if (align === "sequence") { + curTime = child._startTime + (child.totalDuration() / child._timeScale); + } else if (align === "start") { + child._startTime -= child.delay(); + } + } + curTime += stagger; + } + return this._uncache(true); + } else if (typeof(value) === "string") { + return this.addLabel(value, position); + } else if (typeof(value) === "function") { + value = TweenLite.delayedCall(0, value); + } else { + throw("Cannot add " + value + " into the timeline; it is not a tween, timeline, function, or string."); + } + } + + SimpleTimeline.prototype.add.call(this, value, position); + + //if the timeline has already ended but the inserted tween/timeline extends the duration, we should enable this timeline again so that it renders properly. We should also align the playhead with the parent timeline's when appropriate. + if (this._gc || this._time === this._duration) if (!this._paused) if (this._duration < this.duration()) { + //in case any of the ancestors had completed but should now be enabled... + tl = this; + beforeRawTime = (tl.rawTime() > value._startTime); //if the tween is placed on the timeline so that it starts BEFORE the current rawTime, we should align the playhead (move the timeline). This is because sometimes users will create a timeline, let it finish, and much later append a tween and expect it to run instead of jumping to its end state. While technically one could argue that it should jump to its end state, that's not what users intuitively expect. + while (tl._timeline) { + if (beforeRawTime && tl._timeline.smoothChildTiming) { + tl.totalTime(tl._totalTime, true); //moves the timeline (shifts its startTime) if necessary, and also enables it. + } else if (tl._gc) { + tl._enabled(true, false); + } + tl = tl._timeline; + } + } + + return this; + }; + + p.remove = function(value) { + if (value instanceof Animation) { + return this._remove(value, false); + } else if (value instanceof Array || (value && value.push && _isArray(value))) { + var i = value.length; + while (--i > -1) { + this.remove(value[i]); + } + return this; + } else if (typeof(value) === "string") { + return this.removeLabel(value); + } + return this.kill(null, value); + }; + + p._remove = function(tween, skipDisable) { + SimpleTimeline.prototype._remove.call(this, tween, skipDisable); + var last = this._last; + if (!last) { + this._time = this._totalTime = this._duration = this._totalDuration = 0; + } else if (this._time > last._startTime + last._totalDuration / last._timeScale) { + this._time = this.duration(); + this._totalTime = this._totalDuration; + } + return this; + }; + + p.append = function(value, offsetOrLabel) { + return this.add(value, this._parseTimeOrLabel(null, offsetOrLabel, true, value)); + }; + + p.insert = p.insertMultiple = function(value, position, align, stagger) { + return this.add(value, position || 0, align, stagger); + }; + + p.appendMultiple = function(tweens, offsetOrLabel, align, stagger) { + return this.add(tweens, this._parseTimeOrLabel(null, offsetOrLabel, true, tweens), align, stagger); + }; + + p.addLabel = function(label, position) { + this._labels[label] = this._parseTimeOrLabel(position); + return this; + }; + + p.addPause = function(position, callback, params, scope) { + return this.call(_pauseCallback, ["{self}", callback, params, scope], this, position); + }; + + p.removeLabel = function(label) { + delete this._labels[label]; + return this; + }; + + p.getLabelTime = function(label) { + return (this._labels[label] != null) ? this._labels[label] : -1; + }; + + p._parseTimeOrLabel = function(timeOrLabel, offsetOrLabel, appendIfAbsent, ignore) { + var i; + //if we're about to add a tween/timeline (or an array of them) that's already a child of this timeline, we should remove it first so that it doesn't contaminate the duration(). + if (ignore instanceof Animation && ignore.timeline === this) { + this.remove(ignore); + } else if (ignore && ((ignore instanceof Array) || (ignore.push && _isArray(ignore)))) { + i = ignore.length; + while (--i > -1) { + if (ignore[i] instanceof Animation && ignore[i].timeline === this) { + this.remove(ignore[i]); + } + } + } + if (typeof(offsetOrLabel) === "string") { + return this._parseTimeOrLabel(offsetOrLabel, (appendIfAbsent && typeof(timeOrLabel) === "number" && this._labels[offsetOrLabel] == null) ? timeOrLabel - this.duration() : 0, appendIfAbsent); + } + offsetOrLabel = offsetOrLabel || 0; + if (typeof(timeOrLabel) === "string" && (isNaN(timeOrLabel) || this._labels[timeOrLabel] != null)) { //if the string is a number like "1", check to see if there's a label with that name, otherwise interpret it as a number (absolute value). + i = timeOrLabel.indexOf("="); + if (i === -1) { + if (this._labels[timeOrLabel] == null) { + return appendIfAbsent ? (this._labels[timeOrLabel] = this.duration() + offsetOrLabel) : offsetOrLabel; + } + return this._labels[timeOrLabel] + offsetOrLabel; + } + offsetOrLabel = parseInt(timeOrLabel.charAt(i-1) + "1", 10) * Number(timeOrLabel.substr(i+1)); + timeOrLabel = (i > 1) ? this._parseTimeOrLabel(timeOrLabel.substr(0, i-1), 0, appendIfAbsent) : this.duration(); + } else if (timeOrLabel == null) { + timeOrLabel = this.duration(); + } + return Number(timeOrLabel) + offsetOrLabel; + }; + + p.seek = function(position, suppressEvents) { + return this.totalTime((typeof(position) === "number") ? position : this._parseTimeOrLabel(position), (suppressEvents !== false)); + }; + + p.stop = function() { + return this.paused(true); + }; + + p.gotoAndPlay = function(position, suppressEvents) { + return this.play(position, suppressEvents); + }; + + p.gotoAndStop = function(position, suppressEvents) { + return this.pause(position, suppressEvents); + }; + + p.render = function(time, suppressEvents, force) { + if (this._gc) { + this._enabled(true, false); + } + var totalDur = (!this._dirty) ? this._totalDuration : this.totalDuration(), + prevTime = this._time, + prevStart = this._startTime, + prevTimeScale = this._timeScale, + prevPaused = this._paused, + tween, isComplete, next, callback, internalForce; + if (time >= totalDur) { + this._totalTime = this._time = totalDur; + if (!this._reversed) if (!this._hasPausedChild()) { + isComplete = true; + callback = "onComplete"; + if (this._duration === 0) if (time === 0 || this._rawPrevTime < 0 || this._rawPrevTime === _tinyNum) if (this._rawPrevTime !== time && this._first) { + internalForce = true; + if (this._rawPrevTime > _tinyNum) { + callback = "onReverseComplete"; + } + } + } + this._rawPrevTime = (this._duration || !suppressEvents || time || this._rawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration timeline or tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. + time = totalDur + 0.0001; //to avoid occasional floating point rounding errors - sometimes child tweens/timelines were not being fully completed (their progress might be 0.999999999999998 instead of 1 because when _time - tween._startTime is performed, floating point errors would return a value that was SLIGHTLY off). Try (999999999999.7 - 999999999999) * 1 = 0.699951171875 instead of 0.7. + + } else if (time < 0.0000001) { //to work around occasional floating point math artifacts, round super small values to 0. + this._totalTime = this._time = 0; + if (prevTime !== 0 || (this._duration === 0 && this._rawPrevTime !== _tinyNum && (this._rawPrevTime > 0 || (time < 0 && this._rawPrevTime >= 0)))) { + callback = "onReverseComplete"; + isComplete = this._reversed; + } + if (time < 0) { + this._active = false; + if (this._duration === 0) if (this._rawPrevTime >= 0 && this._first) { //zero-duration timelines are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. + internalForce = true; + } + this._rawPrevTime = time; + } else { + this._rawPrevTime = (this._duration || !suppressEvents || time || this._rawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration timeline or tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. + + time = 0; //to avoid occasional floating point rounding errors (could cause problems especially with zero-duration tweens at the very beginning of the timeline) + if (!this._initted) { + internalForce = true; + } + } + + } else { + this._totalTime = this._time = this._rawPrevTime = time; + } + if ((this._time === prevTime || !this._first) && !force && !internalForce) { + return; + } else if (!this._initted) { + this._initted = true; + } + + if (!this._active) if (!this._paused && this._time !== prevTime && time > 0) { + this._active = true; //so that if the user renders the timeline (as opposed to the parent timeline rendering it), it is forced to re-render and align it with the proper time/frame on the next rendering cycle. Maybe the timeline already finished but the user manually re-renders it as halfway done, for example. + } + + if (prevTime === 0) if (this.vars.onStart) if (this._time !== 0) if (!suppressEvents) { + this.vars.onStart.apply(this.vars.onStartScope || this, this.vars.onStartParams || _blankArray); + } + + if (this._time >= prevTime) { + tween = this._first; + while (tween) { + next = tween._next; //record it here because the value could change after rendering... + if (this._paused && !prevPaused) { //in case a tween pauses the timeline when rendering + break; + } else if (tween._active || (tween._startTime <= this._time && !tween._paused && !tween._gc)) { + if (!tween._reversed) { + tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); + } else { + tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); + } + } + tween = next; + } + } else { + tween = this._last; + while (tween) { + next = tween._prev; //record it here because the value could change after rendering... + if (this._paused && !prevPaused) { //in case a tween pauses the timeline when rendering + break; + } else if (tween._active || (tween._startTime <= prevTime && !tween._paused && !tween._gc)) { + if (!tween._reversed) { + tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); + } else { + tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); + } + } + tween = next; + } + } + + if (this._onUpdate) if (!suppressEvents) { + this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); + } + + if (callback) if (!this._gc) if (prevStart === this._startTime || prevTimeScale !== this._timeScale) if (this._time === 0 || totalDur >= this.totalDuration()) { //if one of the tweens that was rendered altered this timeline's startTime (like if an onComplete reversed the timeline), it probably isn't complete. If it is, don't worry, because whatever call altered the startTime would complete if it was necessary at the new time. The only exception is the timeScale property. Also check _gc because there's a chance that kill() could be called in an onUpdate + if (isComplete) { + if (this._timeline.autoRemoveChildren) { + this._enabled(false, false); + } + this._active = false; + } + if (!suppressEvents && this.vars[callback]) { + this.vars[callback].apply(this.vars[callback + "Scope"] || this, this.vars[callback + "Params"] || _blankArray); + } + } + }; + + p._hasPausedChild = function() { + var tween = this._first; + while (tween) { + if (tween._paused || ((tween instanceof TimelineLite) && tween._hasPausedChild())) { + return true; + } + tween = tween._next; + } + return false; + }; + + p.getChildren = function(nested, tweens, timelines, ignoreBeforeTime) { + ignoreBeforeTime = ignoreBeforeTime || -9999999999; + var a = [], + tween = this._first, + cnt = 0; + while (tween) { + if (tween._startTime < ignoreBeforeTime) { + //do nothing + } else if (tween instanceof TweenLite) { + if (tweens !== false) { + a[cnt++] = tween; + } + } else { + if (timelines !== false) { + a[cnt++] = tween; + } + if (nested !== false) { + a = a.concat(tween.getChildren(true, tweens, timelines)); + cnt = a.length; + } + } + tween = tween._next; + } + return a; + }; + + p.getTweensOf = function(target, nested) { + var disabled = this._gc, + a = [], + cnt = 0, + tweens, i; + if (disabled) { + this._enabled(true, true); //getTweensOf() filters out disabled tweens, and we have to mark them as _gc = true when the timeline completes in order to allow clean garbage collection, so temporarily re-enable the timeline here. + } + tweens = TweenLite.getTweensOf(target); + i = tweens.length; + while (--i > -1) { + if (tweens[i].timeline === this || (nested && this._contains(tweens[i]))) { + a[cnt++] = tweens[i]; + } + } + if (disabled) { + this._enabled(false, true); + } + return a; + }; + + p._contains = function(tween) { + var tl = tween.timeline; + while (tl) { + if (tl === this) { + return true; + } + tl = tl.timeline; + } + return false; + }; + + p.shiftChildren = function(amount, adjustLabels, ignoreBeforeTime) { + ignoreBeforeTime = ignoreBeforeTime || 0; + var tween = this._first, + labels = this._labels, + p; + while (tween) { + if (tween._startTime >= ignoreBeforeTime) { + tween._startTime += amount; + } + tween = tween._next; + } + if (adjustLabels) { + for (p in labels) { + if (labels[p] >= ignoreBeforeTime) { + labels[p] += amount; + } + } + } + return this._uncache(true); + }; + + p._kill = function(vars, target) { + if (!vars && !target) { + return this._enabled(false, false); + } + var tweens = (!target) ? this.getChildren(true, true, false) : this.getTweensOf(target), + i = tweens.length, + changed = false; + while (--i > -1) { + if (tweens[i]._kill(vars, target)) { + changed = true; + } + } + return changed; + }; + + p.clear = function(labels) { + var tweens = this.getChildren(false, true, true), + i = tweens.length; + this._time = this._totalTime = 0; + while (--i > -1) { + tweens[i]._enabled(false, false); + } + if (labels !== false) { + this._labels = {}; + } + return this._uncache(true); + }; + + p.invalidate = function() { + var tween = this._first; + while (tween) { + tween.invalidate(); + tween = tween._next; + } + return this; + }; + + p._enabled = function(enabled, ignoreTimeline) { + if (enabled === this._gc) { + var tween = this._first; + while (tween) { + tween._enabled(enabled, true); + tween = tween._next; + } + } + return SimpleTimeline.prototype._enabled.call(this, enabled, ignoreTimeline); + }; + + p.duration = function(value) { + if (!arguments.length) { + if (this._dirty) { + this.totalDuration(); //just triggers recalculation + } + return this._duration; + } + if (this.duration() !== 0 && value !== 0) { + this.timeScale(this._duration / value); + } + return this; + }; + + p.totalDuration = function(value) { + if (!arguments.length) { + if (this._dirty) { + var max = 0, + tween = this._last, + prevStart = 999999999999, + prev, end; + while (tween) { + prev = tween._prev; //record it here in case the tween changes position in the sequence... + if (tween._dirty) { + tween.totalDuration(); //could change the tween._startTime, so make sure the tween's cache is clean before analyzing it. + } + if (tween._startTime > prevStart && this._sortChildren && !tween._paused) { //in case one of the tweens shifted out of order, it needs to be re-inserted into the correct position in the sequence + this.add(tween, tween._startTime - tween._delay); + } else { + prevStart = tween._startTime; + } + if (tween._startTime < 0 && !tween._paused) { //children aren't allowed to have negative startTimes unless smoothChildTiming is true, so adjust here if one is found. + max -= tween._startTime; + if (this._timeline.smoothChildTiming) { + this._startTime += tween._startTime / this._timeScale; + } + this.shiftChildren(-tween._startTime, false, -9999999999); + prevStart = 0; + } + end = tween._startTime + (tween._totalDuration / tween._timeScale); + if (end > max) { + max = end; + } + tween = prev; + } + this._duration = this._totalDuration = max; + this._dirty = false; + } + return this._totalDuration; + } + if (this.totalDuration() !== 0) if (value !== 0) { + this.timeScale(this._totalDuration / value); + } + return this; + }; + + p.usesFrames = function() { + var tl = this._timeline; + while (tl._timeline) { + tl = tl._timeline; + } + return (tl === Animation._rootFramesTimeline); + }; + + p.rawTime = function() { + return this._paused ? this._totalTime : (this._timeline.rawTime() - this._startTime) * this._timeScale; + }; + + return TimelineLite; + + }, true); + + + + + + + + + + + + + /* * ---------------------------------------------------------------- * TimelineMax * ---------------------------------------------------------------- */ - window._gsDefine("TimelineMax", ["TimelineLite","TweenLite","easing.Ease"], function(TimelineLite, TweenLite, Ease) { - - var TimelineMax = function(vars) { - TimelineLite.call(this, vars); - this._repeat = this.vars.repeat || 0; - this._repeatDelay = this.vars.repeatDelay || 0; - this._cycle = 0; - this._yoyo = (this.vars.yoyo === true); - this._dirty = true; - }, - _tinyNum = 0.0000000001, - _blankArray = [], - _easeNone = new Ease(null, null, 1, 0), - p = TimelineMax.prototype = new TimelineLite(); - - p.constructor = TimelineMax; - p.kill()._gc = false; - TimelineMax.version = "1.12.1"; - - p.invalidate = function() { - this._yoyo = (this.vars.yoyo === true); - this._repeat = this.vars.repeat || 0; - this._repeatDelay = this.vars.repeatDelay || 0; - this._uncache(true); - return TimelineLite.prototype.invalidate.call(this); - }; - - p.addCallback = function(callback, position, params, scope) { - return this.add( TweenLite.delayedCall(0, callback, params, scope), position); - }; - - p.removeCallback = function(callback, position) { - if (callback) { - if (position == null) { - this._kill(null, callback); - } else { - var a = this.getTweensOf(callback, false), - i = a.length, - time = this._parseTimeOrLabel(position); - while (--i > -1) { - if (a[i]._startTime === time) { - a[i]._enabled(false, false); - } - } - } - } - return this; - }; - - p.tweenTo = function(position, vars) { - vars = vars || {}; - var copy = {ease:_easeNone, overwrite:(vars.delay ? 2 : 1), useFrames:this.usesFrames(), immediateRender:false},//note: set overwrite to 1 (true/all) by default unless there's a delay so that we avoid a racing situation that could happen if, for example, an onmousemove creates the same tweenTo() over and over again. - duration, p, t; - for (p in vars) { - copy[p] = vars[p]; - } - copy.time = this._parseTimeOrLabel(position); - duration = (Math.abs(Number(copy.time) - this._time) / this._timeScale) || 0.001; - t = new TweenLite(this, duration, copy); - copy.onStart = function() { - t.target.paused(true); - if (t.vars.time !== t.target.time() && duration === t.duration()) { //don't make the duration zero - if it's supposed to be zero, don't worry because it's already initting the tween and will complete immediately, effectively making the duration zero anyway. If we make duration zero, the tween won't run at all. - t.duration( Math.abs( t.vars.time - t.target.time()) / t.target._timeScale ); - } - if (vars.onStart) { //in case the user had an onStart in the vars - we don't want to overwrite it. - vars.onStart.apply(vars.onStartScope || t, vars.onStartParams || _blankArray); - } - }; - return t; - }; - - p.tweenFromTo = function(fromPosition, toPosition, vars) { - vars = vars || {}; - fromPosition = this._parseTimeOrLabel(fromPosition); - vars.startAt = {onComplete:this.seek, onCompleteParams:[fromPosition], onCompleteScope:this}; - vars.immediateRender = (vars.immediateRender !== false); - var t = this.tweenTo(toPosition, vars); - return t.duration((Math.abs( t.vars.time - fromPosition) / this._timeScale) || 0.001); - }; - - p.render = function(time, suppressEvents, force) { - if (this._gc) { - this._enabled(true, false); - } - var totalDur = (!this._dirty) ? this._totalDuration : this.totalDuration(), - dur = this._duration, - prevTime = this._time, - prevTotalTime = this._totalTime, - prevStart = this._startTime, - prevTimeScale = this._timeScale, - prevRawPrevTime = this._rawPrevTime, - prevPaused = this._paused, - prevCycle = this._cycle, - tween, isComplete, next, callback, internalForce, cycleDuration; - if (time >= totalDur) { - if (!this._locked) { - this._totalTime = totalDur; - this._cycle = this._repeat; - } - if (!this._reversed) if (!this._hasPausedChild()) { - isComplete = true; - callback = "onComplete"; - if (this._duration === 0) if (time === 0 || prevRawPrevTime < 0 || prevRawPrevTime === _tinyNum) if (prevRawPrevTime !== time && this._first) { - internalForce = true; - if (prevRawPrevTime > _tinyNum) { - callback = "onReverseComplete"; - } - } - } - this._rawPrevTime = (this._duration || !suppressEvents || time || this._rawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration timeline or tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - if (this._yoyo && (this._cycle & 1) !== 0) { - this._time = time = 0; - } else { - this._time = dur; - time = dur + 0.0001; //to avoid occasional floating point rounding errors - sometimes child tweens/timelines were not being fully completed (their progress might be 0.999999999999998 instead of 1 because when _time - tween._startTime is performed, floating point errors would return a value that was SLIGHTLY off). Try (999999999999.7 - 999999999999) * 1 = 0.699951171875 instead of 0.7. We cannot do less then 0.0001 because the same issue can occur when the duration is extremely large like 999999999999 in which case adding 0.00000001, for example, causes it to act like nothing was added. - } - - } else if (time < 0.0000001) { //to work around occasional floating point math artifacts, round super small values to 0. - if (!this._locked) { - this._totalTime = this._cycle = 0; - } - this._time = 0; - if (prevTime !== 0 || (dur === 0 && prevRawPrevTime !== _tinyNum && (prevRawPrevTime > 0 || (time < 0 && prevRawPrevTime >= 0)) && !this._locked)) { //edge case for checking time < 0 && prevRawPrevTime >= 0: a zero-duration fromTo() tween inside a zero-duration timeline (yeah, very rare) - callback = "onReverseComplete"; - isComplete = this._reversed; - } - if (time < 0) { - this._active = false; - if (dur === 0) if (prevRawPrevTime >= 0 && this._first) { //zero-duration timelines are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. - internalForce = true; - } - this._rawPrevTime = time; - } else { - this._rawPrevTime = (dur || !suppressEvents || time || this._rawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration timeline or tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - time = 0; //to avoid occasional floating point rounding errors (could cause problems especially with zero-duration tweens at the very beginning of the timeline) - if (!this._initted) { - internalForce = true; - } - } - - } else { - if (dur === 0 && prevRawPrevTime < 0) { //without this, zero-duration repeating timelines (like with a simple callback nested at the very beginning and a repeatDelay) wouldn't render the first time through. - internalForce = true; - } - this._time = this._rawPrevTime = time; - if (!this._locked) { - this._totalTime = time; - if (this._repeat !== 0) { - cycleDuration = dur + this._repeatDelay; - this._cycle = (this._totalTime / cycleDuration) >> 0; //originally _totalTime % cycleDuration but floating point errors caused problems, so I normalized it. (4 % 0.8 should be 0 but it gets reported as 0.79999999!) - if (this._cycle !== 0) if (this._cycle === this._totalTime / cycleDuration) { - this._cycle--; //otherwise when rendered exactly at the end time, it will act as though it is repeating (at the beginning) - } - this._time = this._totalTime - (this._cycle * cycleDuration); - if (this._yoyo) if ((this._cycle & 1) !== 0) { - this._time = dur - this._time; - } - if (this._time > dur) { - this._time = dur; - time = dur + 0.0001; //to avoid occasional floating point rounding error - } else if (this._time < 0) { - this._time = time = 0; - } else { - time = this._time; - } - } - } - } - - if (this._cycle !== prevCycle) if (!this._locked) { - /* - make sure children at the end/beginning of the timeline are rendered properly. If, for example, - a 3-second long timeline rendered at 2.9 seconds previously, and now renders at 3.2 seconds (which - would get transated to 2.8 seconds if the timeline yoyos or 0.2 seconds if it just repeats), there - could be a callback or a short tween that's at 2.95 or 3 seconds in which wouldn't render. So - we need to push the timeline to the end (and/or beginning depending on its yoyo value). Also we must - ensure that zero-duration tweens at the very beginning or end of the TimelineMax work. - */ - var backwards = (this._yoyo && (prevCycle & 1) !== 0), - wrap = (backwards === (this._yoyo && (this._cycle & 1) !== 0)), - recTotalTime = this._totalTime, - recCycle = this._cycle, - recRawPrevTime = this._rawPrevTime, - recTime = this._time; - - this._totalTime = prevCycle * dur; - if (this._cycle < prevCycle) { - backwards = !backwards; - } else { - this._totalTime += dur; - } - this._time = prevTime; //temporarily revert _time so that render() renders the children in the correct order. Without this, tweens won't rewind correctly. We could arhictect things in a "cleaner" way by splitting out the rendering queue into a separate method but for performance reasons, we kept it all inside this method. - - this._rawPrevTime = (dur === 0) ? prevRawPrevTime - 0.0001 : prevRawPrevTime; - this._cycle = prevCycle; - this._locked = true; //prevents changes to totalTime and skips repeat/yoyo behavior when we recursively call render() - prevTime = (backwards) ? 0 : dur; - this.render(prevTime, suppressEvents, (dur === 0)); - if (!suppressEvents) if (!this._gc) { - if (this.vars.onRepeat) { - this.vars.onRepeat.apply(this.vars.onRepeatScope || this, this.vars.onRepeatParams || _blankArray); - } - } - if (wrap) { - prevTime = (backwards) ? dur + 0.0001 : -0.0001; - this.render(prevTime, true, false); - } - this._locked = false; - if (this._paused && !prevPaused) { //if the render() triggered callback that paused this timeline, we should abort (very rare, but possible) - return; - } - this._time = recTime; - this._totalTime = recTotalTime; - this._cycle = recCycle; - this._rawPrevTime = recRawPrevTime; - } - - if ((this._time === prevTime || !this._first) && !force && !internalForce) { - if (prevTotalTime !== this._totalTime) if (this._onUpdate) if (!suppressEvents) { //so that onUpdate fires even during the repeatDelay - as long as the totalTime changed, we should trigger onUpdate. - this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); - } - return; - } else if (!this._initted) { - this._initted = true; - } - - if (!this._active) if (!this._paused && this._totalTime !== prevTotalTime && time > 0) { - this._active = true; //so that if the user renders the timeline (as opposed to the parent timeline rendering it), it is forced to re-render and align it with the proper time/frame on the next rendering cycle. Maybe the timeline already finished but the user manually re-renders it as halfway done, for example. - } - - if (prevTotalTime === 0) if (this.vars.onStart) if (this._totalTime !== 0) if (!suppressEvents) { - this.vars.onStart.apply(this.vars.onStartScope || this, this.vars.onStartParams || _blankArray); - } - - if (this._time >= prevTime) { - tween = this._first; - while (tween) { - next = tween._next; //record it here because the value could change after rendering... - if (this._paused && !prevPaused) { //in case a tween pauses the timeline when rendering - break; - } else if (tween._active || (tween._startTime <= this._time && !tween._paused && !tween._gc)) { - if (!tween._reversed) { - tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); - } else { - tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); - } - - } - tween = next; - } - } else { - tween = this._last; - while (tween) { - next = tween._prev; //record it here because the value could change after rendering... - if (this._paused && !prevPaused) { //in case a tween pauses the timeline when rendering - break; - } else if (tween._active || (tween._startTime <= prevTime && !tween._paused && !tween._gc)) { - if (!tween._reversed) { - tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); - } else { - tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); - } - } - tween = next; - } - } - - if (this._onUpdate) if (!suppressEvents) { - this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); - } - if (callback) if (!this._locked) if (!this._gc) if (prevStart === this._startTime || prevTimeScale !== this._timeScale) if (this._time === 0 || totalDur >= this.totalDuration()) { //if one of the tweens that was rendered altered this timeline's startTime (like if an onComplete reversed the timeline), it probably isn't complete. If it is, don't worry, because whatever call altered the startTime would complete if it was necessary at the new time. The only exception is the timeScale property. Also check _gc because there's a chance that kill() could be called in an onUpdate - if (isComplete) { - if (this._timeline.autoRemoveChildren) { - this._enabled(false, false); - } - this._active = false; - } - if (!suppressEvents && this.vars[callback]) { - this.vars[callback].apply(this.vars[callback + "Scope"] || this, this.vars[callback + "Params"] || _blankArray); - } - } - }; - - p.getActive = function(nested, tweens, timelines) { - if (nested == null) { - nested = true; - } - if (tweens == null) { - tweens = true; - } - if (timelines == null) { - timelines = false; - } - var a = [], - all = this.getChildren(nested, tweens, timelines), - cnt = 0, - l = all.length, - i, tween; - for (i = 0; i < l; i++) { - tween = all[i]; - if (tween.isActive()) { - a[cnt++] = tween; - } - } - return a; - }; - - - p.getLabelAfter = function(time) { - if (!time) if (time !== 0) { //faster than isNan() - time = this._time; - } - var labels = this.getLabelsArray(), - l = labels.length, - i; - for (i = 0; i < l; i++) { - if (labels[i].time > time) { - return labels[i].name; - } - } - return null; - }; - - p.getLabelBefore = function(time) { - if (time == null) { - time = this._time; - } - var labels = this.getLabelsArray(), - i = labels.length; - while (--i > -1) { - if (labels[i].time < time) { - return labels[i].name; - } - } - return null; - }; - - p.getLabelsArray = function() { - var a = [], - cnt = 0, - p; - for (p in this._labels) { - a[cnt++] = {time:this._labels[p], name:p}; - } - a.sort(function(a,b) { - return a.time - b.time; - }); - return a; - }; + window._gsDefine("TimelineMax", ["TimelineLite","TweenLite","easing.Ease"], function(TimelineLite, TweenLite, Ease) { + + var TimelineMax = function(vars) { + TimelineLite.call(this, vars); + this._repeat = this.vars.repeat || 0; + this._repeatDelay = this.vars.repeatDelay || 0; + this._cycle = 0; + this._yoyo = (this.vars.yoyo === true); + this._dirty = true; + }, + _tinyNum = 0.0000000001, + _blankArray = [], + _easeNone = new Ease(null, null, 1, 0), + p = TimelineMax.prototype = new TimelineLite(); + + p.constructor = TimelineMax; + p.kill()._gc = false; + TimelineMax.version = "1.12.1"; + + p.invalidate = function() { + this._yoyo = (this.vars.yoyo === true); + this._repeat = this.vars.repeat || 0; + this._repeatDelay = this.vars.repeatDelay || 0; + this._uncache(true); + return TimelineLite.prototype.invalidate.call(this); + }; + + p.addCallback = function(callback, position, params, scope) { + return this.add( TweenLite.delayedCall(0, callback, params, scope), position); + }; + + p.removeCallback = function(callback, position) { + if (callback) { + if (position == null) { + this._kill(null, callback); + } else { + var a = this.getTweensOf(callback, false), + i = a.length, + time = this._parseTimeOrLabel(position); + while (--i > -1) { + if (a[i]._startTime === time) { + a[i]._enabled(false, false); + } + } + } + } + return this; + }; + + p.tweenTo = function(position, vars) { + vars = vars || {}; + var copy = {ease:_easeNone, overwrite:(vars.delay ? 2 : 1), useFrames:this.usesFrames(), immediateRender:false},//note: set overwrite to 1 (true/all) by default unless there's a delay so that we avoid a racing situation that could happen if, for example, an onmousemove creates the same tweenTo() over and over again. + duration, p, t; + for (p in vars) { + copy[p] = vars[p]; + } + copy.time = this._parseTimeOrLabel(position); + duration = (Math.abs(Number(copy.time) - this._time) / this._timeScale) || 0.001; + t = new TweenLite(this, duration, copy); + copy.onStart = function() { + t.target.paused(true); + if (t.vars.time !== t.target.time() && duration === t.duration()) { //don't make the duration zero - if it's supposed to be zero, don't worry because it's already initting the tween and will complete immediately, effectively making the duration zero anyway. If we make duration zero, the tween won't run at all. + t.duration( Math.abs( t.vars.time - t.target.time()) / t.target._timeScale ); + } + if (vars.onStart) { //in case the user had an onStart in the vars - we don't want to overwrite it. + vars.onStart.apply(vars.onStartScope || t, vars.onStartParams || _blankArray); + } + }; + return t; + }; + + p.tweenFromTo = function(fromPosition, toPosition, vars) { + vars = vars || {}; + fromPosition = this._parseTimeOrLabel(fromPosition); + vars.startAt = {onComplete:this.seek, onCompleteParams:[fromPosition], onCompleteScope:this}; + vars.immediateRender = (vars.immediateRender !== false); + var t = this.tweenTo(toPosition, vars); + return t.duration((Math.abs( t.vars.time - fromPosition) / this._timeScale) || 0.001); + }; + + p.render = function(time, suppressEvents, force) { + if (this._gc) { + this._enabled(true, false); + } + var totalDur = (!this._dirty) ? this._totalDuration : this.totalDuration(), + dur = this._duration, + prevTime = this._time, + prevTotalTime = this._totalTime, + prevStart = this._startTime, + prevTimeScale = this._timeScale, + prevRawPrevTime = this._rawPrevTime, + prevPaused = this._paused, + prevCycle = this._cycle, + tween, isComplete, next, callback, internalForce, cycleDuration; + if (time >= totalDur) { + if (!this._locked) { + this._totalTime = totalDur; + this._cycle = this._repeat; + } + if (!this._reversed) if (!this._hasPausedChild()) { + isComplete = true; + callback = "onComplete"; + if (this._duration === 0) if (time === 0 || prevRawPrevTime < 0 || prevRawPrevTime === _tinyNum) if (prevRawPrevTime !== time && this._first) { + internalForce = true; + if (prevRawPrevTime > _tinyNum) { + callback = "onReverseComplete"; + } + } + } + this._rawPrevTime = (this._duration || !suppressEvents || time || this._rawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration timeline or tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. + if (this._yoyo && (this._cycle & 1) !== 0) { + this._time = time = 0; + } else { + this._time = dur; + time = dur + 0.0001; //to avoid occasional floating point rounding errors - sometimes child tweens/timelines were not being fully completed (their progress might be 0.999999999999998 instead of 1 because when _time - tween._startTime is performed, floating point errors would return a value that was SLIGHTLY off). Try (999999999999.7 - 999999999999) * 1 = 0.699951171875 instead of 0.7. We cannot do less then 0.0001 because the same issue can occur when the duration is extremely large like 999999999999 in which case adding 0.00000001, for example, causes it to act like nothing was added. + } + + } else if (time < 0.0000001) { //to work around occasional floating point math artifacts, round super small values to 0. + if (!this._locked) { + this._totalTime = this._cycle = 0; + } + this._time = 0; + if (prevTime !== 0 || (dur === 0 && prevRawPrevTime !== _tinyNum && (prevRawPrevTime > 0 || (time < 0 && prevRawPrevTime >= 0)) && !this._locked)) { //edge case for checking time < 0 && prevRawPrevTime >= 0: a zero-duration fromTo() tween inside a zero-duration timeline (yeah, very rare) + callback = "onReverseComplete"; + isComplete = this._reversed; + } + if (time < 0) { + this._active = false; + if (dur === 0) if (prevRawPrevTime >= 0 && this._first) { //zero-duration timelines are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. + internalForce = true; + } + this._rawPrevTime = time; + } else { + this._rawPrevTime = (dur || !suppressEvents || time || this._rawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration timeline or tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. + time = 0; //to avoid occasional floating point rounding errors (could cause problems especially with zero-duration tweens at the very beginning of the timeline) + if (!this._initted) { + internalForce = true; + } + } + + } else { + if (dur === 0 && prevRawPrevTime < 0) { //without this, zero-duration repeating timelines (like with a simple callback nested at the very beginning and a repeatDelay) wouldn't render the first time through. + internalForce = true; + } + this._time = this._rawPrevTime = time; + if (!this._locked) { + this._totalTime = time; + if (this._repeat !== 0) { + cycleDuration = dur + this._repeatDelay; + this._cycle = (this._totalTime / cycleDuration) >> 0; //originally _totalTime % cycleDuration but floating point errors caused problems, so I normalized it. (4 % 0.8 should be 0 but it gets reported as 0.79999999!) + if (this._cycle !== 0) if (this._cycle === this._totalTime / cycleDuration) { + this._cycle--; //otherwise when rendered exactly at the end time, it will act as though it is repeating (at the beginning) + } + this._time = this._totalTime - (this._cycle * cycleDuration); + if (this._yoyo) if ((this._cycle & 1) !== 0) { + this._time = dur - this._time; + } + if (this._time > dur) { + this._time = dur; + time = dur + 0.0001; //to avoid occasional floating point rounding error + } else if (this._time < 0) { + this._time = time = 0; + } else { + time = this._time; + } + } + } + } + + if (this._cycle !== prevCycle) if (!this._locked) { + /* + make sure children at the end/beginning of the timeline are rendered properly. If, for example, + a 3-second long timeline rendered at 2.9 seconds previously, and now renders at 3.2 seconds (which + would get transated to 2.8 seconds if the timeline yoyos or 0.2 seconds if it just repeats), there + could be a callback or a short tween that's at 2.95 or 3 seconds in which wouldn't render. So + we need to push the timeline to the end (and/or beginning depending on its yoyo value). Also we must + ensure that zero-duration tweens at the very beginning or end of the TimelineMax work. + */ + var backwards = (this._yoyo && (prevCycle & 1) !== 0), + wrap = (backwards === (this._yoyo && (this._cycle & 1) !== 0)), + recTotalTime = this._totalTime, + recCycle = this._cycle, + recRawPrevTime = this._rawPrevTime, + recTime = this._time; + + this._totalTime = prevCycle * dur; + if (this._cycle < prevCycle) { + backwards = !backwards; + } else { + this._totalTime += dur; + } + this._time = prevTime; //temporarily revert _time so that render() renders the children in the correct order. Without this, tweens won't rewind correctly. We could arhictect things in a "cleaner" way by splitting out the rendering queue into a separate method but for performance reasons, we kept it all inside this method. + + this._rawPrevTime = (dur === 0) ? prevRawPrevTime - 0.0001 : prevRawPrevTime; + this._cycle = prevCycle; + this._locked = true; //prevents changes to totalTime and skips repeat/yoyo behavior when we recursively call render() + prevTime = (backwards) ? 0 : dur; + this.render(prevTime, suppressEvents, (dur === 0)); + if (!suppressEvents) if (!this._gc) { + if (this.vars.onRepeat) { + this.vars.onRepeat.apply(this.vars.onRepeatScope || this, this.vars.onRepeatParams || _blankArray); + } + } + if (wrap) { + prevTime = (backwards) ? dur + 0.0001 : -0.0001; + this.render(prevTime, true, false); + } + this._locked = false; + if (this._paused && !prevPaused) { //if the render() triggered callback that paused this timeline, we should abort (very rare, but possible) + return; + } + this._time = recTime; + this._totalTime = recTotalTime; + this._cycle = recCycle; + this._rawPrevTime = recRawPrevTime; + } + + if ((this._time === prevTime || !this._first) && !force && !internalForce) { + if (prevTotalTime !== this._totalTime) if (this._onUpdate) if (!suppressEvents) { //so that onUpdate fires even during the repeatDelay - as long as the totalTime changed, we should trigger onUpdate. + this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); + } + return; + } else if (!this._initted) { + this._initted = true; + } + + if (!this._active) if (!this._paused && this._totalTime !== prevTotalTime && time > 0) { + this._active = true; //so that if the user renders the timeline (as opposed to the parent timeline rendering it), it is forced to re-render and align it with the proper time/frame on the next rendering cycle. Maybe the timeline already finished but the user manually re-renders it as halfway done, for example. + } + + if (prevTotalTime === 0) if (this.vars.onStart) if (this._totalTime !== 0) if (!suppressEvents) { + this.vars.onStart.apply(this.vars.onStartScope || this, this.vars.onStartParams || _blankArray); + } + + if (this._time >= prevTime) { + tween = this._first; + while (tween) { + next = tween._next; //record it here because the value could change after rendering... + if (this._paused && !prevPaused) { //in case a tween pauses the timeline when rendering + break; + } else if (tween._active || (tween._startTime <= this._time && !tween._paused && !tween._gc)) { + if (!tween._reversed) { + tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); + } else { + tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); + } + + } + tween = next; + } + } else { + tween = this._last; + while (tween) { + next = tween._prev; //record it here because the value could change after rendering... + if (this._paused && !prevPaused) { //in case a tween pauses the timeline when rendering + break; + } else if (tween._active || (tween._startTime <= prevTime && !tween._paused && !tween._gc)) { + if (!tween._reversed) { + tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); + } else { + tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); + } + } + tween = next; + } + } + + if (this._onUpdate) if (!suppressEvents) { + this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); + } + if (callback) if (!this._locked) if (!this._gc) if (prevStart === this._startTime || prevTimeScale !== this._timeScale) if (this._time === 0 || totalDur >= this.totalDuration()) { //if one of the tweens that was rendered altered this timeline's startTime (like if an onComplete reversed the timeline), it probably isn't complete. If it is, don't worry, because whatever call altered the startTime would complete if it was necessary at the new time. The only exception is the timeScale property. Also check _gc because there's a chance that kill() could be called in an onUpdate + if (isComplete) { + if (this._timeline.autoRemoveChildren) { + this._enabled(false, false); + } + this._active = false; + } + if (!suppressEvents && this.vars[callback]) { + this.vars[callback].apply(this.vars[callback + "Scope"] || this, this.vars[callback + "Params"] || _blankArray); + } + } + }; + + p.getActive = function(nested, tweens, timelines) { + if (nested == null) { + nested = true; + } + if (tweens == null) { + tweens = true; + } + if (timelines == null) { + timelines = false; + } + var a = [], + all = this.getChildren(nested, tweens, timelines), + cnt = 0, + l = all.length, + i, tween; + for (i = 0; i < l; i++) { + tween = all[i]; + if (tween.isActive()) { + a[cnt++] = tween; + } + } + return a; + }; + + + p.getLabelAfter = function(time) { + if (!time) if (time !== 0) { //faster than isNan() + time = this._time; + } + var labels = this.getLabelsArray(), + l = labels.length, + i; + for (i = 0; i < l; i++) { + if (labels[i].time > time) { + return labels[i].name; + } + } + return null; + }; + + p.getLabelBefore = function(time) { + if (time == null) { + time = this._time; + } + var labels = this.getLabelsArray(), + i = labels.length; + while (--i > -1) { + if (labels[i].time < time) { + return labels[i].name; + } + } + return null; + }; + + p.getLabelsArray = function() { + var a = [], + cnt = 0, + p; + for (p in this._labels) { + a[cnt++] = {time:this._labels[p], name:p}; + } + a.sort(function(a,b) { + return a.time - b.time; + }); + return a; + }; //---- GETTERS / SETTERS ------------------------------------------------------------------------------------------------------- - p.progress = function(value) { - return (!arguments.length) ? this._time / this.duration() : this.totalTime( this.duration() * ((this._yoyo && (this._cycle & 1) !== 0) ? 1 - value : value) + (this._cycle * (this._duration + this._repeatDelay)), false); - }; - - p.totalProgress = function(value) { - return (!arguments.length) ? this._totalTime / this.totalDuration() : this.totalTime( this.totalDuration() * value, false); - }; - - p.totalDuration = function(value) { - if (!arguments.length) { - if (this._dirty) { - TimelineLite.prototype.totalDuration.call(this); //just forces refresh - //Instead of Infinity, we use 999999999999 so that we can accommodate reverses. - this._totalDuration = (this._repeat === -1) ? 999999999999 : this._duration * (this._repeat + 1) + (this._repeatDelay * this._repeat); - } - return this._totalDuration; - } - return (this._repeat === -1) ? this : this.duration( (value - (this._repeat * this._repeatDelay)) / (this._repeat + 1) ); - }; - - p.time = function(value, suppressEvents) { - if (!arguments.length) { - return this._time; - } - if (this._dirty) { - this.totalDuration(); - } - if (value > this._duration) { - value = this._duration; - } - if (this._yoyo && (this._cycle & 1) !== 0) { - value = (this._duration - value) + (this._cycle * (this._duration + this._repeatDelay)); - } else if (this._repeat !== 0) { - value += this._cycle * (this._duration + this._repeatDelay); - } - return this.totalTime(value, suppressEvents); - }; - - p.repeat = function(value) { - if (!arguments.length) { - return this._repeat; - } - this._repeat = value; - return this._uncache(true); - }; - - p.repeatDelay = function(value) { - if (!arguments.length) { - return this._repeatDelay; - } - this._repeatDelay = value; - return this._uncache(true); - }; - - p.yoyo = function(value) { - if (!arguments.length) { - return this._yoyo; - } - this._yoyo = value; - return this; - }; - - p.currentLabel = function(value) { - if (!arguments.length) { - return this.getLabelBefore(this._time + 0.00000001); - } - return this.seek(value, true); - }; - - return TimelineMax; - - }, true); - - - - - - - - - - - - + p.progress = function(value) { + return (!arguments.length) ? this._time / this.duration() : this.totalTime( this.duration() * ((this._yoyo && (this._cycle & 1) !== 0) ? 1 - value : value) + (this._cycle * (this._duration + this._repeatDelay)), false); + }; + + p.totalProgress = function(value) { + return (!arguments.length) ? this._totalTime / this.totalDuration() : this.totalTime( this.totalDuration() * value, false); + }; + + p.totalDuration = function(value) { + if (!arguments.length) { + if (this._dirty) { + TimelineLite.prototype.totalDuration.call(this); //just forces refresh + //Instead of Infinity, we use 999999999999 so that we can accommodate reverses. + this._totalDuration = (this._repeat === -1) ? 999999999999 : this._duration * (this._repeat + 1) + (this._repeatDelay * this._repeat); + } + return this._totalDuration; + } + return (this._repeat === -1) ? this : this.duration( (value - (this._repeat * this._repeatDelay)) / (this._repeat + 1) ); + }; + + p.time = function(value, suppressEvents) { + if (!arguments.length) { + return this._time; + } + if (this._dirty) { + this.totalDuration(); + } + if (value > this._duration) { + value = this._duration; + } + if (this._yoyo && (this._cycle & 1) !== 0) { + value = (this._duration - value) + (this._cycle * (this._duration + this._repeatDelay)); + } else if (this._repeat !== 0) { + value += this._cycle * (this._duration + this._repeatDelay); + } + return this.totalTime(value, suppressEvents); + }; + + p.repeat = function(value) { + if (!arguments.length) { + return this._repeat; + } + this._repeat = value; + return this._uncache(true); + }; + + p.repeatDelay = function(value) { + if (!arguments.length) { + return this._repeatDelay; + } + this._repeatDelay = value; + return this._uncache(true); + }; + + p.yoyo = function(value) { + if (!arguments.length) { + return this._yoyo; + } + this._yoyo = value; + return this; + }; + + p.currentLabel = function(value) { + if (!arguments.length) { + return this.getLabelBefore(this._time + 0.00000001); + } + return this.seek(value, true); + }; + + return TimelineMax; + + }, true); + + + + + + + + + + + + /* * ---------------------------------------------------------------- * BezierPlugin * ---------------------------------------------------------------- */ - (function() { - - var _RAD2DEG = 180 / Math.PI, - _r1 = [], - _r2 = [], - _r3 = [], - _corProps = {}, - Segment = function(a, b, c, d) { - this.a = a; - this.b = b; - this.c = c; - this.d = d; - this.da = d - a; - this.ca = c - a; - this.ba = b - a; - }, - _correlate = ",x,y,z,left,top,right,bottom,marginTop,marginLeft,marginRight,marginBottom,paddingLeft,paddingTop,paddingRight,paddingBottom,backgroundPosition,backgroundPosition_y,", - cubicToQuadratic = function(a, b, c, d) { - var q1 = {a:a}, - q2 = {}, - q3 = {}, - q4 = {c:d}, - mab = (a + b) / 2, - mbc = (b + c) / 2, - mcd = (c + d) / 2, - mabc = (mab + mbc) / 2, - mbcd = (mbc + mcd) / 2, - m8 = (mbcd - mabc) / 8; - q1.b = mab + (a - mab) / 4; - q2.b = mabc + m8; - q1.c = q2.a = (q1.b + q2.b) / 2; - q2.c = q3.a = (mabc + mbcd) / 2; - q3.b = mbcd - m8; - q4.b = mcd + (d - mcd) / 4; - q3.c = q4.a = (q3.b + q4.b) / 2; - return [q1, q2, q3, q4]; - }, - _calculateControlPoints = function(a, curviness, quad, basic, correlate) { - var l = a.length - 1, - ii = 0, - cp1 = a[0].a, - i, p1, p2, p3, seg, m1, m2, mm, cp2, qb, r1, r2, tl; - for (i = 0; i < l; i++) { - seg = a[ii]; - p1 = seg.a; - p2 = seg.d; - p3 = a[ii+1].d; - - if (correlate) { - r1 = _r1[i]; - r2 = _r2[i]; - tl = ((r2 + r1) * curviness * 0.25) / (basic ? 0.5 : _r3[i] || 0.5); - m1 = p2 - (p2 - p1) * (basic ? curviness * 0.5 : (r1 !== 0 ? tl / r1 : 0)); - m2 = p2 + (p3 - p2) * (basic ? curviness * 0.5 : (r2 !== 0 ? tl / r2 : 0)); - mm = p2 - (m1 + (((m2 - m1) * ((r1 * 3 / (r1 + r2)) + 0.5) / 4) || 0)); - } else { - m1 = p2 - (p2 - p1) * curviness * 0.5; - m2 = p2 + (p3 - p2) * curviness * 0.5; - mm = p2 - (m1 + m2) / 2; - } - m1 += mm; - m2 += mm; - - seg.c = cp2 = m1; - if (i !== 0) { - seg.b = cp1; - } else { - seg.b = cp1 = seg.a + (seg.c - seg.a) * 0.6; //instead of placing b on a exactly, we move it inline with c so that if the user specifies an ease like Back.easeIn or Elastic.easeIn which goes BEYOND the beginning, it will do so smoothly. - } - - seg.da = p2 - p1; - seg.ca = cp2 - p1; - seg.ba = cp1 - p1; - - if (quad) { - qb = cubicToQuadratic(p1, cp1, cp2, p2); - a.splice(ii, 1, qb[0], qb[1], qb[2], qb[3]); - ii += 4; - } else { - ii++; - } - - cp1 = m2; - } - seg = a[ii]; - seg.b = cp1; - seg.c = cp1 + (seg.d - cp1) * 0.4; //instead of placing c on d exactly, we move it inline with b so that if the user specifies an ease like Back.easeOut or Elastic.easeOut which goes BEYOND the end, it will do so smoothly. - seg.da = seg.d - seg.a; - seg.ca = seg.c - seg.a; - seg.ba = cp1 - seg.a; - if (quad) { - qb = cubicToQuadratic(seg.a, cp1, seg.c, seg.d); - a.splice(ii, 1, qb[0], qb[1], qb[2], qb[3]); - } - }, - _parseAnchors = function(values, p, correlate, prepend) { - var a = [], - l, i, p1, p2, p3, tmp; - if (prepend) { - values = [prepend].concat(values); - i = values.length; - while (--i > -1) { - if (typeof( (tmp = values[i][p]) ) === "string") if (tmp.charAt(1) === "=") { - values[i][p] = prepend[p] + Number(tmp.charAt(0) + tmp.substr(2)); //accommodate relative values. Do it inline instead of breaking it out into a function for speed reasons - } - } - } - l = values.length - 2; - if (l < 0) { - a[0] = new Segment(values[0][p], 0, 0, values[(l < -1) ? 0 : 1][p]); - return a; - } - for (i = 0; i < l; i++) { - p1 = values[i][p]; - p2 = values[i+1][p]; - a[i] = new Segment(p1, 0, 0, p2); - if (correlate) { - p3 = values[i+2][p]; - _r1[i] = (_r1[i] || 0) + (p2 - p1) * (p2 - p1); - _r2[i] = (_r2[i] || 0) + (p3 - p2) * (p3 - p2); - } - } - a[i] = new Segment(values[i][p], 0, 0, values[i+1][p]); - return a; - }, - bezierThrough = function(values, curviness, quadratic, basic, correlate, prepend) { - var obj = {}, - props = [], - first = prepend || values[0], - i, p, a, j, r, l, seamless, last; - correlate = (typeof(correlate) === "string") ? ","+correlate+"," : _correlate; - if (curviness == null) { - curviness = 1; - } - for (p in values[0]) { - props.push(p); - } - //check to see if the last and first values are identical (well, within 0.05). If so, make seamless by appending the second element to the very end of the values array and the 2nd-to-last element to the very beginning (we'll remove those segments later) - if (values.length > 1) { - last = values[values.length - 1]; - seamless = true; - i = props.length; - while (--i > -1) { - p = props[i]; - if (Math.abs(first[p] - last[p]) > 0.05) { //build in a tolerance of +/-0.05 to accommodate rounding errors. For example, if you set an object's position to 4.945, Flash will make it 4.9 - seamless = false; - break; - } - } - if (seamless) { - values = values.concat(); //duplicate the array to avoid contaminating the original which the user may be reusing for other tweens - if (prepend) { - values.unshift(prepend); - } - values.push(values[1]); - prepend = values[values.length - 3]; - } - } - _r1.length = _r2.length = _r3.length = 0; - i = props.length; - while (--i > -1) { - p = props[i]; - _corProps[p] = (correlate.indexOf(","+p+",") !== -1); - obj[p] = _parseAnchors(values, p, _corProps[p], prepend); - } - i = _r1.length; - while (--i > -1) { - _r1[i] = Math.sqrt(_r1[i]); - _r2[i] = Math.sqrt(_r2[i]); - } - if (!basic) { - i = props.length; - while (--i > -1) { - if (_corProps[p]) { - a = obj[props[i]]; - l = a.length - 1; - for (j = 0; j < l; j++) { - r = a[j+1].da / _r2[j] + a[j].da / _r1[j]; - _r3[j] = (_r3[j] || 0) + r * r; - } - } - } - i = _r3.length; - while (--i > -1) { - _r3[i] = Math.sqrt(_r3[i]); - } - } - i = props.length; - j = quadratic ? 4 : 1; - while (--i > -1) { - p = props[i]; - a = obj[p]; - _calculateControlPoints(a, curviness, quadratic, basic, _corProps[p]); //this method requires that _parseAnchors() and _setSegmentRatios() ran first so that _r1, _r2, and _r3 values are populated for all properties - if (seamless) { - a.splice(0, j); - a.splice(a.length - j, j); - } - } - return obj; - }, - _parseBezierData = function(values, type, prepend) { - type = type || "soft"; - var obj = {}, - inc = (type === "cubic") ? 3 : 2, - soft = (type === "soft"), - props = [], - a, b, c, d, cur, i, j, l, p, cnt, tmp; - if (soft && prepend) { - values = [prepend].concat(values); - } - if (values == null || values.length < inc + 1) { throw "invalid Bezier data"; } - for (p in values[0]) { - props.push(p); - } - i = props.length; - while (--i > -1) { - p = props[i]; - obj[p] = cur = []; - cnt = 0; - l = values.length; - for (j = 0; j < l; j++) { - a = (prepend == null) ? values[j][p] : (typeof( (tmp = values[j][p]) ) === "string" && tmp.charAt(1) === "=") ? prepend[p] + Number(tmp.charAt(0) + tmp.substr(2)) : Number(tmp); - if (soft) if (j > 1) if (j < l - 1) { - cur[cnt++] = (a + cur[cnt-2]) / 2; - } - cur[cnt++] = a; - } - l = cnt - inc + 1; - cnt = 0; - for (j = 0; j < l; j += inc) { - a = cur[j]; - b = cur[j+1]; - c = cur[j+2]; - d = (inc === 2) ? 0 : cur[j+3]; - cur[cnt++] = tmp = (inc === 3) ? new Segment(a, b, c, d) : new Segment(a, (2 * b + a) / 3, (2 * b + c) / 3, c); - } - cur.length = cnt; - } - return obj; - }, - _addCubicLengths = function(a, steps, resolution) { - var inc = 1 / resolution, - j = a.length, - d, d1, s, da, ca, ba, p, i, inv, bez, index; - while (--j > -1) { - bez = a[j]; - s = bez.a; - da = bez.d - s; - ca = bez.c - s; - ba = bez.b - s; - d = d1 = 0; - for (i = 1; i <= resolution; i++) { - p = inc * i; - inv = 1 - p; - d = d1 - (d1 = (p * p * da + 3 * inv * (p * ca + inv * ba)) * p); - index = j * resolution + i - 1; - steps[index] = (steps[index] || 0) + d * d; - } - } - }, - _parseLengthData = function(obj, resolution) { - resolution = resolution >> 0 || 6; - var a = [], - lengths = [], - d = 0, - total = 0, - threshold = resolution - 1, - segments = [], - curLS = [], //current length segments array - p, i, l, index; - for (p in obj) { - _addCubicLengths(obj[p], a, resolution); - } - l = a.length; - for (i = 0; i < l; i++) { - d += Math.sqrt(a[i]); - index = i % resolution; - curLS[index] = d; - if (index === threshold) { - total += d; - index = (i / resolution) >> 0; - segments[index] = curLS; - lengths[index] = total; - d = 0; - curLS = []; - } - } - return {length:total, lengths:lengths, segments:segments}; - }, - - - - BezierPlugin = window._gsDefine.plugin({ - propName: "bezier", - priority: -1, - version: "1.3.2", - API: 2, - global:true, - - //gets called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. - init: function(target, vars, tween) { - this._target = target; - if (vars instanceof Array) { - vars = {values:vars}; - } - this._func = {}; - this._round = {}; - this._props = []; - this._timeRes = (vars.timeResolution == null) ? 6 : parseInt(vars.timeResolution, 10); - var values = vars.values || [], - first = {}, - second = values[0], - autoRotate = vars.autoRotate || tween.vars.orientToBezier, - p, isFunc, i, j, prepend; - - this._autoRotate = autoRotate ? (autoRotate instanceof Array) ? autoRotate : [["x","y","rotation",((autoRotate === true) ? 0 : Number(autoRotate) || 0)]] : null; - for (p in second) { - this._props.push(p); - } - - i = this._props.length; - while (--i > -1) { - p = this._props[i]; - - this._overwriteProps.push(p); - isFunc = this._func[p] = (typeof(target[p]) === "function"); - first[p] = (!isFunc) ? parseFloat(target[p]) : target[ ((p.indexOf("set") || typeof(target["get" + p.substr(3)]) !== "function") ? p : "get" + p.substr(3)) ](); - if (!prepend) if (first[p] !== values[0][p]) { - prepend = first; - } - } - this._beziers = (vars.type !== "cubic" && vars.type !== "quadratic" && vars.type !== "soft") ? bezierThrough(values, isNaN(vars.curviness) ? 1 : vars.curviness, false, (vars.type === "thruBasic"), vars.correlate, prepend) : _parseBezierData(values, vars.type, first); - this._segCount = this._beziers[p].length; - - if (this._timeRes) { - var ld = _parseLengthData(this._beziers, this._timeRes); - this._length = ld.length; - this._lengths = ld.lengths; - this._segments = ld.segments; - this._l1 = this._li = this._s1 = this._si = 0; - this._l2 = this._lengths[0]; - this._curSeg = this._segments[0]; - this._s2 = this._curSeg[0]; - this._prec = 1 / this._curSeg.length; - } - - if ((autoRotate = this._autoRotate)) { - this._initialRotations = []; - if (!(autoRotate[0] instanceof Array)) { - this._autoRotate = autoRotate = [autoRotate]; - } - i = autoRotate.length; - while (--i > -1) { - for (j = 0; j < 3; j++) { - p = autoRotate[i][j]; - this._func[p] = (typeof(target[p]) === "function") ? target[ ((p.indexOf("set") || typeof(target["get" + p.substr(3)]) !== "function") ? p : "get" + p.substr(3)) ] : false; - } - p = autoRotate[i][2]; - this._initialRotations[i] = this._func[p] ? this._func[p].call(this._target) : this._target[p]; - } - } - this._startRatio = tween.vars.runBackwards ? 1 : 0; //we determine the starting ratio when the tween inits which is always 0 unless the tween has runBackwards:true (indicating it's a from() tween) in which case it's 1. - return true; - }, - - //called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.) - set: function(v) { - var segments = this._segCount, - func = this._func, - target = this._target, - notStart = (v !== this._startRatio), - curIndex, inv, i, p, b, t, val, l, lengths, curSeg; - if (!this._timeRes) { - curIndex = (v < 0) ? 0 : (v >= 1) ? segments - 1 : (segments * v) >> 0; - t = (v - (curIndex * (1 / segments))) * segments; - } else { - lengths = this._lengths; - curSeg = this._curSeg; - v *= this._length; - i = this._li; - //find the appropriate segment (if the currently cached one isn't correct) - if (v > this._l2 && i < segments - 1) { - l = segments - 1; - while (i < l && (this._l2 = lengths[++i]) <= v) { } - this._l1 = lengths[i-1]; - this._li = i; - this._curSeg = curSeg = this._segments[i]; - this._s2 = curSeg[(this._s1 = this._si = 0)]; - } else if (v < this._l1 && i > 0) { - while (i > 0 && (this._l1 = lengths[--i]) >= v) { } - if (i === 0 && v < this._l1) { - this._l1 = 0; - } else { - i++; - } - this._l2 = lengths[i]; - this._li = i; - this._curSeg = curSeg = this._segments[i]; - this._s1 = curSeg[(this._si = curSeg.length - 1) - 1] || 0; - this._s2 = curSeg[this._si]; - } - curIndex = i; - //now find the appropriate sub-segment (we split it into the number of pieces that was defined by "precision" and measured each one) - v -= this._l1; - i = this._si; - if (v > this._s2 && i < curSeg.length - 1) { - l = curSeg.length - 1; - while (i < l && (this._s2 = curSeg[++i]) <= v) { } - this._s1 = curSeg[i-1]; - this._si = i; - } else if (v < this._s1 && i > 0) { - while (i > 0 && (this._s1 = curSeg[--i]) >= v) { } - if (i === 0 && v < this._s1) { - this._s1 = 0; - } else { - i++; - } - this._s2 = curSeg[i]; - this._si = i; - } - t = (i + (v - this._s1) / (this._s2 - this._s1)) * this._prec; - } - inv = 1 - t; - - i = this._props.length; - while (--i > -1) { - p = this._props[i]; - b = this._beziers[p][curIndex]; - val = (t * t * b.da + 3 * inv * (t * b.ca + inv * b.ba)) * t + b.a; - if (this._round[p]) { - val = Math.round(val); - } - if (func[p]) { - target[p](val); - } else { - target[p] = val; - } - } - - if (this._autoRotate) { - var ar = this._autoRotate, - b2, x1, y1, x2, y2, add, conv; - i = ar.length; - while (--i > -1) { - p = ar[i][2]; - add = ar[i][3] || 0; - conv = (ar[i][4] === true) ? 1 : _RAD2DEG; - b = this._beziers[ar[i][0]]; - b2 = this._beziers[ar[i][1]]; - - if (b && b2) { //in case one of the properties got overwritten. - b = b[curIndex]; - b2 = b2[curIndex]; - - x1 = b.a + (b.b - b.a) * t; - x2 = b.b + (b.c - b.b) * t; - x1 += (x2 - x1) * t; - x2 += ((b.c + (b.d - b.c) * t) - x2) * t; - - y1 = b2.a + (b2.b - b2.a) * t; - y2 = b2.b + (b2.c - b2.b) * t; - y1 += (y2 - y1) * t; - y2 += ((b2.c + (b2.d - b2.c) * t) - y2) * t; - - val = notStart ? Math.atan2(y2 - y1, x2 - x1) * conv + add : this._initialRotations[i]; - - if (func[p]) { - target[p](val); - } else { - target[p] = val; - } - } - } - } - } - }), - p = BezierPlugin.prototype; - - - BezierPlugin.bezierThrough = bezierThrough; - BezierPlugin.cubicToQuadratic = cubicToQuadratic; - BezierPlugin._autoCSS = true; //indicates that this plugin can be inserted into the "css" object using the autoCSS feature of TweenLite - BezierPlugin.quadraticToCubic = function(a, b, c) { - return new Segment(a, (2 * b + a) / 3, (2 * b + c) / 3, c); - }; - - BezierPlugin._cssRegister = function() { - var CSSPlugin = window._gsDefine.globals.CSSPlugin; - if (!CSSPlugin) { - return; - } - var _internals = CSSPlugin._internals, - _parseToProxy = _internals._parseToProxy, - _setPluginRatio = _internals._setPluginRatio, - CSSPropTween = _internals.CSSPropTween; - _internals._registerComplexSpecialProp("bezier", {parser:function(t, e, prop, cssp, pt, plugin) { - if (e instanceof Array) { - e = {values:e}; - } - plugin = new BezierPlugin(); - var values = e.values, - l = values.length - 1, - pluginValues = [], - v = {}, - i, p, data; - if (l < 0) { - return pt; - } - for (i = 0; i <= l; i++) { - data = _parseToProxy(t, values[i], cssp, pt, plugin, (l !== i)); - pluginValues[i] = data.end; - } - for (p in e) { - v[p] = e[p]; //duplicate the vars object because we need to alter some things which would cause problems if the user plans to reuse the same vars object for another tween. - } - v.values = pluginValues; - pt = new CSSPropTween(t, "bezier", 0, 0, data.pt, 2); - pt.data = data; - pt.plugin = plugin; - pt.setRatio = _setPluginRatio; - if (v.autoRotate === 0) { - v.autoRotate = true; - } - if (v.autoRotate && !(v.autoRotate instanceof Array)) { - i = (v.autoRotate === true) ? 0 : Number(v.autoRotate); - v.autoRotate = (data.end.left != null) ? [["left","top","rotation",i,false]] : (data.end.x != null) ? [["x","y","rotation",i,false]] : false; - } - if (v.autoRotate) { - if (!cssp._transform) { - cssp._enableTransforms(false); - } - data.autoRotate = cssp._target._gsTransform; - } - plugin._onInitTween(data.proxy, v, cssp._tween); - return pt; - }}); - }; - - p._roundProps = function(lookup, value) { - var op = this._overwriteProps, - i = op.length; - while (--i > -1) { - if (lookup[op[i]] || lookup.bezier || lookup.bezierThrough) { - this._round[op[i]] = value; - } - } - }; - - p._kill = function(lookup) { - var a = this._props, - p, i; - for (p in this._beziers) { - if (p in lookup) { - delete this._beziers[p]; - delete this._func[p]; - i = a.length; - while (--i > -1) { - if (a[i] === p) { - a.splice(i, 1); - } - } - } - } - return this._super._kill.call(this, lookup); - }; - - }()); - - - - - - - - - - - - - - + (function() { + + var _RAD2DEG = 180 / Math.PI, + _r1 = [], + _r2 = [], + _r3 = [], + _corProps = {}, + Segment = function(a, b, c, d) { + this.a = a; + this.b = b; + this.c = c; + this.d = d; + this.da = d - a; + this.ca = c - a; + this.ba = b - a; + }, + _correlate = ",x,y,z,left,top,right,bottom,marginTop,marginLeft,marginRight,marginBottom,paddingLeft,paddingTop,paddingRight,paddingBottom,backgroundPosition,backgroundPosition_y,", + cubicToQuadratic = function(a, b, c, d) { + var q1 = {a:a}, + q2 = {}, + q3 = {}, + q4 = {c:d}, + mab = (a + b) / 2, + mbc = (b + c) / 2, + mcd = (c + d) / 2, + mabc = (mab + mbc) / 2, + mbcd = (mbc + mcd) / 2, + m8 = (mbcd - mabc) / 8; + q1.b = mab + (a - mab) / 4; + q2.b = mabc + m8; + q1.c = q2.a = (q1.b + q2.b) / 2; + q2.c = q3.a = (mabc + mbcd) / 2; + q3.b = mbcd - m8; + q4.b = mcd + (d - mcd) / 4; + q3.c = q4.a = (q3.b + q4.b) / 2; + return [q1, q2, q3, q4]; + }, + _calculateControlPoints = function(a, curviness, quad, basic, correlate) { + var l = a.length - 1, + ii = 0, + cp1 = a[0].a, + i, p1, p2, p3, seg, m1, m2, mm, cp2, qb, r1, r2, tl; + for (i = 0; i < l; i++) { + seg = a[ii]; + p1 = seg.a; + p2 = seg.d; + p3 = a[ii+1].d; + + if (correlate) { + r1 = _r1[i]; + r2 = _r2[i]; + tl = ((r2 + r1) * curviness * 0.25) / (basic ? 0.5 : _r3[i] || 0.5); + m1 = p2 - (p2 - p1) * (basic ? curviness * 0.5 : (r1 !== 0 ? tl / r1 : 0)); + m2 = p2 + (p3 - p2) * (basic ? curviness * 0.5 : (r2 !== 0 ? tl / r2 : 0)); + mm = p2 - (m1 + (((m2 - m1) * ((r1 * 3 / (r1 + r2)) + 0.5) / 4) || 0)); + } else { + m1 = p2 - (p2 - p1) * curviness * 0.5; + m2 = p2 + (p3 - p2) * curviness * 0.5; + mm = p2 - (m1 + m2) / 2; + } + m1 += mm; + m2 += mm; + + seg.c = cp2 = m1; + if (i !== 0) { + seg.b = cp1; + } else { + seg.b = cp1 = seg.a + (seg.c - seg.a) * 0.6; //instead of placing b on a exactly, we move it inline with c so that if the user specifies an ease like Back.easeIn or Elastic.easeIn which goes BEYOND the beginning, it will do so smoothly. + } + + seg.da = p2 - p1; + seg.ca = cp2 - p1; + seg.ba = cp1 - p1; + + if (quad) { + qb = cubicToQuadratic(p1, cp1, cp2, p2); + a.splice(ii, 1, qb[0], qb[1], qb[2], qb[3]); + ii += 4; + } else { + ii++; + } + + cp1 = m2; + } + seg = a[ii]; + seg.b = cp1; + seg.c = cp1 + (seg.d - cp1) * 0.4; //instead of placing c on d exactly, we move it inline with b so that if the user specifies an ease like Back.easeOut or Elastic.easeOut which goes BEYOND the end, it will do so smoothly. + seg.da = seg.d - seg.a; + seg.ca = seg.c - seg.a; + seg.ba = cp1 - seg.a; + if (quad) { + qb = cubicToQuadratic(seg.a, cp1, seg.c, seg.d); + a.splice(ii, 1, qb[0], qb[1], qb[2], qb[3]); + } + }, + _parseAnchors = function(values, p, correlate, prepend) { + var a = [], + l, i, p1, p2, p3, tmp; + if (prepend) { + values = [prepend].concat(values); + i = values.length; + while (--i > -1) { + if (typeof( (tmp = values[i][p]) ) === "string") if (tmp.charAt(1) === "=") { + values[i][p] = prepend[p] + Number(tmp.charAt(0) + tmp.substr(2)); //accommodate relative values. Do it inline instead of breaking it out into a function for speed reasons + } + } + } + l = values.length - 2; + if (l < 0) { + a[0] = new Segment(values[0][p], 0, 0, values[(l < -1) ? 0 : 1][p]); + return a; + } + for (i = 0; i < l; i++) { + p1 = values[i][p]; + p2 = values[i+1][p]; + a[i] = new Segment(p1, 0, 0, p2); + if (correlate) { + p3 = values[i+2][p]; + _r1[i] = (_r1[i] || 0) + (p2 - p1) * (p2 - p1); + _r2[i] = (_r2[i] || 0) + (p3 - p2) * (p3 - p2); + } + } + a[i] = new Segment(values[i][p], 0, 0, values[i+1][p]); + return a; + }, + bezierThrough = function(values, curviness, quadratic, basic, correlate, prepend) { + var obj = {}, + props = [], + first = prepend || values[0], + i, p, a, j, r, l, seamless, last; + correlate = (typeof(correlate) === "string") ? ","+correlate+"," : _correlate; + if (curviness == null) { + curviness = 1; + } + for (p in values[0]) { + props.push(p); + } + //check to see if the last and first values are identical (well, within 0.05). If so, make seamless by appending the second element to the very end of the values array and the 2nd-to-last element to the very beginning (we'll remove those segments later) + if (values.length > 1) { + last = values[values.length - 1]; + seamless = true; + i = props.length; + while (--i > -1) { + p = props[i]; + if (Math.abs(first[p] - last[p]) > 0.05) { //build in a tolerance of +/-0.05 to accommodate rounding errors. For example, if you set an object's position to 4.945, Flash will make it 4.9 + seamless = false; + break; + } + } + if (seamless) { + values = values.concat(); //duplicate the array to avoid contaminating the original which the user may be reusing for other tweens + if (prepend) { + values.unshift(prepend); + } + values.push(values[1]); + prepend = values[values.length - 3]; + } + } + _r1.length = _r2.length = _r3.length = 0; + i = props.length; + while (--i > -1) { + p = props[i]; + _corProps[p] = (correlate.indexOf(","+p+",") !== -1); + obj[p] = _parseAnchors(values, p, _corProps[p], prepend); + } + i = _r1.length; + while (--i > -1) { + _r1[i] = Math.sqrt(_r1[i]); + _r2[i] = Math.sqrt(_r2[i]); + } + if (!basic) { + i = props.length; + while (--i > -1) { + if (_corProps[p]) { + a = obj[props[i]]; + l = a.length - 1; + for (j = 0; j < l; j++) { + r = a[j+1].da / _r2[j] + a[j].da / _r1[j]; + _r3[j] = (_r3[j] || 0) + r * r; + } + } + } + i = _r3.length; + while (--i > -1) { + _r3[i] = Math.sqrt(_r3[i]); + } + } + i = props.length; + j = quadratic ? 4 : 1; + while (--i > -1) { + p = props[i]; + a = obj[p]; + _calculateControlPoints(a, curviness, quadratic, basic, _corProps[p]); //this method requires that _parseAnchors() and _setSegmentRatios() ran first so that _r1, _r2, and _r3 values are populated for all properties + if (seamless) { + a.splice(0, j); + a.splice(a.length - j, j); + } + } + return obj; + }, + _parseBezierData = function(values, type, prepend) { + type = type || "soft"; + var obj = {}, + inc = (type === "cubic") ? 3 : 2, + soft = (type === "soft"), + props = [], + a, b, c, d, cur, i, j, l, p, cnt, tmp; + if (soft && prepend) { + values = [prepend].concat(values); + } + if (values == null || values.length < inc + 1) { throw "invalid Bezier data"; } + for (p in values[0]) { + props.push(p); + } + i = props.length; + while (--i > -1) { + p = props[i]; + obj[p] = cur = []; + cnt = 0; + l = values.length; + for (j = 0; j < l; j++) { + a = (prepend == null) ? values[j][p] : (typeof( (tmp = values[j][p]) ) === "string" && tmp.charAt(1) === "=") ? prepend[p] + Number(tmp.charAt(0) + tmp.substr(2)) : Number(tmp); + if (soft) if (j > 1) if (j < l - 1) { + cur[cnt++] = (a + cur[cnt-2]) / 2; + } + cur[cnt++] = a; + } + l = cnt - inc + 1; + cnt = 0; + for (j = 0; j < l; j += inc) { + a = cur[j]; + b = cur[j+1]; + c = cur[j+2]; + d = (inc === 2) ? 0 : cur[j+3]; + cur[cnt++] = tmp = (inc === 3) ? new Segment(a, b, c, d) : new Segment(a, (2 * b + a) / 3, (2 * b + c) / 3, c); + } + cur.length = cnt; + } + return obj; + }, + _addCubicLengths = function(a, steps, resolution) { + var inc = 1 / resolution, + j = a.length, + d, d1, s, da, ca, ba, p, i, inv, bez, index; + while (--j > -1) { + bez = a[j]; + s = bez.a; + da = bez.d - s; + ca = bez.c - s; + ba = bez.b - s; + d = d1 = 0; + for (i = 1; i <= resolution; i++) { + p = inc * i; + inv = 1 - p; + d = d1 - (d1 = (p * p * da + 3 * inv * (p * ca + inv * ba)) * p); + index = j * resolution + i - 1; + steps[index] = (steps[index] || 0) + d * d; + } + } + }, + _parseLengthData = function(obj, resolution) { + resolution = resolution >> 0 || 6; + var a = [], + lengths = [], + d = 0, + total = 0, + threshold = resolution - 1, + segments = [], + curLS = [], //current length segments array + p, i, l, index; + for (p in obj) { + _addCubicLengths(obj[p], a, resolution); + } + l = a.length; + for (i = 0; i < l; i++) { + d += Math.sqrt(a[i]); + index = i % resolution; + curLS[index] = d; + if (index === threshold) { + total += d; + index = (i / resolution) >> 0; + segments[index] = curLS; + lengths[index] = total; + d = 0; + curLS = []; + } + } + return {length:total, lengths:lengths, segments:segments}; + }, + + + + BezierPlugin = window._gsDefine.plugin({ + propName: "bezier", + priority: -1, + version: "1.3.2", + API: 2, + global:true, + + //gets called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. + init: function(target, vars, tween) { + this._target = target; + if (vars instanceof Array) { + vars = {values:vars}; + } + this._func = {}; + this._round = {}; + this._props = []; + this._timeRes = (vars.timeResolution == null) ? 6 : parseInt(vars.timeResolution, 10); + var values = vars.values || [], + first = {}, + second = values[0], + autoRotate = vars.autoRotate || tween.vars.orientToBezier, + p, isFunc, i, j, prepend; + + this._autoRotate = autoRotate ? (autoRotate instanceof Array) ? autoRotate : [["x","y","rotation",((autoRotate === true) ? 0 : Number(autoRotate) || 0)]] : null; + for (p in second) { + this._props.push(p); + } + + i = this._props.length; + while (--i > -1) { + p = this._props[i]; + + this._overwriteProps.push(p); + isFunc = this._func[p] = (typeof(target[p]) === "function"); + first[p] = (!isFunc) ? parseFloat(target[p]) : target[ ((p.indexOf("set") || typeof(target["get" + p.substr(3)]) !== "function") ? p : "get" + p.substr(3)) ](); + if (!prepend) if (first[p] !== values[0][p]) { + prepend = first; + } + } + this._beziers = (vars.type !== "cubic" && vars.type !== "quadratic" && vars.type !== "soft") ? bezierThrough(values, isNaN(vars.curviness) ? 1 : vars.curviness, false, (vars.type === "thruBasic"), vars.correlate, prepend) : _parseBezierData(values, vars.type, first); + this._segCount = this._beziers[p].length; + + if (this._timeRes) { + var ld = _parseLengthData(this._beziers, this._timeRes); + this._length = ld.length; + this._lengths = ld.lengths; + this._segments = ld.segments; + this._l1 = this._li = this._s1 = this._si = 0; + this._l2 = this._lengths[0]; + this._curSeg = this._segments[0]; + this._s2 = this._curSeg[0]; + this._prec = 1 / this._curSeg.length; + } + + if ((autoRotate = this._autoRotate)) { + this._initialRotations = []; + if (!(autoRotate[0] instanceof Array)) { + this._autoRotate = autoRotate = [autoRotate]; + } + i = autoRotate.length; + while (--i > -1) { + for (j = 0; j < 3; j++) { + p = autoRotate[i][j]; + this._func[p] = (typeof(target[p]) === "function") ? target[ ((p.indexOf("set") || typeof(target["get" + p.substr(3)]) !== "function") ? p : "get" + p.substr(3)) ] : false; + } + p = autoRotate[i][2]; + this._initialRotations[i] = this._func[p] ? this._func[p].call(this._target) : this._target[p]; + } + } + this._startRatio = tween.vars.runBackwards ? 1 : 0; //we determine the starting ratio when the tween inits which is always 0 unless the tween has runBackwards:true (indicating it's a from() tween) in which case it's 1. + return true; + }, + + //called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.) + set: function(v) { + var segments = this._segCount, + func = this._func, + target = this._target, + notStart = (v !== this._startRatio), + curIndex, inv, i, p, b, t, val, l, lengths, curSeg; + if (!this._timeRes) { + curIndex = (v < 0) ? 0 : (v >= 1) ? segments - 1 : (segments * v) >> 0; + t = (v - (curIndex * (1 / segments))) * segments; + } else { + lengths = this._lengths; + curSeg = this._curSeg; + v *= this._length; + i = this._li; + //find the appropriate segment (if the currently cached one isn't correct) + if (v > this._l2 && i < segments - 1) { + l = segments - 1; + while (i < l && (this._l2 = lengths[++i]) <= v) { } + this._l1 = lengths[i-1]; + this._li = i; + this._curSeg = curSeg = this._segments[i]; + this._s2 = curSeg[(this._s1 = this._si = 0)]; + } else if (v < this._l1 && i > 0) { + while (i > 0 && (this._l1 = lengths[--i]) >= v) { } + if (i === 0 && v < this._l1) { + this._l1 = 0; + } else { + i++; + } + this._l2 = lengths[i]; + this._li = i; + this._curSeg = curSeg = this._segments[i]; + this._s1 = curSeg[(this._si = curSeg.length - 1) - 1] || 0; + this._s2 = curSeg[this._si]; + } + curIndex = i; + //now find the appropriate sub-segment (we split it into the number of pieces that was defined by "precision" and measured each one) + v -= this._l1; + i = this._si; + if (v > this._s2 && i < curSeg.length - 1) { + l = curSeg.length - 1; + while (i < l && (this._s2 = curSeg[++i]) <= v) { } + this._s1 = curSeg[i-1]; + this._si = i; + } else if (v < this._s1 && i > 0) { + while (i > 0 && (this._s1 = curSeg[--i]) >= v) { } + if (i === 0 && v < this._s1) { + this._s1 = 0; + } else { + i++; + } + this._s2 = curSeg[i]; + this._si = i; + } + t = (i + (v - this._s1) / (this._s2 - this._s1)) * this._prec; + } + inv = 1 - t; + + i = this._props.length; + while (--i > -1) { + p = this._props[i]; + b = this._beziers[p][curIndex]; + val = (t * t * b.da + 3 * inv * (t * b.ca + inv * b.ba)) * t + b.a; + if (this._round[p]) { + val = Math.round(val); + } + if (func[p]) { + target[p](val); + } else { + target[p] = val; + } + } + + if (this._autoRotate) { + var ar = this._autoRotate, + b2, x1, y1, x2, y2, add, conv; + i = ar.length; + while (--i > -1) { + p = ar[i][2]; + add = ar[i][3] || 0; + conv = (ar[i][4] === true) ? 1 : _RAD2DEG; + b = this._beziers[ar[i][0]]; + b2 = this._beziers[ar[i][1]]; + + if (b && b2) { //in case one of the properties got overwritten. + b = b[curIndex]; + b2 = b2[curIndex]; + + x1 = b.a + (b.b - b.a) * t; + x2 = b.b + (b.c - b.b) * t; + x1 += (x2 - x1) * t; + x2 += ((b.c + (b.d - b.c) * t) - x2) * t; + + y1 = b2.a + (b2.b - b2.a) * t; + y2 = b2.b + (b2.c - b2.b) * t; + y1 += (y2 - y1) * t; + y2 += ((b2.c + (b2.d - b2.c) * t) - y2) * t; + + val = notStart ? Math.atan2(y2 - y1, x2 - x1) * conv + add : this._initialRotations[i]; + + if (func[p]) { + target[p](val); + } else { + target[p] = val; + } + } + } + } + } + }), + p = BezierPlugin.prototype; + + + BezierPlugin.bezierThrough = bezierThrough; + BezierPlugin.cubicToQuadratic = cubicToQuadratic; + BezierPlugin._autoCSS = true; //indicates that this plugin can be inserted into the "css" object using the autoCSS feature of TweenLite + BezierPlugin.quadraticToCubic = function(a, b, c) { + return new Segment(a, (2 * b + a) / 3, (2 * b + c) / 3, c); + }; + + BezierPlugin._cssRegister = function() { + var CSSPlugin = window._gsDefine.globals.CSSPlugin; + if (!CSSPlugin) { + return; + } + var _internals = CSSPlugin._internals, + _parseToProxy = _internals._parseToProxy, + _setPluginRatio = _internals._setPluginRatio, + CSSPropTween = _internals.CSSPropTween; + _internals._registerComplexSpecialProp("bezier", {parser:function(t, e, prop, cssp, pt, plugin) { + if (e instanceof Array) { + e = {values:e}; + } + plugin = new BezierPlugin(); + var values = e.values, + l = values.length - 1, + pluginValues = [], + v = {}, + i, p, data; + if (l < 0) { + return pt; + } + for (i = 0; i <= l; i++) { + data = _parseToProxy(t, values[i], cssp, pt, plugin, (l !== i)); + pluginValues[i] = data.end; + } + for (p in e) { + v[p] = e[p]; //duplicate the vars object because we need to alter some things which would cause problems if the user plans to reuse the same vars object for another tween. + } + v.values = pluginValues; + pt = new CSSPropTween(t, "bezier", 0, 0, data.pt, 2); + pt.data = data; + pt.plugin = plugin; + pt.setRatio = _setPluginRatio; + if (v.autoRotate === 0) { + v.autoRotate = true; + } + if (v.autoRotate && !(v.autoRotate instanceof Array)) { + i = (v.autoRotate === true) ? 0 : Number(v.autoRotate); + v.autoRotate = (data.end.left != null) ? [["left","top","rotation",i,false]] : (data.end.x != null) ? [["x","y","rotation",i,false]] : false; + } + if (v.autoRotate) { + if (!cssp._transform) { + cssp._enableTransforms(false); + } + data.autoRotate = cssp._target._gsTransform; + } + plugin._onInitTween(data.proxy, v, cssp._tween); + return pt; + }}); + }; + + p._roundProps = function(lookup, value) { + var op = this._overwriteProps, + i = op.length; + while (--i > -1) { + if (lookup[op[i]] || lookup.bezier || lookup.bezierThrough) { + this._round[op[i]] = value; + } + } + }; + + p._kill = function(lookup) { + var a = this._props, + p, i; + for (p in this._beziers) { + if (p in lookup) { + delete this._beziers[p]; + delete this._func[p]; + i = a.length; + while (--i > -1) { + if (a[i] === p) { + a.splice(i, 1); + } + } + } + } + return this._super._kill.call(this, lookup); + }; + + }()); + + + + + + + + + + + + + + /* * ---------------------------------------------------------------- * CSSPlugin * ---------------------------------------------------------------- */ - window._gsDefine("plugins.CSSPlugin", ["plugins.TweenPlugin","TweenLite"], function(TweenPlugin, TweenLite) { - - /** @constructor **/ - var CSSPlugin = function() { - TweenPlugin.call(this, "css"); - this._overwriteProps.length = 0; - this.setRatio = CSSPlugin.prototype.setRatio; //speed optimization (avoid prototype lookup on this "hot" method) - }, - _hasPriority, //turns true whenever a CSSPropTween instance is created that has a priority other than 0. This helps us discern whether or not we should spend the time organizing the linked list or not after a CSSPlugin's _onInitTween() method is called. - _suffixMap, //we set this in _onInitTween() each time as a way to have a persistent variable we can use in other methods like _parse() without having to pass it around as a parameter and we keep _parse() decoupled from a particular CSSPlugin instance - _cs, //computed style (we store this in a shared variable to conserve memory and make minification tighter - _overwriteProps, //alias to the currently instantiating CSSPlugin's _overwriteProps array. We use this closure in order to avoid having to pass a reference around from method to method and aid in minification. - _specialProps = {}, - p = CSSPlugin.prototype = new TweenPlugin("css"); - - p.constructor = CSSPlugin; - CSSPlugin.version = "1.12.1"; - CSSPlugin.API = 2; - CSSPlugin.defaultTransformPerspective = 0; - CSSPlugin.defaultSkewType = "compensated"; - p = "px"; //we'll reuse the "p" variable to keep file size down - CSSPlugin.suffixMap = {top:p, right:p, bottom:p, left:p, width:p, height:p, fontSize:p, padding:p, margin:p, perspective:p, lineHeight:""}; - - - var _numExp = /(?:\d|\-\d|\.\d|\-\.\d)+/g, - _relNumExp = /(?:\d|\-\d|\.\d|\-\.\d|\+=\d|\-=\d|\+=.\d|\-=\.\d)+/g, - _valuesExp = /(?:\+=|\-=|\-|\b)[\d\-\.]+[a-zA-Z0-9]*(?:%|\b)/gi, //finds all the values that begin with numbers or += or -= and then a number. Includes suffixes. We use this to split complex values apart like "1px 5px 20px rgb(255,102,51)" - _NaNExp = /[^\d\-\.]/g, - _suffixExp = /(?:\d|\-|\+|=|#|\.)*/g, - _opacityExp = /opacity *= *([^)]*)/i, - _opacityValExp = /opacity:([^;]*)/i, - _alphaFilterExp = /alpha\(opacity *=.+?\)/i, - _rgbhslExp = /^(rgb|hsl)/, - _capsExp = /([A-Z])/g, - _camelExp = /-([a-z])/gi, - _urlExp = /(^(?:url\(\"|url\())|(?:(\"\))$|\)$)/gi, //for pulling out urls from url(...) or url("...") strings (some browsers wrap urls in quotes, some don't when reporting things like backgroundImage) - _camelFunc = function(s, g) { return g.toUpperCase(); }, - _horizExp = /(?:Left|Right|Width)/i, - _ieGetMatrixExp = /(M11|M12|M21|M22)=[\d\-\.e]+/gi, - _ieSetMatrixExp = /progid\:DXImageTransform\.Microsoft\.Matrix\(.+?\)/i, - _commasOutsideParenExp = /,(?=[^\)]*(?:\(|$))/gi, //finds any commas that are not within parenthesis - _DEG2RAD = Math.PI / 180, - _RAD2DEG = 180 / Math.PI, - _forcePT = {}, - _doc = document, - _tempDiv = _doc.createElement("div"), - _tempImg = _doc.createElement("img"), - _internals = CSSPlugin._internals = {_specialProps:_specialProps}, //provides a hook to a few internal methods that we need to access from inside other plugins - _agent = navigator.userAgent, - _autoRound, - _reqSafariFix, //we won't apply the Safari transform fix until we actually come across a tween that affects a transform property (to maintain best performance). - - _isSafari, - _isFirefox, //Firefox has a bug that causes 3D transformed elements to randomly disappear unless a repaint is forced after each update on each element. - _isSafariLT6, //Safari (and Android 4 which uses a flavor of Safari) has a bug that prevents changes to "top" and "left" properties from rendering properly if changed on the same frame as a transform UNLESS we set the element's WebkitBackfaceVisibility to hidden (weird, I know). Doing this for Android 3 and earlier seems to actually cause other problems, though (fun!) - _ieVers, - _supportsOpacity = (function() { //we set _isSafari, _ieVers, _isFirefox, and _supportsOpacity all in one function here to reduce file size slightly, especially in the minified version. - var i = _agent.indexOf("Android"), - d = _doc.createElement("div"), a; - - _isSafari = (_agent.indexOf("Safari") !== -1 && _agent.indexOf("Chrome") === -1 && (i === -1 || Number(_agent.substr(i+8, 1)) > 3)); - _isSafariLT6 = (_isSafari && (Number(_agent.substr(_agent.indexOf("Version/")+8, 1)) < 6)); - _isFirefox = (_agent.indexOf("Firefox") !== -1); - - if ((/MSIE ([0-9]{1,}[\.0-9]{0,})/).exec(_agent)) { - _ieVers = parseFloat( RegExp.$1 ); - } - - d.innerHTML = "<a title='' style='top:1px;opacity:.55;'>a</a>"; - a = d.getElementsByTagName("a")[0]; - return a ? /^0.55/.test(a.style.opacity) : false; - }()), - _getIEOpacity = function(v) { - return (_opacityExp.test( ((typeof(v) === "string") ? v : (v.currentStyle ? v.currentStyle.filter : v.style.filter) || "") ) ? ( parseFloat( RegExp.$1 ) / 100 ) : 1); - }, - _log = function(s) {//for logging messages, but in a way that won't throw errors in old versions of IE. - if (window.console) { - //console.log(s); - } - }, - _prefixCSS = "", //the non-camelCase vendor prefix like "-o-", "-moz-", "-ms-", or "-webkit-" - _prefix = "", //camelCase vendor prefix like "O", "ms", "Webkit", or "Moz". - - // @private feed in a camelCase property name like "transform" and it will check to see if it is valid as-is or if it needs a vendor prefix. It returns the corrected camelCase property name (i.e. "WebkitTransform" or "MozTransform" or "transform" or null if no such property is found, like if the browser is IE8 or before, "transform" won't be found at all) - _checkPropPrefix = function(p, e) { - e = e || _tempDiv; - var s = e.style, - a, i; - if (s[p] !== undefined) { - return p; - } - p = p.charAt(0).toUpperCase() + p.substr(1); - a = ["O","Moz","ms","Ms","Webkit"]; - i = 5; - while (--i > -1 && s[a[i]+p] === undefined) { } - if (i >= 0) { - _prefix = (i === 3) ? "ms" : a[i]; - _prefixCSS = "-" + _prefix.toLowerCase() + "-"; - return _prefix + p; - } - return null; - }, - - _getComputedStyle = _doc.defaultView ? _doc.defaultView.getComputedStyle : function() {}, - - /** - * @private Returns the css style for a particular property of an element. For example, to get whatever the current "left" css value for an element with an ID of "myElement", you could do: - * var currentLeft = CSSPlugin.getStyle( document.getElementById("myElement"), "left"); - * - * @param {!Object} t Target element whose style property you want to query - * @param {!string} p Property name (like "left" or "top" or "marginTop", etc.) - * @param {Object=} cs Computed style object. This just provides a way to speed processing if you're going to get several properties on the same element in quick succession - you can reuse the result of the getComputedStyle() call. - * @param {boolean=} calc If true, the value will not be read directly from the element's "style" property (if it exists there), but instead the getComputedStyle() result will be used. This can be useful when you want to ensure that the browser itself is interpreting the value. - * @param {string=} dflt Default value that should be returned in the place of null, "none", "auto" or "auto auto". - * @return {?string} The current property value - */ - _getStyle = CSSPlugin.getStyle = function(t, p, cs, calc, dflt) { - var rv; - if (!_supportsOpacity) if (p === "opacity") { //several versions of IE don't use the standard "opacity" property - they use things like filter:alpha(opacity=50), so we parse that here. - return _getIEOpacity(t); - } - if (!calc && t.style[p]) { - rv = t.style[p]; - } else if ((cs = cs || _getComputedStyle(t))) { - rv = cs[p] || cs.getPropertyValue(p) || cs.getPropertyValue(p.replace(_capsExp, "-$1").toLowerCase()); - } else if (t.currentStyle) { - rv = t.currentStyle[p]; - } - return (dflt != null && (!rv || rv === "none" || rv === "auto" || rv === "auto auto")) ? dflt : rv; - }, - - /** - * @private Pass the target element, the property name, the numeric value, and the suffix (like "%", "em", "px", etc.) and it will spit back the equivalent pixel number. - * @param {!Object} t Target element - * @param {!string} p Property name (like "left", "top", "marginLeft", etc.) - * @param {!number} v Value - * @param {string=} sfx Suffix (like "px" or "%" or "em") - * @param {boolean=} recurse If true, the call is a recursive one. In some browsers (like IE7/8), occasionally the value isn't accurately reported initially, but if we run the function again it will take effect. - * @return {number} value in pixels - */ - _convertToPixels = _internals.convertToPixels = function(t, p, v, sfx, recurse) { - if (sfx === "px" || !sfx) { return v; } - if (sfx === "auto" || !v) { return 0; } - var horiz = _horizExp.test(p), - node = t, - style = _tempDiv.style, - neg = (v < 0), - pix, cache, time; - if (neg) { - v = -v; - } - if (sfx === "%" && p.indexOf("border") !== -1) { - pix = (v / 100) * (horiz ? t.clientWidth : t.clientHeight); - } else { - style.cssText = "border:0 solid red;position:" + _getStyle(t, "position") + ";line-height:0;"; - if (sfx === "%" || !node.appendChild) { - node = t.parentNode || _doc.body; - cache = node._gsCache; - time = TweenLite.ticker.frame; - if (cache && horiz && cache.time === time) { //performance optimization: we record the width of elements along with the ticker frame so that we can quickly get it again on the same tick (seems relatively safe to assume it wouldn't change on the same tick) - return cache.width * v / 100; - } - style[(horiz ? "width" : "height")] = v + sfx; - } else { - style[(horiz ? "borderLeftWidth" : "borderTopWidth")] = v + sfx; - } - node.appendChild(_tempDiv); - pix = parseFloat(_tempDiv[(horiz ? "offsetWidth" : "offsetHeight")]); - node.removeChild(_tempDiv); - if (horiz && sfx === "%" && CSSPlugin.cacheWidths !== false) { - cache = node._gsCache = node._gsCache || {}; - cache.time = time; - cache.width = pix / v * 100; - } - if (pix === 0 && !recurse) { - pix = _convertToPixels(t, p, v, sfx, true); - } - } - return neg ? -pix : pix; - }, - _calculateOffset = _internals.calculateOffset = function(t, p, cs) { //for figuring out "top" or "left" in px when it's "auto". We need to factor in margin with the offsetLeft/offsetTop - if (_getStyle(t, "position", cs) !== "absolute") { return 0; } - var dim = ((p === "left") ? "Left" : "Top"), - v = _getStyle(t, "margin" + dim, cs); - return t["offset" + dim] - (_convertToPixels(t, p, parseFloat(v), v.replace(_suffixExp, "")) || 0); - }, - - // @private returns at object containing ALL of the style properties in camelCase and their associated values. - _getAllStyles = function(t, cs) { - var s = {}, - i, tr; - if ((cs = cs || _getComputedStyle(t, null))) { - if ((i = cs.length)) { - while (--i > -1) { - s[cs[i].replace(_camelExp, _camelFunc)] = cs.getPropertyValue(cs[i]); - } - } else { //Opera behaves differently - cs.length is always 0, so we must do a for...in loop. - for (i in cs) { - s[i] = cs[i]; - } - } - } else if ((cs = t.currentStyle || t.style)) { - for (i in cs) { - if (typeof(i) === "string" && s[i] === undefined) { - s[i.replace(_camelExp, _camelFunc)] = cs[i]; - } - } - } - if (!_supportsOpacity) { - s.opacity = _getIEOpacity(t); - } - tr = _getTransform(t, cs, false); - s.rotation = tr.rotation; - s.skewX = tr.skewX; - s.scaleX = tr.scaleX; - s.scaleY = tr.scaleY; - s.x = tr.x; - s.y = tr.y; - if (_supports3D) { - s.z = tr.z; - s.rotationX = tr.rotationX; - s.rotationY = tr.rotationY; - s.scaleZ = tr.scaleZ; - } - if (s.filters) { - delete s.filters; - } - return s; - }, - - // @private analyzes two style objects (as returned by _getAllStyles()) and only looks for differences between them that contain tweenable values (like a number or color). It returns an object with a "difs" property which refers to an object containing only those isolated properties and values for tweening, and a "firstMPT" property which refers to the first MiniPropTween instance in a linked list that recorded all the starting values of the different properties so that we can revert to them at the end or beginning of the tween - we don't want the cascading to get messed up. The forceLookup parameter is an optional generic object with properties that should be forced into the results - this is necessary for className tweens that are overwriting others because imagine a scenario where a rollover/rollout adds/removes a class and the user swipes the mouse over the target SUPER fast, thus nothing actually changed yet and the subsequent comparison of the properties would indicate they match (especially when px rounding is taken into consideration), thus no tweening is necessary even though it SHOULD tween and remove those properties after the tween (otherwise the inline styles will contaminate things). See the className SpecialProp code for details. - _cssDif = function(t, s1, s2, vars, forceLookup) { - var difs = {}, - style = t.style, - val, p, mpt; - for (p in s2) { - if (p !== "cssText") if (p !== "length") if (isNaN(p)) if (s1[p] !== (val = s2[p]) || (forceLookup && forceLookup[p])) if (p.indexOf("Origin") === -1) if (typeof(val) === "number" || typeof(val) === "string") { - difs[p] = (val === "auto" && (p === "left" || p === "top")) ? _calculateOffset(t, p) : ((val === "" || val === "auto" || val === "none") && typeof(s1[p]) === "string" && s1[p].replace(_NaNExp, "") !== "") ? 0 : val; //if the ending value is defaulting ("" or "auto"), we check the starting value and if it can be parsed into a number (a string which could have a suffix too, like 700px), then we swap in 0 for "" or "auto" so that things actually tween. - if (style[p] !== undefined) { //for className tweens, we must remember which properties already existed inline - the ones that didn't should be removed when the tween isn't in progress because they were only introduced to facilitate the transition between classes. - mpt = new MiniPropTween(style, p, style[p], mpt); - } - } - } - if (vars) { - for (p in vars) { //copy properties (except className) - if (p !== "className") { - difs[p] = vars[p]; - } - } - } - return {difs:difs, firstMPT:mpt}; - }, - _dimensions = {width:["Left","Right"], height:["Top","Bottom"]}, - _margins = ["marginLeft","marginRight","marginTop","marginBottom"], - - /** - * @private Gets the width or height of an element - * @param {!Object} t Target element - * @param {!string} p Property name ("width" or "height") - * @param {Object=} cs Computed style object (if one exists). Just a speed optimization. - * @return {number} Dimension (in pixels) - */ - _getDimension = function(t, p, cs) { - var v = parseFloat((p === "width") ? t.offsetWidth : t.offsetHeight), - a = _dimensions[p], - i = a.length; - cs = cs || _getComputedStyle(t, null); - while (--i > -1) { - v -= parseFloat( _getStyle(t, "padding" + a[i], cs, true) ) || 0; - v -= parseFloat( _getStyle(t, "border" + a[i] + "Width", cs, true) ) || 0; - } - return v; - }, - - // @private Parses position-related complex strings like "top left" or "50px 10px" or "70% 20%", etc. which are used for things like transformOrigin or backgroundPosition. Optionally decorates a supplied object (recObj) with the following properties: "ox" (offsetX), "oy" (offsetY), "oxp" (if true, "ox" is a percentage not a pixel value), and "oxy" (if true, "oy" is a percentage not a pixel value) - _parsePosition = function(v, recObj) { - if (v == null || v === "" || v === "auto" || v === "auto auto") { //note: Firefox uses "auto auto" as default whereas Chrome uses "auto". - v = "0 0"; - } - var a = v.split(" "), - x = (v.indexOf("left") !== -1) ? "0%" : (v.indexOf("right") !== -1) ? "100%" : a[0], - y = (v.indexOf("top") !== -1) ? "0%" : (v.indexOf("bottom") !== -1) ? "100%" : a[1]; - if (y == null) { - y = "0"; - } else if (y === "center") { - y = "50%"; - } - if (x === "center" || (isNaN(parseFloat(x)) && (x + "").indexOf("=") === -1)) { //remember, the user could flip-flop the values and say "bottom center" or "center bottom", etc. "center" is ambiguous because it could be used to describe horizontal or vertical, hence the isNaN(). If there's an "=" sign in the value, it's relative. - x = "50%"; - } - if (recObj) { - recObj.oxp = (x.indexOf("%") !== -1); - recObj.oyp = (y.indexOf("%") !== -1); - recObj.oxr = (x.charAt(1) === "="); - recObj.oyr = (y.charAt(1) === "="); - recObj.ox = parseFloat(x.replace(_NaNExp, "")); - recObj.oy = parseFloat(y.replace(_NaNExp, "")); - } - return x + " " + y + ((a.length > 2) ? " " + a[2] : ""); - }, - - /** - * @private Takes an ending value (typically a string, but can be a number) and a starting value and returns the change between the two, looking for relative value indicators like += and -= and it also ignores suffixes (but make sure the ending value starts with a number or +=/-= and that the starting value is a NUMBER!) - * @param {(number|string)} e End value which is typically a string, but could be a number - * @param {(number|string)} b Beginning value which is typically a string but could be a number - * @return {number} Amount of change between the beginning and ending values (relative values that have a "+=" or "-=" are recognized) - */ - _parseChange = function(e, b) { - return (typeof(e) === "string" && e.charAt(1) === "=") ? parseInt(e.charAt(0) + "1", 10) * parseFloat(e.substr(2)) : parseFloat(e) - parseFloat(b); - }, - - /** - * @private Takes a value and a default number, checks if the value is relative, null, or numeric and spits back a normalized number accordingly. Primarily used in the _parseTransform() function. - * @param {Object} v Value to be parsed - * @param {!number} d Default value (which is also used for relative calculations if "+=" or "-=" is found in the first parameter) - * @return {number} Parsed value - */ - _parseVal = function(v, d) { - return (v == null) ? d : (typeof(v) === "string" && v.charAt(1) === "=") ? parseInt(v.charAt(0) + "1", 10) * Number(v.substr(2)) + d : parseFloat(v); - }, - - /** - * @private Translates strings like "40deg" or "40" or 40rad" or "+=40deg" or "270_short" or "-90_cw" or "+=45_ccw" to a numeric radian angle. Of course a starting/default value must be fed in too so that relative values can be calculated properly. - * @param {Object} v Value to be parsed - * @param {!number} d Default value (which is also used for relative calculations if "+=" or "-=" is found in the first parameter) - * @param {string=} p property name for directionalEnd (optional - only used when the parsed value is directional ("_short", "_cw", or "_ccw" suffix). We need a way to store the uncompensated value so that at the end of the tween, we set it to exactly what was requested with no directional compensation). Property name would be "rotation", "rotationX", or "rotationY" - * @param {Object=} directionalEnd An object that will store the raw end values for directional angles ("_short", "_cw", or "_ccw" suffix). We need a way to store the uncompensated value so that at the end of the tween, we set it to exactly what was requested with no directional compensation. - * @return {number} parsed angle in radians - */ - _parseAngle = function(v, d, p, directionalEnd) { - var min = 0.000001, - cap, split, dif, result; - if (v == null) { - result = d; - } else if (typeof(v) === "number") { - result = v; - } else { - cap = 360; - split = v.split("_"); - dif = Number(split[0].replace(_NaNExp, "")) * ((v.indexOf("rad") === -1) ? 1 : _RAD2DEG) - ((v.charAt(1) === "=") ? 0 : d); - if (split.length) { - if (directionalEnd) { - directionalEnd[p] = d + dif; - } - if (v.indexOf("short") !== -1) { - dif = dif % cap; - if (dif !== dif % (cap / 2)) { - dif = (dif < 0) ? dif + cap : dif - cap; - } - } - if (v.indexOf("_cw") !== -1 && dif < 0) { - dif = ((dif + cap * 9999999999) % cap) - ((dif / cap) | 0) * cap; - } else if (v.indexOf("ccw") !== -1 && dif > 0) { - dif = ((dif - cap * 9999999999) % cap) - ((dif / cap) | 0) * cap; - } - } - result = d + dif; - } - if (result < min && result > -min) { - result = 0; - } - return result; - }, - - _colorLookup = {aqua:[0,255,255], - lime:[0,255,0], - silver:[192,192,192], - black:[0,0,0], - maroon:[128,0,0], - teal:[0,128,128], - blue:[0,0,255], - navy:[0,0,128], - white:[255,255,255], - fuchsia:[255,0,255], - olive:[128,128,0], - yellow:[255,255,0], - orange:[255,165,0], - gray:[128,128,128], - purple:[128,0,128], - green:[0,128,0], - red:[255,0,0], - pink:[255,192,203], - cyan:[0,255,255], - transparent:[255,255,255,0]}, - - _hue = function(h, m1, m2) { - h = (h < 0) ? h + 1 : (h > 1) ? h - 1 : h; - return ((((h * 6 < 1) ? m1 + (m2 - m1) * h * 6 : (h < 0.5) ? m2 : (h * 3 < 2) ? m1 + (m2 - m1) * (2 / 3 - h) * 6 : m1) * 255) + 0.5) | 0; - }, - - /** - * @private Parses a color (like #9F0, #FF9900, or rgb(255,51,153)) into an array with 3 elements for red, green, and blue. Also handles rgba() values (splits into array of 4 elements of course) - * @param {(string|number)} v The value the should be parsed which could be a string like #9F0 or rgb(255,102,51) or rgba(255,0,0,0.5) or it could be a number like 0xFF00CC or even a named color like red, blue, purple, etc. - * @return {Array.<number>} An array containing red, green, and blue (and optionally alpha) in that order. - */ - _parseColor = function(v) { - var c1, c2, c3, h, s, l; - if (!v || v === "") { - return _colorLookup.black; - } - if (typeof(v) === "number") { - return [v >> 16, (v >> 8) & 255, v & 255]; - } - if (v.charAt(v.length - 1) === ",") { //sometimes a trailing commma is included and we should chop it off (typically from a comma-delimited list of values like a textShadow:"2px 2px 2px blue, 5px 5px 5px rgb(255,0,0)" - in this example "blue," has a trailing comma. We could strip it out inside parseComplex() but we'd need to do it to the beginning and ending values plus it wouldn't provide protection from other potential scenarios like if the user passes in a similar value. - v = v.substr(0, v.length - 1); - } - if (_colorLookup[v]) { - return _colorLookup[v]; - } - if (v.charAt(0) === "#") { - if (v.length === 4) { //for shorthand like #9F0 - c1 = v.charAt(1), - c2 = v.charAt(2), - c3 = v.charAt(3); - v = "#" + c1 + c1 + c2 + c2 + c3 + c3; - } - v = parseInt(v.substr(1), 16); - return [v >> 16, (v >> 8) & 255, v & 255]; - } - if (v.substr(0, 3) === "hsl") { - v = v.match(_numExp); - h = (Number(v[0]) % 360) / 360; - s = Number(v[1]) / 100; - l = Number(v[2]) / 100; - c2 = (l <= 0.5) ? l * (s + 1) : l + s - l * s; - c1 = l * 2 - c2; - if (v.length > 3) { - v[3] = Number(v[3]); - } - v[0] = _hue(h + 1 / 3, c1, c2); - v[1] = _hue(h, c1, c2); - v[2] = _hue(h - 1 / 3, c1, c2); - return v; - } - v = v.match(_numExp) || _colorLookup.transparent; - v[0] = Number(v[0]); - v[1] = Number(v[1]); - v[2] = Number(v[2]); - if (v.length > 3) { - v[3] = Number(v[3]); - } - return v; - }, - _colorExp = "(?:\\b(?:(?:rgb|rgba|hsl|hsla)\\(.+?\\))|\\B#.+?\\b"; //we'll dynamically build this Regular Expression to conserve file size. After building it, it will be able to find rgb(), rgba(), # (hexadecimal), and named color values like red, blue, purple, etc. - - for (p in _colorLookup) { - _colorExp += "|" + p + "\\b"; - } - _colorExp = new RegExp(_colorExp+")", "gi"); - - /** - * @private Returns a formatter function that handles taking a string (or number in some cases) and returning a consistently formatted one in terms of delimiters, quantity of values, etc. For example, we may get boxShadow values defined as "0px red" or "0px 0px 10px rgb(255,0,0)" or "0px 0px 20px 20px #F00" and we need to ensure that what we get back is described with 4 numbers and a color. This allows us to feed it into the _parseComplex() method and split the values up appropriately. The neat thing about this _getFormatter() function is that the dflt defines a pattern as well as a default, so for example, _getFormatter("0px 0px 0px 0px #777", true) not only sets the default as 0px for all distances and #777 for the color, but also sets the pattern such that 4 numbers and a color will always get returned. - * @param {!string} dflt The default value and pattern to follow. So "0px 0px 0px 0px #777" will ensure that 4 numbers and a color will always get returned. - * @param {boolean=} clr If true, the values should be searched for color-related data. For example, boxShadow values typically contain a color whereas borderRadius don't. - * @param {boolean=} collapsible If true, the value is a top/left/right/bottom style one that acts like margin or padding, where if only one value is received, it's used for all 4; if 2 are received, the first is duplicated for 3rd (bottom) and the 2nd is duplicated for the 4th spot (left), etc. - * @return {Function} formatter function - */ - var _getFormatter = function(dflt, clr, collapsible, multi) { - if (dflt == null) { - return function(v) {return v;}; - } - var dColor = clr ? (dflt.match(_colorExp) || [""])[0] : "", - dVals = dflt.split(dColor).join("").match(_valuesExp) || [], - pfx = dflt.substr(0, dflt.indexOf(dVals[0])), - sfx = (dflt.charAt(dflt.length - 1) === ")") ? ")" : "", - delim = (dflt.indexOf(" ") !== -1) ? " " : ",", - numVals = dVals.length, - dSfx = (numVals > 0) ? dVals[0].replace(_numExp, "") : "", - formatter; - if (!numVals) { - return function(v) {return v;}; - } - if (clr) { - formatter = function(v) { - var color, vals, i, a; - if (typeof(v) === "number") { - v += dSfx; - } else if (multi && _commasOutsideParenExp.test(v)) { - a = v.replace(_commasOutsideParenExp, "|").split("|"); - for (i = 0; i < a.length; i++) { - a[i] = formatter(a[i]); - } - return a.join(","); - } - color = (v.match(_colorExp) || [dColor])[0]; - vals = v.split(color).join("").match(_valuesExp) || []; - i = vals.length; - if (numVals > i--) { - while (++i < numVals) { - vals[i] = collapsible ? vals[(((i - 1) / 2) | 0)] : dVals[i]; - } - } - return pfx + vals.join(delim) + delim + color + sfx + (v.indexOf("inset") !== -1 ? " inset" : ""); - }; - return formatter; - - } - formatter = function(v) { - var vals, a, i; - if (typeof(v) === "number") { - v += dSfx; - } else if (multi && _commasOutsideParenExp.test(v)) { - a = v.replace(_commasOutsideParenExp, "|").split("|"); - for (i = 0; i < a.length; i++) { - a[i] = formatter(a[i]); - } - return a.join(","); - } - vals = v.match(_valuesExp) || []; - i = vals.length; - if (numVals > i--) { - while (++i < numVals) { - vals[i] = collapsible ? vals[(((i - 1) / 2) | 0)] : dVals[i]; - } - } - return pfx + vals.join(delim) + sfx; - }; - return formatter; - }, - - /** - * @private returns a formatter function that's used for edge-related values like marginTop, marginLeft, paddingBottom, paddingRight, etc. Just pass a comma-delimited list of property names related to the edges. - * @param {!string} props a comma-delimited list of property names in order from top to left, like "marginTop,marginRight,marginBottom,marginLeft" - * @return {Function} a formatter function - */ - _getEdgeParser = function(props) { - props = props.split(","); - return function(t, e, p, cssp, pt, plugin, vars) { - var a = (e + "").split(" "), - i; - vars = {}; - for (i = 0; i < 4; i++) { - vars[props[i]] = a[i] = a[i] || a[(((i - 1) / 2) >> 0)]; - } - return cssp.parse(t, vars, pt, plugin); - }; - }, - - // @private used when other plugins must tween values first, like BezierPlugin or ThrowPropsPlugin, etc. That plugin's setRatio() gets called first so that the values are updated, and then we loop through the MiniPropTweens which handle copying the values into their appropriate slots so that they can then be applied correctly in the main CSSPlugin setRatio() method. Remember, we typically create a proxy object that has a bunch of uniquely-named properties that we feed to the sub-plugin and it does its magic normally, and then we must interpret those values and apply them to the css because often numbers must get combined/concatenated, suffixes added, etc. to work with css, like boxShadow could have 4 values plus a color. - _setPluginRatio = _internals._setPluginRatio = function(v) { - this.plugin.setRatio(v); - var d = this.data, - proxy = d.proxy, - mpt = d.firstMPT, - min = 0.000001, - val, pt, i, str; - while (mpt) { - val = proxy[mpt.v]; - if (mpt.r) { - val = Math.round(val); - } else if (val < min && val > -min) { - val = 0; - } - mpt.t[mpt.p] = val; - mpt = mpt._next; - } - if (d.autoRotate) { - d.autoRotate.rotation = proxy.rotation; - } - //at the end, we must set the CSSPropTween's "e" (end) value dynamically here because that's what is used in the final setRatio() method. - if (v === 1) { - mpt = d.firstMPT; - while (mpt) { - pt = mpt.t; - if (!pt.type) { - pt.e = pt.s + pt.xs0; - } else if (pt.type === 1) { - str = pt.xs0 + pt.s + pt.xs1; - for (i = 1; i < pt.l; i++) { - str += pt["xn"+i] + pt["xs"+(i+1)]; - } - pt.e = str; - } - mpt = mpt._next; - } - } - }, - - /** - * @private @constructor Used by a few SpecialProps to hold important values for proxies. For example, _parseToProxy() creates a MiniPropTween instance for each property that must get tweened on the proxy, and we record the original property name as well as the unique one we create for the proxy, plus whether or not the value needs to be rounded plus the original value. - * @param {!Object} t target object whose property we're tweening (often a CSSPropTween) - * @param {!string} p property name - * @param {(number|string|object)} v value - * @param {MiniPropTween=} next next MiniPropTween in the linked list - * @param {boolean=} r if true, the tweened value should be rounded to the nearest integer - */ - MiniPropTween = function(t, p, v, next, r) { - this.t = t; - this.p = p; - this.v = v; - this.r = r; - if (next) { - next._prev = this; - this._next = next; - } - }, - - /** - * @private Most other plugins (like BezierPlugin and ThrowPropsPlugin and others) can only tween numeric values, but CSSPlugin must accommodate special values that have a bunch of extra data (like a suffix or strings between numeric values, etc.). For example, boxShadow has values like "10px 10px 20px 30px rgb(255,0,0)" which would utterly confuse other plugins. This method allows us to split that data apart and grab only the numeric data and attach it to uniquely-named properties of a generic proxy object ({}) so that we can feed that to virtually any plugin to have the numbers tweened. However, we must also keep track of which properties from the proxy go with which CSSPropTween values and instances. So we create a linked list of MiniPropTweens. Each one records a target (the original CSSPropTween), property (like "s" or "xn1" or "xn2") that we're tweening and the unique property name that was used for the proxy (like "boxShadow_xn1" and "boxShadow_xn2") and whether or not they need to be rounded. That way, in the _setPluginRatio() method we can simply copy the values over from the proxy to the CSSPropTween instance(s). Then, when the main CSSPlugin setRatio() method runs and applies the CSSPropTween values accordingly, they're updated nicely. So the external plugin tweens the numbers, _setPluginRatio() copies them over, and setRatio() acts normally, applying css-specific values to the element. - * This method returns an object that has the following properties: - * - proxy: a generic object containing the starting values for all the properties that will be tweened by the external plugin. This is what we feed to the external _onInitTween() as the target - * - end: a generic object containing the ending values for all the properties that will be tweened by the external plugin. This is what we feed to the external plugin's _onInitTween() as the destination values - * - firstMPT: the first MiniPropTween in the linked list - * - pt: the first CSSPropTween in the linked list that was created when parsing. If shallow is true, this linked list will NOT attach to the one passed into the _parseToProxy() as the "pt" (4th) parameter. - * @param {!Object} t target object to be tweened - * @param {!(Object|string)} vars the object containing the information about the tweening values (typically the end/destination values) that should be parsed - * @param {!CSSPlugin} cssp The CSSPlugin instance - * @param {CSSPropTween=} pt the next CSSPropTween in the linked list - * @param {TweenPlugin=} plugin the external TweenPlugin instance that will be handling tweening the numeric values - * @param {boolean=} shallow if true, the resulting linked list from the parse will NOT be attached to the CSSPropTween that was passed in as the "pt" (4th) parameter. - * @return An object containing the following properties: proxy, end, firstMPT, and pt (see above for descriptions) - */ - _parseToProxy = _internals._parseToProxy = function(t, vars, cssp, pt, plugin, shallow) { - var bpt = pt, - start = {}, - end = {}, - transform = cssp._transform, - oldForce = _forcePT, - i, p, xp, mpt, firstPT; - cssp._transform = null; - _forcePT = vars; - pt = firstPT = cssp.parse(t, vars, pt, plugin); - _forcePT = oldForce; - //break off from the linked list so the new ones are isolated. - if (shallow) { - cssp._transform = transform; - if (bpt) { - bpt._prev = null; - if (bpt._prev) { - bpt._prev._next = null; - } - } - } - while (pt && pt !== bpt) { - if (pt.type <= 1) { - p = pt.p; - end[p] = pt.s + pt.c; - start[p] = pt.s; - if (!shallow) { - mpt = new MiniPropTween(pt, "s", p, mpt, pt.r); - pt.c = 0; - } - if (pt.type === 1) { - i = pt.l; - while (--i > 0) { - xp = "xn" + i; - p = pt.p + "_" + xp; - end[p] = pt.data[xp]; - start[p] = pt[xp]; - if (!shallow) { - mpt = new MiniPropTween(pt, xp, p, mpt, pt.rxp[xp]); - } - } - } - } - pt = pt._next; - } - return {proxy:start, end:end, firstMPT:mpt, pt:firstPT}; - }, - - - - /** - * @constructor Each property that is tweened has at least one CSSPropTween associated with it. These instances store important information like the target, property, starting value, amount of change, etc. They can also optionally have a number of "extra" strings and numeric values named xs1, xn1, xs2, xn2, xs3, xn3, etc. where "s" indicates string and "n" indicates number. These can be pieced together in a complex-value tween (type:1) that has alternating types of data like a string, number, string, number, etc. For example, boxShadow could be "5px 5px 8px rgb(102, 102, 51)". In that value, there are 6 numbers that may need to tween and then pieced back together into a string again with spaces, suffixes, etc. xs0 is special in that it stores the suffix for standard (type:0) tweens, -OR- the first string (prefix) in a complex-value (type:1) CSSPropTween -OR- it can be the non-tweening value in a type:-1 CSSPropTween. We do this to conserve memory. - * CSSPropTweens have the following optional properties as well (not defined through the constructor): - * - l: Length in terms of the number of extra properties that the CSSPropTween has (default: 0). For example, for a boxShadow we may need to tween 5 numbers in which case l would be 5; Keep in mind that the start/end values for the first number that's tweened are always stored in the s and c properties to conserve memory. All additional values thereafter are stored in xn1, xn2, etc. - * - xfirst: The first instance of any sub-CSSPropTweens that are tweening properties of this instance. For example, we may split up a boxShadow tween so that there's a main CSSPropTween of type:1 that has various xs* and xn* values associated with the h-shadow, v-shadow, blur, color, etc. Then we spawn a CSSPropTween for each of those that has a higher priority and runs BEFORE the main CSSPropTween so that the values are all set by the time it needs to re-assemble them. The xfirst gives us an easy way to identify the first one in that chain which typically ends at the main one (because they're all prepende to the linked list) - * - plugin: The TweenPlugin instance that will handle the tweening of any complex values. For example, sometimes we don't want to use normal subtweens (like xfirst refers to) to tween the values - we might want ThrowPropsPlugin or BezierPlugin some other plugin to do the actual tweening, so we create a plugin instance and store a reference here. We need this reference so that if we get a request to round values or disable a tween, we can pass along that request. - * - data: Arbitrary data that needs to be stored with the CSSPropTween. Typically if we're going to have a plugin handle the tweening of a complex-value tween, we create a generic object that stores the END values that we're tweening to and the CSSPropTween's xs1, xs2, etc. have the starting values. We store that object as data. That way, we can simply pass that object to the plugin and use the CSSPropTween as the target. - * - setRatio: Only used for type:2 tweens that require custom functionality. In this case, we call the CSSPropTween's setRatio() method and pass the ratio each time the tween updates. This isn't quite as efficient as doing things directly in the CSSPlugin's setRatio() method, but it's very convenient and flexible. - * @param {!Object} t Target object whose property will be tweened. Often a DOM element, but not always. It could be anything. - * @param {string} p Property to tween (name). For example, to tween element.width, p would be "width". - * @param {number} s Starting numeric value - * @param {number} c Change in numeric value over the course of the entire tween. For example, if element.width starts at 5 and should end at 100, c would be 95. - * @param {CSSPropTween=} next The next CSSPropTween in the linked list. If one is defined, we will define its _prev as the new instance, and the new instance's _next will be pointed at it. - * @param {number=} type The type of CSSPropTween where -1 = a non-tweening value, 0 = a standard simple tween, 1 = a complex value (like one that has multiple numbers in a comma- or space-delimited string like border:"1px solid red"), and 2 = one that uses a custom setRatio function that does all of the work of applying the values on each update. - * @param {string=} n Name of the property that should be used for overwriting purposes which is typically the same as p but not always. For example, we may need to create a subtween for the 2nd part of a "clip:rect(...)" tween in which case "p" might be xs1 but "n" is still "clip" - * @param {boolean=} r If true, the value(s) should be rounded - * @param {number=} pr Priority in the linked list order. Higher priority CSSPropTweens will be updated before lower priority ones. The default priority is 0. - * @param {string=} b Beginning value. We store this to ensure that it is EXACTLY what it was when the tween began without any risk of interpretation issues. - * @param {string=} e Ending value. We store this to ensure that it is EXACTLY what the user defined at the end of the tween without any risk of interpretation issues. - */ - CSSPropTween = _internals.CSSPropTween = function(t, p, s, c, next, type, n, r, pr, b, e) { - this.t = t; //target - this.p = p; //property - this.s = s; //starting value - this.c = c; //change value - this.n = n || p; //name that this CSSPropTween should be associated to (usually the same as p, but not always - n is what overwriting looks at) - if (!(t instanceof CSSPropTween)) { - _overwriteProps.push(this.n); - } - this.r = r; //round (boolean) - this.type = type || 0; //0 = normal tween, -1 = non-tweening (in which case xs0 will be applied to the target's property, like tp.t[tp.p] = tp.xs0), 1 = complex-value SpecialProp, 2 = custom setRatio() that does all the work - if (pr) { - this.pr = pr; - _hasPriority = true; - } - this.b = (b === undefined) ? s : b; - this.e = (e === undefined) ? s + c : e; - if (next) { - this._next = next; - next._prev = this; - } - }, - - /** - * Takes a target, the beginning value and ending value (as strings) and parses them into a CSSPropTween (possibly with child CSSPropTweens) that accommodates multiple numbers, colors, comma-delimited values, etc. For example: - * sp.parseComplex(element, "boxShadow", "5px 10px 20px rgb(255,102,51)", "0px 0px 0px red", true, "0px 0px 0px rgb(0,0,0,0)", pt); - * It will walk through the beginning and ending values (which should be in the same format with the same number and type of values) and figure out which parts are numbers, what strings separate the numeric/tweenable values, and then create the CSSPropTweens accordingly. If a plugin is defined, no child CSSPropTweens will be created. Instead, the ending values will be stored in the "data" property of the returned CSSPropTween like: {s:-5, xn1:-10, xn2:-20, xn3:255, xn4:0, xn5:0} so that it can be fed to any other plugin and it'll be plain numeric tweens but the recomposition of the complex value will be handled inside CSSPlugin's setRatio(). - * If a setRatio is defined, the type of the CSSPropTween will be set to 2 and recomposition of the values will be the responsibility of that method. - * - * @param {!Object} t Target whose property will be tweened - * @param {!string} p Property that will be tweened (its name, like "left" or "backgroundColor" or "boxShadow") - * @param {string} b Beginning value - * @param {string} e Ending value - * @param {boolean} clrs If true, the value could contain a color value like "rgb(255,0,0)" or "#F00" or "red". The default is false, so no colors will be recognized (a performance optimization) - * @param {(string|number|Object)} dflt The default beginning value that should be used if no valid beginning value is defined or if the number of values inside the complex beginning and ending values don't match - * @param {?CSSPropTween} pt CSSPropTween instance that is the current head of the linked list (we'll prepend to this). - * @param {number=} pr Priority in the linked list order. Higher priority properties will be updated before lower priority ones. The default priority is 0. - * @param {TweenPlugin=} plugin If a plugin should handle the tweening of extra properties, pass the plugin instance here. If one is defined, then NO subtweens will be created for any extra properties (the properties will be created - just not additional CSSPropTween instances to tween them) because the plugin is expected to do so. However, the end values WILL be populated in the "data" property, like {s:100, xn1:50, xn2:300} - * @param {function(number)=} setRatio If values should be set in a custom function instead of being pieced together in a type:1 (complex-value) CSSPropTween, define that custom function here. - * @return {CSSPropTween} The first CSSPropTween in the linked list which includes the new one(s) added by the parseComplex() call. - */ - _parseComplex = CSSPlugin.parseComplex = function(t, p, b, e, clrs, dflt, pt, pr, plugin, setRatio) { - //DEBUG: _log("parseComplex: "+p+", b: "+b+", e: "+e); - b = b || dflt || ""; - pt = new CSSPropTween(t, p, 0, 0, pt, (setRatio ? 2 : 1), null, false, pr, b, e); - e += ""; //ensures it's a string - var ba = b.split(", ").join(",").split(" "), //beginning array - ea = e.split(", ").join(",").split(" "), //ending array - l = ba.length, - autoRound = (_autoRound !== false), - i, xi, ni, bv, ev, bnums, enums, bn, rgba, temp, cv, str; - if (e.indexOf(",") !== -1 || b.indexOf(",") !== -1) { - ba = ba.join(" ").replace(_commasOutsideParenExp, ", ").split(" "); - ea = ea.join(" ").replace(_commasOutsideParenExp, ", ").split(" "); - l = ba.length; - } - if (l !== ea.length) { - //DEBUG: _log("mismatched formatting detected on " + p + " (" + b + " vs " + e + ")"); - ba = (dflt || "").split(" "); - l = ba.length; - } - pt.plugin = plugin; - pt.setRatio = setRatio; - for (i = 0; i < l; i++) { - bv = ba[i]; - ev = ea[i]; - bn = parseFloat(bv); - - //if the value begins with a number (most common). It's fine if it has a suffix like px - if (bn || bn === 0) { - pt.appendXtra("", bn, _parseChange(ev, bn), ev.replace(_relNumExp, ""), (autoRound && ev.indexOf("px") !== -1), true); - - //if the value is a color - } else if (clrs && (bv.charAt(0) === "#" || _colorLookup[bv] || _rgbhslExp.test(bv))) { - str = ev.charAt(ev.length - 1) === "," ? ")," : ")"; //if there's a comma at the end, retain it. - bv = _parseColor(bv); - ev = _parseColor(ev); - rgba = (bv.length + ev.length > 6); - if (rgba && !_supportsOpacity && ev[3] === 0) { //older versions of IE don't support rgba(), so if the destination alpha is 0, just use "transparent" for the end color - pt["xs" + pt.l] += pt.l ? " transparent" : "transparent"; - pt.e = pt.e.split(ea[i]).join("transparent"); - } else { - if (!_supportsOpacity) { //old versions of IE don't support rgba(). - rgba = false; - } - pt.appendXtra((rgba ? "rgba(" : "rgb("), bv[0], ev[0] - bv[0], ",", true, true) - .appendXtra("", bv[1], ev[1] - bv[1], ",", true) - .appendXtra("", bv[2], ev[2] - bv[2], (rgba ? "," : str), true); - if (rgba) { - bv = (bv.length < 4) ? 1 : bv[3]; - pt.appendXtra("", bv, ((ev.length < 4) ? 1 : ev[3]) - bv, str, false); - } - } - - } else { - bnums = bv.match(_numExp); //gets each group of numbers in the beginning value string and drops them into an array - - //if no number is found, treat it as a non-tweening value and just append the string to the current xs. - if (!bnums) { - pt["xs" + pt.l] += pt.l ? " " + bv : bv; - - //loop through all the numbers that are found and construct the extra values on the pt. - } else { - enums = ev.match(_relNumExp); //get each group of numbers in the end value string and drop them into an array. We allow relative values too, like +=50 or -=.5 - if (!enums || enums.length !== bnums.length) { - //DEBUG: _log("mismatched formatting detected on " + p + " (" + b + " vs " + e + ")"); - return pt; - } - ni = 0; - for (xi = 0; xi < bnums.length; xi++) { - cv = bnums[xi]; - temp = bv.indexOf(cv, ni); - pt.appendXtra(bv.substr(ni, temp - ni), Number(cv), _parseChange(enums[xi], cv), "", (autoRound && bv.substr(temp + cv.length, 2) === "px"), (xi === 0)); - ni = temp + cv.length; - } - pt["xs" + pt.l] += bv.substr(ni); - } - } - } - //if there are relative values ("+=" or "-=" prefix), we need to adjust the ending value to eliminate the prefixes and combine the values properly. - if (e.indexOf("=") !== -1) if (pt.data) { - str = pt.xs0 + pt.data.s; - for (i = 1; i < pt.l; i++) { - str += pt["xs" + i] + pt.data["xn" + i]; - } - pt.e = str + pt["xs" + i]; - } - if (!pt.l) { - pt.type = -1; - pt.xs0 = pt.e; - } - return pt.xfirst || pt; - }, - i = 9; - - - p = CSSPropTween.prototype; - p.l = p.pr = 0; //length (number of extra properties like xn1, xn2, xn3, etc. - while (--i > 0) { - p["xn" + i] = 0; - p["xs" + i] = ""; - } - p.xs0 = ""; - p._next = p._prev = p.xfirst = p.data = p.plugin = p.setRatio = p.rxp = null; - - - /** - * Appends and extra tweening value to a CSSPropTween and automatically manages any prefix and suffix strings. The first extra value is stored in the s and c of the main CSSPropTween instance, but thereafter any extras are stored in the xn1, xn2, xn3, etc. The prefixes and suffixes are stored in the xs0, xs1, xs2, etc. properties. For example, if I walk through a clip value like "rect(10px, 5px, 0px, 20px)", the values would be stored like this: - * xs0:"rect(", s:10, xs1:"px, ", xn1:5, xs2:"px, ", xn2:0, xs3:"px, ", xn3:20, xn4:"px)" - * And they'd all get joined together when the CSSPlugin renders (in the setRatio() method). - * @param {string=} pfx Prefix (if any) - * @param {!number} s Starting value - * @param {!number} c Change in numeric value over the course of the entire tween. For example, if the start is 5 and the end is 100, the change would be 95. - * @param {string=} sfx Suffix (if any) - * @param {boolean=} r Round (if true). - * @param {boolean=} pad If true, this extra value should be separated by the previous one by a space. If there is no previous extra and pad is true, it will automatically drop the space. - * @return {CSSPropTween} returns itself so that multiple methods can be chained together. - */ - p.appendXtra = function(pfx, s, c, sfx, r, pad) { - var pt = this, - l = pt.l; - pt["xs" + l] += (pad && l) ? " " + pfx : pfx || ""; - if (!c) if (l !== 0 && !pt.plugin) { //typically we'll combine non-changing values right into the xs to optimize performance, but we don't combine them when there's a plugin that will be tweening the values because it may depend on the values being split apart, like for a bezier, if a value doesn't change between the first and second iteration but then it does on the 3rd, we'll run into trouble because there's no xn slot for that value! - pt["xs" + l] += s + (sfx || ""); - return pt; - } - pt.l++; - pt.type = pt.setRatio ? 2 : 1; - pt["xs" + pt.l] = sfx || ""; - if (l > 0) { - pt.data["xn" + l] = s + c; - pt.rxp["xn" + l] = r; //round extra property (we need to tap into this in the _parseToProxy() method) - pt["xn" + l] = s; - if (!pt.plugin) { - pt.xfirst = new CSSPropTween(pt, "xn" + l, s, c, pt.xfirst || pt, 0, pt.n, r, pt.pr); - pt.xfirst.xs0 = 0; //just to ensure that the property stays numeric which helps modern browsers speed up processing. Remember, in the setRatio() method, we do pt.t[pt.p] = val + pt.xs0 so if pt.xs0 is "" (the default), it'll cast the end value as a string. When a property is a number sometimes and a string sometimes, it prevents the compiler from locking in the data type, slowing things down slightly. - } - return pt; - } - pt.data = {s:s + c}; - pt.rxp = {}; - pt.s = s; - pt.c = c; - pt.r = r; - return pt; - }; - - /** - * @constructor A SpecialProp is basically a css property that needs to be treated in a non-standard way, like if it may contain a complex value like boxShadow:"5px 10px 15px rgb(255, 102, 51)" or if it is associated with another plugin like ThrowPropsPlugin or BezierPlugin. Every SpecialProp is associated with a particular property name like "boxShadow" or "throwProps" or "bezier" and it will intercept those values in the vars object that's passed to the CSSPlugin and handle them accordingly. - * @param {!string} p Property name (like "boxShadow" or "throwProps") - * @param {Object=} options An object containing any of the following configuration options: - * - defaultValue: the default value - * - parser: A function that should be called when the associated property name is found in the vars. This function should return a CSSPropTween instance and it should ensure that it is properly inserted into the linked list. It will receive 4 paramters: 1) The target, 2) The value defined in the vars, 3) The CSSPlugin instance (whose _firstPT should be used for the linked list), and 4) A computed style object if one was calculated (this is a speed optimization that allows retrieval of starting values quicker) - * - formatter: a function that formats any value received for this special property (for example, boxShadow could take "5px 5px red" and format it to "5px 5px 0px 0px red" so that both the beginning and ending values have a common order and quantity of values.) - * - prefix: if true, we'll determine whether or not this property requires a vendor prefix (like Webkit or Moz or ms or O) - * - color: set this to true if the value for this SpecialProp may contain color-related values like rgb(), rgba(), etc. - * - priority: priority in the linked list order. Higher priority SpecialProps will be updated before lower priority ones. The default priority is 0. - * - multi: if true, the formatter should accommodate a comma-delimited list of values, like boxShadow could have multiple boxShadows listed out. - * - collapsible: if true, the formatter should treat the value like it's a top/right/bottom/left value that could be collapsed, like "5px" would apply to all, "5px, 10px" would use 5px for top/bottom and 10px for right/left, etc. - * - keyword: a special keyword that can [optionally] be found inside the value (like "inset" for boxShadow). This allows us to validate beginning/ending values to make sure they match (if the keyword is found in one, it'll be added to the other for consistency by default). - */ - var SpecialProp = function(p, options) { - options = options || {}; - this.p = options.prefix ? _checkPropPrefix(p) || p : p; - _specialProps[p] = _specialProps[this.p] = this; - this.format = options.formatter || _getFormatter(options.defaultValue, options.color, options.collapsible, options.multi); - if (options.parser) { - this.parse = options.parser; - } - this.clrs = options.color; - this.multi = options.multi; - this.keyword = options.keyword; - this.dflt = options.defaultValue; - this.pr = options.priority || 0; - }, - - //shortcut for creating a new SpecialProp that can accept multiple properties as a comma-delimited list (helps minification). dflt can be an array for multiple values (we don't do a comma-delimited list because the default value may contain commas, like rect(0px,0px,0px,0px)). We attach this method to the SpecialProp class/object instead of using a private _createSpecialProp() method so that we can tap into it externally if necessary, like from another plugin. - _registerComplexSpecialProp = _internals._registerComplexSpecialProp = function(p, options, defaults) { - if (typeof(options) !== "object") { - options = {parser:defaults}; //to make backwards compatible with older versions of BezierPlugin and ThrowPropsPlugin - } - var a = p.split(","), - d = options.defaultValue, - i, temp; - defaults = defaults || [d]; - for (i = 0; i < a.length; i++) { - options.prefix = (i === 0 && options.prefix); - options.defaultValue = defaults[i] || d; - temp = new SpecialProp(a[i], options); - } - }, - - //creates a placeholder special prop for a plugin so that the property gets caught the first time a tween of it is attempted, and at that time it makes the plugin register itself, thus taking over for all future tweens of that property. This allows us to not mandate that things load in a particular order and it also allows us to log() an error that informs the user when they attempt to tween an external plugin-related property without loading its .js file. - _registerPluginProp = function(p) { - if (!_specialProps[p]) { - var pluginName = p.charAt(0).toUpperCase() + p.substr(1) + "Plugin"; - _registerComplexSpecialProp(p, {parser:function(t, e, p, cssp, pt, plugin, vars) { - var pluginClass = (window.GreenSockGlobals || window).com.greensock.plugins[pluginName]; - if (!pluginClass) { - _log("Error: " + pluginName + " js file not loaded."); - return pt; - } - pluginClass._cssRegister(); - return _specialProps[p].parse(t, e, p, cssp, pt, plugin, vars); - }}); - } - }; - - - p = SpecialProp.prototype; - - /** - * Alias for _parseComplex() that automatically plugs in certain values for this SpecialProp, like its property name, whether or not colors should be sensed, the default value, and priority. It also looks for any keyword that the SpecialProp defines (like "inset" for boxShadow) and ensures that the beginning and ending values have the same number of values for SpecialProps where multi is true (like boxShadow and textShadow can have a comma-delimited list) - * @param {!Object} t target element - * @param {(string|number|object)} b beginning value - * @param {(string|number|object)} e ending (destination) value - * @param {CSSPropTween=} pt next CSSPropTween in the linked list - * @param {TweenPlugin=} plugin If another plugin will be tweening the complex value, that TweenPlugin instance goes here. - * @param {function=} setRatio If a custom setRatio() method should be used to handle this complex value, that goes here. - * @return {CSSPropTween=} First CSSPropTween in the linked list - */ - p.parseComplex = function(t, b, e, pt, plugin, setRatio) { - var kwd = this.keyword, - i, ba, ea, l, bi, ei; - //if this SpecialProp's value can contain a comma-delimited list of values (like boxShadow or textShadow), we must parse them in a special way, and look for a keyword (like "inset" for boxShadow) and ensure that the beginning and ending BOTH have it if the end defines it as such. We also must ensure that there are an equal number of values specified (we can't tween 1 boxShadow to 3 for example) - if (this.multi) if (_commasOutsideParenExp.test(e) || _commasOutsideParenExp.test(b)) { - ba = b.replace(_commasOutsideParenExp, "|").split("|"); - ea = e.replace(_commasOutsideParenExp, "|").split("|"); - } else if (kwd) { - ba = [b]; - ea = [e]; - } - if (ea) { - l = (ea.length > ba.length) ? ea.length : ba.length; - for (i = 0; i < l; i++) { - b = ba[i] = ba[i] || this.dflt; - e = ea[i] = ea[i] || this.dflt; - if (kwd) { - bi = b.indexOf(kwd); - ei = e.indexOf(kwd); - if (bi !== ei) { - e = (ei === -1) ? ea : ba; - e[i] += " " + kwd; - } - } - } - b = ba.join(", "); - e = ea.join(", "); - } - return _parseComplex(t, this.p, b, e, this.clrs, this.dflt, pt, this.pr, plugin, setRatio); - }; - - /** - * Accepts a target and end value and spits back a CSSPropTween that has been inserted into the CSSPlugin's linked list and conforms with all the conventions we use internally, like type:-1, 0, 1, or 2, setting up any extra property tweens, priority, etc. For example, if we have a boxShadow SpecialProp and call: - * this._firstPT = sp.parse(element, "5px 10px 20px rgb(2550,102,51)", "boxShadow", this); - * It should figure out the starting value of the element's boxShadow, compare it to the provided end value and create all the necessary CSSPropTweens of the appropriate types to tween the boxShadow. The CSSPropTween that gets spit back should already be inserted into the linked list (the 4th parameter is the current head, so prepend to that). - * @param {!Object} t Target object whose property is being tweened - * @param {Object} e End value as provided in the vars object (typically a string, but not always - like a throwProps would be an object). - * @param {!string} p Property name - * @param {!CSSPlugin} cssp The CSSPlugin instance that should be associated with this tween. - * @param {?CSSPropTween} pt The CSSPropTween that is the current head of the linked list (we'll prepend to it) - * @param {TweenPlugin=} plugin If a plugin will be used to tween the parsed value, this is the plugin instance. - * @param {Object=} vars Original vars object that contains the data for parsing. - * @return {CSSPropTween} The first CSSPropTween in the linked list which includes the new one(s) added by the parse() call. - */ - p.parse = function(t, e, p, cssp, pt, plugin, vars) { - return this.parseComplex(t.style, this.format(_getStyle(t, this.p, _cs, false, this.dflt)), this.format(e), pt, plugin); - }; - - /** - * Registers a special property that should be intercepted from any "css" objects defined in tweens. This allows you to handle them however you want without CSSPlugin doing it for you. The 2nd parameter should be a function that accepts 3 parameters: - * 1) Target object whose property should be tweened (typically a DOM element) - * 2) The end/destination value (could be a string, number, object, or whatever you want) - * 3) The tween instance (you probably don't need to worry about this, but it can be useful for looking up information like the duration) - * - * Then, your function should return a function which will be called each time the tween gets rendered, passing a numeric "ratio" parameter to your function that indicates the change factor (usually between 0 and 1). For example: - * - * CSSPlugin.registerSpecialProp("myCustomProp", function(target, value, tween) { - * var start = target.style.width; - * return function(ratio) { - * target.style.width = (start + value * ratio) + "px"; - * console.log("set width to " + target.style.width); - * } - * }, 0); - * - * Then, when I do this tween, it will trigger my special property: - * - * TweenLite.to(element, 1, {css:{myCustomProp:100}}); - * - * In the example, of course, we're just changing the width, but you can do anything you want. - * - * @param {!string} name Property name (or comma-delimited list of property names) that should be intercepted and handled by your function. For example, if I define "myCustomProp", then it would handle that portion of the following tween: TweenLite.to(element, 1, {css:{myCustomProp:100}}) - * @param {!function(Object, Object, Object, string):function(number)} onInitTween The function that will be called when a tween of this special property is performed. The function will receive 4 parameters: 1) Target object that should be tweened, 2) Value that was passed to the tween, 3) The tween instance itself (rarely used), and 4) The property name that's being tweened. Your function should return a function that should be called on every update of the tween. That function will receive a single parameter that is a "change factor" value (typically between 0 and 1) indicating the amount of change as a ratio. You can use this to determine how to set the values appropriately in your function. - * @param {number=} priority Priority that helps the engine determine the order in which to set the properties (default: 0). Higher priority properties will be updated before lower priority ones. - */ - CSSPlugin.registerSpecialProp = function(name, onInitTween, priority) { - _registerComplexSpecialProp(name, {parser:function(t, e, p, cssp, pt, plugin, vars) { - var rv = new CSSPropTween(t, p, 0, 0, pt, 2, p, false, priority); - rv.plugin = plugin; - rv.setRatio = onInitTween(t, e, cssp._tween, p); - return rv; - }, priority:priority}); - }; - - - - - - - - - //transform-related methods and properties - var _transformProps = ("scaleX,scaleY,scaleZ,x,y,z,skewX,skewY,rotation,rotationX,rotationY,perspective").split(","), - _transformProp = _checkPropPrefix("transform"), //the Javascript (camelCase) transform property, like msTransform, WebkitTransform, MozTransform, or OTransform. - _transformPropCSS = _prefixCSS + "transform", - _transformOriginProp = _checkPropPrefix("transformOrigin"), - _supports3D = (_checkPropPrefix("perspective") !== null), - Transform = _internals.Transform = function() { - this.skewY = 0; - }, - - /** - * Parses the transform values for an element, returning an object with x, y, z, scaleX, scaleY, scaleZ, rotation, rotationX, rotationY, skewX, and skewY properties. Note: by default (for performance reasons), all skewing is combined into skewX and rotation but skewY still has a place in the transform object so that we can record how much of the skew is attributed to skewX vs skewY. Remember, a skewY of 10 looks the same as a rotation of 10 and skewX of -10. - * @param {!Object} t target element - * @param {Object=} cs computed style object (optional) - * @param {boolean=} rec if true, the transform values will be recorded to the target element's _gsTransform object, like target._gsTransform = {x:0, y:0, z:0, scaleX:1...} - * @param {boolean=} parse if true, we'll ignore any _gsTransform values that already exist on the element, and force a reparsing of the css (calculated style) - * @return {object} object containing all of the transform properties/values like {x:0, y:0, z:0, scaleX:1...} - */ - _getTransform = _internals.getTransform = function(t, cs, rec, parse) { - if (t._gsTransform && rec && !parse) { - return t._gsTransform; //if the element already has a _gsTransform, use that. Note: some browsers don't accurately return the calculated style for the transform (particularly for SVG), so it's almost always safest to just use the values we've already applied rather than re-parsing things. - } - var tm = rec ? t._gsTransform || new Transform() : new Transform(), - invX = (tm.scaleX < 0), //in order to interpret things properly, we need to know if the user applied a negative scaleX previously so that we can adjust the rotation and skewX accordingly. Otherwise, if we always interpret a flipped matrix as affecting scaleY and the user only wants to tween the scaleX on multiple sequential tweens, it would keep the negative scaleY without that being the user's intent. - min = 0.00002, - rnd = 100000, - minAngle = 179.99, - minPI = minAngle * _DEG2RAD, - zOrigin = _supports3D ? parseFloat(_getStyle(t, _transformOriginProp, cs, false, "0 0 0").split(" ")[2]) || tm.zOrigin || 0 : 0, - s, m, i, n, dec, scaleX, scaleY, rotation, skewX, difX, difY, difR, difS; - if (_transformProp) { - s = _getStyle(t, _transformPropCSS, cs, true); - } else if (t.currentStyle) { - //for older versions of IE, we need to interpret the filter portion that is in the format: progid:DXImageTransform.Microsoft.Matrix(M11=6.123233995736766e-17, M12=-1, M21=1, M22=6.123233995736766e-17, sizingMethod='auto expand') Notice that we need to swap b and c compared to a normal matrix. - s = t.currentStyle.filter.match(_ieGetMatrixExp); - s = (s && s.length === 4) ? [s[0].substr(4), Number(s[2].substr(4)), Number(s[1].substr(4)), s[3].substr(4), (tm.x || 0), (tm.y || 0)].join(",") : ""; - } - //split the matrix values out into an array (m for matrix) - m = (s || "").match(/(?:\-|\b)[\d\-\.e]+\b/gi) || []; - i = m.length; - while (--i > -1) { - n = Number(m[i]); - m[i] = (dec = n - (n |= 0)) ? ((dec * rnd + (dec < 0 ? -0.5 : 0.5)) | 0) / rnd + n : n; //convert strings to Numbers and round to 5 decimal places to avoid issues with tiny numbers. Roughly 20x faster than Number.toFixed(). We also must make sure to round before dividing so that values like 0.9999999999 become 1 to avoid glitches in browser rendering and interpretation of flipped/rotated 3D matrices. And don't just multiply the number by rnd, floor it, and then divide by rnd because the bitwise operations max out at a 32-bit signed integer, thus it could get clipped at a relatively low value (like 22,000.00000 for example). - } - if (m.length === 16) { - - //we'll only look at these position-related 6 variables first because if x/y/z all match, it's relatively safe to assume we don't need to re-parse everything which risks losing important rotational information (like rotationX:180 plus rotationY:180 would look the same as rotation:180 - there's no way to know for sure which direction was taken based solely on the matrix3d() values) - var a13 = m[8], a23 = m[9], a33 = m[10], - a14 = m[12], a24 = m[13], a34 = m[14]; - - //we manually compensate for non-zero z component of transformOrigin to work around bugs in Safari - if (tm.zOrigin) { - a34 = -tm.zOrigin; - a14 = a13*a34-m[12]; - a24 = a23*a34-m[13]; - a34 = a33*a34+tm.zOrigin-m[14]; - } - - //only parse from the matrix if we MUST because not only is it usually unnecessary due to the fact that we store the values in the _gsTransform object, but also because it's impossible to accurately interpret rotationX, rotationY, rotationZ, scaleX, and scaleY if all are applied, so it's much better to rely on what we store. However, we must parse the first time that an object is tweened. We also assume that if the position has changed, the user must have done some styling changes outside of CSSPlugin, thus we force a parse in that scenario. - if (!rec || parse || tm.rotationX == null) { - var a11 = m[0], a21 = m[1], a31 = m[2], a41 = m[3], - a12 = m[4], a22 = m[5], a32 = m[6], a42 = m[7], - a43 = m[11], - angle = Math.atan2(a32, a33), - xFlip = (angle < -minPI || angle > minPI), - t1, t2, t3, cos, sin, yFlip, zFlip; - tm.rotationX = angle * _RAD2DEG; - //rotationX - if (angle) { - cos = Math.cos(-angle); - sin = Math.sin(-angle); - t1 = a12*cos+a13*sin; - t2 = a22*cos+a23*sin; - t3 = a32*cos+a33*sin; - a13 = a12*-sin+a13*cos; - a23 = a22*-sin+a23*cos; - a33 = a32*-sin+a33*cos; - a43 = a42*-sin+a43*cos; - a12 = t1; - a22 = t2; - a32 = t3; - } - //rotationY - angle = Math.atan2(a13, a11); - tm.rotationY = angle * _RAD2DEG; - if (angle) { - yFlip = (angle < -minPI || angle > minPI); - cos = Math.cos(-angle); - sin = Math.sin(-angle); - t1 = a11*cos-a13*sin; - t2 = a21*cos-a23*sin; - t3 = a31*cos-a33*sin; - a23 = a21*sin+a23*cos; - a33 = a31*sin+a33*cos; - a43 = a41*sin+a43*cos; - a11 = t1; - a21 = t2; - a31 = t3; - } - //rotationZ - angle = Math.atan2(a21, a22); - tm.rotation = angle * _RAD2DEG; - if (angle) { - zFlip = (angle < -minPI || angle > minPI); - cos = Math.cos(-angle); - sin = Math.sin(-angle); - a11 = a11*cos+a12*sin; - t2 = a21*cos+a22*sin; - a22 = a21*-sin+a22*cos; - a32 = a31*-sin+a32*cos; - a21 = t2; - } - - if (zFlip && xFlip) { - tm.rotation = tm.rotationX = 0; - } else if (zFlip && yFlip) { - tm.rotation = tm.rotationY = 0; - } else if (yFlip && xFlip) { - tm.rotationY = tm.rotationX = 0; - } - - tm.scaleX = ((Math.sqrt(a11 * a11 + a21 * a21) * rnd + 0.5) | 0) / rnd; - tm.scaleY = ((Math.sqrt(a22 * a22 + a23 * a23) * rnd + 0.5) | 0) / rnd; - tm.scaleZ = ((Math.sqrt(a32 * a32 + a33 * a33) * rnd + 0.5) | 0) / rnd; - tm.skewX = 0; - tm.perspective = a43 ? 1 / ((a43 < 0) ? -a43 : a43) : 0; - tm.x = a14; - tm.y = a24; - tm.z = a34; - } - - } else if ((!_supports3D || parse || !m.length || tm.x !== m[4] || tm.y !== m[5] || (!tm.rotationX && !tm.rotationY)) && !(tm.x !== undefined && _getStyle(t, "display", cs) === "none")) { //sometimes a 6-element matrix is returned even when we performed 3D transforms, like if rotationX and rotationY are 180. In cases like this, we still need to honor the 3D transforms. If we just rely on the 2D info, it could affect how the data is interpreted, like scaleY might get set to -1 or rotation could get offset by 180 degrees. For example, do a TweenLite.to(element, 1, {css:{rotationX:180, rotationY:180}}) and then later, TweenLite.to(element, 1, {css:{rotationX:0}}) and without this conditional logic in place, it'd jump to a state of being unrotated when the 2nd tween starts. Then again, we need to honor the fact that the user COULD alter the transforms outside of CSSPlugin, like by manually applying new css, so we try to sense that by looking at x and y because if those changed, we know the changes were made outside CSSPlugin and we force a reinterpretation of the matrix values. Also, in Webkit browsers, if the element's "display" is "none", its calculated style value will always return empty, so if we've already recorded the values in the _gsTransform object, we'll just rely on those. - var k = (m.length >= 6), - a = k ? m[0] : 1, - b = m[1] || 0, - c = m[2] || 0, - d = k ? m[3] : 1; - tm.x = m[4] || 0; - tm.y = m[5] || 0; - scaleX = Math.sqrt(a * a + b * b); - scaleY = Math.sqrt(d * d + c * c); - rotation = (a || b) ? Math.atan2(b, a) * _RAD2DEG : tm.rotation || 0; //note: if scaleX is 0, we cannot accurately measure rotation. Same for skewX with a scaleY of 0. Therefore, we default to the previously recorded value (or zero if that doesn't exist). - skewX = (c || d) ? Math.atan2(c, d) * _RAD2DEG + rotation : tm.skewX || 0; - difX = scaleX - Math.abs(tm.scaleX || 0); - difY = scaleY - Math.abs(tm.scaleY || 0); - if (Math.abs(skewX) > 90 && Math.abs(skewX) < 270) { - if (invX) { - scaleX *= -1; - skewX += (rotation <= 0) ? 180 : -180; - rotation += (rotation <= 0) ? 180 : -180; - } else { - scaleY *= -1; - skewX += (skewX <= 0) ? 180 : -180; - } - } - difR = (rotation - tm.rotation) % 180; //note: matching ranges would be very small (+/-0.0001) or very close to 180. - difS = (skewX - tm.skewX) % 180; - //if there's already a recorded _gsTransform in place for the target, we should leave those values in place unless we know things changed for sure (beyond a super small amount). This gets around ambiguous interpretations, like if scaleX and scaleY are both -1, the matrix would be the same as if the rotation was 180 with normal scaleX/scaleY. If the user tweened to particular values, those must be prioritized to ensure animation is consistent. - if (tm.skewX === undefined || difX > min || difX < -min || difY > min || difY < -min || (difR > -minAngle && difR < minAngle && (difR * rnd) | 0 !== 0) || (difS > -minAngle && difS < minAngle && (difS * rnd) | 0 !== 0)) { - tm.scaleX = scaleX; - tm.scaleY = scaleY; - tm.rotation = rotation; - tm.skewX = skewX; - } - if (_supports3D) { - tm.rotationX = tm.rotationY = tm.z = 0; - tm.perspective = parseFloat(CSSPlugin.defaultTransformPerspective) || 0; - tm.scaleZ = 1; - } - } - tm.zOrigin = zOrigin; - - //some browsers have a hard time with very small values like 2.4492935982947064e-16 (notice the "e-" towards the end) and would render the object slightly off. So we round to 0 in these cases. The conditional logic here is faster than calling Math.abs(). Also, browsers tend to render a SLIGHTLY rotated object in a fuzzy way, so we need to snap to exactly 0 when appropriate. - for (i in tm) { - if (tm[i] < min) if (tm[i] > -min) { - tm[i] = 0; - } - } - //DEBUG: _log("parsed rotation: "+(tm.rotationX)+", "+(tm.rotationY)+", "+(tm.rotation)+", scale: "+tm.scaleX+", "+tm.scaleY+", "+tm.scaleZ+", position: "+tm.x+", "+tm.y+", "+tm.z+", perspective: "+tm.perspective); - if (rec) { - t._gsTransform = tm; //record to the object's _gsTransform which we use so that tweens can control individual properties independently (we need all the properties to accurately recompose the matrix in the setRatio() method) - } - return tm; - }, - - //for setting 2D transforms in IE6, IE7, and IE8 (must use a "filter" to emulate the behavior of modern day browser transforms) - _setIETransformRatio = function(v) { - var t = this.data, //refers to the element's _gsTransform object - ang = -t.rotation * _DEG2RAD, - skew = ang + t.skewX * _DEG2RAD, - rnd = 100000, - a = ((Math.cos(ang) * t.scaleX * rnd) | 0) / rnd, - b = ((Math.sin(ang) * t.scaleX * rnd) | 0) / rnd, - c = ((Math.sin(skew) * -t.scaleY * rnd) | 0) / rnd, - d = ((Math.cos(skew) * t.scaleY * rnd) | 0) / rnd, - style = this.t.style, - cs = this.t.currentStyle, - filters, val; - if (!cs) { - return; - } - val = b; //just for swapping the variables an inverting them (reused "val" to avoid creating another variable in memory). IE's filter matrix uses a non-standard matrix configuration (angle goes the opposite way, and b and c are reversed and inverted) - b = -c; - c = -val; - filters = cs.filter; - style.filter = ""; //remove filters so that we can accurately measure offsetWidth/offsetHeight - var w = this.t.offsetWidth, - h = this.t.offsetHeight, - clip = (cs.position !== "absolute"), - m = "progid:DXImageTransform.Microsoft.Matrix(M11=" + a + ", M12=" + b + ", M21=" + c + ", M22=" + d, - ox = t.x, - oy = t.y, - dx, dy; - - //if transformOrigin is being used, adjust the offset x and y - if (t.ox != null) { - dx = ((t.oxp) ? w * t.ox * 0.01 : t.ox) - w / 2; - dy = ((t.oyp) ? h * t.oy * 0.01 : t.oy) - h / 2; - ox += dx - (dx * a + dy * b); - oy += dy - (dx * c + dy * d); - } - - if (!clip) { - m += ", sizingMethod='auto expand')"; - } else { - dx = (w / 2); - dy = (h / 2); - //translate to ensure that transformations occur around the correct origin (default is center). - m += ", Dx=" + (dx - (dx * a + dy * b) + ox) + ", Dy=" + (dy - (dx * c + dy * d) + oy) + ")"; - } - if (filters.indexOf("DXImageTransform.Microsoft.Matrix(") !== -1) { - style.filter = filters.replace(_ieSetMatrixExp, m); - } else { - style.filter = m + " " + filters; //we must always put the transform/matrix FIRST (before alpha(opacity=xx)) to avoid an IE bug that slices part of the object when rotation is applied with alpha. - } - - //at the end or beginning of the tween, if the matrix is normal (1, 0, 0, 1) and opacity is 100 (or doesn't exist), remove the filter to improve browser performance. - if (v === 0 || v === 1) if (a === 1) if (b === 0) if (c === 0) if (d === 1) if (!clip || m.indexOf("Dx=0, Dy=0") !== -1) if (!_opacityExp.test(filters) || parseFloat(RegExp.$1) === 100) if (filters.indexOf("gradient(" && filters.indexOf("Alpha")) === -1) { - style.removeAttribute("filter"); - } - - //we must set the margins AFTER applying the filter in order to avoid some bugs in IE8 that could (in rare scenarios) cause them to be ignored intermittently (vibration). - if (!clip) { - var mult = (_ieVers < 8) ? 1 : -1, //in Internet Explorer 7 and before, the box model is broken, causing the browser to treat the width/height of the actual rotated filtered image as the width/height of the box itself, but Microsoft corrected that in IE8. We must use a negative offset in IE8 on the right/bottom - marg, prop, dif; - dx = t.ieOffsetX || 0; - dy = t.ieOffsetY || 0; - t.ieOffsetX = Math.round((w - ((a < 0 ? -a : a) * w + (b < 0 ? -b : b) * h)) / 2 + ox); - t.ieOffsetY = Math.round((h - ((d < 0 ? -d : d) * h + (c < 0 ? -c : c) * w)) / 2 + oy); - for (i = 0; i < 4; i++) { - prop = _margins[i]; - marg = cs[prop]; - //we need to get the current margin in case it is being tweened separately (we want to respect that tween's changes) - val = (marg.indexOf("px") !== -1) ? parseFloat(marg) : _convertToPixels(this.t, prop, parseFloat(marg), marg.replace(_suffixExp, "")) || 0; - if (val !== t[prop]) { - dif = (i < 2) ? -t.ieOffsetX : -t.ieOffsetY; //if another tween is controlling a margin, we cannot only apply the difference in the ieOffsets, so we essentially zero-out the dx and dy here in that case. We record the margin(s) later so that we can keep comparing them, making this code very flexible. - } else { - dif = (i < 2) ? dx - t.ieOffsetX : dy - t.ieOffsetY; - } - style[prop] = (t[prop] = Math.round( val - dif * ((i === 0 || i === 2) ? 1 : mult) )) + "px"; - } - } - }, - - _set3DTransformRatio = _internals.set3DTransformRatio = function(v) { - var t = this.data, //refers to the element's _gsTransform object - style = this.t.style, - angle = t.rotation * _DEG2RAD, - sx = t.scaleX, - sy = t.scaleY, - sz = t.scaleZ, - perspective = t.perspective, - a11, a12, a13, a14, a21, a22, a23, a24, a31, a32, a33, a34, a41, a42, a43, - zOrigin, rnd, cos, sin, t1, t2, t3, t4; - if (v === 1 || v === 0) if (t.force3D === "auto") if (!t.rotationY && !t.rotationX && sz === 1 && !perspective && !t.z) { //on the final render (which could be 0 for a from tween), if there are no 3D aspects, render in 2D to free up memory and improve performance especially on mobile devices - _set2DTransformRatio.call(this, v); - return; - } - if (_isFirefox) { - var n = 0.0001; - if (sx < n && sx > -n) { //Firefox has a bug (at least in v25) that causes it to render the transparent part of 32-bit PNG images as black when displayed inside an iframe and the 3D scale is very small and doesn't change sufficiently enough between renders (like if you use a Power4.easeInOut to scale from 0 to 1 where the beginning values only change a tiny amount to begin the tween before accelerating). In this case, we force the scale to be 0.00002 instead which is visually the same but works around the Firefox issue. - sx = sz = 0.00002; - } - if (sy < n && sy > -n) { - sy = sz = 0.00002; - } - if (perspective && !t.z && !t.rotationX && !t.rotationY) { //Firefox has a bug that causes elements to have an odd super-thin, broken/dotted black border on elements that have a perspective set but aren't utilizing 3D space (no rotationX, rotationY, or z). - perspective = 0; - } - } - if (angle || t.skewX) { - cos = Math.cos(angle); - sin = Math.sin(angle); - a11 = cos; - a21 = sin; - if (t.skewX) { - angle -= t.skewX * _DEG2RAD; - cos = Math.cos(angle); - sin = Math.sin(angle); - if (t.skewType === "simple") { //by default, we compensate skewing on the other axis to make it look more natural, but you can set the skewType to "simple" to use the uncompensated skewing that CSS does - t1 = Math.tan(t.skewX * _DEG2RAD); - t1 = Math.sqrt(1 + t1 * t1); - cos *= t1; - sin *= t1; - } - } - a12 = -sin; - a22 = cos; - - } else if (!t.rotationY && !t.rotationX && sz === 1 && !perspective) { //if we're only translating and/or 2D scaling, this is faster... - style[_transformProp] = "translate3d(" + t.x + "px," + t.y + "px," + t.z +"px)" + ((sx !== 1 || sy !== 1) ? " scale(" + sx + "," + sy + ")" : ""); - return; - } else { - a11 = a22 = 1; - a12 = a21 = 0; - } - a33 = 1; - a13 = a14 = a23 = a24 = a31 = a32 = a34 = a41 = a42 = 0; - a43 = (perspective) ? -1 / perspective : 0; - zOrigin = t.zOrigin; - rnd = 100000; - angle = t.rotationY * _DEG2RAD; - if (angle) { - cos = Math.cos(angle); - sin = Math.sin(angle); - a31 = a33*-sin; - a41 = a43*-sin; - a13 = a11*sin; - a23 = a21*sin; - a33 *= cos; - a43 *= cos; - a11 *= cos; - a21 *= cos; - } - angle = t.rotationX * _DEG2RAD; - if (angle) { - cos = Math.cos(angle); - sin = Math.sin(angle); - t1 = a12*cos+a13*sin; - t2 = a22*cos+a23*sin; - t3 = a32*cos+a33*sin; - t4 = a42*cos+a43*sin; - a13 = a12*-sin+a13*cos; - a23 = a22*-sin+a23*cos; - a33 = a32*-sin+a33*cos; - a43 = a42*-sin+a43*cos; - a12 = t1; - a22 = t2; - a32 = t3; - a42 = t4; - } - if (sz !== 1) { - a13*=sz; - a23*=sz; - a33*=sz; - a43*=sz; - } - if (sy !== 1) { - a12*=sy; - a22*=sy; - a32*=sy; - a42*=sy; - } - if (sx !== 1) { - a11*=sx; - a21*=sx; - a31*=sx; - a41*=sx; - } - if (zOrigin) { - a34 -= zOrigin; - a14 = a13*a34; - a24 = a23*a34; - a34 = a33*a34+zOrigin; - } - //we round the x, y, and z slightly differently to allow even larger values. - a14 = (t1 = (a14 += t.x) - (a14 |= 0)) ? ((t1 * rnd + (t1 < 0 ? -0.5 : 0.5)) | 0) / rnd + a14 : a14; - a24 = (t1 = (a24 += t.y) - (a24 |= 0)) ? ((t1 * rnd + (t1 < 0 ? -0.5 : 0.5)) | 0) / rnd + a24 : a24; - a34 = (t1 = (a34 += t.z) - (a34 |= 0)) ? ((t1 * rnd + (t1 < 0 ? -0.5 : 0.5)) | 0) / rnd + a34 : a34; - style[_transformProp] = "matrix3d(" + [ (((a11 * rnd) | 0) / rnd), (((a21 * rnd) | 0) / rnd), (((a31 * rnd) | 0) / rnd), (((a41 * rnd) | 0) / rnd), (((a12 * rnd) | 0) / rnd), (((a22 * rnd) | 0) / rnd), (((a32 * rnd) | 0) / rnd), (((a42 * rnd) | 0) / rnd), (((a13 * rnd) | 0) / rnd), (((a23 * rnd) | 0) / rnd), (((a33 * rnd) | 0) / rnd), (((a43 * rnd) | 0) / rnd), a14, a24, a34, (perspective ? (1 + (-a34 / perspective)) : 1) ].join(",") + ")"; - }, - - _set2DTransformRatio = _internals.set2DTransformRatio = function(v) { - var t = this.data, //refers to the element's _gsTransform object - targ = this.t, - style = targ.style, - ang, skew, rnd, sx, sy; - if (t.rotationX || t.rotationY || t.z || t.force3D === true || (t.force3D === "auto" && v !== 1 && v !== 0)) { //if a 3D tween begins while a 2D one is running, we need to kick the rendering over to the 3D method. For example, imagine a yoyo-ing, infinitely repeating scale tween running, and then the object gets rotated in 3D space with a different tween. - this.setRatio = _set3DTransformRatio; - _set3DTransformRatio.call(this, v); - return; - } - if (!t.rotation && !t.skewX) { - style[_transformProp] = "matrix(" + t.scaleX + ",0,0," + t.scaleY + "," + t.x + "," + t.y + ")"; - } else { - ang = t.rotation * _DEG2RAD; - skew = ang - t.skewX * _DEG2RAD; - rnd = 100000; - sx = t.scaleX * rnd; - sy = t.scaleY * rnd; - //some browsers have a hard time with very small values like 2.4492935982947064e-16 (notice the "e-" towards the end) and would render the object slightly off. So we round to 5 decimal places. - style[_transformProp] = "matrix(" + (((Math.cos(ang) * sx) | 0) / rnd) + "," + (((Math.sin(ang) * sx) | 0) / rnd) + "," + (((Math.sin(skew) * -sy) | 0) / rnd) + "," + (((Math.cos(skew) * sy) | 0) / rnd) + "," + t.x + "," + t.y + ")"; - } - }; - - _registerComplexSpecialProp("transform,scale,scaleX,scaleY,scaleZ,x,y,z,rotation,rotationX,rotationY,rotationZ,skewX,skewY,shortRotation,shortRotationX,shortRotationY,shortRotationZ,transformOrigin,transformPerspective,directionalRotation,parseTransform,force3D,skewType", {parser:function(t, e, p, cssp, pt, plugin, vars) { - if (cssp._transform) { return pt; } //only need to parse the transform once, and only if the browser supports it. - var m1 = cssp._transform = _getTransform(t, _cs, true, vars.parseTransform), - style = t.style, - min = 0.000001, - i = _transformProps.length, - v = vars, - endRotations = {}, - m2, skewY, copy, orig, has3D, hasChange, dr; - if (typeof(v.transform) === "string" && _transformProp) { //for values like transform:"rotate(60deg) scale(0.5, 0.8)" - copy = _tempDiv.style; //don't use the original target because it might be SVG in which case some browsers don't report computed style correctly. - copy[_transformProp] = v.transform; - copy.display = "block"; //if display is "none", the browser often refuses to report the transform properties correctly. - copy.position = "absolute"; - _doc.body.appendChild(_tempDiv); - m2 = _getTransform(_tempDiv, null, false); - _doc.body.removeChild(_tempDiv); - } else if (typeof(v) === "object") { //for values like scaleX, scaleY, rotation, x, y, skewX, and skewY or transform:{...} (object) - m2 = {scaleX:_parseVal((v.scaleX != null) ? v.scaleX : v.scale, m1.scaleX), - scaleY:_parseVal((v.scaleY != null) ? v.scaleY : v.scale, m1.scaleY), - scaleZ:_parseVal(v.scaleZ, m1.scaleZ), - x:_parseVal(v.x, m1.x), - y:_parseVal(v.y, m1.y), - z:_parseVal(v.z, m1.z), - perspective:_parseVal(v.transformPerspective, m1.perspective)}; - dr = v.directionalRotation; - if (dr != null) { - if (typeof(dr) === "object") { - for (copy in dr) { - v[copy] = dr[copy]; - } - } else { - v.rotation = dr; - } - } - m2.rotation = _parseAngle(("rotation" in v) ? v.rotation : ("shortRotation" in v) ? v.shortRotation + "_short" : ("rotationZ" in v) ? v.rotationZ : m1.rotation, m1.rotation, "rotation", endRotations); - if (_supports3D) { - m2.rotationX = _parseAngle(("rotationX" in v) ? v.rotationX : ("shortRotationX" in v) ? v.shortRotationX + "_short" : m1.rotationX || 0, m1.rotationX, "rotationX", endRotations); - m2.rotationY = _parseAngle(("rotationY" in v) ? v.rotationY : ("shortRotationY" in v) ? v.shortRotationY + "_short" : m1.rotationY || 0, m1.rotationY, "rotationY", endRotations); - } - m2.skewX = (v.skewX == null) ? m1.skewX : _parseAngle(v.skewX, m1.skewX); - - //note: for performance reasons, we combine all skewing into the skewX and rotation values, ignoring skewY but we must still record it so that we can discern how much of the overall skew is attributed to skewX vs. skewY. Otherwise, if the skewY would always act relative (tween skewY to 10deg, for example, multiple times and if we always combine things into skewX, we can't remember that skewY was 10 from last time). Remember, a skewY of 10 degrees looks the same as a rotation of 10 degrees plus a skewX of -10 degrees. - m2.skewY = (v.skewY == null) ? m1.skewY : _parseAngle(v.skewY, m1.skewY); - if ((skewY = m2.skewY - m1.skewY)) { - m2.skewX += skewY; - m2.rotation += skewY; - } - } - - if (_supports3D && v.force3D != null) { - m1.force3D = v.force3D; - hasChange = true; - } - - m1.skewType = v.skewType || m1.skewType || CSSPlugin.defaultSkewType; - - has3D = (m1.force3D || m1.z || m1.rotationX || m1.rotationY || m2.z || m2.rotationX || m2.rotationY || m2.perspective); - if (!has3D && v.scale != null) { - m2.scaleZ = 1; //no need to tween scaleZ. - } - - while (--i > -1) { - p = _transformProps[i]; - orig = m2[p] - m1[p]; - if (orig > min || orig < -min || _forcePT[p] != null) { - hasChange = true; - pt = new CSSPropTween(m1, p, m1[p], orig, pt); - if (p in endRotations) { - pt.e = endRotations[p]; //directional rotations typically have compensated values during the tween, but we need to make sure they end at exactly what the user requested - } - pt.xs0 = 0; //ensures the value stays numeric in setRatio() - pt.plugin = plugin; - cssp._overwriteProps.push(pt.n); - } - } - - orig = v.transformOrigin; - if (orig || (_supports3D && has3D && m1.zOrigin)) { //if anything 3D is happening and there's a transformOrigin with a z component that's non-zero, we must ensure that the transformOrigin's z-component is set to 0 so that we can manually do those calculations to get around Safari bugs. Even if the user didn't specifically define a "transformOrigin" in this particular tween (maybe they did it via css directly). - if (_transformProp) { - hasChange = true; - p = _transformOriginProp; - orig = (orig || _getStyle(t, p, _cs, false, "50% 50%")) + ""; //cast as string to avoid errors - pt = new CSSPropTween(style, p, 0, 0, pt, -1, "transformOrigin"); - pt.b = style[p]; - pt.plugin = plugin; - if (_supports3D) { - copy = m1.zOrigin; - orig = orig.split(" "); - m1.zOrigin = ((orig.length > 2 && !(copy !== 0 && orig[2] === "0px")) ? parseFloat(orig[2]) : copy) || 0; //Safari doesn't handle the z part of transformOrigin correctly, so we'll manually handle it in the _set3DTransformRatio() method. - pt.xs0 = pt.e = orig[0] + " " + (orig[1] || "50%") + " 0px"; //we must define a z value of 0px specifically otherwise iOS 5 Safari will stick with the old one (if one was defined)! - pt = new CSSPropTween(m1, "zOrigin", 0, 0, pt, -1, pt.n); //we must create a CSSPropTween for the _gsTransform.zOrigin so that it gets reset properly at the beginning if the tween runs backward (as opposed to just setting m1.zOrigin here) - pt.b = copy; - pt.xs0 = pt.e = m1.zOrigin; - } else { - pt.xs0 = pt.e = orig; - } - - //for older versions of IE (6-8), we need to manually calculate things inside the setRatio() function. We record origin x and y (ox and oy) and whether or not the values are percentages (oxp and oyp). - } else { - _parsePosition(orig + "", m1); - } - } - - if (hasChange) { - cssp._transformType = (has3D || this._transformType === 3) ? 3 : 2; //quicker than calling cssp._enableTransforms(); - } - return pt; - }, prefix:true}); - - _registerComplexSpecialProp("boxShadow", {defaultValue:"0px 0px 0px 0px #999", prefix:true, color:true, multi:true, keyword:"inset"}); - - _registerComplexSpecialProp("borderRadius", {defaultValue:"0px", parser:function(t, e, p, cssp, pt, plugin) { - e = this.format(e); - var props = ["borderTopLeftRadius","borderTopRightRadius","borderBottomRightRadius","borderBottomLeftRadius"], - style = t.style, - ea1, i, es2, bs2, bs, es, bn, en, w, h, esfx, bsfx, rel, hn, vn, em; - w = parseFloat(t.offsetWidth); - h = parseFloat(t.offsetHeight); - ea1 = e.split(" "); - for (i = 0; i < props.length; i++) { //if we're dealing with percentages, we must convert things separately for the horizontal and vertical axis! - if (this.p.indexOf("border")) { //older browsers used a prefix - props[i] = _checkPropPrefix(props[i]); - } - bs = bs2 = _getStyle(t, props[i], _cs, false, "0px"); - if (bs.indexOf(" ") !== -1) { - bs2 = bs.split(" "); - bs = bs2[0]; - bs2 = bs2[1]; - } - es = es2 = ea1[i]; - bn = parseFloat(bs); - bsfx = bs.substr((bn + "").length); - rel = (es.charAt(1) === "="); - if (rel) { - en = parseInt(es.charAt(0)+"1", 10); - es = es.substr(2); - en *= parseFloat(es); - esfx = es.substr((en + "").length - (en < 0 ? 1 : 0)) || ""; - } else { - en = parseFloat(es); - esfx = es.substr((en + "").length); - } - if (esfx === "") { - esfx = _suffixMap[p] || bsfx; - } - if (esfx !== bsfx) { - hn = _convertToPixels(t, "borderLeft", bn, bsfx); //horizontal number (we use a bogus "borderLeft" property just because the _convertToPixels() method searches for the keywords "Left", "Right", "Top", and "Bottom" to determine of it's a horizontal or vertical property, and we need "border" in the name so that it knows it should measure relative to the element itself, not its parent. - vn = _convertToPixels(t, "borderTop", bn, bsfx); //vertical number - if (esfx === "%") { - bs = (hn / w * 100) + "%"; - bs2 = (vn / h * 100) + "%"; - } else if (esfx === "em") { - em = _convertToPixels(t, "borderLeft", 1, "em"); - bs = (hn / em) + "em"; - bs2 = (vn / em) + "em"; - } else { - bs = hn + "px"; - bs2 = vn + "px"; - } - if (rel) { - es = (parseFloat(bs) + en) + esfx; - es2 = (parseFloat(bs2) + en) + esfx; - } - } - pt = _parseComplex(style, props[i], bs + " " + bs2, es + " " + es2, false, "0px", pt); - } - return pt; - }, prefix:true, formatter:_getFormatter("0px 0px 0px 0px", false, true)}); - _registerComplexSpecialProp("backgroundPosition", {defaultValue:"0 0", parser:function(t, e, p, cssp, pt, plugin) { - var bp = "background-position", - cs = (_cs || _getComputedStyle(t, null)), - bs = this.format( ((cs) ? _ieVers ? cs.getPropertyValue(bp + "-x") + " " + cs.getPropertyValue(bp + "-y") : cs.getPropertyValue(bp) : t.currentStyle.backgroundPositionX + " " + t.currentStyle.backgroundPositionY) || "0 0"), //Internet Explorer doesn't report background-position correctly - we must query background-position-x and background-position-y and combine them (even in IE10). Before IE9, we must do the same with the currentStyle object and use camelCase - es = this.format(e), - ba, ea, i, pct, overlap, src; - if ((bs.indexOf("%") !== -1) !== (es.indexOf("%") !== -1)) { - src = _getStyle(t, "backgroundImage").replace(_urlExp, ""); - if (src && src !== "none") { - ba = bs.split(" "); - ea = es.split(" "); - _tempImg.setAttribute("src", src); //set the temp <img>'s src to the background-image so that we can measure its width/height - i = 2; - while (--i > -1) { - bs = ba[i]; - pct = (bs.indexOf("%") !== -1); - if (pct !== (ea[i].indexOf("%") !== -1)) { - overlap = (i === 0) ? t.offsetWidth - _tempImg.width : t.offsetHeight - _tempImg.height; - ba[i] = pct ? (parseFloat(bs) / 100 * overlap) + "px" : (parseFloat(bs) / overlap * 100) + "%"; - } - } - bs = ba.join(" "); - } - } - return this.parseComplex(t.style, bs, es, pt, plugin); - }, formatter:_parsePosition}); - _registerComplexSpecialProp("backgroundSize", {defaultValue:"0 0", formatter:_parsePosition}); - _registerComplexSpecialProp("perspective", {defaultValue:"0px", prefix:true}); - _registerComplexSpecialProp("perspectiveOrigin", {defaultValue:"50% 50%", prefix:true}); - _registerComplexSpecialProp("transformStyle", {prefix:true}); - _registerComplexSpecialProp("backfaceVisibility", {prefix:true}); - _registerComplexSpecialProp("userSelect", {prefix:true}); - _registerComplexSpecialProp("margin", {parser:_getEdgeParser("marginTop,marginRight,marginBottom,marginLeft")}); - _registerComplexSpecialProp("padding", {parser:_getEdgeParser("paddingTop,paddingRight,paddingBottom,paddingLeft")}); - _registerComplexSpecialProp("clip", {defaultValue:"rect(0px,0px,0px,0px)", parser:function(t, e, p, cssp, pt, plugin){ - var b, cs, delim; - if (_ieVers < 9) { //IE8 and earlier don't report a "clip" value in the currentStyle - instead, the values are split apart into clipTop, clipRight, clipBottom, and clipLeft. Also, in IE7 and earlier, the values inside rect() are space-delimited, not comma-delimited. - cs = t.currentStyle; - delim = _ieVers < 8 ? " " : ","; - b = "rect(" + cs.clipTop + delim + cs.clipRight + delim + cs.clipBottom + delim + cs.clipLeft + ")"; - e = this.format(e).split(",").join(delim); - } else { - b = this.format(_getStyle(t, this.p, _cs, false, this.dflt)); - e = this.format(e); - } - return this.parseComplex(t.style, b, e, pt, plugin); - }}); - _registerComplexSpecialProp("textShadow", {defaultValue:"0px 0px 0px #999", color:true, multi:true}); - _registerComplexSpecialProp("autoRound,strictUnits", {parser:function(t, e, p, cssp, pt) {return pt;}}); //just so that we can ignore these properties (not tween them) - _registerComplexSpecialProp("border", {defaultValue:"0px solid #000", parser:function(t, e, p, cssp, pt, plugin) { - return this.parseComplex(t.style, this.format(_getStyle(t, "borderTopWidth", _cs, false, "0px") + " " + _getStyle(t, "borderTopStyle", _cs, false, "solid") + " " + _getStyle(t, "borderTopColor", _cs, false, "#000")), this.format(e), pt, plugin); - }, color:true, formatter:function(v) { - var a = v.split(" "); - return a[0] + " " + (a[1] || "solid") + " " + (v.match(_colorExp) || ["#000"])[0]; - }}); - _registerComplexSpecialProp("borderWidth", {parser:_getEdgeParser("borderTopWidth,borderRightWidth,borderBottomWidth,borderLeftWidth")}); //Firefox doesn't pick up on borderWidth set in style sheets (only inline). - _registerComplexSpecialProp("float,cssFloat,styleFloat", {parser:function(t, e, p, cssp, pt, plugin) { - var s = t.style, - prop = ("cssFloat" in s) ? "cssFloat" : "styleFloat"; - return new CSSPropTween(s, prop, 0, 0, pt, -1, p, false, 0, s[prop], e); - }}); - - //opacity-related - var _setIEOpacityRatio = function(v) { - var t = this.t, //refers to the element's style property - filters = t.filter || _getStyle(this.data, "filter"), - val = (this.s + this.c * v) | 0, - skip; - if (val === 100) { //for older versions of IE that need to use a filter to apply opacity, we should remove the filter if opacity hits 1 in order to improve performance, but make sure there isn't a transform (matrix) or gradient in the filters. - if (filters.indexOf("atrix(") === -1 && filters.indexOf("radient(") === -1 && filters.indexOf("oader(") === -1) { - t.removeAttribute("filter"); - skip = (!_getStyle(this.data, "filter")); //if a class is applied that has an alpha filter, it will take effect (we don't want that), so re-apply our alpha filter in that case. We must first remove it and then check. - } else { - t.filter = filters.replace(_alphaFilterExp, ""); - skip = true; - } - } - if (!skip) { - if (this.xn1) { - t.filter = filters = filters || ("alpha(opacity=" + val + ")"); //works around bug in IE7/8 that prevents changes to "visibility" from being applied properly if the filter is changed to a different alpha on the same frame. - } - if (filters.indexOf("pacity") === -1) { //only used if browser doesn't support the standard opacity style property (IE 7 and 8). We omit the "O" to avoid case-sensitivity issues - if (val !== 0 || !this.xn1) { //bugs in IE7/8 won't render the filter properly if opacity is ADDED on the same frame/render as "visibility" changes (this.xn1 is 1 if this tween is an "autoAlpha" tween) - t.filter = filters + " alpha(opacity=" + val + ")"; //we round the value because otherwise, bugs in IE7/8 can prevent "visibility" changes from being applied properly. - } - } else { - t.filter = filters.replace(_opacityExp, "opacity=" + val); - } - } - }; - _registerComplexSpecialProp("opacity,alpha,autoAlpha", {defaultValue:"1", parser:function(t, e, p, cssp, pt, plugin) { - var b = parseFloat(_getStyle(t, "opacity", _cs, false, "1")), - style = t.style, - isAutoAlpha = (p === "autoAlpha"); - if (typeof(e) === "string" && e.charAt(1) === "=") { - e = ((e.charAt(0) === "-") ? -1 : 1) * parseFloat(e.substr(2)) + b; - } - if (isAutoAlpha && b === 1 && _getStyle(t, "visibility", _cs) === "hidden" && e !== 0) { //if visibility is initially set to "hidden", we should interpret that as intent to make opacity 0 (a convenience) - b = 0; - } - if (_supportsOpacity) { - pt = new CSSPropTween(style, "opacity", b, e - b, pt); - } else { - pt = new CSSPropTween(style, "opacity", b * 100, (e - b) * 100, pt); - pt.xn1 = isAutoAlpha ? 1 : 0; //we need to record whether or not this is an autoAlpha so that in the setRatio(), we know to duplicate the setting of the alpha in order to work around a bug in IE7 and IE8 that prevents changes to "visibility" from taking effect if the filter is changed to a different alpha(opacity) at the same time. Setting it to the SAME value first, then the new value works around the IE7/8 bug. - style.zoom = 1; //helps correct an IE issue. - pt.type = 2; - pt.b = "alpha(opacity=" + pt.s + ")"; - pt.e = "alpha(opacity=" + (pt.s + pt.c) + ")"; - pt.data = t; - pt.plugin = plugin; - pt.setRatio = _setIEOpacityRatio; - } - if (isAutoAlpha) { //we have to create the "visibility" PropTween after the opacity one in the linked list so that they run in the order that works properly in IE8 and earlier - pt = new CSSPropTween(style, "visibility", 0, 0, pt, -1, null, false, 0, ((b !== 0) ? "inherit" : "hidden"), ((e === 0) ? "hidden" : "inherit")); - pt.xs0 = "inherit"; - cssp._overwriteProps.push(pt.n); - cssp._overwriteProps.push(p); - } - return pt; - }}); - - - var _removeProp = function(s, p) { - if (p) { - if (s.removeProperty) { - if (p.substr(0,2) === "ms") { //Microsoft browsers don't conform to the standard of capping the first prefix character, so we adjust so that when we prefix the caps with a dash, it's correct (otherwise it'd be "ms-transform" instead of "-ms-transform" for IE9, for example) - p = "M" + p.substr(1); - } - s.removeProperty(p.replace(_capsExp, "-$1").toLowerCase()); - } else { //note: old versions of IE use "removeAttribute()" instead of "removeProperty()" - s.removeAttribute(p); - } - } - }, - _setClassNameRatio = function(v) { - this.t._gsClassPT = this; - if (v === 1 || v === 0) { - this.t.setAttribute("class", (v === 0) ? this.b : this.e); - var mpt = this.data, //first MiniPropTween - s = this.t.style; - while (mpt) { - if (!mpt.v) { - _removeProp(s, mpt.p); - } else { - s[mpt.p] = mpt.v; - } - mpt = mpt._next; - } - if (v === 1 && this.t._gsClassPT === this) { - this.t._gsClassPT = null; - } - } else if (this.t.getAttribute("class") !== this.e) { - this.t.setAttribute("class", this.e); - } - }; - _registerComplexSpecialProp("className", {parser:function(t, e, p, cssp, pt, plugin, vars) { - var b = t.getAttribute("class") || "", //don't use t.className because it doesn't work consistently on SVG elements; getAttribute("class") and setAttribute("class", value") is more reliable. - cssText = t.style.cssText, - difData, bs, cnpt, cnptLookup, mpt; - pt = cssp._classNamePT = new CSSPropTween(t, p, 0, 0, pt, 2); - pt.setRatio = _setClassNameRatio; - pt.pr = -11; - _hasPriority = true; - pt.b = b; - bs = _getAllStyles(t, _cs); - //if there's a className tween already operating on the target, force it to its end so that the necessary inline styles are removed and the class name is applied before we determine the end state (we don't want inline styles interfering that were there just for class-specific values) - cnpt = t._gsClassPT; - if (cnpt) { - cnptLookup = {}; - mpt = cnpt.data; //first MiniPropTween which stores the inline styles - we need to force these so that the inline styles don't contaminate things. Otherwise, there's a small chance that a tween could start and the inline values match the destination values and they never get cleaned. - while (mpt) { - cnptLookup[mpt.p] = 1; - mpt = mpt._next; - } - cnpt.setRatio(1); - } - t._gsClassPT = pt; - pt.e = (e.charAt(1) !== "=") ? e : b.replace(new RegExp("\\s*\\b" + e.substr(2) + "\\b"), "") + ((e.charAt(0) === "+") ? " " + e.substr(2) : ""); - if (cssp._tween._duration) { //if it's a zero-duration tween, there's no need to tween anything or parse the data. In fact, if we switch classes temporarily (which we must do for proper parsing) and the class has a transition applied, it could cause a quick flash to the end state and back again initially in some browsers. - t.setAttribute("class", pt.e); - difData = _cssDif(t, bs, _getAllStyles(t), vars, cnptLookup); - t.setAttribute("class", b); - pt.data = difData.firstMPT; - t.style.cssText = cssText; //we recorded cssText before we swapped classes and ran _getAllStyles() because in cases when a className tween is overwritten, we remove all the related tweening properties from that class change (otherwise class-specific stuff can't override properties we've directly set on the target's style object due to specificity). - pt = pt.xfirst = cssp.parse(t, difData.difs, pt, plugin); //we record the CSSPropTween as the xfirst so that we can handle overwriting propertly (if "className" gets overwritten, we must kill all the properties associated with the className part of the tween, so we can loop through from xfirst to the pt itself) - } - return pt; - }}); - - - var _setClearPropsRatio = function(v) { - if (v === 1 || v === 0) if (this.data._totalTime === this.data._totalDuration && this.data.data !== "isFromStart") { //this.data refers to the tween. Only clear at the END of the tween (remember, from() tweens make the ratio go from 1 to 0, so we can't just check that and if the tween is the zero-duration one that's created internally to render the starting values in a from() tween, ignore that because otherwise, for example, from(...{height:100, clearProps:"height", delay:1}) would wipe the height at the beginning of the tween and after 1 second, it'd kick back in). - var s = this.t.style, - transformParse = _specialProps.transform.parse, - a, p, i, clearTransform; - if (this.e === "all") { - s.cssText = ""; - clearTransform = true; - } else { - a = this.e.split(","); - i = a.length; - while (--i > -1) { - p = a[i]; - if (_specialProps[p]) { - if (_specialProps[p].parse === transformParse) { - clearTransform = true; - } else { - p = (p === "transformOrigin") ? _transformOriginProp : _specialProps[p].p; //ensures that special properties use the proper browser-specific property name, like "scaleX" might be "-webkit-transform" or "boxShadow" might be "-moz-box-shadow" - } - } - _removeProp(s, p); - } - } - if (clearTransform) { - _removeProp(s, _transformProp); - if (this.t._gsTransform) { - delete this.t._gsTransform; - } - } - - } - }; - _registerComplexSpecialProp("clearProps", {parser:function(t, e, p, cssp, pt) { - pt = new CSSPropTween(t, p, 0, 0, pt, 2); - pt.setRatio = _setClearPropsRatio; - pt.e = e; - pt.pr = -10; - pt.data = cssp._tween; - _hasPriority = true; - return pt; - }}); - - p = "bezier,throwProps,physicsProps,physics2D".split(","); - i = p.length; - while (i--) { - _registerPluginProp(p[i]); - } - - - - - - - - - p = CSSPlugin.prototype; - p._firstPT = null; - - //gets called when the tween renders for the first time. This kicks everything off, recording start/end values, etc. - p._onInitTween = function(target, vars, tween) { - if (!target.nodeType) { //css is only for dom elements - return false; - } - this._target = target; - this._tween = tween; - this._vars = vars; - _autoRound = vars.autoRound; - _hasPriority = false; - _suffixMap = vars.suffixMap || CSSPlugin.suffixMap; - _cs = _getComputedStyle(target, ""); - _overwriteProps = this._overwriteProps; - var style = target.style, - v, pt, pt2, first, last, next, zIndex, tpt, threeD; - if (_reqSafariFix) if (style.zIndex === "") { - v = _getStyle(target, "zIndex", _cs); - if (v === "auto" || v === "") { - //corrects a bug in [non-Android] Safari that prevents it from repainting elements in their new positions if they don't have a zIndex set. We also can't just apply this inside _parseTransform() because anything that's moved in any way (like using "left" or "top" instead of transforms like "x" and "y") can be affected, so it is best to ensure that anything that's tweening has a z-index. Setting "WebkitPerspective" to a non-zero value worked too except that on iOS Safari things would flicker randomly. Plus zIndex is less memory-intensive. - this._addLazySet(style, "zIndex", 0); - } - } - - if (typeof(vars) === "string") { - first = style.cssText; - v = _getAllStyles(target, _cs); - style.cssText = first + ";" + vars; - v = _cssDif(target, v, _getAllStyles(target)).difs; - if (!_supportsOpacity && _opacityValExp.test(vars)) { - v.opacity = parseFloat( RegExp.$1 ); - } - vars = v; - style.cssText = first; - } - this._firstPT = pt = this.parse(target, vars, null); - - if (this._transformType) { - threeD = (this._transformType === 3); - if (!_transformProp) { - style.zoom = 1; //helps correct an IE issue. - } else if (_isSafari) { - _reqSafariFix = true; - //if zIndex isn't set, iOS Safari doesn't repaint things correctly sometimes (seemingly at random). - if (style.zIndex === "") { - zIndex = _getStyle(target, "zIndex", _cs); - if (zIndex === "auto" || zIndex === "") { - this._addLazySet(style, "zIndex", 0); - } - } - //Setting WebkitBackfaceVisibility corrects 3 bugs: - // 1) [non-Android] Safari skips rendering changes to "top" and "left" that are made on the same frame/render as a transform update. - // 2) iOS Safari sometimes neglects to repaint elements in their new positions. Setting "WebkitPerspective" to a non-zero value worked too except that on iOS Safari things would flicker randomly. - // 3) Safari sometimes displayed odd artifacts when tweening the transform (or WebkitTransform) property, like ghosts of the edges of the element remained. Definitely a browser bug. - //Note: we allow the user to override the auto-setting by defining WebkitBackfaceVisibility in the vars of the tween. - if (_isSafariLT6) { - this._addLazySet(style, "WebkitBackfaceVisibility", this._vars.WebkitBackfaceVisibility || (threeD ? "visible" : "hidden")); - } - } - pt2 = pt; - while (pt2 && pt2._next) { - pt2 = pt2._next; - } - tpt = new CSSPropTween(target, "transform", 0, 0, null, 2); - this._linkCSSP(tpt, null, pt2); - tpt.setRatio = (threeD && _supports3D) ? _set3DTransformRatio : _transformProp ? _set2DTransformRatio : _setIETransformRatio; - tpt.data = this._transform || _getTransform(target, _cs, true); - _overwriteProps.pop(); //we don't want to force the overwrite of all "transform" tweens of the target - we only care about individual transform properties like scaleX, rotation, etc. The CSSPropTween constructor automatically adds the property to _overwriteProps which is why we need to pop() here. - } - - if (_hasPriority) { - //reorders the linked list in order of pr (priority) - while (pt) { - next = pt._next; - pt2 = first; - while (pt2 && pt2.pr > pt.pr) { - pt2 = pt2._next; - } - if ((pt._prev = pt2 ? pt2._prev : last)) { - pt._prev._next = pt; - } else { - first = pt; - } - if ((pt._next = pt2)) { - pt2._prev = pt; - } else { - last = pt; - } - pt = next; - } - this._firstPT = first; - } - return true; - }; - - - p.parse = function(target, vars, pt, plugin) { - var style = target.style, - p, sp, bn, en, bs, es, bsfx, esfx, isStr, rel; - for (p in vars) { - es = vars[p]; //ending value string - sp = _specialProps[p]; //SpecialProp lookup. - if (sp) { - pt = sp.parse(target, es, p, this, pt, plugin, vars); - - } else { - bs = _getStyle(target, p, _cs) + ""; - isStr = (typeof(es) === "string"); - if (p === "color" || p === "fill" || p === "stroke" || p.indexOf("Color") !== -1 || (isStr && _rgbhslExp.test(es))) { //Opera uses background: to define color sometimes in addition to backgroundColor: - if (!isStr) { - es = _parseColor(es); - es = ((es.length > 3) ? "rgba(" : "rgb(") + es.join(",") + ")"; - } - pt = _parseComplex(style, p, bs, es, true, "transparent", pt, 0, plugin); - - } else if (isStr && (es.indexOf(" ") !== -1 || es.indexOf(",") !== -1)) { - pt = _parseComplex(style, p, bs, es, true, null, pt, 0, plugin); - - } else { - bn = parseFloat(bs); - bsfx = (bn || bn === 0) ? bs.substr((bn + "").length) : ""; //remember, bs could be non-numeric like "normal" for fontWeight, so we should default to a blank suffix in that case. - - if (bs === "" || bs === "auto") { - if (p === "width" || p === "height") { - bn = _getDimension(target, p, _cs); - bsfx = "px"; - } else if (p === "left" || p === "top") { - bn = _calculateOffset(target, p, _cs); - bsfx = "px"; - } else { - bn = (p !== "opacity") ? 0 : 1; - bsfx = ""; - } - } - - rel = (isStr && es.charAt(1) === "="); - if (rel) { - en = parseInt(es.charAt(0) + "1", 10); - es = es.substr(2); - en *= parseFloat(es); - esfx = es.replace(_suffixExp, ""); - } else { - en = parseFloat(es); - esfx = isStr ? es.substr((en + "").length) || "" : ""; - } - - if (esfx === "") { - esfx = (p in _suffixMap) ? _suffixMap[p] : bsfx; //populate the end suffix, prioritizing the map, then if none is found, use the beginning suffix. - } - - es = (en || en === 0) ? (rel ? en + bn : en) + esfx : vars[p]; //ensures that any += or -= prefixes are taken care of. Record the end value before normalizing the suffix because we always want to end the tween on exactly what they intended even if it doesn't match the beginning value's suffix. - - //if the beginning/ending suffixes don't match, normalize them... - if (bsfx !== esfx) if (esfx !== "") if (en || en === 0) if (bn) { //note: if the beginning value (bn) is 0, we don't need to convert units! - bn = _convertToPixels(target, p, bn, bsfx); - if (esfx === "%") { - bn /= _convertToPixels(target, p, 100, "%") / 100; - if (vars.strictUnits !== true) { //some browsers report only "px" values instead of allowing "%" with getComputedStyle(), so we assume that if we're tweening to a %, we should start there too unless strictUnits:true is defined. This approach is particularly useful for responsive designs that use from() tweens. - bs = bn + "%"; - } - - } else if (esfx === "em") { - bn /= _convertToPixels(target, p, 1, "em"); - - //otherwise convert to pixels. - } else if (esfx !== "px") { - en = _convertToPixels(target, p, en, esfx); - esfx = "px"; //we don't use bsfx after this, so we don't need to set it to px too. - } - if (rel) if (en || en === 0) { - es = (en + bn) + esfx; //the changes we made affect relative calculations, so adjust the end value here. - } - } - - if (rel) { - en += bn; - } - - if ((bn || bn === 0) && (en || en === 0)) { //faster than isNaN(). Also, previously we required en !== bn but that doesn't really gain much performance and it prevents _parseToProxy() from working properly if beginning and ending values match but need to get tweened by an external plugin anyway. For example, a bezier tween where the target starts at left:0 and has these points: [{left:50},{left:0}] wouldn't work properly because when parsing the last point, it'd match the first (current) one and a non-tweening CSSPropTween would be recorded when we actually need a normal tween (type:0) so that things get updated during the tween properly. - pt = new CSSPropTween(style, p, bn, en - bn, pt, 0, p, (_autoRound !== false && (esfx === "px" || p === "zIndex")), 0, bs, es); - pt.xs0 = esfx; - //DEBUG: _log("tween "+p+" from "+pt.b+" ("+bn+esfx+") to "+pt.e+" with suffix: "+pt.xs0); - } else if (style[p] === undefined || !es && (es + "" === "NaN" || es == null)) { - _log("invalid " + p + " tween value: " + vars[p]); - } else { - pt = new CSSPropTween(style, p, en || bn || 0, 0, pt, -1, p, false, 0, bs, es); - pt.xs0 = (es === "none" && (p === "display" || p.indexOf("Style") !== -1)) ? bs : es; //intermediate value should typically be set immediately (end value) except for "display" or things like borderTopStyle, borderBottomStyle, etc. which should use the beginning value during the tween. - //DEBUG: _log("non-tweening value "+p+": "+pt.xs0); - } - } - } - if (plugin) if (pt && !pt.plugin) { - pt.plugin = plugin; - } - } - return pt; - }; - - - //gets called every time the tween updates, passing the new ratio (typically a value between 0 and 1, but not always (for example, if an Elastic.easeOut is used, the value can jump above 1 mid-tween). It will always start and 0 and end at 1. - p.setRatio = function(v) { - var pt = this._firstPT, - min = 0.000001, - val, str, i; - - //at the end of the tween, we set the values to exactly what we received in order to make sure non-tweening values (like "position" or "float" or whatever) are set and so that if the beginning/ending suffixes (units) didn't match and we normalized to px, the value that the user passed in is used here. We check to see if the tween is at its beginning in case it's a from() tween in which case the ratio will actually go from 1 to 0 over the course of the tween (backwards). - if (v === 1 && (this._tween._time === this._tween._duration || this._tween._time === 0)) { - while (pt) { - if (pt.type !== 2) { - pt.t[pt.p] = pt.e; - } else { - pt.setRatio(v); - } - pt = pt._next; - } - - } else if (v || !(this._tween._time === this._tween._duration || this._tween._time === 0) || this._tween._rawPrevTime === -0.000001) { - while (pt) { - val = pt.c * v + pt.s; - if (pt.r) { - val = Math.round(val); - } else if (val < min) if (val > -min) { - val = 0; - } - if (!pt.type) { - pt.t[pt.p] = val + pt.xs0; - } else if (pt.type === 1) { //complex value (one that typically has multiple numbers inside a string, like "rect(5px,10px,20px,25px)" - i = pt.l; - if (i === 2) { - pt.t[pt.p] = pt.xs0 + val + pt.xs1 + pt.xn1 + pt.xs2; - } else if (i === 3) { - pt.t[pt.p] = pt.xs0 + val + pt.xs1 + pt.xn1 + pt.xs2 + pt.xn2 + pt.xs3; - } else if (i === 4) { - pt.t[pt.p] = pt.xs0 + val + pt.xs1 + pt.xn1 + pt.xs2 + pt.xn2 + pt.xs3 + pt.xn3 + pt.xs4; - } else if (i === 5) { - pt.t[pt.p] = pt.xs0 + val + pt.xs1 + pt.xn1 + pt.xs2 + pt.xn2 + pt.xs3 + pt.xn3 + pt.xs4 + pt.xn4 + pt.xs5; - } else { - str = pt.xs0 + val + pt.xs1; - for (i = 1; i < pt.l; i++) { - str += pt["xn"+i] + pt["xs"+(i+1)]; - } - pt.t[pt.p] = str; - } - - } else if (pt.type === -1) { //non-tweening value - pt.t[pt.p] = pt.xs0; - - } else if (pt.setRatio) { //custom setRatio() for things like SpecialProps, external plugins, etc. - pt.setRatio(v); - } - pt = pt._next; - } - - //if the tween is reversed all the way back to the beginning, we need to restore the original values which may have different units (like % instead of px or em or whatever). - } else { - while (pt) { - if (pt.type !== 2) { - pt.t[pt.p] = pt.b; - } else { - pt.setRatio(v); - } - pt = pt._next; - } - } - }; - - /** - * @private - * Forces rendering of the target's transforms (rotation, scale, etc.) whenever the CSSPlugin's setRatio() is called. - * Basically, this tells the CSSPlugin to create a CSSPropTween (type 2) after instantiation that runs last in the linked - * list and calls the appropriate (3D or 2D) rendering function. We separate this into its own method so that we can call - * it from other plugins like BezierPlugin if, for example, it needs to apply an autoRotation and this CSSPlugin - * doesn't have any transform-related properties of its own. You can call this method as many times as you - * want and it won't create duplicate CSSPropTweens. - * - * @param {boolean} threeD if true, it should apply 3D tweens (otherwise, just 2D ones are fine and typically faster) - */ - p._enableTransforms = function(threeD) { - this._transformType = (threeD || this._transformType === 3) ? 3 : 2; - this._transform = this._transform || _getTransform(this._target, _cs, true); //ensures that the element has a _gsTransform property with the appropriate values. - }; - - var lazySet = function(v) { - this.t[this.p] = this.e; - this.data._linkCSSP(this, this._next, null, true); //we purposefully keep this._next even though it'd make sense to null it, but this is a performance optimization, as this happens during the while (pt) {} loop in setRatio() at the bottom of which it sets pt = pt._next, so if we null it, the linked list will be broken in that loop. - }; - /** @private Gives us a way to set a value on the first render (and only the first render). **/ - p._addLazySet = function(t, p, v) { - var pt = this._firstPT = new CSSPropTween(t, p, 0, 0, this._firstPT, 2); - pt.e = v; - pt.setRatio = lazySet; - pt.data = this; - }; - - /** @private **/ - p._linkCSSP = function(pt, next, prev, remove) { - if (pt) { - if (next) { - next._prev = pt; - } - if (pt._next) { - pt._next._prev = pt._prev; - } - if (pt._prev) { - pt._prev._next = pt._next; - } else if (this._firstPT === pt) { - this._firstPT = pt._next; - remove = true; //just to prevent resetting this._firstPT 5 lines down in case pt._next is null. (optimized for speed) - } - if (prev) { - prev._next = pt; - } else if (!remove && this._firstPT === null) { - this._firstPT = pt; - } - pt._next = next; - pt._prev = prev; - } - return pt; - }; - - //we need to make sure that if alpha or autoAlpha is killed, opacity is too. And autoAlpha affects the "visibility" property. - p._kill = function(lookup) { - var copy = lookup, - pt, p, xfirst; - if (lookup.autoAlpha || lookup.alpha) { - copy = {}; - for (p in lookup) { //copy the lookup so that we're not changing the original which may be passed elsewhere. - copy[p] = lookup[p]; - } - copy.opacity = 1; - if (copy.autoAlpha) { - copy.visibility = 1; - } - } - if (lookup.className && (pt = this._classNamePT)) { //for className tweens, we need to kill any associated CSSPropTweens too; a linked list starts at the className's "xfirst". - xfirst = pt.xfirst; - if (xfirst && xfirst._prev) { - this._linkCSSP(xfirst._prev, pt._next, xfirst._prev._prev); //break off the prev - } else if (xfirst === this._firstPT) { - this._firstPT = pt._next; - } - if (pt._next) { - this._linkCSSP(pt._next, pt._next._next, xfirst._prev); - } - this._classNamePT = null; - } - return TweenPlugin.prototype._kill.call(this, copy); - }; - - - - //used by cascadeTo() for gathering all the style properties of each child element into an array for comparison. - var _getChildStyles = function(e, props, targets) { - var children, i, child, type; - if (e.slice) { - i = e.length; - while (--i > -1) { - _getChildStyles(e[i], props, targets); - } - return; - } - children = e.childNodes; - i = children.length; - while (--i > -1) { - child = children[i]; - type = child.type; - if (child.style) { - props.push(_getAllStyles(child)); - if (targets) { - targets.push(child); - } - } - if ((type === 1 || type === 9 || type === 11) && child.childNodes.length) { - _getChildStyles(child, props, targets); - } - } - }; - - /** - * Typically only useful for className tweens that may affect child elements, this method creates a TweenLite - * and then compares the style properties of all the target's child elements at the tween's start and end, and - * if any are different, it also creates tweens for those and returns an array containing ALL of the resulting - * tweens (so that you can easily add() them to a TimelineLite, for example). The reason this functionality is - * wrapped into a separate static method of CSSPlugin instead of being integrated into all regular className tweens - * is because it creates entirely new tweens that may have completely different targets than the original tween, - * so if they were all lumped into the original tween instance, it would be inconsistent with the rest of the API - * and it would create other problems. For example: - * - If I create a tween of elementA, that tween instance may suddenly change its target to include 50 other elements (unintuitive if I specifically defined the target I wanted) - * - We can't just create new independent tweens because otherwise, what happens if the original/parent tween is reversed or pause or dropped into a TimelineLite for tight control? You'd expect that tween's behavior to affect all the others. - * - Analyzing every style property of every child before and after the tween is an expensive operation when there are many children, so this behavior shouldn't be imposed on all className tweens by default, especially since it's probably rare that this extra functionality is needed. - * - * @param {Object} target object to be tweened - * @param {number} Duration in seconds (or frames for frames-based tweens) - * @param {Object} Object containing the end values, like {className:"newClass", ease:Linear.easeNone} - * @return {Array} An array of TweenLite instances - */ - CSSPlugin.cascadeTo = function(target, duration, vars) { - var tween = TweenLite.to(target, duration, vars), - results = [tween], - b = [], - e = [], - targets = [], - _reservedProps = TweenLite._internals.reservedProps, - i, difs, p; - target = tween._targets || tween.target; - _getChildStyles(target, b, targets); - tween.render(duration, true); - _getChildStyles(target, e); - tween.render(0, true); - tween._enabled(true); - i = targets.length; - while (--i > -1) { - difs = _cssDif(targets[i], b[i], e[i]); - if (difs.firstMPT) { - difs = difs.difs; - for (p in vars) { - if (_reservedProps[p]) { - difs[p] = vars[p]; - } - } - results.push( TweenLite.to(targets[i], duration, difs) ); - } - } - return results; - }; - - TweenPlugin.activate([CSSPlugin]); - return CSSPlugin; - - }, true); - - - - - - - - - - - + window._gsDefine("plugins.CSSPlugin", ["plugins.TweenPlugin","TweenLite"], function(TweenPlugin, TweenLite) { + + /** @constructor **/ + var CSSPlugin = function() { + TweenPlugin.call(this, "css"); + this._overwriteProps.length = 0; + this.setRatio = CSSPlugin.prototype.setRatio; //speed optimization (avoid prototype lookup on this "hot" method) + }, + _hasPriority, //turns true whenever a CSSPropTween instance is created that has a priority other than 0. This helps us discern whether or not we should spend the time organizing the linked list or not after a CSSPlugin's _onInitTween() method is called. + _suffixMap, //we set this in _onInitTween() each time as a way to have a persistent variable we can use in other methods like _parse() without having to pass it around as a parameter and we keep _parse() decoupled from a particular CSSPlugin instance + _cs, //computed style (we store this in a shared variable to conserve memory and make minification tighter + _overwriteProps, //alias to the currently instantiating CSSPlugin's _overwriteProps array. We use this closure in order to avoid having to pass a reference around from method to method and aid in minification. + _specialProps = {}, + p = CSSPlugin.prototype = new TweenPlugin("css"); + + p.constructor = CSSPlugin; + CSSPlugin.version = "1.12.1"; + CSSPlugin.API = 2; + CSSPlugin.defaultTransformPerspective = 0; + CSSPlugin.defaultSkewType = "compensated"; + p = "px"; //we'll reuse the "p" variable to keep file size down + CSSPlugin.suffixMap = {top:p, right:p, bottom:p, left:p, width:p, height:p, fontSize:p, padding:p, margin:p, perspective:p, lineHeight:""}; + + + var _numExp = /(?:\d|\-\d|\.\d|\-\.\d)+/g, + _relNumExp = /(?:\d|\-\d|\.\d|\-\.\d|\+=\d|\-=\d|\+=.\d|\-=\.\d)+/g, + _valuesExp = /(?:\+=|\-=|\-|\b)[\d\-\.]+[a-zA-Z0-9]*(?:%|\b)/gi, //finds all the values that begin with numbers or += or -= and then a number. Includes suffixes. We use this to split complex values apart like "1px 5px 20px rgb(255,102,51)" + _NaNExp = /[^\d\-\.]/g, + _suffixExp = /(?:\d|\-|\+|=|#|\.)*/g, + _opacityExp = /opacity *= *([^)]*)/i, + _opacityValExp = /opacity:([^;]*)/i, + _alphaFilterExp = /alpha\(opacity *=.+?\)/i, + _rgbhslExp = /^(rgb|hsl)/, + _capsExp = /([A-Z])/g, + _camelExp = /-([a-z])/gi, + _urlExp = /(^(?:url\(\"|url\())|(?:(\"\))$|\)$)/gi, //for pulling out urls from url(...) or url("...") strings (some browsers wrap urls in quotes, some don't when reporting things like backgroundImage) + _camelFunc = function(s, g) { return g.toUpperCase(); }, + _horizExp = /(?:Left|Right|Width)/i, + _ieGetMatrixExp = /(M11|M12|M21|M22)=[\d\-\.e]+/gi, + _ieSetMatrixExp = /progid\:DXImageTransform\.Microsoft\.Matrix\(.+?\)/i, + _commasOutsideParenExp = /,(?=[^\)]*(?:\(|$))/gi, //finds any commas that are not within parenthesis + _DEG2RAD = Math.PI / 180, + _RAD2DEG = 180 / Math.PI, + _forcePT = {}, + _doc = document, + _tempDiv = _doc.createElement("div"), + _tempImg = _doc.createElement("img"), + _internals = CSSPlugin._internals = {_specialProps:_specialProps}, //provides a hook to a few internal methods that we need to access from inside other plugins + _agent = navigator.userAgent, + _autoRound, + _reqSafariFix, //we won't apply the Safari transform fix until we actually come across a tween that affects a transform property (to maintain best performance). + + _isSafari, + _isFirefox, //Firefox has a bug that causes 3D transformed elements to randomly disappear unless a repaint is forced after each update on each element. + _isSafariLT6, //Safari (and Android 4 which uses a flavor of Safari) has a bug that prevents changes to "top" and "left" properties from rendering properly if changed on the same frame as a transform UNLESS we set the element's WebkitBackfaceVisibility to hidden (weird, I know). Doing this for Android 3 and earlier seems to actually cause other problems, though (fun!) + _ieVers, + _supportsOpacity = (function() { //we set _isSafari, _ieVers, _isFirefox, and _supportsOpacity all in one function here to reduce file size slightly, especially in the minified version. + var i = _agent.indexOf("Android"), + d = _doc.createElement("div"), a; + + _isSafari = (_agent.indexOf("Safari") !== -1 && _agent.indexOf("Chrome") === -1 && (i === -1 || Number(_agent.substr(i+8, 1)) > 3)); + _isSafariLT6 = (_isSafari && (Number(_agent.substr(_agent.indexOf("Version/")+8, 1)) < 6)); + _isFirefox = (_agent.indexOf("Firefox") !== -1); + + if ((/MSIE ([0-9]{1,}[\.0-9]{0,})/).exec(_agent)) { + _ieVers = parseFloat( RegExp.$1 ); + } + + d.innerHTML = "<a title='' style='top:1px;opacity:.55;'>a</a>"; + a = d.getElementsByTagName("a")[0]; + return a ? /^0.55/.test(a.style.opacity) : false; + }()), + _getIEOpacity = function(v) { + return (_opacityExp.test( ((typeof(v) === "string") ? v : (v.currentStyle ? v.currentStyle.filter : v.style.filter) || "") ) ? ( parseFloat( RegExp.$1 ) / 100 ) : 1); + }, + _log = function(s) {//for logging messages, but in a way that won't throw errors in old versions of IE. + if (window.console) { + //console.log(s); + } + }, + _prefixCSS = "", //the non-camelCase vendor prefix like "-o-", "-moz-", "-ms-", or "-webkit-" + _prefix = "", //camelCase vendor prefix like "O", "ms", "Webkit", or "Moz". + + // @private feed in a camelCase property name like "transform" and it will check to see if it is valid as-is or if it needs a vendor prefix. It returns the corrected camelCase property name (i.e. "WebkitTransform" or "MozTransform" or "transform" or null if no such property is found, like if the browser is IE8 or before, "transform" won't be found at all) + _checkPropPrefix = function(p, e) { + e = e || _tempDiv; + var s = e.style, + a, i; + if (s[p] !== undefined) { + return p; + } + p = p.charAt(0).toUpperCase() + p.substr(1); + a = ["O","Moz","ms","Ms","Webkit"]; + i = 5; + while (--i > -1 && s[a[i]+p] === undefined) { } + if (i >= 0) { + _prefix = (i === 3) ? "ms" : a[i]; + _prefixCSS = "-" + _prefix.toLowerCase() + "-"; + return _prefix + p; + } + return null; + }, + + _getComputedStyle = _doc.defaultView ? _doc.defaultView.getComputedStyle : function() {}, + + /** + * @private Returns the css style for a particular property of an element. For example, to get whatever the current "left" css value for an element with an ID of "myElement", you could do: + * var currentLeft = CSSPlugin.getStyle( document.getElementById("myElement"), "left"); + * + * @param {!Object} t Target element whose style property you want to query + * @param {!string} p Property name (like "left" or "top" or "marginTop", etc.) + * @param {Object=} cs Computed style object. This just provides a way to speed processing if you're going to get several properties on the same element in quick succession - you can reuse the result of the getComputedStyle() call. + * @param {boolean=} calc If true, the value will not be read directly from the element's "style" property (if it exists there), but instead the getComputedStyle() result will be used. This can be useful when you want to ensure that the browser itself is interpreting the value. + * @param {string=} dflt Default value that should be returned in the place of null, "none", "auto" or "auto auto". + * @return {?string} The current property value + */ + _getStyle = CSSPlugin.getStyle = function(t, p, cs, calc, dflt) { + var rv; + if (!_supportsOpacity) if (p === "opacity") { //several versions of IE don't use the standard "opacity" property - they use things like filter:alpha(opacity=50), so we parse that here. + return _getIEOpacity(t); + } + if (!calc && t.style[p]) { + rv = t.style[p]; + } else if ((cs = cs || _getComputedStyle(t))) { + rv = cs[p] || cs.getPropertyValue(p) || cs.getPropertyValue(p.replace(_capsExp, "-$1").toLowerCase()); + } else if (t.currentStyle) { + rv = t.currentStyle[p]; + } + return (dflt != null && (!rv || rv === "none" || rv === "auto" || rv === "auto auto")) ? dflt : rv; + }, + + /** + * @private Pass the target element, the property name, the numeric value, and the suffix (like "%", "em", "px", etc.) and it will spit back the equivalent pixel number. + * @param {!Object} t Target element + * @param {!string} p Property name (like "left", "top", "marginLeft", etc.) + * @param {!number} v Value + * @param {string=} sfx Suffix (like "px" or "%" or "em") + * @param {boolean=} recurse If true, the call is a recursive one. In some browsers (like IE7/8), occasionally the value isn't accurately reported initially, but if we run the function again it will take effect. + * @return {number} value in pixels + */ + _convertToPixels = _internals.convertToPixels = function(t, p, v, sfx, recurse) { + if (sfx === "px" || !sfx) { return v; } + if (sfx === "auto" || !v) { return 0; } + var horiz = _horizExp.test(p), + node = t, + style = _tempDiv.style, + neg = (v < 0), + pix, cache, time; + if (neg) { + v = -v; + } + if (sfx === "%" && p.indexOf("border") !== -1) { + pix = (v / 100) * (horiz ? t.clientWidth : t.clientHeight); + } else { + style.cssText = "border:0 solid red;position:" + _getStyle(t, "position") + ";line-height:0;"; + if (sfx === "%" || !node.appendChild) { + node = t.parentNode || _doc.body; + cache = node._gsCache; + time = TweenLite.ticker.frame; + if (cache && horiz && cache.time === time) { //performance optimization: we record the width of elements along with the ticker frame so that we can quickly get it again on the same tick (seems relatively safe to assume it wouldn't change on the same tick) + return cache.width * v / 100; + } + style[(horiz ? "width" : "height")] = v + sfx; + } else { + style[(horiz ? "borderLeftWidth" : "borderTopWidth")] = v + sfx; + } + node.appendChild(_tempDiv); + pix = parseFloat(_tempDiv[(horiz ? "offsetWidth" : "offsetHeight")]); + node.removeChild(_tempDiv); + if (horiz && sfx === "%" && CSSPlugin.cacheWidths !== false) { + cache = node._gsCache = node._gsCache || {}; + cache.time = time; + cache.width = pix / v * 100; + } + if (pix === 0 && !recurse) { + pix = _convertToPixels(t, p, v, sfx, true); + } + } + return neg ? -pix : pix; + }, + _calculateOffset = _internals.calculateOffset = function(t, p, cs) { //for figuring out "top" or "left" in px when it's "auto". We need to factor in margin with the offsetLeft/offsetTop + if (_getStyle(t, "position", cs) !== "absolute") { return 0; } + var dim = ((p === "left") ? "Left" : "Top"), + v = _getStyle(t, "margin" + dim, cs); + return t["offset" + dim] - (_convertToPixels(t, p, parseFloat(v), v.replace(_suffixExp, "")) || 0); + }, + + // @private returns at object containing ALL of the style properties in camelCase and their associated values. + _getAllStyles = function(t, cs) { + var s = {}, + i, tr; + if ((cs = cs || _getComputedStyle(t, null))) { + if ((i = cs.length)) { + while (--i > -1) { + s[cs[i].replace(_camelExp, _camelFunc)] = cs.getPropertyValue(cs[i]); + } + } else { //Opera behaves differently - cs.length is always 0, so we must do a for...in loop. + for (i in cs) { + s[i] = cs[i]; + } + } + } else if ((cs = t.currentStyle || t.style)) { + for (i in cs) { + if (typeof(i) === "string" && s[i] === undefined) { + s[i.replace(_camelExp, _camelFunc)] = cs[i]; + } + } + } + if (!_supportsOpacity) { + s.opacity = _getIEOpacity(t); + } + tr = _getTransform(t, cs, false); + s.rotation = tr.rotation; + s.skewX = tr.skewX; + s.scaleX = tr.scaleX; + s.scaleY = tr.scaleY; + s.x = tr.x; + s.y = tr.y; + if (_supports3D) { + s.z = tr.z; + s.rotationX = tr.rotationX; + s.rotationY = tr.rotationY; + s.scaleZ = tr.scaleZ; + } + if (s.filters) { + delete s.filters; + } + return s; + }, + + // @private analyzes two style objects (as returned by _getAllStyles()) and only looks for differences between them that contain tweenable values (like a number or color). It returns an object with a "difs" property which refers to an object containing only those isolated properties and values for tweening, and a "firstMPT" property which refers to the first MiniPropTween instance in a linked list that recorded all the starting values of the different properties so that we can revert to them at the end or beginning of the tween - we don't want the cascading to get messed up. The forceLookup parameter is an optional generic object with properties that should be forced into the results - this is necessary for className tweens that are overwriting others because imagine a scenario where a rollover/rollout adds/removes a class and the user swipes the mouse over the target SUPER fast, thus nothing actually changed yet and the subsequent comparison of the properties would indicate they match (especially when px rounding is taken into consideration), thus no tweening is necessary even though it SHOULD tween and remove those properties after the tween (otherwise the inline styles will contaminate things). See the className SpecialProp code for details. + _cssDif = function(t, s1, s2, vars, forceLookup) { + var difs = {}, + style = t.style, + val, p, mpt; + for (p in s2) { + if (p !== "cssText") if (p !== "length") if (isNaN(p)) if (s1[p] !== (val = s2[p]) || (forceLookup && forceLookup[p])) if (p.indexOf("Origin") === -1) if (typeof(val) === "number" || typeof(val) === "string") { + difs[p] = (val === "auto" && (p === "left" || p === "top")) ? _calculateOffset(t, p) : ((val === "" || val === "auto" || val === "none") && typeof(s1[p]) === "string" && s1[p].replace(_NaNExp, "") !== "") ? 0 : val; //if the ending value is defaulting ("" or "auto"), we check the starting value and if it can be parsed into a number (a string which could have a suffix too, like 700px), then we swap in 0 for "" or "auto" so that things actually tween. + if (style[p] !== undefined) { //for className tweens, we must remember which properties already existed inline - the ones that didn't should be removed when the tween isn't in progress because they were only introduced to facilitate the transition between classes. + mpt = new MiniPropTween(style, p, style[p], mpt); + } + } + } + if (vars) { + for (p in vars) { //copy properties (except className) + if (p !== "className") { + difs[p] = vars[p]; + } + } + } + return {difs:difs, firstMPT:mpt}; + }, + _dimensions = {width:["Left","Right"], height:["Top","Bottom"]}, + _margins = ["marginLeft","marginRight","marginTop","marginBottom"], + + /** + * @private Gets the width or height of an element + * @param {!Object} t Target element + * @param {!string} p Property name ("width" or "height") + * @param {Object=} cs Computed style object (if one exists). Just a speed optimization. + * @return {number} Dimension (in pixels) + */ + _getDimension = function(t, p, cs) { + var v = parseFloat((p === "width") ? t.offsetWidth : t.offsetHeight), + a = _dimensions[p], + i = a.length; + cs = cs || _getComputedStyle(t, null); + while (--i > -1) { + v -= parseFloat( _getStyle(t, "padding" + a[i], cs, true) ) || 0; + v -= parseFloat( _getStyle(t, "border" + a[i] + "Width", cs, true) ) || 0; + } + return v; + }, + + // @private Parses position-related complex strings like "top left" or "50px 10px" or "70% 20%", etc. which are used for things like transformOrigin or backgroundPosition. Optionally decorates a supplied object (recObj) with the following properties: "ox" (offsetX), "oy" (offsetY), "oxp" (if true, "ox" is a percentage not a pixel value), and "oxy" (if true, "oy" is a percentage not a pixel value) + _parsePosition = function(v, recObj) { + if (v == null || v === "" || v === "auto" || v === "auto auto") { //note: Firefox uses "auto auto" as default whereas Chrome uses "auto". + v = "0 0"; + } + var a = v.split(" "), + x = (v.indexOf("left") !== -1) ? "0%" : (v.indexOf("right") !== -1) ? "100%" : a[0], + y = (v.indexOf("top") !== -1) ? "0%" : (v.indexOf("bottom") !== -1) ? "100%" : a[1]; + if (y == null) { + y = "0"; + } else if (y === "center") { + y = "50%"; + } + if (x === "center" || (isNaN(parseFloat(x)) && (x + "").indexOf("=") === -1)) { //remember, the user could flip-flop the values and say "bottom center" or "center bottom", etc. "center" is ambiguous because it could be used to describe horizontal or vertical, hence the isNaN(). If there's an "=" sign in the value, it's relative. + x = "50%"; + } + if (recObj) { + recObj.oxp = (x.indexOf("%") !== -1); + recObj.oyp = (y.indexOf("%") !== -1); + recObj.oxr = (x.charAt(1) === "="); + recObj.oyr = (y.charAt(1) === "="); + recObj.ox = parseFloat(x.replace(_NaNExp, "")); + recObj.oy = parseFloat(y.replace(_NaNExp, "")); + } + return x + " " + y + ((a.length > 2) ? " " + a[2] : ""); + }, + + /** + * @private Takes an ending value (typically a string, but can be a number) and a starting value and returns the change between the two, looking for relative value indicators like += and -= and it also ignores suffixes (but make sure the ending value starts with a number or +=/-= and that the starting value is a NUMBER!) + * @param {(number|string)} e End value which is typically a string, but could be a number + * @param {(number|string)} b Beginning value which is typically a string but could be a number + * @return {number} Amount of change between the beginning and ending values (relative values that have a "+=" or "-=" are recognized) + */ + _parseChange = function(e, b) { + return (typeof(e) === "string" && e.charAt(1) === "=") ? parseInt(e.charAt(0) + "1", 10) * parseFloat(e.substr(2)) : parseFloat(e) - parseFloat(b); + }, + + /** + * @private Takes a value and a default number, checks if the value is relative, null, or numeric and spits back a normalized number accordingly. Primarily used in the _parseTransform() function. + * @param {Object} v Value to be parsed + * @param {!number} d Default value (which is also used for relative calculations if "+=" or "-=" is found in the first parameter) + * @return {number} Parsed value + */ + _parseVal = function(v, d) { + return (v == null) ? d : (typeof(v) === "string" && v.charAt(1) === "=") ? parseInt(v.charAt(0) + "1", 10) * Number(v.substr(2)) + d : parseFloat(v); + }, + + /** + * @private Translates strings like "40deg" or "40" or 40rad" or "+=40deg" or "270_short" or "-90_cw" or "+=45_ccw" to a numeric radian angle. Of course a starting/default value must be fed in too so that relative values can be calculated properly. + * @param {Object} v Value to be parsed + * @param {!number} d Default value (which is also used for relative calculations if "+=" or "-=" is found in the first parameter) + * @param {string=} p property name for directionalEnd (optional - only used when the parsed value is directional ("_short", "_cw", or "_ccw" suffix). We need a way to store the uncompensated value so that at the end of the tween, we set it to exactly what was requested with no directional compensation). Property name would be "rotation", "rotationX", or "rotationY" + * @param {Object=} directionalEnd An object that will store the raw end values for directional angles ("_short", "_cw", or "_ccw" suffix). We need a way to store the uncompensated value so that at the end of the tween, we set it to exactly what was requested with no directional compensation. + * @return {number} parsed angle in radians + */ + _parseAngle = function(v, d, p, directionalEnd) { + var min = 0.000001, + cap, split, dif, result; + if (v == null) { + result = d; + } else if (typeof(v) === "number") { + result = v; + } else { + cap = 360; + split = v.split("_"); + dif = Number(split[0].replace(_NaNExp, "")) * ((v.indexOf("rad") === -1) ? 1 : _RAD2DEG) - ((v.charAt(1) === "=") ? 0 : d); + if (split.length) { + if (directionalEnd) { + directionalEnd[p] = d + dif; + } + if (v.indexOf("short") !== -1) { + dif = dif % cap; + if (dif !== dif % (cap / 2)) { + dif = (dif < 0) ? dif + cap : dif - cap; + } + } + if (v.indexOf("_cw") !== -1 && dif < 0) { + dif = ((dif + cap * 9999999999) % cap) - ((dif / cap) | 0) * cap; + } else if (v.indexOf("ccw") !== -1 && dif > 0) { + dif = ((dif - cap * 9999999999) % cap) - ((dif / cap) | 0) * cap; + } + } + result = d + dif; + } + if (result < min && result > -min) { + result = 0; + } + return result; + }, + + _colorLookup = {aqua:[0,255,255], + lime:[0,255,0], + silver:[192,192,192], + black:[0,0,0], + maroon:[128,0,0], + teal:[0,128,128], + blue:[0,0,255], + navy:[0,0,128], + white:[255,255,255], + fuchsia:[255,0,255], + olive:[128,128,0], + yellow:[255,255,0], + orange:[255,165,0], + gray:[128,128,128], + purple:[128,0,128], + green:[0,128,0], + red:[255,0,0], + pink:[255,192,203], + cyan:[0,255,255], + transparent:[255,255,255,0]}, + + _hue = function(h, m1, m2) { + h = (h < 0) ? h + 1 : (h > 1) ? h - 1 : h; + return ((((h * 6 < 1) ? m1 + (m2 - m1) * h * 6 : (h < 0.5) ? m2 : (h * 3 < 2) ? m1 + (m2 - m1) * (2 / 3 - h) * 6 : m1) * 255) + 0.5) | 0; + }, + + /** + * @private Parses a color (like #9F0, #FF9900, or rgb(255,51,153)) into an array with 3 elements for red, green, and blue. Also handles rgba() values (splits into array of 4 elements of course) + * @param {(string|number)} v The value the should be parsed which could be a string like #9F0 or rgb(255,102,51) or rgba(255,0,0,0.5) or it could be a number like 0xFF00CC or even a named color like red, blue, purple, etc. + * @return {Array.<number>} An array containing red, green, and blue (and optionally alpha) in that order. + */ + _parseColor = function(v) { + var c1, c2, c3, h, s, l; + if (!v || v === "") { + return _colorLookup.black; + } + if (typeof(v) === "number") { + return [v >> 16, (v >> 8) & 255, v & 255]; + } + if (v.charAt(v.length - 1) === ",") { //sometimes a trailing commma is included and we should chop it off (typically from a comma-delimited list of values like a textShadow:"2px 2px 2px blue, 5px 5px 5px rgb(255,0,0)" - in this example "blue," has a trailing comma. We could strip it out inside parseComplex() but we'd need to do it to the beginning and ending values plus it wouldn't provide protection from other potential scenarios like if the user passes in a similar value. + v = v.substr(0, v.length - 1); + } + if (_colorLookup[v]) { + return _colorLookup[v]; + } + if (v.charAt(0) === "#") { + if (v.length === 4) { //for shorthand like #9F0 + c1 = v.charAt(1), + c2 = v.charAt(2), + c3 = v.charAt(3); + v = "#" + c1 + c1 + c2 + c2 + c3 + c3; + } + v = parseInt(v.substr(1), 16); + return [v >> 16, (v >> 8) & 255, v & 255]; + } + if (v.substr(0, 3) === "hsl") { + v = v.match(_numExp); + h = (Number(v[0]) % 360) / 360; + s = Number(v[1]) / 100; + l = Number(v[2]) / 100; + c2 = (l <= 0.5) ? l * (s + 1) : l + s - l * s; + c1 = l * 2 - c2; + if (v.length > 3) { + v[3] = Number(v[3]); + } + v[0] = _hue(h + 1 / 3, c1, c2); + v[1] = _hue(h, c1, c2); + v[2] = _hue(h - 1 / 3, c1, c2); + return v; + } + v = v.match(_numExp) || _colorLookup.transparent; + v[0] = Number(v[0]); + v[1] = Number(v[1]); + v[2] = Number(v[2]); + if (v.length > 3) { + v[3] = Number(v[3]); + } + return v; + }, + _colorExp = "(?:\\b(?:(?:rgb|rgba|hsl|hsla)\\(.+?\\))|\\B#.+?\\b"; //we'll dynamically build this Regular Expression to conserve file size. After building it, it will be able to find rgb(), rgba(), # (hexadecimal), and named color values like red, blue, purple, etc. + + for (p in _colorLookup) { + _colorExp += "|" + p + "\\b"; + } + _colorExp = new RegExp(_colorExp+")", "gi"); + + /** + * @private Returns a formatter function that handles taking a string (or number in some cases) and returning a consistently formatted one in terms of delimiters, quantity of values, etc. For example, we may get boxShadow values defined as "0px red" or "0px 0px 10px rgb(255,0,0)" or "0px 0px 20px 20px #F00" and we need to ensure that what we get back is described with 4 numbers and a color. This allows us to feed it into the _parseComplex() method and split the values up appropriately. The neat thing about this _getFormatter() function is that the dflt defines a pattern as well as a default, so for example, _getFormatter("0px 0px 0px 0px #777", true) not only sets the default as 0px for all distances and #777 for the color, but also sets the pattern such that 4 numbers and a color will always get returned. + * @param {!string} dflt The default value and pattern to follow. So "0px 0px 0px 0px #777" will ensure that 4 numbers and a color will always get returned. + * @param {boolean=} clr If true, the values should be searched for color-related data. For example, boxShadow values typically contain a color whereas borderRadius don't. + * @param {boolean=} collapsible If true, the value is a top/left/right/bottom style one that acts like margin or padding, where if only one value is received, it's used for all 4; if 2 are received, the first is duplicated for 3rd (bottom) and the 2nd is duplicated for the 4th spot (left), etc. + * @return {Function} formatter function + */ + var _getFormatter = function(dflt, clr, collapsible, multi) { + if (dflt == null) { + return function(v) {return v;}; + } + var dColor = clr ? (dflt.match(_colorExp) || [""])[0] : "", + dVals = dflt.split(dColor).join("").match(_valuesExp) || [], + pfx = dflt.substr(0, dflt.indexOf(dVals[0])), + sfx = (dflt.charAt(dflt.length - 1) === ")") ? ")" : "", + delim = (dflt.indexOf(" ") !== -1) ? " " : ",", + numVals = dVals.length, + dSfx = (numVals > 0) ? dVals[0].replace(_numExp, "") : "", + formatter; + if (!numVals) { + return function(v) {return v;}; + } + if (clr) { + formatter = function(v) { + var color, vals, i, a; + if (typeof(v) === "number") { + v += dSfx; + } else if (multi && _commasOutsideParenExp.test(v)) { + a = v.replace(_commasOutsideParenExp, "|").split("|"); + for (i = 0; i < a.length; i++) { + a[i] = formatter(a[i]); + } + return a.join(","); + } + color = (v.match(_colorExp) || [dColor])[0]; + vals = v.split(color).join("").match(_valuesExp) || []; + i = vals.length; + if (numVals > i--) { + while (++i < numVals) { + vals[i] = collapsible ? vals[(((i - 1) / 2) | 0)] : dVals[i]; + } + } + return pfx + vals.join(delim) + delim + color + sfx + (v.indexOf("inset") !== -1 ? " inset" : ""); + }; + return formatter; + + } + formatter = function(v) { + var vals, a, i; + if (typeof(v) === "number") { + v += dSfx; + } else if (multi && _commasOutsideParenExp.test(v)) { + a = v.replace(_commasOutsideParenExp, "|").split("|"); + for (i = 0; i < a.length; i++) { + a[i] = formatter(a[i]); + } + return a.join(","); + } + vals = v.match(_valuesExp) || []; + i = vals.length; + if (numVals > i--) { + while (++i < numVals) { + vals[i] = collapsible ? vals[(((i - 1) / 2) | 0)] : dVals[i]; + } + } + return pfx + vals.join(delim) + sfx; + }; + return formatter; + }, + + /** + * @private returns a formatter function that's used for edge-related values like marginTop, marginLeft, paddingBottom, paddingRight, etc. Just pass a comma-delimited list of property names related to the edges. + * @param {!string} props a comma-delimited list of property names in order from top to left, like "marginTop,marginRight,marginBottom,marginLeft" + * @return {Function} a formatter function + */ + _getEdgeParser = function(props) { + props = props.split(","); + return function(t, e, p, cssp, pt, plugin, vars) { + var a = (e + "").split(" "), + i; + vars = {}; + for (i = 0; i < 4; i++) { + vars[props[i]] = a[i] = a[i] || a[(((i - 1) / 2) >> 0)]; + } + return cssp.parse(t, vars, pt, plugin); + }; + }, + + // @private used when other plugins must tween values first, like BezierPlugin or ThrowPropsPlugin, etc. That plugin's setRatio() gets called first so that the values are updated, and then we loop through the MiniPropTweens which handle copying the values into their appropriate slots so that they can then be applied correctly in the main CSSPlugin setRatio() method. Remember, we typically create a proxy object that has a bunch of uniquely-named properties that we feed to the sub-plugin and it does its magic normally, and then we must interpret those values and apply them to the css because often numbers must get combined/concatenated, suffixes added, etc. to work with css, like boxShadow could have 4 values plus a color. + _setPluginRatio = _internals._setPluginRatio = function(v) { + this.plugin.setRatio(v); + var d = this.data, + proxy = d.proxy, + mpt = d.firstMPT, + min = 0.000001, + val, pt, i, str; + while (mpt) { + val = proxy[mpt.v]; + if (mpt.r) { + val = Math.round(val); + } else if (val < min && val > -min) { + val = 0; + } + mpt.t[mpt.p] = val; + mpt = mpt._next; + } + if (d.autoRotate) { + d.autoRotate.rotation = proxy.rotation; + } + //at the end, we must set the CSSPropTween's "e" (end) value dynamically here because that's what is used in the final setRatio() method. + if (v === 1) { + mpt = d.firstMPT; + while (mpt) { + pt = mpt.t; + if (!pt.type) { + pt.e = pt.s + pt.xs0; + } else if (pt.type === 1) { + str = pt.xs0 + pt.s + pt.xs1; + for (i = 1; i < pt.l; i++) { + str += pt["xn"+i] + pt["xs"+(i+1)]; + } + pt.e = str; + } + mpt = mpt._next; + } + } + }, + + /** + * @private @constructor Used by a few SpecialProps to hold important values for proxies. For example, _parseToProxy() creates a MiniPropTween instance for each property that must get tweened on the proxy, and we record the original property name as well as the unique one we create for the proxy, plus whether or not the value needs to be rounded plus the original value. + * @param {!Object} t target object whose property we're tweening (often a CSSPropTween) + * @param {!string} p property name + * @param {(number|string|object)} v value + * @param {MiniPropTween=} next next MiniPropTween in the linked list + * @param {boolean=} r if true, the tweened value should be rounded to the nearest integer + */ + MiniPropTween = function(t, p, v, next, r) { + this.t = t; + this.p = p; + this.v = v; + this.r = r; + if (next) { + next._prev = this; + this._next = next; + } + }, + + /** + * @private Most other plugins (like BezierPlugin and ThrowPropsPlugin and others) can only tween numeric values, but CSSPlugin must accommodate special values that have a bunch of extra data (like a suffix or strings between numeric values, etc.). For example, boxShadow has values like "10px 10px 20px 30px rgb(255,0,0)" which would utterly confuse other plugins. This method allows us to split that data apart and grab only the numeric data and attach it to uniquely-named properties of a generic proxy object ({}) so that we can feed that to virtually any plugin to have the numbers tweened. However, we must also keep track of which properties from the proxy go with which CSSPropTween values and instances. So we create a linked list of MiniPropTweens. Each one records a target (the original CSSPropTween), property (like "s" or "xn1" or "xn2") that we're tweening and the unique property name that was used for the proxy (like "boxShadow_xn1" and "boxShadow_xn2") and whether or not they need to be rounded. That way, in the _setPluginRatio() method we can simply copy the values over from the proxy to the CSSPropTween instance(s). Then, when the main CSSPlugin setRatio() method runs and applies the CSSPropTween values accordingly, they're updated nicely. So the external plugin tweens the numbers, _setPluginRatio() copies them over, and setRatio() acts normally, applying css-specific values to the element. + * This method returns an object that has the following properties: + * - proxy: a generic object containing the starting values for all the properties that will be tweened by the external plugin. This is what we feed to the external _onInitTween() as the target + * - end: a generic object containing the ending values for all the properties that will be tweened by the external plugin. This is what we feed to the external plugin's _onInitTween() as the destination values + * - firstMPT: the first MiniPropTween in the linked list + * - pt: the first CSSPropTween in the linked list that was created when parsing. If shallow is true, this linked list will NOT attach to the one passed into the _parseToProxy() as the "pt" (4th) parameter. + * @param {!Object} t target object to be tweened + * @param {!(Object|string)} vars the object containing the information about the tweening values (typically the end/destination values) that should be parsed + * @param {!CSSPlugin} cssp The CSSPlugin instance + * @param {CSSPropTween=} pt the next CSSPropTween in the linked list + * @param {TweenPlugin=} plugin the external TweenPlugin instance that will be handling tweening the numeric values + * @param {boolean=} shallow if true, the resulting linked list from the parse will NOT be attached to the CSSPropTween that was passed in as the "pt" (4th) parameter. + * @return An object containing the following properties: proxy, end, firstMPT, and pt (see above for descriptions) + */ + _parseToProxy = _internals._parseToProxy = function(t, vars, cssp, pt, plugin, shallow) { + var bpt = pt, + start = {}, + end = {}, + transform = cssp._transform, + oldForce = _forcePT, + i, p, xp, mpt, firstPT; + cssp._transform = null; + _forcePT = vars; + pt = firstPT = cssp.parse(t, vars, pt, plugin); + _forcePT = oldForce; + //break off from the linked list so the new ones are isolated. + if (shallow) { + cssp._transform = transform; + if (bpt) { + bpt._prev = null; + if (bpt._prev) { + bpt._prev._next = null; + } + } + } + while (pt && pt !== bpt) { + if (pt.type <= 1) { + p = pt.p; + end[p] = pt.s + pt.c; + start[p] = pt.s; + if (!shallow) { + mpt = new MiniPropTween(pt, "s", p, mpt, pt.r); + pt.c = 0; + } + if (pt.type === 1) { + i = pt.l; + while (--i > 0) { + xp = "xn" + i; + p = pt.p + "_" + xp; + end[p] = pt.data[xp]; + start[p] = pt[xp]; + if (!shallow) { + mpt = new MiniPropTween(pt, xp, p, mpt, pt.rxp[xp]); + } + } + } + } + pt = pt._next; + } + return {proxy:start, end:end, firstMPT:mpt, pt:firstPT}; + }, + + + + /** + * @constructor Each property that is tweened has at least one CSSPropTween associated with it. These instances store important information like the target, property, starting value, amount of change, etc. They can also optionally have a number of "extra" strings and numeric values named xs1, xn1, xs2, xn2, xs3, xn3, etc. where "s" indicates string and "n" indicates number. These can be pieced together in a complex-value tween (type:1) that has alternating types of data like a string, number, string, number, etc. For example, boxShadow could be "5px 5px 8px rgb(102, 102, 51)". In that value, there are 6 numbers that may need to tween and then pieced back together into a string again with spaces, suffixes, etc. xs0 is special in that it stores the suffix for standard (type:0) tweens, -OR- the first string (prefix) in a complex-value (type:1) CSSPropTween -OR- it can be the non-tweening value in a type:-1 CSSPropTween. We do this to conserve memory. + * CSSPropTweens have the following optional properties as well (not defined through the constructor): + * - l: Length in terms of the number of extra properties that the CSSPropTween has (default: 0). For example, for a boxShadow we may need to tween 5 numbers in which case l would be 5; Keep in mind that the start/end values for the first number that's tweened are always stored in the s and c properties to conserve memory. All additional values thereafter are stored in xn1, xn2, etc. + * - xfirst: The first instance of any sub-CSSPropTweens that are tweening properties of this instance. For example, we may split up a boxShadow tween so that there's a main CSSPropTween of type:1 that has various xs* and xn* values associated with the h-shadow, v-shadow, blur, color, etc. Then we spawn a CSSPropTween for each of those that has a higher priority and runs BEFORE the main CSSPropTween so that the values are all set by the time it needs to re-assemble them. The xfirst gives us an easy way to identify the first one in that chain which typically ends at the main one (because they're all prepende to the linked list) + * - plugin: The TweenPlugin instance that will handle the tweening of any complex values. For example, sometimes we don't want to use normal subtweens (like xfirst refers to) to tween the values - we might want ThrowPropsPlugin or BezierPlugin some other plugin to do the actual tweening, so we create a plugin instance and store a reference here. We need this reference so that if we get a request to round values or disable a tween, we can pass along that request. + * - data: Arbitrary data that needs to be stored with the CSSPropTween. Typically if we're going to have a plugin handle the tweening of a complex-value tween, we create a generic object that stores the END values that we're tweening to and the CSSPropTween's xs1, xs2, etc. have the starting values. We store that object as data. That way, we can simply pass that object to the plugin and use the CSSPropTween as the target. + * - setRatio: Only used for type:2 tweens that require custom functionality. In this case, we call the CSSPropTween's setRatio() method and pass the ratio each time the tween updates. This isn't quite as efficient as doing things directly in the CSSPlugin's setRatio() method, but it's very convenient and flexible. + * @param {!Object} t Target object whose property will be tweened. Often a DOM element, but not always. It could be anything. + * @param {string} p Property to tween (name). For example, to tween element.width, p would be "width". + * @param {number} s Starting numeric value + * @param {number} c Change in numeric value over the course of the entire tween. For example, if element.width starts at 5 and should end at 100, c would be 95. + * @param {CSSPropTween=} next The next CSSPropTween in the linked list. If one is defined, we will define its _prev as the new instance, and the new instance's _next will be pointed at it. + * @param {number=} type The type of CSSPropTween where -1 = a non-tweening value, 0 = a standard simple tween, 1 = a complex value (like one that has multiple numbers in a comma- or space-delimited string like border:"1px solid red"), and 2 = one that uses a custom setRatio function that does all of the work of applying the values on each update. + * @param {string=} n Name of the property that should be used for overwriting purposes which is typically the same as p but not always. For example, we may need to create a subtween for the 2nd part of a "clip:rect(...)" tween in which case "p" might be xs1 but "n" is still "clip" + * @param {boolean=} r If true, the value(s) should be rounded + * @param {number=} pr Priority in the linked list order. Higher priority CSSPropTweens will be updated before lower priority ones. The default priority is 0. + * @param {string=} b Beginning value. We store this to ensure that it is EXACTLY what it was when the tween began without any risk of interpretation issues. + * @param {string=} e Ending value. We store this to ensure that it is EXACTLY what the user defined at the end of the tween without any risk of interpretation issues. + */ + CSSPropTween = _internals.CSSPropTween = function(t, p, s, c, next, type, n, r, pr, b, e) { + this.t = t; //target + this.p = p; //property + this.s = s; //starting value + this.c = c; //change value + this.n = n || p; //name that this CSSPropTween should be associated to (usually the same as p, but not always - n is what overwriting looks at) + if (!(t instanceof CSSPropTween)) { + _overwriteProps.push(this.n); + } + this.r = r; //round (boolean) + this.type = type || 0; //0 = normal tween, -1 = non-tweening (in which case xs0 will be applied to the target's property, like tp.t[tp.p] = tp.xs0), 1 = complex-value SpecialProp, 2 = custom setRatio() that does all the work + if (pr) { + this.pr = pr; + _hasPriority = true; + } + this.b = (b === undefined) ? s : b; + this.e = (e === undefined) ? s + c : e; + if (next) { + this._next = next; + next._prev = this; + } + }, + + /** + * Takes a target, the beginning value and ending value (as strings) and parses them into a CSSPropTween (possibly with child CSSPropTweens) that accommodates multiple numbers, colors, comma-delimited values, etc. For example: + * sp.parseComplex(element, "boxShadow", "5px 10px 20px rgb(255,102,51)", "0px 0px 0px red", true, "0px 0px 0px rgb(0,0,0,0)", pt); + * It will walk through the beginning and ending values (which should be in the same format with the same number and type of values) and figure out which parts are numbers, what strings separate the numeric/tweenable values, and then create the CSSPropTweens accordingly. If a plugin is defined, no child CSSPropTweens will be created. Instead, the ending values will be stored in the "data" property of the returned CSSPropTween like: {s:-5, xn1:-10, xn2:-20, xn3:255, xn4:0, xn5:0} so that it can be fed to any other plugin and it'll be plain numeric tweens but the recomposition of the complex value will be handled inside CSSPlugin's setRatio(). + * If a setRatio is defined, the type of the CSSPropTween will be set to 2 and recomposition of the values will be the responsibility of that method. + * + * @param {!Object} t Target whose property will be tweened + * @param {!string} p Property that will be tweened (its name, like "left" or "backgroundColor" or "boxShadow") + * @param {string} b Beginning value + * @param {string} e Ending value + * @param {boolean} clrs If true, the value could contain a color value like "rgb(255,0,0)" or "#F00" or "red". The default is false, so no colors will be recognized (a performance optimization) + * @param {(string|number|Object)} dflt The default beginning value that should be used if no valid beginning value is defined or if the number of values inside the complex beginning and ending values don't match + * @param {?CSSPropTween} pt CSSPropTween instance that is the current head of the linked list (we'll prepend to this). + * @param {number=} pr Priority in the linked list order. Higher priority properties will be updated before lower priority ones. The default priority is 0. + * @param {TweenPlugin=} plugin If a plugin should handle the tweening of extra properties, pass the plugin instance here. If one is defined, then NO subtweens will be created for any extra properties (the properties will be created - just not additional CSSPropTween instances to tween them) because the plugin is expected to do so. However, the end values WILL be populated in the "data" property, like {s:100, xn1:50, xn2:300} + * @param {function(number)=} setRatio If values should be set in a custom function instead of being pieced together in a type:1 (complex-value) CSSPropTween, define that custom function here. + * @return {CSSPropTween} The first CSSPropTween in the linked list which includes the new one(s) added by the parseComplex() call. + */ + _parseComplex = CSSPlugin.parseComplex = function(t, p, b, e, clrs, dflt, pt, pr, plugin, setRatio) { + //DEBUG: _log("parseComplex: "+p+", b: "+b+", e: "+e); + b = b || dflt || ""; + pt = new CSSPropTween(t, p, 0, 0, pt, (setRatio ? 2 : 1), null, false, pr, b, e); + e += ""; //ensures it's a string + var ba = b.split(", ").join(",").split(" "), //beginning array + ea = e.split(", ").join(",").split(" "), //ending array + l = ba.length, + autoRound = (_autoRound !== false), + i, xi, ni, bv, ev, bnums, enums, bn, rgba, temp, cv, str; + if (e.indexOf(",") !== -1 || b.indexOf(",") !== -1) { + ba = ba.join(" ").replace(_commasOutsideParenExp, ", ").split(" "); + ea = ea.join(" ").replace(_commasOutsideParenExp, ", ").split(" "); + l = ba.length; + } + if (l !== ea.length) { + //DEBUG: _log("mismatched formatting detected on " + p + " (" + b + " vs " + e + ")"); + ba = (dflt || "").split(" "); + l = ba.length; + } + pt.plugin = plugin; + pt.setRatio = setRatio; + for (i = 0; i < l; i++) { + bv = ba[i]; + ev = ea[i]; + bn = parseFloat(bv); + + //if the value begins with a number (most common). It's fine if it has a suffix like px + if (bn || bn === 0) { + pt.appendXtra("", bn, _parseChange(ev, bn), ev.replace(_relNumExp, ""), (autoRound && ev.indexOf("px") !== -1), true); + + //if the value is a color + } else if (clrs && (bv.charAt(0) === "#" || _colorLookup[bv] || _rgbhslExp.test(bv))) { + str = ev.charAt(ev.length - 1) === "," ? ")," : ")"; //if there's a comma at the end, retain it. + bv = _parseColor(bv); + ev = _parseColor(ev); + rgba = (bv.length + ev.length > 6); + if (rgba && !_supportsOpacity && ev[3] === 0) { //older versions of IE don't support rgba(), so if the destination alpha is 0, just use "transparent" for the end color + pt["xs" + pt.l] += pt.l ? " transparent" : "transparent"; + pt.e = pt.e.split(ea[i]).join("transparent"); + } else { + if (!_supportsOpacity) { //old versions of IE don't support rgba(). + rgba = false; + } + pt.appendXtra((rgba ? "rgba(" : "rgb("), bv[0], ev[0] - bv[0], ",", true, true) + .appendXtra("", bv[1], ev[1] - bv[1], ",", true) + .appendXtra("", bv[2], ev[2] - bv[2], (rgba ? "," : str), true); + if (rgba) { + bv = (bv.length < 4) ? 1 : bv[3]; + pt.appendXtra("", bv, ((ev.length < 4) ? 1 : ev[3]) - bv, str, false); + } + } + + } else { + bnums = bv.match(_numExp); //gets each group of numbers in the beginning value string and drops them into an array + + //if no number is found, treat it as a non-tweening value and just append the string to the current xs. + if (!bnums) { + pt["xs" + pt.l] += pt.l ? " " + bv : bv; + + //loop through all the numbers that are found and construct the extra values on the pt. + } else { + enums = ev.match(_relNumExp); //get each group of numbers in the end value string and drop them into an array. We allow relative values too, like +=50 or -=.5 + if (!enums || enums.length !== bnums.length) { + //DEBUG: _log("mismatched formatting detected on " + p + " (" + b + " vs " + e + ")"); + return pt; + } + ni = 0; + for (xi = 0; xi < bnums.length; xi++) { + cv = bnums[xi]; + temp = bv.indexOf(cv, ni); + pt.appendXtra(bv.substr(ni, temp - ni), Number(cv), _parseChange(enums[xi], cv), "", (autoRound && bv.substr(temp + cv.length, 2) === "px"), (xi === 0)); + ni = temp + cv.length; + } + pt["xs" + pt.l] += bv.substr(ni); + } + } + } + //if there are relative values ("+=" or "-=" prefix), we need to adjust the ending value to eliminate the prefixes and combine the values properly. + if (e.indexOf("=") !== -1) if (pt.data) { + str = pt.xs0 + pt.data.s; + for (i = 1; i < pt.l; i++) { + str += pt["xs" + i] + pt.data["xn" + i]; + } + pt.e = str + pt["xs" + i]; + } + if (!pt.l) { + pt.type = -1; + pt.xs0 = pt.e; + } + return pt.xfirst || pt; + }, + i = 9; + + + p = CSSPropTween.prototype; + p.l = p.pr = 0; //length (number of extra properties like xn1, xn2, xn3, etc. + while (--i > 0) { + p["xn" + i] = 0; + p["xs" + i] = ""; + } + p.xs0 = ""; + p._next = p._prev = p.xfirst = p.data = p.plugin = p.setRatio = p.rxp = null; + + + /** + * Appends and extra tweening value to a CSSPropTween and automatically manages any prefix and suffix strings. The first extra value is stored in the s and c of the main CSSPropTween instance, but thereafter any extras are stored in the xn1, xn2, xn3, etc. The prefixes and suffixes are stored in the xs0, xs1, xs2, etc. properties. For example, if I walk through a clip value like "rect(10px, 5px, 0px, 20px)", the values would be stored like this: + * xs0:"rect(", s:10, xs1:"px, ", xn1:5, xs2:"px, ", xn2:0, xs3:"px, ", xn3:20, xn4:"px)" + * And they'd all get joined together when the CSSPlugin renders (in the setRatio() method). + * @param {string=} pfx Prefix (if any) + * @param {!number} s Starting value + * @param {!number} c Change in numeric value over the course of the entire tween. For example, if the start is 5 and the end is 100, the change would be 95. + * @param {string=} sfx Suffix (if any) + * @param {boolean=} r Round (if true). + * @param {boolean=} pad If true, this extra value should be separated by the previous one by a space. If there is no previous extra and pad is true, it will automatically drop the space. + * @return {CSSPropTween} returns itself so that multiple methods can be chained together. + */ + p.appendXtra = function(pfx, s, c, sfx, r, pad) { + var pt = this, + l = pt.l; + pt["xs" + l] += (pad && l) ? " " + pfx : pfx || ""; + if (!c) if (l !== 0 && !pt.plugin) { //typically we'll combine non-changing values right into the xs to optimize performance, but we don't combine them when there's a plugin that will be tweening the values because it may depend on the values being split apart, like for a bezier, if a value doesn't change between the first and second iteration but then it does on the 3rd, we'll run into trouble because there's no xn slot for that value! + pt["xs" + l] += s + (sfx || ""); + return pt; + } + pt.l++; + pt.type = pt.setRatio ? 2 : 1; + pt["xs" + pt.l] = sfx || ""; + if (l > 0) { + pt.data["xn" + l] = s + c; + pt.rxp["xn" + l] = r; //round extra property (we need to tap into this in the _parseToProxy() method) + pt["xn" + l] = s; + if (!pt.plugin) { + pt.xfirst = new CSSPropTween(pt, "xn" + l, s, c, pt.xfirst || pt, 0, pt.n, r, pt.pr); + pt.xfirst.xs0 = 0; //just to ensure that the property stays numeric which helps modern browsers speed up processing. Remember, in the setRatio() method, we do pt.t[pt.p] = val + pt.xs0 so if pt.xs0 is "" (the default), it'll cast the end value as a string. When a property is a number sometimes and a string sometimes, it prevents the compiler from locking in the data type, slowing things down slightly. + } + return pt; + } + pt.data = {s:s + c}; + pt.rxp = {}; + pt.s = s; + pt.c = c; + pt.r = r; + return pt; + }; + + /** + * @constructor A SpecialProp is basically a css property that needs to be treated in a non-standard way, like if it may contain a complex value like boxShadow:"5px 10px 15px rgb(255, 102, 51)" or if it is associated with another plugin like ThrowPropsPlugin or BezierPlugin. Every SpecialProp is associated with a particular property name like "boxShadow" or "throwProps" or "bezier" and it will intercept those values in the vars object that's passed to the CSSPlugin and handle them accordingly. + * @param {!string} p Property name (like "boxShadow" or "throwProps") + * @param {Object=} options An object containing any of the following configuration options: + * - defaultValue: the default value + * - parser: A function that should be called when the associated property name is found in the vars. This function should return a CSSPropTween instance and it should ensure that it is properly inserted into the linked list. It will receive 4 paramters: 1) The target, 2) The value defined in the vars, 3) The CSSPlugin instance (whose _firstPT should be used for the linked list), and 4) A computed style object if one was calculated (this is a speed optimization that allows retrieval of starting values quicker) + * - formatter: a function that formats any value received for this special property (for example, boxShadow could take "5px 5px red" and format it to "5px 5px 0px 0px red" so that both the beginning and ending values have a common order and quantity of values.) + * - prefix: if true, we'll determine whether or not this property requires a vendor prefix (like Webkit or Moz or ms or O) + * - color: set this to true if the value for this SpecialProp may contain color-related values like rgb(), rgba(), etc. + * - priority: priority in the linked list order. Higher priority SpecialProps will be updated before lower priority ones. The default priority is 0. + * - multi: if true, the formatter should accommodate a comma-delimited list of values, like boxShadow could have multiple boxShadows listed out. + * - collapsible: if true, the formatter should treat the value like it's a top/right/bottom/left value that could be collapsed, like "5px" would apply to all, "5px, 10px" would use 5px for top/bottom and 10px for right/left, etc. + * - keyword: a special keyword that can [optionally] be found inside the value (like "inset" for boxShadow). This allows us to validate beginning/ending values to make sure they match (if the keyword is found in one, it'll be added to the other for consistency by default). + */ + var SpecialProp = function(p, options) { + options = options || {}; + this.p = options.prefix ? _checkPropPrefix(p) || p : p; + _specialProps[p] = _specialProps[this.p] = this; + this.format = options.formatter || _getFormatter(options.defaultValue, options.color, options.collapsible, options.multi); + if (options.parser) { + this.parse = options.parser; + } + this.clrs = options.color; + this.multi = options.multi; + this.keyword = options.keyword; + this.dflt = options.defaultValue; + this.pr = options.priority || 0; + }, + + //shortcut for creating a new SpecialProp that can accept multiple properties as a comma-delimited list (helps minification). dflt can be an array for multiple values (we don't do a comma-delimited list because the default value may contain commas, like rect(0px,0px,0px,0px)). We attach this method to the SpecialProp class/object instead of using a private _createSpecialProp() method so that we can tap into it externally if necessary, like from another plugin. + _registerComplexSpecialProp = _internals._registerComplexSpecialProp = function(p, options, defaults) { + if (typeof(options) !== "object") { + options = {parser:defaults}; //to make backwards compatible with older versions of BezierPlugin and ThrowPropsPlugin + } + var a = p.split(","), + d = options.defaultValue, + i, temp; + defaults = defaults || [d]; + for (i = 0; i < a.length; i++) { + options.prefix = (i === 0 && options.prefix); + options.defaultValue = defaults[i] || d; + temp = new SpecialProp(a[i], options); + } + }, + + //creates a placeholder special prop for a plugin so that the property gets caught the first time a tween of it is attempted, and at that time it makes the plugin register itself, thus taking over for all future tweens of that property. This allows us to not mandate that things load in a particular order and it also allows us to log() an error that informs the user when they attempt to tween an external plugin-related property without loading its .js file. + _registerPluginProp = function(p) { + if (!_specialProps[p]) { + var pluginName = p.charAt(0).toUpperCase() + p.substr(1) + "Plugin"; + _registerComplexSpecialProp(p, {parser:function(t, e, p, cssp, pt, plugin, vars) { + var pluginClass = (window.GreenSockGlobals || window).com.greensock.plugins[pluginName]; + if (!pluginClass) { + _log("Error: " + pluginName + " js file not loaded."); + return pt; + } + pluginClass._cssRegister(); + return _specialProps[p].parse(t, e, p, cssp, pt, plugin, vars); + }}); + } + }; + + + p = SpecialProp.prototype; + + /** + * Alias for _parseComplex() that automatically plugs in certain values for this SpecialProp, like its property name, whether or not colors should be sensed, the default value, and priority. It also looks for any keyword that the SpecialProp defines (like "inset" for boxShadow) and ensures that the beginning and ending values have the same number of values for SpecialProps where multi is true (like boxShadow and textShadow can have a comma-delimited list) + * @param {!Object} t target element + * @param {(string|number|object)} b beginning value + * @param {(string|number|object)} e ending (destination) value + * @param {CSSPropTween=} pt next CSSPropTween in the linked list + * @param {TweenPlugin=} plugin If another plugin will be tweening the complex value, that TweenPlugin instance goes here. + * @param {function=} setRatio If a custom setRatio() method should be used to handle this complex value, that goes here. + * @return {CSSPropTween=} First CSSPropTween in the linked list + */ + p.parseComplex = function(t, b, e, pt, plugin, setRatio) { + var kwd = this.keyword, + i, ba, ea, l, bi, ei; + //if this SpecialProp's value can contain a comma-delimited list of values (like boxShadow or textShadow), we must parse them in a special way, and look for a keyword (like "inset" for boxShadow) and ensure that the beginning and ending BOTH have it if the end defines it as such. We also must ensure that there are an equal number of values specified (we can't tween 1 boxShadow to 3 for example) + if (this.multi) if (_commasOutsideParenExp.test(e) || _commasOutsideParenExp.test(b)) { + ba = b.replace(_commasOutsideParenExp, "|").split("|"); + ea = e.replace(_commasOutsideParenExp, "|").split("|"); + } else if (kwd) { + ba = [b]; + ea = [e]; + } + if (ea) { + l = (ea.length > ba.length) ? ea.length : ba.length; + for (i = 0; i < l; i++) { + b = ba[i] = ba[i] || this.dflt; + e = ea[i] = ea[i] || this.dflt; + if (kwd) { + bi = b.indexOf(kwd); + ei = e.indexOf(kwd); + if (bi !== ei) { + e = (ei === -1) ? ea : ba; + e[i] += " " + kwd; + } + } + } + b = ba.join(", "); + e = ea.join(", "); + } + return _parseComplex(t, this.p, b, e, this.clrs, this.dflt, pt, this.pr, plugin, setRatio); + }; + + /** + * Accepts a target and end value and spits back a CSSPropTween that has been inserted into the CSSPlugin's linked list and conforms with all the conventions we use internally, like type:-1, 0, 1, or 2, setting up any extra property tweens, priority, etc. For example, if we have a boxShadow SpecialProp and call: + * this._firstPT = sp.parse(element, "5px 10px 20px rgb(2550,102,51)", "boxShadow", this); + * It should figure out the starting value of the element's boxShadow, compare it to the provided end value and create all the necessary CSSPropTweens of the appropriate types to tween the boxShadow. The CSSPropTween that gets spit back should already be inserted into the linked list (the 4th parameter is the current head, so prepend to that). + * @param {!Object} t Target object whose property is being tweened + * @param {Object} e End value as provided in the vars object (typically a string, but not always - like a throwProps would be an object). + * @param {!string} p Property name + * @param {!CSSPlugin} cssp The CSSPlugin instance that should be associated with this tween. + * @param {?CSSPropTween} pt The CSSPropTween that is the current head of the linked list (we'll prepend to it) + * @param {TweenPlugin=} plugin If a plugin will be used to tween the parsed value, this is the plugin instance. + * @param {Object=} vars Original vars object that contains the data for parsing. + * @return {CSSPropTween} The first CSSPropTween in the linked list which includes the new one(s) added by the parse() call. + */ + p.parse = function(t, e, p, cssp, pt, plugin, vars) { + return this.parseComplex(t.style, this.format(_getStyle(t, this.p, _cs, false, this.dflt)), this.format(e), pt, plugin); + }; + + /** + * Registers a special property that should be intercepted from any "css" objects defined in tweens. This allows you to handle them however you want without CSSPlugin doing it for you. The 2nd parameter should be a function that accepts 3 parameters: + * 1) Target object whose property should be tweened (typically a DOM element) + * 2) The end/destination value (could be a string, number, object, or whatever you want) + * 3) The tween instance (you probably don't need to worry about this, but it can be useful for looking up information like the duration) + * + * Then, your function should return a function which will be called each time the tween gets rendered, passing a numeric "ratio" parameter to your function that indicates the change factor (usually between 0 and 1). For example: + * + * CSSPlugin.registerSpecialProp("myCustomProp", function(target, value, tween) { + * var start = target.style.width; + * return function(ratio) { + * target.style.width = (start + value * ratio) + "px"; + * console.log("set width to " + target.style.width); + * } + * }, 0); + * + * Then, when I do this tween, it will trigger my special property: + * + * TweenLite.to(element, 1, {css:{myCustomProp:100}}); + * + * In the example, of course, we're just changing the width, but you can do anything you want. + * + * @param {!string} name Property name (or comma-delimited list of property names) that should be intercepted and handled by your function. For example, if I define "myCustomProp", then it would handle that portion of the following tween: TweenLite.to(element, 1, {css:{myCustomProp:100}}) + * @param {!function(Object, Object, Object, string):function(number)} onInitTween The function that will be called when a tween of this special property is performed. The function will receive 4 parameters: 1) Target object that should be tweened, 2) Value that was passed to the tween, 3) The tween instance itself (rarely used), and 4) The property name that's being tweened. Your function should return a function that should be called on every update of the tween. That function will receive a single parameter that is a "change factor" value (typically between 0 and 1) indicating the amount of change as a ratio. You can use this to determine how to set the values appropriately in your function. + * @param {number=} priority Priority that helps the engine determine the order in which to set the properties (default: 0). Higher priority properties will be updated before lower priority ones. + */ + CSSPlugin.registerSpecialProp = function(name, onInitTween, priority) { + _registerComplexSpecialProp(name, {parser:function(t, e, p, cssp, pt, plugin, vars) { + var rv = new CSSPropTween(t, p, 0, 0, pt, 2, p, false, priority); + rv.plugin = plugin; + rv.setRatio = onInitTween(t, e, cssp._tween, p); + return rv; + }, priority:priority}); + }; + + + + + + + + + //transform-related methods and properties + var _transformProps = ("scaleX,scaleY,scaleZ,x,y,z,skewX,skewY,rotation,rotationX,rotationY,perspective").split(","), + _transformProp = _checkPropPrefix("transform"), //the Javascript (camelCase) transform property, like msTransform, WebkitTransform, MozTransform, or OTransform. + _transformPropCSS = _prefixCSS + "transform", + _transformOriginProp = _checkPropPrefix("transformOrigin"), + _supports3D = (_checkPropPrefix("perspective") !== null), + Transform = _internals.Transform = function() { + this.skewY = 0; + }, + + /** + * Parses the transform values for an element, returning an object with x, y, z, scaleX, scaleY, scaleZ, rotation, rotationX, rotationY, skewX, and skewY properties. Note: by default (for performance reasons), all skewing is combined into skewX and rotation but skewY still has a place in the transform object so that we can record how much of the skew is attributed to skewX vs skewY. Remember, a skewY of 10 looks the same as a rotation of 10 and skewX of -10. + * @param {!Object} t target element + * @param {Object=} cs computed style object (optional) + * @param {boolean=} rec if true, the transform values will be recorded to the target element's _gsTransform object, like target._gsTransform = {x:0, y:0, z:0, scaleX:1...} + * @param {boolean=} parse if true, we'll ignore any _gsTransform values that already exist on the element, and force a reparsing of the css (calculated style) + * @return {object} object containing all of the transform properties/values like {x:0, y:0, z:0, scaleX:1...} + */ + _getTransform = _internals.getTransform = function(t, cs, rec, parse) { + if (t._gsTransform && rec && !parse) { + return t._gsTransform; //if the element already has a _gsTransform, use that. Note: some browsers don't accurately return the calculated style for the transform (particularly for SVG), so it's almost always safest to just use the values we've already applied rather than re-parsing things. + } + var tm = rec ? t._gsTransform || new Transform() : new Transform(), + invX = (tm.scaleX < 0), //in order to interpret things properly, we need to know if the user applied a negative scaleX previously so that we can adjust the rotation and skewX accordingly. Otherwise, if we always interpret a flipped matrix as affecting scaleY and the user only wants to tween the scaleX on multiple sequential tweens, it would keep the negative scaleY without that being the user's intent. + min = 0.00002, + rnd = 100000, + minAngle = 179.99, + minPI = minAngle * _DEG2RAD, + zOrigin = _supports3D ? parseFloat(_getStyle(t, _transformOriginProp, cs, false, "0 0 0").split(" ")[2]) || tm.zOrigin || 0 : 0, + s, m, i, n, dec, scaleX, scaleY, rotation, skewX, difX, difY, difR, difS; + if (_transformProp) { + s = _getStyle(t, _transformPropCSS, cs, true); + } else if (t.currentStyle) { + //for older versions of IE, we need to interpret the filter portion that is in the format: progid:DXImageTransform.Microsoft.Matrix(M11=6.123233995736766e-17, M12=-1, M21=1, M22=6.123233995736766e-17, sizingMethod='auto expand') Notice that we need to swap b and c compared to a normal matrix. + s = t.currentStyle.filter.match(_ieGetMatrixExp); + s = (s && s.length === 4) ? [s[0].substr(4), Number(s[2].substr(4)), Number(s[1].substr(4)), s[3].substr(4), (tm.x || 0), (tm.y || 0)].join(",") : ""; + } + //split the matrix values out into an array (m for matrix) + m = (s || "").match(/(?:\-|\b)[\d\-\.e]+\b/gi) || []; + i = m.length; + while (--i > -1) { + n = Number(m[i]); + m[i] = (dec = n - (n |= 0)) ? ((dec * rnd + (dec < 0 ? -0.5 : 0.5)) | 0) / rnd + n : n; //convert strings to Numbers and round to 5 decimal places to avoid issues with tiny numbers. Roughly 20x faster than Number.toFixed(). We also must make sure to round before dividing so that values like 0.9999999999 become 1 to avoid glitches in browser rendering and interpretation of flipped/rotated 3D matrices. And don't just multiply the number by rnd, floor it, and then divide by rnd because the bitwise operations max out at a 32-bit signed integer, thus it could get clipped at a relatively low value (like 22,000.00000 for example). + } + if (m.length === 16) { + + //we'll only look at these position-related 6 variables first because if x/y/z all match, it's relatively safe to assume we don't need to re-parse everything which risks losing important rotational information (like rotationX:180 plus rotationY:180 would look the same as rotation:180 - there's no way to know for sure which direction was taken based solely on the matrix3d() values) + var a13 = m[8], a23 = m[9], a33 = m[10], + a14 = m[12], a24 = m[13], a34 = m[14]; + + //we manually compensate for non-zero z component of transformOrigin to work around bugs in Safari + if (tm.zOrigin) { + a34 = -tm.zOrigin; + a14 = a13*a34-m[12]; + a24 = a23*a34-m[13]; + a34 = a33*a34+tm.zOrigin-m[14]; + } + + //only parse from the matrix if we MUST because not only is it usually unnecessary due to the fact that we store the values in the _gsTransform object, but also because it's impossible to accurately interpret rotationX, rotationY, rotationZ, scaleX, and scaleY if all are applied, so it's much better to rely on what we store. However, we must parse the first time that an object is tweened. We also assume that if the position has changed, the user must have done some styling changes outside of CSSPlugin, thus we force a parse in that scenario. + if (!rec || parse || tm.rotationX == null) { + var a11 = m[0], a21 = m[1], a31 = m[2], a41 = m[3], + a12 = m[4], a22 = m[5], a32 = m[6], a42 = m[7], + a43 = m[11], + angle = Math.atan2(a32, a33), + xFlip = (angle < -minPI || angle > minPI), + t1, t2, t3, cos, sin, yFlip, zFlip; + tm.rotationX = angle * _RAD2DEG; + //rotationX + if (angle) { + cos = Math.cos(-angle); + sin = Math.sin(-angle); + t1 = a12*cos+a13*sin; + t2 = a22*cos+a23*sin; + t3 = a32*cos+a33*sin; + a13 = a12*-sin+a13*cos; + a23 = a22*-sin+a23*cos; + a33 = a32*-sin+a33*cos; + a43 = a42*-sin+a43*cos; + a12 = t1; + a22 = t2; + a32 = t3; + } + //rotationY + angle = Math.atan2(a13, a11); + tm.rotationY = angle * _RAD2DEG; + if (angle) { + yFlip = (angle < -minPI || angle > minPI); + cos = Math.cos(-angle); + sin = Math.sin(-angle); + t1 = a11*cos-a13*sin; + t2 = a21*cos-a23*sin; + t3 = a31*cos-a33*sin; + a23 = a21*sin+a23*cos; + a33 = a31*sin+a33*cos; + a43 = a41*sin+a43*cos; + a11 = t1; + a21 = t2; + a31 = t3; + } + //rotationZ + angle = Math.atan2(a21, a22); + tm.rotation = angle * _RAD2DEG; + if (angle) { + zFlip = (angle < -minPI || angle > minPI); + cos = Math.cos(-angle); + sin = Math.sin(-angle); + a11 = a11*cos+a12*sin; + t2 = a21*cos+a22*sin; + a22 = a21*-sin+a22*cos; + a32 = a31*-sin+a32*cos; + a21 = t2; + } + + if (zFlip && xFlip) { + tm.rotation = tm.rotationX = 0; + } else if (zFlip && yFlip) { + tm.rotation = tm.rotationY = 0; + } else if (yFlip && xFlip) { + tm.rotationY = tm.rotationX = 0; + } + + tm.scaleX = ((Math.sqrt(a11 * a11 + a21 * a21) * rnd + 0.5) | 0) / rnd; + tm.scaleY = ((Math.sqrt(a22 * a22 + a23 * a23) * rnd + 0.5) | 0) / rnd; + tm.scaleZ = ((Math.sqrt(a32 * a32 + a33 * a33) * rnd + 0.5) | 0) / rnd; + tm.skewX = 0; + tm.perspective = a43 ? 1 / ((a43 < 0) ? -a43 : a43) : 0; + tm.x = a14; + tm.y = a24; + tm.z = a34; + } + + } else if ((!_supports3D || parse || !m.length || tm.x !== m[4] || tm.y !== m[5] || (!tm.rotationX && !tm.rotationY)) && !(tm.x !== undefined && _getStyle(t, "display", cs) === "none")) { //sometimes a 6-element matrix is returned even when we performed 3D transforms, like if rotationX and rotationY are 180. In cases like this, we still need to honor the 3D transforms. If we just rely on the 2D info, it could affect how the data is interpreted, like scaleY might get set to -1 or rotation could get offset by 180 degrees. For example, do a TweenLite.to(element, 1, {css:{rotationX:180, rotationY:180}}) and then later, TweenLite.to(element, 1, {css:{rotationX:0}}) and without this conditional logic in place, it'd jump to a state of being unrotated when the 2nd tween starts. Then again, we need to honor the fact that the user COULD alter the transforms outside of CSSPlugin, like by manually applying new css, so we try to sense that by looking at x and y because if those changed, we know the changes were made outside CSSPlugin and we force a reinterpretation of the matrix values. Also, in Webkit browsers, if the element's "display" is "none", its calculated style value will always return empty, so if we've already recorded the values in the _gsTransform object, we'll just rely on those. + var k = (m.length >= 6), + a = k ? m[0] : 1, + b = m[1] || 0, + c = m[2] || 0, + d = k ? m[3] : 1; + tm.x = m[4] || 0; + tm.y = m[5] || 0; + scaleX = Math.sqrt(a * a + b * b); + scaleY = Math.sqrt(d * d + c * c); + rotation = (a || b) ? Math.atan2(b, a) * _RAD2DEG : tm.rotation || 0; //note: if scaleX is 0, we cannot accurately measure rotation. Same for skewX with a scaleY of 0. Therefore, we default to the previously recorded value (or zero if that doesn't exist). + skewX = (c || d) ? Math.atan2(c, d) * _RAD2DEG + rotation : tm.skewX || 0; + difX = scaleX - Math.abs(tm.scaleX || 0); + difY = scaleY - Math.abs(tm.scaleY || 0); + if (Math.abs(skewX) > 90 && Math.abs(skewX) < 270) { + if (invX) { + scaleX *= -1; + skewX += (rotation <= 0) ? 180 : -180; + rotation += (rotation <= 0) ? 180 : -180; + } else { + scaleY *= -1; + skewX += (skewX <= 0) ? 180 : -180; + } + } + difR = (rotation - tm.rotation) % 180; //note: matching ranges would be very small (+/-0.0001) or very close to 180. + difS = (skewX - tm.skewX) % 180; + //if there's already a recorded _gsTransform in place for the target, we should leave those values in place unless we know things changed for sure (beyond a super small amount). This gets around ambiguous interpretations, like if scaleX and scaleY are both -1, the matrix would be the same as if the rotation was 180 with normal scaleX/scaleY. If the user tweened to particular values, those must be prioritized to ensure animation is consistent. + if (tm.skewX === undefined || difX > min || difX < -min || difY > min || difY < -min || (difR > -minAngle && difR < minAngle && (difR * rnd) | 0 !== 0) || (difS > -minAngle && difS < minAngle && (difS * rnd) | 0 !== 0)) { + tm.scaleX = scaleX; + tm.scaleY = scaleY; + tm.rotation = rotation; + tm.skewX = skewX; + } + if (_supports3D) { + tm.rotationX = tm.rotationY = tm.z = 0; + tm.perspective = parseFloat(CSSPlugin.defaultTransformPerspective) || 0; + tm.scaleZ = 1; + } + } + tm.zOrigin = zOrigin; + + //some browsers have a hard time with very small values like 2.4492935982947064e-16 (notice the "e-" towards the end) and would render the object slightly off. So we round to 0 in these cases. The conditional logic here is faster than calling Math.abs(). Also, browsers tend to render a SLIGHTLY rotated object in a fuzzy way, so we need to snap to exactly 0 when appropriate. + for (i in tm) { + if (tm[i] < min) if (tm[i] > -min) { + tm[i] = 0; + } + } + //DEBUG: _log("parsed rotation: "+(tm.rotationX)+", "+(tm.rotationY)+", "+(tm.rotation)+", scale: "+tm.scaleX+", "+tm.scaleY+", "+tm.scaleZ+", position: "+tm.x+", "+tm.y+", "+tm.z+", perspective: "+tm.perspective); + if (rec) { + t._gsTransform = tm; //record to the object's _gsTransform which we use so that tweens can control individual properties independently (we need all the properties to accurately recompose the matrix in the setRatio() method) + } + return tm; + }, + + //for setting 2D transforms in IE6, IE7, and IE8 (must use a "filter" to emulate the behavior of modern day browser transforms) + _setIETransformRatio = function(v) { + var t = this.data, //refers to the element's _gsTransform object + ang = -t.rotation * _DEG2RAD, + skew = ang + t.skewX * _DEG2RAD, + rnd = 100000, + a = ((Math.cos(ang) * t.scaleX * rnd) | 0) / rnd, + b = ((Math.sin(ang) * t.scaleX * rnd) | 0) / rnd, + c = ((Math.sin(skew) * -t.scaleY * rnd) | 0) / rnd, + d = ((Math.cos(skew) * t.scaleY * rnd) | 0) / rnd, + style = this.t.style, + cs = this.t.currentStyle, + filters, val; + if (!cs) { + return; + } + val = b; //just for swapping the variables an inverting them (reused "val" to avoid creating another variable in memory). IE's filter matrix uses a non-standard matrix configuration (angle goes the opposite way, and b and c are reversed and inverted) + b = -c; + c = -val; + filters = cs.filter; + style.filter = ""; //remove filters so that we can accurately measure offsetWidth/offsetHeight + var w = this.t.offsetWidth, + h = this.t.offsetHeight, + clip = (cs.position !== "absolute"), + m = "progid:DXImageTransform.Microsoft.Matrix(M11=" + a + ", M12=" + b + ", M21=" + c + ", M22=" + d, + ox = t.x, + oy = t.y, + dx, dy; + + //if transformOrigin is being used, adjust the offset x and y + if (t.ox != null) { + dx = ((t.oxp) ? w * t.ox * 0.01 : t.ox) - w / 2; + dy = ((t.oyp) ? h * t.oy * 0.01 : t.oy) - h / 2; + ox += dx - (dx * a + dy * b); + oy += dy - (dx * c + dy * d); + } + + if (!clip) { + m += ", sizingMethod='auto expand')"; + } else { + dx = (w / 2); + dy = (h / 2); + //translate to ensure that transformations occur around the correct origin (default is center). + m += ", Dx=" + (dx - (dx * a + dy * b) + ox) + ", Dy=" + (dy - (dx * c + dy * d) + oy) + ")"; + } + if (filters.indexOf("DXImageTransform.Microsoft.Matrix(") !== -1) { + style.filter = filters.replace(_ieSetMatrixExp, m); + } else { + style.filter = m + " " + filters; //we must always put the transform/matrix FIRST (before alpha(opacity=xx)) to avoid an IE bug that slices part of the object when rotation is applied with alpha. + } + + //at the end or beginning of the tween, if the matrix is normal (1, 0, 0, 1) and opacity is 100 (or doesn't exist), remove the filter to improve browser performance. + if (v === 0 || v === 1) if (a === 1) if (b === 0) if (c === 0) if (d === 1) if (!clip || m.indexOf("Dx=0, Dy=0") !== -1) if (!_opacityExp.test(filters) || parseFloat(RegExp.$1) === 100) if (filters.indexOf("gradient(" && filters.indexOf("Alpha")) === -1) { + style.removeAttribute("filter"); + } + + //we must set the margins AFTER applying the filter in order to avoid some bugs in IE8 that could (in rare scenarios) cause them to be ignored intermittently (vibration). + if (!clip) { + var mult = (_ieVers < 8) ? 1 : -1, //in Internet Explorer 7 and before, the box model is broken, causing the browser to treat the width/height of the actual rotated filtered image as the width/height of the box itself, but Microsoft corrected that in IE8. We must use a negative offset in IE8 on the right/bottom + marg, prop, dif; + dx = t.ieOffsetX || 0; + dy = t.ieOffsetY || 0; + t.ieOffsetX = Math.round((w - ((a < 0 ? -a : a) * w + (b < 0 ? -b : b) * h)) / 2 + ox); + t.ieOffsetY = Math.round((h - ((d < 0 ? -d : d) * h + (c < 0 ? -c : c) * w)) / 2 + oy); + for (i = 0; i < 4; i++) { + prop = _margins[i]; + marg = cs[prop]; + //we need to get the current margin in case it is being tweened separately (we want to respect that tween's changes) + val = (marg.indexOf("px") !== -1) ? parseFloat(marg) : _convertToPixels(this.t, prop, parseFloat(marg), marg.replace(_suffixExp, "")) || 0; + if (val !== t[prop]) { + dif = (i < 2) ? -t.ieOffsetX : -t.ieOffsetY; //if another tween is controlling a margin, we cannot only apply the difference in the ieOffsets, so we essentially zero-out the dx and dy here in that case. We record the margin(s) later so that we can keep comparing them, making this code very flexible. + } else { + dif = (i < 2) ? dx - t.ieOffsetX : dy - t.ieOffsetY; + } + style[prop] = (t[prop] = Math.round( val - dif * ((i === 0 || i === 2) ? 1 : mult) )) + "px"; + } + } + }, + + _set3DTransformRatio = _internals.set3DTransformRatio = function(v) { + var t = this.data, //refers to the element's _gsTransform object + style = this.t.style, + angle = t.rotation * _DEG2RAD, + sx = t.scaleX, + sy = t.scaleY, + sz = t.scaleZ, + perspective = t.perspective, + a11, a12, a13, a14, a21, a22, a23, a24, a31, a32, a33, a34, a41, a42, a43, + zOrigin, rnd, cos, sin, t1, t2, t3, t4; + if (v === 1 || v === 0) if (t.force3D === "auto") if (!t.rotationY && !t.rotationX && sz === 1 && !perspective && !t.z) { //on the final render (which could be 0 for a from tween), if there are no 3D aspects, render in 2D to free up memory and improve performance especially on mobile devices + _set2DTransformRatio.call(this, v); + return; + } + if (_isFirefox) { + var n = 0.0001; + if (sx < n && sx > -n) { //Firefox has a bug (at least in v25) that causes it to render the transparent part of 32-bit PNG images as black when displayed inside an iframe and the 3D scale is very small and doesn't change sufficiently enough between renders (like if you use a Power4.easeInOut to scale from 0 to 1 where the beginning values only change a tiny amount to begin the tween before accelerating). In this case, we force the scale to be 0.00002 instead which is visually the same but works around the Firefox issue. + sx = sz = 0.00002; + } + if (sy < n && sy > -n) { + sy = sz = 0.00002; + } + if (perspective && !t.z && !t.rotationX && !t.rotationY) { //Firefox has a bug that causes elements to have an odd super-thin, broken/dotted black border on elements that have a perspective set but aren't utilizing 3D space (no rotationX, rotationY, or z). + perspective = 0; + } + } + if (angle || t.skewX) { + cos = Math.cos(angle); + sin = Math.sin(angle); + a11 = cos; + a21 = sin; + if (t.skewX) { + angle -= t.skewX * _DEG2RAD; + cos = Math.cos(angle); + sin = Math.sin(angle); + if (t.skewType === "simple") { //by default, we compensate skewing on the other axis to make it look more natural, but you can set the skewType to "simple" to use the uncompensated skewing that CSS does + t1 = Math.tan(t.skewX * _DEG2RAD); + t1 = Math.sqrt(1 + t1 * t1); + cos *= t1; + sin *= t1; + } + } + a12 = -sin; + a22 = cos; + + } else if (!t.rotationY && !t.rotationX && sz === 1 && !perspective) { //if we're only translating and/or 2D scaling, this is faster... + style[_transformProp] = "translate3d(" + t.x + "px," + t.y + "px," + t.z +"px)" + ((sx !== 1 || sy !== 1) ? " scale(" + sx + "," + sy + ")" : ""); + return; + } else { + a11 = a22 = 1; + a12 = a21 = 0; + } + a33 = 1; + a13 = a14 = a23 = a24 = a31 = a32 = a34 = a41 = a42 = 0; + a43 = (perspective) ? -1 / perspective : 0; + zOrigin = t.zOrigin; + rnd = 100000; + angle = t.rotationY * _DEG2RAD; + if (angle) { + cos = Math.cos(angle); + sin = Math.sin(angle); + a31 = a33*-sin; + a41 = a43*-sin; + a13 = a11*sin; + a23 = a21*sin; + a33 *= cos; + a43 *= cos; + a11 *= cos; + a21 *= cos; + } + angle = t.rotationX * _DEG2RAD; + if (angle) { + cos = Math.cos(angle); + sin = Math.sin(angle); + t1 = a12*cos+a13*sin; + t2 = a22*cos+a23*sin; + t3 = a32*cos+a33*sin; + t4 = a42*cos+a43*sin; + a13 = a12*-sin+a13*cos; + a23 = a22*-sin+a23*cos; + a33 = a32*-sin+a33*cos; + a43 = a42*-sin+a43*cos; + a12 = t1; + a22 = t2; + a32 = t3; + a42 = t4; + } + if (sz !== 1) { + a13*=sz; + a23*=sz; + a33*=sz; + a43*=sz; + } + if (sy !== 1) { + a12*=sy; + a22*=sy; + a32*=sy; + a42*=sy; + } + if (sx !== 1) { + a11*=sx; + a21*=sx; + a31*=sx; + a41*=sx; + } + if (zOrigin) { + a34 -= zOrigin; + a14 = a13*a34; + a24 = a23*a34; + a34 = a33*a34+zOrigin; + } + //we round the x, y, and z slightly differently to allow even larger values. + a14 = (t1 = (a14 += t.x) - (a14 |= 0)) ? ((t1 * rnd + (t1 < 0 ? -0.5 : 0.5)) | 0) / rnd + a14 : a14; + a24 = (t1 = (a24 += t.y) - (a24 |= 0)) ? ((t1 * rnd + (t1 < 0 ? -0.5 : 0.5)) | 0) / rnd + a24 : a24; + a34 = (t1 = (a34 += t.z) - (a34 |= 0)) ? ((t1 * rnd + (t1 < 0 ? -0.5 : 0.5)) | 0) / rnd + a34 : a34; + style[_transformProp] = "matrix3d(" + [ (((a11 * rnd) | 0) / rnd), (((a21 * rnd) | 0) / rnd), (((a31 * rnd) | 0) / rnd), (((a41 * rnd) | 0) / rnd), (((a12 * rnd) | 0) / rnd), (((a22 * rnd) | 0) / rnd), (((a32 * rnd) | 0) / rnd), (((a42 * rnd) | 0) / rnd), (((a13 * rnd) | 0) / rnd), (((a23 * rnd) | 0) / rnd), (((a33 * rnd) | 0) / rnd), (((a43 * rnd) | 0) / rnd), a14, a24, a34, (perspective ? (1 + (-a34 / perspective)) : 1) ].join(",") + ")"; + }, + + _set2DTransformRatio = _internals.set2DTransformRatio = function(v) { + var t = this.data, //refers to the element's _gsTransform object + targ = this.t, + style = targ.style, + ang, skew, rnd, sx, sy; + if (t.rotationX || t.rotationY || t.z || t.force3D === true || (t.force3D === "auto" && v !== 1 && v !== 0)) { //if a 3D tween begins while a 2D one is running, we need to kick the rendering over to the 3D method. For example, imagine a yoyo-ing, infinitely repeating scale tween running, and then the object gets rotated in 3D space with a different tween. + this.setRatio = _set3DTransformRatio; + _set3DTransformRatio.call(this, v); + return; + } + if (!t.rotation && !t.skewX) { + style[_transformProp] = "matrix(" + t.scaleX + ",0,0," + t.scaleY + "," + t.x + "," + t.y + ")"; + } else { + ang = t.rotation * _DEG2RAD; + skew = ang - t.skewX * _DEG2RAD; + rnd = 100000; + sx = t.scaleX * rnd; + sy = t.scaleY * rnd; + //some browsers have a hard time with very small values like 2.4492935982947064e-16 (notice the "e-" towards the end) and would render the object slightly off. So we round to 5 decimal places. + style[_transformProp] = "matrix(" + (((Math.cos(ang) * sx) | 0) / rnd) + "," + (((Math.sin(ang) * sx) | 0) / rnd) + "," + (((Math.sin(skew) * -sy) | 0) / rnd) + "," + (((Math.cos(skew) * sy) | 0) / rnd) + "," + t.x + "," + t.y + ")"; + } + }; + + _registerComplexSpecialProp("transform,scale,scaleX,scaleY,scaleZ,x,y,z,rotation,rotationX,rotationY,rotationZ,skewX,skewY,shortRotation,shortRotationX,shortRotationY,shortRotationZ,transformOrigin,transformPerspective,directionalRotation,parseTransform,force3D,skewType", {parser:function(t, e, p, cssp, pt, plugin, vars) { + if (cssp._transform) { return pt; } //only need to parse the transform once, and only if the browser supports it. + var m1 = cssp._transform = _getTransform(t, _cs, true, vars.parseTransform), + style = t.style, + min = 0.000001, + i = _transformProps.length, + v = vars, + endRotations = {}, + m2, skewY, copy, orig, has3D, hasChange, dr; + if (typeof(v.transform) === "string" && _transformProp) { //for values like transform:"rotate(60deg) scale(0.5, 0.8)" + copy = _tempDiv.style; //don't use the original target because it might be SVG in which case some browsers don't report computed style correctly. + copy[_transformProp] = v.transform; + copy.display = "block"; //if display is "none", the browser often refuses to report the transform properties correctly. + copy.position = "absolute"; + _doc.body.appendChild(_tempDiv); + m2 = _getTransform(_tempDiv, null, false); + _doc.body.removeChild(_tempDiv); + } else if (typeof(v) === "object") { //for values like scaleX, scaleY, rotation, x, y, skewX, and skewY or transform:{...} (object) + m2 = {scaleX:_parseVal((v.scaleX != null) ? v.scaleX : v.scale, m1.scaleX), + scaleY:_parseVal((v.scaleY != null) ? v.scaleY : v.scale, m1.scaleY), + scaleZ:_parseVal(v.scaleZ, m1.scaleZ), + x:_parseVal(v.x, m1.x), + y:_parseVal(v.y, m1.y), + z:_parseVal(v.z, m1.z), + perspective:_parseVal(v.transformPerspective, m1.perspective)}; + dr = v.directionalRotation; + if (dr != null) { + if (typeof(dr) === "object") { + for (copy in dr) { + v[copy] = dr[copy]; + } + } else { + v.rotation = dr; + } + } + m2.rotation = _parseAngle(("rotation" in v) ? v.rotation : ("shortRotation" in v) ? v.shortRotation + "_short" : ("rotationZ" in v) ? v.rotationZ : m1.rotation, m1.rotation, "rotation", endRotations); + if (_supports3D) { + m2.rotationX = _parseAngle(("rotationX" in v) ? v.rotationX : ("shortRotationX" in v) ? v.shortRotationX + "_short" : m1.rotationX || 0, m1.rotationX, "rotationX", endRotations); + m2.rotationY = _parseAngle(("rotationY" in v) ? v.rotationY : ("shortRotationY" in v) ? v.shortRotationY + "_short" : m1.rotationY || 0, m1.rotationY, "rotationY", endRotations); + } + m2.skewX = (v.skewX == null) ? m1.skewX : _parseAngle(v.skewX, m1.skewX); + + //note: for performance reasons, we combine all skewing into the skewX and rotation values, ignoring skewY but we must still record it so that we can discern how much of the overall skew is attributed to skewX vs. skewY. Otherwise, if the skewY would always act relative (tween skewY to 10deg, for example, multiple times and if we always combine things into skewX, we can't remember that skewY was 10 from last time). Remember, a skewY of 10 degrees looks the same as a rotation of 10 degrees plus a skewX of -10 degrees. + m2.skewY = (v.skewY == null) ? m1.skewY : _parseAngle(v.skewY, m1.skewY); + if ((skewY = m2.skewY - m1.skewY)) { + m2.skewX += skewY; + m2.rotation += skewY; + } + } + + if (_supports3D && v.force3D != null) { + m1.force3D = v.force3D; + hasChange = true; + } + + m1.skewType = v.skewType || m1.skewType || CSSPlugin.defaultSkewType; + + has3D = (m1.force3D || m1.z || m1.rotationX || m1.rotationY || m2.z || m2.rotationX || m2.rotationY || m2.perspective); + if (!has3D && v.scale != null) { + m2.scaleZ = 1; //no need to tween scaleZ. + } + + while (--i > -1) { + p = _transformProps[i]; + orig = m2[p] - m1[p]; + if (orig > min || orig < -min || _forcePT[p] != null) { + hasChange = true; + pt = new CSSPropTween(m1, p, m1[p], orig, pt); + if (p in endRotations) { + pt.e = endRotations[p]; //directional rotations typically have compensated values during the tween, but we need to make sure they end at exactly what the user requested + } + pt.xs0 = 0; //ensures the value stays numeric in setRatio() + pt.plugin = plugin; + cssp._overwriteProps.push(pt.n); + } + } + + orig = v.transformOrigin; + if (orig || (_supports3D && has3D && m1.zOrigin)) { //if anything 3D is happening and there's a transformOrigin with a z component that's non-zero, we must ensure that the transformOrigin's z-component is set to 0 so that we can manually do those calculations to get around Safari bugs. Even if the user didn't specifically define a "transformOrigin" in this particular tween (maybe they did it via css directly). + if (_transformProp) { + hasChange = true; + p = _transformOriginProp; + orig = (orig || _getStyle(t, p, _cs, false, "50% 50%")) + ""; //cast as string to avoid errors + pt = new CSSPropTween(style, p, 0, 0, pt, -1, "transformOrigin"); + pt.b = style[p]; + pt.plugin = plugin; + if (_supports3D) { + copy = m1.zOrigin; + orig = orig.split(" "); + m1.zOrigin = ((orig.length > 2 && !(copy !== 0 && orig[2] === "0px")) ? parseFloat(orig[2]) : copy) || 0; //Safari doesn't handle the z part of transformOrigin correctly, so we'll manually handle it in the _set3DTransformRatio() method. + pt.xs0 = pt.e = orig[0] + " " + (orig[1] || "50%") + " 0px"; //we must define a z value of 0px specifically otherwise iOS 5 Safari will stick with the old one (if one was defined)! + pt = new CSSPropTween(m1, "zOrigin", 0, 0, pt, -1, pt.n); //we must create a CSSPropTween for the _gsTransform.zOrigin so that it gets reset properly at the beginning if the tween runs backward (as opposed to just setting m1.zOrigin here) + pt.b = copy; + pt.xs0 = pt.e = m1.zOrigin; + } else { + pt.xs0 = pt.e = orig; + } + + //for older versions of IE (6-8), we need to manually calculate things inside the setRatio() function. We record origin x and y (ox and oy) and whether or not the values are percentages (oxp and oyp). + } else { + _parsePosition(orig + "", m1); + } + } + + if (hasChange) { + cssp._transformType = (has3D || this._transformType === 3) ? 3 : 2; //quicker than calling cssp._enableTransforms(); + } + return pt; + }, prefix:true}); + + _registerComplexSpecialProp("boxShadow", {defaultValue:"0px 0px 0px 0px #999", prefix:true, color:true, multi:true, keyword:"inset"}); + + _registerComplexSpecialProp("borderRadius", {defaultValue:"0px", parser:function(t, e, p, cssp, pt, plugin) { + e = this.format(e); + var props = ["borderTopLeftRadius","borderTopRightRadius","borderBottomRightRadius","borderBottomLeftRadius"], + style = t.style, + ea1, i, es2, bs2, bs, es, bn, en, w, h, esfx, bsfx, rel, hn, vn, em; + w = parseFloat(t.offsetWidth); + h = parseFloat(t.offsetHeight); + ea1 = e.split(" "); + for (i = 0; i < props.length; i++) { //if we're dealing with percentages, we must convert things separately for the horizontal and vertical axis! + if (this.p.indexOf("border")) { //older browsers used a prefix + props[i] = _checkPropPrefix(props[i]); + } + bs = bs2 = _getStyle(t, props[i], _cs, false, "0px"); + if (bs.indexOf(" ") !== -1) { + bs2 = bs.split(" "); + bs = bs2[0]; + bs2 = bs2[1]; + } + es = es2 = ea1[i]; + bn = parseFloat(bs); + bsfx = bs.substr((bn + "").length); + rel = (es.charAt(1) === "="); + if (rel) { + en = parseInt(es.charAt(0)+"1", 10); + es = es.substr(2); + en *= parseFloat(es); + esfx = es.substr((en + "").length - (en < 0 ? 1 : 0)) || ""; + } else { + en = parseFloat(es); + esfx = es.substr((en + "").length); + } + if (esfx === "") { + esfx = _suffixMap[p] || bsfx; + } + if (esfx !== bsfx) { + hn = _convertToPixels(t, "borderLeft", bn, bsfx); //horizontal number (we use a bogus "borderLeft" property just because the _convertToPixels() method searches for the keywords "Left", "Right", "Top", and "Bottom" to determine of it's a horizontal or vertical property, and we need "border" in the name so that it knows it should measure relative to the element itself, not its parent. + vn = _convertToPixels(t, "borderTop", bn, bsfx); //vertical number + if (esfx === "%") { + bs = (hn / w * 100) + "%"; + bs2 = (vn / h * 100) + "%"; + } else if (esfx === "em") { + em = _convertToPixels(t, "borderLeft", 1, "em"); + bs = (hn / em) + "em"; + bs2 = (vn / em) + "em"; + } else { + bs = hn + "px"; + bs2 = vn + "px"; + } + if (rel) { + es = (parseFloat(bs) + en) + esfx; + es2 = (parseFloat(bs2) + en) + esfx; + } + } + pt = _parseComplex(style, props[i], bs + " " + bs2, es + " " + es2, false, "0px", pt); + } + return pt; + }, prefix:true, formatter:_getFormatter("0px 0px 0px 0px", false, true)}); + _registerComplexSpecialProp("backgroundPosition", {defaultValue:"0 0", parser:function(t, e, p, cssp, pt, plugin) { + var bp = "background-position", + cs = (_cs || _getComputedStyle(t, null)), + bs = this.format( ((cs) ? _ieVers ? cs.getPropertyValue(bp + "-x") + " " + cs.getPropertyValue(bp + "-y") : cs.getPropertyValue(bp) : t.currentStyle.backgroundPositionX + " " + t.currentStyle.backgroundPositionY) || "0 0"), //Internet Explorer doesn't report background-position correctly - we must query background-position-x and background-position-y and combine them (even in IE10). Before IE9, we must do the same with the currentStyle object and use camelCase + es = this.format(e), + ba, ea, i, pct, overlap, src; + if ((bs.indexOf("%") !== -1) !== (es.indexOf("%") !== -1)) { + src = _getStyle(t, "backgroundImage").replace(_urlExp, ""); + if (src && src !== "none") { + ba = bs.split(" "); + ea = es.split(" "); + _tempImg.setAttribute("src", src); //set the temp <img>'s src to the background-image so that we can measure its width/height + i = 2; + while (--i > -1) { + bs = ba[i]; + pct = (bs.indexOf("%") !== -1); + if (pct !== (ea[i].indexOf("%") !== -1)) { + overlap = (i === 0) ? t.offsetWidth - _tempImg.width : t.offsetHeight - _tempImg.height; + ba[i] = pct ? (parseFloat(bs) / 100 * overlap) + "px" : (parseFloat(bs) / overlap * 100) + "%"; + } + } + bs = ba.join(" "); + } + } + return this.parseComplex(t.style, bs, es, pt, plugin); + }, formatter:_parsePosition}); + _registerComplexSpecialProp("backgroundSize", {defaultValue:"0 0", formatter:_parsePosition}); + _registerComplexSpecialProp("perspective", {defaultValue:"0px", prefix:true}); + _registerComplexSpecialProp("perspectiveOrigin", {defaultValue:"50% 50%", prefix:true}); + _registerComplexSpecialProp("transformStyle", {prefix:true}); + _registerComplexSpecialProp("backfaceVisibility", {prefix:true}); + _registerComplexSpecialProp("userSelect", {prefix:true}); + _registerComplexSpecialProp("margin", {parser:_getEdgeParser("marginTop,marginRight,marginBottom,marginLeft")}); + _registerComplexSpecialProp("padding", {parser:_getEdgeParser("paddingTop,paddingRight,paddingBottom,paddingLeft")}); + _registerComplexSpecialProp("clip", {defaultValue:"rect(0px,0px,0px,0px)", parser:function(t, e, p, cssp, pt, plugin){ + var b, cs, delim; + if (_ieVers < 9) { //IE8 and earlier don't report a "clip" value in the currentStyle - instead, the values are split apart into clipTop, clipRight, clipBottom, and clipLeft. Also, in IE7 and earlier, the values inside rect() are space-delimited, not comma-delimited. + cs = t.currentStyle; + delim = _ieVers < 8 ? " " : ","; + b = "rect(" + cs.clipTop + delim + cs.clipRight + delim + cs.clipBottom + delim + cs.clipLeft + ")"; + e = this.format(e).split(",").join(delim); + } else { + b = this.format(_getStyle(t, this.p, _cs, false, this.dflt)); + e = this.format(e); + } + return this.parseComplex(t.style, b, e, pt, plugin); + }}); + _registerComplexSpecialProp("textShadow", {defaultValue:"0px 0px 0px #999", color:true, multi:true}); + _registerComplexSpecialProp("autoRound,strictUnits", {parser:function(t, e, p, cssp, pt) {return pt;}}); //just so that we can ignore these properties (not tween them) + _registerComplexSpecialProp("border", {defaultValue:"0px solid #000", parser:function(t, e, p, cssp, pt, plugin) { + return this.parseComplex(t.style, this.format(_getStyle(t, "borderTopWidth", _cs, false, "0px") + " " + _getStyle(t, "borderTopStyle", _cs, false, "solid") + " " + _getStyle(t, "borderTopColor", _cs, false, "#000")), this.format(e), pt, plugin); + }, color:true, formatter:function(v) { + var a = v.split(" "); + return a[0] + " " + (a[1] || "solid") + " " + (v.match(_colorExp) || ["#000"])[0]; + }}); + _registerComplexSpecialProp("borderWidth", {parser:_getEdgeParser("borderTopWidth,borderRightWidth,borderBottomWidth,borderLeftWidth")}); //Firefox doesn't pick up on borderWidth set in style sheets (only inline). + _registerComplexSpecialProp("float,cssFloat,styleFloat", {parser:function(t, e, p, cssp, pt, plugin) { + var s = t.style, + prop = ("cssFloat" in s) ? "cssFloat" : "styleFloat"; + return new CSSPropTween(s, prop, 0, 0, pt, -1, p, false, 0, s[prop], e); + }}); + + //opacity-related + var _setIEOpacityRatio = function(v) { + var t = this.t, //refers to the element's style property + filters = t.filter || _getStyle(this.data, "filter"), + val = (this.s + this.c * v) | 0, + skip; + if (val === 100) { //for older versions of IE that need to use a filter to apply opacity, we should remove the filter if opacity hits 1 in order to improve performance, but make sure there isn't a transform (matrix) or gradient in the filters. + if (filters.indexOf("atrix(") === -1 && filters.indexOf("radient(") === -1 && filters.indexOf("oader(") === -1) { + t.removeAttribute("filter"); + skip = (!_getStyle(this.data, "filter")); //if a class is applied that has an alpha filter, it will take effect (we don't want that), so re-apply our alpha filter in that case. We must first remove it and then check. + } else { + t.filter = filters.replace(_alphaFilterExp, ""); + skip = true; + } + } + if (!skip) { + if (this.xn1) { + t.filter = filters = filters || ("alpha(opacity=" + val + ")"); //works around bug in IE7/8 that prevents changes to "visibility" from being applied properly if the filter is changed to a different alpha on the same frame. + } + if (filters.indexOf("pacity") === -1) { //only used if browser doesn't support the standard opacity style property (IE 7 and 8). We omit the "O" to avoid case-sensitivity issues + if (val !== 0 || !this.xn1) { //bugs in IE7/8 won't render the filter properly if opacity is ADDED on the same frame/render as "visibility" changes (this.xn1 is 1 if this tween is an "autoAlpha" tween) + t.filter = filters + " alpha(opacity=" + val + ")"; //we round the value because otherwise, bugs in IE7/8 can prevent "visibility" changes from being applied properly. + } + } else { + t.filter = filters.replace(_opacityExp, "opacity=" + val); + } + } + }; + _registerComplexSpecialProp("opacity,alpha,autoAlpha", {defaultValue:"1", parser:function(t, e, p, cssp, pt, plugin) { + var b = parseFloat(_getStyle(t, "opacity", _cs, false, "1")), + style = t.style, + isAutoAlpha = (p === "autoAlpha"); + if (typeof(e) === "string" && e.charAt(1) === "=") { + e = ((e.charAt(0) === "-") ? -1 : 1) * parseFloat(e.substr(2)) + b; + } + if (isAutoAlpha && b === 1 && _getStyle(t, "visibility", _cs) === "hidden" && e !== 0) { //if visibility is initially set to "hidden", we should interpret that as intent to make opacity 0 (a convenience) + b = 0; + } + if (_supportsOpacity) { + pt = new CSSPropTween(style, "opacity", b, e - b, pt); + } else { + pt = new CSSPropTween(style, "opacity", b * 100, (e - b) * 100, pt); + pt.xn1 = isAutoAlpha ? 1 : 0; //we need to record whether or not this is an autoAlpha so that in the setRatio(), we know to duplicate the setting of the alpha in order to work around a bug in IE7 and IE8 that prevents changes to "visibility" from taking effect if the filter is changed to a different alpha(opacity) at the same time. Setting it to the SAME value first, then the new value works around the IE7/8 bug. + style.zoom = 1; //helps correct an IE issue. + pt.type = 2; + pt.b = "alpha(opacity=" + pt.s + ")"; + pt.e = "alpha(opacity=" + (pt.s + pt.c) + ")"; + pt.data = t; + pt.plugin = plugin; + pt.setRatio = _setIEOpacityRatio; + } + if (isAutoAlpha) { //we have to create the "visibility" PropTween after the opacity one in the linked list so that they run in the order that works properly in IE8 and earlier + pt = new CSSPropTween(style, "visibility", 0, 0, pt, -1, null, false, 0, ((b !== 0) ? "inherit" : "hidden"), ((e === 0) ? "hidden" : "inherit")); + pt.xs0 = "inherit"; + cssp._overwriteProps.push(pt.n); + cssp._overwriteProps.push(p); + } + return pt; + }}); + + + var _removeProp = function(s, p) { + if (p) { + if (s.removeProperty) { + if (p.substr(0,2) === "ms") { //Microsoft browsers don't conform to the standard of capping the first prefix character, so we adjust so that when we prefix the caps with a dash, it's correct (otherwise it'd be "ms-transform" instead of "-ms-transform" for IE9, for example) + p = "M" + p.substr(1); + } + s.removeProperty(p.replace(_capsExp, "-$1").toLowerCase()); + } else { //note: old versions of IE use "removeAttribute()" instead of "removeProperty()" + s.removeAttribute(p); + } + } + }, + _setClassNameRatio = function(v) { + this.t._gsClassPT = this; + if (v === 1 || v === 0) { + this.t.setAttribute("class", (v === 0) ? this.b : this.e); + var mpt = this.data, //first MiniPropTween + s = this.t.style; + while (mpt) { + if (!mpt.v) { + _removeProp(s, mpt.p); + } else { + s[mpt.p] = mpt.v; + } + mpt = mpt._next; + } + if (v === 1 && this.t._gsClassPT === this) { + this.t._gsClassPT = null; + } + } else if (this.t.getAttribute("class") !== this.e) { + this.t.setAttribute("class", this.e); + } + }; + _registerComplexSpecialProp("className", {parser:function(t, e, p, cssp, pt, plugin, vars) { + var b = t.getAttribute("class") || "", //don't use t.className because it doesn't work consistently on SVG elements; getAttribute("class") and setAttribute("class", value") is more reliable. + cssText = t.style.cssText, + difData, bs, cnpt, cnptLookup, mpt; + pt = cssp._classNamePT = new CSSPropTween(t, p, 0, 0, pt, 2); + pt.setRatio = _setClassNameRatio; + pt.pr = -11; + _hasPriority = true; + pt.b = b; + bs = _getAllStyles(t, _cs); + //if there's a className tween already operating on the target, force it to its end so that the necessary inline styles are removed and the class name is applied before we determine the end state (we don't want inline styles interfering that were there just for class-specific values) + cnpt = t._gsClassPT; + if (cnpt) { + cnptLookup = {}; + mpt = cnpt.data; //first MiniPropTween which stores the inline styles - we need to force these so that the inline styles don't contaminate things. Otherwise, there's a small chance that a tween could start and the inline values match the destination values and they never get cleaned. + while (mpt) { + cnptLookup[mpt.p] = 1; + mpt = mpt._next; + } + cnpt.setRatio(1); + } + t._gsClassPT = pt; + pt.e = (e.charAt(1) !== "=") ? e : b.replace(new RegExp("\\s*\\b" + e.substr(2) + "\\b"), "") + ((e.charAt(0) === "+") ? " " + e.substr(2) : ""); + if (cssp._tween._duration) { //if it's a zero-duration tween, there's no need to tween anything or parse the data. In fact, if we switch classes temporarily (which we must do for proper parsing) and the class has a transition applied, it could cause a quick flash to the end state and back again initially in some browsers. + t.setAttribute("class", pt.e); + difData = _cssDif(t, bs, _getAllStyles(t), vars, cnptLookup); + t.setAttribute("class", b); + pt.data = difData.firstMPT; + t.style.cssText = cssText; //we recorded cssText before we swapped classes and ran _getAllStyles() because in cases when a className tween is overwritten, we remove all the related tweening properties from that class change (otherwise class-specific stuff can't override properties we've directly set on the target's style object due to specificity). + pt = pt.xfirst = cssp.parse(t, difData.difs, pt, plugin); //we record the CSSPropTween as the xfirst so that we can handle overwriting propertly (if "className" gets overwritten, we must kill all the properties associated with the className part of the tween, so we can loop through from xfirst to the pt itself) + } + return pt; + }}); + + + var _setClearPropsRatio = function(v) { + if (v === 1 || v === 0) if (this.data._totalTime === this.data._totalDuration && this.data.data !== "isFromStart") { //this.data refers to the tween. Only clear at the END of the tween (remember, from() tweens make the ratio go from 1 to 0, so we can't just check that and if the tween is the zero-duration one that's created internally to render the starting values in a from() tween, ignore that because otherwise, for example, from(...{height:100, clearProps:"height", delay:1}) would wipe the height at the beginning of the tween and after 1 second, it'd kick back in). + var s = this.t.style, + transformParse = _specialProps.transform.parse, + a, p, i, clearTransform; + if (this.e === "all") { + s.cssText = ""; + clearTransform = true; + } else { + a = this.e.split(","); + i = a.length; + while (--i > -1) { + p = a[i]; + if (_specialProps[p]) { + if (_specialProps[p].parse === transformParse) { + clearTransform = true; + } else { + p = (p === "transformOrigin") ? _transformOriginProp : _specialProps[p].p; //ensures that special properties use the proper browser-specific property name, like "scaleX" might be "-webkit-transform" or "boxShadow" might be "-moz-box-shadow" + } + } + _removeProp(s, p); + } + } + if (clearTransform) { + _removeProp(s, _transformProp); + if (this.t._gsTransform) { + delete this.t._gsTransform; + } + } + + } + }; + _registerComplexSpecialProp("clearProps", {parser:function(t, e, p, cssp, pt) { + pt = new CSSPropTween(t, p, 0, 0, pt, 2); + pt.setRatio = _setClearPropsRatio; + pt.e = e; + pt.pr = -10; + pt.data = cssp._tween; + _hasPriority = true; + return pt; + }}); + + p = "bezier,throwProps,physicsProps,physics2D".split(","); + i = p.length; + while (i--) { + _registerPluginProp(p[i]); + } + + + + + + + + + p = CSSPlugin.prototype; + p._firstPT = null; + + //gets called when the tween renders for the first time. This kicks everything off, recording start/end values, etc. + p._onInitTween = function(target, vars, tween) { + if (!target.nodeType) { //css is only for dom elements + return false; + } + this._target = target; + this._tween = tween; + this._vars = vars; + _autoRound = vars.autoRound; + _hasPriority = false; + _suffixMap = vars.suffixMap || CSSPlugin.suffixMap; + _cs = _getComputedStyle(target, ""); + _overwriteProps = this._overwriteProps; + var style = target.style, + v, pt, pt2, first, last, next, zIndex, tpt, threeD; + if (_reqSafariFix) if (style.zIndex === "") { + v = _getStyle(target, "zIndex", _cs); + if (v === "auto" || v === "") { + //corrects a bug in [non-Android] Safari that prevents it from repainting elements in their new positions if they don't have a zIndex set. We also can't just apply this inside _parseTransform() because anything that's moved in any way (like using "left" or "top" instead of transforms like "x" and "y") can be affected, so it is best to ensure that anything that's tweening has a z-index. Setting "WebkitPerspective" to a non-zero value worked too except that on iOS Safari things would flicker randomly. Plus zIndex is less memory-intensive. + this._addLazySet(style, "zIndex", 0); + } + } + + if (typeof(vars) === "string") { + first = style.cssText; + v = _getAllStyles(target, _cs); + style.cssText = first + ";" + vars; + v = _cssDif(target, v, _getAllStyles(target)).difs; + if (!_supportsOpacity && _opacityValExp.test(vars)) { + v.opacity = parseFloat( RegExp.$1 ); + } + vars = v; + style.cssText = first; + } + this._firstPT = pt = this.parse(target, vars, null); + + if (this._transformType) { + threeD = (this._transformType === 3); + if (!_transformProp) { + style.zoom = 1; //helps correct an IE issue. + } else if (_isSafari) { + _reqSafariFix = true; + //if zIndex isn't set, iOS Safari doesn't repaint things correctly sometimes (seemingly at random). + if (style.zIndex === "") { + zIndex = _getStyle(target, "zIndex", _cs); + if (zIndex === "auto" || zIndex === "") { + this._addLazySet(style, "zIndex", 0); + } + } + //Setting WebkitBackfaceVisibility corrects 3 bugs: + // 1) [non-Android] Safari skips rendering changes to "top" and "left" that are made on the same frame/render as a transform update. + // 2) iOS Safari sometimes neglects to repaint elements in their new positions. Setting "WebkitPerspective" to a non-zero value worked too except that on iOS Safari things would flicker randomly. + // 3) Safari sometimes displayed odd artifacts when tweening the transform (or WebkitTransform) property, like ghosts of the edges of the element remained. Definitely a browser bug. + //Note: we allow the user to override the auto-setting by defining WebkitBackfaceVisibility in the vars of the tween. + if (_isSafariLT6) { + this._addLazySet(style, "WebkitBackfaceVisibility", this._vars.WebkitBackfaceVisibility || (threeD ? "visible" : "hidden")); + } + } + pt2 = pt; + while (pt2 && pt2._next) { + pt2 = pt2._next; + } + tpt = new CSSPropTween(target, "transform", 0, 0, null, 2); + this._linkCSSP(tpt, null, pt2); + tpt.setRatio = (threeD && _supports3D) ? _set3DTransformRatio : _transformProp ? _set2DTransformRatio : _setIETransformRatio; + tpt.data = this._transform || _getTransform(target, _cs, true); + _overwriteProps.pop(); //we don't want to force the overwrite of all "transform" tweens of the target - we only care about individual transform properties like scaleX, rotation, etc. The CSSPropTween constructor automatically adds the property to _overwriteProps which is why we need to pop() here. + } + + if (_hasPriority) { + //reorders the linked list in order of pr (priority) + while (pt) { + next = pt._next; + pt2 = first; + while (pt2 && pt2.pr > pt.pr) { + pt2 = pt2._next; + } + if ((pt._prev = pt2 ? pt2._prev : last)) { + pt._prev._next = pt; + } else { + first = pt; + } + if ((pt._next = pt2)) { + pt2._prev = pt; + } else { + last = pt; + } + pt = next; + } + this._firstPT = first; + } + return true; + }; + + + p.parse = function(target, vars, pt, plugin) { + var style = target.style, + p, sp, bn, en, bs, es, bsfx, esfx, isStr, rel; + for (p in vars) { + es = vars[p]; //ending value string + sp = _specialProps[p]; //SpecialProp lookup. + if (sp) { + pt = sp.parse(target, es, p, this, pt, plugin, vars); + + } else { + bs = _getStyle(target, p, _cs) + ""; + isStr = (typeof(es) === "string"); + if (p === "color" || p === "fill" || p === "stroke" || p.indexOf("Color") !== -1 || (isStr && _rgbhslExp.test(es))) { //Opera uses background: to define color sometimes in addition to backgroundColor: + if (!isStr) { + es = _parseColor(es); + es = ((es.length > 3) ? "rgba(" : "rgb(") + es.join(",") + ")"; + } + pt = _parseComplex(style, p, bs, es, true, "transparent", pt, 0, plugin); + + } else if (isStr && (es.indexOf(" ") !== -1 || es.indexOf(",") !== -1)) { + pt = _parseComplex(style, p, bs, es, true, null, pt, 0, plugin); + + } else { + bn = parseFloat(bs); + bsfx = (bn || bn === 0) ? bs.substr((bn + "").length) : ""; //remember, bs could be non-numeric like "normal" for fontWeight, so we should default to a blank suffix in that case. + + if (bs === "" || bs === "auto") { + if (p === "width" || p === "height") { + bn = _getDimension(target, p, _cs); + bsfx = "px"; + } else if (p === "left" || p === "top") { + bn = _calculateOffset(target, p, _cs); + bsfx = "px"; + } else { + bn = (p !== "opacity") ? 0 : 1; + bsfx = ""; + } + } + + rel = (isStr && es.charAt(1) === "="); + if (rel) { + en = parseInt(es.charAt(0) + "1", 10); + es = es.substr(2); + en *= parseFloat(es); + esfx = es.replace(_suffixExp, ""); + } else { + en = parseFloat(es); + esfx = isStr ? es.substr((en + "").length) || "" : ""; + } + + if (esfx === "") { + esfx = (p in _suffixMap) ? _suffixMap[p] : bsfx; //populate the end suffix, prioritizing the map, then if none is found, use the beginning suffix. + } + + es = (en || en === 0) ? (rel ? en + bn : en) + esfx : vars[p]; //ensures that any += or -= prefixes are taken care of. Record the end value before normalizing the suffix because we always want to end the tween on exactly what they intended even if it doesn't match the beginning value's suffix. + + //if the beginning/ending suffixes don't match, normalize them... + if (bsfx !== esfx) if (esfx !== "") if (en || en === 0) if (bn) { //note: if the beginning value (bn) is 0, we don't need to convert units! + bn = _convertToPixels(target, p, bn, bsfx); + if (esfx === "%") { + bn /= _convertToPixels(target, p, 100, "%") / 100; + if (vars.strictUnits !== true) { //some browsers report only "px" values instead of allowing "%" with getComputedStyle(), so we assume that if we're tweening to a %, we should start there too unless strictUnits:true is defined. This approach is particularly useful for responsive designs that use from() tweens. + bs = bn + "%"; + } + + } else if (esfx === "em") { + bn /= _convertToPixels(target, p, 1, "em"); + + //otherwise convert to pixels. + } else if (esfx !== "px") { + en = _convertToPixels(target, p, en, esfx); + esfx = "px"; //we don't use bsfx after this, so we don't need to set it to px too. + } + if (rel) if (en || en === 0) { + es = (en + bn) + esfx; //the changes we made affect relative calculations, so adjust the end value here. + } + } + + if (rel) { + en += bn; + } + + if ((bn || bn === 0) && (en || en === 0)) { //faster than isNaN(). Also, previously we required en !== bn but that doesn't really gain much performance and it prevents _parseToProxy() from working properly if beginning and ending values match but need to get tweened by an external plugin anyway. For example, a bezier tween where the target starts at left:0 and has these points: [{left:50},{left:0}] wouldn't work properly because when parsing the last point, it'd match the first (current) one and a non-tweening CSSPropTween would be recorded when we actually need a normal tween (type:0) so that things get updated during the tween properly. + pt = new CSSPropTween(style, p, bn, en - bn, pt, 0, p, (_autoRound !== false && (esfx === "px" || p === "zIndex")), 0, bs, es); + pt.xs0 = esfx; + //DEBUG: _log("tween "+p+" from "+pt.b+" ("+bn+esfx+") to "+pt.e+" with suffix: "+pt.xs0); + } else if (style[p] === undefined || !es && (es + "" === "NaN" || es == null)) { + _log("invalid " + p + " tween value: " + vars[p]); + } else { + pt = new CSSPropTween(style, p, en || bn || 0, 0, pt, -1, p, false, 0, bs, es); + pt.xs0 = (es === "none" && (p === "display" || p.indexOf("Style") !== -1)) ? bs : es; //intermediate value should typically be set immediately (end value) except for "display" or things like borderTopStyle, borderBottomStyle, etc. which should use the beginning value during the tween. + //DEBUG: _log("non-tweening value "+p+": "+pt.xs0); + } + } + } + if (plugin) if (pt && !pt.plugin) { + pt.plugin = plugin; + } + } + return pt; + }; + + + //gets called every time the tween updates, passing the new ratio (typically a value between 0 and 1, but not always (for example, if an Elastic.easeOut is used, the value can jump above 1 mid-tween). It will always start and 0 and end at 1. + p.setRatio = function(v) { + var pt = this._firstPT, + min = 0.000001, + val, str, i; + + //at the end of the tween, we set the values to exactly what we received in order to make sure non-tweening values (like "position" or "float" or whatever) are set and so that if the beginning/ending suffixes (units) didn't match and we normalized to px, the value that the user passed in is used here. We check to see if the tween is at its beginning in case it's a from() tween in which case the ratio will actually go from 1 to 0 over the course of the tween (backwards). + if (v === 1 && (this._tween._time === this._tween._duration || this._tween._time === 0)) { + while (pt) { + if (pt.type !== 2) { + pt.t[pt.p] = pt.e; + } else { + pt.setRatio(v); + } + pt = pt._next; + } + + } else if (v || !(this._tween._time === this._tween._duration || this._tween._time === 0) || this._tween._rawPrevTime === -0.000001) { + while (pt) { + val = pt.c * v + pt.s; + if (pt.r) { + val = Math.round(val); + } else if (val < min) if (val > -min) { + val = 0; + } + if (!pt.type) { + pt.t[pt.p] = val + pt.xs0; + } else if (pt.type === 1) { //complex value (one that typically has multiple numbers inside a string, like "rect(5px,10px,20px,25px)" + i = pt.l; + if (i === 2) { + pt.t[pt.p] = pt.xs0 + val + pt.xs1 + pt.xn1 + pt.xs2; + } else if (i === 3) { + pt.t[pt.p] = pt.xs0 + val + pt.xs1 + pt.xn1 + pt.xs2 + pt.xn2 + pt.xs3; + } else if (i === 4) { + pt.t[pt.p] = pt.xs0 + val + pt.xs1 + pt.xn1 + pt.xs2 + pt.xn2 + pt.xs3 + pt.xn3 + pt.xs4; + } else if (i === 5) { + pt.t[pt.p] = pt.xs0 + val + pt.xs1 + pt.xn1 + pt.xs2 + pt.xn2 + pt.xs3 + pt.xn3 + pt.xs4 + pt.xn4 + pt.xs5; + } else { + str = pt.xs0 + val + pt.xs1; + for (i = 1; i < pt.l; i++) { + str += pt["xn"+i] + pt["xs"+(i+1)]; + } + pt.t[pt.p] = str; + } + + } else if (pt.type === -1) { //non-tweening value + pt.t[pt.p] = pt.xs0; + + } else if (pt.setRatio) { //custom setRatio() for things like SpecialProps, external plugins, etc. + pt.setRatio(v); + } + pt = pt._next; + } + + //if the tween is reversed all the way back to the beginning, we need to restore the original values which may have different units (like % instead of px or em or whatever). + } else { + while (pt) { + if (pt.type !== 2) { + pt.t[pt.p] = pt.b; + } else { + pt.setRatio(v); + } + pt = pt._next; + } + } + }; + + /** + * @private + * Forces rendering of the target's transforms (rotation, scale, etc.) whenever the CSSPlugin's setRatio() is called. + * Basically, this tells the CSSPlugin to create a CSSPropTween (type 2) after instantiation that runs last in the linked + * list and calls the appropriate (3D or 2D) rendering function. We separate this into its own method so that we can call + * it from other plugins like BezierPlugin if, for example, it needs to apply an autoRotation and this CSSPlugin + * doesn't have any transform-related properties of its own. You can call this method as many times as you + * want and it won't create duplicate CSSPropTweens. + * + * @param {boolean} threeD if true, it should apply 3D tweens (otherwise, just 2D ones are fine and typically faster) + */ + p._enableTransforms = function(threeD) { + this._transformType = (threeD || this._transformType === 3) ? 3 : 2; + this._transform = this._transform || _getTransform(this._target, _cs, true); //ensures that the element has a _gsTransform property with the appropriate values. + }; + + var lazySet = function(v) { + this.t[this.p] = this.e; + this.data._linkCSSP(this, this._next, null, true); //we purposefully keep this._next even though it'd make sense to null it, but this is a performance optimization, as this happens during the while (pt) {} loop in setRatio() at the bottom of which it sets pt = pt._next, so if we null it, the linked list will be broken in that loop. + }; + /** @private Gives us a way to set a value on the first render (and only the first render). **/ + p._addLazySet = function(t, p, v) { + var pt = this._firstPT = new CSSPropTween(t, p, 0, 0, this._firstPT, 2); + pt.e = v; + pt.setRatio = lazySet; + pt.data = this; + }; + + /** @private **/ + p._linkCSSP = function(pt, next, prev, remove) { + if (pt) { + if (next) { + next._prev = pt; + } + if (pt._next) { + pt._next._prev = pt._prev; + } + if (pt._prev) { + pt._prev._next = pt._next; + } else if (this._firstPT === pt) { + this._firstPT = pt._next; + remove = true; //just to prevent resetting this._firstPT 5 lines down in case pt._next is null. (optimized for speed) + } + if (prev) { + prev._next = pt; + } else if (!remove && this._firstPT === null) { + this._firstPT = pt; + } + pt._next = next; + pt._prev = prev; + } + return pt; + }; + + //we need to make sure that if alpha or autoAlpha is killed, opacity is too. And autoAlpha affects the "visibility" property. + p._kill = function(lookup) { + var copy = lookup, + pt, p, xfirst; + if (lookup.autoAlpha || lookup.alpha) { + copy = {}; + for (p in lookup) { //copy the lookup so that we're not changing the original which may be passed elsewhere. + copy[p] = lookup[p]; + } + copy.opacity = 1; + if (copy.autoAlpha) { + copy.visibility = 1; + } + } + if (lookup.className && (pt = this._classNamePT)) { //for className tweens, we need to kill any associated CSSPropTweens too; a linked list starts at the className's "xfirst". + xfirst = pt.xfirst; + if (xfirst && xfirst._prev) { + this._linkCSSP(xfirst._prev, pt._next, xfirst._prev._prev); //break off the prev + } else if (xfirst === this._firstPT) { + this._firstPT = pt._next; + } + if (pt._next) { + this._linkCSSP(pt._next, pt._next._next, xfirst._prev); + } + this._classNamePT = null; + } + return TweenPlugin.prototype._kill.call(this, copy); + }; + + + + //used by cascadeTo() for gathering all the style properties of each child element into an array for comparison. + var _getChildStyles = function(e, props, targets) { + var children, i, child, type; + if (e.slice) { + i = e.length; + while (--i > -1) { + _getChildStyles(e[i], props, targets); + } + return; + } + children = e.childNodes; + i = children.length; + while (--i > -1) { + child = children[i]; + type = child.type; + if (child.style) { + props.push(_getAllStyles(child)); + if (targets) { + targets.push(child); + } + } + if ((type === 1 || type === 9 || type === 11) && child.childNodes.length) { + _getChildStyles(child, props, targets); + } + } + }; + + /** + * Typically only useful for className tweens that may affect child elements, this method creates a TweenLite + * and then compares the style properties of all the target's child elements at the tween's start and end, and + * if any are different, it also creates tweens for those and returns an array containing ALL of the resulting + * tweens (so that you can easily add() them to a TimelineLite, for example). The reason this functionality is + * wrapped into a separate static method of CSSPlugin instead of being integrated into all regular className tweens + * is because it creates entirely new tweens that may have completely different targets than the original tween, + * so if they were all lumped into the original tween instance, it would be inconsistent with the rest of the API + * and it would create other problems. For example: + * - If I create a tween of elementA, that tween instance may suddenly change its target to include 50 other elements (unintuitive if I specifically defined the target I wanted) + * - We can't just create new independent tweens because otherwise, what happens if the original/parent tween is reversed or pause or dropped into a TimelineLite for tight control? You'd expect that tween's behavior to affect all the others. + * - Analyzing every style property of every child before and after the tween is an expensive operation when there are many children, so this behavior shouldn't be imposed on all className tweens by default, especially since it's probably rare that this extra functionality is needed. + * + * @param {Object} target object to be tweened + * @param {number} Duration in seconds (or frames for frames-based tweens) + * @param {Object} Object containing the end values, like {className:"newClass", ease:Linear.easeNone} + * @return {Array} An array of TweenLite instances + */ + CSSPlugin.cascadeTo = function(target, duration, vars) { + var tween = TweenLite.to(target, duration, vars), + results = [tween], + b = [], + e = [], + targets = [], + _reservedProps = TweenLite._internals.reservedProps, + i, difs, p; + target = tween._targets || tween.target; + _getChildStyles(target, b, targets); + tween.render(duration, true); + _getChildStyles(target, e); + tween.render(0, true); + tween._enabled(true); + i = targets.length; + while (--i > -1) { + difs = _cssDif(targets[i], b[i], e[i]); + if (difs.firstMPT) { + difs = difs.difs; + for (p in vars) { + if (_reservedProps[p]) { + difs[p] = vars[p]; + } + } + results.push( TweenLite.to(targets[i], duration, difs) ); + } + } + return results; + }; + + TweenPlugin.activate([CSSPlugin]); + return CSSPlugin; + + }, true); + + + + + + + + + + + /* * ---------------------------------------------------------------- * RoundPropsPlugin * ---------------------------------------------------------------- */ - (function() { - - var RoundPropsPlugin = window._gsDefine.plugin({ - propName: "roundProps", - priority: -1, - API: 2, - - //called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. - init: function(target, value, tween) { - this._tween = tween; - return true; - } - - }), - p = RoundPropsPlugin.prototype; - - p._onInitAllProps = function() { - var tween = this._tween, - rp = (tween.vars.roundProps instanceof Array) ? tween.vars.roundProps : tween.vars.roundProps.split(","), - i = rp.length, - lookup = {}, - rpt = tween._propLookup.roundProps, - prop, pt, next; - while (--i > -1) { - lookup[rp[i]] = 1; - } - i = rp.length; - while (--i > -1) { - prop = rp[i]; - pt = tween._firstPT; - while (pt) { - next = pt._next; //record here, because it may get removed - if (pt.pg) { - pt.t._roundProps(lookup, true); - } else if (pt.n === prop) { - this._add(pt.t, prop, pt.s, pt.c); - //remove from linked list - if (next) { - next._prev = pt._prev; - } - if (pt._prev) { - pt._prev._next = next; - } else if (tween._firstPT === pt) { - tween._firstPT = next; - } - pt._next = pt._prev = null; - tween._propLookup[prop] = rpt; - } - pt = next; - } - } - return false; - }; - - p._add = function(target, p, s, c) { - this._addTween(target, p, s, s + c, p, true); - this._overwriteProps.push(p); - }; - - }()); + (function() { + + var RoundPropsPlugin = window._gsDefine.plugin({ + propName: "roundProps", + priority: -1, + API: 2, + + //called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. + init: function(target, value, tween) { + this._tween = tween; + return true; + } + + }), + p = RoundPropsPlugin.prototype; + + p._onInitAllProps = function() { + var tween = this._tween, + rp = (tween.vars.roundProps instanceof Array) ? tween.vars.roundProps : tween.vars.roundProps.split(","), + i = rp.length, + lookup = {}, + rpt = tween._propLookup.roundProps, + prop, pt, next; + while (--i > -1) { + lookup[rp[i]] = 1; + } + i = rp.length; + while (--i > -1) { + prop = rp[i]; + pt = tween._firstPT; + while (pt) { + next = pt._next; //record here, because it may get removed + if (pt.pg) { + pt.t._roundProps(lookup, true); + } else if (pt.n === prop) { + this._add(pt.t, prop, pt.s, pt.c); + //remove from linked list + if (next) { + next._prev = pt._prev; + } + if (pt._prev) { + pt._prev._next = next; + } else if (tween._firstPT === pt) { + tween._firstPT = next; + } + pt._next = pt._prev = null; + tween._propLookup[prop] = rpt; + } + pt = next; + } + } + return false; + }; + + p._add = function(target, p, s, c) { + this._addTween(target, p, s, s + c, p, true); + this._overwriteProps.push(p); + }; + + }()); @@ -16778,44 +17056,44 @@ angular.module('b2b.att.treeNodeCheckbox', ['b2b.att.utilities']) * AttrPlugin * ---------------------------------------------------------------- */ - window._gsDefine.plugin({ - propName: "attr", - API: 2, - version: "0.3.2", - - //called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. - init: function(target, value, tween) { - var p, start, end; - if (typeof(target.setAttribute) !== "function") { - return false; - } - this._target = target; - this._proxy = {}; - this._start = {}; // we record start and end values exactly as they are in case they're strings (not numbers) - we need to be able to revert to them cleanly. - this._end = {}; - for (p in value) { - this._start[p] = this._proxy[p] = start = target.getAttribute(p); - end = this._addTween(this._proxy, p, parseFloat(start), value[p], p); - this._end[p] = end ? end.s + end.c : value[p]; - this._overwriteProps.push(p); - } - return true; - }, + window._gsDefine.plugin({ + propName: "attr", + API: 2, + version: "0.3.2", - //called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.) - set: function(ratio) { - this._super.setRatio.call(this, ratio); - var props = this._overwriteProps, - i = props.length, - lookup = (ratio === 1) ? this._end : ratio ? this._proxy : this._start, - p; - while (--i > -1) { - p = props[i]; - this._target.setAttribute(p, lookup[p] + ""); - } - } + //called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. + init: function(target, value, tween) { + var p, start, end; + if (typeof(target.setAttribute) !== "function") { + return false; + } + this._target = target; + this._proxy = {}; + this._start = {}; // we record start and end values exactly as they are in case they're strings (not numbers) - we need to be able to revert to them cleanly. + this._end = {}; + for (p in value) { + this._start[p] = this._proxy[p] = start = target.getAttribute(p); + end = this._addTween(this._proxy, p, parseFloat(start), value[p], p); + this._end[p] = end ? end.s + end.c : value[p]; + this._overwriteProps.push(p); + } + return true; + }, - }); + //called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.) + set: function(ratio) { + this._super.setRatio.call(this, ratio); + var props = this._overwriteProps, + i = props.length, + lookup = (ratio === 1) ? this._end : ratio ? this._proxy : this._start, + p; + while (--i > -1) { + p = props[i]; + this._target.setAttribute(p, lookup[p] + ""); + } + } + + }); @@ -16831,411 +17109,411 @@ angular.module('b2b.att.treeNodeCheckbox', ['b2b.att.utilities']) * DirectionalRotationPlugin * ---------------------------------------------------------------- */ - window._gsDefine.plugin({ - propName: "directionalRotation", - API: 2, - version: "0.2.0", - - //called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. - init: function(target, value, tween) { - if (typeof(value) !== "object") { - value = {rotation:value}; - } - this.finals = {}; - var cap = (value.useRadians === true) ? Math.PI * 2 : 360, - min = 0.000001, - p, v, start, end, dif, split; - for (p in value) { - if (p !== "useRadians") { - split = (value[p] + "").split("_"); - v = split[0]; - start = parseFloat( (typeof(target[p]) !== "function") ? target[p] : target[ ((p.indexOf("set") || typeof(target["get" + p.substr(3)]) !== "function") ? p : "get" + p.substr(3)) ]() ); - end = this.finals[p] = (typeof(v) === "string" && v.charAt(1) === "=") ? start + parseInt(v.charAt(0) + "1", 10) * Number(v.substr(2)) : Number(v) || 0; - dif = end - start; - if (split.length) { - v = split.join("_"); - if (v.indexOf("short") !== -1) { - dif = dif % cap; - if (dif !== dif % (cap / 2)) { - dif = (dif < 0) ? dif + cap : dif - cap; - } - } - if (v.indexOf("_cw") !== -1 && dif < 0) { - dif = ((dif + cap * 9999999999) % cap) - ((dif / cap) | 0) * cap; - } else if (v.indexOf("ccw") !== -1 && dif > 0) { - dif = ((dif - cap * 9999999999) % cap) - ((dif / cap) | 0) * cap; - } - } - if (dif > min || dif < -min) { - this._addTween(target, p, start, start + dif, p); - this._overwriteProps.push(p); - } - } - } - return true; - }, - - //called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.) - set: function(ratio) { - var pt; - if (ratio !== 1) { - this._super.setRatio.call(this, ratio); - } else { - pt = this._firstPT; - while (pt) { - if (pt.f) { - pt.t[pt.p](this.finals[pt.p]); - } else { - pt.t[pt.p] = this.finals[pt.p]; - } - pt = pt._next; - } - } - } - - })._autoCSS = true; - - - - - - - - - - - + window._gsDefine.plugin({ + propName: "directionalRotation", + API: 2, + version: "0.2.0", + + //called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. + init: function(target, value, tween) { + if (typeof(value) !== "object") { + value = {rotation:value}; + } + this.finals = {}; + var cap = (value.useRadians === true) ? Math.PI * 2 : 360, + min = 0.000001, + p, v, start, end, dif, split; + for (p in value) { + if (p !== "useRadians") { + split = (value[p] + "").split("_"); + v = split[0]; + start = parseFloat( (typeof(target[p]) !== "function") ? target[p] : target[ ((p.indexOf("set") || typeof(target["get" + p.substr(3)]) !== "function") ? p : "get" + p.substr(3)) ]() ); + end = this.finals[p] = (typeof(v) === "string" && v.charAt(1) === "=") ? start + parseInt(v.charAt(0) + "1", 10) * Number(v.substr(2)) : Number(v) || 0; + dif = end - start; + if (split.length) { + v = split.join("_"); + if (v.indexOf("short") !== -1) { + dif = dif % cap; + if (dif !== dif % (cap / 2)) { + dif = (dif < 0) ? dif + cap : dif - cap; + } + } + if (v.indexOf("_cw") !== -1 && dif < 0) { + dif = ((dif + cap * 9999999999) % cap) - ((dif / cap) | 0) * cap; + } else if (v.indexOf("ccw") !== -1 && dif > 0) { + dif = ((dif - cap * 9999999999) % cap) - ((dif / cap) | 0) * cap; + } + } + if (dif > min || dif < -min) { + this._addTween(target, p, start, start + dif, p); + this._overwriteProps.push(p); + } + } + } + return true; + }, + + //called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.) + set: function(ratio) { + var pt; + if (ratio !== 1) { + this._super.setRatio.call(this, ratio); + } else { + pt = this._firstPT; + while (pt) { + if (pt.f) { + pt.t[pt.p](this.finals[pt.p]); + } else { + pt.t[pt.p] = this.finals[pt.p]; + } + pt = pt._next; + } + } + } + + })._autoCSS = true; + + + + + + + + + + + /* * ---------------------------------------------------------------- * EasePack * ---------------------------------------------------------------- */ - window._gsDefine("easing.Back", ["easing.Ease"], function(Ease) { - - var w = (window.GreenSockGlobals || window), - gs = w.com.greensock, - _2PI = Math.PI * 2, - _HALF_PI = Math.PI / 2, - _class = gs._class, - _create = function(n, f) { - var C = _class("easing." + n, function(){}, true), - p = C.prototype = new Ease(); - p.constructor = C; - p.getRatio = f; - return C; - }, - _easeReg = Ease.register || function(){}, //put an empty function in place just as a safety measure in case someone loads an OLD version of TweenLite.js where Ease.register doesn't exist. - _wrap = function(name, EaseOut, EaseIn, EaseInOut, aliases) { - var C = _class("easing."+name, { - easeOut:new EaseOut(), - easeIn:new EaseIn(), - easeInOut:new EaseInOut() - }, true); - _easeReg(C, name); - return C; - }, - EasePoint = function(time, value, next) { - this.t = time; - this.v = value; - if (next) { - this.next = next; - next.prev = this; - this.c = next.v - value; - this.gap = next.t - time; - } - }, - - //Back - _createBack = function(n, f) { - var C = _class("easing." + n, function(overshoot) { - this._p1 = (overshoot || overshoot === 0) ? overshoot : 1.70158; - this._p2 = this._p1 * 1.525; - }, true), - p = C.prototype = new Ease(); - p.constructor = C; - p.getRatio = f; - p.config = function(overshoot) { - return new C(overshoot); - }; - return C; - }, - - Back = _wrap("Back", - _createBack("BackOut", function(p) { - return ((p = p - 1) * p * ((this._p1 + 1) * p + this._p1) + 1); - }), - _createBack("BackIn", function(p) { - return p * p * ((this._p1 + 1) * p - this._p1); - }), - _createBack("BackInOut", function(p) { - return ((p *= 2) < 1) ? 0.5 * p * p * ((this._p2 + 1) * p - this._p2) : 0.5 * ((p -= 2) * p * ((this._p2 + 1) * p + this._p2) + 2); - }) - ), - - - //SlowMo - SlowMo = _class("easing.SlowMo", function(linearRatio, power, yoyoMode) { - power = (power || power === 0) ? power : 0.7; - if (linearRatio == null) { - linearRatio = 0.7; - } else if (linearRatio > 1) { - linearRatio = 1; - } - this._p = (linearRatio !== 1) ? power : 0; - this._p1 = (1 - linearRatio) / 2; - this._p2 = linearRatio; - this._p3 = this._p1 + this._p2; - this._calcEnd = (yoyoMode === true); - }, true), - p = SlowMo.prototype = new Ease(), - SteppedEase, RoughEase, _createElastic; - - p.constructor = SlowMo; - p.getRatio = function(p) { - var r = p + (0.5 - p) * this._p; - if (p < this._p1) { - return this._calcEnd ? 1 - ((p = 1 - (p / this._p1)) * p) : r - ((p = 1 - (p / this._p1)) * p * p * p * r); - } else if (p > this._p3) { - return this._calcEnd ? 1 - (p = (p - this._p3) / this._p1) * p : r + ((p - r) * (p = (p - this._p3) / this._p1) * p * p * p); - } - return this._calcEnd ? 1 : r; - }; - SlowMo.ease = new SlowMo(0.7, 0.7); - - p.config = SlowMo.config = function(linearRatio, power, yoyoMode) { - return new SlowMo(linearRatio, power, yoyoMode); - }; - - - //SteppedEase - SteppedEase = _class("easing.SteppedEase", function(steps) { - steps = steps || 1; - this._p1 = 1 / steps; - this._p2 = steps + 1; - }, true); - p = SteppedEase.prototype = new Ease(); - p.constructor = SteppedEase; - p.getRatio = function(p) { - if (p < 0) { - p = 0; - } else if (p >= 1) { - p = 0.999999999; - } - return ((this._p2 * p) >> 0) * this._p1; - }; - p.config = SteppedEase.config = function(steps) { - return new SteppedEase(steps); - }; - - - //RoughEase - RoughEase = _class("easing.RoughEase", function(vars) { - vars = vars || {}; - var taper = vars.taper || "none", - a = [], - cnt = 0, - points = (vars.points || 20) | 0, - i = points, - randomize = (vars.randomize !== false), - clamp = (vars.clamp === true), - template = (vars.template instanceof Ease) ? vars.template : null, - strength = (typeof(vars.strength) === "number") ? vars.strength * 0.4 : 0.4, - x, y, bump, invX, obj, pnt; - while (--i > -1) { - x = randomize ? Math.random() : (1 / points) * i; - y = template ? template.getRatio(x) : x; - if (taper === "none") { - bump = strength; - } else if (taper === "out") { - invX = 1 - x; - bump = invX * invX * strength; - } else if (taper === "in") { - bump = x * x * strength; - } else if (x < 0.5) { //"both" (start) - invX = x * 2; - bump = invX * invX * 0.5 * strength; - } else { //"both" (end) - invX = (1 - x) * 2; - bump = invX * invX * 0.5 * strength; - } - if (randomize) { - y += (Math.random() * bump) - (bump * 0.5); - } else if (i % 2) { - y += bump * 0.5; - } else { - y -= bump * 0.5; - } - if (clamp) { - if (y > 1) { - y = 1; - } else if (y < 0) { - y = 0; - } - } - a[cnt++] = {x:x, y:y}; - } - a.sort(function(a, b) { - return a.x - b.x; - }); - - pnt = new EasePoint(1, 1, null); - i = points; - while (--i > -1) { - obj = a[i]; - pnt = new EasePoint(obj.x, obj.y, pnt); - } - - this._prev = new EasePoint(0, 0, (pnt.t !== 0) ? pnt : pnt.next); - }, true); - p = RoughEase.prototype = new Ease(); - p.constructor = RoughEase; - p.getRatio = function(p) { - var pnt = this._prev; - if (p > pnt.t) { - while (pnt.next && p >= pnt.t) { - pnt = pnt.next; - } - pnt = pnt.prev; - } else { - while (pnt.prev && p <= pnt.t) { - pnt = pnt.prev; - } - } - this._prev = pnt; - return (pnt.v + ((p - pnt.t) / pnt.gap) * pnt.c); - }; - p.config = function(vars) { - return new RoughEase(vars); - }; - RoughEase.ease = new RoughEase(); - - - //Bounce - _wrap("Bounce", - _create("BounceOut", function(p) { - if (p < 1 / 2.75) { - return 7.5625 * p * p; - } else if (p < 2 / 2.75) { - return 7.5625 * (p -= 1.5 / 2.75) * p + 0.75; - } else if (p < 2.5 / 2.75) { - return 7.5625 * (p -= 2.25 / 2.75) * p + 0.9375; - } - return 7.5625 * (p -= 2.625 / 2.75) * p + 0.984375; - }), - _create("BounceIn", function(p) { - if ((p = 1 - p) < 1 / 2.75) { - return 1 - (7.5625 * p * p); - } else if (p < 2 / 2.75) { - return 1 - (7.5625 * (p -= 1.5 / 2.75) * p + 0.75); - } else if (p < 2.5 / 2.75) { - return 1 - (7.5625 * (p -= 2.25 / 2.75) * p + 0.9375); - } - return 1 - (7.5625 * (p -= 2.625 / 2.75) * p + 0.984375); - }), - _create("BounceInOut", function(p) { - var invert = (p < 0.5); - if (invert) { - p = 1 - (p * 2); - } else { - p = (p * 2) - 1; - } - if (p < 1 / 2.75) { - p = 7.5625 * p * p; - } else if (p < 2 / 2.75) { - p = 7.5625 * (p -= 1.5 / 2.75) * p + 0.75; - } else if (p < 2.5 / 2.75) { - p = 7.5625 * (p -= 2.25 / 2.75) * p + 0.9375; - } else { - p = 7.5625 * (p -= 2.625 / 2.75) * p + 0.984375; - } - return invert ? (1 - p) * 0.5 : p * 0.5 + 0.5; - }) - ); - - - //CIRC - _wrap("Circ", - _create("CircOut", function(p) { - return Math.sqrt(1 - (p = p - 1) * p); - }), - _create("CircIn", function(p) { - return -(Math.sqrt(1 - (p * p)) - 1); - }), - _create("CircInOut", function(p) { - return ((p*=2) < 1) ? -0.5 * (Math.sqrt(1 - p * p) - 1) : 0.5 * (Math.sqrt(1 - (p -= 2) * p) + 1); - }) - ); - - - //Elastic - _createElastic = function(n, f, def) { - var C = _class("easing." + n, function(amplitude, period) { - this._p1 = amplitude || 1; - this._p2 = period || def; - this._p3 = this._p2 / _2PI * (Math.asin(1 / this._p1) || 0); - }, true), - p = C.prototype = new Ease(); - p.constructor = C; - p.getRatio = f; - p.config = function(amplitude, period) { - return new C(amplitude, period); - }; - return C; - }; - _wrap("Elastic", - _createElastic("ElasticOut", function(p) { - return this._p1 * Math.pow(2, -10 * p) * Math.sin( (p - this._p3) * _2PI / this._p2 ) + 1; - }, 0.3), - _createElastic("ElasticIn", function(p) { - return -(this._p1 * Math.pow(2, 10 * (p -= 1)) * Math.sin( (p - this._p3) * _2PI / this._p2 )); - }, 0.3), - _createElastic("ElasticInOut", function(p) { - return ((p *= 2) < 1) ? -0.5 * (this._p1 * Math.pow(2, 10 * (p -= 1)) * Math.sin( (p - this._p3) * _2PI / this._p2)) : this._p1 * Math.pow(2, -10 *(p -= 1)) * Math.sin( (p - this._p3) * _2PI / this._p2 ) *0.5 + 1; - }, 0.45) - ); - - - //Expo - _wrap("Expo", - _create("ExpoOut", function(p) { - return 1 - Math.pow(2, -10 * p); - }), - _create("ExpoIn", function(p) { - return Math.pow(2, 10 * (p - 1)) - 0.001; - }), - _create("ExpoInOut", function(p) { - return ((p *= 2) < 1) ? 0.5 * Math.pow(2, 10 * (p - 1)) : 0.5 * (2 - Math.pow(2, -10 * (p - 1))); - }) - ); - - - //Sine - _wrap("Sine", - _create("SineOut", function(p) { - return Math.sin(p * _HALF_PI); - }), - _create("SineIn", function(p) { - return -Math.cos(p * _HALF_PI) + 1; - }), - _create("SineInOut", function(p) { - return -0.5 * (Math.cos(Math.PI * p) - 1); - }) - ); - - _class("easing.EaseLookup", { - find:function(s) { - return Ease.map[s]; - } - }, true); - - //register the non-standard eases - _easeReg(w.SlowMo, "SlowMo", "ease,"); - _easeReg(RoughEase, "RoughEase", "ease,"); - _easeReg(SteppedEase, "SteppedEase", "ease,"); - - return Back; - - }, true); + window._gsDefine("easing.Back", ["easing.Ease"], function(Ease) { + + var w = (window.GreenSockGlobals || window), + gs = w.com.greensock, + _2PI = Math.PI * 2, + _HALF_PI = Math.PI / 2, + _class = gs._class, + _create = function(n, f) { + var C = _class("easing." + n, function(){}, true), + p = C.prototype = new Ease(); + p.constructor = C; + p.getRatio = f; + return C; + }, + _easeReg = Ease.register || function(){}, //put an empty function in place just as a safety measure in case someone loads an OLD version of TweenLite.js where Ease.register doesn't exist. + _wrap = function(name, EaseOut, EaseIn, EaseInOut, aliases) { + var C = _class("easing."+name, { + easeOut:new EaseOut(), + easeIn:new EaseIn(), + easeInOut:new EaseInOut() + }, true); + _easeReg(C, name); + return C; + }, + EasePoint = function(time, value, next) { + this.t = time; + this.v = value; + if (next) { + this.next = next; + next.prev = this; + this.c = next.v - value; + this.gap = next.t - time; + } + }, + + //Back + _createBack = function(n, f) { + var C = _class("easing." + n, function(overshoot) { + this._p1 = (overshoot || overshoot === 0) ? overshoot : 1.70158; + this._p2 = this._p1 * 1.525; + }, true), + p = C.prototype = new Ease(); + p.constructor = C; + p.getRatio = f; + p.config = function(overshoot) { + return new C(overshoot); + }; + return C; + }, + + Back = _wrap("Back", + _createBack("BackOut", function(p) { + return ((p = p - 1) * p * ((this._p1 + 1) * p + this._p1) + 1); + }), + _createBack("BackIn", function(p) { + return p * p * ((this._p1 + 1) * p - this._p1); + }), + _createBack("BackInOut", function(p) { + return ((p *= 2) < 1) ? 0.5 * p * p * ((this._p2 + 1) * p - this._p2) : 0.5 * ((p -= 2) * p * ((this._p2 + 1) * p + this._p2) + 2); + }) + ), + + + //SlowMo + SlowMo = _class("easing.SlowMo", function(linearRatio, power, yoyoMode) { + power = (power || power === 0) ? power : 0.7; + if (linearRatio == null) { + linearRatio = 0.7; + } else if (linearRatio > 1) { + linearRatio = 1; + } + this._p = (linearRatio !== 1) ? power : 0; + this._p1 = (1 - linearRatio) / 2; + this._p2 = linearRatio; + this._p3 = this._p1 + this._p2; + this._calcEnd = (yoyoMode === true); + }, true), + p = SlowMo.prototype = new Ease(), + SteppedEase, RoughEase, _createElastic; + + p.constructor = SlowMo; + p.getRatio = function(p) { + var r = p + (0.5 - p) * this._p; + if (p < this._p1) { + return this._calcEnd ? 1 - ((p = 1 - (p / this._p1)) * p) : r - ((p = 1 - (p / this._p1)) * p * p * p * r); + } else if (p > this._p3) { + return this._calcEnd ? 1 - (p = (p - this._p3) / this._p1) * p : r + ((p - r) * (p = (p - this._p3) / this._p1) * p * p * p); + } + return this._calcEnd ? 1 : r; + }; + SlowMo.ease = new SlowMo(0.7, 0.7); + + p.config = SlowMo.config = function(linearRatio, power, yoyoMode) { + return new SlowMo(linearRatio, power, yoyoMode); + }; + + + //SteppedEase + SteppedEase = _class("easing.SteppedEase", function(steps) { + steps = steps || 1; + this._p1 = 1 / steps; + this._p2 = steps + 1; + }, true); + p = SteppedEase.prototype = new Ease(); + p.constructor = SteppedEase; + p.getRatio = function(p) { + if (p < 0) { + p = 0; + } else if (p >= 1) { + p = 0.999999999; + } + return ((this._p2 * p) >> 0) * this._p1; + }; + p.config = SteppedEase.config = function(steps) { + return new SteppedEase(steps); + }; + + + //RoughEase + RoughEase = _class("easing.RoughEase", function(vars) { + vars = vars || {}; + var taper = vars.taper || "none", + a = [], + cnt = 0, + points = (vars.points || 20) | 0, + i = points, + randomize = (vars.randomize !== false), + clamp = (vars.clamp === true), + template = (vars.template instanceof Ease) ? vars.template : null, + strength = (typeof(vars.strength) === "number") ? vars.strength * 0.4 : 0.4, + x, y, bump, invX, obj, pnt; + while (--i > -1) { + x = randomize ? Math.random() : (1 / points) * i; + y = template ? template.getRatio(x) : x; + if (taper === "none") { + bump = strength; + } else if (taper === "out") { + invX = 1 - x; + bump = invX * invX * strength; + } else if (taper === "in") { + bump = x * x * strength; + } else if (x < 0.5) { //"both" (start) + invX = x * 2; + bump = invX * invX * 0.5 * strength; + } else { //"both" (end) + invX = (1 - x) * 2; + bump = invX * invX * 0.5 * strength; + } + if (randomize) { + y += (Math.random() * bump) - (bump * 0.5); + } else if (i % 2) { + y += bump * 0.5; + } else { + y -= bump * 0.5; + } + if (clamp) { + if (y > 1) { + y = 1; + } else if (y < 0) { + y = 0; + } + } + a[cnt++] = {x:x, y:y}; + } + a.sort(function(a, b) { + return a.x - b.x; + }); + + pnt = new EasePoint(1, 1, null); + i = points; + while (--i > -1) { + obj = a[i]; + pnt = new EasePoint(obj.x, obj.y, pnt); + } + + this._prev = new EasePoint(0, 0, (pnt.t !== 0) ? pnt : pnt.next); + }, true); + p = RoughEase.prototype = new Ease(); + p.constructor = RoughEase; + p.getRatio = function(p) { + var pnt = this._prev; + if (p > pnt.t) { + while (pnt.next && p >= pnt.t) { + pnt = pnt.next; + } + pnt = pnt.prev; + } else { + while (pnt.prev && p <= pnt.t) { + pnt = pnt.prev; + } + } + this._prev = pnt; + return (pnt.v + ((p - pnt.t) / pnt.gap) * pnt.c); + }; + p.config = function(vars) { + return new RoughEase(vars); + }; + RoughEase.ease = new RoughEase(); + + + //Bounce + _wrap("Bounce", + _create("BounceOut", function(p) { + if (p < 1 / 2.75) { + return 7.5625 * p * p; + } else if (p < 2 / 2.75) { + return 7.5625 * (p -= 1.5 / 2.75) * p + 0.75; + } else if (p < 2.5 / 2.75) { + return 7.5625 * (p -= 2.25 / 2.75) * p + 0.9375; + } + return 7.5625 * (p -= 2.625 / 2.75) * p + 0.984375; + }), + _create("BounceIn", function(p) { + if ((p = 1 - p) < 1 / 2.75) { + return 1 - (7.5625 * p * p); + } else if (p < 2 / 2.75) { + return 1 - (7.5625 * (p -= 1.5 / 2.75) * p + 0.75); + } else if (p < 2.5 / 2.75) { + return 1 - (7.5625 * (p -= 2.25 / 2.75) * p + 0.9375); + } + return 1 - (7.5625 * (p -= 2.625 / 2.75) * p + 0.984375); + }), + _create("BounceInOut", function(p) { + var invert = (p < 0.5); + if (invert) { + p = 1 - (p * 2); + } else { + p = (p * 2) - 1; + } + if (p < 1 / 2.75) { + p = 7.5625 * p * p; + } else if (p < 2 / 2.75) { + p = 7.5625 * (p -= 1.5 / 2.75) * p + 0.75; + } else if (p < 2.5 / 2.75) { + p = 7.5625 * (p -= 2.25 / 2.75) * p + 0.9375; + } else { + p = 7.5625 * (p -= 2.625 / 2.75) * p + 0.984375; + } + return invert ? (1 - p) * 0.5 : p * 0.5 + 0.5; + }) + ); + + + //CIRC + _wrap("Circ", + _create("CircOut", function(p) { + return Math.sqrt(1 - (p = p - 1) * p); + }), + _create("CircIn", function(p) { + return -(Math.sqrt(1 - (p * p)) - 1); + }), + _create("CircInOut", function(p) { + return ((p*=2) < 1) ? -0.5 * (Math.sqrt(1 - p * p) - 1) : 0.5 * (Math.sqrt(1 - (p -= 2) * p) + 1); + }) + ); + + + //Elastic + _createElastic = function(n, f, def) { + var C = _class("easing." + n, function(amplitude, period) { + this._p1 = amplitude || 1; + this._p2 = period || def; + this._p3 = this._p2 / _2PI * (Math.asin(1 / this._p1) || 0); + }, true), + p = C.prototype = new Ease(); + p.constructor = C; + p.getRatio = f; + p.config = function(amplitude, period) { + return new C(amplitude, period); + }; + return C; + }; + _wrap("Elastic", + _createElastic("ElasticOut", function(p) { + return this._p1 * Math.pow(2, -10 * p) * Math.sin( (p - this._p3) * _2PI / this._p2 ) + 1; + }, 0.3), + _createElastic("ElasticIn", function(p) { + return -(this._p1 * Math.pow(2, 10 * (p -= 1)) * Math.sin( (p - this._p3) * _2PI / this._p2 )); + }, 0.3), + _createElastic("ElasticInOut", function(p) { + return ((p *= 2) < 1) ? -0.5 * (this._p1 * Math.pow(2, 10 * (p -= 1)) * Math.sin( (p - this._p3) * _2PI / this._p2)) : this._p1 * Math.pow(2, -10 *(p -= 1)) * Math.sin( (p - this._p3) * _2PI / this._p2 ) *0.5 + 1; + }, 0.45) + ); + + + //Expo + _wrap("Expo", + _create("ExpoOut", function(p) { + return 1 - Math.pow(2, -10 * p); + }), + _create("ExpoIn", function(p) { + return Math.pow(2, 10 * (p - 1)) - 0.001; + }), + _create("ExpoInOut", function(p) { + return ((p *= 2) < 1) ? 0.5 * Math.pow(2, 10 * (p - 1)) : 0.5 * (2 - Math.pow(2, -10 * (p - 1))); + }) + ); + + + //Sine + _wrap("Sine", + _create("SineOut", function(p) { + return Math.sin(p * _HALF_PI); + }), + _create("SineIn", function(p) { + return -Math.cos(p * _HALF_PI) + 1; + }), + _create("SineInOut", function(p) { + return -0.5 * (Math.cos(Math.PI * p) - 1); + }) + ); + + _class("easing.EaseLookup", { + find:function(s) { + return Ease.map[s]; + } + }, true); + + //register the non-standard eases + _easeReg(w.SlowMo, "SlowMo", "ease,"); + _easeReg(RoughEase, "RoughEase", "ease,"); + _easeReg(SteppedEase, "SteppedEase", "ease,"); + + return Back; + + }, true); }); @@ -17257,119 +17535,119 @@ angular.module('b2b.att.treeNodeCheckbox', ['b2b.att.utilities']) */ (function(window) { - "use strict"; - var _globals = window.GreenSockGlobals || window; - if (_globals.TweenLite) { - return; //in case the core set of classes is already loaded, don't instantiate twice. - } - var _namespace = function(ns) { - var a = ns.split("."), - p = _globals, i; - for (i = 0; i < a.length; i++) { - p[a[i]] = p = p[a[i]] || {}; - } - return p; - }, - gs = _namespace("com.greensock"), - _tinyNum = 0.0000000001, - _slice = [].slice, - _emptyFunc = function() {}, - _isArray = (function() { //works around issues in iframe environments where the Array global isn't shared, thus if the object originates in a different window/iframe, "(obj instanceof Array)" will evaluate false. We added some speed optimizations to avoid Object.prototype.toString.call() unless it's absolutely necessary because it's VERY slow (like 20x slower) - var toString = Object.prototype.toString, - array = toString.call([]); - return function(obj) { - return obj != null && (obj instanceof Array || (typeof(obj) === "object" && !!obj.push && toString.call(obj) === array)); - }; - }()), - a, i, p, _ticker, _tickerActive, - _defLookup = {}, - - /** - * @constructor - * Defines a GreenSock class, optionally with an array of dependencies that must be instantiated first and passed into the definition. - * This allows users to load GreenSock JS files in any order even if they have interdependencies (like CSSPlugin extends TweenPlugin which is - * inside TweenLite.js, but if CSSPlugin is loaded first, it should wait to run its code until TweenLite.js loads and instantiates TweenPlugin - * and then pass TweenPlugin to CSSPlugin's definition). This is all done automatically and internally. - * - * Every definition will be added to a "com.greensock" global object (typically window, but if a window.GreenSockGlobals object is found, - * it will go there as of v1.7). For example, TweenLite will be found at window.com.greensock.TweenLite and since it's a global class that should be available anywhere, - * it is ALSO referenced at window.TweenLite. However some classes aren't considered global, like the base com.greensock.core.Animation class, so - * those will only be at the package like window.com.greensock.core.Animation. Again, if you define a GreenSockGlobals object on the window, everything - * gets tucked neatly inside there instead of on the window directly. This allows you to do advanced things like load multiple versions of GreenSock - * files and put them into distinct objects (imagine a banner ad uses a newer version but the main site uses an older one). In that case, you could - * sandbox the banner one like: - * - * <script> - * var gs = window.GreenSockGlobals = {}; //the newer version we're about to load could now be referenced in a "gs" object, like gs.TweenLite.to(...). Use whatever alias you want as long as it's unique, "gs" or "banner" or whatever. - * </script> - * <script src="js/greensock/v1.7/TweenMax.js"></script> - * <script> - * window.GreenSockGlobals = null; //reset it back to null so that the next load of TweenMax affects the window and we can reference things directly like TweenLite.to(...) - * </script> - * <script src="js/greensock/v1.6/TweenMax.js"></script> - * <script> - * gs.TweenLite.to(...); //would use v1.7 - * TweenLite.to(...); //would use v1.6 - * </script> - * - * @param {!string} ns The namespace of the class definition, leaving off "com.greensock." as that's assumed. For example, "TweenLite" or "plugins.CSSPlugin" or "easing.Back". - * @param {!Array.<string>} dependencies An array of dependencies (described as their namespaces minus "com.greensock." prefix). For example ["TweenLite","plugins.TweenPlugin","core.Animation"] - * @param {!function():Object} func The function that should be called and passed the resolved dependencies which will return the actual class for this definition. - * @param {boolean=} global If true, the class will be added to the global scope (typically window unless you define a window.GreenSockGlobals object) - */ - Definition = function(ns, dependencies, func, global) { - this.sc = (_defLookup[ns]) ? _defLookup[ns].sc : []; //subclasses - _defLookup[ns] = this; - this.gsClass = null; - this.func = func; - var _classes = []; - this.check = function(init) { - var i = dependencies.length, - missing = i, - cur, a, n, cl; - while (--i > -1) { - if ((cur = _defLookup[dependencies[i]] || new Definition(dependencies[i], [])).gsClass) { - _classes[i] = cur.gsClass; - missing--; - } else if (init) { - cur.sc.push(this); - } - } - if (missing === 0 && func) { - a = ("com.greensock." + ns).split("."); - n = a.pop(); - cl = _namespace(a.join("."))[n] = this.gsClass = func.apply(func, _classes); - - //exports to multiple environments - if (global) { - _globals[n] = cl; //provides a way to avoid global namespace pollution. By default, the main classes like TweenLite, Power1, Strong, etc. are added to window unless a GreenSockGlobals is defined. So if you want to have things added to a custom object instead, just do something like window.GreenSockGlobals = {} before loading any GreenSock files. You can even set up an alias like window.GreenSockGlobals = windows.gs = {} so that you can access everything like gs.TweenLite. Also remember that ALL classes are added to the window.com.greensock object (in their respective packages, like com.greensock.easing.Power1, com.greensock.TweenLite, etc.) - if (typeof(define) === "function" && define.amd){ //AMD - define((window.GreenSockAMDPath ? window.GreenSockAMDPath + "/" : "") + ns.split(".").join("/"), [], function() { return cl; }); - } else if (typeof(module) !== "undefined" && module.exports){ //node - module.exports = cl; - } - } - for (i = 0; i < this.sc.length; i++) { - this.sc[i].check(); - } - } - }; - this.check(true); - }, - - //used to create Definition instances (which basically registers a class that has dependencies). - _gsDefine = window._gsDefine = function(ns, dependencies, func, global) { - return new Definition(ns, dependencies, func, global); - }, - - //a quick way to create a class that doesn't have any dependencies. Returns the class, but first registers it in the GreenSock namespace so that other classes can grab it (other classes might be dependent on the class). - _class = gs._class = function(ns, func, global) { - func = func || function() {}; - _gsDefine(ns, [], function(){ return func; }, global); - return func; - }; - - _gsDefine.globals = _globals; + "use strict"; + var _globals = window.GreenSockGlobals || window; + if (_globals.TweenLite) { + return; //in case the core set of classes is already loaded, don't instantiate twice. + } + var _namespace = function(ns) { + var a = ns.split("."), + p = _globals, i; + for (i = 0; i < a.length; i++) { + p[a[i]] = p = p[a[i]] || {}; + } + return p; + }, + gs = _namespace("com.greensock"), + _tinyNum = 0.0000000001, + _slice = [].slice, + _emptyFunc = function() {}, + _isArray = (function() { //works around issues in iframe environments where the Array global isn't shared, thus if the object originates in a different window/iframe, "(obj instanceof Array)" will evaluate false. We added some speed optimizations to avoid Object.prototype.toString.call() unless it's absolutely necessary because it's VERY slow (like 20x slower) + var toString = Object.prototype.toString, + array = toString.call([]); + return function(obj) { + return obj != null && (obj instanceof Array || (typeof(obj) === "object" && !!obj.push && toString.call(obj) === array)); + }; + }()), + a, i, p, _ticker, _tickerActive, + _defLookup = {}, + + /** + * @constructor + * Defines a GreenSock class, optionally with an array of dependencies that must be instantiated first and passed into the definition. + * This allows users to load GreenSock JS files in any order even if they have interdependencies (like CSSPlugin extends TweenPlugin which is + * inside TweenLite.js, but if CSSPlugin is loaded first, it should wait to run its code until TweenLite.js loads and instantiates TweenPlugin + * and then pass TweenPlugin to CSSPlugin's definition). This is all done automatically and internally. + * + * Every definition will be added to a "com.greensock" global object (typically window, but if a window.GreenSockGlobals object is found, + * it will go there as of v1.7). For example, TweenLite will be found at window.com.greensock.TweenLite and since it's a global class that should be available anywhere, + * it is ALSO referenced at window.TweenLite. However some classes aren't considered global, like the base com.greensock.core.Animation class, so + * those will only be at the package like window.com.greensock.core.Animation. Again, if you define a GreenSockGlobals object on the window, everything + * gets tucked neatly inside there instead of on the window directly. This allows you to do advanced things like load multiple versions of GreenSock + * files and put them into distinct objects (imagine a banner ad uses a newer version but the main site uses an older one). In that case, you could + * sandbox the banner one like: + * + * <script> + * var gs = window.GreenSockGlobals = {}; //the newer version we're about to load could now be referenced in a "gs" object, like gs.TweenLite.to(...). Use whatever alias you want as long as it's unique, "gs" or "banner" or whatever. + * </script> + * <script src="js/greensock/v1.7/TweenMax.js"></script> + * <script> + * window.GreenSockGlobals = null; //reset it back to null so that the next load of TweenMax affects the window and we can reference things directly like TweenLite.to(...) + * </script> + * <script src="js/greensock/v1.6/TweenMax.js"></script> + * <script> + * gs.TweenLite.to(...); //would use v1.7 + * TweenLite.to(...); //would use v1.6 + * </script> + * + * @param {!string} ns The namespace of the class definition, leaving off "com.greensock." as that's assumed. For example, "TweenLite" or "plugins.CSSPlugin" or "easing.Back". + * @param {!Array.<string>} dependencies An array of dependencies (described as their namespaces minus "com.greensock." prefix). For example ["TweenLite","plugins.TweenPlugin","core.Animation"] + * @param {!function():Object} func The function that should be called and passed the resolved dependencies which will return the actual class for this definition. + * @param {boolean=} global If true, the class will be added to the global scope (typically window unless you define a window.GreenSockGlobals object) + */ + Definition = function(ns, dependencies, func, global) { + this.sc = (_defLookup[ns]) ? _defLookup[ns].sc : []; //subclasses + _defLookup[ns] = this; + this.gsClass = null; + this.func = func; + var _classes = []; + this.check = function(init) { + var i = dependencies.length, + missing = i, + cur, a, n, cl; + while (--i > -1) { + if ((cur = _defLookup[dependencies[i]] || new Definition(dependencies[i], [])).gsClass) { + _classes[i] = cur.gsClass; + missing--; + } else if (init) { + cur.sc.push(this); + } + } + if (missing === 0 && func) { + a = ("com.greensock." + ns).split("."); + n = a.pop(); + cl = _namespace(a.join("."))[n] = this.gsClass = func.apply(func, _classes); + + //exports to multiple environments + if (global) { + _globals[n] = cl; //provides a way to avoid global namespace pollution. By default, the main classes like TweenLite, Power1, Strong, etc. are added to window unless a GreenSockGlobals is defined. So if you want to have things added to a custom object instead, just do something like window.GreenSockGlobals = {} before loading any GreenSock files. You can even set up an alias like window.GreenSockGlobals = windows.gs = {} so that you can access everything like gs.TweenLite. Also remember that ALL classes are added to the window.com.greensock object (in their respective packages, like com.greensock.easing.Power1, com.greensock.TweenLite, etc.) + if (typeof(define) === "function" && define.amd){ //AMD + define((window.GreenSockAMDPath ? window.GreenSockAMDPath + "/" : "") + ns.split(".").join("/"), [], function() { return cl; }); + } else if (typeof(module) !== "undefined" && module.exports){ //node + module.exports = cl; + } + } + for (i = 0; i < this.sc.length; i++) { + this.sc[i].check(); + } + } + }; + this.check(true); + }, + + //used to create Definition instances (which basically registers a class that has dependencies). + _gsDefine = window._gsDefine = function(ns, dependencies, func, global) { + return new Definition(ns, dependencies, func, global); + }, + + //a quick way to create a class that doesn't have any dependencies. Returns the class, but first registers it in the GreenSock namespace so that other classes can grab it (other classes might be dependent on the class). + _class = gs._class = function(ns, func, global) { + func = func || function() {}; + _gsDefine(ns, [], function(){ return func; }, global); + return func; + }; + + _gsDefine.globals = _globals; @@ -17378,64 +17656,64 @@ angular.module('b2b.att.treeNodeCheckbox', ['b2b.att.utilities']) * Ease * ---------------------------------------------------------------- */ - var _baseParams = [0, 0, 1, 1], - _blankArray = [], - Ease = _class("easing.Ease", function(func, extraParams, type, power) { - this._func = func; - this._type = type || 0; - this._power = power || 0; - this._params = extraParams ? _baseParams.concat(extraParams) : _baseParams; - }, true), - _easeMap = Ease.map = {}, - _easeReg = Ease.register = function(ease, names, types, create) { - var na = names.split(","), - i = na.length, - ta = (types || "easeIn,easeOut,easeInOut").split(","), - e, name, j, type; - while (--i > -1) { - name = na[i]; - e = create ? _class("easing."+name, null, true) : gs.easing[name] || {}; - j = ta.length; - while (--j > -1) { - type = ta[j]; - _easeMap[name + "." + type] = _easeMap[type + name] = e[type] = ease.getRatio ? ease : ease[type] || new ease(); - } - } - }; - - p = Ease.prototype; - p._calcEnd = false; - p.getRatio = function(p) { - if (this._func) { - this._params[0] = p; - return this._func.apply(null, this._params); - } - var t = this._type, - pw = this._power, - r = (t === 1) ? 1 - p : (t === 2) ? p : (p < 0.5) ? p * 2 : (1 - p) * 2; - if (pw === 1) { - r *= r; - } else if (pw === 2) { - r *= r * r; - } else if (pw === 3) { - r *= r * r * r; - } else if (pw === 4) { - r *= r * r * r * r; - } - return (t === 1) ? 1 - r : (t === 2) ? r : (p < 0.5) ? r / 2 : 1 - (r / 2); - }; - - //create all the standard eases like Linear, Quad, Cubic, Quart, Quint, Strong, Power0, Power1, Power2, Power3, and Power4 (each with easeIn, easeOut, and easeInOut) - a = ["Linear","Quad","Cubic","Quart","Quint,Strong"]; - i = a.length; - while (--i > -1) { - p = a[i]+",Power"+i; - _easeReg(new Ease(null,null,1,i), p, "easeOut", true); - _easeReg(new Ease(null,null,2,i), p, "easeIn" + ((i === 0) ? ",easeNone" : "")); - _easeReg(new Ease(null,null,3,i), p, "easeInOut"); - } - _easeMap.linear = gs.easing.Linear.easeIn; - _easeMap.swing = gs.easing.Quad.easeInOut; //for jQuery folks + var _baseParams = [0, 0, 1, 1], + _blankArray = [], + Ease = _class("easing.Ease", function(func, extraParams, type, power) { + this._func = func; + this._type = type || 0; + this._power = power || 0; + this._params = extraParams ? _baseParams.concat(extraParams) : _baseParams; + }, true), + _easeMap = Ease.map = {}, + _easeReg = Ease.register = function(ease, names, types, create) { + var na = names.split(","), + i = na.length, + ta = (types || "easeIn,easeOut,easeInOut").split(","), + e, name, j, type; + while (--i > -1) { + name = na[i]; + e = create ? _class("easing."+name, null, true) : gs.easing[name] || {}; + j = ta.length; + while (--j > -1) { + type = ta[j]; + _easeMap[name + "." + type] = _easeMap[type + name] = e[type] = ease.getRatio ? ease : ease[type] || new ease(); + } + } + }; + + p = Ease.prototype; + p._calcEnd = false; + p.getRatio = function(p) { + if (this._func) { + this._params[0] = p; + return this._func.apply(null, this._params); + } + var t = this._type, + pw = this._power, + r = (t === 1) ? 1 - p : (t === 2) ? p : (p < 0.5) ? p * 2 : (1 - p) * 2; + if (pw === 1) { + r *= r; + } else if (pw === 2) { + r *= r * r; + } else if (pw === 3) { + r *= r * r * r; + } else if (pw === 4) { + r *= r * r * r * r; + } + return (t === 1) ? 1 - r : (t === 2) ? r : (p < 0.5) ? r / 2 : 1 - (r / 2); + }; + + //create all the standard eases like Linear, Quad, Cubic, Quart, Quint, Strong, Power0, Power1, Power2, Power3, and Power4 (each with easeIn, easeOut, and easeInOut) + a = ["Linear","Quad","Cubic","Quart","Quint,Strong"]; + i = a.length; + while (--i > -1) { + p = a[i]+",Power"+i; + _easeReg(new Ease(null,null,1,i), p, "easeOut", true); + _easeReg(new Ease(null,null,2,i), p, "easeIn" + ((i === 0) ? ",easeNone" : "")); + _easeReg(new Ease(null,null,3,i), p, "easeInOut"); + } + _easeMap.linear = gs.easing.Linear.easeIn; + _easeMap.swing = gs.easing.Quad.easeInOut; //for jQuery folks /* @@ -17443,64 +17721,64 @@ angular.module('b2b.att.treeNodeCheckbox', ['b2b.att.utilities']) * EventDispatcher * ---------------------------------------------------------------- */ - var EventDispatcher = _class("events.EventDispatcher", function(target) { - this._listeners = {}; - this._eventTarget = target || this; - }); - p = EventDispatcher.prototype; - - p.addEventListener = function(type, callback, scope, useParam, priority) { - priority = priority || 0; - var list = this._listeners[type], - index = 0, - listener, i; - if (list == null) { - this._listeners[type] = list = []; - } - i = list.length; - while (--i > -1) { - listener = list[i]; - if (listener.c === callback && listener.s === scope) { - list.splice(i, 1); - } else if (index === 0 && listener.pr < priority) { - index = i + 1; - } - } - list.splice(index, 0, {c:callback, s:scope, up:useParam, pr:priority}); - if (this === _ticker && !_tickerActive) { - _ticker.wake(); - } - }; - - p.removeEventListener = function(type, callback) { - var list = this._listeners[type], i; - if (list) { - i = list.length; - while (--i > -1) { - if (list[i].c === callback) { - list.splice(i, 1); - return; - } - } - } - }; - - p.dispatchEvent = function(type) { - var list = this._listeners[type], - i, t, listener; - if (list) { - i = list.length; - t = this._eventTarget; - while (--i > -1) { - listener = list[i]; - if (listener.up) { - listener.c.call(listener.s || t, {type:type, target:t}); - } else { - listener.c.call(listener.s || t); - } - } - } - }; + var EventDispatcher = _class("events.EventDispatcher", function(target) { + this._listeners = {}; + this._eventTarget = target || this; + }); + p = EventDispatcher.prototype; + + p.addEventListener = function(type, callback, scope, useParam, priority) { + priority = priority || 0; + var list = this._listeners[type], + index = 0, + listener, i; + if (list == null) { + this._listeners[type] = list = []; + } + i = list.length; + while (--i > -1) { + listener = list[i]; + if (listener.c === callback && listener.s === scope) { + list.splice(i, 1); + } else if (index === 0 && listener.pr < priority) { + index = i + 1; + } + } + list.splice(index, 0, {c:callback, s:scope, up:useParam, pr:priority}); + if (this === _ticker && !_tickerActive) { + _ticker.wake(); + } + }; + + p.removeEventListener = function(type, callback) { + var list = this._listeners[type], i; + if (list) { + i = list.length; + while (--i > -1) { + if (list[i].c === callback) { + list.splice(i, 1); + return; + } + } + } + }; + + p.dispatchEvent = function(type) { + var list = this._listeners[type], + i, t, listener; + if (list) { + i = list.length; + t = this._eventTarget; + while (--i > -1) { + listener = list[i]; + if (listener.up) { + listener.c.call(listener.s || t, {type:type, target:t}); + } else { + listener.c.call(listener.s || t); + } + } + } + }; /* @@ -17508,118 +17786,118 @@ angular.module('b2b.att.treeNodeCheckbox', ['b2b.att.utilities']) * Ticker * ---------------------------------------------------------------- */ - var _reqAnimFrame = window.requestAnimationFrame, - _cancelAnimFrame = window.cancelAnimationFrame, - _getTime = Date.now || function() {return new Date().getTime();}, - _lastUpdate = _getTime(); - - //now try to determine the requestAnimationFrame and cancelAnimationFrame functions and if none are found, we'll use a setTimeout()/clearTimeout() polyfill. - a = ["ms","moz","webkit","o"]; - i = a.length; - while (--i > -1 && !_reqAnimFrame) { - _reqAnimFrame = window[a[i] + "RequestAnimationFrame"]; - _cancelAnimFrame = window[a[i] + "CancelAnimationFrame"] || window[a[i] + "CancelRequestAnimationFrame"]; - } - - _class("Ticker", function(fps, useRAF) { - var _self = this, - _startTime = _getTime(), - _useRAF = (useRAF !== false && _reqAnimFrame), - _lagThreshold = 500, - _adjustedLag = 33, - _fps, _req, _id, _gap, _nextTime, - _tick = function(manual) { - var elapsed = _getTime() - _lastUpdate, - overlap, dispatch; - if (elapsed > _lagThreshold) { - _startTime += elapsed - _adjustedLag; - } - _lastUpdate += elapsed; - _self.time = (_lastUpdate - _startTime) / 1000; - overlap = _self.time - _nextTime; - if (!_fps || overlap > 0 || manual === true) { - _self.frame++; - _nextTime += overlap + (overlap >= _gap ? 0.004 : _gap - overlap); - dispatch = true; - } - if (manual !== true) { //make sure the request is made before we dispatch the "tick" event so that timing is maintained. Otherwise, if processing the "tick" requires a bunch of time (like 15ms) and we're using a setTimeout() that's based on 16.7ms, it'd technically take 31.7ms between frames otherwise. - _id = _req(_tick); - } - if (dispatch) { - _self.dispatchEvent("tick"); - } - }; - - EventDispatcher.call(_self); - _self.time = _self.frame = 0; - _self.tick = function() { - _tick(true); - }; - - _self.lagSmoothing = function(threshold, adjustedLag) { - _lagThreshold = threshold || (1 / _tinyNum); //zero should be interpreted as basically unlimited - _adjustedLag = Math.min(adjustedLag, _lagThreshold, 0); - }; - - _self.sleep = function() { - if (_id == null) { - return; - } - if (!_useRAF || !_cancelAnimFrame) { - clearTimeout(_id); - } else { - _cancelAnimFrame(_id); - } - _req = _emptyFunc; - _id = null; - if (_self === _ticker) { - _tickerActive = false; - } - }; - - _self.wake = function() { - if (_id !== null) { - _self.sleep(); - } else if (_self.frame > 10) { //don't trigger lagSmoothing if we're just waking up, and make sure that at least 10 frames have elapsed because of the iOS bug that we work around below with the 1.5-second setTimout(). - _lastUpdate = _getTime() - _lagThreshold + 5; - } - _req = (_fps === 0) ? _emptyFunc : (!_useRAF || !_reqAnimFrame) ? function(f) { return setTimeout(f, ((_nextTime - _self.time) * 1000 + 1) | 0); } : _reqAnimFrame; - if (_self === _ticker) { - _tickerActive = true; - } - _tick(2); - }; - - _self.fps = function(value) { - if (!arguments.length) { - return _fps; - } - _fps = value; - _gap = 1 / (_fps || 60); - _nextTime = this.time + _gap; - _self.wake(); - }; - - _self.useRAF = function(value) { - if (!arguments.length) { - return _useRAF; - } - _self.sleep(); - _useRAF = value; - _self.fps(_fps); - }; - _self.fps(fps); - - //a bug in iOS 6 Safari occasionally prevents the requestAnimationFrame from working initially, so we use a 1.5-second timeout that automatically falls back to setTimeout() if it senses this condition. - setTimeout(function() { - if (_useRAF && (!_id || _self.frame < 5)) { - _self.useRAF(false); - } - }, 1500); - }); - - p = gs.Ticker.prototype = new gs.events.EventDispatcher(); - p.constructor = gs.Ticker; + var _reqAnimFrame = window.requestAnimationFrame, + _cancelAnimFrame = window.cancelAnimationFrame, + _getTime = Date.now || function() {return new Date().getTime();}, + _lastUpdate = _getTime(); + + //now try to determine the requestAnimationFrame and cancelAnimationFrame functions and if none are found, we'll use a setTimeout()/clearTimeout() polyfill. + a = ["ms","moz","webkit","o"]; + i = a.length; + while (--i > -1 && !_reqAnimFrame) { + _reqAnimFrame = window[a[i] + "RequestAnimationFrame"]; + _cancelAnimFrame = window[a[i] + "CancelAnimationFrame"] || window[a[i] + "CancelRequestAnimationFrame"]; + } + + _class("Ticker", function(fps, useRAF) { + var _self = this, + _startTime = _getTime(), + _useRAF = (useRAF !== false && _reqAnimFrame), + _lagThreshold = 500, + _adjustedLag = 33, + _fps, _req, _id, _gap, _nextTime, + _tick = function(manual) { + var elapsed = _getTime() - _lastUpdate, + overlap, dispatch; + if (elapsed > _lagThreshold) { + _startTime += elapsed - _adjustedLag; + } + _lastUpdate += elapsed; + _self.time = (_lastUpdate - _startTime) / 1000; + overlap = _self.time - _nextTime; + if (!_fps || overlap > 0 || manual === true) { + _self.frame++; + _nextTime += overlap + (overlap >= _gap ? 0.004 : _gap - overlap); + dispatch = true; + } + if (manual !== true) { //make sure the request is made before we dispatch the "tick" event so that timing is maintained. Otherwise, if processing the "tick" requires a bunch of time (like 15ms) and we're using a setTimeout() that's based on 16.7ms, it'd technically take 31.7ms between frames otherwise. + _id = _req(_tick); + } + if (dispatch) { + _self.dispatchEvent("tick"); + } + }; + + EventDispatcher.call(_self); + _self.time = _self.frame = 0; + _self.tick = function() { + _tick(true); + }; + + _self.lagSmoothing = function(threshold, adjustedLag) { + _lagThreshold = threshold || (1 / _tinyNum); //zero should be interpreted as basically unlimited + _adjustedLag = Math.min(adjustedLag, _lagThreshold, 0); + }; + + _self.sleep = function() { + if (_id == null) { + return; + } + if (!_useRAF || !_cancelAnimFrame) { + clearTimeout(_id); + } else { + _cancelAnimFrame(_id); + } + _req = _emptyFunc; + _id = null; + if (_self === _ticker) { + _tickerActive = false; + } + }; + + _self.wake = function() { + if (_id !== null) { + _self.sleep(); + } else if (_self.frame > 10) { //don't trigger lagSmoothing if we're just waking up, and make sure that at least 10 frames have elapsed because of the iOS bug that we work around below with the 1.5-second setTimout(). + _lastUpdate = _getTime() - _lagThreshold + 5; + } + _req = (_fps === 0) ? _emptyFunc : (!_useRAF || !_reqAnimFrame) ? function(f) { return setTimeout(f, ((_nextTime - _self.time) * 1000 + 1) | 0); } : _reqAnimFrame; + if (_self === _ticker) { + _tickerActive = true; + } + _tick(2); + }; + + _self.fps = function(value) { + if (!arguments.length) { + return _fps; + } + _fps = value; + _gap = 1 / (_fps || 60); + _nextTime = this.time + _gap; + _self.wake(); + }; + + _self.useRAF = function(value) { + if (!arguments.length) { + return _useRAF; + } + _self.sleep(); + _useRAF = value; + _self.fps(_fps); + }; + _self.fps(fps); + + //a bug in iOS 6 Safari occasionally prevents the requestAnimationFrame from working initially, so we use a 1.5-second timeout that automatically falls back to setTimeout() if it senses this condition. + setTimeout(function() { + if (_useRAF && (!_id || _self.frame < 5)) { + _self.useRAF(false); + } + }, 1500); + }); + + p = gs.Ticker.prototype = new gs.events.EventDispatcher(); + p.constructor = gs.Ticker; /* @@ -17627,323 +17905,323 @@ angular.module('b2b.att.treeNodeCheckbox', ['b2b.att.utilities']) * Animation * ---------------------------------------------------------------- */ - var Animation = _class("core.Animation", function(duration, vars) { - this.vars = vars = vars || {}; - this._duration = this._totalDuration = duration || 0; - this._delay = Number(vars.delay) || 0; - this._timeScale = 1; - this._active = (vars.immediateRender === true); - this.data = vars.data; - this._reversed = (vars.reversed === true); - - if (!_rootTimeline) { - return; - } - if (!_tickerActive) { //some browsers (like iOS 6 Safari) shut down JavaScript execution when the tab is disabled and they [occasionally] neglect to start up requestAnimationFrame again when returning - this code ensures that the engine starts up again properly. - _ticker.wake(); - } - - var tl = this.vars.useFrames ? _rootFramesTimeline : _rootTimeline; - tl.add(this, tl._time); - - if (this.vars.paused) { - this.paused(true); - } - }); - - _ticker = Animation.ticker = new gs.Ticker(); - p = Animation.prototype; - p._dirty = p._gc = p._initted = p._paused = false; - p._totalTime = p._time = 0; - p._rawPrevTime = -1; - p._next = p._last = p._onUpdate = p._timeline = p.timeline = null; - p._paused = false; - - - //some browsers (like iOS) occasionally drop the requestAnimationFrame event when the user switches to a different tab and then comes back again, so we use a 2-second setTimeout() to sense if/when that condition occurs and then wake() the ticker. - var _checkTimeout = function() { - if (_tickerActive && _getTime() - _lastUpdate > 2000) { - _ticker.wake(); - } - setTimeout(_checkTimeout, 2000); - }; - _checkTimeout(); - - - p.play = function(from, suppressEvents) { - if (from != null) { - this.seek(from, suppressEvents); - } - return this.reversed(false).paused(false); - }; - - p.pause = function(atTime, suppressEvents) { - if (atTime != null) { - this.seek(atTime, suppressEvents); - } - return this.paused(true); - }; - - p.resume = function(from, suppressEvents) { - if (from != null) { - this.seek(from, suppressEvents); - } - return this.paused(false); - }; - - p.seek = function(time, suppressEvents) { - return this.totalTime(Number(time), suppressEvents !== false); - }; - - p.restart = function(includeDelay, suppressEvents) { - return this.reversed(false).paused(false).totalTime(includeDelay ? -this._delay : 0, (suppressEvents !== false), true); - }; - - p.reverse = function(from, suppressEvents) { - if (from != null) { - this.seek((from || this.totalDuration()), suppressEvents); - } - return this.reversed(true).paused(false); - }; - - p.render = function(time, suppressEvents, force) { - //stub - we override this method in subclasses. - }; - - p.invalidate = function() { - return this; - }; - - p.isActive = function() { - var tl = this._timeline, //the 2 root timelines won't have a _timeline; they're always active. - startTime = this._startTime, - rawTime; - return (!tl || (!this._gc && !this._paused && tl.isActive() && (rawTime = tl.rawTime()) >= startTime && rawTime < startTime + this.totalDuration() / this._timeScale)); - }; - - p._enabled = function (enabled, ignoreTimeline) { - if (!_tickerActive) { - _ticker.wake(); - } - this._gc = !enabled; - this._active = this.isActive(); - if (ignoreTimeline !== true) { - if (enabled && !this.timeline) { - this._timeline.add(this, this._startTime - this._delay); - } else if (!enabled && this.timeline) { - this._timeline._remove(this, true); - } - } - return false; - }; - - - p._kill = function(vars, target) { - return this._enabled(false, false); - }; - - p.kill = function(vars, target) { - this._kill(vars, target); - return this; - }; - - p._uncache = function(includeSelf) { - var tween = includeSelf ? this : this.timeline; - while (tween) { - tween._dirty = true; - tween = tween.timeline; - } - return this; - }; - - p._swapSelfInParams = function(params) { - var i = params.length, - copy = params.concat(); - while (--i > -1) { - if (params[i] === "{self}") { - copy[i] = this; - } - } - return copy; - }; + var Animation = _class("core.Animation", function(duration, vars) { + this.vars = vars = vars || {}; + this._duration = this._totalDuration = duration || 0; + this._delay = Number(vars.delay) || 0; + this._timeScale = 1; + this._active = (vars.immediateRender === true); + this.data = vars.data; + this._reversed = (vars.reversed === true); + + if (!_rootTimeline) { + return; + } + if (!_tickerActive) { //some browsers (like iOS 6 Safari) shut down JavaScript execution when the tab is disabled and they [occasionally] neglect to start up requestAnimationFrame again when returning - this code ensures that the engine starts up again properly. + _ticker.wake(); + } + + var tl = this.vars.useFrames ? _rootFramesTimeline : _rootTimeline; + tl.add(this, tl._time); + + if (this.vars.paused) { + this.paused(true); + } + }); + + _ticker = Animation.ticker = new gs.Ticker(); + p = Animation.prototype; + p._dirty = p._gc = p._initted = p._paused = false; + p._totalTime = p._time = 0; + p._rawPrevTime = -1; + p._next = p._last = p._onUpdate = p._timeline = p.timeline = null; + p._paused = false; + + + //some browsers (like iOS) occasionally drop the requestAnimationFrame event when the user switches to a different tab and then comes back again, so we use a 2-second setTimeout() to sense if/when that condition occurs and then wake() the ticker. + var _checkTimeout = function() { + if (_tickerActive && _getTime() - _lastUpdate > 2000) { + _ticker.wake(); + } + setTimeout(_checkTimeout, 2000); + }; + _checkTimeout(); + + + p.play = function(from, suppressEvents) { + if (from != null) { + this.seek(from, suppressEvents); + } + return this.reversed(false).paused(false); + }; + + p.pause = function(atTime, suppressEvents) { + if (atTime != null) { + this.seek(atTime, suppressEvents); + } + return this.paused(true); + }; + + p.resume = function(from, suppressEvents) { + if (from != null) { + this.seek(from, suppressEvents); + } + return this.paused(false); + }; + + p.seek = function(time, suppressEvents) { + return this.totalTime(Number(time), suppressEvents !== false); + }; + + p.restart = function(includeDelay, suppressEvents) { + return this.reversed(false).paused(false).totalTime(includeDelay ? -this._delay : 0, (suppressEvents !== false), true); + }; + + p.reverse = function(from, suppressEvents) { + if (from != null) { + this.seek((from || this.totalDuration()), suppressEvents); + } + return this.reversed(true).paused(false); + }; + + p.render = function(time, suppressEvents, force) { + //stub - we override this method in subclasses. + }; + + p.invalidate = function() { + return this; + }; + + p.isActive = function() { + var tl = this._timeline, //the 2 root timelines won't have a _timeline; they're always active. + startTime = this._startTime, + rawTime; + return (!tl || (!this._gc && !this._paused && tl.isActive() && (rawTime = tl.rawTime()) >= startTime && rawTime < startTime + this.totalDuration() / this._timeScale)); + }; + + p._enabled = function (enabled, ignoreTimeline) { + if (!_tickerActive) { + _ticker.wake(); + } + this._gc = !enabled; + this._active = this.isActive(); + if (ignoreTimeline !== true) { + if (enabled && !this.timeline) { + this._timeline.add(this, this._startTime - this._delay); + } else if (!enabled && this.timeline) { + this._timeline._remove(this, true); + } + } + return false; + }; + + + p._kill = function(vars, target) { + return this._enabled(false, false); + }; + + p.kill = function(vars, target) { + this._kill(vars, target); + return this; + }; + + p._uncache = function(includeSelf) { + var tween = includeSelf ? this : this.timeline; + while (tween) { + tween._dirty = true; + tween = tween.timeline; + } + return this; + }; + + p._swapSelfInParams = function(params) { + var i = params.length, + copy = params.concat(); + while (--i > -1) { + if (params[i] === "{self}") { + copy[i] = this; + } + } + return copy; + }; //----Animation getters/setters -------------------------------------------------------- - p.eventCallback = function(type, callback, params, scope) { - if ((type || "").substr(0,2) === "on") { - var v = this.vars; - if (arguments.length === 1) { - return v[type]; - } - if (callback == null) { - delete v[type]; - } else { - v[type] = callback; - v[type + "Params"] = (_isArray(params) && params.join("").indexOf("{self}") !== -1) ? this._swapSelfInParams(params) : params; - v[type + "Scope"] = scope; - } - if (type === "onUpdate") { - this._onUpdate = callback; - } - } - return this; - }; - - p.delay = function(value) { - if (!arguments.length) { - return this._delay; - } - if (this._timeline.smoothChildTiming) { - this.startTime( this._startTime + value - this._delay ); - } - this._delay = value; - return this; - }; - - p.duration = function(value) { - if (!arguments.length) { - this._dirty = false; - return this._duration; - } - this._duration = this._totalDuration = value; - this._uncache(true); //true in case it's a TweenMax or TimelineMax that has a repeat - we'll need to refresh the totalDuration. - if (this._timeline.smoothChildTiming) if (this._time > 0) if (this._time < this._duration) if (value !== 0) { - this.totalTime(this._totalTime * (value / this._duration), true); - } - return this; - }; - - p.totalDuration = function(value) { - this._dirty = false; - return (!arguments.length) ? this._totalDuration : this.duration(value); - }; - - p.time = function(value, suppressEvents) { - if (!arguments.length) { - return this._time; - } - if (this._dirty) { - this.totalDuration(); - } - return this.totalTime((value > this._duration) ? this._duration : value, suppressEvents); - }; - - p.totalTime = function(time, suppressEvents, uncapped) { - if (!_tickerActive) { - _ticker.wake(); - } - if (!arguments.length) { - return this._totalTime; - } - if (this._timeline) { - if (time < 0 && !uncapped) { - time += this.totalDuration(); - } - if (this._timeline.smoothChildTiming) { - if (this._dirty) { - this.totalDuration(); - } - var totalDuration = this._totalDuration, - tl = this._timeline; - if (time > totalDuration && !uncapped) { - time = totalDuration; - } - this._startTime = (this._paused ? this._pauseTime : tl._time) - ((!this._reversed ? time : totalDuration - time) / this._timeScale); - if (!tl._dirty) { //for performance improvement. If the parent's cache is already dirty, it already took care of marking the ancestors as dirty too, so skip the function call here. - this._uncache(false); - } - //in case any of the ancestor timelines had completed but should now be enabled, we should reset their totalTime() which will also ensure that they're lined up properly and enabled. Skip for animations that are on the root (wasteful). Example: a TimelineLite.exportRoot() is performed when there's a paused tween on the root, the export will not complete until that tween is unpaused, but imagine a child gets restarted later, after all [unpaused] tweens have completed. The startTime of that child would get pushed out, but one of the ancestors may have completed. - if (tl._timeline) { - while (tl._timeline) { - if (tl._timeline._time !== (tl._startTime + tl._totalTime) / tl._timeScale) { - tl.totalTime(tl._totalTime, true); - } - tl = tl._timeline; - } - } - } - if (this._gc) { - this._enabled(true, false); - } - if (this._totalTime !== time || this._duration === 0) { - this.render(time, suppressEvents, false); - if (_lazyTweens.length) { //in case rendering caused any tweens to lazy-init, we should render them because typically when someone calls seek() or time() or progress(), they expect an immediate render. - _lazyRender(); - } - } - } - return this; - }; - - p.progress = p.totalProgress = function(value, suppressEvents) { - return (!arguments.length) ? this._time / this.duration() : this.totalTime(this.duration() * value, suppressEvents); - }; - - p.startTime = function(value) { - if (!arguments.length) { - return this._startTime; - } - if (value !== this._startTime) { - this._startTime = value; - if (this.timeline) if (this.timeline._sortChildren) { - this.timeline.add(this, value - this._delay); //ensures that any necessary re-sequencing of Animations in the timeline occurs to make sure the rendering order is correct. - } - } - return this; - }; - - p.timeScale = function(value) { - if (!arguments.length) { - return this._timeScale; - } - value = value || _tinyNum; //can't allow zero because it'll throw the math off - if (this._timeline && this._timeline.smoothChildTiming) { - var pauseTime = this._pauseTime, - t = (pauseTime || pauseTime === 0) ? pauseTime : this._timeline.totalTime(); - this._startTime = t - ((t - this._startTime) * this._timeScale / value); - } - this._timeScale = value; - return this._uncache(false); - }; - - p.reversed = function(value) { - if (!arguments.length) { - return this._reversed; - } - if (value != this._reversed) { - this._reversed = value; - this.totalTime(((this._timeline && !this._timeline.smoothChildTiming) ? this.totalDuration() - this._totalTime : this._totalTime), true); - } - return this; - }; - - p.paused = function(value) { - if (!arguments.length) { - return this._paused; - } - if (value != this._paused) if (this._timeline) { - if (!_tickerActive && !value) { - _ticker.wake(); - } - var tl = this._timeline, - raw = tl.rawTime(), - elapsed = raw - this._pauseTime; - if (!value && tl.smoothChildTiming) { - this._startTime += elapsed; - this._uncache(false); - } - this._pauseTime = value ? raw : null; - this._paused = value; - this._active = this.isActive(); - if (!value && elapsed !== 0 && this._initted && this.duration()) { - this.render((tl.smoothChildTiming ? this._totalTime : (raw - this._startTime) / this._timeScale), true, true); //in case the target's properties changed via some other tween or manual update by the user, we should force a render. - } - } - if (this._gc && !value) { - this._enabled(true, false); - } - return this; - }; + p.eventCallback = function(type, callback, params, scope) { + if ((type || "").substr(0,2) === "on") { + var v = this.vars; + if (arguments.length === 1) { + return v[type]; + } + if (callback == null) { + delete v[type]; + } else { + v[type] = callback; + v[type + "Params"] = (_isArray(params) && params.join("").indexOf("{self}") !== -1) ? this._swapSelfInParams(params) : params; + v[type + "Scope"] = scope; + } + if (type === "onUpdate") { + this._onUpdate = callback; + } + } + return this; + }; + + p.delay = function(value) { + if (!arguments.length) { + return this._delay; + } + if (this._timeline.smoothChildTiming) { + this.startTime( this._startTime + value - this._delay ); + } + this._delay = value; + return this; + }; + + p.duration = function(value) { + if (!arguments.length) { + this._dirty = false; + return this._duration; + } + this._duration = this._totalDuration = value; + this._uncache(true); //true in case it's a TweenMax or TimelineMax that has a repeat - we'll need to refresh the totalDuration. + if (this._timeline.smoothChildTiming) if (this._time > 0) if (this._time < this._duration) if (value !== 0) { + this.totalTime(this._totalTime * (value / this._duration), true); + } + return this; + }; + + p.totalDuration = function(value) { + this._dirty = false; + return (!arguments.length) ? this._totalDuration : this.duration(value); + }; + + p.time = function(value, suppressEvents) { + if (!arguments.length) { + return this._time; + } + if (this._dirty) { + this.totalDuration(); + } + return this.totalTime((value > this._duration) ? this._duration : value, suppressEvents); + }; + + p.totalTime = function(time, suppressEvents, uncapped) { + if (!_tickerActive) { + _ticker.wake(); + } + if (!arguments.length) { + return this._totalTime; + } + if (this._timeline) { + if (time < 0 && !uncapped) { + time += this.totalDuration(); + } + if (this._timeline.smoothChildTiming) { + if (this._dirty) { + this.totalDuration(); + } + var totalDuration = this._totalDuration, + tl = this._timeline; + if (time > totalDuration && !uncapped) { + time = totalDuration; + } + this._startTime = (this._paused ? this._pauseTime : tl._time) - ((!this._reversed ? time : totalDuration - time) / this._timeScale); + if (!tl._dirty) { //for performance improvement. If the parent's cache is already dirty, it already took care of marking the ancestors as dirty too, so skip the function call here. + this._uncache(false); + } + //in case any of the ancestor timelines had completed but should now be enabled, we should reset their totalTime() which will also ensure that they're lined up properly and enabled. Skip for animations that are on the root (wasteful). Example: a TimelineLite.exportRoot() is performed when there's a paused tween on the root, the export will not complete until that tween is unpaused, but imagine a child gets restarted later, after all [unpaused] tweens have completed. The startTime of that child would get pushed out, but one of the ancestors may have completed. + if (tl._timeline) { + while (tl._timeline) { + if (tl._timeline._time !== (tl._startTime + tl._totalTime) / tl._timeScale) { + tl.totalTime(tl._totalTime, true); + } + tl = tl._timeline; + } + } + } + if (this._gc) { + this._enabled(true, false); + } + if (this._totalTime !== time || this._duration === 0) { + this.render(time, suppressEvents, false); + if (_lazyTweens.length) { //in case rendering caused any tweens to lazy-init, we should render them because typically when someone calls seek() or time() or progress(), they expect an immediate render. + _lazyRender(); + } + } + } + return this; + }; + + p.progress = p.totalProgress = function(value, suppressEvents) { + return (!arguments.length) ? this._time / this.duration() : this.totalTime(this.duration() * value, suppressEvents); + }; + + p.startTime = function(value) { + if (!arguments.length) { + return this._startTime; + } + if (value !== this._startTime) { + this._startTime = value; + if (this.timeline) if (this.timeline._sortChildren) { + this.timeline.add(this, value - this._delay); //ensures that any necessary re-sequencing of Animations in the timeline occurs to make sure the rendering order is correct. + } + } + return this; + }; + + p.timeScale = function(value) { + if (!arguments.length) { + return this._timeScale; + } + value = value || _tinyNum; //can't allow zero because it'll throw the math off + if (this._timeline && this._timeline.smoothChildTiming) { + var pauseTime = this._pauseTime, + t = (pauseTime || pauseTime === 0) ? pauseTime : this._timeline.totalTime(); + this._startTime = t - ((t - this._startTime) * this._timeScale / value); + } + this._timeScale = value; + return this._uncache(false); + }; + + p.reversed = function(value) { + if (!arguments.length) { + return this._reversed; + } + if (value != this._reversed) { + this._reversed = value; + this.totalTime(((this._timeline && !this._timeline.smoothChildTiming) ? this.totalDuration() - this._totalTime : this._totalTime), true); + } + return this; + }; + + p.paused = function(value) { + if (!arguments.length) { + return this._paused; + } + if (value != this._paused) if (this._timeline) { + if (!_tickerActive && !value) { + _ticker.wake(); + } + var tl = this._timeline, + raw = tl.rawTime(), + elapsed = raw - this._pauseTime; + if (!value && tl.smoothChildTiming) { + this._startTime += elapsed; + this._uncache(false); + } + this._pauseTime = value ? raw : null; + this._paused = value; + this._active = this.isActive(); + if (!value && elapsed !== 0 && this._initted && this.duration()) { + this.render((tl.smoothChildTiming ? this._totalTime : (raw - this._startTime) / this._timeScale), true, true); //in case the target's properties changed via some other tween or manual update by the user, we should force a render. + } + } + if (this._gc && !value) { + this._enabled(true, false); + } + return this; + }; /* @@ -17951,844 +18229,844 @@ angular.module('b2b.att.treeNodeCheckbox', ['b2b.att.utilities']) * SimpleTimeline * ---------------------------------------------------------------- */ - var SimpleTimeline = _class("core.SimpleTimeline", function(vars) { - Animation.call(this, 0, vars); - this.autoRemoveChildren = this.smoothChildTiming = true; - }); - - p = SimpleTimeline.prototype = new Animation(); - p.constructor = SimpleTimeline; - p.kill()._gc = false; - p._first = p._last = null; - p._sortChildren = false; - - p.add = p.insert = function(child, position, align, stagger) { - var prevTween, st; - child._startTime = Number(position || 0) + child._delay; - if (child._paused) if (this !== child._timeline) { //we only adjust the _pauseTime if it wasn't in this timeline already. Remember, sometimes a tween will be inserted again into the same timeline when its startTime is changed so that the tweens in the TimelineLite/Max are re-ordered properly in the linked list (so everything renders in the proper order). - child._pauseTime = child._startTime + ((this.rawTime() - child._startTime) / child._timeScale); - } - if (child.timeline) { - child.timeline._remove(child, true); //removes from existing timeline so that it can be properly added to this one. - } - child.timeline = child._timeline = this; - if (child._gc) { - child._enabled(true, true); - } - prevTween = this._last; - if (this._sortChildren) { - st = child._startTime; - while (prevTween && prevTween._startTime > st) { - prevTween = prevTween._prev; - } - } - if (prevTween) { - child._next = prevTween._next; - prevTween._next = child; - } else { - child._next = this._first; - this._first = child; - } - if (child._next) { - child._next._prev = child; - } else { - this._last = child; - } - child._prev = prevTween; - if (this._timeline) { - this._uncache(true); - } - return this; - }; - - p._remove = function(tween, skipDisable) { - if (tween.timeline === this) { - if (!skipDisable) { - tween._enabled(false, true); - } - tween.timeline = null; - - if (tween._prev) { - tween._prev._next = tween._next; - } else if (this._first === tween) { - this._first = tween._next; - } - if (tween._next) { - tween._next._prev = tween._prev; - } else if (this._last === tween) { - this._last = tween._prev; - } - - if (this._timeline) { - this._uncache(true); - } - } - return this; - }; - - p.render = function(time, suppressEvents, force) { - var tween = this._first, - next; - this._totalTime = this._time = this._rawPrevTime = time; - while (tween) { - next = tween._next; //record it here because the value could change after rendering... - if (tween._active || (time >= tween._startTime && !tween._paused)) { - if (!tween._reversed) { - tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); - } else { - tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); - } - } - tween = next; - } - }; - - p.rawTime = function() { - if (!_tickerActive) { - _ticker.wake(); - } - return this._totalTime; - }; + var SimpleTimeline = _class("core.SimpleTimeline", function(vars) { + Animation.call(this, 0, vars); + this.autoRemoveChildren = this.smoothChildTiming = true; + }); + + p = SimpleTimeline.prototype = new Animation(); + p.constructor = SimpleTimeline; + p.kill()._gc = false; + p._first = p._last = null; + p._sortChildren = false; + + p.add = p.insert = function(child, position, align, stagger) { + var prevTween, st; + child._startTime = Number(position || 0) + child._delay; + if (child._paused) if (this !== child._timeline) { //we only adjust the _pauseTime if it wasn't in this timeline already. Remember, sometimes a tween will be inserted again into the same timeline when its startTime is changed so that the tweens in the TimelineLite/Max are re-ordered properly in the linked list (so everything renders in the proper order). + child._pauseTime = child._startTime + ((this.rawTime() - child._startTime) / child._timeScale); + } + if (child.timeline) { + child.timeline._remove(child, true); //removes from existing timeline so that it can be properly added to this one. + } + child.timeline = child._timeline = this; + if (child._gc) { + child._enabled(true, true); + } + prevTween = this._last; + if (this._sortChildren) { + st = child._startTime; + while (prevTween && prevTween._startTime > st) { + prevTween = prevTween._prev; + } + } + if (prevTween) { + child._next = prevTween._next; + prevTween._next = child; + } else { + child._next = this._first; + this._first = child; + } + if (child._next) { + child._next._prev = child; + } else { + this._last = child; + } + child._prev = prevTween; + if (this._timeline) { + this._uncache(true); + } + return this; + }; + + p._remove = function(tween, skipDisable) { + if (tween.timeline === this) { + if (!skipDisable) { + tween._enabled(false, true); + } + tween.timeline = null; + + if (tween._prev) { + tween._prev._next = tween._next; + } else if (this._first === tween) { + this._first = tween._next; + } + if (tween._next) { + tween._next._prev = tween._prev; + } else if (this._last === tween) { + this._last = tween._prev; + } + + if (this._timeline) { + this._uncache(true); + } + } + return this; + }; + + p.render = function(time, suppressEvents, force) { + var tween = this._first, + next; + this._totalTime = this._time = this._rawPrevTime = time; + while (tween) { + next = tween._next; //record it here because the value could change after rendering... + if (tween._active || (time >= tween._startTime && !tween._paused)) { + if (!tween._reversed) { + tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); + } else { + tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); + } + } + tween = next; + } + }; + + p.rawTime = function() { + if (!_tickerActive) { + _ticker.wake(); + } + return this._totalTime; + }; /* * ---------------------------------------------------------------- * TweenLite * ---------------------------------------------------------------- */ - var TweenLite = _class("TweenLite", function(target, duration, vars) { - Animation.call(this, duration, vars); - this.render = TweenLite.prototype.render; //speed optimization (avoid prototype lookup on this "hot" method) - - if (target == null) { - throw "Cannot tween a null target."; - } - - this.target = target = (typeof(target) !== "string") ? target : TweenLite.selector(target) || target; - - var isSelector = (target.jquery || (target.length && target !== window && target[0] && (target[0] === window || (target[0].nodeType && target[0].style && !target.nodeType)))), - overwrite = this.vars.overwrite, - i, targ, targets; - - this._overwrite = overwrite = (overwrite == null) ? _overwriteLookup[TweenLite.defaultOverwrite] : (typeof(overwrite) === "number") ? overwrite >> 0 : _overwriteLookup[overwrite]; - - if ((isSelector || target instanceof Array || (target.push && _isArray(target))) && typeof(target[0]) !== "number") { - this._targets = targets = _slice.call(target, 0); - this._propLookup = []; - this._siblings = []; - for (i = 0; i < targets.length; i++) { - targ = targets[i]; - if (!targ) { - targets.splice(i--, 1); - continue; - } else if (typeof(targ) === "string") { - targ = targets[i--] = TweenLite.selector(targ); //in case it's an array of strings - if (typeof(targ) === "string") { - targets.splice(i+1, 1); //to avoid an endless loop (can't imagine why the selector would return a string, but just in case) - } - continue; - } else if (targ.length && targ !== window && targ[0] && (targ[0] === window || (targ[0].nodeType && targ[0].style && !targ.nodeType))) { //in case the user is passing in an array of selector objects (like jQuery objects), we need to check one more level and pull things out if necessary. Also note that <select> elements pass all the criteria regarding length and the first child having style, so we must also check to ensure the target isn't an HTML node itself. - targets.splice(i--, 1); - this._targets = targets = targets.concat(_slice.call(targ, 0)); - continue; - } - this._siblings[i] = _register(targ, this, false); - if (overwrite === 1) if (this._siblings[i].length > 1) { - _applyOverwrite(targ, this, null, 1, this._siblings[i]); - } - } - - } else { - this._propLookup = {}; - this._siblings = _register(target, this, false); - if (overwrite === 1) if (this._siblings.length > 1) { - _applyOverwrite(target, this, null, 1, this._siblings); - } - } - if (this.vars.immediateRender || (duration === 0 && this._delay === 0 && this.vars.immediateRender !== false)) { - this._time = -_tinyNum; //forces a render without having to set the render() "force" parameter to true because we want to allow lazying by default (using the "force" parameter always forces an immediate full render) - this.render(-this._delay); - } - }, true), - _isSelector = function(v) { - return (v.length && v !== window && v[0] && (v[0] === window || (v[0].nodeType && v[0].style && !v.nodeType))); //we cannot check "nodeType" if the target is window from within an iframe, otherwise it will trigger a security error in some browsers like Firefox. - }, - _autoCSS = function(vars, target) { - var css = {}, - p; - for (p in vars) { - if (!_reservedProps[p] && (!(p in target) || p === "transform" || p === "x" || p === "y" || p === "width" || p === "height" || p === "className" || p === "border") && (!_plugins[p] || (_plugins[p] && _plugins[p]._autoCSS))) { //note: <img> elements contain read-only "x" and "y" properties. We should also prioritize editing css width/height rather than the element's properties. - css[p] = vars[p]; - delete vars[p]; - } - } - vars.css = css; - }; - - p = TweenLite.prototype = new Animation(); - p.constructor = TweenLite; - p.kill()._gc = false; + var TweenLite = _class("TweenLite", function(target, duration, vars) { + Animation.call(this, duration, vars); + this.render = TweenLite.prototype.render; //speed optimization (avoid prototype lookup on this "hot" method) + + if (target == null) { + throw "Cannot tween a null target."; + } + + this.target = target = (typeof(target) !== "string") ? target : TweenLite.selector(target) || target; + + var isSelector = (target.jquery || (target.length && target !== window && target[0] && (target[0] === window || (target[0].nodeType && target[0].style && !target.nodeType)))), + overwrite = this.vars.overwrite, + i, targ, targets; + + this._overwrite = overwrite = (overwrite == null) ? _overwriteLookup[TweenLite.defaultOverwrite] : (typeof(overwrite) === "number") ? overwrite >> 0 : _overwriteLookup[overwrite]; + + if ((isSelector || target instanceof Array || (target.push && _isArray(target))) && typeof(target[0]) !== "number") { + this._targets = targets = _slice.call(target, 0); + this._propLookup = []; + this._siblings = []; + for (i = 0; i < targets.length; i++) { + targ = targets[i]; + if (!targ) { + targets.splice(i--, 1); + continue; + } else if (typeof(targ) === "string") { + targ = targets[i--] = TweenLite.selector(targ); //in case it's an array of strings + if (typeof(targ) === "string") { + targets.splice(i+1, 1); //to avoid an endless loop (can't imagine why the selector would return a string, but just in case) + } + continue; + } else if (targ.length && targ !== window && targ[0] && (targ[0] === window || (targ[0].nodeType && targ[0].style && !targ.nodeType))) { //in case the user is passing in an array of selector objects (like jQuery objects), we need to check one more level and pull things out if necessary. Also note that <select> elements pass all the criteria regarding length and the first child having style, so we must also check to ensure the target isn't an HTML node itself. + targets.splice(i--, 1); + this._targets = targets = targets.concat(_slice.call(targ, 0)); + continue; + } + this._siblings[i] = _register(targ, this, false); + if (overwrite === 1) if (this._siblings[i].length > 1) { + _applyOverwrite(targ, this, null, 1, this._siblings[i]); + } + } + + } else { + this._propLookup = {}; + this._siblings = _register(target, this, false); + if (overwrite === 1) if (this._siblings.length > 1) { + _applyOverwrite(target, this, null, 1, this._siblings); + } + } + if (this.vars.immediateRender || (duration === 0 && this._delay === 0 && this.vars.immediateRender !== false)) { + this._time = -_tinyNum; //forces a render without having to set the render() "force" parameter to true because we want to allow lazying by default (using the "force" parameter always forces an immediate full render) + this.render(-this._delay); + } + }, true), + _isSelector = function(v) { + return (v.length && v !== window && v[0] && (v[0] === window || (v[0].nodeType && v[0].style && !v.nodeType))); //we cannot check "nodeType" if the target is window from within an iframe, otherwise it will trigger a security error in some browsers like Firefox. + }, + _autoCSS = function(vars, target) { + var css = {}, + p; + for (p in vars) { + if (!_reservedProps[p] && (!(p in target) || p === "transform" || p === "x" || p === "y" || p === "width" || p === "height" || p === "className" || p === "border") && (!_plugins[p] || (_plugins[p] && _plugins[p]._autoCSS))) { //note: <img> elements contain read-only "x" and "y" properties. We should also prioritize editing css width/height rather than the element's properties. + css[p] = vars[p]; + delete vars[p]; + } + } + vars.css = css; + }; + + p = TweenLite.prototype = new Animation(); + p.constructor = TweenLite; + p.kill()._gc = false; //----TweenLite defaults, overwrite management, and root updates ---------------------------------------------------- - p.ratio = 0; - p._firstPT = p._targets = p._overwrittenProps = p._startAt = null; - p._notifyPluginsOfEnabled = p._lazy = false; - - TweenLite.version = "1.12.1"; - TweenLite.defaultEase = p._ease = new Ease(null, null, 1, 1); - TweenLite.defaultOverwrite = "auto"; - TweenLite.ticker = _ticker; - TweenLite.autoSleep = true; - TweenLite.lagSmoothing = function(threshold, adjustedLag) { - _ticker.lagSmoothing(threshold, adjustedLag); - }; - TweenLite.selector = window.$ || window.jQuery || function(e) { if (window.$) { TweenLite.selector = window.$; return window.$(e); } return window.document ? window.document.getElementById((e.charAt(0) === "#") ? e.substr(1) : e) : e; }; - - var _lazyTweens = [], - _lazyLookup = {}, - _internals = TweenLite._internals = {isArray:_isArray, isSelector:_isSelector, lazyTweens:_lazyTweens}, //gives us a way to expose certain private values to other GreenSock classes without contaminating tha main TweenLite object. - _plugins = TweenLite._plugins = {}, - _tweenLookup = _internals.tweenLookup = {}, - _tweenLookupNum = 0, - _reservedProps = _internals.reservedProps = {ease:1, delay:1, overwrite:1, onComplete:1, onCompleteParams:1, onCompleteScope:1, useFrames:1, runBackwards:1, startAt:1, onUpdate:1, onUpdateParams:1, onUpdateScope:1, onStart:1, onStartParams:1, onStartScope:1, onReverseComplete:1, onReverseCompleteParams:1, onReverseCompleteScope:1, onRepeat:1, onRepeatParams:1, onRepeatScope:1, easeParams:1, yoyo:1, immediateRender:1, repeat:1, repeatDelay:1, data:1, paused:1, reversed:1, autoCSS:1, lazy:1}, - _overwriteLookup = {none:0, all:1, auto:2, concurrent:3, allOnStart:4, preexisting:5, "true":1, "false":0}, - _rootFramesTimeline = Animation._rootFramesTimeline = new SimpleTimeline(), - _rootTimeline = Animation._rootTimeline = new SimpleTimeline(), - _lazyRender = function() { - var i = _lazyTweens.length; - _lazyLookup = {}; - while (--i > -1) { - a = _lazyTweens[i]; - if (a && a._lazy !== false) { - a.render(a._lazy, false, true); - a._lazy = false; - } - } - _lazyTweens.length = 0; - }; - - _rootTimeline._startTime = _ticker.time; - _rootFramesTimeline._startTime = _ticker.frame; - _rootTimeline._active = _rootFramesTimeline._active = true; - setTimeout(_lazyRender, 1); //on some mobile devices, there isn't a "tick" before code runs which means any lazy renders wouldn't run before the next official "tick". - - Animation._updateRoot = TweenLite.render = function() { - var i, a, p; - if (_lazyTweens.length) { //if code is run outside of the requestAnimationFrame loop, there may be tweens queued AFTER the engine refreshed, so we need to ensure any pending renders occur before we refresh again. - _lazyRender(); - } - _rootTimeline.render((_ticker.time - _rootTimeline._startTime) * _rootTimeline._timeScale, false, false); - _rootFramesTimeline.render((_ticker.frame - _rootFramesTimeline._startTime) * _rootFramesTimeline._timeScale, false, false); - if (_lazyTweens.length) { - _lazyRender(); - } - if (!(_ticker.frame % 120)) { //dump garbage every 120 frames... - for (p in _tweenLookup) { - a = _tweenLookup[p].tweens; - i = a.length; - while (--i > -1) { - if (a[i]._gc) { - a.splice(i, 1); - } - } - if (a.length === 0) { - delete _tweenLookup[p]; - } - } - //if there are no more tweens in the root timelines, or if they're all paused, make the _timer sleep to reduce load on the CPU slightly - p = _rootTimeline._first; - if (!p || p._paused) if (TweenLite.autoSleep && !_rootFramesTimeline._first && _ticker._listeners.tick.length === 1) { - while (p && p._paused) { - p = p._next; - } - if (!p) { - _ticker.sleep(); - } - } - } - }; - - _ticker.addEventListener("tick", Animation._updateRoot); - - var _register = function(target, tween, scrub) { - var id = target._gsTweenID, a, i; - if (!_tweenLookup[id || (target._gsTweenID = id = "t" + (_tweenLookupNum++))]) { - _tweenLookup[id] = {target:target, tweens:[]}; - } - if (tween) { - a = _tweenLookup[id].tweens; - a[(i = a.length)] = tween; - if (scrub) { - while (--i > -1) { - if (a[i] === tween) { - a.splice(i, 1); - } - } - } - } - return _tweenLookup[id].tweens; - }, - - _applyOverwrite = function(target, tween, props, mode, siblings) { - var i, changed, curTween, l; - if (mode === 1 || mode >= 4) { - l = siblings.length; - for (i = 0; i < l; i++) { - if ((curTween = siblings[i]) !== tween) { - if (!curTween._gc) if (curTween._enabled(false, false)) { - changed = true; - } - } else if (mode === 5) { - break; - } - } - return changed; - } - //NOTE: Add 0.0000000001 to overcome floating point errors that can cause the startTime to be VERY slightly off (when a tween's time() is set for example) - var startTime = tween._startTime + _tinyNum, - overlaps = [], - oCount = 0, - zeroDur = (tween._duration === 0), - globalStart; - i = siblings.length; - while (--i > -1) { - if ((curTween = siblings[i]) === tween || curTween._gc || curTween._paused) { - //ignore - } else if (curTween._timeline !== tween._timeline) { - globalStart = globalStart || _checkOverlap(tween, 0, zeroDur); - if (_checkOverlap(curTween, globalStart, zeroDur) === 0) { - overlaps[oCount++] = curTween; - } - } else if (curTween._startTime <= startTime) if (curTween._startTime + curTween.totalDuration() / curTween._timeScale > startTime) if (!((zeroDur || !curTween._initted) && startTime - curTween._startTime <= 0.0000000002)) { - overlaps[oCount++] = curTween; - } - } - - i = oCount; - while (--i > -1) { - curTween = overlaps[i]; - if (mode === 2) if (curTween._kill(props, target)) { - changed = true; - } - if (mode !== 2 || (!curTween._firstPT && curTween._initted)) { - if (curTween._enabled(false, false)) { //if all property tweens have been overwritten, kill the tween. - changed = true; - } - } - } - return changed; - }, - - _checkOverlap = function(tween, reference, zeroDur) { - var tl = tween._timeline, - ts = tl._timeScale, - t = tween._startTime; - while (tl._timeline) { - t += tl._startTime; - ts *= tl._timeScale; - if (tl._paused) { - return -100; - } - tl = tl._timeline; - } - t /= ts; - return (t > reference) ? t - reference : ((zeroDur && t === reference) || (!tween._initted && t - reference < 2 * _tinyNum)) ? _tinyNum : ((t += tween.totalDuration() / tween._timeScale / ts) > reference + _tinyNum) ? 0 : t - reference - _tinyNum; - }; + p.ratio = 0; + p._firstPT = p._targets = p._overwrittenProps = p._startAt = null; + p._notifyPluginsOfEnabled = p._lazy = false; + + TweenLite.version = "1.12.1"; + TweenLite.defaultEase = p._ease = new Ease(null, null, 1, 1); + TweenLite.defaultOverwrite = "auto"; + TweenLite.ticker = _ticker; + TweenLite.autoSleep = true; + TweenLite.lagSmoothing = function(threshold, adjustedLag) { + _ticker.lagSmoothing(threshold, adjustedLag); + }; + TweenLite.selector = window.$ || window.jQuery || function(e) { if (window.$) { TweenLite.selector = window.$; return window.$(e); } return window.document ? window.document.getElementById((e.charAt(0) === "#") ? e.substr(1) : e) : e; }; + + var _lazyTweens = [], + _lazyLookup = {}, + _internals = TweenLite._internals = {isArray:_isArray, isSelector:_isSelector, lazyTweens:_lazyTweens}, //gives us a way to expose certain private values to other GreenSock classes without contaminating tha main TweenLite object. + _plugins = TweenLite._plugins = {}, + _tweenLookup = _internals.tweenLookup = {}, + _tweenLookupNum = 0, + _reservedProps = _internals.reservedProps = {ease:1, delay:1, overwrite:1, onComplete:1, onCompleteParams:1, onCompleteScope:1, useFrames:1, runBackwards:1, startAt:1, onUpdate:1, onUpdateParams:1, onUpdateScope:1, onStart:1, onStartParams:1, onStartScope:1, onReverseComplete:1, onReverseCompleteParams:1, onReverseCompleteScope:1, onRepeat:1, onRepeatParams:1, onRepeatScope:1, easeParams:1, yoyo:1, immediateRender:1, repeat:1, repeatDelay:1, data:1, paused:1, reversed:1, autoCSS:1, lazy:1}, + _overwriteLookup = {none:0, all:1, auto:2, concurrent:3, allOnStart:4, preexisting:5, "true":1, "false":0}, + _rootFramesTimeline = Animation._rootFramesTimeline = new SimpleTimeline(), + _rootTimeline = Animation._rootTimeline = new SimpleTimeline(), + _lazyRender = function() { + var i = _lazyTweens.length; + _lazyLookup = {}; + while (--i > -1) { + a = _lazyTweens[i]; + if (a && a._lazy !== false) { + a.render(a._lazy, false, true); + a._lazy = false; + } + } + _lazyTweens.length = 0; + }; + + _rootTimeline._startTime = _ticker.time; + _rootFramesTimeline._startTime = _ticker.frame; + _rootTimeline._active = _rootFramesTimeline._active = true; + setTimeout(_lazyRender, 1); //on some mobile devices, there isn't a "tick" before code runs which means any lazy renders wouldn't run before the next official "tick". + + Animation._updateRoot = TweenLite.render = function() { + var i, a, p; + if (_lazyTweens.length) { //if code is run outside of the requestAnimationFrame loop, there may be tweens queued AFTER the engine refreshed, so we need to ensure any pending renders occur before we refresh again. + _lazyRender(); + } + _rootTimeline.render((_ticker.time - _rootTimeline._startTime) * _rootTimeline._timeScale, false, false); + _rootFramesTimeline.render((_ticker.frame - _rootFramesTimeline._startTime) * _rootFramesTimeline._timeScale, false, false); + if (_lazyTweens.length) { + _lazyRender(); + } + if (!(_ticker.frame % 120)) { //dump garbage every 120 frames... + for (p in _tweenLookup) { + a = _tweenLookup[p].tweens; + i = a.length; + while (--i > -1) { + if (a[i]._gc) { + a.splice(i, 1); + } + } + if (a.length === 0) { + delete _tweenLookup[p]; + } + } + //if there are no more tweens in the root timelines, or if they're all paused, make the _timer sleep to reduce load on the CPU slightly + p = _rootTimeline._first; + if (!p || p._paused) if (TweenLite.autoSleep && !_rootFramesTimeline._first && _ticker._listeners.tick.length === 1) { + while (p && p._paused) { + p = p._next; + } + if (!p) { + _ticker.sleep(); + } + } + } + }; + + _ticker.addEventListener("tick", Animation._updateRoot); + + var _register = function(target, tween, scrub) { + var id = target._gsTweenID, a, i; + if (!_tweenLookup[id || (target._gsTweenID = id = "t" + (_tweenLookupNum++))]) { + _tweenLookup[id] = {target:target, tweens:[]}; + } + if (tween) { + a = _tweenLookup[id].tweens; + a[(i = a.length)] = tween; + if (scrub) { + while (--i > -1) { + if (a[i] === tween) { + a.splice(i, 1); + } + } + } + } + return _tweenLookup[id].tweens; + }, + + _applyOverwrite = function(target, tween, props, mode, siblings) { + var i, changed, curTween, l; + if (mode === 1 || mode >= 4) { + l = siblings.length; + for (i = 0; i < l; i++) { + if ((curTween = siblings[i]) !== tween) { + if (!curTween._gc) if (curTween._enabled(false, false)) { + changed = true; + } + } else if (mode === 5) { + break; + } + } + return changed; + } + //NOTE: Add 0.0000000001 to overcome floating point errors that can cause the startTime to be VERY slightly off (when a tween's time() is set for example) + var startTime = tween._startTime + _tinyNum, + overlaps = [], + oCount = 0, + zeroDur = (tween._duration === 0), + globalStart; + i = siblings.length; + while (--i > -1) { + if ((curTween = siblings[i]) === tween || curTween._gc || curTween._paused) { + //ignore + } else if (curTween._timeline !== tween._timeline) { + globalStart = globalStart || _checkOverlap(tween, 0, zeroDur); + if (_checkOverlap(curTween, globalStart, zeroDur) === 0) { + overlaps[oCount++] = curTween; + } + } else if (curTween._startTime <= startTime) if (curTween._startTime + curTween.totalDuration() / curTween._timeScale > startTime) if (!((zeroDur || !curTween._initted) && startTime - curTween._startTime <= 0.0000000002)) { + overlaps[oCount++] = curTween; + } + } + + i = oCount; + while (--i > -1) { + curTween = overlaps[i]; + if (mode === 2) if (curTween._kill(props, target)) { + changed = true; + } + if (mode !== 2 || (!curTween._firstPT && curTween._initted)) { + if (curTween._enabled(false, false)) { //if all property tweens have been overwritten, kill the tween. + changed = true; + } + } + } + return changed; + }, + + _checkOverlap = function(tween, reference, zeroDur) { + var tl = tween._timeline, + ts = tl._timeScale, + t = tween._startTime; + while (tl._timeline) { + t += tl._startTime; + ts *= tl._timeScale; + if (tl._paused) { + return -100; + } + tl = tl._timeline; + } + t /= ts; + return (t > reference) ? t - reference : ((zeroDur && t === reference) || (!tween._initted && t - reference < 2 * _tinyNum)) ? _tinyNum : ((t += tween.totalDuration() / tween._timeScale / ts) > reference + _tinyNum) ? 0 : t - reference - _tinyNum; + }; //---- TweenLite instance methods ----------------------------------------------------------------------------- - p._init = function() { - var v = this.vars, - op = this._overwrittenProps, - dur = this._duration, - immediate = !!v.immediateRender, - ease = v.ease, - i, initPlugins, pt, p, startVars; - if (v.startAt) { - if (this._startAt) { - this._startAt.render(-1, true); //if we've run a startAt previously (when the tween instantiated), we should revert it so that the values re-instantiate correctly particularly for relative tweens. Without this, a TweenLite.fromTo(obj, 1, {x:"+=100"}, {x:"-=100"}), for example, would actually jump to +=200 because the startAt would run twice, doubling the relative change. - this._startAt.kill(); - } - startVars = {}; - for (p in v.startAt) { //copy the properties/values into a new object to avoid collisions, like var to = {x:0}, from = {x:500}; timeline.fromTo(e, 1, from, to).fromTo(e, 1, to, from); - startVars[p] = v.startAt[p]; - } - startVars.overwrite = false; - startVars.immediateRender = true; - startVars.lazy = (immediate && v.lazy !== false); - startVars.startAt = startVars.delay = null; //no nesting of startAt objects allowed (otherwise it could cause an infinite loop). - this._startAt = TweenLite.to(this.target, 0, startVars); - if (immediate) { - if (this._time > 0) { - this._startAt = null; //tweens that render immediately (like most from() and fromTo() tweens) shouldn't revert when their parent timeline's playhead goes backward past the startTime because the initial render could have happened anytime and it shouldn't be directly correlated to this tween's startTime. Imagine setting up a complex animation where the beginning states of various objects are rendered immediately but the tween doesn't happen for quite some time - if we revert to the starting values as soon as the playhead goes backward past the tween's startTime, it will throw things off visually. Reversion should only happen in TimelineLite/Max instances where immediateRender was false (which is the default in the convenience methods like from()). - } else if (dur !== 0) { - return; //we skip initialization here so that overwriting doesn't occur until the tween actually begins. Otherwise, if you create several immediateRender:true tweens of the same target/properties to drop into a TimelineLite or TimelineMax, the last one created would overwrite the first ones because they didn't get placed into the timeline yet before the first render occurs and kicks in overwriting. - } - } - } else if (v.runBackwards && dur !== 0) { - //from() tweens must be handled uniquely: their beginning values must be rendered but we don't want overwriting to occur yet (when time is still 0). Wait until the tween actually begins before doing all the routines like overwriting. At that time, we should render at the END of the tween to ensure that things initialize correctly (remember, from() tweens go backwards) - if (this._startAt) { - this._startAt.render(-1, true); - this._startAt.kill(); - this._startAt = null; - } else { - pt = {}; - for (p in v) { //copy props into a new object and skip any reserved props, otherwise onComplete or onUpdate or onStart could fire. We should, however, permit autoCSS to go through. - if (!_reservedProps[p] || p === "autoCSS") { - pt[p] = v[p]; - } - } - pt.overwrite = 0; - pt.data = "isFromStart"; //we tag the tween with as "isFromStart" so that if [inside a plugin] we need to only do something at the very END of a tween, we have a way of identifying this tween as merely the one that's setting the beginning values for a "from()" tween. For example, clearProps in CSSPlugin should only get applied at the very END of a tween and without this tag, from(...{height:100, clearProps:"height", delay:1}) would wipe the height at the beginning of the tween and after 1 second, it'd kick back in. - pt.lazy = (immediate && v.lazy !== false); - pt.immediateRender = immediate; //zero-duration tweens render immediately by default, but if we're not specifically instructed to render this tween immediately, we should skip this and merely _init() to record the starting values (rendering them immediately would push them to completion which is wasteful in that case - we'd have to render(-1) immediately after) - this._startAt = TweenLite.to(this.target, 0, pt); - if (!immediate) { - this._startAt._init(); //ensures that the initial values are recorded - this._startAt._enabled(false); //no need to have the tween render on the next cycle. Disable it because we'll always manually control the renders of the _startAt tween. - } else if (this._time === 0) { - return; - } - } - } - if (!ease) { - this._ease = TweenLite.defaultEase; - } else if (ease instanceof Ease) { - this._ease = (v.easeParams instanceof Array) ? ease.config.apply(ease, v.easeParams) : ease; - } else { - this._ease = (typeof(ease) === "function") ? new Ease(ease, v.easeParams) : _easeMap[ease] || TweenLite.defaultEase; - } - this._easeType = this._ease._type; - this._easePower = this._ease._power; - this._firstPT = null; - - if (this._targets) { - i = this._targets.length; - while (--i > -1) { - if ( this._initProps( this._targets[i], (this._propLookup[i] = {}), this._siblings[i], (op ? op[i] : null)) ) { - initPlugins = true; - } - } - } else { - initPlugins = this._initProps(this.target, this._propLookup, this._siblings, op); - } - - if (initPlugins) { - TweenLite._onPluginEvent("_onInitAllProps", this); //reorders the array in order of priority. Uses a static TweenPlugin method in order to minimize file size in TweenLite - } - if (op) if (!this._firstPT) if (typeof(this.target) !== "function") { //if all tweening properties have been overwritten, kill the tween. If the target is a function, it's probably a delayedCall so let it live. - this._enabled(false, false); - } - if (v.runBackwards) { - pt = this._firstPT; - while (pt) { - pt.s += pt.c; - pt.c = -pt.c; - pt = pt._next; - } - } - this._onUpdate = v.onUpdate; - this._initted = true; - }; - - p._initProps = function(target, propLookup, siblings, overwrittenProps) { - var p, i, initPlugins, plugin, pt, v; - if (target == null) { - return false; - } - - if (_lazyLookup[target._gsTweenID]) { - _lazyRender(); //if other tweens of the same target have recently initted but haven't rendered yet, we've got to force the render so that the starting values are correct (imagine populating a timeline with a bunch of sequential tweens and then jumping to the end) - } - - if (!this.vars.css) if (target.style) if (target !== window && target.nodeType) if (_plugins.css) if (this.vars.autoCSS !== false) { //it's so common to use TweenLite/Max to animate the css of DOM elements, we assume that if the target is a DOM element, that's what is intended (a convenience so that users don't have to wrap things in css:{}, although we still recommend it for a slight performance boost and better specificity). Note: we cannot check "nodeType" on the window inside an iframe. - _autoCSS(this.vars, target); - } - for (p in this.vars) { - v = this.vars[p]; - if (_reservedProps[p]) { - if (v) if ((v instanceof Array) || (v.push && _isArray(v))) if (v.join("").indexOf("{self}") !== -1) { - this.vars[p] = v = this._swapSelfInParams(v, this); - } - - } else if (_plugins[p] && (plugin = new _plugins[p]())._onInitTween(target, this.vars[p], this)) { - - //t - target [object] - //p - property [string] - //s - start [number] - //c - change [number] - //f - isFunction [boolean] - //n - name [string] - //pg - isPlugin [boolean] - //pr - priority [number] - this._firstPT = pt = {_next:this._firstPT, t:plugin, p:"setRatio", s:0, c:1, f:true, n:p, pg:true, pr:plugin._priority}; - i = plugin._overwriteProps.length; - while (--i > -1) { - propLookup[plugin._overwriteProps[i]] = this._firstPT; - } - if (plugin._priority || plugin._onInitAllProps) { - initPlugins = true; - } - if (plugin._onDisable || plugin._onEnable) { - this._notifyPluginsOfEnabled = true; - } - - } else { - this._firstPT = propLookup[p] = pt = {_next:this._firstPT, t:target, p:p, f:(typeof(target[p]) === "function"), n:p, pg:false, pr:0}; - pt.s = (!pt.f) ? parseFloat(target[p]) : target[ ((p.indexOf("set") || typeof(target["get" + p.substr(3)]) !== "function") ? p : "get" + p.substr(3)) ](); - pt.c = (typeof(v) === "string" && v.charAt(1) === "=") ? parseInt(v.charAt(0) + "1", 10) * Number(v.substr(2)) : (Number(v) - pt.s) || 0; - } - if (pt) if (pt._next) { - pt._next._prev = pt; - } - } - - if (overwrittenProps) if (this._kill(overwrittenProps, target)) { //another tween may have tried to overwrite properties of this tween before init() was called (like if two tweens start at the same time, the one created second will run first) - return this._initProps(target, propLookup, siblings, overwrittenProps); - } - if (this._overwrite > 1) if (this._firstPT) if (siblings.length > 1) if (_applyOverwrite(target, this, propLookup, this._overwrite, siblings)) { - this._kill(propLookup, target); - return this._initProps(target, propLookup, siblings, overwrittenProps); - } - if (this._firstPT) if ((this.vars.lazy !== false && this._duration) || (this.vars.lazy && !this._duration)) { //zero duration tweens don't lazy render by default; everything else does. - _lazyLookup[target._gsTweenID] = true; - } - return initPlugins; - }; - - p.render = function(time, suppressEvents, force) { - var prevTime = this._time, - duration = this._duration, - prevRawPrevTime = this._rawPrevTime, - isComplete, callback, pt, rawPrevTime; - if (time >= duration) { - this._totalTime = this._time = duration; - this.ratio = this._ease._calcEnd ? this._ease.getRatio(1) : 1; - if (!this._reversed ) { - isComplete = true; - callback = "onComplete"; - } - if (duration === 0) if (this._initted || !this.vars.lazy || force) { //zero-duration tweens are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. - if (this._startTime === this._timeline._duration) { //if a zero-duration tween is at the VERY end of a timeline and that timeline renders at its end, it will typically add a tiny bit of cushion to the render time to prevent rounding errors from getting in the way of tweens rendering their VERY end. If we then reverse() that timeline, the zero-duration tween will trigger its onReverseComplete even though technically the playhead didn't pass over it again. It's a very specific edge case we must accommodate. - time = 0; - } - if (time === 0 || prevRawPrevTime < 0 || prevRawPrevTime === _tinyNum) if (prevRawPrevTime !== time) { - force = true; - if (prevRawPrevTime > _tinyNum) { - callback = "onReverseComplete"; - } - } - this._rawPrevTime = rawPrevTime = (!suppressEvents || time || prevRawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - } - - } else if (time < 0.0000001) { //to work around occasional floating point math artifacts, round super small values to 0. - this._totalTime = this._time = 0; - this.ratio = this._ease._calcEnd ? this._ease.getRatio(0) : 0; - if (prevTime !== 0 || (duration === 0 && prevRawPrevTime > 0 && prevRawPrevTime !== _tinyNum)) { - callback = "onReverseComplete"; - isComplete = this._reversed; - } - if (time < 0) { - this._active = false; - if (duration === 0) if (this._initted || !this.vars.lazy || force) { //zero-duration tweens are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. - if (prevRawPrevTime >= 0) { - force = true; - } - this._rawPrevTime = rawPrevTime = (!suppressEvents || time || prevRawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - } - } else if (!this._initted) { //if we render the very beginning (time == 0) of a fromTo(), we must force the render (normal tweens wouldn't need to render at a time of 0 when the prevTime was also 0). This is also mandatory to make sure overwriting kicks in immediately. - force = true; - } - } else { - this._totalTime = this._time = time; - - if (this._easeType) { - var r = time / duration, type = this._easeType, pow = this._easePower; - if (type === 1 || (type === 3 && r >= 0.5)) { - r = 1 - r; - } - if (type === 3) { - r *= 2; - } - if (pow === 1) { - r *= r; - } else if (pow === 2) { - r *= r * r; - } else if (pow === 3) { - r *= r * r * r; - } else if (pow === 4) { - r *= r * r * r * r; - } - - if (type === 1) { - this.ratio = 1 - r; - } else if (type === 2) { - this.ratio = r; - } else if (time / duration < 0.5) { - this.ratio = r / 2; - } else { - this.ratio = 1 - (r / 2); - } - - } else { - this.ratio = this._ease.getRatio(time / duration); - } - } - - if (this._time === prevTime && !force) { - return; - } else if (!this._initted) { - this._init(); - if (!this._initted || this._gc) { //immediateRender tweens typically won't initialize until the playhead advances (_time is greater than 0) in order to ensure that overwriting occurs properly. Also, if all of the tweening properties have been overwritten (which would cause _gc to be true, as set in _init()), we shouldn't continue otherwise an onStart callback could be called for example. - return; - } else if (!force && this._firstPT && ((this.vars.lazy !== false && this._duration) || (this.vars.lazy && !this._duration))) { - this._time = this._totalTime = prevTime; - this._rawPrevTime = prevRawPrevTime; - _lazyTweens.push(this); - this._lazy = time; - return; - } - //_ease is initially set to defaultEase, so now that init() has run, _ease is set properly and we need to recalculate the ratio. Overall this is faster than using conditional logic earlier in the method to avoid having to set ratio twice because we only init() once but renderTime() gets called VERY frequently. - if (this._time && !isComplete) { - this.ratio = this._ease.getRatio(this._time / duration); - } else if (isComplete && this._ease._calcEnd) { - this.ratio = this._ease.getRatio((this._time === 0) ? 0 : 1); - } - } - if (this._lazy !== false) { //in case a lazy render is pending, we should flush it because the new render is occuring now (imagine a lazy tween instantiating and then immediately the user calls tween.seek(tween.duration()), skipping to the end - the end render would be forced, and then if we didn't flush the lazy render, it'd fire AFTER the seek(), rendering it at the wrong time. - this._lazy = false; - } - if (!this._active) if (!this._paused && this._time !== prevTime && time >= 0) { - this._active = true; //so that if the user renders a tween (as opposed to the timeline rendering it), the timeline is forced to re-render and align it with the proper time/frame on the next rendering cycle. Maybe the tween already finished but the user manually re-renders it as halfway done. - } - if (prevTime === 0) { - if (this._startAt) { - if (time >= 0) { - this._startAt.render(time, suppressEvents, force); - } else if (!callback) { - callback = "_dummyGS"; //if no callback is defined, use a dummy value just so that the condition at the end evaluates as true because _startAt should render AFTER the normal render loop when the time is negative. We could handle this in a more intuitive way, of course, but the render loop is the MOST important thing to optimize, so this technique allows us to avoid adding extra conditional logic in a high-frequency area. - } - } - if (this.vars.onStart) if (this._time !== 0 || duration === 0) if (!suppressEvents) { - this.vars.onStart.apply(this.vars.onStartScope || this, this.vars.onStartParams || _blankArray); - } - } - - pt = this._firstPT; - while (pt) { - if (pt.f) { - pt.t[pt.p](pt.c * this.ratio + pt.s); - } else { - pt.t[pt.p] = pt.c * this.ratio + pt.s; - } - pt = pt._next; - } - - if (this._onUpdate) { - if (time < 0) if (this._startAt && this._startTime) { //if the tween is positioned at the VERY beginning (_startTime 0) of its parent timeline, it's illegal for the playhead to go back further, so we should not render the recorded startAt values. - this._startAt.render(time, suppressEvents, force); //note: for performance reasons, we tuck this conditional logic inside less traveled areas (most tweens don't have an onUpdate). We'd just have it at the end before the onComplete, but the values should be updated before any onUpdate is called, so we ALSO put it here and then if it's not called, we do so later near the onComplete. - } - if (!suppressEvents) if (this._time !== prevTime || isComplete) { - this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); - } - } - - if (callback) if (!this._gc) { //check _gc because there's a chance that kill() could be called in an onUpdate - if (time < 0 && this._startAt && !this._onUpdate && this._startTime) { //if the tween is positioned at the VERY beginning (_startTime 0) of its parent timeline, it's illegal for the playhead to go back further, so we should not render the recorded startAt values. - this._startAt.render(time, suppressEvents, force); - } - if (isComplete) { - if (this._timeline.autoRemoveChildren) { - this._enabled(false, false); - } - this._active = false; - } - if (!suppressEvents && this.vars[callback]) { - this.vars[callback].apply(this.vars[callback + "Scope"] || this, this.vars[callback + "Params"] || _blankArray); - } - if (duration === 0 && this._rawPrevTime === _tinyNum && rawPrevTime !== _tinyNum) { //the onComplete or onReverseComplete could trigger movement of the playhead and for zero-duration tweens (which must discern direction) that land directly back on their start time, we don't want to fire again on the next render. Think of several addPause()'s in a timeline that forces the playhead to a certain spot, but what if it's already paused and another tween is tweening the "time" of the timeline? Each time it moves [forward] past that spot, it would move back, and since suppressEvents is true, it'd reset _rawPrevTime to _tinyNum so that when it begins again, the callback would fire (so ultimately it could bounce back and forth during that tween). Again, this is a very uncommon scenario, but possible nonetheless. - this._rawPrevTime = 0; - } - } - - }; - - p._kill = function(vars, target) { - if (vars === "all") { - vars = null; - } - if (vars == null) if (target == null || target === this.target) { - this._lazy = false; - return this._enabled(false, false); - } - target = (typeof(target) !== "string") ? (target || this._targets || this.target) : TweenLite.selector(target) || target; - var i, overwrittenProps, p, pt, propLookup, changed, killProps, record; - if ((_isArray(target) || _isSelector(target)) && typeof(target[0]) !== "number") { - i = target.length; - while (--i > -1) { - if (this._kill(vars, target[i])) { - changed = true; - } - } - } else { - if (this._targets) { - i = this._targets.length; - while (--i > -1) { - if (target === this._targets[i]) { - propLookup = this._propLookup[i] || {}; - this._overwrittenProps = this._overwrittenProps || []; - overwrittenProps = this._overwrittenProps[i] = vars ? this._overwrittenProps[i] || {} : "all"; - break; - } - } - } else if (target !== this.target) { - return false; - } else { - propLookup = this._propLookup; - overwrittenProps = this._overwrittenProps = vars ? this._overwrittenProps || {} : "all"; - } - - if (propLookup) { - killProps = vars || propLookup; - record = (vars !== overwrittenProps && overwrittenProps !== "all" && vars !== propLookup && (typeof(vars) !== "object" || !vars._tempKill)); //_tempKill is a super-secret way to delete a particular tweening property but NOT have it remembered as an official overwritten property (like in BezierPlugin) - for (p in killProps) { - if ((pt = propLookup[p])) { - if (pt.pg && pt.t._kill(killProps)) { - changed = true; //some plugins need to be notified so they can perform cleanup tasks first - } - if (!pt.pg || pt.t._overwriteProps.length === 0) { - if (pt._prev) { - pt._prev._next = pt._next; - } else if (pt === this._firstPT) { - this._firstPT = pt._next; - } - if (pt._next) { - pt._next._prev = pt._prev; - } - pt._next = pt._prev = null; - } - delete propLookup[p]; - } - if (record) { - overwrittenProps[p] = 1; - } - } - if (!this._firstPT && this._initted) { //if all tweening properties are killed, kill the tween. Without this line, if there's a tween with multiple targets and then you killTweensOf() each target individually, the tween would technically still remain active and fire its onComplete even though there aren't any more properties tweening. - this._enabled(false, false); - } - } - } - return changed; - }; - - p.invalidate = function() { - if (this._notifyPluginsOfEnabled) { - TweenLite._onPluginEvent("_onDisable", this); - } - this._firstPT = null; - this._overwrittenProps = null; - this._onUpdate = null; - this._startAt = null; - this._initted = this._active = this._notifyPluginsOfEnabled = this._lazy = false; - this._propLookup = (this._targets) ? {} : []; - return this; - }; - - p._enabled = function(enabled, ignoreTimeline) { - if (!_tickerActive) { - _ticker.wake(); - } - if (enabled && this._gc) { - var targets = this._targets, - i; - if (targets) { - i = targets.length; - while (--i > -1) { - this._siblings[i] = _register(targets[i], this, true); - } - } else { - this._siblings = _register(this.target, this, true); - } - } - Animation.prototype._enabled.call(this, enabled, ignoreTimeline); - if (this._notifyPluginsOfEnabled) if (this._firstPT) { - return TweenLite._onPluginEvent((enabled ? "_onEnable" : "_onDisable"), this); - } - return false; - }; + p._init = function() { + var v = this.vars, + op = this._overwrittenProps, + dur = this._duration, + immediate = !!v.immediateRender, + ease = v.ease, + i, initPlugins, pt, p, startVars; + if (v.startAt) { + if (this._startAt) { + this._startAt.render(-1, true); //if we've run a startAt previously (when the tween instantiated), we should revert it so that the values re-instantiate correctly particularly for relative tweens. Without this, a TweenLite.fromTo(obj, 1, {x:"+=100"}, {x:"-=100"}), for example, would actually jump to +=200 because the startAt would run twice, doubling the relative change. + this._startAt.kill(); + } + startVars = {}; + for (p in v.startAt) { //copy the properties/values into a new object to avoid collisions, like var to = {x:0}, from = {x:500}; timeline.fromTo(e, 1, from, to).fromTo(e, 1, to, from); + startVars[p] = v.startAt[p]; + } + startVars.overwrite = false; + startVars.immediateRender = true; + startVars.lazy = (immediate && v.lazy !== false); + startVars.startAt = startVars.delay = null; //no nesting of startAt objects allowed (otherwise it could cause an infinite loop). + this._startAt = TweenLite.to(this.target, 0, startVars); + if (immediate) { + if (this._time > 0) { + this._startAt = null; //tweens that render immediately (like most from() and fromTo() tweens) shouldn't revert when their parent timeline's playhead goes backward past the startTime because the initial render could have happened anytime and it shouldn't be directly correlated to this tween's startTime. Imagine setting up a complex animation where the beginning states of various objects are rendered immediately but the tween doesn't happen for quite some time - if we revert to the starting values as soon as the playhead goes backward past the tween's startTime, it will throw things off visually. Reversion should only happen in TimelineLite/Max instances where immediateRender was false (which is the default in the convenience methods like from()). + } else if (dur !== 0) { + return; //we skip initialization here so that overwriting doesn't occur until the tween actually begins. Otherwise, if you create several immediateRender:true tweens of the same target/properties to drop into a TimelineLite or TimelineMax, the last one created would overwrite the first ones because they didn't get placed into the timeline yet before the first render occurs and kicks in overwriting. + } + } + } else if (v.runBackwards && dur !== 0) { + //from() tweens must be handled uniquely: their beginning values must be rendered but we don't want overwriting to occur yet (when time is still 0). Wait until the tween actually begins before doing all the routines like overwriting. At that time, we should render at the END of the tween to ensure that things initialize correctly (remember, from() tweens go backwards) + if (this._startAt) { + this._startAt.render(-1, true); + this._startAt.kill(); + this._startAt = null; + } else { + pt = {}; + for (p in v) { //copy props into a new object and skip any reserved props, otherwise onComplete or onUpdate or onStart could fire. We should, however, permit autoCSS to go through. + if (!_reservedProps[p] || p === "autoCSS") { + pt[p] = v[p]; + } + } + pt.overwrite = 0; + pt.data = "isFromStart"; //we tag the tween with as "isFromStart" so that if [inside a plugin] we need to only do something at the very END of a tween, we have a way of identifying this tween as merely the one that's setting the beginning values for a "from()" tween. For example, clearProps in CSSPlugin should only get applied at the very END of a tween and without this tag, from(...{height:100, clearProps:"height", delay:1}) would wipe the height at the beginning of the tween and after 1 second, it'd kick back in. + pt.lazy = (immediate && v.lazy !== false); + pt.immediateRender = immediate; //zero-duration tweens render immediately by default, but if we're not specifically instructed to render this tween immediately, we should skip this and merely _init() to record the starting values (rendering them immediately would push them to completion which is wasteful in that case - we'd have to render(-1) immediately after) + this._startAt = TweenLite.to(this.target, 0, pt); + if (!immediate) { + this._startAt._init(); //ensures that the initial values are recorded + this._startAt._enabled(false); //no need to have the tween render on the next cycle. Disable it because we'll always manually control the renders of the _startAt tween. + } else if (this._time === 0) { + return; + } + } + } + if (!ease) { + this._ease = TweenLite.defaultEase; + } else if (ease instanceof Ease) { + this._ease = (v.easeParams instanceof Array) ? ease.config.apply(ease, v.easeParams) : ease; + } else { + this._ease = (typeof(ease) === "function") ? new Ease(ease, v.easeParams) : _easeMap[ease] || TweenLite.defaultEase; + } + this._easeType = this._ease._type; + this._easePower = this._ease._power; + this._firstPT = null; + + if (this._targets) { + i = this._targets.length; + while (--i > -1) { + if ( this._initProps( this._targets[i], (this._propLookup[i] = {}), this._siblings[i], (op ? op[i] : null)) ) { + initPlugins = true; + } + } + } else { + initPlugins = this._initProps(this.target, this._propLookup, this._siblings, op); + } + + if (initPlugins) { + TweenLite._onPluginEvent("_onInitAllProps", this); //reorders the array in order of priority. Uses a static TweenPlugin method in order to minimize file size in TweenLite + } + if (op) if (!this._firstPT) if (typeof(this.target) !== "function") { //if all tweening properties have been overwritten, kill the tween. If the target is a function, it's probably a delayedCall so let it live. + this._enabled(false, false); + } + if (v.runBackwards) { + pt = this._firstPT; + while (pt) { + pt.s += pt.c; + pt.c = -pt.c; + pt = pt._next; + } + } + this._onUpdate = v.onUpdate; + this._initted = true; + }; + + p._initProps = function(target, propLookup, siblings, overwrittenProps) { + var p, i, initPlugins, plugin, pt, v; + if (target == null) { + return false; + } + + if (_lazyLookup[target._gsTweenID]) { + _lazyRender(); //if other tweens of the same target have recently initted but haven't rendered yet, we've got to force the render so that the starting values are correct (imagine populating a timeline with a bunch of sequential tweens and then jumping to the end) + } + + if (!this.vars.css) if (target.style) if (target !== window && target.nodeType) if (_plugins.css) if (this.vars.autoCSS !== false) { //it's so common to use TweenLite/Max to animate the css of DOM elements, we assume that if the target is a DOM element, that's what is intended (a convenience so that users don't have to wrap things in css:{}, although we still recommend it for a slight performance boost and better specificity). Note: we cannot check "nodeType" on the window inside an iframe. + _autoCSS(this.vars, target); + } + for (p in this.vars) { + v = this.vars[p]; + if (_reservedProps[p]) { + if (v) if ((v instanceof Array) || (v.push && _isArray(v))) if (v.join("").indexOf("{self}") !== -1) { + this.vars[p] = v = this._swapSelfInParams(v, this); + } + + } else if (_plugins[p] && (plugin = new _plugins[p]())._onInitTween(target, this.vars[p], this)) { + + //t - target [object] + //p - property [string] + //s - start [number] + //c - change [number] + //f - isFunction [boolean] + //n - name [string] + //pg - isPlugin [boolean] + //pr - priority [number] + this._firstPT = pt = {_next:this._firstPT, t:plugin, p:"setRatio", s:0, c:1, f:true, n:p, pg:true, pr:plugin._priority}; + i = plugin._overwriteProps.length; + while (--i > -1) { + propLookup[plugin._overwriteProps[i]] = this._firstPT; + } + if (plugin._priority || plugin._onInitAllProps) { + initPlugins = true; + } + if (plugin._onDisable || plugin._onEnable) { + this._notifyPluginsOfEnabled = true; + } + + } else { + this._firstPT = propLookup[p] = pt = {_next:this._firstPT, t:target, p:p, f:(typeof(target[p]) === "function"), n:p, pg:false, pr:0}; + pt.s = (!pt.f) ? parseFloat(target[p]) : target[ ((p.indexOf("set") || typeof(target["get" + p.substr(3)]) !== "function") ? p : "get" + p.substr(3)) ](); + pt.c = (typeof(v) === "string" && v.charAt(1) === "=") ? parseInt(v.charAt(0) + "1", 10) * Number(v.substr(2)) : (Number(v) - pt.s) || 0; + } + if (pt) if (pt._next) { + pt._next._prev = pt; + } + } + + if (overwrittenProps) if (this._kill(overwrittenProps, target)) { //another tween may have tried to overwrite properties of this tween before init() was called (like if two tweens start at the same time, the one created second will run first) + return this._initProps(target, propLookup, siblings, overwrittenProps); + } + if (this._overwrite > 1) if (this._firstPT) if (siblings.length > 1) if (_applyOverwrite(target, this, propLookup, this._overwrite, siblings)) { + this._kill(propLookup, target); + return this._initProps(target, propLookup, siblings, overwrittenProps); + } + if (this._firstPT) if ((this.vars.lazy !== false && this._duration) || (this.vars.lazy && !this._duration)) { //zero duration tweens don't lazy render by default; everything else does. + _lazyLookup[target._gsTweenID] = true; + } + return initPlugins; + }; + + p.render = function(time, suppressEvents, force) { + var prevTime = this._time, + duration = this._duration, + prevRawPrevTime = this._rawPrevTime, + isComplete, callback, pt, rawPrevTime; + if (time >= duration) { + this._totalTime = this._time = duration; + this.ratio = this._ease._calcEnd ? this._ease.getRatio(1) : 1; + if (!this._reversed ) { + isComplete = true; + callback = "onComplete"; + } + if (duration === 0) if (this._initted || !this.vars.lazy || force) { //zero-duration tweens are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. + if (this._startTime === this._timeline._duration) { //if a zero-duration tween is at the VERY end of a timeline and that timeline renders at its end, it will typically add a tiny bit of cushion to the render time to prevent rounding errors from getting in the way of tweens rendering their VERY end. If we then reverse() that timeline, the zero-duration tween will trigger its onReverseComplete even though technically the playhead didn't pass over it again. It's a very specific edge case we must accommodate. + time = 0; + } + if (time === 0 || prevRawPrevTime < 0 || prevRawPrevTime === _tinyNum) if (prevRawPrevTime !== time) { + force = true; + if (prevRawPrevTime > _tinyNum) { + callback = "onReverseComplete"; + } + } + this._rawPrevTime = rawPrevTime = (!suppressEvents || time || prevRawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. + } + + } else if (time < 0.0000001) { //to work around occasional floating point math artifacts, round super small values to 0. + this._totalTime = this._time = 0; + this.ratio = this._ease._calcEnd ? this._ease.getRatio(0) : 0; + if (prevTime !== 0 || (duration === 0 && prevRawPrevTime > 0 && prevRawPrevTime !== _tinyNum)) { + callback = "onReverseComplete"; + isComplete = this._reversed; + } + if (time < 0) { + this._active = false; + if (duration === 0) if (this._initted || !this.vars.lazy || force) { //zero-duration tweens are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. + if (prevRawPrevTime >= 0) { + force = true; + } + this._rawPrevTime = rawPrevTime = (!suppressEvents || time || prevRawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. + } + } else if (!this._initted) { //if we render the very beginning (time == 0) of a fromTo(), we must force the render (normal tweens wouldn't need to render at a time of 0 when the prevTime was also 0). This is also mandatory to make sure overwriting kicks in immediately. + force = true; + } + } else { + this._totalTime = this._time = time; + + if (this._easeType) { + var r = time / duration, type = this._easeType, pow = this._easePower; + if (type === 1 || (type === 3 && r >= 0.5)) { + r = 1 - r; + } + if (type === 3) { + r *= 2; + } + if (pow === 1) { + r *= r; + } else if (pow === 2) { + r *= r * r; + } else if (pow === 3) { + r *= r * r * r; + } else if (pow === 4) { + r *= r * r * r * r; + } + + if (type === 1) { + this.ratio = 1 - r; + } else if (type === 2) { + this.ratio = r; + } else if (time / duration < 0.5) { + this.ratio = r / 2; + } else { + this.ratio = 1 - (r / 2); + } + + } else { + this.ratio = this._ease.getRatio(time / duration); + } + } + + if (this._time === prevTime && !force) { + return; + } else if (!this._initted) { + this._init(); + if (!this._initted || this._gc) { //immediateRender tweens typically won't initialize until the playhead advances (_time is greater than 0) in order to ensure that overwriting occurs properly. Also, if all of the tweening properties have been overwritten (which would cause _gc to be true, as set in _init()), we shouldn't continue otherwise an onStart callback could be called for example. + return; + } else if (!force && this._firstPT && ((this.vars.lazy !== false && this._duration) || (this.vars.lazy && !this._duration))) { + this._time = this._totalTime = prevTime; + this._rawPrevTime = prevRawPrevTime; + _lazyTweens.push(this); + this._lazy = time; + return; + } + //_ease is initially set to defaultEase, so now that init() has run, _ease is set properly and we need to recalculate the ratio. Overall this is faster than using conditional logic earlier in the method to avoid having to set ratio twice because we only init() once but renderTime() gets called VERY frequently. + if (this._time && !isComplete) { + this.ratio = this._ease.getRatio(this._time / duration); + } else if (isComplete && this._ease._calcEnd) { + this.ratio = this._ease.getRatio((this._time === 0) ? 0 : 1); + } + } + if (this._lazy !== false) { //in case a lazy render is pending, we should flush it because the new render is occuring now (imagine a lazy tween instantiating and then immediately the user calls tween.seek(tween.duration()), skipping to the end - the end render would be forced, and then if we didn't flush the lazy render, it'd fire AFTER the seek(), rendering it at the wrong time. + this._lazy = false; + } + if (!this._active) if (!this._paused && this._time !== prevTime && time >= 0) { + this._active = true; //so that if the user renders a tween (as opposed to the timeline rendering it), the timeline is forced to re-render and align it with the proper time/frame on the next rendering cycle. Maybe the tween already finished but the user manually re-renders it as halfway done. + } + if (prevTime === 0) { + if (this._startAt) { + if (time >= 0) { + this._startAt.render(time, suppressEvents, force); + } else if (!callback) { + callback = "_dummyGS"; //if no callback is defined, use a dummy value just so that the condition at the end evaluates as true because _startAt should render AFTER the normal render loop when the time is negative. We could handle this in a more intuitive way, of course, but the render loop is the MOST important thing to optimize, so this technique allows us to avoid adding extra conditional logic in a high-frequency area. + } + } + if (this.vars.onStart) if (this._time !== 0 || duration === 0) if (!suppressEvents) { + this.vars.onStart.apply(this.vars.onStartScope || this, this.vars.onStartParams || _blankArray); + } + } + + pt = this._firstPT; + while (pt) { + if (pt.f) { + pt.t[pt.p](pt.c * this.ratio + pt.s); + } else { + pt.t[pt.p] = pt.c * this.ratio + pt.s; + } + pt = pt._next; + } + + if (this._onUpdate) { + if (time < 0) if (this._startAt && this._startTime) { //if the tween is positioned at the VERY beginning (_startTime 0) of its parent timeline, it's illegal for the playhead to go back further, so we should not render the recorded startAt values. + this._startAt.render(time, suppressEvents, force); //note: for performance reasons, we tuck this conditional logic inside less traveled areas (most tweens don't have an onUpdate). We'd just have it at the end before the onComplete, but the values should be updated before any onUpdate is called, so we ALSO put it here and then if it's not called, we do so later near the onComplete. + } + if (!suppressEvents) if (this._time !== prevTime || isComplete) { + this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); + } + } + + if (callback) if (!this._gc) { //check _gc because there's a chance that kill() could be called in an onUpdate + if (time < 0 && this._startAt && !this._onUpdate && this._startTime) { //if the tween is positioned at the VERY beginning (_startTime 0) of its parent timeline, it's illegal for the playhead to go back further, so we should not render the recorded startAt values. + this._startAt.render(time, suppressEvents, force); + } + if (isComplete) { + if (this._timeline.autoRemoveChildren) { + this._enabled(false, false); + } + this._active = false; + } + if (!suppressEvents && this.vars[callback]) { + this.vars[callback].apply(this.vars[callback + "Scope"] || this, this.vars[callback + "Params"] || _blankArray); + } + if (duration === 0 && this._rawPrevTime === _tinyNum && rawPrevTime !== _tinyNum) { //the onComplete or onReverseComplete could trigger movement of the playhead and for zero-duration tweens (which must discern direction) that land directly back on their start time, we don't want to fire again on the next render. Think of several addPause()'s in a timeline that forces the playhead to a certain spot, but what if it's already paused and another tween is tweening the "time" of the timeline? Each time it moves [forward] past that spot, it would move back, and since suppressEvents is true, it'd reset _rawPrevTime to _tinyNum so that when it begins again, the callback would fire (so ultimately it could bounce back and forth during that tween). Again, this is a very uncommon scenario, but possible nonetheless. + this._rawPrevTime = 0; + } + } + + }; + + p._kill = function(vars, target) { + if (vars === "all") { + vars = null; + } + if (vars == null) if (target == null || target === this.target) { + this._lazy = false; + return this._enabled(false, false); + } + target = (typeof(target) !== "string") ? (target || this._targets || this.target) : TweenLite.selector(target) || target; + var i, overwrittenProps, p, pt, propLookup, changed, killProps, record; + if ((_isArray(target) || _isSelector(target)) && typeof(target[0]) !== "number") { + i = target.length; + while (--i > -1) { + if (this._kill(vars, target[i])) { + changed = true; + } + } + } else { + if (this._targets) { + i = this._targets.length; + while (--i > -1) { + if (target === this._targets[i]) { + propLookup = this._propLookup[i] || {}; + this._overwrittenProps = this._overwrittenProps || []; + overwrittenProps = this._overwrittenProps[i] = vars ? this._overwrittenProps[i] || {} : "all"; + break; + } + } + } else if (target !== this.target) { + return false; + } else { + propLookup = this._propLookup; + overwrittenProps = this._overwrittenProps = vars ? this._overwrittenProps || {} : "all"; + } + + if (propLookup) { + killProps = vars || propLookup; + record = (vars !== overwrittenProps && overwrittenProps !== "all" && vars !== propLookup && (typeof(vars) !== "object" || !vars._tempKill)); //_tempKill is a super-secret way to delete a particular tweening property but NOT have it remembered as an official overwritten property (like in BezierPlugin) + for (p in killProps) { + if ((pt = propLookup[p])) { + if (pt.pg && pt.t._kill(killProps)) { + changed = true; //some plugins need to be notified so they can perform cleanup tasks first + } + if (!pt.pg || pt.t._overwriteProps.length === 0) { + if (pt._prev) { + pt._prev._next = pt._next; + } else if (pt === this._firstPT) { + this._firstPT = pt._next; + } + if (pt._next) { + pt._next._prev = pt._prev; + } + pt._next = pt._prev = null; + } + delete propLookup[p]; + } + if (record) { + overwrittenProps[p] = 1; + } + } + if (!this._firstPT && this._initted) { //if all tweening properties are killed, kill the tween. Without this line, if there's a tween with multiple targets and then you killTweensOf() each target individually, the tween would technically still remain active and fire its onComplete even though there aren't any more properties tweening. + this._enabled(false, false); + } + } + } + return changed; + }; + + p.invalidate = function() { + if (this._notifyPluginsOfEnabled) { + TweenLite._onPluginEvent("_onDisable", this); + } + this._firstPT = null; + this._overwrittenProps = null; + this._onUpdate = null; + this._startAt = null; + this._initted = this._active = this._notifyPluginsOfEnabled = this._lazy = false; + this._propLookup = (this._targets) ? {} : []; + return this; + }; + + p._enabled = function(enabled, ignoreTimeline) { + if (!_tickerActive) { + _ticker.wake(); + } + if (enabled && this._gc) { + var targets = this._targets, + i; + if (targets) { + i = targets.length; + while (--i > -1) { + this._siblings[i] = _register(targets[i], this, true); + } + } else { + this._siblings = _register(this.target, this, true); + } + } + Animation.prototype._enabled.call(this, enabled, ignoreTimeline); + if (this._notifyPluginsOfEnabled) if (this._firstPT) { + return TweenLite._onPluginEvent((enabled ? "_onEnable" : "_onDisable"), this); + } + return false; + }; //----TweenLite static methods ----------------------------------------------------- - TweenLite.to = function(target, duration, vars) { - return new TweenLite(target, duration, vars); - }; - - TweenLite.from = function(target, duration, vars) { - vars.runBackwards = true; - vars.immediateRender = (vars.immediateRender != false); - return new TweenLite(target, duration, vars); - }; - - TweenLite.fromTo = function(target, duration, fromVars, toVars) { - toVars.startAt = fromVars; - toVars.immediateRender = (toVars.immediateRender != false && fromVars.immediateRender != false); - return new TweenLite(target, duration, toVars); - }; - - TweenLite.delayedCall = function(delay, callback, params, scope, useFrames) { - return new TweenLite(callback, 0, {delay:delay, onComplete:callback, onCompleteParams:params, onCompleteScope:scope, onReverseComplete:callback, onReverseCompleteParams:params, onReverseCompleteScope:scope, immediateRender:false, useFrames:useFrames, overwrite:0}); - }; - - TweenLite.set = function(target, vars) { - return new TweenLite(target, 0, vars); - }; - - TweenLite.getTweensOf = function(target, onlyActive) { - if (target == null) { return []; } - target = (typeof(target) !== "string") ? target : TweenLite.selector(target) || target; - var i, a, j, t; - if ((_isArray(target) || _isSelector(target)) && typeof(target[0]) !== "number") { - i = target.length; - a = []; - while (--i > -1) { - a = a.concat(TweenLite.getTweensOf(target[i], onlyActive)); - } - i = a.length; - //now get rid of any duplicates (tweens of arrays of objects could cause duplicates) - while (--i > -1) { - t = a[i]; - j = i; - while (--j > -1) { - if (t === a[j]) { - a.splice(i, 1); - } - } - } - } else { - a = _register(target).concat(); - i = a.length; - while (--i > -1) { - if (a[i]._gc || (onlyActive && !a[i].isActive())) { - a.splice(i, 1); - } - } - } - return a; - }; - - TweenLite.killTweensOf = TweenLite.killDelayedCallsTo = function(target, onlyActive, vars) { - if (typeof(onlyActive) === "object") { - vars = onlyActive; //for backwards compatibility (before "onlyActive" parameter was inserted) - onlyActive = false; - } - var a = TweenLite.getTweensOf(target, onlyActive), - i = a.length; - while (--i > -1) { - a[i]._kill(vars, target); - } - }; + TweenLite.to = function(target, duration, vars) { + return new TweenLite(target, duration, vars); + }; + + TweenLite.from = function(target, duration, vars) { + vars.runBackwards = true; + vars.immediateRender = (vars.immediateRender != false); + return new TweenLite(target, duration, vars); + }; + + TweenLite.fromTo = function(target, duration, fromVars, toVars) { + toVars.startAt = fromVars; + toVars.immediateRender = (toVars.immediateRender != false && fromVars.immediateRender != false); + return new TweenLite(target, duration, toVars); + }; + + TweenLite.delayedCall = function(delay, callback, params, scope, useFrames) { + return new TweenLite(callback, 0, {delay:delay, onComplete:callback, onCompleteParams:params, onCompleteScope:scope, onReverseComplete:callback, onReverseCompleteParams:params, onReverseCompleteScope:scope, immediateRender:false, useFrames:useFrames, overwrite:0}); + }; + + TweenLite.set = function(target, vars) { + return new TweenLite(target, 0, vars); + }; + + TweenLite.getTweensOf = function(target, onlyActive) { + if (target == null) { return []; } + target = (typeof(target) !== "string") ? target : TweenLite.selector(target) || target; + var i, a, j, t; + if ((_isArray(target) || _isSelector(target)) && typeof(target[0]) !== "number") { + i = target.length; + a = []; + while (--i > -1) { + a = a.concat(TweenLite.getTweensOf(target[i], onlyActive)); + } + i = a.length; + //now get rid of any duplicates (tweens of arrays of objects could cause duplicates) + while (--i > -1) { + t = a[i]; + j = i; + while (--j > -1) { + if (t === a[j]) { + a.splice(i, 1); + } + } + } + } else { + a = _register(target).concat(); + i = a.length; + while (--i > -1) { + if (a[i]._gc || (onlyActive && !a[i].isActive())) { + a.splice(i, 1); + } + } + } + return a; + }; + + TweenLite.killTweensOf = TweenLite.killDelayedCallsTo = function(target, onlyActive, vars) { + if (typeof(onlyActive) === "object") { + vars = onlyActive; //for backwards compatibility (before "onlyActive" parameter was inserted) + onlyActive = false; + } + var a = TweenLite.getTweensOf(target, onlyActive), + i = a.length; + while (--i > -1) { + a[i]._kill(vars, target); + } + }; @@ -18797,175 +19075,175 @@ angular.module('b2b.att.treeNodeCheckbox', ['b2b.att.utilities']) * TweenPlugin (could easily be split out as a separate file/class, but included for ease of use (so that people don't need to include another <script> call before loading plugins which is easy to forget) * ---------------------------------------------------------------- */ - var TweenPlugin = _class("plugins.TweenPlugin", function(props, priority) { - this._overwriteProps = (props || "").split(","); - this._propName = this._overwriteProps[0]; - this._priority = priority || 0; - this._super = TweenPlugin.prototype; - }, true); - - p = TweenPlugin.prototype; - TweenPlugin.version = "1.10.1"; - TweenPlugin.API = 2; - p._firstPT = null; - - p._addTween = function(target, prop, start, end, overwriteProp, round) { - var c, pt; - if (end != null && (c = (typeof(end) === "number" || end.charAt(1) !== "=") ? Number(end) - start : parseInt(end.charAt(0) + "1", 10) * Number(end.substr(2)))) { - this._firstPT = pt = {_next:this._firstPT, t:target, p:prop, s:start, c:c, f:(typeof(target[prop]) === "function"), n:overwriteProp || prop, r:round}; - if (pt._next) { - pt._next._prev = pt; - } - return pt; - } - }; - - p.setRatio = function(v) { - var pt = this._firstPT, - min = 0.000001, - val; - while (pt) { - val = pt.c * v + pt.s; - if (pt.r) { - val = Math.round(val); - } else if (val < min) if (val > -min) { //prevents issues with converting very small numbers to strings in the browser - val = 0; - } - if (pt.f) { - pt.t[pt.p](val); - } else { - pt.t[pt.p] = val; - } - pt = pt._next; - } - }; - - p._kill = function(lookup) { - var a = this._overwriteProps, - pt = this._firstPT, - i; - if (lookup[this._propName] != null) { - this._overwriteProps = []; - } else { - i = a.length; - while (--i > -1) { - if (lookup[a[i]] != null) { - a.splice(i, 1); - } - } - } - while (pt) { - if (lookup[pt.n] != null) { - if (pt._next) { - pt._next._prev = pt._prev; - } - if (pt._prev) { - pt._prev._next = pt._next; - pt._prev = null; - } else if (this._firstPT === pt) { - this._firstPT = pt._next; - } - } - pt = pt._next; - } - return false; - }; - - p._roundProps = function(lookup, value) { - var pt = this._firstPT; - while (pt) { - if (lookup[this._propName] || (pt.n != null && lookup[ pt.n.split(this._propName + "_").join("") ])) { //some properties that are very plugin-specific add a prefix named after the _propName plus an underscore, so we need to ignore that extra stuff here. - pt.r = value; - } - pt = pt._next; - } - }; - - TweenLite._onPluginEvent = function(type, tween) { - var pt = tween._firstPT, - changed, pt2, first, last, next; - if (type === "_onInitAllProps") { - //sorts the PropTween linked list in order of priority because some plugins need to render earlier/later than others, like MotionBlurPlugin applies its effects after all x/y/alpha tweens have rendered on each frame. - while (pt) { - next = pt._next; - pt2 = first; - while (pt2 && pt2.pr > pt.pr) { - pt2 = pt2._next; - } - if ((pt._prev = pt2 ? pt2._prev : last)) { - pt._prev._next = pt; - } else { - first = pt; - } - if ((pt._next = pt2)) { - pt2._prev = pt; - } else { - last = pt; - } - pt = next; - } - pt = tween._firstPT = first; - } - while (pt) { - if (pt.pg) if (typeof(pt.t[type]) === "function") if (pt.t[type]()) { - changed = true; - } - pt = pt._next; - } - return changed; - }; - - TweenPlugin.activate = function(plugins) { - var i = plugins.length; - while (--i > -1) { - if (plugins[i].API === TweenPlugin.API) { - _plugins[(new plugins[i]())._propName] = plugins[i]; - } - } - return true; - }; - - //provides a more concise way to define plugins that have no dependencies besides TweenPlugin and TweenLite, wrapping common boilerplate stuff into one function (added in 1.9.0). You don't NEED to use this to define a plugin - the old way still works and can be useful in certain (rare) situations. - _gsDefine.plugin = function(config) { - if (!config || !config.propName || !config.init || !config.API) { throw "illegal plugin definition."; } - var propName = config.propName, - priority = config.priority || 0, - overwriteProps = config.overwriteProps, - map = {init:"_onInitTween", set:"setRatio", kill:"_kill", round:"_roundProps", initAll:"_onInitAllProps"}, - Plugin = _class("plugins." + propName.charAt(0).toUpperCase() + propName.substr(1) + "Plugin", - function() { - TweenPlugin.call(this, propName, priority); - this._overwriteProps = overwriteProps || []; - }, (config.global === true)), - p = Plugin.prototype = new TweenPlugin(propName), - prop; - p.constructor = Plugin; - Plugin.API = config.API; - for (prop in map) { - if (typeof(config[prop]) === "function") { - p[map[prop]] = config[prop]; - } - } - Plugin.version = config.version; - TweenPlugin.activate([Plugin]); - return Plugin; - }; - - - //now run through all the dependencies discovered and if any are missing, log that to the console as a warning. This is why it's best to have TweenLite load last - it can check all the dependencies for you. - a = window._gsQueue; - if (a) { - for (i = 0; i < a.length; i++) { - a[i](); - } - for (p in _defLookup) { - if (!_defLookup[p].func) { - //window.console.log("GSAP encountered missing dependency: com.greensock." + p); - } - } - } - - _tickerActive = false; //ensures that the first official animation forces a ticker.tick() to update the time when it is instantiated + var TweenPlugin = _class("plugins.TweenPlugin", function(props, priority) { + this._overwriteProps = (props || "").split(","); + this._propName = this._overwriteProps[0]; + this._priority = priority || 0; + this._super = TweenPlugin.prototype; + }, true); + + p = TweenPlugin.prototype; + TweenPlugin.version = "1.10.1"; + TweenPlugin.API = 2; + p._firstPT = null; + + p._addTween = function(target, prop, start, end, overwriteProp, round) { + var c, pt; + if (end != null && (c = (typeof(end) === "number" || end.charAt(1) !== "=") ? Number(end) - start : parseInt(end.charAt(0) + "1", 10) * Number(end.substr(2)))) { + this._firstPT = pt = {_next:this._firstPT, t:target, p:prop, s:start, c:c, f:(typeof(target[prop]) === "function"), n:overwriteProp || prop, r:round}; + if (pt._next) { + pt._next._prev = pt; + } + return pt; + } + }; + + p.setRatio = function(v) { + var pt = this._firstPT, + min = 0.000001, + val; + while (pt) { + val = pt.c * v + pt.s; + if (pt.r) { + val = Math.round(val); + } else if (val < min) if (val > -min) { //prevents issues with converting very small numbers to strings in the browser + val = 0; + } + if (pt.f) { + pt.t[pt.p](val); + } else { + pt.t[pt.p] = val; + } + pt = pt._next; + } + }; + + p._kill = function(lookup) { + var a = this._overwriteProps, + pt = this._firstPT, + i; + if (lookup[this._propName] != null) { + this._overwriteProps = []; + } else { + i = a.length; + while (--i > -1) { + if (lookup[a[i]] != null) { + a.splice(i, 1); + } + } + } + while (pt) { + if (lookup[pt.n] != null) { + if (pt._next) { + pt._next._prev = pt._prev; + } + if (pt._prev) { + pt._prev._next = pt._next; + pt._prev = null; + } else if (this._firstPT === pt) { + this._firstPT = pt._next; + } + } + pt = pt._next; + } + return false; + }; + + p._roundProps = function(lookup, value) { + var pt = this._firstPT; + while (pt) { + if (lookup[this._propName] || (pt.n != null && lookup[ pt.n.split(this._propName + "_").join("") ])) { //some properties that are very plugin-specific add a prefix named after the _propName plus an underscore, so we need to ignore that extra stuff here. + pt.r = value; + } + pt = pt._next; + } + }; + + TweenLite._onPluginEvent = function(type, tween) { + var pt = tween._firstPT, + changed, pt2, first, last, next; + if (type === "_onInitAllProps") { + //sorts the PropTween linked list in order of priority because some plugins need to render earlier/later than others, like MotionBlurPlugin applies its effects after all x/y/alpha tweens have rendered on each frame. + while (pt) { + next = pt._next; + pt2 = first; + while (pt2 && pt2.pr > pt.pr) { + pt2 = pt2._next; + } + if ((pt._prev = pt2 ? pt2._prev : last)) { + pt._prev._next = pt; + } else { + first = pt; + } + if ((pt._next = pt2)) { + pt2._prev = pt; + } else { + last = pt; + } + pt = next; + } + pt = tween._firstPT = first; + } + while (pt) { + if (pt.pg) if (typeof(pt.t[type]) === "function") if (pt.t[type]()) { + changed = true; + } + pt = pt._next; + } + return changed; + }; + + TweenPlugin.activate = function(plugins) { + var i = plugins.length; + while (--i > -1) { + if (plugins[i].API === TweenPlugin.API) { + _plugins[(new plugins[i]())._propName] = plugins[i]; + } + } + return true; + }; + + //provides a more concise way to define plugins that have no dependencies besides TweenPlugin and TweenLite, wrapping common boilerplate stuff into one function (added in 1.9.0). You don't NEED to use this to define a plugin - the old way still works and can be useful in certain (rare) situations. + _gsDefine.plugin = function(config) { + if (!config || !config.propName || !config.init || !config.API) { throw "illegal plugin definition."; } + var propName = config.propName, + priority = config.priority || 0, + overwriteProps = config.overwriteProps, + map = {init:"_onInitTween", set:"setRatio", kill:"_kill", round:"_roundProps", initAll:"_onInitAllProps"}, + Plugin = _class("plugins." + propName.charAt(0).toUpperCase() + propName.substr(1) + "Plugin", + function() { + TweenPlugin.call(this, propName, priority); + this._overwriteProps = overwriteProps || []; + }, (config.global === true)), + p = Plugin.prototype = new TweenPlugin(propName), + prop; + p.constructor = Plugin; + Plugin.API = config.API; + for (prop in map) { + if (typeof(config[prop]) === "function") { + p[map[prop]] = config[prop]; + } + } + Plugin.version = config.version; + TweenPlugin.activate([Plugin]); + return Plugin; + }; + + + //now run through all the dependencies discovered and if any are missing, log that to the console as a warning. This is why it's best to have TweenLite load last - it can check all the dependencies for you. + a = window._gsQueue; + if (a) { + for (i = 0; i < a.length; i++) { + a[i](); + } + for (p in _defLookup) { + if (!_defLookup[p].func) { + //window.console.log("GSAP encountered missing dependency: com.greensock." + p); + } + } + } + + _tickerActive = false; //ensures that the first official animation forces a ticker.tick() to update the time when it is instantiated })(window); @@ -19172,8 +19450,8 @@ angular.module('b2b.att.position', []) left: boundingClientRect.left + ($window.pageXOffset || $document[0].body.scrollLeft || $document[0].documentElement.scrollLeft) }; }, - - /** + + /** * Provides functionality to check whether an element is in view port. */ isElementInViewport: function (element) { @@ -19381,7 +19659,6 @@ angular.module('b2b.att.utilities', ['ngSanitize']) } result[data[i][key]].childArray.push(data[i]); if (data[i].activeGrp && data[i].activeGrp == true) { - console.log('make ' + data[i].grpChild + ' active'); result[data[i][key]].showGroup = true; } } @@ -19401,7 +19678,7 @@ angular.module('b2b.att.utilities', ['ngSanitize']) searchText = searchText.toLowerCase(); angular.forEach(items, function(item) { angular.forEach(attrs, function(attr) { - if (item.hasOwnProperty(attr) && item[attr].toLowerCase().includes(searchText)) { + if (item.hasOwnProperty(attr) && (item[attr].toLowerCase().indexOf(searchText) != -1)) { filtered.push(item); return; } @@ -19808,6 +20085,51 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js }) +.factory('isHighContrast', function () { + var _isHighContrast = function (idval) + + + { + var objDiv, objImage, strColor, strWidth, strReady; + var strImageID = idval; // ID of image on the page + + // Create a test div + objDiv = document.createElement('div'); + + //Set its color style to something unusual + objDiv.style.color = 'rgb(31, 41, 59)'; + + // Attach to body so we can inspect it + document.body.appendChild(objDiv); + + // Read computed color value + strColor = document.defaultView ? document.defaultView.getComputedStyle(objDiv, null).color : objDiv.currentStyle.color; + strColor = strColor.replace(/ /g, ''); + + // Delete the test DIV + document.body.removeChild(objDiv); + + // Check if we get the color back that we set. If not, we're in + // high contrast mode. + if (strColor !== 'rgb(31,41,59)') { + return true; + } else { + return false; + } + }; + + return _isHighContrast; +}) + +.run(['isHighContrast', '$document', function (isHighContrast, $document) { + var html = $document.find('html').eq(0); + if (isHighContrast()) { + html.addClass('ds2-no-colors'); + } else { + html.removeClass('ds2-no-colors'); + } +}]) + .factory('$documentBind', ['$document', '$timeout', function ($document, $timeout) { var _click = function (flag, callbackFunc, scope) { scope.$watch(flag, function (val) { @@ -19821,6 +20143,18 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js }); }; + var _touch = function (flag, callbackFunc, scope) { + scope.$watch(flag, function (val) { + $timeout(function () { + if (val) { + $document.bind('touchstart', callbackFunc); + } else { + $document.unbind('touchstart', callbackFunc); + } + }); + }); + }; + var _scroll = function (flag, callbackFunc, scope) { scope.$watch(flag, function (val) { $timeout(function () { @@ -19864,6 +20198,7 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js return { click: _click, + touch: _touch, scroll: _scroll, event: _event }; @@ -19961,7 +20296,7 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js // anchors/areas without href are not focusable return (element[0].href !== ''); } - return !(element[0].disabled || element[0].readOnly); + return !(element[0].disabled); } return false; }; @@ -20115,196 +20450,6 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js }; }) -.factory('trapFocusInElement', ['$document', '$isElement', 'DOMHelper', 'keymap', function ($document, $isElement, DOMHelper, keymap) { - var elementStack = []; - var stackHead = undefined; - var trapFocusInElement = function (flag) { - var bodyElements = $document.find('body').children(); - - var firstTabableElement = angular.element(DOMHelper.firstTabableElement(stackHead)); - var lastTabableElement = angular.element(DOMHelper.lastTabableElement(stackHead)); - - var trapKeyboardFocusInFirstElement = function (e) { - if (!e.keyCode) { - e.keyCode = e.which; - } - - if (e.shiftKey === true && e.keyCode === keymap.KEY.TAB) { - lastTabableElement[0].focus(); - e.preventDefault(e); - e.stopPropagation(e); - } - - }; - - var trapKeyboardFocusInLastElement = function (e) { - if (!e.keyCode) { - e.keyCode = e.which; - } - - if (e.shiftKey === false && e.keyCode === keymap.KEY.TAB) { - firstTabableElement[0].focus(); - e.preventDefault(e); - e.stopPropagation(e); - } - }; - - if (flag) { - for (var i = 0; i < bodyElements.length; i++) { - if (bodyElements[i] !== stackHead[0]) { - bodyElements.eq(i).attr('aria-hidden', true); - } - } - firstTabableElement.bind('keydown', trapKeyboardFocusInFirstElement); - lastTabableElement.bind('keydown', trapKeyboardFocusInLastElement); - } else { - for (var j = 0; j < bodyElements.length; j++) { - if (bodyElements[j] !== stackHead[0]) { - bodyElements.eq(j).removeAttr('aria-hidden'); - } - } - firstTabableElement.unbind('keydown', trapKeyboardFocusInFirstElement); - lastTabableElement.unbind('keydown', trapKeyboardFocusInLastElement); - } - }; - var toggleTrapFocusInElement = function (flag, element) { - if (angular.isDefined(flag) && angular.isDefined(element)) { - if (angular.isUndefined(stackHead)) { - stackHead = element; - trapFocusInElement(flag); - } else { - if (flag) { - trapFocusInElement(false); - elementStack.push(stackHead); - stackHead = element; - trapFocusInElement(true); - } else { - if (stackHead.prop('$$hashKey') === element.prop('$$hashKey')) { - trapFocusInElement(false); - stackHead = elementStack.pop(); - if (angular.isDefined(stackHead)) { - trapFocusInElement(true); - } - } - } - } - } - }; - - return toggleTrapFocusInElement; -}]) - -.factory('DOMHelper', function () { - - var _isTabable = function (node) { - var element = angular.element(node); - var tagName = element[0].tagName.toUpperCase(); - - if (isHidden(element)) { - return false; - } - if (element.attr('tabindex') !== undefined) { - return (parseInt(element.attr('tabindex'), 10) >= 0); - } - if (tagName === 'A' || tagName === 'AREA' || tagName === 'BUTTON' || tagName === 'INPUT' || tagName === 'TEXTAREA' || tagName === 'SELECT') { - if (tagName === 'A' || tagName === 'AREA') { - // anchors/areas without href are not focusable - return (element[0].href !== ''); - } - return !(element[0].disabled || element[0].readOnly); - } - return false; - }; - - function isValidChild(child) { - return child.nodeType == 1 && child.nodeName != 'SCRIPT' && child.nodeName != 'STYLE'; - } - - function isHidden(obj) { - var elem = angular.element(obj); - var style; - try { - style = window.getComputedStyle(obj); - } - catch(err) { - style = window.getComputedStyle(obj[0]); - } - - // getComputedStyle() for Zepto object returns null - if (style === null){ - return elem.hasClass('ng-hide') || elem.css('display') === 'none'; - } - - return elem.hasClass('ng-hide') || elem.css('display') === 'none' || style.display === 'none' || style.display === 'hidden'; - } - - function traverse(obj, fromTop) { - var obj = obj || document.getElementsByTagName('body')[0]; - - if (isValidChild(obj) && _isTabable(obj)) { - return obj; - } - - // If object is hidden, skip it's children - if (isValidChild(obj) && isHidden(obj)) { - return undefined; - } - // If object is hidden, skip it's children - if (angular.element(obj).hasClass('ng-hide')) { - return undefined; - } - - if (obj.hasChildNodes()) { - var child; - if (fromTop) { - child = obj.firstChild; - } else { - child = obj.lastChild; - } - while (child) { - var res = traverse(child, fromTop); - if (res) { - return res; - } else { - if (fromTop) { - child = child.nextSibling; - } else { - child = child.previousSibling; - } - } - } - } else { - return undefined; - } - } - - var _lastTabableElement = function (el) { - /* This will return the last tabable element from the parent el */ - var elem = el; - if (el.hasOwnProperty('length')) { - elem = el[0]; - } - - return traverse(elem, false); - }; - - var _firstTabableElement = function (el) { - /* This will return the first tabable element from the parent el */ - var elem = el; - if (el.hasOwnProperty('length')) { - elem = el[0]; - } - - return traverse(elem, true); - }; - - return { - firstTabableElement: _firstTabableElement, - lastTabableElement: _lastTabableElement, - isTabable: _isTabable - }; -}) - .factory('windowOrientation', ['$window', function ($window) { var _isPotrait = function () { if ($window.innerHeight > $window.innerWidth) { @@ -20326,7 +20471,6 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js isLandscape: _isLandscape }; }]) - .directive('b2bNextElement', function() { return { restrict: 'A', @@ -20524,7 +20668,7 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js }; }]) -.factory('trapFocusInElement', ['$document', '$isElement', 'DOMHelper', 'keymap', '$interval', function ($document, $isElement, DOMHelper, keymap, $interval) { +.factory('trapFocusInElement', ['$document', '$isElement', 'b2bDOMHelper', 'keymap', '$interval', function ($document, $isElement, b2bDOMHelper, keymap, $interval) { var elementStack = []; var stackHead = undefined; var stopInterval = undefined; @@ -20560,8 +20704,8 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js var trapFocusInElement = function (flag, firstTabableElementParam, lastTabableElementParam) { var bodyElements = $document.find('body').children(); - firstTabableElement = firstTabableElementParam ? firstTabableElementParam : angular.element(DOMHelper.firstTabableElement(stackHead)); - lastTabableElement = lastTabableElementParam ? lastTabableElementParam : angular.element(DOMHelper.lastTabableElement(stackHead)); + firstTabableElement = firstTabableElementParam ? firstTabableElementParam : angular.element(b2bDOMHelper.firstTabableElement(stackHead)); + lastTabableElement = lastTabableElementParam ? lastTabableElementParam : angular.element(b2bDOMHelper.lastTabableElement(stackHead)); if (flag) { for (var i = 0; i < bodyElements.length; i++) { @@ -20583,8 +20727,8 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js if (intervalRequired && flag) { stopInterval = $interval(function () { - var firstTabableElementTemp = angular.element(DOMHelper.firstTabableElement(stackHead)); - var lastTabableElementTemp = angular.element(DOMHelper.lastTabableElement(stackHead)); + var firstTabableElementTemp = angular.element(b2bDOMHelper.firstTabableElement(stackHead)); + var lastTabableElementTemp = angular.element(b2bDOMHelper.lastTabableElement(stackHead)); if (firstTabableElementTemp[0] !== firstTabableElement[0] || lastTabableElementTemp[0] !== lastTabableElement[0]) { $interval.cancel(stopInterval); stopInterval = undefined; @@ -20632,7 +20776,94 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js return toggleTrapFocusInElement; }]) +.factory('draggedElement', function(){ + var draggedElement; + return { + setElement: function(data){ + draggedElement = data; + }, + getElement: function(){ + return draggedElement; + } + } +}) + +.directive('draggable', ['draggedElement',function (draggedElement) { + return function(scope, element) { + + element[0].draggable = true; + + element.bind('dragstart', function(e) { + draggedElement.setElement(this.parentElement.parentElement); + e.dataTransfer.effectAllowed = 'move'; + e.dataTransfer.setDragImage(this.parentElement.parentElement, 0, 0); + this.parentElement.parentElement.classList.add('b2-drag-element'); + return false; + }); + + element.bind('dragend', function(e) { + draggedElement.setElement(e); + this.parentElement.parentElement.classList.remove('b2-drag-element'); + return false; + }); + }; +}]) + +.directive('droppable', ['draggedElement',function (draggedElement) { + return { + restrict: 'EA', + replace: true, + scope: { + rowData: '=' + }, + link: function(scope, element, attr) { + if(attr.droppable === 'true') { + element.bind('dragover', function(e) { + e.dataTransfer.dropEffect = 'move'; + this.classList.add('b2b-drag-over') + if (e.preventDefault) e.preventDefault(); // allows us to drop + return false; + }); + + element.bind('dragstart', function(e) { + if(!e.target.parentElement.classList.contains('b2b-draggable')) { + e.preventDefault(); + return false; + } + }); + + element.bind('dragenter', function(e) { + if(e.target.getAttribute('droppable') ==='true') { + this.click(); + } + }); + + element.bind('dragleave', function(e) { + this.classList.remove('b2b-drag-over'); + return false; + }); + + element.bind('drop', function(e) { + var ele = draggedElement.getElement(); + if (e.stopPropagation) e.stopPropagation(); + if (e.preventDefault) e.preventDefault(); + this.classList.remove('b2b-drag-over'); + if(ele && ele.hasAttribute('data-index')){ + var element = scope.rowData[parseInt(ele.getAttribute('data-index'))]; + if(element !== undefined) { + scope.rowData.splice(parseInt(ele.getAttribute('data-index')), 1); + scope.rowData.splice(parseInt(e.currentTarget.getAttribute('data-index')), 0 , element); + } + } + scope.$apply(); + + return false; + }); + } + } + } +}]) .directive('b2bSetNextFocusOn', ['b2bDOMHelper', '$timeout', function(b2bDOMHelper, $timeout) { return { restrict: 'A', @@ -20645,29 +20876,29 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js var timeout = parseInt(attr.setNextFocusTimeout, 0) | 100; var index = parseInt(attr.b2bSetNextFocusIndex, 0) | 0; - /* - *Fix for IE7 and lower - *polyfill src: https://github.com/HubSpot/pace/issues/102 - */ - if (!document.querySelectorAll) { - document.querySelectorAll = function (selectors) { - var style = document.createElement('style'), elements = [], element; - document.documentElement.firstChild.appendChild(style); - document._qsa = []; - - style.styleSheet.cssText = selectors + '{x-qsa:expression(document._qsa && document._qsa.push(this))}'; - window.scrollBy(0, 0); - style.parentNode.removeChild(style); - - while (document._qsa.length) { - element = document._qsa.shift(); - element.style.removeAttribute('x-qsa'); - elements.push(element); - } - document._qsa = null; - return elements; - }; - } + /* + *Fix for IE7 and lower + *polyfill src: https://github.com/HubSpot/pace/issues/102 + */ + if (!document.querySelectorAll) { + document.querySelectorAll = function (selectors) { + var style = document.createElement('style'), elements = [], element; + document.documentElement.firstChild.appendChild(style); + document._qsa = []; + + style.styleSheet.cssText = selectors + '{x-qsa:expression(document._qsa && document._qsa.push(this))}'; + window.scrollBy(0, 0); + style.parentNode.removeChild(style); + + while (document._qsa.length) { + element = document._qsa.shift(); + element.style.removeAttribute('x-qsa'); + elements.push(element); + } + document._qsa = null; + return elements; + }; + } if (attr.b2bSetNextFocusOn === '') { return; @@ -21015,6 +21246,690 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js }; }]) +.constant('b2bMaskConfig', { + maskDefinitions: { + '9': /\d/, + 'A': /[a-zA-Z]/, + '*': /[a-zA-Z0-9]/ + }, + clearOnBlur: false, + clearOnBlurPlaceholder: false, + escChar: '\\', + eventsToHandle: ['input', 'keyup', 'click', 'focus'], + addDefaultPlaceholder: true, + allowInvalidValue: true +}) +/** + * @param {boolean} modelViewValue - If this is set to true, then the model value bound with ng-model will be the same as the $viewValue meaning it will contain any static mask characters present in the mask definition. This will not set the model value to a $viewValue that is considered invalid. + * @param {String} maskPlaceholder - Allows customizing the mask placeholder when a user has focused the input element and while typing in their value + * @param {String} maskPlaceholderChar - Allows customizing the mask placeholder character. The default mask placeholder is _. + * @param {boolean} addDefaultPlaceholder - The default placeholder is constructed from the ui-mask definition so a mask of 999-9999 would have a default placeholder of ___-____; unless you have overridden the default placeholder character. + */ +.directive('b2bMask', ['b2bMaskConfig', function(b2bMaskConfig) { + return { + require: 'ngModel', + restrict: 'A', + link: function(scope, element, attrs, ctrl) { + var maskProcessed = false, eventsBound = false, + maskCaretMap, maskPatterns, maskPlaceholder, maskComponents, + // Minimum required length of the value to be considered valid + minRequiredLength, + value, valueMasked, isValid, + // Vars for initializing/uninitializing + originalPlaceholder = attrs.placeholder, + originalMaxlength = attrs.maxlength, + // Vars used exclusively in eventHandler() + oldValue, oldValueUnmasked, oldCaretPosition, oldSelectionLength, + // Used for communicating if a backspace operation should be allowed between + // keydownHandler and eventHandler + preventBackspace; + + var options = b2bMaskConfig; + + function isFocused (elem) { + return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); + } + + var originalIsEmpty = ctrl.$isEmpty; + ctrl.$isEmpty = function(value) { + if (maskProcessed) { + return originalIsEmpty(unmaskValue(value || '')); + } else { + return originalIsEmpty(value); + } + }; + + function initialize(maskAttr) { + if (!angular.isDefined(maskAttr)) { + return uninitialize(); + } + processRawMask(maskAttr); + if (!maskProcessed) { + return uninitialize(); + } + initializeElement(); + bindEventListeners(); + return true; + } + + function initPlaceholder(placeholderAttr) { + if ( ! placeholderAttr) { + return; + } + maskPlaceholder = placeholderAttr; + /* If the mask is processed, then we need to update the value + but don't set the value if there is nothing entered into the element + and there is a placeholder attribute on the element because that + will only set the value as the blank maskPlaceholder + and override the placeholder on the element */ + if (maskProcessed && !(element.val().length === 0 && angular.isDefined(attrs.placeholder))) { + element.val(maskValue(unmaskValue(element.val()))); + } + } + + function initPlaceholderChar() { + return initialize(attrs.uiMask); + } + + var modelViewValue = false; + + attrs.$observe('modelViewValue', function(val) { + if (val === 'true') { + modelViewValue = true; + } + }); + + attrs.$observe('allowInvalidValue', function(val) { + linkOptions.allowInvalidValue = val === ''? true : !!val; + formatter(ctrl.$modelValue); + }); + + function formatter(fromModelValue) { + if (!maskProcessed) { + return fromModelValue; + } + value = unmaskValue(fromModelValue || ''); + isValid = validateValue(value); + ctrl.$setValidity('mask', isValid); + + if (!value.length) return undefined; + if (isValid || linkOptions.allowInvalidValue) { + return maskValue(value); + } else { + return undefined; + } + } + + function parser(fromViewValue) { + if (!maskProcessed) { + return fromViewValue; + } + value = unmaskValue(fromViewValue || ''); + isValid = validateValue(value); + /* We have to set viewValue manually as the reformatting of the input + value performed by eventHandler() doesn't happen until after + this parser is called, which causes what the user sees in the input + to be out-of-sync with what the ctrl's $viewValue is set to. */ + ctrl.$viewValue = value.length ? maskValue(value) : ''; + ctrl.$setValidity('mask', isValid); + + if (isValid || linkOptions.allowInvalidValue) { + return modelViewValue ? ctrl.$viewValue : value; + } + } + + var linkOptions = {}; + + // to do + if (attrs.b2bMaskOptions) { + linkOptions = scope.$eval('[' + attrs.b2bMaskOptions + ']'); + if (angular.isObject(linkOptions[0])) { + // we can't use angular.copy nor angular.extend, they lack the power to do a deep merge + linkOptions = (function(original, current) { + for (var i in original) { + if (Object.prototype.hasOwnProperty.call(original, i)) { + if (current[i] === undefined) { + current[i] = angular.copy(original[i]); + } else { + if (angular.isObject(current[i]) && !angular.isArray(current[i])) { + current[i] = angular.extend({}, original[i], current[i]); + } + } + } + } + return current; + })(options, linkOptions[0]); + } else { + linkOptions = options; //gotta be a better way to do this.. + } + } else { + linkOptions = options; + } + + attrs.$observe('b2bMask', initialize); + if (angular.isDefined(attrs.maskPlaceholder)) { + attrs.$observe('maskPlaceholder', initPlaceholder); + } + else { + attrs.$observe('placeholder', initPlaceholder); + } + if (angular.isDefined(attrs.maskPlaceholderChar)) { + attrs.$observe('maskPlaceholderChar', initPlaceholderChar); + } + + ctrl.$formatters.unshift(formatter); + ctrl.$parsers.unshift(parser); + + function uninitialize() { + maskProcessed = false; + unbindEventListeners(); + + if (angular.isDefined(originalPlaceholder)) { + element.attr('placeholder', originalPlaceholder); + } else { + element.removeAttr('placeholder'); + } + + if (angular.isDefined(originalMaxlength)) { + element.attr('maxlength', originalMaxlength); + } else { + element.removeAttr('maxlength'); + } + + element.val(ctrl.$modelValue); + ctrl.$viewValue = ctrl.$modelValue; + return false; + } + + function initializeElement() { + value = oldValueUnmasked = unmaskValue(ctrl.$modelValue || ''); + valueMasked = oldValue = maskValue(value); + isValid = validateValue(value); + if (attrs.maxlength) { // Double maxlength to allow pasting new val at end of mask + element.attr('maxlength', maskCaretMap[maskCaretMap.length - 1] * 2); + } + if ( ! originalPlaceholder && linkOptions.addDefaultPlaceholder) { + element.attr('placeholder', maskPlaceholder); + } + var viewValue = ctrl.$modelValue; + var idx = ctrl.$formatters.length; + while(idx--) { + viewValue = ctrl.$formatters[idx](viewValue); + } + ctrl.$viewValue = viewValue || ''; + ctrl.$render(); + } + + function bindEventListeners() { + if (eventsBound) { + return; + } + element.bind('blur', blurHandler); + element.bind('mousedown mouseup', mouseDownUpHandler); + element.bind('keydown', keydownHandler); + element.bind(linkOptions.eventsToHandle.join(' '), eventHandler); + eventsBound = true; + } + + function unbindEventListeners() { + if (!eventsBound) { + return; + } + element.unbind('blur', blurHandler); + element.unbind('mousedown', mouseDownUpHandler); + element.unbind('mouseup', mouseDownUpHandler); + element.unbind('keydown', keydownHandler); + element.unbind('input', eventHandler); + element.unbind('keyup', eventHandler); + element.unbind('click', eventHandler); + element.unbind('focus', eventHandler); + eventsBound = false; + } + + function validateValue(value) { + // Zero-length value validity is ngRequired's determination + return value.length ? value.length >= minRequiredLength : true; + } + + function unmaskValue(value) { + var valueUnmasked = '', + input = element[0], + maskPatternsCopy = maskPatterns.slice(), + selectionStart = oldCaretPosition, + selectionEnd = selectionStart + getSelectionLength(input), + valueOffset, valueDelta, tempValue = ''; + // Preprocess by stripping mask components from value + value = value.toString(); + valueOffset = 0; + valueDelta = value.length - maskPlaceholder.length; + angular.forEach(maskComponents, function(component) { + var position = component.position; + //Only try and replace the component if the component position is not within the selected range + //If component was in selected range then it was removed with the user input so no need to try and remove that component + if (!(position >= selectionStart && position < selectionEnd)) { + if (position >= selectionStart) { + position += valueDelta; + } + if (value.substring(position, position + component.value.length) === component.value) { + tempValue += value.slice(valueOffset, position);// + value.slice(position + component.value.length); + valueOffset = position + component.value.length; + } + } + }); + value = tempValue + value.slice(valueOffset); + angular.forEach(value.split(''), function(chr) { + if (maskPatternsCopy.length && maskPatternsCopy[0].test(chr)) { + valueUnmasked += chr; + maskPatternsCopy.shift(); + } + }); + + return valueUnmasked; + } + + function maskValue(unmaskedValue) { + var valueMasked = '', + maskCaretMapCopy = maskCaretMap.slice(); + + angular.forEach(maskPlaceholder.split(''), function(chr, i) { + if (unmaskedValue.length && i === maskCaretMapCopy[0]) { + valueMasked += unmaskedValue.charAt(0) || '_'; + unmaskedValue = unmaskedValue.substr(1); + maskCaretMapCopy.shift(); + } + else { + valueMasked += chr; + } + }); + return valueMasked; + } + + function getPlaceholderChar(i) { + var placeholder = angular.isDefined(attrs.uiMaskPlaceholder) ? attrs.uiMaskPlaceholder : attrs.placeholder, + defaultPlaceholderChar; + + if (angular.isDefined(placeholder) && placeholder[i]) { + return placeholder[i]; + } else { + defaultPlaceholderChar = angular.isDefined(attrs.uiMaskPlaceholderChar) && attrs.uiMaskPlaceholderChar ? attrs.uiMaskPlaceholderChar : '_'; + return (defaultPlaceholderChar.toLowerCase() === 'space') ? ' ' : defaultPlaceholderChar[0]; + } + } + + /* Generate array of mask components that will be stripped from a masked value + before processing to prevent mask components from being added to the unmasked value. + E.g., a mask pattern of '+7 9999' won't have the 7 bleed into the unmasked value. */ + function getMaskComponents() { + var maskPlaceholderChars = maskPlaceholder.split(''), + maskPlaceholderCopy, components; + + /* maskCaretMap can have bad values if the input has the ui-mask attribute implemented as an obversable property, e.g. the demo page */ + if (maskCaretMap && !isNaN(maskCaretMap[0])) { + /* Instead of trying to manipulate the RegEx based on the placeholder characters + we can simply replace the placeholder characters based on the already built + maskCaretMap to underscores and leave the original working RegEx to get the proper + mask components */ + angular.forEach(maskCaretMap, function(value) { + maskPlaceholderChars[value] = '_'; + }); + } + maskPlaceholderCopy = maskPlaceholderChars.join(''); + components = maskPlaceholderCopy.replace(/[_]+/g, '_').split('_'); + components = components.filter(function(s) { + return s !== ''; + }); + + /* need a string search offset in cases where the mask contains multiple identical components + E.g., a mask of 99.99.99-999.99 */ + var offset = 0; + return components.map(function(c) { + var componentPosition = maskPlaceholderCopy.indexOf(c, offset); + offset = componentPosition + 1; + return { + value: c, + position: componentPosition + }; + }); + } + + function processRawMask(mask) { + var characterCount = 0; + + maskCaretMap = []; + maskPatterns = []; + maskPlaceholder = ''; + + if (angular.isString(mask)) { + minRequiredLength = 0; + + var isOptional = false, + numberOfOptionalCharacters = 0, + splitMask = mask.split(''); + + var inEscape = false; + angular.forEach(splitMask, function(chr, i) { + if (inEscape) { + inEscape = false; + maskPlaceholder += chr; + characterCount++; + } + else if (linkOptions.escChar === chr) { + inEscape = true; + } + else if (linkOptions.maskDefinitions[chr]) { + maskCaretMap.push(characterCount); + + maskPlaceholder += getPlaceholderChar(i - numberOfOptionalCharacters); + maskPatterns.push(linkOptions.maskDefinitions[chr]); + + characterCount++; + if (!isOptional) { + minRequiredLength++; + } + + isOptional = false; + } + else if (chr === '?') { + isOptional = true; + numberOfOptionalCharacters++; + } + else { + maskPlaceholder += chr; + characterCount++; + } + }); + } + // Caret position immediately following last position is valid. + maskCaretMap.push(maskCaretMap.slice().pop() + 1); + + maskComponents = getMaskComponents(); + maskProcessed = maskCaretMap.length > 1 ? true : false; + } + + var prevValue = element.val(); + function blurHandler() { + if (linkOptions.clearOnBlur || ((linkOptions.clearOnBlurPlaceholder) && (value.length === 0) && attrs.placeholder)) { + oldCaretPosition = 0; + oldSelectionLength = 0; + if (!isValid || value.length === 0) { + valueMasked = ''; + element.val(''); + scope.$apply(function() { + //only $setViewValue when not $pristine to avoid changing $pristine state. + if (!ctrl.$pristine) { + ctrl.$setViewValue(''); + } + }); + } + } + //Check for different value and trigger change. + if (value !== prevValue) { + var currentVal = element.val(); + var isTemporarilyEmpty = value === '' && currentVal && angular.isDefined(attrs.uiMaskPlaceholderChar) && attrs.uiMaskPlaceholderChar === 'space'; + if(isTemporarilyEmpty) { + element.val(''); + } + triggerChangeEvent(element[0]); + if(isTemporarilyEmpty) { + element.val(currentVal); + } + } + prevValue = value; + } + + function triggerChangeEvent(element) { + var change; + if (angular.isFunction(window.Event) && !element.fireEvent) { + // modern browsers and Edge + try { + change = new Event('change', { + view: window, + bubbles: true, + cancelable: false + }); + } catch (ex) { + //this is for certain mobile browsers that have the Event object + //but don't support the Event constructor + change = document.createEvent('HTMLEvents'); + change.initEvent('change', false, true); + } finally { + element.dispatchEvent(change); + } + } else if ('createEvent' in document) { + // older browsers + change = document.createEvent('HTMLEvents'); + change.initEvent('change', false, true); + element.dispatchEvent(change); + } + else if (element.fireEvent) { + // IE <= 11 + element.fireEvent('onchange'); + } + } + + function mouseDownUpHandler(e) { + if (e.type === 'mousedown') { + element.bind('mouseout', mouseoutHandler); + } else { + element.unbind('mouseout', mouseoutHandler); + } + } + + element.bind('mousedown mouseup', mouseDownUpHandler); + + function mouseoutHandler() { + oldSelectionLength = getSelectionLength(this); + element.unbind('mouseout', mouseoutHandler); + } + + function keydownHandler(e) { + var isKeyBackspace = e.which === 8, + caretPos = getCaretPosition(this) - 1 || 0, //value in keydown is pre change so bump caret position back to simulate post change + isCtrlZ = e.which === 90 && e.ctrlKey; //ctrl+z pressed + + if (isKeyBackspace) { + while(caretPos >= 0) { + if (isValidCaretPosition(caretPos)) { + //re-adjust the caret position. + //Increment to account for the initial decrement to simulate post change caret position + setCaretPosition(this, caretPos + 1); + break; + } + caretPos--; + } + preventBackspace = caretPos === -1; + } + + if (isCtrlZ) { + // prevent IE bug - value should be returned to initial state + element.val(''); + e.preventDefault(); + } + } + + function eventHandler(e) { + e = e || {}; + // Allows more efficient minification + var eventWhich = e.which, + eventType = e.type; + + // Prevent shift and ctrl from mucking with old values + if (eventWhich === 16 || eventWhich === 91) { + return; + } + + var val = element.val(), + valOld = oldValue, + valMasked, + valAltered = false, + valUnmasked = unmaskValue(val), + valUnmaskedOld = oldValueUnmasked, + caretPos = getCaretPosition(this) || 0, + caretPosOld = oldCaretPosition || 0, + caretPosDelta = caretPos - caretPosOld, + caretPosMin = maskCaretMap[0], + caretPosMax = maskCaretMap[valUnmasked.length] || maskCaretMap.slice().shift(), + selectionLenOld = oldSelectionLength || 0, + isSelected = getSelectionLength(this) > 0, + wasSelected = selectionLenOld > 0, + // Case: Typing a character to overwrite a selection + isAddition = (val.length > valOld.length) || (selectionLenOld && val.length > valOld.length - selectionLenOld), + // Case: Delete and backspace behave identically on a selection + isDeletion = (val.length < valOld.length) || (selectionLenOld && val.length === valOld.length - selectionLenOld), + isSelection = (eventWhich >= 37 && eventWhich <= 40) && e.shiftKey, // Arrow key codes + + isKeyLeftArrow = eventWhich === 37, + // Necessary due to "input" event not providing a key code + isKeyBackspace = eventWhich === 8 || (eventType !== 'keyup' && isDeletion && (caretPosDelta === -1)), + isKeyDelete = eventWhich === 46 || (eventType !== 'keyup' && isDeletion && (caretPosDelta === 0) && !wasSelected), + // Handles cases where caret is moved and placed in front of invalid maskCaretMap position. Logic below + // ensures that, on click or leftward caret placement, caret is moved leftward until directly right of + // non-mask character. Also applied to click since users are (arguably) more likely to backspace + // a character when clicking within a filled input. + caretBumpBack = (isKeyLeftArrow || isKeyBackspace || eventType === 'click') && caretPos > caretPosMin; + + oldSelectionLength = getSelectionLength(this); + + // These events don't require any action + if (isSelection || (isSelected && (eventType === 'click' || eventType === 'keyup' || eventType === 'focus'))) { + return; + } + + if (isKeyBackspace && preventBackspace) { + element.val(maskPlaceholder); + // This shouldn't be needed but for some reason after aggressive backspacing the ctrl $viewValue is incorrect. + // This keeps the $viewValue updated and correct. + scope.$apply(function () { + ctrl.$setViewValue(''); // $setViewValue should be run in angular context, otherwise the changes will be invisible to angular and user code. + }); + setCaretPosition(this, caretPosOld); + return; + } + + // User attempted to delete but raw value was unaffected--correct this grievous offense + if ((eventType === 'input') && isDeletion && !wasSelected && valUnmasked === valUnmaskedOld) { + while (isKeyBackspace && caretPos > caretPosMin && !isValidCaretPosition(caretPos)) { + caretPos--; + } + while (isKeyDelete && caretPos < caretPosMax && maskCaretMap.indexOf(caretPos) === -1) { + caretPos++; + } + var charIndex = maskCaretMap.indexOf(caretPos); + // Strip out non-mask character that user would have deleted if mask hadn't been in the way. + valUnmasked = valUnmasked.substring(0, charIndex) + valUnmasked.substring(charIndex + 1); + + // If value has not changed, don't want to call $setViewValue, may be caused by IE raising input event due to placeholder + if (valUnmasked !== valUnmaskedOld) + valAltered = true; + } + + // Update values + valMasked = maskValue(valUnmasked); + + oldValue = valMasked; + oldValueUnmasked = valUnmasked; + + //additional check to fix the problem where the viewValue is out of sync with the value of the element. + //better fix for commit 2a83b5fb8312e71d220a497545f999fc82503bd9 (I think) + if (!valAltered && val.length > valMasked.length) + valAltered = true; + + element.val(valMasked); + + //we need this check. What could happen if you don't have it is that you'll set the model value without the user + //actually doing anything. Meaning, things like pristine and touched will be set. + if (valAltered) { + scope.$apply(function () { + ctrl.$setViewValue(valMasked); // $setViewValue should be run in angular context, otherwise the changes will be invisible to angular and user code. + }); + } + + // Caret Repositioning + // Ensure that typing always places caret ahead of typed character in cases where the first char of + // the input is a mask char and the caret is placed at the 0 position. + if (isAddition && (caretPos <= caretPosMin)) { + caretPos = caretPosMin + 1; + } + + if (caretBumpBack) { + caretPos--; + } + + // Make sure caret is within min and max position limits + caretPos = caretPos > caretPosMax ? caretPosMax : caretPos < caretPosMin ? caretPosMin : caretPos; + + // Scoot the caret back or forth until it's in a non-mask position and within min/max position limits + while (!isValidCaretPosition(caretPos) && caretPos > caretPosMin && caretPos < caretPosMax) { + caretPos += caretBumpBack ? -1 : 1; + } + + if ((caretBumpBack && caretPos < caretPosMax) || (isAddition && !isValidCaretPosition(caretPosOld))) { + caretPos++; + } + oldCaretPosition = caretPos; + setCaretPosition(this, caretPos); + } + + function isValidCaretPosition(pos) { + return maskCaretMap.indexOf(pos) > -1; + } + + function getCaretPosition(input) { + if (!input) + return 0; + if (input.selectionStart !== undefined) { + return input.selectionStart; + } else if (document.selection) { + if (isFocused(element[0])) { + // For IE + input.focus(); + var selection = document.selection.createRange(); + selection.moveStart('character', input.value ? -input.value.length : 0); + return selection.text.length; + } + } + return 0; + } + + function setCaretPosition(input, pos) { + if (!input) + return 0; + if (input.offsetWidth === 0 || input.offsetHeight === 0) { + return; // Input's hidden + } + if (input.setSelectionRange) { + if (isFocused(element[0])) { + input.focus(); + input.setSelectionRange(pos, pos); + } + } + else if (input.createTextRange) { + // For IE + var range = input.createTextRange(); + range.collapse(true); + range.moveEnd('character', pos); + range.moveStart('character', pos); + range.select(); + } + } + + function getSelectionLength(input) { + if (!input) + return 0; + if (input.selectionStart !== undefined) { + return (input.selectionEnd - input.selectionStart); + } + if (window.getSelection) { + return (window.getSelection().toString().length); + } + if (document.selection) { + return (document.selection.createRange().text.length); + } + return 0; + } + } + }; +}]) .filter('b2bMultiSepartorHighlight', function($sce) { return function(text, searchText, searchSeperator) { var splitText = function(string) { @@ -21052,10 +21967,20 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js .factory('b2bUserAgent', [function() { var _isMobile = function() { - return /Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent); + if(/Android/i.test(navigator.userAgent)){ + return /Mobile/i.test(navigator.userAgent); + }else{ + return /Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent); + } + }; var _notMobile = function() { - return !/Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent); + if(/Android/i.test(navigator.userAgent)){ + return !/Mobile/i.test(navigator.userAgent); + }else{ + return !/Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent); + } + }; var _isIE = function() { return /msie|trident/i.test(navigator.userAgent); @@ -21064,7 +21989,7 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js return /Firefox/.test(navigator.userAgent); }; var _isChrome = function() { - return /Google Inc/.test(navigator.vendor); + return /Chrome/.test(navigator.userAgent); }; var _isSafari = function() { return /Safari/.test(navigator.userAgent) && !/Chrome/.test(navigator.userAgent); @@ -21164,56 +22089,56 @@ https://github.com/cwilso/AudioRecorder/blob/master/js/recorderjs/recorder.js angular.module("b2bTemplate/audioPlayer/audioPlayer.html", []).run(["$templateCache", function($templateCache) { $templateCache.put("b2bTemplate/audioPlayer/audioPlayer.html", "<div class=\"b2b-audio\">\n" + - " <audio preload=\"auto\">\n" + - " <source ng-src=\"{{audio.mp3 | trustedAudioUrl}}\" type=\"audio/mp3\"></source>\n" + - " <i>Your browser does not support the audio element.</i>\n" + + " <audio preload=\"auto\">\n" + + " <source ng-src=\"{{audio.mp3 | trustedAudioUrl}}\" type=\"audio/mp3\"></source>\n" + + " <i>Your browser does not support the audio element.</i>\n" + " </audio>\n" + "\n" + " <div audio-play-pause-icon class=\"controls-wrapper\" ng-click=\"toggleAudio()\" tabindex=\"0\" b2b-accessibility-click=\"13,32\" role=\"button\" aria-label=\"{{isPlayInProgress?'pause':'play'}}\">\n" + - " <i class=\"icoControls-pointer\" ng-show='!isPlayInProgress'></i>\n" + - " <i class=\"icoControls-pause\" ng-show='isPlayInProgress'></i>\n" + + " <i class=\"icoControls-pointer\" ng-show='!isPlayInProgress'></i>\n" + + " <i class=\"icoControls-pause\" ng-show='isPlayInProgress'></i>\n" + " </div>\n" + "\n" + " <div class=\"seek-bar-container-wrapper\">\n" + - " <b2b-seek-bar min=\"0\" max=\"{{audio.duration}}\" step=\"1\" skip-interval=\"{{audio.timeShiftInSeconds}}\" no-aria-label ng-model=\"audio.currentTime\" on-drag-init=\"isAudioDragging=true\" on-drag-end=\"setAudioPosition(audio.currentTime)\"></b2b-seek-bar>\n" + - " <div class=\"timing-container\">\n" + - " <span class=\"timing-container-left\">{{timeFormatter(audio.currentTime)}}</span>\n" + - " <span class=\"timing-container-right\">{{timeFormatter(audio.duration)}}</span>\n" + - " <div class=\"timing-container-spacer\"></div>\n" + - " </div>\n" + + " <b2b-seek-bar min=\"0\" max=\"{{audio.duration}}\" step=\"1\" skip-interval=\"{{audio.timeShiftInSeconds}}\" no-aria-label ng-model=\"audio.currentTime\" on-drag-init=\"isAudioDragging=true\" on-drag-end=\"setAudioPosition(audio.currentTime)\"></b2b-seek-bar>\n" + + " <div class=\"timing-container\">\n" + + " <span class=\"timing-container-left\">{{timeFormatter(audio.currentTime)}}</span>\n" + + " <span class=\"timing-container-right\">{{timeFormatter(audio.duration)}}</span>\n" + + " <div class=\"timing-container-spacer\"></div>\n" + + " </div>\n" + " </div>\n" + - " \n" + + " \n" + " <b2b-flyout>\n" + - " <div tabindex=\"0\" b2b-accessibility-click=\"13,32\" role=\"button\" aria-label=\"Volume pop-over. Volume set at {{audio.currentVolume}}%\" class=\"controls-wrapper audio-volume-control\" b2b-flyout-toggler>\n" + - " <i class=\"icoControls-mutespeakers\" ng-show=\"audio.currentVolume === 0\"></i>\n" + - " <i class=\"icoControls-volumedown\" ng-show=\"audio.currentVolume > 0 && audio.currentVolume <= 50\"></i>\n" + - " <i class=\"icoControls-volumeup\" ng-show=\"audio.currentVolume > 50\"></i>\n" + - " </div> \n" + - " \n" + - " <b2b-flyout-content horizontal-placement=\"center\" flyout-style=\"width:70px; height:190px;\" vertical-placement=\"above\">\n" + - " <div class=\"b2b-audio-popover text-center\">\n" + - " <span>Max</span>\n" + - " <b2b-seek-bar min=\"0\" max=\"100\" step=\"1\" skip-interval=\"10\" vertical data-ng-model=\"audio.currentVolume\" class='volume-popover'></b2b-seek-bar>\n" + - " <div class=\"min-label\">Min</div>\n" + - " </div>\n" + - " </b2b-flyout-content>\n" + - " </b2b-flyout>\n" + + " <div tabindex=\"0\" b2b-accessibility-click=\"13,32\" role=\"button\" aria-label=\"Volume pop-over. Volume set at {{audio.currentVolume}}%\" class=\"controls-wrapper audio-volume-control\" b2b-flyout-toggler>\n" + + " <i class=\"icoControls-mutespeakers\" ng-show=\"audio.currentVolume === 0\"></i>\n" + + " <i class=\"icoControls-volumedown\" ng-show=\"audio.currentVolume > 0 && audio.currentVolume <= 50\"></i>\n" + + " <i class=\"icoControls-volumeup\" ng-show=\"audio.currentVolume > 50\"></i>\n" + + " </div> \n" + + " \n" + + " <b2b-flyout-content horizontal-placement=\"center\" flyout-style=\"width:70px; height:190px;\" vertical-placement=\"above\">\n" + + " <div class=\"b2b-audio-popover text-center\">\n" + + " <span>Max</span>\n" + + " <b2b-seek-bar min=\"0\" max=\"100\" step=\"1\" skip-interval=\"10\" vertical data-ng-model=\"audio.currentVolume\" class='volume-popover'></b2b-seek-bar>\n" + + " <div class=\"min-label\">Min</div>\n" + + " </div>\n" + + " </b2b-flyout-content>\n" + + " </b2b-flyout>\n" + "</div>"); }]); angular.module("b2bTemplate/audioRecorder/audioRecorder.html", []).run(["$templateCache", function($templateCache) { $templateCache.put("b2bTemplate/audioRecorder/audioRecorder.html", "<div class=\"b2b-audio-recorder row\">\n" + - " <div class=\"b2b-elapsed-time span11\">\n" + - " <div ng-if=\"isRecording\">\n" + - " <span style=\"padding-right: 25px;\">{{config.whileRecordingMessage}}</span>\n" + - " <span>{{timeFormatter(elapsedTime)}}</span>\n" + - " </div>\n" + - " <span ng-if=\"!isRecording\">{{config.startRecordingMessage}}</span>\n" + - " </div> \n" + - " <div class=\"b2b-controls\" title=\"{{isRecording ? 'Stop' : 'REC'}}\" b2b-accessibility-click=\"13,32\" ng-click=\"toggleRecording()\" role=\"button\">\n" + - " <i ng-if=\"isRecording\" class=\"icoControls-stop\" ></i>\n" + - " <i ng-if=\"!isRecording\" class=\"icoControls-record\"></i>\n" + + " <div class=\"b2b-elapsed-time span11\">\n" + + " <div ng-if=\"isRecording\">\n" + + " <span style=\"padding-right: 25px;\">{{config.whileRecordingMessage}}</span>\n" + + " <span>{{timeFormatter(elapsedTime)}}</span>\n" + + " </div>\n" + + " <span ng-if=\"!isRecording\">{{config.startRecordingMessage}}</span>\n" + + " </div> \n" + + " <div class=\"b2b-controls\" title=\"{{isRecording ? 'Stop' : 'REC'}}\" b2b-accessibility-click=\"13,32\" ng-click=\"toggleRecording()\" role=\"button\">\n" + + " <i ng-if=\"isRecording\" class=\"icoControls-stop\" ></i>\n" + + " <i ng-if=\"!isRecording\" class=\"icoControls-record\"></i>\n" + " </div>\n" + "</div>"); }]); @@ -21249,26 +22174,26 @@ angular.module("b2bTemplate/boardstrip/b2bBoard.html", []).run(["$templateCache" angular.module("b2bTemplate/boardstrip/b2bBoardstrip.html", []).run(["$templateCache", function($templateCache) { $templateCache.put("b2bTemplate/boardstrip/b2bBoardstrip.html", "<div class=\"b2b-boardstrip\">\n" + - " <div class=\"boardstrip-reel\" role=\"menu\">\n" + - " <div class=\"prev-items\">\n" + - " <!-- <i tabindex=\"{{isPrevBoard() ? 0 : -1}}\" ng-class=\"{'disabled': !isPrevBoard()}\" role=\"menuitem\" aria-label=\"See previous boards\" b2b-accessibility-click=\"13,32\" ng-click=\"prevBoard()\" class=\"arrow icoControls-left\"></i> -->\n" + - " <button class=\"btn-arrow arrow\" b2b-accessibility-click=\"13,32\" ng-click=\"prevBoard()\" ng-disabled=\"!isPrevBoard()\">\n" + - " <div class=\"btn btn-small btn-alt\"><i class=\"icon-primary-left\"></i>\n" + - " </div>\n" + - " <span class=\"offscreen-text\">Previous boards</span>\n" + - " </button>\n" + - " </div>\n" + - " <div b2b-add-board on-add-board=\"onAddBoard()\"></div>\n" + - " <div class=\"board-viewport\"><ul role=\"menu\" class=\"boardstrip-container\" ng-transclude></ul></div>\n" + - " <div class=\"next-items\">\n" + - " <!-- <i tabindex=\"{{isNextBoard() ? 0 : -1}}\" ng-class=\"{'disabled': !isNextBoard()}\" role=\"menuitem\" aria-label=\"See next boards\" b2b-accessibility-click=\"13,32\" ng-click=\"nextBoard()\" class=\"arrow icoControls-right\"></i> -->\n" + - " <button class=\"btn-arrow arrow\" b2b-accessibility-click=\"13,32\" ng-click=\"nextBoard()\" ng-disabled=\"!isNextBoard()\">\n" + - " <div class=\"btn btn-small btn-alt\"><i class=\"icon-primary-right\"></i>\n" + - " </div>\n" + - " <span class=\"offscreen-text\">Next boards</span>\n" + - " </button>\n" + - " </div>\n" + - " </div>\n" + + " <div class=\"boardstrip-reel\" role=\"menu\">\n" + + " <div class=\"prev-items\">\n" + + " <!-- <i tabindex=\"{{isPrevBoard() ? 0 : -1}}\" ng-class=\"{'disabled': !isPrevBoard()}\" role=\"menuitem\" aria-label=\"See previous boards\" b2b-accessibility-click=\"13,32\" ng-click=\"prevBoard()\" class=\"arrow icoControls-left\"></i> -->\n" + + " <button class=\"btn-arrow arrow\" b2b-accessibility-click=\"13,32\" ng-click=\"prevBoard()\" ng-disabled=\"!isPrevBoard()\">\n" + + " <div class=\"btn btn-small btn-alt\"><i class=\"icon-primary-left\"></i>\n" + + " </div>\n" + + " <span class=\"offscreen-text\">Previous boards</span>\n" + + " </button>\n" + + " </div>\n" + + " <div b2b-add-board on-add-board=\"onAddBoard()\"></div>\n" + + " <div class=\"board-viewport\"><ul role=\"menu\" class=\"boardstrip-container\" ng-transclude></ul></div>\n" + + " <div class=\"next-items\">\n" + + " <!-- <i tabindex=\"{{isNextBoard() ? 0 : -1}}\" ng-class=\"{'disabled': !isNextBoard()}\" role=\"menuitem\" aria-label=\"See next boards\" b2b-accessibility-click=\"13,32\" ng-click=\"nextBoard()\" class=\"arrow icoControls-right\"></i> -->\n" + + " <button class=\"btn-arrow arrow\" b2b-accessibility-click=\"13,32\" ng-click=\"nextBoard()\" ng-disabled=\"!isNextBoard()\">\n" + + " <div class=\"btn btn-small btn-alt\"><i class=\"icon-primary-right\"></i>\n" + + " </div>\n" + + " <span class=\"offscreen-text\">Next boards</span>\n" + + " </button>\n" + + " </div>\n" + + " </div>\n" + "</div>\n" + ""); }]); @@ -21281,9 +22206,9 @@ angular.module("b2bTemplate/calendar/datepicker-popup.html", []).run(["$template " <table class=\"table-condensed\">\n" + " <thead>\n" + " <tr>\n" + - " <th id=\"prev\" class=\"prev\" tabindex=\"0\" b2b-accessibility-click=\"13\" aria-label=\"Previous Month\" role=\"button\" b2b-element-focus=\"!disablePrev && getFocus\" ng-style=\"{visibility: visibilityPrev}\" ng-click=\"!disablePrev && move(-1,$event)\"><i class=\"icon-primary-left\" aria-hidden=\"true\"></i></th>\n" + + " <th id=\"prev\" class=\"prev\" tabindex=\"0\" b2b-accessibility-click=\"13,32\" aria-label=\"Previous Month\" role=\"button\" b2b-element-focus=\"!disablePrev && getFocus\" ng-style=\"{visibility: visibilityPrev}\" ng-click=\"!disablePrev && move(-1,$event)\"><i class=\"icon-primary-left\" aria-hidden=\"true\"></i></th>\n" + " <th id=\"month\" tabindex=\"-1\" aria-label=\"{{title}}\" class=\"datepicker-switch\" colspan=\"{{rows[0].length - 2}}\">{{title}}</th>\n" + - " <th id=\"next\" class=\"next\" tabindex=\"0\" b2b-accessibility-click=\"13\" b2b-element-focus=\"disablePrev && getFocus\" aria-label=\"Next Month\" role=\"button\" ng-style=\"{visibility: visibilityNext}\" ng-click=\"!disableNext && move(1,$event)\"><i class=\"icon-primary-right\" aria-hidden=\"true\"></i></th>\n" + + " <th id=\"next\" class=\"next\" tabindex=\"0\" b2b-accessibility-click=\"13,32\" b2b-element-focus=\"disablePrev && getFocus\" aria-label=\"Next Month\" role=\"button\" ng-style=\"{visibility: visibilityNext}\" ng-click=\"!disableNext && move(1,$event)\"><i class=\"icon-primary-right\" aria-hidden=\"true\"></i></th>\n" + " </tr>\n" + " <tr ng-show=\"labels.length > 0\">\n" + " <th id=\"{{label.post}}\" class=\"dow\" ng-repeat=\"label in labels\" aria-hidden=\"true\"><span aria-hidden=\"true\">{{label.pre}}</span></th>\n" + @@ -21315,29 +22240,29 @@ angular.module("b2bTemplate/calendar/datepicker.html", []).run(["$templateCache" angular.module("b2bTemplate/coachmark/coachmark.html", []).run(["$templateCache", function($templateCache) { $templateCache.put("b2bTemplate/coachmark/coachmark.html", "<div class=\"b2b-coachmark-container\" tabindex=\"-1\" role=\"dialog\" aria-label=\"{{currentCoachmark.contentHeader}} {{currentCoachmark.content}} {{currentCoachmark.offscreenText}}\" ng-style=\"{'top':coackmarkElPos.top,'left':coackmarkElPos.left}\" aria-describeby=\"{{currentCoachmark}}\">\n" + - " <i class=\"b2b-coachmark-caret\"></i>\n" + - " <div class=\"b2b-coachmark-header\">\n" + - " <div class=\"b2b-coachmark-countlabel\"><span ng-if=\"coachmarkIndex !== 0\">{{coachmarkIndex}} of {{(coachmarks.length-1)}}<span></div>\n" + - " <div class=\"corner-button\">\n" + - " <button type=\"button\" ng-focus=\"closeButtonFocus()\" class=\"close\" title=\"close\" aria-label=\"Close\" ng-click=\"closeCoachmark()\"></button>\n" + - " </div>\n" + - " </div>\n" + - " <div class=\"b2b-coachmark-content\"> \n" + - " <i class=\"icon-misc-dimmer\"></i>\n" + - " <div class=\"b2b-coachmark-content-header\"><span class=\"offscreen-text\">{{currentCoachmark.offscreenText}}</span>{{currentCoachmark.contentHeader}}</div>\n" + - " <div class=\"b2b-coachmark-description\">{{currentCoachmark.content}}</div>\n" + - " <div class=\"b2b-coachmark-btn-group\">\n" + - " <a class=\"b2b-coachmark-link\" href=\"javascript:void(0)\" ng-if=\"currentCoachmark.linkLabel !== '' && currentCoachmark.linkLabel !== undefined\" ng-click=\"actionCoachmark(currentCoachmark.linkLabel)\">{{currentCoachmark.linkLabel}}</a>\n" + - " <button class=\"btn btn-alt\" ng-if=\"currentCoachmark.buttonLabel !== '' && currentCoachmark.buttonLabel !== undefined\" ng-click=\"actionCoachmark(currentCoachmark.buttonLabel)\">{{currentCoachmark.buttonLabel}}</button>\n" + - " </div> \n" + - " </div> \n" + + " <i class=\"b2b-coachmark-caret\"></i>\n" + + " <div class=\"b2b-coachmark-header\">\n" + + " <div class=\"b2b-coachmark-countlabel\"><span ng-if=\"coachmarkIndex !== 0\">{{coachmarkIndex}} of {{(coachmarks.length-1)}}<span></div>\n" + + " <div class=\"corner-button\">\n" + + " <button type=\"button\" ng-focus=\"closeButtonFocus()\" class=\"close\" title=\"close\" aria-label=\"Close\" ng-click=\"closeCoachmark()\"></button>\n" + + " </div>\n" + + " </div>\n" + + " <div class=\"b2b-coachmark-content\"> \n" + + " <i class=\"icon-misc-dimmer\"></i>\n" + + " <div class=\"b2b-coachmark-content-header\"><span class=\"offscreen-text\">{{currentCoachmark.offscreenText}}</span>{{currentCoachmark.contentHeader}}</div>\n" + + " <div class=\"b2b-coachmark-description\">{{currentCoachmark.content}}</div>\n" + + " <div class=\"b2b-coachmark-btn-group\">\n" + + " <a class=\"b2b-coachmark-link\" href=\"javascript:void(0)\" ng-if=\"currentCoachmark.linkLabel !== '' && currentCoachmark.linkLabel !== undefined\" ng-click=\"actionCoachmark(currentCoachmark.linkLabel)\">{{currentCoachmark.linkLabel}}</a>\n" + + " <button class=\"btn btn-alt\" ng-if=\"currentCoachmark.buttonLabel !== '' && currentCoachmark.buttonLabel !== undefined\" ng-click=\"actionCoachmark(currentCoachmark.buttonLabel)\">{{currentCoachmark.buttonLabel}}</button>\n" + + " </div> \n" + + " </div> \n" + "</div>"); }]); angular.module("b2bTemplate/dropdowns/b2bDropdownDesktop.html", []).run(["$templateCache", function($templateCache) { $templateCache.put("b2bTemplate/dropdowns/b2bDropdownDesktop.html", "<span b2b-key prev=\"38\" next=\"40\" enable-search ng-class=\"{'large': (dropdownSize === 'large'), 'disabled': (disabled), 'selectWrap': (isInputDropdown), 'selectorModule': (dropdownType === 'menu'), 'linkSelectorModule': (dropdownType === 'link-menu')}\">\n" + - " <input b2b-dropdown-toggle b2b-dropdown-validation ng-disabled=\"disabled\" type=\"text\" id=\"{{dropdownId}}\" name=\"{{dropdownName}}\" class=\"awd-select isWrapped\" ng-required=\"dropdownRequired\" ng-model=\"currentSelected.text\" role=\"combobox\" aria-owns=\"listbox{{$id}}\" aria-expanded=\"{{toggleFlag}}\" ng-click=\"toggleDropdown()\" ng-focus=\"focused=true\" ng-blur=\"setBlur(); focused=false\" ng-class=\"{'active': toggleFlag, 'closed': !toggleFlag, 'large': (dropdownSize === 'large'), 'focused':focused}\" style=\"width:100%;\" value=\"{{currentSelected.text}}\" ng-show=\"isInputDropdown\" aria-describedby=\"{{dropdownDescribedBy}}\" readonly=\"readonly\">\n" + + " <input b2b-dropdown-toggle b2b-dropdown-validation ng-disabled=\"disabled\" type=\"text\" id=\"{{dropdownId}}\" name=\"{{dropdownName}}\" class=\"awd-select isWrapped\" ng-required=\"dropdownRequired\" ng-model=\"currentSelected.text\" role=\"combobox\" aria-owns=\"listbox{{$id}}\" aria-expanded=\"{{toggleFlag}}\" ng-click=\"toggleDropdown()\" ng-blur=\"setBlur();\" ng-class=\"{'active': toggleFlag, 'closed': !toggleFlag, 'large': (dropdownSize === 'large')}\" style=\"width:100%;\" value=\"{{currentSelected.text}}\" ng-show=\"isInputDropdown\" aria-describedby=\"{{dropdownDescribedBy}}\" readonly=\"readonly\">\n" + " <button type=\"button\" b2b-dropdown-toggle ng-disabled=\"disabled\" class=\"selectModule\" aria-label=\"{{labelText}} {{currentSelected.label}}\" aria-expanded=\"{{toggleFlag}}\" aria-haspopup=\"true\" ng-click=\"toggleDropdown()\" ng-blur=\"setBlur()\" ng-class=\"{'active opened': toggleFlag, 'closed': !toggleFlag, 'large': (dropdownSize === 'large')}\" ng-bind-html=\"currentSelected.text\" ng-show=\"!isInputDropdown\"></button>\n" + " <div ng-class=\"{'selectWrapper': (isInputDropdown), 'moduleWrapper': (!isInputDropdown)}\">\n" + " <ul id=\"listbox{{$id}}\" role=\"{{isInputDropdown?'listbox':'menu'}}\" ng-class=\"{'awd-select-list': (isInputDropdown), 'awd-module-list': (!isInputDropdown)}\" tabindex=\"-1\" ng-show=\"toggleFlag\" aria-label=\"Choose options\"></ul>\n" + @@ -21348,7 +22273,7 @@ angular.module("b2bTemplate/dropdowns/b2bDropdownDesktop.html", []).run(["$templ " </ul>\n" + "</div>\n" + "<i class=\"icon-primary-down\" aria-hidden=\"true\"></i>\n" + - "</span> "); + "</span>"); }]); angular.module("b2bTemplate/dropdowns/b2bDropdownGroupDesktop.html", []).run(["$templateCache", function($templateCache) { @@ -21360,14 +22285,14 @@ angular.module("b2bTemplate/dropdowns/b2bDropdownGroupDesktop.html", []).run(["$ angular.module("b2bTemplate/dropdowns/b2bDropdownListDesktop.html", []).run(["$templateCache", function($templateCache) { $templateCache.put("b2bTemplate/dropdowns/b2bDropdownListDesktop.html", - "<li b2b-dropdown-list-desktop b2b-key-item b2b-accessibility-click=\"13\" aria-selected=\"{{currentSelected.value === dropdownListValue}}\" ng-class=\"{'awd-select-list-item': (isInputDropdown), 'module-list-item': (!isInputDropdown)}\" tabindex=\"0\" role=\"{{isInputDropdown?'option':'menuitem'}}\" ng-click=\"selectDropdownItem()\"></li>"); + "<li b2b-dropdown-list-desktop b2b-key-item b2b-accessibility-click=\"13\" aria-selected=\"{{currentSelected.value === dropdownListValue}}\" data-hover=\"{{dropdown.highlightedValue === dropdownListValue}}\" ng-class=\"{'awd-select-list-item': (isInputDropdown), 'module-list-item': (!isInputDropdown)}\" tabindex=\"0\" role=\"{{isInputDropdown?'option':'menuitem'}}\" ng-click=\"selectDropdownItem()\" ng-focus=\"highlightDropdown()\"></li>"); }]); angular.module("b2bTemplate/fileUpload/fileUpload.html", []).run(["$templateCache", function($templateCache) { $templateCache.put("b2bTemplate/fileUpload/fileUpload.html", "<label class=\"b2b-file-container\">\n" + - " <span class=\"b2b-upload-link\" ng-transclude></span>\n" + - " <input type=\"file\" b2b-file-change>\n" + + " <span class=\"b2b-upload-link\" ng-transclude></span>\n" + + " <input type=\"file\" b2b-file-change>\n" + "</label>"); }]); @@ -21416,24 +22341,36 @@ angular.module("b2bTemplate/horizontalTable/horizontalTable.html", []).run(["$te $templateCache.put("b2bTemplate/horizontalTable/horizontalTable.html", "<div class=\"b2b-horizontal-table\">\n" + " <div class=\"b2b-horizontal-table-arrows row span12\">\n" + - " <div class=\"span4\">\n" + - " <button class=\"btn-arrow left\" type=\"button\" ng-click=\"moveViewportLeft()\" ddh-accessibility-click=\"13,32\" ng-disabled=\"disableLeft\"><div class=\"btn btn-alt\"><i class=\"icon-primary-left\"></i></div>Previous Set</button>\n" + + " <div class=\"span4 b2b-prev-link\">\n" + + " <a href=\"javascript:void(0)\" ng-click=\"moveViewportLeft()\" ddh-accessibility-click=\"13,32\" ng-if=\"!disableLeft\">Previous</a>\n" + + " <span ng-if=\"disableLeft\" class=\"b2b-disabled-text\">Previous</span>\n" + " </div>\n" + " \n" + " <span class=\"span5 b2b-horizontal-table-column-info\" aria-live=\"polite\" tabindex=\"-1\">\n" + - " Displaying {{getColumnSet()[0]}} - {{getColumnSet()[1]}} of {{numOfCols}} (total) columns\n" + + " Showing {{countDisplayText}} {{getColumnSet()[0]+1}}-{{getColumnSet()[1]+1}} of {{numOfCols}} columns\n" + " </span>\n" + + "\n" + + " <div ng-if=\"legendContent\" class=\"span2 b2b-horizontal-table-legend\">\n" + + " | <b2b-flyout>\n" + + " <div tabindex=\"0\" role=\"button\" aria-haspopup=\"true\" b2b-flyout-toggler b2b-accessibility-click=\"13,32\" aria-expanded=\"{{flyoutOpened ? 'true' : 'false'}}\">\n" + + " Legend\n" + + " <i class=\"icoControls-down\" role=\"img\"></i>\n" + + " </div>\n" + + " <b2b-flyout-content horizontal-placement=\"center\" vertical-placement=\"below\">\n" + + " <div ng-bind-html=\"legendContent\"></div>\n" + + " </b2b-flyout-content>\n" + + " </b2b-flyout>\n" + + " </div>\n" + " \n" + - " <div class=\"span3\">\n" + - " <button class=\"btn-arrow right\" ng-click=\"moveViewportRight()\" ddh-accessibility-click=\"13,32\" ng-disabled=\"disableRight\" type=\"button\">Next Set<div class=\"btn btn-alt\"><i class=\"icon-primary-right\"></i></div></button>\n" + - " </div>\n" + + " <div class=\"span3 text-right b2b-next-link\">\n" + + " <a href=\"javascript:void(0)\" ng-click=\"moveViewportRight()\" ddh-accessibility-click=\"13,32\" ng-if=\"!disableRight\">Next</a>\n" + + " <span ng-if=\"disableRight\" class=\"b2b-disabled-text\">Next</span>\n" + + " </div>\n" + " </div>\n" + " <div class=\"b2b-horizontal-table-inner-container\">\n" + " <span ng-transclude></span>\n" + " </div>\n" + - "</div>\n" + - "\n" + - ""); + "</div>"); }]); angular.module("b2bTemplate/hourPicker/b2bHourpicker.html", []).run(["$templateCache", function($templateCache) { @@ -21450,7 +22387,7 @@ angular.module("b2bTemplate/hourPicker/b2bHourpickerPanel.html", []).run(["$temp $templateCache.put("b2bTemplate/hourPicker/b2bHourpickerPanel.html", "<form name=\"{{'hourpickerForm' + $id}}\">\n" + " <div class=\"hp-checkbox\" role=\"group\">\n" + - " <label class=\"checkbox\" for=\"checkbox_{{dayOption.title}}_{{$id}}\" aria-label=\"{{dayOption.title}}\" ng-repeat=\"dayOption in hourpicker.dayOptions\">\n" + + " <label class=\"checkbox\" for=\"checkbox_{{dayOption.title}}_{{$id}}\" ng-repeat=\"dayOption in hourpicker.dayOptions\">\n" + " <input type=\"checkbox\" id=\"checkbox_{{dayOption.title}}_{{$id}}\" name=\"{{'hourpickerDays' + $id}}\" ng-model=\"hourpickerPanelValue.days[$index].value\" ng-disabled=\"dayOption.disabled\" /><i class=\"skin\"></i><span>{{dayOption.label}}</span>\n" + " </label>\n" + " </div>\n" + @@ -21504,8 +22441,8 @@ angular.module("b2bTemplate/hourPicker/b2bHourpickerValue.html", []).run(["$temp "<div class=\"selected-days\">\n" + " <span class=\"day\">{{hourpickerValue.days}} {{hourpickerValue.startTime}} {{hourpickerValue.startMeridiem}} - {{hourpickerValue.endTime}} {{hourpickerValue.endMeridiem}}</span>\n" + " <span style=\"float:right\">\n" + - " <i class=\"icon-misc-pen\" role=\"button\" title=\"Edit {{hourpickerValue.days}} {{hourpickerValue.startTime}} {{hourpickerValue.startMeridiem}} - {{hourpickerValue.endTime}} {{hourpickerValue.endMeridiem}}\" tabindex=\"0\" b2b-accessibility-click=\"13,32\" ng-click=\"editHourpickerValue(hourpickerValue.index)\"></i>\n" + - " <i class=\"icon-misc-trash\" role=\"button\" title=\"Delete {{hourpickerValue.days}} {{hourpickerValue.startTime}} {{hourpickerValue.startMeridiem}} - {{hourpickerValue.endTime}} {{hourpickerValue.endMeridiem}}\" tabindex=\"0\" b2b-accessibility-click=\"13,32\" ng-click=\"deleteHourpickerValue(hourpickerValue.index)\"></i>\n" + + " <i class=\"icon-misc-pen\" role=\"button\" aria-label=\"Edit {{hourpickerValue.days}} {{hourpickerValue.startTime}} {{hourpickerValue.startMeridiem}} - {{hourpickerValue.endTime}} {{hourpickerValue.endMeridiem}}\" title=\"Edit\" tabindex=\"0\" b2b-accessibility-click=\"13,32\" ng-click=\"editHourpickerValue(hourpickerValue.index)\"></i>\n" + + " <i class=\"icon-misc-trash\" role=\"button\" aria-label=\"Delete {{hourpickerValue.days}} {{hourpickerValue.startTime}} {{hourpickerValue.startMeridiem}} - {{hourpickerValue.endTime}} {{hourpickerValue.endMeridiem}}\" title=\"Delete\" tabindex=\"0\" b2b-accessibility-click=\"13,32\" ng-click=\"deleteHourpickerValue(hourpickerValue.index)\"></i>\n" + " </span>\n" + " <div style=\"clear:both\"></div>\n" + "</div>"); @@ -21513,26 +22450,13 @@ angular.module("b2bTemplate/hourPicker/b2bHourpickerValue.html", []).run(["$temp angular.module("b2bTemplate/leftNavigation/leftNavigation.html", []).run(["$templateCache", function($templateCache) { $templateCache.put("b2bTemplate/leftNavigation/leftNavigation.html", - "<div class=\"b2b-nav-menu\" ng-init=\"(showmenu = true)\" ng-class=\"{false: 'left-menu-collapsed'}[showmenu]\">\n" + + "<div class=\"b2b-nav-menu\">\n" + " <div class=\"b2b-subnav-container\">\n" + " <ul class=\"b2b-subnav-content\">\n" + - " <li>" + - " <div ng-class=\"{true: 'leftmenu-arrow-expand', false: 'leftmenu-arrow-collapse'}[showmenu]\">"+ - " <a ng-click=\"toggleDrawer(showmenu);(showmenu = !showmenu) \" class=\"text-right\">" + - " <i ng-class=\"{true: 'icon-controls-left', false: 'icon-controls-right'}[showmenu]\"> </i></a>" + - " </div>"+ - " </li>" + - " <li ng-repeat=\"menu in menuData\" ui-sref=\"{{menu.state}}\">" + - " <span ng-class=\"{true: 'menu-icon', false: 'menu-icon-collapse'}[showmenu]\"><span class=\"{{menu.imageSrc}}\"></span> </span>" + - " <a ng-class=\"{expand: isOpen($index)}\" ng-if=\"showmenu\" aria-label=\"{{menu.name}}\" title=\" \" aria-expanded=\"{{(idx==$index)?true:false;}}\" href=\"javascript:void(0);\">" + - " {{menu.name}}" + - " <i aria-hidden=\"true\" ng-if=\"(menu.menuItems.length > 0)\" class=\"b2b-icon-primary-plus-minus\"ng-class=\"idx==$index ? 'icon-primary-expanded' : 'icon-primary-collapsed'\"></i>" + - " </a>\n" + - " <div role=\"region\" aria-hidden=\"{{(isOpen($index))?false:true;}}\">\n" + - " <ul ng-class=\"{expand: idx==$index}\">\n" + - " <li ng-repeat=\"menuItem in menu.menuItems\" ng-click=\"liveLink($event, $index, $parent.$index)\"><a aria-hidden=\"{{!(idx==$parent.$index)}}\" aria-label=\"{{menuItem.name}}\" title=\" \" href=\"{{menuItem.href}}\" tabindex=\"{{(idx==$parent.$index)?0:-1;}}\" ng-class=\"{active: itemIdx==$index && navIdx==$parent.$index}\">{{menuItem.name}}</a></li>\n" + - " </ul>\n" + - " </div>\n" + + " <li ng-repeat=\"menu in menuData\" ng-click=\"toggleNav($index)\"><a ng-class=\"{'expand': idx==$index}\" aria-label=\"{{menu.name}}\" title=\" \" aria-expanded=\"{{(idx==$index)?true:false;}}\" href=\"javascript:void(0);\">{{menu.name}}<i class=\"b2b-icon-primary-plus-minus\" ng-class=\"idx==$index ? 'icon-primary-expanded' : 'icon-primary-collapsed'\"></i></a>\n" + + " <ul ng-class=\"{expand: idx==$index}\">\n" + + " <li ng-repeat=\"menuItem in menu.menuItems\" ng-click=\"liveLink($event, $index, $parent.$index)\"><a aria-hidden=\"{{!(idx==$parent.$index)}}\" aria-label=\"{{menuItem.name}}\" title=\" \" href=\"{{menuItem.href}}\" tabindex=\"{{(idx==$parent.$index)?0:-1;}}\" ng-class=\"{active: itemIdx==$index && navIdx==$parent.$index}\">{{menuItem.name}}</a></li>\n" + + " </ul>\n" + " </li>\n" + " </ul>\n" + " </div>\n" + @@ -21614,29 +22538,31 @@ angular.module("b2bTemplate/pagination/b2b-pagination.html", []).run(["$template $templateCache.put("b2bTemplate/pagination/b2b-pagination.html", "<div class=\"b2b-pager\">\n" + " <div ng-if=\"notMobile && totalPages > 1\">\n" + - " <a tabindex=\"{{currentPage <= 1 ? -1 : 0 }}\" class=\"b2b-pager__item--prev\" b2b-accessibility-click=\"13,32\" title=\"Previous Page\" ng-click=\"prev($event)\" ng-if=\"totalPages > 10\" ng-class=\"currentPage <= 1 ? 'b2b-pager__item--prev-disabled': '' \">\n" + + " <a tabindex=\"{{currentPage <= 1 ? -1 : 0 }}\" class=\"b2b-pager__item--prev\" b2b-accessibility-click=\"13,32\" title=\"Previous Page\" ng-click=\"prev($event)\" ng-if=\"totalPages > 10\" ng-class=\"currentPage <= 1 ? 'b2b-pager__item--prev-disabled': '' \">\n" + " <i class=\"icon-primary-left\"></i>\n" + " </a>\n" + - " <a tabindex=\"{{currentPage === 1 ? -1 : 0}}\" ng-class=\"{'b2b-pager__item--noclick': currentPage === 1}\" aria-selected=\"{{checkSelectedPage(page)}}\" class=\"b2b-pager__item b2b-pager__item--link\" title=\"Page 1{{checkSelectedPage(page) ? ' selected' : '' }}\" ng-if=\"totalPages > 10 && currentPage > 6\" b2b-accessibility-click=\"13,32\" ng-click=\"selectPage(1, $event)\">\n" + + " <a droppable=\"{{droppableAttribute}}\" tabindex=\"{{currentPage === 1 ? -1 : 0}}\" ng-class=\"{'b2b-pager__item--noclick': currentPage === 1}\" class=\"b2b-pager__item b2b-pager__item--link\" title=\"Page 1{{checkSelectedPage(page) ? ' selected' : '' }}\" ng-if=\"totalPages > 10 && currentPage > 6\" b2b-accessibility-click=\"13,32\" ng-click=\"selectPage(1, $event)\" aria-atomic=\"true\" aria-live=\"polite\">\n" + " 1<span class=\"offscreen-text\" ng-if=\"currentPage === 1\"> is selected</span>\n" + " </a>\n" + - " <a tabindex=\"{{currentPage === 2 ? -1 : 0}}\" aria-selected=\"{{checkSelectedPage(page)}}\" ng-class=\"{'b2b-pager__item--noclick': currentPage === 2}\" class=\"b2b-pager__item b2b-pager__item--link\" title=\"Page 2{{checkSelectedPage(page) ? ' selected' : '' }}\" ng-if=\"totalPages > 10 && currentPage > 6\" b2b-accessibility-click=\"13,32\" ng-click=\"selectPage(2, $event)\">2<span class=\"offscreen-text\" ng-if=\"currentPage === 2\"> is selected</span></a>\n" + "\n" + " <span class=\"b2b-pager__item\" ng-if=\"totalPages > 10 && currentPage > 6\">...</span>\n" + "\n" + - " <a tabindex=\"{{checkSelectedPage(page) ? -1 : 0}}\" href=\"javascript:void(0)\" class=\"b2b-pager__item b2b-pager__item--link\" title=\"Page {{page}}\" b2b-element-focus=\"isFocused(page)\" ng-repeat=\"page in pages\" ng-class=\"{'b2b-pager__item--active': checkSelectedPage(page), 'b2b-pager__item--noclick': checkSelectedPage(page)}\" b2b-accessibility-click=\"13,32\" ng-click=\"!checkSelectedPage(page) && selectPage(page, $event)\">{{page}}<span class=\"offscreen-text\" ng-if=\"currentPage === page\"> is selected</span></a>\n" + + " <a droppable=\"{{droppableAttribute}}\" tabindex=\"{{checkSelectedPage(page) ? -1 : 0}}\" href=\"javascript:void(0);\" class=\"b2b-pager__item b2b-pager__item--link\" title=\"Page {{page}}\" b2b-element-focus=\"isFocused(page)\" ng-repeat=\"page in pages\" ng-class=\"{'b2b-pager__item--active': checkSelectedPage(page), 'b2b-pager__item--noclick': checkSelectedPage(page),'b2b-pager__item--droppable': droppableAttribute == true}\" b2b-accessibility-click=\"13,32\" ng-click=\"!checkSelectedPage(page) && selectPage(page, $event)\" aria-atomic=\"true\" aria-live=\"polite\">\n" + + " {{page}}<span class=\"offscreen-text\" ng-if=\"checkSelectedPage(page)\"> is selected</span>\n" + + " </a>\n" + "\n" + - " <span class=\"b2b-pager__item\" ng-if=\"totalPages > 10 && currentPage <= totalPages - 5\">...</span>\n" + + " <span class=\"b2b-pager__item\" ng-if=\"totalPages > 10 && currentPage <= (totalPages - boundary)\">...</span>\n" + "\n" + - " <a tabindex=\"{{checkSelectedPage(page) ? -1 : 0}}\" href=\"javascript:void(0)\" ng-class=\"{'b2b-pager__item--noclick': checkSelectedPage(page)}\" aria-selected=\"{{checkSelectedPage(page)}}\" class=\"b2b-pager__item b2b-pager__item--link\" title=\"Page {{totalPages-1}}\" ng-if=\"totalPages > 10 && currentPage <= totalPages - 5\" b2b-accessibility-click=\"13,32\" ng-click=\"selectPage(totalPages-1, $event)\">{{totalPages-1}}<span class=\"offscreen-text\" ng-if=\"currentPage === totalPages-1\"> is selected</span></a>\n" + + " <a droppable=\"{{droppableAttribute}}\" tabindex=\"{{currentPage === totalPages ? -1 : 0}}\" href=\"javascript:void(0);\" ng-class=\"{'b2b-pager__item--noclick': currentPage === totalPages}\" class=\"b2b-pager__item b2b-pager__item--link\" title=\"Page {{totalPages}}\" ng-if=\"totalPages > 10 && currentPage <= (totalPages - boundary)\" b2b-accessibility-click=\"13,32\" ng-click=\"selectPage(totalPages, $event)\" aria-atomic=\"true\" aria-live=\"polite\">\n" + + " {{totalPages}}<span class=\"offscreen-text\" ng-if=\"checkSelectedPage(page)\"> is selected</span>\n" + + " </a>\n" + "\n" + - " <a tabindex=\"{{currentPage === totalPages ? -1 : 0}}\" href=\"javascript:void(0)\" ng-class=\"{'b2b-pager__item--noclick': currentPage === totalPages}\" aria-selected=\"{{checkSelectedPage(page)}}\" class=\"b2b-pager__item b2b-pager__item--link\" title=\"Page {{totalPages}}\" ng-if=\"totalPages > 10 && currentPage <= totalPages - 5\" b2b-accessibility-click=\"13,32\" ng-click=\"selectPage(totalPages, $event)\">{{totalPages}}<span class=\"offscreen-text\" ng-if=\"currentPage === totalPages\"> is selected</span></a>\n" + "\n" + - " <a tabindex=\"{{currentPage >= totalPages ? -1 : 0 }}\" href=\"javascript:void(0)\" class=\"b2b-pager__item--next\" b2b-accessibility-click=\"13,32\" title=\"Next Page\" ng-click=\"next($event)\" ng-if=\"totalPages > 10\" ng-class=\"currentPage >= totalPages ? 'b2b-pager__item--next-disabled' :'' \">\n" + + " <a tabindex=\"{{currentPage >= totalPages ? -1 : 0 }}\" href=\"javascript:void(0);\" class=\"b2b-pager__item--next\" b2b-accessibility-click=\"13,32\" title=\"Next Page\" ng-click=\"next($event)\" ng-if=\"totalPages > 10\" ng-class=\"currentPage >= totalPages ? 'b2b-pager__item--next-disabled' :'' \">\n" + " <i class=\"icon-primary-right\"></i>\n" + " </a>\n" + " \n" + - " <span class=\"fieldLabel\" ng-show=\"totalPages > 10 && showInput === true\"> \n" + + " <div class=\"fieldLabel b2b-go-to-page\" ng-class=\"{'b2b-go-to-page-inline' : inputClass !== undefined }\" ng-show=\"totalPages > 20\"> \n" + " <label for=\"{{inputId}}\">Go to Page:</label>\n" + " <input id=\"{{inputId}}\" class=\"b2b-pager__item--input\" type=\"number\" ng-blur=\"onfocusOut($event)\" ng-focus=\"onfocusIn($event)\" ng-keypress=\"gotoKeyClick($event)\" b2b-only-nums=\"4\" ng-model=\"$parent.gotoPage\" />\n" + " <button class=\"btn-arrow\" ng-click=\"gotoBtnClick()\" ng-disabled=\"$parent.gotoPage !== 0 || $parent.gotoPage !== undefined\" aria-label=\"Go to\">\n" + @@ -21644,10 +22570,10 @@ angular.module("b2bTemplate/pagination/b2b-pagination.html", []).run(["$template " <i class=\"icon-primary-right\"></i>\n" + " </div>\n" + " </button>\n" + - " </span>\n" + + " </div>\n" + " </div>\n" + " <div ng-if=\"isMobile && totalPages > 1\" ng-swipe-right=\"prev()\" ng-swipe-left=\"next()\" ng-class=\"isMobile ? 'b2b-mobile-view': '' \">\n" + - " <a tabindex=\"{{checkSelectedPage(page) ? -1 : 0}}\" href=\"javascript:void(0)\" class=\"b2b-pager__item b2b-pager__item--link\" title=\"Page {{page}}\" b2b-element-focus=\"isFocused(page)\" ng-repeat=\"page in pages\" ng-class=\"{'b2b-pager__item--active': checkSelectedPage(page), fade1: ($index == 0 && currentPage > meanVal+1), fade2: ($index == 1 && currentPage > meanVal+1), fadesl: ($index == pages.length-2 && currentPage < totalPages - meanVal), fadel: ($last && currentPage < totalPages - meanVal), 'b2b-pager__item--noclick': checkSelectedPage(page)}\" b2b-accessibility-click=\"13,32\" ng-click=\"selectPage(page, $event)\">{{page}}</a>\n" + + " <a droppable=\"{{droppableAttribute}}\" tabindex=\"{{checkSelectedPage(page) ? -1 : 0}}\" href=\"javascript:void(0);\" class=\"b2b-pager__item b2b-pager__item--link\" title=\"Page {{page}}\" b2b-element-focus=\"isFocused(page)\" ng-repeat=\"page in pages\" ng-class=\"{'b2b-pager__item--active': checkSelectedPage(page), fade1: ($index == 0 && currentPage > meanVal+1), fade2: ($index == 1 && currentPage > meanVal+1), fadesl: ($index == pages.length-2 && currentPage < totalPages - meanVal), fadel: ($last && currentPage < totalPages - meanVal), 'b2b-pager__item--noclick': checkSelectedPage(page)}\" b2b-accessibility-click=\"13,32\" ng-click=\"selectPage(page, $event)\">{{page}}</a>\n" + " </div>\n" + "</div>\n" + ""); @@ -21767,7 +22693,7 @@ angular.module("b2bTemplate/searchField/searchField.html", []).run(["$templateCa $templateCache.put("b2bTemplate/searchField/searchField.html", "<div class=\"search-bar\">\n" + " <div class='input-container' ng-blur=\"blurInput()\">\n" + - " <input type=\"text\" class=\"innershadow b2b-search-input-field\" id=\"{{configObj.labelId}}\" b2b-search-input ng-model=\"inputModel\" ng-disabled=\"disabled\" b2b-reset ng-keydown=\"selectionIndex($event)\" placeholder=\"{{configObj.ghostText}}\" style=\"width:100%\" maxlength=\"{{configObj.maxLength}}\" title=\"{{inputModel}}\" aria-label=\"{{inputModel.length>0?inputModel:configObj.ghostText}}\" aria-live=\"assertive\"/>\n" + + " <input type=\"text\" class=\"innershadow b2b-search-input-field\" id=\"{{configObj.labelId}}\" b2b-search-input ng-model=\"inputModel\" ng-disabled=\"disabled\" b2b-reset ng-keydown=\"selectionIndex($event)\" placeholder=\"{{configObj.ghostText}}\" style=\"width:100%\" maxlength=\"{{configObj.maxLength}}\" title=\"{{inputModel}}\" aria-label=\"{{inputModel.length>0?inputModel:configObj.ghostText}}\" />\n" + " <button class=\"btn-search\" ng-disabled=\"disabled\" ng-click=\"startSearch()\" b2b-accessibility-click=\"13,32\" aria-label=\"Search\" ng-focus=\"showListFlag = false\" type=\"button\"><i class=\"icoControls-magnifyingglass\"></i></button>\n" + " </div>\n" + " <div class=\"search-suggestion-wrapper\" ng-if=\"filterList.length >=0\" ng-show=\"showListFlag\">\n" + @@ -21819,34 +22745,34 @@ angular.module("b2bTemplate/spinButton/spinButton.html", []).run(["$templateCach angular.module("b2bTemplate/statusTracker/statusTracker.html", []).run(["$templateCache", function($templateCache) { $templateCache.put("b2bTemplate/statusTracker/statusTracker.html", "<div class=\"b2b-status-tracker row\">\n" + - " <button tabindex=\"0\" ng-disabled=\"currentViewIndex === 0\" ng-if=\"statuses.length > b2bStatusTrackerConfig.maxViewItems\" class=\"btn-arrow\" type=\"button\" aria-label=\"Previous status\" ng-click=\"previousStatus()\">\n" + - " <div class=\"btn btn-small btn-secondary\">\n" + - " <i class=\"icon-primary-left\"></i>\n" + - " </div>\n" + - " </button>\n" + - " <div ng-repeat=\"status in statuses\" class=\"b2b-status-tracker-step\" ng-class=\"{ 'complete' : status.complete, 'current' : currentStatus($index)}\" ng-show=\"isInViewport($index)\">\n" + - " <p class=\"b2b-status-tracker-heading\">{{status.heading}}</p>\n" + - " <div class=\"progress\">\n" + - " <div class=\"progress-bar\">\n" + - " <span class=\"hidden-spoken\">\n" + - " {{status.complete ? 'Complete' : 'Incomplete'}}\n" + - " </span>\n" + - " </div>\n" + - " </div>\n" + - " <div class=\"b2b-status-tracker-estimate\">\n" + - " <i ng-show=\"status.estimate !== '' && status.estimate !== undefined\" ng-class=\"status.complete ? 'icoControls-approval' : 'icon-misc-time'\"></i> {{status.complete ? 'Complete' : status.estimate}}\n" + - " \n" + - " </div>\n" + - " \n" + - " <div class=\"b2b-status-tracker-description\">\n" + - " {{status.description}}\n" + - " </div>\n" + - " </div>\n" + - " <button tabindex=\"0\" ng-disabled=\"currentViewIndex + b2bStatusTrackerConfig.maxViewItems === statuses.length\" ng-if=\"statuses.length > b2bStatusTrackerConfig.maxViewItems\" class=\"btn-arrow\" type=\"button\" aria-label=\"Next status\" ng-click=\"nextStatus()\">\n" + - " <div class=\"btn btn-small btn-secondary\">\n" + - " <i class=\"icon-primary-right\"></i>\n" + - " </div>\n" + - " </button>\n" + + " <button tabindex=\"0\" ng-disabled=\"currentViewIndex === 0\" ng-if=\"statuses.length > b2bStatusTrackerConfig.maxViewItems\" class=\"btn-arrow\" type=\"button\" aria-label=\"Previous status\" ng-click=\"previousStatus()\">\n" + + " <div class=\"btn btn-small btn-secondary\">\n" + + " <i class=\"icon-primary-left\"></i>\n" + + " </div>\n" + + " </button>\n" + + " <div ng-repeat=\"status in statuses\" class=\"b2b-status-tracker-step {{ status.state }}\" ng-show=\"isInViewport($index)\">\n" + + " <p class=\"b2b-status-tracker-heading\">{{status.heading}}</p>\n" + + " <div class=\"progress\">\n" + + " <div class=\"progress-bar\">\n" + + " <span class=\"hidden-spoken\">\n" + + " {{ removeCamelCase(status.state) }}\n" + + " </span>\n" + + " </div>\n" + + " </div>\n" + + " <div class=\"b2b-status-tracker-estimate {{status.state}}\">\n" + + " <i ng-show=\"status.estimate !== '' && status.estimate !== undefined\" ng-class=\"b2bStatusTrackerConfig.icons[status.state]\"></i>\n" + + " \n" + + " <span ng-bind-html=\"status.estimate\"></span>\n" + + " </div>\n" + + " \n" + + " <div class=\"b2b-status-tracker-description\" ng-bind-html=\"status.description\"> \n" + + " </div>\n" + + " </div>\n" + + " <button tabindex=\"0\" ng-disabled=\"currentViewIndex + b2bStatusTrackerConfig.maxViewItems === statuses.length\" ng-if=\"statuses.length > b2bStatusTrackerConfig.maxViewItems\" class=\"btn-arrow\" type=\"button\" aria-label=\"Next status\" ng-click=\"nextStatus()\">\n" + + " <div class=\"btn btn-small btn-secondary\">\n" + + " <i class=\"icon-primary-right\"></i>\n" + + " </div>\n" + + " </button>\n" + "</div>"); }]); @@ -21854,15 +22780,15 @@ angular.module("b2bTemplate/stepTracker/stepTracker.html", []).run(["$templateCa $templateCache.put("b2bTemplate/stepTracker/stepTracker.html", "<div class=\"b2b-step-tracker\">\n" + " <button class=\"btn-arrow b2b-left-arrow\" ng-click=\"previousStatus()\" ng-disabled=\"currentViewIndex === 0\" ng-if=\"stepsItemsObject.length > b2bStepTrackerConfig.maxViewItems\" aria-label=\"Previous step\">\n" + - " <div class=\"btn btn-left btn-small btn-secondary\"><i class=\"icon-primary-left\"></i></div>\n" + - " </button>\n" + + " <div class=\"btn btn-left btn-small btn-secondary\"><i class=\"icon-primary-left\"></i></div>\n" + + " </button>\n" + " <button class=\"btn-arrow b2b-right-arrow\" ng-click=\"nextStatus()\" ng-disabled=\"currentViewIndex + b2bStepTrackerConfig.maxViewItems === stepsItemsObject.length\" ng-if=\"stepsItemsObject.length > b2bStepTrackerConfig.maxViewItems\" aria-label=\"Next step\">\n" + - " <div class=\"btn btn-small btn-right btn-secondary\"><i class=\"icon-primary-right\"></i></div>\n" + - " </button>\n" + + " <div class=\"btn btn-small btn-right btn-secondary\"><i class=\"icon-primary-right\"></i></div>\n" + + " </button>\n" + " <ul class=\"b2b-steps\">\n" + " <li ng-class=\"{'b2b-step-done':$index < currentIndex - 1 ,'b2b-step-on':$index == currentIndex - 1}\" \n" + " ng-repeat=\"stepsItem in stepsItemsObject\" ng-show=\"isInViewport($index)\">\n" + - " <p class=\"b2b-step-text\" data-sm-text=\"{{stepsItem.dataMobile}}\" data-large-text=\"{{stepsItem.dataDesktop}}\">{{stepsItem.text}}</p>\n" + + " <p class=\"b2b-step-text\" data-sm-text=\"{{stepsItem.dataMobile}}\" data-large-text=\"{{stepsItem.dataDesktop}}\">{{stepsItem.text}}</p>\n" + " <span class=\"hidden-spoken\">\n" + " {{($index < currentIndex - 1)? 'Complete. '+stepsItem.text+' '+stepsItem.dataMobile:''}} \n" + " {{($index == currentIndex - 1)? 'In Progress. '+stepsItem.text+' '+stepsItem.dataMobile:''}} \n" + @@ -21949,7 +22875,7 @@ angular.module("b2bTemplate/tables/b2bTableHeaderSortable.html", []).run(["$temp $templateCache.put("b2bTemplate/tables/b2bTableHeaderSortable.html", "<th scope=\"col\" role=\"columnheader\" aria-sort=\"{{sortPattern !== 'null' && 'none' || sortPattern}}\" aria-label=\"{{headerName}} {{sortable !== 'false' && ': activate to sort' || ' '}} {{sortPattern !== 'null' && '' || sortPattern}}\" tabindex=\"{{sortable !== 'false' && '0' || '-1'}}\" b2b-accessibility-click=\"13,32\" ng-click=\"(sortable !== 'false') && sort();\" ng-hide=\"isHidden()\">\n" + " <span ng-transclude></span>\n" + - " <i ng-class=\"{'icon-controls-upPRIMARY active': sortPattern === 'ascending', 'icon-controls-down active down': sortPattern === 'descending'}\"></i>\n" + + " <i ng-class=\"{'icoArrows-sort-arrow active': sortPattern === 'ascending', 'icoArrows-sort-arrow active down': sortPattern === 'descending'}\"></i>\n" + "</th>"); }]); @@ -21988,18 +22914,18 @@ angular.module("b2bTemplate/treeNav/groupedTree.html", []).run(["$templateCache" angular.module("b2bTemplate/treeNav/treeMember.html", []).run(["$templateCache", function($templateCache) { $templateCache.put("b2bTemplate/treeNav/treeMember.html", "<li role=\"treeitem\" aria-expanded=\"{{(member.active?true:false)}}\" aria-label=\"{{member.tooltipContent ? member.tooltipContent : member.name}}\" aria-describedby=\"description_{{$id}}\" ng-class=\"{'bg':member.selected}\" b2b-tree-link>\n" + - " <a tabindex=\"-1\" title=\"{{member.tooltipContent ? member.tooltipContent : member.name}}\" href=\"javascript:void(0)\" ng-class=\"{'active':member.active,'b2b-locked-node':member.locked}\"> <span class=\"b2b-tree-node-name\">{{member.name}}</span>\n" + + " <a tabindex=\"-1\" title=\"{{member.tooltipContent ? member.tooltipContent : member.name}}\" href=\"javascript:void(0)\" ng-class=\"{'active':member.active,'b2b-locked-node':member.locked}\"> <span class=\"b2b-tree-node-name\">{{member.name}}</span>\n" + " <span class=\"{{!member.child?'end':''}} b2b-tree-node-icon\">\n" + " <i class=\"b2b-tree-expandCollapse-icon\" ng-class=\"{'icon-primary-expanded':member.active}\"></i>\n" + " </span>\n" + " <div id=\"description_{{$id}}\" class=\"offscreen-text\">\n" + - " {{member.descriptionText}}\n" + + " {{member.descriptionText}}\n" + " </div>\n" + " <div class=\"b2b-tree-tooltip\" ng-if=\"member.showTooltip\">\n" + - " <span class=\"b2b-tree-arrow-left\"></span>\n" + - " <div class=\"b2b-tree-tooltip-content\">\n" + - " {{member.tooltipContent}}\n" + - " </div> \n" + + " <span class=\"b2b-tree-arrow-left\"></span>\n" + + " <div class=\"b2b-tree-tooltip-content\">\n" + + " {{member.tooltipContent}}\n" + + " </div> \n" + " </div>\n" + " </a>\n" + "</li>"); @@ -22034,14 +22960,14 @@ angular.module("b2bTemplate/treeNodeCheckbox/treeMember.html", []).run(["$templa $templateCache.put("b2bTemplate/treeNodeCheckbox/treeMember.html", "<li role=\"treeitem\" aria-expanded=\"{{(member.active?true:false)}}\" aria-label=\"{{member.name}}\" ng-class=\"{'bg':member.selected}\" b2b-tree-node-link>\n" + " <a tabindex=\"-1\" title=\"{{member.name}}\" href=\"javascript:void(0)\" ng-class=\"{'active':member.active}\">\n" + - " <span ng-show=\"member.displayCheckbox\">\n" + - " <label class=\"checkbox\">\n" + + " <span ng-show=\"member.displayCheckbox\">\n" + + " <label class=\"checkbox\">\n" + " <input type=\"checkbox\" tabindex=\"-1\" ng-model=\"member.isSelected\" ng-class=\"{'treeCheckBox': (member.displayCheckbox !== undefined)}\" style=\"margin-top:2px;\"/><i class=\"skin\"></i><span> {{member.name}}</span>\n" + " </label>\n" + " </span>\n" + - " <span ng-show=\"!member.displayCheckbox\">\n" + - " {{member.name}} \n" + - " </span>\n" + + " <span ng-show=\"!member.displayCheckbox\">\n" + + " {{member.name}} \n" + + " </span>\n" + " <span class=\"nodeIcon {{!member.child?'end':''}}\">\n" + " <i class=\"expandCollapseIcon\" ng-class=\"{'icon-primary-expanded':member.active}\"></i>\n" + " </span>\n" + diff --git a/ecomp-portal-FE-common/pom.xml b/ecomp-portal-FE-common/pom.xml index 111b2881..61546a04 100644 --- a/ecomp-portal-FE-common/pom.xml +++ b/ecomp-portal-FE-common/pom.xml @@ -2,6 +2,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.openecomp.portal</groupId> <artifactId>ecompportal-FE-common</artifactId> - <version>1.1</version> - <!-- This file exists primarily to allow easy import of this project into Eclipse. --> + <version>0</version> + <!-- This file exists only to allow easy import of this project into Eclipse. --> </project> diff --git a/ecomp-portal-FE-os/client/assets/images/onap-logo.png b/ecomp-portal-FE-os/client/assets/images/onap-logo.png Binary files differindex 32320322..8d601009 100644 --- a/ecomp-portal-FE-os/client/assets/images/onap-logo.png +++ b/ecomp-portal-FE-os/client/assets/images/onap-logo.png diff --git a/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css b/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css index 8e747af3..708a4a65 100644 --- a/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css +++ b/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css @@ -1,6 +1,7 @@ @charset "UTF-8"; @font-face { font-family: "Ionicons"; src: url("../fonts/ionicons.eot?v=2.0.0"); src: url("../fonts/ionicons.eot?v=2.0.0#iefix") format("embedded-opentype"), url("../fonts/ionicons.ttf?v=2.0.0") format("truetype"), url("../fonts/ionicons.woff?v=2.0.0") format("woff"), url("../fonts/ionicons.svg?v=2.0.0#Ionicons") format("svg"); font-weight: normal; font-style: normal; } + .ionicons, .icon-controls-upPRIMARY, .icon-arrows-download:before, @@ -56,7 +57,14 @@ .icon-misc-trash:before, .icon-misc-pen:before, .ion-navicon:before, -.icon-primary-close:before, .close:before, .reset-field:before, +.icon-primary-down:before, +.icon-primary-left:before, +.icon-primary-right:before, +.icon-primary-check:before, +.icon-primary-calendar:before, +.icon-primary-close:before, +.close:before, +.reset-field:before, .icon-datanetwork-softwareasaservice:before, .icon-datanetwork-messaging2:before, .icon-controls-moreapplications:before, @@ -75,7 +83,6 @@ } - .icoSecurityalerts-alert:before { content: "\f100"; } .icon-arrows-download:before { content: "\f41f"; } @@ -178,16 +185,26 @@ .icon-misc-pen:before { content: "\f2bf"; } +.icon-primary-down:before { content: "\f123" !important;} + +.icon-primary-left:before { content: "\f124" !important; transform: rotate(0deg) !important;} + +.icon-primary-right:before { content: "\f125" !important; transform: rotate(0deg) !important; } + +.icon-primary-check:before, .checkbox input:checked + .skin:after {content: "\f121" !important; font-family: "Ionicons" !important;} + +.icon-primary-calendar:before {content: "\f3f4" !important;} + +.icon-primary-close:before, .close:before, .reset-field:before {content: "\f2d7" !important; font-family: "Ionicons" !important;} + .ion-navicon:before { content: "\f20e"; } .icon-building-home:before { content: "\f144"; } .icon-content-star:before { content: "\f24e"; } -.icon-primary-close:before, .close:before, .reset-field:before { content: "\f129"; } - .icon-datanetwork-softwareasaservice:before { content: "\f40c"; } .icon-datanetwork-messaging2:before { content: "\f132"; } -.icon-controls-moreapplications:before { content: "\f20b"; }
\ No newline at end of file +.icon-controls-moreapplications:before { content: "\f20b"; } diff --git a/ecomp-portal-FE-os/client/index.html b/ecomp-portal-FE-os/client/index.html index 16eba088..35715497 100644 --- a/ecomp-portal-FE-os/client/index.html +++ b/ecomp-portal-FE-os/client/index.html @@ -131,6 +131,7 @@ <div ui-view="tabbar"></div> <div ng-show="ContentModel.IsVisible" class="slide"> <div ui-view="content"></div> + <div class="loadingLayer" id="loadLayer"></div> <div ui-view="sidebar"></div> <div ui-view="userbar" style="float:right"></div> </div> @@ -204,6 +205,7 @@ <script src="app/directives/search-users/search-users.controller.js"></script> <script src="app/directives/search-users/search-users.directive.js"></script> <script src="app/filters/elipsis/elipsis.filter.js"></script> + <script src="app/filters/pagination-start-from/start-from.filter.js"></script> <script src="app/filters/trusted-url/trusted-url.filter.js"></script> <script src="app/router.js"></script> <script src="app/services/admins/admins.service.js"></script> @@ -241,7 +243,6 @@ <script src="app/views/admins/admins.controller.js"></script> <script src="app/views/applications/application-details-dialog/application-details.controller.js"></script> <script src="app/views/applications/applications.controller.js"></script> - <script src="app/views/catalog/add-catalog-dialogs/new-catalog.controller.js"></script> <script src="app/views/catalog/catalog.controller.js"></script> <script src="app/views/catalog/catalogconfirmation.controller.js"></script> <script src="app/views/confirmation-box/confirmation-box.controller.js"></script> @@ -255,6 +256,7 @@ <script src="app/views/functionalMenu/jqTreeContextMenu.js"></script> <script src="app/views/header/header.controller.js"></script> <script src="app/views/header/profile-edit-dialogs/profile-edit.controller.js"></script> + <script src="app/views/headerRecommendation/headerRecommendations.controller.js"></script> <script src="app/views/microservice-onboarding/microservice-add-details/microservice-add-details.js"></script> <script src="app/views/microservice-onboarding/microservice-onboarding.controller.js"></script> <script src="app/views/notification-history/notificationhistory.controller.js"></script> @@ -271,8 +273,8 @@ <script src="app/views/support/contact-us/contact-us.controller.js"></script> <script src="app/views/support/get-access/get-access.controller.js"></script> <script src="app/views/tabs/tabs.controller.js"></script> - <script src="app/views/user-notifications-admin/user.notifications.Json.details.controller.js"></script> <script src="app/views/user-notifications-admin/user.notifications.controller.js"></script> + <script src="app/views/user-notifications-admin/user.notifications.json.details.controller.js"></script> <script src="app/views/user-notifications-admin/user.notifications.modal.controller.js"></script> <script src="app/views/userbar/userbar.controller.js"></script> <script src="app/views/users/new-user-dialogs/bulk-user.controller.js"></script> diff --git a/ecomp-portal-FE-os/client/src/app.less b/ecomp-portal-FE-os/client/src/app.less index 1c99e063..6e7df2a4 100644 --- a/ecomp-portal-FE-os/client/src/app.less +++ b/ecomp-portal-FE-os/client/src/app.less @@ -3,7 +3,7 @@ @import 'directives/multiple-select/multiple-select.less'; @import 'directives/right-menu/right-menu.less'; @import 'directives/search-users/search-users.less'; -@import 'styles/att-abs.less'; +@import 'styles/ecomp-abs.less'; @import 'styles/buttons.less'; @import 'styles/ecomp-general.less'; @import 'styles/fonts.less'; @@ -15,6 +15,7 @@ @import 'styles/spinner.less'; @import 'styles/sprites.less'; @import 'styles/variables.less'; +@import 'styles/appDS2.less'; @import 'views/admins/add-admin-dialogs/new-admin.modal.less'; @import 'views/admins/admins.less'; @import 'views/applications/application-details-dialog/application-details.modal.less'; @@ -54,7 +55,7 @@ html { height: 100%; overflow-y: hidden;} * { box-sizing: border-box; } body { - font: normal 12px Omnes-ECOMP-W02, Arial; + font: normal 12px Omnes-ECOMP-W02, Arial;-ms-overflow-style: scrollbar; } /* Responsive: Portrait tablets and up */ @@ -80,3 +81,15 @@ body { .checkbox-field-openSRC{ height: 15px !important; } + + .loadingLayer{ + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + background: none repeat scroll 0 0 black; + z-index: 100; + display: none; + opacity: 0; +}
\ No newline at end of file diff --git a/ecomp-portal-FE-os/client/src/directives/search-users/search-users.less b/ecomp-portal-FE-os/client/src/directives/search-users/search-users.less index 32ea9caa..605abfc8 100644 --- a/ecomp-portal-FE-os/client/src/directives/search-users/search-users.less +++ b/ecomp-portal-FE-os/client/src/directives/search-users/search-users.less @@ -20,7 +20,7 @@ .search-users-directive{ .title { //.n18r; - .dGray18r; //AT&T Dark Gray + .dGray18r; border-bottom: @blue-active 3px solid; } diff --git a/ecomp-portal-FE-os/client/src/directives/search-users/search-users.tpl.html b/ecomp-portal-FE-os/client/src/directives/search-users/search-users.tpl.html index ef659920..5ac0cb9a 100644 --- a/ecomp-portal-FE-os/client/src/directives/search-users/search-users.tpl.html +++ b/ecomp-portal-FE-os/client/src/directives/search-users/search-users.tpl.html @@ -21,7 +21,7 @@ <form name="searchUsersForm" novalidate> <div class="title" ng-bind="searchUsers.searchTitle"></div> <div class="main"> - <div ng-if="searchUsers.showSearch"> + <div ng-show="searchUsers.showSearch"> <div class="search-instructions">Enter first name, last name or User ID</div> <div class="search"> <input id="input-user-search" @@ -86,7 +86,7 @@ </div> - <div id="addWidget" class="add-user-section" ng-if="searchUsers.showAddUser"> + <div id="addWidget" class="add-user-section" ng-show="searchUsers.showAddUser"> <div> <div class="input-new-user-div" > <div class="">*First Name</div> diff --git a/ecomp-portal-FE-os/client/src/router.js b/ecomp-portal-FE-os/client/src/router.js index 88afa39b..1b9cb5c5 100644 --- a/ecomp-portal-FE-os/client/src/router.js +++ b/ecomp-portal-FE-os/client/src/router.js @@ -150,6 +150,15 @@ angular.module('ecompApp') controllerAs: 'widgetOnboarding' } } + }).state('root.accountOnboarding', { + url: '/accountOnboarding', + views: { + 'content@': { + templateUrl: 'app/views/account-onboarding/account-onboarding.tpl.html', + controller: 'AccountOnboardingCtrl', + controllerAs: 'accountOnboarding' + } + } }).state('root.functionalMenu', { url: '/functionalMenu', views: { diff --git a/ecomp-portal-FE-os/client/src/services/userProfile/userProfile.service.js b/ecomp-portal-FE-os/client/src/services/userProfile/userProfile.service.js index 2cc7c329..76a778f3 100644 --- a/ecomp-portal-FE-os/client/src/services/userProfile/userProfile.service.js +++ b/ecomp-portal-FE-os/client/src/services/userProfile/userProfile.service.js @@ -195,7 +195,9 @@ return deferred.promise; } - + + + } UserProfileService.$inject = ['$q', '$log', '$http', 'conf', 'uuid4', 'utilsService']; angular.module('ecompApp').service('userProfileService', UserProfileService) diff --git a/ecomp-portal-FE-os/client/src/styles/att-abs.less b/ecomp-portal-FE-os/client/src/styles/ecomp-abs.less index 1562375c..1562375c 100644 --- a/ecomp-portal-FE-os/client/src/styles/att-abs.less +++ b/ecomp-portal-FE-os/client/src/styles/ecomp-abs.less diff --git a/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.js b/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.js index da7cd4a4..550b9faf 100644 --- a/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.js +++ b/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.js @@ -21,12 +21,12 @@ (function () { class AppDetailsModalCtrl { constructor($scope, $log, applicationsService, errorMessageByCode, - ECOMP_URL_REGEX,userProfileService, $cookies, confirmBoxService) { + ECOMP_URL_REGEX,userProfileService, $cookies, confirmBoxService,items) { // let emptyImg = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='; // empty image should really be empty, or it causes problems for the back end let emptyImg = null; this.emptyImgForPreview = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='; - + $scope.ngDialogData=items; let newAppModel = { 'id': null, 'name': null, @@ -41,7 +41,9 @@ 'appPassword': null, 'thumbnail': emptyImg, 'isEnabled': true, - 'restrictedApp': false + 'restrictedApp': false, + 'nameSpace': null, + 'isCentralAuth': false }; let init = () => { @@ -71,6 +73,7 @@ this.app.thumbnail = emptyImg; this.originalImage = null; this.app.imageUrl = null; + this.app.imageLink = null; } }).catch(err => { $log.error('AppDetailsModalCtrl:removeImage error:: ',err); @@ -152,9 +155,14 @@ this.saveChanges = () => { //if valid.. - if($scope.appForm.$invalid){ - return; - } + if(((angular.isUndefined(this.app.name) || !this.app.name)&&(angular.isUndefined(this.app.url) || !this.app.url) + &&(angular.isUndefined(this.app.username) || !this.app.username)&&(angular.isUndefined(this.app.appPassword) || !this.app.appPassword))) { + confirmBoxService.showInformation('Please fill in all required fields').then(isConfirmed => {}); + return; + }else if(!((angular.isUndefined(this.app.name) || !!this.app.name)&&(angular.isUndefined(this.app.url) || !!this.app.url))){ + confirmBoxService.showInformation('Please fill in all required fields').then(isConfirmed => {}); + return; + } this.isSaving = true; // For a restricted app, null out all irrelevant fields if (this.app.restrictedApp) { @@ -167,10 +175,12 @@ this.app.uebSecret = null; } if(this.isEditMode){ + if (this.app.nameSpace=="") {this.app.nameSpace = null;} applicationsService.updateOnboardingApp(this.app) .then(() => { $log.debug('AppDetailsModalCtrl:updateOnboardingApp:: App update succeeded!'); - $scope.closeThisDialog(true); + // $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); emptyCookies(); }).catch(err => { switch (err.status) { @@ -204,7 +214,8 @@ applicationsService.addOnboardingApp(this.app) .then(() => { $log.debug('App creation succeeded!'); - $scope.closeThisDialog(true); + //$scope.closeThisDialog(true); + $scope.$dismiss('cancel'); emptyCookies(); }).catch(err => { switch (err.status) { @@ -232,6 +243,7 @@ // for bug in IE 11 }); } + }; @@ -252,6 +264,7 @@ if(!(_.isEqual(newVal, oldVal))){ $log.debug('applicationsService:$scope.$watch:: thumbnail updated!'); this.app.imageUrl = null; + this.app.imageLink = null; this.app.thumbnail = newVal.resized.dataURL; } }); @@ -263,6 +276,6 @@ } } AppDetailsModalCtrl.$inject = ['$scope', '$log', 'applicationsService', 'errorMessageByCode', - 'ECOMP_URL_REGEX','userProfileService','$cookies', 'confirmBoxService']; + 'ECOMP_URL_REGEX','userProfileService','$cookies', 'confirmBoxService','items']; angular.module('ecompApp').controller('AppDetailsModalCtrl', AppDetailsModalCtrl); })();
\ No newline at end of file diff --git a/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.modal.html b/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.modal.html index ad659aa8..d90c35ec 100644 --- a/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.modal.html +++ b/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.modal.html @@ -18,20 +18,32 @@ ================================================================================ --> <div class="application-details-modal"> - <div id="title" class="title">Application Details</div> + <div class="b2b-modal-header"> + <h2 class="account-details-title" id="application-details-title">Application Details</h2> + + <div class="corner-button in"> + <button type="button" class="close" aria-label="Closhhhe" + ng-click="$dismiss('cancel')"></button> + </div> + </div> + + <div class="b2b-modal-body"> <div class="app-properties-main" scroll-top="appDetails.scrollApi"> <form name="appForm" novalidate autocomplete="off"> - <!-- We can remove this script once we get to AT&T Corporate Firefox version 47 + <!-- We can remove this script once we get to Firefox version 47 autocomplete="off" won't work until v47 --> - <script type="text/javascript"> + <!-- <script type="text/javascript"> document.getElementById("appForm").reset(); - </script> + </script> --> <div id="app-left-container" class="left-container"> - <div class="property"> - <input id="checkbox-app-is-restricted" type="checkbox" class="checkbox-field checkbox-field-openSRC" ng-disabled="appDetails.isEditMode" ng-model="appDetails.app.restrictedApp" ng-checked="appDetails.app.restrictedApp"/> - <div class="property-label checkbox-label">Hyperlink only application</div> - </div> + <div class="property-label checkbox-label"> + <label for="checkbox-app-is-restricted" class="checkbox"> + <input type="checkbox" ng-model="appDetails.app.restrictedApp" id="checkbox-app-is-restricted" ng-disabled="appDetails.isEditMode" ng-checked="appDetails.app.restrictedApp"/> + <i class="skin"></i> + <span>Hyperlink only application</span> + </label> + </div> <div class="property required"> <div class="property-label">Application Name</div> <input id="input-app-name" type="text" @@ -123,6 +135,14 @@ <small id="error-mylogins-password-reqd" class="err-message" ng-message="required">My Logins App Password is required</small> </div> </div> + + <div class="property" ng-show="!appDetails.app.restrictedApp"> + <div id="pwd-property-label" class="property-label">Name Space</div> + <input type="text" id="input-mylogins-auth-namespace" + ng-model="appDetails.app.nameSpace" + name="appAuthNameSpace" + maxlength="256"/> + </div> </div> </div> <div class="right-container"> @@ -173,12 +193,25 @@ </div> <div id="property-guest-access" class="property"> - <input id="checkbox-app-is-open" type="checkbox" class="checkbox-field checkbox-field-openSRC" ng-model="appDetails.app.isOpen" ng-checked="appDetails.app.isOpen || appDetails.app.restrictedApp" ng-disabled="appDetails.app.restrictedApp"/> - <div id="property-guest-checkbox-label" class="property-label checkbox-label">Allow guest access</div> + <label for="checkbox-app-is-open" class="checkbox"> + <input type="checkbox" ng-model="appDetails.app.isOpen" id="checkbox-app-is-open" ng-checked="appDetails.app.isOpen || appDetails.app.restrictedApp" ng-disabled="appDetails.app.restrictedApp"/> + <i class="skin"></i> + <span>Allow guest access</span> + </label> </div> <div id="property-active" class="property"> - <input id="checkbox-app-is-enabled" type="checkbox" class=" checkbox-field checkbox-field-openSRC " ng-model="appDetails.app.isEnabled"/> - <div id="property-active-checkbox-label" class="property-label checkbox-label">Active</div> + <label for="checkbox-app-is-enabled" class="checkbox"> + <input type="checkbox" ng-model="appDetails.app.isEnabled" id="checkbox-app-is-enabled"/> + <i class="skin"></i> + <span>Active</span> + </label> + </div> <br/> + <div id="property-is-central-auth" class="property" ng-show="!appDetails.app.restrictedApp"> + <label for="checkbox-app-is-central-auth" class="checkbox"> + <input type="checkbox" ng-model="appDetails.app.isCentralAuth" id="checkbox-app-is-central-auth"/> + <i class="skin"></i> + <span>Centralized</span> + </label> </div> </div> @@ -186,14 +219,25 @@ </div> </form> </div> + </div> + + <br> + <div class="b2b-modal-footer"> + <div class="dialog-control"> + <span class="ecomp-save-spinner" ng-show="appDetails.isSaving"></span> + <button id="button-save-app" class="btn btn-alt btn-small" ng-class="{disabled: appForm.$invalid}" ng-click="appDetails.saveChanges()">Save</button> + <button id="button-notification-cancel" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')"role="button" tabindex="0">Cancel</button> + + + </div> + </div> + + + - <div class="dialog-control"> - <span class="ecomp-save-spinner" ng-show="appDetails.isSaving"></span> - <button id="button-save-app" class="btn btn-alt btn-small" ng-class="{disabled: appForm.$invalid}" ng-click="appDetails.saveChanges()">Save</button> - <button id="button-app-cancel" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Cancel</button> - </div> </div> + <script type="application/javascript"> $(document).ready(function(){ $(".ngdialog-content").css("top","-150px") diff --git a/ecomp-portal-FE-os/client/src/views/applications/applications.controller.js b/ecomp-portal-FE-os/client/src/views/applications/applications.controller.js index 08f00669..d1c2b091 100644 --- a/ecomp-portal-FE-os/client/src/views/applications/applications.controller.js +++ b/ecomp-portal-FE-os/client/src/views/applications/applications.controller.js @@ -22,7 +22,7 @@ class ApplicationsCtrl { constructor($log, $cookies, conf, ngDialog, - applicationsService, confirmBoxService, userProfileService, utilsService) { + applicationsService, confirmBoxService, userProfileService, utilsService,$modal) { this.emptyImgForPreview = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='; let getOnboardingApps = () => { this.isLoadingTable = true; @@ -31,8 +31,10 @@ // Use proper back-end URL to load image for (var i = 0; i < appsList.length; i++) { appsList[i].imageLink = ''; - if (appsList[i].imageUrl) + if (appsList[i].imageUrl){ appsList[i].imageLink = conf.api.appThumbnail.replace(':appId', appsList[i].id); + appsList[i].imageLink = appsList[i].imageLink+'?' + new Date().getTime(); + } } this.appsList = appsList; }).catch(err => { @@ -58,6 +60,8 @@ {name: 'Communication Topic', value: 'uebTopicName', isSortable: true}, {name: 'Communication Key', value: 'uebKey', isSortable: true}, {name: 'Communication Secret', value: 'uebSecret', isSortable: true}, + {name: 'Application Namespace', value: 'nameSpace', isSortable: true}, + {name: 'Central Access Type', value: 'isCentralAuth', isSortable: true} ]; this.appsList = []; }; @@ -75,18 +79,20 @@ app: selectedApp } } - ngDialog.open({ + var modalInstance = $modal.open({ templateUrl: 'app/views/applications/application-details-dialog/application-details.modal.html', - controller: 'AppDetailsModalCtrl', - controllerAs: 'appDetails', - data: data - }).closePromise.then(needUpdate => { - if (needUpdate.value === true) { - $log.debug('ApplicationsCtrl:openAddNewAppModal: updating table data...'); - getOnboardingApps(); - } - }); - + controller: 'AppDetailsModalCtrl as appDetails', + sizeClass: 'modal-large', + resolve: { + items: function () { + return data; + } + } + }) + + modalInstance.result.finally(function (){ + getOnboardingApps(); + }); }; @@ -118,6 +124,6 @@ } } ApplicationsCtrl.$inject = ['$log', '$cookies', 'conf', 'ngDialog', - 'applicationsService', 'confirmBoxService', 'userProfileService', 'utilsService']; + 'applicationsService', 'confirmBoxService', 'userProfileService', 'utilsService','$modal']; angular.module('ecompApp').controller('ApplicationsCtrl', ApplicationsCtrl); })(); diff --git a/ecomp-portal-FE-os/client/src/views/applications/applications.tpl.html b/ecomp-portal-FE-os/client/src/views/applications/applications.tpl.html index fa61e554..6016a2b1 100644 --- a/ecomp-portal-FE-os/client/src/views/applications/applications.tpl.html +++ b/ecomp-portal-FE-os/client/src/views/applications/applications.tpl.html @@ -51,6 +51,8 @@ <th b2b-table-header id="app-header-Topic" sortable="false">Communication Topic</th> <th b2b-table-header id="app-header-CommKey" sortable="false">Communication Key</th> <th b2b-table-header id="app-header-Secret" sortable="false">Communication Secret</th> + <th b2b-table-header id="app-header-namespace" sortable="false">Application Namespace</th> + <th b2b-table-header id="app-header-central-auth" sortable="false">Central Auth Access</th> <th b2b-table-header id="app-header-delete" sortable="false">Delete</th> </tr> </thead> @@ -68,7 +70,9 @@ <td b2b-table-body headers="rowheader_t1_{{$index}} col11" ng-click="apps.openAddNewAppModal(rowData)"ng-bind="rowData.uebTopicName"></td> <td b2b-table-body headers="rowheader_t1_{{$index}} col12" ng-click="apps.openAddNewAppModal(rowData)"ng-bind="rowData.uebKey"></td> <td b2b-table-body headers="rowheader_t1_{{$index}} col13" ng-click="apps.openAddNewAppModal(rowData)"ng-bind="rowData.uebSecret"></td> - <td b2b-table-body headers="rowheader_t1_{{$index}} col14" > + <td b2b-table-body headers="rowheader_t1_{{$index}} col14" ng-click="apps.openAddNewAppModal(rowData)"ng-bind="rowData.nameSpace"></td> + <td b2b-table-body headers="rowheader_t1_{{$index}} col15" ng-click="apps.openAddNewAppModal(rowData)">{{(rowData.isCentralAuth) ? 'yes' : 'no'}}</td> + <td b2b-table-body headers="rowheader_t1_{{$index}} col16" > <span class="icon-misc-trash" ng-click="apps.deleteApp(rowData)"></span> </td> </tr> diff --git a/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu-dialog/menu-details.controller.js b/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu-dialog/menu-details.controller.js deleted file mode 100644 index 140aea94..00000000 --- a/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu-dialog/menu-details.controller.js +++ /dev/null @@ -1,415 +0,0 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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. - * ================================================================================ - */ -/** - * Created by nnaffar on 12/20/15. - */ -'use strict'; -(function () { - class MenuDetailsModalCtrl { - constructor($scope, $log, functionalMenuService, errorMessageByCode, ECOMP_URL_REGEX,$rootScope,confirmBoxService) { - - - let newMenuModel = { - name: null, - menuId: null, - parentMenuId: null, - url: null - }; - - let getAvailableRoles = (appid) => { - this.isSaving = true; - if (appid != null) { - $log.debug("MenuDetailsModalCtrl::getAvailableRoles: About to call getManagedRolesMenu"); - functionalMenuService.getManagedRolesMenu(appid).then(rolesObj => { - $log.debug("MenuDetailsModalCtrl::getAvailableRoles: Roles returned = " + JSON.stringify(rolesObj)) - this.availableRoles = rolesObj; - this.preSelectedRoles = {roles:[]}; - - if(($scope.ngDialogData.source==='edit') && this.isMidLevelMenuItem()){ - // in Edit flow , for Midlevel menu item no need to preSelect. - this.preSelectedRoles = {roles:[]}; - }else if(!angular.isUndefined(this.menuItem.menuDetails) && - $scope.ngDialogData.source==='edit' && this.isLeafMenuItem() && - this.menuItem.menuDetails.appid!=appid) { - // in Edit flow , for LeafMenuItem, if appid changed then no need to preSelect. - this.preSelectedRoles = {roles:[]}; - }else{ - if((!angular.isUndefined(this.menuItem.menuDetails)) && - (!angular.isUndefined(this.menuItem.menuDetails.roles))){ - $log.debug('menuDetails.roles: ' + this.menuItem.menuDetails.roles); - for(var i=0; i<this.menuItem.menuDetails.roles.length; i++){ - var role = {"roleId":this.menuItem.menuDetails.roles[i]}; - $log.debug('MenuDetailsModalCtrl::getAvailableRoles: adding role to preselected: ' + i + ': ' + JSON.stringify(role)); - this.preSelectedRoles.roles.push(role); - } - } - } - $rootScope.$broadcast('availableRolesReady'); - this.isSaving = false; - }).catch(err => { - $log.error("MenuDetailsModalCtrl::getAvailableRoles: error: " + err); - }); - } else { - $log.debug("MenuDetailsModalCtrl::getAvailableRoles: appid was null"); - } - }; - - let getAvailableApps = () => { - functionalMenuService.getAvailableApplications().then(apps => { - $log.debug("MenuDetailsModalCtrl::getAvailableApps: Apps returned = " + JSON.stringify(apps)) - this.availableApps = apps; - // Keep track of whether or not the selected app is disabled - if (angular.isDefined(this.selectedApp) && angular.isDefined(this.selectedApp.index)) { - for (var i = 0; i < apps.length; i++) { - if (apps[i].index === this.selectedApp.index) { - $log.debug("MenuDetailsModalCtrl::getAvailableApps: found app with index: " + this.selectedApp.index); - $log.debug("MenuDetailsModalCtrl::getAvailableApps: setting isDisabled to: " + !apps[i].enabled); - this.selectedApp.isDisabled = !apps[i].enabled; - break; - } - } - $log.debug("didn't find index: " + this.selectedApp.index); - } - })['catch'](function (err) { - confirmBoxService.showInformation('There was a problem retrieving the Applications. ' + - 'Please try again later. Error Status: '+ err.status).then(isConfirmed => {}); - $log.error("MenuDetailsModalCtrl::getAvailableApps: getAvailableApps error: " + err); - }).finally(()=>{ - this.isSaving = false; - }); - }; - - let init = () => { - $log.info('MenuDetailsModalCtrl::init'); - this.saveOrContinueBtnText = "Save"; - this.isSaving = false; - this.displayRoles = $scope.ngDialogData.source==='view' ? true : false; - this.formEditable = $scope.ngDialogData.source==='view' ? false : true; - this.selectedRole = []; - this.availableRoles = []; - this.menuItem = _.clone($scope.ngDialogData.menuItem); - $log.info('MenuDetailsModalCtrl::getAvailableApps: Within init, about to check menuDetails for defined'); - if(!angular.isUndefined(this.menuItem.menuDetails) && - ($scope.ngDialogData.source==='view' || - ($scope.ngDialogData.source==='edit') && this.isLeafMenuItem() )){ - - $log.debug("MenuDetailsModalCtrl::init: menuItem: "); - $log.debug('MenuDetailsModalCtrl::init: ',this.menuItem); - this.menuItem.menu.url = this.menuItem.menuDetails.url; - this.selectedApp={}; - this.selectedApp.index = this.menuItem.menuDetails.appid; - getAvailableRoles(this.selectedApp.index); - - } - - if($scope.ngDialogData.source==='view' || $scope.ngDialogData.source==='edit'){ - this.menutitle = this.menuItem.menu.name; - this.menuLocation = this.isParentMenuItem() ? this.menuItem.menu.name : this.menuItem.menu.parent.name; - }else{ - this.menutitle = ''; - this.menuLocation = this.menuItem.menu.name; - } - // Temporarily passing 0 as dummy for getAvailableRoles incase of this.selectedApp is not there i.e., in Add flow - // getAvailableRoles(angular.isUndefined(this.selectedApp) ? 0: this.selectedApp.index ); - getAvailableApps(); - $log.debug("MenuDetailsModalCtrl::init: Menu details: " + JSON.stringify(this.menuItem.menuDetails)); - }; - - - this.ECOMP_URL_REGEX = ECOMP_URL_REGEX; - - //This part handles conflict errors (409) - this.conflictMessages = {}; - this.scrollApi = {}; - let handleConflictErrors = err => { - if(!err.data){ - return; - } - if(!err.data.length){ //support objects - err.data = [err.data] - } - $log.debug('MenuDetailsModalCtrl::handleConflictErrors: err.data = ' + JSON.stringify(err.data)); - _.forEach(err.data, item => { - _.forEach(item.fields, field => { - //set conflict message - this.conflictMessages[field.name] = errorMessageByCode[item.errorCode]; - //set field as invalid - $log.debug('MenuDetailsModalCtrl::handleConflictErrors: fieldName = ' + field.name); - $scope.functionalMenuForm[field.name].$setValidity('conflict', false); - //set watch once to clear error after user correction - watchOnce[field.name](); - }); - }); - this.scrollApi.scrollTop(); - }; - - let resetConflict = fieldName => { - delete this.conflictMessages[fieldName]; - $log.debug('MenuDetailsModalCtrl::resetConflict: $setValidity(true) = ' + fieldName); - if($scope.functionalMenuForm[fieldName]){ - $scope.functionalMenuForm[fieldName].$setValidity('conflict', true); - } - }; - - let watchOnce = { - text: () => { - let unregisterName = $scope.$watch('functionalMenuDetails.menutitle', (newVal, oldVal) => { - // $log.debug('title:: newVal, oldVal = ' + newVal.toLowerCase() + " | " + oldVal.toLowerCase()); - if(newVal.toLowerCase() !== oldVal.toLowerCase()){ - resetConflict('text'); - unregisterName(); - } - }); - }, - url: () => { - let unregisterUrl = $scope.$watch('functionalMenuDetails.menuItem.menu.url', (newVal, oldVal) => { - if(newVal.toLowerCase() !== oldVal.toLowerCase()){ - resetConflict('url'); - unregisterUrl(); - } - }); - } - }; - - //*************************** - - this.isLeafMenuItem = () => { - return this.menuItem.menu.children.length>0 ? false : true; - }; - - this.isMidLevelMenuItem = () => { - return this.menuItem.menu.parentMenuId!=null && this.menuItem.menu.children.length>0 ? true : false; - }; - - this.isParentMenuItem = () => { - return this.menuItem.menu.parentMenuId!=null ? false : true; - }; - - this.updateSelectedApp = (appItem) => { - if (!appItem) { - return; - } - $log.debug('MenuDetailsModalCtrl::updateSelectedApp: drop down app item = ' + JSON.stringify(appItem.index)); - $log.debug("MenuDetailsModalCtrl::updateSelectedApp: appItem in updateSelectedApp: "); - $log.debug('MenuDetailsModalCtrl::updateSelectedApp: ',appItem); - this.selectedApp.isDisabled = ! appItem.enabled; - $log.debug("MenuDetailsModalCtrl::updateSelectedApp: isDisabled: "+this.selectedApp.isDisabled); - getAvailableRoles(appItem.index); - }; - - this.continue = () => { - this.displayRoles = true; - this.formEditable = false; - }; - - this.saveChanges = () => { - - //todo : form validation was commented as dialog message is kept for error validations - /*if($scope.functionalMenuForm.$invalid){ - return; - }*/ - - if(!!this.menuItem.menu.url && (angular.isUndefined(this.selectedApp) || !this.selectedApp.index>0)) { - confirmBoxService.showInformation('Please select the appropriate app, or remove the url').then(isConfirmed => {}); - return; - }else if(!this.menuItem.menu.url && !angular.isUndefined(this.selectedApp) && this.selectedApp.index>0){ - confirmBoxService.showInformation('Please enter url, or select "No Application"').then(isConfirmed => {}); - return; - }else if(!this.menutitle){ - confirmBoxService.showInformation('Please enter the Menu title').then(isConfirmed => {}); - return; - } - - this.isSaving = true; - var activeMenuItem = {}; - - if ($scope.ngDialogData.source === 'edit') { // Edit Menu Item - $log.debug('MenuDetailsModalCtrl::saveChanges: Will be saving an edit menu item'); - activeMenuItem = { - menuId:this.menuItem.menu.menuId, - column:this.menuItem.menu.column, - text:this.menutitle, - parentMenuId:this.menuItem.menu.parentMenuId, - url:this.menuItem.menu.url, - appid: angular.isUndefined(this.selectedApp) ? null:this.selectedApp.index, - roles:this.selectedRole - }; - // If we have removed the url and appid, we must remove the roles - if (!activeMenuItem.appid && !activeMenuItem.url) { - activeMenuItem.roles = null; - } - functionalMenuService.saveEditedMenuItem(activeMenuItem) - .then(() => { - $log.debug('MenuDetailsModalCtrl::saveChanges: Menu Item saved'); - $scope.closeThisDialog(true); - }).catch(err => { - if(err.status === 409){//Conflict - handleConflictErrors(err); - } else { - confirmBoxService.showInformation('There was a problem saving your change. ' + - 'Please try again later. Error Status: '+ err.status).then(isConfirmed => {}); - } - $log.error('MenuDetailsModalCtrl::saveChanges: error - ',err); - }).finally(()=>{ - this.isSaving = false; - }); - - $log.debug("MenuDetailsModalCtrl::saveChanges: Edit Menu output will be: " + JSON.stringify(activeMenuItem)); - } else { // New Menu Item - $log.debug('MenuDetailsModalCtrl::saveChanges: Will be saving a New menu item'); - var newMenuItem = { - menuId:null, // this is a new menu item - column:this.menuItem.menu.column, - text:this.menutitle, - // We are creating this new menu item under the menu item that was clicked on. - parentMenuId:this.menuItem.menu.menuId, - url:this.menuItem.menu.url, - appid: angular.isUndefined(this.selectedApp) ? null:this.selectedApp.index, - roles:this.selectedRole - }; - - $log.debug("MenuDetailsModalCtrl::saveChanges: New Menu output will be: " + JSON.stringify(newMenuItem)); - functionalMenuService.saveMenuItem(newMenuItem) - .then(() => { - $log.debug('MenuDetailsModalCtrl::saveChanges: Menu Item saved'); - $scope.closeThisDialog(true); - }).catch(err => { - if(err.status === 409){//Conflict - handleConflictErrors(err); - } else { - confirmBoxService.showInformation('There was a problem saving your menu. ' + - 'Please try again later. Error Status: '+ err.status).then(isConfirmed => {}); - } - $log.error('MenuDetailsModalCtrl::saveChanges error: ', err); - }).finally(()=>{ - this.isSaving = false; - }); - - } - }; - - init(); - - $scope.$on('$stateChangeStart', e => { - //Disable navigation when modal is opened - e.preventDefault(); - }); - } - } - MenuDetailsModalCtrl.$inject = ['$scope', '$log', 'functionalMenuService', 'errorMessageByCode', 'ECOMP_URL_REGEX','$rootScope','confirmBoxService']; - angular.module('ecompApp').controller('MenuDetailsModalCtrl', MenuDetailsModalCtrl); - - angular.module('ecompApp').directive('dropdownMultiselect', ['functionalMenuService',function(){ - return { - restrict: 'E', - scope: { - model: '=', - options: '=', - populated_roles: '=preSelected', - dropdownTitle: '@', - source: '=' - }, - template: "<div class='btn-group' data-ng-class='{open: open}'>" + - "<button class='btn btn-medium'>{{dropdownTitle}}</button>" + - "<button class='btn dropdown-toggle' data-ng-click='open=!open;openDropDown()'><span class='caret'></span></button>" + - "<ul class='dropdown-menu dropdown-menu-medium' aria-labelledby='dropdownMenu'>" + - "<li data-ng-repeat='option in options'> <input ng-disabled='setDisable(source)' type='checkbox' data-ng-change='setSelectedItem(option.roleId)' ng-model='selectedItems[option.roleId]'>{{option.rolename}}</li>" + - "</ul>" + - "</div>", - controller: function ($scope) { - $scope.selectedItems = {}; - $scope.checkAll = false; - $scope.$on('availableRolesReady', function() { - init(); - }); - - function init() { - console.log('dropdownMultiselect init'); - $scope.dropdownTitle = $scope.source ==='view' ? 'View Roles' : 'Select Roles'; - console.log('$scope.populated_roles = ' + $scope.populated_roles); - } - - $scope.$watch('populated_roles', function(){ - if ($scope.populated_roles && $scope.populated_roles.length>0) { - for (var i = 0; i < $scope.populated_roles.length; i++) { - $scope.model.push($scope.populated_roles[i].roleId); - $scope.selectedItems[$scope.populated_roles[i].roleId] = true; - } - if ($scope.populated_roles.length === $scope.options.length) { - $scope.checkAll = true; - } - }else{ - deselectAll(); - } - }); - - $scope.openDropDown = function () { - - }; - - $scope.checkAllClicked = function () { - if ($scope.checkAll) { - selectAll(); - } else { - deselectAll(); - } - }; - - function selectAll() { - $scope.model = []; - $scope.selectedItems = {}; - angular.forEach($scope.options, function (option) { - $scope.model.push(option.roleId); - }); - angular.forEach($scope.model, function (id) { - $scope.selectedItems[id] = true; - }); - console.log($scope.model); - }; - - function deselectAll() { - $scope.model = []; - $scope.selectedItems = {}; - console.log($scope.model); - }; - - $scope.setSelectedItem = function (id) { - var filteredArray = []; - if ($scope.selectedItems[id] === true) { - $scope.model.push(id); - } else { - filteredArray = $scope.model.filter(function (value) { - return value != id; - }); - $scope.model = filteredArray; - $scope.checkAll = false; - } - console.log(filteredArray); - return false; - }; - - $scope.setDisable = function(source){ - return source ==='view' ? true : false; - } - } - } - }]); - -})(); diff --git a/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html b/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html deleted file mode 100644 index 56c3f4dc..00000000 --- a/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html +++ /dev/null @@ -1,103 +0,0 @@ -<!-- - ================================================================================ - ECOMP Portal - ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - 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. - ================================================================================ - --> -<div class="functionalMenu-details-modal"> - <div class="title">{{ngDialogData.title}}</div> - - - <div class="functionalMenu-properties-main" scroll-top="functionalMenuDetails.scrollApi"> - <form name="functionalMenuForm"> - - <div class="item"> - <div class="item-label">Parent</div> - <input id="input-parent" readonly="readonly" class="input-field" value="{{functionalMenuDetails.menuLocation}}" type="text" name="menuItem" required/> - </div> - <div class="item"> - <div class="item-label">Title</div> - <input id="input-title" ng-readonly="!functionalMenuDetails.formEditable ? 'checked':'' " placeholder="Enter text" class="input-field" ng-model="functionalMenuDetails.menutitle" type="text" name="text"/> - <div id="div-error-conflict" class="error-container" ng-show="functionalMenuDetails.conflictMessages.text"> - <small id="msg-error-conflict" id="functionalMenuDetails-input-title-conflict" class="err-message" ng-bind="functionalMenuDetails.conflictMessages.text"></small> - </div> - </div> - <div class="item"> - <div class="left-item"> - <div class="item-label">URL</div> - <input id="input-url" ng-readonly="!functionalMenuDetails.formEditable ? 'checked':'' " placeholder="http://" class="input-field" ng-model="functionalMenuDetails.menuItem.menu.url" type="url" name="url"/> - <span id="error-url-conflict" class="err-message" ng-show="functionalMenuForm.url.$error.url"> Not valid URL!</span> - </div> - <div class="right-item"> - <div class="item-label">App</div> - <div class="custom-select-wrap" ng-readonly="checked"> - <select id="select-app" class="select-field" - ng-model="functionalMenuDetails.selectedApp" - ng-change="functionalMenuDetails.updateSelectedApp(functionalMenuDetails.selectedApp);" - ng-options="app.title for app in functionalMenuDetails.availableApps track by app.index" - ng-disabled="!functionalMenuDetails.availableApps || !functionalMenuDetails.availableApps.length || !functionalMenuDetails.formEditable" - name="app" - required> - <option value="" >No Application</option> - </select> - </div> - <!--<span class="err-message" ng-show="functionalMenuForm.app.$dirty && functionalMenuForm.app.$error.required"> Please select App!</span>--> - <!-- <pre>{{functionalMenuDetails.menuItem | json}}</pre> --> - </div> - </div> - <div class="item" ng-show="functionalMenuDetails.displayRoles==true"> - <div class="item-label">Roles</div> - <dropdown-multiselect id="dropdown-roles" dropdown-title="Select Roles" pre-selected="functionalMenuDetails.preSelectedRoles.roles" - model="functionalMenuDetails.selectedRole" - options="functionalMenuDetails.availableRoles" source="ngDialogData.source"> - </dropdown-multiselect> - </div> - <div ng-show="functionalMenuDetails.selectedApp && functionalMenuDetails.selectedApp.isDisabled" class="err-message">Application is disabled</div> - </form> - </div> - <div class="dialog-control"> - <div ng-if="ngDialogData.source!='view'"> - <span class="ecomp-save-spinner" ng-show="functionalMenuDetails.isSaving"></span> - <span ng-if="ngDialogData.source=='edit' && functionalMenuDetails.isLeafMenuItem()"> - <button class="save-button" id="add-menu-button-save" - ng-show="!functionalMenuDetails.menuItem.menu.url || - !(functionalMenuDetails.selectedApp.index>0) || - functionalMenuDetails.displayRoles" - ng-disabled="!functionalMenuForm.text.$valid" - ng-click="functionalMenuDetails.saveChanges()">Save</button> - <button class="save-button" id="add-menu-button-continue" - ng-show="!!functionalMenuDetails.menuItem.menu.url && - functionalMenuDetails.selectedApp.index>0 && - functionalMenuDetails.menutitle && - !functionalMenuDetails.displayRoles" - ng-disabled="!functionalMenuForm.url.$valid" ng-click="functionalMenuDetails.continue()">Continue</button> - </span> - <span ng-if="ngDialogData.source=='add' || (ngDialogData.source=='edit' && !functionalMenuDetails.isLeafMenuItem())"> - <button id="button-save-add" - class="save-button" ng-show="!functionalMenuDetails.menuItem.menu.url || !(functionalMenuDetails.selectedApp.index>0) - || functionalMenuDetails.selectedRole.length>0 || !functionalMenuDetails.menutitle" ng-disabled="!functionalMenuForm.text.$valid || !functionalMenuDetails.menutitle" - ng-click="functionalMenuDetails.saveChanges()">Save</button> - <button id="button-save-continue" class="save-button" ng-show="!!functionalMenuDetails.menuItem.menu.url && functionalMenuDetails.selectedApp.index>0 && functionalMenuDetails.menutitle - && !functionalMenuDetails.selectedRole.length>0" ng-disabled="!functionalMenuForm.url.$valid" - ng-click="functionalMenuDetails.continue()">Continue</button> - </span> - <button id="button-cancel-close-dialog" class="cancel-button" ng-click="closeThisDialog()">Cancel</button> - </div> - <div ng-if="ngDialogData.source=='view'"> - <div id="div-close-dialog" class="cancel-button" ng-click="closeThisDialog()">Close</div> - </div> - </div> -</div> diff --git a/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.controller.js b/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.controller.js index 343c968d..0ff46e4d 100644 --- a/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.controller.js +++ b/ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu.controller.js @@ -20,7 +20,7 @@ 'use strict'; (function () { class FunctionalMenuCtrl { - constructor($log, functionalMenuService, $scope,ngDialog, confirmBoxService) { + constructor($log, functionalMenuService, $scope,ngDialog, confirmBoxService,$modal) { $log.info('FunctionalMenuCtrl init'); $scope.invokeDialog = () => { @@ -145,19 +145,26 @@ title: getDialogTitle(source) }; } - ngDialog.open({ + var modalInstance = $modal.open({ templateUrl: 'app/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html', - controller: 'MenuDetailsModalCtrl', - controllerAs: 'functionalMenuDetails', - data: data - }).closePromise.then(needUpdate => { - if(needUpdate.value === true){ - $log.debug('FunctionalMenuCtrl::openMenuDetailsModal: updating table data...'); + controller: 'MenuDetailsModalCtrl as functionalMenuDetails', + sizeClass: 'modal-large', + resolve: { + items: function () { + return data; + } + } + }) + + modalInstance.result.finally(function (needUpdate){ + if(needUpdate.value === true){ + $log.debug('FunctionalMenuCtrl::openMenuDetailsModal: updating table data...'); if(source==="edit") { init(); } - } - }); + + } + }); }); }; @@ -191,18 +198,25 @@ }; } - ngDialog.open({ + var modalInstance = $modal.open({ templateUrl: 'app/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html', - controller: 'MenuDetailsModalCtrl', - controllerAs: 'functionalMenuDetails', - data: data - }).closePromise.then(needUpdate => { - if(needUpdate.value === true){ + controller: 'MenuDetailsModalCtrl as functionalMenuDetails', + sizeClass: 'modal-large', + resolve: { + items: function () { + return data; + } + } + }) + + modalInstance.result.finally(function (needUpdate){ + if(needUpdate.value === true){ $log.debug('FunctionalMenuCtrl::getMenuDetails: updating table data...'); init(); //getOnboardingWidgets(); - } - }); + + } + }); } }); }; @@ -238,7 +252,7 @@ init(); } } - FunctionalMenuCtrl.$inject = ['$log', 'functionalMenuService','$scope', 'ngDialog', 'confirmBoxService']; + FunctionalMenuCtrl.$inject = ['$log', 'functionalMenuService','$scope', 'ngDialog', 'confirmBoxService','$modal']; angular.module('ecompApp').controller('FunctionalMenuCtrl', FunctionalMenuCtrl); angular.module('ecompApp').directive('jqTree', ['functionalMenuService','$log','confirmBoxService',function(functionalMenuService,$log,confirmBoxService){ diff --git a/ecomp-portal-FE-os/pom.xml b/ecomp-portal-FE-os/pom.xml index 2ee46044..aa853498 100644 --- a/ecomp-portal-FE-os/pom.xml +++ b/ecomp-portal-FE-os/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.openecomp.portal</groupId> <artifactId>ecompportal-FE-os</artifactId> - <version>1.1</version> + <version>1.1.0</version> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --git a/ecomp-portal-widget-ms/.gitignore b/ecomp-portal-widget-ms/.gitignore index 172a425c..f151f08a 100644 --- a/ecomp-portal-widget-ms/.gitignore +++ b/ecomp-portal-widget-ms/.gitignore @@ -1,39 +1,5 @@ .classpath .project +/.settings/ /bin/ target/ -logs/ -DEV_HOME_IS_UNDEFINED/ -!.mvn/wrapper/maven-wrapper.jar - -### STS ### -.apt_generated -.factorypath -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ - -/target/ -/catalina.base_IS_UNDEFINED/ -.mvn -.settings/ -.springBeans -bin/ -debug-logs/ -logs/ -/application.properties -mvnw -mvnw.cmd diff --git a/ecomp-portal-widget-ms/1702-widgets/approx-portal-usage.zip b/ecomp-portal-widget-ms/1702-widgets/approx-portal-usage.zip Binary files differdeleted file mode 100644 index 9f7eca41..00000000 --- a/ecomp-portal-widget-ms/1702-widgets/approx-portal-usage.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/1702-widgets/daily-app-usage-count.zip b/ecomp-portal-widget-ms/1702-widgets/daily-app-usage-count.zip Binary files differdeleted file mode 100644 index ce37c653..00000000 --- a/ecomp-portal-widget-ms/1702-widgets/daily-app-usage-count.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/1702-widgets/daily-app-usage-count2.zip b/ecomp-portal-widget-ms/1702-widgets/daily-app-usage-count2.zip Binary files differdeleted file mode 100644 index 142b412b..00000000 --- a/ecomp-portal-widget-ms/1702-widgets/daily-app-usage-count2.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/1702-widgets/widget_events.zip b/ecomp-portal-widget-ms/1702-widgets/widget_events.zip Binary files differdeleted file mode 100644 index 380a5868..00000000 --- a/ecomp-portal-widget-ms/1702-widgets/widget_events.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/1702-widgets/widget_news.zip b/ecomp-portal-widget-ms/1702-widgets/widget_news.zip Binary files differdeleted file mode 100644 index 532cf610..00000000 --- a/ecomp-portal-widget-ms/1702-widgets/widget_news.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/1702-widgets/widget_resources.zip b/ecomp-portal-widget-ms/1702-widgets/widget_resources.zip Binary files differdeleted file mode 100644 index e9de9c48..00000000 --- a/ecomp-portal-widget-ms/1702-widgets/widget_resources.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/README.md b/ecomp-portal-widget-ms/README.md index b2424dd3..aef8c901 100644 --- a/ecomp-portal-widget-ms/README.md +++ b/ecomp-portal-widget-ms/README.md @@ -1,220 +1,5 @@ -# Portl Widget Microservice +# Portal Widget Microservice -For security, the server listens only on localhost (127.0.0.1) and requires HTTP Basic -Authentication. Because no network traffic is accepted or processed (packets never leave -the host). Currently, the server uses a self signed certificate - details below. - -## Build Prerequisites - -1. Java version 1.8 -2. Maven version 3 -3. Connectivity to AT&T Maven Central - -## Run Prerequisites - -1. Java version 1.8 -2. A Mysql database using the same database as the Portal - -## Build and Package - -Use maven to build and package the microservice into a jar using this command: - - mvn clean package - -## Configuring - -All configuration parameters are entered in a file called application.properties. A version with default values can be found in the top level of this project. - -Details about the database are configured in this file. The default entries for the database configuration are shown here: - - spring.datasource.url=jdbc:mariadb:failover://{db_host:db_port/{portal_db} - spring.datasource.username={username} - spring.datasource.password=ENC({encrypted_password}) - -The HTTP server's username and password are configured in this file. Only one username/password is used to secure the REST endpoint. The default entries for the server are shown here: - - security.user.name={basic_auth_username} - security.user.password=ENC({encrypted_basic_auth_password}) - -When you package the application into a jar file and launch the microservice using that jar, the configuration file must be in the current working directory where you launch the service. - -## Generating Encrypted Passwords - -Use the following command to generate an encrypted password for the database and the -micro service. The entire command must be entered on one line; the command shown -below uses backslashes to break lines for readability: - - java -cp ~/.m2/repository/org/jasypt/jasypt/1.9.2/jasypt-1.9.2.jar \ - org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI \ - algorithm=PBEWithMD5AndDES \ - input='YourPasswordHere' \ - password='EncryptionKey' - -Note, 'YourPasswordHere' is the actual database password, as supplied in the 'password' -parameter. The value 'EncryptionKey' is used to encrypt the input, and must be supplied -at run time in one of two ways: - -* On the command line with a JVM argument "-Djasypt.encryptor.password". Here's an example -of using maven with the Spring-Boot goal: - - mvn -Djasypt.encryptor.password=EncryptionKey spring-boot:run - -Here's an example of using java and the jar file: - - java -jar dbc-microservice.jar -Djasypt.encryptor.password=EncryptionKey - -* In the application.properties file using the key jasypt.encryptor.password. For example: - - jasypt.encryptor.password=EncryptionKey - -## Development Launch - -Check the configuration properties in file src/main/resources/application.properties. Then launch the microservice for development and testing like this: - - mvn clean spring-boot:run - -## Production Launch - -Ensure a valid configuration is present in file application.properties in the current working directory. Then launch the microservice for production like this: - - widget-service.sh start - -## Supported Methods - -This micro service supports the following methods. All can be accessed with a web browser -or a REST client such as Postman. - -## Generating Encrypted Passwords - -Use the following command to generate an encrypted password for the database and the -micro service. The entire command must be entered on one line; the command shown -below uses backslashes to break lines for readability: - - java -cp ~/.m2/repository/org/jasypt/jasypt/1.9.2/jasypt-1.9.2.jar \ - org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI \ - algorithm=PBEWithMD5AndDES \ - input='YourPasswordHere' \ - password='EncryptionKey' - -Note, 'YourPasswordHere' is the actual database password, as supplied in the 'password' -parameter. The value 'EncryptionKey' is used to encrypt the input, and must be supplied -at run time in one of two ways: - -* On the command line with a JVM argument "-Djasypt.encryptor.password". Here's an example -of using maven with the Spring-Boot goal: - - mvn -Djasypt.encryptor.password=EncryptionKey spring-boot:run - -Here's an example of using java and the jar file: - - java -jar dbc-microservice.jar -Djasypt.encryptor.password=EncryptionKey - -* In the application.properties file using the key jasypt.encryptor.password. For example: - - jasypt.encryptor.password=EncryptionKey - -## Release Notes - -### Release 1702, February 2017 - -#### Consul Release Notes - -Build 1702.3.48, 5 Feb 2017 -- DE264319 - Corrected spelling for output file from 'consule.out' to 'consul.out' - Please do not miss re-deploying consul build. Widget-ms build is not enough (or required) for this bug fix to be validated. - -#### Widget-ms Release Notes - -Build 1.2.145 -- Def 143148 - fixed the defect, common widgets work on Firefox version 45 -- Def 142432 - Widget-ms: InputStream is not getting closed in file StorageServiceImpl.java - -Build 1.2.140 -- St 164888 allow partner applications to trigger a new app tab through portal -- St 164847 CCD Widgets -- Def 141951 Fixed the issue for inappropriate location of framework-template.js file -- Def 141352 Widget Onboarding Page, download icon is not clickable in FF 45 version, Revise widget upload service temporary storage to /tmp -- St 164902 One copy of framework.js hidden in the Portal instead of being part of the widgets -- St 164905 Download the widget -- St 164711 Widget Personalization: Allow user to define his/her own parameters on widgets -- St 164863 Widgets to use service onboarding feature - -Build 1702.3.86 -- MariaDB connector / failover fix - -Build 1702.3.79, 10 Feb 2017 -- Updated application.properties to correct database schema name from dbca to portal -- US799260 appended complete hostname to widget certificate for irvine -- US799260 appended complete hostname to consul config.json file in prod1 and prod2 -- US799260 fixed the bar chart issue on devn1, the bar chart shows up on devn1 Home Page - -Build 1702.3.78, 9 Feb 2017 -- US799260 fixed the firefox compatibility issue; and y-scales issue in bar chart -- US799260 Added the three new widgets in dashboard-widgets folder; removed all testing logs in all widgets; fixed a bug in widget-test - -Build 1702.3.75, 07 Feb 2017 -DE267061 - Removed a hardcoded intance of loginId used in the query. - -Build 1702.3.73, 06 Feb 2017 -DE267061 - Fixed - user should only see widgets that were uploaded against app/roles that they have OR if they were uploaded by checking All Users checkbox. -Build 1702.3.71, 5 Feb 2017 -- Important Note: Copied all these build notes from Portal WebApp to here (widget-ms) - in order not to confuse folks, we have removed Portal's build numbers for these notes. Going forward, will add widget-ms's own build number. Also note that we've changed the version series in POM.xml from 1702.0 to 1702.3 in pom.xml - Although Jenkins/SWM overrides and doesn't care about maven's versioning, but did this to synch with what Portal Web App POM. -- DE261560 Portal App: Widgets MS logs are not getting rolled over -- DE261655 Unable to delete standard widgets -- DE262487 EP-Portal App: News widget not adapting when tile size is changed by user -- DE257516 Common widgets reload in a single tab -- DE262505 Upload Duplicate Widget Issue -- DE262610 Widget Microservice logging is not following EELF guidelines -- DE262800 Issues with widget name this requires database modifications -- DE263090 Issues with widget roles -- US799260 BE now 'discovers' widget-service using Consul. If consul is not running, it fallbacks to the current implemenation which is https://localhost and the port of your choosing in system.properties - Ex: localhost:8082 -- US799260 Fix delete feature for the three special widgets news, events, resources widget can have spaces in its name -- US799260 Widget feature: - + Add the editing feature in widgetOnboarding page - + Move widget catalog and onboarding to new directories -- US811188 Log / Audit widgets logging in DB -- US818934 Allow basic authentication -- US814730 Make news / Events and Resources as widgets -- US827836 Portal Widget Framework - -## Contact - -Ikram Ikramullah - -## Certificate - -### Create self signed certificate - -1. Create a self signed certificate for the microservice -keytool -genkey -alias widget-microservice -storetype PKCS12 -keyalg RSA -keystore widget-keystore.p12 - -### Import into client's trust store - -1. Export certificate from microservice's keystore - default password is 'microservice' -keytool -exportcert -keystore widget-keystore.p12 -alias widget-microservice -file widget-cert.cer - -2. Import the exported certificate of microservice from step 1 and import it into Portal JRE's cacerts file. The location of this file is %JRE%/lib/secuirty/cacerts. - -keytool -import -trustcacerts -keystore "C:\Program Files\Java\jre1.8.0_91\lib\security\cacerts" -noprompt -alias widget-microservice -file widget-cert.cer - -OR -; -keytool -import -trustcacerts -keystore /usr/local/add-on/jdk1.8.0_60/jre/lib/security/ -noprompt -alias widget-microservice -file widget-cert.cer - -### Runing on http (not https) - -If the intent is to run this microservice without https i.e run on plain http, comment out (put a leading #) infront of all properties in 'Certificate Properties' section of application.properties - these properties are - -server.ssl.key-store=classpath:widget-keystore.p12 -server.ssl.key-store-password=ENC(DiIYnAMab4u7rEW2yKhF9zBL00uU55q8) -server.ssl.keyStoreType=PKCS12 -server.ssl.keyAlias=widget-microservice - -## Running service in docker - -a). Build docker image: mvn docker:build -b). Run the service in docker: docker run -p <port>:<port-in> -t <image-name> -c). Check running docker containers: docker ps - -## Migration Instruction -1. Due to changes in the existing tables, the user will have to remove all the existing widgets in 1702 release -2. Re-upload the latest version of widgets under dashboard-widgets folder +This directory holds the ONAP Portal Widget Microservice. +Subdirectory dashboard-widgets-os has widgets suitable for open-source use, +and subdirectory widget-ms has the Spring-Boot application that is the service. diff --git a/ecomp-portal-widget-ms/common-widgets/.gitignore b/ecomp-portal-widget-ms/common-widgets/.gitignore new file mode 100644 index 00000000..f151f08a --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/.gitignore @@ -0,0 +1,5 @@ +.classpath +.project +/.settings/ +/bin/ +target/ diff --git a/ecomp-portal-widget-ms/common-widgets/assembly-descriptor-events.xml b/ecomp-portal-widget-ms/common-widgets/assembly-descriptor-events.xml new file mode 100644 index 00000000..0ed3c98a --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/assembly-descriptor-events.xml @@ -0,0 +1,23 @@ +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 " + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance " + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 + http://maven.apache.org/xsd/assembly-1.1.2.xsd "> + <!-- second part of the final zip archive name --> + <id>widget</id> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>zip</format> + </formats> + <fileSets> + <fileSet> + <directory>${basedir}</directory> + <includes> + <include>events-widget/**</include> + </includes> + <!-- silence warning about filesystem-root relative reference --> + <outputDirectory>${file.separator}</outputDirectory> + <filtered>true</filtered> + </fileSet> + </fileSets> +</assembly> diff --git a/ecomp-portal-widget-ms/common-widgets/assembly-descriptor-news.xml b/ecomp-portal-widget-ms/common-widgets/assembly-descriptor-news.xml new file mode 100644 index 00000000..93797b66 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/assembly-descriptor-news.xml @@ -0,0 +1,23 @@ +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 " + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance " + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 + http://maven.apache.org/xsd/assembly-1.1.2.xsd "> + <!-- second part of the final zip archive name --> + <id>widget</id> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>zip</format> + </formats> + <fileSets> + <fileSet> + <directory>${basedir}</directory> + <includes> + <include>news-widget/**</include> + </includes> + <!-- silence warning about filesystem-root relative reference --> + <outputDirectory>${file.separator}</outputDirectory> + <filtered>true</filtered> + </fileSet> + </fileSets> +</assembly> diff --git a/ecomp-portal-widget-ms/common-widgets/assembly-descriptor-resources.xml b/ecomp-portal-widget-ms/common-widgets/assembly-descriptor-resources.xml new file mode 100644 index 00000000..e584a81b --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/assembly-descriptor-resources.xml @@ -0,0 +1,23 @@ +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 " + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance " + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 + http://maven.apache.org/xsd/assembly-1.1.2.xsd "> + <!-- second part of the final zip archive name --> + <id>widget</id> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>zip</format> + </formats> + <fileSets> + <fileSet> + <directory>${basedir}</directory> + <includes> + <include>resources-widget/**</include> + </includes> + <!-- silence warning about filesystem-root relative reference --> + <outputDirectory>${file.separator}</outputDirectory> + <filtered>true</filtered> + </fileSet> + </fileSets> +</assembly> diff --git a/ecomp-portal-widget-ms/common-widgets/events-widget/js/controller.js b/ecomp-portal-widget-ms/common-widgets/events-widget/js/controller.js new file mode 100644 index 00000000..8ccebeee --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/events-widget/js/controller.js @@ -0,0 +1,64 @@ +function EventsCtrl($rootScope, applicationsService , $log, + $window, userProfileService, $scope, $cookies, $timeout, $interval, + $uibModal, dashboardService, ngDialog) { + var _this = this; + + //activate spinner + this.isLoading = true; + $scope.getUserAppsIsDone = false; + this.userProfileService = userProfileService; + $scope.demoNum = 1; + $scope.event_content_show = false; + $scope.widgetData = []; + + $scope.editWidgetModalPopup = function(availableData, resourceType) { + + $scope.editData = JSON.stringify(availableData); + $scope.availableDataTemp = $scope.availableData; + ngDialog.open({ + templateUrl : 'app/views/dashboard/dashboard-widget-manage.html', + controller : 'CommonWidgetController', + resolve : { + message : function message() { + var message = { + type : resourceType, + availableData : $scope.editData + }; + return message; + } + } + }).closePromise.then(needUpdate => { + if(resourceType=='NEWS'){ + $scope.updateNews(); + }else if(resourceType=='EVENTS'){ + $scope.updateEvents(); + }else if(resourceType=='IMPORTANTRESOURCES'){ + $scope.updateImportRes(); + } + }); + }; + /*Setting News data*/ + $scope.eventData = []; + $scope.updateEvents = function() { + + $scope.eventData.length=0; + //dashboardService.getCommonWidgetData('EVENTS').then(function(res) { + var eventDataJsonArray = res.response.items; + for (var i = 0; i < eventDataJsonArray.length; i++) { + if(eventDataJsonArray[i].eventDate !=null) { + // yyyy-mm-dd + eventDataJsonArray[i].year = eventDataJsonArray[i].eventDate.substring(2,4); + eventDataJsonArray[i].mon = eventDataJsonArray[i].eventDate.substring(5,7); + eventDataJsonArray[i].day = eventDataJsonArray[i].eventDate.substring(8,10); + } + $scope.eventData.push(eventDataJsonArray[i]); + } + //})['catch'](function(err) { + // $log.error('dashboard controller: failed to get Events list', err); + // _this.isLoading = false; + //}); + } + $scope.updateEvents(); + + + } diff --git a/ecomp-portal-widget-ms/common-widgets/events-widget/markup/markup.html b/ecomp-portal-widget-ms/common-widgets/events-widget/markup/markup.html new file mode 100644 index 00000000..39715547 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/events-widget/markup/markup.html @@ -0,0 +1,49 @@ +<div id="widget-events" ng-controller="EventsCtrl" class="widget-news-main"> + <div att-gridster-item-body + class="information-section-gridsterContent"> + <div class="events"> + <ul ng-show="eventData.length!=0"> + <li ng-repeat="event in eventData"> + <div ng-click="event_content_show=!event_content_show"> + <div class="events-date">{{event.mon}}/{{event.day}}/{{event.year}} + </div> + <div> + <div class="event-title-div"> + <p ng-bind="event.title"></p> + </div> + <div> + <span class="icon-chevron-up" ng-if="event_content_show" + style="color: #888; font-size: 22px;"></span> <span + class="icon-chevron-down" ng-if="!event_content_show" + style="color: #888; font-size: 22px;"></span> + + </div> + <div style="clear: both;"></div> + </div> + </div> + <div class="events-content" ng-show="event_content_show"> + <div class="events-content-body"> + <a id="event-widget-{{event.id}}" class="events-link" ng-href="{{event.href}}" + target="_blank"> <span ng-bind="event.content"></span> + </a> + </div> + <div></div> + </div> + </li> + + + </ul> + <div ng-hide="eventData.length!=0"> + <div class="activity-error-container" + style="background: rgb(255, 255, 255); overflow: hidden !important; width: 100%;"> + <div class="activity-error-block"> + <i class="icon-information full-linear-icon-information" + style="margin-left: 125px; font-size: 90px"></i> <br> + <div class="activity-error-msg1">There's currently no + event available.</div> + </div> + </div> + </div> + </div> + </div> +</div> diff --git a/ecomp-portal-widget-ms/common-widgets/events-widget/styles/app-widget-1-by-3.css b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/app-widget-1-by-3.css new file mode 100644 index 00000000..53ac5c82 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/app-widget-1-by-3.css @@ -0,0 +1,43 @@ + +.portal-widget-panel-container { + margin-left:150px; + width:1500px; +} + + +.portal-widget-panel-fixed-panel { + min-height: 300px; + max-height: 300px; + overflow: auto; +} + +.portal-widget-panel-double-middle { + min-height: 660px; + max-height: 660px; + overflow: auto; +} + +.portal-widget-panel-row { + margin-right: 0px; + margin-left: 0px; + width: 2800px; +} + +/*Increases the width of the card/panel */ +.portal-widget-panel-panel-default { + width:450px +} + +/*Controls the spacing between the cards */ +.portal-widget-panel-col-sm-3 { + width:20.5% +} + +.portal-widget-panel-top { + top: 15px; + left: 15px; +} + +#stork-css-ready { +color: #bada55 !important; +}
\ No newline at end of file diff --git a/ecomp-portal-widget-ms/common-widgets/events-widget/styles/images/generic.png b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/images/generic.png Binary files differnew file mode 100644 index 00000000..5f06bc2e --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/images/generic.png diff --git a/ecomp-portal-widget-ms/common-widgets/events-widget/styles/images/grips.png b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/images/grips.png Binary files differnew file mode 100644 index 00000000..29b92cc5 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/images/grips.png diff --git a/ecomp-portal-widget-ms/common-widgets/events-widget/styles/styles.css b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/styles.css new file mode 100644 index 00000000..b2fbe871 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/events-widget/styles/styles.css @@ -0,0 +1,43 @@ + +.portal-widget-panel-container { + margin-left:150px; + width:1500px; +} + + +.portal-widget-panel-fixed-panel { + min-height: 300px; + max-height: 1300px; + overflow: auto; +} + +.portal-widget-panel-double-middle { + min-height: 660px; + max-height: 660px; + overflow: auto; +} + +.portal-widget-panel-row { + margin-right: 0px; + margin-left: 0px; + width: 2800px; +} + +/*Increases the width of the card/panel */ +.portal-widget-panel-panel-default { + width:450px +} + +/*Controls the spacing between the cards */ +.portal-widget-panel-col-sm-3 { + width:20.5% +} + +.portal-widget-panel-top { + top: 15px; + left: 15px; +} + +#events-css-ready { +color: #bada55 !important; +}
\ No newline at end of file diff --git a/ecomp-portal-widget-ms/common-widgets/news-widget/js/controller.js b/ecomp-portal-widget-ms/common-widgets/news-widget/js/controller.js new file mode 100644 index 00000000..13133339 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/news-widget/js/controller.js @@ -0,0 +1,60 @@ +function NewsCtrl($rootScope, applicationsService , $log, + $window, userProfileService, $scope, $cookies, $timeout, $interval, + $uibModal, dashboardService, ngDialog) { + + var _this = this; + + //activate spinner + this.isLoading = true; + $scope.getUserAppsIsDone = false; + this.userProfileService = userProfileService; + $scope.demoNum = 1; + $scope.event_content_show = false; + $scope.widgetData = []; + + $scope.editWidgetModalPopup = function(availableData, resourceType) { + + $scope.editData = JSON.stringify(availableData); + $scope.availableDataTemp = $scope.availableData; + ngDialog.open({ + templateUrl : 'app/views/dashboard/dashboard-widget-manage.html', + controller : 'CommonWidgetController', + resolve : { + message : function message() { + var message = { + type : resourceType, + availableData : $scope.editData + }; + return message; + } + } + }).closePromise.then(needUpdate => { + if(resourceType=='NEWS'){ + $scope.updateNews(); + }else if(resourceType=='EVENTS'){ + $scope.updateEvents(); + }else if(resourceType=='IMPORTANTRESOURCES'){ + $scope.updateImportRes(); + } + }); + }; + + /*Setting News data*/ + $scope.newsData = []; + $scope.updateNews = function() { + $scope.newsData.length=0; + //dashboardService.getCommonWidgetData('NEWS').then(function(res) { + // $log.info(res.message); + var newsDataJsonArray = res.response.items; + for (var i = 0; i < newsDataJsonArray.length; i++) { + $scope.newsData.push(newsDataJsonArray[i]); + } + //})['catch'](function(err) { + // $log.error('dashboard controller: failed to get news list', err); + // _this.isLoading = false; + //}); + } + $scope.updateNews(); + + } + diff --git a/ecomp-portal-widget-ms/common-widgets/news-widget/markup/markup.html b/ecomp-portal-widget-ms/common-widgets/news-widget/markup/markup.html new file mode 100644 index 00000000..c7d2df44 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/news-widget/markup/markup.html @@ -0,0 +1,21 @@ +<div id="widget-news" ng-controller="NewsCtrl" class="widget-news-main"> + <div att-gridster-item-body class="information-section-gridsterContent"> + <div class="resources"> + <ul ng-show="newsData.length!=0"> + <li ng-repeat="item in newsData"><a id="new-widget-{{item.id}}" + href="{{item.href}}" target="_blank" ng-bind="item.title"></a></li> + </ul> + <div ng-hide="newsData.length!=0"> + <div class="activity-error-container" + style="background: rgb(255, 255, 255); overflow: hidden !important; width: 100%;"> + <div class="activity-error-block"> + <i class="icon-information full-linear-icon-information" + style="margin-left: 125px; font-size: 90px"></i> <br> + <div class="activity-error-msg1">There's currently no + news available.</div> + </div> + </div> + </div> + </div> + </div> +</div> diff --git a/ecomp-portal-widget-ms/common-widgets/news-widget/styles/app-widget-1-by-3.css b/ecomp-portal-widget-ms/common-widgets/news-widget/styles/app-widget-1-by-3.css new file mode 100644 index 00000000..53ac5c82 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/news-widget/styles/app-widget-1-by-3.css @@ -0,0 +1,43 @@ + +.portal-widget-panel-container { + margin-left:150px; + width:1500px; +} + + +.portal-widget-panel-fixed-panel { + min-height: 300px; + max-height: 300px; + overflow: auto; +} + +.portal-widget-panel-double-middle { + min-height: 660px; + max-height: 660px; + overflow: auto; +} + +.portal-widget-panel-row { + margin-right: 0px; + margin-left: 0px; + width: 2800px; +} + +/*Increases the width of the card/panel */ +.portal-widget-panel-panel-default { + width:450px +} + +/*Controls the spacing between the cards */ +.portal-widget-panel-col-sm-3 { + width:20.5% +} + +.portal-widget-panel-top { + top: 15px; + left: 15px; +} + +#stork-css-ready { +color: #bada55 !important; +}
\ No newline at end of file diff --git a/ecomp-portal-widget-ms/common-widgets/news-widget/styles/app-widget.css b/ecomp-portal-widget-ms/common-widgets/news-widget/styles/app-widget.css new file mode 100644 index 00000000..0fbc8758 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/news-widget/styles/app-widget.css @@ -0,0 +1,43 @@ + +.portal-widget-panel-container { + margin-left:150px; + width:1500px; +} + + +.portal-widget-panel-fixed-panel { + min-height: 300px; + max-height: 1300px; + overflow: auto; +} + +.portal-widget-panel-double-middle { + min-height: 660px; + max-height: 660px; + overflow: auto; +} + +.portal-widget-panel-row { + margin-right: 0px; + margin-left: 0px; + width: 2800px; +} + +/*Increases the width of the card/panel */ +.portal-widget-panel-panel-default { + width:450px +} + +/*Controls the spacing between the cards */ +.portal-widget-panel-col-sm-3 { + width:20.5% +} + +.portal-widget-panel-top { + top: 15px; + left: 15px; +} + +#stork-css-ready { +color: #bada55 !important; +}
\ No newline at end of file diff --git a/ecomp-portal-widget-ms/common-widgets/news-widget/styles/images/generic.png b/ecomp-portal-widget-ms/common-widgets/news-widget/styles/images/generic.png Binary files differnew file mode 100644 index 00000000..5f06bc2e --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/news-widget/styles/images/generic.png diff --git a/ecomp-portal-widget-ms/common-widgets/news-widget/styles/images/grips.png b/ecomp-portal-widget-ms/common-widgets/news-widget/styles/images/grips.png Binary files differnew file mode 100644 index 00000000..29b92cc5 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/news-widget/styles/images/grips.png diff --git a/ecomp-portal-widget-ms/common-widgets/news-widget/styles/style.css b/ecomp-portal-widget-ms/common-widgets/news-widget/styles/style.css new file mode 100644 index 00000000..e7c07d59 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/news-widget/styles/style.css @@ -0,0 +1,43 @@ + +.portal-widget-panel-container { + margin-left:150px; + width:1500px; +} + + +.portal-widget-panel-fixed-panel { + min-height: 300px; + max-height: 1300px; + overflow: auto; +} + +.portal-widget-panel-double-middle { + min-height: 660px; + max-height: 660px; + overflow: auto; +} + +.portal-widget-panel-row { + margin-right: 0px; + margin-left: 0px; + width: 2800px; +} + +/*Increases the width of the card/panel */ +.portal-widget-panel-panel-default { + width:450px +} + +/*Controls the spacing between the cards */ +.portal-widget-panel-col-sm-3 { + width:20.5% +} + +.portal-widget-panel-top { + top: 15px; + left: 15px; +} + +#-css-ready { +color: #bada55 !important; +}
\ No newline at end of file diff --git a/ecomp-portal-widget-ms/common-widgets/news-widget/styles/styles.css b/ecomp-portal-widget-ms/common-widgets/news-widget/styles/styles.css new file mode 100644 index 00000000..e7c07d59 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/news-widget/styles/styles.css @@ -0,0 +1,43 @@ + +.portal-widget-panel-container { + margin-left:150px; + width:1500px; +} + + +.portal-widget-panel-fixed-panel { + min-height: 300px; + max-height: 1300px; + overflow: auto; +} + +.portal-widget-panel-double-middle { + min-height: 660px; + max-height: 660px; + overflow: auto; +} + +.portal-widget-panel-row { + margin-right: 0px; + margin-left: 0px; + width: 2800px; +} + +/*Increases the width of the card/panel */ +.portal-widget-panel-panel-default { + width:450px +} + +/*Controls the spacing between the cards */ +.portal-widget-panel-col-sm-3 { + width:20.5% +} + +.portal-widget-panel-top { + top: 15px; + left: 15px; +} + +#-css-ready { +color: #bada55 !important; +}
\ No newline at end of file diff --git a/ecomp-portal-widget-ms/common-widgets/pom.xml b/ecomp-portal-widget-ms/common-widgets/pom.xml new file mode 100644 index 00000000..a71c5ac5 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/pom.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.openecomp.portal</groupId> + <artifactId>widget-ms-widgets-os</artifactId> + <version>1.3.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> + + <build> + + <plugins> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <!-- <version>2.4</version> --> + <executions> + <execution> + <id>events</id> + <phase>prepare-package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptor>assembly-descriptor-events.xml</descriptor> + <!-- final zip archive name --> + <finalName>events-widget</finalName> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + <execution> + <id>news</id> + <phase>prepare-package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptor>assembly-descriptor-news.xml</descriptor> + <!-- final zip archive name --> + <finalName>news-widget</finalName> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + <execution> + <id>resources</id> + <phase>prepare-package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptor>assembly-descriptor-resources.xml</descriptor> + <!-- final zip archive name --> + <finalName>resources-widget</finalName> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + </executions> + </plugin> + + <!-- No deployment step for this project --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + + </plugins> + + </build> + +</project> diff --git a/ecomp-portal-widget-ms/common-widgets/resources-widget/js/controller.js b/ecomp-portal-widget-ms/common-widgets/resources-widget/js/controller.js new file mode 100644 index 00000000..13133339 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/resources-widget/js/controller.js @@ -0,0 +1,60 @@ +function NewsCtrl($rootScope, applicationsService , $log, + $window, userProfileService, $scope, $cookies, $timeout, $interval, + $uibModal, dashboardService, ngDialog) { + + var _this = this; + + //activate spinner + this.isLoading = true; + $scope.getUserAppsIsDone = false; + this.userProfileService = userProfileService; + $scope.demoNum = 1; + $scope.event_content_show = false; + $scope.widgetData = []; + + $scope.editWidgetModalPopup = function(availableData, resourceType) { + + $scope.editData = JSON.stringify(availableData); + $scope.availableDataTemp = $scope.availableData; + ngDialog.open({ + templateUrl : 'app/views/dashboard/dashboard-widget-manage.html', + controller : 'CommonWidgetController', + resolve : { + message : function message() { + var message = { + type : resourceType, + availableData : $scope.editData + }; + return message; + } + } + }).closePromise.then(needUpdate => { + if(resourceType=='NEWS'){ + $scope.updateNews(); + }else if(resourceType=='EVENTS'){ + $scope.updateEvents(); + }else if(resourceType=='IMPORTANTRESOURCES'){ + $scope.updateImportRes(); + } + }); + }; + + /*Setting News data*/ + $scope.newsData = []; + $scope.updateNews = function() { + $scope.newsData.length=0; + //dashboardService.getCommonWidgetData('NEWS').then(function(res) { + // $log.info(res.message); + var newsDataJsonArray = res.response.items; + for (var i = 0; i < newsDataJsonArray.length; i++) { + $scope.newsData.push(newsDataJsonArray[i]); + } + //})['catch'](function(err) { + // $log.error('dashboard controller: failed to get news list', err); + // _this.isLoading = false; + //}); + } + $scope.updateNews(); + + } + diff --git a/ecomp-portal-widget-ms/common-widgets/resources-widget/markup/markup.html b/ecomp-portal-widget-ms/common-widgets/resources-widget/markup/markup.html new file mode 100644 index 00000000..ce27632e --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/resources-widget/markup/markup.html @@ -0,0 +1,21 @@ +<div id="widget-news" ng-controller="NewsCtrl" class="widget-news-main"> + <div att-gridster-item-body class="information-section-gridsterContent"> + <div class="resources"> + <ul ng-show="newsData.length!=0"> + <li ng-repeat="item in newsData"><a id="resource-widget-{{item.id}}" + href="{{item.href}}" target="_blank" ng-bind="item.title"></a></li> + </ul> + <div ng-hide="newsData.length!=0"> + <div class="activity-error-container" + style="background: rgb(255, 255, 255); overflow: hidden !important; width: 100%;"> + <div class="activity-error-block"> + <i class="icon-information full-linear-icon-information" + style="margin-left: 125px; font-size: 90px"></i> <br> + <div class="activity-error-msg1">There's currently no + news available.</div> + </div> + </div> + </div> + </div> + </div> +</div> diff --git a/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/app-widget-1-by-3.css b/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/app-widget-1-by-3.css new file mode 100644 index 00000000..53ac5c82 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/app-widget-1-by-3.css @@ -0,0 +1,43 @@ + +.portal-widget-panel-container { + margin-left:150px; + width:1500px; +} + + +.portal-widget-panel-fixed-panel { + min-height: 300px; + max-height: 300px; + overflow: auto; +} + +.portal-widget-panel-double-middle { + min-height: 660px; + max-height: 660px; + overflow: auto; +} + +.portal-widget-panel-row { + margin-right: 0px; + margin-left: 0px; + width: 2800px; +} + +/*Increases the width of the card/panel */ +.portal-widget-panel-panel-default { + width:450px +} + +/*Controls the spacing between the cards */ +.portal-widget-panel-col-sm-3 { + width:20.5% +} + +.portal-widget-panel-top { + top: 15px; + left: 15px; +} + +#stork-css-ready { +color: #bada55 !important; +}
\ No newline at end of file diff --git a/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/app-widget.css b/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/app-widget.css new file mode 100644 index 00000000..0fbc8758 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/app-widget.css @@ -0,0 +1,43 @@ + +.portal-widget-panel-container { + margin-left:150px; + width:1500px; +} + + +.portal-widget-panel-fixed-panel { + min-height: 300px; + max-height: 1300px; + overflow: auto; +} + +.portal-widget-panel-double-middle { + min-height: 660px; + max-height: 660px; + overflow: auto; +} + +.portal-widget-panel-row { + margin-right: 0px; + margin-left: 0px; + width: 2800px; +} + +/*Increases the width of the card/panel */ +.portal-widget-panel-panel-default { + width:450px +} + +/*Controls the spacing between the cards */ +.portal-widget-panel-col-sm-3 { + width:20.5% +} + +.portal-widget-panel-top { + top: 15px; + left: 15px; +} + +#stork-css-ready { +color: #bada55 !important; +}
\ No newline at end of file diff --git a/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/images/generic.png b/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/images/generic.png Binary files differnew file mode 100644 index 00000000..5f06bc2e --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/images/generic.png diff --git a/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/images/grips.png b/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/images/grips.png Binary files differnew file mode 100644 index 00000000..29b92cc5 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/images/grips.png diff --git a/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/style.css b/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/style.css new file mode 100644 index 00000000..e7c07d59 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/style.css @@ -0,0 +1,43 @@ + +.portal-widget-panel-container { + margin-left:150px; + width:1500px; +} + + +.portal-widget-panel-fixed-panel { + min-height: 300px; + max-height: 1300px; + overflow: auto; +} + +.portal-widget-panel-double-middle { + min-height: 660px; + max-height: 660px; + overflow: auto; +} + +.portal-widget-panel-row { + margin-right: 0px; + margin-left: 0px; + width: 2800px; +} + +/*Increases the width of the card/panel */ +.portal-widget-panel-panel-default { + width:450px +} + +/*Controls the spacing between the cards */ +.portal-widget-panel-col-sm-3 { + width:20.5% +} + +.portal-widget-panel-top { + top: 15px; + left: 15px; +} + +#-css-ready { +color: #bada55 !important; +}
\ No newline at end of file diff --git a/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/styles.css b/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/styles.css new file mode 100644 index 00000000..e7c07d59 --- /dev/null +++ b/ecomp-portal-widget-ms/common-widgets/resources-widget/styles/styles.css @@ -0,0 +1,43 @@ + +.portal-widget-panel-container { + margin-left:150px; + width:1500px; +} + + +.portal-widget-panel-fixed-panel { + min-height: 300px; + max-height: 1300px; + overflow: auto; +} + +.portal-widget-panel-double-middle { + min-height: 660px; + max-height: 660px; + overflow: auto; +} + +.portal-widget-panel-row { + margin-right: 0px; + margin-left: 0px; + width: 2800px; +} + +/*Increases the width of the card/panel */ +.portal-widget-panel-panel-default { + width:450px +} + +/*Controls the spacing between the cards */ +.portal-widget-panel-col-sm-3 { + width:20.5% +} + +.portal-widget-panel-top { + top: 15px; + left: 15px; +} + +#-css-ready { +color: #bada55 !important; +}
\ No newline at end of file diff --git a/ecomp-portal-widget-ms/dashboard-widgets/approx-portal-usage.zip b/ecomp-portal-widget-ms/dashboard-widgets/approx-portal-usage.zip Binary files differdeleted file mode 100644 index ce0f1a89..00000000 --- a/ecomp-portal-widget-ms/dashboard-widgets/approx-portal-usage.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/dashboard-widgets/approx-portal-usage2.zip b/ecomp-portal-widget-ms/dashboard-widgets/approx-portal-usage2.zip Binary files differdeleted file mode 100644 index 3d31a00f..00000000 --- a/ecomp-portal-widget-ms/dashboard-widgets/approx-portal-usage2.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/dashboard-widgets/ccd_widget.zip b/ecomp-portal-widget-ms/dashboard-widgets/ccd_widget.zip Binary files differdeleted file mode 100644 index 03b4f76f..00000000 --- a/ecomp-portal-widget-ms/dashboard-widgets/ccd_widget.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/dashboard-widgets/daily-app-usage-count.zip b/ecomp-portal-widget-ms/dashboard-widgets/daily-app-usage-count.zip Binary files differdeleted file mode 100644 index ab023cb4..00000000 --- a/ecomp-portal-widget-ms/dashboard-widgets/daily-app-usage-count.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/dashboard-widgets/events-widget.zip b/ecomp-portal-widget-ms/dashboard-widgets/events-widget.zip Binary files differdeleted file mode 100644 index bddee8ec..00000000 --- a/ecomp-portal-widget-ms/dashboard-widgets/events-widget.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/dashboard-widgets/news-widget.zip b/ecomp-portal-widget-ms/dashboard-widgets/news-widget.zip Binary files differdeleted file mode 100644 index 2d367c89..00000000 --- a/ecomp-portal-widget-ms/dashboard-widgets/news-widget.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/dashboard-widgets/resources-widget.zip b/ecomp-portal-widget-ms/dashboard-widgets/resources-widget.zip Binary files differdeleted file mode 100644 index d2ada049..00000000 --- a/ecomp-portal-widget-ms/dashboard-widgets/resources-widget.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/java b/ecomp-portal-widget-ms/java deleted file mode 100644 index e69de29b..00000000 --- a/ecomp-portal-widget-ms/java +++ /dev/null diff --git a/ecomp-portal-widget-ms/pom.xml b/ecomp-portal-widget-ms/pom.xml index 5438ad13..d2c72fb3 100644 --- a/ecomp-portal-widget-ms/pom.xml +++ b/ecomp-portal-widget-ms/pom.xml @@ -3,164 +3,30 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.openecomp.portal</groupId> - <artifactId>widget-ms</artifactId> - <version>1.2</version> - <packaging>jar</packaging> - <name>ecompportal-widget-microservice</name> - - <parent> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-parent</artifactId> - <version>1.4.2.RELEASE</version> - <relativePath /> <!-- lookup parent from repository --> - </parent> - - <properties> - <docker.imagename>widget-ms</docker.imagename> - <docker.host>zlp11313.vci.att.com</docker.host> - <docker.port>5100</docker.port> - <docker.namespace>com.att.ecompportal</docker.namespace> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <java.version>1.8</java.version> - <hibernate.version>4.3.11.Final</hibernate.version> - <!-- docker.image.prefix>${docker.host}:${docker.port}/${docker.namespace}</docker.image.prefix --> - <docker.image.prefix>${docker.host}:${docker.port}/${docker.namespace}</docker.image.prefix> - - </properties> - - <dependencies> - <dependency> - <!-- Setup Spring Data JPA Repository support --> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-jpa</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-security</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-thymeleaf</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-devtools</artifactId> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-configuration-processor</artifactId> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${hibernate.version}</version> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter</artifactId> - </dependency> - - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - </dependency> - - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.10</version> - </dependency> - - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - <version>1.5.8</version> - </dependency> - <dependency> - <groupId>com.github.ulisesbocchio</groupId> - <artifactId>jasypt-spring-boot-starter</artifactId> - <version>1.9</version> - </dependency> - - <!-- - hibernate-core depends on dom4j, which has optional dependencies. - On jenkins, contrary to doc, mvn 3.0.5 packages the optional - dependencies in the war. Workaround: exclude them explicitly. - --> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - <exclusions> - <exclusion> - <groupId>jaxme</groupId> - <artifactId>jaxme-api</artifactId> - </exclusion> - <exclusion> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - </exclusion> - <exclusion> - <groupId>msv</groupId> - <artifactId>xsdlib</artifactId> - </exclusion> - <exclusion> - <groupId>msv</groupId> - <artifactId>relaxngDatatype</artifactId> - </exclusion> - <exclusion> - <groupId>pull-parser</groupId> - <artifactId>pull-parser</artifactId> - </exclusion> - <exclusion> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - </exclusion> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - </dependencies> - - <build> - - <finalName>${project.artifactId}</finalName> - - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - </plugin> - - <plugin> - <groupId>com.spotify</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.4.11</version> - <configuration> - <imageName>${project.artifactId}</imageName> - <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory> - <resources> - <resource> - <targetPath>/</targetPath> - <directory>${project.build.directory}</directory> - <include>${project.build.finalName}.jar</include> - </resource> - </resources> - </configuration> - </plugin> - </plugins> - </build> - + <artifactId>widget-ms-parent</artifactId> + <version>1.3.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <modules> + <!-- Child modules do NOT name this parent. --> + <!-- Defined for build convenience only! --> + <!-- This POM names only ONAP projects --> + <module>common-widgets</module> + <module>widget-ms</module> + </modules> + + <build> + <plugins> + <!-- No deployment step for this project --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/utils/UnzipUtil.java b/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/utils/UnzipUtil.java deleted file mode 100644 index efbfe437..00000000 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/utils/UnzipUtil.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.openecomp.portalapp.widget.utils; - -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.HashMap; -import java.util.Map; -import java.util.Stack; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; - -import org.openecomp.portalapp.widget.constant.WidgetConstant; -import org.openecomp.portalapp.widget.service.impl.StorageServiceImpl; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -public class UnzipUtil { - - /** - * Size of the buffer to read/write data - */ - private static final int BUFFER_SIZE = 4096; - private static final Logger logger = LoggerFactory.getLogger(UnzipUtil.class); - /** - * Extracts a zip file specified by the zipFilePath to a directory specified by - * destDirectory (will be created if does not exists) - * @param zipFilePath - * @param destDirectory - * @throws IOException - */ - - public Map<String, byte[]> unzip_db(String zipFilePath, String destDirectory, String widgetName) throws IOException { - - logger.debug("UnzipUtil.unzip_db: unzip widget file {}", widgetName); - File destDir = new File(destDirectory); - if (!destDir.exists()) { - destDir.mkdir(); - } - ZipInputStream zipIn = new ZipInputStream(new FileInputStream(zipFilePath)); - ZipEntry entry = zipIn.getNextEntry(); - Map<String, byte[]> map = new HashMap<>(); - - map.put(WidgetConstant.WIDGET_CONTROLLER_LOCATION, null); - map.put(WidgetConstant.WIDGET_MARKUP_LOCATION, null); - map.put(WidgetConstant.WIDGET_STYLE_LOCATION, null); - - - Stack<File> stack = new Stack<>(); - - // iterates over entries in the zip file - while (entry != null) { - String filePath = destDirectory + File.separator + widgetName + File.separator + - entry.getName().substring(entry.getName().indexOf("/")+1); - logger.debug("UnzipUtil.unzip_db: file path " + filePath); - if (!entry.isDirectory()) { - // if the entry is a file, extracts it - logger.debug("UnzipUtil.unzip_db: unzip and save widget file {}", filePath); - stack.push(new File(filePath)); - extractFile(zipIn, filePath); - } else { - // if the entry is a directory, make the directory - logger.debug("UnzipUtil.unzip_db: unzip and create widget folder {}", filePath); - File dir = new File(filePath); - stack.push(new File(filePath)); - - dir.mkdir(); - - } - if(map.containsKey(entry.getName().substring(entry.getName().indexOf("/")+1))){ - map.put(entry.getName().substring(entry.getName().indexOf("/")+1), Files.readAllBytes(Paths.get(filePath))); - } - zipIn.closeEntry(); - entry = zipIn.getNextEntry(); - } - zipIn.close(); - while(!stack.isEmpty()) - stack.pop().delete(); - return map; - } - - - - - /** - * Extracts a zip entry (file entry) - * @param zipIn - * @param filePath - * @throws IOException - */ - private void extractFile(ZipInputStream zipIn, String filePath) throws IOException { - BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(filePath)); - byte[] bytesIn = new byte[BUFFER_SIZE]; - int read = 0; - while ((read = zipIn.read(bytesIn)) != -1) { - bos.write(bytesIn, 0, read); - } - bos.close(); - } -}
\ No newline at end of file diff --git a/ecomp-portal-widget-ms/src/main/resources/events-widget.zip b/ecomp-portal-widget-ms/src/main/resources/events-widget.zip Binary files differdeleted file mode 100644 index bddee8ec..00000000 --- a/ecomp-portal-widget-ms/src/main/resources/events-widget.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/src/main/resources/news-widget.zip b/ecomp-portal-widget-ms/src/main/resources/news-widget.zip Binary files differdeleted file mode 100644 index 2d367c89..00000000 --- a/ecomp-portal-widget-ms/src/main/resources/news-widget.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/src/main/resources/resources-widget.zip b/ecomp-portal-widget-ms/src/main/resources/resources-widget.zip Binary files differdeleted file mode 100644 index d2ada049..00000000 --- a/ecomp-portal-widget-ms/src/main/resources/resources-widget.zip +++ /dev/null diff --git a/ecomp-portal-widget-ms/widget-ms/.gitignore b/ecomp-portal-widget-ms/widget-ms/.gitignore new file mode 100644 index 00000000..172a425c --- /dev/null +++ b/ecomp-portal-widget-ms/widget-ms/.gitignore @@ -0,0 +1,39 @@ +.classpath +.project +/bin/ +target/ +logs/ +DEV_HOME_IS_UNDEFINED/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.factorypath +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ + +/target/ +/catalina.base_IS_UNDEFINED/ +.mvn +.settings/ +.springBeans +bin/ +debug-logs/ +logs/ +/application.properties +mvnw +mvnw.cmd diff --git a/ecomp-portal-widget-ms/widget-ms/README.md b/ecomp-portal-widget-ms/widget-ms/README.md new file mode 100644 index 00000000..ceb9dd2b --- /dev/null +++ b/ecomp-portal-widget-ms/widget-ms/README.md @@ -0,0 +1,189 @@ +# Portal Widget Microservice + +For security, the server listens only on localhost (127.0.0.1) and requires HTTP Basic +Authentication. No outside network traffic is accepted or processed (packets never leave +the host). Currently, the server uses a self signed certificate - details below. + +## Build Prerequisites + +1. Java version 1.8 +2. Maven version 3 +3. Connectivity to AT&T Maven Central + +## Run Prerequisites + +1. Java version 1.8 +2. A Mysql database using the same database as the Portal + +## Build and Package + +Use maven to build and package the microservice into a jar using this command: + + mvn clean package + +## Configuring + +All configuration parameters are entered in a file called application.properties. A version with default values can be found in the top level of this project. + +Details about the database are configured in this file. The default entries for the database configuration are shown here: + + spring.datasource.url=jdbc:mariadb:failover://{db_host:db_port/{portal_db} + spring.datasource.username={username} + spring.datasource.password=ENC({encrypted_password}) + +The HTTP server's username and password are configured in this file. Only one username/password is used to secure the REST endpoint. The default entries for the server are shown here: + + security.user.name={basic_auth_username} + security.user.password=ENC({encrypted_basic_auth_password}) + +When you package the application into a jar file and launch the microservice using that jar, the configuration file must be in the current working directory where you launch the service. + +## Generating Encrypted Passwords + +Use the following command to generate an encrypted password for the database and the +micro service. The entire command must be entered on one line; the command shown +below uses backslashes to break lines for readability: + + java -cp ~/.m2/repository/org/jasypt/jasypt/1.9.2/jasypt-1.9.2.jar \ + org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI \ + algorithm=PBEWithMD5AndDES \ + input='YourPasswordHere' \ + password='EncryptionKey' + +Note, 'YourPasswordHere' is the actual database password, as supplied in the 'password' +parameter. The value 'EncryptionKey' is used to encrypt the input, and must be supplied +at run time in one of two ways: + +* On the command line with a JVM argument "-Djasypt.encryptor.password". Here's an example +of using maven with the Spring-Boot goal: + + mvn -Djasypt.encryptor.password=EncryptionKey spring-boot:run + +Here's an example of using java and the jar file: + + java -jar dbc-microservice.jar -Djasypt.encryptor.password=EncryptionKey + +* In the application.properties file using the key jasypt.encryptor.password. For example: + + jasypt.encryptor.password=EncryptionKey + +## Development Launch + +Check the configuration properties in file src/main/resources/application.properties. Then launch the microservice for development and testing like this: + + mvn clean spring-boot:run + +## Production Launch + +Ensure a valid configuration is present in file application.properties in the current working directory. Then launch the microservice for production like this: + + widget-service.sh start + +## Release Notes + +### Release 1702, February 2017 + +#### Consul Release Notes + +Build 1702.3.48, 5 Feb 2017 +- DE264319 - Corrected spelling for output file from 'consule.out' to 'consul.out' - Please do not miss re-deploying consul build. Widget-ms build is not enough (or required) for this bug fix to be validated. + +#### Widget-ms Release Notes + +Build 1.2.175 +- Def 120258 Fixed the widget displaying issues in Internet Explorer 11 + +Build 1.2.145 +- Def 143148 - fixed the defect, common widgets work on Firefox version 45 +- Def 142432 - Widget-ms: InputStream is not getting closed in file StorageServiceImpl.java + +Build 1.2.140 +- St 164888 allow partner applications to trigger a new app tab through portal +- St 164847 CCD Widgets +- Def 141951 Fixed the issue for inappropriate location of framework-template.js file +- Def 141352 Widget Onboarding Page, download icon is not clickable in FF 45 version, Revise widget upload service temporary storage to /tmp +- St 164902 One copy of framework.js hidden in the Portal instead of being part of the widgets +- St 164905 Download the widget +- St 164711 Widget Personalization: Allow user to define his/her own parameters on widgets +- St 164863 Widgets to use service onboarding feature + +Build 1702.3.86 +- MariaDB connector / failover fix + +Build 1702.3.79, 10 Feb 2017 +- Updated application.properties to correct database schema name from dbca to portal +- US799260 appended complete hostname to widget certificate for irvine +- US799260 appended complete hostname to consul config.json file in prod1 and prod2 +- US799260 fixed the bar chart issue on devn1, the bar chart shows up on devn1 Home Page + +Build 1702.3.78, 9 Feb 2017 +- US799260 fixed the firefox compatibility issue; and y-scales issue in bar chart +- US799260 Added the three new widgets in dashboard-widgets folder; removed all testing logs in all widgets; fixed a bug in widget-test + +Build 1702.3.75, 07 Feb 2017 +DE267061 - Removed a hardcoded intance of loginId used in the query. + +Build 1702.3.73, 06 Feb 2017 +DE267061 - Fixed - user should only see widgets that were uploaded against app/roles that they have OR if they were uploaded by checking All Users checkbox. +Build 1702.3.71, 5 Feb 2017 +- Important Note: Copied all these build notes from Portal WebApp to here (widget-ms) - in order not to confuse folks, we have removed Portal's build numbers for these notes. Going forward, will add widget-ms's own build number. Also note that we've changed the version series in POM.xml from 1702.0 to 1702.3 in pom.xml - Although Jenkins/SWM overrides and doesn't care about maven's versioning, but did this to synch with what Portal Web App POM. +- DE261560 Portal App: Widgets MS logs are not getting rolled over +- DE261655 Unable to delete standard widgets +- DE262487 EP-Portal App: News widget not adapting when tile size is changed by user +- DE257516 Common widgets reload in a single tab +- DE262505 Upload Duplicate Widget Issue +- DE262610 Widget Microservice logging is not following EELF guidelines +- DE262800 Issues with widget name this requires database modifications +- DE263090 Issues with widget roles +- US799260 BE now 'discovers' widget-service using Consul. If consul is not running, it fallbacks to the current implemenation which is https://localhost and the port of your choosing in system.properties - Ex: localhost:8082 +- US799260 Fix delete feature for the three special widgets news, events, resources widget can have spaces in its name +- US799260 Widget feature: + + Add the editing feature in widgetOnboarding page + + Move widget catalog and onboarding to new directories +- US811188 Log / Audit widgets logging in DB +- US818934 Allow basic authentication +- US814730 Make news / Events and Resources as widgets +- US827836 Portal Widget Framework + +## Contact + +Ikram Ikramullah + +## Certificate + +### Create self signed certificate + +1. Create a self signed certificate for the microservice +keytool -genkey -alias widget-microservice -storetype PKCS12 -keyalg RSA -keystore widget-keystore.p12 + +### Import into client's trust store + +1. Export certificate from microservice's keystore - default password is 'microservice' +keytool -exportcert -keystore widget-keystore.p12 -alias widget-microservice -file widget-cert.cer + +2. Import the exported certificate of microservice from step 1 and import it into Portal JRE's cacerts file. The location of this file is %JRE%/lib/secuirty/cacerts. + +keytool -import -trustcacerts -keystore "C:\Program Files\Java\jre1.8.0_91\lib\security\cacerts" -noprompt -alias widget-microservice -file widget-cert.cer + +OR +; +keytool -import -trustcacerts -keystore /usr/local/add-on/jdk1.8.0_60/jre/lib/security/ -noprompt -alias widget-microservice -file widget-cert.cer + +### Runing on http (not https) + +If the intent is to run this microservice without https i.e run on plain http, comment out (put a leading #) infront of all properties in 'Certificate Properties' section of application.properties - these properties are + +server.ssl.key-store=classpath:widget-keystore.p12 +server.ssl.key-store-password=ENC(DiIYnAMab4u7rEW2yKhF9zBL00uU55q8) +server.ssl.keyStoreType=PKCS12 +server.ssl.keyAlias=widget-microservice + +## Running service in docker + +a). Build docker image: mvn docker:build +b). Run the service in docker: docker run -p <port>:<port-in> -t <image-name> +c). Check running docker containers: docker ps + +## Migration Instruction +1. Due to changes in the existing tables, the user will have to remove all the existing widgets in 1702 release +2. Re-upload the latest version of widgets under dashboard-widgets folder diff --git a/ecomp-portal-widget-ms/docs/Deployment Guide Portal Microservices and Consul.docx b/ecomp-portal-widget-ms/widget-ms/docs/Deployment Guide Portal Microservices and Consul.docx Binary files differindex 683b1e92..683b1e92 100644 --- a/ecomp-portal-widget-ms/docs/Deployment Guide Portal Microservices and Consul.docx +++ b/ecomp-portal-widget-ms/widget-ms/docs/Deployment Guide Portal Microservices and Consul.docx diff --git a/ecomp-portal-widget-ms/widget-ms/pom.xml b/ecomp-portal-widget-ms/widget-ms/pom.xml new file mode 100644 index 00000000..14820b65 --- /dev/null +++ b/ecomp-portal-widget-ms/widget-ms/pom.xml @@ -0,0 +1,170 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.openecomp.portal</groupId> + <artifactId>widget-ms</artifactId> + <version>1.3.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>widget-microservice</name> + + <parent> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-parent</artifactId> + <version>1.4.2.RELEASE</version> + <relativePath /> <!-- lookup parent from repository --> + </parent> + + <properties> + <docker.imagename>widget-ms</docker.imagename> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <java.version>1.8</java.version> + <hibernate.version>4.3.11.Final</hibernate.version> + <skipTests>true</skipTests> + </properties> + + <dependencies> + <dependency> + <!-- Setup Spring Data JPA Repository support --> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-data-jpa</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-security</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-thymeleaf</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-devtools</artifactId> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-configuration-processor</artifactId> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <!-- <version>${hibernate.version}</version> --> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <!-- <version>1.10</version> --> + </dependency> + <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <!-- <version>1.5.8</version> --> + </dependency> + <dependency> + <groupId>com.github.ulisesbocchio</groupId> + <artifactId>jasypt-spring-boot-starter</artifactId> + <version>1.9</version> + </dependency> + <!-- hibernate-core depends on dom4j, which has optional dependencies. + On jenkins, contrary to doc, mvn 3.0.5 packages the optional dependencies + in the war. Workaround: exclude them explicitly. --> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <!-- <version>1.6.1</version> --> + <exclusions> + <exclusion> + <groupId>jaxme</groupId> + <artifactId>jaxme-api</artifactId> + </exclusion> + <exclusion> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + </exclusion> + <exclusion> + <groupId>msv</groupId> + <artifactId>xsdlib</artifactId> + </exclusion> + <exclusion> + <groupId>msv</groupId> + <artifactId>relaxngDatatype</artifactId> + </exclusion> + <exclusion> + <groupId>pull-parser</groupId> + <artifactId>pull-parser</artifactId> + </exclusion> + <exclusion> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + </exclusion> + <exclusion> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <build> + + <finalName>${project.artifactId}</finalName> + + <!-- To add resources, must name all including usual src/main/resources --> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>../common-widgets/target</directory> + <includes> + <include>**/*.zip</include> + </includes> + </resource> + </resources> + + <plugins> + + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + </plugin> + + <plugin> + <groupId>com.spotify</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.4.11</version> + <configuration> + <imageName>${project.artifactId}</imageName> + <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory> + <resources> + <resource> + <targetPath>/</targetPath> + <directory>${project.build.directory}</directory> + <include>${project.build.finalName}.jar</include> + </resource> + </resources> + </configuration> + </plugin> + + </plugins> + + </build> + +</project> diff --git a/ecomp-portal-widget-ms/src/main/certificates/be1/widget-keystore.p12 b/ecomp-portal-widget-ms/widget-ms/src/main/certificates/be1/widget-keystore.p12 Binary files differindex 9dcdb1a0..9dcdb1a0 100644 --- a/ecomp-portal-widget-ms/src/main/certificates/be1/widget-keystore.p12 +++ b/ecomp-portal-widget-ms/widget-ms/src/main/certificates/be1/widget-keystore.p12 diff --git a/ecomp-portal-widget-ms/src/main/certificates/be2/widget-keystore.p12 b/ecomp-portal-widget-ms/widget-ms/src/main/certificates/be2/widget-keystore.p12 Binary files differindex 600dc01d..600dc01d 100644 --- a/ecomp-portal-widget-ms/src/main/certificates/be2/widget-keystore.p12 +++ b/ecomp-portal-widget-ms/widget-ms/src/main/certificates/be2/widget-keystore.p12 diff --git a/ecomp-portal-widget-ms/src/main/docker/Dockerfile b/ecomp-portal-widget-ms/widget-ms/src/main/docker/Dockerfile index 7e25c222..7e25c222 100644 --- a/ecomp-portal-widget-ms/src/main/docker/Dockerfile +++ b/ecomp-portal-widget-ms/widget-ms/src/main/docker/Dockerfile diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/MicroserviceApplication.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/MicroserviceApplication.java index eb1e7844..6516c364 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/MicroserviceApplication.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/MicroserviceApplication.java @@ -2,7 +2,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.web.client.RestTemplate; diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/constant/WidgetConstant.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/constant/WidgetConstant.java index 3cd95b8e..b1a939b1 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/constant/WidgetConstant.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/constant/WidgetConstant.java @@ -1,7 +1,5 @@ package org.openecomp.portalapp.widget.constant; -import java.io.File; - public final class WidgetConstant { public static final String WIDGET_MARKUP_LOCATION = "markup/markup.html"; diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/controller/DatabaseFileUploadController.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/controller/DatabaseFileUploadController.java index eac8b37b..ec32e42f 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/controller/DatabaseFileUploadController.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/controller/DatabaseFileUploadController.java @@ -5,7 +5,6 @@ import java.io.UnsupportedEncodingException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.openecomp.portalapp.widget.domain.ValidationRespond; import org.openecomp.portalapp.widget.service.StorageService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,9 +13,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.multipart.MultipartFile; @Controller public class DatabaseFileUploadController { diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/controller/HealthController.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/controller/HealthController.java index fc324ab1..fc324ab1 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/controller/HealthController.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/controller/HealthController.java diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/controller/WidgetsCatalogController.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/controller/WidgetsCatalogController.java index e801a256..1af5a3cc 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/controller/WidgetsCatalogController.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/controller/WidgetsCatalogController.java @@ -143,7 +143,7 @@ public class WidgetsCatalogController { } } catch (Exception e) { - logger.error("Exception occurred while performing WidgetsCatalogController.saveWidgetCatalog in widget microservices. Details:" + e.getMessage()); + logger.error("Exception occurred while performing WidgetsCatalogController.saveWidgetCatalog in widget microservices. Details:", e); } return respond; } diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/dao/WidgetDataSource.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/dao/WidgetDataSource.java index 0a950c54..0a950c54 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/dao/WidgetDataSource.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/dao/WidgetDataSource.java diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/App.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/App.java index 19c6311b..19c6311b 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/App.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/App.java diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/MicroserviceData.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/MicroserviceData.java index 831b1e65..831b1e65 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/MicroserviceData.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/MicroserviceData.java diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/MicroserviceParameter.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/MicroserviceParameter.java index 9f19c0d4..9f19c0d4 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/MicroserviceParameter.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/MicroserviceParameter.java diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/RoleApp.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/RoleApp.java index 93fa9963..ca73f313 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/RoleApp.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/RoleApp.java @@ -13,7 +13,6 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToMany; import javax.persistence.ManyToOne; -import javax.persistence.PreRemove; import javax.persistence.Table; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/ValidationRespond.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/ValidationRespond.java index 25c74af1..25c74af1 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/ValidationRespond.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/ValidationRespond.java diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/WidgetCatalog.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/WidgetCatalog.java index a4491997..6b7823e6 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/WidgetCatalog.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/WidgetCatalog.java @@ -19,7 +19,6 @@ import javax.persistence.Transient; @Entity @Table(name="EP_WIDGET_CATALOG") public class WidgetCatalog{ - private static final long serialVersionUID = 1L; @Id @Column(name = "widget_id") @@ -128,7 +127,8 @@ public class WidgetCatalog{ @Override public String toString() { - return "WidgetCatalog [name=" + name + ", desc=" + desc + ", allowAllUser=" + allowAllUser + "]"; + return "WidgetCatalog [id=" + id + ", name=" + name + ", desc=" + desc + ", fileLocation=" + fileLocation + + ", allowAllUser=" + allowAllUser + ", serviceId=" + serviceId + ", sortOrder=" + sortOrder + + ", statusCode=" + statusCode + ", widgetRoles=" + widgetRoles + "]"; } - } diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/WidgetFile.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/WidgetFile.java index 7eb3c1ef..7eb3c1ef 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/WidgetFile.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/domain/WidgetFile.java diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/excetpion/StorageException.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/excetpion/StorageException.java index 65b71454..65b71454 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/excetpion/StorageException.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/excetpion/StorageException.java diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/excetpion/StorageFileNotFoundException.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/excetpion/StorageFileNotFoundException.java index 44fb7286..44fb7286 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/excetpion/StorageFileNotFoundException.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/excetpion/StorageFileNotFoundException.java diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/filters/CorsConfiguration.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/filters/CorsConfiguration.java index 2fdb5480..2fdb5480 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/filters/CorsConfiguration.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/filters/CorsConfiguration.java diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/hibernate/HibernateConfiguration.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/hibernate/HibernateConfiguration.java index a376da0a..a376da0a 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/hibernate/HibernateConfiguration.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/hibernate/HibernateConfiguration.java diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/listener/WidgetEventListener.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/listener/WidgetEventListener.java index 3516196b..25eadfa7 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/listener/WidgetEventListener.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/listener/WidgetEventListener.java @@ -28,7 +28,7 @@ public class WidgetEventListener implements ApplicationListener<ApplicationReady if(Boolean.parseBoolean(init_default_widget)) initializationService.initialize(); } catch (Exception e) { - logger.error("Exception occurred while performing WidgetsCatalogController.initializeWidgetCatalog in widget microservices. Details:" + e.getMessage()); + logger.error("onApplicationEvent: InitializationService#initialize failed", e); } } diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/InitializationService.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/InitializationService.java index 4a34606a..4a34606a 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/InitializationService.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/InitializationService.java diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/MicroserviceService.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/MicroserviceService.java index 32eb48b1..32eb48b1 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/MicroserviceService.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/MicroserviceService.java diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/StorageService.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/StorageService.java index 1eb14704..1eb14704 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/StorageService.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/StorageService.java diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/WidgetCatalogService.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/WidgetCatalogService.java index 82853dcd..e9bd0f33 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/WidgetCatalogService.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/WidgetCatalogService.java @@ -2,7 +2,6 @@ package org.openecomp.portalapp.widget.service; import java.util.List; -import org.openecomp.portalapp.widget.domain.RoleApp; import org.openecomp.portalapp.widget.domain.WidgetCatalog; public interface WidgetCatalogService { diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/InitializationServiceImpl.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/InitializationServiceImpl.java index 31635f74..7a45d71e 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/InitializationServiceImpl.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/InitializationServiceImpl.java @@ -8,7 +8,6 @@ import java.util.HashSet; import javax.transaction.Transactional; -import org.openecomp.portalapp.widget.controller.WidgetsCatalogController; import org.openecomp.portalapp.widget.domain.MicroserviceData; import org.openecomp.portalapp.widget.domain.MicroserviceParameter; import org.openecomp.portalapp.widget.domain.RoleApp; @@ -24,49 +23,51 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.stereotype.Service; +/** + * Uploads widget zip archives to Portal. + */ @Service("initService") @Transactional @org.springframework.context.annotation.Configuration @EnableAspectJAutoProxy -public class InitializationServiceImpl implements InitializationService{ - +public class InitializationServiceImpl implements InitializationService { + private static final String BASIC_AUTH = "Basic Authentication"; private static final String PARAMETER_KEY = "resourceType"; - private static final Logger logger = LoggerFactory.getLogger(WidgetsCatalogController.class); - + private static final Logger logger = LoggerFactory.getLogger(InitializationServiceImpl.class); + @Autowired WidgetCatalogService widgetCatalogService; - + @Autowired StorageService storageService; - + @Autowired MicroserviceService microserviceService; - + @Value("${account.user.name}") String account_user; - + @Value("${account.user.password}") String account_password; - + @Value("${initialization.widgetData.url}") String widgetData_url; - + @Override public void initialize() { initCommonWidget("News"); initCommonWidget("Events"); initCommonWidget("Resources"); } - - private void initCommonWidget(String name){ - + + private void initCommonWidget(String name) { + final String newServiceName = name + " Microservice"; - final String newWidgetName = name + " Widget"; - + Long serviceId = microserviceService.getMicroserviceIdByName(newServiceName); - - if(serviceId == null){ + + if (serviceId == null) { MicroserviceData newService = new MicroserviceData(); newService.setName(newServiceName); newService.setDesc(name); @@ -77,30 +78,29 @@ public class InitializationServiceImpl implements InitializationService{ newService.setPassword(account_password); newService.setActive("Y"); serviceId = microserviceService.saveMicroserivce(newService); - - + MicroserviceParameter parameter = new MicroserviceParameter(); parameter.setServiceId(serviceId); parameter.setPara_key(PARAMETER_KEY); String parameter_value = null; - switch(name.toLowerCase()){ - case "news": - parameter_value = "NEWS"; - break; - case "events": - parameter_value = "EVENTS"; - break; - case "resources": - parameter_value = "IMPORTANTRESOURCES"; - break; + switch (name.toLowerCase()) { + case "news": + parameter_value = "NEWS"; + break; + case "events": + parameter_value = "EVENTS"; + break; + case "resources": + parameter_value = "IMPORTANTRESOURCES"; + break; } parameter.setPara_value(parameter_value); microserviceService.saveMicroserviceParameter(parameter); } - - if(!widgetCatalogService.getWidgetIdByName(newWidgetName)){ + + if (!widgetCatalogService.getWidgetIdByName(name)) { WidgetCatalog newWidget = new WidgetCatalog(); - newWidget.setName(newWidgetName); + newWidget.setName(name); newWidget.setDesc(name); newWidget.setAllowAllUser("1"); String fileLocation = name.toLowerCase() + "-widget.zip"; @@ -108,21 +108,26 @@ public class InitializationServiceImpl implements InitializationService{ newWidget.setServiceId(serviceId); newWidget.setWidgetRoles(new HashSet<RoleApp>()); long widgetId = widgetCatalogService.saveWidgetCatalog(newWidget); - - File file = new File("/tmp/" + fileLocation); - try{ - - InputStream fileInputStream = this.getClass().getClassLoader().getResourceAsStream(fileLocation); - OutputStream outputStream = new FileOutputStream(file); + + File tmpZipFile = new File("/tmp/" + fileLocation); + InputStream fileInputStream = null; + OutputStream outputStream = null; + try { + fileInputStream = this.getClass().getClassLoader().getResourceAsStream(fileLocation); + outputStream = new FileOutputStream(tmpZipFile); int read = 0; byte[] bytes = new byte[4096]; while ((read = fileInputStream.read(bytes)) != -1) { outputStream.write(bytes, 0, read); } - }catch(Exception e){ - logger.error("Exception occurred while performing InitializationServiceImpl.initCommonWidget in widget microservices. Details:" + e.getMessage()); + outputStream.close(); + fileInputStream.close(); + } catch (Exception e) { + logger.error( + "Exception occurred while performing InitializationServiceImpl.initCommonWidget in widget microservices. Details:", e); } - storageService.initSave(file, newWidget, widgetId); + storageService.initSave(tmpZipFile, newWidget, widgetId); + tmpZipFile.delete(); } } } diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/MicroserviceServiceImpl.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/MicroserviceServiceImpl.java index 395d4283..80c45a2e 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/MicroserviceServiceImpl.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/MicroserviceServiceImpl.java @@ -11,7 +11,6 @@ import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; import org.openecomp.portalapp.widget.domain.MicroserviceData; import org.openecomp.portalapp.widget.domain.MicroserviceParameter; -import org.openecomp.portalapp.widget.domain.WidgetCatalog; import org.openecomp.portalapp.widget.service.MicroserviceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/StorageServiceImpl.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/StorageServiceImpl.java index 046b5ac4..f459ffc4 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/StorageServiceImpl.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/StorageServiceImpl.java @@ -1,14 +1,11 @@ package org.openecomp.portalapp.widget.service.impl; -import java.io.BufferedInputStream; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.nio.file.Files; -import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; import java.util.List; @@ -24,7 +21,6 @@ import org.hibernate.SessionFactory; import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; import org.openecomp.portalapp.widget.constant.WidgetConstant; -import org.openecomp.portalapp.widget.controller.DatabaseFileUploadController; import org.openecomp.portalapp.widget.domain.ValidationRespond; import org.openecomp.portalapp.widget.domain.WidgetCatalog; import org.openecomp.portalapp.widget.domain.WidgetFile; @@ -43,20 +39,21 @@ import org.springframework.web.multipart.MultipartFile; public class StorageServiceImpl implements StorageService { private static final Logger logger = LoggerFactory.getLogger(StorageServiceImpl.class); - + @Autowired private SessionFactory sessionFactory; @Autowired WidgetCatalogService widgetCatalogService; - + @Override @Transactional public void deleteWidgetFile(long widgetId) { WidgetFile widgetFile = getWidgetFile(widgetId); logger.debug("StorageServiceImpl.deleteWidgetFile: deleting widget file {}", widgetId); - if (widgetFile == null){ - logger.debug("StorageServiceImpl.deleteWidgetFile: No widget file found in database while performing StorageServiceImpl.deleteWidgetFile."); + if (widgetFile == null) { + logger.debug( + "StorageServiceImpl.deleteWidgetFile: No widget file found in database while performing StorageServiceImpl.deleteWidgetFile."); return; } Session session = sessionFactory.getCurrentSession(); @@ -64,7 +61,7 @@ public class StorageServiceImpl implements StorageService { session.delete(widgetFile); tx.commit(); } - + @Override @SuppressWarnings("unchecked") @Transactional @@ -81,9 +78,9 @@ public class StorageServiceImpl implements StorageService { widgetFile = widgetFiles.get(0); return widgetFile; } - + @Override - public ValidationRespond checkZipFile(MultipartFile file){ + public ValidationRespond checkZipFile(MultipartFile file) { StringBuilder error_msg = new StringBuilder(); UnzipUtil unzipper = new UnzipUtil(); Map<String, byte[]> map; @@ -96,8 +93,10 @@ public class StorageServiceImpl implements StorageService { } try { if (file.isEmpty()) { - logger.error("StorageServiceImpl.checkZipFile: Failed to store empty file " + file.getOriginalFilename()); - throw new StorageException("StorageServiceImpl.checkZipFile: Failed to store empty file " + file.getOriginalFilename()); + logger.error( + "StorageServiceImpl.checkZipFile: Failed to store empty file " + file.getOriginalFilename()); + throw new StorageException( + "StorageServiceImpl.checkZipFile: Failed to store empty file " + file.getOriginalFilename()); } String fileLocation = file.getOriginalFilename(); logger.debug("StorageServiceImpl.checkZipFile: store the widget to:" + fileLocation); @@ -109,23 +108,24 @@ public class StorageServiceImpl implements StorageService { convFile.delete(); } catch (IOException e) { logger.error("StorageServiceImpl.checkZipFile: Failed to store file " + file.getOriginalFilename(), e); - throw new StorageException("torageServiceImpl.checkZipFile: Failed to store file " + file.getOriginalFilename(), e); + throw new StorageException( + "torageServiceImpl.checkZipFile: Failed to store file " + file.getOriginalFilename(), e); } - - for(byte[] b: map.values()){ - if(isValid && b == null){ + + for (byte[] b : map.values()) { + if (isValid && b == null) { isValid = false; error_msg.append(WidgetConstant.VALIDATION_MESSAGE_FILES); break; } } - return new ValidationRespond(isValid, error_msg.toString()); + return new ValidationRespond(isValid, error_msg.toString()); } - + @Override @Transactional public void save(MultipartFile file, WidgetCatalog newWidget, long widgetId) { - + UnzipUtil unzipper = new UnzipUtil(); Map<String, byte[]> map; File convFile; @@ -148,15 +148,14 @@ public class StorageServiceImpl implements StorageService { } saveHelper(newWidget, widgetId, map); } - - + @Override @Transactional public void initSave(File file, WidgetCatalog newWidget, long widgetId) { - + UnzipUtil unzipper = new UnzipUtil(); Map<String, byte[]> map; - + try { String fileLocation = file.getPath(); logger.debug("StorageServiceImpl.save: store the widget to:" + fileLocation); @@ -165,27 +164,27 @@ public class StorageServiceImpl implements StorageService { logger.error("StorageServiceImpl.save: Failed to store file " + file.getName(), e); throw new StorageException("Failed to store file " + file.getName(), e); } + saveHelper(newWidget, widgetId, map); } - - + /** - * Helper method for saving widget files (controller.js, framework.js, markup.html and style.css) - * to ep_widget_catalog_files table in database + * Helper method for saving widget files (controller.js, framework.js, + * markup.html and style.css) to ep_widget_catalog_files table in database * * @param newWidget * @param widgetId * @param map */ - private void saveHelper(WidgetCatalog newWidget, long widgetId, Map<String, byte[]> map){ - + private void saveHelper(WidgetCatalog newWidget, long widgetId, Map<String, byte[]> map) { + + logger.debug("Going to save widget " + newWidget); WidgetFile widgetFile = new WidgetFile(); widgetFile.setName(newWidget.getName()); widgetFile.setWidgetId(widgetId); - - + InputStream fileInputStream = this.getClass().getClassLoader().getResourceAsStream("framework-template.js"); - + String sb = null; try { byte[] bytes = new byte[fileInputStream.available()]; @@ -200,65 +199,71 @@ public class StorageServiceImpl implements StorageService { fileInputStream.close(); } catch (IOException e) { logger.error("StorageServiceImpl.update: Failed to close the fileInputStream ", e); - e.printStackTrace(); } } } - - + String namespace = "Portal" + widgetId + "Widget"; String controllerName = "Portal" + widgetId + "Ctrl"; String cssName = "portal" + widgetId + "-css-ready"; String colorArg1 = "color: #fff"; - String framework = sb - .replaceAll("ARUGMENT1", namespace) - .replaceAll("ARUGMENT2", controllerName) - .replaceAll("ARUGMENT3", cssName) - .replaceAll("CSS_ARG1", colorArg1) + String framework = sb.replaceAll("ARUGMENT1", namespace).replaceAll("ARUGMENT2", controllerName) + .replaceAll("ARUGMENT3", cssName).replaceAll("CSS_ARG1", colorArg1) .replaceAll("MICROSERVICE_ID", newWidget.getServiceId().toString()) .replaceAll("WIDGET_ID", Long.toString(widgetId)); - + widgetFile.setFramework(framework.getBytes()); - - String javascript = new String(map.get(WidgetConstant.WIDGET_CONTROLLER_LOCATION)); - String functionHeader = javascript.substring(javascript.indexOf("function"), javascript.indexOf(")")+1); + + final byte[] controllerLoc = map.get(WidgetConstant.WIDGET_CONTROLLER_LOCATION); + if (controllerLoc == null || controllerLoc.length == 0) + throw new IllegalArgumentException( + "Map is missing required key " + WidgetConstant.WIDGET_CONTROLLER_LOCATION); + String javascript = new String(controllerLoc); + String functionHeader = javascript.substring(javascript.indexOf("function"), javascript.indexOf(")") + 1); String functionName = functionHeader.substring(functionHeader.indexOf(" "), functionHeader.indexOf("(")).trim(); javascript = javascript.replaceFirst(functionName, controllerName); - String functionParam = functionHeader.substring(functionHeader.indexOf("(")+1, functionHeader.indexOf(")")); + String functionParam = functionHeader.substring(functionHeader.indexOf("(") + 1, functionHeader.indexOf(")")); List<String> paramList = Arrays.asList(functionParam.split(",")); - + int left_bracket_index = javascript.indexOf("{") + 1; String widgetData = namespace + "=" + namespace + "||{};" + "var res = " + namespace + ".widgetData;"; - javascript = javascript.substring(0, left_bracket_index) + widgetData + javascript.substring(left_bracket_index); - + javascript = javascript.substring(0, left_bracket_index) + widgetData + + javascript.substring(left_bracket_index); + StringBuilder injectStr = new StringBuilder().append("["); - for(int i = 0; i < paramList.size(); i++){ - if(i == paramList.size()-1) + for (int i = 0; i < paramList.size(); i++) { + if (i == paramList.size() - 1) injectStr.append("'" + paramList.get(i).trim() + "'];"); else injectStr.append("'" + paramList.get(i).trim() + "',"); } - javascript = namespace + ".controller = " + javascript + ";" + namespace + ".controller.$inject = " + injectStr.toString(); - - String html = new String(map.get(WidgetConstant.WIDGET_MARKUP_LOCATION)).replaceFirst(functionName, controllerName);; - + javascript = namespace + ".controller = " + javascript + ";" + namespace + ".controller.$inject = " + + injectStr.toString(); + + String html = new String(map.get(WidgetConstant.WIDGET_MARKUP_LOCATION)).replaceFirst(functionName, + controllerName); + ; + Pattern cssPattern = Pattern.compile("#.*-css-ready"); Matcher cssMatcher = cssPattern.matcher(new String(map.get(WidgetConstant.WIDGET_STYLE_LOCATION))); - if (cssMatcher.find( )) { - widgetFile.setCss(new String(map.get(WidgetConstant.WIDGET_STYLE_LOCATION)).replace(cssMatcher.group(0), "#" + cssName).getBytes()); + if (cssMatcher.find()) { + widgetFile.setCss(new String(map.get(WidgetConstant.WIDGET_STYLE_LOCATION)) + .replace(cssMatcher.group(0), "#" + cssName).getBytes()); } - + widgetFile.setMarkup(html.getBytes()); widgetFile.setController(javascript.getBytes()); Session session = sessionFactory.openSession(); session.save(widgetFile); session.flush(); session.close(); - //sessionFactory.getCurrentSession().save(widgetFile); - logger.debug("StorageServiceImpl.save: saved fraemwork.js controller.js, markup.html and style.css files to the database for widget {}", widgetId); - + // sessionFactory.getCurrentSession().save(widgetFile); + logger.debug( + "StorageServiceImpl.save: saved fraemwork.js controller.js, markup.html and style.css files to the database for widget {}", + widgetId); + } - + @Override public void update(MultipartFile file, WidgetCatalog newWidget, long widgetId) { UnzipUtil unzipper = new UnzipUtil(); @@ -279,10 +284,11 @@ public class StorageServiceImpl implements StorageService { convFile.delete(); } catch (IOException e) { logger.error("StorageServiceImpl.update: Failed to store file " + file.getOriginalFilename(), e); - throw new StorageException("StorageServiceImpl.update: Failed to store file " + file.getOriginalFilename(), e); + throw new StorageException("StorageServiceImpl.update: Failed to store file " + file.getOriginalFilename(), + e); } WidgetFile widgetFile = getWidgetFile(widgetId); - + InputStream fileInputStream = this.getClass().getClassLoader().getResourceAsStream("framework-template.js"); String sb = null; try { @@ -302,61 +308,64 @@ public class StorageServiceImpl implements StorageService { } } } - + String namespace = "Portal" + widgetId + "Widget"; String controllerName = "Portal" + widgetId + "Ctrl"; String cssName = "portal" + widgetId + "-css-ready"; String colorArg1 = "color: #fff"; - String framework = sb - .replaceAll("ARUGMENT1", namespace) - .replaceAll("ARUGMENT2", controllerName) - .replaceAll("ARUGMENT3", cssName) - .replaceAll("CSS_ARG1", colorArg1) + String framework = sb.replaceAll("ARUGMENT1", namespace).replaceAll("ARUGMENT2", controllerName) + .replaceAll("ARUGMENT3", cssName).replaceAll("CSS_ARG1", colorArg1) .replaceAll("MICROSERVICE_ID", newWidget.getServiceId().toString()) .replaceAll("WIDGET_ID", Long.toString(widgetId)); widgetFile.setFramework(framework.getBytes()); - + String javascript = new String(map.get(WidgetConstant.WIDGET_CONTROLLER_LOCATION)); - String functionHeader = javascript.substring(javascript.indexOf("function"), javascript.indexOf(")")+1); + String functionHeader = javascript.substring(javascript.indexOf("function"), javascript.indexOf(")") + 1); String functionName = functionHeader.substring(functionHeader.indexOf(" "), functionHeader.indexOf("(")).trim(); javascript = javascript.replaceFirst(functionName, controllerName); - String functionParam = functionHeader.substring(functionHeader.indexOf("(")+1, functionHeader.indexOf(")")); + String functionParam = functionHeader.substring(functionHeader.indexOf("(") + 1, functionHeader.indexOf(")")); List<String> paramList = Arrays.asList(functionParam.split(",")); - + int left_bracket_index = javascript.indexOf("{") + 1; String widgetData = namespace + "=" + namespace + "||{};" + "var res = " + namespace + ".widgetData;"; - javascript = javascript.substring(0, left_bracket_index) + widgetData + javascript.substring(left_bracket_index); - + javascript = javascript.substring(0, left_bracket_index) + widgetData + + javascript.substring(left_bracket_index); + StringBuilder injectStr = new StringBuilder().append("["); - for(int i = 0; i < paramList.size(); i++){ - if(i == paramList.size()-1) + for (int i = 0; i < paramList.size(); i++) { + if (i == paramList.size() - 1) injectStr.append("'" + paramList.get(i).trim() + "'];"); else injectStr.append("'" + paramList.get(i).trim() + "',"); } - javascript = namespace + ".controller = " + javascript + ";" + namespace + ".controller.$inject = " + injectStr.toString(); - - String html = new String(map.get(WidgetConstant.WIDGET_MARKUP_LOCATION)).replaceFirst(functionName, controllerName);; - + javascript = namespace + ".controller = " + javascript + ";" + namespace + ".controller.$inject = " + + injectStr.toString(); + + String html = new String(map.get(WidgetConstant.WIDGET_MARKUP_LOCATION)).replaceFirst(functionName, + controllerName); + ; + Pattern cssPattern = Pattern.compile("#.*-css-ready"); Matcher cssMatcher = cssPattern.matcher(new String(map.get(WidgetConstant.WIDGET_STYLE_LOCATION))); - if (cssMatcher.find( )) { - widgetFile.setCss(new String(map.get(WidgetConstant.WIDGET_STYLE_LOCATION)).replace(cssMatcher.group(0), "#" + cssName).getBytes()); + if (cssMatcher.find()) { + widgetFile.setCss(new String(map.get(WidgetConstant.WIDGET_STYLE_LOCATION)) + .replace(cssMatcher.group(0), "#" + cssName).getBytes()); } - + widgetFile.setMarkup(html.getBytes()); widgetFile.setController(javascript.getBytes()); - //widgetFile.setCss(map.get(WidgetConstant.WIDGET_STYLE_LOCATION)); + // widgetFile.setCss(map.get(WidgetConstant.WIDGET_STYLE_LOCATION)); Session session = sessionFactory.openSession(); Transaction tx = session.beginTransaction(); session.update(widgetFile); tx.commit(); session.flush(); session.close(); - logger.debug("StorageServiceImpl.save: updated fraemwork.js controller.js, markup.html and style.css files to the database for widget {}", widgetId); + logger.debug( + "StorageServiceImpl.save: updated fraemwork.js controller.js, markup.html and style.css files to the database for widget {}", + widgetId); } - @Override @SuppressWarnings("unchecked") @Transactional @@ -367,9 +376,9 @@ public class StorageServiceImpl implements StorageService { criteria.add(Restrictions.eq("widgetId", widgetId)); List<WidgetFile> widgetFile = criteria.list(); logger.debug("StorageServiceImpl.getWidgetMarkup: getting widget markup result={}", widgetFile); - - if(widgetFile.size() > 0 ) - markup = new String(widgetFile.get(0).getMarkup(), "UTF-8"); + + if (widgetFile.size() > 0) + markup = new String(widgetFile.get(0).getMarkup(), "UTF-8"); return markup; } @@ -383,8 +392,8 @@ public class StorageServiceImpl implements StorageService { criteria.add(Restrictions.eq("widgetId", widgetId)); List<WidgetFile> widgetFile = criteria.list(); logger.debug("StorageServiceImpl.getWidgetController: getting widget controller result={}", widgetFile); - - if(widgetFile.size() > 0 ) + + if (widgetFile.size() > 0) controller = new String(widgetFile.get(0).getController(), "UTF-8"); return controller; } @@ -399,8 +408,8 @@ public class StorageServiceImpl implements StorageService { criteria.add(Restrictions.eq("widgetId", widgetId)); List<WidgetFile> widgetFile = criteria.list(); logger.debug("StorageServiceImpl.getWidgetFramework: getting widget framework result={}", widgetFile); - - if(widgetFile.size() > 0 ) + + if (widgetFile.size() > 0) framework = new String(widgetFile.get(0).getFramework(), "UTF-8"); return framework; } @@ -415,24 +424,21 @@ public class StorageServiceImpl implements StorageService { criteria.add(Restrictions.eq("widgetId", widgetId)); List<WidgetFile> widgetFile = criteria.list(); logger.debug("StorageServiceImpl.getWidgetCSS: getting widget css result={}", widgetFile); - - if(widgetFile.size() > 0 ) + + if (widgetFile.size() > 0) css = new String(widgetFile.get(0).getCss(), "UTF-8"); return css; } - - + @Override @Transactional - public byte[] getWidgetCatalogContent(long widgetId) throws Exception{ - - + public byte[] getWidgetCatalogContent(long widgetId) throws Exception { + WidgetCatalog widget = widgetCatalogService.getWidgetCatalog(widgetId); String namespace = "Portal" + widgetId + "Widget"; String controllerName = "Portal" + widgetId + "Ctrl"; String cssName = "portal" + widgetId + "-css-ready"; - - + String styles = getWidgetCSS(widgetId).replaceAll(cssName, widget.getName() + "-css-ready"); File f = File.createTempFile("temp", ".zip"); ZipOutputStream out = new ZipOutputStream(new FileOutputStream(f)); @@ -442,36 +448,36 @@ public class StorageServiceImpl implements StorageService { out.putNextEntry(e); byte[] data = styles.getBytes(); out.write(data, 0, data.length); - String widgetData = namespace + "=" + namespace + "||{};" + "var res = " + namespace + ".widgetData;"; - String javascript = getWidgetController(widgetId).replace(widgetData, "") - .replace(namespace + ".controller =", ""); - - String functionHeader = javascript.substring(javascript.indexOf("function"), javascript.indexOf(")")+1); + String javascript = getWidgetController(widgetId).replace(widgetData, "").replace(namespace + ".controller =", + ""); + + String functionHeader = javascript.substring(javascript.indexOf("function"), javascript.indexOf(")") + 1); javascript = javascript.replaceFirst(controllerName, widget.getName() + "Ctrl"); - String functionParam = functionHeader.substring(functionHeader.indexOf("(")+1, functionHeader.indexOf(")")); + String functionParam = functionHeader.substring(functionHeader.indexOf("(") + 1, functionHeader.indexOf(")")); StringBuilder injectStr = new StringBuilder().append("["); List<String> paramList = Arrays.asList(functionParam.split(",")); - for(int i = 0; i < paramList.size(); i++){ - if(i == paramList.size()-1) + for (int i = 0; i < paramList.size(); i++) { + if (i == paramList.size() - 1) injectStr.append("'" + paramList.get(i).trim() + "'];"); else injectStr.append("'" + paramList.get(i).trim() + "',"); } javascript = javascript.replace(";" + namespace + ".controller.$inject = " + injectStr.toString(), ""); - + e = new ZipEntry(widget.getName() + "/js/controller.js"); out.putNextEntry(new ZipEntry(widget.getName() + "/js/")); out.putNextEntry(e); data = javascript.getBytes(); out.write(data, 0, data.length); - + String html = getWidgetMarkup(widgetId).replaceFirst(controllerName, widget.getName() + "Ctrl"); - - //new String(map.get(WidgetConstant.WIDGET_MARKUP_LOCATION)).replaceFirst(functionName, controllerName);; - - + + // new + // String(map.get(WidgetConstant.WIDGET_MARKUP_LOCATION)).replaceFirst(functionName, + // controllerName);; + e = new ZipEntry(widget.getName() + "/markup/markup.html"); out.putNextEntry(new ZipEntry(widget.getName() + "/markup/")); out.putNextEntry(e); diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java index 700274e2..51f78227 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/service/impl/WidgetCatalogServiceImpl.java @@ -57,9 +57,12 @@ public class WidgetCatalogServiceImpl implements WidgetCatalogService { .append(" ep_widget_catalog w, ") .append(" ep_widget_catalog_role wr, ") .append(" fn_user_role ur, ") + .append(" fn_app app, ") .append(" fn_user u ") .append(" where ") .append(" w.widget_id = wr.WIDGET_ID and ") + .append(" ur.app_id = app.app_id and ") + .append(" app.enabled = 'Y' and ") .append(" wr.role_id = ur.role_id and ") .append(" ur.user_id = u.user_id and ") .append(" u.login_id = '" + loginName + "' and (w.all_user_flag = 'N' or w.all_user_flag is null) ") diff --git a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/utils/AuthorizationUtil.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/utils/AuthorizationUtil.java index f25f0db6..f25f0db6 100644 --- a/ecomp-portal-widget-ms/src/main/java/org/openecomp/portalapp/widget/utils/AuthorizationUtil.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/utils/AuthorizationUtil.java diff --git a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/utils/UnzipUtil.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/utils/UnzipUtil.java new file mode 100644 index 00000000..1d61d587 --- /dev/null +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/openecomp/portalapp/widget/utils/UnzipUtil.java @@ -0,0 +1,110 @@ +package org.openecomp.portalapp.widget.utils; + +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.HashMap; +import java.util.Map; +import java.util.Stack; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + +import org.openecomp.portalapp.widget.constant.WidgetConstant; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class UnzipUtil { + + /** + * Size of the buffer to read/write data + */ + private static final int BUFFER_SIZE = 4096; + private static final Logger logger = LoggerFactory.getLogger(UnzipUtil.class); + + /** + * Extracts a zip file specified by the zipFilePath to a directory specified by + * destDirectory (will be created if does not exists) + * + * @param zipFilePath + * path + * @param destDirectory + * directory + * @param widgetName + * name + * @return Map of contents + * @throws IOException + * On error + */ + public Map<String, byte[]> unzip_db(String zipFilePath, String destDirectory, String widgetName) + throws IOException { + + logger.debug("UnzipUtil.unzip_db: unzip widget file {}", widgetName); + File destDir = new File(destDirectory); + if (!destDir.exists()) + destDir.mkdir(); + ZipInputStream zipIn = new ZipInputStream(new FileInputStream(zipFilePath)); + ZipEntry entry = zipIn.getNextEntry(); + Map<String, byte[]> map = new HashMap<>(); + + String[] requiredKeys = { WidgetConstant.WIDGET_CONTROLLER_LOCATION, WidgetConstant.WIDGET_MARKUP_LOCATION, + WidgetConstant.WIDGET_STYLE_LOCATION }; + for (String k : requiredKeys) + map.put(k, null); + + // iterates over entries in the zip file + Stack<File> stack = new Stack<>(); + while (entry != null) { + String filePath = destDirectory + File.separator + widgetName + File.separator + + entry.getName().substring(entry.getName().indexOf("/") + 1); + final String entryShortName = entry.getName().substring(entry.getName().indexOf("/") + 1); + logger.debug("UnzipUtil.unzip_db: file path {}, short name {}", filePath, entryShortName); + if (!entry.isDirectory()) { + // if the entry is a file, extracts it + logger.debug("UnzipUtil.unzip_db: unzip and save widget file {}", filePath); + stack.push(new File(filePath)); + extractFile(zipIn, filePath); + } else { + // if the entry is a directory, make the directory + logger.debug("UnzipUtil.unzip_db: unzip and create widget folder {}", filePath); + File dir = new File(filePath); + stack.push(new File(filePath)); + dir.mkdir(); + } + // Is this one we need? + if (map.containsKey(entryShortName)) + map.put(entryShortName, Files.readAllBytes(Paths.get(filePath))); + zipIn.closeEntry(); + entry = zipIn.getNextEntry(); + } + zipIn.close(); + while (!stack.isEmpty()) + stack.pop().delete(); + + for (String k : requiredKeys) + if (!map.containsKey(k)) + logger.warn("UnzipUtil.unzip_db: no zip archive entry found for required key {}", k); + + return map; + } + + /** + * Extracts a zip entry (file entry) + * + * @param zipIn + * @param filePath + * @throws IOException + */ + private void extractFile(ZipInputStream zipIn, String filePath) throws IOException { + BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(filePath)); + byte[] bytesIn = new byte[BUFFER_SIZE]; + int read = 0; + while ((read = zipIn.read(bytesIn)) != -1) { + bos.write(bytesIn, 0, read); + } + bos.close(); + } +}
\ No newline at end of file diff --git a/ecomp-portal-widget-ms/src/main/resources/application-properties b/ecomp-portal-widget-ms/widget-ms/src/main/resources/application-properties index 77d2b78d..77d2b78d 100644 --- a/ecomp-portal-widget-ms/src/main/resources/application-properties +++ b/ecomp-portal-widget-ms/widget-ms/src/main/resources/application-properties diff --git a/ecomp-portal-widget-ms/src/main/resources/application.properties.templated b/ecomp-portal-widget-ms/widget-ms/src/main/resources/application.properties.templated index ec4803f0..ec4803f0 100644 --- a/ecomp-portal-widget-ms/src/main/resources/application.properties.templated +++ b/ecomp-portal-widget-ms/widget-ms/src/main/resources/application.properties.templated diff --git a/ecomp-portal-widget-ms/src/main/resources/framework-template.js b/ecomp-portal-widget-ms/widget-ms/src/main/resources/framework-template.js index 45350d91..45350d91 100644 --- a/ecomp-portal-widget-ms/src/main/resources/framework-template.js +++ b/ecomp-portal-widget-ms/widget-ms/src/main/resources/framework-template.js diff --git a/ecomp-portal-widget-ms/src/main/resources/logback.xml b/ecomp-portal-widget-ms/widget-ms/src/main/resources/logback.xml index 204a6598..204a6598 100644 --- a/ecomp-portal-widget-ms/src/main/resources/logback.xml +++ b/ecomp-portal-widget-ms/widget-ms/src/main/resources/logback.xml diff --git a/ecomp-portal-widget-ms/src/main/resources/templates/Upload.html b/ecomp-portal-widget-ms/widget-ms/src/main/resources/templates/Upload.html index a5e7c632..a5e7c632 100644 --- a/ecomp-portal-widget-ms/src/main/resources/templates/Upload.html +++ b/ecomp-portal-widget-ms/widget-ms/src/main/resources/templates/Upload.html diff --git a/ecomp-portal-widget-ms/src/main/resources/templates/widgetsPage.html b/ecomp-portal-widget-ms/widget-ms/src/main/resources/templates/widgetsPage.html index 440f64ca..440f64ca 100644 --- a/ecomp-portal-widget-ms/src/main/resources/templates/widgetsPage.html +++ b/ecomp-portal-widget-ms/widget-ms/src/main/resources/templates/widgetsPage.html diff --git a/ecomp-portal-widget-ms/src/main/resources/widget-keystore.p12 b/ecomp-portal-widget-ms/widget-ms/src/main/resources/widget-keystore.p12 Binary files differindex b2dd42ff..b2dd42ff 100644 --- a/ecomp-portal-widget-ms/src/main/resources/widget-keystore.p12 +++ b/ecomp-portal-widget-ms/widget-ms/src/main/resources/widget-keystore.p12 diff --git a/ecomp-portal-widget-ms/src/main/resources/widget_ms_start.sh b/ecomp-portal-widget-ms/widget-ms/src/main/resources/widget_ms_start.sh index 8405fe99..8405fe99 100755 --- a/ecomp-portal-widget-ms/src/main/resources/widget_ms_start.sh +++ b/ecomp-portal-widget-ms/widget-ms/src/main/resources/widget_ms_start.sh diff --git a/ecomp-portal-widget-ms/src/main/resources/widget_ms_stop.sh b/ecomp-portal-widget-ms/widget-ms/src/main/resources/widget_ms_stop.sh index 8c9abf56..8c9abf56 100755 --- a/ecomp-portal-widget-ms/src/main/resources/widget_ms_stop.sh +++ b/ecomp-portal-widget-ms/widget-ms/src/main/resources/widget_ms_stop.sh diff --git a/ecomp-portal-widget-ms/src/test/java/org/openecomp/portalapp/widget/test/controller/WidgetFileControllerTest.java b/ecomp-portal-widget-ms/widget-ms/src/test/java/org/openecomp/portalapp/widget/test/controller/WidgetFileControllerTest.java index 2045435c..2045435c 100644 --- a/ecomp-portal-widget-ms/src/test/java/org/openecomp/portalapp/widget/test/controller/WidgetFileControllerTest.java +++ b/ecomp-portal-widget-ms/widget-ms/src/test/java/org/openecomp/portalapp/widget/test/controller/WidgetFileControllerTest.java diff --git a/ecomp-portal-widget-ms/src/test/java/org/openecomp/portalapp/widget/test/controller/WidgetsCatalogControllerTest.java b/ecomp-portal-widget-ms/widget-ms/src/test/java/org/openecomp/portalapp/widget/test/controller/WidgetsCatalogControllerTest.java index bd7eba3a..bd7eba3a 100644 --- a/ecomp-portal-widget-ms/src/test/java/org/openecomp/portalapp/widget/test/controller/WidgetsCatalogControllerTest.java +++ b/ecomp-portal-widget-ms/widget-ms/src/test/java/org/openecomp/portalapp/widget/test/controller/WidgetsCatalogControllerTest.java diff --git a/ecomp-portal-widget-ms/src/test/java/org/openecomp/portalapp/widget/test/service/WidgetCatalogServiceTest.java b/ecomp-portal-widget-ms/widget-ms/src/test/java/org/openecomp/portalapp/widget/test/service/WidgetCatalogServiceTest.java index 3def6062..3def6062 100644 --- a/ecomp-portal-widget-ms/src/test/java/org/openecomp/portalapp/widget/test/service/WidgetCatalogServiceTest.java +++ b/ecomp-portal-widget-ms/widget-ms/src/test/java/org/openecomp/portalapp/widget/test/service/WidgetCatalogServiceTest.java diff --git a/ecomp-portal-widget-ms/testadd.txt b/ecomp-portal-widget-ms/widget-ms/testadd.txt index bdf08de0..bdf08de0 100644 --- a/ecomp-portal-widget-ms/testadd.txt +++ b/ecomp-portal-widget-ms/widget-ms/testadd.txt diff --git a/ecomp-portal-widget-ms/website.url b/ecomp-portal-widget-ms/widget-ms/website.url Binary files differindex 4b50369c..4b50369c 100644 --- a/ecomp-portal-widget-ms/website.url +++ b/ecomp-portal-widget-ms/widget-ms/website.url @@ -16,6 +16,7 @@ <module>ecomp-portal-BE-os</module> <module>ecomp-portal-BE-common-test</module> <module>ecomp-portal-FE-os</module> + <module>ecomp-portal-widget-ms</module> </modules> <build> |
