Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Features 376 381 412 #417

Merged
merged 42 commits into from
Nov 14, 2021
Merged

Conversation

clmrv
Copy link
Collaborator

@clmrv clmrv commented Nov 8, 2021

Description

  • Connect backend with frontend.
  • Add ssh-server mock.
  • Add shhKey option to credentials (front only?)

Motivation and Context

#412, old pr: #415
#381, old pr: #413
#376

Screenshots (if appropriate)

image

Upgrade notes (if appropriate)

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • Automated functional tests have been added or modified to cover my changes (if applicable)
  • I have updated the documentation accordingly.

I hereby agree to the terms of the Cogboard Contributor License Agreement.

mprzypasniak99 and others added 30 commits September 25, 2021 18:18
# Conflicts:
#	cogboard-app/src/main/kotlin/com/cognifide/cogboard/CogboardConstants.kt
// send(JsonObject().put("logs", logs))
}

// private fun createTemplateLogs(n: Int): JsonArray {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

co to za komentarze? wyrzućmy, żeby nie śmiecić kodu

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

private fun determineLogParsingStrategy() =
LogParserStrategyFactory()
.build(LogParserStrategyFactory.MOCK)
/* temporary solution, we'll have to decide if we'll get information of log types from
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tu też

import com.cognifide.cogboard.widget.type.logviewer.logparser.ParsedLog.Companion.PROVIDER
import com.cognifide.cogboard.widget.type.logviewer.logparser.ParsedLog.Companion.MESSAGE

class MockLogParserStrategy : LogParserStrategy() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nie wiem, czy MockLogParserStrategy to odpowiednia nazwa? Czy format logów, które tworzymy w logu trzyma się jakiejś konwencji, czy jest z czapy?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nie bardzo jestem w stanie znaleźć jakiej konwencji mógłby się trzymać ten format logów, stąd nazwa klasy. Dotyczy stricte tych logów, które są generowane w mocku


override fun parseLine(logLine: String): JsonObject {
val groups = regex.matchEntire(logLine.trim())?.groups
// ?: throw LogParsingException("Unable to parse line: $logLine")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

co z tym wyjątkiem?

const reader = new FileReader();
reader.onload = async e => {
const text = e.target.result;
let event = e;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dlaczego od razu nie nazwiemy argumentu "event"?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

const deleteFile = e => {
e.preventDefault();
setFilename('');
let event = e;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tutaj tak samo

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@TheTerabit TheTerabit merged commit 6d49c96 into enhancement/log-viewer-widget Nov 14, 2021
@clmrv clmrv deleted the feature/376-381-412 branch November 26, 2021 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants