Merge pull request #1 from redbox-mint/develop

Version 1.0.0

.circleci/config.yml

@@ -0,0 +1,106 @@
+version: 2.1
+jobs:
+  build_and_publish:
+    docker:
+      - image: cimg/node:20.9.0
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - run:      
+          command: |
+                    set +e
+                    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash
+                    export NVM_DIR="$HOME/.nvm"
+                    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" 
+      - run: export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && nvm install && npm install && node_modules/.bin/tsc
+      - run: chmod +x support/build/compileAngularLegacy.sh && support/build/compileAngularLegacy.sh omero
+      # run tests!
+      # - run: npm test
+      # # store test results
+      # - store_test_results:
+      #     path: test_results
+
+      # store code coverage
+      # - persist_to_workspace:
+      #     root: ~/repo
+      #     paths: .
+      - run:
+          name: Authenticate with NPM
+          command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
+      - run:
+          name: Publish package
+          command: npm publish --access public
+  build_only:
+    docker:
+      - image: cimg/node:20.9.0
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - run:      
+          command: |
+                    set +e
+                    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash
+                    export NVM_DIR="$HOME/.nvm"
+                    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" 
+      - run: export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && nvm install && npm install && node_modules/.bin/tsc
+      - run: chmod +x support/build/compileAngularLegacy.sh && support/build/compileAngularLegacy.sh omero
+      # run tests!
+      # - run: npm test
+      # # store test results
+      # - store_test_results:
+      #     path: test_results
+
+      # store code coverage
+      # - persist_to_workspace:
+      #     root: ~/repo
+      #     paths: .
+
+
+workflows:
+  publish:
+    jobs:
+      - build_and_publish:
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              ignore: /.*/
+  build:
+    jobs:  
+      - build_only:
+          filters:
+            tags:
+              ignore: /.*/
+            branches:
+              only: /.*/
+# jobs:
+#   build:
+#     docker:
+#       - image: "cimg/base:stable"
+#       - checkout
+#       - node/install:
+#           node-version: 12.16.0
+#       - run: npm install --production
+#       - run: node_modules/.bin/tsc
+#       - persist_to_workspace:
+#           root: .
+#           paths:
+#             - .
+#   test:
+#     machine: true
+#     steps:
+#       - docker/install-docker-compose
+#       - attach_workspace:
+#            at: /home/circleci/project
+#       - run: export NVM_DIR=/opt/circleci/.nvm && source /opt/circleci/.nvm/nvm.sh && nvm install 12.16.0 && nvm use 12.16.0
+#       - run: export NVM_DIR=/opt/circleci/.nvm && source /opt/circleci/.nvm/nvm.sh && nvm use 12.16.0 && node_modules/.bin/tsc -p tsconfig-codecov.json
+#       - run: (cd support/integration-testing && docker-compose -f docker-compose.newman.yml up --abort-on-container-exit --exit-code-from redboxportal && docker-compose -f docker-compose.mocha.yml up --abort-on-container-exit --exit-code-from redboxportal)
+#       - run: export NVM_DIR=/opt/circleci/.nvm && source /opt/circleci/.nvm/nvm.sh && nvm use 12.16.0 && npm i -g codecov && codecov -t $CODECOV_TOKEN
+#       - run: export NVM_DIR=/opt/circleci/.nvm && source /opt/circleci/.nvm/nvm.sh && nvm use 12.16.0 && node_modules/.bin/tsc
+#
+# orbs:
+#   node: circleci/node@4.0.0
+#   docker: circleci/docker@1.4.0
+# version: 2.1
+# workflows:
+#

.dockerignore

@@ -0,0 +1,4 @@
+support/development
+runForDev.sh
+.circleci
+temp/

.gitignore

@@ -45,3 +45,7 @@ e2e/*.map
 Thumbs.db
 
 test/angular
+api
+angular-legacy/shared
+assets/angular
+dist/

.npmignore

@@ -0,0 +1,7 @@
+.circleci
+support
+test
+.editorconfig
+.gitignore
+angular-legacy
+.idea

.nvmrc

@@ -0,0 +1 @@
+20.9.0

app/omero/.angular-cli.json → angular-legacy/.angular-cli.json

@@ -1,13 +1,13 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "project": {
-    "name": "omero"
+    "name": "angular"
   },
   "apps": [
     {
       "name": "omero",
-      "root": "src",
-      "outDir": "dist",
+      "root": "omero",
+      "outDir": "../assets/angular/omero",
       "assets": [
         "assets",
         "favicon.ico"
@@ -20,11 +20,9 @@
       "testTsconfig": "tsconfig.spec.json",
       "prefix": "app",
       "styles": [
-        "../node_modules/bootstrap/dist/css/bootstrap.min.css",
         "styles.css"
       ],
       "scripts": [
-        "../node_modules/jquery/dist/jquery.min.js"
       ],
       "environmentSource": "environments/environment.ts",
       "environments": {

angular-legacy/.nvmrc

@@ -0,0 +1 @@
+14.19.0

app/omero/src/app/components/create-workspace.component.ts → angular-legacy/omero/app/components/create-workspace.component.ts

@@ -1,6 +1,6 @@
 import {Input, Output, Component, OnInit, Inject, Injector, ElementRef, ViewChild, EventEmitter} from '@angular/core';
-import {SimpleComponent} from '../shared/form/field-simple.component';
-import {FieldBase} from '../shared/form/field-base';
+import {SimpleComponent} from '../../../shared/form/field-simple.component';
+import {FieldBase} from '../../../shared/form/field-base';
 import {FormGroup, FormControl, Validators} from '@angular/forms';
 import * as _ from "lodash-es";
 
@@ -125,7 +125,8 @@ export class CreateWorkspaceField extends FieldBase<any> {
     this.creation.clear();
     this.creationAlert.clear();
     console.log('clear');
-    jQuery('#createModal').modal({show: true, keyboard: false, backdrop: 'static'});
+    jQuery('#createModal').modal({show: true});
+    jQuery('#createModal').modal('show');
   }
 
   create() {

app/omero/src/app/components/field-createworkspace.html → angular-legacy/omero/app/components/field-createworkspace.html

@@ -50,7 +50,7 @@ <h4>{{ field.addDescription }}</h4>
         <span *ngIf="field.creationAlert.status !== ('working' || 'done'); then buttonsCreate else buttonsBlocked;"></span>
         <ng-template #buttonsCreate>
           <button *ngIf="field.creationAlert.status !== 'done'" class="btn btn-primary" (click)="field.create()" type="submit">{{ field.createLabel }}</button>
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ field.dismissLabel }}</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ field.dismissLabel }}</button>
         </ng-template>
         <ng-template #buttonsBlocked>
           <button disabled class="btn btn-primary disabled"  type="submit">{{ field.createLabel }}</button>

app/omero/src/app/components/linkmodal-workspace.component.ts → angular-legacy/omero/app/components/linkmodal-workspace.component.ts

@@ -1,6 +1,6 @@
 import {Input, Output, Component, OnInit, Inject, Injector, EventEmitter} from '@angular/core';
-import {SimpleComponent} from '../shared/form/field-simple.component';
-import {FieldBase} from '../shared/form/field-base';
+import {SimpleComponent} from '../../../shared/form/field-simple.component';
+import {FieldBase} from '../../../shared/form/field-base';
 import {FormGroup, FormControl, Validators} from '@angular/forms';
 import * as _ from "lodash-es";
 
@@ -100,6 +100,7 @@ export class LinkModalWorkspaceField extends FieldBase<any> {
     this.currentWorkspace = workspace;
     this.checks.clear();
     jQuery('#linkModal').modal({show: true, keyboard: false, backdrop: 'static'});
+    jQuery('#linkModal').modal('show');
     this.processing = true;
     this.checks.master = true;
     return this.omeroService.info()
@@ -166,10 +167,10 @@ export class LinkModalWorkspaceField extends FieldBase<any> {
           <div class="modal-footer">
             <span *ngIf="field.processing; then waitForProcessing; else finishProcessing"></span>
             <ng-template #finishProcessing>
-              <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ field.closeLabel }}</button>
+              <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ field.closeLabel }}</button>
             </ng-template>
             <ng-template #waitForProcessing>
-              <button type="button" class="btn btn-secondary disabled" data-dismiss="modal">{{ field.closeLabel }}
+              <button type="button" class="btn btn-secondary disabled" data-bs-dismiss="modal">{{ field.closeLabel }}
               </button>
             </ng-template>
           </div>

app/omero/src/app/components/list-workspaces.component.ts → angular-legacy/omero/app/components/list-workspaces.component.ts

@@ -1,6 +1,6 @@
 import {Input, Output, Component, OnInit, Inject, Injector, EventEmitter} from '@angular/core';
-import {SimpleComponent} from '../shared/form/field-simple.component';
-import {FieldBase} from '../shared/form/field-base';
+import {SimpleComponent} from '../../../shared/form/field-simple.component';
+import {FieldBase} from '../../../shared/form/field-base';
 import {FormGroup, FormControl, Validators} from '@angular/forms';
 import * as _ from "lodash-es";
 import {PaginationModule} from 'ngx-bootstrap';

app/omero/src/app/components/login-workspaceapp.component.ts → angular-legacy/omero/app/components/login-workspaceapp.component.ts

@@ -1,7 +1,7 @@
 import {Output, EventEmitter, Component, OnInit, Inject, Injector} from '@angular/core';
 import {FormGroup, FormControl, Validators, NgForm} from '@angular/forms';
-import {SimpleComponent} from '../shared/form/field-simple.component';
-import {FieldBase} from '../shared/form/field-base';
+import {SimpleComponent} from '../../../shared/form/field-simple.component';
+import {FieldBase} from '../../../shared/form/field-base';
 import * as _ from "lodash-es";
 
 // STEST-22

app/omero/src/app/omero-form.component.ts → angular-legacy/omero/app/omero-form.component.ts

@@ -1,22 +1,20 @@
 import { Component, Inject, Input, ElementRef, Output, EventEmitter } from '@angular/core';
 import { Location, LocationStrategy, PathLocationStrategy } from '@angular/common';
 import { FormGroup, FormControl, Validators, NgForm } from '@angular/forms';
-import { RecordsService } from './shared/form/records.service';
+import { RecordsService } from '../../shared/form/records.service';
 import { OMEROService } from './omero.service';
-import { LoadableComponent } from './shared/loadable.component';
-import { FieldControlService } from './shared/form/field-control.service';
+import { LoadableComponent } from '../../shared/loadable.component';
+import { FieldControlService } from '../../shared/form/field-control.service';
 import { Observable } from 'rxjs/Observable';
 import * as _ from "lodash-es";
-import { TranslationService } from './shared/translation-service';
 
-import { LoginWorkspaceAppField, LoginWorkspaceAppComponent } from './components/login-workspaceapp.component';
+import { LoginWorkspaceAppField, LoginWorkspaceAppComponent } from "./components/login-workspaceapp.component";
 import { ListWorkspaceDataField, ListWorkspaceDataComponent } from './components/list-workspaces.component';
 import { LinkModalWorkspaceField, LinkModalWorkspaceComponent } from './components/linkmodal-workspace.component';
 import { CreateWorkspaceField, CreateWorkspaceComponent } from './components/create-workspace.component';
 
 import { WorkspaceUser } from './components/shared';
-// STEST-22
-declare var jQuery: any;
+import * as jQuery from 'jquery';
 
 /**
 * Main OMERO Edit component
@@ -106,8 +104,7 @@ export class OMEROFormComponent extends LoadableComponent {
     @Inject(RecordsService) protected RecordsService: RecordsService,
     @Inject(FieldControlService) protected fcs: FieldControlService,
     @Inject(Location) protected LocationService: Location,
-    @Inject(OMEROService) protected OMEROService: OMEROService,
-    public translationService: TranslationService
+    @Inject(OMEROService) protected OMEROService: OMEROService
   ) {
     super();
     this.oid = elm.nativeElement.getAttribute('oid');

app/omero/src/app/omero.module.ts → angular-legacy/omero/app/omero.module.ts

@@ -4,8 +4,7 @@ import { ReactiveFormsModule, FormsModule} from "@angular/forms";
 import { HttpModule } from '@angular/http';
 import { OMEROFormComponent } from './omero-form.component';
 import { OMEROService } from './omero.service';
-import { WorkspaceFieldComponent } from './shared/form/workspace-field.component';
-import { SharedModule } from './shared/shared.module';
+import { SharedModule } from '../../shared/shared.module';
 import { PaginationModule } from 'ngx-bootstrap/pagination';
 
 import { LoginWorkspaceAppComponent } from './components/login-workspaceapp.component';
@@ -17,16 +16,18 @@ import { CreateWorkspaceComponent } from './components/create-workspace.componen
   imports: [ BrowserModule, HttpModule, ReactiveFormsModule,
     SharedModule, FormsModule, PaginationModule.forRoot()
   ],
-  declarations: [ OMEROFormComponent,
+  declarations: [ 
+    OMEROFormComponent,
     ListWorkspaceDataComponent, LoginWorkspaceAppComponent,
     LinkModalWorkspaceComponent, CreateWorkspaceComponent
   ],
   exports: [  ],
   providers: [ OMEROService ],
   bootstrap: [ OMEROFormComponent ],
-  entryComponents: [ LoginWorkspaceAppComponent,
-  ListWorkspaceDataComponent, LinkModalWorkspaceComponent,
-  CreateWorkspaceComponent
+  entryComponents: [ 
+    LoginWorkspaceAppComponent,
+    ListWorkspaceDataComponent, LinkModalWorkspaceComponent,
+    CreateWorkspaceComponent
  ]
 })
 export class OMEROModule { }

app/omero/src/app/omero.service.ts → angular-legacy/omero/app/omero.service.ts

@@ -5,8 +5,8 @@ import 'rxjs/add/operator/toPromise';
 import 'rxjs/add/operator/delay';
 import {Observable} from 'rxjs/Observable';
 
-import {BaseService} from './shared/base-service';
-import {ConfigService} from './shared/config-service';
+import {BaseService} from "../../shared/base-service";
+import {ConfigService} from "../../shared/config-service";
 
 @Injectable()
 export class OMEROService extends BaseService {