Commit d0d000e1 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Various improvements

parent 8a72ad86

database/Dockerfile

+1 −0
Original line number Diff line number Diff line 
FROM library/postgres:11

COPY gms/src/main/resources/sql/init.sql /docker-entrypoint-initdb.d/

COPY database/user.sql /docker-entrypoint-initdb.d/

ENV ALLOW_IP_RANGE=0.0.0.0/0

ENV POSTGRES_HOST_AUTH_METHOD=trust

gms-client/gms-client-lib/pom.xml

+5 −0
Original line number Diff line number Diff line
@@ -11,6 +11,11 @@ 
        <maven.compiler.target>12</maven.compiler.target>

    </properties>

    <dependencies>

        <dependency>

            <groupId>org.apache.logging.log4j</groupId>

            <artifactId>log4j-to-slf4j</artifactId>

            <version>2.12.1</version>

        </dependency>

        <dependency>

            <groupId>junit</groupId>

            <artifactId>junit</artifactId>

gms-client/gms-client-lib/src/main/java/it/inaf/ia2/gms/client/call/BaseGmsCall.java

+10 −11
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ import java.net.http.HttpRequest; 
import java.net.http.HttpRequest.Builder;

import java.net.http.HttpResponse;

import java.util.Scanner;

import java.util.logging.Level;

import java.util.logging.Logger;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



public abstract class BaseGmsCall {



    private static final Logger LOGGER = Logger.getLogger(BaseGmsCall.class.getName());

    private static final Logger LOGGER = LoggerFactory.getLogger(BaseGmsCall.class);



    protected final HttpClientWrapper clientWrapper;
@@ -28,18 +28,17 @@ public abstract class BaseGmsCall { 
    }



    protected static void logServerError(HttpRequest request, HttpResponse<String> response) {

        LOGGER.log(Level.SEVERE, () -> "Error while reading " + request.uri()

        LOGGER.error("Error while reading " + request.uri()

                + "\nServer response status code is " + response.statusCode()

                + "\nServer response text is " + response.body());

    }



    protected static void logServerErrorInputStream(HttpRequest request, HttpResponse<InputStream> response) {

        LOGGER.log(Level.SEVERE, () -> {

        Scanner s = new Scanner(response.body()).useDelimiter("\\A");

        String responseBody = s.hasNext() ? s.next() : "";

            return "Error while reading " + request.uri()

        String error = "Error while reading " + request.uri()

                + "\nServer response status code is " + response.statusCode()

                + "\nServer response text is " + responseBody;

        });

        LOGGER.error(error);

    }

}

gms-ui/src/components/GroupsBreadcrumb.vue

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
      <span v-if="group.active">{{group.groupName}}</span>

    </li>

  </ol>

  <a :href="'group/status/' + currentGroup.groupId" :download="currentGroup.groupName + '.csv'" id="csv-status-download" title="Download CSV">

  <a v-if="currentGroup" :href="'group/status/' + currentGroup.groupId" :download="currentGroup.groupName + '.csv'" id="csv-status-download" title="Download CSV">

    <font-awesome-icon icon="download"></font-awesome-icon>

  </a>

</nav>

gms-ui/src/components/MembersPanel.vue

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
          <User :user="member" :anchor="false" />

        </div>

        <span v-if="model.permission === 'ADMIN' || model.permission === 'MANAGE_MEMBERS'" class="float-right">

          <a href="#" v-on:click.stop="openRemoveMemberModal(member)" class="text-danger" title="Remove member">

          <a href="#" v-on:click.stop.prevent="openRemoveMemberModal(member)" class="text-danger" title="Remove member">

            <font-awesome-icon icon="trash"></font-awesome-icon>

          </a>

        </span>