Resolved merge conflicts

Author: SPARSH1608

app/helpers/json-to-table.js

@@ -18,7 +18,6 @@
       </div>
     {{/if}}
     <SubmissionResult 
-      @allowedLanguages={{contest.allowedLanguages}}
       @fullScreen={{fullScreen}}
       @judgeResult={{if (not submission.codeTaskGroup.isRunning) lastResult}} />
   </div>

app/pods/components/code-editor-component/template.hbs

@@ -1,10 +1,7 @@
 import Component from '@ember/component';
 import { action, computed } from '@ember/object';
-import { inject as service } from '@ember/service';
 
 export default class CodeWindowComponent extends Component {
-  @service('language-selection') languageSelection;
-
   isLanguageSelectOpen = false
   customInputOpen = true
   customInput = ''
@@ -51,15 +48,9 @@ export default class CodeWindowComponent extends Component {
       code: "csharp",
       mode: "csharp",
       source: ""
-    },
-    {
-      name: "MySQL 10",
-      code: "mysql",
-      mode: "mysql",
-      source: ""
     }
   ]
- 
+
   setSubmission = () => {
     this.set('selectedLanguage', this.languageSpecs.find(spec => spec.code === this.submission.language))
     this.set('selectedLanguage.source', window.atob(this.submission.solution.source))
@@ -89,10 +80,11 @@ export default class CodeWindowComponent extends Component {
 
   @action
   selectLanguage(languageCode) {
-    let selectedLanguage = this.languageSpecs.find((spec) => spec.code === languageCode);
-    this.set('selectedLanguage', selectedLanguage);
-    this.languageSelection.set('selectedLanguage', selectedLanguage);
-    this.trigger("restoreCodeFromStorage");
+    // console.log(languageCode)
+    this.set('selectedLanguage', this.get('languageSpecs').find((spec) => {
+      return spec.code === languageCode
+    }))
+    this.trigger("restoreCodeFromStorage")
   }
 
   @action

app/pods/components/code-window/component.js

@@ -2,21 +2,23 @@
   <p>{{markdown-to-html problem.details.description}}</p>
 
   <div class="extra-bold">Input Format</div>
-  <pre>{{problem.details.input_format}}</pre>
-
+  <p>
+    {{markdown-to-html problem.details.input_format}}
+  </p>
   <div class="extra-bold">Constraints</div>
   <div class="bg-grey br-5 w-60 px-4 py-2 my-2">
-    <p>{{markdown-to-html problem.details.constraints}}</p>
+    <p>
+      {{markdown-to-html problem.details.constraints}}
+    </p>
   </div>
-
   <div class="extra-bold">Output Format</div>
-  <pre>{{problem.details.output_format}}</pre>
-
+  <p>
+    {{markdown-to-html problem.details.output_format}}
+  </p>
   <div class="extra-bold">Sample Input</div>
   <div class="bg-grey br-5 w-60 px-4 py-2 my-2">
     <pre>{{problem.details.sample_input}}</pre>
   </div>
-
   <div class="extra-bold">Sample Output</div>
   <div class="bg-grey br-5 w-60 px-4 py-2 my-2">
     {{#if (includes contest.allowedLanguages "mysql")}}
@@ -25,11 +27,10 @@
       <pre>{{problem.details.sample_output}}</pre>
     {{/if}}
   </div>
-
   {{#if problem.details.explanation}}
     <div class="extra-bold">Explanation</div>
     <div class="bg-grey br-5 w-60 px-4 py-2 my-2">
       {{markdown-to-html problem.details.explanation}}
     </div>
   {{/if}}
-</div>
+</div>

app/pods/components/problem-explanation/template.hbs

@@ -33,7 +33,7 @@
 
   {{#liquid-if (eq selectedTab "problem")}}
   <ProblemExplanation
-    @problem={{problem}}  @contest={{contest}} />
+    @problem={{problem}} />
   {{else if (eq selectedTab "submissions")}}
   <SubmissionsList 
     @contest={{contest}}

app/pods/components/problem-view/template.hbs

@@ -57,11 +57,9 @@
     {{/if}}
   </div>
 </div>
-
 {{#if (or submitProjectTask.isRunning lastResult)}}
   <div class="mt-4">
     <SubmissionResult
-    @allowedLanguages={{contest.allowedLanguages}}
       @contentType={{content.type}}
       @judgeResult={{if (not submitProjectTask.isRunning) lastResult}}
     />

app/pods/components/project-view/template.hbs

@@ -4,12 +4,10 @@ import { computed } from '@ember/object';
 export default class RunResultComponent extends Component {
   didRender() {
     this.element.scrollIntoView({behavior: "smooth", block: "end" })
- 
   }
 
   @computed('judgeResult')
   get output() {    
-
     if (this.judgeResult.data){
       return window.atob(this.judgeResult.data.output)
     } else if (this.judgeResult.error) {

app/pods/components/run-result/component.js

@@ -1,48 +1,44 @@
 import Component from '@ember/component';
 import { computed } from '@ember/object';
-import { jsonToTable } from '../../../util/json-to-table';
-
-export default Component.extend({
 
+export default class SubmissionResult extends Component {
   didRender() {
-    this._super(...arguments); 
-    this.element.scrollIntoView({ behavior: "smooth", block: "end" });
-  },
+    this.element.scrollIntoView({ behavior: "smooth", block: "end" })
+  }
 
-  isRunning: computed('judgeResult', function() {
-    return !this.get('judgeResult');
-  }),
+  @computed('judgeResult')
+  get isRunning() {
+    return !this.judgeResult
+  }
 
-  isErrored: computed('judgeResult', function() {
-    return !!this.get('judgeResult')?.stderr;
-  }),
+  @computed('judgeResult')
+  get isErrored() {
+    return !!this.judgeResult.stderr
+  }
 
-  isSubmission: computed('judgeResult', function() {
-    return !!this.get('judgeResult')?.testcases;
-  }),
+  @computed('judgeResult')
+  get isSubmission() {    
+    return !!(this.judgeResult.testcases)
+  }
 
-  errorPayload: computed('isErrored', function() {
-    if (this.get('isErrored')) {
-      return window.atob(this.get('judgeResult')?.stderr || this.get('judgeResult')?.stdout);
+  @computed('isErrored')
+  get errorPayload() {    
+    if (this.isErrored) {      
+      return window.atob(this.judgeResult.stderr || this.judgeResult.stdout)
     }
-  }),
-
-  output: computed('isSubmission', function() {
-    if (!this.get('isSubmission')) {
-      const output = window.atob(this.get('judgeResult')?.stdout);
+  }
 
-      return output;
+  @computed('isSubmission')
+  get output() {
+    if (!this.isSubmission) {
+      return window.atob(this.judgeResult.stdout)
     }
-  }),
+  }
 
-  testcasesPayload: computed('isSubmission', function() {
-    if (this.get('isSubmission')) {
-      return this.get('judgeResult')?.testcases;
+  @computed('isSubmission')
+  get testcasesPayload() {
+    if (this.isSubmission) {
+      return this.judgeResult.testcases
     }
-  }),
-
-  jsonToTable(data) {
-    const table = jsonToTable(data);
-    return table;
   }
-});
+}

app/pods/components/submission-result/component.js

@@ -2,12 +2,7 @@
   <span class="font-sm bold">
     Compilation Successful
   </span>
-
   {{#if output}}
-    {{#if (includes allowedLanguages "mysql")}}
-      <pre class="mt-3 bg-grey p-4">{{json-to-table output}}</pre>
-    {{else}}
-      <pre class="mt-3 bg-grey p-4">{{output}}</pre>
-    {{/if}}
+    <pre class="mt-3 bg-grey p-4">{{output}}</pre>
   {{/if}}
 </div>

app/pods/components/submission-result/submission-success/template.hbs

@@ -1,18 +1,11 @@
 <div class="{{unless fullScreen "border-card mb-5"}} p-0">
- 
-
   {{#if isRunning}}
     <SubmissionResult::SubmissionStatus />
   {{else if isErrored}}
     <SubmissionResult::SubmissionError @output={{errorPayload}} />
   {{else if isSubmission}}
     <SubmissionResult::SubmissionTestcases @testcases={{testcasesPayload}} />
   {{else}}
-<SubmissionResult::SubmissionSuccess 
-  @message={{message}} 
-  @output={{output}} 
-  @allowedLanguages={{allowedLanguages}} 
-/>
-
+    <SubmissionResult::SubmissionSuccess @message={{message}} @output={{output}} />
   {{/if}}
 </div>